@akiojin/gwt 4.9.1 → 4.11.6

package/dist/gemini.js

@@ -1,10 +1,10 @@
 import { execa } from "execa";
 import chalk from "chalk";
 import { existsSync } from "fs";
-import { createChildStdio, getTerminalStreams, resetTerminalModes, } from "./utils/terminal.js";
+import { createChildStdio, getTerminalStreams, resetTerminalModes, writeTerminalLine, } from "./utils/terminal.js";
 import { findCommand } from "./utils/command.js";
 import { findLatestGeminiSessionId } from "./utils/session.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
  * while providing a user-friendly message.
@@ -34,12 +34,12 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
         if (!existsSync(worktreePath)) {
             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 = [];
         if (options.model) {
             args.push("--model", options.model);
-            console.log(chalk.green(`   🎯 Model: ${options.model}`));
+            writeTerminalLine(chalk.green(`   🎯 Model: ${options.model}`));
         }
         // Handle execution mode
         const resumeSessionId = options.sessionId && options.sessionId.trim().length > 0
@@ -80,28 +80,28 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
         switch (options.mode) {
             case "continue":
                 if (resumeSessionId) {
-                    console.log(chalk.cyan(`   ⏭️  Continuing specific session: ${resumeSessionId}`));
+                    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(chalk.yellow("   ⚠️  Auto-approving all actions (YOLO mode)"));
+            writeTerminalLine(chalk.yellow("   ⚠️  Auto-approving all actions (YOLO mode)"));
         }
         terminal.exitRawMode();
         resetTerminalModes(terminal.stdout);
@@ -115,6 +115,16 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
         // Preserve TTY for interactive UI (colors/width) by inheriting stdout/stderr.
         // Session ID is determined via file-based detection after exit.
         let capturedSessionId = null;
+        // Determine execution strategy based on version selection
+        // FR-063b: "installed" option only appears when local command exists
+        const selectedVersion = options.version ?? "installed";
+        // Log version information (FR-072)
+        if (selectedVersion === "installed") {
+            writeTerminalLine(chalk.green(`   📦 Version: installed`));
+        }
+        else {
+            writeTerminalLine(chalk.green(`   📦 Version: @${selectedVersion}`));
+        }
         const runGemini = async (runArgs) => {
             const execChild = async (child) => {
                 try {
@@ -139,21 +149,16 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
                 });
                 await execChild(child);
             };
-            if (geminiLookup.source === "installed" && geminiLookup.path) {
-                // Use the full path to avoid PATH issues in non-interactive shells
-                console.log(chalk.green("   ✨ Using locally installed gemini command"));
+            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;
         try {
@@ -166,7 +171,7 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
                     resumeSessionId;
                 if (shouldRetry) {
                     fellBackToLatest = true;
-                    console.log(chalk.yellow(`   ⚠️  Failed to resume session ${resumeSessionId}. Retrying with latest session...`));
+                    writeTerminalLine(chalk.yellow(`   ⚠️  Failed to resume session ${resumeSessionId}. Retrying with latest session...`));
                     await runGemini(argsFallback);
                 }
                 else {
@@ -195,11 +200,11 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
             }
         }
         if (capturedSessionId) {
-            console.log(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
-            console.log(chalk.gray(`   Resume command: gemini --resume ${capturedSessionId}`));
+            writeTerminalLine(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
+            writeTerminalLine(chalk.gray(`   Resume command: gemini --resume ${capturedSessionId}`));
         }
         else {
-            console.log(chalk.yellow("\n   ℹ️  Could not determine Gemini session ID automatically."));
+            writeTerminalLine(chalk.yellow("\n   ℹ️  Could not determine Gemini session ID automatically."));
         }
         return capturedSessionId ? { sessionId: capturedSessionId } : {};
     }
@@ -223,16 +228,16 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
             errorMessage = `Failed to launch Gemini CLI: ${details || "Unknown error"}`;
         }
         if (process.platform === "win32") {
-            console.error(chalk.red("\n💡 Windows troubleshooting tips:"));
+            writeTerminalLine(chalk.red("\n💡 Windows troubleshooting tips:"), "stderr");
             if (hasLocalGemini) {
-                console.error(chalk.yellow("   1. Confirm that Gemini CLI is installed and the 'gemini' command is on PATH"));
-                console.error(chalk.yellow('   2. Run "gemini --version" to verify the setup'));
+                writeTerminalLine(chalk.yellow("   1. Confirm that Gemini CLI is installed and the 'gemini' command is on PATH"), "stderr");
+                writeTerminalLine(chalk.yellow('   2. Run "gemini --version" to verify the setup'), "stderr");
             }
             else {
-                console.error(chalk.yellow("   1. Confirm that Bun is installed and bunx is available"));
-                console.error(chalk.yellow('   2. Run "bunx @google/gemini-cli@latest -- --version" to verify the setup'));
+                writeTerminalLine(chalk.yellow("   1. Confirm that Bun is installed and bunx is available"), "stderr");
+                writeTerminalLine(chalk.yellow('   2. Run "bunx @google/gemini-cli@latest -- --version" to verify the setup'), "stderr");
             }
-            console.error(chalk.yellow("   3. Restart your terminal or IDE to refresh PATH"));
+            writeTerminalLine(chalk.yellow("   3. Restart your terminal or IDE to refresh PATH"), "stderr");
         }
         throw new GeminiError(errorMessage, error);
     }
@@ -246,14 +251,14 @@ export async function launchGeminiCLI(worktreePath, options = {}) {
  */
 export async function isGeminiCLIAvailable() {
     try {
-        await execa("bunx", [GEMINI_CLI_PACKAGE, "--version"]);
+        await execa("bunx", [`${GEMINI_CLI_PACKAGE}@latest`, "--version"]);
         return true;
     }
     catch (error) {
         const err = error;
         if (err.code === "ENOENT") {
-            console.error(chalk.yellow("\n⚠️  bunx command not found"));
-            console.error(chalk.gray("   Install Bun and confirm that bunx is available before continuing"));
+            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/dist/gemini.js.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/gemini.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import type { SelectionResult } from "./cli/ui/components/App.js";
+import type { SelectionResult } from "./cli/ui/App.solid.js";
 /**
  * Handle AI tool workflow
  */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AA6BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAqQlE;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC,CAyiBf;AAED,KAAK,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;AAC5D,KAAK,eAAe,GAAG,CAAC,SAAS,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAWrE,wBAAsB,kBAAkB,CACtC,SAAS,GAAE,SAAqB,EAChC,eAAe,GAAE,eAAsC,GACtD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CA6C1C;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CASrE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAwBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAmO7D;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC,CA0lBf;AAED,KAAK,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;AAC5D,KAAK,eAAe,GAAG,CAAC,SAAS,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAerE,wBAAsB,kBAAkB,CACtC,SAAS,GAAE,SAA8B,EACzC,eAAe,GAAE,eAAsC,GACtD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAmD1C;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CASrE"}

package/dist/index.js

@@ -1,27 +1,28 @@
 #!/usr/bin/env node
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { isGitRepository, getRepositoryRoot, branchExists, fetchAllRemotes, pullFastForward, getBranchDivergenceStatuses, hasUncommittedChanges, hasUnpushedCommits, getUncommittedChangesCount, getUnpushedCommitsCount, GitError, } from "./git.js";
+import { isGitRepository, getRepositoryRoot, branchExists, fetchAllRemotes, pullFastForward, getBranchDivergenceStatuses, hasUncommittedChanges, hasUnpushedCommits, getUncommittedChangesCount, getUnpushedCommitsCount, } from "./git.js";
 import { launchClaudeCode } from "./claude.js";
-import { launchCodexCLI, CodexError, } from "./codex.js";
-import { launchGeminiCLI, GeminiError } from "./gemini.js";
+import { launchCodexCLI } from "./codex.js";
+import { launchGeminiCLI } from "./gemini.js";
 import { WorktreeOrchestrator, } from "./services/WorktreeOrchestrator.js";
 import chalk from "chalk";
-import { isProtectedBranchName, switchToProtectedBranch, WorktreeError, resolveWorktreePathForBranch, } from "./worktree.js";
-import { getTerminalStreams, waitForUserAcknowledgement, } from "./utils/terminal.js";
+import { isProtectedBranchName, switchToProtectedBranch, resolveWorktreePathForBranch, repairWorktreePath, } from "./worktree.js";
+import { getTerminalStreams, resetTerminalModes, waitForUserAcknowledgement, writeTerminalLine, } from "./utils/terminal.js";
 import { createLogger } from "./logging/logger.js";
 import { getCodingAgentById, getSharedEnvironment } from "./config/tools.js";
 import { launchCodingAgent } from "./launcher.js";
 import { saveSession, loadSession } from "./config/index.js";
 import { findLatestCodexSession, findLatestClaudeSession, findLatestGeminiSession, } from "./utils/session.js";
-import { getPackageVersion } from "./utils.js";
+import { getPackageVersion, setupExitHandlers, registerExitCleanup, clearExitCleanup, } from "./utils.js";
 import { findLatestClaudeSessionId } from "./utils/session.js";
 import { resolveContinueSessionId } from "./cli/ui/utils/continueSession.js";
 import { normalizeModelId } from "./cli/ui/utils/modelOptions.js";
 import { installDependenciesForWorktree, DependencyInstallError, } from "./services/dependency-installer.js";
-import { waitForEnter } from "./utils/prompt.js";
+import { isGitRelatedError, isRecoverableError } from "./utils/error-utils.js";
 const ERROR_PROMPT = chalk.yellow("Review the error details, then press Enter to continue.");
-const POST_SESSION_DELAY_MS = 3000;
+const SUCCESS_PROMPT = chalk.green("Press Enter to return to main menu...");
+const POST_SESSION_DELAY_MS = 500;
 // Category: cli
 const appLogger = createLogger({ category: "cli" });
 async function waitForErrorAcknowledgement() {
@@ -31,63 +32,18 @@ async function waitForErrorAcknowledgement() {
  * Simple print functions (replacing legacy UI display functions)
  */
 function printError(message) {
-    console.error(chalk.red(`❌ ${message}`));
+    writeTerminalLine(chalk.red(`❌ ${message}`), "stderr");
     appLogger.error({ message });
 }
 function printInfo(message) {
-    console.log(chalk.blue(`ℹ️  ${message}`));
+    writeTerminalLine(chalk.blue(`ℹ️  ${message}`));
     appLogger.info({ message });
 }
 function printWarning(message) {
-    console.warn(chalk.yellow(`⚠️  ${message}`));
+    writeTerminalLine(chalk.yellow(`⚠️  ${message}`), "stderr");
     appLogger.warn({ message });
 }
-function isGitRelatedError(error) {
-    if (!error) {
-        return false;
-    }
-    if (error instanceof GitError || error instanceof WorktreeError) {
-        return true;
-    }
-    if (error instanceof Error) {
-        return error.name === "GitError" || error.name === "WorktreeError";
-    }
-    if (typeof error === "object" &&
-        "name" in error) {
-        const name = error.name;
-        return name === "GitError" || name === "WorktreeError";
-    }
-    return false;
-}
-function isRecoverableError(error) {
-    if (!error) {
-        return false;
-    }
-    if (error instanceof GitError ||
-        error instanceof WorktreeError ||
-        error instanceof CodexError ||
-        error instanceof GeminiError ||
-        error instanceof DependencyInstallError) {
-        return true;
-    }
-    if (error instanceof Error) {
-        return (error.name === "GitError" ||
-            error.name === "WorktreeError" ||
-            error.name === "CodexError" ||
-            error.name === "GeminiError" ||
-            error.name === "DependencyInstallError");
-    }
-    if (typeof error === "object" &&
-        "name" in error) {
-        const name = error.name;
-        return (name === "GitError" ||
-            name === "WorktreeError" ||
-            name === "CodexError" ||
-            name === "GeminiError" ||
-            name === "DependencyInstallError");
-    }
-    return false;
-}
+// Note: isGitRelatedError and isRecoverableError are now imported from ./utils/error-utils.js
 async function runGitStep(description, step) {
     try {
         const value = await step();
@@ -162,43 +118,64 @@ async function showVersion() {
     }
 }
 /**
- * Main function for Ink.js UI
+ * Performs terminal cleanup when exiting.
+ */
+function performTerminalCleanup() {
+    const terminal = getTerminalStreams();
+    terminal.exitRawMode();
+    resetTerminalModes(terminal.stdout);
+}
+/**
+ * Main function for OpenTUI UI
  * Returns SelectionResult if user made selections, undefined if user quit
  */
-async function mainInkUI() {
-    const { render } = await import("ink");
-    const React = await import("react");
-    const { App } = await import("./cli/ui/components/App.js");
+async function mainSolidUI() {
+    const { renderSolidApp } = await import("./opentui/index.solid.js");
     const terminal = getTerminalStreams();
+    // Register cleanup for signal handlers
+    registerExitCleanup(performTerminalCleanup);
     let selectionResult;
-    // Resume stdin to ensure it's ready for Ink.js
+    // マウスキャプチャを有効にしてSelection APIで選択終了時にクリップボードへコピー
+    const useMouse = true;
+    const enableMouseMovement = false;
+    const altScreenPreference = process.env.GWT_UI_ALT_SCREEN?.trim().toLowerCase();
+    // Ink.js版ではalternate screenを使用していなかったため、デフォルトをfalseに
+    // alternate screenを使用するとコーディングエージェント起動/終了ログが見えなくなる
+    const useAlternateScreen = altScreenPreference === "true" || altScreenPreference === "1";
     if (typeof terminal.stdin.resume === "function") {
         terminal.stdin.resume();
     }
-    const { unmount, waitUntilExit } = render(React.createElement(App, {
-        onExit: (result) => {
-            selectionResult = result;
-        },
-    }), {
-        stdin: terminal.stdin,
-        stdout: terminal.stdout,
-        stderr: terminal.stderr,
-        patchConsole: false,
-    });
-    // Wait for user to exit
+    if (typeof terminal.stdin.setRawMode === "function") {
+        try {
+            terminal.stdin.setRawMode(true);
+        }
+        catch {
+            // Ignore raw mode errors and let OpenTUI handle setup.
+        }
+    }
     try {
-        await waitUntilExit();
+        await renderSolidApp({
+            onExit: (result) => {
+                selectionResult = result;
+            },
+        }, {
+            stdin: terminal.stdin,
+            stdout: terminal.stdout,
+            exitOnCtrlC: true,
+            useAlternateScreen,
+            useMouse,
+            enableMouseMovement,
+        });
     }
     finally {
-        terminal.exitRawMode();
+        performTerminalCleanup();
         if (typeof terminal.stdin.pause === "function") {
             terminal.stdin.pause();
         }
-        // Inkが残した data リスナーが子プロセス入力を奪わないようクリーンアップ
         terminal.stdin.removeAllListeners?.("data");
         terminal.stdin.removeAllListeners?.("keypress");
         terminal.stdin.removeAllListeners?.("readable");
-        unmount();
+        clearExitCleanup();
     }
     return selectionResult;
 }
@@ -206,7 +183,7 @@ async function mainInkUI() {
  * Handle AI tool workflow
  */
 export async function handleAIToolWorkflow(selectionResult) {
-    const { branch, displayName, branchType, remoteBranch, tool, mode, skipPermissions, model, inferenceLevel, sessionId: selectedSessionId, } = selectionResult;
+    const { branch, displayName, branchType, remoteBranch, baseBranch, isNewBranch, tool, mode, skipPermissions, model, inferenceLevel, sessionId: selectedSessionId, toolVersion, } = selectionResult;
     const branchLabel = displayName ?? branch;
     const normalizedModel = normalizeModelId(tool, model ?? null);
     const modelInfo = normalizedModel || inferenceLevel
@@ -222,17 +199,40 @@ export async function handleAIToolWorkflow(selectionResult) {
         const repoRoot = repoRootResult.value;
         // Determine ensure options (local vs remote branch)
         const ensureOptions = {};
-        if (branchType === "remote") {
+        if (isNewBranch) {
+            ensureOptions.isNewBranch = true;
+            if (baseBranch) {
+                ensureOptions.baseBranch = baseBranch;
+            }
+        }
+        if (branchType === "remote" && !isNewBranch) {
             const remoteRef = remoteBranch ?? branch;
             const localExists = await branchExists(branch);
             ensureOptions.baseBranch = remoteRef;
             ensureOptions.isNewBranch = !localExists;
         }
-        const existingWorktreeResolution = await resolveWorktreePathForBranch(branch);
-        const existingWorktree = existingWorktreeResolution.path;
+        let existingWorktreeResolution = await resolveWorktreePathForBranch(branch);
+        let existingWorktree = existingWorktreeResolution.path;
+        // mismatch検出時に自動修復を試みる (FR-009〜FR-013)
         if (!existingWorktree && existingWorktreeResolution.mismatch) {
             const actualBranch = existingWorktreeResolution.mismatch.actualBranch ?? "unknown";
-            printWarning(`Worktree mismatch detected: ${existingWorktreeResolution.mismatch.path} is checked out to '${actualBranch}'. Creating or reusing the correct worktree for '${branch}'.`);
+            printWarning(`Worktree mismatch detected: ${existingWorktreeResolution.mismatch.path} is checked out to '${actualBranch}'. Attempting to repair...`);
+            // 共通修復関数を使用してパス修復を試みる
+            const repairResult = await repairWorktreePath(branch, existingWorktreeResolution.mismatch.path, repoRoot);
+            if (repairResult.repaired) {
+                // FR-012: 修復成功時のメッセージ
+                printInfo(`Worktree path repaired: ${repairResult.newPath}`);
+                // 修復後に再度解決を試みる
+                existingWorktreeResolution = await resolveWorktreePathForBranch(branch);
+                existingWorktree = existingWorktreeResolution.path;
+            }
+            else if (repairResult.removed) {
+                // FR-013: メタデータ削除成功時のメッセージ
+                printInfo(`Stale worktree metadata removed. Creating new worktree...`);
+            }
+            else {
+                printWarning(`Failed to repair worktree for '${branch}'.`);
+            }
         }
         const isProtectedBranch = isProtectedBranchName(branch) ||
             (remoteBranch ? isProtectedBranchName(remoteBranch) : false);
@@ -350,25 +350,26 @@ export async function handleAIToolWorkflow(selectionResult) {
         if (sanitizedRemoteBranch) {
             divergenceBranches.add(sanitizedRemoteBranch);
         }
-        const divergenceResult = await runGitStep("check branch divergence", () => getBranchDivergenceStatuses({
-            cwd: repoRoot,
-            branches: Array.from(divergenceBranches),
-        }));
-        if (!divergenceResult.ok) {
-            return;
+        let divergenceStatuses = [];
+        try {
+            divergenceStatuses = await getBranchDivergenceStatuses({
+                cwd: repoRoot,
+                branches: Array.from(divergenceBranches),
+            });
+        }
+        catch (error) {
+            const details = error instanceof Error ? error.message : String(error);
+            printWarning(`Failed to check branch divergence. Error: ${details}. Continuing without blocking.`);
+            divergenceStatuses = [];
         }
-        const divergenceStatuses = divergenceResult.value;
         const divergedBranches = divergenceStatuses.filter((status) => status.remoteAhead > 0 && status.localAhead > 0);
         if (divergedBranches.length > 0) {
             printWarning("Potential merge conflicts detected when pulling the following local branches:");
             divergedBranches.forEach(({ branch: divergedBranch, remoteAhead, localAhead }) => {
                 const highlight = divergedBranch === branch ? " (selected branch)" : "";
-                console.warn(chalk.yellow(`   • ${divergedBranch}${highlight}  remote:+${remoteAhead}  local:+${localAhead}`));
+                writeTerminalLine(chalk.yellow(`   • ${divergedBranch}${highlight}  remote:+${remoteAhead}  local:+${localAhead}`), "stderr");
             });
-            printWarning("Resolve these divergences (e.g., rebase or merge) before launching to avoid conflicts.");
-            await waitForEnter("Press Enter to return to the main menu and resolve these issues manually.");
-            printWarning("AI tool launch has been cancelled until divergences are resolved.");
-            return;
+            printWarning("Resolve these divergences (e.g., rebase or merge) to avoid conflicts. Continuing without blocking.");
         }
         else if (fastForwardError) {
             printWarning(`Fast-forward pull could not complete (${fastForwardError.message}). Continuing without blocking.`);
@@ -393,6 +394,7 @@ export async function handleAIToolWorkflow(selectionResult) {
             model: normalizedModel ?? null,
             reasoningLevel: inferenceLevel ?? null,
             skipPermissions: skipPermissions ?? null,
+            toolVersion: toolVersion ?? null,
             timestamp: Date.now(),
             repositoryRoot: repoRoot,
         });
@@ -431,6 +433,7 @@ export async function handleAIToolWorkflow(selectionResult) {
                     model: normalizedModel ?? null,
                     reasoningLevel: inferenceLevel ?? null,
                     skipPermissions: skipPermissions ?? null,
+                    toolVersion: toolVersion ?? null,
                     timestamp: Date.now(),
                     repositoryRoot: repoRoot,
                 }, { skipHistory: true });
@@ -455,6 +458,7 @@ export async function handleAIToolWorkflow(selectionResult) {
                     envOverrides: sharedEnv,
                     sessionId: resumeSessionId,
                     chrome: true,
+                    version: toolVersion ?? null,
                 };
                 if (normalizedModel) {
                     launchOptions.model = normalizedModel;
@@ -471,6 +475,7 @@ export async function handleAIToolWorkflow(selectionResult) {
                     bypassApprovals: skipPermissions,
                     envOverrides: sharedEnv,
                     sessionId: resumeSessionId,
+                    version: toolVersion ?? null,
                 };
                 if (normalizedModel) {
                     launchOptions.model = normalizedModel;
@@ -491,6 +496,7 @@ export async function handleAIToolWorkflow(selectionResult) {
                     skipPermissions,
                     envOverrides: sharedEnv,
                     sessionId: resumeSessionId,
+                    version: toolVersion ?? null,
                 };
                 if (normalizedModel) {
                     launchOptions.model = normalizedModel;
@@ -498,9 +504,9 @@ export async function handleAIToolWorkflow(selectionResult) {
                 launchResult = await launchGeminiCLI(worktreePath, launchOptions);
             }
             else {
-                // Custom coding agent
+                // Custom coding agent (including OpenCode)
                 printInfo(`Launching custom agent: ${agentConfig.displayName}`);
-                launchResult = await launchCodingAgent(agentConfig, {
+                const customLaunchOptions = {
                     mode: mode === "resume"
                         ? "resume"
                         : mode === "continue"
@@ -509,7 +515,11 @@ export async function handleAIToolWorkflow(selectionResult) {
                     skipPermissions,
                     cwd: worktreePath,
                     sharedEnv,
-                });
+                };
+                if (toolVersion) {
+                    customLaunchOptions.version = toolVersion;
+                }
+                launchResult = await launchCodingAgent(agentConfig, customLaunchOptions);
             }
         }
         finally {
@@ -589,6 +599,7 @@ export async function handleAIToolWorkflow(selectionResult) {
             model: normalizedModel ?? null,
             reasoningLevel: inferenceLevel ?? null,
             skipPermissions: skipPermissions ?? null,
+            toolVersion: toolVersion ?? null,
             timestamp: Date.now(),
             repositoryRoot: repoRoot,
             lastSessionId: finalSessionId,
@@ -619,7 +630,8 @@ export async function handleAIToolWorkflow(selectionResult) {
         }
         // Small buffer before returning to branch list to avoid abrupt screen swap
         await new Promise((resolve) => setTimeout(resolve, POST_SESSION_DELAY_MS));
-        printInfo("Session completed successfully. Returning to main menu...");
+        printInfo("Session completed successfully.");
+        await waitForUserAcknowledgement(SUCCESS_PROMPT);
         return;
     }
     catch (error) {
@@ -634,6 +646,9 @@ export async function handleAIToolWorkflow(selectionResult) {
         throw error;
     }
 }
+function resolveUIHandler() {
+    return mainSolidUI;
+}
 function logLoopError(error, context) {
     const label = context === "ui" ? "UI" : "workflow";
     if (error instanceof Error) {
@@ -643,8 +658,8 @@ function logLoopError(error, context) {
         printError(`${label} error: ${String(error)}`);
     }
 }
-export async function runInteractiveLoop(uiHandler = mainInkUI, workflowHandler = handleAIToolWorkflow) {
-    // Main loop: UI → AI Tool → back to UI
+export async function runInteractiveLoop(uiHandler = resolveUIHandler(), workflowHandler = handleAIToolWorkflow) {
+    // Main loop: UI → Coding Agent → back to UI
     while (true) {
         let selectionResult;
         try {
@@ -673,6 +688,8 @@ export async function runInteractiveLoop(uiHandler = mainInkUI, workflowHandler
  * Main entry point
  */
 export async function main() {
+    // Setup global signal handlers for clean exit
+    setupExitHandlers();
     // Parse command line arguments
     const args = process.argv.slice(2);
     const showVersionFlag = args.includes("-v") || args.includes("--version");
@@ -706,6 +723,8 @@ export async function main() {
         process.exit(1);
     }
     await runInteractiveLoop();
+    // Ensure clean exit with code 0
+    process.exit(0);
 }
 export function isEntryPoint(metaUrl, argv1) {
     if (!argv1) {
@@ -721,7 +740,8 @@ export function isEntryPoint(metaUrl, argv1) {
 // Run the application if this module is executed directly
 if (isEntryPoint(import.meta.url, process.argv[1])) {
     main().catch(async (error) => {
-        console.error("Fatal error:", error);
+        const details = error instanceof Error ? (error.stack ?? error.message) : String(error);
+        writeTerminalLine(`Fatal error: ${details}`, "stderr");
         await waitForErrorAcknowledgement();
         process.exit(1);
     });