git-watchtower 1.14.5 → 1.14.6

package/bin/git-watchtower.js

@@ -84,7 +84,7 @@ const { parseGitHubPr, parseGitLabMr, parseGitHubPrList, parseGitLabMrList, isBa
 // ============================================================================
 const { isValidBranchName, sanitizeBranchName, getGoneBranches, deleteGoneBranches, getCurrentBranch: getCurrentBranchRaw, getAllBranches: getAllBranchesRaw } = require('../src/git/branch');
 const { pruneStaleEntries } = require('../src/polling/engine');
-const { isGitAvailable: checkGitAvailable, execGit, execGitSilent, getDiffStats: getDiffStatsSafe, getAheadBehind, getDiffShortstat, hasUncommittedChanges: checkUncommittedChanges } = require('../src/git/commands');
+const { isGitAvailable: checkGitAvailable, execGit, execGitOptional, getDiffStats: getDiffStatsSafe, getAheadBehind, getDiffShortstat, hasUncommittedChanges: checkUncommittedChanges } = require('../src/git/commands');
 
 // Session stats (always-on, non-casino stats)
 const sessionStats = require('../src/stats/session');
@@ -506,6 +506,8 @@ async function getRemoteWebUrl(branchName) {
     const parsed = parseRemoteUrl(stdout);
     return buildWebUrl(parsed, branchName);
   } catch (e) {
+    // No remote configured, or URL isn't parseable as github/gitlab —
+    // action modal hides the "view on web" link, nothing else breaks.
     return null;
   }
 }
@@ -513,10 +515,10 @@ async function getRemoteWebUrl(branchName) {
 // Extract Claude Code session URL from the most recent commit on a branch
 async function getSessionUrl(branchName) {
   // Try remote branch first, fall back to local
-  const result = await execGitSilent(
+  const result = await execGitOptional(
     ['log', `${REMOTE_NAME}/${branchName}`, '-1', '--format=%B'],
     { cwd: PROJECT_ROOT }
-  ) || await execGitSilent(
+  ) || await execGitOptional(
     ['log', branchName, '-1', '--format=%B'],
     { cwd: PROJECT_ROOT }
   );
@@ -866,7 +868,7 @@ const CLI_TIMEOUT = 30000;
 
 /**
  * Execute a non-git CLI command safely using execFile (no shell interpolation).
- * For git commands, use execGit/execGitSilent from src/git/commands.js instead.
+ * For git commands, use execGit/execGitOptional from src/git/commands.js instead.
  * @param {string} cmd - The executable (e.g. 'gh', 'glab', 'which')
  * @param {string[]} args - Arguments array (no shell interpolation)
  * @param {Object} [options] - Execution options
@@ -922,6 +924,9 @@ async function detectDefaultBranch() {
     const { stdout } = await execGit(['symbolic-ref', `refs/remotes/${REMOTE_NAME}/HEAD`], { cwd: PROJECT_ROOT });
     detectedDefaultBranch = stdout.trim().replace('refs/remotes/', '');
   } catch (e) {
+    // No remote HEAD and none of the common names exist — ahead/behind
+    // is hidden entirely (fetchAheadBehindForBranches short-circuits on
+    // a null detectedDefaultBranch).
     detectedDefaultBranch = null;
   }
 }
@@ -1051,10 +1056,10 @@ async function refreshAllSparklines() {
 
     try {
       // Get commit counts for last 7 days (try remote, fall back to local)
-      const sparkResult = await execGitSilent(
+      const sparkResult = await execGitOptional(
         ['log', `origin/${branch.name}`, '--since=7 days ago', '--format=%ad', '--date=format:%Y-%m-%d'],
         { cwd: PROJECT_ROOT }
-      ) || await execGitSilent(
+      ) || await execGitOptional(
         ['log', branch.name, '--since=7 days ago', '--format=%ad', '--date=format:%Y-%m-%d'],
         { cwd: PROJECT_ROOT }
       );
@@ -1090,10 +1095,10 @@ async function refreshAllSparklines() {
 async function getPreviewData(branchName) {
   try {
     // Get last 5 commits (try remote, fall back to local)
-    const logResult = await execGitSilent(
+    const logResult = await execGitOptional(
       ['log', `origin/${branchName}`, '-5', '--oneline'],
       { cwd: PROJECT_ROOT }
-    ) || await execGitSilent(
+    ) || await execGitOptional(
       ['log', branchName, '-5', '--oneline'],
       { cwd: PROJECT_ROOT }
     );
@@ -1106,10 +1111,10 @@ async function getPreviewData(branchName) {
 
     // Get files changed (comparing to current branch)
     let filesChanged = [];
-    const diffResult = await execGitSilent(
+    const diffResult = await execGitOptional(
       ['diff', '--stat', '--name-only', `HEAD...origin/${branchName}`],
       { cwd: PROJECT_ROOT }
-    ) || await execGitSilent(
+    ) || await execGitOptional(
       ['diff', '--stat', '--name-only', `HEAD...${branchName}`],
       { cwd: PROJECT_ROOT }
     );
@@ -1119,6 +1124,9 @@ async function getPreviewData(branchName) {
 
     return { commits, filesChanged };
   } catch (e) {
+    // Preview pane is best-effort — branch may not exist on the remote yet,
+    // refs may have been pruned mid-fetch. Empty pane is better than an
+    // error toast for a background UI enrichment.
     return { commits: [], filesChanged: [] };
   }
 }
@@ -1585,7 +1593,7 @@ async function pullCurrentBranch() {
 
     // Capture HEAD before pull so we can diff against it when git pull
     // doesn't put a clean "already up to date" message on stdout.
-    const preHead = await execGitSilent(['rev-parse', 'HEAD'], { cwd: PROJECT_ROOT });
+    const preHead = await execGitOptional(['rev-parse', 'HEAD'], { cwd: PROJECT_ROOT });
     const oldCommit = preHead && preHead.stdout ? preHead.stdout.trim() : null;
 
     const result = await execGit(['pull', REMOTE_NAME, branch], { cwd: PROJECT_ROOT, timeout: 60000 });

package/package.json

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

package/src/git/branch.js

@@ -3,7 +3,7 @@
  * Provides branch management and parsing
  */
 
-const { execGit, execGitSilent, fetch, hasUncommittedChanges, getCommitsByDay, log, deleteLocalBranch } = require('./commands');
+const { execGit, execGitOptional, fetch, hasUncommittedChanges, getCommitsByDay, log, deleteLocalBranch } = require('./commands');
 const { GitError, ValidationError } = require('../utils/errors');
 
 // Valid git branch name pattern (conservative)
@@ -73,6 +73,8 @@ async function getCurrentBranch(cwd) {
 
     return { name: stdout, isDetached: false };
   } catch (error) {
+    // Not in a git repo, or git is broken. name:null signals "no current
+    // branch" to the caller, which renders as "Not in a git repository".
     return { name: null, isDetached: false };
   }
 }
@@ -100,7 +102,7 @@ async function getAllBranches(options = {}) {
     // Get local branches
     // Use \x1f (Unit Separator) as delimiter since | can appear in commit subjects
     const delimiter = '\x1f';
-    const localResult = await execGitSilent(
+    const localResult = await execGitOptional(
       ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, 'refs/heads/'],
       { cwd }
     );
@@ -125,7 +127,7 @@ async function getAllBranches(options = {}) {
     }
 
     // Get remote branches
-    const remoteResult = await execGitSilent(
+    const remoteResult = await execGitOptional(
       ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, `refs/remotes/${remoteName}/`],
       { cwd }
     );
@@ -300,6 +302,9 @@ async function getPreviewData(branchName, options = {}) {
 
     return { commits, files };
   } catch (error) {
+    // Preview is best-effort UI enrichment — branch may not exist on the
+    // remote yet, log may be empty, etc. Returning empty lists renders the
+    // preview pane as "no commits to show" rather than crashing the TUI.
     return { commits: [], files: [] };
   }
 }
@@ -345,6 +350,7 @@ async function getLocalBranches(cwd) {
       .map((b) => b.trim().replace(/^\* /, ''))
       .filter(Boolean);
   } catch (error) {
+    // Not in a git repo or git unavailable — treat as "no local branches".
     return [];
   }
 }
@@ -381,6 +387,8 @@ async function getGoneBranches(cwd) {
     }
     return gone;
   } catch (error) {
+    // `branch -vv` fails on a repo with no commits yet, or when git is
+    // broken. Caller treats "no gone branches" as "nothing to clean up".
     return [];
   }
 }

package/src/git/commands.js

@@ -62,12 +62,20 @@ async function execGit(args, options = {}) {
 }
 
 /**
- * Execute git command silently (suppress errors)
+ * Execute a git command, collapsing any failure into a null result.
+ *
+ * Callers use this when they want "the output, or nothing": the fallback
+ * pattern `execGitOptional(A) || execGitOptional(B)` relies on this, as does
+ * every caller that treats a missing result as "no data to show." This does
+ * conflate "branch has no commits" (empty stdout, non-null result) with
+ * "git errored" (null result) — if you need to distinguish those, use
+ * execGit() and handle the throw yourself.
+ *
  * @param {string[]} command - Git arguments
  * @param {Object} [options] - Execution options
- * @returns {Promise<{stdout: string, stderr: string}|null>}
+ * @returns {Promise<{stdout: string, stderr: string}|null>} Result, or null if git failed
  */
-async function execGitSilent(command, options = {}) {
+async function execGitOptional(command, options = {}) {
   try {
     return await execGit(command, options);
   } catch (error) {
@@ -112,6 +120,7 @@ async function getRemotes(cwd) {
     const { stdout } = await execGit(['remote'], { cwd, timeout: 5000 });
     return stdout.split('\n').filter(Boolean);
   } catch (error) {
+    // Not a git repo or `git remote` unavailable — treat as "no remotes".
     return [];
   }
 }
@@ -241,7 +250,9 @@ async function getCommitsByDay(branchName, days = 7, cwd) {
       }
     }
   } catch (error) {
-    // Return zeros on error
+    // Sparkline is decorative — a git-log failure (missing branch, network
+    // hiccup) returns all-zeros and renders a flat bar rather than crashing
+    // the caller.
   }
 
   return counts;
@@ -331,6 +342,8 @@ async function getChangedFiles(branchName, baseBranch = 'HEAD', cwd) {
     );
     return stdout.split('\n').filter(Boolean);
   } catch (error) {
+    // Diff fails when branches share no common ancestor, or when either
+    // ref doesn't exist. Caller renders "no changed files" either way.
     return [];
   }
 }
@@ -370,6 +383,8 @@ async function getDiffStats(fromCommit, toCommit = 'HEAD', options = {}) {
     const { stdout } = await execGit(['diff', '--stat', `${fromCommit}..${toCommit}`], options);
     return parseDiffStats(stdout);
   } catch (e) {
+    // Diff fails when a ref is gone or commits share no ancestor. Zero
+    // added/deleted renders as "no change summary" in the activity log.
     return { added: 0, deleted: 0 };
   }
 }
@@ -418,6 +433,9 @@ async function getAheadBehind(branchRef, baseRef, options = {}) {
       ahead: parseInt(parts[1], 10) || 0,
     };
   } catch (e) {
+    // rev-list fails when baseRef is missing (no remote yet) or when the
+    // branches share no common ancestor. 0/0 hides the ahead/behind column
+    // for that row rather than crashing the background refresher.
     return { ahead: 0, behind: 0 };
   }
 }
@@ -438,13 +456,15 @@ async function getDiffShortstat(baseRef, branchRef, options = {}) {
     );
     return parseDiffStats(stdout);
   } catch (e) {
+    // See getAheadBehind: same background-refresh path, same 0/0 fallback
+    // to hide the +/- column when a ref is missing.
     return { added: 0, deleted: 0 };
   }
 }
 
 module.exports = {
   execGit,
-  execGitSilent,
+  execGitOptional,
   isGitAvailable,
   isGitRepository,
   getRemotes,

package/src/index.js

@@ -103,7 +103,7 @@ module.exports = {
   parseDiffStats: gitCommands.parseDiffStats,
   getDiffStats: gitCommands.getDiffStats,
   execGit: gitCommands.execGit,
-  execGitSilent: gitCommands.execGitSilent,
+  execGitOptional: gitCommands.execGitOptional,
   isGitAvailable: gitCommands.isGitAvailable,
   isGitRepository: gitCommands.isGitRepository,
   getRemotes: gitCommands.getRemotes,

package/src/server/coordinator.js

@@ -83,6 +83,9 @@ function readLock() {
     if (!data || !data.pid) return null;
     return data;
   } catch (e) {
+    // Lock file was unlinked between existsSync and readFileSync, or contains
+    // garbage (crashed mid-write). Treat as "no lock" so tryAcquireLock()
+    // can clean it up and retry.
     return null;
   }
 }

package/src/server/process.js

@@ -352,16 +352,35 @@ class ProcessManager {
   }
 
   /**
-   * Restart the server process
+   * Restart the server process.
+   *
+   * Waits for the old process to fully exit (so it releases its port)
+   * rather than sleeping a static RESTART_DELAY that is shorter than
+   * the SIGKILL grace period. Bounded by KILL_GRACE_PERIOD + a small
+   * margin so we never hang indefinitely if 'close' doesn't fire.
+   *
    * @returns {Promise<{success: boolean, error?: Error, pid?: number}>}
    */
   async restart() {
     return this._restartMutex.withLock(async () => {
       const command = this.command;
+      // Capture before stop() nulls this.process.
+      const oldProc = this.process;
+
       this.stop();
 
-      // Wait before restarting
-      await new Promise((resolve) => setTimeout(resolve, RESTART_DELAY));
+      if (oldProc && oldProc.exitCode === null && oldProc.signalCode === null) {
+        // Old process hasn't exited yet — wait for 'close' with a bounded
+        // timeout so we don't hang if the process ignores all signals.
+        await new Promise((resolve) => {
+          const timeout = setTimeout(resolve, KILL_GRACE_PERIOD + RESTART_DELAY);
+          timeout.unref();
+          oldProc.once('close', () => {
+            clearTimeout(timeout);
+            resolve();
+          });
+        });
+      }
 
       return this.start(command);
     });

package/src/server/web-ui/js.js

@@ -65,7 +65,7 @@ function getDashboardJs() {
   function loadPrefs() {
     try {
       return JSON.parse(localStorage.getItem(PREFS_KEY)) || {};
-    } catch (e) { return {}; }
+    } catch (e) { /* localStorage unavailable (private mode) or stored JSON got corrupted — fall back to defaults */ return {}; }
   }
   function savePrefs(updates) {
     const prefs = loadPrefs();

package/src/utils/gitignore.js

@@ -64,6 +64,9 @@ function gitignorePatternToRegex(pattern) {
   try {
     return new RegExp(regexStr);
   } catch (e) {
+    // A malformed pattern in .gitignore shouldn't disable the file watcher
+    // entirely — signal "skip this line" via null, caller drops it from
+    // the pattern list. Extremely rare in practice.
     return null;
   }
 }
@@ -97,7 +100,10 @@ function parseGitignoreFile(gitignorePath) {
       }
     }
   } catch (err) {
-    // Silently continue if we can't read .gitignore
+    // .gitignore exists but we can't read it (permissions, mid-edit truncation,
+    // encoding). The file watcher still runs — it just won't honor gitignore
+    // rules this session. Surfacing the error would be noise; the user will
+    // notice when they see changes to ignored files trigger reloads.
   }
 
   return patterns;

package/src/utils/monitor-lock.js

@@ -69,6 +69,9 @@ function readLock(file) {
     if (!data || typeof data.pid !== 'number') return null;
     return data;
   } catch (e) {
+    // File was unlinked between existsSync and readFileSync, or contains
+    // garbage (crashed mid-write, foreign content). Treat as "no lock" so
+    // acquire() can clean it up and retry.
     return null;
   }
 }