@akiojin/gwt 3.1.1 → 4.0.0

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

@@ -327,7 +327,7 @@ export function BranchListScreen({
         case "gemini-cli":
           return chalk.magenta(label);
         case "qwen-cli":
-          return chalk.green(label);
+          return chalk.gray(label);
         default: {
           const trimmed = label.trim().toLowerCase();
           if (!toolId || trimmed === "unknown") {

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

@@ -32,6 +32,10 @@ const formatSkip = (skip?: boolean | null) =>
 
 const supportsReasoning = (toolId?: string | null) => toolId === "codex-cli";
 
+const UNSUPPORTED_TOOL_ID = "qwen-cli";
+const UNSUPPORTED_TOOL_MESSAGE = "Unsupported tool (Qwen CLI). ";
+const UNSUPPORTED_TOOL_CATEGORY_LABEL = "Qwen (unsupported)";
+
 const describe = (opt: BranchQuickStartOption, includeSessionId = true) => {
   const parts = [`Model: ${opt.model ?? "default"}`];
   if (supportsReasoning(opt.toolId)) {
@@ -111,6 +115,7 @@ export function BranchQuickStartScreen({
         const flat: QuickStartItem[] = [];
         sorted.forEach((opt, idx) => {
           const cat = resolveCategory(opt.toolId);
+          const isUnsupportedTool = opt.toolId === UNSUPPORTED_TOOL_ID;
           const prevCat =
             idx > 0 ? resolveCategory(sorted[idx - 1]?.toolId).label : null;
           const isNewCategory = prevCat !== cat.label;
@@ -121,7 +126,10 @@ export function BranchQuickStartScreen({
               value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
               action: "reuse-continue",
               toolId: opt.toolId ?? null,
-              description: describe(opt, true),
+              description: isUnsupportedTool
+                ? `${UNSUPPORTED_TOOL_MESSAGE}${describe(opt, true)}`
+                : describe(opt, true),
+              ...(isUnsupportedTool ? { disabled: true } : {}),
               groupStart: isNewCategory && flat.length > 0,
               category: cat.label,
               categoryColor: cat.color,
@@ -131,7 +139,10 @@ export function BranchQuickStartScreen({
               value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
               action: "reuse-new",
               toolId: opt.toolId ?? null,
-              description: describe(opt, false),
+              description: isUnsupportedTool
+                ? `${UNSUPPORTED_TOOL_MESSAGE}${describe(opt, false)}`
+                : describe(opt, false),
+              ...(isUnsupportedTool ? { disabled: true } : {}),
               groupStart: false,
               category: cat.label,
               categoryColor: cat.color,
@@ -197,27 +208,34 @@ 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}] `}
-                </Text>
-                <Text inverse={isSelected}>
-                  {item.label}
-                  {item.disabled ? " (disabled)" : ""}
+          renderItem={(item: QuickStartItem, isSelected) => {
+            const categoryLabel =
+              item.toolId === UNSUPPORTED_TOOL_ID
+                ? UNSUPPORTED_TOOL_CATEGORY_LABEL
+                : item.category;
+
+            return (
+              <Box
+                flexDirection="column"
+                marginTop={
+                  item.groupStart ? 1 : item.category === "Other" ? 1 : 0
+                }
+              >
+                <Text>
+                  <Text color={item.categoryColor} inverse={isSelected}>
+                    {`[${categoryLabel}] `}
+                  </Text>
+                  <Text inverse={isSelected}>
+                    {item.label}
+                    {item.disabled ? " (disabled)" : ""}
+                  </Text>
                 </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/ModelSelectorScreen.tsx

@@ -37,7 +37,6 @@ const TOOL_LABELS: Record<string, string> = {
   "claude-code": "Claude Code",
   "codex-cli": "Codex",
   "gemini-cli": "Gemini",
-  "qwen-cli": "Qwen",
 };
 
 const INFERENCE_LABELS: Record<InferenceLevel, string> = {
@@ -255,13 +254,6 @@ export function ModelSelectorScreen({
                 {modelOptions.length === 0 ? " (no options)" : ""}
               </Text>
             </Box>
-            {tool === "qwen-cli" ? (
-              <Box marginBottom={1} flexDirection="column">
-                <Text>Latest Qwen models from Alibaba Cloud ModelStudio:</Text>
-                <Text>• coder-model (qwen3-coder-plus-2025-09-23)</Text>
-                <Text>• vision-model (qwen3-vl-plus-2025-09-23)</Text>
-              </Box>
-            ) : null}
 
             {modelItems.length === 0 ? (
               <Select

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

@@ -8,13 +8,13 @@ import {
 const byId = (tool: string) => getModelOptions(tool).map((m) => m.id);
 
 describe("modelOptions", () => {
-  it("lists Claude official aliases and sets Opus 4.5 as default", () => {
+  it("lists Claude official aliases and sets Default as default", () => {
     const options = getModelOptions("claude-code");
     const ids = options.map((m) => m.id);
-    expect(ids).toEqual(["opus", "sonnet", "haiku"]);
+    expect(ids).toEqual(["", "opus", "sonnet", "haiku"]);
     const defaultModel = getDefaultModelOption("claude-code");
-    expect(defaultModel?.id).toBe("opus");
-    expect(defaultModel?.label).toBe("Opus 4.5");
+    expect(defaultModel?.id).toBe("");
+    expect(defaultModel?.label).toBe("Default (Auto)");
   });
 
   it("has unique Codex models", () => {
@@ -22,6 +22,7 @@ describe("modelOptions", () => {
     const unique = new Set(ids);
     expect(unique.size).toBe(ids.length);
     expect(ids).toEqual([
+      "",
       "gpt-5.1-codex",
       "gpt-5.2",
       "gpt-5.1-codex-max",
@@ -52,14 +53,16 @@ describe("modelOptions", () => {
 
   it("lists expected Gemini models", () => {
     expect(byId("gemini-cli")).toEqual([
+      "",
       "gemini-3-pro-preview",
+      "gemini-3-flash-preview",
       "gemini-2.5-pro",
       "gemini-2.5-flash",
       "gemini-2.5-flash-lite",
     ]);
   });
 
-  it("lists expected Qwen models", () => {
-    expect(byId("qwen-cli")).toEqual(["coder-model", "vision-model"]);
+  it("returns no models for unsupported tools", () => {
+    expect(byId("qwen-cli")).toEqual([]);
   });
 });

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

@@ -5,12 +5,17 @@ const CODEX_MAX_LEVELS: InferenceLevel[] = ["xhigh", "high", "medium", "low"];
 
 const MODEL_OPTIONS: Record<string, ModelOption[]> = {
   "claude-code": [
+    {
+      id: "",
+      label: "Default (Auto)",
+      description: "Use Claude Code default behavior",
+      isDefault: true,
+    },
     {
       id: "opus",
       label: "Opus 4.5",
       description:
         "Official Opus alias for Claude Code (non-custom, matches /model option).",
-      isDefault: true,
     },
     {
       id: "sonnet",
@@ -25,13 +30,20 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
     },
   ],
   "codex-cli": [
+    {
+      id: "",
+      label: "Default (Auto)",
+      description: "Use Codex default model",
+      isDefault: true,
+      inferenceLevels: CODEX_BASE_LEVELS,
+      defaultInference: "high",
+    },
     {
       id: "gpt-5.1-codex",
       label: "gpt-5.1-codex",
       description: "Standard Codex model",
       inferenceLevels: CODEX_BASE_LEVELS,
       defaultInference: "high",
-      isDefault: true,
     },
     {
       id: "gpt-5.2",
@@ -63,12 +75,22 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
     },
   ],
   "gemini-cli": [
+    {
+      id: "",
+      label: "Default (Auto)",
+      description: "Use Gemini CLI default model",
+      isDefault: true,
+    },
     {
       id: "gemini-3-pro-preview",
       label: "Pro (gemini-3-pro-preview)",
       description:
         "Default Pro. Falls back to gemini-2.5-pro when preview is unavailable.",
-      isDefault: true,
+    },
+    {
+      id: "gemini-3-flash-preview",
+      label: "Flash (gemini-3-flash-preview)",
+      description: "Next-generation high-speed model",
     },
     {
       id: "gemini-2.5-pro",
@@ -86,21 +108,6 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
       description: "Fastest for simple tasks",
     },
   ],
-  "qwen-cli": [
-    {
-      id: "coder-model",
-      label: "Coder Model",
-      description:
-        "Latest Qwen Coder model (qwen3-coder-plus-2025-09-23) from Alibaba Cloud ModelStudio",
-      isDefault: true,
-    },
-    {
-      id: "vision-model",
-      label: "Vision Model",
-      description:
-        "Latest Qwen Vision model (qwen3-vl-plus-2025-09-23) from Alibaba Cloud ModelStudio",
-    },
-  ],
 };
 
 export function getModelOptions(tool: AITool): ModelOption[] {

package/src/config/builtin-tools.ts

@@ -60,6 +60,8 @@ export const GEMINI_CLI_TOOL: CustomAITool = {
 
 /**
  * Qwen のビルトイン定義
+ *
+ * NOTE: 現在は未サポート（選択画面には表示しない）。ID予約のため定義のみ残す。
  */
 export const QWEN_CLI_TOOL: CustomAITool = {
   id: "qwen-cli",

package/src/config/tools.ts

@@ -299,13 +299,17 @@ 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

@@ -134,62 +134,41 @@ export async function launchGeminiCLI(
     // Auto-detect locally installed gemini command
     const hasLocalGemini = await isGeminiCommandAvailable();
 
-    // Capture session ID from Gemini's exit summary
+    // Preserve TTY for interactive UI (colors/width) by inheriting stdout/stderr.
+    // Session ID is determined via file-based detection after exit.
     let capturedSessionId: string | null = null;
-    const extractSessionId = (output: string | undefined) => {
-      if (!output) return;
-      // Gemini outputs "Session ID: <uuid>" in exit summary
-      // UUID may be split across lines due to terminal width
-      // First, find "Session ID:" and extract following hex characters
-      const sessionIdIndex = output.indexOf("Session ID:");
-      if (sessionIdIndex === -1) return;
-
-      // Extract text after "Session ID:" until we have enough hex chars for UUID
-      const afterLabel = output.slice(sessionIdIndex + "Session ID:".length);
-      // Remove all non-hex characters except dash, then extract UUID pattern
-      const hexOnly = afterLabel.replace(/[^0-9a-fA-F-]/g, "");
-      // UUID format: 8-4-4-4-12 = 32 hex chars + 4 dashes
-      const uuidMatch = hexOnly.match(
-        /^([0-9a-f]{8})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{4})-?([0-9a-f]{12})/i,
-      );
-      if (uuidMatch) {
-        capturedSessionId = `${uuidMatch[1]}-${uuidMatch[2]}-${uuidMatch[3]}-${uuidMatch[4]}-${uuidMatch[5]}`;
-      }
-    };
 
-    const runGemini = async (
-      runArgs: string[],
-    ): Promise<string | undefined> => {
-      // Capture stdout while passing through to terminal
-      // Store chunks to extract session ID after process exits
-      const outputChunks: string[] = [];
+    const runGemini = async (runArgs: string[]): Promise<void> => {
+      const execChild = async (child: Promise<unknown>) => {
+        try {
+          await child;
+        } catch (execError: unknown) {
+          // Treat SIGINT/SIGTERM as normal exit (user pressed Ctrl+C)
+          const signal = (execError as { signal?: unknown })?.signal;
+          if (signal === "SIGINT" || signal === "SIGTERM") {
+            return;
+          }
+          throw execError;
+        }
+      };
 
-      const runWithCapture = async (cmd: string, args: string[]) => {
+      const run = async (cmd: string, args: string[]) => {
         const child = execa(cmd, args, {
           cwd: worktreePath,
           shell: true,
           stdin: childStdio.stdin,
-          stdout: "pipe",
+          stdout: childStdio.stdout,
           stderr: childStdio.stderr,
           env: baseEnv,
         });
-
-        // Pass stdout through to terminal while capturing
-        child.stdout?.on("data", (chunk: Buffer) => {
-          const text = chunk.toString("utf8");
-          outputChunks.push(text);
-          terminal.stdout.write(chunk);
-        });
-
-        await child;
-        return outputChunks.join("");
+        await execChild(child);
       };
 
       if (hasLocalGemini) {
         console.log(
           chalk.green("   ✨ Using locally installed gemini command"),
         );
-        return await runWithCapture("gemini", runArgs);
+        return await run("gemini", runArgs);
       }
       console.log(
         chalk.cyan("   🔄 Falling back to bunx @google/gemini-cli@latest"),
@@ -202,15 +181,14 @@ export async function launchGeminiCLI(
       console.log(chalk.yellow("      npm install -g @google/gemini-cli"));
       console.log("");
       await new Promise((resolve) => setTimeout(resolve, 2000));
-      return await runWithCapture("bunx", [GEMINI_CLI_PACKAGE, ...runArgs]);
+      return await run("bunx", [GEMINI_CLI_PACKAGE, ...runArgs]);
     };
 
-    let output: string | undefined;
     let fellBackToLatest = false;
     try {
       // Try with explicit session ID first (if any), then fallback to --resume (latest) once
       try {
-        output = await runGemini(argsPrimary);
+        await runGemini(argsPrimary);
       } catch (err) {
         const shouldRetry =
           (options.mode === "resume" || options.mode === "continue") &&
@@ -222,7 +200,7 @@ export async function launchGeminiCLI(
               `   ⚠️  Failed to resume session ${resumeSessionId}. Retrying with latest session...`,
             ),
           );
-          output = await runGemini(argsFallback);
+          await runGemini(argsFallback);
         } else {
           throw err;
         }
@@ -231,9 +209,6 @@ export async function launchGeminiCLI(
       childStdio.cleanup();
     }
 
-    // Extract session ID from Gemini's exit summary output
-    extractSessionId(output);
-
     const explicitResumeSucceeded = usedExplicitSessionId && !fellBackToLatest;
 
     // If we explicitly resumed a specific session (and did not fall back), keep that ID.

package/src/index.ts

@@ -16,7 +16,6 @@ import {
   type CodexReasoningEffort,
 } from "./codex.js";
 import { launchGeminiCLI, GeminiError } from "./gemini.js";
-import { launchQwenCLI, QwenError } from "./qwen.js";
 import {
   WorktreeOrchestrator,
   type EnsureWorktreeOptions,
@@ -117,7 +116,6 @@ function isRecoverableError(error: unknown): boolean {
     error instanceof WorktreeError ||
     error instanceof CodexError ||
     error instanceof GeminiError ||
-    error instanceof QwenError ||
     error instanceof DependencyInstallError
   ) {
     return true;
@@ -129,7 +127,6 @@ function isRecoverableError(error: unknown): boolean {
       error.name === "WorktreeError" ||
       error.name === "CodexError" ||
       error.name === "GeminiError" ||
-      error.name === "QwenError" ||
       error.name === "DependencyInstallError"
     );
   }
@@ -144,7 +141,6 @@ function isRecoverableError(error: unknown): boolean {
       name === "WorktreeError" ||
       name === "CodexError" ||
       name === "GeminiError" ||
-      name === "QwenError" ||
       name === "DependencyInstallError"
     );
   }
@@ -311,6 +307,12 @@ 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", () =>
@@ -658,28 +660,6 @@ export async function handleAIToolWorkflow(
         launchOptions.model = model;
       }
       launchResult = await launchGeminiCLI(worktreePath, launchOptions);
-    } else if (tool === "qwen-cli") {
-      const launchOptions: {
-        mode?: "normal" | "continue" | "resume";
-        skipPermissions?: boolean;
-        envOverrides?: Record<string, string>;
-        model?: string;
-        sessionId?: string | null;
-      } = {
-        mode:
-          mode === "resume"
-            ? "resume"
-            : mode === "continue"
-              ? "continue"
-              : "normal",
-        skipPermissions,
-        envOverrides: sharedEnv,
-        sessionId: resumeSessionId,
-      };
-      if (model) {
-        launchOptions.model = model;
-      }
-      launchResult = await launchQwenCLI(worktreePath, launchOptions);
     } else {
       // Custom tool
       printInfo(`Launching custom tool: ${toolConfig.displayName}`);
@@ -743,7 +723,7 @@ export async function handleAIToolWorkflow(
       }
     } else if (!finalSessionId && tool === "gemini-cli") {
       try {
-        const latestGemini = await findLatestGeminiSession(worktreePath, {
+        const latestGemini = await findLatestGeminiSession({
           since: launchStartedAt - 60_000,
           until: finishedAt + 60_000,
           preferClosestTo: finishedAt,