git-watchtower 2.1.2 → 2.1.4

package/bin/git-watchtower.js

@@ -708,27 +708,38 @@ function startServerProcess() {
   };
 
   try {
-    serverProcess = spawn(cmd, args, spawnOptions);
+    const proc = spawn(cmd, args, spawnOptions);
+    serverProcess = proc;
     store.setState({ serverRunning: true });
 
-    serverProcess.stdout.on('data', (data) => {
+    // Capture `proc` in each listener so a late event from an old process
+    // (e.g. proc1's SIGTERM-induced 'close' arriving after restart already
+    // spawned proc2) cannot clobber proc2's globals. Without this guard,
+    // proc1's close handler resolves the module-level `serverProcess` at
+    // execution time — which is now proc2 — and nulls it out, leaving the
+    // TUI thinking no server is running while proc2 is alive on its port.
+    proc.stdout.on('data', (data) => {
+      if (serverProcess !== proc) return;
       const lines = data.toString().split('\n').filter(Boolean);
       lines.forEach(line => addServerLog(line));
     });
 
-    serverProcess.stderr.on('data', (data) => {
+    proc.stderr.on('data', (data) => {
+      if (serverProcess !== proc) return;
       const lines = data.toString().split('\n').filter(Boolean);
       lines.forEach(line => addServerLog(line, true));
     });
 
-    serverProcess.on('error', (err) => {
+    proc.on('error', (err) => {
+      if (serverProcess !== proc) return;
       store.setState({ serverRunning: false, serverCrashed: true });
       addServerLog(`Error: ${err.message}`, true);
       addLog(`Server error: ${err.message}`, 'error');
       render();
     });
 
-    serverProcess.on('close', (code) => {
+    proc.on('close', (code) => {
+      if (serverProcess !== proc) return;
       store.setState({ serverRunning: false });
       if (code !== 0 && code !== null) {
         store.setState({ serverCrashed: true });
@@ -742,7 +753,7 @@ function startServerProcess() {
       render();
     });
 
-    addLog(`Server started (pid: ${serverProcess.pid})`, 'success');
+    addLog(`Server started (pid: ${proc.pid})`, 'success');
   } catch (err) {
     store.setState({ serverCrashed: true });
     addServerLog(`Failed to start: ${err.message}`, true);
@@ -1080,7 +1091,7 @@ async function refreshAllSparklines() {
     try {
       // Get commit counts for last 7 days (try remote, fall back to local)
       const sparkResult = await execGitOptional(
-        ['log', `origin/${branch.name}`, '--since=7 days ago', '--format=%ad', '--date=format:%Y-%m-%d'],
+        ['log', `${REMOTE_NAME}/${branch.name}`, '--since=7 days ago', '--format=%ad', '--date=format:%Y-%m-%d'],
         { cwd: PROJECT_ROOT }
       ) || await execGitOptional(
         ['log', branch.name, '--since=7 days ago', '--format=%ad', '--date=format:%Y-%m-%d'],
@@ -1119,7 +1130,7 @@ async function getPreviewData(branchName) {
   try {
     // Get last 5 commits (try remote, fall back to local)
     const logResult = await execGitOptional(
-      ['log', `origin/${branchName}`, '-5', '--oneline'],
+      ['log', `${REMOTE_NAME}/${branchName}`, '-5', '--oneline'],
       { cwd: PROJECT_ROOT }
     ) || await execGitOptional(
       ['log', branchName, '-5', '--oneline'],
@@ -1135,7 +1146,7 @@ async function getPreviewData(branchName) {
     // Get files changed (comparing to current branch)
     let filesChanged = [];
     const diffResult = await execGitOptional(
-      ['diff', '--stat', '--name-only', `HEAD...origin/${branchName}`],
+      ['diff', '--stat', '--name-only', `HEAD...${REMOTE_NAME}/${branchName}`],
       { cwd: PROJECT_ROOT }
     ) || await execGitOptional(
       ['diff', '--stat', '--name-only', `HEAD...${branchName}`],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {
@@ -67,8 +67,7 @@
       "main"
     ],
     "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
+      "./scripts/release-filter-cli.js",
       [
         "@semantic-release/changelog",
         {