@ohzw/worktree-command-tui 0.1.3 → 0.1.4

package/README.md

@@ -6,7 +6,7 @@ It keeps one active runtime session per namespace, lets you switch worktrees wit
 ## Features
 
 - Discover worktrees from the current repository even when launched from a subdirectory
-- Start or switch the active worktree session with `Enter`
+- Start, switch, or restart the active worktree session with `Enter`
 - Stop the active session and clean up recorded orphan processes with `s`
 - Run an optional per-worktree setup command with `i`
 - Open the selected worktree in your editor with `e`
@@ -65,7 +65,7 @@ If config is missing, the CLI exits with a message telling you to run `wctui ini
 Primary shortcuts in the footer:
 
 - `↑↓` / `j` `k` — move selection
-- `Enter` — start or switch to selected worktree
+- `Enter` — start, switch to, or restart the selected worktree
 - `i` — run `setupCommand` when configured
 - `e` — open the selected worktree in the configured editor when `editorCommand` is configured
 - `o` — open the selected worktree's pull request when GitHub metadata is available
@@ -89,7 +89,7 @@ Additional shortcuts from the help window:
 
 `wctui` executes the argv commands stored in `.worktree-command-tui.jsonc` when you press the matching keys. Treat repository config as trusted code:
 
-- `Enter` starts `command` in the selected worktree.
+- `Enter` starts `command` in the selected worktree; pressing it on the active worktree restarts that session.
 - `i` runs `setupCommand`; package-manager install commands may run dependency lifecycle scripts.
 - `e` runs `editorCommand` with the selected worktree path appended.
 

package/dist/app.js

@@ -64,7 +64,7 @@ function getLogPaneHeight(_rootHeight) {
     return 9;
 }
 const ACTIVE_TAG = 'active';
-const ALREADY_ACTIVE_MESSAGE = 'already active';
+const REPEATED_ENTER_DEBOUNCE_MS = 750;
 function syncActiveTags(rows, activePath) {
     let changed = false;
     const nextRows = rows.map(row => {
@@ -82,13 +82,7 @@ function syncActiveTags(rows, activePath) {
     return changed ? nextRows : rows;
 }
 function shouldRefreshLogs(model) {
-    if (model.activePath === null) {
-        return false;
-    }
-    if (model.status.kind === 'running' || model.status.kind === 'error') {
-        return true;
-    }
-    return model.status.message === ALREADY_ACTIVE_MESSAGE;
+    return model.activePath !== null && (model.status.kind === 'running' || model.status.kind === 'error');
 }
 function getStatusAfterLogRefresh(current, refresh) {
     if (current.status.kind !== 'running') {
@@ -124,6 +118,7 @@ export function App({ initialModel, actions, windowSizeOverride, }) {
     const logRefreshInFlightRef = useRef(false);
     const actionGenerationRef = useRef(0);
     const previousStatusRef = useRef(initialModel.status.kind);
+    const lastStartRequestRef = useRef({ path: null, atMs: 0 });
     const alertTimeoutRef = useRef(null);
     useEffect(() => {
         setSelectedPath(currentPath => getNextSelectedPath(model.rows, currentPath));
@@ -134,7 +129,8 @@ export function App({ initialModel, actions, windowSizeOverride, }) {
     useEffect(() => {
         const becameRunning = previousStatusRef.current === 'starting' && model.status.kind === 'running';
         if (becameRunning) {
-            setCompletedAlert(model.activeBranch ? `Switched to ${model.activeBranch}` : 'Worktree switch complete.');
+            const switchedAlert = model.activeBranch ? `Switched to ${model.activeBranch}` : 'Worktree switch complete.';
+            setCompletedAlert(model.status.message.startsWith('restarted ') && model.activeBranch ? `Restarted ${model.activeBranch}` : switchedAlert);
             if (alertTimeoutRef.current !== null) {
                 clearTimeout(alertTimeoutRef.current);
             }
@@ -143,7 +139,7 @@ export function App({ initialModel, actions, windowSizeOverride, }) {
             }, 2500);
         }
         previousStatusRef.current = model.status.kind;
-    }, [model.status.kind, model.activeBranch]);
+    }, [model.status.kind, model.status.message, model.activeBranch]);
     useEffect(() => {
         return () => {
             if (alertTimeoutRef.current !== null) {
@@ -256,6 +252,16 @@ export function App({ initialModel, actions, windowSizeOverride, }) {
             userActionInFlightRef.current = false;
         }
     }
+    function shouldAcceptStartRequest(path) {
+        const nowMs = Date.now();
+        const last = lastStartRequestRef.current;
+        if (last.path === path && nowMs - last.atMs < REPEATED_ENTER_DEBOUNCE_MS) {
+            return false;
+        }
+        last.path = path;
+        last.atMs = nowMs;
+        return true;
+    }
     useInput((input, key) => {
         if (isHelpOverlayOpen) {
             if (key.escape || input === '\u001B' || input === 'q' || input === '?') {
@@ -372,6 +378,9 @@ export function App({ initialModel, actions, windowSizeOverride, }) {
                 clearTransientAlert();
                 return;
             }
+            if (!shouldAcceptStartRequest(decision.path)) {
+                return;
+            }
             setModel(current => ({ ...current, status: decision.status }));
             clearTransientAlert();
             void apply(() => actions.start(decision.path));

package/dist/components/ActionPanel.js

@@ -99,7 +99,7 @@ function getActionMessage(selectedRow, activePath) {
         return 'Cannot start this worktree.';
     }
     if (action.kind === 'active') {
-        return 'Already active. Press s to stop the current session.';
+        return 'Already active. Press Enter to restart, or s to stop.';
     }
     return 'Press Enter to start here and switch the active session.';
 }

package/dist/components/HelpWindow.js

@@ -8,7 +8,7 @@ function buildHelpLines(setupAvailable, editorAvailable) {
         { section: 'Scroll', binding: 'PageUp/PageDn', description: 'selection page' },
         { section: 'Logs', binding: 'L', description: 'full-screen logs' },
         { section: 'Logs', binding: '[/]', description: 'scroll log' },
-        { section: 'Actions', binding: 'Enter', description: 'start/switch worktree' },
+        { section: 'Actions', binding: 'Enter', description: 'start/switch/restart worktree' },
     ];
     if (setupAvailable) {
         lines.push({ section: 'Actions', binding: 'i', description: 'setup selected worktree' });

package/dist/core/runtime-state.js

@@ -76,19 +76,11 @@ export function createRuntimeStateActions({ config, paths, adapter }) {
     };
     const start = async (worktreePath) => {
         const current = await adapter.readActive();
-        if (current?.worktreePath === worktreePath) {
-            const model = await adapter.refresh();
-            return {
-                ...model,
-                activePath: current.worktreePath,
-                activeBranch: current.branch,
-                status: { kind: 'idle', message: 'already active' },
-            };
-        }
         const invalidReason = await adapter.getInvalidReason(worktreePath);
         if (invalidReason) {
             throw new Error(invalidReason);
         }
+        const isRestart = current?.worktreePath === worktreePath;
         if (current) {
             await adapter.stopSession(current);
             await adapter.clearSession();
@@ -115,7 +107,7 @@ export function createRuntimeStateActions({ config, paths, adapter }) {
             ...model,
             activePath: worktreePath,
             activeBranch: branch,
-            status: { kind: 'running', message: `started ${branch}` },
+            status: { kind: 'running', message: `${isRestart ? 'restarted' : 'started'} ${branch}` },
         };
     };
     const openEditor = async (worktreePath) => refreshWithStatus(() => adapter.openEditor(worktreePath), true);

package/dist/core/tui-interaction.js

@@ -33,9 +33,9 @@ export function decideEnterInteraction(selected, activePath) {
     }
     if (selected.path === activePath) {
         return {
-            kind: 'set-status',
-            status: { kind: 'idle', message: 'already active' },
-            suppressesBackgroundRefreshes: true,
+            kind: 'start',
+            path: selected.path,
+            status: { kind: 'starting', message: `Restarting ${selected.branch}...` },
         };
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohzw/worktree-command-tui",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A TUI for managing git worktrees",
   "private": false,
   "type": "module",

package/dist/repro.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/repro.js

@@ -1,13 +0,0 @@
-const model = {
-    repoName: "reclaim-the-forest",
-    namespace: "rojo-serve",
-    rows: Array.from({ length: 10 }, (_, index) => ({
-        path: `/repo/.worktree/feat-${index}`,
-        shortPath: `.worktree/feat-${index}`,
-        branch: `feat/${index}`,
-        tags: (index === 0 ? [active] : []),
-        pullRequest: index === 0 ? { kind: found, number: 2125, title: Selection }
-            :
-    }))
-};
-export {};