@akiojin/gwt 4.9.0 → 4.9.1

package/src/web/client/src/pages/ConfigPage.tsx

@@ -1,15 +1,15 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import type {
-  CustomAITool,
+  ApiCodingAgent,
   EnvironmentVariable,
 } from "../../../../types/api.js";
 import { useConfig, useUpdateConfig } from "../hooks/useConfig";
-import { CustomToolList } from "../components/CustomToolList";
+import { CustomCodingAgentList } from "../components/CustomCodingAgentList";
 import {
-  CustomToolForm,
-  type CustomToolFormValue,
-} from "../components/CustomToolForm";
+  CustomCodingAgentForm,
+  type CustomCodingAgentFormValue,
+} from "../components/CustomCodingAgentForm";
 import {
   EnvironmentEditor,
   type EnvEntry,
@@ -31,8 +31,8 @@ const ENV_VALUE_MAX = 500;
 export function ConfigPage() {
   const { data, isLoading, error } = useConfig();
   const updateConfig = useUpdateConfig();
-  const [tools, setTools] = useState<CustomAITool[]>([]);
-  const [editingTool, setEditingTool] = useState<CustomAITool | undefined>(
+  const [agents, setAgents] = useState<ApiCodingAgent[]>([]);
+  const [editingAgent, setEditingAgent] = useState<ApiCodingAgent | undefined>(
     undefined,
   );
   const [banner, setBanner] = useState<BannerState | null>(null);
@@ -40,36 +40,36 @@ export function ConfigPage() {
   const [envEntries, setEnvEntries] = useState<EnvEntry[]>([]);
 
   useEffect(() => {
-    if (data?.tools) setTools(data.tools);
+    if (data?.codingAgents) setAgents(data.codingAgents);
     if (data) setEnvEntries(entriesFromVariables(data.env));
   }, [data]);
 
-  const sortedTools = useMemo(() => {
-    return [...tools].sort((a, b) =>
+  const sortedAgents = useMemo(() => {
+    return [...agents].sort((a, b) =>
       a.displayName.localeCompare(b.displayName, "ja"),
     );
-  }, [tools]);
+  }, [agents]);
 
-  const handleEdit = (tool: CustomAITool) => {
-    setEditingTool(tool);
+  const handleEdit = (agent: ApiCodingAgent) => {
+    setEditingAgent(agent);
     setIsCreating(false);
   };
 
-  const handleDelete = (tool: CustomAITool) => {
-    if (!window.confirm(`${tool.displayName} を削除しますか？`)) return;
-    const next = tools.filter((t) => t.id !== tool.id);
-    persistConfig(next, envEntries, `${tool.displayName} を削除しました。`);
+  const handleDelete = (agent: ApiCodingAgent) => {
+    if (!window.confirm(`${agent.displayName} を削除しますか？`)) return;
+    const next = agents.filter((a) => a.id !== agent.id);
+    persistConfig(next, envEntries, `${agent.displayName} を削除しました。`);
   };
 
   const handleCreate = () => {
-    setEditingTool(undefined);
+    setEditingAgent(undefined);
     setIsCreating(true);
   };
 
-  const handleFormSubmit = (value: CustomToolFormValue) => {
+  const handleFormSubmit = (value: CustomCodingAgentFormValue) => {
     const now = new Date().toISOString();
-    const existing = tools.find((tool) => tool.id === value.id);
-    const nextTool: CustomAITool = {
+    const existing = agents.find((agent) => agent.id === value.id);
+    const nextAgent: ApiCodingAgent = {
       id: value.id,
       displayName: value.displayName,
       icon: value.icon ?? null,
@@ -89,21 +89,21 @@ export function ConfigPage() {
     };
 
     const nextList = existing
-      ? tools.map((tool) => (tool.id === nextTool.id ? nextTool : tool))
-      : [...tools, nextTool];
+      ? agents.map((agent) => (agent.id === nextAgent.id ? nextAgent : agent))
+      : [...agents, nextAgent];
 
     persistConfig(
       nextList,
       envEntries,
-      `${nextTool.displayName} を保存しました。`,
+      `${nextAgent.displayName} を保存しました。`,
     );
   };
 
   const persistConfig = (
-    nextTools: CustomAITool[],
+    nextAgents: ApiCodingAgent[],
     nextEnvEntries: EnvEntry[],
     successMessage: string,
-    options?: { resetToolForm?: boolean },
+    options?: { resetForm?: boolean },
   ) => {
     let envPayload: EnvironmentVariable[];
     try {
@@ -116,13 +116,17 @@ export function ConfigPage() {
 
     const nextVersion = data?.version ?? "1.0.0";
     updateConfig
-      .mutateAsync({ version: nextVersion, tools: nextTools, env: envPayload })
+      .mutateAsync({
+        version: nextVersion,
+        codingAgents: nextAgents,
+        env: envPayload,
+      })
       .then((response) => {
-        setTools(response.tools);
+        setAgents(response.codingAgents);
         setEnvEntries(entriesFromVariables(response.env));
         setBanner({ type: "success", message: successMessage });
-        if (options?.resetToolForm ?? true) {
-          setEditingTool(undefined);
+        if (options?.resetForm ?? true) {
+          setEditingAgent(undefined);
           setIsCreating(false);
         }
       })
@@ -154,15 +158,15 @@ export function ConfigPage() {
   const handleEnvRemove = (id: string) =>
     setEnvEntries((prev) => prev.filter((e) => e.id !== id));
   const handleEnvSave = () =>
-    persistConfig(tools, envEntries, "環境変数を保存しました。", {
-      resetToolForm: false,
+    persistConfig(agents, envEntries, "環境変数を保存しました。", {
+      resetForm: false,
     });
   const handleCancel = () => {
-    setEditingTool(undefined);
+    setEditingAgent(undefined);
     setIsCreating(false);
   };
 
-  const activeFormTool = isCreating ? undefined : editingTool;
+  const activeFormAgent = isCreating ? undefined : editingAgent;
 
   // Loading state
   if (isLoading) {
@@ -170,7 +174,7 @@ export function ConfigPage() {
       <div className="min-h-screen bg-background">
         <PageHeader
           eyebrow="CONFIGURATION"
-          title="カスタムAIツール設定"
+          title="Custom Coding Agent"
           subtitle="読み込み中..."
         />
         <main className="mx-auto max-w-7xl px-6 py-8">
@@ -207,15 +211,15 @@ export function ConfigPage() {
     <div className="min-h-screen bg-background">
       <PageHeader
         eyebrow="CONFIGURATION"
-        title="カスタムAIツール設定"
-        subtitle="tools.json を編集して、独自のAIツールをCLI / Web UI 両方から利用できます。"
+        title="Custom Coding Agent"
+        subtitle="tools.json を編集して、独自の Coding Agent を CLI / Web UI 両方から利用できます。"
       >
         <div className="mt-4 flex flex-wrap gap-2">
           <Button variant="ghost" size="sm" asChild>
             <Link to="/">← ブランチ一覧</Link>
           </Button>
           <Button variant="secondary" onClick={handleCreate}>
-            カスタムツールを追加
+            Coding Agent を追加
           </Button>
         </div>
       </PageHeader>
@@ -251,8 +255,8 @@ export function ConfigPage() {
             </p>
             <h3 className="mt-1 text-lg font-semibold">共有環境変数</h3>
             <p className="mt-2 text-sm text-muted-foreground">
-              Web UI で起動する AI
-              ツールはここに定義された環境変数を自動的に引き継ぎます。
+              Web UI で起動する Coding Agent
+              はここに定義された環境変数を自動的に引き継ぎます。
             </p>
           </CardHeader>
           <CardContent>
@@ -267,33 +271,35 @@ export function ConfigPage() {
           </CardContent>
         </Card>
 
-        {/* Tool List */}
+        {/* Coding Agent List */}
         <Card>
           <CardHeader className="pb-3">
             <p className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
-              Registered Tools
+              Registered Coding Agents
             </p>
-            <h3 className="mt-1 text-lg font-semibold">登録済みツール</h3>
+            <h3 className="mt-1 text-lg font-semibold">
+              登録済み Coding Agent
+            </h3>
             <p className="mt-2 text-sm text-muted-foreground">
               CLI と Web UI は同じ設定を参照します。更新すると ~/.gwt/tools.json
               に保存されます。
             </p>
           </CardHeader>
           <CardContent>
-            <CustomToolList
-              tools={sortedTools}
+            <CustomCodingAgentList
+              agents={sortedAgents}
               onEdit={handleEdit}
               onDelete={handleDelete}
             />
           </CardContent>
         </Card>
 
-        {/* Tool Form */}
-        {(isCreating || editingTool) && (
+        {/* Coding Agent Form */}
+        {(isCreating || editingAgent) && (
           <Card>
             <CardContent className="pt-6">
-              <CustomToolForm
-                {...(activeFormTool ? { initialValue: activeFormTool } : {})}
+              <CustomCodingAgentForm
+                {...(activeFormAgent ? { initialValue: activeFormAgent } : {})}
                 onSubmit={handleFormSubmit}
                 onCancel={handleCancel}
                 isSaving={updateConfig.isPending}

package/src/web/server/env/importer.ts

@@ -1,4 +1,7 @@
-import { loadToolsConfig, saveToolsConfig } from "../../../config/tools.js";
+import {
+  loadCodingAgentsConfig,
+  saveCodingAgentsConfig,
+} from "../../../config/tools.js";
 import { recordEnvHistory } from "../../../config/env-history.js";
 import type { EnvironmentHistoryEntry } from "../../../types/api.js";
 import { createLogger } from "../../../logging/logger.js";
@@ -18,7 +21,7 @@ const IMPORTABLE_KEYS = [
 const importedKeySet = new Set<string>();
 
 export async function importOsEnvIntoSharedConfig(): Promise<string[]> {
-  const config = await loadToolsConfig();
+  const config = await loadCodingAgentsConfig();
   const sharedEnv = { ...(config.env ?? {}) };
   const importedKeys: string[] = [];
 
@@ -36,7 +39,7 @@ export async function importOsEnvIntoSharedConfig(): Promise<string[]> {
     return [];
   }
 
-  await saveToolsConfig({
+  await saveCodingAgentsConfig({
     ...config,
     env: sharedEnv,
   });

package/src/web/server/pty/manager.ts

@@ -1,29 +1,29 @@
 /**
  * PTY Manager
  *
- * AI Toolセッションの疑似端末(PTY)を管理します。
+ * コーディングエージェントセッションの疑似端末(PTY)を管理します。
  * node-ptyを使用してプロセスをスポーンし、WebSocketを通じて入出力を中継します。
  */
 
 import * as pty from "node-pty";
 import type { IPty } from "node-pty";
 import { randomUUID } from "node:crypto";
-import type { AIToolSession } from "../../../types/api.js";
+import type { CodingAgentSession } from "../../../types/api.js";
 import {
   resolveClaudeCommand,
   resolveCodexCommand,
-  resolveCustomToolCommand,
-  AIToolResolutionError,
+  resolveCodingAgentCommand,
+  CodingAgentResolutionError,
   type ResolvedCommand,
-} from "../../../services/aiToolResolver.js";
-import { loadToolsConfig } from "../../../config/tools.js";
+} from "../../../services/codingAgentResolver.js";
+import { loadCodingAgentsConfig } from "../../../config/tools.js";
 import { createLogger } from "../../../logging/logger.js";
 
 const logger = createLogger({ category: "pty" });
 
 export interface PTYInstance {
   ptyProcess: IPty;
-  session: AIToolSession;
+  session: CodingAgentSession;
 }
 
 /**
@@ -48,7 +48,7 @@ export class PTYManager {
       extraArgs?: string[];
       customToolId?: string | null;
     } = {},
-  ): Promise<{ sessionId: string; session: AIToolSession }> {
+  ): Promise<{ sessionId: string; session: CodingAgentSession }> {
     const cols = options.cols ?? 80;
     const rows = options.rows ?? 24;
     const toolName = options.toolName ?? null;
@@ -136,10 +136,10 @@ export class PTYManager {
       "PTY process spawned",
     );
 
-    const session: AIToolSession = {
+    const session: CodingAgentSession = {
       sessionId,
-      toolType,
-      toolName: options.customToolId ?? toolName ?? null,
+      agentType: toolType,
+      agentName: options.customToolId ?? toolName ?? null,
       mode,
       worktreePath,
       ptyPid: ptyProcess.pid,
@@ -190,7 +190,7 @@ export class PTYManager {
    */
   public updateStatus(
     sessionId: string,
-    status: AIToolSession["status"],
+    status: CodingAgentSession["status"],
     exitCode?: number,
     errorMessage?: string,
   ): boolean {
@@ -217,7 +217,7 @@ export class PTYManager {
   /**
    * すべてのセッション一覧を取得
    */
-  public list(): AIToolSession[] {
+  public list(): CodingAgentSession[] {
     return Array.from(this.instances.values()).map((inst) => inst.session);
   }
 
@@ -233,16 +233,16 @@ export class PTYManager {
     },
   ): Promise<ResolvedCommand> {
     if (toolType === "custom") {
-      const toolId = options.customToolId ?? options.toolName;
-      if (!toolId) {
-        throw new AIToolResolutionError(
+      const agentId = options.customToolId ?? options.toolName;
+      if (!agentId) {
+        throw new CodingAgentResolutionError(
           "COMMAND_NOT_FOUND",
-          "Custom tool identifier is required to start a session.",
+          "Coding agent identifier is required to start a session.",
         );
       }
 
-      return resolveCustomToolCommand({
-        toolId,
+      return resolveCodingAgentCommand({
+        agentId,
         mode,
         ...(options.skipPermissions !== undefined
           ? { skipPermissions: options.skipPermissions }
@@ -285,7 +285,7 @@ export class PTYManager {
   }
 
   private async loadSharedEnv(): Promise<Record<string, string>> {
-    const config = await loadToolsConfig();
+    const config = await loadCodingAgentsConfig();
     const sharedEnv = { ...(config.env ?? {}) };
     logger.debug(
       { keyCount: Object.keys(sharedEnv).length },

package/src/web/server/routes/config.ts

@@ -2,7 +2,10 @@
  * Config Routes
  */
 
-import { loadToolsConfig, saveToolsConfig } from "../../../config/tools.js";
+import {
+  loadCodingAgentsConfig,
+  saveCodingAgentsConfig,
+} from "../../../config/tools.js";
 import {
   loadEnvHistory,
   recordEnvHistory,
@@ -10,11 +13,11 @@ import {
 import type {
   ApiResponse,
   ConfigPayload,
-  CustomAITool as ApiCustomAITool,
+  ApiCodingAgent,
   EnvironmentHistoryEntry,
   EnvironmentVariable,
 } from "../../../types/api.js";
-import type { CustomAITool as FileCustomAITool } from "../../../types/tools.js";
+import type { CodingAgent } from "../../../types/tools.js";
 import { getImportedEnvKeys } from "../env/importer.js";
 import type { WebFastifyInstance } from "../types.js";
 
@@ -62,51 +65,51 @@ function envArrayToRecord(
   return record;
 }
 
-function toApiTool(
-  tool: FileCustomAITool,
+function toApiCodingAgent(
+  agent: CodingAgent,
   history: EnvironmentHistoryEntry[],
   importedKeys: Set<string>,
-): ApiCustomAITool {
+): ApiCodingAgent {
   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: ApiCustomAITool): FileCustomAITool {
-  const envRecord = envArrayToRecord(tool.env);
-  const fileTool: FileCustomAITool = {
-    id: tool.id,
-    displayName: tool.displayName,
-    type: tool.executionType,
-    command: tool.command,
-    modeArgs: tool.modeArgs,
+function toFileCodingAgent(agent: ApiCodingAgent): CodingAgent {
+  const envRecord = envArrayToRecord(agent.env);
+  const fileAgent: CodingAgent = {
+    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(
@@ -141,7 +144,7 @@ export async function registerConfigRoutes(
     "/api/config",
     async (request, reply) => {
       try {
-        const config = await loadToolsConfig();
+        const config = await loadCodingAgentsConfig();
         const history = await loadEnvHistory();
         const importedSet = new Set(getImportedEnvKeys());
 
@@ -152,13 +155,16 @@ export async function registerConfigRoutes(
             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),
             ),
           },
         } satisfies ApiResponse<ConfigPayload>;
       } 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,
@@ -175,7 +181,7 @@ export async function registerConfigRoutes(
   }>("/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 ?? {},
@@ -183,10 +189,10 @@ export async function registerConfigRoutes(
         "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) {
@@ -203,7 +209,7 @@ export async function registerConfigRoutes(
           updatedAt: new Date().toISOString(),
           env: normalizeEnv(nextEnvRecord, importedSet, history),
           history,
-          tools: payload.tools,
+          codingAgents: payload.codingAgents,
         },
       } satisfies ApiResponse<ConfigPayload>;
     } catch (error) {