Release v1.0.6: Background Timer Fix

.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run build:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

.gitignore

@@ -1,5 +1,7 @@
 # Build output
 *.js.map
+release/
+*.zip
 
 # npm
 node_modules/

README.md

@@ -4,7 +4,7 @@ A powerful task management and focus timer plugin for [Obsidian](https://obsidia
 
 ![Focus Task Banner](https://img.shields.io/badge/Obsidian-Plugin-7c3aed?style=for-the-badge&logo=obsidian&logoColor=white)
 ![License](https://img.shields.io/badge/License-MIT-green?style=for-the-badge)
-![Version](https://img.shields.io/badge/Version-1.0.3-blue?style=for-the-badge)
+![Version](https://img.shields.io/badge/Version-1.0.6-blue?style=for-the-badge)
 
 ## 🎯 Overview
 
@@ -46,6 +46,7 @@ Focus Task brings the power of time-boxed task management directly into your Obs
 - **Streak Counter**: Build momentum with consecutive productive days
 - **Time Comparison**: Compare estimated vs. actual time to improve planning
 - **Pomodoro Count**: Track total pomodoros completed
+- **Daily Note Logging**: Automatically log completed tasks to your daily notes with timestamps and performance metrics
 
 ### 🎨 User Experience
 - **Status Bar Timer**: timer that stays visible while you work
@@ -136,7 +137,7 @@ Best for: Tracking time on open-ended tasks
 | Short Break | Length of short breaks | 5 min |
 | Long Break | Length of long breaks | 15 min |
 | Long Break Interval | Pomodoros before a long break | 4 |
-| Auto-start Breaks | Automatically start break timer | Off |
+| Auto-start Breaks | Automatically start break timer | On |
 
 ### General
 | Setting | Description | Default |
@@ -146,6 +147,27 @@ Best for: Tracking time on open-ended tasks
 | Enable Celebrations | Show celebration messages | On |
 | Show Floating Timer | Display draggable timer widget | On |
 
+### Daily Note Integration
+
+| Setting | Description | Default |
+|---------|-------------|---------|
+| Log to Daily Note | Automatically log completed tasks to your daily note | Off |
+
+When enabled, completed tasks are automatically appended to your daily note with:
+
+- Task name and list category
+- Time spent vs. estimated time
+- Completion timestamp
+- Performance indicator (under/over/on target)
+
+**Example entry:**
+
+```
+- [x] Write project proposal | 💼 Work | ⏱️ 45min / 30min (15min over estimate) | ✅ 14:30
+```
+
+**Requirements:** The core "Daily Notes" plugin must be enabled in Obsidian settings. Focus Task respects your Daily Notes configuration (folder, date format, and template).
+
 ### Lists
 Customize your task lists with:
 - Custom names

main.js

@@ -43,7 +43,7 @@ var DEFAULT_SETTINGS = {
     { id: "personal", name: "Personal", color: "#22c55e", icon: "\u{1F3E0}" },
     { id: "learning", name: "Learning", color: "#f59e0b", icon: "\u{1F4DA}" }
   ],
-  autoStartBreak: false,
+  autoStartBreak: true,
   tickSoundEnabled: false,
   // Daily note logging
   logToDaily: false
@@ -319,9 +319,11 @@ var FocusTaskView = class extends import_obsidian2.ItemView {
         const activeCard = activeSection.createEl("div", { cls: "focus-task-active-card" });
         if (this.plugin.isBreakMode) {
           activeCard.addClass("focus-task-break-card");
-          activeCard.createEl("div", { cls: "focus-task-active-label", text: "\u2615 BREAK TIME" });
+          const breakLabel = this.plugin.currentTimerSeconds > 0 ? "\u2615 BREAK TIME" : "\u2728 BREAK COMPLETE";
+          activeCard.createEl("div", { cls: "focus-task-active-label", text: breakLabel });
         } else {
-          activeCard.createEl("div", { cls: "focus-task-active-label", text: "\u{1F3AF} FOCUSING ON" });
+          const workLabel = this.plugin.currentTimerSeconds > 0 ? "\u{1F3AF} FOCUSING ON" : "\u{1F345} POMODORO COMPLETE";
+          activeCard.createEl("div", { cls: "focus-task-active-label", text: workLabel });
         }
         activeCard.createEl("div", { cls: "focus-task-active-task-name", text: task.text });
         const timerDisplay = activeCard.createEl("div", { cls: "focus-task-timer-display" });
@@ -348,25 +350,62 @@ var FocusTaskView = class extends import_obsidian2.ItemView {
           this.actualTimeEl = timeInfo.createEl("span", { text: `Actual: ${this.plugin.formatTimeHuman(task.actualMinutes)}` });
         }
         const controls = activeCard.createEl("div", { cls: "focus-task-active-controls" });
+        if (this.plugin.isBreakMode) {
+          if (this.plugin.currentTimerSeconds > 0) {
             this.pauseBtnEl = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-secondary" });
             this.pauseBtnEl.innerHTML = this.plugin.isTimerRunning ? "\u23F8 Pause" : "\u25B6 Resume";
             this.pauseBtnEl.addEventListener("click", () => this.plugin.toggleTimer());
-        if (!this.plugin.isBreakMode) {
+            const skipBreakBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-primary" });
-          const completeBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-success" });
-          completeBtn.innerHTML = "\u2713 Complete";
-          completeBtn.addEventListener("click", () => this.plugin.completeTask(task.id));
-        }
-        const stopBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-danger" });
-        stopBtn.innerHTML = "\u2715 Stop";
-        stopBtn.addEventListener("click", () => this.plugin.stopTimer());
-        if (this.plugin.isBreakMode) {
-          const skipBreakBtn = controls.createEl("button", { cls: "focus-task-btn" });
             skipBreakBtn.innerHTML = "\u23ED Skip Break";
             skipBreakBtn.addEventListener("click", () => {
               this.plugin.isBreakMode = false;
-            this.plugin.stopTimer();
+              this.plugin.startPomodoro(task.id);
-            this.refresh();
             });
+            const stopBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-danger" });
+            stopBtn.innerHTML = "\u2715 Stop";
+            stopBtn.addEventListener("click", () => {
+              this.plugin.isBreakMode = false;
+              this.plugin.stopTimer();
+            });
+          } else {
+            const resumeWorkBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-success" });
+            resumeWorkBtn.innerHTML = "\u25B6 Resume Work";
+            resumeWorkBtn.addEventListener("click", () => {
+              this.plugin.isBreakMode = false;
+              this.plugin.startPomodoro(task.id);
+            });
+            const stopBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-danger" });
+            stopBtn.innerHTML = "\u2715 Stop";
+            stopBtn.addEventListener("click", () => {
+              this.plugin.isBreakMode = false;
+              this.plugin.stopTimer();
+            });
+          }
+        } else {
+          if (this.plugin.currentTimerSeconds > 0) {
+            this.pauseBtnEl = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-secondary" });
+            this.pauseBtnEl.innerHTML = this.plugin.isTimerRunning ? "\u23F8 Pause" : "\u25B6 Resume";
+            this.pauseBtnEl.addEventListener("click", () => this.plugin.toggleTimer());
+            const completeBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-success" });
+            completeBtn.innerHTML = "\u2713 Complete";
+            completeBtn.addEventListener("click", () => this.plugin.completeTask(task.id));
+            const stopBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-danger" });
+            stopBtn.innerHTML = "\u2715 Stop";
+            stopBtn.addEventListener("click", () => this.plugin.stopTimer());
+          } else {
+            const startBreakBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-secondary" });
+            startBreakBtn.innerHTML = "\u2615 Start Break";
+            startBreakBtn.addEventListener("click", () => this.plugin.startBreak());
+            const continueBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-primary" });
+            continueBtn.innerHTML = "\u25B6 Continue Working";
+            continueBtn.addEventListener("click", () => this.plugin.startPomodoro(task.id));
+            const completeBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-success" });
+            completeBtn.innerHTML = "\u2713 Complete";
+            completeBtn.addEventListener("click", () => this.plugin.completeTask(task.id));
+            const stopBtn = controls.createEl("button", { cls: "focus-task-btn focus-task-btn-danger" });
+            stopBtn.innerHTML = "\u2715 Stop";
+            stopBtn.addEventListener("click", () => this.plugin.stopTimer());
+          }
         }
       }
     } else {
@@ -497,14 +536,23 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
     this.isBreakMode = false;
     this.activeTaskId = null;
     this.pomodoroCount = 0;
+    // Timestamp-based tracking for reliable background timing
+    this.timerStartTimestamp = 0;
+    this.pausedTimeRemaining = 0;
     // Focus time tracking (in seconds for accuracy)
     this.focusSecondsToday = 0;
+    this.secondsWorkedOnCurrentTask = 0;
     // Status bar element
     this.statusBarEl = null;
   }
   async onload() {
     await this.loadAllData();
     this.checkDailyReset();
+    document.addEventListener("visibilitychange", () => {
+      if (!document.hidden && this.isTimerRunning) {
+        this.syncTimerFromTimestamp();
+      }
+    });
     this.registerView(
       VIEW_TYPE_FOCUS_TASK,
       (leaf) => new FocusTaskView(leaf, this)
@@ -661,6 +709,41 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
     }
   }
   // ============ Timer Management ============
+  // Sync timer based on timestamp when app returns from background
+  syncTimerFromTimestamp() {
+    if (!this.isTimerRunning || this.timerStartTimestamp === 0)
+      return;
+    const now = Date.now();
+    const elapsedMs = now - this.timerStartTimestamp;
+    const elapsedSeconds = Math.floor(elapsedMs / 1e3);
+    if (this.isBreakMode) {
+      this.currentTimerSeconds = Math.max(0, this.pausedTimeRemaining - elapsedSeconds);
+      if (this.currentTimerSeconds <= 0) {
+        this.handlePomodoroEnd();
+      }
+    } else {
+      const task = this.data.tasks.find((t) => t.id === this.activeTaskId);
+      if (!task)
+        return;
+      if (this.pausedTimeRemaining > 0) {
+        this.currentTimerSeconds = Math.max(0, this.pausedTimeRemaining - elapsedSeconds);
+        this.secondsWorkedOnCurrentTask += elapsedSeconds;
+        task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
+        this.focusSecondsToday += elapsedSeconds;
+        if (this.currentTimerSeconds <= 0) {
+          this.handlePomodoroEnd();
+        }
+      } else {
+        this.currentTimerSeconds += elapsedSeconds;
+        this.secondsWorkedOnCurrentTask += elapsedSeconds;
+        task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
+        this.focusSecondsToday += elapsedSeconds;
+      }
+    }
+    this.updateStatusBar();
+    this.updateTimerDisplay();
+    this.saveAllData();
+  }
   startTimer(taskId) {
     const task = this.data.tasks.find((t) => t.id === taskId);
     if (!task)
@@ -671,11 +754,15 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
     this.isBreakMode = false;
     this.currentTimerSeconds = 0;
     this.isTimerRunning = true;
+    this.secondsWorkedOnCurrentTask = task.actualMinutes * 60;
+    this.timerStartTimestamp = Date.now();
+    this.pausedTimeRemaining = 0;
     this.refreshView();
     this.updateStatusBar();
     this.timerInterval = window.setInterval(() => {
       this.currentTimerSeconds++;
-      task.actualMinutes = Math.floor(this.currentTimerSeconds / 60);
+      this.secondsWorkedOnCurrentTask++;
+      task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
       this.focusSecondsToday++;
       this.updateStatusBar();
       this.updateTimerDisplay();
@@ -698,14 +785,16 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
     this.isBreakMode = false;
     this.currentTimerSeconds = this.settings.pomodoroWorkMinutes * 60;
     this.isTimerRunning = true;
+    this.secondsWorkedOnCurrentTask = task.actualMinutes * 60;
+    this.timerStartTimestamp = Date.now();
+    this.pausedTimeRemaining = this.currentTimerSeconds;
     this.refreshView();
     this.updateStatusBar();
-    let secondsWorked = 0;
     this.timerInterval = window.setInterval(() => {
       this.currentTimerSeconds--;
       if (!this.isBreakMode) {
-        secondsWorked++;
+        this.secondsWorkedOnCurrentTask++;
-        task.actualMinutes = Math.floor(secondsWorked / 60);
+        task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
         this.focusSecondsToday++;
       }
       this.updateStatusBar();
@@ -716,6 +805,14 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
     }, 1e3);
   }
   handlePomodoroEnd() {
+    if (this.timerInterval) {
+      window.clearInterval(this.timerInterval);
+      this.timerInterval = null;
+    }
+    this.currentTimerSeconds = 0;
+    this.isTimerRunning = false;
+    this.updateStatusBar();
+    this.updateTimerDisplay();
     if (!this.isBreakMode) {
       this.pomodoroCount++;
       this.data.pomodorosCompleted++;
@@ -726,22 +823,24 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
       if (this.settings.autoStartBreak) {
         this.startBreak();
       } else {
-        this.stopTimer();
+        this.refreshView();
       }
     } else {
       if (this.settings.enableSounds) {
         this.playAlertSound();
       }
       new import_obsidian3.Notice("\u26A1 Break over! Ready to focus?");
-      this.isBreakMode = false;
+      this.refreshView();
-      this.stopTimer();
     }
     this.saveAllData();
   }
   startBreak() {
     this.isBreakMode = true;
+    this.isTimerRunning = true;
     const isLongBreak = this.pomodoroCount % this.settings.longBreakInterval === 0;
     this.currentTimerSeconds = (isLongBreak ? this.settings.longBreakMinutes : this.settings.pomodoroBreakMinutes) * 60;
+    this.timerStartTimestamp = Date.now();
+    this.pausedTimeRemaining = this.currentTimerSeconds;
     new import_obsidian3.Notice(isLongBreak ? "\u2615 Long break time!" : "\u2615 Short break time!");
     this.refreshView();
     if (!this.timerInterval) {
@@ -761,13 +860,16 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
       window.clearInterval(this.timerInterval);
       this.timerInterval = null;
       this.isTimerRunning = false;
+      this.pausedTimeRemaining = this.currentTimerSeconds;
     } else if (this.activeTaskId) {
       this.isTimerRunning = true;
+      this.timerStartTimestamp = Date.now();
       const task = this.data.tasks.find((t) => t.id === this.activeTaskId);
       this.timerInterval = window.setInterval(() => {
         this.currentTimerSeconds--;
         if (task && !this.isBreakMode) {
-          task.actualMinutes = Math.floor((this.settings.pomodoroWorkMinutes * 60 - this.currentTimerSeconds) / 60);
+          this.secondsWorkedOnCurrentTask++;
+          task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
           this.focusSecondsToday++;
         }
         this.updateStatusBar();
@@ -795,6 +897,9 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
     }
     this.isTimerRunning = false;
     this.activeTaskId = null;
+    this.secondsWorkedOnCurrentTask = 0;
+    this.timerStartTimestamp = 0;
+    this.pausedTimeRemaining = 0;
     this.updateStatusBar();
     this.saveAllData();
     this.refreshView();
@@ -924,9 +1029,20 @@ var FocusTaskPlugin = class extends import_obsidian3.Plugin {
   formatDailyNoteDate(format) {
     const now = new Date();
     const year = now.getFullYear();
-    const month = (now.getMonth() + 1).toString().padStart(2, "0");
+    const month = now.getMonth() + 1;
-    const day = now.getDate().toString().padStart(2, "0");
+    const day = now.getDate();
-    return format.replace("YYYY", year.toString()).replace("YY", year.toString().slice(-2)).replace("MM", month).replace("M", (now.getMonth() + 1).toString()).replace("DD", day).replace("D", now.getDate().toString()).replace("dddd", now.toLocaleDateString("en-US", { weekday: "long" })).replace("ddd", now.toLocaleDateString("en-US", { weekday: "short" })).replace("MMMM", now.toLocaleDateString("en-US", { month: "long" })).replace("MMM", now.toLocaleDateString("en-US", { month: "short" }));
+    let result = format;
+    result = result.replace(/YYYY/g, year.toString());
+    result = result.replace(/YY/g, year.toString().slice(-2));
+    result = result.replace(/MMMM/g, now.toLocaleDateString("en-US", { month: "long" }));
+    result = result.replace(/MMM/g, now.toLocaleDateString("en-US", { month: "short" }));
+    result = result.replace(/MM/g, month.toString().padStart(2, "0"));
+    result = result.replace(/(?<![A-Za-z])M(?![A-Za-z])/g, month.toString());
+    result = result.replace(/dddd/g, now.toLocaleDateString("en-US", { weekday: "long" }));
+    result = result.replace(/ddd/g, now.toLocaleDateString("en-US", { weekday: "short" }));
+    result = result.replace(/DD/g, day.toString().padStart(2, "0"));
+    result = result.replace(/(?<![A-Za-z])D(?![A-Za-z])/g, day.toString());
+    return result;
   }
   async getOrCreateDailyNote() {
     const { vault } = this.app;

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "focus-task",
   "name": "Focus Task",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "minAppVersion": "0.15.0",
   "description": "A Blitzit-inspired task management and focus timer plugin. Plan your day, track time with Pomodoro technique, and crush your tasks with satisfying checkoffs.",
   "author": "Crib",

package-release.mjs

@@ -0,0 +1,62 @@
+import { promises as fs } from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const RELEASE_DIR = 'release';
+const FILES_TO_INCLUDE = [
+	'main.js',
+	'manifest.json',
+	'styles.css'
+];
+
+async function packageRelease() {
+	try {
+		console.log('📦 Packaging release files...\n');
+
+		// Create release directory if it doesn't exist
+		try {
+			await fs.access(RELEASE_DIR);
+			console.log(`✓ Release directory exists: ${RELEASE_DIR}`);
+		} catch {
+			await fs.mkdir(RELEASE_DIR);
+			console.log(`✓ Created release directory: ${RELEASE_DIR}`);
+		}
+
+		// Copy each file
+		for (const file of FILES_TO_INCLUDE) {
+			const sourcePath = path.join(__dirname, file);
+			const destPath = path.join(__dirname, RELEASE_DIR, file);
+
+			try {
+				await fs.copyFile(sourcePath, destPath);
+				console.log(`✓ Copied ${file}`);
+			} catch (error) {
+				console.error(`✗ Failed to copy ${file}:`, error.message);
+				process.exit(1);
+			}
+		}
+
+		// Read manifest to get version
+		const manifestPath = path.join(__dirname, 'manifest.json');
+		const manifestContent = await fs.readFile(manifestPath, 'utf8');
+		const manifest = JSON.parse(manifestContent);
+
+		console.log(`\n✅ Release package created successfully!`);
+		console.log(`📁 Location: ./${RELEASE_DIR}/`);
+		console.log(`📌 Version: ${manifest.version}`);
+		console.log(`\nFiles included:`);
+		FILES_TO_INCLUDE.forEach(file => console.log(`   - ${file}`));
+		console.log(`\n💡 Tip: You can now upload these files from the '${RELEASE_DIR}' directory to your Gitea release.`);
+		console.log(`💡 Tip: To create a zip, run: cd ${RELEASE_DIR} && zip -r ../focus-task-${manifest.version}.zip *`);
+
+	} catch (error) {
+		console.error('❌ Error packaging release:', error);
+		process.exit(1);
+	}
+}
+
+packageRelease();

package.json

@@ -1,11 +1,12 @@
 {
   "name": "focus-task",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "A Blitzit-inspired task management and focus timer plugin for Obsidian",
   "main": "main.js",
   "scripts": {
     "dev": "node esbuild.config.mjs",
     "build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
+    "package": "npm run build && node package-release.mjs",
     "version": "node version-bump.mjs && git add manifest.json versions.json"
   },
   "keywords": [

src/main.ts

@@ -37,8 +37,13 @@ export default class FocusTaskPlugin extends Plugin {
 	activeTaskId: string | null = null;
 	pomodoroCount: number = 0;
 
+	// Timestamp-based tracking for reliable background timing
+	private timerStartTimestamp: number = 0;
+	private pausedTimeRemaining: number = 0;
+
 	// Focus time tracking (in seconds for accuracy)
 	private focusSecondsToday: number = 0;
+	private secondsWorkedOnCurrentTask: number = 0;
 	
 	// Status bar element
 	statusBarEl: HTMLElement | null = null;
@@ -49,6 +54,13 @@ export default class FocusTaskPlugin extends Plugin {
 		// Check and reset daily stats
 		this.checkDailyReset();
 
+		// Handle visibility changes to sync timer when app comes back to foreground
+		document.addEventListener('visibilitychange', () => {
+			if (!document.hidden && this.isTimerRunning) {
+				this.syncTimerFromTimestamp();
+			}
+		});
+
 		// Register the main view
 		this.registerView(
 			VIEW_TYPE_FOCUS_TASK,
@@ -250,6 +262,53 @@ export default class FocusTaskPlugin extends Plugin {
 
 	// ============ Timer Management ============
 
+	// Sync timer based on timestamp when app returns from background
+	syncTimerFromTimestamp() {
+		if (!this.isTimerRunning || this.timerStartTimestamp === 0) return;
+
+		const now = Date.now();
+		const elapsedMs = now - this.timerStartTimestamp;
+		const elapsedSeconds = Math.floor(elapsedMs / 1000);
+
+		if (this.isBreakMode) {
+			// Break mode: countdown timer
+			this.currentTimerSeconds = Math.max(0, this.pausedTimeRemaining - elapsedSeconds);
+
+			if (this.currentTimerSeconds <= 0) {
+				this.handlePomodoroEnd();
+			}
+		} else {
+			// Work mode: check if it's pomodoro (countdown) or stopwatch (count up)
+			const task = this.data.tasks.find(t => t.id === this.activeTaskId);
+			if (!task) return;
+
+			if (this.pausedTimeRemaining > 0) {
+				// Pomodoro countdown mode
+				this.currentTimerSeconds = Math.max(0, this.pausedTimeRemaining - elapsedSeconds);
+
+				// Update actual minutes worked
+				this.secondsWorkedOnCurrentTask += elapsedSeconds;
+				task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
+				this.focusSecondsToday += elapsedSeconds;
+
+				if (this.currentTimerSeconds <= 0) {
+					this.handlePomodoroEnd();
+				}
+			} else {
+				// Stopwatch count up mode
+				this.currentTimerSeconds += elapsedSeconds;
+				this.secondsWorkedOnCurrentTask += elapsedSeconds;
+				task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
+				this.focusSecondsToday += elapsedSeconds;
+			}
+		}
+
+		// Update displays
+		this.updateStatusBar();
+		this.updateTimerDisplay();
+		this.saveAllData();
+	}
+
 	startTimer(taskId: string) {
 		const task = this.data.tasks.find(t => t.id === taskId);
 		if (!task) return;
@@ -263,6 +322,11 @@ export default class FocusTaskPlugin extends Plugin {
 		this.isBreakMode = false;
 		this.currentTimerSeconds = 0;
 		this.isTimerRunning = true;
+		this.secondsWorkedOnCurrentTask = task.actualMinutes * 60;
+
+		// Set timestamp for background tracking (stopwatch mode)
+		this.timerStartTimestamp = Date.now();
+		this.pausedTimeRemaining = 0; // 0 indicates stopwatch mode
 
 		// Full refresh to show the active task card
 		this.refreshView();
@@ -271,7 +335,8 @@ export default class FocusTaskPlugin extends Plugin {
 		// Start interval (count up mode - stopwatch)
 		this.timerInterval = window.setInterval(() => {
 			this.currentTimerSeconds++;
-			task.actualMinutes = Math.floor(this.currentTimerSeconds / 60);
+			this.secondsWorkedOnCurrentTask++;
+			task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
 
 			// Track focus time
 			this.focusSecondsToday++;
@@ -303,19 +368,23 @@ export default class FocusTaskPlugin extends Plugin {
 		this.currentTimerSeconds = this.settings.pomodoroWorkMinutes * 60;
 		this.isTimerRunning = true;
 
+		// Initialize from existing actual time to preserve progress across breaks
+		this.secondsWorkedOnCurrentTask = task.actualMinutes * 60;
+
+		// Set timestamp for background tracking (pomodoro countdown mode)
+		this.timerStartTimestamp = Date.now();
+		this.pausedTimeRemaining = this.currentTimerSeconds;
+
 		// Full refresh to show the active task card
 		this.refreshView();
 		this.updateStatusBar();
 
-		// Track seconds worked for accurate focus time
-		let secondsWorked = 0;
-		
 		this.timerInterval = window.setInterval(() => {
 			this.currentTimerSeconds--;
 
 			if (!this.isBreakMode) {
-				secondsWorked++;
+				this.secondsWorkedOnCurrentTask++;
-				task.actualMinutes = Math.floor(secondsWorked / 60);
+				task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
 				// Increment focus time by 1 second
 				this.focusSecondsToday++;
 			}
@@ -331,6 +400,20 @@ export default class FocusTaskPlugin extends Plugin {
 	}
 
 	handlePomodoroEnd() {
+		// Stop the timer interval to prevent going into negative
+		if (this.timerInterval) {
+			window.clearInterval(this.timerInterval);
+			this.timerInterval = null;
+		}
+
+		// Set timer to 0 to ensure it doesn't show negative
+		this.currentTimerSeconds = 0;
+		this.isTimerRunning = false;
+
+		// Update displays immediately
+		this.updateStatusBar();
+		this.updateTimerDisplay();
+
 		if (!this.isBreakMode) {
 			// Work session ended
 			this.pomodoroCount++;
@@ -345,16 +428,17 @@ export default class FocusTaskPlugin extends Plugin {
 			if (this.settings.autoStartBreak) {
 				this.startBreak();
 			} else {
-				this.stopTimer();
+				this.refreshView();
 			}
 		} else {
-			// Break ended
+			// Break ended - keep timer at 0 until user resumes
 			if (this.settings.enableSounds) {
 				this.playAlertSound();
 			}
 			new Notice('⚡ Break over! Ready to focus?');
-			this.isBreakMode = false;
+
-			this.stopTimer();
+			// Keep the break card visible with timer at 0:00
+			this.refreshView();
 		}
 
 		this.saveAllData();
@@ -362,9 +446,14 @@ export default class FocusTaskPlugin extends Plugin {
 
 	startBreak() {
 		this.isBreakMode = true;
+		this.isTimerRunning = true;
 		const isLongBreak = this.pomodoroCount % this.settings.longBreakInterval === 0;
 		this.currentTimerSeconds = (isLongBreak ? this.settings.longBreakMinutes : this.settings.pomodoroBreakMinutes) * 60;
 
+		// Set timestamp for background tracking (break countdown mode)
+		this.timerStartTimestamp = Date.now();
+		this.pausedTimeRemaining = this.currentTimerSeconds;
+
 		new Notice(isLongBreak ? '☕ Long break time!' : '☕ Short break time!');
 
 		// Full refresh to show break state
@@ -388,19 +477,22 @@ export default class FocusTaskPlugin extends Plugin {
 
 	toggleTimer() {
 		if (this.isTimerRunning && this.timerInterval) {
-			// Pause
+			// Pause - save current state
 			window.clearInterval(this.timerInterval);
 			this.timerInterval = null;
 			this.isTimerRunning = false;
+			this.pausedTimeRemaining = this.currentTimerSeconds;
 		} else if (this.activeTaskId) {
-			// Resume
+			// Resume - restart with new timestamp
 			this.isTimerRunning = true;
+			this.timerStartTimestamp = Date.now();
 			const task = this.data.tasks.find(t => t.id === this.activeTaskId);
 
 			this.timerInterval = window.setInterval(() => {
 				this.currentTimerSeconds--;
 				if (task && !this.isBreakMode) {
-					task.actualMinutes = Math.floor((this.settings.pomodoroWorkMinutes * 60 - this.currentTimerSeconds) / 60);
+					this.secondsWorkedOnCurrentTask++;
+					task.actualMinutes = Math.floor(this.secondsWorkedOnCurrentTask / 60);
 					// Track focus time
 					this.focusSecondsToday++;
 				}
@@ -436,6 +528,9 @@ export default class FocusTaskPlugin extends Plugin {
 
 		this.isTimerRunning = false;
 		this.activeTaskId = null;
+		this.secondsWorkedOnCurrentTask = 0;
+		this.timerStartTimestamp = 0;
+		this.pausedTimeRemaining = 0;
 		this.updateStatusBar();
 		this.saveAllData();
 		this.refreshView();
@@ -598,21 +693,32 @@ export default class FocusTaskPlugin extends Plugin {
 	formatDailyNoteDate(format: string): string {
 		const now = new Date();
 		const year = now.getFullYear();
-		const month = (now.getMonth() + 1).toString().padStart(2, '0');
+		const month = now.getMonth() + 1;
-		const day = now.getDate().toString().padStart(2, '0');
+		const day = now.getDate();
 		
-		// Handle common date format tokens
+		// Use placeholders to avoid replacement conflicts
-		return format
+		// Replace longer tokens first, use unique placeholders
-			.replace('YYYY', year.toString())
+		let result = format;
-			.replace('YY', year.toString().slice(-2))
+		
-			.replace('MM', month)
+		// Year tokens
-			.replace('M', (now.getMonth() + 1).toString())
+		result = result.replace(/YYYY/g, year.toString());
-			.replace('DD', day)
+		result = result.replace(/YY/g, year.toString().slice(-2));
-			.replace('D', now.getDate().toString())
+		
-			.replace('dddd', now.toLocaleDateString('en-US', { weekday: 'long' }))
+		// Month tokens (longer first)
-			.replace('ddd', now.toLocaleDateString('en-US', { weekday: 'short' }))
+		result = result.replace(/MMMM/g, now.toLocaleDateString('en-US', { month: 'long' }));
-			.replace('MMMM', now.toLocaleDateString('en-US', { month: 'long' }))
+		result = result.replace(/MMM/g, now.toLocaleDateString('en-US', { month: 'short' }));
-			.replace('MMM', now.toLocaleDateString('en-US', { month: 'short' }));
+		result = result.replace(/MM/g, month.toString().padStart(2, '0'));
+		// Only replace standalone M, not part of other tokens
+		result = result.replace(/(?<![A-Za-z])M(?![A-Za-z])/g, month.toString());
+		
+		// Day tokens (longer first)
+		result = result.replace(/dddd/g, now.toLocaleDateString('en-US', { weekday: 'long' }));
+		result = result.replace(/ddd/g, now.toLocaleDateString('en-US', { weekday: 'short' }));
+		result = result.replace(/DD/g, day.toString().padStart(2, '0'));
+		// Only replace standalone D, not part of other tokens
+		result = result.replace(/(?<![A-Za-z])D(?![A-Za-z])/g, day.toString());
+		
+		return result;
 	}
 
 	async getOrCreateDailyNote(): Promise<TFile | null> {

src/types.ts

@@ -58,7 +58,7 @@ export const DEFAULT_SETTINGS: FocusTaskSettings = {
 		{ id: 'personal', name: 'Personal', color: '#22c55e', icon: '🏠' },
 		{ id: 'learning', name: 'Learning', color: '#f59e0b', icon: '📚' },
 	],
-	autoStartBreak: false,
+	autoStartBreak: true,
 	tickSoundEnabled: false,
 	// Daily note logging
 	logToDaily: false,

src/view.ts

@@ -145,9 +145,11 @@ export class FocusTaskView extends ItemView {
 				
 				if (this.plugin.isBreakMode) {
 					activeCard.addClass('focus-task-break-card');
-					activeCard.createEl('div', { cls: 'focus-task-active-label', text: '☕ BREAK TIME' });
+					const breakLabel = this.plugin.currentTimerSeconds > 0 ? '☕ BREAK TIME' : '✨ BREAK COMPLETE';
+					activeCard.createEl('div', { cls: 'focus-task-active-label', text: breakLabel });
 				} else {
-					activeCard.createEl('div', { cls: 'focus-task-active-label', text: '🎯 FOCUSING ON' });
+					const workLabel = this.plugin.currentTimerSeconds > 0 ? '🎯 FOCUSING ON' : '🍅 POMODORO COMPLETE';
+					activeCard.createEl('div', { cls: 'focus-task-active-label', text: workLabel });
 				}
 				
 				activeCard.createEl('div', { cls: 'focus-task-active-task-name', text: task.text });
@@ -187,28 +189,76 @@ export class FocusTaskView extends ItemView {
 				// Controls
 				const controls = activeCard.createEl('div', { cls: 'focus-task-active-controls' });
 
+				if (this.plugin.isBreakMode) {
+					// Break mode controls
+					if (this.plugin.currentTimerSeconds > 0) {
+						// Break is still counting down
+						this.pauseBtnEl = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-secondary' });
+						this.pauseBtnEl.innerHTML = this.plugin.isTimerRunning ? '⏸ Pause' : '▶ Resume';
+						this.pauseBtnEl.addEventListener('click', () => this.plugin.toggleTimer());
+
+						const skipBreakBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-primary' });
+						skipBreakBtn.innerHTML = '⏭ Skip Break';
+						skipBreakBtn.addEventListener('click', () => {
+							this.plugin.isBreakMode = false;
+							this.plugin.startPomodoro(task.id);
+						});
+
+						const stopBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-danger' });
+						stopBtn.innerHTML = '✕ Stop';
+						stopBtn.addEventListener('click', () => {
+							this.plugin.isBreakMode = false;
+							this.plugin.stopTimer();
+						});
+					} else {
+						// Break timer finished - show resume button
+						const resumeWorkBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-success' });
+						resumeWorkBtn.innerHTML = '▶ Resume Work';
+						resumeWorkBtn.addEventListener('click', () => {
+							this.plugin.isBreakMode = false;
+							this.plugin.startPomodoro(task.id);
+						});
+
+						const stopBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-danger' });
+						stopBtn.innerHTML = '✕ Stop';
+						stopBtn.addEventListener('click', () => {
+							this.plugin.isBreakMode = false;
+							this.plugin.stopTimer();
+						});
+					}
+				} else {
+					// Work mode controls
+					if (this.plugin.currentTimerSeconds > 0) {
+						// Work session still running
 						this.pauseBtnEl = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-secondary' });
 						this.pauseBtnEl.innerHTML = this.plugin.isTimerRunning ? '⏸ Pause' : '▶ Resume';
 						this.pauseBtnEl.addEventListener('click', () => this.plugin.toggleTimer());
 
-				if (!this.plugin.isBreakMode) {
 						const completeBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-success' });
 						completeBtn.innerHTML = '✓ Complete';
 						completeBtn.addEventListener('click', () => this.plugin.completeTask(task.id));
-				}
 
 						const stopBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-danger' });
 						stopBtn.innerHTML = '✕ Stop';
 						stopBtn.addEventListener('click', () => this.plugin.stopTimer());
+					} else {
+						// Work session finished - show break and completion options
+						const startBreakBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-secondary' });
+						startBreakBtn.innerHTML = '☕ Start Break';
+						startBreakBtn.addEventListener('click', () => this.plugin.startBreak());
 
-				if (this.plugin.isBreakMode) {
+						const continueBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-primary' });
-					const skipBreakBtn = controls.createEl('button', { cls: 'focus-task-btn' });
+						continueBtn.innerHTML = '▶ Continue Working';
-					skipBreakBtn.innerHTML = '⏭ Skip Break';
+						continueBtn.addEventListener('click', () => this.plugin.startPomodoro(task.id));
-					skipBreakBtn.addEventListener('click', () => {
+
-						this.plugin.isBreakMode = false;
+						const completeBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-success' });
-						this.plugin.stopTimer();
+						completeBtn.innerHTML = '✓ Complete';
-						this.refresh();
+						completeBtn.addEventListener('click', () => this.plugin.completeTask(task.id));
-					});
+
+						const stopBtn = controls.createEl('button', { cls: 'focus-task-btn focus-task-btn-danger' });
+						stopBtn.innerHTML = '✕ Stop';
+						stopBtn.addEventListener('click', () => this.plugin.stopTimer());
+					}
 				}
 			}
 		} else {

versions.json

@@ -1,3 +1,5 @@
 {
-  "1.0.3": "0.15.0"
+  "1.0.4": "0.15.0",
+  "1.0.5": "0.15.0",
+  "1.0.6": "0.15.0"
 }