@akiojin/gwt 4.8.0 → 4.9.1

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

@@ -640,7 +640,7 @@ export const BranchListScreen = React.memo(function BranchListScreen({
         )}
       </Box>
 
-      {/* Tool Status - FR-019, FR-021 */}
+      {/* Tool Status - FR-019, FR-021, FR-022 */}
       {toolStatuses && toolStatuses.length > 0 && (
         <Box>
           <Text dimColor>Tools: </Text>
@@ -648,7 +648,9 @@ export const BranchListScreen = React.memo(function BranchListScreen({
             <React.Fragment key={tool.id}>
               <Text>{tool.name}: </Text>
               <Text color={tool.status === "installed" ? "green" : "yellow"}>
-                {tool.status}
+                {tool.status === "installed" && tool.version
+                  ? tool.version
+                  : tool.status}
               </Text>
               {index < toolStatuses.length - 1 && <Text dimColor> | </Text>}
             </React.Fragment>

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

@@ -0,0 +1,159 @@
+import React, { useState, useEffect } from "react";
+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 { getAllCodingAgents } from "../../../../config/tools.js";
+import type { CodingAgentConfig } from "../../../../types/tools.js";
+import type { CodingAgentId } from "../../types.js";
+
+/**
+ * Renderable item for the coding agent selector list.
+ */
+export interface CodingAgentItem {
+  label: string;
+  value: CodingAgentId;
+  description: string;
+}
+
+/**
+ * Props for `CodingAgentSelectorScreen`.
+ */
+export interface CodingAgentSelectorScreenProps {
+  onBack: () => void;
+  onSelect: (agentId: CodingAgentId) => void;
+  version?: string | null;
+  initialAgentId?: CodingAgentId | null;
+}
+
+/**
+ * CodingAgentSelectorScreen - Screen for selecting coding agent (Claude Code, Codex CLI, or custom agents)
+ * Layout: Header + Agent Selection + Footer
+ *
+ * This screen dynamically loads available agents from the configuration (builtin + custom).
+ */
+export function CodingAgentSelectorScreen({
+  onBack,
+  onSelect,
+  version,
+  initialAgentId,
+}: CodingAgentSelectorScreenProps) {
+  const { rows } = useTerminalSize();
+  const [agentItems, setAgentItems] = useState<CodingAgentItem[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [selectedIndex, setSelectedIndex] = useState<number>(0);
+
+  // Load agents from getAllCodingAgents()
+  useEffect(() => {
+    const loadAgents = async () => {
+      try {
+        const agents = await getAllCodingAgents();
+
+        // Convert CodingAgentConfig[] to CodingAgentItem[]
+        const items: CodingAgentItem[] = agents.map(
+          (agent: CodingAgentConfig) => {
+            // Generate description based on whether it's builtin or custom
+            const description = agent.isBuiltin
+              ? `Official ${agent.displayName} agent`
+              : `Custom coding agent`;
+
+            // Add icon to label if present
+            const label = agent.icon
+              ? `${agent.icon} ${agent.displayName}`
+              : agent.displayName;
+
+            return {
+              label,
+              value: agent.id,
+              description,
+            };
+          },
+        );
+
+        setAgentItems(items);
+
+        // Decide initial cursor position based on last used agent
+        const idx =
+          initialAgentId && items.length > 0
+            ? items.findIndex((item) => item.value === initialAgentId)
+            : 0;
+        setSelectedIndex(idx >= 0 ? idx : 0);
+      } catch (error) {
+        // If loading fails, show error in console but don't crash
+        console.error("Failed to load coding agents:", error);
+        // Fall back to empty array
+        setAgentItems([]);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    loadAgents();
+  }, [initialAgentId]);
+
+  // Update selection when props or items change
+  useEffect(() => {
+    if (isLoading || agentItems.length === 0) return;
+    const idx =
+      initialAgentId && agentItems.length > 0
+        ? agentItems.findIndex((item) => item.value === initialAgentId)
+        : 0;
+    setSelectedIndex(idx >= 0 ? idx : 0);
+  }, [initialAgentId, agentItems, isLoading]);
+
+  // Handle keyboard input
+  // Note: Select component handles Enter and arrow keys
+  useAppInput((input, key) => {
+    if (key.escape) {
+      onBack();
+    }
+  });
+
+  // Handle agent selection
+  const handleSelect = (item: CodingAgentItem) => {
+    onSelect(item.value);
+  };
+
+  // Footer actions
+  const footerActions = [
+    { key: "enter", description: "Select" },
+    { key: "esc", description: "Back" },
+  ];
+
+  return (
+    <Box flexDirection="column" height={rows}>
+      {/* Header */}
+      <Header
+        title="Coding Agent Selection"
+        titleColor="blue"
+        version={version}
+      />
+
+      {/* Content */}
+      <Box flexDirection="column" flexGrow={1} marginTop={1}>
+        <Box marginBottom={1}>
+          <Text>Select coding agent to use:</Text>
+        </Box>
+        {isLoading ? (
+          <Text>Loading coding agents...</Text>
+        ) : agentItems.length === 0 ? (
+          <Text color="yellow">
+            No coding agents available. Please check your configuration.
+          </Text>
+        ) : (
+          <Select
+            items={agentItems}
+            onSelect={handleSelect}
+            selectedIndex={selectedIndex}
+            onSelectedIndexChange={setSelectedIndex}
+          />
+        )}
+      </Box>
+
+      {/* Footer */}
+      <Footer actions={footerActions} />
+    </Box>
+  );
+}

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

@@ -5,7 +5,11 @@ 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";
-import type { AITool, InferenceLevel, ModelOption } from "../../types.js";
+import type {
+  CodingAgentId,
+  InferenceLevel,
+  ModelOption,
+} from "../../types.js";
 import {
   getDefaultInferenceForModel,
   getDefaultModelOption,
@@ -33,7 +37,7 @@ interface InferenceSelectItem extends SelectItem {
  * Props for `ModelSelectorScreen`.
  */
 export interface ModelSelectorScreenProps {
-  tool: AITool;
+  tool: CodingAgentId;
   onBack: () => void;
   onSelect: (selection: ModelSelectionResult) => void;
   version?: string | null;

package/src/cli/ui/types.ts

@@ -9,7 +9,7 @@ export interface WorktreeInfo {
   hasUncommittedChanges?: boolean;
 }
 
-export type AITool = string;
+export type CodingAgentId = string;
 export type InferenceLevel = "low" | "medium" | "high" | "xhigh";
 
 /**
@@ -194,7 +194,7 @@ export type ScreenType =
   | "branch-creator"
   | "branch-action-selector"
   | "branch-quick-start"
-  | "ai-tool-selector"
+  | "coding-agent-selector"
   | "model-selector"
   | "session-selector"
   | "execution-mode-selector"

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

@@ -1,4 +1,4 @@
-import type { AITool, InferenceLevel, ModelOption } from "../types.js";
+import type { CodingAgentId, InferenceLevel, ModelOption } from "../types.js";
 
 const CODEX_BASE_LEVELS: InferenceLevel[] = ["high", "medium", "low"];
 const CODEX_MAX_LEVELS: InferenceLevel[] = ["xhigh", "high", "medium", "low"];
@@ -105,11 +105,13 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
   ],
 };
 
-export function getModelOptions(tool: AITool): ModelOption[] {
+export function getModelOptions(tool: CodingAgentId): ModelOption[] {
   return MODEL_OPTIONS[tool] ?? [];
 }
 
-export function getDefaultModelOption(tool: AITool): ModelOption | undefined {
+export function getDefaultModelOption(
+  tool: CodingAgentId,
+): ModelOption | undefined {
   const options = getModelOptions(tool);
   return options.find((opt) => opt.isDefault) ?? options[0];
 }
@@ -136,7 +138,7 @@ export function getDefaultInferenceForModel(
  * Normalize a model identifier for consistent display and persistence.
  */
 export function normalizeModelId(
-  tool: AITool,
+  tool: CodingAgentId,
   model?: string | null,
 ): string | null {
   if (model === null || model === undefined) return model ?? null;

package/src/config/{builtin-tools.ts → builtin-coding-agents.ts}

@@ -1,19 +1,19 @@
 /**
- * ビルトインAIツール定義
+ * ビルトインコーディングエージェント定義
  *
- * Claude Code、Codex、Gemini の CustomAITool 形式定義
+ * Claude Code、Codex、Gemini の CodingAgent 形式定義
  */
 
-import type { CustomAITool } from "../types/tools.js";
+import type { CodingAgent } from "../types/tools.js";
 import {
   CLAUDE_PERMISSION_SKIP_ARGS,
   CODEX_DEFAULT_ARGS,
-} from "../shared/aiToolConstants.js";
+} from "../shared/codingAgentConstants.js";
 
 /**
  * Claude Code のビルトイン定義
  */
-export const CLAUDE_CODE_TOOL: CustomAITool = {
+export const CLAUDE_CODE_TOOL: CodingAgent = {
   id: "claude-code",
   displayName: "Claude Code",
   type: "bunx",
@@ -32,7 +32,7 @@ export const CLAUDE_CODE_TOOL: CustomAITool = {
 /**
  * Codex のビルトイン定義
  */
-export const CODEX_CLI_TOOL: CustomAITool = {
+export const CODEX_CLI_TOOL: CodingAgent = {
   id: "codex-cli",
   displayName: "Codex",
   type: "bunx",
@@ -48,7 +48,7 @@ export const CODEX_CLI_TOOL: CustomAITool = {
 /**
  * Gemini のビルトイン定義
  */
-export const GEMINI_CLI_TOOL: CustomAITool = {
+export const GEMINI_CLI_TOOL: CodingAgent = {
   id: "gemini-cli",
   displayName: "Gemini",
   type: "bunx",
@@ -62,9 +62,9 @@ export const GEMINI_CLI_TOOL: CustomAITool = {
 };
 
 /**
- * すべてのビルトインツール
+ * すべてのビルトインコーディングエージェント
  */
-export const BUILTIN_TOOLS: CustomAITool[] = [
+export const BUILTIN_CODING_AGENTS: CodingAgent[] = [
   CLAUDE_CODE_TOOL,
   CODEX_CLI_TOOL,
   GEMINI_CLI_TOOL,

package/src/config/index.ts

@@ -52,11 +52,8 @@ const DEFAULT_CONFIG: AppConfig = {
 export async function loadConfig(): Promise<AppConfig> {
   const configPaths = [
     path.join(process.cwd(), ".gwt.json"),
-    path.join(process.cwd(), ".claude-worktree.json"), // 後方互換性
     path.join(homedir(), ".config", "gwt", "config.json"),
-    path.join(homedir(), ".config", "claude-worktree", "config.json"), // 後方互換性
     path.join(homedir(), ".gwt.json"),
-    path.join(homedir(), ".claude-worktree.json"), // 後方互換性
   ];
 
   for (const configPath of configPaths) {
@@ -79,10 +76,9 @@ export async function loadConfig(): Promise<AppConfig> {
   return {
     ...DEFAULT_CONFIG,
     defaultBaseBranch:
-      process.env.CLAUDE_WORKTREE_BASE_BRANCH ||
-      DEFAULT_CONFIG.defaultBaseBranch,
-    skipPermissions: process.env.CLAUDE_WORKTREE_SKIP_PERMISSIONS === "true",
-    enableGitHubIntegration: process.env.CLAUDE_WORKTREE_GITHUB !== "false",
+      process.env.GWT_BASE_BRANCH || DEFAULT_CONFIG.defaultBaseBranch,
+    skipPermissions: process.env.GWT_SKIP_PERMISSIONS === "true",
+    enableGitHubIntegration: process.env.GWT_GITHUB !== "false",
     enableDebugMode:
       process.env.DEBUG_CLEANUP === "true" || process.env.DEBUG === "true",
   };

package/src/config/profiles.ts

@@ -29,16 +29,13 @@ import {
 /**
  * 設定ディレクトリのパスを取得
  *
- * 環境変数の優先順位: GWT_HOME > CLAUDE_WORKTREE_HOME (後方互換性) > ホームディレクトリ
+ * 環境変数 GWT_HOME が設定されている場合はそれを使用、それ以外はホームディレクトリ
  */
 function getConfigDir(): string {
   const worktreeHome =
     process.env.GWT_HOME && process.env.GWT_HOME.trim().length > 0
       ? process.env.GWT_HOME
-      : process.env.CLAUDE_WORKTREE_HOME &&
-          process.env.CLAUDE_WORKTREE_HOME.trim().length > 0
-        ? process.env.CLAUDE_WORKTREE_HOME
-        : homedir();
+      : homedir();
   return path.join(worktreeHome, ".gwt");
 }
 
@@ -133,11 +130,11 @@ async function mutateProfiles(
 }
 
 /**
- * プロファイル設定ファイルのパス（後方互換性のためエクスポート）
+ * プロファイル設定ファイルのパス
  *
  * @deprecated 内部では getProfilesConfigPath() を使用してください。
  * この定数はモジュールロード時に評価されるため、
- * 実行中に環境変数（GWT_HOME/CLAUDE_WORKTREE_HOME）を変更しても反映されません。
+ * 実行中に環境変数（GWT_HOME）を変更しても反映されません。
  */
 export const PROFILES_CONFIG_PATH = getProfilesConfigPath();