@akiojin/gwt 4.0.0 → 4.0.1

package/src/cli/ui/screens/__tests__/BranchActionSelectorScreen.test.tsx

@@ -2,7 +2,8 @@
  * @vitest-environment happy-dom
  */
 import { describe, it, expect, beforeEach, vi } from "vitest";
-import { render } from "@testing-library/react";
+import { act, render } from "@testing-library/react";
+import { render as inkRender } from "ink-testing-library";
 import React from "react";
 import { BranchActionSelectorScreen } from "../BranchActionSelectorScreen.js";
 import { Window } from "happy-dom";
@@ -149,4 +150,70 @@ describe("BranchActionSelectorScreen", () => {
     // For now, we verify the component structure and callbacks are set up
     expect(onCreateNew).not.toHaveBeenCalled();
   });
+
+  it("should treat split down-arrow sequence as navigation (WSL2) and not as Escape", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+
+    const inkApp = inkRender(
+      <BranchActionSelectorScreen
+        selectedBranch="feature-test"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+      />,
+    );
+
+    act(() => {
+      inkApp.stdin.write("\u001b");
+      inkApp.stdin.write("[");
+      inkApp.stdin.write("B");
+    });
+
+    act(() => {
+      inkApp.stdin.write("\r");
+    });
+
+    expect(onBack).not.toHaveBeenCalled();
+    expect(onCreateNew).toHaveBeenCalledTimes(1);
+    expect(onUseExisting).not.toHaveBeenCalled();
+
+    inkApp.unmount();
+  });
+
+  it("should still handle Escape key as back navigation", () => {
+    vi.useFakeTimers();
+    let inkApp: ReturnType<typeof inkRender> | undefined;
+
+    try {
+      const onUseExisting = vi.fn();
+      const onCreateNew = vi.fn();
+      const onBack = vi.fn();
+
+      inkApp = inkRender(
+        <BranchActionSelectorScreen
+          selectedBranch="feature-test"
+          onUseExisting={onUseExisting}
+          onCreateNew={onCreateNew}
+          onBack={onBack}
+        />,
+      );
+
+      act(() => {
+        inkApp.stdin.write("\u001b");
+      });
+
+      act(() => {
+        vi.advanceTimersByTime(25);
+      });
+
+      expect(onBack).toHaveBeenCalledTimes(1);
+      expect(onCreateNew).not.toHaveBeenCalled();
+      expect(onUseExisting).not.toHaveBeenCalled();
+    } finally {
+      inkApp?.unmount();
+      vi.useRealTimers();
+    }
+  });
 });

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

@@ -98,7 +98,6 @@ function mapToolLabel(toolId: string, toolLabel?: string): string {
   if (toolId === "claude-code") return "Claude";
   if (toolId === "codex-cli") return "Codex";
   if (toolId === "gemini-cli") return "Gemini";
-  if (toolId === "qwen-cli") return "Qwen";
   if (toolLabel) return toolLabel;
   return "Custom";
 }

package/src/cli/ui/utils/modelOptions.test.ts

@@ -63,6 +63,6 @@ describe("modelOptions", () => {
   });
 
   it("returns no models for unsupported tools", () => {
-    expect(byId("qwen-cli")).toEqual([]);
+    expect(byId("unknown-tool")).toEqual([]);
   });
 });

package/src/codex.ts

@@ -2,16 +2,36 @@ import { execa } from "execa";
 import chalk from "chalk";
 import { platform } from "os";
 import { existsSync } from "fs";
-import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
+import {
+  createChildStdio,
+  getTerminalStreams,
+  resetTerminalModes,
+} from "./utils/terminal.js";
 import { findLatestCodexSession } from "./utils/session.js";
 
 const CODEX_CLI_PACKAGE = "@openai/codex@latest";
 
+/**
+ * Reasoning effort levels supported by Codex CLI.
+ */
 export type CodexReasoningEffort = "low" | "medium" | "high" | "xhigh";
 
+/**
+ * Default Codex model used when no override is provided.
+ */
 export const DEFAULT_CODEX_MODEL = "gpt-5.1-codex";
+
+/**
+ * Default reasoning effort used when no override is provided.
+ */
 export const DEFAULT_CODEX_REASONING_EFFORT: CodexReasoningEffort = "high";
 
+/**
+ * Builds the default argument list for Codex CLI launch.
+ *
+ * @param model - Model name to pass via `--model`
+ * @param reasoningEffort - Reasoning effort to pass via config
+ */
 export const buildDefaultCodexArgs = (
   model: string = DEFAULT_CODEX_MODEL,
   reasoningEffort: CodexReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT,
@@ -37,6 +57,10 @@ export const buildDefaultCodexArgs = (
   "shell_environment_policy.experimental_use_profile=true",
 ];
 
+/**
+ * Error wrapper used by `launchCodexCLI` to preserve the original failure
+ * while providing a user-friendly message.
+ */
 export class CodexError extends Error {
   constructor(
     message: string,
@@ -47,6 +71,16 @@ export class CodexError extends Error {
   }
 }
 
+/**
+ * Launches Codex CLI in the given worktree path.
+ *
+ * This function resets terminal modes before and after the child process and
+ * tries to detect a session id after launch (when supported).
+ *
+ * @param worktreePath - Worktree directory to run Codex CLI in
+ * @param options - Launch options (mode/session/model/reasoning/env)
+ * @returns Captured session id when available
+ */
 export async function launchCodexCLI(
   worktreePath: string,
   options: {
@@ -133,6 +167,7 @@ export async function launchCodexCLI(
     console.log(chalk.gray(`   📋 Args: ${args.join(" ")}`));
 
     terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
 
     const childStdio = createChildStdio();
 
@@ -235,9 +270,13 @@ export async function launchCodexCLI(
     throw new CodexError(errorMessage, error);
   } finally {
     terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
   }
 }
 
+/**
+ * Checks whether Codex CLI is available via `bunx` in the current environment.
+ */
 export async function isCodexAvailable(): Promise<boolean> {
   try {
     await execa("bunx", [CODEX_CLI_PACKAGE, "--help"]);

package/src/config/builtin-tools.ts

@@ -1,7 +1,7 @@
 /**
  * ビルトインAIツール定義
  *
- * Claude Code、Codex、Gemini、Qwen の CustomAITool 形式定義
+ * Claude Code、Codex、Gemini の CustomAITool 形式定義
  */
 
 import type { CustomAITool } from "../types/tools.js";
@@ -58,25 +58,6 @@ export const GEMINI_CLI_TOOL: CustomAITool = {
   permissionSkipArgs: ["-y"],
 };
 
-/**
- * Qwen のビルトイン定義
- *
- * NOTE: 現在は未サポート（選択画面には表示しない）。ID予約のため定義のみ残す。
- */
-export const QWEN_CLI_TOOL: CustomAITool = {
-  id: "qwen-cli",
-  displayName: "Qwen",
-  type: "bunx",
-  command: "@qwen-code/qwen-code@latest",
-  defaultArgs: ["--checkpointing"],
-  modeArgs: {
-    normal: [],
-    continue: [],
-    resume: [],
-  },
-  permissionSkipArgs: ["--yolo"],
-};
-
 /**
  * すべてのビルトインツール
  */
@@ -84,5 +65,4 @@ export const BUILTIN_TOOLS: CustomAITool[] = [
   CLAUDE_CODE_TOOL,
   CODEX_CLI_TOOL,
   GEMINI_CLI_TOOL,
-  QWEN_CLI_TOOL,
 ];

package/src/config/tools.ts

@@ -299,17 +299,13 @@ export async function getToolById(
 export async function getAllTools(): Promise<AIToolConfig[]> {
   const config = await loadToolsConfig();
 
-  // Builtin tools that are reserved but not exposed in selectors.
-  // These IDs remain blocked from customTools to avoid ambiguity.
-  const UNSUPPORTED_BUILTIN_TOOL_IDS = new Set<string>(["qwen-cli"]);
-
   // ビルトインツールをAIToolConfig形式に変換
   const builtinConfigs: AIToolConfig[] = BUILTIN_TOOLS.map((tool) => ({
     id: tool.id,
     displayName: tool.displayName,
     ...(tool.icon ? { icon: tool.icon } : {}),
     isBuiltin: true,
-  })).filter((tool) => !UNSUPPORTED_BUILTIN_TOOL_IDS.has(tool.id));
+  }));
 
   // カスタムツールをAIToolConfig形式に変換
   const customConfigs: AIToolConfig[] = config.customTools.map((tool) => ({

package/src/gemini.ts

@@ -1,11 +1,20 @@
 import { execa } 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 { findLatestGeminiSessionId } from "./utils/session.js";
 
 const GEMINI_CLI_PACKAGE = "@google/gemini-cli@latest";
 
+/**
+ * Error wrapper used by `launchGeminiCLI` to preserve the original failure
+ * while providing a user-friendly message.
+ */
 export class GeminiError extends Error {
   constructor(
     message: string,
@@ -16,6 +25,16 @@ export class GeminiError extends Error {
   }
 }
 
+/**
+ * Launches Gemini CLI in the given worktree path.
+ *
+ * This function resets terminal modes before and after the child process and
+ * supports continue/resume modes when a session id is available.
+ *
+ * @param worktreePath - Worktree directory to run Gemini CLI in
+ * @param options - Launch options (mode/session/model/permissions/env)
+ * @returns Captured session id when available
+ */
 export async function launchGeminiCLI(
   worktreePath: string,
   options: {
@@ -119,6 +138,7 @@ export async function launchGeminiCLI(
       );
     }
     terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
 
     const baseEnv = Object.fromEntries(
       Object.entries({
@@ -132,7 +152,7 @@ export async function launchGeminiCLI(
     const childStdio = createChildStdio();
 
     // Auto-detect locally installed gemini command
-    const hasLocalGemini = await isGeminiCommandAvailable();
+    const hasLocalGemini = await isCommandAvailable("gemini");
 
     // Preserve TTY for interactive UI (colors/width) by inheriting stdout/stderr.
     // Session ID is determined via file-based detection after exit.
@@ -243,7 +263,7 @@ export async function launchGeminiCLI(
 
     return capturedSessionId ? { sessionId: capturedSessionId } : {};
   } catch (error: unknown) {
-    const hasLocalGemini = await isGeminiCommandAvailable();
+    const hasLocalGemini = await isCommandAvailable("gemini");
     let errorMessage: string;
     const err = error as NodeJS.ErrnoException;
 
@@ -291,29 +311,13 @@ export async function launchGeminiCLI(
     throw new GeminiError(errorMessage, error);
   } finally {
     terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
   }
 }
 
 /**
- * Check if locally installed `gemini` command is available
- * @returns true if `gemini` command exists in PATH, false otherwise
+ * Checks whether Gemini CLI is available via `bunx` in the current environment.
  */
-async function isGeminiCommandAvailable(): Promise<boolean> {
-  try {
-    const command = process.platform === "win32" ? "where" : "which";
-    await execa(command, ["gemini"], {
-      shell: true,
-      stdin: "ignore",
-      stdout: "ignore",
-      stderr: "ignore",
-    });
-    return true;
-  } catch {
-    // gemini command not found in PATH
-    return false;
-  }
-}
-
 export async function isGeminiCLIAvailable(): Promise<boolean> {
   try {
     await execa("bunx", [GEMINI_CLI_PACKAGE, "--version"], { shell: true });

package/src/index.ts

@@ -307,12 +307,6 @@ export async function handleAIToolWorkflow(
     `Selected: ${branchLabel} with ${tool} (${mode} mode${modelInfo}, skipPermissions: ${skipPermissions})`,
   );
 
-  if (tool === "qwen-cli") {
-    printError("Qwen CLI is currently unsupported.");
-    await waitForErrorAcknowledgement();
-    return;
-  }
-
   try {
     // Get repository root
     const repoRootResult = await runGitStep("retrieve repository root", () =>

package/src/utils/command.ts

@@ -0,0 +1,26 @@
+import { execa } from "execa";
+
+/**
+ * Checks whether a command is available in the current PATH.
+ *
+ * Uses `where` on Windows and `which` on other platforms.
+ *
+ * @param commandName - Command name to look up (e.g. `claude`, `npx`, `gemini`)
+ * @returns true if the command exists in PATH
+ */
+export async function isCommandAvailable(
+  commandName: string,
+): Promise<boolean> {
+  try {
+    const command = process.platform === "win32" ? "where" : "which";
+    await execa(command, [commandName], {
+      shell: true,
+      stdin: "ignore",
+      stdout: "ignore",
+      stderr: "ignore",
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}

package/src/utils/session/index.ts

@@ -5,7 +5,6 @@
  * - Claude Code
  * - Codex CLI
  * - Gemini CLI
- * - Qwen CLI
  */
 
 // Type exports
@@ -41,6 +40,3 @@ export {
   findLatestGeminiSession,
   findLatestGeminiSessionId,
 } from "./parsers/gemini.js";
-
-// Qwen CLI parser
-export { findLatestQwenSessionId } from "./parsers/qwen.js";

package/src/utils/session/parsers/index.ts

@@ -23,6 +23,3 @@ export {
   findLatestGeminiSession,
   findLatestGeminiSessionId,
 } from "./gemini.js";
-
-// Qwen CLI
-export { findLatestQwenSessionId } from "./qwen.js";

package/src/utils/session.ts

@@ -11,7 +11,6 @@
  * - ./session/parsers/claude.js - Claude-specific functions
  * - ./session/parsers/codex.js - Codex-specific functions
  * - ./session/parsers/gemini.js - Gemini-specific functions
- * - ./session/parsers/qwen.js - Qwen-specific functions
  */
 
 export * from "./session/index.js";

package/src/utils/terminal.ts

@@ -2,6 +2,13 @@ import fs from "node:fs";
 import { platform } from "node:os";
 import { ReadStream, WriteStream } from "node:tty";
 
+/**
+ * Terminal streams used by the CLI (stdin/stdout/stderr) and their raw-mode
+ * teardown helper.
+ *
+ * When the current process is not a TTY, this may fall back to `/dev/tty` so
+ * interactive child processes can still read/write correctly.
+ */
 export interface TerminalStreams {
   stdin: NodeJS.ReadStream;
   stdout: NodeJS.WriteStream;
@@ -14,9 +21,18 @@ export interface TerminalStreams {
 }
 
 const DEV_TTY_PATH = "/dev/tty";
+// 端末モードのリセット:
+// - ESC[?1l: application cursor keys (DECCKM) を無効化
+// - ESC>: keypad mode を normal/numeric に戻す
+// WSL2/Windowsの矢印キー入力が壊れるケースを抑止する。
+const TERMINAL_RESET_SEQUENCE = "\u001b[?1l\u001b>";
 
 let cachedStreams: TerminalStreams | null = null;
 
+/**
+ * Stdio configuration for launching an interactive child process (via `execa`),
+ * plus a cleanup hook to be called after the child exits.
+ */
 export interface ChildStdio {
   stdin: "inherit" | { file: string; append?: boolean };
   stdout: "inherit" | { file: string; append?: boolean };
@@ -165,6 +181,9 @@ function createTerminalStreams(): TerminalStreams {
   }
 }
 
+/**
+ * Returns cached terminal streams and falls back to `/dev/tty` when needed.
+ */
 export function getTerminalStreams(): TerminalStreams {
   if (!cachedStreams) {
     cachedStreams = createTerminalStreams();
@@ -172,6 +191,35 @@ export function getTerminalStreams(): TerminalStreams {
   return cachedStreams;
 }
 
+/**
+ * Best-effort terminal mode reset for interactive sessions.
+ *
+ * This writes a small ANSI sequence to restore cursor-key/keypad modes, which
+ * helps prevent broken arrow-key behavior on some Windows/WSL2 terminals after
+ * interactive CLIs exit.
+ */
+export function resetTerminalModes(
+  stdout: NodeJS.WriteStream | undefined,
+): void {
+  if (!stdout || typeof stdout.write !== "function") {
+    return;
+  }
+  if (!("isTTY" in stdout) || !stdout.isTTY) {
+    return;
+  }
+  try {
+    stdout.write(TERMINAL_RESET_SEQUENCE);
+  } catch {
+    // Ignore terminal reset errors.
+  }
+}
+
+/**
+ * Creates stdio settings for launching a child process.
+ *
+ * When terminal streams are backed by `/dev/tty`, forwards those file
+ * descriptors to the child so it remains interactive.
+ */
 export function createChildStdio(): ChildStdio {
   const terminal = getTerminalStreams();
 
@@ -196,6 +244,12 @@ function isInteractive(stream: NodeJS.ReadStream): boolean {
   return Boolean(stream.isTTY);
 }
 
+/**
+ * Prints a message and waits for the user to press Enter when running in an
+ * interactive terminal.
+ *
+ * Useful for pausing on errors while ensuring raw mode is disabled.
+ */
 export async function waitForUserAcknowledgement(
   message: string = DEFAULT_ACK_MESSAGE,
 ): Promise<void> {
@@ -214,20 +268,26 @@ export async function waitForUserAcknowledgement(
   terminal.exitRawMode();
 
   await new Promise<void>((resolve) => {
-    const cleanup = () => {
+    let finished = false;
+
+    function cleanup(): void {
+      if (finished) {
+        return;
+      }
+      finished = true;
       stdin.removeListener("data", onData);
       if (typeof stdin.pause === "function") {
         stdin.pause();
       }
-    };
+    }
 
-    const onData = (chunk: Buffer | string) => {
+    function onData(chunk: Buffer | string): void {
       const data = typeof chunk === "string" ? chunk : chunk.toString("utf8");
       if (data.includes("\n") || data.includes("\r")) {
         cleanup();
         resolve();
       }
-    };
+    }
 
     if (typeof stdout?.write === "function") {
       stdout.write(`\n${message}\n`);
@@ -238,5 +298,6 @@ export async function waitForUserAcknowledgement(
     }
 
     stdin.on("data", onData);
+    process.once("exit", cleanup);
   });
 }

package/src/web/client/src/components/branch-detail/BranchInfoCards.tsx

@@ -13,7 +13,6 @@ function mapToolLabel(toolId: string, toolLabel?: string | null): string {
   if (toolId === "claude-code") return "Claude";
   if (toolId === "codex-cli") return "Codex";
   if (toolId === "gemini-cli") return "Gemini";
-  if (toolId === "qwen-cli") return "Qwen";
   if (toolLabel) return toolLabel;
   return "Custom";
 }

package/dist/qwen.d.ts

@@ -1,16 +0,0 @@
-export declare class QwenError extends Error {
-    cause?: unknown | undefined;
-    constructor(message: string, cause?: unknown | undefined);
-}
-export declare function launchQwenCLI(worktreePath: string, options?: {
-    skipPermissions?: boolean;
-    mode?: "normal" | "continue" | "resume";
-    extraArgs?: string[];
-    envOverrides?: Record<string, string>;
-    model?: string;
-    sessionId?: string | null;
-}): Promise<{
-    sessionId?: string | null;
-}>;
-export declare function isQwenCLIAvailable(): Promise<boolean>;
-//# sourceMappingURL=qwen.d.ts.map

package/dist/qwen.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"qwen.d.ts","sourceRoot":"","sources":["../src/qwen.ts"],"names":[],"mappings":"AAQA,qBAAa,SAAU,SAAQ,KAAK;IAGzB,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GACL,OAAO,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAmNxC;AAiBD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAgB3D"}