commandmate 0.48.0 → 0.49.1

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

@@ -17,6 +17,7 @@
  * @module lib/db/relay-db
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.stashRelayPayload = exports.settleRelaySendState = exports.setRelayPendingReply = exports.setRelayHold = exports.reserveRelayBind = exports.replaceRelayPromptWithReply = exports.replaceRelayPromptWithPendingReply = exports.recordRelayInputBoundary = exports.promoteRelayPendingReply = exports.listRelaysWithPendingPayload = exports.listOpenBoundRelays = exports.getRelayPendingPayload = exports.getRelayBinding = exports.failOrphanedRelayBind = exports.explainRelayBindRefusal = exports.clearRelayPendingReply = exports.clearRelayPending = exports.clearRelayHeldCandidates = exports.appendRelayHeldCandidate = void 0;
 exports.createRelay = createRelay;
 exports.getRelayById = getRelayById;
 exports.listOpenRelaysTo = listOpenRelaysTo;
@@ -24,9 +25,6 @@ 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;
@@ -37,39 +35,44 @@ exports.countRelays = countRelays;
 const crypto_1 = require("crypto");
 const types_1 = require("../../lib/relay/types");
 const logger_1 = require("../../lib/logger");
+const relay_bind_db_1 = require("../../lib/db/relay-bind-db");
+// Issue #3995: the send binding and the pending slots live in `relay-bind-db`;
+// re-exported so every caller (and every `vi.mock`) keeps this module's surface.
+var relay_bind_db_2 = require("../../lib/db/relay-bind-db");
+Object.defineProperty(exports, "appendRelayHeldCandidate", { enumerable: true, get: function () { return relay_bind_db_2.appendRelayHeldCandidate; } });
+Object.defineProperty(exports, "clearRelayHeldCandidates", { enumerable: true, get: function () { return relay_bind_db_2.clearRelayHeldCandidates; } });
+Object.defineProperty(exports, "clearRelayPending", { enumerable: true, get: function () { return relay_bind_db_2.clearRelayPending; } });
+Object.defineProperty(exports, "clearRelayPendingReply", { enumerable: true, get: function () { return relay_bind_db_2.clearRelayPendingReply; } });
+Object.defineProperty(exports, "explainRelayBindRefusal", { enumerable: true, get: function () { return relay_bind_db_2.explainRelayBindRefusal; } });
+Object.defineProperty(exports, "failOrphanedRelayBind", { enumerable: true, get: function () { return relay_bind_db_2.failOrphanedRelayBind; } });
+Object.defineProperty(exports, "getRelayBinding", { enumerable: true, get: function () { return relay_bind_db_2.getRelayBinding; } });
+Object.defineProperty(exports, "getRelayPendingPayload", { enumerable: true, get: function () { return relay_bind_db_2.getRelayPendingPayload; } });
+Object.defineProperty(exports, "listOpenBoundRelays", { enumerable: true, get: function () { return relay_bind_db_2.listOpenBoundRelays; } });
+Object.defineProperty(exports, "listRelaysWithPendingPayload", { enumerable: true, get: function () { return relay_bind_db_2.listRelaysWithPendingPayload; } });
+Object.defineProperty(exports, "promoteRelayPendingReply", { enumerable: true, get: function () { return relay_bind_db_2.promoteRelayPendingReply; } });
+Object.defineProperty(exports, "recordRelayInputBoundary", { enumerable: true, get: function () { return relay_bind_db_2.recordRelayInputBoundary; } });
+Object.defineProperty(exports, "replaceRelayPromptWithPendingReply", { enumerable: true, get: function () { return relay_bind_db_2.replaceRelayPromptWithPendingReply; } });
+Object.defineProperty(exports, "replaceRelayPromptWithReply", { enumerable: true, get: function () { return relay_bind_db_2.replaceRelayPromptWithReply; } });
+Object.defineProperty(exports, "reserveRelayBind", { enumerable: true, get: function () { return relay_bind_db_2.reserveRelayBind; } });
+Object.defineProperty(exports, "setRelayHold", { enumerable: true, get: function () { return relay_bind_db_2.setRelayHold; } });
+Object.defineProperty(exports, "setRelayPendingReply", { enumerable: true, get: function () { return relay_bind_db_2.setRelayPendingReply; } });
+Object.defineProperty(exports, "settleRelaySendState", { enumerable: true, get: function () { return relay_bind_db_2.settleRelaySendState; } });
+Object.defineProperty(exports, "stashRelayPayload", { enumerable: true, get: function () { return relay_bind_db_2.stashRelayPayload; } });
 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();
+    const bindMode = input.bindMode ?? 'legacy';
+    // A legacy row carries no send state at all: NULL, never a pretended `sent`.
+    const sendState = bindMode === 'bound' ? 'awaiting' : null;
     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);
+       created_at, updated_at, expires_at, delivered_at, bind_mode, send_state)
+    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, bindMode, sendState);
     return {
         id,
         from: { ...input.from },
@@ -82,40 +85,46 @@ function createRelay(db, input) {
         updatedAt: now,
         expiresAt: input.expiresAt,
         deliveredAt: null,
+        bindMode,
+        sendState,
+        inputBoundaryAt: null,
+        boundaryKind: null,
+        turnOpenAtSend: null,
+        obsState: null,
+        holdReason: null,
+        overlap: null,
     };
 }
 /** One relay by id, or null. */
 function getRelayById(db, id) {
     const row = db
-        .prepare(`SELECT ${RELAY_COLUMNS} FROM session_relays WHERE id = ?`)
+        .prepare(`SELECT ${relay_bind_db_1.RELAY_COLUMNS} FROM session_relays WHERE id = ?`)
         .get(id);
-    return row ? mapRelay(row) : null;
+    return row ? (0, relay_bind_db_1.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
+      SELECT ${relay_bind_db_1.RELAY_COLUMNS} FROM session_relays
       WHERE to_worktree_id = ? AND to_instance_id = ?
-        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+        AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
       ORDER BY created_at ASC
     `)
         .all(endpoint.worktreeId, endpoint.instanceId, ...types_1.OPEN_RELAY_STATES);
-    return rows.map(mapRelay);
+    return rows.map(relay_bind_db_1.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
+      SELECT ${relay_bind_db_1.RELAY_COLUMNS} FROM session_relays
       WHERE from_worktree_id = ? AND from_instance_id = ?
-        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+        AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
       ORDER BY created_at ASC
     `)
         .all(endpoint.worktreeId, endpoint.instanceId, ...types_1.OPEN_RELAY_STATES);
-    return rows.map(mapRelay);
+    return rows.map(relay_bind_db_1.mapRelay);
 }
 /** Both halves of {@link SessionRelaySummary} in one call. */
 function getSessionRelaySummary(db, endpoint) {
@@ -128,13 +137,13 @@ function getSessionRelaySummary(db, endpoint) {
 function listOpenRelaysForWorktree(db, worktreeId) {
     const rows = db
         .prepare(`
-      SELECT ${RELAY_COLUMNS} FROM session_relays
+      SELECT ${relay_bind_db_1.RELAY_COLUMNS} FROM session_relays
       WHERE (from_worktree_id = ? OR to_worktree_id = ?)
-        AND state IN (${OPEN_STATE_PLACEHOLDERS})
+        AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
       ORDER BY created_at ASC
     `)
         .all(worktreeId, worktreeId, ...types_1.OPEN_RELAY_STATES);
-    return rows.map(mapRelay);
+    return rows.map(relay_bind_db_1.mapRelay);
 }
 /**
  * How many open relays already run from `from` to `to`.
@@ -149,58 +158,11 @@ function countOpenRelaysBetween(db, from, to) {
       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})
+        AND state IN (${relay_bind_db_1.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.
  *
@@ -225,9 +187,9 @@ function markRelayDelivered(db, id, sentRequestId, now = Date.now()) {
             .prepare(`
         UPDATE session_relays
         SET state = 'delivered', sent_request_id = ?, delivered_at = ?,
-            pending_kind = NULL, pending_body = NULL, updated_at = ?
+            pending_kind = NULL, pending_body = NULL, payload_id = NULL, updated_at = ?
         WHERE id = ? AND sent_request_id IS NULL
-          AND state IN (${OPEN_STATE_PLACEHOLDERS})
+          AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
       `)
             .run(sentRequestId, now, now, id, ...types_1.OPEN_RELAY_STATES);
         return result.changes === 1;
@@ -278,7 +240,7 @@ function markRelayExpired(db, id, now = Date.now()) {
         .prepare(`
       UPDATE session_relays
       SET state = 'expired', updated_at = ?
-      WHERE id = ? AND state IN (${OPEN_STATE_PLACEHOLDERS})
+      WHERE id = ? AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
     `)
         .run(now, id, ...types_1.OPEN_RELAY_STATES);
     return result.changes === 1;
@@ -287,20 +249,21 @@ function markRelayExpired(db, id, now = Date.now()) {
 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 <= ?
+      SELECT ${relay_bind_db_1.RELAY_COLUMNS} FROM session_relays
+      WHERE state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS}) AND expires_at <= ?
       ORDER BY expires_at ASC
     `)
         .all(...types_1.OPEN_RELAY_STATES, now);
-    return rows.map(mapRelay);
+    return rows.map(relay_bind_db_1.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})
+      SET state = 'cancelled', pending_kind = NULL, pending_body = NULL, payload_id = NULL,
+          pending_reply = NULL, updated_at = ?
+      WHERE id = ? AND state IN (${relay_bind_db_1.OPEN_STATE_PLACEHOLDERS})
     `)
         .run(now, id, ...types_1.OPEN_RELAY_STATES);
     return result.changes === 1;

package/dist/server/src/lib/detection/composer-text.js

@@ -93,12 +93,25 @@
  * server does. That is deliberate — `useTerminalPanePolling` derives the
  * composer text client-side from the frame it already has, which keeps the
  * WebSocket push path and the HTTP poll path from disagreeing.
+ *
+ * That is also why the "a dialog below the composer means no composer" rule
+ * (Issue #3927, {@link codexDialogBelow}) lives here rather than next to the
+ * clear in `session/composer-clear.ts`: the clear, the published
+ * `composerText` and the browser's own reading all go through
+ * {@link extractLiveComposerText}, and `tools/codex/cli-patterns.ts`, whose
+ * `readCodexGlyphRowKind` the rule was first written on, imports the logger.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SUPPORTED_COMPOSER_TOOLS = exports.COMPOSER_TEXT_MAX_CHARS = void 0;
 exports.findClaudeInputBox = findClaudeInputBox;
+exports.isCodexComposerRow = isCodexComposerRow;
+exports.isCodexBoldGutterRow = isCodexBoldGutterRow;
+exports.findCodexLiveComposerRow = findCodexLiveComposerRow;
+exports.codexDialogBelow = codexDialogBelow;
 exports.findCodexInputBox = findCodexInputBox;
 exports.extractComposerText = extractComposerText;
+exports.extractLiveComposerText = extractLiveComposerText;
+exports.readCodexComposerFrom = readCodexComposerFrom;
 const ansi_1 = require("./ansi");
 /**
  * Upper bound on the published composer text.
@@ -208,6 +221,10 @@ function isBlankRow(line) {
  * A bare `\u203A` with nothing after it is accepted: `capture-pane` trims trailing
  * whitespace, so that is what a composer with neither text nor placeholder looks
  * like, and calling it `no_composer` would be a worse answer than `empty`.
+ *
+ * Exported for the send path (Issue #3906): when {@link findCodexInputBox}'s
+ * block bound cannot reach a composer split by many blank rows, the sender
+ * still has to tell the real `\u203A` row from these look-alikes.
  */
 function isCodexComposerRow(line) {
     if (line === undefined)
@@ -226,6 +243,120 @@ function isCodexComposerRow(line) {
     const firstText = chars.slice(2).find(c => c.ch !== ' ');
     return firstText === undefined || !firstText.bold;
 }
+/**
+ * Whether a codex `\u203A` row has its gutter space inside the glyph's bold span
+ * (Issue #3906).
+ *
+ * codex also draws the transcript echo of a sent message with a bold glyph that
+ * is NOT dim — `ESC[1m\u203A ESC[0m` + text (measured on 0.153.2 and 0.160.0:
+ * `tests/fixtures/codex-live-2310/turn-submitted-no-status.txt:36`,
+ * `codex-multiline-composer-3205/tc104-raw-pane.txt:20`,
+ * `codex-dialogs-0157/approval.txt:24`) — which {@link isCodexComposerRow}
+ * accepts. Every measured composer resets right after its glyph
+ * (`ESC[1m\u203AESC[0m `), and every echo carries the space in the glyph's span,
+ * dim or not. {@link findCodexInputBox} does not need this — it only looks at
+ * the frame's last blocks, where the live composer is — but a search that climbs
+ * past them into the transcript does.
+ */
+function isCodexBoldGutterRow(line) {
+    if (line === undefined)
+        return false;
+    const chars = scanAttributedChars(line);
+    return chars.length > 1 && chars[0].ch === CODEX_PROMPT_GLYPH && chars[1].ch === ' ' && chars[1].bold;
+}
+/**
+ * Classify one raw codex row whose first rendered glyph is `\u203A` (Issue #3927).
+ *
+ * The same reading as `readCodexGlyphRowKind` in `tools/codex/cli-patterns.ts`,
+ * re-stated on this module's SGR scan because that module imports the logger
+ * and this one is read by the browser bundle. In order: no attributes at all →
+ * null (a stripped capture, where every `\u203A` use reads the same); a dim
+ * glyph → the transcript echo; a bold label → a dialog option; a dim label →
+ * the composer's placeholder; a coloured glyph whose label is drawn in the
+ * same colour → a dialog option (from 0.155.1 the composer's glyph is
+ * coloured too, but it resets before its label); anything else → the composer.
+ * `tests/unit/lib/detection/composer-text-dialog-below-3927.test.ts` holds the
+ * two readings equal over the codex fixtures.
+ *
+ * @param rawRow - One row of the capture, ANSI intact
+ */
+function readCodexGlyphRow(rawRow) {
+    if (!rawRow.includes('\x1b'))
+        return null;
+    const chars = scanAttributedChars(rawRow);
+    const glyphIndex = chars.findIndex(c => c.ch.trim() !== '');
+    if (glyphIndex < 0 || chars[glyphIndex].ch !== CODEX_PROMPT_GLYPH)
+        return null;
+    const glyph = chars[glyphIndex];
+    if (glyph.dim)
+        return 'transcript-echo';
+    const label = chars.slice(glyphIndex + 1).find(c => c.ch.trim() !== '');
+    if (label?.bold)
+        return 'option';
+    if (label?.dim)
+        return 'composer';
+    if (glyph.fg !== null && label?.fg === glyph.fg)
+        return 'option';
+    return 'composer';
+}
+/**
+ * A composer row by every reading: {@link isCodexComposerRow}, and not the
+ * bold-not-dim echo ({@link isCodexBoldGutterRow}). The caller has already had
+ * {@link readCodexGlyphRow} call it `'composer'`, which also requires ANSI
+ * attributes: an attribute-free `\u203A` row (a stripped capture, where a dialog
+ * option reads the same as a composer) is never taken (Issue #3906).
+ */
+function isLiveComposerRow(row) {
+    return isCodexComposerRow(row) && !isCodexBoldGutterRow(row);
+}
+/**
+ * The live codex composer's `\u203A` row, wherever it is in the frame (Issue #3906).
+ *
+ * Read from the bottom, in the order `findCodexBottomGlyphRow` reads a frame:
+ * a dialog's highlighted option reached before any composer row means the
+ * dialog is what the pane shows now, and a composer row above it is one left
+ * there from before (codex-live-1671) — so the answer is -1, not that row. The
+ * transcript echo of a sent message is skipped, dim ({@link isCodexComposerRow}
+ * rejects it) or not ({@link isCodexBoldGutterRow}).
+ *
+ * Moved here from `session/composer-clear.ts` by Issue #3927, with
+ * {@link codexDialogBelow}, so the browser can read the same rule.
+ *
+ * @param rows - The capture split into rows, ANSI intact
+ * @returns The row's index, or -1 when no live composer row is drawn
+ */
+function findCodexLiveComposerRow(rows) {
+    for (let i = rows.length - 1; i >= 0; i--) {
+        const kind = readCodexGlyphRow(rows[i]);
+        if (kind === 'option')
+            return -1;
+        if (kind === 'composer' && isLiveComposerRow(rows[i]))
+            return i;
+    }
+    return -1;
+}
+/**
+ * Whether a dialog, not a composer, is what the pane shows below `row` (Issue #3906).
+ *
+ * The same bottom-up reading as {@link findCodexLiveComposerRow}, stopped at
+ * `row`: a dialog's highlighted option reached first means the composer at
+ * `row` — even one {@link findCodexInputBox} located among the frame's last
+ * blocks — was left there from before the dialog opened. A live composer row
+ * reached first means it was not.
+ *
+ * @param rows - The capture split into rows, ANSI intact
+ * @param row - Index of the composer's `\u203A` row
+ */
+function codexDialogBelow(rows, row) {
+    for (let i = rows.length - 1; i > row; i--) {
+        const kind = readCodexGlyphRow(rows[i]);
+        if (kind === 'option')
+            return true;
+        if (kind === 'composer' && isLiveComposerRow(rows[i]))
+            return false;
+    }
+    return false;
+}
 /**
  * Locate codex's composer in a captured pane (Issue #1890).
  *
@@ -282,7 +413,7 @@ function findCodexInputBox(lines) {
  */
 function applySgr(params, state) {
     const parts = params === '' ? ['0'] : params.split(';');
-    let { dim, bold } = state;
+    let { dim, bold, fg } = state;
     for (let i = 0; i < parts.length; i++) {
         const code = parts[i] === '' ? 0 : Number(parts[i]);
         if (Number.isNaN(code))
@@ -290,15 +421,18 @@ function applySgr(params, state) {
         if (code === 38 || code === 48 || code === 58) {
             const mode = parts[i + 1] === '' || parts[i + 1] === undefined ? -1 : Number(parts[i + 1]);
             // 5 = 256-colour (one argument), 2 = 24-bit RGB (three arguments).
-            if (mode === 5)
-                i += 2;
-            else if (mode === 2)
-                i += 4;
-            else
-                i += 1;
+            const argCount = mode === 5 ? 2 : mode === 2 ? 4 : 1;
+            if (code === 38)
+                fg = parts.slice(i + 1, i + 1 + argCount).join(';');
+            i += argCount;
             continue;
         }
-        if (code === 0 || code === 22) {
+        if (code === 0) {
+            dim = false;
+            bold = false;
+            fg = null;
+        }
+        else if (code === 22) {
             dim = false;
             bold = false;
         }
@@ -306,8 +440,12 @@ function applySgr(params, state) {
             bold = true;
         else if (code === 2)
             dim = true;
+        else if (code === 39)
+            fg = null;
+        else if ((code >= 30 && code <= 37) || (code >= 90 && code <= 97))
+            fg = String(code);
     }
-    return { dim, bold };
+    return { dim, bold, fg };
 }
 /**
  * Split one raw pane row into rendered characters tagged with their dim state.
@@ -319,12 +457,12 @@ function applySgr(params, state) {
  */
 function scanAttributedChars(line) {
     const out = [];
-    let state = { dim: false, bold: false };
+    let state = { dim: false, bold: false, fg: null };
     let i = 0;
     while (i < line.length) {
         const ch = line[i];
         if (ch !== '\x1b') {
-            out.push({ ch, dim: state.dim, bold: state.bold });
+            out.push({ ch, dim: state.dim, bold: state.bold, fg: state.fg });
             i++;
             continue;
         }
@@ -430,6 +568,72 @@ function extractComposerText(rawCapture, cliToolId) {
     const region = locateComposer(lines, cliToolId);
     if (region === null)
         return { text: '', state: 'no_composer' };
+    return readComposerRegion(lines, region);
+}
+/**
+ * The composer the pane shows NOW — {@link extractComposerText}, less a codex
+ * composer that a dialog has opened below (Issue #3927).
+ *
+ * codex draws on the normal screen, so a composer row from before a dialog
+ * opened can still sit among the frame's last blocks, above the dialog's
+ * highlighted option. {@link extractComposerText} locates it and reports its
+ * old text as `content`; this reports `no_composer`, the answer the clear
+ * (`session/composer-clear.ts`) has given that frame since #3906. The two
+ * display paths — the published `composerText`
+ * (`session/current-output-builder.ts`) and the browser's own reading
+ * (`hooks/useTerminalPanePolling.ts`) — read through this, so the unsent bar
+ * neither shows text its [Clear] cannot remove nor offers a [Run] whose Enter
+ * would land in the dialog.
+ *
+ * {@link extractComposerText} itself keeps its reading. The sender
+ * (`cli-tools/submit-verified-sender.ts`) applies {@link codexDialogBelow} to
+ * the box it locates on its own branches, and Auto-Yes's Enter fallback and
+ * the send-residue check are left reading the box as before.
+ *
+ * @param rawCapture - A pane capture with ANSI attributes intact
+ * @param cliToolId - The CLI whose session was captured
+ */
+function extractLiveComposerText(rawCapture, cliToolId) {
+    const read = extractComposerText(rawCapture, cliToolId);
+    if (cliToolId !== 'codex' || read.state === 'no_composer' || read.state === 'unsupported_tool')
+        return read;
+    const lines = rawCapture.split('\n');
+    const box = findCodexInputBox(lines);
+    if (box !== null && codexDialogBelow(lines, box.firstRow))
+        return { text: '', state: 'no_composer' };
+    return read;
+}
+/**
+ * Read a codex composer from a known `\u203A` row (Issue #3906).
+ *
+ * {@link findCodexInputBox} only searches the frame's last four blocks, and
+ * takes the composer's own block alone: a body of several paragraphs puts its
+ * `\u203A` row higher up, and its text stops at the first blank row. This reads
+ * from `firstRow` down to the frame's last block — codex's model / cwd footer —
+ * blank rows included, under the same dim rule as {@link extractComposerText}.
+ * When the composer's own block is the frame's last block it is read to the end.
+ *
+ * Whether `firstRow` is the live composer — not a row left above a dialog — is
+ * the caller's question; this only reads it.
+ *
+ * @param lines - Captured pane lines, ANSI intact
+ * @param firstRow - Index of a row {@link isCodexComposerRow} accepts
+ */
+function readCodexComposerFrom(lines, firstRow) {
+    let end = lines.length - 1;
+    while (end >= 0 && isBlankRow(lines[end]))
+        end--;
+    let lastBlockStart = end;
+    while (lastBlockStart > 0 && !isBlankRow(lines[lastBlockStart - 1]))
+        lastBlockStart--;
+    let ownBlockEnd = firstRow;
+    while (ownBlockEnd + 1 < lines.length && !isBlankRow(lines[ownBlockEnd + 1]))
+        ownBlockEnd++;
+    const lastRow = lastBlockStart > ownBlockEnd ? lastBlockStart - 1 : end;
+    return readComposerRegion(lines, { firstRow, lastRow, glyph: CODEX_PROMPT_GLYPH_PATTERN });
+}
+/** The text of a located composer region, under the dim rule. */
+function readComposerRegion(lines, region) {
     const realRows = [];
     const renderedRows = [];
     for (let i = region.firstRow; i <= region.lastRow; i++) {