commandmate 0.44.2 → 0.44.3

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

@@ -1,16 +1,10 @@
 "use strict";
 /** Response checking and extraction logic for CLI tool polling (Issue #575 split from response-poller.ts). */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PENDING_SCRAPE_HOLD_MS = void 0;
-exports.incompleteResult = incompleteResult;
-exports.buildPromptExtractionResult = buildPromptExtractionResult;
+exports.isNumberedDialogVouched = exports.buildPromptExtractionResult = exports.incompleteResult = exports.flushPendingScrapedResponse = exports.hasPendingScrapedResponse = exports.resetPendingScrapedResponses = exports.PENDING_SCRAPE_HOLD_MS = void 0;
 exports.detectPromptOnCleanFrame = detectPromptOnCleanFrame;
-exports.isNumberedDialogVouched = isNumberedDialogVouched;
 exports.detectPromptWithOptions = detectPromptWithOptions;
 exports.extractResponse = extractResponse;
-exports.resetPendingScrapedResponses = resetPendingScrapedResponses;
-exports.hasPendingScrapedResponse = hasPendingScrapedResponse;
-exports.flushPendingScrapedResponse = flushPendingScrapedResponse;
 exports.checkForResponse = checkForResponse;
 const cli_session_1 = require("../../lib/session/cli-session");
 const db_instance_1 = require("../../lib/db/db-instance");
@@ -35,15 +29,18 @@ const response_cleaner_1 = require("../response-cleaner");
 const copilot_constants_1 = require("../../config/copilot-constants");
 const tui_accumulator_1 = require("../tui-accumulator");
 const prompt_dedup_1 = require("./prompt-dedup");
-const antigravity_permission_receipts_1 = require("./antigravity-permission-receipts");
-// Issue #2457: the same rollout table, `hasDialogRules` cross-check and
-// `detectDialog` seam Auto-Yes reads, reached through the presence helper rather
-// than through `evaluateAutoYesDialogGate` — see `isNumberedDialogVouched`.
-const auto_yes_dialog_gate_1 = require("./auto-yes-dialog-gate");
 const prompt_dedup_state_1 = require("./prompt-dedup-state");
 const response_dedup_1 = require("./response-dedup");
 const structured_history_gate_1 = require("./structured-history-gate");
-const stop_history_capture_1 = require("../../lib/hooks/stop-history-capture");
+const pending_scraped_response_1 = require("./pending-scraped-response");
+// Issue #3213: the held scrape (#2436) lives in `./pending-scraped-response`.
+// Re-exported under the names it had here, so no import site — and no suite
+// that replaces this module by path — has to change.
+var pending_scraped_response_2 = require("./pending-scraped-response");
+Object.defineProperty(exports, "PENDING_SCRAPE_HOLD_MS", { enumerable: true, get: function () { return pending_scraped_response_2.PENDING_SCRAPE_HOLD_MS; } });
+Object.defineProperty(exports, "resetPendingScrapedResponses", { enumerable: true, get: function () { return pending_scraped_response_2.resetPendingScrapedResponses; } });
+Object.defineProperty(exports, "hasPendingScrapedResponse", { enumerable: true, get: function () { return pending_scraped_response_2.hasPendingScrapedResponse; } });
+Object.defineProperty(exports, "flushPendingScrapedResponse", { enumerable: true, get: function () { return pending_scraped_response_2.flushPendingScrapedResponse; } });
 const relay_triggers_1 = require("../../lib/relay/relay-triggers");
 // Issue #2317 Phase D: while a human holds the pane's geometry, the frame is
 // their terminal (44 rows), not the 1000-row canvas every rule below was
@@ -68,16 +65,6 @@ const upstream_faults_1 = require("../../lib/detection/upstream-faults");
 const waiting_push_notifier_1 = require("../../lib/push/waiting-push-notifier");
 const waiting_episode_state_1 = require("../../lib/session/waiting-episode-state");
 const task_transition_service_1 = require("../../lib/tasks/task-transition-service");
-/**
- * How many rows from the bottom of a copilot capture may hold its status bar.
- *
- * `readCopilotStatusBar` stops at the first non-blank row from the end, and the
- * capture handed to it here has already had its trailing blanks trimmed, so one
- * row is enough in practice. The slack exists so the reader keeps working if that
- * trim ever changes, without mapping a thousand rows through `stripAnsi` on every
- * poll tick. (Issue #1897)
- */
-const COPILOT_STATUS_BAR_SCAN_ROWS = 8;
 /**
  * How many rows from the bottom of a capture the upstream-fault check reads
  * (Issue #2000).
@@ -156,46 +143,22 @@ function broadcastPromptSweptToAnswered(worktreeId) {
 // the notification path owns. Idempotent by replacement, and it starts no timer
 // and touches no database until a wait actually opens.
 (0, waiting_push_notifier_1.startWaitingPushNotifier)();
-/**
- * Creates an incomplete extraction result with empty response.
- * Centralizes the repeated pattern of returning an in-progress/incomplete state.
- *
- * @param lineCount - Current line count for state tracking
- * @returns ExtractionResult with empty response and isComplete: false
- */
-function incompleteResult(lineCount) {
-    return { response: '', isComplete: false, lineCount };
-}
-/**
- * Build a complete ExtractionResult for a detected prompt.
- *
- * Shared between Claude early prompt detection (section 3-4, site 1) and
- * fallback prompt detection (section 3-4, site 2) in extractResponse().
- * Applies resolveExtractionStartIndex() to limit extraction to lastCapturedLine
- * onwards, then strips ANSI codes for safe DB storage (Stage 4 MF-001).
- *
- * @param lines - The trimmed tmux buffer lines array
- * @param lastCapturedLine - Number of lines previously captured
- * @param totalLines - Total line count in the buffer
- * @param bufferReset - External buffer reset flag
- * @param cliToolId - CLI tool identifier
- * @param findRecentUserPromptIndex - Callback to locate the most recent user prompt
- * @param promptDetection - Prompt detection result to carry on the extraction result
- * @param captureWindowSaturated - True when the capture was clipped by the capture window (#1670)
- * @returns ExtractionResult with isComplete: true and ANSI-stripped response
- */
-function buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection, captureWindowSaturated = false) {
-    const startIndex = (0, response_extractor_1.resolveExtractionStartIndex)(lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, captureWindowSaturated);
-    const extractedLines = lines.slice(startIndex);
-    return {
-        response: (0, cli_patterns_1.stripAnsi)(extractedLines.join('\n')),
-        isComplete: true,
-        lineCount: totalLines,
-        promptDetection,
-        bufferReset,
-        captureWindowSaturated,
-    };
-}
+// Issue #3374: the extraction result, the two dialog gates and the steps split
+// out of `extractResponse` live in their own modules. The exported names are
+// re-exported under the names they had here, so no import site — and no suite
+// that replaces this module by path — has to change. `detectPromptOnCleanFrame`,
+// `detectPromptWithOptions` and `extractResponse` stay here:
+// `tests/unit/guards/prompt-detector-single-entry-2368.test.ts` pins this file as
+// the one that calls `detectPrompt`, and only this file may import
+// `@/lib/tmux/tmux-capture-cache` (.eslintrc.json `no-restricted-imports`).
+const response_checker_extraction_result_1 = require("./response-checker-extraction-result");
+var response_checker_extraction_result_2 = require("./response-checker-extraction-result");
+Object.defineProperty(exports, "incompleteResult", { enumerable: true, get: function () { return response_checker_extraction_result_2.incompleteResult; } });
+Object.defineProperty(exports, "buildPromptExtractionResult", { enumerable: true, get: function () { return response_checker_extraction_result_2.buildPromptExtractionResult; } });
+const response_checker_dialog_gate_1 = require("./response-checker-dialog-gate");
+var response_checker_dialog_gate_2 = require("./response-checker-dialog-gate");
+Object.defineProperty(exports, "isNumberedDialogVouched", { enumerable: true, get: function () { return response_checker_dialog_gate_2.isNumberedDialogVouched; } });
+const response_checker_extraction_steps_1 = require("./response-checker-extraction-steps");
 /**
  * The one reading of a frame that every consumer of it shares, for a capture
  * that has ALREADY been through `stripBoxDrawing(stripAnsi(…))`.
@@ -260,7 +223,7 @@ function detectPromptOnCleanFrame(cleanOutput, cliToolId, precomputedLines, rawF
     if (cliToolId === 'antigravity') {
         const dialog = (0, dialog_1.detectAntigravityNumberedDialogPrompt)(cleanOutput);
         if (dialog !== null) {
-            return isWithheldForWantOfReceipt(receiptScope)
+            return (0, response_checker_dialog_gate_1.isWithheldForWantOfReceipt)(receiptScope)
                 ? { isPrompt: false, cleanContent: cleanOutput.trim() }
                 : dialog;
         }
@@ -316,90 +279,11 @@ function detectPromptOnCleanFrame(cleanOutput, cliToolId, precomputedLines, rawF
     // does not mean the frame is no dialog — the generic pass above reads shapes
     // agy's reader declines, and #2851 showed it can read a quotation — so a gate
     // that covered only the reader's exit would leave this one open.
-    if (cliToolId === 'antigravity' && result.isPrompt && isWithheldForWantOfReceipt(receiptScope)) {
+    if (cliToolId === 'antigravity' && result.isPrompt && (0, response_checker_dialog_gate_1.isWithheldForWantOfReceipt)(receiptScope)) {
         return { isPrompt: false, cleanContent: cleanOutput.trim() };
     }
     return result;
 }
-/**
- * Should an agy frame that reads as a prompt be treated as no prompt because
- * agy asked CommandMate about no tool call lately? (Issue #2849)
- *
- * agy asks (`PreToolUse`) before it draws ANY approval dialog and waits for the
- * reply, so a dialog that is really open follows a question a moment before it,
- * and one that is only quoted in a reply follows nothing. The frame carries no
- * tool name, so the check is time-only.
- *
- * Not gated (false) when there is no scope: a caller that only shows the frame —
- * the status API, the response poller's stored `prompt` row, the notification —
- * must keep showing a real dialog on a machine whose hook is not installed or
- * did not reach us. Only the caller that ANSWERS the frame opts in, because for
- * it a missed answer costs a human a keystroke and a wrong one is sent as an
- * utterance nobody asked for.
- *
- * `debug`, not `info`: the poller re-reads a static pane every 2s, so a
- * quotation left on screen would print this on every tick.
- */
-function isWithheldForWantOfReceipt(scope) {
-    if (scope === undefined)
-        return false;
-    if ((0, antigravity_permission_receipts_1.hasRecentAntigravityPermissionReceipt)(scope.worktreeId, 'antigravity', scope.instanceId))
-        return false;
-    logger.debug('antigravity-dialog-no-recent-receipt', {
-        worktreeId: scope.worktreeId,
-        instanceId: scope.instanceId ?? 'antigravity',
-    });
-    return true;
-}
-/**
- * Is the generic parser's numbered-list candidate a dialog the tool vouches for?
- * (Issue #2457)
- *
- * ## The candidate this removes
- *
- * `detectPrompt` classifies a frame as `multiple_choice` from the ROWS alone,
- * and for Claude `buildDetectPromptOptions` returns
- * `requireDefaultIndicator: false` — so a reply that happens to answer in
- * Markdown ("1. …  2. …  3. …") is a candidate with no `❯` anywhere near it.
- * Every one of those was stored as a `prompt` message, and the chat surface drew
- * a tool-approval chip over an ordinary answer.
- *
- * ## Why the whole frame, and only the frame
- *
- * `detectDialog` decides by POSITION and CHROME — where the option block sits
- * relative to the transcript tail, what (if anything) is drawn under it. None of
- * that survives being handed the extracted response, the question string or a
- * tail window, so the caller passes the same capture the candidate came off, as
- * captured: `evaluateDialogPresence` documents why the box drawing must still be
- * on it.
- *
- * ## What a `false` means downstream
- *
- * Not "there is no output here" — only "this is not a prompt". The caller falls
- * through to the ordinary completion/partial reading, so a real reply is still
- * saved by the normal path and a half-written one still reports
- * `isComplete: false`.
- *
- * @param cliToolId - CLI tool the frame came from
- * @param promptDetection - What the generic parser (or a tool reader) answered
- * @param frame - The whole capture this tick made, as captured
- * @returns True when the candidate may be treated as a live prompt
- */
-function isNumberedDialogVouched(cliToolId, promptDetection, frame) {
-    const presence = (0, auto_yes_dialog_gate_1.evaluateDialogPresence)(cliToolId, promptDetection.promptData?.type, frame);
-    if (presence.present)
-        return true;
-    // `debug`, not `info`: the poller re-reads a static idle pane every 2s, so a
-    // reply carrying a numbered list would print this on every tick for as long as
-    // it stays on screen. The suppression is not silent where it matters — nothing
-    // is stored, so History simply shows the reply the ordinary path saves.
-    logger.debug('prompt-candidate-not-vouched', {
-        cliToolId,
-        promptType: promptDetection.promptData?.type,
-        gateMode: presence.mode,
-    });
-    return false;
-}
 /**
  * Internal helper: detect prompt with CLI-tool-specific options.
  *
@@ -417,9 +301,6 @@ function detectPromptWithOptions(output, cliToolId) {
     // was DERIVED from.
     return detectPromptOnCleanFrame((0, cli_patterns_1.stripBoxDrawing)((0, cli_patterns_1.stripAnsi)(output)), cliToolId, undefined, output);
 }
-// ============================================================================
-// extractResponse (internal)
-// ============================================================================
 /**
  * Extract CLI tool response from tmux output
  * Detects when a CLI tool has completed a response by looking for tool-specific patterns
@@ -430,7 +311,8 @@ function detectPromptWithOptions(output, cliToolId) {
  * @param captureWindowLines - Size of the capture window `output` was produced with.
  *   Used only to decide whether the capture came back clipped (Issue #1670);
  *   defaults to the window `checkForResponse()` uses.
- * @returns Extracted response or null if incomplete
+ * @returns Null when there is no new output; otherwise the extraction result,
+ *   with `isComplete: false` when the response is not finished yet
  */
 function extractResponse(output, lastCapturedLine, cliToolId, captureWindowLines = tmux_capture_cache_1.CACHE_MAX_CAPTURE_LINES) {
     // Trim trailing empty lines from the output before processing
@@ -476,32 +358,7 @@ function extractResponse(output, lastCapturedLine, cliToolId, captureWindowLines
     // silently delete another tool's boundary, and a boundary that stops existing
     // does not fail loudly: it puts terminal furniture back into History.
     const openCodeCleanLines = cliToolId === 'opencode' ? lines.map(cli_patterns_1.stripAnsi) : null;
-    // Issue #2250: Command Code is the fourth. Its landmark is its own — the
-    // `❯ Ask your question...` composer fenced by two full-pane rules, with the
-    // permission-mode row underneath — and it is load-bearing rather than tidy:
-    // that placeholder is drawn with the same `❯ <text>` shape as a transcript
-    // echo, so without the boundary `findRecentUserPromptIndex` anchors the turn
-    // on the FOOTER and every reply extracts as empty (#1289's defect, verbatim).
-    //
-    // Issue #2400: codex is the fifth, and the one that had been missing. It pins
-    // the same two rows — `› Ask Codex to do anything` and the `model · cwd`
-    // status bar — and without a boundary the saturated-window anchor (#1670)
-    // walked into them: the newest `›` in the pane was the COMPOSER, so extraction
-    // started on the status bar and every reply on a saturated pane was saved as
-    // that one row. `findCodexChromeStart` reads the composer by its SGR
-    // attributes (#2310) rather than by its placeholder wording, which is what the
-    // previous guard did and why it stopped working at codex 0.15x.
-    const chromeStart = cliToolId === 'claude'
-        ? (0, cli_patterns_1.findClaudeChromeStart)(lines)
-        : cliToolId === 'copilot'
-            ? (0, cli_patterns_1.findCopilotChromeStart)(lines)
-            : cliToolId === 'command-code'
-                ? (0, cli_patterns_1.findCommandCodeChromeStart)(lines)
-                : cliToolId === 'codex'
-                    ? (0, cli_patterns_1.findCodexChromeStart)(lines)
-                    : openCodeCleanLines
-                        ? (0, cli_patterns_1.findOpenCodeChromeStart)(openCodeCleanLines)
-                        : -1;
+    const chromeStart = (0, response_checker_extraction_steps_1.findChromeStart)(cliToolId, lines, openCodeCleanLines);
     const contentEnd = chromeStart >= 0 ? chromeStart : totalLines;
     const BUFFER_RESET_TOLERANCE = 25;
     const bufferShrank = totalLines > 0 && lastCapturedLine > BUFFER_RESET_TOLERANCE && (totalLines + BUFFER_RESET_TOLERANCE) < lastCapturedLine;
@@ -520,79 +377,7 @@ function extractResponse(output, lastCapturedLine, cliToolId, captureWindowLines
         : linesToCheck.join('\n');
     // Get tool-specific patterns from shared module
     const { promptPattern, separatorPattern, thinkingPattern, skipPatterns } = (0, cli_patterns_1.getCliToolPatterns)(cliToolId);
-    const findRecentUserPromptIndex = (windowSize = 60) => {
-        let userPromptPattern;
-        if (cliToolId === 'codex') {
-            // Issue #2400: codex's three uses of `›` are separated by their SGR
-            // attributes, not by their text (#2310). This branch used to exclude the
-            // composer with a negative lookahead over its placeholder strings
-            // (`Implement`, `Find and fix`, `Type`, `Summarize`) — codex 0.1x wording,
-            // none of which 0.15x draws. `Ask Codex to do anything` passed the guard,
-            // became the newest "echo", and on a saturated pane (#1670) — the only
-            // path where this anchor decides where extraction STARTS — every reply was
-            // saved as the single status-bar row below it.
-            //
-            // Two independent things now keep the composer out, and the reader needs
-            // both because neither covers the other's frames: `contentEnd` cuts the
-            // composer off structurally when `findCodexChromeStart` located it, and
-            // when it did not, `findCodexUserEchoIndex` steps over the bottom-most
-            // `›` row instead. The second is what still answers on an ANSI-stripped
-            // capture, where none of #2310's attributes survive to be read.
-            return (0, cli_patterns_1.findCodexUserEchoIndex)(lines, contentEnd, windowSize, chromeStart >= 0);
-        }
-        else if (openCodeCleanLines) {
-            // Issue #1911: anchor on the newest ECHOED USER PROMPT, not on the
-            // second-to-last `▣ Build` row. The old anchor belonged to the PREVIOUS
-            // turn, so the echoed prompt of the current one was always extracted as
-            // part of the reply — and on the first turn of a session, where there is
-            // no second marker, it fell through to line 0 and the whole pane (banner
-            // included) became the answer. `windowSize` is ignored: the alternate
-            // screen has no scrollback, so the whole pane IS the window, and every
-            // caller already passes `totalLines` or more for this tool.
-            return (0, response_extractor_1.resolveOpenCodeTurnRegion)(openCodeCleanLines).echoEnd;
-        }
-        else if (cliToolId === 'copilot') {
-            // Issue #1897: copilot 1.0.80 draws the transcript one column in, so the
-            // bare `^[>❯]` form below never matched the echoed prompt -- every copilot
-            // extraction fell back to line 0, i.e. to the launch banner. The composer,
-            // which IS at column 0, lives below `contentEnd` and so cannot be picked up
-            // as an echo here.
-            //
-            // The scan then walks past the echo's own wrapped rows and returns the LAST
-            // of them, so that callers' `+ 1` lands on the reply rather than on the
-            // second half of the operator's question.
-            //
-            // Same defect as #1911's opencode branch above and the same shape of fix,
-            // but NOT the same code: opencode's echo is a `┃  <text>` gutter row and
-            // copilot's is ` ❯ <text>` at the pane's one-column indent, so the anchor
-            // and the continuation rule are both tool-specific measurements.
-            for (let i = contentEnd - 1; i >= Math.max(0, contentEnd - windowSize); i--) {
-                if (!cli_patterns_1.COPILOT_USER_ECHO_PATTERN.test((0, cli_patterns_1.stripAnsi)(lines[i])))
-                    continue;
-                let echoEnd = i;
-                while (echoEnd + 1 < contentEnd &&
-                    cli_patterns_1.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN.test((0, cli_patterns_1.stripAnsi)(lines[echoEnd + 1]))) {
-                    echoEnd++;
-                }
-                return echoEnd;
-            }
-            return -1;
-        }
-        else {
-            userPromptPattern = /^[>❯]\s+\S/;
-        }
-        // Issue #1289: for Claude the search stops above the footer. The text the
-        // user just typed sits in the footer's input box and matches the same "❯ …"
-        // shape as the transcript echo; anchoring on it would treat the footer as
-        // the newest turn and extract the status bar as its reply.
-        for (let i = contentEnd - 1; i >= Math.max(0, contentEnd - windowSize); i--) {
-            const cleanLine = (0, cli_patterns_1.stripAnsi)(lines[i]);
-            if (userPromptPattern.test(cleanLine)) {
-                return i;
-            }
-        }
-        return -1;
-    };
+    const findRecentUserPromptIndex = (windowSize = 60) => (0, response_checker_extraction_steps_1.findRecentUserPromptIndexInFrame)(cliToolId, lines, openCodeCleanLines, chromeStart, contentEnd, windowSize);
     // Early check for interactive prompts (before extraction logic)
     //
     // Issue #2250: `command-code` must be here. Its permission dialog draws its
@@ -612,270 +397,21 @@ function extractResponse(output, lastCapturedLine, cliToolId, captureWindowLines
         // completion/partial reading to answer, which is what a reply containing a
         // numbered list needs. The gate is handed `fullOutput`, the capture itself,
         // not the string `detectPromptWithOptions` cleaned for the parser.
-        if (promptDetection.isPrompt && isNumberedDialogVouched(cliToolId, promptDetection, fullOutput)) {
-            return buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection, captureWindowSaturated);
+        if (promptDetection.isPrompt && (0, response_checker_dialog_gate_1.isNumberedDialogVouched)(cliToolId, promptDetection, fullOutput)) {
+            return (0, response_checker_extraction_result_1.buildPromptExtractionResult)(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection, captureWindowSaturated);
         }
     }
     // Strip ANSI codes before pattern matching
     const cleanOutputToCheck = (0, cli_patterns_1.stripAnsi)(outputToCheck);
-    const hasPrompt = promptPattern.test(cleanOutputToCheck);
-    const hasSeparator = separatorPattern.test(cleanOutputToCheck);
-    // Issue #1671: Codex's activity markers are past-tense transcript records that
-    // never leave the scrollback, so testing them against this fixed tail window
-    // reports "still thinking" for a finished turn whenever its final message was
-    // short enough to keep the last "• Ran <cmd>" row inside the window. Codex gets
-    // a liveness check that keys off the status line it repaints above the composer
-    // instead; every other tool keeps the tail-window match.
-    const isThinking = cliToolId === 'codex'
-        ? (0, cli_patterns_1.isCodexTurnActive)(lines, checkLineCount)
-        : thinkingPattern.test(cleanOutputToCheck);
-    // Issue #1897: copilot's `hasPrompt` is worthless as a completion signal and
-    // its `isThinking` is worthless as a liveness one. The `❯` composer is drawn
-    // between its two rules throughout a turn (measured on every frame of #1885's
-    // running fixtures), and `COPILOT_THINKING_PATTERN` matches nothing copilot
-    // 1.0.80 draws (0 of 44 live generating frames). So `hasPrompt && !isThinking`
-    // was true on the very first poll of a running turn -- the extractor declared
-    // the turn finished, saved the status bar as the reply, and `checkForResponse`
-    // stopped polling, which is why the real answer never reached History.
-    //
-    // 1.0.80 paints the turn's state on the bottom row of the pane and nowhere
-    // else, so that ROW -- never a tail window, which copilot's own reply text can
-    // forge (`status-vocabulary-in-response.txt`) -- is the evidence. `idle` is a
-    // positive observation that the turn is over (design policy §4 D1 decision 1
-    // item 2); `working` and `null` (a dialog box has taken the bar away) both mean
-    // "not finished", and the dialog case is already served by the prompt path
-    // above.
-    const copilotStatusBar = cliToolId === 'copilot'
-        ? (0, cli_patterns_1.readCopilotStatusBar)(lines.slice(Math.max(0, totalLines - COPILOT_STATUS_BAR_SCAN_ROWS)).map(cli_patterns_1.stripAnsi))
-        : null;
-    // Prompt-based completion logic
-    const isPromptBasedComplete = cliToolId === 'copilot'
-        ? copilotStatusBar === 'idle'
-        : (cliToolId === 'codex' || cliToolId === 'gemini' || cliToolId === 'vibe-local' || cliToolId === 'antigravity') && hasPrompt && !isThinking;
-    const isClaudeComplete = cliToolId === 'claude' && hasPrompt && hasSeparator && !isThinking;
-    // Issue #2250: claude's shape, because Command Code's layout is claude's — the
-    // composer sits between two full-pane rules and is drawn only when the agent
-    // will accept input. Deliberately NOT keyed on `✻ Worked for`: that row is the
-    // live turn's, not the transcript's (it is present in `turn-version.txt` and
-    // gone from `dialog-create-file.txt`, the same pane one prompt later) and
-    // `WorkedDurationNote` omits it entirely for a turn under 1000 ms.
-    const isCommandCodeComplete = cliToolId === 'command-code' && hasPrompt && hasSeparator && !isThinking;
-    const isOpenCodeDone = cliToolId === 'opencode' && (0, response_extractor_1.isOpenCodeComplete)(cleanOutputToCheck);
-    if (isPromptBasedComplete || isClaudeComplete || isCommandCodeComplete || isOpenCodeDone) {
-        const responseLines = [];
-        const startIndex = (0, response_extractor_1.resolveExtractionStartIndex)(lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, captureWindowSaturated);
-        // `contentEnd` bounds the content only; `endIndex` keeps reporting the full
-        // buffer so lineCount bookkeeping in session_states is unchanged (#1289).
-        //
-        // Issue #2400: codex is the exception, and it is the pre-existing behaviour
-        // rather than a new rule. Before this Issue the loop below stopped on the
-        // composer's `›` and wrote that row's index into `endIndex`; now the composer
-        // is outside `contentEnd`, so the break can no longer fire on it and
-        // `endIndex` would silently advance ~3 rows further. Those rows matter for
-        // codex specifically: it renders INLINE, and it repaints the composer band in
-        // place — the next turn's transcript is printed over exactly the rows the
-        // composer occupied in this capture. A cursor parked past them would skip
-        // real content on the following poll. So the cursor stops where the content
-        // stops, which is what it did before.
-        let endIndex = cliToolId === 'codex' ? contentEnd : totalLines;
-        for (let i = startIndex; i < contentEnd; i++) {
-            const line = lines[i];
-            const cleanLine = (0, cli_patterns_1.stripAnsi)(line);
-            if (cliToolId === 'codex' && /^›\s+/.test(cleanLine)) {
-                endIndex = i;
-                break;
-            }
-            if (cliToolId === 'gemini' && /^(%|\$|.*@.*[%$#])\s*$/.test(cleanLine)) {
-                endIndex = i;
-                break;
-            }
-            // Antigravity (agy): the bare ">" input box line marks the end of the
-            // response (the status bar and shortcuts footer follow below it). (Issue #988)
-            if (cliToolId === 'antigravity' && /^>\s*$/.test(cleanLine)) {
-                endIndex = i;
-                break;
-            }
-            // Issue #1911: both rows this stops on (`Ask anything...` in the composer,
-            // `tab agents  ctrl+p commands` under its border) live in the chrome, which
-            // `contentEnd` now excludes structurally. Kept only as the fallback for a
-            // frame whose chrome could not be located, because there it is still the
-            // one boundary available — and #1883 measured that a REPLY can contain
-            // `Ask anything...`, so cutting the turn on it is a last resort, not the
-            // primary rule.
-            if (cliToolId === 'opencode' && chromeStart < 0) {
-                if (cli_patterns_1.OPENCODE_PROMPT_PATTERN.test(cleanLine) || cli_patterns_1.OPENCODE_PROMPT_AFTER_RESPONSE.test(cleanLine)) {
-                    endIndex = i;
-                    break;
-                }
-            }
-            const shouldSkip = skipPatterns.some(pattern => pattern.test(cleanLine));
-            if (shouldSkip) {
-                continue;
-            }
-            responseLines.push(line);
-        }
-        const response = responseLines.join('\n').trim();
-        // DR-004: Check only the tail of the response for thinking indicators.
-        //
-        // Issue #1897: not for copilot. This is the same tail-window match the #1671
-        // codex fix removed from the liveness test, and on copilot it is both
-        // redundant and harmful: the status bar above has already made a positive
-        // `idle` observation about THIS frame, while the window here sees transcript
-        // that never scrolls away. `COPILOT_THINKING_PATTERN`'s braille alternative
-        // matches any spinner glyph a reply happens to quote, and the turn would then
-        // be reported unfinished for the rest of the session.
-        const responseTailLines = response.split('\n').slice(-thinking_constants_1.THINKING_TAIL_LINE_COUNT).join('\n');
-        if (cliToolId !== 'copilot' && thinkingPattern.test(responseTailLines)) {
-            return incompleteResult(totalLines);
-        }
-        // CRITICAL FIX: Detect and skip Claude Code startup banner/screen
-        if (cliToolId === 'claude') {
-            const cleanResponse = (0, cli_patterns_1.stripAnsi)(response);
-            // Issue #2247: `│` is what Claude Code draws markdown TABLES with -- the
-            // live frame in `tests/fixtures/claude-live-2247/turn-table.txt` is a
-            // two-row table and nothing else -- so it identified a reply, not a banner.
-            // The banner's own frame glyphs are the rounded corners and the block
-            // shading; those stay.
-            const hasBannerArt = /[╭╮╰╯]/.test(cleanResponse) || /░{3,}/.test(cleanResponse) || /▓{3,}/.test(cleanResponse);
-            // Issue #2247: the bare `v\d+\.\d+` alternative matched any version string a
-            // reply happens to mention. The frame that lost a turn on 2026-09-02 was
-            // "GitHub Release v0.30.0 を公開しました" (148 chars, well under the 2000
-            // below). What the banner actually prints is the tool's own name and
-            // version on one row -- `Claude Code v2.1.258` -- so that is what is
-            // matched now, plus the `claude/` form older banners used.
-            const hasVersionInfo = /Claude Code v\d+\.\d+|claude\//.test(cleanResponse);
-            const hasStartupTips = /Tip:|for shortcuts|\?\s*for help/.test(cleanResponse);
-            const hasProjectInit = /^\s*\/Users\/.*$/m.test(cleanResponse) && cleanResponse.split('\n').length < 30;
-            // Issue #2247: the anchors above are only evidence of a banner on a pane
-            // that has not had a single turn yet -- the same shape as the #1897 copilot
-            // fix below. Claude echoes every prompt into the transcript as `❯ <text>`,
-            // and the startup screen has none, so an echo anywhere in the transcript
-            // rules the banner out no matter what the reply quotes.
-            //
-            // The search is `findRecentUserPromptIndex`, deliberately: it is the same
-            // `/^[>❯]\s+\S/` this file already anchors extraction on, and it stops at
-            // `contentEnd`. That bound is load-bearing rather than incidental -- the
-            // footer's composer draws a DIM ghost suggestion (`❯ Try "write a test for
-            // <filepath>"`, see `boot-banner.txt`) whose stripped bytes are identical
-            // to a real echo (#1879), so a scan over the whole pane would read the
-            // startup screen as "already had a turn" and put the banner back in
-            // History.
-            const hasTurnEcho = findRecentUserPromptIndex(totalLines) >= 0;
-            const userPromptMatch = cleanResponse.match(/^[>❯]\s+(\S.*)$/m);
-            if (userPromptMatch) {
-                const userPromptIndex = cleanResponse.indexOf(userPromptMatch[0]);
-                const contentAfterPrompt = cleanResponse.substring(userPromptIndex + userPromptMatch[0].length).trim();
-                const contentLines = contentAfterPrompt.split('\n').filter(line => {
-                    const trimmed = line.trim();
-                    return trimmed &&
-                        !skipPatterns.some(p => p.test(trimmed)) &&
-                        !/^─+$/.test(trimmed);
-                });
-                if (contentLines.length === 0) {
-                    return incompleteResult(totalLines);
-                }
-            }
-            else if (!hasTurnEcho &&
-                (hasBannerArt || hasVersionInfo || hasStartupTips || hasProjectInit) &&
-                response.length < 2000) {
-                // Issue #2247: this branch used to swallow the turn in silence -- the
-                // poller kept ticking every 2s and `response-poller` logged nothing at
-                // all, so the only way to tell a lost turn from an idle session was to
-                // re-run `extractResponse` on a saved pane by hand. It is reached only
-                // before the first echo lands, so it cannot become a per-tick flood.
-                logger.info('Claude startup banner suppressed, response not saved', {
-                    responseLength: response.length,
-                    hasBannerArt,
-                    hasVersionInfo,
-                    hasStartupTips,
-                    hasProjectInit,
-                });
-                return incompleteResult(totalLines);
-            }
-        }
-        // Issue #1897: copilot's launch screen is a complete, idle frame -- composer
-        // drawn, key hints on the status bar -- so every check above accepts it and
-        // History used to open with the banner ("Current Sessions Issues Pull
-        // requests Gists / No copilot-instructions.md found… / Tip: /app") saved as
-        // the agent's first reply, before the operator had said anything.
-        //
-        // What actually distinguishes it is that no turn has happened: copilot echoes
-        // every prompt into the transcript as ` ❯ <text>`, and the launch screen has
-        // none. The banner anchors are only consulted once that echo is missing, so a
-        // reply that quotes any of this wording is unaffected.
-        if (cliToolId === 'copilot') {
-            const cleanResponse = (0, cli_patterns_1.stripAnsi)(response);
-            const hasUserEcho = cleanResponse
-                .split('\n')
-                .some(line => cli_patterns_1.COPILOT_USER_ECHO_PATTERN.test(line));
-            if (!hasUserEcho && cli_patterns_1.COPILOT_BOOT_BANNER_ANCHORS.some(anchor => anchor.test(cleanResponse))) {
-                return incompleteResult(totalLines);
-            }
-        }
-        // Issue #2250: Command Code's launch screen is a complete, idle frame --
-        // block-art logo, three `#` banner rows, composer drawn between its two
-        // rules -- so every check above accepts it, and History would open with
-        // `# Command Code v1.40.1 / # models: … / # <cwd>` saved as the agent's
-        // first reply before the operator has said anything.
-        //
-        // The rule is ONE condition and it is a positive one: Command Code echoes
-        // every prompt into the transcript as `❯ <text>`, and the launch screen has
-        // none. That is the shape #1897 and #2247 both converged on; the anchor
-        // heuristics claude carries above (`hasBannerArt` / `hasVersionInfo` /
-        // `hasStartupTips`) are deliberately NOT reproduced here, because they are
-        // what #2247 had to take back -- a bare version string in a reply is a
-        // normal reply, and Command Code prints its own version on every launch.
-        //
-        // `findRecentUserPromptIndex` is the same `/^[>❯]\s+\S/` scan the extraction
-        // anchors on, and it stops at `contentEnd`, so the composer's own dim
-        // `❯ Ask your question...` placeholder cannot be mistaken for an echo
-        // (#1879's trap).
-        if (cliToolId === 'command-code' && findRecentUserPromptIndex(totalLines) < 0) {
-            logger.info('Command Code launch screen suppressed, response not saved', {
-                responseLength: response.length,
-            });
-            return incompleteResult(totalLines);
-        }
-        // Gemini-specific check
-        if (cliToolId === 'gemini') {
-            const bannerCharCount = (response.match(/[░███]/g) || []).length;
-            const totalChars = response.length;
-            if (bannerCharCount > totalChars * 0.3) {
-                return incompleteResult(totalLines);
-            }
-            if (response_poller_core_1.GEMINI_LOADING_INDICATORS.some(indicator => response.includes(indicator))) {
-                return incompleteResult(totalLines);
-            }
-            if (!response.includes('\u2726') && response.length < 10) {
-                return incompleteResult(totalLines);
-            }
-        }
-        // OpenCode banner defense
-        if (cliToolId === 'opencode') {
-            const cleanResponse = (0, cli_patterns_1.stripAnsi)(response);
-            if (cleanResponse.length < 50 || !cli_patterns_1.OPENCODE_RESPONSE_COMPLETE.test(cleanOutputToCheck)) {
-                const contentLines = cleanResponse.split('\n').filter(line => {
-                    const trimmed = line.trim();
-                    return trimmed && !cli_patterns_1.OPENCODE_SKIP_PATTERNS.some(p => p.test(trimmed));
-                });
-                if (contentLines.length === 0) {
-                    return incompleteResult(totalLines);
-                }
-            }
-        }
-        return {
-            response,
-            isComplete: true,
-            lineCount: endIndex,
-            bufferReset,
-            captureWindowSaturated,
-            // Issue #1911: opencode only. `echoEnd < 0` means the turn is longer than
-            // the alternate-screen pane and its head has already scrolled away, so
-            // `response` starts mid-answer. Nothing else in this frame can recover it.
-            turnHeadTruncated: openCodeCleanLines
-                ? (0, response_extractor_1.resolveOpenCodeTurnRegion)(openCodeCleanLines).headTruncated
-                : undefined,
-        };
+    // Issue #3213: what the steps split out of this function read off the frame.
+    const ctx = {
+        cliToolId, lines, totalLines, openCodeCleanLines, chromeStart, contentEnd,
+        lastCapturedLine, bufferReset, captureWindowSaturated, checkLineCount, cleanOutputToCheck,
+        promptPattern, separatorPattern, thinkingPattern, skipPatterns,
+        findRecentUserPromptIndex,
+    };
+    if ((0, response_checker_extraction_steps_1.isTurnComplete)(ctx)) {
+        return (0, response_checker_extraction_steps_1.extractCompletedResponse)(ctx);
     }
     // Check if this is an interactive prompt
     if (cliToolId !== 'opencode') {
@@ -884,234 +420,623 @@ function extractResponse(output, lastCapturedLine, cliToolId, captureWindowLines
         // reaches when the completion rules said "unfinished", so a candidate
         // accepted here would end the turn on it just the same.
         const promptDetection = detectPromptWithOptions(fullOutput, cliToolId);
-        if (promptDetection.isPrompt && isNumberedDialogVouched(cliToolId, promptDetection, fullOutput)) {
-            return buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection, captureWindowSaturated);
+        if (promptDetection.isPrompt && (0, response_checker_dialog_gate_1.isNumberedDialogVouched)(cliToolId, promptDetection, fullOutput)) {
+            return (0, response_checker_extraction_result_1.buildPromptExtractionResult)(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection, captureWindowSaturated);
         }
     }
-    // Partial response in progress
-    const responseLines = [];
-    const endIndex = totalLines;
-    // Issue #1670: a saturated window makes lastCapturedLine meaningless here too —
-    // starting the partial slice at it would stream an arbitrary tail fragment
-    // instead of the turn so far. Re-anchor on the echoed user prompt.
-    const partialBufferReset = bufferReset || captureWindowSaturated || lastCapturedLine >= endIndex - 5;
-    const recentPromptIndex = partialBufferReset ? findRecentUserPromptIndex(80) : -1;
-    const startIndex = partialBufferReset
-        ? (recentPromptIndex >= 0 ? recentPromptIndex + 1 : Math.max(0, endIndex - 80))
-        : Math.max(0, lastCapturedLine);
-    // Partial (still-streaming) content is bounded by the footer too (#1289).
-    for (let i = startIndex; i < Math.min(endIndex, contentEnd); i++) {
-        const line = lines[i];
-        const cleanLine = (0, cli_patterns_1.stripAnsi)(line);
-        const shouldSkip = skipPatterns.some(pattern => pattern.test(cleanLine));
-        if (shouldSkip) {
-            continue;
-        }
-        responseLines.push(line);
-    }
-    const partialResponse = responseLines.join('\n').trim();
-    if (partialResponse) {
-        return {
-            response: partialResponse,
-            isComplete: false,
-            lineCount: endIndex,
-        };
-    }
-    // Response not yet complete
-    return incompleteResult(totalLines);
+    return (0, response_checker_extraction_steps_1.extractPartialResponse)(ctx);
 }
 // ============================================================================
 // checkForResponse (exported for response-poller-core.ts)
 // ============================================================================
-// ============================================================================
-// The held scrape (Issue #2436)
-// ============================================================================
 /**
- * How long a scraped reply is held while its transcript finishes closing.
+ * Record what the structured writers said about this turn, for the ticks that
+ * will not get to ask (Issue #2399).
  *
- * Derived from `STOP_TRANSCRIPT_DEFERRED_DELAYS_MS`, not spelled again: those
- * are the instants the Stop receiver re-reads the transcript at after it has
- * answered the agent (#2398), so their SUM is the moment after which nobody is
- * still trying. Holding past it would be holding for a row that has no producer
- * left; stopping short of it would race the producer that is still running.
+ * One line either way, but named because the two calls are a pair and the
+ * failure mode of writing only one of them is silent: mark without settle and
+ * the reader is re-asked forever after a turn it already recorded; settle
+ * without mark and the fix does not exist.
  *
- * The measured gap this covers is under a second — codex 2026-09-08 appended
- * `task_complete` ~700 ms after the frame went quiet — so the budget is roughly
- * ten times the case it exists for, spent only on turns that ask for it.
+ * @param pollerKey - Poller key ("worktreeId:instanceId")
+ * @param recorded - Whether a structured writer owns this turn
  */
-exports.PENDING_SCRAPE_HOLD_MS = stop_history_capture_1.STOP_TRANSCRIPT_DEFERRED_DELAYS_MS.reduce((total, delay) => total + delay, 0);
+function markOrSettleStructuredHistoryRecheck(pollerKey, recorded) {
+    if (recorded) {
+        (0, response_dedup_1.settleStructuredHistoryRecheck)(pollerKey);
+    }
+    else {
+        (0, response_dedup_1.markStructuredHistoryRecheckPending)(pollerKey);
+    }
+}
 /**
- * Held scrapes, by poller key.
+ * Read the frame this tick captured: is there a finished turn on it that the
+ * cursor has not already counted?
+ *
+ * The part of {@link checkForResponse} between the capture and the prompt
+ * check, split out as it was (Issue #3213). It starts on the line after the
+ * capture's `await` and holds no `await` of its own, so it moved as a
+ * synchronous function and the call adds no yield. The part above it — the
+ * session check through the capture — has four, and stays where it was: a
+ * function holding them would have to be awaited, and that yield would fall
+ * between the capture and everything this tick does with it.
  *
- * **Deliberately not in `./response-dedup`.** That module's two caches are
- * cleared by `stopPollingByKey` — `clearResponseHashCache` is called from
- * inside it — so a held reply parked beside them would be dropped by the very
- * event that has to write it (Issue #2436, requirement B). It lives here, next
- * to the code that fills it and the code that writes it out, and
- * `flushPendingScrapedResponse` is what the poller calls before it clears
- * anything.
+ * Not a pure read. It feeds the fault notifier and the Layer-2 accumulator on
+ * every tick, and on an unfinished frame it may mark pending prompts answered.
  *
- * On `globalThis` for the reason every shared map in this subsystem is (#1736):
- * under `next dev` the poller's bundle and each route's bundle would otherwise
- * hold a private copy, and a held reply only one bundle can see is a lost one.
+ * Every `return false` is the tick's own result; the caller returns it as it is.
+ *
+ * @param ctx - What this tick is keyed by
+ * @param output - The capture this tick made
+ * @param lastCapturedLine - Its cursor, 0 when there is none
+ * @returns What the tick goes on with, or `false` when the tick ends here
  */
-const pendingScrapedResponses = (globalThis.__pendingScrapedResponses ??= new Map());
-/** Forget every held scrape. Test seam. */
-function resetPendingScrapedResponses() {
-    pendingScrapedResponses.clear();
-}
-/** Whether a scrape is being held for this poller key. Test seam / diagnostics. */
-function hasPendingScrapedResponse(pollerKey) {
-    return pendingScrapedResponses.has(pollerKey);
+function extractCompletedTurn(ctx, output, lastCapturedLine) {
+    const { db, worktreeId, cliToolId, instanceId, resolvedInstanceId, pollerKey } = ctx;
+    // Issue #2000: the frame is in hand, so this is the cheapest place to ask
+    // whether the model API has stalled the session. Level in, edge out — see
+    // the helper.
+    observeUpstreamFaultForPush(worktreeId, cliToolId, instanceId, output);
+    // Layer 2: Accumulate TUI content for full-screen TUI tools, so a turn that
+    // outgrows the alternate-screen pane keeps the head that has scrolled away.
+    if (cliToolId === 'opencode' || cliToolId === 'copilot') {
+        // Issue #1911: opencode is accumulated from the CURRENT TURN'S REGION
+        // rather than the whole frame. Feeding the raw pane seeded the accumulator
+        // with the previous turn's transcript, the echoed prompt and the bottom
+        // chrome on the very first poll, so the accumulated content could never be
+        // used as a response source without re-introducing defect 1.
+        const accumulatorSource = cliToolId === 'opencode' ? (0, response_extractor_1.sliceOpenCodeTurn)(output) : output;
+        (0, tui_accumulator_1.accumulateTuiContent)(pollerKey, accumulatorSource, cliToolId);
+    }
+    // Extract response
+    const result = extractResponse(output, lastCapturedLine, cliToolId, tmux_capture_cache_1.CACHE_MAX_CAPTURE_LINES);
+    if (!result || !result.isComplete) {
+        // DR-004 windowing: Only check tail lines
+        const { thinkingPattern } = (0, cli_patterns_1.getCliToolPatterns)(cliToolId);
+        const cleanOutput = (0, cli_patterns_1.stripAnsi)(output);
+        const tailLines = cleanOutput.split('\n').slice(-thinking_constants_1.THINKING_TAIL_LINE_COUNT).join('\n');
+        if (thinkingPattern.test(tailLines)) {
+            // Intended twin of the sweep in recordCompletedResponse: this one runs when
+            // working is visible on an unfinished frame, that one when a response is
+            // recorded (Issue #31).
+            const answeredCount = (0, db_1.markPendingPromptsAsAnswered)(db, worktreeId, cliToolId, resolvedInstanceId, broadcastPromptSweptToAnswered(worktreeId));
+            if (answeredCount > 0) {
+                logger.info('marked-answeredcount-pending');
+            }
+        }
+        return false;
+    }
+    const isFullScreenTui = cliToolId === 'opencode' || cliToolId === 'copilot';
+    // Issue #1268: line-count bookkeeping is only meaningful for tools that keep
+    // scrollback. Alternate-screen tools (claude since v2, opencode, copilot)
+    // always capture exactly pane_height lines, so lastCapturedLine saturates at
+    // the pane height on the first save and every later check would see
+    // `lineCount <= lastCapturedLine` and drop the response forever — leaving
+    // History stuck on "Waiting for response..." while the terminal shows the
+    // reply. Those tools dedup on response content instead (see below).
+    //
+    // Issue #1670: the scrollback tools reach the SAME dead end from the other
+    // side. Their buffer does grow — but only until it outgrows the capture
+    // window, after which the capture is clipped, the count is pinned at the
+    // window size, and the cursor can never be overtaken again. #1268 fixed
+    // saturation at pane height; this is saturation at the capture window, and it
+    // disables the cursor for exactly as long as the clipping lasts (a session
+    // restart or a cleared pane un-saturates it and the cursor comes back).
+    const lineCountIsCursor = !(0, types_1.usesAlternateScreen)(cliToolId) && !result.captureWindowSaturated;
+    // Duplicate prevention
+    if (lineCountIsCursor && !result.bufferReset && result.lineCount === lastCapturedLine) {
+        return false;
+    }
+    if (lineCountIsCursor && !result.bufferReset && result.lineCount <= lastCapturedLine) {
+        // Every poll of a finished, unchanged screen lands here, so it is debug.
+        logger.debug('already-saved-up-to-last-captured-line', {
+            worktreeId,
+            cliToolId,
+            instanceId: resolvedInstanceId,
+            lineCount: result.lineCount,
+            lastCapturedLine,
+        });
+        return false;
+    }
+    return { result, isFullScreenTui, lineCountIsCursor };
 }
 /**
- * Hold this tick's scraped reply instead of writing it (Issue #2436).
+ * Save a live prompt as a prompt message, and raise what follows from it: the
+ * task event, the push notification and the waiting episode.
  *
- * Called when the transcript reader has said `not_yet_closed`: the agent's own
- * Markdown for this turn is coming, and writing the pane's copy now is what put
- * 234,323 characters of prompt echo, intermediate output and footer into
- * History beside the real answer.
+ * The body of the `if (promptIsLive)` branch of {@link checkForResponse}, split
+ * out as it was (Issue #3213). Both returns are the tick's own result — `false`
+ * for a prompt the dedup has already recorded, `true` once the row is written.
  *
- * A second hold for the same key REPLACES the content and keeps the original
- * deadline. Replaces, because a frame that moved on is a better copy of the
- * same turn; keeps, because a pane that redraws every tick would otherwise push
- * its own deadline forward forever and the hold would stop being bounded.
+ * @param ctx - What this tick is keyed by
+ * @param promptDetection - The detection that passed the #2457 gate
+ * @param result - The complete extraction this tick made
+ * @param isFullScreenTui - True for opencode and copilot, which keep polling after a prompt
+ * @returns What `checkForResponse` returns for this tick
  */
-function holdScrapedResponse(pollerKey, pending) {
-    const existing = pendingScrapedResponses.get(pollerKey);
-    if (existing) {
-        existing.content = pending.content;
-        return;
+function savePromptMessage(ctx, promptDetection, result, isFullScreenTui) {
+    const { db, worktree, worktreeId, cliToolId, instanceId, resolvedInstanceId, pollerKey } = ctx;
+    // Issue #565: Content hash-based duplicate prompt prevention
+    const promptContent = promptDetection.rawContent || promptDetection.cleanContent;
+    const normalizedForDedup = (0, prompt_dedup_1.normalizePromptForDedup)(promptContent, cliToolId);
+    if ((0, prompt_dedup_1.isDuplicatePrompt)(pollerKey, normalizedForDedup)) {
+        // Issue #1695: the log line below is invisible to `commandmate capture
+        // --json`, so a suppressed prompt and a prompt the detection layer never
+        // classified (#1676) look identical from the CLI — both say "nothing was
+        // recorded". Count the skip so the payload can tell them apart.
+        (0, prompt_dedup_state_1.recordPromptDedupSkip)(worktreeId, cliToolId, instanceId);
+        logger.info('duplicate-prompt-skipped', { worktreeId, cliToolId });
+        return false;
+    }
+    // Issue #571: Clean TUI decorations from Copilot prompt content before saving
+    let promptSaveContent = promptContent;
+    if (cliToolId === 'copilot') {
+        promptSaveContent = (0, response_cleaner_1.cleanCopilotResponse)(promptContent);
+        promptSaveContent = (0, response_cleaner_1.truncateMessage)(promptSaveContent, copilot_constants_1.COPILOT_MAX_MESSAGE_LENGTH, copilot_constants_1.COPILOT_TRUNCATION_MARKER);
+    }
+    // This is a prompt - save as prompt message
+    (0, db_1.clearInProgressMessageId)(db, worktreeId, cliToolId, resolvedInstanceId);
+    const message = (0, db_1.createMessage)(db, {
+        worktreeId,
+        role: 'assistant',
+        content: promptSaveContent,
+        messageType: 'prompt',
+        promptData: promptDetection.promptData,
+        timestamp: new Date(),
+        cliToolId,
+        instanceId: resolvedInstanceId,
+    });
+    (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
+    (0, ws_server_1.broadcastMessage)('message', { worktreeId, message });
+    // Issue #1548: the agent is blocked on input. Raised after the dedup and
+    // save above, so the task log counts prompts the system actually recorded
+    // rather than every poll that saw the same one still on screen. No-ops
+    // when this instance is not running a contract.
+    (0, task_transition_service_1.applyEventToActiveTask)(db, worktreeId, cliToolId, resolvedInstanceId, 'prompt_detected', {
+        promptType: promptDetection.promptData?.type,
+    });
+    // Web Push fan-out (Issue #1125): agent is now waiting for a prompt reply.
+    // Fire-and-forget — push is advisory and must never block/break the poller.
+    //
+    // Issue #1790: the wait is now named by #1786's episode rather than by the
+    // prompt text. The two lines below are ordered, not incidental:
+    //
+    //  1. the notification is raised first, while it still has the prompt's
+    //     own question to quote — it records the episode in the dedup, so
+    //     whichever path reports the wait second says nothing;
+    //  2. `observeWaitingEdge` then opens that same episode, which is what
+    //     lets the edge listener (and #1788's WebSocket frame) agree with this
+    //     call about *which* wait this is instead of raising a second one.
+    //
+    // Both use one timestamp so the episode the notification claims and the
+    // episode the store opens are the same number.
+    const promptObservedAt = Date.now();
+    const promptWaitingSince = (0, waiting_episode_state_1.getWaitingEpisode)(worktreeId, cliToolId, instanceId)?.since ?? promptObservedAt;
+    // Issue #1999: Auto-Yes is a declaration that this session's prompts are
+    // answered without a human, so notifying for one is telling the reader the
+    // opposite of the truth. Only the notification is gated — the episode
+    // below still opens, so the WebSocket frame, the status API and the #1790
+    // reminder all see the wait exactly as they did before. The gate runs
+    // before the call rather than inside it because `shouldSendWaitingPush`
+    // records the episode the moment it decides to send.
+    if (!(0, prompt_push_gate_1.isPromptPushSuppressed)({
+        worktreeId,
+        cliToolId,
+        instanceId,
+        waitingSince: promptWaitingSince,
+    })) {
+        void (0, push_1.notifyPushSubscribers)({
+            worktreeId,
+            worktreeName: worktree.name,
+            kind: 'prompt',
+            agentName: resolvedInstanceId,
+            instanceId: resolvedInstanceId,
+            waitingKind: 'prompt',
+            waitingSince: promptWaitingSince,
+            excerpt: promptDetection.promptData?.question ?? promptSaveContent,
+        }).catch(() => { });
+    }
+    (0, waiting_episode_state_1.observeWaitingEdge)({
+        worktreeId,
+        cliToolId,
+        instanceId,
+        waiting: true,
+        kind: 'prompt',
+        now: promptObservedAt,
+    });
+    if (!isFullScreenTui) {
+        (0, response_poller_core_1.stopPolling)(worktreeId, cliToolId, instanceId);
     }
-    pendingScrapedResponses.set(pollerKey, pending);
+    return true;
 }
 /**
- * Drop a held scrape without writing it (Issue #2436).
+ * Clean a complete response the way its tool needs before it is saved.
+ *
+ * The "Clean up responses" step of {@link checkForResponse}, split out as it
+ * was (Issue #3213). Not a pure function: for copilot and opencode it reads the
+ * Layer-2 accumulator and clears it, so it is called once per tick, at the
+ * position the step had.
  *
- * The one thing that justifies dropping it: the transcript reader has since
- * written the turn as the agent's own Markdown, so the pane's copy is the
- * duplicate this Issue exists to stop.
+ * @param cliToolId - CLI tool identifier
+ * @param result - The complete extraction this tick made
+ * @param pollerKey - Poller key ("worktreeId:instanceId")
+ * @returns The cleaned response
  */
-function discardPendingScrapedResponse(pollerKey) {
-    pendingScrapedResponses.delete(pollerKey);
+function cleanCompletedResponse(cliToolId, result, pollerKey) {
+    // Clean up responses
+    let cleanedResponse = result.response;
+    if (cliToolId === 'gemini') {
+        cleanedResponse = (0, response_cleaner_1.cleanGeminiResponse)(result.response);
+    }
+    else if (cliToolId === 'claude') {
+        cleanedResponse = (0, response_cleaner_1.cleanClaudeResponse)(result.response);
+    }
+    else if (cliToolId === 'copilot') {
+        const accumulatedContent = (0, tui_accumulator_1.getAccumulatedContent)(pollerKey);
+        const sourceContent = accumulatedContent || result.response;
+        cleanedResponse = (0, response_cleaner_1.cleanCopilotResponse)(sourceContent);
+        cleanedResponse = (0, response_cleaner_1.truncateMessage)(cleanedResponse, copilot_constants_1.COPILOT_MAX_MESSAGE_LENGTH, copilot_constants_1.COPILOT_TRUNCATION_MARKER);
+        (0, tui_accumulator_1.clearTuiAccumulator)(pollerKey);
+    }
+    else if (cliToolId === 'opencode') {
+        // Issue #1911 defect 3: opencode wrote to the Layer-2 accumulator but never
+        // read it, so any turn longer than the pane was saved without its head.
+        //
+        // Read it only when the head is ACTUALLY gone, which is what
+        // `turnHeadTruncated` measures — deliberately NOT copilot's unconditional
+        // `accumulated || response`. The accumulator appends whatever the overlap
+        // check cannot match against the previous poll, and opencode rewrites rows
+        // in place while it works (`+ Thought: … · 12ms` becomes `· 579ms`, a
+        // pending patch row becomes the applied edit). Every such rewrite breaks
+        // the overlap and re-appends the lines above it, so preferring the
+        // accumulator for the common short answer would duplicate content that
+        // `result.response` already holds exactly. When the echo is off screen the
+        // frame is missing content outright, and a possible duplicate beats a
+        // guaranteed truncation.
+        const accumulatedContent = (0, tui_accumulator_1.getAccumulatedContent)(pollerKey);
+        const sourceContent = result.turnHeadTruncated && accumulatedContent
+            ? accumulatedContent
+            : result.response;
+        cleanedResponse = (0, response_cleaner_1.cleanOpenCodeResponse)(sourceContent);
+        (0, tui_accumulator_1.clearTuiAccumulator)(pollerKey);
+    }
+    return cleanedResponse;
 }
 /**
- * Write a held scrape now, whatever the clock says (Issue #2436).
+ * Skip a response the content dedup has already seen, and re-ask the transcript
+ * reader on the ticks that are owed an answer (Issue #2399).
  *
- * Exported because `response-poller-core` calls it from `stopPollingByKey`,
- * which is every way a polling cycle ends: an explicit stop, the session going
- * away, `MAX_POLLING_DURATION`, and the restart that opens the NEXT turn. A
- * held reply must not be able to outlive the cycle that holds it — the caches
- * that key it are cleared in that same function, and a reply nobody writes is
- * strictly worse than the duplicate row this Issue is trading against.
+ * The body of the `isDuplicateResponse` branch of {@link checkForResponse},
+ * split out as it was (Issue #3213). Both returns are the tick's own result,
+ * and the caller returns it without doing anything else — so the one `await`
+ * this split adds comes after every write of the tick.
  *
- * **Deliberately bypasses `isDuplicateResponse`.** The hash for this content was
- * registered by the tick that decided to hold it (the dedup guard's check is
- * also its write), so a re-check here would answer "duplicate" for the reply
- * that has never been saved. That is requirement A of the Issue in one line.
+ * @param ctx - What this tick is keyed by
+ * @param result - The complete extraction this tick made
+ * @param claudeMetadata - Claude's parsed metadata, undefined for every other tool
+ * @returns What `checkForResponse` returns for this tick
+ */
+async function recheckDuplicateResponse(ctx, result, claudeMetadata) {
+    const { db, worktree, worktreeId, cliToolId, instanceId, resolvedInstanceId, pollerKey } = ctx;
+    // Issue #1695: this branch used to drop the response silently — the
+    // prompt-side guard above has logged its skip since #565, this one
+    // logged nothing at all, so a reply that never reached History left no
+    // trace anywhere. Same action name shape as its sibling so both skips
+    // are found by one grep.
+    logger.info('duplicate-response-skipped', { worktreeId, cliToolId, instanceId: resolvedInstanceId });
+    (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
+    // Issue #2399: the skip above is about the SCREEN, and until this Issue
+    // it also ended the tick for the TRANSCRIPT READER 100 lines below —
+    // which is the one consumer for whom "the frame has not changed" is not
+    // evidence of anything. A pull-mode agent closes its turn in its own
+    // file AFTER the pane has gone quiet, so the reader's single ask (on the
+    // poll that saved the scrape) is systematically too early, and every
+    // later poll returned here. Measured on codex 2026-09-07: one
+    // `codex-transcript-turn-open`, `task_complete` appended 1.8 s later,
+    // and then `duplicate-response-skipped` every 2 s until
+    // `MAX_POLLING_DURATION` ran out. The Markdown row was never written and
+    // the only thing left in History was the scrape — for a saturated pane,
+    // a single footer line.
+    //
+    // So the reader is re-asked from inside the skip, throttled by
+    // `claimStructuredHistoryRecheck` (once on the first duplicate tick,
+    // then every third — see `./response-dedup`). Deliberately the reader
+    // and nothing else: the scrape stays suppressed, the cursor has already
+    // been advanced above, and none of the bookkeeping the guard skips has a
+    // second producer to be asked about.
+    //
+    // Order over the alternative in the Issue (hoist the reader above the
+    // guard): the reader is a WRITE, and hoisting it would run that write on
+    // every one of the 900 ticks of a 30-minute cycle instead of on the ones
+    // that are owed an answer — the same argument the #2317 Phase D comment
+    // below makes for not letting the delegation test short-circuit it.
+    //
+    // What this does NOT do is retract the scraped row the earlier tick
+    // saved. Three reasons, and the first is decisive: nothing here can
+    // identify that row. The hash this guard matched is per pollerKey, not
+    // per turn — it survives the `resume` of a chain paused on a prompt —
+    // so the row it stands for may belong to an earlier turn entirely, and
+    // a scraped row carries no turn key to join on. Second, `archived` in
+    // this schema is the tombstone of an operator clearing History (#168),
+    // written by `archiveMessages` for a whole worktree; reusing it for
+    // "superseded" would make a clear and a handover indistinguishable in
+    // the table. Third, the scrape is not always junk — when a turn is
+    // interrupted the pane holds text the transcript's closed turn does not
+    // — and a duplicated row is visible and recoverable where a deleted one
+    // is neither. Two rows for one turn is the failure this trades for, and
+    // #2401 has already stopped the junk one being picked as a relay's
+    // answer.
+    //
+    // Issue #2436 narrowed what that trade costs, without changing the
+    // decision above. The row this skip cannot retract is now only ever one
+    // the poller had no reason to hold: a turn whose reader said
+    // `not_yet_closed` is held at the save path below rather than written,
+    // so on the ordinary codex turn there is no earlier row here to regret.
+    // What remains is the case the three reasons above are actually about —
+    // a scrape written when the reader could tell us nothing, and a
+    // transcript that closed later anyway — and for that the row stays,
+    // folded rather than deleted on the chat surface (`ChatMessageBubble`).
+    if ((0, response_dedup_1.claimStructuredHistoryRecheck)(pollerKey)) {
+        const recaptured = await (0, structured_history_gate_1.captureStructuredHistoryTurn)(worktreeId, cliToolId, instanceId, {
+            worktreePath: worktree.path,
+            transcriptPathHint: claudeMetadata?.logFilePath ?? null,
+        });
+        if (recaptured) {
+            (0, response_dedup_1.settleStructuredHistoryRecheck)(pollerKey);
+            // Issue #2436: the turn is now the agent's own Markdown, so a
+            // scrape held for it is exactly the second row this Issue exists
+            // to stop. Dropped, not written — the only case where dropping a
+            // held reply loses nothing.
+            (0, pending_scraped_response_1.discardPendingScrapedResponse)(pollerKey);
+            logger.info('structured-history-recheck-captured', {
+                worktreeId,
+                cliToolId,
+                instanceId: resolvedInstanceId,
+            });
+            // The turn IS now in History, as the agent's own Markdown, so this
+            // tick recorded something and says so. Inert for the poller either
+            // way: `runPollTick` only reads this value after a stop the tick
+            // raised itself, and this branch raises none.
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Hold the scraped reply, write it as a message, or drop it.
  *
- * Synchronous through the row: `better-sqlite3` is, and this runs on shutdown
- * paths where an awaited continuation may never be reached. The Markdown
- * conversation log is fired afterwards and not waited for, because it is a
- * secondary record and the row is the one History reads.
+ * The three-way branch on the save path of {@link checkForResponse}, split out
+ * as it was (Issue #3213). Only the branch moved. What decides it — the
+ * structured-history gate and the conversation log, both awaited — stays in
+ * the caller, {@link recordCompletedResponse}, together with the writes that
+ * follow the call (the waiting edge, the push, the cursor): an `await` on a
+ * function holding the first without the second would put a yield between the
+ * writes here and those, and `onRelayTurnCompleted` starts work that could then
+ * run in between.
  *
- * @param pollerKey - Poller key ("worktreeId:instanceId")
- * @param reason - What ended the hold; logged, for the operator reading back
- * @returns Whether a held reply was written
+ * @param ctx - What this tick is keyed by
+ * @param cleanedResponse - The cleaned response
+ * @param claudeMetadata - Claude's parsed metadata, undefined for every other tool
+ * @param decision - Whether the scrape is held, written or suppressed
  */
-function flushPendingScrapedResponse(pollerKey, reason) {
-    const pending = pendingScrapedResponses.get(pollerKey);
-    if (!pending)
-        return false;
-    pendingScrapedResponses.delete(pollerKey);
-    try {
-        const db = (0, db_instance_1.getDbInstance)();
+function recordOrHoldScrapedResponse(ctx, cleanedResponse, claudeMetadata, decision) {
+    const { db, worktree, worktreeId, cliToolId, resolvedInstanceId, pollerKey } = ctx;
+    const { structuredHistoryLive, suppressScrapedHistory, holdScrapedHistory } = decision;
+    // Issue #2041: the one write the structured path replaces. The scraped text
+    // is dropped, not saved-and-deduped, because the two renderings of one turn
+    // are not byte-comparable — the pane's copy is hard-wrapped at the pane
+    // width and gutter-prefixed, so no content check could ever recognise them
+    // as the same reply.
+    if (holdScrapedHistory) {
+        (0, pending_scraped_response_1.holdScrapedResponse)(pollerKey, {
+            worktreeId,
+            cliToolId,
+            instanceId: resolvedInstanceId,
+            content: cleanedResponse,
+            // The instant the turn was JUDGED finished, not the instant the row is
+            // written. History sorts on this, and a row dated at the end of the
+            // hold would sort under the NEXT turn's prompt.
+            timestamp: new Date(),
+            summary: claudeMetadata?.summary,
+            logFileName: claudeMetadata?.logFileName,
+            requestId: claudeMetadata?.requestId,
+            worktreePath: worktree.path,
+            transcriptPathHint: claudeMetadata?.logFilePath ?? null,
+            expiresAt: Date.now() + pending_scraped_response_1.PENDING_SCRAPE_HOLD_MS,
+        });
+        logger.info('structured-history-scrape-held', {
+            worktreeId,
+            cliToolId,
+            instanceId: resolvedInstanceId,
+            scrapedLength: cleanedResponse.length,
+            holdMs: pending_scraped_response_1.PENDING_SCRAPE_HOLD_MS,
+        });
+        // The completion edge is announced HERE and not at the flush, because the
+        // turn finished now. A relay waiting on this session gets #2401's grace
+        // window to find a turn-keyed row, which is exactly the row the hold is
+        // waiting for; delaying the announcement by the hold would delay every
+        // delivery by it too.
+        (0, relay_triggers_1.onRelayTurnCompleted)(worktreeId, cliToolId, resolvedInstanceId, false);
+    }
+    else if (!suppressScrapedHistory) {
+        // Create new CLI tool message in database
         const message = (0, db_1.createMessage)(db, {
-            worktreeId: pending.worktreeId,
+            worktreeId,
             role: 'assistant',
-            content: pending.content,
+            content: cleanedResponse,
             messageType: 'normal',
-            timestamp: pending.timestamp,
-            cliToolId: pending.cliToolId,
-            instanceId: pending.instanceId,
-            summary: pending.summary,
-            logFileName: pending.logFileName,
-            requestId: pending.requestId,
-        });
-        (0, ws_server_1.broadcastMessage)('message', { worktreeId: pending.worktreeId, message });
-        logger.info('pending-scrape-flushed', {
-            worktreeId: pending.worktreeId,
-            cliToolId: pending.cliToolId,
-            instanceId: pending.instanceId,
-            reason,
-            scrapedLength: pending.content.length,
-            heldForMs: Date.now() - pending.timestamp.getTime(),
+            timestamp: new Date(),
+            cliToolId,
+            instanceId: resolvedInstanceId,
+            summary: claudeMetadata?.summary,
+            logFileName: claudeMetadata?.logFileName,
+            requestId: claudeMetadata?.requestId,
         });
-        void (0, conversation_logger_1.recordClaudeConversation)(db, pending.worktreeId, pending.content, pending.cliToolId).catch(() => { });
-        return true;
+        // Broadcast message to WebSocket clients
+        (0, ws_server_1.broadcastMessage)('message', { worktreeId, message });
+        // Issue #2377: the scrape path's completion edge. `settled: false` is the
+        // whole difference from the gate's own announcement: this row was read off
+        // a SCREEN whose completion was judged by string analysis, so a relay
+        // waiting on this session re-reads after a few seconds of quiet before it
+        // delivers — the Issue's 「完了検知 + 数秒の静穏」 for the three tools that
+        // keep no transcript. Announced here rather than after the `if` because
+        // the suppressed branch means the gate already announced it, settled.
+        (0, relay_triggers_1.onRelayTurnCompleted)(worktreeId, cliToolId, resolvedInstanceId, false);
     }
-    catch (error) {
-        logger.warn('pending-scrape-flush-failed', {
-            worktreeId: pending.worktreeId,
-            cliToolId: pending.cliToolId,
-            instanceId: pending.instanceId,
-            reason,
-            error: error instanceof Error ? error.message : String(error),
+    else {
+        // Issue #2436: a hold from an earlier tick of this same turn is now moot
+        // — the row it was waiting for exists.
+        if (structuredHistoryLive)
+            (0, pending_scraped_response_1.discardPendingScrapedResponse)(pollerKey);
+        logger.info('structured-history-scrape-suppressed', {
+            worktreeId,
+            cliToolId,
+            instanceId: resolvedInstanceId,
+            scrapedLength: cleanedResponse.length,
+            // Which of the two reasons suppressed it. Without this the Phase D case
+            // and the ordinary #2041/#2121 handover are one indistinguishable log
+            // line, and "History is missing a turn" has two very different causes.
+            reason: structuredHistoryLive ? 'structured-history' : 'geometry-delegated',
         });
-        return false;
     }
 }
 /**
- * End a hold whose deadline has passed, one way or the other (Issue #2436).
+ * Record a finished reply and close the tick: the structured-history gate, the
+ * conversation log, the prompt sweep, the scrape, the waiting edge, the push
+ * and the cursor.
  *
- * Run at the top of every tick, because the tick that has to notice an expiry
- * is very often one that returns early — a static frame yields no new lines for
- * a scrollback tool and is a duplicate for an alternate-screen one, and neither
- * of those paths reaches the save block at the bottom of `checkForResponse`.
+ * The rest of {@link checkForResponse} from the structured-history gate to its
+ * last return, split out as it was (Issue #3213). One function, tail included,
+ * on purpose: the gate and the conversation log are awaited, and everything
+ * after them, from the prompt sweep to `stopPolling`, runs without a yield. Cut
+ * anywhere short of the last return and the caller's `await` would put one
+ * inside that run. Taken whole, the one `await` the split adds comes after
+ * every write of the tick, as in {@link recheckDuplicateResponse}. Both returns
+ * are the tick's own result.
  *
- * The reader is asked ONE more time before the row is written. By the deadline
- * the throttled recheck (#2399) has usually already captured the turn and
- * dropped the hold, but the two are not in step — the recheck is every third
- * duplicate tick and this is a wall clock — and a last read costs one tail
- * parse against writing a pane dump that is about to be superseded.
+ * @param ctx - What this tick is keyed by
+ * @param turn - The finished turn this tick read off the frame
+ * @param claudeMetadata - Claude's parsed metadata, undefined for every other tool
+ * @param cleanedResponse - The cleaned response
+ * @param delegation - What the geometry-delegation probe answered for this tick
+ * @returns What `checkForResponse` returns for this tick
  */
-async function settleExpiredPendingScrapedResponse(pollerKey) {
-    const pending = pendingScrapedResponses.get(pollerKey);
-    if (!pending || Date.now() < pending.expiresAt)
-        return;
-    const captured = await (0, structured_history_gate_1.captureStructuredHistoryTurn)(pending.worktreeId, pending.cliToolId, pending.instanceId, { worktreePath: pending.worktreePath, transcriptPathHint: pending.transcriptPathHint });
-    if (captured) {
-        discardPendingScrapedResponse(pollerKey);
-        (0, response_dedup_1.settleStructuredHistoryRecheck)(pollerKey);
-        logger.info('pending-scrape-superseded', {
-            worktreeId: pending.worktreeId,
-            cliToolId: pending.cliToolId,
-            instanceId: pending.instanceId,
-            heldForMs: Date.now() - pending.timestamp.getTime(),
-        });
-        return;
+async function recordCompletedResponse(ctx, turn, claudeMetadata, cleanedResponse, delegation) {
+    const { db, worktree, worktreeId, cliToolId, instanceId, resolvedInstanceId, pollerKey } = ctx;
+    const { result, isFullScreenTui, lineCountIsCursor } = turn;
+    // Issue #2041: opencode's own server is publishing this reply as Markdown
+    // over the SSE stream `lib/hooks/sources/opencode/history` is writing from,
+    // so the scrape below would be a second copy of the same turn — the agent's
+    // text once as it wrote it and once as its TUI drew it, 200 columns wide.
+    //
+    // Read here rather than at the top of the function on purpose: everything
+    // above this line is bookkeeping the event stream has no second producer for
+    // (the prompt row, Auto-Yes, the waiting episode, the push fan-out), and the
+    // liveness answer is only allowed to suppress the two calls that RECORD THE
+    // REPLY. See `./structured-history-gate` for the whole argument.
+    //
+    // Issue #2121 adds the second shape. Claude has no stream to be live on; it
+    // has a transcript file, and this is the moment to read it — the turn is
+    // finished (everything above this line established that) and the row is
+    // about to be written. `captureStructuredHistoryTurn` writes the agent's own
+    // Markdown and answers true, or answers false and leaves the scrape below to
+    // be the only record. `||` and not `&&`: the two are different tools'
+    // answers to the same question, and each one is false for the other's tool.
+    //
+    // Issue #2436 adds the third answer. `captureReport.outcome` distinguishes
+    // "the agent has not closed this turn yet" from "there is nothing to read
+    // here", which the boolean could not: both arrived as `false`, and `false`
+    // meant "save the pane's copy". See {@link StructuredHistoryCaptureOutcome}.
+    const captureReport = {};
+    const structuredHistoryLive = (0, structured_history_gate_1.isStructuredHistoryWriterLive)(worktreeId, cliToolId, instanceId) ||
+        (await (0, structured_history_gate_1.captureStructuredHistoryTurn)(worktreeId, cliToolId, instanceId, {
+            worktreePath: worktree.path,
+            transcriptPathHint: claudeMetadata?.logFilePath ?? null,
+        }, captureReport));
+    // Issue #2399: remember which way that went, because the next tick may not
+    // get here. A `false` is the reader saying "not yet, or not mine", and the
+    // dedup guard above turns every following poll of the same static frame into
+    // a return — so unless the fact is written down now, the ask never happens
+    // again. A `true` settles it: the turn is recorded and there is nothing left
+    // to re-ask about.
+    markOrSettleStructuredHistoryRecheck(pollerKey, structuredHistoryLive);
+    // Issue #2317 Phase D: the scrape is dropped while the geometry is
+    // delegated, and the transcript capture above is what makes that safe.
+    //
+    // ORDER IS LOAD-BEARING. The delegation test is folded in AFTER the two
+    // calls above rather than short-circuiting them: `captureStructuredHistoryTurn`
+    // is a WRITE, not a query — it is the moment claude's own transcript becomes
+    // a History row — so an `||` that put the delegation first would suppress
+    // the scrape and the real reply together, and the turn would vanish. Read as
+    // it stands: record the turn from the agent's own file, then drop the pane's
+    // copy of it, which at 44 rows is a fraction of the answer hard-wrapped at
+    // the reader's terminal width.
+    //
+    // When the transcript capture answers false (an unreadable or absent file)
+    // the turn goes UNRECORDED for as long as the delegation lasts. That is the
+    // deliberate trade: a missing row is recoverable, a truncated reply saved as
+    // the agent's answer is not.
+    const suppressScrapedHistory = structuredHistoryLive || delegation.delegated;
+    // Issue #2436: not suppressed — HELD. The reader has read the transcript,
+    // found the newest turn still open and said so, which means the agent's own
+    // Markdown for this turn is on its way. Writing the pane's copy now is what
+    // put a 234,323-character dump of prompt echo, intermediate output and
+    // footer into History beside the real answer, and #2399 explicitly accepted
+    // that trade because the boolean it had could not tell "not yet" from
+    // "never". It can now.
+    //
+    // Everything else this tick does still happens: the cursor advances, the
+    // prompts are marked answered, the waiting episode closes, the push goes
+    // out. Only the two writes that RECORD THE REPLY wait.
+    const holdScrapedHistory = !suppressScrapedHistory && captureReport.outcome === 'not_yet_closed';
+    // Create Markdown log file for the conversation pair
+    if (cleanedResponse && !suppressScrapedHistory && !holdScrapedHistory) {
+        await (0, conversation_logger_1.recordClaudeConversation)(db, worktreeId, cleanedResponse, cliToolId);
     }
-    flushPendingScrapedResponse(pollerKey, 'hold-expired');
-}
-/**
- * Record what the structured writers said about this turn, for the ticks that
- * will not get to ask (Issue #2399).
- *
- * One line either way, but named because the two calls are a pair and the
- * failure mode of writing only one of them is silent: mark without settle and
- * the reader is re-asked forever after a turn it already recorded; settle
- * without mark and the fix does not exist.
- *
- * @param pollerKey - Poller key ("worktreeId:instanceId")
- * @param recorded - Whether a structured writer owns this turn
- */
-function markOrSettleStructuredHistoryRecheck(pollerKey, recorded) {
-    if (recorded) {
-        (0, response_dedup_1.settleStructuredHistoryRecheck)(pollerKey);
+    // Mark any pending prompts as answered. Intended twin of the sweep in
+    // extractCompletedTurn (working visible on an unfinished frame); this one runs
+    // when a response is recorded (Issue #31).
+    const answeredCount = (0, db_1.markPendingPromptsAsAnswered)(db, worktreeId, cliToolId, resolvedInstanceId, broadcastPromptSweptToAnswered(worktreeId));
+    if (answeredCount > 0) {
+        logger.info('marked-answeredcount-pending');
     }
-    else {
-        (0, response_dedup_1.markStructuredHistoryRecheckPending)(pollerKey);
+    // Race condition prevention: re-check session state before saving.
+    // Issue #1268: skipped for alternate-screen tools for the same reason as the
+    // dedup gates above — their line count never grows past the pane height.
+    const currentSessionState = (0, db_1.getSessionState)(db, worktreeId, resolvedInstanceId);
+    if (lineCountIsCursor && currentSessionState && result.lineCount <= currentSessionState.lastCapturedLine) {
+        logger.info('race-condition-detected-skipping-save-re');
+        return false;
+    }
+    recordOrHoldScrapedResponse(ctx, cleanedResponse, claudeMetadata, {
+        structuredHistoryLive,
+        suppressScrapedHistory,
+        holdScrapedHistory,
+    });
+    // Issue #1790: the agent has just produced a reply, so whatever it was
+    // waiting for is over. Closing the episode here is what makes a *second*
+    // prompt in the same session notify again: without it a wait opened by the
+    // prompt branch above could stay open until a browser next probes the status
+    // API, and every later prompt would be folded into that stale episode and
+    // silently deduped. Nothing to close is a no-op, and no notification is
+    // raised for a closing edge.
+    (0, waiting_episode_state_1.observeWaitingEdge)({ worktreeId, cliToolId, instanceId, waiting: false });
+    // Web Push fan-out (Issue #1125): session completed (running → idle).
+    // Fire-and-forget — push is advisory and must never block/break the poller.
+    void (0, push_1.notifyPushSubscribers)({
+        worktreeId,
+        worktreeName: worktree.name,
+        kind: 'completion',
+        agentName: resolvedInstanceId,
+        excerpt: cleanedResponse,
+    }).catch(() => { });
+    // Update session state
+    (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
+    // For full-screen TUIs, stop polling after saving the response.
+    if (isFullScreenTui) {
+        (0, response_poller_core_1.stopPolling)(worktreeId, cliToolId, instanceId);
     }
+    return true;
 }
 /**
  * Check for CLI tool response once
@@ -1134,7 +1059,7 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         // Get worktree to verify it exists
         const worktree = (0, db_1.getWorktreeById)(db, worktreeId);
         if (!worktree) {
-            logger.error('worktree-worktreeid-not');
+            logger.error('worktree-not-found');
             (0, response_poller_core_1.stopPolling)(worktreeId, cliToolId, instanceId);
             return false;
         }
@@ -1144,18 +1069,30 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
             logger.info('session-not-running');
             // `stopPolling` is what confirms a held scrape here; see
             // `flushPendingScrapedResponse` and `stopPollingByKey`. Requirement B of
-            // Issue #2436: this return is ~300 lines above the save path, so a hold
-            // released only down there would never be released at all.
+            // Issue #2436: this return comes long before the save path (~300 lines
+            // below when measured; a function of its own today,
+            // `recordCompletedResponse`), so a hold released only down there would
+            // never be released at all.
             (0, response_poller_core_1.stopPolling)(worktreeId, cliToolId, instanceId);
             return false;
         }
         const pollerKey = (0, response_poller_core_1.getPollerKey)(worktreeId, cliToolId, instanceId);
+        // Issue #3213: what the steps split out of this function are keyed by.
+        const ctx = {
+            db,
+            worktree,
+            worktreeId,
+            cliToolId,
+            instanceId,
+            resolvedInstanceId,
+            pollerKey,
+        };
         // Issue #2436: a scrape held by an earlier tick, whose transcript has now
         // had its whole budget to close. Ahead of everything below because most
         // ticks of a finished turn never reach the save path — a static frame is a
         // duplicate for an alternate-screen tool and yields no new lines for a
         // scrollback one, and both of those return early.
-        await settleExpiredPendingScrapedResponse(pollerKey);
+        await (0, pending_scraped_response_1.settleExpiredPendingScrapedResponse)(pollerKey);
         // Issue #2317 Phase D: is a human reading this pane at their own terminal
         // size right now, and did they just stop?
         //
@@ -1193,61 +1130,11 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         // taken from the same constant extractResponse() measures saturation against
         // (Issue #1670) — a literal here would silently decouple the two.
         const output = await (0, cli_session_1.captureSessionOutput)(worktreeId, cliToolId, tmux_capture_cache_1.CACHE_MAX_CAPTURE_LINES, instanceId);
-        // Issue #2000: the frame is in hand, so this is the cheapest place to ask
-        // whether the model API has stalled the session. Level in, edge out — see
-        // the helper.
-        observeUpstreamFaultForPush(worktreeId, cliToolId, instanceId, output);
-        // Layer 2: Accumulate TUI content for full-screen TUI tools, so a turn that
-        // outgrows the alternate-screen pane keeps the head that has scrolled away.
-        if (cliToolId === 'opencode' || cliToolId === 'copilot') {
-            // Issue #1911: opencode is accumulated from the CURRENT TURN'S REGION
-            // rather than the whole frame. Feeding the raw pane seeded the accumulator
-            // with the previous turn's transcript, the echoed prompt and the bottom
-            // chrome on the very first poll, so the accumulated content could never be
-            // used as a response source without re-introducing defect 1.
-            const accumulatorSource = cliToolId === 'opencode' ? (0, response_extractor_1.sliceOpenCodeTurn)(output) : output;
-            (0, tui_accumulator_1.accumulateTuiContent)(pollerKey, accumulatorSource, cliToolId);
-        }
-        // Extract response
-        const result = extractResponse(output, lastCapturedLine, cliToolId, tmux_capture_cache_1.CACHE_MAX_CAPTURE_LINES);
-        if (!result || !result.isComplete) {
-            // DR-004 windowing: Only check tail lines
-            const { thinkingPattern } = (0, cli_patterns_1.getCliToolPatterns)(cliToolId);
-            const cleanOutput = (0, cli_patterns_1.stripAnsi)(output);
-            const tailLines = cleanOutput.split('\n').slice(-thinking_constants_1.THINKING_TAIL_LINE_COUNT).join('\n');
-            if (thinkingPattern.test(tailLines)) {
-                const answeredCount = (0, db_1.markPendingPromptsAsAnswered)(db, worktreeId, cliToolId, resolvedInstanceId, broadcastPromptSweptToAnswered(worktreeId));
-                if (answeredCount > 0) {
-                    logger.info('marked-answeredcount-pending');
-                }
-            }
-            return false;
-        }
-        const isFullScreenTui = cliToolId === 'opencode' || cliToolId === 'copilot';
-        // Issue #1268: line-count bookkeeping is only meaningful for tools that keep
-        // scrollback. Alternate-screen tools (claude since v2, opencode, copilot)
-        // always capture exactly pane_height lines, so lastCapturedLine saturates at
-        // the pane height on the first save and every later check would see
-        // `lineCount <= lastCapturedLine` and drop the response forever — leaving
-        // History stuck on "Waiting for response..." while the terminal shows the
-        // reply. Those tools dedup on response content instead (see below).
-        //
-        // Issue #1670: the scrollback tools reach the SAME dead end from the other
-        // side. Their buffer does grow — but only until it outgrows the capture
-        // window, after which the capture is clipped, the count is pinned at the
-        // window size, and the cursor can never be overtaken again. #1268 fixed
-        // saturation at pane height; this is saturation at the capture window, and it
-        // disables the cursor for exactly as long as the clipping lasts (a session
-        // restart or a cleared pane un-saturates it and the cursor comes back).
-        const lineCountIsCursor = !(0, types_1.usesAlternateScreen)(cliToolId) && !result.captureWindowSaturated;
-        // Duplicate prevention
-        if (lineCountIsCursor && !result.bufferReset && result.lineCount === lastCapturedLine && !sessionState?.inProgressMessageId) {
-            return false;
-        }
-        if (lineCountIsCursor && !result.bufferReset && result.lineCount <= lastCapturedLine) {
-            logger.info('already-saved-up-to-line-lastcapturedlin');
+        const turn = extractCompletedTurn(ctx, output, lastCapturedLine);
+        if (!turn) {
             return false;
         }
+        const { result, isFullScreenTui, lineCountIsCursor } = turn;
         // Response is complete! Check if it's a prompt.
         const promptDetection = result.promptDetection ?? detectPromptWithOptions(result.response, cliToolId);
         // Issue #2457: the gate is applied HERE as well as in `extractResponse`, and
@@ -1265,100 +1152,9 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         //
         // The frame is the capture this tick made — never `result.response`, which
         // has lost the position `detectDialog` judges by.
-        const promptIsLive = promptDetection.isPrompt && isNumberedDialogVouched(cliToolId, promptDetection, output);
+        const promptIsLive = promptDetection.isPrompt && (0, response_checker_dialog_gate_1.isNumberedDialogVouched)(cliToolId, promptDetection, output);
         if (promptIsLive) {
-            // Issue #565: Content hash-based duplicate prompt prevention
-            const promptContent = promptDetection.rawContent || promptDetection.cleanContent;
-            const normalizedForDedup = (0, prompt_dedup_1.normalizePromptForDedup)(promptContent, cliToolId);
-            if ((0, prompt_dedup_1.isDuplicatePrompt)(pollerKey, normalizedForDedup)) {
-                // Issue #1695: the log line below is invisible to `commandmate capture
-                // --json`, so a suppressed prompt and a prompt the detection layer never
-                // classified (#1676) look identical from the CLI — both say "nothing was
-                // recorded". Count the skip so the payload can tell them apart.
-                (0, prompt_dedup_state_1.recordPromptDedupSkip)(worktreeId, cliToolId, instanceId);
-                logger.info('duplicate-prompt-skipped', { worktreeId, cliToolId });
-                return false;
-            }
-            // Issue #571: Clean TUI decorations from Copilot prompt content before saving
-            let promptSaveContent = promptContent;
-            if (cliToolId === 'copilot') {
-                promptSaveContent = (0, response_cleaner_1.cleanCopilotResponse)(promptContent);
-                promptSaveContent = (0, response_cleaner_1.truncateMessage)(promptSaveContent, copilot_constants_1.COPILOT_MAX_MESSAGE_LENGTH, copilot_constants_1.COPILOT_TRUNCATION_MARKER);
-            }
-            // This is a prompt - save as prompt message
-            (0, db_1.clearInProgressMessageId)(db, worktreeId, cliToolId, resolvedInstanceId);
-            const message = (0, db_1.createMessage)(db, {
-                worktreeId,
-                role: 'assistant',
-                content: promptSaveContent,
-                messageType: 'prompt',
-                promptData: promptDetection.promptData,
-                timestamp: new Date(),
-                cliToolId,
-                instanceId: resolvedInstanceId,
-            });
-            (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
-            (0, ws_server_1.broadcastMessage)('message', { worktreeId, message });
-            // Issue #1548: the agent is blocked on input. Raised after the dedup and
-            // save above, so the task log counts prompts the system actually recorded
-            // rather than every poll that saw the same one still on screen. No-ops
-            // when this instance is not running a contract.
-            (0, task_transition_service_1.applyEventToActiveTask)(db, worktreeId, cliToolId, resolvedInstanceId, 'prompt_detected', {
-                promptType: promptDetection.promptData?.type,
-            });
-            // Web Push fan-out (Issue #1125): agent is now waiting for a prompt reply.
-            // Fire-and-forget — push is advisory and must never block/break the poller.
-            //
-            // Issue #1790: the wait is now named by #1786's episode rather than by the
-            // prompt text. The two lines below are ordered, not incidental:
-            //
-            //  1. the notification is raised first, while it still has the prompt's
-            //     own question to quote — it records the episode in the dedup, so
-            //     whichever path reports the wait second says nothing;
-            //  2. `observeWaitingEdge` then opens that same episode, which is what
-            //     lets the edge listener (and #1788's WebSocket frame) agree with this
-            //     call about *which* wait this is instead of raising a second one.
-            //
-            // Both use one timestamp so the episode the notification claims and the
-            // episode the store opens are the same number.
-            const promptObservedAt = Date.now();
-            const promptWaitingSince = (0, waiting_episode_state_1.getWaitingEpisode)(worktreeId, cliToolId, instanceId)?.since ?? promptObservedAt;
-            // Issue #1999: Auto-Yes is a declaration that this session's prompts are
-            // answered without a human, so notifying for one is telling the reader the
-            // opposite of the truth. Only the notification is gated — the episode
-            // below still opens, so the WebSocket frame, the status API and the #1790
-            // reminder all see the wait exactly as they did before. The gate runs
-            // before the call rather than inside it because `shouldSendWaitingPush`
-            // records the episode the moment it decides to send.
-            if (!(0, prompt_push_gate_1.isPromptPushSuppressed)({
-                worktreeId,
-                cliToolId,
-                instanceId,
-                waitingSince: promptWaitingSince,
-            })) {
-                void (0, push_1.notifyPushSubscribers)({
-                    worktreeId,
-                    worktreeName: worktree.name,
-                    kind: 'prompt',
-                    agentName: resolvedInstanceId,
-                    instanceId: resolvedInstanceId,
-                    waitingKind: 'prompt',
-                    waitingSince: promptWaitingSince,
-                    excerpt: promptDetection.promptData?.question ?? promptSaveContent,
-                }).catch(() => { });
-            }
-            (0, waiting_episode_state_1.observeWaitingEdge)({
-                worktreeId,
-                cliToolId,
-                instanceId,
-                waiting: true,
-                kind: 'prompt',
-                now: promptObservedAt,
-            });
-            if (!isFullScreenTui) {
-                (0, response_poller_core_1.stopPolling)(worktreeId, cliToolId, instanceId);
-            }
-            return true;
+            return savePromptMessage(ctx, promptDetection, result, isFullScreenTui);
         }
         // Validate response content is not empty
         if (!result.response || result.response.trim() === '') {
@@ -1369,43 +1165,7 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         const claudeMetadata = cliToolId === 'claude'
             ? (0, claude_output_1.parseClaudeOutput)(result.response)
             : undefined;
-        // Clean up responses
-        let cleanedResponse = result.response;
-        if (cliToolId === 'gemini') {
-            cleanedResponse = (0, response_cleaner_1.cleanGeminiResponse)(result.response);
-        }
-        else if (cliToolId === 'claude') {
-            cleanedResponse = (0, response_cleaner_1.cleanClaudeResponse)(result.response);
-        }
-        else if (cliToolId === 'copilot') {
-            const accumulatedContent = (0, tui_accumulator_1.getAccumulatedContent)(pollerKey);
-            const sourceContent = accumulatedContent || result.response;
-            cleanedResponse = (0, response_cleaner_1.cleanCopilotResponse)(sourceContent);
-            cleanedResponse = (0, response_cleaner_1.truncateMessage)(cleanedResponse, copilot_constants_1.COPILOT_MAX_MESSAGE_LENGTH, copilot_constants_1.COPILOT_TRUNCATION_MARKER);
-            (0, tui_accumulator_1.clearTuiAccumulator)(pollerKey);
-        }
-        else if (cliToolId === 'opencode') {
-            // Issue #1911 defect 3: opencode wrote to the Layer-2 accumulator but never
-            // read it, so any turn longer than the pane was saved without its head.
-            //
-            // Read it only when the head is ACTUALLY gone, which is what
-            // `turnHeadTruncated` measures — deliberately NOT copilot's unconditional
-            // `accumulated || response`. The accumulator appends whatever the overlap
-            // check cannot match against the previous poll, and opencode rewrites rows
-            // in place while it works (`+ Thought: … · 12ms` becomes `· 579ms`, a
-            // pending patch row becomes the applied edit). Every such rewrite breaks
-            // the overlap and re-appends the lines above it, so preferring the
-            // accumulator for the common short answer would duplicate content that
-            // `result.response` already holds exactly. When the echo is off screen the
-            // frame is missing content outright, and a possible duplicate beats a
-            // guaranteed truncation.
-            const accumulatedContent = (0, tui_accumulator_1.getAccumulatedContent)(pollerKey);
-            const sourceContent = result.turnHeadTruncated && accumulatedContent
-                ? accumulatedContent
-                : result.response;
-            cleanedResponse = (0, response_cleaner_1.cleanOpenCodeResponse)(sourceContent);
-            (0, tui_accumulator_1.clearTuiAccumulator)(pollerKey);
-        }
+        const cleanedResponse = cleanCompletedResponse(cliToolId, result, pollerKey);
         // If cleaned response is empty or just "[No content]", skip saving
         if (!cleanedResponse || cleanedResponse.trim() === '' || cleanedResponse === '[No content]') {
             (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
@@ -1424,274 +1184,13 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         // the poller would append the same finished reply every 2 s.
         if (!lineCountIsCursor) {
             if ((0, response_dedup_1.isDuplicateResponse)(pollerKey, cleanedResponse)) {
-                // Issue #1695: this branch used to drop the response silently — the
-                // prompt-side guard above has logged its skip since #565, this one
-                // logged nothing at all, so a reply that never reached History left no
-                // trace anywhere. Same action name shape as its sibling so both skips
-                // are found by one grep.
-                logger.info('duplicate-response-skipped', { worktreeId, cliToolId, instanceId: resolvedInstanceId });
-                (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
-                // Issue #2399: the skip above is about the SCREEN, and until this Issue
-                // it also ended the tick for the TRANSCRIPT READER 100 lines below —
-                // which is the one consumer for whom "the frame has not changed" is not
-                // evidence of anything. A pull-mode agent closes its turn in its own
-                // file AFTER the pane has gone quiet, so the reader's single ask (on the
-                // poll that saved the scrape) is systematically too early, and every
-                // later poll returned here. Measured on codex 2026-09-07: one
-                // `codex-transcript-turn-open`, `task_complete` appended 1.8 s later,
-                // and then `duplicate-response-skipped` every 2 s until
-                // `MAX_POLLING_DURATION` ran out. The Markdown row was never written and
-                // the only thing left in History was the scrape — for a saturated pane,
-                // a single footer line.
-                //
-                // So the reader is re-asked from inside the skip, throttled by
-                // `claimStructuredHistoryRecheck` (once on the first duplicate tick,
-                // then every third — see `./response-dedup`). Deliberately the reader
-                // and nothing else: the scrape stays suppressed, the cursor has already
-                // been advanced above, and none of the bookkeeping the guard skips has a
-                // second producer to be asked about.
-                //
-                // Order over the alternative in the Issue (hoist the reader above the
-                // guard): the reader is a WRITE, and hoisting it would run that write on
-                // every one of the 900 ticks of a 30-minute cycle instead of on the ones
-                // that are owed an answer — the same argument the #2317 Phase D comment
-                // below makes for not letting the delegation test short-circuit it.
-                //
-                // What this does NOT do is retract the scraped row the earlier tick
-                // saved. Three reasons, and the first is decisive: nothing here can
-                // identify that row. The hash this guard matched is per pollerKey, not
-                // per turn — it survives the `resume` of a chain paused on a prompt —
-                // so the row it stands for may belong to an earlier turn entirely, and
-                // a scraped row carries no turn key to join on. Second, `archived` in
-                // this schema is the tombstone of an operator clearing History (#168),
-                // written by `archiveMessages` for a whole worktree; reusing it for
-                // "superseded" would make a clear and a handover indistinguishable in
-                // the table. Third, the scrape is not always junk — when a turn is
-                // interrupted the pane holds text the transcript's closed turn does not
-                // — and a duplicated row is visible and recoverable where a deleted one
-                // is neither. Two rows for one turn is the failure this trades for, and
-                // #2401 has already stopped the junk one being picked as a relay's
-                // answer.
-                //
-                // Issue #2436 narrowed what that trade costs, without changing the
-                // decision above. The row this skip cannot retract is now only ever one
-                // the poller had no reason to hold: a turn whose reader said
-                // `not_yet_closed` is held at the save path below rather than written,
-                // so on the ordinary codex turn there is no earlier row here to regret.
-                // What remains is the case the three reasons above are actually about —
-                // a scrape written when the reader could tell us nothing, and a
-                // transcript that closed later anyway — and for that the row stays,
-                // folded rather than deleted on the chat surface (`ChatMessageBubble`).
-                if ((0, response_dedup_1.claimStructuredHistoryRecheck)(pollerKey)) {
-                    const recaptured = await (0, structured_history_gate_1.captureStructuredHistoryTurn)(worktreeId, cliToolId, instanceId, {
-                        worktreePath: worktree.path,
-                        transcriptPathHint: claudeMetadata?.logFilePath ?? null,
-                    });
-                    if (recaptured) {
-                        (0, response_dedup_1.settleStructuredHistoryRecheck)(pollerKey);
-                        // Issue #2436: the turn is now the agent's own Markdown, so a
-                        // scrape held for it is exactly the second row this Issue exists
-                        // to stop. Dropped, not written — the only case where dropping a
-                        // held reply loses nothing.
-                        discardPendingScrapedResponse(pollerKey);
-                        logger.info('structured-history-recheck-captured', {
-                            worktreeId,
-                            cliToolId,
-                            instanceId: resolvedInstanceId,
-                        });
-                        // The turn IS now in History, as the agent's own Markdown, so this
-                        // tick recorded something and says so. Inert for the poller either
-                        // way: `runPollTick` only reads this value after a stop the tick
-                        // raised itself, and this branch raises none.
-                        return true;
-                    }
-                }
-                return false;
+                // `await`, so that a rejection still lands in the catch below.
+                return await recheckDuplicateResponse(ctx, result, claudeMetadata);
             }
         }
-        // Issue #2041: opencode's own server is publishing this reply as Markdown
-        // over the SSE stream `lib/hooks/sources/opencode/history` is writing from,
-        // so the scrape below would be a second copy of the same turn — the agent's
-        // text once as it wrote it and once as its TUI drew it, 200 columns wide.
-        //
-        // Read here rather than at the top of the function on purpose: everything
-        // above this line is bookkeeping the event stream has no second producer for
-        // (the prompt row, Auto-Yes, the waiting episode, the push fan-out), and the
-        // liveness answer is only allowed to suppress the two calls that RECORD THE
-        // REPLY. See `./structured-history-gate` for the whole argument.
-        //
-        // Issue #2121 adds the second shape. Claude has no stream to be live on; it
-        // has a transcript file, and this is the moment to read it — the turn is
-        // finished (everything above this line established that) and the row is
-        // about to be written. `captureStructuredHistoryTurn` writes the agent's own
-        // Markdown and answers true, or answers false and leaves the scrape below to
-        // be the only record. `||` and not `&&`: the two are different tools'
-        // answers to the same question, and each one is false for the other's tool.
-        //
-        // Issue #2436 adds the third answer. `captureReport.outcome` distinguishes
-        // "the agent has not closed this turn yet" from "there is nothing to read
-        // here", which the boolean could not: both arrived as `false`, and `false`
-        // meant "save the pane's copy". See {@link StructuredHistoryCaptureOutcome}.
-        const captureReport = {};
-        const structuredHistoryLive = (0, structured_history_gate_1.isStructuredHistoryWriterLive)(worktreeId, cliToolId, instanceId) ||
-            (await (0, structured_history_gate_1.captureStructuredHistoryTurn)(worktreeId, cliToolId, instanceId, {
-                worktreePath: worktree.path,
-                transcriptPathHint: claudeMetadata?.logFilePath ?? null,
-            }, captureReport));
-        // Issue #2399: remember which way that went, because the next tick may not
-        // get here. A `false` is the reader saying "not yet, or not mine", and the
-        // dedup guard above turns every following poll of the same static frame into
-        // a return — so unless the fact is written down now, the ask never happens
-        // again. A `true` settles it: the turn is recorded and there is nothing left
-        // to re-ask about.
-        markOrSettleStructuredHistoryRecheck(pollerKey, structuredHistoryLive);
-        // Issue #2317 Phase D: the scrape is dropped while the geometry is
-        // delegated, and the transcript capture above is what makes that safe.
-        //
-        // ORDER IS LOAD-BEARING. The delegation test is folded in AFTER the two
-        // calls above rather than short-circuiting them: `captureStructuredHistoryTurn`
-        // is a WRITE, not a query — it is the moment claude's own transcript becomes
-        // a History row — so an `||` that put the delegation first would suppress
-        // the scrape and the real reply together, and the turn would vanish. Read as
-        // it stands: record the turn from the agent's own file, then drop the pane's
-        // copy of it, which at 44 rows is a fraction of the answer hard-wrapped at
-        // the reader's terminal width.
-        //
-        // When the transcript capture answers false (an unreadable or absent file)
-        // the turn goes UNRECORDED for as long as the delegation lasts. That is the
-        // deliberate trade: a missing row is recoverable, a truncated reply saved as
-        // the agent's answer is not.
-        const suppressScrapedHistory = structuredHistoryLive || delegation.delegated;
-        // Issue #2436: not suppressed — HELD. The reader has read the transcript,
-        // found the newest turn still open and said so, which means the agent's own
-        // Markdown for this turn is on its way. Writing the pane's copy now is what
-        // put a 234,323-character dump of prompt echo, intermediate output and
-        // footer into History beside the real answer, and #2399 explicitly accepted
-        // that trade because the boolean it had could not tell "not yet" from
-        // "never". It can now.
-        //
-        // Everything else this tick does still happens: the cursor advances, the
-        // prompts are marked answered, the waiting episode closes, the push goes
-        // out. Only the two writes that RECORD THE REPLY wait.
-        const holdScrapedHistory = !suppressScrapedHistory && captureReport.outcome === 'not_yet_closed';
-        // Create Markdown log file for the conversation pair
-        if (cleanedResponse && !suppressScrapedHistory && !holdScrapedHistory) {
-            await (0, conversation_logger_1.recordClaudeConversation)(db, worktreeId, cleanedResponse, cliToolId);
-        }
-        // Mark any pending prompts as answered
-        const answeredCount = (0, db_1.markPendingPromptsAsAnswered)(db, worktreeId, cliToolId, resolvedInstanceId, broadcastPromptSweptToAnswered(worktreeId));
-        if (answeredCount > 0) {
-            logger.info('marked-answeredcount-pending');
-        }
-        // Race condition prevention: re-check session state before saving.
-        // Issue #1268: skipped for alternate-screen tools for the same reason as the
-        // dedup gates above — their line count never grows past the pane height.
-        const currentSessionState = (0, db_1.getSessionState)(db, worktreeId, resolvedInstanceId);
-        if (lineCountIsCursor && currentSessionState && result.lineCount <= currentSessionState.lastCapturedLine) {
-            logger.info('race-condition-detected-skipping-save-re');
-            return false;
-        }
-        // Issue #2041: the one write the structured path replaces. The scraped text
-        // is dropped, not saved-and-deduped, because the two renderings of one turn
-        // are not byte-comparable — the pane's copy is hard-wrapped at the pane
-        // width and gutter-prefixed, so no content check could ever recognise them
-        // as the same reply.
-        if (holdScrapedHistory) {
-            holdScrapedResponse(pollerKey, {
-                worktreeId,
-                cliToolId,
-                instanceId: resolvedInstanceId,
-                content: cleanedResponse,
-                // The instant the turn was JUDGED finished, not the instant the row is
-                // written. History sorts on this, and a row dated at the end of the
-                // hold would sort under the NEXT turn's prompt.
-                timestamp: new Date(),
-                summary: claudeMetadata?.summary,
-                logFileName: claudeMetadata?.logFileName,
-                requestId: claudeMetadata?.requestId,
-                worktreePath: worktree.path,
-                transcriptPathHint: claudeMetadata?.logFilePath ?? null,
-                expiresAt: Date.now() + exports.PENDING_SCRAPE_HOLD_MS,
-            });
-            logger.info('structured-history-scrape-held', {
-                worktreeId,
-                cliToolId,
-                instanceId: resolvedInstanceId,
-                scrapedLength: cleanedResponse.length,
-                holdMs: exports.PENDING_SCRAPE_HOLD_MS,
-            });
-            // The completion edge is announced HERE and not at the flush, because the
-            // turn finished now. A relay waiting on this session gets #2401's grace
-            // window to find a turn-keyed row, which is exactly the row the hold is
-            // waiting for; delaying the announcement by the hold would delay every
-            // delivery by it too.
-            (0, relay_triggers_1.onRelayTurnCompleted)(worktreeId, cliToolId, resolvedInstanceId, false);
-        }
-        else if (!suppressScrapedHistory) {
-            // Create new CLI tool message in database
-            const message = (0, db_1.createMessage)(db, {
-                worktreeId,
-                role: 'assistant',
-                content: cleanedResponse,
-                messageType: 'normal',
-                timestamp: new Date(),
-                cliToolId,
-                instanceId: resolvedInstanceId,
-                summary: claudeMetadata?.summary,
-                logFileName: claudeMetadata?.logFileName,
-                requestId: claudeMetadata?.requestId,
-            });
-            // Broadcast message to WebSocket clients
-            (0, ws_server_1.broadcastMessage)('message', { worktreeId, message });
-            // Issue #2377: the scrape path's completion edge. `settled: false` is the
-            // whole difference from the gate's own announcement: this row was read off
-            // a SCREEN whose completion was judged by string analysis, so a relay
-            // waiting on this session re-reads after a few seconds of quiet before it
-            // delivers — the Issue's 「完了検知 + 数秒の静穏」 for the three tools that
-            // keep no transcript. Announced here rather than after the `if` because
-            // the suppressed branch means the gate already announced it, settled.
-            (0, relay_triggers_1.onRelayTurnCompleted)(worktreeId, cliToolId, resolvedInstanceId, false);
-        }
-        else {
-            // Issue #2436: a hold from an earlier tick of this same turn is now moot
-            // — the row it was waiting for exists.
-            if (structuredHistoryLive)
-                discardPendingScrapedResponse(pollerKey);
-            logger.info('structured-history-scrape-suppressed', {
-                worktreeId,
-                cliToolId,
-                instanceId: resolvedInstanceId,
-                scrapedLength: cleanedResponse.length,
-                // Which of the two reasons suppressed it. Without this the Phase D case
-                // and the ordinary #2041/#2121 handover are one indistinguishable log
-                // line, and "History is missing a turn" has two very different causes.
-                reason: structuredHistoryLive ? 'structured-history' : 'geometry-delegated',
-            });
-        }
-        // Issue #1790: the agent has just produced a reply, so whatever it was
-        // waiting for is over. Closing the episode here is what makes a *second*
-        // prompt in the same session notify again: without it a wait opened by the
-        // prompt branch above could stay open until a browser next probes the status
-        // API, and every later prompt would be folded into that stale episode and
-        // silently deduped. Nothing to close is a no-op, and no notification is
-        // raised for a closing edge.
-        (0, waiting_episode_state_1.observeWaitingEdge)({ worktreeId, cliToolId, instanceId, waiting: false });
-        // Web Push fan-out (Issue #1125): session completed (running → idle).
-        // Fire-and-forget — push is advisory and must never block/break the poller.
-        void (0, push_1.notifyPushSubscribers)({
-            worktreeId,
-            worktreeName: worktree.name,
-            kind: 'completion',
-            agentName: resolvedInstanceId,
-            excerpt: cleanedResponse,
-        }).catch(() => { });
-        // Update session state
-        (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
-        // For full-screen TUIs, stop polling after saving the response.
-        if (isFullScreenTui) {
-            (0, response_poller_core_1.stopPolling)(worktreeId, cliToolId, instanceId);
-        }
-        return true;
+        // The rest of the tick, to its last return. `await` for the same reason as
+        // above.
+        return await recordCompletedResponse(ctx, turn, claudeMetadata, cleanedResponse, delegation);
     }
     catch (error) {
         logger.error('response:check-failed', { error: error instanceof Error ? error.message : String(error) });