commandmate 0.49.0 → 0.49.2

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/prompt-detect-multiple-choice.js

@@ -753,7 +753,7 @@ function detectMultipleChoicePrompt(output, options, truncateRawContentFn) {
     // Issue #1699: the same block, cut at the previous turn's boundary. Display
     // keeps the wide window; deny patterns are judged against this one.
     const approvalBlock = extractApprovalTarget(lines, questionEndIndex, effectiveEnd, pickerTop);
-    // Issue #616: Determine submitMode from confirmation footer (detected in single-pass above)
+    // Issue #616: Determine submitMode from confirmation footer (detected in single-pass by findConfirmationFooter())
     const submitMode = hasConfirmationFooter
         ? (hasNumberFooter ? 'answer_only' : 'answer_then_enter')
         : undefined;
@@ -808,7 +808,7 @@ function hasModelOverlayFooter(scanWindow) {
     // [Issue #1495] Claude `/model` local-settings overlay guard.
     // The `/model` overlay renders a ❯-marked numbered model list ("1. Default …
     // 5. Haiku") under a "Select model" header, which the option-collection logic
-    // below would otherwise return as a genuine multiple_choice prompt. Auto-Yes
+    // (collectOptions()) would otherwise return as a genuine multiple_choice prompt. Auto-Yes
     // (detectAndRespondToPrompt) calls detectPrompt() directly and would resolve +
     // Enter-confirm the default option — silently changing the user's default model.
     // The overlay-unique "Enter to set as default …" footer never appears in real
@@ -948,10 +948,11 @@ function isMetadataRow(state, rawLine, line, paneCut) {
     // would then poison isValidPrecedingOption() and cause every real option
     // above (1./2./3.) to be rejected — resulting in collectedOptions.length<2
     // and a spurious no_prompt verdict. Treat the summary line as metadata
-    // (same continuation handling as COLLAPSED_OUTPUT_PATTERN above) so the
+    // (same continuation handling as the COLLAPSED_OUTPUT_PATTERN check earlier
+    // in isMetadataRow()) so the
     // reverse scan continues into the actual option block.
     //
-    // Defense-in-depth: works alongside the S2 effectiveEnd trim above. Either
+    // Defense-in-depth: works alongside the S2 effectiveEnd trim in findScanWindow(). Either
     // S1 or S2 alone is sufficient to fix Issue #704; keeping both protects
     // against future Claude renderings where the footer line text changes
     // (S1 still catches) or the summary line wording changes (S2 still

package/dist/server/src/lib/detection/upstream-faults.js

@@ -25,8 +25,9 @@
  * @module lib/detection/upstream-faults
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UPSTREAM_FAULT_TRUNCATION_MARKER = exports.UPSTREAM_FAULT_EXCERPT_MAX_BYTES = exports.UPSTREAM_FAULTS = void 0;
+exports.UPSTREAM_FAULT_TRUNCATION_MARKER = exports.UPSTREAM_FAULT_EXCERPT_MAX_BYTES = exports.CODEX_ERROR_ROW_FAULT_IDS = exports.UPSTREAM_FAULTS = void 0;
 exports.matchUpstreamFault = matchUpstreamFault;
+exports.matchCodexErrorRowFault = matchCodexErrorRowFault;
 exports.findUpstreamFault = findUpstreamFault;
 const ansi_1 = require("./ansi");
 const excerpt_1 = require("./excerpt");
@@ -71,8 +72,30 @@ exports.UPSTREAM_FAULTS = [
         selfRetrying: false,
     },
     { id: 'limit-reached', pattern: /\blimit reached\b/i, selfRetrying: false },
-    { id: 'api-error', pattern: /\bAPI Error(?::|\s+\d{3})/i, selfRetrying: false },
+    {
+        // Anchored to a line start (Issue #3946), like `model-capacity`: only the two
+        // shapes measured for the fault itself are accepted — claude's `⏺ API Error: …`
+        // row (Issue #1839) and a bare `API Error: …` at column 0. Unanchored, it
+        // matched a healthy codex reply that quoted `• API Error: 500` on an indented
+        // continuation line, and `ask` exited 11 — twice, because the quoting turn was
+        // still inside the 100-row window when the next turn ended. A codex `• ` row,
+        // an indented continuation and a `› ` input echo are not accepted.
+        //
+        // Known limit: a claude reply that itself begins with `⏺ API Error: …` is
+        // indistinguishable from the fault, because nothing here knows who wrote a row
+        // (reply, echo, tool error) — only its leading shape.
+        id: 'api-error',
+        pattern: /^(?:⏺ )?API Error(?::|\s+\d{3})/im,
+        selfRetrying: false,
+    },
 ];
+/**
+ * The faults whose pattern is anchored to codex's own error row (`■ ` at column
+ * 0), and so the only ones safe to apply to a row outside `realtimeSnippet`
+ * (Issue #3946, {@link matchCodexErrorRowFault}). An unanchored pattern on such a
+ * row would read a quote in an old reply as a fault happening now.
+ */
+exports.CODEX_ERROR_ROW_FAULT_IDS = ['model-capacity'];
 /**
  * Bound on {@link UpstreamFaultMatch.matchedText}, in UTF-8 **bytes**.
  *
@@ -103,12 +126,23 @@ function truncateExcerpt(text) {
  * sequences on a live pane.
  */
 function matchUpstreamFault(frame) {
+    return matchFaults(frame, exports.UPSTREAM_FAULTS);
+}
+/**
+ * {@link matchUpstreamFault} restricted to {@link CODEX_ERROR_ROW_FAULT_IDS}
+ * (Issue #3946): for the one codex transcript row read from outside the window,
+ * where a quote must not count.
+ */
+function matchCodexErrorRowFault(row) {
+    return matchFaults(row, exports.UPSTREAM_FAULTS.filter((fault) => exports.CODEX_ERROR_ROW_FAULT_IDS.includes(fault.id)));
+}
+function matchFaults(frame, faults) {
     const clean = (0, ansi_1.stripAnsi)(frame);
-    for (const fault of exports.UPSTREAM_FAULTS) {
+    for (const fault of faults) {
         const match = fault.pattern.exec(clean);
-        // The patterns are stateless (no /g; only `model-capacity` is anchored, to a
-        // line start with /m), so `exec` cannot carry a lastIndex between calls —
-        // but reading `index` requires exec regardless.
+        // The patterns are stateless (no /g; `model-capacity` and `api-error` are
+        // anchored to a line start with /m), so `exec` cannot carry a lastIndex
+        // between calls — but reading `index` requires exec regardless.
         if (!match)
             continue;
         const lineStart = clean.lastIndexOf('\n', match.index) + 1;

package/dist/server/src/lib/hooks/sources/copilot/hook-settings.js

@@ -868,9 +868,8 @@ function writeCopilotHookSettings(options = {}) {
  *
  * Applied to the launched process rather than through `tmux set-environment`:
  * the pane is created before the agent starts and the assignment then travels
- * with the one process that matters, out of reach of
- * `sanitizeSessionEnvironment` and of anything else that edits the session's
- * environment later.
+ * with the one process that matters, out of reach of anything that edits
+ * the session's environment later (claude's `unset CLAUDECODE` among them).
  *
  * Returned as a map since Issue #1846. It used to be a pre-quoted
  * `NAME=value NAME=value` string that the caller concatenated in front of the

package/dist/server/src/lib/hooks/sources/opencode/client.js

@@ -478,7 +478,7 @@ function promptSelectionBody(selection) {
  * @param sessionId - `ses_…`, the session the message belongs to
  * @param messageId - `msg_…`, from {@link newOpencodeMessageId}
  * @param parts - The message body; at least one part
- * @returns Whether the server answered `204`
+ * @returns How the POST ended ({@link OpencodePromptDispatch})
  */
 async function sendOpencodePrompt(port, sessionId, messageId, parts, selection) {
     const url = `${opencodeBaseUrl(port)}/session/${encodeURIComponent(sessionId)}/prompt_async`;
@@ -493,18 +493,24 @@ async function sendOpencodePrompt(port, sessionId, messageId, parts, selection)
             }),
             signal: AbortSignal.timeout(exports.OPENCODE_REQUEST_TIMEOUT_MS),
         });
-        if (response.status !== 204) {
-            logger.warn('opencode-prompt-rejected', { port, sessionId, status: response.status });
-            return false;
+        if (response.status === 204)
+            return 'accepted';
+        // Issue #3992: another 2xx may still have created the message (a JSON 200 /
+        // 201), so it stays unknown — except the web UI's SPA shell an unknown route
+        // answers (`200 text/html`, #1931), which never took the message.
+        if (response.status >= 200 && response.status < 300 && !hasContentType(response, 'text/html')) {
+            logger.warn('opencode-prompt-unexpected-success', { port, sessionId, status: response.status });
+            return 'unknown';
         }
-        return true;
+        logger.warn('opencode-prompt-rejected', { port, sessionId, status: response.status });
+        return 'rejected';
     }
     catch (error) {
         logger.debug('opencode-request-failed', {
             url,
             error: error instanceof Error ? error.message : String(error),
         });
-        return false;
+        return 'unknown';
     }
 }
 /**

package/dist/server/src/lib/polling/response-checker.js

@@ -62,7 +62,6 @@ const push_1 = require("../../lib/push");
 const prompt_push_gate_1 = require("../../lib/push/prompt-push-gate");
 // Issue #2000: deep path for the same reason as the two imports above.
 const failure_push_notifier_1 = require("../../lib/push/failure-push-notifier");
-const upstream_faults_1 = require("../../lib/detection/upstream-faults");
 const realtime_snippet_1 = require("../../lib/realtime-snippet");
 const waiting_push_notifier_1 = require("../../lib/push/waiting-push-notifier");
 const waiting_episode_binding_1 = require("../../lib/session/waiting-episode-binding");
@@ -88,9 +87,10 @@ const response_checker_blank_response_1 = require("./response-checker-blank-resp
  * anything, so the level can be handed over on every poll.
  */
 function observeUpstreamFaultForPush(worktreeId, cliToolId, instanceId, output) {
-    // The rows `current-output-builder` publishes as `realtimeSnippet` and judges
-    // `upstreamFault` on (#1839), cut by the same function rather than a copy of
-    // its window. The reason is #1839's: the wider capture keeps a banner from an
+    // The rows `current-output-builder` judges `upstreamFault` on (#1839: the rows
+    // it publishes as `realtimeSnippet`; #3946: plus codex's last transcript row
+    // above them on a split screen), read through the same entry
+    // (`matchPaneUpstreamFault`) rather than a copy of its window. The reason is #1839's: the wider capture keeps a banner from an
     // hour ago in scope, and "is this happening now" is the only question worth
     // ringing a phone about. Sharing the cut also means the notification and the
     // `upstreamFault` an operator reads in `capture --json` judge the same rows —
@@ -98,7 +98,9 @@ function observeUpstreamFaultForPush(worktreeId, cliToolId, instanceId, output)
     // unverifiable. Issue #3936: the plain last 100 rows (#2000) drifted from the
     // snippet when #2768 anchored it to the last row with content, so an inline
     // codex pane showed `model-capacity` in the capture and never rang.
-    const match = (0, upstream_faults_1.matchUpstreamFault)((0, realtime_snippet_1.buildRealtimeSnippet)(output));
+    // Issue #3946: one entry with current-output, which also reads codex's last
+    // transcript row above the window on a split screen.
+    const match = (0, realtime_snippet_1.matchPaneUpstreamFault)(output.split('\n'), cliToolId);
     // Fire-and-forget, like every other push call in this file: the poller must
     // not slow down or break because a notification could not be delivered.
     void (0, failure_push_notifier_1.notifyUpstreamFaultPush)({