git-watchtower 1.11.10 → 1.12.1

package/bin/git-watchtower.js

@@ -389,6 +389,20 @@ let AUTO_PULL = true;
 const MAX_LOG_ENTRIES = 10;
 const MAX_SERVER_LOG_LINES = 500;
 
+// Timing constants (ms)
+/** Grace period before SIGKILLing a process after SIGTERM. */
+const FORCE_KILL_GRACE_MS = 3000;
+/** Additional grace period added to a command's timeout before SIGKILL. */
+const SIGKILL_GRACE_AFTER_TIMEOUT_MS = 5000;
+/** Delay between stopping and restarting the dev server. */
+const SERVER_RESTART_DELAY_MS = 500;
+/** How long a transient flash message stays on screen. */
+const FLASH_MESSAGE_DURATION_MS = 3000;
+/** Debounce window for file watcher events before notifying clients. */
+const FILE_WATCHER_DEBOUNCE_MS = 100;
+/** Max time to wait for the static HTTP server to close on shutdown. */
+const SERVER_CLOSE_TIMEOUT_MS = 2000;
+
 // Telemetry session tracking
 let branchSwitchCount = 0;
 let sessionStartTime = null;
@@ -742,7 +756,7 @@ function stopServerProcess() {
       } catch (e) {
         // Process group may already be dead
       }
-    }, 3000);
+    }, FORCE_KILL_GRACE_MS);
 
     // Clear the force-kill timer if the process exits cleanly
     proc.once('close', () => {
@@ -760,7 +774,7 @@ function restartServerProcess() {
   setTimeout(() => {
     startServerProcess();
     render();
-  }, 500);
+  }, SERVER_RESTART_DELAY_MS);
 }
 
 // Network and polling state
@@ -857,7 +871,7 @@ function execCli(cmd, args = [], options = {}) {
     if (timeout > 0) {
       const killTimer = setTimeout(() => {
         try { child.kill('SIGKILL'); } catch (e) { /* already dead */ }
-      }, timeout + 5000);
+      }, timeout + SIGKILL_GRACE_AFTER_TIMEOUT_MS);
       child.on('close', () => clearTimeout(killTimer));
     }
   });
@@ -1336,7 +1350,7 @@ function showFlash(message) {
   flashTimeout = setTimeout(() => {
     store.setState({ flashMessage: null });
     render();
-  }, 3000);
+  }, FLASH_MESSAGE_DURATION_MS);
 }
 
 function hideFlash() {
@@ -2194,7 +2208,7 @@ function setupFileWatcher() {
         addLog(`File changed: ${filename}`, 'info');
         notifyClients();
         render();
-      }, 100);
+      }, FILE_WATCHER_DEBOUNCE_MS);
     });
 
     fileWatcher.on('error', (err) => {
@@ -3250,7 +3264,7 @@ async function shutdown() {
     clients.clear();
 
     const serverClosePromise = new Promise(resolve => server.close(resolve));
-    const timeoutPromise = new Promise(resolve => setTimeout(resolve, 2000));
+    const timeoutPromise = new Promise(resolve => setTimeout(resolve, SERVER_CLOSE_TIMEOUT_MS));
     await Promise.race([serverClosePromise, timeoutPromise]);
   }
 

package/package.json

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

package/src/server/process.js

@@ -31,8 +31,17 @@ const KILL_GRACE_PERIOD = 3000;
 const RESTART_DELAY = 500;
 
 /**
- * Parse a command string into command and arguments
- * Handles quoted strings properly
+ * Parse a command string into command and arguments.
+ * Handles quoted strings, backslash escapes (e.g. `\"`, `\\`, `\ `),
+ * and empty quoted arguments (`""`).
+ *
+ * Rules (POSIX-ish):
+ * - Inside single quotes, characters are literal — backslashes do NOT escape.
+ * - Inside double quotes or outside any quotes, a backslash causes the next
+ *   character to be treated literally (so `\"` yields `"`, `\\` yields `\`,
+ *   and `\ ` yields a literal space that doesn't split the argument).
+ * - A trailing backslash with no following character is left literal.
+ *
  * @param {string} commandString - Command string to parse
  * @returns {{command: string, args: string[]}}
  */
@@ -41,27 +50,43 @@ function parseCommand(commandString) {
   let current = '';
   let inQuotes = false;
   let quoteChar = '';
+  // Tracks whether we've started accumulating an argument — distinguishes
+  // `""` (empty argument) from whitespace between arguments.
+  let hasCurrent = false;
 
   for (let i = 0; i < commandString.length; i++) {
     const char = commandString[i];
 
+    // Backslash escapes: unless we're inside single quotes, a backslash
+    // causes the next character to be treated literally. A trailing
+    // backslash (no following character) falls through and is kept literal.
+    if (char === '\\' && quoteChar !== "'" && i + 1 < commandString.length) {
+      current += commandString[i + 1];
+      hasCurrent = true;
+      i++;
+      continue;
+    }
+
     if ((char === '"' || char === "'") && !inQuotes) {
       inQuotes = true;
       quoteChar = char;
+      hasCurrent = true;
     } else if (char === quoteChar && inQuotes) {
       inQuotes = false;
       quoteChar = '';
     } else if (char === ' ' && !inQuotes) {
-      if (current) {
+      if (hasCurrent) {
         args.push(current);
         current = '';
+        hasCurrent = false;
       }
     } else {
       current += char;
+      hasCurrent = true;
     }
   }
 
-  if (current) {
+  if (hasCurrent) {
     args.push(current);
   }
 

package/src/ui/ansi.js

@@ -7,6 +7,22 @@
 const ESC = '\x1b';
 const CSI = `${ESC}[`;
 
+/**
+ * Whether color output is enabled.
+ * Honors the NO_COLOR convention (https://no-color.org/) and TERM=dumb.
+ * Structural codes (cursor movement, screen control) are still emitted
+ * so the TUI layout remains functional — only color/style codes are stripped.
+ */
+const colorsEnabled = !(
+  (process.env.NO_COLOR && process.env.NO_COLOR !== '') ||
+  process.env.TERM === 'dumb'
+);
+
+/** Empty string for disabled color codes, or the given code when enabled. */
+const c = (code) => (colorsEnabled ? code : '');
+/** Empty-returning function for disabled color functions. */
+const cFn = (fn) => (colorsEnabled ? fn : () => '');
+
 /**
  * ANSI escape codes for terminal control and styling
  */
@@ -44,81 +60,81 @@ const ansi = {
   restoreCursor: `${CSI}u`,
 
   // Text styles
-  reset: `${CSI}0m`,
-  bold: `${CSI}1m`,
-  dim: `${CSI}2m`,
-  italic: `${CSI}3m`,
-  underline: `${CSI}4m`,
-  blink: `${CSI}5m`,
-  inverse: `${CSI}7m`,
-  hidden: `${CSI}8m`,
-  strikethrough: `${CSI}9m`,
+  reset: c(`${CSI}0m`),
+  bold: c(`${CSI}1m`),
+  dim: c(`${CSI}2m`),
+  italic: c(`${CSI}3m`),
+  underline: c(`${CSI}4m`),
+  blink: c(`${CSI}5m`),
+  inverse: c(`${CSI}7m`),
+  hidden: c(`${CSI}8m`),
+  strikethrough: c(`${CSI}9m`),
 
   // Reset specific styles
-  resetBold: `${CSI}22m`,
-  resetDim: `${CSI}22m`,
-  resetItalic: `${CSI}23m`,
-  resetUnderline: `${CSI}24m`,
-  resetBlink: `${CSI}25m`,
-  resetInverse: `${CSI}27m`,
-  resetHidden: `${CSI}28m`,
-  resetStrikethrough: `${CSI}29m`,
+  resetBold: c(`${CSI}22m`),
+  resetDim: c(`${CSI}22m`),
+  resetItalic: c(`${CSI}23m`),
+  resetUnderline: c(`${CSI}24m`),
+  resetBlink: c(`${CSI}25m`),
+  resetInverse: c(`${CSI}27m`),
+  resetHidden: c(`${CSI}28m`),
+  resetStrikethrough: c(`${CSI}29m`),
 
   // Foreground colors (standard)
-  black: `${CSI}30m`,
-  red: `${CSI}31m`,
-  green: `${CSI}32m`,
-  yellow: `${CSI}33m`,
-  blue: `${CSI}34m`,
-  magenta: `${CSI}35m`,
-  cyan: `${CSI}36m`,
-  white: `${CSI}37m`,
-  default: `${CSI}39m`,
+  black: c(`${CSI}30m`),
+  red: c(`${CSI}31m`),
+  green: c(`${CSI}32m`),
+  yellow: c(`${CSI}33m`),
+  blue: c(`${CSI}34m`),
+  magenta: c(`${CSI}35m`),
+  cyan: c(`${CSI}36m`),
+  white: c(`${CSI}37m`),
+  default: c(`${CSI}39m`),
 
   // Foreground colors (bright)
-  gray: `${CSI}90m`,
-  brightRed: `${CSI}91m`,
-  brightGreen: `${CSI}92m`,
-  brightYellow: `${CSI}93m`,
-  brightBlue: `${CSI}94m`,
-  brightMagenta: `${CSI}95m`,
-  brightCyan: `${CSI}96m`,
-  brightWhite: `${CSI}97m`,
+  gray: c(`${CSI}90m`),
+  brightRed: c(`${CSI}91m`),
+  brightGreen: c(`${CSI}92m`),
+  brightYellow: c(`${CSI}93m`),
+  brightBlue: c(`${CSI}94m`),
+  brightMagenta: c(`${CSI}95m`),
+  brightCyan: c(`${CSI}96m`),
+  brightWhite: c(`${CSI}97m`),
 
   // Background colors (standard)
-  bgBlack: `${CSI}40m`,
-  bgRed: `${CSI}41m`,
-  bgGreen: `${CSI}42m`,
-  bgYellow: `${CSI}43m`,
-  bgBlue: `${CSI}44m`,
-  bgMagenta: `${CSI}45m`,
-  bgCyan: `${CSI}46m`,
-  bgWhite: `${CSI}47m`,
-  bgDefault: `${CSI}49m`,
+  bgBlack: c(`${CSI}40m`),
+  bgRed: c(`${CSI}41m`),
+  bgGreen: c(`${CSI}42m`),
+  bgYellow: c(`${CSI}43m`),
+  bgBlue: c(`${CSI}44m`),
+  bgMagenta: c(`${CSI}45m`),
+  bgCyan: c(`${CSI}46m`),
+  bgWhite: c(`${CSI}47m`),
+  bgDefault: c(`${CSI}49m`),
 
   // Background colors (bright)
-  bgGray: `${CSI}100m`,
-  bgBrightRed: `${CSI}101m`,
-  bgBrightGreen: `${CSI}102m`,
-  bgBrightYellow: `${CSI}103m`,
-  bgBrightBlue: `${CSI}104m`,
-  bgBrightMagenta: `${CSI}105m`,
-  bgBrightCyan: `${CSI}106m`,
-  bgBrightWhite: `${CSI}107m`,
+  bgGray: c(`${CSI}100m`),
+  bgBrightRed: c(`${CSI}101m`),
+  bgBrightGreen: c(`${CSI}102m`),
+  bgBrightYellow: c(`${CSI}103m`),
+  bgBrightBlue: c(`${CSI}104m`),
+  bgBrightMagenta: c(`${CSI}105m`),
+  bgBrightCyan: c(`${CSI}106m`),
+  bgBrightWhite: c(`${CSI}107m`),
 
   /**
    * Set foreground color using 256-color palette
    * @param {number} n - Color number (0-255)
    * @returns {string}
    */
-  fg256: (n) => `${CSI}38;5;${n}m`,
+  fg256: cFn((n) => `${CSI}38;5;${n}m`),
 
   /**
    * Set background color using 256-color palette
    * @param {number} n - Color number (0-255)
    * @returns {string}
    */
-  bg256: (n) => `${CSI}48;5;${n}m`,
+  bg256: cFn((n) => `${CSI}48;5;${n}m`),
 
   /**
    * Set foreground color using RGB
@@ -127,7 +143,7 @@ const ansi = {
    * @param {number} b - Blue (0-255)
    * @returns {string}
    */
-  fgRgb: (r, g, b) => `${CSI}38;2;${r};${g};${b}m`,
+  fgRgb: cFn((r, g, b) => `${CSI}38;2;${r};${g};${b}m`),
 
   /**
    * Set background color using RGB
@@ -136,7 +152,7 @@ const ansi = {
    * @param {number} b - Blue (0-255)
    * @returns {string}
    */
-  bgRgb: (r, g, b) => `${CSI}48;2;${r};${g};${b}m`,
+  bgRgb: cFn((r, g, b) => `${CSI}48;2;${r};${g};${b}m`),
 };
 
 /**
@@ -492,6 +508,7 @@ module.exports = {
   wordWrap,
   horizontalLine,
   style,
+  colorsEnabled,
   // Export constants for direct use
   ESC,
   CSI,