git-watchtower 1.9.12 → 1.9.14

package/bin/git-watchtower.js

@@ -1746,11 +1746,15 @@ async function pollGitChanges() {
       previousBranchStates.set(branch.name, branch.commit);
     }
 
-    // Remove stale entries from previousBranchStates for branches
+    // Remove stale entries from caches for branches
     // that no longer exist in the current poll results
-    for (const name of previousBranchStates.keys()) {
-      if (!activeBranchNames.has(name)) {
-        previousBranchStates.delete(name);
+    const staleCaches = [previousBranchStates, prInfoCache, store.get('sparklineCache'), store.get('aheadBehindCache')];
+    for (const cache of staleCaches) {
+      if (!cache) continue;
+      for (const name of cache.keys()) {
+        if (!activeBranchNames.has(name)) {
+          cache.delete(name);
+        }
       }
     }
 
@@ -1975,11 +1979,18 @@ async function pollGitChanges() {
   }
 }
 
+function schedulePoll() {
+  pollIntervalId = setTimeout(async () => {
+    await pollGitChanges();
+    schedulePoll();
+  }, store.get('adaptivePollInterval'));
+}
+
 function restartPolling() {
   if (pollIntervalId) {
-    clearInterval(pollIntervalId);
+    clearTimeout(pollIntervalId);
   }
-  pollIntervalId = setInterval(pollGitChanges, store.get('adaptivePollInterval'));
+  schedulePoll();
 }
 
 // ============================================================================
@@ -2833,7 +2844,7 @@ async function shutdown() {
   }
 
   if (fileWatcher) fileWatcher.close();
-  if (pollIntervalId) clearInterval(pollIntervalId);
+  if (pollIntervalId) clearTimeout(pollIntervalId);
 
   // Stop server based on mode
   if (SERVER_MODE === 'command') {
@@ -3023,8 +3034,8 @@ async function start() {
     render();
   });
 
-  // Start polling with adaptive interval
-  pollIntervalId = setInterval(pollGitChanges, store.get('adaptivePollInterval'));
+  // Start polling with adaptive interval (setTimeout-based to avoid queuing)
+  schedulePoll();
 
   // Initial render
   render();

package/package.json

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