commandmate 0.31.3 → 0.32.1

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

@@ -0,0 +1,343 @@
+"use strict";
+/**
+ * The relay ledger's CRUD (Issue #2377, table from migration v60).
+ *
+ * Every state change a relay can undergo is a statement in this file, and each
+ * one that must happen at most once is written as a GUARDED update that reports
+ * whether it won. That is not a style choice: the turn's end is judged by two
+ * independent producers (the Stop hook and the poller) and the delivery pump can
+ * be re-entered by a timer while a first pass is still awaiting a send, so
+ * "read, decide, write" would deliver some replies twice. `better-sqlite3` is
+ * synchronous, so a single `UPDATE … WHERE <precondition>` plus `changes === 1`
+ * is a compare-and-set with no window in it.
+ *
+ * Shapes come from `@/lib/relay/types`, which knows nothing about SQL — the
+ * browser hook reads the same interfaces.
+ *
+ * @module lib/db/relay-db
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRelay = createRelay;
+exports.getRelayById = getRelayById;
+exports.listOpenRelaysTo = listOpenRelaysTo;
+exports.listOpenRelaysFrom = listOpenRelaysFrom;
+exports.getSessionRelaySummary = getSessionRelaySummary;
+exports.listOpenRelaysForWorktree = listOpenRelaysForWorktree;
+exports.countOpenRelaysBetween = countOpenRelaysBetween;
+exports.stashRelayPayload = stashRelayPayload;
+exports.listRelaysWithPendingPayload = listRelaysWithPendingPayload;
+exports.clearRelayPending = clearRelayPending;
+exports.markRelayDelivered = markRelayDelivered;
+exports.markRelayPromptNotified = markRelayPromptNotified;
+exports.getRelayPromptSignature = getRelayPromptSignature;
+exports.markRelayExpired = markRelayExpired;
+exports.listExpiredOpenRelays = listExpiredOpenRelays;
+exports.cancelRelay = cancelRelay;
+exports.countRelays = countRelays;
+const crypto_1 = require("crypto");
+const types_1 = require("../../lib/relay/types");
+const logger_1 = require("../../lib/logger");
+const logger = (0, logger_1.createLogger)('relay-db');
+/** Every column, in one place, so the readers cannot drift from each other. */
+const RELAY_COLUMNS = `
+  id, from_worktree_id, from_instance_id, to_worktree_id, to_instance_id,
+  state, hops, sent_request_id, pending_kind, pending_body, prompt_signature,
+  created_at, updated_at, expires_at, delivered_at
+`;
+function mapRelay(row) {
+    return {
+        id: row.id,
+        from: { worktreeId: row.from_worktree_id, instanceId: row.from_instance_id },
+        to: { worktreeId: row.to_worktree_id, instanceId: row.to_instance_id },
+        state: row.state,
+        hops: row.hops,
+        sentRequestId: row.sent_request_id,
+        pendingKind: row.pending_kind ?? null,
+        createdAt: row.created_at,
+        updatedAt: row.updated_at,
+        expiresAt: row.expires_at,
+        deliveredAt: row.delivered_at,
+    };
+}
+/** Insert a new `pending` relay and hand it back. */
+function createRelay(db, input) {
+    const id = (0, crypto_1.randomUUID)();
+    const now = input.now ?? Date.now();
+    db.prepare(`
+    INSERT INTO session_relays
+      (id, from_worktree_id, from_instance_id, to_worktree_id, to_instance_id,
+       state, hops, sent_request_id, pending_kind, pending_body, prompt_signature,
+       created_at, updated_at, expires_at, delivered_at)
+    VALUES (?, ?, ?, ?, ?, 'pending', ?, NULL, NULL, NULL, NULL, ?, ?, ?, NULL)
+  `).run(id, input.from.worktreeId, input.from.instanceId, input.to.worktreeId, input.to.instanceId, input.hops, now, now, input.expiresAt);
+    return {
+        id,
+        from: { ...input.from },
+        to: { ...input.to },
+        state: 'pending',
+        hops: input.hops,
+        sentRequestId: null,
+        pendingKind: null,
+        createdAt: now,
+        updatedAt: now,
+        expiresAt: input.expiresAt,
+        deliveredAt: null,
+    };
+}
+/** One relay by id, or null. */
+function getRelayById(db, id) {
+    const row = db
+        .prepare(`SELECT ${RELAY_COLUMNS} FROM session_relays WHERE id = ?`)
+        .get(id);
+    return row ? mapRelay(row) : null;
+}
+/** Placeholders for an `IN (…)` over the open states. */
+const OPEN_STATE_PLACEHOLDERS = types_1.OPEN_RELAY_STATES.map(() => '?').join(', ');
+/** Every still-open relay this session must answer (it is the `to` end). */
+function listOpenRelaysTo(db, endpoint) {
+    const rows = db
+        .prepare(`
+      SELECT ${RELAY_COLUMNS} FROM session_relays
+      WHERE to_worktree_id = ? AND to_instance_id = ?
+        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+      ORDER BY created_at ASC
+    `)
+        .all(endpoint.worktreeId, endpoint.instanceId, ...types_1.OPEN_RELAY_STATES);
+    return rows.map(mapRelay);
+}
+/** Every still-open relay this session is waiting on (it is the `from` end). */
+function listOpenRelaysFrom(db, endpoint) {
+    const rows = db
+        .prepare(`
+      SELECT ${RELAY_COLUMNS} FROM session_relays
+      WHERE from_worktree_id = ? AND from_instance_id = ?
+        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+      ORDER BY created_at ASC
+    `)
+        .all(endpoint.worktreeId, endpoint.instanceId, ...types_1.OPEN_RELAY_STATES);
+    return rows.map(mapRelay);
+}
+/** Both halves of {@link SessionRelaySummary} in one call. */
+function getSessionRelaySummary(db, endpoint) {
+    return {
+        owed: listOpenRelaysTo(db, endpoint),
+        awaiting: listOpenRelaysFrom(db, endpoint),
+    };
+}
+/** Every open relay in a worktree, whichever end it belongs to. */
+function listOpenRelaysForWorktree(db, worktreeId) {
+    const rows = db
+        .prepare(`
+      SELECT ${RELAY_COLUMNS} FROM session_relays
+      WHERE (from_worktree_id = ? OR to_worktree_id = ?)
+        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+      ORDER BY created_at ASC
+    `)
+        .all(worktreeId, worktreeId, ...types_1.OPEN_RELAY_STATES);
+    return rows.map(mapRelay);
+}
+/**
+ * How many open relays already run from `from` to `to`.
+ *
+ * The Issue's "a from→to pair must not sit at two pending relays at once": a
+ * second standing instruction to the same session says nothing the first one
+ * does not, and both would fire on the same finished turn.
+ */
+function countOpenRelaysBetween(db, from, to) {
+    const row = db
+        .prepare(`
+      SELECT COUNT(*) AS n FROM session_relays
+      WHERE from_worktree_id = ? AND from_instance_id = ?
+        AND to_worktree_id = ? AND to_instance_id = ?
+        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+    `)
+        .get(from.worktreeId, from.instanceId, to.worktreeId, to.instanceId, ...types_1.OPEN_RELAY_STATES);
+    return row.n;
+}
+/**
+ * Record a payload that has been decided and not yet delivered.
+ *
+ * Guarded on `pending_kind IS NULL`, which is what makes two producers finding
+ * the same finished turn cost ONE delivery: the second one loses the race and
+ * returns false rather than queueing a duplicate. The guard is released by
+ * {@link clearRelayPending} once the payload has actually gone out, so the same
+ * relay can carry a prompt notice now and a reply later.
+ *
+ * @returns Whether this call is the one that stashed it
+ */
+function stashRelayPayload(db, id, kind, body, now = Date.now()) {
+    const result = db
+        .prepare(`
+      UPDATE session_relays
+      SET pending_kind = ?, pending_body = ?, updated_at = ?
+      WHERE id = ? AND pending_kind IS NULL
+        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+    `)
+        .run(kind, body, now, id, ...types_1.OPEN_RELAY_STATES);
+    return result.changes === 1;
+}
+/** Every relay carrying an undelivered payload, oldest first. */
+function listRelaysWithPendingPayload(db) {
+    const rows = db
+        .prepare(`
+      SELECT ${RELAY_COLUMNS} FROM session_relays
+      WHERE pending_kind IS NOT NULL
+      ORDER BY updated_at ASC
+    `)
+        .all();
+    return rows
+        .filter((row) => row.pending_body !== null && row.pending_kind !== null)
+        .map((row) => ({
+        relay: mapRelay(row),
+        kind: row.pending_kind,
+        body: row.pending_body,
+    }));
+}
+/** Drop an undelivered payload (it went out, or it was superseded). */
+function clearRelayPending(db, id, now = Date.now()) {
+    db.prepare(`
+    UPDATE session_relays
+    SET pending_kind = NULL, pending_body = NULL, updated_at = ?
+    WHERE id = ?
+  `).run(now, id);
+}
+/**
+ * Close the relay as delivered, exactly once.
+ *
+ * Two clauses, and they guard different things — worth separating, because a
+ * later reader who notices that the second is redundant *for one relay id* will
+ * otherwise delete the one that is not.
+ *
+ *  - `state IN (open)` is what makes a SECOND call for the same relay answer
+ *    false: the first call left it `delivered`, which is not an open state.
+ *  - `sent_request_id IS NULL`, together with the column's UNIQUE index, is what
+ *    makes the delivery id itself unrepeatable ACROSS relays and across
+ *    processes. It is the idempotency key the Issue names, and it is why this
+ *    function catches: the index refusing a write is the answer "somebody else
+ *    got there first", and that answer must not arrive as an exception inside a
+ *    delivery path.
+ *
+ * @returns Whether this call is the one that closed it
+ */
+function markRelayDelivered(db, id, sentRequestId, now = Date.now()) {
+    try {
+        const result = db
+            .prepare(`
+        UPDATE session_relays
+        SET state = 'delivered', sent_request_id = ?, delivered_at = ?,
+            pending_kind = NULL, pending_body = NULL, updated_at = ?
+        WHERE id = ? AND sent_request_id IS NULL
+          AND state IN (${OPEN_STATE_PLACEHOLDERS})
+      `)
+            .run(sentRequestId, now, now, id, ...types_1.OPEN_RELAY_STATES);
+        return result.changes === 1;
+    }
+    catch (error) {
+        // The UNIQUE index refusing the write IS the answer "somebody else got
+        // there first", and it must not become an exception in a delivery path.
+        logger.warn('relay-deliver-conflict', {
+            relayId: id,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return false;
+    }
+}
+/**
+ * Note that A is being told B is waiting on a confirmation.
+ *
+ * Leaves the relay OPEN — `prompt` is an open state, so answering the dialog
+ * lets B finish and the reply is stashed and delivered from here — and leaves
+ * any stashed payload alone: this records the DECISION to notify, while
+ * `clearRelayPending` records that the notice went out. `prompt_signature` is
+ * what stops a twenty-minute wait from producing a notice on every poll.
+ */
+function markRelayPromptNotified(db, id, signature, now = Date.now()) {
+    db.prepare(`
+    UPDATE session_relays
+    SET state = 'prompt', prompt_signature = ?, updated_at = ?
+    WHERE id = ?
+  `).run(signature, now, id);
+}
+/** The confirmation notice already sent for this relay, or null. */
+function getRelayPromptSignature(db, id) {
+    const row = db
+        .prepare('SELECT prompt_signature FROM session_relays WHERE id = ?')
+        .get(id);
+    return row?.prompt_signature ?? null;
+}
+/**
+ * Close the relay as expired, exactly once.
+ *
+ * The once-ness is the point: the Issue asks for ONE line of notice, and the
+ * state transition is what the notice is written from.
+ *
+ * @returns Whether this call is the one that expired it
+ */
+function markRelayExpired(db, id, now = Date.now()) {
+    const result = db
+        .prepare(`
+      UPDATE session_relays
+      SET state = 'expired', updated_at = ?
+      WHERE id = ? AND state IN (${OPEN_STATE_PLACEHOLDERS})
+    `)
+        .run(now, id, ...types_1.OPEN_RELAY_STATES);
+    return result.changes === 1;
+}
+/** Every open relay whose deadline has passed. */
+function listExpiredOpenRelays(db, now = Date.now()) {
+    const rows = db
+        .prepare(`
+      SELECT ${RELAY_COLUMNS} FROM session_relays
+      WHERE state IN (${OPEN_STATE_PLACEHOLDERS}) AND expires_at <= ?
+      ORDER BY expires_at ASC
+    `)
+        .all(...types_1.OPEN_RELAY_STATES, now);
+    return rows.map(mapRelay);
+}
+/** Withdraw a relay. Returns false when it was already closed or absent. */
+function cancelRelay(db, id, now = Date.now()) {
+    const result = db
+        .prepare(`
+      UPDATE session_relays
+      SET state = 'cancelled', pending_kind = NULL, pending_body = NULL, updated_at = ?
+      WHERE id = ? AND state IN (${OPEN_STATE_PLACEHOLDERS})
+    `)
+        .run(now, id, ...types_1.OPEN_RELAY_STATES);
+    return result.changes === 1;
+}
+/**
+ * Count relays per state.
+ *
+ * The shape `commandmate task show` and `report metrics` print. Counting in SQL
+ * rather than reading rows because a long-lived server accumulates thousands
+ * and both callers want five integers.
+ */
+function countRelays(db, filter = {}) {
+    const clauses = [];
+    const params = [];
+    if (filter.worktreeId) {
+        if (filter.instanceId) {
+            clauses.push('((from_worktree_id = ? AND from_instance_id = ?) OR (to_worktree_id = ? AND to_instance_id = ?))');
+            params.push(filter.worktreeId, filter.instanceId, filter.worktreeId, filter.instanceId);
+        }
+        else {
+            clauses.push('(from_worktree_id = ? OR to_worktree_id = ?)');
+            params.push(filter.worktreeId, filter.worktreeId);
+        }
+    }
+    if (filter.since !== undefined) {
+        clauses.push('created_at >= ?');
+        params.push(filter.since);
+    }
+    const where = clauses.length > 0 ? `WHERE ${clauses.join(' AND ')}` : '';
+    const rows = db
+        .prepare(`SELECT state, COUNT(*) AS n FROM session_relays ${where} GROUP BY state`)
+        .all(...params);
+    const counts = (0, types_1.emptyRelayCounts)();
+    for (const row of rows) {
+        if (row.state in counts) {
+            counts[row.state] = row.n;
+        }
+    }
+    return counts;
+}

package/dist/server/src/lib/detection/ansi.js

@@ -11,7 +11,9 @@
  * Covers:
  * - SGR sequences: ESC[Nm (colors, bold, underline, etc.)
  * - OSC sequences: ESC]...BEL and ESC]...ST (ESC \\) - window title, and the
- *   OSC 8 hyperlinks that claude/codex/copilot emit (Issue #1912)
+ *   OSC 8 hyperlinks that claude/codex/copilot emit (Issue #1912). Also
+ *   available on its own as {@link stripOsc} (Issue #2369), for a consumer that
+ *   renders SGR and must not render OSC.
  * - CSI sequences: ESC[...letter (cursor movement, erase, etc.)
  *
  * Known limitations (SEC-002): 8-bit CSI (0x9B), DEC private modes (ESC[?25h),
@@ -19,14 +21,49 @@
  * practice tmux capture-pane output rarely contains these.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANSI_PATTERN = void 0;
+exports.ANSI_PATTERN = exports.OSC_PATTERN = void 0;
 exports.stripAnsi = stripAnsi;
+exports.stripOsc = stripOsc;
 exports.extractAnsiSequences = extractAnsiSequences;
-exports.ANSI_PATTERN = /\x1b\[[0-9;]*[a-zA-Z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\[[0-9;]*m/g;
+/**
+ * One OSC sequence: `ESC ]`, a payload, and either terminator (BEL or ST).
+ *
+ * Split out of {@link ANSI_PATTERN} by Issue #2369 so a second consumer can
+ * strip OSC **without** stripping SGR. `sanitizeTerminalOutput`
+ * (`lib/security/sanitize.ts`) is that consumer: it hands the frame to
+ * `ansi-to-html`, which turns SGR into colour and does not know OSC at all — so
+ * before this split, Command Code's `/usage` panel rendered its breakdown link
+ * as the literal text `]8;;https://commandcode.ai/…\` beside the label. Calling
+ * `stripAnsi` there would have thrown the colour away with it.
+ *
+ * The payload class excludes ESC as well as BEL (Issue #1912) so a sequence
+ * ended by ST cannot run on to a BEL later in the buffer and swallow the visible
+ * link text between them. An OSC with no terminator at all matches nothing and
+ * is left in place, which is the safe answer: eating the rest of the frame is
+ * worse than showing one stray escape.
+ *
+ * The source is shared with {@link ANSI_PATTERN} rather than restated, so the
+ * two cannot drift about which terminators exist.
+ */
+const OSC_SOURCE = '\\x1b\\][^\\x07\\x1b]*(?:\\x07|\\x1b\\\\)';
+/** {@link OSC_SOURCE} as a reusable global pattern. */
+exports.OSC_PATTERN = new RegExp(OSC_SOURCE, 'g');
+exports.ANSI_PATTERN = new RegExp(`\\x1b\\[[0-9;]*[a-zA-Z]|${OSC_SOURCE}|\\[[0-9;]*m`, 'g');
 /** Remove all ANSI escape sequences from a string. */
 function stripAnsi(str) {
     return str.replace(exports.ANSI_PATTERN, '');
 }
+/**
+ * Remove OSC sequences only, leaving SGR (colour) and CSI untouched.
+ *
+ * For OSC 8 hyperlinks — `ESC ] 8 ; ; <url> ST <label> ESC ] 8 ; ; ST` — this
+ * drops both halves of the pair and keeps `<label>`, which is the text the
+ * terminal itself shows. See {@link OSC_PATTERN} for who needs this and why
+ * `stripAnsi` is not the answer for them.
+ */
+function stripOsc(str) {
+    return str.replace(exports.OSC_PATTERN, '');
+}
 /**
  * Extract the ANSI escape sequences from a string, in order, discarding all
  * other characters. Reuses the same tested pattern as {@link stripAnsi} so the

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

@@ -4,13 +4,15 @@
  * Shared between response-poller.ts and API routes
  */
 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_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.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_USER_ECHO_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_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 = exports.COPILOT_TOOL_ROW_PATTERN = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.isCodexPromptReady = isCodexPromptReady;
 exports.getCodexActiveDialog = getCodexActiveDialog;
 exports.getCodexLifecycleDialog = getCodexLifecycleDialog;
+exports.findCodexChromeStart = findCodexChromeStart;
+exports.findCodexUserEchoIndex = findCodexUserEchoIndex;
 exports.findOpenCodeChromeStart = findOpenCodeChromeStart;
 exports.findOpenCodeUserEchoEnd = findOpenCodeUserEchoEnd;
 exports.findOpenCodeComposerRows = findOpenCodeComposerRows;
@@ -29,6 +31,7 @@ exports.buildDetectPromptOptions = buildDetectPromptOptions;
 const logger_1 = require("../../lib/logger");
 const ansi_1 = require("./ansi");
 const composer_text_1 = require("./composer-text");
+const cli_patterns_1 = require("./tools/codex/cli-patterns");
 const thinking_constants_1 = require("../../config/thinking-constants");
 const logger = (0, logger_1.createLogger)('cli-patterns');
 /**
@@ -589,6 +592,207 @@ exports.CODEX_PAGER_FOOTER_PATTERN = /(?:↑\/↓|pgup\/pgdn|home\/end)\s+to\s+(
  * line. No nested quantifiers (ReDoS-safe; adjacent greedy quantifiers only).
  */
 exports.CODEX_STATUS_BAR_PATTERN = /^\s*\S.*·\s*~?\/\S*\s*$/;
+/**
+ * How far above the last non-blank row {@link findCodexChromeStart} looks for the
+ * composer.
+ *
+ * Same allowance and the same reason as {@link CODEX_COMPOSER_SEARCH_ROWS}: codex
+ * pins the composer two to three rows above the bottom in every measured frame
+ * (`tests/fixtures/codex-live-2310/`), and a wider band would let the search walk
+ * into the transcript and mistake the echoed user message — drawn with the same
+ * `›` — for the input box.
+ *
+ * Wider than the 8 rows of the liveness search because 0.15x can draw notices
+ * BELOW the composer (`N background terminal running · /ps to view · /stop to
+ * close`) that the liveness search never had to step over.
+ */
+const CODEX_CHROME_SEARCH_ROWS = 12;
+/**
+ * A row whose first character is codex's `›` glyph, with something after it.
+ *
+ * Deliberately not {@link CODEX_PROMPT_PATTERN}: that one is multiline and
+ * matches a bare `›`, which is right for "is a prompt on screen anywhere?" and
+ * wrong for classifying ONE row. Anchored at column 0 because all three of
+ * codex's `›` uses are, and an indented `›` in a reply is quoted text.
+ */
+const CODEX_CHROME_GLYPH_ROW_PATTERN = /^›(\s|$)/;
+/**
+ * Locate the start of codex's bottom-pinned chrome within a captured pane.
+ *
+ * The fifth reader of this shape, after {@link findClaudeChromeStart} (#1289),
+ * {@link findCopilotChromeStart} (#1897), {@link findOpenCodeChromeStart}
+ * (#1911) and {@link findCommandCodeChromeStart} (#2250). codex is the tool that
+ * never got one, and Issue #2400 is the bill for that.
+ *
+ * codex renders inline and pins two rows to the bottom of a settled pane:
+ *
+ * ```text
+ * › Ask Codex to do anything                      ← composer (placeholder or typed text)
+ *
+ *   gpt-6-astra xhigh · ~/share/work/…/CommandMate ← status bar (model · cwd)
+ * ```
+ *
+ * Below the composer codex may also draw its own notices (`N background terminal
+ * running · /ps to view`), so the boundary is "the composer row" rather than a
+ * list of footer shapes: everything from the composer down is chrome by
+ * construction, whatever codex adds there next.
+ *
+ * ## What went wrong without it (#2400)
+ *
+ * While the capture window is NOT saturated codex's extraction starts at
+ * `lastCapturedLine`, so the composer only ever mattered as the `endIndex` break
+ * — which the extraction loop already had. Once the pane outgrows
+ * `CACHE_MAX_CAPTURE_LINES` (#1670) the cursor stops being a position in the
+ * capture and `resolveExtractionStartIndex` switches to the newest echoed user
+ * prompt. With no `contentEnd`, that backwards search started at the very bottom
+ * of the pane and the first `›` it met was the COMPOSER. Extraction then began
+ * on the row after it, i.e. on the status bar, and the saved "reply" for every
+ * turn on a saturated pane was one row:
+ *
+ * ```text
+ * gpt-6-astra xhigh · ~/share/work/github_kewton/CommandAgent-develop
+ * ```
+ *
+ * Identical on every turn, so `isDuplicateResponse` then locked on it and the
+ * pane could not record another reply at all. That is #1289's defect verbatim,
+ * one tool later — the same reason `findCommandCodeChromeStart` exists.
+ *
+ * ## Why the attributes and not the placeholder text
+ *
+ * The codex branch of `findRecentUserPromptIndex` used to exclude the composer by
+ * naming its placeholders (`Implement`, `Find and fix`, `Type`, `Summarize`).
+ * Those are codex 0.1x wording, and 0.15x draws `Ask Codex to do anything`, so
+ * the list silently stopped matching the thing it was written for. Issue #2310
+ * measured what actually separates codex's three uses of `›` (U+203A), and it is
+ * the SGR attributes, not the text: the composer glyph is bold (`ESC[1m›`), a
+ * transcript echo is dim (`ESC[1;2m›`), a dialog option carries a coloured glyph
+ * or a bold label. {@link readCodexGlyphRowKind} is that measurement, and this
+ * reader is one of its callers.
+ *
+ * `-1` is returned for a frame whose bottom-most `›` is an option row: codex
+ * replaces the composer with the dialog, so there is no chrome to trim and the
+ * caller resolves the frame on the prompt path instead.
+ *
+ * ## The stripped-capture fallback
+ *
+ * Auto-Yes hands the detection layer a capture that has already been through
+ * `stripAnsi`, and there every `›` is the same byte — {@link
+ * readCodexGlyphRowKind} answers `null` on purpose rather than guessing. This
+ * reader still has to answer for those frames, so it falls back to the one
+ * structural landmark codex pins BELOW the composer and nowhere else: the status
+ * bar ({@link CODEX_STATUS_BAR_PATTERN}, `model · /path`). Requiring it means a
+ * frame with no bar — a pane mid-redraw, an overlay — yields `-1` and the
+ * pre-#2400 reading, which is the direction that costs nothing.
+ *
+ * @param lines - Captured pane lines, ANSI-bearing or not; trailing blanks tolerated
+ * @returns Index of the composer row, or -1 when no composer chrome is present
+ */
+function findCodexChromeStart(lines) {
+    let lastRow = lines.length - 1;
+    while (lastRow >= 0 && (0, ansi_1.stripAnsi)(lines[lastRow]).trim() === '')
+        lastRow--;
+    if (lastRow < 0)
+        return -1;
+    // Bottom-most `›` row within the band codex reserves for its chrome. Anything
+    // further up is transcript, and latching onto an echo there would cut the
+    // reply this whole reader exists to keep.
+    let glyphRow = -1;
+    for (let i = lastRow; i >= Math.max(0, lastRow - CODEX_CHROME_SEARCH_ROWS); i--) {
+        if (CODEX_CHROME_GLYPH_ROW_PATTERN.test((0, ansi_1.stripAnsi)(lines[i]))) {
+            glyphRow = i;
+            break;
+        }
+    }
+    if (glyphRow < 0)
+        return -1;
+    const kind = (0, cli_patterns_1.readCodexGlyphRowKind)(lines[glyphRow]);
+    if (kind === 'composer')
+        return glyphRow;
+    // A dialog is up (no composer drawn) or the bottom-most `›` is a transcript
+    // echo mid-redraw. Neither is chrome to trim.
+    if (kind !== null)
+        return -1;
+    // Stripped capture: no attributes to read. Accept the row as the composer only
+    // when codex's status bar is drawn below it, which is where it always sits and
+    // where a transcript echo can never be.
+    for (let i = glyphRow + 1; i <= lastRow; i++) {
+        if (exports.CODEX_STATUS_BAR_PATTERN.test((0, ansi_1.stripAnsi)(lines[i])))
+            return glyphRow;
+    }
+    return -1;
+}
+/**
+ * The shape of a codex row that could be the echo of a message the user sent.
+ *
+ * Shape only — `›` at column 0 with text after it — which all three of codex's
+ * `›` uses share. {@link findCodexUserEchoIndex} is what tells them apart.
+ */
+exports.CODEX_USER_ECHO_PATTERN = /^›\s+\S/;
+/**
+ * Find the newest transcript echo of an operator message in a codex capture.
+ *
+ * The reader `findRecentUserPromptIndex` anchors codex turns on (Issue #2400).
+ * It replaces a negative lookahead over composer placeholder strings
+ * (`(?!Implement|Find and fix|Type|Summarize)`) written against codex 0.1x:
+ * 0.15x draws `Ask Codex to do anything`, so the guard matched nothing it was
+ * written for. The composer became the newest "echo", and on a saturated pane —
+ * the one path where this anchor decides where extraction STARTS (#1670) — the
+ * reply saved for every turn was the single status-bar row below it.
+ *
+ * ## What the attributes can and cannot separate
+ *
+ * #2310 measured the three uses of `›` and this reader adds the fourth reading
+ * they left open, captured for #2400 on codex-cli 0.153.4
+ * (`tests/fixtures/codex-live-2310/turn-submitted-no-status.txt`): the echo of
+ * a message the operator has JUST submitted is drawn `ESC[1m› ESC[0m<text>` —
+ * bold glyph, plain label — and only becomes the dim `ESC[1;2m› ` of the
+ * measured frames once the turn settles. That shape is indistinguishable from a
+ * composer holding typed text, so no per-row attribute rule can separate them.
+ *
+ * What separates them is position, which codex's layout fixes: the composer is
+ * the BOTTOM-MOST `›` row of a frame. So the reader takes the boundary from its
+ * caller:
+ *
+ * - `composerTrimmed` — `findCodexChromeStart` located the chrome and `lines`
+ *   has already been cut above it, so every `›` row left is transcript and the
+ *   newest one wins outright.
+ * - otherwise — the composer may still be the bottom-most `›` row, so the first
+ *   candidate is stepped over. This is the structural spelling of the guard the
+ *   placeholder list used to be, and unlike that list it cannot go stale.
+ *
+ * Dialog option rows are refused wherever they appear: codex renders inline, so
+ * a dialog answered minutes ago is still in the scrollback with its options
+ * intact (#1160), and anchoring on one would cut the reply mid-way.
+ *
+ * @param lines - Captured pane rows, ANSI intact where the caller has it
+ * @param contentEnd - Exclusive end of the conversation region
+ * @param windowSize - How many rows above `contentEnd` to search
+ * @param composerTrimmed - Whether `contentEnd` already excludes the composer
+ * @returns Index of the newest echo row, or -1 when none is in the window
+ */
+function findCodexUserEchoIndex(lines, contentEnd, windowSize, composerTrimmed) {
+    let composerHandled = composerTrimmed;
+    for (let i = Math.min(contentEnd, lines.length) - 1; i >= Math.max(0, contentEnd - windowSize); i--) {
+        if (!exports.CODEX_USER_ECHO_PATTERN.test((0, ansi_1.stripAnsi)(lines[i])))
+            continue;
+        const kind = (0, cli_patterns_1.readCodexGlyphRowKind)(lines[i]);
+        // An option row of a dialog still sitting in the scrollback.
+        if (kind === 'option')
+            continue;
+        // Positively an echo: codex has settled the row and drawn its glyph dim.
+        if (kind === 'transcript-echo')
+            return i;
+        // `composer` (bold glyph) or `null` (an ANSI-stripped capture, where all
+        // three uses are one byte). Either could be the input box, and the input box
+        // is always the bottom-most `›` row.
+        if (!composerHandled) {
+            composerHandled = true;
+            continue;
+        }
+        return i;
+    }
+    return -1;
+}
 /**
  * Pasted text pattern
  *