commandmate 0.31.2 → 0.31.3

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

@@ -6,7 +6,7 @@
  * Issue #479: Extracted from db.ts for single-responsibility separation
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UNKEYED_USER_MESSAGE_LIMIT = exports.ACTIVE_FILTER = void 0;
+exports.MODEL_CHANGE_REQUEST_ID_PREFIX = exports.UNKEYED_USER_MESSAGE_LIMIT = exports.ACTIVE_FILTER = void 0;
 exports.getLastAssistantMessageAt = getLastAssistantMessageAt;
 exports.createMessage = createMessage;
 exports.updateMessageContent = updateMessageContent;
@@ -28,6 +28,7 @@ exports.getMessageById = getMessageById;
 exports.updatePromptData = updatePromptData;
 exports.markPendingPromptsAsAnswered = markPendingPromptsAsAnswered;
 exports.recordAnsweredPrompt = recordAnsweredPrompt;
+exports.createModelChangeMessage = createModelChangeMessage;
 const crypto_1 = require("crypto");
 const logger_1 = require("../../lib/logger");
 const logger = (0, logger_1.createLogger)('chat-db');
@@ -654,3 +655,45 @@ function recordAnsweredPrompt(db, params) {
     });
     return { message, created: true };
 }
+// ============================================================================
+// Model change rows (Issue #2357)
+// ============================================================================
+/**
+ * The `request_id` prefix a model-change row carries (Issue #2357).
+ *
+ * `chat_messages` has no `system` role — `role` is `user | assistant` and every
+ * reader of the column branches on exactly those two — so the sentence "the
+ * model changed" is stored as an assistant row and *identified* by its request
+ * id instead: `model-changed:<epoch ms>`. A reader that wants to style these
+ * rows differently, or a `capture --prompts`-style audit that wants to list
+ * them, matches on this prefix rather than on the wording, which is localized
+ * at write time and would otherwise have to be matched in every language.
+ */
+exports.MODEL_CHANGE_REQUEST_ID_PREFIX = 'model-changed:';
+/**
+ * Persist "the model changed" into the instance's history (Issue #2357).
+ *
+ * One row per transition, written by the model edge's subscriber and nothing
+ * else — the chat transcript and the History tab both read this table, so one
+ * write reaches both, and the same row is what the `message` frame pushes to a
+ * transcript that is open at the time.
+ *
+ * An assistant row, on purpose: the transcript groups an assistant row that
+ * follows no user row as a standalone reply, which is the closest the schema
+ * comes to a system line without a migration. The row is a `normal` message
+ * (not a `prompt`), so nothing that scans for open dialogs will mistake it for
+ * one, and the request id (see {@link MODEL_CHANGE_REQUEST_ID_PREFIX}) is what
+ * marks it.
+ */
+function createModelChangeMessage(db, params) {
+    return createMessage(db, {
+        worktreeId: params.worktreeId,
+        role: 'assistant',
+        content: params.content,
+        messageType: 'normal',
+        timestamp: new Date(params.at),
+        requestId: `${exports.MODEL_CHANGE_REQUEST_ID_PREFIX}${params.at}`,
+        cliToolId: params.cliToolId,
+        instanceId: params.instanceId ?? params.cliToolId,
+    });
+}

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

@@ -5,7 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
-exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NUMBERED_DIALOG_QUESTION_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = void 0;
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.isCodexPromptReady = isCodexPromptReady;
@@ -19,6 +19,7 @@ exports.readCopilotStatusBar = readCopilotStatusBar;
 exports.findCopilotChromeStart = findCopilotChromeStart;
 exports.isCopilotSelectionFrame = isCopilotSelectionFrame;
 exports.isCopilotFolderTrustDialog = isCopilotFolderTrustDialog;
+exports.locateAntigravityDialogRegion = locateAntigravityDialogRegion;
 exports.isAntigravityNumberedDialog = isAntigravityNumberedDialog;
 exports.findCommandCodeChromeStart = findCommandCodeChromeStart;
 exports.detectThinking = detectThinking;
@@ -1861,25 +1862,125 @@ exports.ANTIGRAVITY_SEPARATOR_PATTERN = /^─{3,}$/m;
  */
 exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = /Switch Model|↑\/↓\s*Navigate/m;
 /**
- * The question line agy draws above its numbered permission dialog
- * (Issue #2270; measured on agy 1.1.25, pane 200x1000, 2026-09-04).
+ * The `↑/↓ Navigate` hint agy draws under every arrow-key screen it owns
+ * (Issue #2364; measured on agy 1.1.27, pane 200x1000, 2026-09-06).
  *
- * Anchored to the whole line so a model's prose that merely quotes the phrase
- * inside a sentence cannot match it.
+ * The same token {@link ANTIGRAVITY_SELECTION_LIST_PATTERN} matches, split out
+ * because the numbered-dialog reader anchors on THIS row and reads upward from
+ * it. It is the one thing all four measured agy dialogs share — the `Do you want
+ * to proceed?` command menu, the `Allow creation of this file?` file menu, the
+ * folder-trust screen and the `/model` picker all end on it — while the words
+ * after it differ on every one (`tab Amend · f full diff`, `tab Amend · ctrl+g
+ * edit/expand command`, `enter Confirm`, `←/→ Effort  enter Select`).
  */
-exports.ANTIGRAVITY_NUMBERED_DIALOG_QUESTION_PATTERN = /^\s*Do you want to proceed\?\s*$/m;
+exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = /↑\/↓\s*Navigate/;
 /**
- * One numbered option row of that dialog: `> 1. Yes`, `  4. No`.
+ * One numbered option row of agy's dialogs: `> 1. Yes`, `  4. No`,
+ * `  2. No, deny creation`.
  *
- * The `>` gutter marks the highlighted row and is optional, because only one of
- * the four rows carries it.
+ * The `>` gutter marks the highlighted row and is optional, because only one
+ * of the rows carries it.
  */
 exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = /^\s*>?\s*\d+\.\s+\S/m;
 /**
- * Is this frame agy's NUMBERED permission dialog rather than one of its
- * arrow-key-only pickers? (Issue #2270)
+ * The header of agy's `/model` picker (Issue #995).
  *
- * Both agy screens share the `↑/↓ Navigate` footer that
+ * Kept as its own exclusion even though the picker's rows already fail the
+ * numbered-row test: the Issue #2364 rule is written as "footer + numbered rows
+ * + NOT the Switch Model picker", and the picker is the one agy screen whose
+ * misreading has a measured cost (#995: NavigationButtons vanished).
+ */
+exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = /^\s*Switch Model\s*$/;
+/**
+ * A row that ends the dialog block when reading UPWARD from the footer
+ * (Issue #2364).
+ *
+ * Everything agy draws above its own dialog panel carries one of these:
+ *
+ *  - a horizontal rule (the turn separator, the input-box border, or the rule
+ *    under the `Command` / `Create file` panel header);
+ *  - a `>`-prefixed row that is not a numbered option — the echoed user prompt,
+ *    the bare composer, the highlighted row of an UNNUMBERED picker (`> Gemini
+ *    3.8 Flash`, `> Yes, I trust this folder`) or of the slash-command popup
+ *    (`> /add-dir  Add a directory …`);
+ *  - a `●` tool-call row, a `⎿` tool-result row or a `▸ Thought for …` row.
+ *
+ * Bounding the block at the nearest one is what keeps a numbered list in the
+ * MODEL'S PROSE, sitting in the transcript above an open picker or popup, from
+ * being adopted as that screen's options. Wrapped option labels never start
+ * with any of these on the measured frames: agy prints the command text inside
+ * the quotes of `… commands that start with '<cmd>'`, indented under the row
+ * that opened it.
+ *
+ * `stripBoxDrawing` blanks the rule rows before the response poller's copy of
+ * the frame reaches this rule; the `●` / `>` rows survive it, so the block is
+ * bounded the same way on both paths.
+ */
+exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = /^\s*(?:─{3,}\s*$|[●⎿▸]|>(?!\s*\d+\.\s+\S))/;
+/**
+ * How many rows above the `↑/↓ Navigate` footer the dialog block may reach.
+ *
+ * The tallest measured frame (`dialog-bash-wrapped.txt`: header, rule,
+ * `Requesting permission for:`, a four-row command, the question and four
+ * options of which two wrap onto three rows each) spans 18 rows; the cap leaves
+ * room for a longer command without letting a boundary-free frame drag the
+ * whole transcript into the block.
+ */
+exports.ANTIGRAVITY_DIALOG_MAX_ROWS = 60;
+/**
+ * agy's post-answer survey row (Issue #2364).
+ *
+ * Drawn once, in place of the composer, after some tool decisions:
+ *
+ * ```
+ *  How's the CLI experience so far? Help us improve:
+ *  [1] Good  [2] Fine  [3] Bad  [0] Skip
+ *
+ * ? for shortcuts …
+ * ```
+ *
+ * Every option sits on ONE row in `[N] label` form and the screen takes a
+ * typed digit, not the arrow keys; there is no `↑/↓ Navigate` footer and no bare
+ * `>` composer, so before this pattern existed the frame reached the `default`
+ * floor — `running`, with the chat surface showing "generating" over a screen
+ * that was waiting for a keypress. Anchored to the whole row.
+ */
+exports.ANTIGRAVITY_SURVEY_PATTERN = /^\s*\[1\]\s*Good\s+\[2\]\s*Fine\s+\[3\]\s*Bad\s+\[0\]\s*Skip\s*$/m;
+/**
+ * Find the rows between the last boundary and the last `↑/↓ Navigate` footer
+ * (Issue #2364).
+ *
+ * The footer is searched from the bottom, so an older dialog still in the
+ * scrollback above a newer one is never the one read. Returns null when the
+ * frame has no footer at all.
+ *
+ * @param lines - ANSI-stripped rows, box drawing optional
+ */
+function locateAntigravityDialogRegion(lines) {
+    let footer = -1;
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN.test(lines[i])) {
+            footer = i;
+            break;
+        }
+    }
+    if (footer < 0)
+        return null;
+    const floor = Math.max(0, footer - exports.ANTIGRAVITY_DIALOG_MAX_ROWS);
+    let start = floor;
+    for (let i = footer - 1; i >= floor; i--) {
+        if (exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN.test(lines[i])) {
+            start = i + 1;
+            break;
+        }
+    }
+    return { start, footer };
+}
+/**
+ * Is this frame one of agy's NUMBERED dialogs rather than one of its
+ * arrow-key-only pickers? (Issue #2270, re-measured by Issue #2364)
+ *
+ * Both kinds of screen share the `↑/↓ Navigate` footer that
  * {@link ANTIGRAVITY_SELECTION_LIST_PATTERN} matches, which is why #997 could
  * widen that pattern to cover the permission menu — and why the menu then
  * resolved as `antigravity_selection_list`, `hasActivePrompt: false`. On the
@@ -1888,21 +1989,45 @@ exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = /^\s*>?\s*\d+\.\s+\S/m;
  * options 2-4 became unreachable, while the poller and the push notification
  * described the very same frame as a `multiple_choice` prompt.
  *
- * The discriminator is the pair below, not the footer:
- *
- *  - `Do you want to proceed?` on its own line, and
- *  - at least one `N. label` row.
- *
- * The Switch Model picker has neither (its rows are unnumbered model names and
- * its header is `Switch Model`), so it keeps the #995 reading. Every other agy
- * arrow-key TUI keeps it too — this is deliberately a rule about the ONE dialog
- * whose frames were measured, not a general "numbers mean prompt" inference.
+ * #2270 told the two apart by the question line, `Do you want to proceed?`,
+ * because that was the one dialog it had measured. #2364 measured a second one
+ * — agy 1.1.27's file-creation menu asks `Allow creation of this file?` above
+ * `1. Yes, allow creation` / `2. No, deny creation` — and it fell straight back
+ * into the selection-list reading. So the rule is now about the STRUCTURE the
+ * dialogs share and the pickers lack:
+ *
+ *  - the `↑/↓ Navigate` footer,
+ *  - at least two `N. label` rows between the nearest boundary row and that
+ *    footer ({@link ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN}), and
+ *  - no `Switch Model` header in that region.
+ *
+ * The Switch Model picker, the folder-trust screen and the slash-command popup
+ * all draw unnumbered rows (`> Gemini 3.8 Flash`, `> Yes, I trust this folder`,
+ * `> /add-dir …`), so they keep the #995 reading — and because a `>` row that
+ * is not numbered is itself a boundary, a numbered list in the transcript above
+ * one of them cannot be counted.
+ *
+ * True here means "hand the frame to the agy dialog reader"
+ * (`tools/antigravity/dialog.ts`), never "this is a prompt": a frame that
+ * passes this test and still fails to read is published as an unclassified
+ * frame, not as a selection list and never as "generating".
  *
  * Callers pass the same text they hand {@link ANTIGRAVITY_SELECTION_LIST_PATTERN}.
  */
 function isAntigravityNumberedDialog(text) {
-    return (exports.ANTIGRAVITY_NUMBERED_DIALOG_QUESTION_PATTERN.test(text) &&
-        exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN.test(text));
+    const lines = text.split('\n');
+    const region = locateAntigravityDialogRegion(lines);
+    if (region === null)
+        return false;
+    let numberedRows = 0;
+    for (let i = region.start; i < region.footer; i++) {
+        const line = lines[i];
+        if (exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN.test(line))
+            return false;
+        if (exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN.test(line))
+            numberedRows++;
+    }
+    return numberedRows >= 2;
 }
 /**
  * Antigravity (agy) skip patterns for response cleaning (Issue #988)
@@ -2421,6 +2546,15 @@ function buildDetectPromptOptions(cliToolId) {
     // the Pass 1 gate rejects these menus, so Auto-Yes never responds. Treat agy
     // like claude/opencode/copilot so Pass 2 collects its "1. Yes / … / N. No"
     // options and reports isPrompt=true.
+    //
+    // [Issue #2364] The `↑/↓ Navigate` dialogs themselves no longer reach
+    // `detectPrompt` on either production path: `tools/antigravity/detect.ts`
+    // (status) and `detectPromptWithOptions` (response poller) both read them
+    // with `detectAntigravityNumberedDialogPrompt` first, because the generic
+    // multiple-choice pass reads one row per option and agy wraps a long command
+    // across several rows of one label. What this setting still serves is every
+    // OTHER numbered agy screen — `/feedback`'s `1-6 Select & Continue` menu is
+    // the measured one — which the generic pass reads as before.
     if (cliToolId === 'antigravity') {
         return { requireDefaultIndicator: false };
     }

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