abmux 0.0.7 → 0.0.8

package/dist/cli/index.js

@@ -532,7 +532,12 @@ var createManagerUsecase = (context) => {
   const { tmux, sessionDetection } = context.services;
   const windowTarget = (up) => `${up.pane.sessionName}:${String(up.pane.windowIndex)}`;
   return {
-    createSession: async ({ sessionName, cwd, prompt }) => {
+    createSession: async ({
+      sessionName,
+      cwd,
+      prompt,
+      worktree
+    }) => {
       const exists2 = await context.infra.tmuxCli.hasSession(sessionName);
       if (!exists2) {
         await context.infra.tmuxCli.newSession({ name: sessionName, cwd });
@@ -544,7 +549,8 @@ var createManagerUsecase = (context) => {
       const target = sessionPanes[0]?.paneId;
       if (!target) return;
       const escapedPrompt = escapeShellArg(prompt);
-      await tmux.sendCommand({ target, command: `claude -w -- ${escapedPrompt}` });
+      const worktreeFlag = worktree ? " -w" : "";
+      await tmux.sendCommand({ target, command: `claude${worktreeFlag} -- ${escapedPrompt}` });
     },
     list: async () => {
       const panes = await tmux.listPanes();
@@ -597,7 +603,7 @@ var createUsecases = (context) => ({
 // package.json
 var package_default = {
   name: "abmux",
-  version: "0.0.7",
+  version: "0.0.8",
   repository: {
     type: "git",
     url: "https://github.com/cut0/abmux.git"
@@ -667,8 +673,8 @@ import { createElement } from "react";
 
 // src/components/ManagerView.tsx
 import { basename as basename2 } from "node:path";
-import { Box as Box11 } from "ink";
-import { useCallback as useCallback4, useMemo as useMemo7, useRef as useRef3, useState as useState6 } from "react";
+import { Box as Box11, useInput as useInput7 } from "ink";
+import { useCallback as useCallback5, useMemo as useMemo7, useRef as useRef3, useState as useState7 } from "react";
 
 // src/components/shared/Header.tsx
 import { Box, Text } from "ink";
@@ -769,10 +775,12 @@ var SessionListPanel = ({
   onSelect,
   onCursorChange,
   onDeleteSession,
-  onAddSession
+  onAddSession,
+  initialCursor,
+  cursorRef
 }) => {
   const { exit } = useApp();
-  const [cursor, setCursor] = useState(0);
+  const [cursor, setCursor] = useState(initialCursor ?? 0);
   const sortedSessions = useMemo3(
     () => sortSessions(sessions, currentSession),
     [sessions, currentSession]
@@ -782,6 +790,7 @@ var SessionListPanel = ({
   if (clampedCursor !== cursor) {
     setCursor(clampedCursor);
   }
+  if (cursorRef) cursorRef.current = clampedCursor;
   const reservedLines = 1;
   const { scrollOffset, visibleCount } = useScroll(
     clampedCursor,
@@ -902,16 +911,19 @@ var PaneListView = ({
   onUnhighlight,
   onBack,
   onNewSession,
-  onKillPane
+  onKillPane,
+  initialCursor,
+  cursorRef
 }) => {
   const { exit } = useApp2();
-  const [cursor, setCursor] = useState2(0);
+  const [cursor, setCursor] = useState2(initialCursor ?? 0);
   const highlightedRef = useRef(void 0);
   const panes = useMemo4(() => group.tabs.flatMap((t) => t.panes), [group]);
   const clampedCursor = cursor >= panes.length ? Math.max(0, panes.length - 1) : cursor;
   if (clampedCursor !== cursor) {
     setCursor(clampedCursor);
   }
+  if (cursorRef) cursorRef.current = clampedCursor;
   const reservedLines = 1;
   const { scrollOffset, visibleCount } = useScroll(
     clampedCursor,
@@ -1023,7 +1035,9 @@ var PaneListPanel = ({
   onUnhighlight,
   onBack,
   onNewSession,
-  onKillPane
+  onKillPane,
+  initialCursor,
+  cursorRef
 }) => {
   if (!selectedSession) {
     return /* @__PURE__ */ jsx6(Box6, { paddingLeft: 1, children: /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "No session selected" }) });
@@ -1040,7 +1054,9 @@ var PaneListPanel = ({
       onUnhighlight,
       onBack,
       onNewSession,
-      onKillPane
+      onKillPane,
+      initialCursor,
+      cursorRef
     },
     selectedSession
   );
@@ -1058,10 +1074,12 @@ var SessionOverviewPanel = ({
   isLoading,
   isFocused,
   availableRows,
-  onBack
+  onBack,
+  initialCursor,
+  cursorRef
 }) => {
   const { exit } = useApp3();
-  const [cursor, setCursor] = useState3(0);
+  const [cursor, setCursor] = useState3(initialCursor ?? 0);
   const lines = useMemo5(() => {
     const summaryLines = overallSummary ? [
       { key: "summary", type: "summary", text: overallSummary },
@@ -1094,6 +1112,7 @@ var SessionOverviewPanel = ({
     return [...summaryLines, ...sessionLines];
   }, [overallSummary, items, groups]);
   const clampedCursor = cursor >= lines.length ? Math.max(0, lines.length - 1) : cursor;
+  if (cursorRef) cursorRef.current = clampedCursor;
   const reservedLines = 3;
   const { scrollOffset, visibleCount } = useScroll(
     clampedCursor,
@@ -1170,6 +1189,7 @@ var SessionOverviewPanel = ({
 
 // src/components/ConfirmView.tsx
 import { Box as Box8, Text as Text8, useInput as useInput4 } from "ink";
+import { useCallback as useCallback4, useState as useState5 } from "react";
 
 // src/hooks/use-terminal-size.ts
 import { useStdout } from "ink";
@@ -1199,20 +1219,35 @@ var useTerminalSize = () => {
 import { jsx as jsx8, jsxs as jsxs6 } from "react/jsx-runtime";
 var ConfirmView = ({ selectedDir, prompt, onConfirm, onCancel }) => {
   const { rows } = useTerminalSize();
+  const [worktree, setWorktree] = useState5(true);
   const previewLines = prompt.split("\n");
-  const maxPreview = Math.min(previewLines.length, rows - 6);
+  const maxPreview = Math.min(previewLines.length, rows - 7);
+  const handleToggleWorktree = useCallback4(() => {
+    setWorktree((prev) => !prev);
+  }, []);
   useInput4((_input, key) => {
     if (key.return) {
-      onConfirm();
+      onConfirm({ worktree });
       return;
     }
     if (key.escape) {
       onCancel();
+      return;
+    }
+    if (key.tab) {
+      handleToggleWorktree();
     }
   });
   return /* @__PURE__ */ jsxs6(Box8, { flexDirection: "column", height: rows, children: [
     /* @__PURE__ */ jsx8(Header, { title: `${APP_TITLE} \u2014 ${selectedDir}` }),
-    /* @__PURE__ */ jsx8(Box8, { marginBottom: 1, children: /* @__PURE__ */ jsx8(Text8, { bold: true, children: "New Claude session:" }) }),
+    /* @__PURE__ */ jsxs6(Box8, { marginBottom: 1, gap: 2, children: [
+      /* @__PURE__ */ jsx8(Text8, { bold: true, children: "New Claude session:" }),
+      /* @__PURE__ */ jsxs6(Text8, { color: worktree ? "green" : "gray", children: [
+        "worktree: [",
+        worktree ? "ON" : "OFF",
+        "]"
+      ] })
+    ] }),
     /* @__PURE__ */ jsxs6(Box8, { flexDirection: "column", flexGrow: 1, overflow: "hidden", paddingLeft: 2, children: [
       previewLines.slice(0, maxPreview).map((line, i) => /* @__PURE__ */ jsx8(Text8, { color: "white", children: line }, i)),
       previewLines.length > maxPreview && /* @__PURE__ */ jsxs6(Text8, { dimColor: true, children: [
@@ -1223,6 +1258,7 @@ var ConfirmView = ({ selectedDir, prompt, onConfirm, onCancel }) => {
     ] }),
     /* @__PURE__ */ jsxs6(Box8, { gap: 2, children: [
       /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: "Enter confirm" }),
+      /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: "Tab worktree" }),
       /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: "Esc cancel" })
     ] })
   ] });
@@ -1266,7 +1302,7 @@ var DeleteSessionView = ({ sessionName, paneCount, onConfirm, onCancel }) => {
 
 // src/components/DirectorySearchView.tsx
 import { Box as Box10, Text as Text10, useInput as useInput6 } from "ink";
-import { useMemo as useMemo6, useState as useState5 } from "react";
+import { useMemo as useMemo6, useState as useState6 } from "react";
 import { basename } from "node:path";
 import { jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
 var formatPath = (path) => {
@@ -1278,8 +1314,8 @@ var formatPath = (path) => {
 };
 var DirectorySearchView = ({ directories, onSelect, onCancel }) => {
   const { rows } = useTerminalSize();
-  const [query, setQuery] = useState5("");
-  const [cursor, setCursor] = useState5(0);
+  const [query, setQuery] = useState6("");
+  const [cursor, setCursor] = useState6(0);
   const filtered = useMemo6(() => {
     if (!query) return directories;
     const lower = query.toLowerCase();
@@ -1400,25 +1436,34 @@ var ManagerView = ({
   directories,
   restoredPrompt,
   restoredSession,
-  restoredCwd
+  restoredCwd,
+  snapshotRef,
+  restoredState
 }) => {
   const { rows, columns } = useTerminalSize();
-  const [sessionsState, setSessionsState] = useState6({
+  const [sessionsState, setSessionsState] = useState7({
     sessions: [],
     isLoading: true
   });
-  const [mode, setMode] = useState6(restoredPrompt ? MODE.confirm : MODE.split);
-  const [focus, setFocus] = useState6(FOCUS.left);
-  const [selectedSession, setSelectedSession] = useState6(restoredSession);
-  const [pendingPrompt, setPendingPrompt] = useState6(restoredPrompt ?? "");
-  const [pendingDeleteSession, setPendingDeleteSession] = useState6(void 0);
-  const [overviewResult, setOverviewResult] = useState6({
-    overallSummary: "",
-    sessions: []
-  });
-  const [overviewLoading, setOverviewLoading] = useState6(true);
+  const [mode, setMode] = useState7(restoredPrompt ? MODE.confirm : MODE.split);
+  const [focus, setFocus] = useState7(restoredState?.focus ?? FOCUS.left);
+  const [selectedSession, setSelectedSession] = useState7(
+    restoredSession ?? restoredState?.selectedSession
+  );
+  const [pendingPrompt, setPendingPrompt] = useState7(restoredPrompt ?? "");
+  const [pendingDeleteSession, setPendingDeleteSession] = useState7(void 0);
+  const [overviewResult, setOverviewResult] = useState7(
+    restoredState?.overviewResult ?? { overallSummary: "", sessions: [] }
+  );
+  const [overviewLoading, setOverviewLoading] = useState7(
+    restoredState?.overviewResult ? false : true
+  );
   const overviewInFlightRef = useRef3(false);
-  const refresh = useCallback4(async () => {
+  const sessionCursorRef = useRef3(restoredState?.sessionListCursor ?? 0);
+  const paneCursorRef = useRef3(restoredState?.paneListCursor ?? 0);
+  const overviewCursorRef = useRef3(restoredState?.overviewCursor ?? 0);
+  const paneRestoredRef = useRef3(false);
+  const refresh = useCallback5(async () => {
     try {
       const fetched = await actions.fetchSessions();
       setSessionsState((prev) => {
@@ -1437,7 +1482,6 @@ var ManagerView = ({
     () => {
       if (overviewInFlightRef.current) return;
       overviewInFlightRef.current = true;
-      setOverviewLoading(true);
       void actions.fetchOverview(sessionsState.sessions).then((result) => {
         setOverviewResult(result);
       }).catch(() => {
@@ -1449,7 +1493,29 @@ var ManagerView = ({
     OVERVIEW_POLL_INTERVAL,
     !sessionsState.isLoading
   );
+  useInput7(
+    (_input, key) => {
+      if (key.tab) {
+        setFocus((prev) => {
+          if (prev === FOCUS.left) return FOCUS.right;
+          if (prev === FOCUS.right) return FOCUS.bottom;
+          return FOCUS.left;
+        });
+      }
+    },
+    { isActive: mode === MODE.split }
+  );
   const resolvedSession = selectedSession ?? sessionsState.sessions[0]?.name;
+  const paneInitialCursor = !paneRestoredRef.current && restoredState?.selectedSession === resolvedSession ? restoredState?.paneListCursor : void 0;
+  if (paneInitialCursor !== void 0) paneRestoredRef.current = true;
+  snapshotRef.current = {
+    focus,
+    selectedSession: resolvedSession,
+    sessionListCursor: sessionCursorRef.current,
+    paneListCursor: paneCursorRef.current,
+    overviewCursor: overviewCursorRef.current,
+    overviewResult
+  };
   const selectedManagedSession = useMemo7(
     () => sessionsState.sessions.find((s) => s.name === resolvedSession),
     [sessionsState.sessions, resolvedSession]
@@ -1474,10 +1540,10 @@ var ManagerView = ({
     }, {}),
     [allGroups]
   );
-  const handleOpenAddSession = useCallback4(() => {
+  const handleOpenAddSession = useCallback5(() => {
     setMode(MODE.addSession);
   }, []);
-  const handleAddSessionSelect = useCallback4((path) => {
+  const handleAddSessionSelect = useCallback5((path) => {
     const name = basename2(path);
     setSessionsState((prev) => {
       const exists2 = prev.sessions.some((s) => s.name === name);
@@ -1490,14 +1556,14 @@ var ManagerView = ({
     setSelectedSession(name);
     setMode(MODE.split);
   }, []);
-  const handleCancelAddSession = useCallback4(() => {
+  const handleCancelAddSession = useCallback5(() => {
     setMode(MODE.split);
   }, []);
-  const handleDeleteSession = useCallback4((name) => {
+  const handleDeleteSession = useCallback5((name) => {
     setPendingDeleteSession(name);
     setMode(MODE.deleteSession);
   }, []);
-  const handleConfirmDelete = useCallback4(() => {
+  const handleConfirmDelete = useCallback5(() => {
     if (!pendingDeleteSession) return;
     const session = sessionsState.sessions.find((s) => s.name === pendingDeleteSession);
     setSessionsState((prev) => ({
@@ -1516,11 +1582,11 @@ var ManagerView = ({
     setPendingDeleteSession(void 0);
     setMode(MODE.split);
   }, [pendingDeleteSession, resolvedSession, sessionsState.sessions, actions, refresh]);
-  const handleCancelDelete = useCallback4(() => {
+  const handleCancelDelete = useCallback5(() => {
     setPendingDeleteSession(void 0);
     setMode(MODE.split);
   }, []);
-  const handleNewSession = useCallback4(
+  const handleNewSession = useCallback5(
     (sessionName) => {
       const cwd = selectedManagedSession?.path;
       if (!cwd) return;
@@ -1528,48 +1594,51 @@ var ManagerView = ({
     },
     [actions, selectedManagedSession]
   );
-  const handleConfirmNew = useCallback4(() => {
-    if (!resolvedSession) return;
-    const cwd = restoredCwd ?? selectedManagedSession?.path;
-    if (!cwd) return;
-    void actions.createSession(resolvedSession, cwd, pendingPrompt).then(() => void refresh());
-    setPendingPrompt("");
-    setMode(MODE.split);
-  }, [resolvedSession, restoredCwd, selectedManagedSession, pendingPrompt, actions, refresh]);
-  const handleCancelConfirm = useCallback4(() => {
+  const handleConfirmNew = useCallback5(
+    ({ worktree }) => {
+      if (!resolvedSession) return;
+      const cwd = restoredCwd ?? selectedManagedSession?.path;
+      if (!cwd) return;
+      void actions.createSession(resolvedSession, cwd, pendingPrompt, worktree).then(() => void refresh());
+      setPendingPrompt("");
+      setMode(MODE.split);
+    },
+    [resolvedSession, restoredCwd, selectedManagedSession, pendingPrompt, actions, refresh]
+  );
+  const handleCancelConfirm = useCallback5(() => {
     setPendingPrompt("");
     setMode(MODE.split);
   }, []);
-  const handleSessionSelect = useCallback4((name) => {
+  const handleSessionSelect = useCallback5((name) => {
     setSelectedSession(name);
     setFocus(FOCUS.right);
   }, []);
-  const handleSessionCursorChange = useCallback4((name) => {
+  const handleSessionCursorChange = useCallback5((name) => {
     setSelectedSession(name);
   }, []);
-  const handleNavigate = useCallback4(
+  const handleNavigate = useCallback5(
     (up) => {
       void actions.navigateToPane(up);
     },
     [actions]
   );
-  const handleBack = useCallback4(() => {
+  const handleBack = useCallback5(() => {
     setFocus(FOCUS.left);
   }, []);
-  const handleKillPane = useCallback4(
+  const handleKillPane = useCallback5(
     async (paneId) => {
       await swallow(() => actions.killPane(paneId));
       void refresh();
     },
     [actions, refresh]
   );
-  const handleHighlight = useCallback4(
+  const handleHighlight = useCallback5(
     async (up) => {
       await swallow(() => actions.highlightWindow(up));
     },
     [actions]
   );
-  const handleUnhighlight = useCallback4(
+  const handleUnhighlight = useCallback5(
     async (up) => {
       await swallow(() => actions.unhighlightWindow(up));
     },
@@ -1644,7 +1713,9 @@ var ManagerView = ({
               onSelect: handleSessionSelect,
               onCursorChange: handleSessionCursorChange,
               onDeleteSession: handleDeleteSession,
-              onAddSession: handleOpenAddSession
+              onAddSession: handleOpenAddSession,
+              initialCursor: restoredState?.sessionListCursor,
+              cursorRef: sessionCursorRef
             }
           )
         }
@@ -1668,7 +1739,9 @@ var ManagerView = ({
               onUnhighlight: handleUnhighlight,
               onBack: handleBack,
               onNewSession: handleNewSession,
-              onKillPane: handleKillPane
+              onKillPane: handleKillPane,
+              initialCursor: paneInitialCursor,
+              cursorRef: paneCursorRef
             }
           )
         }
@@ -1683,13 +1756,15 @@ var ManagerView = ({
         isLoading: overviewLoading,
         isFocused: focus === FOCUS.bottom,
         availableRows: bottomHeight,
-        onBack: handleBack
+        onBack: handleBack,
+        initialCursor: restoredState?.overviewCursor,
+        cursorRef: overviewCursorRef
       }
     ),
     /* @__PURE__ */ jsx11(
       StatusBar,
       {
-        message: focus === FOCUS.left ? "\u2191/\u2193 move  Enter/\u2192 select  n add  d delete  q quit" : focus === FOCUS.right ? "\u2191/\u2193 move  Enter focus  n new  d kill  Esc/\u2190 back  q quit" : "\u2191/\u2193 scroll  Esc/\u2190 back  q quit",
+        message: focus === FOCUS.left ? "\u2191/\u2193 move  Enter/\u2192 select  Tab next  n add  d delete  q quit" : focus === FOCUS.right ? "\u2191/\u2193 move  Enter focus  Tab next  n new  d kill  Esc/\u2190 back  q quit" : "\u2191/\u2193 scroll  Tab next  Esc/\u2190 back  q quit",
         statusCounts
       }
     )
@@ -1703,6 +1778,8 @@ var createTuiCommand = ({ usecases, services, infra }) => async () => {
   let pendingPrompt;
   let pendingSession;
   let pendingCwd;
+  const snapshotRef = { current: void 0 };
+  let restoredState;
   const actions = {
     fetchSessions: async () => {
       const result = await usecases.manager.list();
@@ -1736,8 +1813,8 @@ var createTuiCommand = ({ usecases, services, infra }) => async () => {
       const groups = sessions.flatMap((s) => s.groups);
       return await usecases.manager.fetchOverview(groups);
     },
-    createSession: async (sessionName, cwd, prompt) => {
-      await usecases.manager.createSession({ sessionName, cwd, prompt });
+    createSession: async (sessionName, cwd, prompt, worktree) => {
+      await usecases.manager.createSession({ sessionName, cwd, prompt, worktree });
     },
     killSession: async (sessionName) => {
       await usecases.manager.killSession(sessionName);
@@ -1752,6 +1829,7 @@ var createTuiCommand = ({ usecases, services, infra }) => async () => {
       await usecases.manager.unhighlightWindow(up);
     },
     openEditor: (sessionName, cwd) => {
+      restoredState = snapshotRef.current;
       instance.unmount();
       const prompt = infra.editor.open();
       pendingPrompt = prompt;
@@ -1764,6 +1842,7 @@ var createTuiCommand = ({ usecases, services, infra }) => async () => {
       const target = `${up.pane.sessionName}:${String(up.pane.windowIndex)}`;
       await infra.tmuxCli.selectWindow(target);
       await infra.tmuxCli.selectPane(up.pane.paneId);
+      restoredState = snapshotRef.current;
       instance.unmount();
       await infra.tmuxCli.attachSession(up.pane.sessionName);
       instance = renderApp();
@@ -1773,9 +1852,12 @@ var createTuiCommand = ({ usecases, services, infra }) => async () => {
     const prompt = pendingPrompt;
     const session = pendingSession;
     const cwd = pendingCwd;
+    const snapshot = restoredState;
     pendingPrompt = void 0;
     pendingSession = void 0;
     pendingCwd = void 0;
+    restoredState = void 0;
+    snapshotRef.current = void 0;
     const rawCwd = process.cwd();
     const currentSession = basename3(findMatchingDirectory(rawCwd, directories) ?? rawCwd);
     return render(
@@ -1785,7 +1867,9 @@ var createTuiCommand = ({ usecases, services, infra }) => async () => {
         directories,
         restoredPrompt: prompt,
         restoredSession: session,
-        restoredCwd: cwd
+        restoredCwd: cwd,
+        snapshotRef,
+        restoredState: snapshot
       }),
       { concurrent: true }
     );
@@ -1801,18 +1885,20 @@ var createNewCommand = ({ usecases }) => async (args) => {
   const { values, positionals } = parseArgs({
     args,
     options: {
-      dir: { type: "string" }
+      dir: { type: "string" },
+      worktree: { type: "boolean", default: true }
     },
     allowPositionals: true
   });
   const prompt = positionals[0];
   if (!prompt) {
-    console.error("Usage: abmux new <prompt> [--dir <path>]");
+    console.error("Usage: abmux new <prompt> [--dir <path>] [--no-worktree]");
     process.exit(1);
   }
   const dir = values.dir ?? process.cwd();
   const sessionName = basename4(dir);
-  await usecases.manager.createSession({ sessionName, cwd: dir, prompt });
+  const worktree = values.worktree ?? true;
+  await usecases.manager.createSession({ sessionName, cwd: dir, prompt, worktree });
   console.log(`Session "${sessionName}" created.`);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmux",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/cut0/abmux.git"