@akiojin/gwt 4.8.0 → 4.9.1

package/dist/web/server/routes/config.js

@@ -1,7 +1,7 @@
 /**
  * Config Routes
  */
-import { loadToolsConfig, saveToolsConfig } from "../../../config/tools.js";
+import { loadCodingAgentsConfig, saveCodingAgentsConfig, } from "../../../config/tools.js";
 import { loadEnvHistory, recordEnvHistory, } from "../../../config/env-history.js";
 import { getImportedEnvKeys } from "../env/importer.js";
 function normalizeEnv(env, importedKeys, history) {
@@ -36,44 +36,44 @@ function envArrayToRecord(env) {
     }
     return record;
 }
-function toApiTool(tool, history, importedKeys) {
+function toApiCodingAgent(agent, history, importedKeys) {
     return {
-        id: tool.id,
-        displayName: tool.displayName,
-        icon: tool.icon ?? null,
-        command: tool.command,
-        executionType: tool.type,
-        defaultArgs: tool.defaultArgs ?? null,
-        modeArgs: tool.modeArgs,
-        permissionSkipArgs: tool.permissionSkipArgs ?? null,
-        env: normalizeEnv(tool.env, importedKeys, history),
+        id: agent.id,
+        displayName: agent.displayName,
+        icon: agent.icon ?? null,
+        command: agent.command,
+        executionType: agent.type,
+        defaultArgs: agent.defaultArgs ?? null,
+        modeArgs: agent.modeArgs,
+        permissionSkipArgs: agent.permissionSkipArgs ?? null,
+        env: normalizeEnv(agent.env, importedKeys, history),
         description: null,
         createdAt: null,
         updatedAt: null,
     };
 }
-function toFileTool(tool) {
-    const envRecord = envArrayToRecord(tool.env);
-    const fileTool = {
-        id: tool.id,
-        displayName: tool.displayName,
-        type: tool.executionType,
-        command: tool.command,
-        modeArgs: tool.modeArgs,
+function toFileCodingAgent(agent) {
+    const envRecord = envArrayToRecord(agent.env);
+    const fileAgent = {
+        id: agent.id,
+        displayName: agent.displayName,
+        type: agent.executionType,
+        command: agent.command,
+        modeArgs: agent.modeArgs,
     };
-    if (tool.icon) {
-        fileTool.icon = tool.icon;
+    if (agent.icon) {
+        fileAgent.icon = agent.icon;
     }
-    if (tool.defaultArgs && tool.defaultArgs.length > 0) {
-        fileTool.defaultArgs = tool.defaultArgs;
+    if (agent.defaultArgs && agent.defaultArgs.length > 0) {
+        fileAgent.defaultArgs = agent.defaultArgs;
     }
-    if (tool.permissionSkipArgs && tool.permissionSkipArgs.length > 0) {
-        fileTool.permissionSkipArgs = tool.permissionSkipArgs;
+    if (agent.permissionSkipArgs && agent.permissionSkipArgs.length > 0) {
+        fileAgent.permissionSkipArgs = agent.permissionSkipArgs;
     }
     if (Object.keys(envRecord).length > 0) {
-        fileTool.env = envRecord;
+        fileAgent.env = envRecord;
     }
-    return fileTool;
+    return fileAgent;
 }
 function diffEnvHistory(previous, next, source) {
     const entries = [];
@@ -96,7 +96,7 @@ function diffEnvHistory(previous, next, source) {
 export async function registerConfigRoutes(fastify) {
     fastify.get("/api/config", async (request, reply) => {
         try {
-            const config = await loadToolsConfig();
+            const config = await loadCodingAgentsConfig();
             const history = await loadEnvHistory();
             const importedSet = new Set(getImportedEnvKeys());
             return {
@@ -106,12 +106,12 @@ export async function registerConfigRoutes(fastify) {
                     updatedAt: config.updatedAt ?? null,
                     env: normalizeEnv(config.env, importedSet, history),
                     history,
-                    tools: config.customTools.map((tool) => toApiTool(tool, history, importedSet)),
+                    codingAgents: config.customCodingAgents.map((agent) => toApiCodingAgent(agent, history, importedSet)),
                 },
             };
         }
         catch (error) {
-            request.log.error({ err: error }, "Failed to load custom tool config");
+            request.log.error({ err: error }, "Failed to load coding agents config");
             reply.code(500);
             return {
                 success: false,
@@ -123,13 +123,13 @@ export async function registerConfigRoutes(fastify) {
     fastify.put("/api/config", async (request, reply) => {
         try {
             const payload = request.body;
-            const existing = await loadToolsConfig();
+            const existing = await loadCodingAgentsConfig();
             const nextEnvRecord = envArrayToRecord(payload.env);
             const envHistory = diffEnvHistory(existing.env ?? {}, nextEnvRecord, "ui");
-            await saveToolsConfig({
+            await saveCodingAgentsConfig({
                 version: payload.version || existing.version,
                 env: nextEnvRecord,
-                customTools: payload.tools.map(toFileTool),
+                customCodingAgents: payload.codingAgents.map(toFileCodingAgent),
             });
             if (envHistory.length) {
                 await recordEnvHistory(envHistory);
@@ -143,7 +143,7 @@ export async function registerConfigRoutes(fastify) {
                     updatedAt: new Date().toISOString(),
                     env: normalizeEnv(nextEnvRecord, importedSet, history),
                     history,
-                    tools: payload.tools,
+                    codingAgents: payload.codingAgents,
                 },
             };
         }

package/dist/web/server/routes/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/web/server/routes/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/web/server/routes/config.ts"],"names":[],"mappings":"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"}

package/dist/web/server/routes/sessions.d.ts

@@ -1,7 +1,7 @@
 /**
  * Session Routes
  *
- * AI Toolセッション関連のREST APIエンドポイント。
+ * コーディングエージェントセッション関連のREST APIエンドポイント。
  */
 import type { PTYManager } from "../pty/manager.js";
 import type { WebFastifyInstance } from "../types.js";

package/dist/web/server/routes/sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../../src/web/server/routes/sessions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AASpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKtD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,kBAAkB,EAC3B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAkNf"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../../src/web/server/routes/sessions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AASpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKtD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,kBAAkB,EAC3B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAqNf"}

package/dist/web/server/routes/sessions.js

@@ -1,9 +1,9 @@
 /**
  * Session Routes
  *
- * AI Toolセッション関連のREST APIエンドポイント。
+ * コーディングエージェントセッション関連のREST APIエンドポイント。
  */
-import { AIToolResolutionError } from "../../../services/aiToolResolver.js";
+import { CodingAgentResolutionError } from "../../../services/codingAgentResolver.js";
 import { saveSession } from "../../../config/index.js";
 import { execa } from "execa";
 import { createLogger } from "../../../logging/logger.js";
@@ -32,11 +32,11 @@ export async function registerSessionRoutes(fastify, ptyManager) {
     // POST /api/sessions - 新しいセッションを開始
     fastify.post("/api/sessions", async (request, reply) => {
         try {
-            const { toolType, toolName, mode, worktreePath, skipPermissions, bypassApprovals, extraArgs, customToolId, } = request.body;
-            logger.debug({ toolType, mode, worktreePath }, "Session start requested");
+            const { agentType, agentName, mode, worktreePath, skipPermissions, bypassApprovals, extraArgs, customAgentId, } = request.body;
+            logger.debug({ agentType, mode, worktreePath }, "Session start requested");
             const spawnOptions = {};
-            if (typeof toolName !== "undefined") {
-                spawnOptions.toolName = toolName;
+            if (typeof agentName !== "undefined") {
+                spawnOptions.toolName = agentName;
             }
             if (typeof skipPermissions !== "undefined") {
                 spawnOptions.skipPermissions = skipPermissions;
@@ -47,18 +47,18 @@ export async function registerSessionRoutes(fastify, ptyManager) {
             if (Array.isArray(extraArgs) && extraArgs.length > 0) {
                 spawnOptions.extraArgs = extraArgs;
             }
-            if (typeof customToolId !== "undefined") {
-                spawnOptions.customToolId = customToolId;
+            if (typeof customAgentId !== "undefined") {
+                spawnOptions.customToolId = customAgentId;
             }
-            if (toolType === "custom" && !toolName && !customToolId) {
+            if (agentType === "custom" && !agentName && !customAgentId) {
                 reply.code(400);
                 return {
                     success: false,
-                    error: "Custom tool requires toolName or customToolId",
+                    error: "Custom coding agent requires agentName or customAgentId",
                     details: null,
                 };
             }
-            const { session } = await ptyManager.spawn(toolType, worktreePath, mode, spawnOptions);
+            const { session } = await ptyManager.spawn(agentType, worktreePath, mode, spawnOptions);
             // 履歴を永続化（best-effort）
             try {
                 const { stdout: repoRoot } = await execa("git", ["rev-parse", "--show-toplevel"], {
@@ -75,10 +75,10 @@ export async function registerSessionRoutes(fastify, ptyManager) {
                 await saveSession({
                     lastWorktreePath: worktreePath,
                     lastBranch: branchName,
-                    lastUsedTool: toolType === "custom" ? (toolName ?? "custom") : toolType,
-                    toolLabel: toolType === "custom"
-                        ? (toolName ?? "Custom")
-                        : toolLabelFromType(toolType),
+                    lastUsedTool: agentType === "custom" ? (agentName ?? "custom") : agentType,
+                    toolLabel: agentType === "custom"
+                        ? (agentName ?? "Custom")
+                        : agentLabelFromType(agentType),
                     mode,
                     timestamp: Date.now(),
                     repositoryRoot: repoRoot.trim(),
@@ -87,12 +87,12 @@ export async function registerSessionRoutes(fastify, ptyManager) {
             catch {
                 // ignore persistence errors
             }
-            logger.info({ sessionId: session.sessionId, toolType }, "Session created");
+            logger.info({ sessionId: session.sessionId, agentType }, "Session created");
             reply.code(201);
             return { success: true, data: session };
         }
         catch (error) {
-            if (error instanceof AIToolResolutionError) {
+            if (error instanceof CodingAgentResolutionError) {
                 reply.code(400);
                 return {
                     success: false,
@@ -162,10 +162,10 @@ export async function registerSessionRoutes(fastify, ptyManager) {
         }
     });
 }
-function toolLabelFromType(toolType) {
-    if (toolType === "claude-code")
+function agentLabelFromType(agentType) {
+    if (agentType === "claude-code")
         return "Claude";
-    if (toolType === "codex-cli")
+    if (agentType === "codex-cli")
         return "Codex";
     return "Custom";
 }

package/dist/web/server/routes/sessions.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../../src/web/server/routes/sessions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../../src/web/server/routes/sessions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akiojin/gwt",
-  "version": "4.8.0",
-  "description": "Interactive Git worktree manager for Claude Code with graphical branch selection",
+  "version": "4.9.1",
+  "description": "Interactive Git worktree manager with Coding Agent selection (Claude Code / Codex CLI / Gemini CLI)",
   "main": "dist/index.js",
   "bin": {
     "gwt": "bin/gwt.js"

package/src/cli/ui/__tests__/components/screens/{AIToolSelectorScreen.test.tsx → CodingAgentSelectorScreen.test.tsx}

@@ -4,12 +4,12 @@
 import { describe, it, expect, beforeEach, vi } from "vitest";
 import { render, waitFor } from "@testing-library/react";
 import React from "react";
-import { AIToolSelectorScreen } from "../../../components/screens/AIToolSelectorScreen.js";
+import { CodingAgentSelectorScreen } from "../../../components/screens/CodingAgentSelectorScreen.js";
 import { Window } from "happy-dom";
 
-// Mock getAllTools
+// Mock getAllCodingAgents
 vi.mock("../../../config/tools.js", () => ({
-  getAllTools: vi.fn().mockResolvedValue([
+  getAllCodingAgents: vi.fn().mockResolvedValue([
     {
       id: "claude-code",
       displayName: "Claude Code",
@@ -23,7 +23,7 @@ vi.mock("../../../config/tools.js", () => ({
   ]),
 }));
 
-describe("AIToolSelectorScreen", () => {
+describe("CodingAgentSelectorScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     const window = new Window();
@@ -36,20 +36,20 @@ describe("AIToolSelectorScreen", () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { getByText } = render(
-      <AIToolSelectorScreen onBack={onBack} onSelect={onSelect} />,
+      <CodingAgentSelectorScreen onBack={onBack} onSelect={onSelect} />,
     );
 
-    expect(getByText(/AI Tool Selection/i)).toBeDefined();
+    expect(getByText(/Coding Agent Selection/i)).toBeDefined();
   });
 
-  it("should render AI tool options", async () => {
+  it("should render Coding Agent options", async () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { getByText } = render(
-      <AIToolSelectorScreen onBack={onBack} onSelect={onSelect} />,
+      <CodingAgentSelectorScreen onBack={onBack} onSelect={onSelect} />,
     );
 
-    // Wait for tools to load
+    // Wait for agents to load
     await waitFor(() => {
       expect(getByText(/Claude Code/i)).toBeDefined();
       expect(getByText(/Codex/i)).toBeDefined();
@@ -60,7 +60,7 @@ describe("AIToolSelectorScreen", () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { getAllByText } = render(
-      <AIToolSelectorScreen onBack={onBack} onSelect={onSelect} />,
+      <CodingAgentSelectorScreen onBack={onBack} onSelect={onSelect} />,
     );
 
     expect(getAllByText(/enter/i).length).toBeGreaterThan(0);
@@ -74,7 +74,7 @@ describe("AIToolSelectorScreen", () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { container } = render(
-      <AIToolSelectorScreen onBack={onBack} onSelect={onSelect} />,
+      <CodingAgentSelectorScreen onBack={onBack} onSelect={onSelect} />,
     );
 
     expect(container).toBeDefined();
@@ -86,32 +86,32 @@ describe("AIToolSelectorScreen", () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { container } = render(
-      <AIToolSelectorScreen onBack={onBack} onSelect={onSelect} />,
+      <CodingAgentSelectorScreen onBack={onBack} onSelect={onSelect} />,
     );
 
     // Test will verify onBack is called when ESC is pressed
     expect(container).toBeDefined();
   });
 
-  it("should handle tool selection", () => {
+  it("should handle coding agent selection", () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { container } = render(
-      <AIToolSelectorScreen onBack={onBack} onSelect={onSelect} />,
+      <CodingAgentSelectorScreen onBack={onBack} onSelect={onSelect} />,
     );
 
-    // Test will verify onSelect is called with correct tool
+    // Test will verify onSelect is called with correct agent
     expect(container).toBeDefined();
   });
 
-  it("should preselect the last used tool when provided", async () => {
+  it("should preselect the last used coding agent when provided", async () => {
     const onBack = vi.fn();
     const onSelect = vi.fn();
     const { container } = render(
-      <AIToolSelectorScreen
+      <CodingAgentSelectorScreen
         onBack={onBack}
         onSelect={onSelect}
-        initialToolId="codex-cli"
+        initialAgentId="codex-cli"
       />,
     );
 
@@ -125,49 +125,49 @@ describe("AIToolSelectorScreen", () => {
   });
 
   /**
-   * T210: カスタムツール表示のテスト
+   * T210: カスタムコーディングエージェント表示のテスト
    */
-  describe("Custom tool display", () => {
-    it("should load tools from getAllTools() dynamically", async () => {
+  describe("Custom coding agent display", () => {
+    it("should load coding agents from getAllCodingAgents() dynamically", async () => {
       // TODO: 実装後にテストを記述
-      // getAllTools()がモックされ、呼び出されることを確認
-      // モックの戻り値がツールアイテムとして表示されることを確認
+      // getAllCodingAgents()がモックされ、呼び出されることを確認
+      // モックの戻り値がエージェントアイテムとして表示されることを確認
       expect(true).toBe(true);
     });
 
-    it("should display both builtin and custom tools", async () => {
+    it("should display both builtin and custom coding agents", async () => {
       // TODO: 実装後にテストを記述
-      // getAllTools()がビルトインツール（claude-code, codex-cli）と
-      // カスタムツール（例: aider）を返す場合、
-      // すべてのツールが表示されることを確認
+      // getAllCodingAgents()がビルトインエージェント（claude-code, codex-cli）と
+      // カスタムエージェント（例: aider）を返す場合、
+      // すべてのエージェントが表示されることを確認
       expect(true).toBe(true);
     });
 
-    it("should display custom tool with icon if defined", async () => {
+    it("should display custom coding agent with icon if defined", async () => {
       // TODO: 実装後にテストを記述
-      // カスタムツールにiconフィールドがある場合、
+      // カスタムエージェントにiconフィールドがある場合、
       // それが表示されることを確認
       expect(true).toBe(true);
     });
 
-    it("should display custom tool without icon if not defined", async () => {
+    it("should display custom coding agent without icon if not defined", async () => {
       // TODO: 実装後にテストを記述
-      // カスタムツールにiconフィールドがない場合、
-      // ツール名のみが表示されることを確認
+      // カスタムエージェントにiconフィールドがない場合、
+      // エージェント名のみが表示されることを確認
       expect(true).toBe(true);
     });
 
-    it("should handle custom tool selection", async () => {
+    it("should handle custom coding agent selection", async () => {
       // TODO: 実装後にテストを記述
-      // カスタムツールを選択した場合、
-      // onSelect()がカスタムツールのIDで呼び出されることを確認
+      // カスタムエージェントを選択した場合、
+      // onSelect()がカスタムエージェントのIDで呼び出されることを確認
       expect(true).toBe(true);
     });
 
-    it("should display only builtin tools if no custom tools exist", async () => {
+    it("should display only builtin coding agents if no custom agents exist", async () => {
       // TODO: 実装後にテストを記述
-      // getAllTools()がビルトインツールのみを返す場合、
-      // ビルトインツールのみが表示されることを確認
+      // getAllCodingAgents()がビルトインエージェントのみを返す場合、
+      // ビルトインエージェントのみが表示されることを確認
       expect(true).toBe(true);
     });
   });

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

@@ -16,7 +16,7 @@ import { LogDetailScreen } from "./screens/LogDetailScreen.js";
 import { LogDatePickerScreen } from "./screens/LogDatePickerScreen.js";
 import { BranchCreatorScreen } from "./screens/BranchCreatorScreen.js";
 import { BranchActionSelectorScreen } from "../screens/BranchActionSelectorScreen.js";
-import { AIToolSelectorScreen } from "./screens/AIToolSelectorScreen.js";
+import { CodingAgentSelectorScreen } from "./screens/CodingAgentSelectorScreen.js";
 import { ExecutionModeSelectorScreen } from "./screens/ExecutionModeSelectorScreen.js";
 import type { ExecutionMode } from "./screens/ExecutionModeSelectorScreen.js";
 import { BranchQuickStartScreen } from "./screens/BranchQuickStartScreen.js";
@@ -46,7 +46,7 @@ import {
   type LogFileInfo,
 } from "../../../logging/reader.js";
 import type {
-  AITool,
+  CodingAgentId,
   BranchInfo,
   BranchItem,
   CleanupTarget,
@@ -93,7 +93,7 @@ export interface SelectionResult {
   displayName: string; // Name that was selected in the UI (may include remote prefix)
   branchType: "local" | "remote";
   remoteBranch?: string; // Full remote ref when branchType === 'remote'
-  tool: AITool;
+  tool: CodingAgentId;
   mode: ExecutionMode;
   skipPermissions: boolean;
   model?: string | null;
@@ -136,7 +136,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
   );
   const [branchQuickStart, setBranchQuickStart] = useState<
     {
-      toolId: AITool;
+      toolId: CodingAgentId;
       toolLabel: string;
       model?: string | null;
       sessionId?: string | null;
@@ -172,13 +172,15 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     useState<SelectedBranchState | null>(null);
   const [creationSourceBranch, setCreationSourceBranch] =
     useState<SelectedBranchState | null>(null);
-  const [selectedTool, setSelectedTool] = useState<AITool | null>(null);
+  const [selectedTool, setSelectedTool] = useState<CodingAgentId | null>(null);
   const [selectedModel, setSelectedModel] =
     useState<ModelSelectionResult | null>(null);
   const [lastModelByTool, setLastModelByTool] = useState<
-    Record<AITool, ModelSelectionResult | undefined>
+    Record<CodingAgentId, ModelSelectionResult | undefined>
   >({});
-  const [preferredToolId, setPreferredToolId] = useState<AITool | null>(null);
+  const [preferredToolId, setPreferredToolId] = useState<CodingAgentId | null>(
+    null,
+  );
 
   // PR cleanup feedback
   const [cleanupIndicators, setCleanupIndicators] = useState<
@@ -413,12 +415,12 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
             }
 
             const normalizedModel = normalizeModelId(
-              entry.toolId as AITool,
+              entry.toolId as CodingAgentId,
               entry.model ?? null,
             );
 
             return {
-              toolId: entry.toolId as AITool,
+              toolId: entry.toolId as CodingAgentId,
               toolLabel: entry.toolLabel,
               model: normalizedModel ?? null,
               inferenceLevel: (entry.reasoningLevel ??
@@ -772,7 +774,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
       const nextScreen =
         branchQuickStart.length || branchQuickStartLoading
           ? "branch-quick-start"
-          : "ai-tool-selector";
+          : "coding-agent-selector";
       navigateTo(nextScreen);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -799,7 +801,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     if (branchQuickStart.length) {
       navigateTo("branch-quick-start");
     } else {
-      navigateTo("ai-tool-selector");
+      navigateTo("coding-agent-selector");
     }
   }, [
     handleProtectedBranchSwitch,
@@ -893,7 +895,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
         setPreferredToolId(null);
         setCleanupFooterMessage(null);
 
-        navigateTo("ai-tool-selector");
+        navigateTo("coding-agent-selector");
       } catch (error) {
         // On error, go back to branch list
         console.error("Failed to create branch:", error);
@@ -1144,7 +1146,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
 
   // Handle AI tool selection
   const handleToolSelect = useCallback(
-    (tool: AITool) => {
+    (tool: CodingAgentId) => {
       setSelectedTool(tool);
       setSelectedModel(lastModelByTool[tool] ?? null);
       navigateTo("model-selector");
@@ -1211,9 +1213,9 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
   );
 
   const handleQuickStartSelect = useCallback(
-    (action: QuickStartAction, toolId?: AITool | null) => {
+    (action: QuickStartAction, toolId?: CodingAgentId | null) => {
       if (action === "manual" || !branchQuickStart.length) {
-        navigateTo("ai-tool-selector");
+        navigateTo("coding-agent-selector");
         return;
       }
 
@@ -1221,14 +1223,14 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
         branchQuickStart.find((opt) => opt.toolId === toolId) ??
         branchQuickStart[0];
       if (!selected) {
-        navigateTo("ai-tool-selector");
+        navigateTo("coding-agent-selector");
         return;
       }
 
       setSelectedTool(selected.toolId);
       setPreferredToolId(selected.toolId);
       const normalizedQuickStartModel = normalizeModelId(
-        selected.toolId as AITool,
+        selected.toolId as CodingAgentId,
         selected.model ?? null,
       );
       setSelectedModel(
@@ -1399,13 +1401,13 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
           />
         );
 
-      case "ai-tool-selector":
+      case "coding-agent-selector":
         return (
-          <AIToolSelectorScreen
+          <CodingAgentSelectorScreen
             onBack={goBack}
             onSelect={handleToolSelect}
             version={version}
-            initialToolId={selectedTool ?? preferredToolId ?? null}
+            initialAgentId={selectedTool ?? preferredToolId ?? null}
           />
         );