@akiojin/gwt 2.13.0 → 2.14.0

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

@@ -25,13 +25,12 @@ const REASONING_LABELS: Record<string, string> = {
 };
 
 const formatReasoning = (level?: string | null) =>
-  level ? REASONING_LABELS[level] ?? level : "Default";
+  level ? (REASONING_LABELS[level] ?? level) : "Default";
 
 const formatSkip = (skip?: boolean | null) =>
   skip === true ? "Yes" : skip === false ? "No" : "No";
 
-const supportsReasoning = (toolId?: string | null) =>
-  toolId === "codex-cli";
+const supportsReasoning = (toolId?: string | null) => toolId === "codex-cli";
 
 const describe = (opt: BranchQuickStartOption, includeSessionId = true) => {
   const parts = [`Model: ${opt.model ?? "default"}`];
@@ -103,45 +102,45 @@ export function BranchQuickStartScreen({
   const items: QuickStartItem[] = previousOptions.length
     ? (() => {
         const order = ["Claude", "Codex", "Gemini", "Qwen", "Other"];
-      const sorted = [...previousOptions].sort((a, b) => {
-        const ca = resolveCategory(a.toolId).label;
-        const cb = resolveCategory(b.toolId).label;
-        return order.indexOf(ca) - order.indexOf(cb);
-      });
+        const sorted = [...previousOptions].sort((a, b) => {
+          const ca = resolveCategory(a.toolId).label;
+          const cb = resolveCategory(b.toolId).label;
+          return order.indexOf(ca) - order.indexOf(cb);
+        });
 
-      const flat: QuickStartItem[] = [];
+        const flat: QuickStartItem[] = [];
         sorted.forEach((opt, idx) => {
           const cat = resolveCategory(opt.toolId);
           const prevCat =
             idx > 0 ? resolveCategory(sorted[idx - 1]?.toolId).label : null;
           const isNewCategory = prevCat !== cat.label;
 
-        flat.push(
-          {
-            label: "Resume",
-            value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
-            action: "reuse-continue",
-            toolId: opt.toolId ?? null,
-            description: describe(opt, true),
-            groupStart: isNewCategory && flat.length > 0,
-            category: cat.label,
-            categoryColor: cat.color,
-          },
-          {
-            label: "New",
-            value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
-            action: "reuse-new",
-            toolId: opt.toolId ?? null,
-            description: describe(opt, false),
-            groupStart: false,
-            category: cat.label,
-            categoryColor: cat.color,
-          },
-        );
-      });
-
-      return flat;
-    })()
+          flat.push(
+            {
+              label: "Resume",
+              value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
+              action: "reuse-continue",
+              toolId: opt.toolId ?? null,
+              description: describe(opt, true),
+              groupStart: isNewCategory && flat.length > 0,
+              category: cat.label,
+              categoryColor: cat.color,
+            },
+            {
+              label: "New",
+              value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
+              action: "reuse-new",
+              toolId: opt.toolId ?? null,
+              description: describe(opt, false),
+              groupStart: false,
+              category: cat.label,
+              categoryColor: cat.color,
+            },
+          );
+        });
+
+        return flat;
+      })()
     : [
         {
           label: "Resume with previous settings",
@@ -180,11 +179,7 @@ export function BranchQuickStartScreen({
 
   return (
     <Box flexDirection="column" height={containerHeight}>
-      <Header
-        title="Quick Start"
-        titleColor="cyan"
-        version={version}
-      />
+      <Header title="Quick Start" titleColor="cyan" version={version} />
 
       <Box flexDirection="column" flexGrow={1} marginTop={1}>
         <Box marginBottom={1} flexDirection="column">
@@ -197,6 +192,7 @@ export function BranchQuickStartScreen({
         </Box>
         <Select
           items={items}
+          disabled={loading}
           onSelect={(item: QuickStartItem) => {
             if (item.disabled) return;
             onSelect(item.action, item.toolId ?? null);
@@ -204,13 +200,12 @@ export function BranchQuickStartScreen({
           renderItem={(item: QuickStartItem, isSelected) => (
             <Box
               flexDirection="column"
-              marginTop={item.groupStart ? 1 : item.category === "Other" ? 1 : 0}
+              marginTop={
+                item.groupStart ? 1 : item.category === "Other" ? 1 : 0
+              }
             >
               <Text>
-                <Text
-                  color={item.categoryColor}
-                  inverse={isSelected}
-                >
+                <Text color={item.categoryColor} inverse={isSelected}>
                   {`[${item.category}] `}
                 </Text>
                 <Text inverse={isSelected}>
@@ -219,7 +214,7 @@ export function BranchQuickStartScreen({
                 </Text>
               </Text>
               {item.description && (
-                <Text color="gray">  {item.description}</Text>
+                <Text color="gray"> {item.description}</Text>
               )}
             </Box>
           )}

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

@@ -17,13 +17,7 @@ export interface ContinueSessionContext {
 export async function resolveContinueSessionId(
   context: ContinueSessionContext,
 ): Promise<string | null> {
-  const {
-    history,
-    sessionData,
-    branch,
-    toolId,
-    repoRoot,
-  } = context;
+  const { history, sessionData, branch, toolId, repoRoot: _repoRoot } = context;
 
   // 1) 履歴から最新マッチを探す（末尾から遡る）
   for (let i = history.length - 1; i >= 0; i -= 1) {

package/src/codex.ts

@@ -3,10 +3,7 @@ import chalk from "chalk";
 import { platform } from "os";
 import { existsSync } from "fs";
 import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
-import {
-  findLatestCodexSession,
-  waitForCodexSessionId,
-} from "./utils/session.js";
+import { findLatestCodexSession } from "./utils/session.js";
 
 const CODEX_CLI_PACKAGE = "@openai/codex@latest";
 
@@ -85,11 +82,9 @@ export async function launchCodexCLI(
       options.sessionId && options.sessionId.trim().length > 0
         ? options.sessionId.trim()
         : null;
-
-    // Start polling session files immediately to catch the session created right after launch.
-    const sessionProbe = waitForCodexSessionId({ startedAt, cwd: worktreePath }).catch(
-      () => null,
-    );
+    const usedExplicitSessionId =
+      Boolean(resumeSessionId) &&
+      (options.mode === "continue" || options.mode === "resume");
 
     switch (options.mode) {
       case "continue":
@@ -141,15 +136,23 @@ export async function launchCodexCLI(
 
     const childStdio = createChildStdio();
 
-    const env = { ...process.env, ...(options.envOverrides ?? {}) };
+    const env = Object.fromEntries(
+      Object.entries({
+        ...process.env,
+        ...(options.envOverrides ?? {}),
+      }).filter(
+        (entry): entry is [string, string] => typeof entry[1] === "string",
+      ),
+    );
 
     try {
-      const execChild = async (child: any) => {
+      const execChild = async (child: Promise<unknown>) => {
         try {
           await child;
-        } catch (execError: any) {
+        } catch (execError: unknown) {
           // Treat SIGINT/SIGTERM as normal exit (user pressed Ctrl+C)
-          if (execError.signal === "SIGINT" || execError.signal === "SIGTERM") {
+          const signal = (execError as { signal?: unknown })?.signal;
+          if (signal === "SIGINT" || signal === "SIGTERM") {
             return;
           }
           throw execError;
@@ -163,7 +166,7 @@ export async function launchCodexCLI(
         stdout: childStdio.stdout,
         stderr: childStdio.stderr,
         env,
-      } as any);
+      });
       await execChild(child);
     } finally {
       childStdio.cleanup();
@@ -181,10 +184,13 @@ export async function launchCodexCLI(
         windowMs: 10 * 60 * 1000,
         cwd: worktreePath,
       });
-      // Priority: latest on disk > resumeSessionId
-      capturedSessionId = latest?.id ?? resumeSessionId ?? null;
+      const detectedSessionId = latest?.id ?? null;
+      // When we explicitly resumed a specific session, keep that ID as the source of truth.
+      capturedSessionId = usedExplicitSessionId
+        ? resumeSessionId
+        : detectedSessionId;
     } catch {
-      capturedSessionId = resumeSessionId ?? null;
+      capturedSessionId = usedExplicitSessionId ? resumeSessionId : null;
     }
 
     if (capturedSessionId) {
@@ -201,11 +207,13 @@ export async function launchCodexCLI(
     }
 
     return capturedSessionId ? { sessionId: capturedSessionId } : {};
-  } catch (error: any) {
+  } catch (error: unknown) {
+    const err = error as NodeJS.ErrnoException;
+    const details = error instanceof Error ? error.message : String(error);
     const errorMessage =
-      error.code === "ENOENT"
+      err.code === "ENOENT"
         ? "bunx command not found. Please ensure Bun is installed so Codex CLI can run via bunx."
-        : `Failed to launch Codex CLI: ${error.message || "Unknown error"}`;
+        : `Failed to launch Codex CLI: ${details || "Unknown error"}`;
 
     if (platform() === "win32") {
       console.error(chalk.red("\n💡 Windows troubleshooting tips:"));
@@ -234,8 +242,9 @@ export async function isCodexAvailable(): Promise<boolean> {
   try {
     await execa("bunx", [CODEX_CLI_PACKAGE, "--help"]);
     return true;
-  } catch (error: any) {
-    if (error.code === "ENOENT") {
+  } catch (error: unknown) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code === "ENOENT") {
       console.error(chalk.yellow("\n⚠️  bunx command not found"));
     }
     return false;

package/src/config/builtin-tools.ts

@@ -5,6 +5,10 @@
  */
 
 import type { CustomAITool } from "../types/tools.js";
+import {
+  CLAUDE_PERMISSION_SKIP_ARGS,
+  CODEX_DEFAULT_ARGS,
+} from "../shared/aiToolConstants.js";
 
 /**
  * Claude Code のビルトイン定義
@@ -19,7 +23,7 @@ export const CLAUDE_CODE_TOOL: CustomAITool = {
     continue: ["-c"],
     resume: ["-r"],
   },
-  permissionSkipArgs: ["--yes"],
+  permissionSkipArgs: Array.from(CLAUDE_PERMISSION_SKIP_ARGS),
 };
 
 /**
@@ -30,7 +34,7 @@ export const CODEX_CLI_TOOL: CustomAITool = {
   displayName: "Codex",
   type: "bunx",
   command: "@openai/codex@latest",
-  defaultArgs: ["--auto-approve", "--verbose"],
+  defaultArgs: Array.from(CODEX_DEFAULT_ARGS),
   modeArgs: {
     normal: [],
     continue: ["resume", "--last"],

package/src/config/shared-env.ts

@@ -0,0 +1,139 @@
+/**
+ * Shared environment variable helpers.
+ *
+ * 管理画面やサーバー側の設定ロジックから共通で利用する
+ * 環境変数スキーマ/バリデーション/マージ処理を集約する。
+ */
+
+const ENV_KEY_PATTERN = /^[A-Z0-9_]+$/;
+const MAX_KEY_LENGTH = 100;
+const MAX_VALUE_LENGTH = 500;
+
+const DEFAULT_BOOTSTRAP_ENV_KEYS = [
+  "ANTHROPIC_API_KEY",
+  "ANTHROPIC_API_KEY_PATH",
+  "ANTHROPIC_API_BASE",
+  "OPENAI_API_KEY",
+  "OPENAI_BASE_URL",
+  "OPENAI_API_BASE",
+  "OPENAI_ORG_ID",
+  "OPENAI_PROJECT",
+  "OPENAI_API_TYPE",
+  "OPENAI_API_VERSION",
+  "GITHUB_TOKEN",
+  "GH_TOKEN",
+  "GITLAB_TOKEN",
+  "AZURE_OPENAI_API_KEY",
+  "AZURE_OPENAI_ENDPOINT",
+] as const;
+
+export type EnvironmentRecord = Record<string, string>;
+
+/**
+ * 環境変数キーが有効かどうかを判定。
+ */
+export function isValidEnvKey(key: string): boolean {
+  if (!key || typeof key !== "string") {
+    return false;
+  }
+  if (key.length === 0 || key.length > MAX_KEY_LENGTH) {
+    return false;
+  }
+  return ENV_KEY_PATTERN.test(key);
+}
+
+/**
+ * 許容されるキー長を取得。
+ */
+export function getEnvConstraints(): {
+  maxKeyLength: number;
+  maxValueLength: number;
+} {
+  return {
+    maxKeyLength: MAX_KEY_LENGTH,
+    maxValueLength: MAX_VALUE_LENGTH,
+  };
+}
+
+/**
+ * 任意のレコードをサニタイズして string -> string のみに整形する。
+ */
+export function sanitizeEnvRecord(
+  record?: Record<string, unknown>,
+): EnvironmentRecord {
+  if (!record || typeof record !== "object") {
+    return {};
+  }
+  const result: EnvironmentRecord = {};
+  for (const [key, value] of Object.entries(record)) {
+    if (value === undefined || value === null) {
+      continue;
+    }
+    result[key] = String(value);
+  }
+  return result;
+}
+
+/**
+ * envレコードを検証し、フォーマットが不正な場合は例外を投げる。
+ */
+export function validateEnvRecord(record: EnvironmentRecord): void {
+  for (const [key, value] of Object.entries(record)) {
+    if (!isValidEnvKey(key)) {
+      throw new Error(
+        `Invalid environment variable key: "${key}". Use 1-${MAX_KEY_LENGTH} characters (A-Z, 0-9, underscore).`,
+      );
+    }
+    if (value.length === 0) {
+      throw new Error(`Environment variable "${key}" must not be empty.`);
+    }
+    if (value.length > MAX_VALUE_LENGTH) {
+      throw new Error(
+        `Environment variable "${key}" exceeds the maximum length (${MAX_VALUE_LENGTH}).`,
+      );
+    }
+  }
+}
+
+/**
+ * 起動時にOSから読み取って取り込みたい環境変数キー一覧を返す。
+ * CLAUDE_WORKTREE_BOOTSTRAP_ENV_KEYS=KEY1,KEY2 で上書き可能。
+ */
+export function getBootstrapEnvKeys(): string[] {
+  const override = process.env.CLAUDE_WORKTREE_BOOTSTRAP_ENV_KEYS;
+  if (!override) {
+    return [...DEFAULT_BOOTSTRAP_ENV_KEYS];
+  }
+  return override
+    .split(",")
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+    .map((entry) => entry.toUpperCase());
+}
+
+/**
+ * 現在のenvレコードへ、指定されたキーのみOS環境変数から補完する。
+ */
+export function mergeWithBootstrapEnv(
+  current: EnvironmentRecord,
+  sourceEnv: NodeJS.ProcessEnv,
+  keys: string[] = getBootstrapEnvKeys(),
+): { merged: EnvironmentRecord; addedKeys: string[] } {
+  const merged: EnvironmentRecord = { ...current };
+  const addedKeys: string[] = [];
+
+  for (const key of keys) {
+    if (merged[key] !== undefined) {
+      continue; // 既に設定済み
+    }
+    const value = sourceEnv[key];
+    if (typeof value === "string" && value.length > 0) {
+      merged[key] = value;
+      addedKeys.push(key);
+    }
+  }
+
+  return { merged, addedKeys };
+}
+
+export { ENV_KEY_PATTERN };

package/src/gemini.ts

@@ -50,6 +50,9 @@ export async function launchGeminiCLI(
       options.sessionId && options.sessionId.trim().length > 0
         ? options.sessionId.trim()
         : null;
+    const usedExplicitSessionId =
+      Boolean(resumeSessionId) &&
+      (options.mode === "continue" || options.mode === "resume");
 
     const buildArgs = (useResumeId: boolean) => {
       const a: string[] = [];
@@ -59,12 +62,6 @@ export async function launchGeminiCLI(
 
       switch (options.mode) {
         case "continue":
-          if (useResumeId && resumeSessionId) {
-            a.push("--resume", resumeSessionId);
-          } else {
-            a.push("--resume");
-          }
-          break;
         case "resume":
           if (useResumeId && resumeSessionId) {
             a.push("--resume", resumeSessionId);
@@ -123,10 +120,14 @@ export async function launchGeminiCLI(
     }
     terminal.exitRawMode();
 
-    const baseEnv = {
-      ...process.env,
-      ...(options.envOverrides ?? {}),
-    };
+    const baseEnv = Object.fromEntries(
+      Object.entries({
+        ...process.env,
+        ...(options.envOverrides ?? {}),
+      }).filter(
+        (entry): entry is [string, string] => typeof entry[1] === "string",
+      ),
+    );
 
     const childStdio = createChildStdio();
 
@@ -156,7 +157,9 @@ export async function launchGeminiCLI(
       }
     };
 
-    const runGemini = async (runArgs: string[]): Promise<string | undefined> => {
+    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[] = [];
@@ -169,7 +172,7 @@ export async function launchGeminiCLI(
           stdout: "pipe",
           stderr: childStdio.stderr,
           env: baseEnv,
-        } as any);
+        });
 
         // Pass stdout through to terminal while capturing
         child.stdout?.on("data", (chunk: Buffer) => {
@@ -203,6 +206,7 @@ export async function launchGeminiCLI(
     };
 
     let output: string | undefined;
+    let fellBackToLatest = false;
     try {
       // Try with explicit session ID first (if any), then fallback to --resume (latest) once
       try {
@@ -212,6 +216,7 @@ export async function launchGeminiCLI(
           (options.mode === "resume" || options.mode === "continue") &&
           resumeSessionId;
         if (shouldRetry) {
+          fellBackToLatest = true;
           console.log(
             chalk.yellow(
               `   ⚠️  Failed to resume session ${resumeSessionId}. Retrying with latest session...`,
@@ -229,17 +234,22 @@ export async function launchGeminiCLI(
     // Extract session ID from Gemini's exit summary output
     extractSessionId(output);
 
-    // Fallback to file-based detection if stdout capture failed
+    const explicitResumeSucceeded = usedExplicitSessionId && !fellBackToLatest;
+
+    // If we explicitly resumed a specific session (and did not fall back), keep that ID.
+    if (explicitResumeSucceeded) {
+      capturedSessionId = resumeSessionId;
+    }
+
+    // Fallback to file-based detection if stdout capture failed (and we don't have an explicit-resume ID)
     if (!capturedSessionId) {
       try {
         capturedSessionId =
           (await findLatestGeminiSessionId(worktreePath, {
             cwd: worktreePath,
-          })) ??
-          resumeSessionId ??
-          null;
+          })) ?? null;
       } catch {
-        capturedSessionId = resumeSessionId ?? null;
+        capturedSessionId = null;
       }
     }
 
@@ -257,11 +267,12 @@ export async function launchGeminiCLI(
     }
 
     return capturedSessionId ? { sessionId: capturedSessionId } : {};
-  } catch (error: any) {
+  } catch (error: unknown) {
     const hasLocalGemini = await isGeminiCommandAvailable();
     let errorMessage: string;
+    const err = error as NodeJS.ErrnoException;
 
-    if (error.code === "ENOENT") {
+    if (err.code === "ENOENT") {
       if (hasLocalGemini) {
         errorMessage =
           "gemini command not found. Please ensure Gemini CLI is properly installed.";
@@ -270,7 +281,8 @@ export async function launchGeminiCLI(
           "bunx command not found. Please ensure Bun is installed so Gemini CLI can run via bunx.";
       }
     } else {
-      errorMessage = `Failed to launch Gemini CLI: ${error.message || "Unknown error"}`;
+      const details = error instanceof Error ? error.message : String(error);
+      errorMessage = `Failed to launch Gemini CLI: ${details || "Unknown error"}`;
     }
 
     if (process.platform === "win32") {
@@ -331,8 +343,9 @@ export async function isGeminiCLIAvailable(): Promise<boolean> {
   try {
     await execa("bunx", [GEMINI_CLI_PACKAGE, "--version"], { shell: true });
     return true;
-  } catch (error: any) {
-    if (error.code === "ENOENT") {
+  } catch (error: unknown) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code === "ENOENT") {
       console.error(chalk.yellow("\n⚠️  bunx command not found"));
       console.error(
         chalk.gray(

package/src/index.ts

@@ -33,6 +33,7 @@ import {
   getTerminalStreams,
   waitForUserAcknowledgement,
 } from "./utils/terminal.js";
+import { resolveWebUiPort, isPortInUse } from "./utils/webui.js";
 import { createLogger } from "./logging/logger.js";
 import { getToolById, getSharedEnvironment } from "./config/tools.js";
 import { launchCustomAITool } from "./launcher.js";
@@ -552,12 +553,12 @@ export async function handleAIToolWorkflow(
       { skipHistory: true },
     );
 
-    // Lookup saved session ID for continue/resume
+    // Lookup saved session ID for Continue (auto attach)
     let resumeSessionId: string | null =
       selectedSessionId && selectedSessionId.length > 0
         ? selectedSessionId
         : null;
-    if (mode === "continue" || mode === "resume") {
+    if (mode === "continue") {
       const existingSession = await loadSession(repoRoot);
       const history = existingSession?.history ?? [];
 
@@ -700,14 +701,15 @@ export async function handleAIToolWorkflow(
 
     if (!finalSessionId && tool === "claude-code") {
       try {
-        finalSessionId = (await findLatestClaudeSessionId(worktreePath)) ?? null;
+        finalSessionId =
+          (await findLatestClaudeSessionId(worktreePath)) ?? null;
       } catch {
         finalSessionId = null;
       }
     }
     const finishedAt = Date.now();
 
-    if (tool === "codex-cli") {
+    if (!finalSessionId && tool === "codex-cli") {
       try {
         const latest = await findLatestCodexSession({
           since: launchStartedAt - 60_000,
@@ -722,7 +724,7 @@ export async function handleAIToolWorkflow(
       } catch {
         // ignore fallback failure
       }
-    } else if (tool === "claude-code") {
+    } else if (!finalSessionId && tool === "claude-code") {
       try {
         const latestClaude = await findLatestClaudeSession(worktreePath, {
           since: launchStartedAt - 60_000,
@@ -736,7 +738,7 @@ export async function handleAIToolWorkflow(
       } catch {
         // ignore
       }
-    } else if (tool === "gemini-cli") {
+    } else if (!finalSessionId && tool === "gemini-cli") {
       try {
         const latestGemini = await findLatestGeminiSession(worktreePath, {
           since: launchStartedAt - 60_000,
@@ -874,7 +876,52 @@ export async function main(): Promise<void> {
     process.exit(1);
   }
 
-  await runInteractiveLoop();
+  // Start Web UI server in background (skip if port is in use)
+  const port = resolveWebUiPort();
+  const portInUse = await isPortInUse(port);
+  let webServerHandlePromise: Promise<{
+    close: () => Promise<void>;
+  } | null> | null = null;
+  if (portInUse) {
+    printWarning(`Port ${port} is already in use. Skipping Web UI server.`);
+  } else {
+    const { startWebServer } = await import("./web/server/index.js");
+    webServerHandlePromise = startWebServer({ background: true }).catch(
+      (err) => {
+        appLogger.warn({ err }, "Web UI server failed to start");
+        return null;
+      },
+    );
+    printInfo(`Web UI available at http://localhost:${port}`);
+  }
+
+  try {
+    await runInteractiveLoop();
+  } finally {
+    if (webServerHandlePromise) {
+      const shutdownTimeoutMs = 2000;
+      const handleOrTimeout = await Promise.race([
+        webServerHandlePromise,
+        new Promise<"timeout">((resolve) => {
+          const timer = setTimeout(() => resolve("timeout"), shutdownTimeoutMs);
+          timer.unref?.();
+        }),
+      ]);
+
+      if (handleOrTimeout === "timeout") {
+        appLogger.warn(
+          { timeoutMs: shutdownTimeoutMs },
+          "Web UI server startup did not finish before shutdown timeout; skipping stop",
+        );
+      } else if (handleOrTimeout) {
+        try {
+          await handleOrTimeout.close();
+        } catch (err) {
+          appLogger.warn({ err }, "Web UI server failed to stop");
+        }
+      }
+    }
+  }
 }
 
 // Run the application if this module is executed directly