git-watchtower 1.10.19 → 1.11.0

package/bin/git-watchtower.js

@@ -2531,7 +2531,7 @@ function setupKeyboardInput() {
       if (key === '\r' || key === '\n') {
         const selectedIdx = store.get('updateModalSelectedIndex') || 0;
         if (selectedIdx === 0) {
-          // Update now — run npm i -g git-watchtower
+          // Update & restart — run npm i -g git-watchtower, then re-exec
           store.setState({ updateInProgress: true });
           render();
           const { spawn } = require('child_process');
@@ -2544,8 +2544,8 @@ function setupKeyboardInput() {
             store.setState({ updateInProgress: false, updateModalVisible: false, updateModalSelectedIndex: 0 });
             if (code === 0) {
               store.setState({ updateAvailable: null });
-              addLog('Successfully updated git-watchtower! Restart to use new version.', 'update');
-              showFlash('Updated! Restart to use new version.');
+              addLog('Successfully updated git-watchtower! Restarting...', 'update');
+              restartProcess();
             } else {
               addLog(`Update failed (exit code ${code}). Run manually: npm i -g git-watchtower`, 'error');
               showFlash('Update failed. Try manually: npm i -g git-watchtower');
@@ -2987,6 +2987,36 @@ async function handleWebAction(action, payload) {
           }
         }
         break;
+      case 'checkUpdate':
+        if (payload && payload.install) {
+          store.setState({ updateInProgress: true });
+          render();
+          const { spawn: spawnUpdate } = require('child_process');
+          const updateChild = spawnUpdate('npm', ['i', '-g', 'git-watchtower'], {
+            stdio: 'ignore',
+            detached: false,
+          });
+          updateChild.on('close', (code) => {
+            store.setState({ updateInProgress: false });
+            if (code === 0) {
+              store.setState({ updateAvailable: null });
+              sendResult(true, 'Updated! Restarting...');
+              addLog('Successfully updated git-watchtower! Restarting...', 'update');
+              restartProcess();
+            } else {
+              sendResult(false, `Update failed (exit code ${code})`);
+              addLog(`Update failed (exit code ${code}). Run manually: npm i -g git-watchtower`, 'error');
+              render();
+            }
+          });
+          updateChild.on('error', (err2) => {
+            store.setState({ updateInProgress: false });
+            sendResult(false, err2.message);
+            addLog(`Update failed: ${err2.message}`, 'error');
+            render();
+          });
+        }
+        break;
     }
   } catch (err) {
     addLog(`Web action error: ${err.message}`, 'error');
@@ -3121,6 +3151,47 @@ function stopWebDashboard() {
   return wasPort;
 }
 
+// ============================================================================
+// Restart after update
+// ============================================================================
+
+/**
+ * Restart the process after a successful update by re-execing with the same
+ * arguments. Cleans up terminal state and spawns a replacement process,
+ * then exits the current one.
+ */
+function restartProcess() {
+  // Restore terminal state
+  write(ansi.showCursor);
+  write(ansi.restoreScreen);
+  restoreTerminalTitle();
+  if (process.stdin.isTTY) process.stdin.setRawMode(false);
+
+  // Stop server, watcher, polling
+  if (fileWatcher) fileWatcher.close();
+  if (pollIntervalId) clearTimeout(pollIntervalId);
+  if (SERVER_MODE === 'command') stopServerProcess();
+  else if (SERVER_MODE === 'static') {
+    clients.forEach(client => client.end());
+    clients.clear();
+  }
+  stopWebDashboard();
+
+  console.log('\n♻ Restarting git-watchtower...\n');
+
+  const { spawn: spawnChild } = require('child_process');
+  const child = spawnChild(process.argv[0], process.argv.slice(1), {
+    stdio: 'inherit',
+    detached: false,
+  });
+  child.on('error', () => {
+    console.error('Failed to restart. Please run git-watchtower manually.');
+    process.exit(1);
+  });
+  // Forward the child's exit code when it finishes
+  child.on('close', (code) => process.exit(code || 0));
+}
+
 // ============================================================================
 // Shutdown
 // ============================================================================

package/package.json

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

@@ -5,6 +5,7 @@
 
 const { spawn } = require('child_process');
 const { ServerError } = require('../utils/errors');
+const { Mutex } = require('../utils/async');
 
 /**
  * @typedef {Object} ServerProcessState
@@ -90,6 +91,7 @@ class ProcessManager {
     this.crashed = false;
     this.logs = [];
     this.command = '';
+    this._restartMutex = new Mutex();
   }
 
   /**
@@ -283,13 +285,15 @@ class ProcessManager {
    * @returns {Promise<{success: boolean, error?: Error, pid?: number}>}
    */
   async restart() {
-    const command = this.command;
-    this.stop();
+    return this._restartMutex.withLock(async () => {
+      const command = this.command;
+      this.stop();
 
-    // Wait before restarting
-    await new Promise((resolve) => setTimeout(resolve, RESTART_DELAY));
+      // Wait before restarting
+      await new Promise((resolve) => setTimeout(resolve, RESTART_DELAY));
 
-    return this.start(command);
+      return this.start(command);
+    });
   }
 
   /**

package/src/server/web-ui/js.js

@@ -968,7 +968,7 @@ ${pureFnBlock}
     } else {
       html += '<div class="confirm-actions">';
       html += '<button class="confirm-btn" id="update-dismiss">Dismiss</button>';
-      html += '<button class="confirm-btn primary" id="update-install">Update Now</button>';
+      html += '<button class="confirm-btn primary" id="update-install">Update &amp; Restart</button>';
       html += '</div>';
     }
     document.getElementById('update-content').innerHTML = html;

package/src/ui/renderer.js

@@ -1485,7 +1485,7 @@ function renderUpdateModal(state, write) {
   const updateCmd = 'npm i -g git-watchtower';
 
   const options = [
-    'Update now',
+    'Update & restart',
     'Show update command',
   ];
   const selectedIdx = state.updateModalSelectedIndex || 0;