commandmate 0.40.1 → 0.41.0

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

@@ -61,6 +61,7 @@ exports.stopAutoYesPollingByWorktree = stopAutoYesPollingByWorktree;
 exports.isAnyPollerActiveForWorktree = isAnyPollerActiveForWorktree;
 const cli_session_1 = require("./session/cli-session");
 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 auto_yes_suppression_state_1 = require("./polling/auto-yes-suppression-state");
@@ -82,6 +83,16 @@ const auto_yes_state_1 = require("./auto-yes-state");
 /** In-memory storage for poller states (globalThis for hot reload persistence) */
 const autoYesPollerStates = globalThis.__autoYesPollerStates ??
     (globalThis.__autoYesPollerStates = new Map());
+/**
+ * When `antigravity-autoyes-withheld-no-hook-receipt` was last logged, per
+ * compositeKey (Issue #2857). The poller re-reads a static pane every 2s, so the
+ * line is limited to one per {@link WITHHELD_NO_RECEIPT_LOG_INTERVAL_MS} per
+ * instance. globalThis for the same reason as the poller states above.
+ */
+const withheldNoReceiptLoggedAt = globalThis.__autoYesWithheldNoReceiptLoggedAt ??
+    (globalThis.__autoYesWithheldNoReceiptLoggedAt = new Map());
+/** Least gap between two `antigravity-autoyes-withheld-no-hook-receipt` lines for one instance. */
+const WITHHELD_NO_RECEIPT_LOG_INTERVAL_MS = 60_000;
 // =============================================================================
 // Poller State Accessors (compositeKey-based)
 // =============================================================================
@@ -108,6 +119,7 @@ function getActivePollerCount() {
 function clearAllPollerStates() {
     stopAllAutoYesPolling();
     autoYesPollerStates.clear();
+    withheldNoReceiptLoggedAt.clear();
 }
 /**
  * Get the last server response timestamp for a composite key.
@@ -284,6 +296,50 @@ function processStopConditionDelta(compositeKey, pollerState, cleanOutput) {
     }
     return false;
 }
+/**
+ * Say, once a minute, that Auto-Yes left an agy dialog alone for want of a hook
+ * receipt (Issue #2857).
+ *
+ * `detectPromptOnCleanFrame` hands a frame the receipt gate (#2849) withholds
+ * back as an ordinary `isPrompt: false`, so the poller cannot tell "no dialog on
+ * the pane" from "a dialog agy never asked us about" by looking at the result.
+ * The gate is the ONLY thing `receiptScope` changes, so the same frame read
+ * without it answering a prompt is exactly the withheld case. That second
+ * reading is taken only after the cheap tests: no receipt for this instance in
+ * the window (with one, the gate let the frame through and a no-prompt result is
+ * a real one) and no line for it in the last minute.
+ *
+ * Why it is worth a line: a machine whose `~/.gemini/config/hooks.json` points at
+ * another server (#2622) never sends us the question, and every real dialog then
+ * waits for a human with no sign of why. The line names the file to look at.
+ * The response-checker's own `antigravity-dialog-no-recent-receipt` stays at
+ * debug — it prints on every tick the same pane is read again.
+ *
+ * @param compositeKey - The instance's key, for the once-a-minute limit
+ * @param readWithoutGate - The same frame read without `receiptScope`
+ */
+function logIfWithheldForWantOfReceipt(worktreeId, instanceId, compositeKey, readWithoutGate) {
+    if ((0, antigravity_permission_receipts_1.hasRecentAntigravityPermissionReceipt)(worktreeId, 'antigravity', instanceId))
+        return;
+    const now = Date.now();
+    const lastLoggedAt = withheldNoReceiptLoggedAt.get(compositeKey);
+    if (lastLoggedAt !== undefined && now - lastLoggedAt < WITHHELD_NO_RECEIPT_LOG_INTERVAL_MS)
+        return;
+    const ungated = readWithoutGate();
+    if (!ungated.isPrompt || !ungated.promptData)
+        return;
+    for (const [key, loggedAt] of withheldNoReceiptLoggedAt) {
+        if (now - loggedAt >= WITHHELD_NO_RECEIPT_LOG_INTERVAL_MS)
+            withheldNoReceiptLoggedAt.delete(key);
+    }
+    withheldNoReceiptLoggedAt.set(compositeKey, now);
+    logger.info('antigravity-autoyes-withheld-no-hook-receipt', {
+        worktreeId,
+        instanceId: instanceId ?? 'antigravity',
+        windowMs: antigravity_permission_receipts_1.ANTIGRAVITY_PERMISSION_RECEIPT_WINDOW_MS,
+        hint: 'hook の受信記録が直近に無いため Auto-Yes は答えなかった。~/.gemini/config/hooks.json の向き先（#2622）を確認',
+    });
+}
 /**
  * Detect prompt in terminal output, resolve auto-answer, and send response.
  *
@@ -330,10 +386,25 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // the same tick's raw capture reached it. `precomputedLines` stays the split
         // of `cleanOutput` — the stop-condition delta and every other tool's reading
         // are measured on that string and must not move.
-        const promptDetection = (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput);
+        //
+        // Issue #2857 adds the fifth, and this is the only caller that passes it: the
+        // one that ANSWERS the frame. For agy the frame then reads as a prompt only
+        // when agy asked CommandMate about a tool call for this instance in the last
+        // few seconds (#2849) — a dialog it never asked about is a reply quoting one
+        // (#2845, #2851) or a menu the user opened, and neither is ours to answer.
+        // The status API, the response poller's `prompt` row and the notification
+        // still call without it, so a real dialog stays visible to a human on a
+        // machine whose hook does not reach us. The price is that Auto-Yes leaves
+        // such a machine's dialogs alone, which is why `logIfWithheldForWantOfReceipt`
+        // says so.
+        const receiptScope = { worktreeId, instanceId };
+        const promptDetection = (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput, receiptScope);
         if (!promptDetection.isPrompt || !promptDetection.promptData) {
             pollerState.lastAnsweredPromptKey = null;
             pollerState.lastAnsweredAt = null;
+            if (cliToolId === 'antigravity' && !promptDetection.isPrompt) {
+                logIfWithheldForWantOfReceipt(worktreeId, instanceId, compositeKey, () => (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput));
+            }
             return 'no_prompt';
         }
         // 2. Check for duplicate prompt (Issue #306)

package/dist/server/src/lib/db/chat-db.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RELAY_SYSTEM_REQUEST_ID_PREFIX = exports.RELAY_REQUEST_ID_PREFIX = exports.MODEL_CHANGE_REQUEST_ID_PREFIX = exports.USER_TURN_CANDIDATE_LIMIT = exports.ACTIVE_FILTER = void 0;
 exports.getLastAssistantMessageAt = getLastAssistantMessageAt;
+exports.getLastMessageAtByInstance = getLastMessageAtByInstance;
 exports.createMessage = createMessage;
 exports.updateMessageContent = updateMessageContent;
 exports.getMessages = getMessages;
@@ -85,6 +86,43 @@ function getLastAssistantMessageAt(db, worktreeId) {
     }
     return new Date(row.last_assistant_message_at);
 }
+/**
+ * Latest message time per worktree and agent instance (Issue #2838).
+ *
+ * The sidebar's session rows need a time of their own: `worktrees.updated_at`
+ * moves on a message from ANY instance, so every row of one worktree used to
+ * share it. One `GROUP BY` for the whole server — the list polls it, so a
+ * query per worktree would multiply every poll.
+ *
+ * A row belongs to `COALESCE(instance_id, cli_tool_id, 'claude')`, the instance
+ * `getMessages` reads it as, so pre-#868 rows (`instance_id IS NULL`) count
+ * toward the primary instance. Role and `archived` are not filtered, matching
+ * what moves `updated_at` (`createMessage` touches it for every row).
+ *
+ * @returns worktreeId → (instanceId → latest message time); worktrees without
+ *   messages are absent
+ */
+function getLastMessageAtByInstance(db) {
+    const rows = db.prepare(`
+    SELECT worktree_id,
+           COALESCE(instance_id, cli_tool_id, 'claude') AS resolved_instance_id,
+           MAX(timestamp) AS last_message_at
+    FROM chat_messages
+    GROUP BY worktree_id, resolved_instance_id
+  `).all();
+    const result = new Map();
+    for (const row of rows) {
+        if (row.last_message_at === null)
+            continue;
+        let byInstance = result.get(row.worktree_id);
+        if (!byInstance) {
+            byInstance = {};
+            result.set(row.worktree_id, byInstance);
+        }
+        byInstance[row.resolved_instance_id] = new Date(row.last_message_at);
+    }
+    return result;
+}
 /**
  * Create a new chat message
  */

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

@@ -2272,6 +2272,13 @@ exports.ANTIGRAVITY_SURVEY_PATTERN = /^\s*\[1\]\s*Good\s+\[2\]\s*Fine\s+\[3\]\s*
  * scrollback above a newer one is never the one read. Returns null when the
  * frame has no footer at all.
  *
+ * Also null when agy's input box is drawn BELOW that footer (Issue #2845): agy
+ * paints no `>` composer while a dialog is open — the dialog takes its place —
+ * so a footer with a composer under it is the model's reply quoting a dialog,
+ * or a dialog left in the scrollback, not a screen waiting for a keypress. It is
+ * the same reading `isAntigravitySurveyOpen` gives the survey row (#2364), and
+ * the composer is recognised by the same {@link ANTIGRAVITY_PROMPT_PATTERN}.
+ *
  * @param lines - ANSI-stripped rows, box drawing optional
  */
 function locateAntigravityDialogRegion(lines) {
@@ -2284,6 +2291,10 @@ function locateAntigravityDialogRegion(lines) {
     }
     if (footer < 0)
         return null;
+    for (let i = footer + 1; i < lines.length; i++) {
+        if (exports.ANTIGRAVITY_PROMPT_PATTERN.test(lines[i]))
+            return null;
+    }
     const floor = Math.max(0, footer - exports.ANTIGRAVITY_DIALOG_MAX_ROWS);
     let start = floor;
     for (let i = footer - 1; i >= floor; i--) {

package/dist/server/src/lib/detection/selection-shape.js

@@ -66,6 +66,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COMMAND_CODE_PLAN_APPROVE_CHOICE_FOOTER = exports.COMMAND_CODE_PLAN_APPROVE_CHOICE_ROW = exports.COMMAND_CODE_PLAN_REVIEW_FOOTER = exports.DISMISSABLE_PANEL_FOOTER_PATTERN = exports.COMMAND_CODE_SELECTION_LIST_FOOTER = exports.SET_AS_DEFAULT_FOOTER_PATTERN = exports.SESSION_SCOPE_FOOTER_PATTERN = exports.MAX_OPTION_NUMBER = exports.SELECTION_SHAPE_TAIL_LINE_COUNT = void 0;
 exports.isCommandCodePlanApproveChoice = isCommandCodePlanApproveChoice;
+exports.hasCommandCodeSelectionListFooterAtBottom = hasCommandCodeSelectionListFooterAtBottom;
+exports.hasCommandCodeDismissablePanelFooterAtBottom = hasCommandCodeDismissablePanelFooterAtBottom;
+exports.hasCommandCodePlanReviewFooterAtBottom = hasCommandCodePlanReviewFooterAtBottom;
 exports.hasDismissablePanelFooter = hasDismissablePanelFooter;
 exports.readCommandCodeQuestionRegion = readCommandCodeQuestionRegion;
 exports.hasCommandCodeQuestionChrome = hasCommandCodeQuestionChrome;
@@ -282,6 +285,79 @@ function isCommandCodePlanApproveChoice(tail) {
     return (exports.COMMAND_CODE_PLAN_APPROVE_CHOICE_ROW.test(tail) &&
         exports.COMMAND_CODE_PLAN_APPROVE_CHOICE_FOOTER.test(tail));
 }
+/**
+ * How many content rows the plan review footer's LAST row (`Cancel esc`) may
+ * have under it and still be the overlay's own footer (Issue #2846): the footer's
+ * two rows plus three.
+ *
+ * Measured over the sixteen plan review captures that carry the footer
+ * (`tests/fixtures/command-code-plan-review-2761/`, `-2763/`): fourteen draw ONE
+ * row below it, the hint bar (`type + enter to comment · …`); one draws two, an
+ * `Editor exited with code 127` row and then the hint bar; and the garbled
+ * `editor-killed-staircase.txt` draws three, because the pane wrapped the hint
+ * bar. So the plan review footer is NOT the last row the way the picker's is,
+ * and a "last two rows" rule misses every one of them.
+ *
+ * What bounds it from above is the composer. A transcript is always drawn above
+ * one, and its shortest measured form is four rows — rule, `❯ Ask your
+ * question...`, rule, status row — so a footer QUOTED in a reply has at least
+ * four content rows under it and its `Approve` row falls outside this window.
+ * The margin between the widest overlay (3) and the narrowest composer (4) is
+ * one row; a capture that narrows it is the reason to re-measure, not to widen
+ * this.
+ */
+const COMMAND_CODE_PLAN_REVIEW_TAIL_ROW_COUNT = 5;
+/**
+ * The last `count` rows of `text` that carry content, joined with `\n`.
+ *
+ * Blank rows are dropped rather than counted: the pane is padded with them, and
+ * a real footer is set off from its hint bar by one.
+ */
+function lastContentRows(text, count) {
+    return text
+        .split('\n')
+        .filter((row) => row.trim() !== '')
+        .slice(-count)
+        .join('\n');
+}
+/**
+ * Whether the LAST content row of this tail is Command Code's picker footer
+ * (Issue #2846).
+ *
+ * {@link COMMAND_CODE_SELECTION_LIST_FOOTER} matches the sentence anywhere, and
+ * a reply that quotes the `/model` footer is that sentence in the middle of the
+ * transcript. The picker draws the footer as the last row of the pane (all four
+ * captures that carry it do, `tests/fixtures/chat-dialog-card-2254/`), and a
+ * transcript always has the composer under it — the same reasoning
+ * {@link COMMAND_CODE_PLAN_APPROVE_CHOICE_FOOTER} anchors with `$`.
+ *
+ * @param tail - the frame's last rows, ANSI stripped, last content row last
+ */
+function hasCommandCodeSelectionListFooterAtBottom(tail) {
+    return exports.COMMAND_CODE_SELECTION_LIST_FOOTER.test(lastContentRows(tail, 1));
+}
+/**
+ * Whether the LAST content row of this tail is the dismiss-only panel's footer
+ * (Issue #2846). `Press Esc to close` is the panel's last row
+ * ({@link DISMISSABLE_PANEL_FOOTER_PATTERN}); the same row inside a reply has
+ * the composer under it.
+ *
+ * @param tail - the frame's last rows, ANSI stripped, last content row last
+ */
+function hasCommandCodeDismissablePanelFooterAtBottom(tail) {
+    return exports.DISMISSABLE_PANEL_FOOTER_PATTERN.test(lastContentRows(tail, 1));
+}
+/**
+ * Whether the plan review footer ({@link COMMAND_CODE_PLAN_REVIEW_FOOTER}) sits
+ * at the bottom of this tail (Issue #2846): both of its rows are within the last
+ * {@link COMMAND_CODE_PLAN_REVIEW_TAIL_ROW_COUNT} content rows, which is the
+ * overlay's own hint bar and nothing as tall as a composer.
+ *
+ * @param tail - the frame's last rows, ANSI stripped, last content row last
+ */
+function hasCommandCodePlanReviewFooterAtBottom(tail) {
+    return exports.COMMAND_CODE_PLAN_REVIEW_FOOTER.test(lastContentRows(tail, COMMAND_CODE_PLAN_REVIEW_TAIL_ROW_COUNT));
+}
 /**
  * How many rows from the end of the content the dismiss footer is looked for.
  *

package/dist/server/src/lib/detection/tools/antigravity/detect.js

@@ -17,6 +17,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.antigravityStatusDetector = exports.VERIFIED_AGAINST = void 0;
+exports.isAntigravityQuotedNumberedList = isAntigravityQuotedNumberedList;
 const cli_patterns_1 = require("../../cli-patterns");
 const status_reason_1 = require("../../status-reason");
 const run_detection_1 = require("../run-detection");
@@ -61,9 +62,66 @@ function isAntigravitySurveyOpen(contentLines) {
     const { promptPattern } = (0, cli_patterns_1.getCliToolPatterns)('antigravity');
     return !tail.slice(surveyAt + 1).some(row => promptPattern.test(row));
 }
+/**
+ * Is the screen the selection-list pattern matched the LIVE one, rather than
+ * words the model quoted or a screen left in the scrollback? (Issue #2845)
+ *
+ * agy paints no `>` composer while a dialog or picker is open — the screen
+ * replaces it — so a composer drawn below the last row the pattern matches
+ * means that row is not an open screen's. Without this the model quoting
+ * `↑/↓ Navigate` in a reply put the whole pane at `waiting` while agy sat at its
+ * composer, and Auto-Yes answered a dialog nobody had opened. The same reading
+ * `locateAntigravityDialogRegion` gives the numbered dialog's footer, and
+ * `isAntigravitySurveyOpen` above gives the survey row, with the same composer
+ * pattern.
+ */
+function isAntigravitySelectionScreenOpen(lastLines) {
+    const rows = lastLines.split('\n');
+    let matchedAt = -1;
+    for (let i = rows.length - 1; i >= 0; i--) {
+        if (cli_patterns_1.ANTIGRAVITY_SELECTION_LIST_PATTERN.test(rows[i])) {
+            matchedAt = i;
+            break;
+        }
+    }
+    if (matchedAt < 0)
+        return false;
+    const { promptPattern } = (0, cli_patterns_1.getCliToolPatterns)('antigravity');
+    return !rows.slice(matchedAt + 1).some(row => promptPattern.test(row));
+}
+/**
+ * Is the numbered list the shared parser read a quotation, not a dialog?
+ * (Issue #2845)
+ *
+ * The shared pass takes any `> 1. …` run in the last rows for a menu, wherever
+ * on the frame it sits. agy draws its numbered screens either IN PLACE OF the
+ * composer (the approval dialogs) or BELOW it (`/feedback`'s category menu),
+ * never above it — so a numbered list with the composer drawn under its last row
+ * is the model's reply, or a dialog left in the scrollback. Branch 0.9 declines
+ * such a frame (see {@link isAntigravitySelectionScreenOpen}); without this the
+ * shared pass then read the quoted `Do you want to proceed?` menu itself and
+ * published the composer-idle pane as `waiting` / `prompt_detected`.
+ */
+function isAntigravityQuotedNumberedList(frame, prompt) {
+    if (prompt.promptData?.type !== 'multiple_choice')
+        return false;
+    const rows = (0, cli_patterns_1.stripBoxDrawing)(frame.contentLines.join('\n')).split('\n');
+    const { promptPattern } = (0, cli_patterns_1.getCliToolPatterns)('antigravity');
+    let composerAt = -1;
+    for (let i = rows.length - 1; i >= 0; i--) {
+        if (promptPattern.test(rows[i])) {
+            composerAt = i;
+            break;
+        }
+    }
+    if (composerAt < 0)
+        return false;
+    return !rows.slice(composerAt + 1).some(row => cli_patterns_1.ANTIGRAVITY_NUMBERED_OPTION_PATTERN.test(row));
+}
 exports.antigravityStatusDetector = (0, run_detection_1.createToolStatusDetector)({
     tool: 'antigravity',
     verifiedAgainst: exports.VERIFIED_AGAINST,
+    isStalePrompt: isAntigravityQuotedNumberedList,
     beforePrompt(frame) {
         // 0.85. Issue #2364: the survey agy draws in place of its composer after a
         // tool decision — `[1] Good  [2] Fine  [3] Bad  [0] Skip` under `How's the
@@ -88,8 +146,14 @@ exports.antigravityStatusDetector = (0, run_detection_1.createToolStatusDetector
         // screen as "generating" and NavigationButtons would never be shown. Detecting the
         // selection list here — ahead of thinking — is the fix. Mirrors the Copilot /
         // Codex early-detection pattern.
+        //
+        // Issue #2845: only while the screen is the live one. The words alone are
+        // not enough — a reply that quotes the `↑/↓ Navigate` footer leaves them in
+        // the last rows of a pane whose composer is drawn below them.
         if (!cli_patterns_1.ANTIGRAVITY_SELECTION_LIST_PATTERN.test(frame.lastLines))
             return null;
+        if (!isAntigravitySelectionScreenOpen(frame.lastLines))
+            return null;
         // Issue #2270 / #2364: except when the frame is a NUMBERED dialog.
         //
         // #997 widened the pattern above to the bare `↑/↓ Navigate` footer so the

package/dist/server/src/lib/detection/tools/claude/detect.js

@@ -16,6 +16,7 @@ const composer_text_1 = require("../../composer-text");
 const prompt_detect_multiple_choice_1 = require("../../prompt-detect-multiple-choice");
 const status_reason_1 = require("../../status-reason");
 const prompt_1 = require("./prompt");
+const frame_1 = require("../frame");
 const run_detection_1 = require("../run-detection");
 const patterns_1 = require("./patterns");
 /**
@@ -93,6 +94,30 @@ function readIdleEvidence(frame) {
         return 'positive';
     return 'none';
 }
+/**
+ * The rows a selection-list footer may be read from (Issue #2847).
+ *
+ * The footer belongs to the picker, and a picker is either the input box's
+ * neighbour or its replacement. Above the input box is the conversation, which
+ * can quote the footer's wording (a reply explaining the picker, a pasted
+ * transcript) without any picker being open — and reading the whole 15-row tail
+ * turned that quotation into `waiting` on an idle composer.
+ *
+ * So when the input box is on screen, only its rows and the status bar under it
+ * are read (still inside the 15-row tail, never wider). When there is no input
+ * box, a picker has taken its place and the tail is read as before.
+ *
+ * The box is located by {@link findClaudeInputBox}, the finder
+ * {@link findClaudeTranscriptTail} and {@link readIdleEvidence} already use, so
+ * this rule cannot disagree with them about where the conversation ends.
+ */
+function selectionFooterRows(frame) {
+    const box = (0, composer_text_1.findClaudeInputBox)(frame.contentLines);
+    if (!box)
+        return frame.lastLines;
+    const tailStart = frame.contentLines.length - frame_1.STATUS_CHECK_LINE_COUNT;
+    return frame.contentLines.slice(Math.max(box.openingSeparator, tailStart)).join('\n');
+}
 exports.claudeStatusDetector = (0, run_detection_1.createToolStatusDetector)({
     tool: 'claude',
     verifiedAgainst: patterns_1.VERIFIED_AGAINST,
@@ -102,7 +127,9 @@ exports.claudeStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         // use arrow keys + Enter to navigate and toggle, not number input.
         // The 15-line window may miss the question line, causing SEC-001a rejection above.
         // Detect via the footer instruction pattern and show NavigationButtons instead of PromptPanel.
-        if (cli_patterns_1.CLAUDE_SELECTION_LIST_FOOTER.test(frame.lastLines)) {
+        // Read only the rows at or below the input box (Issue #2847): a footer quoted in the reply
+        // above it is conversation, not a picker.
+        if (cli_patterns_1.CLAUDE_SELECTION_LIST_FOOTER.test(selectionFooterRows(frame))) {
             return {
                 status: 'waiting',
                 confidence: 'high',

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

@@ -101,6 +101,7 @@ exports.CODEX_DIALOG_FOOTER_PATTERN = exports.CODEX_DIALOG_RULES_VERIFIED_AGAINS
 exports.readCodexGlyphRowKind = readCodexGlyphRowKind;
 exports.findCodexBottomGlyphRow = findCodexBottomGlyphRow;
 exports.readCodexDialogFrame = readCodexDialogFrame;
+exports.isCodexComposerAtBottom = isCodexComposerAtBottom;
 exports.reportCodexDialogFooterDrift = reportCodexDialogFooterDrift;
 exports.resetCodexDialogFooterDriftForTests = resetCodexDialogFooterDriftForTests;
 const logger_1 = require("../../../../lib/logger");
@@ -384,6 +385,56 @@ function readCodexDialogFrame(raw, contentLines, contentEnd) {
         footerRecognised: exports.CODEX_DIALOG_FOOTER_PATTERN.test(footer),
     };
 }
+/** A `›` row that is a numbered option (`› 1. …`), as opposed to the composer. */
+const CODEX_NUMBERED_GLYPH_ROW_PATTERN = /^\s*›\s*\d{1,2}[.)]\s/;
+/**
+ * Is the bottom of this codex pane the composer (Issue #2841)?
+ *
+ * codex draws exactly one thing between the conversation and its status bar:
+ * the composer, or a dialog that REPLACES the composer while it is open. Every
+ * measured dialog frame (`tests/fixtures/codex-dialogs-0155/`,
+ * `tests/fixtures/codex-live-2310/`, `codex-live-1628/`) ends on the dialog's
+ * rows with no `›` row below its footer. So when the composer is the pane's
+ * bottom, no dialog is open, whatever the conversation above it says — and the
+ * conversation is free text: an agent quoting another session's approval dialog
+ * (the reported case), a numbered list, a pasted footer.
+ *
+ * This is the one question every dialog reading in this module asks first, so
+ * that no reading can be satisfied by words in the transcript.
+ *
+ * Two readings, in order:
+ *
+ *  1. **raw** — the bottom-most `›` row of the RAW capture
+ *     ({@link findCodexBottomGlyphRow}) is `composer` → true; `option` → false;
+ *     `transcript-echo` → false (not shown to be the composer).
+ *  2. **stripped** (no attributes: Auto-Yes and `prompt-answer-sender` hand the
+ *     layer a `stripAnsi`'d capture) — the last non-blank row of the content
+ *     region starts with `›` and is not a numbered option row. A dialog's
+ *     highlighted row can also be the last row; a numbered one is excluded here,
+ *     and an unnumbered one keeps the reading it had before (branch 2.7 B
+ *     already calls that frame `ready` when stripped).
+ *
+ * False only means "not shown to be the composer": callers must use it as a
+ * veto on a dialog reading, never as evidence of one.
+ *
+ * @param raw - The capture exactly as it arrived (`NormalizedFrame.raw`)
+ * @param contentLines - The ANSI-stripped rows (`NormalizedFrame.contentLines`)
+ * @param contentEnd - Exclusive end of the conversation region (the row above
+ *   the status bar with padding walked off, or `contentLines.length`)
+ */
+function isCodexComposerAtBottom(raw, contentLines, contentEnd) {
+    const glyphRow = findCodexBottomGlyphRow(raw);
+    if (glyphRow !== null)
+        return glyphRow.kind === 'composer';
+    const end = Math.min(contentEnd, contentLines.length);
+    let last = end - 1;
+    while (last >= 0 && contentLines[last].trim() === '')
+        last--;
+    if (last < 0)
+        return false;
+    const row = contentLines[last];
+    return row.trimStart().startsWith(exports.CODEX_GLYPH) && !CODEX_NUMBERED_GLYPH_ROW_PATTERN.test(row);
+}
 /** Index of the bottom-most `›` row within the content region, or -1. */
 function findLastGlyphContentRow(contentLines, endExclusive) {
     for (let i = Math.min(endExclusive, contentLines.length) - 1; i >= 0; i--) {

package/dist/server/src/lib/detection/tools/codex/detect.js

@@ -166,6 +166,16 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
     verifiedAgainst: exports.VERIFIED_AGAINST,
     beforePrompt(frame) {
         const { contentLines } = frame;
+        // 0.6. The composer is the pane's bottom → no dialog is open (Issue #2841).
+        // Every branch below reads dialog chrome (a pager footer, a lifecycle
+        // screen, a "Press enter to confirm" footer, a `›`-selected block) out of
+        // rows that can also be conversation text. codex hides the composer while a
+        // dialog is up, so a composer at the bottom vetoes all of them at once, and
+        // the chain goes on to the prompt / thinking / idle readings it would have
+        // reached had the transcript not quoted anything.
+        if ((0, cli_patterns_2.isCodexComposerAtBottom)(frame.raw, contentLines, findCodexContentEnd(contentLines))) {
+            return null;
+        }
         // 0.7. Codex: pager / edit-previous (transcript) mode detection (Issue #1017)
         // Codex's transcript pager renders scroll / edit key-hint footers, e.g.:
         //   "↑/↓ to scroll   pgup/pgdn to page   home/end to jump"
@@ -321,15 +331,24 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         return null;
     },
     isStalePrompt(frame) {
-        return isCodexStalePrompt(frame.contentLines);
+        // Issue #2841: a prompt above the composer is conversation text, not a
+        // dialog — the same veto branch 0.6 applies to the status branches.
+        return (isCodexStalePrompt(frame.contentLines) ||
+            (0, cli_patterns_2.isCodexComposerAtBottom)(frame.raw, frame.contentLines, findCodexContentEnd(frame.contentLines)));
     },
     // §4 D1 決定 4 (Issue #1928). All three inputs are readings this module
     // already performs for its status branches, passed rather than recomputed:
     // the content boundary (0.8 / 2.7), the #1160 staleness guard and the #1829
     // lifecycle screens. `prompt.ts` therefore needs no import from this file.
     detectDialog(frame) {
+        // Issue #2841: Auto-Yes and `respond` act on this answer, so it takes the
+        // same veto as the status branches — before the lifecycle screens too, whose
+        // wording (`Do you trust …`) can be quoted like any other.
+        const contentEnd = findCodexContentEnd(frame.contentLines);
+        if ((0, cli_patterns_2.isCodexComposerAtBottom)(frame.raw, frame.contentLines, contentEnd))
+            return null;
         return (0, prompt_1.detectCodexDialog)(frame, {
-            contentEnd: findCodexContentEnd(frame.contentLines),
+            contentEnd,
             stalePrompt: isCodexStalePrompt(frame.contentLines),
             lifecycleDialog: (0, cli_patterns_1.getCodexLifecycleDialog)(frame.clean),
         });

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

@@ -174,7 +174,13 @@ exports.commandCodeStatusDetector = (0, run_detection_1.createToolStatusDetector
         //    pending (`←/→ choose · enter confirm · esc back`). The same verdict: it is
         //    the same overlay, still waiting on a human's decision about the plan,
         //    and the arrow pad (`◀` `▶` `Enter` `Esc`) is exactly what it asks for.
-        if (selection_shape_1.COMMAND_CODE_PLAN_REVIEW_FOOTER.test(frame.lastLines) ||
+        //
+        // Issue #2846: the footer has to be at the BOTTOM of the frame, not merely
+        // somewhere in the 15-row window. A reply that quotes `Approve ctrl+a` /
+        // `Cancel esc` sits above the composer, and `frame.lastLines` used to match it
+        // there — `waiting` on a pane that was waiting for a message. See
+        // `hasCommandCodePlanReviewFooterAtBottom` for how far from the end is "bottom".
+        if ((0, selection_shape_1.hasCommandCodePlanReviewFooterAtBottom)(frame.lastLines) ||
             (0, selection_shape_1.isCommandCodePlanApproveChoice)(frame.lastLines)) {
             return {
                 status: 'waiting',
@@ -278,7 +284,10 @@ exports.commandCodeStatusDetector = (0, run_detection_1.createToolStatusDetector
         //
         // A human still has to press the key, so `waiting` is also the honest word:
         // nothing on this pane will move until they do.
-        if (selection_shape_1.DISMISSABLE_PANEL_FOOTER_PATTERN.test(frame.lastLines)) {
+        //
+        // Issue #2846: only when `Press Esc to close` is the LAST row. The panel draws
+        // it last; a reply that quotes it has the composer underneath.
+        if ((0, selection_shape_1.hasCommandCodeDismissablePanelFooterAtBottom)(frame.lastLines)) {
             return {
                 status: 'waiting',
                 confidence: 'high',
@@ -298,7 +307,9 @@ exports.commandCodeStatusDetector = (0, run_detection_1.createToolStatusDetector
         // `waiting` + `positive`, exactly as claude's selection-list branch reports:
         // a human has to move the highlight and press enter, and the frame says so
         // in as many words.
-        if (selection_shape_1.COMMAND_CODE_SELECTION_LIST_FOOTER.test(frame.lastLines)) {
+        //
+        // Issue #2846: last row only, for the reason the branch above gives.
+        if ((0, selection_shape_1.hasCommandCodeSelectionListFooterAtBottom)(frame.lastLines)) {
             return {
                 status: 'waiting',
                 confidence: 'high',