git-watchtower 1.9.2 → 1.9.4

package/bin/git-watchtower.js

@@ -82,6 +82,7 @@ const { parseGitHubPr, parseGitLabMr, parseGitHubPrList, parseGitLabMrList, isBa
 // Security & Validation (imported from src/git/branch.js and src/git/commands.js)
 // ============================================================================
 const { isValidBranchName, sanitizeBranchName, getGoneBranches, deleteGoneBranches } = require('../src/git/branch');
+const { pruneStaleEntries } = require('../src/polling/engine');
 const { isGitAvailable: checkGitAvailable, execGit, execGitSilent, getDiffStats: getDiffStatsSafe, getAheadBehind, getDiffShortstat } = require('../src/git/commands');
 
 // Session stats (always-on, non-casino stats)
@@ -1423,13 +1424,16 @@ async function getAllBranches() {
     const seenBranches = new Set();
 
     // Get local branches
+    // Use \x1f (Unit Separator) as delimiter since | can appear in commit subjects
+    const delimiter = '\x1f';
     const { stdout: localOutput } = await execGit(
-      ['for-each-ref', '--sort=-committerdate', '--format=%(refname:short)|%(committerdate:iso8601)|%(objectname:short)|%(subject)', 'refs/heads/'],
+      ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, 'refs/heads/'],
       { cwd: PROJECT_ROOT }
     );
 
     for (const line of localOutput.split('\n').filter(Boolean)) {
-      const [name, dateStr, commit, subject] = line.split('|');
+      const [name, dateStr, commit, ...subjectParts] = line.split(delimiter);
+      const subject = subjectParts.join(delimiter);
       if (!seenBranches.has(name) && isValidBranchName(name)) {
         seenBranches.add(name);
         branchList.push({
@@ -1446,14 +1450,15 @@ async function getAllBranches() {
 
     // Get remote branches (using configured remote name)
     const remoteResult = await execGitSilent(
-      ['for-each-ref', '--sort=-committerdate', '--format=%(refname:short)|%(committerdate:iso8601)|%(objectname:short)|%(subject)', `refs/remotes/${REMOTE_NAME}/`],
+      ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, `refs/remotes/${REMOTE_NAME}/`],
       { cwd: PROJECT_ROOT }
     );
     const remoteOutput = remoteResult ? remoteResult.stdout : '';
 
     const remotePrefix = `${REMOTE_NAME}/`;
     for (const line of remoteOutput.split('\n').filter(Boolean)) {
-      const [fullName, dateStr, commit, subject] = line.split('|');
+      const [fullName, dateStr, commit, ...subjectParts] = line.split(delimiter);
+      const subject = subjectParts.join(delimiter);
       const name = fullName.replace(remotePrefix, '');
       if (name === 'HEAD') continue;
       if (!isValidBranchName(name)) continue;
@@ -1817,6 +1822,16 @@ async function pollGitChanges() {
       }
     }
 
+    // Prune stale entries: remove branches from tracking sets/caches
+    // that no longer exist in git (deleted >30s ago or already gone)
+    pruneStaleEntries({
+      knownBranchNames,
+      fetchedBranchNames,
+      allBranches,
+      caches: [previousBranchStates, prInfoCache, store.get('sparklineCache'), store.get('aheadBehindCache')],
+      now,
+    });
+
     // Note: isNew flag is only cleared when branch becomes current (see below)
 
     // Keep deleted branches in the list (don't remove them)

package/package.json

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

package/src/polling/engine.js

@@ -147,6 +147,38 @@ function restoreSelection(branches, previousName, previousIndex) {
   return { selectedIndex: previousIndex, selectedBranchName: previousName };
 }
 
+/**
+ * Prune stale entries from tracking sets and caches for branches
+ * that no longer exist in git.
+ * @param {Object} opts
+ * @param {Set<string>} opts.knownBranchNames - Known branch names (mutated)
+ * @param {Set<string>} opts.fetchedBranchNames - Currently fetched branch names
+ * @param {Array<{name: string, isDeleted?: boolean, deletedAt?: number}>} opts.allBranches - All branches including deleted
+ * @param {Map<string, *>[]} opts.caches - Maps to prune stale keys from
+ * @param {number} [opts.retentionMs=30000] - How long to keep deleted branches before pruning
+ * @param {number} [opts.now] - Current timestamp (defaults to Date.now())
+ * @returns {string[]} Names of pruned branches
+ */
+function pruneStaleEntries({ knownBranchNames, fetchedBranchNames, allBranches, caches, retentionMs = 30000, now }) {
+  const timestamp = now ?? Date.now();
+  const pruned = [];
+  for (const knownName of [...knownBranchNames]) {
+    if (fetchedBranchNames.has(knownName)) continue;
+    const deletedBranch = allBranches.find(b => b.name === knownName && b.isDeleted);
+    const shouldPrune = deletedBranch
+      ? (deletedBranch.deletedAt && (timestamp - deletedBranch.deletedAt) > retentionMs)
+      : true; // Not in allBranches at all — stale entry
+    if (shouldPrune) {
+      knownBranchNames.delete(knownName);
+      for (const cache of caches) {
+        cache.delete(knownName);
+      }
+      pruned.push(knownName);
+    }
+  }
+  return pruned;
+}
+
 module.exports = {
   detectNewBranches,
   detectDeletedBranches,
@@ -154,4 +186,5 @@ module.exports = {
   sortBranches,
   calculateAdaptiveInterval,
   restoreSelection,
+  pruneStaleEntries,
 };