@akiojin/gwt 3.1.2 → 4.0.1

package/src/claude.ts

@@ -1,10 +1,20 @@
-import { execa } from "execa";
+import { execa, type Options as ExecaOptions } from "execa";
 import chalk from "chalk";
 import { existsSync } from "fs";
-import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
+import {
+  createChildStdio,
+  getTerminalStreams,
+  resetTerminalModes,
+} from "./utils/terminal.js";
+import { isCommandAvailable } from "./utils/command.js";
 import { findLatestClaudeSession } from "./utils/session.js";
 
 const CLAUDE_CLI_PACKAGE = "@anthropic-ai/claude-code@latest";
+
+/**
+ * Error wrapper used by `launchClaudeCode` to preserve the original failure
+ * while providing a user-friendly message.
+ */
 export class ClaudeError extends Error {
   constructor(
     message: string,
@@ -15,6 +25,20 @@ export class ClaudeError extends Error {
   }
 }
 
+/**
+ * Launches Claude Code in the given worktree path.
+ *
+ * This function:
+ * - validates the worktree path
+ * - normalizes launch arguments (mode/model/session/extra args)
+ * - resets terminal modes before and after the child process
+ * - auto-detects a local `claude` command and falls back to `npx` (Windows) or
+ *   `bunx` when needed
+ *
+ * @param worktreePath - Worktree directory to run Claude Code in
+ * @param options - Launch options (mode/session/model/permissions/env)
+ * @returns Captured session id when available
+ */
 export async function launchClaudeCode(
   worktreePath: string,
   options: {
@@ -175,6 +199,7 @@ export async function launchClaudeCode(
     console.log(chalk.gray(`   📋 Args: ${args.join(" ")}`));
 
     terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
 
     const baseEnv = { ...process.env, ...(options.envOverrides ?? {}) };
     const launchEnvSource =
@@ -191,26 +216,58 @@ export async function launchClaudeCode(
 
     // Auto-detect locally installed claude command
     const hasLocalClaude = await isClaudeCommandAvailable();
+    const hasNpx =
+      process.platform === "win32" ? await isNpxCommandAvailable() : false;
+
+    const execInteractive = async (
+      file: string,
+      fileArgs: string[],
+      execOptions: Omit<ExecaOptions, "shell">,
+    ) => {
+      if (process.platform !== "win32") {
+        await execa(file, fileArgs, { ...execOptions, shell: true });
+        return;
+      }
+
+      try {
+        await execa(file, fileArgs, { ...execOptions, shell: false });
+        return;
+      } catch (error: unknown) {
+        const err = error as NodeJS.ErrnoException;
+        if (err?.code === "ENOENT" || err?.code === "EINVAL") {
+          await execa(file, fileArgs, { ...execOptions, shell: true });
+          return;
+        }
+        throw error;
+      }
+    };
 
     try {
       if (hasLocalClaude) {
         console.log(
           chalk.green("   ✨ Using locally installed claude command"),
         );
-        await execa("claude", args, {
+        await execInteractive("claude", args, {
           cwd: worktreePath,
-          shell: true,
           stdin: childStdio.stdin,
           stdout: childStdio.stdout,
           stderr: childStdio.stderr,
           env: launchEnv,
         });
       } else {
-        console.log(
-          chalk.cyan(
-            "   🔄 Falling back to bunx @anthropic-ai/claude-code@latest",
-          ),
-        );
+        if (hasNpx) {
+          console.log(
+            chalk.cyan(
+              "   🔄 Falling back to npx @anthropic-ai/claude-code@latest",
+            ),
+          );
+        } else {
+          console.log(
+            chalk.cyan(
+              "   🔄 Falling back to bunx @anthropic-ai/claude-code@latest",
+            ),
+          );
+        }
         console.log(
           chalk.yellow(
             "   💡 Recommended: Install Claude Code via official method for faster startup",
@@ -231,14 +288,23 @@ export async function launchClaudeCode(
         );
         console.log("");
         await new Promise((resolve) => setTimeout(resolve, 2000));
-        await execa("bunx", [CLAUDE_CLI_PACKAGE, ...args], {
-          cwd: worktreePath,
-          shell: true,
-          stdin: childStdio.stdin,
-          stdout: childStdio.stdout,
-          stderr: childStdio.stderr,
-          env: launchEnv,
-        });
+        if (hasNpx) {
+          await execInteractive("npx", ["-y", CLAUDE_CLI_PACKAGE, ...args], {
+            cwd: worktreePath,
+            stdin: childStdio.stdin,
+            stdout: childStdio.stdout,
+            stderr: childStdio.stderr,
+            env: launchEnv,
+          });
+        } else {
+          await execInteractive("bunx", [CLAUDE_CLI_PACKAGE, ...args], {
+            cwd: worktreePath,
+            stdin: childStdio.stdin,
+            stdout: childStdio.stdout,
+            stderr: childStdio.stderr,
+            env: launchEnv,
+          });
+        }
       }
     } finally {
       childStdio.cleanup();
@@ -327,29 +393,21 @@ export async function launchClaudeCode(
     throw new ClaudeError(errorMessage, error);
   } finally {
     terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
   }
 }
 
-/**
- * Check if locally installed `claude` command is available
- * @returns true if `claude` command exists in PATH, false otherwise
- */
 async function isClaudeCommandAvailable(): Promise<boolean> {
-  try {
-    const command = process.platform === "win32" ? "where" : "which";
-    await execa(command, ["claude"], {
-      shell: true,
-      stdin: "ignore",
-      stdout: "ignore",
-      stderr: "ignore",
-    });
-    return true;
-  } catch {
-    // claude command not found in PATH
-    return false;
-  }
+  return isCommandAvailable("claude");
 }
 
+async function isNpxCommandAvailable(): Promise<boolean> {
+  return isCommandAvailable("npx");
+}
+
+/**
+ * Checks whether Claude Code is available via `bunx` in the current environment.
+ */
 export async function isClaudeCodeAvailable(): Promise<boolean> {
   try {
     await execa("bunx", [CLAUDE_CLI_PACKAGE, "--version"], { shell: true });

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

@@ -204,6 +204,8 @@ describe("App protected branch handling", () => {
     });
 
     expect(navigateToMock).toHaveBeenCalledWith("branch-action-selector");
-    expect(branchQuickStartProps).not.toHaveLength(0);
+    // When branchQuickStart is empty, navigates to ai-tool-selector instead of branch-quick-start
+    // So AIToolSelectorScreen should be rendered, not BranchQuickStartScreen
+    expect(aiToolProps).not.toHaveLength(0);
   });
 });

package/src/cli/ui/__tests__/components/ModelSelectorScreen.initial.test.tsx

@@ -3,7 +3,7 @@
  */
 import React from "react";
 import { describe, it, expect, beforeEach, vi } from "vitest";
-import { render, waitFor, fireEvent, screen } from "@testing-library/react";
+import { render, waitFor } from "@testing-library/react";
 import { ModelSelectorScreen } from "../../components/screens/ModelSelectorScreen.js";
 import type { ModelSelectionResult } from "../../components/screens/ModelSelectorScreen.js";
 import { Window } from "happy-dom";
@@ -55,8 +55,9 @@ describe("ModelSelectorScreen initial selection", () => {
     await waitFor(() => expect(selectMocks.length).toBeGreaterThan(0));
     const modelSelect = selectMocks.at(-1);
     const index = modelSelect.initialIndex as number;
-    // codex-cli models: [gpt-5.1-codex, gpt-5.2, gpt-5.1-codex-max, gpt-5.1-codex-mini, gpt-5.1]
-    expect(index).toBe(2);
+    // codex-cli models: ["", gpt-5.1-codex, gpt-5.2, gpt-5.1-codex-max, gpt-5.1-codex-mini, gpt-5.1]
+    // (index 0 = Default/Auto, index 3 = gpt-5.1-codex-max)
+    expect(index).toBe(3);
   });
 
   it("includes gpt-5.2 in model options and preserves ordering", async () => {
@@ -75,9 +76,11 @@ describe("ModelSelectorScreen initial selection", () => {
     );
 
     await waitFor(() => expect(selectMocks.length).toBeGreaterThan(1));
-    const modelSelect = selectMocks.at(-1)!;
-    const ids = modelSelect.items.map((item) => item.value);
+    const modelSelect = selectMocks.at(-1);
+    expect(modelSelect).toBeDefined();
+    const ids = modelSelect?.items.map((item) => item.value);
     expect(ids).toEqual([
+      "", // Default (Auto)
       "gpt-5.1-codex",
       "gpt-5.2",
       "gpt-5.1-codex-max",

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

@@ -1,11 +1,18 @@
 import React, { useEffect, useState } from "react";
-import { Box, Text, useInput, useStdout } from "ink";
+import { Box, Text, useStdout } from "ink";
+import { useAppInput } from "../../hooks/useAppInput.js";
 
+/**
+ * Item descriptor for the `Select` component.
+ */
 export interface SelectItem {
   label: string;
   value: string;
 }
 
+/**
+ * Props for the `Select` component.
+ */
 export interface SelectProps<T extends SelectItem = SelectItem> {
   items: T[];
   onSelect: (item: T) => void;
@@ -133,7 +140,7 @@ const SelectComponent = <T extends SelectItem = SelectItem>({
     }
   }, [items, limit]);
 
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (disabled) {
       return;
     }

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

@@ -1,19 +1,26 @@
 import React, { useState, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import { getAllTools } from "../../../../config/tools.js";
 import type { AIToolConfig } from "../../../../types/tools.js";
 import type { AITool } from "../../types.js";
 
+/**
+ * Renderable item for the AI tool selector list.
+ */
 export interface AIToolItem {
   label: string;
   value: AITool;
   description: string;
 }
 
+/**
+ * Props for `AIToolSelectorScreen`.
+ */
 export interface AIToolSelectorScreenProps {
   onBack: () => void;
   onSelect: (tool: AITool) => void;
@@ -96,7 +103,7 @@ export function AIToolSelectorScreen({
 
   // Handle keyboard input
   // Note: Select component handles Enter and arrow keys
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (key.escape) {
       onBack();
     }

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

@@ -1,12 +1,16 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { ProgressBar } from "../parts/ProgressBar.js";
 import { MergeStatusList } from "../parts/MergeStatusList.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { BatchMergeProgress, BranchMergeStatus } from "../../types.js";
 
+/**
+ * Props for `BatchMergeProgressScreen`.
+ */
 export interface BatchMergeProgressScreenProps {
   progress: BatchMergeProgress;
   statuses: BranchMergeStatus[];
@@ -26,7 +30,7 @@ export function BatchMergeProgressScreen({
   const { rows } = useTerminalSize();
 
   // Handle keyboard input
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if ((input === "q" || key.escape) && onCancel) {
       onCancel();
     }

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

@@ -1,11 +1,15 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { MergeStatusList } from "../parts/MergeStatusList.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { BatchMergeResult } from "../../types.js";
 
+/**
+ * Props for `BatchMergeResultScreen`.
+ */
 export interface BatchMergeResultScreenProps {
   result: BatchMergeResult;
   onBack?: () => void;
@@ -25,7 +29,7 @@ export function BatchMergeResultScreen({
   const { rows } = useTerminalSize();
 
   // Handle keyboard input
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (input === "q" && onQuit) {
       onQuit();
     } else if (key.escape && onBack) {

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

@@ -1,9 +1,10 @@
 import React, { useState, useCallback, useEffect, useRef } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
 import { Input } from "../common/Input.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import { BRANCH_PREFIXES } from "../../../../config/constants.js";
 
@@ -12,6 +13,9 @@ type Step = "type-selection" | "name-input";
 
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧"];
 
+/**
+ * Props for `BranchCreatorScreen`.
+ */
 export interface BranchCreatorScreenProps {
   onBack: () => void;
   onCreate: (branchName: string) => Promise<void>;
@@ -52,7 +56,7 @@ export function BranchCreatorScreen({
   const spinnerFrame = SPINNER_FRAMES[spinnerIndex] ?? SPINNER_FRAMES[0];
 
   // Handle keyboard input for back navigation
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (isCreating) {
       return;
     }

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

@@ -1,11 +1,12 @@
 import React, { useCallback, useState, useMemo, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Stats } from "../parts/Stats.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
 import { Input } from "../common/Input.js";
 import { LoadingIndicator } from "../common/LoadingIndicator.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { BranchItem, Statistics } from "../../types.js";
 import stringWidth from "string-width";
@@ -77,6 +78,9 @@ interface CleanupUIState {
   inputLocked: boolean;
 }
 
+/**
+ * Props for `BranchListScreen`.
+ */
 export interface BranchListScreenProps {
   branches: BranchItem[];
   stats: Statistics;
@@ -166,7 +170,7 @@ export function BranchListScreen({
   // Handle keyboard input
   // Note: Input component blocks specific keys (c/r/f) using blockKeys prop
   // This prevents shortcuts from triggering while typing in the filter
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (cleanupUI?.inputLocked) {
       return;
     }
@@ -326,8 +330,6 @@ export function BranchListScreen({
           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") {

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

@@ -1,16 +1,23 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select, type SelectItem } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
+/**
+ * Action returned by `BranchQuickStartScreen`.
+ */
 export type QuickStartAction = "reuse-continue" | "reuse-new" | "manual";
 
+/**
+ * Previous tool/session configuration shown in the quick start list.
+ */
 export interface BranchQuickStartOption {
   toolId?: string | null;
   toolLabel: string;
-  toolCategory?: "Codex" | "Claude" | "Gemini" | "Qwen" | "Other";
+  toolCategory?: "Codex" | "Claude" | "Gemini" | "Other";
   model?: string | null;
   sessionId?: string | null;
   inferenceLevel?: string | null;
@@ -54,6 +61,9 @@ type QuickStartItem = SelectItem & {
   categoryColor: "cyan" | "yellow" | "magenta" | "green" | "white";
 };
 
+/**
+ * Props for `BranchQuickStartScreen`.
+ */
 export interface BranchQuickStartScreenProps {
   previousOptions: BranchQuickStartOption[];
   loading?: boolean;
@@ -78,7 +88,6 @@ export function BranchQuickStartScreen({
     "codex-cli": { label: "Codex", color: "cyan" },
     "claude-code": { label: "Claude", color: "yellow" },
     "gemini-cli": { label: "Gemini", color: "magenta" },
-    "qwen-cli": { label: "Qwen", color: "green" },
     other: { label: "Other", color: "white" },
   } as const;
 
@@ -92,8 +101,6 @@ export function BranchQuickStartScreen({
         return CATEGORY_META["claude-code"];
       case "gemini-cli":
         return CATEGORY_META["gemini-cli"];
-      case "qwen-cli":
-        return CATEGORY_META["qwen-cli"];
       default:
         return CATEGORY_META.other;
     }
@@ -101,7 +108,7 @@ export function BranchQuickStartScreen({
 
   const items: QuickStartItem[] = previousOptions.length
     ? (() => {
-        const order = ["Claude", "Codex", "Gemini", "Qwen", "Other"];
+        const order = ["Claude", "Codex", "Gemini", "Other"];
         const sorted = [...previousOptions].sort((a, b) => {
           const ca = resolveCategory(a.toolId).label;
           const cb = resolveCategory(b.toolId).label;
@@ -171,7 +178,7 @@ export function BranchQuickStartScreen({
     categoryColor: CATEGORY_META.other.color,
   });
 
-  useInput((_, key) => {
+  useAppInput((_, key) => {
     if (key.escape) {
       onBack();
     }
@@ -197,27 +204,29 @@ export function BranchQuickStartScreen({
             if (item.disabled) return;
             onSelect(item.action, item.toolId ?? null);
           }}
-          renderItem={(item: QuickStartItem, isSelected) => (
-            <Box
-              flexDirection="column"
-              marginTop={
-                item.groupStart ? 1 : item.category === "Other" ? 1 : 0
-              }
-            >
-              <Text>
-                <Text color={item.categoryColor} inverse={isSelected}>
-                  {`[${item.category}] `}
+          renderItem={(item: QuickStartItem, isSelected) => {
+            return (
+              <Box
+                flexDirection="column"
+                marginTop={
+                  item.groupStart ? 1 : item.category === "Other" ? 1 : 0
+                }
+              >
+                <Text>
+                  <Text color={item.categoryColor} inverse={isSelected}>
+                    {`[${item.category}] `}
+                  </Text>
+                  <Text inverse={isSelected}>
+                    {item.label}
+                    {item.disabled ? " (disabled)" : ""}
+                  </Text>
                 </Text>
-                <Text inverse={isSelected}>
-                  {item.label}
-                  {item.disabled ? " (disabled)" : ""}
-                </Text>
-              </Text>
-              {item.description && (
-                <Text color="gray"> {item.description}</Text>
-              )}
-            </Box>
-          )}
+                {item.description && (
+                  <Text color="gray"> {item.description}</Text>
+                )}
+              </Box>
+            );
+          }}
         />
       </Box>
 

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

@@ -6,16 +6,20 @@
  */
 
 import React, { useState, useCallback, useMemo, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
 import { Input } from "../common/Input.js";
 import { Confirm } from "../common/Confirm.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import { useProfiles } from "../../hooks/useProfiles.js";
 import { isValidProfileName } from "../../../../types/profiles.js";
 
+/**
+ * Props for `EnvironmentProfileScreen`.
+ */
 export interface EnvironmentProfileScreenProps {
   onBack: () => void;
   version?: string | null;
@@ -432,7 +436,7 @@ export function EnvironmentProfileScreen({
   );
 
   // キーボード入力ハンドリング
-  useInput(
+  useAppInput(
     (input, key) => {
       // 入力モード時は他のキーハンドリングをスキップ
       if (

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

@@ -1,29 +1,45 @@
 import React, { useState } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
+/**
+ * Supported execution modes for interactive tools.
+ */
 export type ExecutionMode = "normal" | "continue" | "resume";
 
+/**
+ * Selectable execution mode item (step 1).
+ */
 export interface ExecutionModeItem {
   label: string;
   value: ExecutionMode;
   description: string;
 }
 
+/**
+ * Selectable skip-permissions item (step 2).
+ */
 export interface SkipPermissionsItem {
   label: string;
   value: string; // "yes" or "no"
   description: string;
 }
 
+/**
+ * Result returned by `ExecutionModeSelectorScreen`.
+ */
 export interface ExecutionModeResult {
   mode: ExecutionMode;
   skipPermissions: boolean;
 }
 
+/**
+ * Props for `ExecutionModeSelectorScreen`.
+ */
 export interface ExecutionModeSelectorScreenProps {
   onBack: () => void;
   onSelect: (result: ExecutionModeResult) => void;
@@ -48,7 +64,7 @@ export function ExecutionModeSelectorScreen({
   const [selectedMode, setSelectedMode] = useState<ExecutionMode | null>(null);
 
   // Handle keyboard input
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (key.escape) {
       if (step === 2) {
         // Go back to step 1