git-watchtower 1.10.12 → 1.10.14

package/bin/git-watchtower.js

@@ -656,6 +656,9 @@ function startServerProcess() {
     env: { ...process.env, FORCE_COLOR: '1' },
     shell: isWindows,
     stdio: ['ignore', 'pipe', 'pipe'],
+    // On Unix, create a new process group so we can kill the entire tree
+    // (e.g. npm -> node -> next). On Windows, taskkill /t handles this.
+    detached: !isWindows,
   };
 
   try {
@@ -713,13 +716,19 @@ function stopServerProcess() {
   if (process.platform === 'win32') {
     spawn('taskkill', ['/pid', proc.pid.toString(), '/f', '/t']);
   } else {
-    proc.kill('SIGTERM');
+    // Kill the entire process group (negative PID) so that
+    // grandchildren (e.g. npm -> node -> vite) are also terminated.
+    try {
+      process.kill(-proc.pid, 'SIGTERM');
+    } catch (e) {
+      // Process group may already be dead
+    }
     // Force kill after grace period if process hasn't exited
     const forceKillTimeout = setTimeout(() => {
       try {
-        proc.kill('SIGKILL');
+        process.kill(-proc.pid, 'SIGKILL');
       } catch (e) {
-        // Process may already be dead
+        // Process group may already be dead
       }
     }, 3000);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.10.12",
+  "version": "1.10.14",
   "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/commands.js

@@ -5,7 +5,6 @@
 
 const { execFile } = require('child_process');
 const { GitError } = require('../utils/errors');
-const { withTimeout } = require('../utils/async');
 
 // Default timeout for git operations (30 seconds)
 const DEFAULT_TIMEOUT = 30000;
@@ -44,10 +43,12 @@ async function execGit(args, options = {}) {
   const command = `git ${args.join(' ')}`;
 
   try {
-    const promise = new Promise((resolve, reject) => {
+    const result = await new Promise((resolve, reject) => {
       execFile('git', args, {
         cwd,
         maxBuffer: 10 * 1024 * 1024, // 10MB buffer for large outputs
+        timeout,          // kill child process after timeout ms
+        killSignal: 'SIGTERM',
       }, (error, stdout, stderr) => {
         if (error) {
           error.stderr = stderr;
@@ -58,23 +59,13 @@ async function execGit(args, options = {}) {
       });
     });
 
-    const result = await withTimeout(
-      promise,
-      timeout,
-      `Git command timed out after ${timeout}ms: ${command}`
-    );
-
     return {
       stdout: result.stdout.trim(),
       stderr: result.stderr.trim(),
     };
   } catch (error) {
-    // Handle timeout error
-    if (error.message && error.message.includes('timed out')) {
-      throw new GitError(error.message, 'GIT_TIMEOUT', { command });
-    }
-
-    // Handle exec error
+    // execFile sets error.killed = true when the process is killed due to
+    // timeout.  GitError.fromExecError already maps killed → GIT_TIMEOUT.
     throw GitError.fromExecError(error, command, error.stderr);
   }
 }

package/src/server/process.js

@@ -174,6 +174,9 @@ class ProcessManager {
       env: { ...process.env, FORCE_COLOR: '1' },
       shell: isWindows,
       stdio: ['ignore', 'pipe', 'pipe'],
+      // On Unix, create a new process group so we can kill the entire tree
+      // (e.g. npm -> node -> next). On Windows, taskkill /t handles this.
+      detached: !isWindows,
     };
 
     try {
@@ -247,14 +250,16 @@ class ProcessManager {
       }
     } else {
       try {
-        proc.kill('SIGTERM');
+        // Kill the entire process group (negative PID) so that
+        // grandchildren (e.g. npm -> node -> vite) are also terminated.
+        process.kill(-proc.pid, 'SIGTERM');
 
         // Force kill after grace period
         const forceKillTimeout = setTimeout(() => {
           try {
-            proc.kill('SIGKILL');
+            process.kill(-proc.pid, 'SIGKILL');
           } catch (e) {
-            // Process may already be dead
+            // Process group may already be dead
           }
         }, KILL_GRACE_PERIOD);
 
@@ -263,7 +268,7 @@ class ProcessManager {
           clearTimeout(forceKillTimeout);
         });
       } catch (e) {
-        // Process may already be dead
+        // Process group may already be dead
       }
     }