@akiojin/gwt 4.10.0 → 4.12.0

package/src/config/builtin-coding-agents.ts

@@ -17,7 +17,7 @@ export const CLAUDE_CODE_TOOL: CodingAgent = {
   id: "claude-code",
   displayName: "Claude Code",
   type: "bunx",
-  command: "@anthropic-ai/claude-code@latest",
+  command: "@anthropic-ai/claude-code",
   modeArgs: {
     normal: [],
     continue: ["-c"],
@@ -36,7 +36,7 @@ export const CODEX_CLI_TOOL: CodingAgent = {
   id: "codex-cli",
   displayName: "Codex",
   type: "bunx",
-  command: "@openai/codex@latest",
+  command: "@openai/codex",
   defaultArgs: Array.from(CODEX_DEFAULT_ARGS),
   modeArgs: {
     normal: [],
@@ -52,7 +52,7 @@ export const GEMINI_CLI_TOOL: CodingAgent = {
   id: "gemini-cli",
   displayName: "Gemini",
   type: "bunx",
-  command: "@google/gemini-cli@latest",
+  command: "@google/gemini-cli",
   modeArgs: {
     normal: [],
     continue: ["-r", "latest"],
@@ -68,7 +68,7 @@ export const OPENCODE_TOOL: CodingAgent = {
   id: "opencode",
   displayName: "OpenCode",
   type: "bunx",
-  command: "opencode-ai@latest",
+  command: "opencode-ai",
   modeArgs: {
     normal: [],
     continue: ["-c"],

package/src/config/index.ts

@@ -22,6 +22,7 @@ export interface SessionData {
   mode?: "normal" | "continue" | "resume";
   model?: string | null;
   toolLabel?: string | null;
+  toolVersion?: string | null;
   history?: ToolSessionEntry[];
 }
 
@@ -35,6 +36,7 @@ export interface ToolSessionEntry {
   model?: string | null;
   reasoningLevel?: string | null;
   skipPermissions?: boolean | null;
+  toolVersion?: string | null;
   timestamp: number;
 }
 
@@ -46,6 +48,14 @@ const DEFAULT_CONFIG: AppConfig = {
   worktreeNamingPattern: "{repo}-{branch}",
 };
 
+function normalizeToolVersion(version?: string | null): string {
+  if (!version) {
+    return "latest";
+  }
+  const trimmed = version.trim();
+  return trimmed.length > 0 ? trimmed : "latest";
+}
+
 /**
  * 設定ファイルを読み込む
  */
@@ -119,6 +129,7 @@ export async function saveSession(
   try {
     const sessionPath = getSessionFilePath(sessionData.repositoryRoot);
     const sessionDir = path.dirname(sessionPath);
+    const resolvedToolVersion = normalizeToolVersion(sessionData.toolVersion);
 
     // ディレクトリを作成
     await mkdir(sessionDir, { recursive: true });
@@ -152,6 +163,7 @@ export async function saveSession(
         model: sessionData.model ?? null,
         reasoningLevel: sessionData.reasoningLevel ?? null,
         skipPermissions: sessionData.skipPermissions ?? false,
+        toolVersion: resolvedToolVersion,
         timestamp: sessionData.timestamp,
       };
       existingHistory = [...existingHistory, entry].slice(-100); // keep latest 100
@@ -163,6 +175,7 @@ export async function saveSession(
       lastSessionId: sessionData.lastSessionId ?? null,
       reasoningLevel: sessionData.reasoningLevel ?? null,
       skipPermissions: sessionData.skipPermissions ?? false,
+      toolVersion: resolvedToolVersion,
     };
 
     await writeFile(sessionPath, JSON.stringify(payload, null, 2), "utf-8");
@@ -277,6 +290,7 @@ export async function getLastToolUsageMap(
         worktreePath: parsed.lastWorktreePath,
         toolId: parsed.lastUsedTool ?? "unknown",
         toolLabel: parsed.toolLabel ?? parsed.lastUsedTool ?? "Custom",
+        sessionId: parsed.lastSessionId ?? null,
         mode: parsed.mode ?? null,
         model: parsed.model ?? null,
         reasoningLevel: parsed.reasoningLevel ?? null,

package/src/gemini.ts

@@ -5,11 +5,16 @@ import {
   createChildStdio,
   getTerminalStreams,
   resetTerminalModes,
+  writeTerminalLine,
 } from "./utils/terminal.js";
 import { findCommand } from "./utils/command.js";
 import { findLatestGeminiSessionId } from "./utils/session.js";
+import {
+  runAgentWithPty,
+  shouldCaptureAgentOutput,
+} from "./logging/agentOutput.js";
 
-const GEMINI_CLI_PACKAGE = "@google/gemini-cli@latest";
+const GEMINI_CLI_PACKAGE = "@google/gemini-cli";
 
 /**
  * Error wrapper used by `launchGeminiCLI` to preserve the original failure
@@ -44,6 +49,8 @@ export async function launchGeminiCLI(
     envOverrides?: Record<string, string>;
     model?: string;
     sessionId?: string | null;
+    branch?: string | null;
+    version?: string | null;
   } = {},
 ): Promise<{ sessionId?: string | null }> {
   const terminal = getTerminalStreams();
@@ -54,14 +61,14 @@ export async function launchGeminiCLI(
       throw new Error(`Worktree path does not exist: ${worktreePath}`);
     }
 
-    console.log(chalk.blue("🚀 Launching Gemini CLI..."));
-    console.log(chalk.gray(`   Working directory: ${worktreePath}`));
+    writeTerminalLine(chalk.blue("🚀 Launching Gemini CLI..."));
+    writeTerminalLine(chalk.gray(`   Working directory: ${worktreePath}`));
 
     const args: string[] = [];
 
     if (options.model) {
       args.push("--model", options.model);
-      console.log(chalk.green(`   🎯 Model: ${options.model}`));
+      writeTerminalLine(chalk.green(`   🎯 Model: ${options.model}`));
     }
 
     // Handle execution mode
@@ -109,31 +116,35 @@ export async function launchGeminiCLI(
     switch (options.mode) {
       case "continue":
         if (resumeSessionId) {
-          console.log(
+          writeTerminalLine(
             chalk.cyan(
               `   ⏭️  Continuing specific session: ${resumeSessionId}`,
             ),
           );
         } else {
-          console.log(chalk.cyan("   ⏭️  Continuing most recent session"));
+          writeTerminalLine(
+            chalk.cyan("   ⏭️  Continuing most recent session"),
+          );
         }
         break;
       case "resume":
         if (resumeSessionId) {
-          console.log(chalk.cyan(`   🔄 Resuming session: ${resumeSessionId}`));
+          writeTerminalLine(
+            chalk.cyan(`   🔄 Resuming session: ${resumeSessionId}`),
+          );
         } else {
-          console.log(chalk.cyan("   🔄 Resuming session (latest)"));
+          writeTerminalLine(chalk.cyan("   🔄 Resuming session (latest)"));
         }
         break;
       case "normal":
       default:
-        console.log(chalk.green("   ✨ Starting new session"));
+        writeTerminalLine(chalk.green("   ✨ Starting new session"));
         break;
     }
 
     // Handle skip permissions (YOLO mode)
     if (options.skipPermissions) {
-      console.log(
+      writeTerminalLine(
         chalk.yellow("   ⚠️  Auto-approving all actions (YOLO mode)"),
       );
     }
@@ -148,8 +159,8 @@ export async function launchGeminiCLI(
         (entry): entry is [string, string] => typeof entry[1] === "string",
       ),
     );
-
-    const childStdio = createChildStdio();
+    const captureOutput = shouldCaptureAgentOutput(baseEnv);
+    const childStdio = captureOutput ? null : createChildStdio();
 
     // Auto-detect locally installed gemini command
     const geminiLookup = await findCommand("gemini");
@@ -158,6 +169,27 @@ export async function launchGeminiCLI(
     // Session ID is determined via file-based detection after exit.
     let capturedSessionId: string | null = null;
 
+    // Determine execution strategy based on version selection
+    // FR-063b: "installed" option only appears when local command exists
+    const requestedVersion = options.version ?? "latest";
+    let selectedVersion = requestedVersion;
+
+    if (requestedVersion === "installed" && !geminiLookup.path) {
+      writeTerminalLine(
+        chalk.yellow(
+          "   ⚠️  Installed gemini command not found. Falling back to latest.",
+        ),
+      );
+      selectedVersion = "latest";
+    }
+
+    // Log version information (FR-072)
+    if (selectedVersion === "installed") {
+      writeTerminalLine(chalk.green(`   📦 Version: installed`));
+    } else {
+      writeTerminalLine(chalk.green(`   📦 Version: @${selectedVersion}`));
+    }
+
     const runGemini = async (runArgs: string[]): Promise<void> => {
       const execChild = async (child: Promise<unknown>) => {
         try {
@@ -171,8 +203,35 @@ export async function launchGeminiCLI(
           throw execError;
         }
       };
+      // Treat SIGHUP (1), SIGINT (2), SIGTERM (15) as normal exit signals
+      // SIGHUP can occur when the PTY closes, SIGINT/SIGTERM are user interrupts
+      const isNormalExitSignal = (signal?: number | null) =>
+        signal === 1 || signal === 2 || signal === 15;
 
       const run = async (cmd: string, args: string[]) => {
+        if (captureOutput) {
+          const result = await runAgentWithPty({
+            command: cmd,
+            args,
+            cwd: worktreePath,
+            env: baseEnv,
+            agentId: "gemini-cli",
+          });
+          if (isNormalExitSignal(result.signal)) {
+            return;
+          }
+          if (result.exitCode !== null && result.exitCode !== 0) {
+            throw new Error(
+              `Gemini CLI exited with code ${result.exitCode ?? "unknown"}`,
+            );
+          }
+          return;
+        }
+
+        if (!childStdio) {
+          return;
+        }
+
         const child = execa(cmd, args, {
           cwd: worktreePath,
           stdin: childStdio.stdin,
@@ -183,30 +242,19 @@ export async function launchGeminiCLI(
         await execChild(child);
       };
 
-      if (geminiLookup.source === "installed" && geminiLookup.path) {
-        // Use the full path to avoid PATH issues in non-interactive shells
-        console.log(
+      if (selectedVersion === "installed" && geminiLookup.path) {
+        // FR-066: Use locally installed command when "installed" is selected
+        // FR-063b guarantees local command exists when this option is shown
+        writeTerminalLine(
           chalk.green("   ✨ Using locally installed gemini command"),
         );
         return await run(geminiLookup.path, runArgs);
       }
-      console.log(
-        chalk.cyan("   🔄 Falling back to bunx @google/gemini-cli@latest"),
-      );
-      console.log(
-        chalk.yellow(
-          "   💡 Recommended: Install Gemini CLI globally for faster startup",
-        ),
-      );
-      console.log(chalk.yellow("      npm install -g @google/gemini-cli"));
-      console.log("");
-      const shouldSkipDelay =
-        typeof process !== "undefined" &&
-        (process.env?.NODE_ENV === "test" || Boolean(process.env?.VITEST));
-      if (!shouldSkipDelay) {
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-      }
-      return await run("bunx", [GEMINI_CLI_PACKAGE, ...runArgs]);
+
+      // FR-067, FR-068: Use bunx with version suffix for latest/specific versions
+      const packageWithVersion = `${GEMINI_CLI_PACKAGE}@${selectedVersion}`;
+      writeTerminalLine(chalk.cyan(`   🔄 Using bunx ${packageWithVersion}`));
+      return await run("bunx", [packageWithVersion, ...runArgs]);
     };
 
     let fellBackToLatest = false;
@@ -220,7 +268,7 @@ export async function launchGeminiCLI(
           resumeSessionId;
         if (shouldRetry) {
           fellBackToLatest = true;
-          console.log(
+          writeTerminalLine(
             chalk.yellow(
               `   ⚠️  Failed to resume session ${resumeSessionId}. Retrying with latest session...`,
             ),
@@ -231,7 +279,7 @@ export async function launchGeminiCLI(
         }
       }
     } finally {
-      childStdio.cleanup();
+      childStdio?.cleanup();
     }
 
     const explicitResumeSucceeded = usedExplicitSessionId && !fellBackToLatest;
@@ -247,6 +295,10 @@ export async function launchGeminiCLI(
         capturedSessionId =
           (await findLatestGeminiSessionId(worktreePath, {
             cwd: worktreePath,
+            branch: options.branch ?? null,
+            worktrees: options.branch
+              ? [{ path: worktreePath, branch: options.branch }]
+              : null,
           })) ?? null;
       } catch {
         capturedSessionId = null;
@@ -254,12 +306,12 @@ export async function launchGeminiCLI(
     }
 
     if (capturedSessionId) {
-      console.log(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
-      console.log(
+      writeTerminalLine(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
+      writeTerminalLine(
         chalk.gray(`   Resume command: gemini --resume ${capturedSessionId}`),
       );
     } else {
-      console.log(
+      writeTerminalLine(
         chalk.yellow(
           "\n   ℹ️  Could not determine Gemini session ID automatically.",
         ),
@@ -288,30 +340,38 @@ export async function launchGeminiCLI(
     }
 
     if (process.platform === "win32") {
-      console.error(chalk.red("\n💡 Windows troubleshooting tips:"));
+      writeTerminalLine(
+        chalk.red("\n💡 Windows troubleshooting tips:"),
+        "stderr",
+      );
       if (hasLocalGemini) {
-        console.error(
+        writeTerminalLine(
           chalk.yellow(
             "   1. Confirm that Gemini CLI is installed and the 'gemini' command is on PATH",
           ),
+          "stderr",
         );
-        console.error(
+        writeTerminalLine(
           chalk.yellow('   2. Run "gemini --version" to verify the setup'),
+          "stderr",
         );
       } else {
-        console.error(
+        writeTerminalLine(
           chalk.yellow(
             "   1. Confirm that Bun is installed and bunx is available",
           ),
+          "stderr",
         );
-        console.error(
+        writeTerminalLine(
           chalk.yellow(
             '   2. Run "bunx @google/gemini-cli@latest -- --version" to verify the setup',
           ),
+          "stderr",
         );
       }
-      console.error(
+      writeTerminalLine(
         chalk.yellow("   3. Restart your terminal or IDE to refresh PATH"),
+        "stderr",
       );
     }
 
@@ -327,16 +387,17 @@ export async function launchGeminiCLI(
  */
 export async function isGeminiCLIAvailable(): Promise<boolean> {
   try {
-    await execa("bunx", [GEMINI_CLI_PACKAGE, "--version"]);
+    await execa("bunx", [`${GEMINI_CLI_PACKAGE}@latest`, "--version"]);
     return true;
   } catch (error: unknown) {
     const err = error as NodeJS.ErrnoException;
     if (err.code === "ENOENT") {
-      console.error(chalk.yellow("\n⚠️  bunx command not found"));
-      console.error(
+      writeTerminalLine(chalk.yellow("\n⚠️  bunx command not found"), "stderr");
+      writeTerminalLine(
         chalk.gray(
           "   Install Bun and confirm that bunx is available before continuing",
         ),
+        "stderr",
       );
     }
     return false;

package/src/index.test.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { describe, it, expect, spyOn, beforeEach, afterEach } from "bun:test";
+import { getPackageVersion } from "./utils";
 import * as utils from "./utils";
 
 // showVersion関数のテスト（TDD Green phase）
@@ -6,18 +7,18 @@ import * as utils from "./utils";
 // そのため、main()関数経由でテストするか、関数をexportする必要がある
 
 describe("showVersion via CLI args", () => {
-  let consoleLogSpy: ReturnType<typeof vi.spyOn>;
-  let consoleErrorSpy: ReturnType<typeof vi.spyOn>;
-  let processExitSpy: ReturnType<typeof vi.spyOn>;
+  let consoleLogSpy: ReturnType<typeof spyOn>;
+  let consoleErrorSpy: ReturnType<typeof spyOn>;
+  let processExitSpy: ReturnType<typeof spyOn>;
   let originalArgv: string[];
 
   beforeEach(() => {
     // console.log, console.error, process.exitをモック
-    consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
-    processExitSpy = vi
-      .spyOn(process, "exit")
-      .mockImplementation((() => {}) as any);
+    consoleLogSpy = spyOn(console, "log").mockImplementation(() => {});
+    consoleErrorSpy = spyOn(console, "error").mockImplementation(() => {});
+    processExitSpy = spyOn(process, "exit").mockImplementation(
+      (() => {}) as () => never,
+    );
 
     // 元のprocess.argvを保存
     originalArgv = [...process.argv];
@@ -28,7 +29,6 @@ describe("showVersion via CLI args", () => {
     consoleLogSpy.mockRestore();
     consoleErrorSpy.mockRestore();
     processExitSpy.mockRestore();
-
     // process.argvを復元
     process.argv = originalArgv;
   });
@@ -37,32 +37,34 @@ describe("showVersion via CLI args", () => {
     // Arrange: CLIフラグを設定
     process.argv = ["node", "index.js", "--version"];
 
-    // getPackageVersion()をモック
-    const mockVersion = "2.6.1";
-    vi.spyOn(utils, "getPackageVersion").mockResolvedValue(mockVersion);
+    const expectedVersion = await getPackageVersion();
+    if (!expectedVersion) {
+      throw new Error("Failed to resolve package version for test.");
+    }
 
     // Act: main()を呼び出す
     const { main } = await import("./index");
     await main();
 
     // Assert: 標準出力にバージョンが表示されることを期待
-    expect(consoleLogSpy).toHaveBeenCalledWith(mockVersion);
+    expect(consoleLogSpy).toHaveBeenCalledWith(expectedVersion);
   }, 30000);
 
   it("正常系: -vフラグでバージョンを表示する", async () => {
     // Arrange: CLIフラグを設定
     process.argv = ["node", "index.js", "-v"];
 
-    // getPackageVersion()をモック
-    const mockVersion = "1.12.3";
-    vi.spyOn(utils, "getPackageVersion").mockResolvedValue(mockVersion);
+    const expectedVersion = await getPackageVersion();
+    if (!expectedVersion) {
+      throw new Error("Failed to resolve package version for test.");
+    }
 
     // Act: main()を呼び出す
     const { main } = await import("./index");
     await main();
 
     // Assert: 標準出力にバージョンが表示されることを期待
-    expect(consoleLogSpy).toHaveBeenCalledWith(mockVersion);
+    expect(consoleLogSpy).toHaveBeenCalledWith(expectedVersion);
   }, 30000);
 
   // Note: This test is skipped due to module caching issues in CI environment
@@ -72,7 +74,10 @@ describe("showVersion via CLI args", () => {
     process.argv = ["node", "index.js", "--version"];
 
     // getPackageVersion()をモックしてnullを返す
-    vi.spyOn(utils, "getPackageVersion").mockResolvedValue(null);
+    const getPackageVersionSpy = spyOn(
+      utils,
+      "getPackageVersion",
+    ).mockResolvedValue(null);
 
     // Act: main()を呼び出す
     const { main } = await import("./index");
@@ -83,5 +88,6 @@ describe("showVersion via CLI args", () => {
       expect.stringContaining("Error"),
     );
     expect(processExitSpy).toHaveBeenCalledWith(1);
+    getPackageVersionSpy.mockRestore();
   });
 });