@akiojin/gwt 4.10.0 → 4.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akiojin/gwt",
-  "version": "4.10.0",
+  "version": "4.12.0",
   "description": "Interactive Git worktree manager with Coding Agent selection (Claude Code / Codex CLI / Gemini CLI)",
   "main": "dist/index.js",
   "bin": {
@@ -10,7 +10,8 @@
   "packageManager": "bun@latest",
   "scripts": {
     "build": "bun run build:cli && bun run build:web",
-    "build:cli": "tsc",
+    "build:cli": "tsc && bun run build:opentui",
+    "build:opentui": "bun scripts/build-opentui.ts",
     "build:server": "tsc",
     "build:client": "vite build src/web/client",
     "build:web": "bun run build:client",
@@ -22,10 +23,9 @@
     "start:web": "node ./dist/index.js serve",
     "prepare": "husky",
     "pretest": "bun run build:cli",
-    "test": "NODE_OPTIONS=--max-old-space-size=6144 vitest run --maxWorkers=1",
-    "test:watch": "vitest",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest run --coverage",
+    "test": "bun test tests/unit tests/logging tests/quality tests/web src",
+    "test:watch": "bun test --watch",
+    "test:coverage": "bun test --coverage",
     "test:e2e": "playwright test",
     "lint": "eslint src/**/*.ts src/**/*.tsx",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\" \"tests/**/*.ts\"",
@@ -57,6 +57,8 @@
   "dependencies": {
     "@fastify/static": "^9.0.0",
     "@fastify/websocket": "^11.2.0",
+    "@opentui/core": "^0.1.68",
+    "@opentui/solid": "^0.1.68",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-label": "^2.1.8",
     "@radix-ui/react-select": "^2.2.6",
@@ -69,15 +71,13 @@
     "d3-force": "^3.0.0",
     "execa": "^9.6.0",
     "fastify": "^5.2.1",
-    "ink": "^6.3.1",
-    "ink-select-input": "^6.2.0",
-    "ink-text-input": "^6.0.0",
     "node-pty": "1.1.0",
     "pino": "^10.1.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-router": "^7.2.0",
     "react-router-dom": "^7.2.0",
+    "solid-js": "^1.9.10",
     "string-width": "^8.1.0",
     "systray2": "^2.1.4",
     "tailwindcss": "^4.1.18",
@@ -90,6 +90,7 @@
   "devDependencies": {
     "@commitlint/cli": "^20.1.0",
     "@commitlint/config-conventional": "^20.0.0",
+    "@happy-dom/global-registrator": "^20.0.11",
     "@playwright/test": "^1.51.0",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
@@ -101,8 +102,7 @@
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",
     "@vitejs/plugin-react": "^5.1.1",
-    "@vitest/coverage-v8": "^4.0.8",
-    "@vitest/ui": "^4.0.8",
+    "bun-types": "^1.3.5",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "concurrently": "^9.1.2",
@@ -110,7 +110,6 @@
     "eslint": "^9.31.0",
     "happy-dom": "^20.0.8",
     "husky": "^9.1.7",
-    "ink-testing-library": "^4.0.0",
     "jsdom": "^27.0.1",
     "lint-staged": "^16.2.7",
     "lucide-react": "^0.562.0",
@@ -119,8 +118,8 @@
     "tailwind-merge": "^3.4.0",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "^5.8.3",
-    "vite": "^7.2.4",
-    "vitest": "^4.0.8"
+    "typescript-language-server": "^5.1.3",
+    "vite": "^7.2.4"
   },
   "lint-staged": {
     "**/*.md": "bunx --bun markdownlint-cli -c .markdownlint.json --ignore CHANGELOG.md --ignore node_modules",

package/src/claude.ts

@@ -5,9 +5,14 @@ import {
   createChildStdio,
   getTerminalStreams,
   resetTerminalModes,
+  writeTerminalLine,
 } from "./utils/terminal.js";
 import { findCommand } from "./utils/command.js";
 import { findLatestClaudeSession } from "./utils/session.js";
+import {
+  runAgentWithPty,
+  shouldCaptureAgentOutput,
+} from "./logging/agentOutput.js";
 
 const CLAUDE_CLI_PACKAGE = "@anthropic-ai/claude-code@latest";
 
@@ -49,6 +54,8 @@ export async function launchClaudeCode(
     model?: string;
     sessionId?: string | null;
     chrome?: boolean;
+    branch?: string | null;
+    version?: string | null;
   } = {},
 ): Promise<{ sessionId?: string | null }> {
   const terminal = getTerminalStreams();
@@ -60,16 +67,16 @@ export async function launchClaudeCode(
       throw new Error(`Worktree path does not exist: ${worktreePath}`);
     }
 
-    console.log(chalk.blue("🚀 Launching Claude Code..."));
-    console.log(chalk.gray(`   Working directory: ${worktreePath}`));
+    writeTerminalLine(chalk.blue("🚀 Launching Claude Code..."));
+    writeTerminalLine(chalk.gray(`   Working directory: ${worktreePath}`));
 
     const args: string[] = [];
 
     if (options.model && options.model !== "opus") {
       args.push("--model", options.model);
-      console.log(chalk.green(`   🎯 Model: ${options.model}`));
+      writeTerminalLine(chalk.green(`   🎯 Model: ${options.model}`));
     } else if (options.model === "opus") {
-      console.log(chalk.green(`   🎯 Model: ${options.model} (Default)`));
+      writeTerminalLine(chalk.green(`   🎯 Model: ${options.model} (Default)`));
     }
 
     const resumeSessionId =
@@ -85,11 +92,11 @@ export async function launchClaudeCode(
       case "continue":
         if (resumeSessionId) {
           args.push("--resume", resumeSessionId);
-          console.log(
+          writeTerminalLine(
             chalk.cyan(`   📱 Continuing specific session: ${resumeSessionId}`),
           );
         } else {
-          console.log(
+          writeTerminalLine(
             chalk.yellow(
               "   ℹ️  No saved session ID for this branch/tool. Starting new session.",
             ),
@@ -97,14 +104,14 @@ export async function launchClaudeCode(
         }
         break;
       case "resume":
-        // TODO: Implement conversation selection with Ink UI
+        // TODO: Implement conversation selection in the OpenTUI UI
         // Legacy UI removed - this feature needs to be reimplemented
-        console.log(
+        writeTerminalLine(
           chalk.yellow(
-            "   ⚠️  Resume conversation feature temporarily disabled (Ink UI migration)",
+            "   ⚠️  Resume conversation feature temporarily disabled (UI migration)",
           ),
         );
-        console.log(
+        writeTerminalLine(
           chalk.cyan("   ℹ️  Using default Claude Code resume behavior"),
         );
 
@@ -116,14 +123,14 @@ export async function launchClaudeCode(
             await selectClaudeConversation(worktreePath);
 
           if (selectedConversation) {
-            console.log(
+            writeTerminalLine(
               chalk.green(`   ✨ Resuming: ${selectedConversation.title}`),
             );
 
             // Use specific session ID if available
             if (selectedConversation.sessionId) {
               args.push("--resume", selectedConversation.sessionId);
-              console.log(
+              writeTerminalLine(
                 chalk.cyan(
                   `   🆔 Using session ID: ${selectedConversation.sessionId}`,
                 ),
@@ -131,7 +138,7 @@ export async function launchClaudeCode(
             } else {
               // Fallback: try to use filename as session identifier
               const fileName = selectedConversation.id;
-              console.log(
+              writeTerminalLine(
                 chalk.yellow(
                   `   ⚠️  No session ID found, trying filename: ${fileName}`,
                 ),
@@ -140,7 +147,7 @@ export async function launchClaudeCode(
             }
           } else {
             // User cancelled - return without launching Claude
-            console.log(
+            writeTerminalLine(
               chalk.gray("   ↩️  Selection cancelled, returning to menu"),
             );
             return;
@@ -157,7 +164,7 @@ export async function launchClaudeCode(
         // Use standard Claude Code resume for now
         if (resumeSessionId) {
           args.push("--resume", resumeSessionId);
-          console.log(
+          writeTerminalLine(
             chalk.cyan(`   🔄 Resuming Claude session: ${resumeSessionId}`),
           );
         } else {
@@ -166,16 +173,16 @@ export async function launchClaudeCode(
         break;
       case "normal":
       default:
-        console.log(chalk.green("   ✨ Starting new session"));
+        writeTerminalLine(chalk.green("   ✨ Starting new session"));
         break;
     }
 
     // Handle Chrome extension integration
     if (options.chrome && isChromeIntegrationSupported()) {
       args.push("--chrome");
-      console.log(chalk.green("   🌐 Chrome integration enabled"));
+      writeTerminalLine(chalk.green("   🌐 Chrome integration enabled"));
     } else if (options.chrome) {
-      console.log(
+      writeTerminalLine(
         chalk.yellow(
           "   ⚠️  Chrome integration is not supported on this platform. Skipping --chrome.",
         ),
@@ -193,11 +200,11 @@ export async function launchClaudeCode(
     // Handle skip permissions
     if (options.skipPermissions) {
       args.push("--dangerously-skip-permissions");
-      console.log(chalk.yellow("   ⚠️  Skipping permissions check"));
+      writeTerminalLine(chalk.yellow("   ⚠️  Skipping permissions check"));
 
       // Show additional warning for root users in Docker/sandbox environments
       if (isRoot) {
-        console.log(
+        writeTerminalLine(
           chalk.yellow(
             "   ⚠️  Running as Docker/sandbox environment (IS_SANDBOX=1)",
           ),
@@ -209,7 +216,7 @@ export async function launchClaudeCode(
       args.push(...options.extraArgs);
     }
 
-    console.log(chalk.gray(`   📋 Args: ${args.join(" ")}`));
+    writeTerminalLine(chalk.gray(`   📋 Args: ${args.join(" ")}`));
 
     terminal.exitRawMode();
     resetTerminalModes(terminal.stdout);
@@ -229,7 +236,8 @@ export async function launchClaudeCode(
       ),
     );
 
-    const childStdio = createChildStdio();
+    const captureOutput = shouldCaptureAgentOutput(launchEnv);
+    const childStdio = captureOutput ? null : createChildStdio();
 
     // Auto-detect locally installed claude command
     const claudeLookup = await findCommand("claude");
@@ -259,95 +267,112 @@ export async function launchClaudeCode(
       }
     };
 
-    try {
-      if (claudeLookup.source === "installed" && claudeLookup.path) {
-        // Use the full path to avoid PATH issues in non-interactive shells
-        console.log(
-          chalk.green("   ✨ Using locally installed claude command"),
-        );
-        await execInteractive(claudeLookup.path, args, {
+    // 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 runCommand = async (file: string, fileArgs: string[]) => {
+      if (captureOutput) {
+        const result = await runAgentWithPty({
+          command: file,
+          args: fileArgs,
           cwd: worktreePath,
-          stdin: childStdio.stdin,
-          stdout: childStdio.stdout,
-          stderr: childStdio.stderr,
           env: launchEnv,
+          agentId: "claude-code",
         });
+        // Treat normal exit signals (SIGHUP, SIGINT, SIGTERM) as successful exit
+        if (isNormalExitSignal(result.signal)) {
+          return;
+        }
+        if (result.exitCode !== null && result.exitCode !== 0) {
+          throw new Error(`Claude Code exited with code ${result.exitCode}`);
+        }
+        return;
+      }
+
+      if (!childStdio) {
+        return;
+      }
+
+      await execInteractive(file, fileArgs, {
+        cwd: worktreePath,
+        stdin: childStdio.stdin,
+        stdout: childStdio.stdout,
+        stderr: childStdio.stderr,
+        env: launchEnv,
+      });
+    };
+
+    // 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" && !claudeLookup.path) {
+      writeTerminalLine(
+        chalk.yellow(
+          "   ⚠️  Installed claude 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}`));
+    }
+
+    try {
+      if (selectedVersion === "installed" && claudeLookup.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 claude command"),
+        );
+        await runCommand(claudeLookup.path, args);
       } else {
+        // FR-067, FR-068: Use bunx with version suffix for latest/specific versions
+        const packageWithVersion = `@anthropic-ai/claude-code@${selectedVersion}`;
+
         const useNpx = npxLookup?.source === "installed" && npxLookup?.path;
         if (useNpx) {
-          console.log(
-            chalk.cyan(
-              "   🔄 Falling back to npx @anthropic-ai/claude-code@latest",
-            ),
+          writeTerminalLine(
+            chalk.cyan(`   🔄 Using npx ${packageWithVersion}`),
           );
         } else {
-          console.log(
-            chalk.cyan(
-              "   🔄 Falling back to bunx @anthropic-ai/claude-code@latest",
-            ),
+          writeTerminalLine(
+            chalk.cyan(`   🔄 Using bunx ${packageWithVersion}`),
           );
         }
-        console.log(
-          chalk.yellow(
-            "   💡 Recommended: Install Claude Code via official method for faster startup",
-          ),
-        );
-        console.log(
-          chalk.yellow("      macOS/Linux: brew install --cask claude-code"),
-        );
-        console.log(
-          chalk.yellow(
-            "      or: curl -fsSL https://claude.ai/install.sh | bash",
-          ),
-        );
-        console.log(
-          chalk.yellow(
-            "      Windows: irm https://claude.ai/install.ps1 | iex",
-          ),
-        );
-        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));
-        }
+
         if (useNpx && npxLookup?.path) {
-          await execInteractive(
-            npxLookup.path,
-            ["-y", CLAUDE_CLI_PACKAGE, ...args],
-            {
-              cwd: worktreePath,
-              stdin: childStdio.stdin,
-              stdout: childStdio.stdout,
-              stderr: childStdio.stderr,
-              env: launchEnv,
-            },
-          );
+          await runCommand(npxLookup.path, ["-y", packageWithVersion, ...args]);
         } else {
-          await execInteractive("bunx", [CLAUDE_CLI_PACKAGE, ...args], {
-            cwd: worktreePath,
-            stdin: childStdio.stdin,
-            stdout: childStdio.stdout,
-            stderr: childStdio.stderr,
-            env: launchEnv,
-          });
+          await runCommand("bunx", [packageWithVersion, ...args]);
         }
       }
     } finally {
-      childStdio.cleanup();
+      childStdio?.cleanup();
     }
 
     // File-based session detection only - no stdout capture
     // Use only findLatestClaudeSession with short timeout, skip sessionProbe to avoid hanging
     let capturedSessionId: string | null = null;
     const finishedAt = Date.now();
+    const branchWorktrees = options.branch
+      ? [{ path: worktreePath, branch: options.branch }]
+      : null;
     try {
       const latest = await findLatestClaudeSession(worktreePath, {
         since: startedAt,
         until: finishedAt + 30_000,
         preferClosestTo: finishedAt,
         windowMs: 10 * 60 * 1000,
+        branch: options.branch ?? null,
+        worktrees: branchWorktrees,
       });
       const detectedSessionId = latest?.id ?? null;
       // When we explicitly resumed a specific session, keep that ID as the source of truth.
@@ -359,12 +384,12 @@ export async function launchClaudeCode(
     }
 
     if (capturedSessionId) {
-      console.log(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
-      console.log(
+      writeTerminalLine(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
+      writeTerminalLine(
         chalk.gray(`   Resume command: claude --resume ${capturedSessionId}`),
       );
     } else {
-      console.log(
+      writeTerminalLine(
         chalk.yellow(
           "\n   ℹ️  Could not determine Claude session ID automatically.",
         ),
@@ -393,30 +418,38 @@ export async function launchClaudeCode(
     }
 
     if (process.platform === "win32") {
-      console.error(chalk.red("\n💡 Windows troubleshooting tips:"));
+      writeTerminalLine(
+        chalk.red("\n💡 Windows troubleshooting tips:"),
+        "stderr",
+      );
       if (hasLocalClaude) {
-        console.error(
+        writeTerminalLine(
           chalk.yellow(
             "   1. Confirm that Claude Code is installed and the 'claude' command is on PATH",
           ),
+          "stderr",
         );
-        console.error(
+        writeTerminalLine(
           chalk.yellow('   2. Run "claude --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 @anthropic-ai/claude-code@latest -- --version" to verify the setup',
           ),
+          "stderr",
         );
       }
-      console.error(
+      writeTerminalLine(
         chalk.yellow("   3. Restart your terminal or IDE to refresh PATH"),
+        "stderr",
       );
     }
 
@@ -439,11 +472,12 @@ export async function isClaudeCodeAvailable(): Promise<boolean> {
   } 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;