commandmate 0.42.2 → 0.44.0

package/dist/server/src/lib/cli-tools/command-code-plan-review.js

@@ -0,0 +1,175 @@
+"use strict";
+/**
+ * Answering Command Code's plan review overlay from the CLI / API (Issue #3125).
+ *
+ * The overlay (`REVIEW` — `Approve ctrl+a` / `Cancel esc` / `type + enter to
+ * comment`) is not a dialog with options and not the composer, so neither
+ * `respond` (options) nor `send` (composer) could reach it. This module is the
+ * one place its keys are decided:
+ *
+ * | action    | keys                                   | allowed on phase              |
+ * |-----------|----------------------------------------|-------------------------------|
+ * | `comment` | `Enter`, the text (`-l`), `Enter`      | `body`                        |
+ * | `submit`  | [the comment keys], `C-r`              | `body` (needs ≥1 comment)     |
+ * | `approve` | `C-a` — or `Enter` on the radio        | `body`, `approve-choice`      |
+ * | `cancel`  | `Escape`                               | `body`, `approve-choice`      |
+ *
+ * Why the comment opens the box with `Enter` first instead of just typing: `?`
+ * `x` `!` are one-key quick comments on this screen (measured on 1.58.0), so a
+ * comment that begins with one of them would pin a canned sentence instead.
+ * An empty `Enter` with the cursor in the plan body only opens the box
+ * (measured, #2763 §1 問い 4), and inside the box every key is text.
+ *
+ * Everything else is refused with nothing sent:
+ *  - `action-focus`: `Enter` RUNS the focused action there (#2763 approved a
+ *    plan that way), and what the shortcuts and letters do with the focus on
+ *    the list was not measured;
+ *  - `comment-box`: someone is typing a comment in the pane, and `Escape` there
+ *    discards it rather than cancelling the review;
+ *  - `unknown`: a hint bar this module has not seen.
+ *
+ * Approval is only ever the explicit `approve` action. Nothing here is reached
+ * by Auto-Yes: the detector publishes this screen with `hasActivePrompt: false`.
+ *
+ * @module lib/cli-tools/command-code-plan-review
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PLAN_REVIEW_STEP_DELAY_MS = exports.PLAN_REVIEW_REFUSAL = exports.PLAN_REVIEW_ACTIONS = void 0;
+exports.isPlanReviewAction = isPlanReviewAction;
+exports.planCommandCodePlanReviewKeys = planCommandCodePlanReviewKeys;
+exports.sendCommandCodePlanReviewKeys = sendCommandCodePlanReviewKeys;
+const tmux_1 = require("../tmux/tmux");
+const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
+exports.PLAN_REVIEW_ACTIONS = ['comment', 'submit', 'approve', 'cancel'];
+function isPlanReviewAction(value) {
+    return typeof value === 'string' && exports.PLAN_REVIEW_ACTIONS.includes(value);
+}
+/** Refusal reason codes. All of them mean "nothing was sent". */
+exports.PLAN_REVIEW_REFUSAL = {
+    /** The overlay is up, but its focus is somewhere these keys are unsafe. */
+    BUSY: 'plan_review_busy',
+    /** `submit` with no comment given and none pending. */
+    NOTHING_TO_SUBMIT: 'plan_review_nothing_to_submit',
+    /** A bare number / yes / no, which would otherwise become a comment. */
+    AMBIGUOUS_ANSWER: 'plan_review_ambiguous_answer',
+    /** The request does not fit this screen (no text for a comment, `--default`). */
+    INVALID_REQUEST: 'plan_review_invalid_request',
+};
+/**
+ * A comment the caller did not label as one, that is really an answer meant
+ * for an options dialog. Typed as a comment it would land on the plan.
+ */
+const DIALOG_ANSWER_LIKE = /^(?:\d+(?:\s*,\s*\d+)*|y|yes|n|no)$/i;
+/** One line: a newline inside the box would pin the comment half-typed. */
+function normalizeComment(text) {
+    return text.replace(/\s*[\r\n]+\s*/g, ' ').trim();
+}
+const PHASE_REFUSALS = {
+    'action-focus': 'The plan review has its focus on the action list (`↑/↓ choose · enter to run`), where Enter runs the ' +
+        'focused action, so no key was sent. Move the focus back into the plan (↑) in the terminal, then retry.',
+    'comment-box': 'A comment is being typed in the plan review (`enter to pin · esc discard`), so no key was sent. ' +
+        'Pin or discard it in the terminal, then retry.',
+    unknown: 'The plan review is up, but its hint bar is not one this version knows, so no key was sent. ' +
+        'Answer it in the terminal.',
+};
+/**
+ * Decide the keys for a request against the screen as it is now. Pure.
+ *
+ * @param state - `readCommandCodePlanReviewState` of the frame about to be answered
+ * @param request - what the caller asked for
+ */
+function planCommandCodePlanReviewKeys(state, request) {
+    const comment = request.text === undefined ? '' : normalizeComment(request.text);
+    const action = request.action ?? 'comment';
+    if (request.useDefault) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.INVALID_REQUEST,
+            message: 'The plan review has no default option. Comment with text, or choose ' +
+                '--plan-review submit | approve | cancel.',
+        };
+    }
+    if ((action === 'approve' || action === 'cancel') && comment) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.INVALID_REQUEST,
+            message: `--plan-review ${action} takes no text. Comment first, then ${action}.`,
+        };
+    }
+    if (action === 'comment' && !comment) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.INVALID_REQUEST,
+            message: 'A plan review comment needs text.',
+        };
+    }
+    if (request.action === undefined && DIALOG_ANSWER_LIKE.test(comment)) {
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.AMBIGUOUS_ANSWER,
+            message: `The plan review has no numbered options, and "${comment}" would be pinned to the plan as a ` +
+                'comment, so no key was sent. Approve or cancel with --plan-review approve | cancel; to really ' +
+                'comment this text, add --plan-review comment.',
+        };
+    }
+    if (state.phase === 'approve-choice') {
+        // The radio `ctrl+a` opens when comments are pending (1.58.0): `enter
+        // confirm · esc back`. Enter confirms whichever side is `(•)`.
+        if (action === 'approve')
+            return { ok: true, action, steps: [{ kind: 'key', key: 'Enter' }], comment: null };
+        if (action === 'cancel')
+            return { ok: true, action, steps: [{ kind: 'key', key: 'Escape' }], comment: null };
+        return {
+            ok: false,
+            reason: exports.PLAN_REVIEW_REFUSAL.BUSY,
+            message: 'The plan review is asking how to approve (`←/→ choose · enter confirm · esc back`), so no key was ' +
+                'sent. Confirm with --plan-review approve, or go back with --plan-review cancel.',
+        };
+    }
+    if (state.phase !== 'body') {
+        return { ok: false, reason: exports.PLAN_REVIEW_REFUSAL.BUSY, message: PHASE_REFUSALS[state.phase] };
+    }
+    const commentSteps = comment
+        ? [{ kind: 'key', key: 'Enter' }, { kind: 'text', text: comment }, { kind: 'key', key: 'Enter' }]
+        : [];
+    switch (action) {
+        case 'comment':
+            return { ok: true, action, steps: commentSteps, comment };
+        case 'submit':
+            if (!comment && state.pendingComments === 0) {
+                return {
+                    ok: false,
+                    reason: exports.PLAN_REVIEW_REFUSAL.NOTHING_TO_SUBMIT,
+                    message: 'The plan review has no pending comment to submit, so no key was sent. Give the comment text ' +
+                        'with --plan-review submit, or approve / cancel the plan.',
+                };
+            }
+            return { ok: true, action, steps: [...commentSteps, { kind: 'key', key: 'C-r' }], comment: comment || null };
+        case 'approve':
+            return { ok: true, action, steps: [{ kind: 'key', key: 'C-a' }], comment: null };
+        case 'cancel':
+            return { ok: true, action, steps: [{ kind: 'key', key: 'Escape' }], comment: null };
+    }
+}
+/** Pause between steps, so the TUI handles each one as its own input event. */
+exports.PLAN_REVIEW_STEP_DELAY_MS = 300;
+/**
+ * Send the planned steps, one tmux invocation each.
+ *
+ * Key steps (including `C-r`) go through `sendSpecialKeys`; the comment text
+ * goes through `-l` so it is never resolved as a key name.
+ */
+async function sendCommandCodePlanReviewKeys(sessionName, steps, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))) {
+    for (let i = 0; i < steps.length; i++) {
+        const step = steps[i];
+        if (step.kind === 'text') {
+            await (0, tmux_1.sendKeys)(sessionName, step.text, false, { literal: true });
+        }
+        else {
+            await (0, tmux_1.sendSpecialKeys)(sessionName, [step.key]);
+        }
+        if (i < steps.length - 1)
+            await sleep(exports.PLAN_REVIEW_STEP_DELAY_MS);
+    }
+    (0, tmux_capture_cache_1.invalidateCache)(sessionName);
+}

package/dist/server/src/lib/cli-tools/command-code.js

@@ -36,7 +36,7 @@
  * only the correlation.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandCodeTool = exports.COMMAND_CODE_EXIT_COMMAND = exports.COMMAND_CODE_LAUNCH_FLAGS = exports.COMMAND_CODE_COMMAND = void 0;
+exports.CommandCodeTool = exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE = exports.COMMAND_CODE_STARTING_WINDOW_MS = exports.COMMAND_CODE_EXIT_COMMAND = exports.COMMAND_CODE_LAUNCH_FLAGS = exports.COMMAND_CODE_COMMAND = void 0;
 exports.buildCommandCodeLaunchCommand = buildCommandCodeLaunchCommand;
 exports.isCommandCodeReady = isCommandCodeReady;
 const base_1 = require("./base");
@@ -51,6 +51,8 @@ const tool_id_1 = require("../../lib/hooks/sources/command-code/tool-id");
 const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifecycle");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
+const plan_review_state_1 = require("../detection/tools/command-code/plan-review-state");
+const session_start_error_1 = require("../../lib/session/session-start-error");
 const logger = (0, logger_1.createLogger)('cli-tools/command-code');
 /** The executable CommandMate launches. See the module docblock for why not `cmd`. */
 exports.COMMAND_CODE_COMMAND = 'commandcode';
@@ -106,6 +108,16 @@ const COMMAND_CODE_POLL_INTERVAL_MS = 1000;
 const COMMAND_CODE_INIT_MAX_ATTEMPTS = 30;
 /** Timeout for waiting for the composer before sending a message. */
 const COMMAND_CODE_PROMPT_WAIT_TIMEOUT_MS = 15000;
+/**
+ * How long after a launch a composer that has never been seen still counts as
+ * "starting" (Issue #3006).
+ *
+ * Past this, a pane that has shown no composer since it was launched is not
+ * slow, it is stuck on something (an unmeasured dialog, a crash screen), and
+ * `prompt not ready` — which #3007 answers by reading the screen — is the
+ * truer report than "retry in a few seconds".
+ */
+exports.COMMAND_CODE_STARTING_WINDOW_MS = 120_000;
 /** Rows of pane tail the readiness probe reads. */
 const COMMAND_CODE_READINESS_CAPTURE_LINES = 50;
 /**
@@ -133,6 +145,16 @@ function isCommandCodeReady(rawOutput) {
         return false;
     return !cli_patterns_1.COMMAND_CODE_THINKING_PATTERN.test((0, cli_patterns_1.stripAnsi)(rawOutput));
 }
+/**
+ * Why `send` stops at the plan review overlay (Issue #3125).
+ *
+ * The overlay replaces the composer until a human decides, so waiting for the
+ * composer only ran out the clock (`prompt not ready` after the full timeout).
+ * Its comments, Submit review, approval and cancel go through `respond`.
+ */
+exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE = 'Command Code is showing a plan review (REVIEW), which takes review comments, not messages. ' +
+    'Comment with `commandmate respond <worktree-id> "<text>"`, then `--plan-review submit` (ctrl+r), ' +
+    '`--plan-review approve` (ctrl+a) or `--plan-review cancel` (esc).';
 /**
  * Command Code CLI tool implementation.
  * Manages `commandcode` sessions using tmux.
@@ -141,6 +163,20 @@ class CommandCodeTool extends base_1.BaseCLITool {
     id = 'command-code';
     name = 'Command Code CLI';
     command = exports.COMMAND_CODE_COMMAND;
+    /**
+     * Sessions this instance launched whose composer has not been seen since,
+     * keyed by tmux session name, valued by launch time (Issue #3006).
+     *
+     * This is what tells a slow cold start apart from a live session that is
+     * showing something other than the composer. Only the launch path adds an
+     * entry, and any readiness probe that sees the composer removes it, so a
+     * session that has ever reached its composer keeps the old
+     * `prompt not ready` refusal. Held per instance rather than per module
+     * because `CLIToolManager` holds one instance for the process, and a restart
+     * forgets it — which errs towards `prompt not ready`, the answer this
+     * repository gave before.
+     */
+    composerPendingSince = new Map();
     /**
      * Declare the claude-family pad (Issue #2297).
      *
@@ -209,6 +245,9 @@ class CommandCodeTool extends base_1.BaseCLITool {
         // launch below then fails: falling back to the screen scraper is always safe
         // and trusting a dead session's events is not.
         (0, agent_session_lifecycle_1.beginAgentSession)({ worktreeId, cliToolId: tool_id_1.COMMAND_CODE_CLI_TOOL_ID, instanceId });
+        // Issue #3006: from here until a readiness probe sees the composer, a send
+        // that cannot find it is reporting a slow start, not a wedged session.
+        this.composerPendingSince.set(sessionName, Date.now());
         try {
             if (!exists) {
                 // Inline-rendered, so the pane keeps scrollback; depth comes from the
@@ -229,6 +268,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
             logger.info('started-command-code-session');
         }
         catch (error) {
+            this.composerPendingSince.delete(sessionName);
             throw new Error(`Failed to start Command Code session: ${(0, errors_1.getErrorMessage)(error)}`);
         }
     }
@@ -246,6 +286,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
             try {
                 const rawOutput = await (0, tmux_1.capturePane)(sessionName, COMMAND_CODE_READINESS_CAPTURE_LINES);
                 if (isCommandCodeReady(rawOutput)) {
+                    this.composerPendingSince.delete(sessionName);
                     logger.info('command-code-prompt-detected');
                     return;
                 }
@@ -262,23 +303,57 @@ class CommandCodeTool extends base_1.BaseCLITool {
      * Mirrors CodexTool.waitForPrompt: throws on timeout so a failed readiness
      * check STOPS the send rather than typing into a non-ready TUI.
      *
+     * Issue #3006: when the session was launched by this server and its composer
+     * has not been seen once since — the cold start of a dispatch — the timeout
+     * is a {@link SessionStartTimeoutError} (`SESSION_STARTING`, 503 at the send
+     * route), the same answer claude gives for a start that is merely slow. A
+     * session that HAS shown its composer keeps the plain `prompt not ready`
+     * error: it is up, and something on screen is in the way.
+     *
+     * @throws SessionStartTimeoutError when a just-launched session's composer
+     *   has still not appeared
+     * @throws Error ({@link COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE}) at once when
+     *   the plan review overlay is on screen (Issue #3125)
      * @throws Error when the composer is not detected within the timeout
      */
     async waitForPrompt(sessionName) {
         const startTime = Date.now();
         const pollInterval = 500;
+        let planReviewPolls = 0;
         while (Date.now() - startTime < COMMAND_CODE_PROMPT_WAIT_TIMEOUT_MS) {
+            let planReviewUp = false;
             try {
                 const rawOutput = await (0, tmux_1.capturePane)(sessionName, COMMAND_CODE_READINESS_CAPTURE_LINES);
-                if (isCommandCodeReady(rawOutput)) {
+                // Read first: a focused action row (`❯ Approve  ctrl+a`) is a `❯` row.
+                planReviewUp = (0, plan_review_state_1.readCommandCodePlanReviewState)(rawOutput) !== null;
+                if (!planReviewUp && isCommandCodeReady(rawOutput)) {
+                    this.composerPendingSince.delete(sessionName);
                     return;
                 }
             }
             catch {
                 // Capture may fail - continue polling
             }
+            // Issue #3125: no composer comes back until a human answers the review.
+            // Two polls in a row, because the frame redrawn just after `Esc` can
+            // still carry the footer (`after-cancel-partial-redraw.txt`, #2763).
+            planReviewPolls = planReviewUp ? planReviewPolls + 1 : 0;
+            if (planReviewPolls >= 2) {
+                logger.info('command-code-plan-review-blocks-send', { sessionName });
+                throw new Error(exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE);
+            }
             await new Promise((resolve) => setTimeout(resolve, pollInterval));
         }
+        const launchedAt = this.composerPendingSince.get(sessionName);
+        if (launchedAt !== undefined) {
+            const sinceLaunchMs = Date.now() - launchedAt;
+            if (sinceLaunchMs <= exports.COMMAND_CODE_STARTING_WINDOW_MS) {
+                logger.info('command-code-session-still-starting', { sessionName, sinceLaunchMs });
+                throw new session_start_error_1.SessionStartTimeoutError(this.name, sessionName, sinceLaunchMs);
+            }
+            // Too long since the launch to call it slow; report it as not ready.
+            this.composerPendingSince.delete(sessionName);
+        }
         logger.info('command-code-prompt-not-ready');
         throw new Error('Command Code prompt not ready: timed out waiting for the composer before sending');
     }
@@ -312,6 +387,9 @@ class CommandCodeTool extends base_1.BaseCLITool {
             logger.info('sent-message-to-command-code-session');
         }
         catch (error) {
+            // Issue #3006: passed through unwrapped so its `code` reaches the route.
+            if ((0, session_start_error_1.isSessionStartTimeoutError)(error))
+                throw error;
             throw new Error(`Failed to send message to Command Code: ${(0, errors_1.getErrorMessage)(error)}`);
         }
     }
@@ -338,6 +416,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
                 await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_EXIT_WAIT_MS));
             }
             const killed = await (0, tmux_1.killSession)(sessionName);
+            this.composerPendingSince.delete(sessionName);
             // So a later session reusing the name starts clean.
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
             if (killed) {

package/dist/server/src/lib/cli-tools/composer-spec.js

@@ -87,6 +87,16 @@ const COMPOSER_SPECS = {
         clearBeforeSend: false,
         submitEnterCount: 1,
     },
+    // Issue #2934: OpenCode V2 draws the same gutter-and-no-marker input box as
+    // v1 (`┃  Ask anything… "…"` on 2.0.18, 80x200), so the box reader is the
+    // right one — the marker reader would find nothing and classify every send
+    // `submitted` without evidence. Same pane height as v1's.
+    'opencode-v2': {
+        reader: 'opencode-box',
+        verifyCaptureLines: tmux_pane_config_1.OPENCODE_PANE_HEIGHT,
+        clearBeforeSend: false,
+        submitEnterCount: 1,
+    },
 };
 /**
  * The composer description for a CLI tool.

package/dist/server/src/lib/cli-tools/copilot-executable.js

@@ -39,6 +39,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COPILOT_VERSION_PROBE_TIMEOUT_MS = void 0;
 exports.findExecutableOnPath = findExecutableOnPath;
+exports.findExecutablesOnPath = findExecutablesOnPath;
 exports.resolveCopilotExecutable = resolveCopilotExecutable;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
@@ -83,17 +84,32 @@ function isExecutableFile(candidate) {
  * is; what is copilot-specific is the caller below.
  */
 function findExecutableOnPath(name) {
+    return findExecutablesOnPath(name, 1)[0] ?? null;
+}
+/**
+ * Every executable named `name` on `PATH`, in `PATH` order, up to `limit`.
+ *
+ * Issue #2939: `opencode` can name two different programs on one machine
+ * (OpenCode 1.x's installer and `@opencode/cli`, which registers `opencode`
+ * next to `opencode2`), so "the first one" is not always the one a tool wants.
+ * The same walk as {@link findExecutableOnPath}, not a second copy of it.
+ */
+function findExecutablesOnPath(name, limit = Infinity) {
     const rawPath = process.env.PATH;
-    if (!rawPath)
-        return null;
+    if (!rawPath || limit <= 0)
+        return [];
+    const found = [];
     for (const directory of rawPath.split(path_1.delimiter)) {
         if (!directory)
             continue;
         const candidate = (0, path_1.join)(directory, name);
-        if (isExecutableFile(candidate))
-            return candidate;
+        if (found.includes(candidate) || !isExecutableFile(candidate))
+            continue;
+        found.push(candidate);
+        if (found.length >= limit)
+            break;
     }
-    return null;
+    return found;
 }
 /**
  * Where `gh copilot` puts the copy it downloads.

package/dist/server/src/lib/cli-tools/graceful-exit.js

@@ -42,7 +42,7 @@
  * @module lib/cli-tools/graceful-exit
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_GRACEFUL_EXIT_SPEC = exports.GEMINI_EXIT_COMMAND_TEXT = exports.COMMAND_CODE_EXIT_COMMAND_TEXT = exports.OPENCODE_EXIT_COMMAND_TEXT = exports.COPILOT_EXIT_COMMAND_TEXT = void 0;
+exports.DEFAULT_GRACEFUL_EXIT_SPEC = exports.GEMINI_EXIT_COMMAND_TEXT = exports.COMMAND_CODE_EXIT_COMMAND_TEXT = exports.OPENCODE_V2_EXIT_COMMAND_TEXT = exports.OPENCODE_EXIT_COMMAND_TEXT = exports.COPILOT_EXIT_COMMAND_TEXT = void 0;
 exports.resolveGracefulExitSpec = resolveGracefulExitSpec;
 exports.verifyGracefulExit = verifyGracefulExit;
 const copilot_constants_1 = require("../../config/copilot-constants");
@@ -52,6 +52,8 @@ const cli_tool_contracts_1 = require("../../types/cli-tool-contracts");
 exports.COPILOT_EXIT_COMMAND_TEXT = '/exit';
 /** The graceful exit command opencode's TUI accepts. */
 exports.OPENCODE_EXIT_COMMAND_TEXT = '/exit';
+/** OpenCode V2's quit command (Issue #2934) — the TUI's own `/exit`. */
+exports.OPENCODE_V2_EXIT_COMMAND_TEXT = '/exit';
 /** Command Code's own quit command (Issue #2250). */
 exports.COMMAND_CODE_EXIT_COMMAND_TEXT = '/exit';
 /** The graceful exit command gemini's TUI accepts. */
@@ -141,6 +143,18 @@ const GRACEFUL_EXIT_SPECS = {
         exitWaitMs: cli_tool_timing_config_1.OPENCODE_EXIT_WAIT_MS,
         ownsLoopbackServer: true,
     },
+    // Issue #2934: `/exit` and a separate Enter, as for v1. The server is not the
+    // TUI here but `opencode2 serve` in the same pane, stopped by
+    // `scripts/opencode-v2/launch.sh`'s trap when the TUI goes — so the pane still
+    // owns a loopback port, and the postcondition checks it stopped answering.
+    'opencode-v2': {
+        keys: [
+            (0, cli_tool_contracts_1.literalStep)(exports.OPENCODE_V2_EXIT_COMMAND_TEXT, cli_tool_timing_config_1.TUI_TEXT_INPUT_WAIT_MS),
+            (0, cli_tool_contracts_1.keyStep)('Enter'),
+        ],
+        exitWaitMs: cli_tool_timing_config_1.OPENCODE_V2_EXIT_WAIT_MS,
+        ownsLoopbackServer: true,
+    },
 };
 /**
  * The graceful-exit description for a CLI tool.

package/dist/server/src/lib/cli-tools/index.js

@@ -6,7 +6,7 @@
  * @module cli-tools
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLIToolManager = exports.buildCommandCodeLaunchCommand = exports.CommandCodeTool = exports.AntigravityTool = exports.GeminiTool = exports.CodexTool = exports.ClaudeTool = exports.BaseCLITool = exports.DEFAULT_GRACEFUL_EXIT_SPEC = exports.verifyGracefulExit = exports.resolveGracefulExitSpec = exports.GEMINI_PANE_HEIGHT = exports.resolveCaptureSpec = exports.DEFAULT_COMPOSER_SPEC = exports.resolveComposerSpec = exports.isImageCapableCLITool = void 0;
+exports.CLIToolManager = exports.OpenCodeV2Tool = exports.buildCommandCodeLaunchCommand = exports.CommandCodeTool = exports.AntigravityTool = exports.GeminiTool = exports.CodexTool = exports.ClaudeTool = exports.BaseCLITool = exports.DEFAULT_GRACEFUL_EXIT_SPEC = exports.verifyGracefulExit = exports.resolveGracefulExitSpec = exports.GEMINI_PANE_HEIGHT = exports.resolveCaptureSpec = exports.DEFAULT_COMPOSER_SPEC = exports.resolveComposerSpec = exports.isImageCapableCLITool = void 0;
 var types_1 = require("./types");
 Object.defineProperty(exports, "isImageCapableCLITool", { enumerable: true, get: function () { return types_1.isImageCapableCLITool; } });
 var composer_spec_1 = require("./composer-spec");
@@ -34,6 +34,8 @@ Object.defineProperty(exports, "AntigravityTool", { enumerable: true, get: funct
 var command_code_1 = require("./command-code");
 Object.defineProperty(exports, "CommandCodeTool", { enumerable: true, get: function () { return command_code_1.CommandCodeTool; } });
 Object.defineProperty(exports, "buildCommandCodeLaunchCommand", { enumerable: true, get: function () { return command_code_1.buildCommandCodeLaunchCommand; } });
+var opencode_v2_1 = require("./opencode-v2");
+Object.defineProperty(exports, "OpenCodeV2Tool", { enumerable: true, get: function () { return opencode_v2_1.OpenCodeV2Tool; } });
 // Export CLI tool manager
 var manager_1 = require("./manager");
 Object.defineProperty(exports, "CLIToolManager", { enumerable: true, get: function () { return manager_1.CLIToolManager; } });

package/dist/server/src/lib/cli-tools/install-hints.js

@@ -83,6 +83,8 @@ exports.CLI_TOOL_INSTALL_HINTS = {
     opencode: 'Install with: npm install -g opencode-ai',
     copilot: copilot_constants_1.COPILOT_INSTALL_HINT,
     'command-code': 'Install with: npm install -g command-code',
+    // Issue #2934: the package installs the `opencode2` executable.
+    'opencode-v2': 'Install with: npm install -g @opencode/cli',
     // No package to name: `agy` ships with Antigravity and updates itself. The
     // URL is lifted from the binary on PATH rather than from a search result.
     antigravity: 'Install the Antigravity CLI: https://antigravity.google/docs/cli/reference',
@@ -114,18 +116,22 @@ function getCliToolInstallHint(id) {
  * and #2009's contract is that the phrase survives.
  *
  * @param tool - The tool that could not be started
+ * @param detail - Why, when there is more to say than "not on PATH" — e.g.
+ *   `opencode` is there but is OpenCode V2 (Issue #2939)
  * @returns A sentence safe to hand back to an HTTP caller
  */
-function buildMissingToolMessage(tool) {
+function buildMissingToolMessage(tool, detail) {
     return (`${tool.name} (${tool.command}) is not installed or not in PATH. ` +
+        (detail ? `${detail} ` : '') +
         `${getCliToolInstallHint(tool.id)}`);
 }
 /**
  * The typed refusal, carrying {@link buildMissingToolMessage}.
  *
  * @param tool - The tool that could not be started
+ * @param detail - See {@link buildMissingToolMessage}
  * @returns The error every launch path throws for a missing binary
  */
-function missingToolError(tool) {
-    return new session_start_error_1.SessionStartUnavailableError(tool.name, buildMissingToolMessage(tool));
+function missingToolError(tool, detail) {
+    return new session_start_error_1.SessionStartUnavailableError(tool.name, buildMissingToolMessage(tool, detail));
 }

package/dist/server/src/lib/cli-tools/liveness-spec.js

@@ -211,6 +211,25 @@ const LIVENESS_SPECS = {
             cli_patterns_1.COMMAND_CODE_THINKING_PATTERN,
         ],
     },
+    /**
+     * OpenCode V2 2.0.18 — measured at 80x200 (Issue #2934).
+     *
+     * The footer (`… ctrl+p commands`) is drawn on every frame the TUI paints,
+     * before and after a turn and while one runs, so it alone carries liveness;
+     * the placeholder and the running hint are listed as well so a frame with
+     * either is not taken for a shell. None of the three can be matched by a
+     * shell prompt. After the TUI exits the alternate screen is gone and only the
+     * shell's rows remain, which is what makes the verdict flip.
+     */
+    'opencode-v2': {
+        ...SHARED,
+        ...ADDED_TOOL_DEFAULTS,
+        alivePatterns: [
+            cli_patterns_1.OPENCODE_V2_IDLE_COMPOSER_PATTERN,
+            cli_patterns_1.OPENCODE_V2_FOOTER_PATTERN,
+            cli_patterns_1.OPENCODE_V2_THINKING_PATTERN,
+        ],
+    },
     /** vibe-local — patterns from `cli-patterns`; no live frames (needs Ollama). */
     'vibe-local': {
         ...SHARED,

package/dist/server/src/lib/cli-tools/manager.js

@@ -46,6 +46,7 @@ const opencode_1 = require("./opencode");
 const copilot_1 = require("./copilot");
 const antigravity_1 = require("./antigravity");
 const command_code_1 = require("./command-code");
+const opencode_v2_1 = require("./opencode-v2");
 /**
  * CLI Tool Manager (Singleton)
  * Provides centralized access to all CLI tools (Issue #368: includes Vibe Local, Issue #379: includes OpenCode)
@@ -67,6 +68,7 @@ class CLIToolManager {
         this.tools.set('copilot', new copilot_1.CopilotTool());
         this.tools.set('antigravity', new antigravity_1.AntigravityTool());
         this.tools.set('command-code', new command_code_1.CommandCodeTool());
+        this.tools.set('opencode-v2', new opencode_v2_1.OpenCodeV2Tool());
     }
     /**
      * Get singleton instance