git-watchtower 1.9.9 → 1.9.11

package/bin/git-watchtower.js

@@ -732,6 +732,7 @@ const { ansi, box, truncate, sparkline: uiSparkline, visibleLength, stripAnsi, p
 
 // Error detection utilities imported from src/utils/errors.js
 const { ErrorHandler, isAuthError, isMergeConflict, isNetworkError } = require('../src/utils/errors');
+const { Mutex } = require('../src/utils/async');
 
 // Keyboard handling utilities imported from src/ui/keybindings.js
 const { filterBranches } = require('../src/ui/keybindings');
@@ -1606,8 +1607,12 @@ async function stashAndRetry() {
 // Polling
 // ============================================================================
 
+const pollMutex = new Mutex();
+
 async function pollGitChanges() {
-  if (store.get('isPolling')) return;
+  // Skip if a poll is already in progress (don't queue)
+  if (pollMutex.isLocked()) return;
+  await pollMutex.acquire();
   store.setState({ isPolling: true, pollingStatus: 'fetching' });
 
   // Casino mode: start slot reels spinning (no sound - too annoying)
@@ -1728,10 +1733,12 @@ async function pollGitChanges() {
     // Detect updates on other branches (for flash notification)
     const updatedBranches = [];
     const currentBranchName = store.get('currentBranch');
+    const activeBranchNames = new Set();
     for (const branch of pollFilteredBranches) {
       // Clear previous cycle's flag so only freshly-updated branches are highlighted
       branch.justUpdated = false;
       if (branch.isDeleted) continue;
+      activeBranchNames.add(branch.name);
       const prevCommit = previousBranchStates.get(branch.name);
       if (prevCommit && prevCommit !== branch.commit && branch.name !== currentBranchName) {
         updatedBranches.push(branch);
@@ -1740,6 +1747,14 @@ async function pollGitChanges() {
       previousBranchStates.set(branch.name, branch.commit);
     }
 
+    // Remove stale entries from previousBranchStates for branches
+    // that no longer exist in the current poll results
+    for (const name of previousBranchStates.keys()) {
+      if (!activeBranchNames.has(name)) {
+        previousBranchStates.delete(name);
+      }
+    }
+
     // Flash and sound for updates or new branches
     const casinoOn = store.get('casinoModeEnabled');
     const notifyBranches = [...updatedBranches, ...newBranchList];
@@ -1956,6 +1971,7 @@ async function pollGitChanges() {
     }
   } finally {
     store.setState({ isPolling: false });
+    pollMutex.release();
     render();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.9.9",
+  "version": "1.9.11",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {