git-watchtower 1.4.0 → 1.5.0

package/bin/git-watchtower.js

@@ -1190,6 +1190,11 @@ function render() {
   if (state.errorToast) {
     renderer.renderErrorToast(state, write);
   }
+
+  // Stash confirmation dialog renders on top of everything
+  if (state.stashConfirmMode) {
+    renderer.renderStashConfirm(state, write);
+  }
 }
 
 function showFlash(message) {
@@ -1224,7 +1229,6 @@ function showErrorToast(title, message, hint = null, duration = 8000) {
 
   errorToastTimeout = setTimeout(() => {
     store.setState({ errorToast: null });
-    pendingDirtyOperation = null;
     render();
   }, duration);
 }
@@ -1240,6 +1244,26 @@ function hideErrorToast() {
   }
 }
 
+function showStashConfirm(operationLabel) {
+  store.setState({
+    stashConfirmMode: true,
+    stashConfirmSelectedIndex: 0,
+    pendingDirtyOperationLabel: operationLabel,
+  });
+  render();
+}
+
+function hideStashConfirm() {
+  if (store.get('stashConfirmMode')) {
+    store.setState({
+      stashConfirmMode: false,
+      stashConfirmSelectedIndex: 0,
+      pendingDirtyOperationLabel: null,
+    });
+    render();
+  }
+}
+
 // ============================================================================
 // Git Functions
 // ============================================================================
@@ -1365,13 +1389,8 @@ async function switchToBranch(branchName, recordHistory = true) {
     const isDirty = await hasUncommittedChanges();
     if (isDirty) {
       addLog(`Cannot switch: uncommitted changes in working directory`, 'error');
-      addLog(`Press S to stash changes, or commit manually`, 'warning');
       pendingDirtyOperation = { type: 'switch', branch: branchName };
-      showErrorToast(
-        'Cannot Switch Branch',
-        'You have uncommitted changes in your working directory that would be lost.',
-        'Press S to stash changes'
-      );
+      showStashConfirm(`switch to ${branchName}`);
       return { success: false, reason: 'dirty' };
     }
 
@@ -1404,6 +1423,7 @@ async function switchToBranch(branchName, recordHistory = true) {
     }
 
     addLog(`Switched to ${safeBranchName}`, 'success');
+    pendingDirtyOperation = null;
 
     // Restart server if configured (command mode)
     if (SERVER_MODE === 'command' && RESTART_ON_SWITCH && serverProcess) {
@@ -1423,13 +1443,8 @@ async function switchToBranch(branchName, recordHistory = true) {
       );
     } else if (errMsg.includes('local changes') || errMsg.includes('overwritten')) {
       addLog(`Cannot switch: local changes would be overwritten`, 'error');
-      addLog(`Press S to stash changes, or commit manually`, 'warning');
       pendingDirtyOperation = { type: 'switch', branch: branchName };
-      showErrorToast(
-        'Cannot Switch Branch',
-        'Your local changes would be overwritten by checkout.',
-        'Press S to stash changes'
-      );
+      showStashConfirm(`switch to ${branchName}`);
     } else {
       addLog(`Failed to switch: ${errMsg}`, 'error');
       showErrorToast(
@@ -1481,6 +1496,7 @@ async function pullCurrentBranch() {
 
     await execAsync(`git pull "${REMOTE_NAME}" "${branch}"`);
     addLog('Pulled successfully', 'success');
+    pendingDirtyOperation = null;
     notifyClients();
     return { success: true };
   } catch (e) {
@@ -1488,13 +1504,8 @@ async function pullCurrentBranch() {
     addLog(`Pull failed: ${errMsg}`, 'error');
 
     if (errMsg.includes('local changes') || errMsg.includes('overwritten') || errMsg.includes('uncommitted changes')) {
-      addLog(`Press S to stash changes, or commit manually`, 'warning');
       pendingDirtyOperation = { type: 'pull' };
-      showErrorToast(
-        'Pull Failed',
-        'Your local changes would be overwritten by pull.',
-        'Press S to stash changes'
-      );
+      showStashConfirm('pull');
     } else if (isMergeConflict(errMsg)) {
       store.setState({ hasMergeConflict: true });
       showErrorToast(
@@ -1535,6 +1546,7 @@ async function stashAndRetry() {
 
   pendingDirtyOperation = null;
   hideErrorToast();
+  hideStashConfirm();
 
   addLog('Stashing uncommitted changes...', 'update');
   render();
@@ -1556,9 +1568,13 @@ async function stashAndRetry() {
       const popResult = await gitStashPop();
       if (popResult.success) {
         addLog('Stashed changes restored', 'info');
+        showFlash('Stashed changes restored (switch failed)');
       } else {
         addLog('Warning: could not restore stashed changes. Run: git stash pop', 'error');
+        showErrorToast('Stash Pop Failed', 'Could not restore stashed changes.', 'Run: git stash pop');
       }
+    } else {
+      showFlash(`Stashed & switched to ${operation.branch}`);
     }
     await pollGitChanges();
   } else if (operation.type === 'pull') {
@@ -1568,9 +1584,13 @@ async function stashAndRetry() {
       const popResult = await gitStashPop();
       if (popResult.success) {
         addLog('Stashed changes restored', 'info');
+        showFlash('Stashed changes restored (pull failed)');
       } else {
         addLog('Warning: could not restore stashed changes. Run: git stash pop', 'error');
+        showErrorToast('Stash Pop Failed', 'Could not restore stashed changes.', 'Run: git stash pop');
       }
+    } else {
+      showFlash('Stashed & pulled successfully');
     }
     await pollGitChanges();
   }
@@ -2309,6 +2329,52 @@ function setupKeyboardInput() {
       return; // Ignore other keys in action mode
     }
 
+    // Handle stash confirmation dialog
+    if (store.get('stashConfirmMode')) {
+      if (key === '\u001b[A' || key === 'k') { // Up
+        const idx = store.get('stashConfirmSelectedIndex');
+        if (idx > 0) {
+          store.setState({ stashConfirmSelectedIndex: idx - 1 });
+          render();
+        }
+        return;
+      }
+      if (key === '\u001b[B' || key === 'j') { // Down
+        const idx = store.get('stashConfirmSelectedIndex');
+        if (idx < 1) {
+          store.setState({ stashConfirmSelectedIndex: idx + 1 });
+          render();
+        }
+        return;
+      }
+      if (key === '\r' || key === '\n') { // Enter — execute selected option
+        const idx = store.get('stashConfirmSelectedIndex');
+        hideStashConfirm();
+        if (idx === 0 && pendingDirtyOperation) {
+          await stashAndRetry();
+        } else {
+          addLog('Stash cancelled — handle changes manually', 'info');
+          pendingDirtyOperation = null;
+        }
+        return;
+      }
+      if (key === 'S') { // S shortcut — stash directly
+        hideStashConfirm();
+        if (pendingDirtyOperation) {
+          await stashAndRetry();
+        }
+        return;
+      }
+      if (key === '\u001b') { // Escape — cancel
+        hideStashConfirm();
+        addLog('Stash cancelled — handle changes manually', 'info');
+        pendingDirtyOperation = null;
+        render();
+        return;
+      }
+      return; // Ignore other keys in stash confirm mode
+    }
+
     // Dismiss flash on any key
     if (store.get('flashMessage')) {
       hideFlash();
@@ -2324,7 +2390,6 @@ function setupKeyboardInput() {
         return;
       }
       hideErrorToast();
-      pendingDirtyOperation = null;
       if (key !== '\u001b[A' && key !== '\u001b[B' && key !== '\r' && key !== 'q') {
         return;
       }
@@ -2475,9 +2540,14 @@ function setupKeyboardInput() {
         break;
       }
 
-      case 'S': // Stash changes (only active with pending dirty operation)
+      case 'S': // Stash changes — open confirm dialog or show hint
         if (pendingDirtyOperation) {
-          await stashAndRetry();
+          const label = pendingDirtyOperation.type === 'switch'
+            ? `switch to ${pendingDirtyOperation.branch}`
+            : 'pull';
+          showStashConfirm(label);
+        } else {
+          showFlash('No pending operation — stash with S after a failed switch or pull');
         }
         break;
 

package/package.json

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