commandmate 0.43.0 → 0.44.0

package/dist/server/locales/en/worktree.json

@@ -65,6 +65,10 @@
         "systemMessage": "System Message",
         "systemMessageLabel": "System message",
         "openFile": "Open file: {path}",
+        "imageLoading": "Loading image…",
+        "imageUnavailable": "Image unavailable",
+        "openImage": "Open image: {path}",
+        "videoLabel": "Video: {path}",
         "conversationLabel": "Conversation: {preview}",
         "filePathMissing": "That path is not in this worktree"
     },
@@ -491,7 +495,10 @@
         "buttonAriaLabel": "Update CommandMate to v{version}",
         "buttonReleaseAriaLabel": "Open the v{version} release page",
         "buttonUpdating": "Updating…",
-        "statusDialogTitle": "Update status"
+        "statusDialogTitle": "Update status",
+        "pendingLabel": "v{version} coming soon",
+        "pendingDescription": "v{version} is not on npm yet. You can update once it is published there.",
+        "notYetPublished": "The new version is not on npm yet. Please try again in a few minutes."
     },
     "terminal": {
         "historyLabel": "History",
@@ -1097,11 +1104,26 @@
         "close": "Close (Esc)",
         "closeAria": "Close this screen (Esc)"
     },
-    "planApproveKeys": {
-        "toolbarLabel": "Approve this plan",
-        "approve": "Approve plan (Ctrl+A)",
-        "approveAria": "Approve this plan and run it (Ctrl+A)",
-        "note": "Approving runs the plan. Use Esc above to cancel instead."
+    "planReview": {
+        "groupLabel": "Plan review",
+        "commentLabel": "Comment on the plan",
+        "commentPlaceholder": "What should change? (Add comment → Submit review)",
+        "comment": "Add comment",
+        "submit": "Submit review (Ctrl+R)",
+        "approve": "Approve (Ctrl+A)",
+        "cancel": "Cancel (Esc)",
+        "approveConfirmLabel": "Confirm plan approval",
+        "approveConfirmText": "Approving runs the plan. Approve it?",
+        "approveConfirmYes": "Approve and run",
+        "approveConfirmNo": "Not now",
+        "refusal": {
+            "ambiguousAnswer": "Nothing was sent: a bare number or yes / no is not an answer here — the plan review has no numbered options. Approve or cancel, or rephrase it as a comment.",
+            "busy": "Nothing was sent: the plan review's focus is not on the plan. Move it back into the plan in the terminal, then retry.",
+            "nothingToSubmit": "There is no comment to submit. Add a comment first.",
+            "invalidRequest": "That action does not fit this screen. Nothing was sent.",
+            "notActive": "Nothing was sent: no plan review is on screen.",
+            "generic": "Could not send."
+        }
     },
     "selectionKeys": {
         "numbersToolbarLabel": "Option number keys",

package/dist/server/locales/ja/worktree.json

@@ -65,6 +65,10 @@
         "systemMessage": "システムメッセージ",
         "systemMessageLabel": "システムメッセージ",
         "openFile": "ファイルを開く: {path}",
+        "imageLoading": "画像を読み込み中…",
+        "imageUnavailable": "画像を表示できません",
+        "openImage": "画像を開く: {path}",
+        "videoLabel": "動画: {path}",
         "conversationLabel": "会話: {preview}",
         "filePathMissing": "このパスは worktree にありません"
     },
@@ -491,7 +495,10 @@
         "buttonAriaLabel": "CommandMate を v{version} にアップデート",
         "buttonReleaseAriaLabel": "v{version} のリリースページを開く",
         "buttonUpdating": "更新中…",
-        "statusDialogTitle": "アップデートの状態"
+        "statusDialogTitle": "アップデートの状態",
+        "pendingLabel": "v{version} 公開準備中",
+        "pendingDescription": "v{version} は npm への反映待ちです。反映されると更新できるようになります。",
+        "notYetPublished": "npm への反映待ちです。しばらくしてから再度お試しください。"
     },
     "terminal": {
         "historyLabel": "履歴",
@@ -1097,11 +1104,26 @@
         "close": "閉じる (Esc)",
         "closeAria": "この画面を閉じる (Esc)"
     },
-    "planApproveKeys": {
-        "toolbarLabel": "このプランを承認",
-        "approve": "プランを承認 (Ctrl+A)",
-        "approveAria": "このプランを承認して実行する (Ctrl+A)",
-        "note": "承認するとプランが実行されます。やめる場合は上の Esc を押してください。"
+    "planReview": {
+        "groupLabel": "プランのレビュー",
+        "commentLabel": "プランへのコメント",
+        "commentPlaceholder": "直してほしい点を書く（コメントを追加 → レビューを送信）",
+        "comment": "コメントを追加",
+        "submit": "レビューを送信 (Ctrl+R)",
+        "approve": "承認 (Ctrl+A)",
+        "cancel": "取り消し (Esc)",
+        "approveConfirmLabel": "プランの承認の確認",
+        "approveConfirmText": "承認するとプランが実行されます。承認しますか？",
+        "approveConfirmYes": "承認して実行",
+        "approveConfirmNo": "やめる",
+        "refusal": {
+            "ambiguousAnswer": "番号や yes / no だけの入力は送っていません。計画には番号付きの選択肢がありません。承認か取り消しを使うか、コメントとして書き直してください。",
+            "busy": "レビュー画面のフォーカスが本文以外にあるため、何も送っていません。ターミナルで本文にフォーカスを戻してから、もう一度送ってください。",
+            "nothingToSubmit": "送るコメントがありません。先にコメントを追加してください。",
+            "invalidRequest": "この画面では送れない操作です。何も送っていません。",
+            "notActive": "計画のレビュー画面が表示されていないため、何も送っていません。",
+            "generic": "送信できませんでした。"
+        }
     },
     "selectionKeys": {
         "numbersToolbarLabel": "選択肢の番号キー",

package/dist/server/src/config/image-extensions.js

@@ -228,6 +228,7 @@ function validateImageContent(extension, buffer) {
         return {
             valid: false,
             error: `File size exceeds ${exports.IMAGE_MAX_SIZE_BYTES / 1024 / 1024}MB limit`,
+            reason: 'too-large',
         };
     }
     const normalizedExt = normalizeExtension(extension);

package/dist/server/src/lib/auto-yes-poller.js

@@ -64,6 +64,7 @@ const response_checker_1 = require("./polling/response-checker");
 const antigravity_permission_receipts_1 = require("./polling/antigravity-permission-receipts");
 const auto_yes_resolver_1 = require("./polling/auto-yes-resolver");
 const auto_yes_policy_1 = require("./polling/auto-yes-policy");
+const detect_1 = require("./detection/tools/codex/detect");
 const auto_yes_suppression_state_1 = require("./polling/auto-yes-suppression-state");
 const auto_yes_dialog_gate_1 = require("./polling/auto-yes-dialog-gate");
 const task_transition_service_1 = require("./tasks/task-transition-service");
@@ -490,6 +491,27 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
             });
             return 'no_answer';
         }
+        // 3.2. Issue #3062: codex's `/model` picker (both stages) is not ours to
+        // answer. A digit there is an immediate decision, so the base rules'
+        // default would choose the model and effort for the operator. Judged by the
+        // picker's own footer, not by `kind: picker`, which the hooks screens share.
+        // The tool's `detectPrompt` still reports the prompt, so `/prompt-response`
+        // (the human's answer) is unaffected. Reuses `unclassified-frame`: the tool
+        // recognised the frame and deliberately declined it.
+        if (cliToolId === 'codex' && (0, detect_1.isCodexModelPickerFrame)(cleanOutput)) {
+            (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, {
+                reason: 'unclassified-frame',
+                mode: null,
+                promptType: promptDetection.promptData.type,
+            });
+            warnOncePerFrame(pollerState, `${frameKey}\u0000codex-model-picker`, 'poller:auto-yes-skipped-model-picker', {
+                worktreeId,
+                cliToolId,
+                instanceId,
+                promptType: promptDetection.promptData.type,
+            });
+            return 'no_answer';
+        }
         // 3.5. Issue #1928 (§4 D1 decision 4): the generic numbered-list inference is
         // not enough to send an answer. The detection above judges the ROWS, and the
         // rows of an agent's own reply can be indistinguishable from a dialog's --

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_STARTING_WINDOW_MS = 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,7 @@ 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`. */
@@ -144,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.
@@ -301,15 +312,21 @@ class CommandCodeTool extends base_1.BaseCLITool {
      *
      * @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;
                 }
@@ -317,6 +334,14 @@ class CommandCodeTool extends base_1.BaseCLITool {
             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);

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

@@ -8,6 +8,9 @@ exports.findOpencodeV2DialogTitle = exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = e
 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;
@@ -229,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
@@ -1470,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.

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)));
+}

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

@@ -0,0 +1,75 @@
+"use strict";
+/**
+ * Which part of Command Code's plan review overlay has the keyboard
+ * (Issue #3125).
+ *
+ * The detector already says THAT the overlay is up
+ * (`command_code_plan_review`, see `detect.ts`). Answering it needs one more
+ * fact, because the same keys mean different things depending on where the
+ * focus is — measured on 1.58.0 (`tests/fixtures/command-code-plan-review-2763/`)
+ * and unchanged in the 1.74.0 rows #3059 observed
+ * (`tests/fixtures/command-code-plan-review-3125/`):
+ *
+ * | phase            | hint bar (last content row)                  | `Enter` does            |
+ * |------------------|----------------------------------------------|-------------------------|
+ * | `body`           | `type + enter to comment · …`                | opens / pins a comment  |
+ * | `comment-box`    | `enter to pin · esc discard`                 | pins what is typed      |
+ * | `action-focus`   | `↑/↓ choose · enter to run` (a `❯` on a row) | RUNS the focused action |
+ * | `approve-choice` | `←/→ choose · enter confirm · esc back`      | confirms the approval   |
+ *
+ * The body cursor itself is drawn by background colour alone and cannot be read
+ * off a plain capture; the hint bar and the `❯` can, which is all this needs.
+ *
+ * Browser-safe and pure, like `selection-shape.ts` it builds on.
+ *
+ * @module lib/detection/tools/command-code/plan-review-state
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readCommandCodePlanReviewState = readCommandCodePlanReviewState;
+const ansi_1 = require("../../ansi");
+const selection_shape_1 = require("../../selection-shape");
+/** Rows read from the end of the frame — the same 15 the detector reads. */
+const TAIL_CONTENT_ROWS = 15;
+const BODY_HINT = /^\s*type \+ enter to comment\b/i;
+const COMMENT_BOX_HINT = /^\s*enter to pin\s*·\s*esc discard\s*$/i;
+const ACTION_FOCUS_HINT = /^\s*↑\/↓ choose\s*·\s*enter to run\s*$/i;
+const FOCUSED_ACTION_ROW = /^\s*❯ +(?:Submit review\b|Approve\s+ctrl\+a\b|Cancel\s+esc\b)/im;
+const PENDING_BADGE = /^\s*REVIEW\s+(\d+)\s+pending comments?\b/im;
+const APPROVE_WITH_COMMENTS_SELECTED = /\(•\)\s+with\s+\d+\s+comments?\s+as\s+notes/i;
+/**
+ * Read the plan review overlay's focus off a capture.
+ *
+ * @param frame - a raw `capture-pane` frame, ANSI intact or stripped
+ * @returns null when the overlay is not at the bottom of this frame
+ */
+function readCommandCodePlanReviewState(frame) {
+    if (!frame)
+        return null;
+    const rows = (0, ansi_1.stripAnsi)(frame.replace(/\r\n/g, '\n'))
+        .split('\n')
+        .filter((row) => row.trim() !== '')
+        .slice(-TAIL_CONTENT_ROWS);
+    if (rows.length === 0)
+        return null;
+    const tail = rows.join('\n');
+    const pendingMatch = PENDING_BADGE.exec(tail);
+    const pendingComments = pendingMatch ? Number(pendingMatch[1]) : 0;
+    if ((0, selection_shape_1.isCommandCodePlanApproveChoice)(tail)) {
+        return {
+            phase: 'approve-choice',
+            pendingComments,
+            approveChoice: APPROVE_WITH_COMMENTS_SELECTED.test(tail) ? 'with-comments' : 'discard-comments',
+        };
+    }
+    if (!(0, selection_shape_1.hasCommandCodePlanReviewFooterAtBottom)(tail))
+        return null;
+    const hint = rows[rows.length - 1];
+    let phase = 'unknown';
+    if (FOCUSED_ACTION_ROW.test(tail) || ACTION_FOCUS_HINT.test(hint))
+        phase = 'action-focus';
+    else if (COMMENT_BOX_HINT.test(hint))
+        phase = 'comment-box';
+    else if (BODY_HINT.test(hint))
+        phase = 'body';
+    return { phase, pendingComments, approveChoice: null };
+}