git-watchtower 1.14.6 → 1.14.8

package/bin/git-watchtower.js

@@ -3390,9 +3390,34 @@ function restartProcess() {
   restoreTerminalTitle();
   if (process.stdin.isTTY) process.stdin.setRawMode(false);
 
-  // Stop server, watcher, polling
-  if (fileWatcher) fileWatcher.close();
-  if (pollIntervalId) clearTimeout(pollIntervalId);
+  // Silence the parent before the replacement takes over the TTY. The parent
+  // stays alive waiting on child.on('close') to forward the exit code, and
+  // stdio is inherited — so any stray listener here will race with the child
+  // (keystrokes consumed twice, render() drawing frames on top of the child's
+  // UI, Ctrl+C intercepted by both, etc.).
+  try { process.stdin.removeAllListeners('data'); } catch (_) { /* stdin may be detached */ }
+  try { process.stdin.pause(); } catch (_) { /* stdin may already be paused */ }
+  try { process.stdout.removeAllListeners('resize'); } catch (_) { /* stdout may be detached */ }
+  try { process.removeAllListeners('SIGWINCH'); } catch (_) { /* no SIGWINCH handler registered */ }
+  try { process.removeAllListeners('SIGINT'); } catch (_) { /* no SIGINT handler registered */ }
+  try { process.removeAllListeners('SIGTERM'); } catch (_) { /* no SIGTERM handler registered */ }
+
+  // Stop every scheduler that can trigger a render while we're waiting on the
+  // child. periodicUpdateCheck in particular will fire render() on completion
+  // and would draw over the replacement's frames.
+  if (pollIntervalId) {
+    try { clearTimeout(pollIntervalId); } catch (_) { /* defensive */ }
+    pollIntervalId = null;
+  }
+  if (periodicUpdateCheck) {
+    try { periodicUpdateCheck.stop(); } catch (_) { /* interval may already be cleared */ }
+  }
+  if (fileWatcher) {
+    try { fileWatcher.close(); } catch (_) { /* watcher may already be closed */ }
+    fileWatcher = null;
+  }
+
+  // Stop server, SSE clients, web dashboard
   if (SERVER_MODE === 'command') stopServerProcess();
   else if (SERVER_MODE === 'static') {
     clients.forEach(client => client.end());
@@ -3408,6 +3433,12 @@ function restartProcess() {
     monitorLockFile = null;
   }
 
+  // The parent's 'exit' handler (process.on('exit', cleanupResources)) writes
+  // ANSI escapes — showCursor / restoreScreen — to the shared TTY. Once the
+  // child owns the screen those writes would corrupt its UI on parent exit,
+  // so mark cleanup as already done.
+  _resourcesCleaned = true;
+
   console.log('\n♻ Restarting git-watchtower...\n');
 
   const { spawn: spawnChild } = require('child_process');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.14.6",
+  "version": "1.14.8",
   "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, execGitOptional, fetch, hasUncommittedChanges, getCommitsByDay, log, deleteLocalBranch } = require('./commands');
+const { execGit, fetch, hasUncommittedChanges, getCommitsByDay, log, deleteLocalBranch } = require('./commands');
 const { GitError, ValidationError } = require('../utils/errors');
 
 // Valid git branch name pattern (conservative)
@@ -102,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 execGitOptional(
+    const localResult = await execGit(
       ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, 'refs/heads/'],
       { cwd }
     );
@@ -127,7 +127,7 @@ async function getAllBranches(options = {}) {
     }
 
     // Get remote branches
-    const remoteResult = await execGitOptional(
+    const remoteResult = await execGit(
       ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, `refs/remotes/${remoteName}/`],
       { cwd }
     );