commandmate 0.42.2 → 0.44.0

package/dist/server/src/lib/cmate-cli-tool-parser.js

@@ -16,9 +16,12 @@
  * - resolveScheduleCommandOptions(): CMATE.md row -> executor options (Issue #2044)
  * - TOOLS_WITH_MODEL_SUPPORT: Set of tools supporting --model in CMATE.md
  * - TOOLS_WITH_RUN_OPTIONS: Set of tools whose column accepts a flag list
+ * - TOOLS_WITH_VARIANT_ON_MODEL: tools whose variant rides on the model (Issue #2982)
+ * - validateVariantHasModel(): refuse a model-less variant for those tools (Issue #2982)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPENCODE_COLUMN_SYNTAX = exports.TOOLS_WITH_RUN_OPTIONS = exports.TOOLS_WITH_MODEL_SUPPORT = void 0;
+exports.OPENCODE_V2_COLUMN_SYNTAX = exports.OPENCODE_COLUMN_SYNTAX = exports.TOOLS_WITH_VARIANT_ON_MODEL = exports.TOOLS_WITH_RUN_OPTIONS = exports.TOOLS_WITH_MODEL_SUPPORT = void 0;
+exports.validateVariantHasModel = validateVariantHasModel;
 exports.tokenizeCliToolColumn = tokenizeCliToolColumn;
 exports.parseCliToolColumn = parseCliToolColumn;
 exports.validateCopilotModelName = validateCopilotModelName;
@@ -57,8 +60,14 @@ const opencode_constants_1 = require("../config/opencode-constants");
  * format `opencode run --help` documents for `-m, --model` (measured on
  * opencode 1.18.21). It is not prefixed with `ollama/` — see
  * `buildCliArgs()` for why that prefix went away.
+ *
+ * ## `opencode-v2` (Issue #2982)
+ *
+ * `opencode2 run -m` takes the same `provider/model` value (plus an optional
+ * `#variant`, see {@link TOOLS_WITH_VARIANT_ON_MODEL}), and the executor's
+ * `opencode-v2` case has built `-m` since #2974.
  */
-exports.TOOLS_WITH_MODEL_SUPPORT = new Set(['copilot', 'opencode']);
+exports.TOOLS_WITH_MODEL_SUPPORT = new Set(['copilot', 'opencode', 'opencode-v2']);
 /**
  * CLI Tools whose CMATE.md column is a **flag list** rather than one fixed shape
  * (Issue #2044).
@@ -73,8 +82,28 @@ exports.TOOLS_WITH_MODEL_SUPPORT = new Set(['copilot', 'opencode']);
  * CommandMate can drive (`--agent`, `--variant`, `-c`, `--title`), and a
  * schedule that wants `--agent plan --variant high` cannot say so in three
  * tokens. Membership here is what {@link parseCliToolColumn} branches on.
+ *
+ * Issue #2982: `opencode-v2` joins with the same five column flags. Its
+ * `opencode2 run` has `-m`, `--agent`, `-c` and `--title` with v1's meaning;
+ * `--variant` is the one difference, see {@link TOOLS_WITH_VARIANT_ON_MODEL}.
  */
-exports.TOOLS_WITH_RUN_OPTIONS = new Set(['opencode']);
+exports.TOOLS_WITH_RUN_OPTIONS = new Set(['opencode', 'opencode-v2']);
+/**
+ * Tools whose CLI has no `--variant` flag and takes the variant as a suffix of
+ * the model instead: `-m provider/model#variant` (Issue #2982).
+ *
+ * `opencode2 run` (2.0.18, measured in #2974) answers `--variant` with
+ * "Unrecognized flag" and exit 1. The column still spells the variant as
+ * `--variant <name>` — the same grammar, dialog field and writer order as v1 —
+ * and `claude-executor.ts` composes `model#variant`. Two consequences are
+ * enforced by {@link validateVariantHasModel}:
+ *
+ * - a variant **without a model** has nothing to ride on, and is an error
+ *   rather than a silently dropped option;
+ * - `#` in the model itself is not a way around it: `MODEL_NAME_PATTERN`
+ *   already refuses `#`, so `--model x#high` is rejected as an invalid model.
+ */
+exports.TOOLS_WITH_VARIANT_ON_MODEL = new Set(['opencode-v2']);
 /**
  * The opencode column grammar, as one line, for error messages.
  *
@@ -82,6 +111,28 @@ exports.TOOLS_WITH_RUN_OPTIONS = new Set(['opencode']);
  * the flags the loop accepts are edited together.
  */
 exports.OPENCODE_COLUMN_SYNTAX = 'opencode [--model <provider/model>] [--agent <name>] [--variant <name>] [--continue] [--title <text>]';
+/**
+ * The opencode-v2 column grammar, as one line, for error messages (Issue #2982).
+ *
+ * Same flags as {@link OPENCODE_COLUMN_SYNTAX}; `--variant` is nested inside
+ * the `--model` bracket because it is only valid alongside a model.
+ */
+exports.OPENCODE_V2_COLUMN_SYNTAX = 'opencode-v2 [--model <provider/model> [--variant <name>]] [--agent <name>] [--continue] [--title <text>]';
+/**
+ * Error for a variant given without a model, for the tools in
+ * {@link TOOLS_WITH_VARIANT_ON_MODEL} (Issue #2982). Shared by the column
+ * parser and `cmate-writer.validateScheduleInput()` so the file and the
+ * form refuse the same row with the same words.
+ *
+ * @returns The error message, or undefined when the combination is fine
+ */
+function validateVariantHasModel(cliToolId, model, variant) {
+    if (!exports.TOOLS_WITH_VARIANT_ON_MODEL.has(cliToolId))
+        return undefined;
+    if (!variant?.trim() || model?.trim())
+        return undefined;
+    return `${cliToolId} option "--variant" needs "--model" (sent as -m <provider/model>#<variant>)`;
+}
 // =============================================================================
 // Parse Functions
 // =============================================================================
@@ -154,7 +205,8 @@ function tokenizeCliToolColumn(raw) {
  * - **a missing value** — `--agent --title x` would make `--title` the agent
  *   name, and a value starting with `-` is the DR4-001 injection shape anyway.
  *
- * @param cliToolId - Always `opencode` today; echoed into error messages
+ * @param cliToolId - `opencode` or `opencode-v2` (Issue #2982); echoed into
+ *   error messages and picks the syntax hint
  * @param tokens - Tokens after the tool id
  * @returns The parsed options, or an error
  */
@@ -218,10 +270,15 @@ function parseOpencodeRunFlags(cliToolId, tokens) {
                 parsed.continueSession = true;
                 break;
             }
-            default:
-                return { cliToolId, error: `${cliToolId} only supports: ${exports.OPENCODE_COLUMN_SYNTAX}` };
+            default: {
+                const syntax = cliToolId === 'opencode-v2' ? exports.OPENCODE_V2_COLUMN_SYNTAX : exports.OPENCODE_COLUMN_SYNTAX;
+                return { cliToolId, error: `${cliToolId} only supports: ${syntax}` };
+            }
         }
     }
+    const variantError = validateVariantHasModel(cliToolId, parsed.model, parsed.variant);
+    if (variantError)
+        return { cliToolId, error: variantError };
     return parsed;
 }
 /**
@@ -508,7 +565,8 @@ function parseAndValidateCliToolColumn(raw) {
  * {@link TOOLS_WITH_MODEL_SUPPORT} for the model, exactly as that line did, so
  * the two agree about which tools take one; the run options are additionally
  * gated on {@link TOOLS_WITH_RUN_OPTIONS} so a future tool cannot inherit
- * opencode's flags by accident.
+ * opencode's flags by accident. For `opencode-v2` (Issue #2982) the variant is
+ * passed on as-is; the executor folds it into `-m model#variant`.
  *
  * Living here rather than in `job-executor.ts` is the point: the column's
  * grammar is this module's business, and a scheduler that re-states any part of

package/dist/server/src/lib/cmate-parser.js

@@ -206,6 +206,12 @@ function parseSchedulesSection(rows) {
             logger.warn('parse:invalid-cli-tool', { name: sanitizedName, cliToolId: resolvedCliToolId });
             continue;
         }
+        // Issue #2934: registered but not schedulable (SCHEDULE_UNSUPPORTED_CLI_TOOLS,
+        // empty since #2974). Skipped like an unknown tool, so no run is built for it.
+        if (!(0, schedule_config_1.isScheduleSupportedCliTool)(resolvedCliToolId)) {
+            logger.warn('parse:unsupported-cli-tool', { name: sanitizedName, cliToolId: resolvedCliToolId });
+            continue;
+        }
         const defaultPermission = schedule_config_1.DEFAULT_PERMISSIONS[resolvedCliToolId] ?? '';
         let permission = permissionStr?.trim() || defaultPermission;
         // Validate permission against allowed values
@@ -237,6 +243,12 @@ function parseSchedulesSection(rows) {
             case 'command-code':
                 allowedValues = schedule_config_1.COMMAND_CODE_SCHEDULE_PERMISSIONS;
                 break;
+            // Issue #2974: `default` (no flag) / `auto` (`--auto`). An empty cell
+            // resolves to `default`, so an `ask` rule fails the run rather than being
+            // approved unattended.
+            case 'opencode-v2':
+                allowedValues = schedule_config_1.OPENCODE_V2_PERMISSIONS;
+                break;
             case 'gemini':
             case 'vibe-local':
             case 'opencode':

package/dist/server/src/lib/cmate-validator.js

@@ -225,6 +225,16 @@ function validateSchedulesSection(rows) {
                 field: 'cliTool',
             });
         }
+        // Issue #2934: a registered tool that cannot be scheduled
+        // (SCHEDULE_UNSUPPORTED_CLI_TOOLS, empty since #2974). The parser skips the
+        // same rows.
+        if (parsed && (0, types_1.isCliToolType)(parsed.cliToolId) && !(0, schedule_config_1.isScheduleSupportedCliTool)(parsed.cliToolId)) {
+            errors.push({
+                row: i,
+                message: `Row ${i + 1}: CLI Tool "${parsed.cliToolId}" is not supported in schedules yet`,
+                field: 'cliTool',
+            });
+        }
         // Validate permission (6th column)
         // Empty/missing permission is allowed -- parser applies default per CLI tool
         const permissionStr = row[5];
@@ -245,7 +255,9 @@ function validateSchedulesSection(rows) {
                     : cliToolId === 'copilot' ? schedule_config_1.COPILOT_PERMISSIONS
                         : cliToolId === 'antigravity' ? schedule_config_1.ANTIGRAVITY_PERMISSIONS
                             : cliToolId === 'command-code' ? schedule_config_1.COMMAND_CODE_SCHEDULE_PERMISSIONS
-                                : [];
+                                // Issue #2974: `default` / `auto`, the parser's and the dialog's list.
+                                : cliToolId === 'opencode-v2' ? schedule_config_1.OPENCODE_V2_PERMISSIONS
+                                    : [];
             if (!allowedValues.includes(trimmedPermission)) {
                 errors.push({
                     row: i,

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

@@ -4,10 +4,13 @@
  * 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.resolveClaudeTrustDialogKeys = resolveClaudeTrustDialogKeys;
+exports.isClaudeTrustDialogOpen = isClaudeTrustDialogOpen;
+exports.isShellPaneCommand = isShellPaneCommand;
 exports.isCodexPromptReady = isCodexPromptReady;
 exports.getCodexActiveDialog = getCodexActiveDialog;
 exports.getCodexLifecycleDialog = getCodexLifecycleDialog;
@@ -17,6 +20,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;
@@ -228,6 +232,86 @@ function findClaudeChromeStart(lines) {
  * tmux padding or other output. (SF-001)
  */
 exports.CLAUDE_TRUST_DIALOG_PATTERN = /Yes, I trust this folder/m;
+/** The option row of the trust dialog's cursor: `❯` (or legacy `>`) after the dialog's left padding. */
+const CLAUDE_TRUST_CURSOR_ROW_PATTERN = /^\s*[>❯]\s+\S/;
+/** How far the cursor row may sit from the `Yes, I trust this folder` row (the dialog has two options). */
+const CLAUDE_TRUST_MAX_CURSOR_DISTANCE = 3;
+/**
+ * Keys that answer Claude Code's folder-trust dialog with "Yes", or null when
+ * no answerable dialog is on screen (Issue #3078).
+ *
+ * The dialog comes in two layouts, and Enter alone is only right for one:
+ *
+ *   - default Yes (Issue #201 era, `tests/unit/lib/claude-session.test.ts`):
+ *     ` ❯ 1. Yes, I trust this folder` / `   2. No, exit` — Enter confirms Yes.
+ *   - default No (2.1.259 `tests/fixtures/chat-dialog-card-2254/claude-trust-2-1-259.txt`,
+ *     2.1.287 with a permission allow-list
+ *     `tests/fixtures/claude-trust-dialog-3078/allowlist-default-no-2-1-287.txt`):
+ *     ` ❯ No, exit` / `   Yes, I trust this folder` — Enter EXITS Claude Code.
+ *
+ * So the answer is read off the screen: the distance from the cursor row to the
+ * Yes row becomes that many `Up`/`Down` presses, then `Enter`. Only the last
+ * dialog in the capture counts, and a dialog followed by Claude's input-box
+ * separator is history in the scrollback, not an open dialog.
+ *
+ * @param output - ANSI-stripped pane output
+ * @returns tmux key names ending in `Enter` (just `['Enter']` when the cursor is
+ *   already on Yes), or null when no open dialog / no readable cursor row
+ */
+function resolveClaudeTrustDialogKeys(output) {
+    const lines = output.split('\n');
+    const yesIndex = findOpenClaudeTrustYesRow(lines);
+    if (yesIndex === -1)
+        return null;
+    for (let distance = 0; distance <= CLAUDE_TRUST_MAX_CURSOR_DISTANCE; distance++) {
+        for (const direction of distance === 0 ? [0] : [-1, 1]) {
+            const index = yesIndex + direction * distance;
+            if (index < 0 || index >= lines.length)
+                continue;
+            if (!CLAUDE_TRUST_CURSOR_ROW_PATTERN.test(lines[index]))
+                continue;
+            // Cursor above Yes → move Down; below → move Up.
+            const key = direction < 0 ? 'Down' : 'Up';
+            return [...Array(distance).fill(key), 'Enter'];
+        }
+    }
+    return null;
+}
+/**
+ * Whether Claude Code's folder-trust dialog is the open screen (Issue #3078).
+ *
+ * The dialog's cursor row (` ❯ No, exit`) has the prompt glyph, so the start
+ * wait asks this before CLAUDE_PROMPT_PATTERN rather than reading the dialog as
+ * a ready prompt.
+ *
+ * @param output - ANSI-stripped pane output
+ */
+function isClaudeTrustDialogOpen(output) {
+    return findOpenClaudeTrustYesRow(output.split('\n')) !== -1;
+}
+/** `#{pane_current_command}` values of an interactive shell, with tmux's `-` login prefix removed. */
+const SHELL_PANE_COMMANDS = new Set(['sh', 'bash', 'zsh', 'fish', 'dash', 'ksh', 'tcsh', 'csh']);
+/**
+ * Whether a pane's foreground command is a shell rather than an agent
+ * (Issue #3089). Claude Code shows up as `claude`, `node` or its version
+ * string (`2.1.287`), never as one of these, so a shell here after the agent
+ * was seen running means the agent has exited.
+ *
+ * @param command - `#{pane_current_command}` of the pane
+ */
+function isShellPaneCommand(command) {
+    return SHELL_PANE_COMMANDS.has(command.trim().replace(/^-/, ''));
+}
+/** Row of the last `Yes, I trust this folder`, or -1 when absent or already answered. */
+function findOpenClaudeTrustYesRow(lines) {
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (!exports.CLAUDE_TRUST_DIALOG_PATTERN.test(lines[i]))
+            continue;
+        // Claude's input box (separator rows) drawn below it: the dialog is scrollback.
+        return lines.slice(i + 1).some((line) => exports.CLAUDE_SEPARATOR_PATTERN.test(line)) ? -1 : i;
+    }
+    return -1;
+}
 /**
  * Codex prompt pattern
  * T1.2: Improved to detect empty prompts as well
@@ -1469,12 +1553,22 @@ exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = /Enter\s+to\s+set\s+as\s+default\b
  *   "Enter to set as default · s to use this session only · Esc to cancel"
  *     (/model command footer as of Claude Code v2.1.218 — Issue #1495)
  *
+ *   "←/→ to adjust · Enter to confirm · s for this session only · Esc to cancel"
+ *     (/effort slider footer as of Claude Code v2.1.257 — Issue #3052; before
+ *      2.1.257 it was "Enter to confirm · Esc to cancel")
+ *
+ * The /effort branch keys on "Enter to confirm · s for this session only" rather
+ * than "←/→ to adjust": the `s` hint is unique to the pickers (the trust dialog's
+ * "Enter to confirm · Esc to cancel" and approval dialogs never carry it), and
+ * keeping the match under the `Enter to` prefix leaves the pattern a single
+ * linear alternation. Linear, no nested quantifiers — ReDoS safe.
+ *
  * The "set as default" branch lets status-detector classify the `/model` overlay
  * as a Claude selection list (NavigationButtons + ESC hatch, hasActivePrompt=false)
  * once detectPrompt() no longer reports it as a prompt (see
  * CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN).
  */
-exports.CLAUDE_SELECTION_LIST_FOOTER = /Enter\s+to\s+(?:select\s+.*to\s+navigate|confirm\s+·\s+Esc|set\s+as\s+default)/;
+exports.CLAUDE_SELECTION_LIST_FOOTER = /Enter\s+to\s+(?:select\s+.*to\s+navigate|confirm\s+·\s+(?:Esc|s\s+for\s+this\s+session\s+only)|set\s+as\s+default)/;
 /**
  * OpenCode TUI separator pattern (Issue #379)
  * Matches lines composed entirely of box-drawing / TUI decoration characters.
@@ -1498,6 +1592,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 +2825,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 +2946,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/codex/detect.js

@@ -16,12 +16,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.codexStatusDetector = exports.VERIFIED_AGAINST = void 0;
 exports.isCodexStalePrompt = isCodexStalePrompt;
+exports.isCodexModelPickerFrame = isCodexModelPickerFrame;
 const cli_patterns_1 = require("../../cli-patterns");
 const prompt_detector_1 = require("../../prompt-detector");
 const status_reason_1 = require("../../status-reason");
 const cli_patterns_2 = require("./cli-patterns");
 const prompt_1 = require("./prompt");
 const frame_1 = require("../frame");
+const dialog_block_1 = require("../dialog-block");
 const run_detection_1 = require("../run-detection");
 const verified_against_1 = require("../verified-against");
 const thinking_constants_1 = require("../../../../config/thinking-constants");
@@ -463,3 +465,27 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         return null;
     },
 });
+/**
+ * Issue #3062: is this frame codex's `/model` picker (either stage)?
+ *
+ * Auto-Yes must not answer it: the digit is an immediate decision, so the
+ * poller would pick the model and the reasoning effort for the operator. It is
+ * judged by the picker's own footer row (`enter select · esc back`, `enter
+ * default · s session · esc back`) rather than by `detectDialog`'s `picker`
+ * kind, which also covers the hooks list/detail screens whose Auto-Yes
+ * behaviour is unchanged. The footer must sit under the option block of a frame
+ * `detectDialog` vouches for, so the same words quoted in a reply do not count.
+ * `/prompt-response` does not call this and keeps accepting an answer.
+ *
+ * @param cleanOutput - The capture Auto-Yes judged (ANSI and box drawing stripped)
+ */
+function isCodexModelPickerFrame(cleanOutput) {
+    const frame = (0, frame_1.normalizeFrame)(cleanOutput);
+    if (!exports.codexStatusDetector.detectDialog(frame))
+        return false;
+    const contentEnd = findCodexContentEnd(frame.contentLines);
+    const block = (0, dialog_block_1.findNumberedOptionBlock)((0, cli_patterns_1.stripBoxDrawing)(frame.clean).split('\n'), contentEnd);
+    return (block !== null &&
+        (cli_patterns_1.CODEX_PICKER_FOOTER_PATTERN.test(block.footer) ||
+            cli_patterns_1.CODEX_EFFORT_PICKER_FOOTER_PATTERN.test(block.footer)));
+}