git-watchtower 1.9.8 → 1.9.10

package/bin/git-watchtower.js

@@ -1669,6 +1669,7 @@ async function pollGitChanges() {
     const currentBranches = store.get('branches');
 
     // Detect NEW branches (not seen before)
+    const NEW_BADGE_TTL = 30000; // 30 seconds
     const newBranchList = [];
     for (const branch of allBranches) {
       if (!knownBranchNames.has(branch.name)) {
@@ -1677,9 +1678,9 @@ async function pollGitChanges() {
         addLog(`New branch: ${branch.name}`, 'success');
         newBranchList.push(branch);
       } else {
-        // Preserve isNew flag from previous poll cycle for branches not yet switched to
+        // Preserve isNew flag from previous poll cycle, but expire after TTL
         const prevBranch = currentBranches.find(b => b.name === branch.name);
-        if (prevBranch && prevBranch.isNew) {
+        if (prevBranch && prevBranch.isNew && (now - prevBranch.newAt) < NEW_BADGE_TTL) {
           branch.isNew = true;
           branch.newAt = prevBranch.newAt;
         }
@@ -1727,10 +1728,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);
@@ -1739,6 +1742,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];

package/package.json

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