git-watchtower 1.8.4 → 1.8.6

package/bin/git-watchtower.js

@@ -622,10 +622,8 @@ function startServerProcess() {
   addLog(`Starting: ${SERVER_COMMAND}`, 'update');
   addServerLog(`$ ${SERVER_COMMAND}`);
 
-  // Parse command and args
-  const parts = SERVER_COMMAND.split(' ');
-  const cmd = parts[0];
-  const args = parts.slice(1);
+  // Parse command and args (handles quoted arguments like `npm run "my script"`)
+  const { command: cmd, args } = parseCommand(SERVER_COMMAND);
 
   // Use shell on Windows, direct spawn elsewhere
   const isWindows = process.platform === 'win32';
@@ -741,6 +739,9 @@ const actions = require('../src/ui/actions');
 // Diff stats parsing and stash imported from src/git/commands.js
 const { parseDiffStats, stash: gitStash, stashPop: gitStashPop } = require('../src/git/commands');
 
+// Server process command parsing
+const { parseCommand } = require('../src/server/process');
+
 // State (non-store globals)
 let previousBranchStates = new Map(); // branch name -> commit hash
 let knownBranchNames = new Set(); // Track known branches to detect NEW ones

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.8.4",
+  "version": "1.8.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

@@ -225,7 +225,7 @@ async function checkout(branchName, options = {}) {
     const { stdout: localBranches } = await execGit(['branch', '--list'], { cwd });
     const hasLocal = localBranches
       .split('\n')
-      .some((b) => b.trim().replace('* ', '') === safeName);
+      .some((b) => b.trim().replace(/^\* /, '') === safeName);
 
     if (hasLocal) {
       // Local branch exists - just check out
@@ -335,7 +335,7 @@ async function getLocalBranches(cwd) {
     const { stdout } = await execGit(['branch', '--list'], { cwd });
     return stdout
       .split('\n')
-      .map((b) => b.trim().replace('* ', ''))
+      .map((b) => b.trim().replace(/^\* /, ''))
       .filter(Boolean);
   } catch (error) {
     return [];