commandmate 0.33.2 → 0.34.0

package/dist/server/src/lib/detection/prompt-detect-multiple-choice.js

@@ -3,12 +3,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.APPROVAL_TARGET_MAX_LOOKBACK = void 0;
 exports.findClaudeTaskPanelLines = findClaudeTaskPanelLines;
+exports.findClaudeChrome = findClaudeChrome;
+exports.maskClaudeChrome = maskClaudeChrome;
 exports.findApprovalContextStart = findApprovalContextStart;
 exports.joinApprovalTarget = joinApprovalTarget;
 exports.buildMultipleChoiceResult = buildMultipleChoiceResult;
 exports.detectMultipleChoicePrompt = detectMultipleChoicePrompt;
 const tui_detection_frame_1 = require("./tui-detection-frame");
 const cli_patterns_1 = require("./cli-patterns");
+const picker_chrome_1 = require("./tools/claude/picker-chrome");
 // ============================================================================
 // Constants
 // ============================================================================
@@ -114,11 +117,45 @@ const CLAUDE_TASK_PANEL_HEADER_PATTERN = /^\s*\d{1,3}\s+tasks?\s+\(\d+\s+done\b/
  */
 const CLAUDE_TASK_PANEL_ROW_PATTERN = /^\s*[◼◻]\s/;
 /**
- * Line indices belonging to a Claude task panel within [start, end).
+ * [Issue #2468] Claude Code 2.1.267's session-diff HUD row, in the two
+ * spellings measured on a live pane (tests/fixtures/claude-live-2468):
+ *   "No changes this session"
+ *   "+28 files edited before this session (show)"
+ *
+ * Chrome like the task panel, but a single row and RIGHT-aligned: on a
+ * 200-column pane it is ~110 columns of padding and then the text. It is
+ * therefore matched on the trimmed row — a reader that slices the row from the
+ * left sees nothing but blanks.
+ *
+ * It broke two readers. Pass 2 below parses `+2 files edited …` as option 2,
+ * which poisons the real `1. / 2.` above it the way `… +2 completed` did in
+ * #1708. And `findClaudeTranscriptTail` took it for the last transcript row, so
+ * `detectClaudeDialog` read it as the footer of the AskUserQuestion
+ * confirmation screen — a dialog that draws no footer — and refused a dialog
+ * that was open on screen: Auto-Yes, the UI's answer and `commandmate respond`
+ * all got `prompt_no_longer_active`.
+ *
+ * `files?` is the one spelling not seen on a pane: a one-file session was not
+ * captured, and the singular is accepted so that it is not the case that
+ * regresses. Everything else is literal, for the same reason the glyph set
+ * above is an allowlist. Anchored at both ends, no nested quantifiers — ReDoS
+ * safe (S4-001).
+ */
+const CLAUDE_SESSION_DIFF_HUD_PATTERN = /^(?:No changes this session|\+\d+ files? edited before this session \(show\))$/;
+/**
+ * Line indices belonging to Claude's bottom-pinned panels within [start, end).
+ *
+ * Two panels, both chrome rather than transcript or prompt:
+ *  - the task panel (#1708). Walks down from each header row for as long as
+ *    rows keep looking like panel content (task rows or the collapsed `… +N …`
+ *    summary). The first line that is neither ends the block, so a panel that
+ *    abuts other content cannot swallow it.
+ *  - the session-diff HUD (#2468), a single row claimed on its own.
  *
- * Walks down from each header row for as long as rows keep looking like panel
- * content (task rows or the collapsed `… +N …` summary). The first line that is
- * neither ends the block, so a panel that abuts other content cannot swallow it.
+ * Pass 2 here, `findClaudeTranscriptTail` and `detectClaudeDialog`'s footer
+ * guard all read this one set — through {@link findClaudeChrome}, which adds an
+ * AskUserQuestion preview pane to it (Issue #2486) — so they cannot disagree
+ * about which rows are chrome.
  *
  * @param lines - Full frame, already ANSI/box stripped
  * @param start - First index to consider (inclusive)
@@ -128,6 +165,10 @@ const CLAUDE_TASK_PANEL_ROW_PATTERN = /^\s*[◼◻]\s/;
 function findClaudeTaskPanelLines(lines, start, end) {
     const panelLines = new Set();
     for (let i = Math.max(0, start); i < Math.min(end, lines.length); i++) {
+        if (CLAUDE_SESSION_DIFF_HUD_PATTERN.test(lines[i].trim())) {
+            panelLines.add(i);
+            continue;
+        }
         if (!CLAUDE_TASK_PANEL_HEADER_PATTERN.test(lines[i]))
             continue;
         panelLines.add(i);
@@ -140,6 +181,43 @@ function findClaudeTaskPanelLines(lines, start, end) {
     }
     return panelLines;
 }
+/**
+ * Claude's chrome within [start, end). See {@link ClaudeChrome}.
+ *
+ * @param lines - Full frame, ANSI stripped; box drawing optional
+ * @param start - First index to consider (inclusive)
+ * @param end - Last index to consider (exclusive)
+ */
+function findClaudeChrome(lines, start, end) {
+    const rows = findClaudeTaskPanelLines(lines, start, end);
+    const panes = (0, picker_chrome_1.findClaudePreviewPanes)(lines, start, end);
+    for (const row of panes.rows)
+        rows.add(row);
+    return { rows, cuts: panes.cuts };
+}
+/**
+ * The frame with Claude's chrome taken out: chrome rows blank, rows shared with
+ * the preview pane cut back to the options column. Row indices are unchanged,
+ * so a reader of the result can report positions in the original frame.
+ */
+function maskClaudeChrome(lines, chrome) {
+    return lines.map((line, i) => {
+        if (chrome.rows.has(i))
+            return '';
+        const cut = chrome.cuts.get(i);
+        return cut === undefined ? line : line.slice(0, cut).trimEnd();
+    });
+}
+/**
+ * [Issue #2486] An indented row in the options column beside a preview pane.
+ *
+ * The column is ~30 wide there and draws no descriptions (the pane replaces
+ * them), so such a row is the wrapped tail of the label above it —
+ * `❯ 1. 整えた状態で続行` / `    (Recommended)` on the live capture. Option rows
+ * start within two columns (`❯ 1.` / `  2.`); three or more spaces is a wrap.
+ * Anchored, no nested quantifiers — ReDoS safe (S4-001).
+ */
+const PANE_WRAPPED_LABEL_PATTERN = /^\s{3,}\S/;
 /**
  * Pattern for separator lines (horizontal rules).
  * Matches lines consisting only of dash (-) or em-dash (─) characters.
@@ -238,8 +316,11 @@ const CLAUDE_PROMPT_FOOTER_PATTERN = /Esc\s+to\s+cancel\s*[·•]\s*Tab\s+to\s+a
  *
  * Linear pattern, single unbounded quantifier between literal anchors —
  * ReDoS safe (S4-001).
+ *
+ * [Issue #2486] Defined in `tools/claude/picker-chrome.ts`, whose preview-pane
+ * finder anchors a pane on this same footer.
  */
-const CLAUDE_ASK_USER_QUESTION_FOOTER_PATTERN = /Enter\s+to\s+select\b.*\bnavigate\b/i;
+const CLAUDE_ASK_USER_QUESTION_FOOTER_PATTERN = picker_chrome_1.ASK_USER_QUESTION_PICKER_FOOTER_PATTERN;
 /**
  * Codex/OpenAI TUI confirmation footer shown beneath interactive choices.
  * When this footer is present, numbered options form an active prompt even if
@@ -556,14 +637,17 @@ function isContinuationLine(rawLine, line) {
  *
  * @param lines - Array of output lines
  * @param questionEndIndex - Index of the last line before options, or -1 if not found
+ * @param floor - First row the question may start at. Issue #2486: one below an
+ *   AskUserQuestion picker's tab row, so neither that row nor the transcript
+ *   above it becomes part of the question; 0 when there is none.
  * @returns Extracted question text, or generic fallback if questionEndIndex is -1
  */
-function extractQuestionText(lines, questionEndIndex) {
+function extractQuestionText(lines, questionEndIndex, floor = 0) {
     if (questionEndIndex < 0) {
         return 'Please select an option:';
     }
     const questionLines = [];
-    for (let i = Math.max(0, questionEndIndex - QUESTION_CONTEXT_LINES); i <= questionEndIndex; i++) {
+    for (let i = Math.max(floor, questionEndIndex - QUESTION_CONTEXT_LINES); i <= questionEndIndex; i++) {
         const line = lines[i].trim();
         if (line && !SEPARATOR_LINE_PATTERN.test(line)) {
             questionLines.push(line);
@@ -682,16 +766,22 @@ function joinApprovalTarget(lines, start, end) {
  * of the deny surface. Narrowing that would change prompt dedup keys and what
  * the UI renders, and it is bounded by the options below it either way.
  *
+ * [Issue #2486] One exception to both: neither reaches above an AskUserQuestion
+ * picker's tab row. Everything up there is the transcript — the Bash call Claude
+ * ran just before asking, on the Issue's pane — and a question is not the
+ * command that happened to precede it.
+ *
  * @param lines - Array of output lines
  * @param questionEndIndex - Index of the last line before options, or -1 if not found
  * @param effectiveEnd - End index of non-trailing-empty lines
+ * @param floor - First row the block may start at (Issue #2486); 0 for none
  * @returns Approval target string, or undefined if no question line found
  */
-function extractApprovalTarget(lines, questionEndIndex, effectiveEnd) {
+function extractApprovalTarget(lines, questionEndIndex, effectiveEnd, floor = 0) {
     if (questionEndIndex < 0) {
         return undefined;
     }
-    return joinApprovalTarget(lines, findApprovalContextStart(lines, questionEndIndex), effectiveEnd);
+    return joinApprovalTarget(lines, Math.max(floor, findApprovalContextStart(lines, questionEndIndex)), effectiveEnd);
 }
 /**
  * Build the final PromptDetectionResult for a multiple choice prompt.
@@ -878,13 +968,33 @@ function detectMultipleChoicePrompt(output, options, truncateRawContentFn) {
     // [Issue #1708] Claude's bottom-anchored task panel is an overlay, not part of
     // the prompt frame. Resolved as a block up front because the reverse scan meets
     // its rows before its header and so cannot recognise them one at a time.
-    const taskPanelLines = findClaudeTaskPanelLines(lines, scanStart, effectiveEnd);
+    //
+    // [Issue #2486] The same reading carries an AskUserQuestion preview pane, whose
+    // rows the scan likewise meets before the top border that identifies it — and
+    // some of which it shares with the options column.
+    const chrome = findClaudeChrome(lines, scanStart, effectiveEnd);
+    // [Issue #2486] Wrapped label rows beside a preview pane, held for the option
+    // ABOVE them, which the reverse scan has not reached yet.
+    let paneWrap = [];
     for (let i = effectiveEnd - 1; i >= scanStart; i--) {
-        const line = lines[i].trim();
-        // [Issue #1708] Task-panel rows are metadata. Same handling as the
+        // [Issue #1708] Chrome rows are metadata. Same handling as the
         // COLLAPSED_OUTPUT / SUMMARY guards below: skip without ending the scan, so
-        // the options rendered ABOVE the panel are still reachable.
-        if (taskPanelLines.has(i)) {
+        // the options rendered ABOVE the panel (or beside the pane) are still
+        // reachable.
+        if (chrome.rows.has(i)) {
+            continuationLineCount++;
+            continue;
+        }
+        // [Issue #2486] A row the preview pane shares with the options column is
+        // read as the options column alone. Unread, `❯ 1. 整えた状態で続行   ┌───┐`
+        // became the option label `整えた状態で続行   ┌───┐`.
+        const paneCut = chrome.cuts.get(i);
+        // Original indentation preserved; only the pane is cut off.
+        const rawLine = paneCut === undefined ? lines[i] : lines[i].slice(0, paneCut).trimEnd();
+        const line = rawLine.trim();
+        // [Issue #2486] See PANE_WRAPPED_LABEL_PATTERN: the tail of the label above.
+        if (paneCut !== undefined && PANE_WRAPPED_LABEL_PATTERN.test(rawLine)) {
+            paneWrap.unshift(line);
             continuationLineCount++;
             continue;
         }
@@ -918,7 +1028,9 @@ function detectMultipleChoicePrompt(output, options, truncateRawContentFn) {
         if (defaultMatch) {
             const number = parseInt(defaultMatch[1], 10);
             if (number <= 20 && isValidPrecedingOption(number, collectedOptions)) {
-                const label = defaultMatch[2].trim();
+                // [Issue #2486] A label that wrapped beside a preview pane is whole again.
+                const label = [defaultMatch[2].trim(), ...paneWrap].join(' ');
+                paneWrap = [];
                 collectedOptions.unshift({ number, label, isDefault: true });
                 continuationLineCount = 0;
                 continue;
@@ -937,7 +1049,8 @@ function detectMultipleChoicePrompt(output, options, truncateRawContentFn) {
                 // Treat as non-option line (e.g., diff line numbers from Codex approval prompts)
             }
             else {
-                const label = normalMatch[2].trim();
+                const label = [normalMatch[2].trim(), ...paneWrap].join(' ');
+                paneWrap = [];
                 collectedOptions.unshift({ number, label, isDefault: false });
                 continuationLineCount = 0;
                 continue;
@@ -954,7 +1067,6 @@ function detectMultipleChoicePrompt(output, options, truncateRawContentFn) {
         }
         // Non-option line handling
         if (collectedOptions.length > 0 && line && !SEPARATOR_LINE_PATTERN.test(line)) {
-            const rawLine = lines[i]; // Original line with indentation preserved
             // [Issue #460] For deeply indented lines (4+ leading spaces), check
             // continuation BEFORE question keywords. These are option description
             // lines (e.g., "     Let Gemini CLI decide the best model...") that may
@@ -1054,11 +1166,20 @@ function detectMultipleChoicePrompt(output, options, truncateRawContentFn) {
             }
         }
     }
-    const question = extractQuestionText(lines, questionEndIndex);
+    // [Issue #2486] An AskUserQuestion picker's tab row is the dialog's top edge:
+    // the row is chrome and everything above it is transcript. Found once so
+    // `question` and `approvalTarget` start at the same row; 0 on a frame with no
+    // tab row, which leaves every other prompt exactly as it was. `instructionText`
+    // keeps its wide window — it is the human's view, and on a preview picker the
+    // pane it carries is what the question asks the human to look at.
+    const pickerTop = questionEndIndex < 0
+        ? 0
+        : (0, picker_chrome_1.findAskUserQuestionTabRow)(lines, questionEndIndex, exports.APPROVAL_TARGET_MAX_LOOKBACK) + 1;
+    const question = extractQuestionText(lines, questionEndIndex, pickerTop);
     const instructionText = extractInstructionText(lines, questionEndIndex, effectiveEnd);
     // Issue #1699: the same block, cut at the previous turn's boundary. Display
     // keeps the wide window; deny patterns are judged against this one.
-    const approvalTarget = extractApprovalTarget(lines, questionEndIndex, effectiveEnd);
+    const approvalTarget = extractApprovalTarget(lines, questionEndIndex, effectiveEnd, pickerTop);
     // Issue #616: Determine submitMode from confirmation footer (detected in single-pass above)
     const submitMode = hasConfirmationFooter
         ? (hasNumberFooter ? 'answer_only' : 'answer_then_enter')

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

@@ -28,6 +28,17 @@ const patterns_1 = require("./patterns");
  * them, which after `compactBlankRows` is a handful of rows up even when the
  * live pane put ~870 blank rows in between.
  *
+ * The same finder claims the right-aligned session-diff HUD row
+ * (`+N files edited before this session (show)`, Issue #2468). On the
+ * AskUserQuestion confirmation screen, which has no input box and no footer,
+ * that row is the bottom of the frame; before the finder knew it, it WAS the
+ * tail, and the dialog above it read as finished output.
+ *
+ * It is read through `findClaudeChrome`, the one reading `detectClaudeDialog`
+ * and the generic parser use too — which since Issue #2486 includes the
+ * AskUserQuestion preview pane — so the three cannot disagree about which rows
+ * are chrome.
+ *
  * Returning an index rather than a boolean keeps this usable by anything else
  * that needs "the last thing Claude actually said".
  */
@@ -35,11 +46,11 @@ function findClaudeTranscriptTail(contentLines) {
     const lines = contentLines;
     const box = (0, composer_text_1.findClaudeInputBox)(lines);
     const end = box ? box.openingSeparator : lines.length;
-    const panelRows = (0, prompt_detect_multiple_choice_1.findClaudeTaskPanelLines)(lines, 0, end);
+    const chromeRows = (0, prompt_detect_multiple_choice_1.findClaudeChrome)(lines, 0, end).rows;
     let index = end - 1;
     while (index >= 0 &&
         (lines[index].trim() === '' ||
-            panelRows.has(index) ||
+            chromeRows.has(index) ||
             patterns_1.CLAUDE_EFFORT_CHIP_PATTERN.test(lines[index]))) {
         index--;
     }

package/dist/server/src/lib/detection/tools/claude/picker-chrome.js

@@ -0,0 +1,239 @@
+"use strict";
+/**
+ * The AskUserQuestion picker's own chrome, as claude-cli 2.1.268 draws it
+ * (Issue #2486).
+ *
+ * Two parts of the picker are drawn AROUND the dialog rather than as part of it,
+ * and the detectors read both as if they were the dialog:
+ *
+ * - **The tab row** above the question: `←  ☐ 権限モード  ☐ Goal/範囲  ✔ Submit  →`
+ *   for a multi-question call, ` ☐ 権限モード ` for a single question. The upward
+ *   scans that build `question` and `approvalTarget` swept it up, together with
+ *   whatever the transcript showed above it (the previous tool's row).
+ * - **The preview pane.** When an option carries a `preview`, the options column
+ *   narrows to ~32 columns and a box opens to its right: `┌─…─┐` at the end of
+ *   option 1's row, `│ … │` rows under it, `└─…─┘`, and `Notes: press n to add
+ *   notes` at the box's indent below that. Its ~20 rows sit between the options
+ *   and the footer, which put the options out of reach of the dialog reader's
+ *   footer scan — `detectClaudeDialog` found no block, and `/prompt-response`
+ *   refused the open dialog as `prompt_no_longer_active` (the refusal #2486
+ *   reported). Its text also rode along on the option rows it shares a line with.
+ *
+ * Measured on a private tmux socket at the production 200x1000 geometry
+ * (`tests/fixtures/claude-live-2486/`): the tab row alone did not stop
+ * `detectClaudeDialog`; the pane did, with or without a tab row.
+ *
+ * ## A leaf on purpose
+ *
+ * Imports nothing, so `lib/chat/chat-tool-approvals.ts` — which client
+ * components reach — takes its tab-bar pattern from here rather than keeping a
+ * second copy of what the bar looks like (#2460 strips it from rows stored before
+ * this Issue stopped the detector from putting it there).
+ *
+ * ## Why characters and not columns
+ *
+ * Every reader sees one of two spellings of these rows: the capture with its box
+ * drawing, or the same capture after `stripBoxDrawing` (the Auto-Yes poller and
+ * every `detectPrompt` caller). `stripBoxDrawing` removes a leading `│` with the
+ * whitespace in front of it, so a pane row with nothing in the options column
+ * loses its left border and slides to column 0, while a row that shares its
+ * line with an option keeps the border in the middle. A column position cannot
+ * follow that — and `terminal-columns.ts` deliberately counts a CJK character as
+ * one column — so the pane is found by structure instead: its top border on
+ * option 1's row, a bottom border of the same width, the FIRST `│` on each row
+ * in between, and the picker's footer under it all. That reads the same in both
+ * spellings.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ASK_USER_QUESTION_PICKER_FOOTER_PATTERN = exports.ASK_USER_QUESTION_TAB_BAR_PREFIX_PATTERN = void 0;
+exports.isAskUserQuestionTabRow = isAskUserQuestionTabRow;
+exports.findAskUserQuestionTabRow = findAskUserQuestionTabRow;
+exports.findClaudePreviewPanes = findClaudePreviewPanes;
+/**
+ * The multi-question tab bar: `←`, one checkbox per question, `✔ Submit`, `→`.
+ *
+ * A tab name may hold spaces, Japanese or `/` (`Goal/範囲`); the class excludes
+ * only the bar's own glyphs. `(?:[☐☒☑][^…☐☒☑…]*)+` cannot backtrack: every
+ * repetition starts with a checkbox the inner class excludes. ReDoS-safe.
+ */
+const TAB_BAR_SOURCE = String.raw `←\s*(?:[☐☒☑][^←→☐☒☑✔]*)+✔\s*Submit\s*→`;
+/**
+ * The tab bar at the FRONT of a string an upward scan swept it into (#2460).
+ *
+ * Stored `question` values from before #2486 start with it; the chat surface
+ * strips it at display time. Unanchored at the end on purpose — the question
+ * follows it.
+ */
+exports.ASK_USER_QUESTION_TAB_BAR_PREFIX_PATTERN = new RegExp(`^${TAB_BAR_SOURCE}\\s*`);
+/**
+ * The tab bar as a whole pane row.
+ *
+ * At most one leading space: Claude draws it at column 0, and a row the
+ * transcript indents (tool output, a quoted reply) is not the picker's.
+ */
+const TAB_BAR_ROW_PATTERN = new RegExp(`^\\s?${TAB_BAR_SOURCE}$`);
+/**
+ * A single question's tab: ` ☐ 権限モード `.
+ *
+ * - At most one leading space, like the bar. TodoWrite's `☐ task` rows sit under
+ *   `⎿` and are indented further, so they do not match.
+ * - The header may not begin with a digit: `☐ 1. Blue` is how a multi-select
+ *   option would read, and an option row must never be taken for chrome.
+ * - AskUserQuestion caps a header at 12 characters, so 40 is generous and keeps a
+ *   row of prose that happens to start with a checkbox from qualifying.
+ */
+const SINGLE_TAB_ROW_PATTERN = /^\s?[☐☒☑] [^\s\d←→☐☒☑✔][^←→☐☒☑✔]{0,40}$/;
+/**
+ * The picker's footer: `Enter to select · ↑/↓ to navigate · … · Esc to cancel`.
+ *
+ * The generic parser trims its scan at it and flags `isAskUserQuestion` from it
+ * (#807); the pane finder below requires it under a pane (#2486). One pattern for
+ * both, so "this is a live picker" means the same thing to each. A single
+ * unbounded quantifier between literal anchors — ReDoS safe.
+ */
+exports.ASK_USER_QUESTION_PICKER_FOOTER_PATTERN = /Enter\s+to\s+select\b.*\bnavigate\b/i;
+/** Whether `row` is an AskUserQuestion picker's tab row, in either form. */
+function isAskUserQuestionTabRow(row) {
+    const text = row.trimEnd();
+    return TAB_BAR_ROW_PATTERN.test(text) || SINGLE_TAB_ROW_PATTERN.test(text);
+}
+/**
+ * The tab row above the question whose last row is `questionRow`, or -1.
+ *
+ * Only ever asked from a question or an option block upward, so the tab row is
+ * found where the picker draws it — above its own question — and nowhere else.
+ *
+ * @param lines - ANSI-stripped rows, box drawing optional
+ * @param questionRow - The question's last row (or the options' first row)
+ * @param lookback - How many rows above `questionRow` the tab row may sit
+ */
+function findAskUserQuestionTabRow(lines, questionRow, lookback) {
+    const floor = Math.max(0, questionRow - lookback);
+    for (let i = questionRow - 1; i >= floor; i--) {
+        if (isAskUserQuestionTabRow(lines[i] ?? ''))
+            return i;
+    }
+    return -1;
+}
+/** The pane's top border, closing option 1's row: `❯ 1. label   ┌───┐`. */
+const PREVIEW_TOP_BORDER_PATTERN = /┌(─+)┐\s*$/;
+/**
+ * What must precede the top border on its row: option 1, cursor or not.
+ *
+ * One of the two anchors that keep a box Claude renders in the TRANSCRIPT — a
+ * Markdown table, a diagram in a reply — from being taken for a pane: those
+ * start at the transcript's own indent, not on a numbered option row. The other
+ * is the picker footer ({@link hasPickerFooterBelow}).
+ */
+const PREVIEW_ANCHOR_OPTION_PATTERN = /^\s*(?:[❯›>]\s*)?1\.\s+\S/;
+/** The pane's bottom border, alone on its row; the indent is the pane's column. */
+const PREVIEW_BOTTOM_BORDER_PATTERN = /^( *)└(─+)┘\s*$/;
+/** The pane's left border. The first one on a row is the border, never content. */
+const PREVIEW_LEFT_BORDER = '│';
+/**
+ * What the options column may hold beside the pane: an option row, or the
+ * wrapped tail of a label (`    (Recommended)`). Anything else to the left of a
+ * `│` is pane content that `stripBoxDrawing` slid left, and the row is pane.
+ */
+const OPTION_COLUMN_PATTERN = /^\s*(?:[❯›>]\s*)?\d{1,2}\.\s+\S|^\s{2,}\S/;
+/** How far below its top border a pane's bottom border may be looked for. */
+const MAX_PREVIEW_ROWS = 80;
+/**
+ * How many non-blank rows may separate a pane (and its notes) from the picker
+ * footer. Measured: the separator rule and the unnumbered `Chat about this`.
+ */
+const PICKER_FOOTER_LOOKAHEAD_ROWS = 4;
+function leadingSpaces(row) {
+    return row.length - row.trimStart().length;
+}
+/**
+ * Whether the picker's footer follows `from` within a few rows.
+ *
+ * A pane belongs to a LIVE picker, whose footer sits right under it. A reply
+ * that quotes a preview picker — box, cursor and all — has no footer under it;
+ * claiming its rows as chrome would hand the dialog reader the quoted options
+ * as if nothing followed them. Read past the caller's region on purpose: the
+ * generic parser's region ENDS at this footer.
+ */
+function hasPickerFooterBelow(lines, from) {
+    let seen = 0;
+    for (let i = from; i < lines.length && seen < PICKER_FOOTER_LOOKAHEAD_ROWS; i++) {
+        const row = lines[i];
+        if (row.trim() === '')
+            continue;
+        if (exports.ASK_USER_QUESTION_PICKER_FOOTER_PATTERN.test(row))
+            return true;
+        seen++;
+    }
+    return false;
+}
+/**
+ * Find the AskUserQuestion preview pane(s) in [start, end).
+ *
+ * A pane is claimed only when all of it is on screen: a top border on option
+ * 1's row, a bottom border of exactly the same width below it, and the picker's
+ * footer under that. Anything less — a pane caught mid-draw, a quoted one — is
+ * left alone, which is the safe direction: its rows are read as they were before
+ * this Issue, and the dialog reader declines the frame rather than trusting half
+ * a box.
+ *
+ * @param lines - ANSI-stripped rows, box drawing optional
+ * @param start - First index to consider (inclusive)
+ * @param end - Last index to consider (exclusive)
+ */
+function findClaudePreviewPanes(lines, start, end) {
+    const rows = new Set();
+    const cuts = new Map();
+    const last = Math.min(end, lines.length);
+    for (let top = Math.max(0, start); top < last; top++) {
+        const row = lines[top];
+        if (!row.includes('┌'))
+            continue;
+        const topBorder = PREVIEW_TOP_BORDER_PATTERN.exec(row);
+        if (!topBorder || !PREVIEW_ANCHOR_OPTION_PATTERN.test(row.slice(0, topBorder.index)))
+            continue;
+        let bottom = -1;
+        let indent = 0;
+        for (let i = top + 1; i < Math.min(last, top + MAX_PREVIEW_ROWS); i++) {
+            const bottomBorder = PREVIEW_BOTTOM_BORDER_PATTERN.exec(lines[i]);
+            if (bottomBorder && bottomBorder[2].length === topBorder[1].length) {
+                bottom = i;
+                indent = bottomBorder[1].length;
+                break;
+            }
+        }
+        if (bottom < 0)
+            continue;
+        const paneRows = [bottom];
+        const paneCuts = [[top, topBorder.index]];
+        for (let i = top + 1; i < bottom; i++) {
+            const border = lines[i].indexOf(PREVIEW_LEFT_BORDER);
+            const optionColumn = border > 0 ? lines[i].slice(0, border) : '';
+            if (optionColumn.trim() !== '' && OPTION_COLUMN_PATTERN.test(optionColumn)) {
+                paneCuts.push([i, border]);
+            }
+            else {
+                paneRows.push(i);
+            }
+        }
+        // `Notes: press n to add notes` — the pane's column continues under the box
+        // at the box's own indent, which no row of the dialog shares.
+        let next = bottom + 1;
+        for (; next < last; next++) {
+            const below = lines[next];
+            if (below.trim() === '')
+                continue;
+            if (leadingSpaces(below) !== indent)
+                break;
+            paneRows.push(next);
+        }
+        if (!hasPickerFooterBelow(lines, next))
+            continue;
+        for (const paneRow of paneRows)
+            rows.add(paneRow);
+        for (const [cutRow, index] of paneCuts)
+            cuts.set(cutRow, index);
+        top = next - 1;
+    }
+    return { rows, cuts };
+}

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

@@ -35,11 +35,35 @@
  * bullet — ` ● Which color scheme do you prefer?` is a live row of
  * `askuserquestion-submit-taskpanel.txt`. Accepting it here would let Claude's
  * own prose vouch for itself, which is the #1896 failure with a different glyph.
+ *
+ * ## Claude's pinned panels are not a footer (Issue #2468)
+ *
+ * claude-cli 2.1.267 draws a right-aligned HUD row at the bottom of the pane
+ * (`+28 files edited before this session (show)` / `No changes this session`,
+ * `tests/fixtures/claude-live-2468/`). Under the footer-less AskUserQuestion
+ * screen it was read as that screen's footer, failed the footer test, and the
+ * open dialog was refused. The footer guard therefore reads the rows under the
+ * options through `findClaudeTaskPanelLines` — the same set the transcript-tail
+ * walk steps over — and a footer made only of panel rows is no footer.
+ *
+ * ## An AskUserQuestion preview pane is chrome too (Issue #2486)
+ *
+ * claude-cli 2.1.268 opens a box to the right of the options when an option
+ * carries a `preview` (`tests/fixtures/claude-live-2486/`). Its ~20 rows sit
+ * between the last option and the footer, so the block reader's footer scan —
+ * eight non-blank rows — ran out on pane rows, found no option, and an open
+ * picker was refused as `prompt_no_longer_active`. The region is therefore read
+ * with Claude's chrome masked out (`findClaudeChrome` / `maskClaudeChrome`):
+ * the reading the transcript-tail walk and the generic parser use as well. The
+ * picker's tab row bounds the context scan above the options for the same
+ * reason in the other direction.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectClaudeDialog = detectClaudeDialog;
 const cli_patterns_1 = require("../../cli-patterns");
+const prompt_detect_multiple_choice_1 = require("../../prompt-detect-multiple-choice");
 const dialog_block_1 = require("../dialog-block");
+const picker_chrome_1 = require("./picker-chrome");
 /**
  * Claude's dialog footers, in every spelling measured.
  *
@@ -62,10 +86,16 @@ const CLAUDE_PERMISSION_QUESTION_PATTERN = /do you want to\b|allow\b.*\?$/i;
 const CLAUDE_ASK_USER_QUESTION_PATTERN = /ready to submit your answers\?|review your answers/i;
 /** The `/model` overlay's footer verb (Issue #1495). */
 const CLAUDE_PICKER_FOOTER_PATTERN = /set\s+as\s+default/i;
-/** The non-blank rows immediately above `firstRow`, nearest first. */
+/**
+ * The non-blank rows immediately above `firstRow`, nearest first — up to an
+ * AskUserQuestion picker's tab row, which is the dialog's top edge (Issue
+ * #2486). Above it is the transcript, whose rows have no say in what kind of
+ * dialog this is.
+ */
 function readContextAbove(lines, firstRow) {
+    const tabRow = (0, picker_chrome_1.findAskUserQuestionTabRow)(lines, firstRow, prompt_detect_multiple_choice_1.APPROVAL_TARGET_MAX_LOOKBACK);
     const rows = [];
-    for (let i = firstRow - 1; i >= 0 && rows.length < QUESTION_SCAN_ROWS; i--) {
+    for (let i = firstRow - 1; i > tabRow && rows.length < QUESTION_SCAN_ROWS; i--) {
         const row = lines[i].trim();
         if (row === '')
             continue;
@@ -73,6 +103,26 @@ function readContextAbove(lines, firstRow) {
     }
     return rows.join('\n');
 }
+/**
+ * The non-blank rows in [from, end) — the block's footer — without Claude's
+ * chrome (Issue #2468).
+ *
+ * `findClaudeTranscriptTail` already steps over the panels, so normally none is
+ * in range. #2468 is what "normally" cost: a HUD row the tail walk did not know
+ * became the tail, then the footer, and the one dialog with no footer of its own
+ * was refused over a row of chrome. Reading the range through the same chrome
+ * the tail walk uses keeps the two rules from disagreeing about what is chrome —
+ * and since #2486 that includes the preview pane, whose rows sit exactly here.
+ */
+function readFooter(lines, chromeRows, from, end) {
+    const rows = [];
+    for (let i = from; i < Math.min(end, lines.length); i++) {
+        const row = lines[i].trim();
+        if (row !== '' && !chromeRows.has(i))
+            rows.push(row);
+    }
+    return rows.join('\n');
+}
 function classify(context, footer) {
     if (CLAUDE_ASK_USER_QUESTION_PATTERN.test(context))
         return 'ask_user';
@@ -97,7 +147,23 @@ function detectClaudeDialog(frame, context) {
     // `frame.contentLines` is valid here too — and a frame whose gutter the
     // Auto-Yes poller already removed parses to the same rows.
     const lines = (0, cli_patterns_1.stripBoxDrawing)(frame.clean).split('\n');
-    const block = (0, dialog_block_1.findNumberedOptionBlock)(lines, context.transcriptTail + 1);
+    const end = context.transcriptTail + 1;
+    // Issue #2486: read the region with Claude's chrome taken out. An
+    // AskUserQuestion preview pane puts ~20 rows between the options and the
+    // footer and shares its top rows with the options; unmasked, the block reader's
+    // footer scan ran out on pane rows before it reached an option, and the open
+    // dialog was refused. Masking keeps row indices, so everything below reports
+    // positions in `lines` unchanged.
+    //
+    // The chrome is measured on the rows as they ARRIVED, not on `lines`: the
+    // Auto-Yes poller hands this a frame it already box-stripped, and a second
+    // `stripBoxDrawing` removes the pane border an option row is left ending with
+    // (`  2. ファイル読取のみで続行       │`) — the one mark that the row shares its
+    // line with the pane. The cuts carry over, because a strip only ever shortens
+    // such a row from the right.
+    const chrome = (0, prompt_detect_multiple_choice_1.findClaudeChrome)(frame.contentLines, 0, end);
+    const visible = (0, prompt_detect_multiple_choice_1.maskClaudeChrome)(lines, chrome);
+    const block = (0, dialog_block_1.findNumberedOptionBlock)(visible, end);
     if (!block)
         return null;
     // Guard 1: the selection cursor. Claude puts it on the highlighted option of
@@ -108,12 +174,14 @@ function detectClaudeDialog(frame, context) {
     // Guard 2: whatever sits between the options and the end of the transcript
     // must be one of Claude's dialog footers, or nothing at all. A completion
     // marker (`✻ Brewed for 24s`) or a fresh line of prose there means the block
-    // is finished output with something after it, not an open dialog.
-    const footer = block.footer.trim();
+    // is finished output with something after it, not an open dialog. Claude's
+    // chrome is neither, so it is read out of it first (Issue #2468; an
+    // AskUserQuestion preview pane since #2486).
+    const footer = readFooter(visible, chrome.rows, block.lastRow + 1, end);
     if (footer !== '' && !CLAUDE_DIALOG_FOOTER_PATTERN.test(footer))
         return null;
     return {
-        kind: classify(readContextAbove(lines, block.firstRow), footer),
+        kind: classify(readContextAbove(visible, block.firstRow), footer),
         options: block.options,
         // Claude's menus take ↑/↓ + Enter, and `sendPromptAnswer` already knows
         // that: it NAVIGATES to the numbered option for claude rather than typing