@akiojin/gwt 2.13.0 → 3.0.0

package/src/claude.ts

@@ -51,6 +51,9 @@ export async function launchClaudeCode(
       options.sessionId && options.sessionId.trim().length > 0
         ? options.sessionId.trim()
         : null;
+    const usedExplicitSessionId =
+      Boolean(resumeSessionId) &&
+      (options.mode === "continue" || options.mode === "resume");
 
     // Handle execution mode
     switch (options.mode) {
@@ -173,14 +176,16 @@ export async function launchClaudeCode(
 
     terminal.exitRawMode();
 
-    const baseEnv = {
-      ...process.env,
-      ...(options.envOverrides ?? {}),
-    };
-    const launchEnv =
+    const baseEnv = { ...process.env, ...(options.envOverrides ?? {}) };
+    const launchEnvSource =
       options.skipPermissions && !baseEnv.IS_SANDBOX
         ? { ...baseEnv, IS_SANDBOX: "1" }
         : baseEnv;
+    const launchEnv = Object.fromEntries(
+      Object.entries(launchEnvSource).filter(
+        (entry): entry is [string, string] => typeof entry[1] === "string",
+      ),
+    );
 
     const childStdio = createChildStdio();
 
@@ -199,7 +204,7 @@ export async function launchClaudeCode(
           stdout: childStdio.stdout,
           stderr: childStdio.stderr,
           env: launchEnv,
-        } as any);
+        });
       } else {
         console.log(
           chalk.cyan(
@@ -233,7 +238,7 @@ export async function launchClaudeCode(
           stdout: childStdio.stdout,
           stderr: childStdio.stderr,
           env: launchEnv,
-        } as any);
+        });
       }
     } finally {
       childStdio.cleanup();
@@ -250,10 +255,13 @@ export async function launchClaudeCode(
         preferClosestTo: finishedAt,
         windowMs: 10 * 60 * 1000,
       });
-      // Priority: latest on disk > resumeSessionId
-      capturedSessionId = latest?.id ?? resumeSessionId ?? null;
+      const detectedSessionId = latest?.id ?? null;
+      // When we explicitly resumed a specific session, keep that ID as the source of truth.
+      capturedSessionId = usedExplicitSessionId
+        ? resumeSessionId
+        : detectedSessionId;
     } catch {
-      capturedSessionId = resumeSessionId ?? null;
+      capturedSessionId = usedExplicitSessionId ? resumeSessionId : null;
     }
 
     if (capturedSessionId) {
@@ -270,11 +278,12 @@ export async function launchClaudeCode(
     }
 
     return capturedSessionId ? { sessionId: capturedSessionId } : {};
-  } catch (error: any) {
+  } catch (error: unknown) {
     const hasLocalClaude = await isClaudeCommandAvailable();
     let errorMessage: string;
+    const err = error as NodeJS.ErrnoException;
 
-    if (error.code === "ENOENT") {
+    if (err.code === "ENOENT") {
       if (hasLocalClaude) {
         errorMessage =
           "claude command not found. Please ensure Claude Code is properly installed.";
@@ -283,7 +292,8 @@ export async function launchClaudeCode(
           "bunx command not found. Please ensure Bun is installed so Claude Code can run via bunx.";
       }
     } else {
-      errorMessage = `Failed to launch Claude Code: ${error.message || "Unknown error"}`;
+      const details = error instanceof Error ? error.message : String(error);
+      errorMessage = `Failed to launch Claude Code: ${details || "Unknown error"}`;
     }
 
     if (process.platform === "win32") {
@@ -344,8 +354,9 @@ export async function isClaudeCodeAvailable(): Promise<boolean> {
   try {
     await execa("bunx", [CLAUDE_CLI_PACKAGE, "--version"], { shell: true });
     return true;
-  } catch (error: any) {
-    if (error.code === "ENOENT") {
+  } catch (error: unknown) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code === "ENOENT") {
       console.error(chalk.yellow("\n⚠️  bunx command not found"));
       console.error(
         chalk.gray(

package/src/cli/ui/__tests__/components/App.protected-branch.test.tsx

@@ -203,7 +203,7 @@ describe("App protected branch handling", () => {
       remoteRef: null,
     });
 
-    expect(navigateToMock).toHaveBeenCalledWith("branch-quick-start");
+    expect(navigateToMock).toHaveBeenCalledWith("branch-action-selector");
     expect(branchQuickStartProps).not.toHaveLength(0);
   });
 });

package/src/cli/ui/__tests__/components/common/Select.test.tsx

@@ -183,6 +183,17 @@ describe("Select", () => {
       expect(onSelect).toHaveBeenCalled();
     });
 
+    it("should call onSelect when linefeed is pressed (cooked mode Enter)", () => {
+      const onSelect = vi.fn();
+      const { stdin } = render(
+        <Select items={mockItems} onSelect={onSelect} />,
+      );
+
+      stdin.write("\n"); // Linefeed key
+
+      expect(onSelect).toHaveBeenCalled();
+    });
+
     it("should pass selected item to onSelect callback", () => {
       const onSelect = vi.fn();
       render(<Select items={mockItems} onSelect={onSelect} initialIndex={2} />);

package/src/cli/ui/__tests__/components/screens/BranchListScreen.test.tsx

@@ -431,7 +431,9 @@ describe("BranchListScreen", () => {
       stdin.write(" ");
     });
 
-    const frame = stripControlSequences(stripAnsi(renderResult.lastFrame() ?? ""));
+    const frame = stripControlSequences(
+      stripAnsi(renderResult.lastFrame() ?? ""),
+    );
     expect(frame).toContain("[*] 🟢 🛡");
     expect(frame).toContain("feature/login");
   });

package/src/cli/ui/__tests__/components/screens/BranchQuickStartScreen.test.tsx

@@ -66,9 +66,7 @@ describe("BranchQuickStartScreen", () => {
       />,
     );
 
-    expect(
-      getByText(/Model: opus \/ Skip: No \/ ID: abc-123/),
-    ).toBeDefined();
+    expect(getByText(/Model: opus \/ Skip: No \/ ID: abc-123/)).toBeDefined();
   });
 
   it("disables previous options when no history", () => {
@@ -132,7 +130,9 @@ describe("BranchQuickStartScreen", () => {
 
     expect(getAllByText(/\[Codex\]/i)).toHaveLength(2);
     expect(
-      getByText(/Model: gpt-5.1-codex \/ Reasoning: High \/ Skip: Yes \/ ID: codex-123/),
+      getByText(
+        /Model: gpt-5.1-codex \/ Reasoning: High \/ Skip: Yes \/ ID: codex-123/,
+      ),
     ).toBeDefined();
     expect(getAllByText(/\[Claude\]/i)).toHaveLength(2);
     expect(

package/src/cli/ui/components/App.tsx

@@ -11,7 +11,6 @@ import { BranchListScreen } from "./screens/BranchListScreen.js";
 import { BranchCreatorScreen } from "./screens/BranchCreatorScreen.js";
 import { BranchActionSelectorScreen } from "../screens/BranchActionSelectorScreen.js";
 import { AIToolSelectorScreen } from "./screens/AIToolSelectorScreen.js";
-import { SessionSelectorScreen } from "./screens/SessionSelectorScreen.js";
 import { ExecutionModeSelectorScreen } from "./screens/ExecutionModeSelectorScreen.js";
 import type { ExecutionMode } from "./screens/ExecutionModeSelectorScreen.js";
 import { BranchQuickStartScreen } from "./screens/BranchQuickStartScreen.js";
@@ -93,13 +92,6 @@ export interface AppProps {
   loadingIndicatorDelay?: number;
 }
 
-export interface SessionOption {
-  sessionId: string;
-  toolLabel: string;
-  branch: string;
-  timestamp: number;
-}
-
 /**
  * App - Top-level component for Ink.js UI
  * Integrates ErrorBoundary, data fetching, screen navigation, and all screens
@@ -119,13 +111,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
   // Version state
   const [version, setVersion] = useState<string | null>(null);
   const [repoRoot, setRepoRoot] = useState<string | null>(null);
-  const [sessionOptions, setSessionOptions] = useState<SessionOption[]>([]);
-  const [sessionLoading, setSessionLoading] = useState(false);
-  const [sessionError, setSessionError] = useState<string | null>(null);
-  const [pendingExecution, setPendingExecution] = useState<{
-    mode: ExecutionMode;
-    skipPermissions: boolean;
-  } | null>(null);
   const [continueSessionId, setContinueSessionId] = useState<string | null>(
     null,
   );
@@ -140,8 +125,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
       timestamp?: number | null;
     }[]
   >([]);
-  const [branchQuickStartLoading, setBranchQuickStartLoading] =
-    useState(false);
+  const [branchQuickStartLoading, setBranchQuickStartLoading] = useState(false);
 
   // Selection state (for branch → tool → mode flow)
   const [selectedBranch, setSelectedBranch] =
@@ -274,9 +258,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
         if (cancelled) return;
         const safe = new Set(
           targets
-            .filter(
-              (t) => !t.hasUncommittedChanges && !t.hasUnpushedCommits,
-            )
+            .filter((t) => !t.hasUncommittedChanges && !t.hasUnpushedCommits)
             .map((t) => t.branch),
         );
         setSafeBranches(safe);
@@ -290,53 +272,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     };
   }, [branches, worktrees]);
 
-  // Load available sessions when entering session selector
-  useEffect(() => {
-    if (currentScreen !== "session-selector") {
-      return;
-    }
-    if (!selectedTool || !selectedBranch) {
-      setSessionOptions([]);
-      return;
-    }
-
-    setSessionLoading(true);
-    setSessionError(null);
-
-    (async () => {
-      try {
-        const root = repoRoot ?? (await getRepositoryRoot());
-        if (!repoRoot && root) {
-          setRepoRoot(root);
-        }
-        const sessionData = root ? await loadSession(root) : null;
-        const history = sessionData?.history ?? [];
-
-        const filtered = history
-          .filter(
-            (entry) =>
-              entry.sessionId &&
-              entry.toolId === selectedTool &&
-              entry.branch === selectedBranch.name,
-          )
-          .sort((a, b) => (b.timestamp ?? 0) - (a.timestamp ?? 0))
-          .map((entry) => ({
-            sessionId: entry.sessionId as string,
-            toolLabel: entry.toolLabel,
-            branch: entry.branch,
-            timestamp: entry.timestamp,
-          }));
-
-        setSessionOptions(filtered);
-      } catch (_err) {
-        setSessionOptions([]);
-        setSessionError("セッション一覧の取得に失敗しました");
-      } finally {
-        setSessionLoading(false);
-      }
-    })();
-  }, [currentScreen, selectedTool, selectedBranch, repoRoot]);
-
   // Load quick start options for selected branch (latest per tool)
   useEffect(() => {
     if (!selectedBranch) {
@@ -387,60 +322,55 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
         const mapped = await Promise.all(
           latestPerTool.map(async (entry) => {
             let sessionId = entry.sessionId ?? null;
+            const worktree = selectedWorktreePath ?? workingDirectory;
 
             // For Codex, prefer a newer filesystem session over stale history
-            if (entry.toolId === "codex-cli") {
+            if (!sessionId && entry.toolId === "codex-cli") {
               try {
-                const latestCodex = await findLatestCodexSession();
-                const historyTs = entry.timestamp ?? 0;
-                if (
-                  latestCodex &&
-                  (!sessionId || latestCodex.mtime > historyTs)
-                ) {
-                  sessionId = latestCodex.id;
-                }
-                // Fallback when filesystem unavailable and history missing
-                if (!sessionId) {
-                  const latestId = await findLatestCodexSessionId();
-                  if (latestId) sessionId = latestId;
-                }
+                const historyTs = entry.timestamp ?? null;
+                const latestCodex = await findLatestCodexSession({
+                  ...(historyTs
+                    ? {
+                        since: historyTs - 60_000,
+                        preferClosestTo: historyTs,
+                        windowMs: 60 * 60 * 1000,
+                      }
+                    : {}),
+                  cwd: worktree,
+                });
+                sessionId =
+                  latestCodex?.id ??
+                  (await findLatestCodexSessionId({ cwd: worktree })) ??
+                  null;
               } catch {
                 // ignore lookup failure
               }
             }
 
             // For Claude Code, prefer the newest session file in the worktree even if history is stale.
-            if (entry.toolId === "claude-code") {
+            if (!sessionId && entry.toolId === "claude-code") {
               try {
-                const worktree =
-                  selectedWorktreePath ??
-                  selectedBranch?.displayName ??
-                  workingDirectory;
-
                 // Always resolve freshest on-disk session for this worktree (no window restriction)
                 const latestAny = await findLatestClaudeSession(worktree);
-                sessionId = latestAny?.id ?? sessionId ?? null;
-
+                sessionId = latestAny?.id ?? null;
               } catch {
                 // ignore lookup failure
               }
             }
 
             // For Gemini, prefer newest session file (Gemini keeps per-project chats)
-            if (entry.toolId === "gemini-cli") {
+            if (!sessionId && entry.toolId === "gemini-cli") {
               try {
-                const gemSession = await findLatestGeminiSession(
-                  selectedWorktreePath ??
-                    selectedBranch?.displayName ??
-                    workingDirectory,
-                  {
-                    ...(entry.timestamp !== null && entry.timestamp !== undefined
-                      ? { since: entry.timestamp - 60_000, preferClosestTo: entry.timestamp }
-                      : {}),
-                    windowMs: 60 * 60 * 1000,
-                  },
-                );
-                if (gemSession?.id) sessionId = gemSession.id;
+                const gemSession = await findLatestGeminiSession(worktree, {
+                  ...(entry.timestamp !== null && entry.timestamp !== undefined
+                    ? {
+                        since: entry.timestamp - 60_000,
+                        preferClosestTo: entry.timestamp,
+                      }
+                    : {}),
+                  windowMs: 60 * 60 * 1000,
+                });
+                sessionId = gemSession?.id ?? null;
               } catch {
                 // ignore
               }
@@ -1165,18 +1095,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     ],
   );
 
-  // Handle session selection
-  const handleSessionSelect = useCallback(
-    (session: string) => {
-      const execution = pendingExecution ?? {
-        mode: "resume" as ExecutionMode,
-        skipPermissions: false,
-      };
-      completeSelection(execution.mode, execution.skipPermissions, session);
-    },
-    [pendingExecution, completeSelection],
-  );
-
   const handleQuickStartSelect = useCallback(
     (action: QuickStartAction, toolId?: AITool | null) => {
       if (action === "manual" || !branchQuickStart.length) {
@@ -1228,14 +1146,9 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
   // Handle execution mode and skipPermissions selection
   const handleModeSelect = useCallback(
     (result: { mode: ExecutionMode; skipPermissions: boolean }) => {
-      if (result.mode === "resume") {
-        setPendingExecution(result);
-        navigateTo("session-selector");
-        return;
-      }
       completeSelection(result.mode, result.skipPermissions, null);
     },
-    [completeSelection, navigateTo],
+    [completeSelection],
   );
 
   // Render screen based on currentScreen
@@ -1345,19 +1258,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
           />
         );
 
-      case "session-selector":
-        // TODO: Implement session data fetching
-        return (
-          <SessionSelectorScreen
-            sessions={sessionOptions}
-            loading={sessionLoading}
-            errorMessage={sessionError}
-            onBack={goBack}
-            onSelect={handleSessionSelect}
-            version={version}
-          />
-        );
-
       case "execution-mode-selector":
         return (
           <ExecutionModeSelectorScreen

package/src/cli/ui/components/common/Select.tsx

@@ -164,8 +164,8 @@ const SelectComponent = <T extends SelectItem = SelectItem>({
 
         return newIndex;
       });
-    } else if (key.return) {
-      // Select current item
+    } else if (key.return || input === "\n") {
+      // Select current item (handle both CR in raw mode and LF in cooked mode)
       const selectedItem = items[selectedIndex];
       if (selectedItem && !disabled) {
         onSelect(selectedItem);

package/src/cli/ui/components/screens/BranchListScreen.tsx

@@ -125,9 +125,11 @@ export function BranchListScreen({
   onToggleSelect,
 }: BranchListScreenProps) {
   const { rows } = useTerminalSize();
-  const headerText =
-    "  Legend: [ ]/[ * ] select  🟢/⚪ worktree  🛡/⚠ safe";
-  const selectedSet = useMemo(() => new Set(selectedBranches), [selectedBranches]);
+  const headerText = "  Legend: [ ]/[ * ] select  🟢/⚪ worktree  🛡/⚠ safe";
+  const selectedSet = useMemo(
+    () => new Set(selectedBranches),
+    [selectedBranches],
+  );
 
   // Filter state - allow test control via props
   const [internalFilterQuery, setInternalFilterQuery] = useState("");
@@ -308,25 +310,28 @@ export function BranchListScreen({
     return result + ellipsis;
   }, []);
 
-  const colorToolLabel = useCallback((label: string, toolId?: string | null) => {
-    switch (toolId) {
-      case "claude-code":
-        return chalk.hex("#ffaf00")(label); // orange-ish
-      case "codex-cli":
-        return chalk.cyan(label);
-      case "gemini-cli":
-        return chalk.magenta(label);
-      case "qwen-cli":
-        return chalk.green(label);
-      default: {
-        const trimmed = label.trim().toLowerCase();
-        if (!toolId || trimmed === "unknown") {
-          return chalk.gray(label);
+  const colorToolLabel = useCallback(
+    (label: string, toolId?: string | null) => {
+      switch (toolId) {
+        case "claude-code":
+          return chalk.hex("#ffaf00")(label); // orange-ish
+        case "codex-cli":
+          return chalk.cyan(label);
+        case "gemini-cli":
+          return chalk.magenta(label);
+        case "qwen-cli":
+          return chalk.green(label);
+        default: {
+          const trimmed = label.trim().toLowerCase();
+          if (!toolId || trimmed === "unknown") {
+            return chalk.gray(label);
+          }
+          return chalk.white(label);
         }
-        return chalk.white(label);
       }
-    }
-  }, []);
+    },
+    [],
+  );
 
   const renderBranchRow = useCallback(
     (item: BranchItem, isSelected: boolean, context: { columns: number }) => {
@@ -450,7 +455,9 @@ export function BranchListScreen({
 
       // 端末幅を超えた場合は隙間→ラベルの順で詰めて収める
       const clampToWidth = () => {
-        const finalWidth = measureDisplayWidth(stripAnsi(lineWithColoredTimestamp));
+        const finalWidth = measureDisplayWidth(
+          stripAnsi(lineWithColoredTimestamp),
+        );
         if (finalWidth <= columns) {
           return;
         }

package/src/cli/ui/components/screens/BranchQuickStartScreen.tsx

@@ -25,13 +25,12 @@ const REASONING_LABELS: Record<string, string> = {
 };
 
 const formatReasoning = (level?: string | null) =>
-  level ? REASONING_LABELS[level] ?? level : "Default";
+  level ? (REASONING_LABELS[level] ?? level) : "Default";
 
 const formatSkip = (skip?: boolean | null) =>
   skip === true ? "Yes" : skip === false ? "No" : "No";
 
-const supportsReasoning = (toolId?: string | null) =>
-  toolId === "codex-cli";
+const supportsReasoning = (toolId?: string | null) => toolId === "codex-cli";
 
 const describe = (opt: BranchQuickStartOption, includeSessionId = true) => {
   const parts = [`Model: ${opt.model ?? "default"}`];
@@ -103,45 +102,45 @@ export function BranchQuickStartScreen({
   const items: QuickStartItem[] = previousOptions.length
     ? (() => {
         const order = ["Claude", "Codex", "Gemini", "Qwen", "Other"];
-      const sorted = [...previousOptions].sort((a, b) => {
-        const ca = resolveCategory(a.toolId).label;
-        const cb = resolveCategory(b.toolId).label;
-        return order.indexOf(ca) - order.indexOf(cb);
-      });
+        const sorted = [...previousOptions].sort((a, b) => {
+          const ca = resolveCategory(a.toolId).label;
+          const cb = resolveCategory(b.toolId).label;
+          return order.indexOf(ca) - order.indexOf(cb);
+        });
 
-      const flat: QuickStartItem[] = [];
+        const flat: QuickStartItem[] = [];
         sorted.forEach((opt, idx) => {
           const cat = resolveCategory(opt.toolId);
           const prevCat =
             idx > 0 ? resolveCategory(sorted[idx - 1]?.toolId).label : null;
           const isNewCategory = prevCat !== cat.label;
 
-        flat.push(
-          {
-            label: "Resume",
-            value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
-            action: "reuse-continue",
-            toolId: opt.toolId ?? null,
-            description: describe(opt, true),
-            groupStart: isNewCategory && flat.length > 0,
-            category: cat.label,
-            categoryColor: cat.color,
-          },
-          {
-            label: "New",
-            value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
-            action: "reuse-new",
-            toolId: opt.toolId ?? null,
-            description: describe(opt, false),
-            groupStart: false,
-            category: cat.label,
-            categoryColor: cat.color,
-          },
-        );
-      });
-
-      return flat;
-    })()
+          flat.push(
+            {
+              label: "Resume",
+              value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
+              action: "reuse-continue",
+              toolId: opt.toolId ?? null,
+              description: describe(opt, true),
+              groupStart: isNewCategory && flat.length > 0,
+              category: cat.label,
+              categoryColor: cat.color,
+            },
+            {
+              label: "New",
+              value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
+              action: "reuse-new",
+              toolId: opt.toolId ?? null,
+              description: describe(opt, false),
+              groupStart: false,
+              category: cat.label,
+              categoryColor: cat.color,
+            },
+          );
+        });
+
+        return flat;
+      })()
     : [
         {
           label: "Resume with previous settings",
@@ -180,11 +179,7 @@ export function BranchQuickStartScreen({
 
   return (
     <Box flexDirection="column" height={containerHeight}>
-      <Header
-        title="Quick Start"
-        titleColor="cyan"
-        version={version}
-      />
+      <Header title="Quick Start" titleColor="cyan" version={version} />
 
       <Box flexDirection="column" flexGrow={1} marginTop={1}>
         <Box marginBottom={1} flexDirection="column">
@@ -197,6 +192,7 @@ export function BranchQuickStartScreen({
         </Box>
         <Select
           items={items}
+          disabled={loading}
           onSelect={(item: QuickStartItem) => {
             if (item.disabled) return;
             onSelect(item.action, item.toolId ?? null);
@@ -204,13 +200,12 @@ export function BranchQuickStartScreen({
           renderItem={(item: QuickStartItem, isSelected) => (
             <Box
               flexDirection="column"
-              marginTop={item.groupStart ? 1 : item.category === "Other" ? 1 : 0}
+              marginTop={
+                item.groupStart ? 1 : item.category === "Other" ? 1 : 0
+              }
             >
               <Text>
-                <Text
-                  color={item.categoryColor}
-                  inverse={isSelected}
-                >
+                <Text color={item.categoryColor} inverse={isSelected}>
                   {`[${item.category}] `}
                 </Text>
                 <Text inverse={isSelected}>
@@ -219,7 +214,7 @@ export function BranchQuickStartScreen({
                 </Text>
               </Text>
               {item.description && (
-                <Text color="gray">  {item.description}</Text>
+                <Text color="gray"> {item.description}</Text>
               )}
             </Box>
           )}

package/src/cli/ui/utils/continueSession.ts

@@ -17,13 +17,7 @@ export interface ContinueSessionContext {
 export async function resolveContinueSessionId(
   context: ContinueSessionContext,
 ): Promise<string | null> {
-  const {
-    history,
-    sessionData,
-    branch,
-    toolId,
-    repoRoot,
-  } = context;
+  const { history, sessionData, branch, toolId, repoRoot: _repoRoot } = context;
 
   // 1) 履歴から最新マッチを探す（末尾から遡る）
   for (let i = history.length - 1; i >= 0; i -= 1) {