commandmate 0.31.2 → 0.32.0

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

@@ -35,6 +35,7 @@
  * |-------------|------------------------------------------------------------------|
  * | codex       | footer:  `gpt-5.6-sol xhigh · ~/share/work/…`                     |
  * | claude      | banner:  `▝▜█████▛▘  Opus 5 (1M context) with xhigh effort · Claude Max` |
+ * | claude      | switch:  `  ⎿  Set model to Sonnet 5 for this session only` (#2361)  |
  * | antigravity | footer:  `? for shortcuts …               Gemini 3.7 Flash · hig` |
  * | antigravity | banner:  `    ▀▀▀▀▀▀▀▀      Gemini 3.7 Flash (High)`              |
  * | copilot     | footer:  `← open sidebar · … · tab next tab      GPT-5 mini · Medium` |
@@ -60,7 +61,7 @@
  * @see Issue #1784, Phase 2 of the model/effort visibility series
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANTIGRAVITY_MODEL_ID_EFFORT_PATTERN = exports.OPENCODE_STEP_MODEL_PATTERN = exports.COPILOT_MODEL_CHANGE_PATTERN = exports.ANTIGRAVITY_BANNER_MODEL_PATTERN = exports.ANTIGRAVITY_STATUS_BAR_HINT_PATTERN = exports.CLAUDE_STARTUP_BANNER_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
+exports.ANTIGRAVITY_MODEL_ID_EFFORT_PATTERN = exports.COMMAND_CODE_BANNER_MODELS_PATTERN = exports.OPENCODE_STEP_MODEL_PATTERN = exports.COPILOT_MODEL_CHANGE_PATTERN = exports.ANTIGRAVITY_BANNER_MODEL_PATTERN = exports.ANTIGRAVITY_STATUS_BAR_HINT_PATTERN = exports.CLAUDE_MODEL_SWITCH_PATTERN = exports.CLAUDE_STARTUP_BANNER_PATTERN = exports.CODEX_FOOTER_MODEL_PATTERN = exports.REASONING_EFFORT_LEVELS = void 0;
 exports.resolveEffortToken = resolveEffortToken;
 exports.extractModelInfo = extractModelInfo;
 exports.deriveEffortFromModelId = deriveEffortFromModelId;
@@ -219,6 +220,89 @@ function readClaudeBanner(line) {
         return null;
     return { model, effort: resolveEffortToken(match[2]) };
 }
+/**
+ * Reads `<model>[ with <effort> effort]` off the line Claude prints when the
+ * session's model changes (Issue #2361).
+ *
+ * Measured live on claude 2.1.263 for this Issue
+ * (`tests/fixtures/claude-model-switch-2361/`, and that directory's README).
+ * The confirmation is the `⎿` stdout row under the `/model` command, in the
+ * same place for the picker (`Enter` / `s`) and for `/model <arg>`:
+ *
+ *   `  ⎿  Set model to Sonnet 5 for this session only`
+ *   `  ⎿  Set model to Haiku 4.5 and saved as your default for new sessions`
+ *   `  ⎿  Set model to Opus 5 (1M context) and saved as your default for new sessions with high effort`
+ *   `  ⎿  Kept model as Haiku 4.5`                     (picker closed with Esc)
+ *
+ * **The Issue's starting point (`selection-shape.ts`, "Set model to Sonnet 5
+ * and saved as your default for new sessions") is one of three suffixes, not
+ * the line.** What was measured beyond it:
+ *
+ *  - **The scope suffix comes BEFORE the effort.** `… and saved as your default
+ *    for new sessions with high effort` — the effort is appended only when the
+ *    picker's `←/→` row was moved, and is absent otherwise even though the
+ *    session has one. So the effort is read when printed and left null when
+ *    not, and `recordCapturedModelInfo` keeps the previous effort — the
+ *    Issue's rule 3.
+ *  - **`Kept model as` is the Esc outcome** and names the current model. It is
+ *    read for the same reason the banner is: it is the TUI stating the model,
+ *    and on a session whose banner scrolled away it is the only thing on screen
+ *    that does.
+ *  - **The banner is rewritten in place on every switch** (fullscreen and
+ *    inline alike): `Fable 5.1 with xhigh effort` became `Sonnet 5 with xhigh
+ *    effort` on the same row, `history_size` unchanged — and `/effort` and
+ *    `/fast` rewrite it too. That decides the precedence in
+ *    {@link extractModelInfo}: **the banner wins while it is on screen, the
+ *    line is the fallback for when it is gone**
+ *    (`fullscreen-switch-sonnet-banner-scrolled.txt`). The Issue asked for
+ *    "whichever is lower", on the premise that the banner is static; measured,
+ *    that rule answers the STALE model on `fullscreen-fast-on.txt` — the
+ *    lowest confirmation there is `Kept model as Haiku 4.5`, printed before a
+ *    `/fast` moved the session to Opus and rewrote the banner above it to
+ *    `Opus 5 (1M context) with high effort`.
+ *  - **Haiku's rewritten banner has no effort clause** (`Haiku 4.5 · API Usage
+ *    Billing`), so {@link CLAUDE_STARTUP_BANNER_PATTERN} does not read it and
+ *    the confirmation line is what publishes the model there. The banner
+ *    pattern is deliberately not widened: without the `with … effort` anchor
+ *    a box-framed table row containing ` · ` would read as a banner.
+ *  - **`/fast` prints `⎿  ↯ Fast mode ON · model set to Opus 5 · $10/$50 per
+ *    Mtok` and is a model switch** (`PostModelSwitch` reported
+ *    `claude-fable-5-1` → `claude-opus-5[1m]` on the same keypress). It is NOT
+ *    read: the line spells the model `Opus 5` where the banner and `Kept model
+ *    as` spell it `Opus 5 (1M context)`, and within one channel #2357's
+ *    identity rule is exact, so reading it would announce a second, spurious
+ *    "change" the next time the fuller spelling appears. While the banner is
+ *    on screen the rewrite covers `/fast`; once it is gone the switch is
+ *    missed by this reader until the next `/model` line. Issue #2363 closed
+ *    that gap on the structured side: `PostModelSwitch` is registered and
+ *    reports `/fast` as `to_model: "claude-opus-5[1m]"` — one spelling, no
+ *    drift — so this reader stays the fallback for sessions the hook does not
+ *    reach (`lib/hooks/sources/claude/model-switch`).
+ *
+ * The `⎿` marker is required. Claude's own prose shares the pane with its
+ * chrome, and the 2.1.263 release notes alone contain 75 rows that mention
+ * a model (`fullscreen-switch-line-scrolled.txt`, which must read as unknown);
+ * the marker is what local-command output carries and prose does not. A value
+ * read here latches for the rest of the session.
+ *
+ * No /g. No nested quantifiers: the lazy label class is bounded by three
+ * literal-anchored alternatives and the end of the row; the `[^·]*` after the
+ * effort admits the parenthesised `(the effort applies to this session only)`
+ * note the binary can append, and stops at the `·` that opens the fast-mode
+ * / usage-credit suffixes. The lookahead keeps a row with no name at all from
+ * reading its own suffix as one. `ultracode` resolves to no
+ * {@link ReasoningEffort} and answers null, like Command Code's `max`.
+ */
+exports.CLAUDE_MODEL_SWITCH_PATTERN = /^\s*⎿\s+(?:Set model to|Kept model as)\s+(?!(?:and saved as your default|for this session only)\b)([A-Za-z0-9][A-Za-z0-9 .()[\]_:@/-]*?)(?:\s+(?:and saved as your default for new sessions|for this session only))?(?:\s+with\s+([A-Za-z]+)\s+effort\b[^·]*)?\s*(?:·.*)?$/;
+function readClaudeModelSwitchLine(line) {
+    const match = exports.CLAUDE_MODEL_SWITCH_PATTERN.exec(line);
+    if (!match)
+        return null;
+    const model = match[1].trim();
+    if (!isPlausibleModelLabel(model))
+        return null;
+    return { model, effort: match[2] ? resolveEffortToken(match[2]) : null };
+}
 // =============================================================================
 // Antigravity
 // =============================================================================
@@ -452,14 +536,95 @@ function readOpencodeStepMarker(line) {
     return isPlausibleModelLabel(model) ? { model, effort: null } : null;
 }
 // =============================================================================
+// Command Code (Issue #2358)
+// =============================================================================
+/**
+ * Reads `<model>[ with <effort> effort]` off the `# models:` row of the Command
+ * Code startup banner (Issue #2358).
+ *
+ * Command Code's hooks carry no model at all
+ * (`src/lib/hooks/sources/command-code/source.ts`: no `model` key on any
+ * captured payload), so the banner is the only place the value exists. It is
+ * the same three rows on 1.40.1, 1.47.1 and 1.49.0, straight under the
+ * block-art logo:
+ *
+ *   `# Command Code v1.49.0`
+ *   `# models: deepseek-v4-flash-(latest) · taste-1`
+ *   `# /path/to/cwd`
+ *
+ * **The Issue text says the row is `<model> · <taste>` and that there is no
+ * effort. The pane says otherwise.** Measured live on 1.49.0 for this Issue
+ * (`tests/fixtures/chat-dialog-card-2254/command-code-model-1-49-0-*.txt`, and
+ * that directory's README): the `/model` picker is followed by a second screen,
+ * `Select reasoning effort for <model>`
+ * (`Default` / `low` / `high` / `max`, the set varying by model), and a
+ * non-default choice is printed into the banner —
+ *
+ *   `# models: deepseek-v4-pro-(latest) with high effort · taste-1`
+ *   `# models: deepseek-v4-flash-(latest) with max effort · taste-1`   (also at launch, from config)
+ *   `# models: kimi-k3 with low effort · taste-1`
+ *
+ * — while `Default` prints the bare form the 18 earlier fixtures show. So:
+ *
+ *  - **The model is everything before ` with ` / ` · `, kept verbatim.** The
+ *    `(latest)` suffix is part of the id — it is how the picker spells the same
+ *    entry (`DeepSeek V4 Flash (latest)`), so stripping it would publish a name
+ *    the picker never shows. `MODEL_LABEL_SHAPE` admits the parentheses; the
+ *    bare token shape does not.
+ *  - **`taste-1` is not a model.** It is Command Code's "taste" setting (the
+ *    footer reads `? for shortcuts · taste on`), so everything from the dot on
+ *    is dropped, and the dot itself is optional.
+ *  - **The effort is read when the banner prints one, through the shared
+ *    vocabulary.** `low` / `high` resolve; `max` is not a
+ *    {@link ReasoningEffort} and answers null rather than widening a list every
+ *    other reader and the UI type depend on. The model half is published either
+ *    way: the ` with … effort` frame delimits it cleanly, so nothing is
+ *    half-read.
+ *
+ * ## After a `/model` switch (measured, 1.49.0)
+ *
+ * Command Code renders inline (`#{alternate_on}` is 0) and on a **model**
+ * change it re-emits its whole output, banner included, without growing the
+ * history: the `# models:` row was rewritten in place both while it sat on
+ * screen and after 1100 transcript rows had pushed it into scrollback. So
+ * bottom-up scanning is the whole rule, and a switch is visible on the next
+ * poll for as long as the banner is inside the captured window
+ * (`STATUS_DETECTION_CAPTURE_LINES` = 1000 rows from the bottom —
+ * `…-switch-banner-scrolled.txt` is a frame past that point, and answers
+ * unknown so the latch keeps the pre-switch value).
+ *
+ * An **effort-only** change on the current model does NOT rewrite the row: in
+ * three trials (`max`→`high`, `high`→`max`, `max`→`Default`) the banner kept the
+ * effort it first showed for that model, while `config.json` did change. That
+ * is a Command Code display defect, and this reader mirrors the screen — the
+ * effort published for a model is the one its banner row shows, which is the
+ * launch value or the value chosen when the model was first picked.
+ *
+ * No /g. No nested quantifiers: the lazy `[^·]+?` is bounded by the literal
+ * ` with `, the literal `·`, or the end of the line; the optional effort group
+ * is anchored on two literals and contains no quantified group of its own.
+ */
+exports.COMMAND_CODE_BANNER_MODELS_PATTERN = /^\s*#\s+models:\s*([^·]+?)(?:\s+with\s+([A-Za-z]+)\s+effort)?\s*(?:·|$)/i;
+function readCommandCodeBanner(line) {
+    const match = exports.COMMAND_CODE_BANNER_MODELS_PATTERN.exec(line);
+    if (!match)
+        return null;
+    const model = match[1].trim();
+    if (!isPlausibleModelLabel(model))
+        return null;
+    return { model, effort: match[2] ? resolveEffortToken(match[2]) : null };
+}
+// =============================================================================
 // Public API
 // =============================================================================
 /**
  * Scan a capture from the bottom up, returning the first line that reads.
  *
  * Bottom-up is the whole rule: the status bar is the last line of the frame, and
- * for Claude "the last banner wins" is how a mid-session `/model` switch — which
- * prints a fresh banner — overtakes the one from session start.
+ * for Claude "the last banner wins" is how a fresh banner overtakes the one from
+ * session start (on 2.1.263 a `/model` switch rewrites the banner in place
+ * instead, and prints a confirmation line the second scan reads once the banner
+ * is gone — Issue #2361).
  *
  * ANSI is stripped per line rather than over the whole blob so a malformed OSC
  * sequence can never swallow a newline and merge two lines into one.
@@ -498,7 +663,17 @@ function extractModelInfo(cliToolId, captureText) {
         case 'codex':
             return scanFromEnd(captureText, readCodexFooter) ?? unknown();
         case 'claude':
-            return scanFromEnd(captureText, readClaudeBanner) ?? unknown();
+            // Issue #2361. The banner is live chrome — rewritten in place by
+            // `/model`, `/effort` and `/fast` — so it wins for as long as it is on
+            // screen, and the lowest `/model` confirmation line is the fallback for
+            // the long session whose banner has scrolled away (see
+            // `readClaudeModelSwitchLine` for the measured precedence). Claude's
+            // hooks name the model on `SessionStart` alone — `/model` fires none of
+            // the events CommandMate registers — so on a switch the pane is the only
+            // channel that hears it.
+            return (scanFromEnd(captureText, readClaudeBanner) ??
+                scanFromEnd(captureText, readClaudeModelSwitchLine) ??
+                unknown());
         case 'antigravity':
             return (scanFromEnd(captureText, readAntigravityStatusBar) ??
                 scanFromEnd(captureText, readAntigravityBanner) ??
@@ -520,6 +695,12 @@ function extractModelInfo(cliToolId, captureText) {
         }
         case 'opencode':
             return scanFromEnd(captureText, readOpencodeStepMarker) ?? unknown();
+        case 'command-code':
+            // Issue #2358. The banner is the only source — hooks carry no model — and
+            // bottom-up is the same "last banner wins" rule Claude uses: a relaunch in
+            // the same pane overtakes the banner above it, and a `/model` switch
+            // rewrites the one row in place (see `readCommandCodeBanner`).
+            return scanFromEnd(captureText, readCommandCodeBanner) ?? unknown();
         default:
             return unknown();
     }

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

@@ -64,7 +64,8 @@
  * written once.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.hasDismissablePanelFooter = hasDismissablePanelFooter;
 exports.extractCommandCodeSelectionListFrame = extractCommandCodeSelectionListFrame;
 exports.readSelectionListShape = readSelectionListShape;
 exports.shouldOfferOptionNumbers = shouldOfferOptionNumbers;
@@ -150,6 +151,76 @@ const FILTER_INPUT_PATTERN = /\btype\s+to\s+search\b|\bsearch\s+\w+\s*(?:…|\.\
  * settled on for the same reason.
  */
 exports.COMMAND_CODE_SELECTION_LIST_FOOTER = /\benter\s+to\s+select\b\s*[·•]\s*esc\s+to\s+cancel\b/i;
+/**
+ * The footer of an overlay whose ONLY exit is the dismiss (Issue #2369).
+ *
+ * Measured on Command Code 1.49's `/usage`, whose last row is verbatim
+ * `Press Esc to close`. The panel above it is read-only — a plan header, two
+ * meters, a breakdown URL — so there is no highlight to move and no key to
+ * confirm with. Before this pattern existed nothing matched the screen, it
+ * reached the `default` floor, and the chat surface answered an
+ * eighteen-button `unclassified` card to a panel with one working key.
+ *
+ * ## Why it is this narrow
+ *
+ * Three narrowings, and each one is there because this predicate SUPPRESSES
+ * controls — a false positive takes the arrow pad and the answer keys away from
+ * a screen that needed them:
+ *
+ *  - **a verb before the key.** `Press`/`Hit`/`Type`, or nothing at all, but not
+ *    an arbitrary run of prose. `esc to cancel` on its own is the tail of every
+ *    picker footer in this file, including
+ *    {@link COMMAND_CODE_SELECTION_LIST_FOOTER}, and those screens have a
+ *    highlight;
+ *  - **`close`/`dismiss`/`exit`, never `cancel` or `go back`.** The distinction
+ *    is measured rather than stylistic: `cancel` is what a screen with a
+ *    COMMITTABLE choice calls its escape (claude's `/model`, codex's picker,
+ *    Command Code's own), while `close` is what a panel that decided nothing
+ *    calls it;
+ *  - **the whole row.** Anchored at both ends (leading/trailing space aside), so
+ *    a hint bar that offers a dismiss ALONGSIDE something else — `↑/↓ navigate ·
+ *    enter to select · esc to close` — does not match, and keeps the arrows the
+ *    other half of its sentence promises.
+ *
+ * Case-insensitive because the measured row is `Press Esc to close` and Command
+ * Code writes its picker hints in lower case; nothing rests on which it uses.
+ */
+exports.DISMISSABLE_PANEL_FOOTER_PATTERN = /^\s*(?:press|hit|type)?\s*(?:<)?esc(?:ape)?(?:>)?\s+to\s+(?:close|dismiss|exit)\b[\s.·•]*$/im;
+/**
+ * How many rows from the end of the content the dismiss footer is looked for.
+ *
+ * The same 15-row tail the detection chain hands a tool module as
+ * `NormalizedFrame.lastLines` (`STATUS_CHECK_LINE_COUNT`), restated as a number
+ * here because this module is a browser-safe leaf and `tools/frame.ts` pulls in
+ * `cli-patterns`. `detect.ts` reads `frame.lastLines` and never this constant,
+ * so the two cannot disagree about the detector's own window; this one bounds
+ * the CLIENT-side reading in {@link hasDismissablePanelFooter}.
+ */
+const DISMISSABLE_PANEL_TAIL_LINE_COUNT = 15;
+/**
+ * Whether the tail of this frame is a dismiss-only panel (Issue #2369).
+ *
+ * The same question `commandCodeStatusDetector.afterPrompt` asks of
+ * `frame.lastLines`, asked of a raw capture, so the chat surface can answer for
+ * a frame whose server verdict has not reached it. The pattern is shared rather
+ * than restated — one expression, two call sites, exactly as
+ * {@link COMMAND_CODE_SELECTION_LIST_FOOTER} is shared between the detector and
+ * the dialog card.
+ *
+ * @param frame - a raw `capture-pane -p -e` frame, ANSI intact
+ */
+function hasDismissablePanelFooter(frame) {
+    if (!frame)
+        return false;
+    const lines = (0, ansi_1.stripAnsi)(frame.replace(/\r\n/g, '\n')).split('\n');
+    let last = lines.length - 1;
+    while (last >= 0 && lines[last].trim() === '')
+        last -= 1;
+    if (last < 0)
+        return false;
+    const tail = lines.slice(Math.max(0, last + 1 - DISMISSABLE_PANEL_TAIL_LINE_COUNT), last + 1);
+    return tail.some((line) => exports.DISMISSABLE_PANEL_FOOTER_PATTERN.test(line));
+}
 /**
  * The horizontal rule Command Code draws directly above a full-screen dialog.
  *

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

@@ -64,6 +64,34 @@ exports.STATUS_REASON = {
      * `Type to search models...` box.
      */
     COMMAND_CODE_SELECTION_LIST: 'command_code_selection_list',
+    /**
+     * Issue #2369: a Command Code overlay that only Esc leaves.
+     *
+     * `/usage` opens a read-only panel — a plan header, two usage meters, a
+     * breakdown URL — whose last row is `Press Esc to close`. There is no
+     * highlight to move, no numbered option and no confirm key; the ONE thing the
+     * screen accepts is the dismiss.
+     *
+     * Distinct from {@link STATUS_REASON.COMMAND_CODE_SELECTION_LIST} because the
+     * two screens want different controls, and that is the whole of this Issue:
+     * before it, this panel matched no rule at all, reached the `default` floor
+     * and so raised `isUnclassifiedActive` — which the chat surface answers with
+     * `TerminalEscapeHatch` plus `PromptAnswerKeys`, eighteen buttons (arrows,
+     * Enter, Esc, `1`-`9`, `y`, `n`) of which exactly one does anything. Reporting
+     * the selection-list token instead would put the arrow pad on the card and
+     * tell an operator reading `capture --json` that a moving highlight had been
+     * read off a panel that has none.
+     *
+     * Deliberately NOT a member of `SELECTION_LIST_REASONS`
+     * (`lib/detection/status-detector.ts`): that set is what `isSelectionListActive`
+     * — and therefore the arrow pad — is derived from. The flag this one feeds is
+     * `isDismissablePanelActive`, published beside it.
+     *
+     * The vocabulary is Command Code's alone for now (方針書 §4 D2's tool-by-tool
+     * rule): the SHAPE "an overlay whose footer offers only a dismiss" is general,
+     * the sentence that identifies it was measured on one tool.
+     */
+    COMMAND_CODE_DISMISSABLE_PANEL: 'command_code_dismissable_panel',
     COPILOT_SELECTION_LIST: 'copilot_selection_list',
     CODEX_SELECTION_LIST: 'codex_selection_list',
     /** Issue #1017: Codex pager / edit-previous (transcript) mode. */

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

@@ -3,16 +3,17 @@
  * Antigravity (agy) status detector (Issue #1927, 方針書 §4 D2).
  *
  * A verbatim lift of the `cliToolId === 'antigravity'` blocks (priorities 0.9
- * and 2.8) out of `detectSessionStatus`.
+ * and 2.8) out of `detectSessionStatus`, plus the Issue #2364 dialog reading in
+ * `beforePrompt`.
  *
  * No `readIdleEvidence`: agy's idle branch reads the same always-visible `> `
- * input box that #1885 showed is not evidence on its own, and no IDLE agy frame
- * has been captured to measure a better rule from. (Issue #2270 added live
- * 1.1.25 captures, but only of the permission dialog and the `/model` picker —
- * both `waiting`.) Per §4 D1 決定 1's tool-by-tool rollout (DR2-002) a tool
- * without a measured rule keeps the pre-#1927 reading, and its rule must be read
- * off ITS OWN frames rather than inferred from another tool's — which is exactly
- * the mistake #1979 corrected.
+ * input box that #1885 showed is not evidence on its own. Issue #2364 captured
+ * the first live IDLE agy frame (`antigravity-live-2364/boot-idle.txt`: a bare
+ * `>` between two rules over a `? for shortcuts` status row), so a rule could
+ * now be measured — but it has not been, and per §4 D1 決定 1's tool-by-tool
+ * rollout (DR2-002) a tool without a measured rule keeps the pre-#1927 reading.
+ * Its rule must be read off ITS OWN frames rather than inferred from another
+ * tool's — which is exactly the mistake #1979 corrected.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.antigravityStatusDetector = exports.VERIFIED_AGAINST = void 0;
@@ -20,12 +21,66 @@ const cli_patterns_1 = require("../../cli-patterns");
 const status_reason_1 = require("../../status-reason");
 const run_detection_1 = require("../run-detection");
 const verified_against_1 = require("../verified-against");
-/** agy build these rules were read off (Issue #988 / #995; value in ../verified-against, #1929). */
+const dialog_1 = require("./dialog");
+/** agy build these rules were read off (Issue #988 / #995 / #2364; value in ../verified-against, #1929). */
 exports.VERIFIED_AGAINST = verified_against_1.ANTIGRAVITY_VERIFIED_AGAINST;
+/**
+ * An agy screen only the terminal can drive: the `/model` picker, the folder
+ * trust screen, the slash-command popup — and the post-answer survey.
+ *
+ * `hasActivePrompt: false` with a reason in `SELECTION_LIST_REASONS` is what
+ * puts NavigationButtons (and the chat surface's "drive it from the terminal"
+ * card) on screen, and what makes `wait` stop with exit 10 instead of hanging.
+ */
+const SELECTION_LIST_VERDICT = {
+    status: 'waiting',
+    confidence: 'high',
+    reason: status_reason_1.STATUS_REASON.ANTIGRAVITY_SELECTION_LIST,
+    hasActivePrompt: false,
+    evidence: 'positive',
+};
+/**
+ * How close to the bottom of the content the survey row must be to count as
+ * open: itself, a blank row and the `? for shortcuts` status row.
+ */
+const SURVEY_TAIL_ROWS = 3;
+/**
+ * Is the post-answer survey the live screen, rather than a row of it left in
+ * the scrollback? (Issue #2364)
+ *
+ * agy retains scrollback, so the guard is positional: the `[1] Good … [0] Skip`
+ * row is the survey only while it sits within the last few content rows and
+ * no bare `>` composer has been drawn below it — the composer is what replaces
+ * it once the digit is typed.
+ */
+function isAntigravitySurveyOpen(contentLines) {
+    const tail = contentLines.slice(-SURVEY_TAIL_ROWS);
+    const surveyAt = tail.findIndex(row => cli_patterns_1.ANTIGRAVITY_SURVEY_PATTERN.test(row));
+    if (surveyAt < 0)
+        return false;
+    const { promptPattern } = (0, cli_patterns_1.getCliToolPatterns)('antigravity');
+    return !tail.slice(surveyAt + 1).some(row => promptPattern.test(row));
+}
 exports.antigravityStatusDetector = (0, run_detection_1.createToolStatusDetector)({
     tool: 'antigravity',
     verifiedAgainst: exports.VERIFIED_AGAINST,
     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
+        // CLI experience so far?`. Nothing else on that frame is readable: there is
+        // no `↑/↓ Navigate` footer and no bare `>` row, so it used to reach the
+        // `default` floor as `running`, and the chat surface showed "generating"
+        // over a screen waiting for a keypress.
+        //
+        // Published as a selection list rather than as a `multiple_choice` prompt
+        // on purpose. The screen takes a TYPED digit (`0` closes it), while
+        // `sendPromptAnswer` drives every numeric agy answer with arrow keys +
+        // Enter (Issue #999) — a `0. Skip` button on PromptPanel would send `Up`,
+        // `Enter` to a screen that does not navigate. As a selection list the
+        // frame is `waiting`, `wait` returns, the waiting push fires, and the chat
+        // surface's card points at the terminal, where a single `0` is the answer.
+        if (isAntigravitySurveyOpen(frame.contentLines))
+            return SELECTION_LIST_VERDICT;
         // 0.9. Antigravity: selection list detection BEFORE thinking detection (Issue #995)
         // agy's "Switch Model" (and other) selection TUIs render an "esc to cancel"
         // footer that ANTIGRAVITY_THINKING_PATTERN also matches, so the generic thinking
@@ -35,7 +90,7 @@ exports.antigravityStatusDetector = (0, run_detection_1.createToolStatusDetector
         // Codex early-detection pattern.
         if (!cli_patterns_1.ANTIGRAVITY_SELECTION_LIST_PATTERN.test(frame.lastLines))
             return null;
-        // Issue #2270: except when the frame is the NUMBERED permission dialog.
+        // Issue #2270 / #2364: except when the frame is a NUMBERED dialog.
         //
         // #997 widened the pattern above to the bare `↑/↓ Navigate` footer so the
         // "Do you want to proceed?" menu would reach this branch — but this branch
@@ -47,23 +102,48 @@ exports.antigravityStatusDetector = (0, run_detection_1.createToolStatusDetector
         // with four `multiple_choice` options and the push notification sent
         // `kind: 'prompt'` — one screen, two answers.
         //
-        // Returning null hands the frame to priority 1, where `detectPrompt` with
-        // `buildDetectPromptOptions('antigravity')` already reads it as that same
-        // 4-option `multiple_choice` (Issue #999). That is what puts
-        // `hasActivePrompt: true` and `promptData` on the wire, so PromptPanel and
-        // the legacy Auto-Yes path both work and all three producers agree.
+        // #2270 returned null here and let priority 1's generic `detectPrompt` read
+        // the frame. That held for the one dialog it measured and broke on the next
+        // two (#2364): the file-creation menu never passed its `Do you want to
+        // proceed?` discriminator, and a Bash approval whose option labels wrap —
+        // agy prints the command inside the label, so most of them do — passed it
+        // and then failed in the one-row-per-option parser, after which the `esc
+        // to cancel` status row matched the thinking pattern and the pane went out
+        // as `running` / `thinking_indicator`. So the discriminator is structural
+        // now (`isAntigravityNumberedDialog`), the frame is read by agy's own
+        // reader (`./dialog.ts`), and a frame the reader cannot parse is published
+        // as UNCLASSIFIED — never as a picker, and never as "generating", which is
+        // the worst answer a waiting dialog can get: `wait` never returns from it.
+        //
+        // `stripBoxDrawing` here, as priority 1 applies it before `detectPrompt`,
+        // so this verdict and the response poller's (`detectPromptWithOptions`,
+        // which reads the same helper over the same spelling) carry one question,
+        // one option list and one `instructionText` for one screen.
         //
         // #995's own case is untouched: the Switch Model picker carries no numbered
-        // rows, so it still resolves here and still keeps NavigationButtons.
-        if ((0, cli_patterns_1.isAntigravityNumberedDialog)(frame.lastLines))
-            return null;
-        return {
-            status: 'waiting',
-            confidence: 'high',
-            reason: status_reason_1.STATUS_REASON.ANTIGRAVITY_SELECTION_LIST,
-            hasActivePrompt: false,
-            evidence: 'positive',
-        };
+        // rows, so it still resolves below and still keeps NavigationButtons.
+        const text = (0, cli_patterns_1.stripBoxDrawing)(frame.clean);
+        if ((0, cli_patterns_1.isAntigravityNumberedDialog)(text)) {
+            const promptDetection = (0, dialog_1.detectAntigravityNumberedDialogPrompt)(text);
+            if (promptDetection !== null) {
+                return {
+                    status: 'waiting',
+                    confidence: 'high',
+                    reason: status_reason_1.STATUS_REASON.PROMPT_DETECTED,
+                    hasActivePrompt: true,
+                    evidence: 'positive',
+                    promptDetection,
+                };
+            }
+            return {
+                status: 'running',
+                confidence: 'low',
+                reason: status_reason_1.STATUS_REASON.UNKNOWN_FRAME,
+                hasActivePrompt: false,
+                evidence: 'none',
+            };
+        }
+        return SELECTION_LIST_VERDICT;
     },
     afterThinking(frame) {
         // 2.8. Antigravity (agy) footer-based detection (Issue #988)