commandmate 0.42.2 → 0.43.0

package/dist/server/src/lib/detection/cli-patterns.js

@@ -4,8 +4,8 @@
  * Shared between response-poller.ts and API routes
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_TRAILED_STATUS_BAR_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = exports.CODEX_PICKER_FOOTER_PATTERN = exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_TRUST_QUESTION_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
-exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = void 0;
+exports.findOpencodeV2DialogTitle = exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = exports.OPENCODE_V2_THINKING_PATTERN = exports.OPENCODE_V2_FOOTER_PATTERN = exports.OPENCODE_V2_IDLE_COMPOSER_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_TRAILED_STATUS_BAR_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = exports.CODEX_PICKER_FOOTER_PATTERN = exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_TRUST_QUESTION_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_V2_SKIP_PATTERNS = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.isCodexPromptReady = isCodexPromptReady;
@@ -17,6 +17,7 @@ exports.findOpenCodeChromeStart = findOpenCodeChromeStart;
 exports.findOpenCodeUserEchoEnd = findOpenCodeUserEchoEnd;
 exports.findOpenCodeComposerRows = findOpenCodeComposerRows;
 exports.stripOpenCodeGutter = stripOpenCodeGutter;
+exports.isOpencodeV2ComposerVisible = isOpencodeV2ComposerVisible;
 exports.readCopilotStatusBar = readCopilotStatusBar;
 exports.findCopilotChromeStart = findCopilotChromeStart;
 exports.isCopilotSelectionFrame = isCopilotSelectionFrame;
@@ -1498,6 +1499,68 @@ exports.OPENCODE_SKIP_PATTERNS = [
     exports.OPENCODE_FOOTER_STATUS_PATTERN,
     exports.PASTED_TEXT_PATTERN,
 ];
+// =============================================================================
+// OpenCode V2 (`opencode2`, Issue #2934)
+// =============================================================================
+//
+// A separate tool id from `opencode` (Epic #2370, decision 1). Its TUI is drawn
+// by the same toolkit and many rows look alike, but v1's constants are v1's:
+// they are left exactly as they are, and v2 names its own here so a change on
+// either side cannot move the other. Phase 1 reads only what the send path and
+// the fallback status reader need; the approval dialog (`Always allow`, the
+// reverse of v1's `Allow always`), the completion row and the session tabs are
+// Phase 3's.
+/**
+ * OpenCode V2's empty composer: the input box's `┃` gutter with the
+ * `Ask anything…` placeholder on the same row (2.0.18 draws U+2026; the ASCII
+ * `...` is accepted too, as for v1 since #2915).
+ *
+ * Measured on 2.0.18 at 80x200 (2026-09-28):
+ * `   ┃  Ask anything… "Fix broken tests"`. Match against the ANSI-stripped
+ * frame BEFORE `stripBoxDrawing`, which removes the gutter this anchors on.
+ */
+exports.OPENCODE_V2_IDLE_COMPOSER_PATTERN = /^[^\S\n]*[\u2502\u2503][^\S\n]*Ask anything(?:\.\.\.|\u2026)/m;
+/**
+ * OpenCode V2's footer, which ends in `ctrl+p commands` on every frame the
+ * TUI draws (before a turn: `<path>:<branch>  shift+tab agents  ctrl+p commands`;
+ * after one: `<path>:<branch>  8.8K (1%)  ctrl+p commands`, 2.0.18).
+ *
+ * Proof that the TUI — and so its composer — is on screen, NOT that it is idle:
+ * a running turn keeps the footer.
+ */
+exports.OPENCODE_V2_FOOTER_PATTERN = /ctrl\+p commands/;
+/**
+ * OpenCode V2 working indicator: the footer's `esc interrupt` hint, drawn only
+ * while a turn is running (2.0.18).
+ */
+exports.OPENCODE_V2_THINKING_PATTERN = /esc interrupt/;
+/**
+ * Whether OpenCode V2's composer is on screen, so a send may type into it
+ * (Issue #2934, D6): the gutter-anchored placeholder, or the footer.
+ *
+ * @param text - ANSI-stripped capture, box drawing intact
+ */
+function isOpencodeV2ComposerVisible(text) {
+    return exports.OPENCODE_V2_IDLE_COMPOSER_PATTERN.test(text) || exports.OPENCODE_V2_FOOTER_PATTERN.test(text);
+}
+/**
+ * The OpenCode V2 dialog title row and its reader (Issue #2971) live in a
+ * browser-safe leaf since Issue #2983, because the chat surface's dialog card
+ * reads the same row to decide whether v2's model keys may close the dialog
+ * first. Re-exported here so every server-side caller keeps one import site.
+ */
+var dialog_title_1 = require("./tools/opencode-v2/dialog-title");
+Object.defineProperty(exports, "OPENCODE_V2_DIALOG_TITLE_PATTERN", { enumerable: true, get: function () { return dialog_title_1.OPENCODE_V2_DIALOG_TITLE_PATTERN; } });
+Object.defineProperty(exports, "findOpencodeV2DialogTitle", { enumerable: true, get: function () { return dialog_title_1.findOpencodeV2DialogTitle; } });
+/** OpenCode V2 rows that are chrome, never reply content. */
+exports.OPENCODE_V2_SKIP_PATTERNS = [
+    exports.OPENCODE_SEPARATOR_PATTERN,
+    exports.OPENCODE_V2_FOOTER_PATTERN,
+    exports.OPENCODE_V2_THINKING_PATTERN,
+    /Ask anything(?:\.\.\.|\u2026)/,
+    /^Build\s+·/,
+    exports.PASTED_TEXT_PATTERN,
+];
 /**
  * Copilot prompt pattern (Issue #545)
  * Copilot CLI shows "❯" followed by cursor/text hint:
@@ -2669,6 +2732,9 @@ function detectThinking(cliToolId, content) {
         case 'command-code':
             result = exports.COMMAND_CODE_THINKING_PATTERN.test(content);
             break;
+        case 'opencode-v2':
+            result = exports.OPENCODE_V2_THINKING_PATTERN.test(content);
+            break;
         default:
             result = exports.CLAUDE_THINKING_PATTERN.test(content);
     }
@@ -2787,6 +2853,16 @@ function getCliToolPatterns(cliToolId) {
                 thinkingPattern: exports.COMMAND_CODE_THINKING_PATTERN,
                 skipPatterns: [...exports.COMMAND_CODE_SKIP_PATTERNS],
             };
+        // Issue #2934: OpenCode V2's own constants (see OPENCODE_V2_* above). The
+        // separator row is the same half-block rule v1 draws, so v1's pattern is
+        // reused as a value; nothing of v1's is changed.
+        case 'opencode-v2':
+            return {
+                promptPattern: exports.OPENCODE_V2_IDLE_COMPOSER_PATTERN,
+                separatorPattern: exports.OPENCODE_SEPARATOR_PATTERN,
+                thinkingPattern: exports.OPENCODE_V2_THINKING_PATTERN,
+                skipPatterns: [...exports.OPENCODE_V2_SKIP_PATTERNS],
+            };
         default:
             // Default to Claude patterns
             return getCliToolPatterns('claude');

package/dist/server/src/lib/detection/model-info-extractor.js

@@ -62,7 +62,7 @@
  * @see Issue #1784, Phase 2 of the model/effort visibility series
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANTIGRAVITY_MODEL_ID_EFFORT_PATTERN = exports.COMMAND_CODE_BANNER_MODELS_PATTERN = exports.OPENCODE_STEP_MODEL_PATTERN = exports.COPILOT_MODEL_CHANGE_PATTERN = exports.ANTIGRAVITY_BANNER_MODEL_PATTERN = exports.ANTIGRAVITY_STATUS_BAR_HINT_PATTERN = exports.CLAUDE_MODEL_SWITCH_PATTERN = exports.CLAUDE_STARTUP_BANNER_PATTERN = exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN = exports.CODEX_FOOTER_EFFORT_SLOT_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
+exports.ANTIGRAVITY_MODEL_ID_EFFORT_PATTERN = exports.COMMAND_CODE_BANNER_MODELS_PATTERN = exports.OPENCODE_STEP_MODEL_PATTERN = exports.COPILOT_MODEL_CHANGE_PATTERN = exports.ANTIGRAVITY_BANNER_MODEL_PATTERN = exports.ANTIGRAVITY_STATUS_BAR_HINT_PATTERN = exports.CLAUDE_MODEL_SWITCH_PATTERN = exports.CLAUDE_EFFORT_ROW_PATTERN = exports.CLAUDE_STARTUP_BANNER_V2_1_28X_PATTERN = exports.CLAUDE_STARTUP_BANNER_PATTERN = exports.CODEX_STATUS_BAR_WITH_TRAILER_PATTERN = exports.CODEX_FOOTER_EFFORT_SLOT_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
 exports.resolveEffortToken = resolveEffortToken;
 exports.extractModelInfo = extractModelInfo;
 exports.deriveEffortFromModelId = deriveEffortFromModelId;
@@ -288,14 +288,83 @@ function readCodexFooter(line) {
  * literal-anchored parts, and the greedy prefix class is disjoint from `\S`.
  */
 exports.CLAUDE_STARTUP_BANNER_PATTERN = /^\s*[\u2500-\u259F][\s\u2500-\u259F]*(\S[^\u2500-\u259F]*?)\s+with\s+(minimal|low|medium|high|xhigh)\s+effort\b/i;
+/**
+ * The startup banner as claude 2.1.28x draws it: `<model> · <plan>` with no
+ * effort clause (Issue #2955).
+ *
+ * Measured on claude 2.1.284 (`tests/fixtures/claude-session-start-2955/`):
+ *   `▝▜██████▀  Sonnet 5.5 · Claude Max`
+ * The effort moved off this row to a right-aligned one of its own
+ * ({@link CLAUDE_EFFORT_ROW_PATTERN}). Issue #3023 measured on 2.1.285 that
+ * this is the shape at the model's DEFAULT effort only: a non-default effort
+ * brings the clause back (`Opus 5.5 with xhigh effort · Claude Max`), which
+ * {@link CLAUDE_STARTUP_BANNER_PATTERN} reads
+ * (`tests/fixtures/claude-effort-default-3023/`).
+ *
+ * Without the `with … effort` anchor, a box-framed table row containing ` · `
+ * would read as a banner — the reason #2361 declined to widen
+ * {@link CLAUDE_STARTUP_BANNER_PATTERN}. The anchor here is the plan instead:
+ * the separator must be followed by `Claude <Plan>`, the spelling measured on
+ * 2.1.284. `API Usage Billing` is deliberately NOT accepted yet: the only frames
+ * that carry it are #2361's 2.1.263 Haiku banners, and
+ * `model-info-claude-switch-2361.test.ts` pins those as an honest unknown
+ * (`fullscreen-after-clear`). The hook's `SessionStart` names the model on
+ * those sessions. `·` is excluded from the model group so the lazy
+ * match stops at the first separator, and a label still carrying `with …
+ * effort` (a truncated old-format banner) is refused by the caller.
+ *
+ * Tried only after the old pattern, so a 2.1.232-shaped line keeps its effort.
+ */
+exports.CLAUDE_STARTUP_BANNER_V2_1_28X_PATTERN = /^\s*[\u2500-\u259F][\s\u2500-\u259F]*(\S[^\u2500-\u259F·]*?)\s+·\s+Claude\s+[A-Za-z]+\b/;
+/**
+ * The right-aligned effort row claude 2.1.28x draws under its banner
+ * (Issue #2955): `◐ medium · /effort`.
+ *
+ * Anchored on the trailing `· /effort` hint, which is chrome and nothing a
+ * reply would end a line with; the leading glyph is any one non-space
+ * character (the dial changes with the level). The word goes through
+ * {@link resolveEffortToken}, so anything outside the known levels reads as no
+ * effort rather than as a guess.
+ *
+ * The row is drawn on the first frame only; after the first turn it is gone
+ * (Issue #3023), so a later frame reads the model and no effort.
+ */
+exports.CLAUDE_EFFORT_ROW_PATTERN = /^\s*\S\s+([A-Za-z]+)\s+·\s+\/effort\s*$/;
 function readClaudeBanner(line) {
     const match = exports.CLAUDE_STARTUP_BANNER_PATTERN.exec(line);
-    if (!match)
+    if (match) {
+        const model = match[1].trim();
+        if (!isPlausibleModelLabel(model))
+            return null;
+        return { model, effort: resolveEffortToken(match[2]) };
+    }
+    // Issue #2955: the 2.1.28x shape, no effort on the row.
+    const current = exports.CLAUDE_STARTUP_BANNER_V2_1_28X_PATTERN.exec(line);
+    if (!current)
         return null;
-    const model = match[1].trim();
-    if (!isPlausibleModelLabel(model))
+    const model = current[1].trim();
+    if (/\swith\s/i.test(model) || !isPlausibleModelLabel(model))
         return null;
-    return { model, effort: resolveEffortToken(match[2]) };
+    return { model, effort: null };
+}
+function readClaudeEffortRow(line) {
+    const match = exports.CLAUDE_EFFORT_ROW_PATTERN.exec(line);
+    if (!match)
+        return null;
+    const effort = resolveEffortToken(match[1]);
+    return effort === null ? null : { model: null, effort };
+}
+/**
+ * The banner, with the effort filled from the 2.1.28x effort row when the
+ * banner itself names none (Issue #2955). The row is consulted only for a
+ * banner that was read, so it never supplies an effort on its own.
+ */
+function readClaudeBannerWithEffort(captureText) {
+    const banner = scanFromEnd(captureText, readClaudeBanner);
+    if (!banner || banner.effort !== null)
+        return banner;
+    const row = scanFromEnd(captureText, readClaudeEffortRow);
+    return row ? { model: banner.model, effort: row.effort } : banner;
 }
 /**
  * Reads `<model>[ with <effort> effort]` off the line Claude prints when the
@@ -341,7 +410,10 @@ function readClaudeBanner(line) {
  *    Billing`), so {@link CLAUDE_STARTUP_BANNER_PATTERN} does not read it and
  *    the confirmation line is what publishes the model there. The banner
  *    pattern is deliberately not widened: without the `with … effort` anchor
- *    a box-framed table row containing ` · ` would read as a banner.
+ *    a box-framed table row containing ` · ` would read as a banner. (#2955
+ *    added a second, plan-anchored pattern for the 2.1.28x banner —
+ *    {@link CLAUDE_STARTUP_BANNER_V2_1_28X_PATTERN} — which accepts
+ *    `· Claude <Plan>` only, so this Haiku row is still not read.)
  *  - **`/fast` prints `⎿  ↯ Fast mode ON · model set to Opus 5 · $10/$50 per
  *    Mtok` and is a model switch** (`PostModelSwitch` reported
  *    `claude-fable-5-1` → `claude-opus-5[1m]` on the same keypress). It is NOT
@@ -747,7 +819,7 @@ function extractModelInfo(cliToolId, captureText) {
             // hooks name the model on `SessionStart` alone — `/model` fires none of
             // the events CommandMate registers — so on a switch the pane is the only
             // channel that hears it.
-            return (scanFromEnd(captureText, readClaudeBanner) ??
+            return (readClaudeBannerWithEffort(captureText) ??
                 scanFromEnd(captureText, readClaudeModelSwitchLine) ??
                 unknown());
         case 'antigravity':

package/dist/server/src/lib/detection/status-detector.js

@@ -31,6 +31,7 @@ exports.detectSessionStatus = detectSessionStatus;
 const status_reason_1 = require("./status-reason");
 const frame_1 = require("./tools/frame");
 const registry_1 = require("./tools/registry");
+const auto_yes_dialog_gate_1 = require("../../lib/polling/auto-yes-dialog-gate");
 var status_reason_2 = require("./status-reason");
 Object.defineProperty(exports, "STATUS_REASON", { enumerable: true, get: function () { return status_reason_2.STATUS_REASON; } });
 /**
@@ -139,7 +140,15 @@ Object.defineProperty(exports, "STATUS_CHECK_LINE_COUNT", { enumerable: true, ge
  */
 function detectSessionStatus(output, cliToolId, lastOutputTimestamp) {
     const frame = (0, frame_1.normalizeFrame)(output);
-    const verdict = (0, registry_1.getToolStatusDetector)(cliToolId).detect(frame, { lastOutputTimestamp });
+    const verdict = (0, registry_1.getToolStatusDetector)(cliToolId).detect(frame, {
+        lastOutputTimestamp,
+        // Issue #2991: the same presence reading Auto-Yes and History use, so an
+        // unvouched numbered list is not `waiting` here either (and therefore
+        // neither `isPromptWaiting` nor a send refusal). Consulted only by tools
+        // that set `requireVouchedPrompt`; `legacy` tools and non-`multiple_choice`
+        // prompts come back `present: true` regardless.
+        isPromptVouched: (prompt) => (0, auto_yes_dialog_gate_1.evaluateDialogPresence)(cliToolId, prompt.promptData?.type, output).present,
+    });
     return {
         status: verdict.status,
         confidence: verdict.confidence,

package/dist/server/src/lib/detection/tools/codex/cli-patterns.js

@@ -155,10 +155,11 @@ exports.CODEX_DIALOG_RULES_VERIFIED_AGAINST = {
  * | `Press space to select or enter to save for next conversation` | `/experimental` | 1st |
  * | `Press space to select or enter to save` | `/experimental` (0.155.1) | 1st |
  * | `left/right group · enter edit shortcut · … · esc close` | `/keymap` | 2nd |
+ * | `enter continue · esc skip` | update offer (0.157.1, Issue #3020) | 2nd |
  *
  * No `/g` (keeps `.test()` stateless) and no nested quantifiers (ReDoS-safe).
  */
-exports.CODEX_DIALOG_FOOTER_PATTERN = /press\s+\S+\s+to\s+\S|esc\s+(?:to\s+)?(?:cancel|close|dismiss|quit|exit|back|go\s+back)/i;
+exports.CODEX_DIALOG_FOOTER_PATTERN = /press\s+\S+\s+to\s+\S|esc\s+(?:to\s+)?(?:cancel|close|dismiss|quit|exit|back|go\s+back|skip)/i;
 const INITIAL_SGR = { bold: false, dim: false, fg: null };
 /**
  * Apply one SGR parameter list to the running attribute state.

package/dist/server/src/lib/detection/tools/opencode-v2/detect.js

@@ -0,0 +1,253 @@
+"use strict";
+/**
+ * OpenCode V2 screen detector — the fallback reader (Issue #2934, Phase 1).
+ *
+ * OpenCode V2's state comes from its server's SSE stream
+ * (`@/lib/hooks/sources/opencode-v2`); this module is what decides when that
+ * stream is not there (a pane launched `--standalone`, a subscription that has
+ * not reattached yet). It reads, in this order:
+ *
+ *  - the approval dialog's button strip (`Allow once   Always allow   Reject`)
+ *    → `waiting` (Issue #2965);
+ *  - the question form's key hints (`↑↓ select  enter submit  esc dismiss`)
+ *    → `waiting` (Issue #2965);
+ *  - a dialog's title row (`Select variant … esc`, the model / variant
+ *    pickers, Commands, Sessions, Select agent) anywhere on the pane
+ *    → `waiting` (Issue #2971);
+ *  - the footer's `esc interrupt` hint → `running`;
+ *  - the completion row (`Build · <model> · 3.5s · 11.2 tok/s`) as the last
+ *    transcript row → `ready` (Issue #2965);
+ *  - the gutter-anchored empty composer (`┃  Ask anything…`) → `ready`;
+ *  - otherwise the footer without that hint (`… 8.6K (1%)  ctrl+p commands`,
+ *    the frame after a turn, whose composer is a bare gutter) → `ready`.
+ *
+ * Both dialogs are drawn INSIDE the composer's `┃` gutter and replace the
+ * footer altogether (measured on 2.0.18, 80x200, 2026-09-29:
+ * `tests/fixtures/opencode-v2-live-2945/permission-required.txt` /
+ * `question.txt`), so before #2965 they reached the floor as `running` /
+ * `default` — an unclassified frame, which is what wrote the "could not parse
+ * it" row into the chat while the structured layer held the very approval.
+ *
+ * v1's opencode detector is deliberately not reused: its dialog rule keys on
+ * v1's wording (`Allow always`, the reverse word order) and would misread v2.
+ *
+ * `detectDialog` (Issue #2984) reads the same three surfaces for the Auto-Yes
+ * gate (`polling/auto-yes-dialog-gate`), measured on 2.0.18 at 80x200
+ * (2026-09-29, `tests/fixtures/opencode-v2-dialogs-2984/`): the approval strip
+ * (`keys` — a typed digit leaves it open), the question form (`numbered`,
+ * `answer_only` — a typed `2` alone submitted `Blue`) and a dialog title
+ * (`keys` — a digit goes into the filter). v2's approvals and questions are
+ * still answered through the agent's own API (#2945); what the gate needs from
+ * this module is the NO — an agent's reply that quotes a `❯ 1. Yes` dialog is
+ * none of the three, so Auto-Yes does not type into the composer for it.
+ *
+ * @module lib/detection/tools/opencode-v2/detect
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.opencodeV2StatusDetector = exports.OPENCODE_V2_PERMISSION_OPTIONS = exports.OPENCODE_V2_TURN_COMPLETE_PATTERN = exports.OPENCODE_V2_QUESTION_PATTERN = exports.OPENCODE_V2_PERMISSION_PATTERN = exports.VERIFIED_AGAINST = void 0;
+exports.endsWithTurnComplete = endsWithTurnComplete;
+const cli_patterns_1 = require("../../cli-patterns");
+const status_reason_1 = require("../../status-reason");
+const run_detection_1 = require("../run-detection");
+const verified_against_1 = require("../verified-against");
+exports.VERIFIED_AGAINST = verified_against_1.OPENCODE_V2_VERIFIED_AGAINST;
+/**
+ * The approval dialog's button strip, on the composer's own `┃` gutter:
+ * `┃   Allow once   Always allow   Reject  ctrl+f fullscreen  ⇆ select  enter con…`
+ * (2.0.18). The gutter anchor keeps the same words reaching the pane inside a
+ * reply from being read as a dialog, as v1's `OPENCODE_PERMISSION_PATTERN`
+ * does; the word order is v2's own (`Always allow`, not v1's `Allow always`).
+ */
+exports.OPENCODE_V2_PERMISSION_PATTERN = /^[^\S\n]*[│┃][^\S\n]*Allow once[^\S\n]{2,}Always allow[^\S\n]{2,}Reject\b/m;
+/**
+ * The question form's key hints, on the composer's gutter:
+ * `┃  ↑↓ select  enter submit  esc dismiss` (2.0.18, below the numbered
+ * choices and `Type your own answer`).
+ */
+exports.OPENCODE_V2_QUESTION_PATTERN = /^[^\S\n]*[│┃][^\S\n]*↑↓ select[^\S\n]+enter submit[^\S\n]+esc dismiss\b/m;
+/**
+ * The row that closes a finished turn: `Build · <model> · 3.5s · 11.2 tok/s`
+ * (2.0.18). Transcript rows carry no gutter; the composer's model bar
+ * (`┃  Build · <model> OpenCode Zen`) does and has no duration, so neither it
+ * nor v1's `▣` row matches. A duration is required — the row without one is not
+ * a completion (the lesson v1's #1893 learned).
+ */
+exports.OPENCODE_V2_TURN_COMPLETE_PATTERN = /^[^\S\n│┃]*[A-Za-z][\w-]*(?: [\w-]+)* · [^\n]+? · \d+(?:\.\d+)?(?:ms|s|m(?: \d+s)?)(?: · [\d.]+ tok\/s)?[^\S\n]*$/;
+/** The approval strip's buttons, in the order it draws them (2.0.18). */
+exports.OPENCODE_V2_PERMISSION_OPTIONS = ['Allow once', 'Always allow', 'Reject'];
+/** A row of the composer's gutter (`┃  …`). The question form is drawn entirely on it. */
+const GUTTER_ROW_PATTERN = /^[^\S\n]*[│┃]/;
+/** One choice of the question form: `┃  1. Red` (2.0.18). */
+const QUESTION_OPTION_ROW_PATTERN = /^[^\S\n]*[│┃][^\S\n]*(\d+)\.[^\S\n]+(\S.*?)[^\S\n]*$/;
+/**
+ * The question form as a dialog (Issue #2984): the choices on the gutter rows
+ * above its key hints, numbered 1..n without a gap. `null` when the hints row
+ * is not in the status window or fewer than two choices can be read.
+ *
+ * `numbered` / `answer_only` because that is what the form does with a digit:
+ * measured on 2.0.18, typing `2` with no Enter submitted `Blue`
+ * (`tests/fixtures/opencode-v2-dialogs-2984/question-answered-by-digit.txt`).
+ */
+function readQuestionDialog(frame) {
+    if (!exports.OPENCODE_V2_QUESTION_PATTERN.test(frame.lastLines))
+        return null;
+    const lines = frame.contentLines;
+    let hints = -1;
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (exports.OPENCODE_V2_QUESTION_PATTERN.test(lines[i])) {
+            hints = i;
+            break;
+        }
+    }
+    if (hints < 0)
+        return null;
+    const options = [];
+    for (let i = hints - 1; i >= 0 && GUTTER_ROW_PATTERN.test(lines[i]); i--) {
+        const match = QUESTION_OPTION_ROW_PATTERN.exec(lines[i]);
+        if (match)
+            options.unshift(`${match[1]}. ${match[2]}`);
+    }
+    if (options.length < 2)
+        return null;
+    if (!options.every((option, index) => option.startsWith(`${index + 1}. `)))
+        return null;
+    return { kind: 'question', options, answerMode: 'numbered', submitMode: 'answer_only' };
+}
+/** Rows below the transcript that are chrome: gutter padding, the model bar, the rule, the footer, the version. */
+function isChromeRow(line) {
+    if (/^[\s│┃╹▀]*$/.test(line))
+        return true;
+    // The composer's model bar: gutter, then `<Agent> · <model> <provider>` with no second `·`.
+    if (/^[^\S\n]*[│┃][^\S\n]*[A-Za-z][\w-]* · [^·\n]+$/.test(line))
+        return true;
+    if (cli_patterns_1.OPENCODE_V2_FOOTER_PATTERN.test(line))
+        return true;
+    return /^\s*\d+\.\d+\.\d+\s*$/.test(line);
+}
+/**
+ * Whether the last transcript row — the first row above the composer's chrome —
+ * is the completion row. Only the LAST row counts: the completion row of an
+ * earlier turn stays on the pane behind the next turn and behind a dialog.
+ */
+function endsWithTurnComplete(frame) {
+    const lines = frame.contentLines;
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (isChromeRow(lines[i]))
+            continue;
+        return exports.OPENCODE_V2_TURN_COMPLETE_PATTERN.test(lines[i]);
+    }
+    return false;
+}
+exports.opencodeV2StatusDetector = (0, run_detection_1.createToolStatusDetector)({
+    tool: 'opencode-v2',
+    verifiedAgainst: exports.VERIFIED_AGAINST,
+    // Issue #2991: every v2 dialog is recognised by `beforePrompt` below, so a
+    // numbered list that reaches the generic parser is text in a reply (the UAT
+    // frame: `❯ 1. Yes / 2. No` quoted in the answer). Unvouched by
+    // `detectDialog`, it is not published as `waiting` — which had left the
+    // session refusing every send with nothing on screen to answer.
+    requireVouchedPrompt: true,
+    // Issue #2965: the two dialogs, ahead of everything. Each is the agent
+    // blocked on a human whatever else is on the pane — the question frame keeps
+    // the previous turn's completion row above it — and ahead of the generic
+    // numbered-list parser too, because the question's `1. Red / 2. Blue` is
+    // driven by ↑↓ + Enter (hence `hasActivePrompt: false` and a reason from
+    // `SELECTION_LIST_REASONS`, which draws the arrow keys instead of offering to
+    // type a number). Issue #2984 measured that a typed digit also commits it,
+    // with no Enter — see `detectDialog` below.
+    beforePrompt(frame) {
+        if (exports.OPENCODE_V2_PERMISSION_PATTERN.test(frame.lastLines)) {
+            return {
+                status: 'waiting',
+                confidence: 'high',
+                reason: status_reason_1.STATUS_REASON.OPENCODE_PERMISSION_PROMPT,
+                hasActivePrompt: false,
+                evidence: 'positive',
+            };
+        }
+        if (exports.OPENCODE_V2_QUESTION_PATTERN.test(frame.lastLines)) {
+            return {
+                status: 'waiting',
+                confidence: 'high',
+                reason: status_reason_1.STATUS_REASON.OPENCODE_SELECTION_LIST,
+                hasActivePrompt: false,
+                evidence: 'positive',
+            };
+        }
+        // Issue #2971: a dialog opened over the composer keeps the footer (and
+        // often the placeholder) on screen, so every rule below read it as `ready`
+        // and `wait` completed a turn that never started. Its title row sits ~150
+        // rows above the bottom of an 80x200 pane, outside `lastLines`, so the
+        // whole frame is read. The reason is v1's (#2112): the same kind of
+        // overlay, driven by ↑↓ + Enter and closed with `esc` — no number answers
+        // it, hence `hasActivePrompt: false`.
+        if ((0, cli_patterns_1.findOpencodeV2DialogTitle)((0, cli_patterns_1.stripAnsi)(frame.raw)) !== null) {
+            return {
+                status: 'waiting',
+                confidence: 'high',
+                reason: status_reason_1.STATUS_REASON.OPENCODE_MODAL_OVERLAY,
+                hasActivePrompt: false,
+                evidence: 'positive',
+            };
+        }
+        return null;
+    },
+    afterThinking(frame) {
+        if ((0, cli_patterns_1.detectThinking)('opencode-v2', frame.lastLines)) {
+            return {
+                status: 'running',
+                confidence: 'high',
+                reason: status_reason_1.STATUS_REASON.THINKING_INDICATOR,
+                hasActivePrompt: false,
+                evidence: 'positive',
+            };
+        }
+        // Issue #2965: the completion row as the last transcript row, with no
+        // `esc interrupt` (ruled out just above) — a finished turn, whether or not
+        // the footer made it into the capture.
+        if (endsWithTurnComplete(frame)) {
+            return {
+                status: 'ready',
+                confidence: 'high',
+                reason: status_reason_1.STATUS_REASON.OPENCODE_RESPONSE_COMPLETE,
+                hasActivePrompt: false,
+                evidence: 'positive',
+            };
+        }
+        // The placeholder against the ANSI-stripped frame with its box drawing
+        // intact (the pattern anchors on the `┃` gutter). The footer is on every
+        // frame, and the running hint was ruled out just above.
+        if (cli_patterns_1.OPENCODE_V2_IDLE_COMPOSER_PATTERN.test((0, cli_patterns_1.stripAnsi)(frame.raw)) ||
+            cli_patterns_1.OPENCODE_V2_FOOTER_PATTERN.test(frame.lastLines)) {
+            return {
+                status: 'ready',
+                confidence: 'high',
+                reason: status_reason_1.STATUS_REASON.INPUT_PROMPT,
+                hasActivePrompt: false,
+                evidence: 'positive',
+            };
+        }
+        return null;
+    },
+    // Issue #2984: the seam the Auto-Yes gate and `respond` read. The same three
+    // rules `beforePrompt` reports `waiting` on, in the same order, so the gate
+    // and the status API agree about which frames carry a dialog.
+    //
+    // The strip and the question form are anchored on the composer's `┃` gutter,
+    // which `stripBoxDrawing` removes: on the spelling the Auto-Yes poller judges
+    // they answer `null` (v1's #1893 precedent). For Auto-Yes `null` and `keys`
+    // both send nothing, and the question form never reaches the gate anyway —
+    // it draws no `❯` for the generic parser to key on.
+    detectDialog(frame) {
+        if (exports.OPENCODE_V2_PERMISSION_PATTERN.test(frame.lastLines)) {
+            return { kind: 'permission', options: exports.OPENCODE_V2_PERMISSION_OPTIONS, answerMode: 'keys' };
+        }
+        const question = readQuestionDialog(frame);
+        if (question !== null)
+            return question;
+        if ((0, cli_patterns_1.findOpencodeV2DialogTitle)((0, cli_patterns_1.stripAnsi)(frame.raw)) !== null) {
+            return { kind: 'picker', options: [], answerMode: 'keys' };
+        }
+        return null;
+    },
+});

package/dist/server/src/lib/detection/tools/opencode-v2/dialog-title.js

@@ -0,0 +1,48 @@
+"use strict";
+/**
+ * OpenCode V2's dialog title row — a pure, dependency-free leaf (Issue #2983).
+ *
+ * Moved out of `cli-patterns.ts` (which re-exports both names) so a client
+ * component can read the same row the detector reads without pulling the
+ * logger and the tool registry into the browser bundle: the chat surface's
+ * dialog card draws v2's model keys only while one of these dialogs is open,
+ * because each of those keys closes the dialog with `Escape` before it is sent.
+ *
+ * @module lib/detection/tools/opencode-v2/dialog-title
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = void 0;
+exports.findOpencodeV2DialogTitle = findOpencodeV2DialogTitle;
+/**
+ * The title row of an OpenCode V2 dialog opened over the composer: the model
+ * picker (`ctrl+x m`), the variant picker it opens next, the Commands palette
+ * (`ctrl+p`), Sessions (`ctrl+x l`) and Select agent (`ctrl+x a`) — Issue #2971.
+ *
+ * Measured on 2.0.18 at 80x200 (2026-09-29,
+ * `tests/fixtures/opencode-v2-live-2971/`): every one of them opens with a row
+ * `   <Title>                                     esc`, the dismiss hint
+ * right-aligned after a wide gap, with no `┃` gutter in front. The row BELOW it
+ * is the filter (`Search`, or whatever was typed into it) and changes; the
+ * title row does not. The footer (`… ctrl+p commands`) stays drawn under every
+ * one of them, which is why the footer alone cannot say the composer is free.
+ *
+ * Not matched: the running footer (`esc interrupt  ctrl+p commands`, `esc` not
+ * last) and the question form's `┃  ↑↓ select  enter submit  esc dismiss`
+ * (gutter, `esc` not last). Match against the ANSI-stripped frame; the title
+ * sits far above the 15-line status window (row 52 of 200), so pass the whole
+ * capture.
+ */
+exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = /^[^\S\n]*[^\s\u2502\u2503\u2579\u2580][^\n]*?[^\S\n]{8,}esc[^\S\n]*$/m;
+/**
+ * The title of the OpenCode V2 dialog open on the pane (`Select variant`), or
+ * `null` when none is (Issue #2971). A send must not type while one is open:
+ * the text lands in the dialog's filter, not in the composer.
+ *
+ * @param text - ANSI-stripped capture of the whole pane
+ */
+function findOpencodeV2DialogTitle(text) {
+    const match = exports.OPENCODE_V2_DIALOG_TITLE_PATTERN.exec(text);
+    if (match === null)
+        return null;
+    return match[0].trim().replace(/\s+esc$/, '');
+}

package/dist/server/src/lib/detection/tools/registry.js

@@ -18,6 +18,7 @@ const detect_3 = require("./codex/detect");
 const detect_4 = require("./command-code/detect");
 const detect_5 = require("./copilot/detect");
 const detect_6 = require("./opencode/detect");
+const detect_7 = require("./opencode-v2/detect");
 const run_detection_1 = require("./run-detection");
 const verified_against_1 = require("./verified-against");
 /**
@@ -43,6 +44,7 @@ const DETECTORS = {
     opencode: detect_6.opencodeStatusDetector,
     antigravity: detect_1.antigravityStatusDetector,
     'command-code': detect_4.commandCodeStatusDetector,
+    'opencode-v2': detect_7.opencodeV2StatusDetector,
     gemini: geminiStatusDetector,
     'vibe-local': vibeLocalStatusDetector,
 };

package/dist/server/src/lib/detection/tools/run-detection.js

@@ -99,6 +99,15 @@ function runToolDetection(spec, frame, context = {}) {
             // and let the chain continue to the tool's running/idle branches.
             promptDetection = { ...promptDetection, isPrompt: false, promptData: undefined };
         }
+        else if (spec.requireVouchedPrompt && context.isPromptVouched?.(promptDetection) === false) {
+            // Issue #2991: a numbered list the tool's own dialog rules do not vouch
+            // for — the agent's reply quoting `❯ 1. Yes / 2. No`. Auto-Yes (#2984)
+            // and History (#2457) already refuse it; publishing `waiting` for it
+            // left the session unanswerable (no dialog to answer) and unwritable (the
+            // send guard refused every message). Neutralised the same way as the
+            // stale block above, so the tool's own branches decide the status.
+            promptDetection = { ...promptDetection, isPrompt: false, promptData: undefined };
+        }
         else {
             return {
                 status: 'waiting',