commandmate 0.47.2 → 0.48.0

package/dist/server/src/lib/auto-yes-poller.js

@@ -8,8 +8,14 @@
  * Issue #525: Composite key migration (worktreeId:cliToolId) for per-agent auto-yes.
  *
  * Dependencies: auto-yes-state.ts (composite keys / state), polling/* (prompt
- * detection, resolver, policy, dialog gate, enter fallback, poller state),
- * cli-tools/*, session/cli-session.ts, tmux/*, detection/*, db/*, tasks/*.
+ * detection, resolver, policy, dialog gate, session epoch, poller state,
+ * decision record), cli-tools/*, session/cli-session.ts, tmux/*, detection/*,
+ * db/*, tasks/*.
+ *
+ * Issue #3821: this poller (with the hook / API adjudication) is what answers
+ * automatically. The browser no longer answers, and the Enter sent to a choice
+ * screen CommandMate could not read (#3397) is gone: such a screen is left to a
+ * human, recorded as `unclassified-frame`.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -45,7 +51,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capturePollerFrame = exports.captureAndCleanOutput = exports.AUTO_YES_ENTER_FALLBACK_ANSWER = exports.noHookReceiptHint = exports.isPollerActive = exports.getLastServerResponseTimestamp = exports.getActivePollerCount = void 0;
+exports.capturePollerFrame = exports.captureAndCleanOutput = exports.AUTO_YES_ENTER_FALLBACK_ANSWER = exports.isAnyPollerActiveForWorktree = exports.getAutoYesPollerCompositeKeys = exports.noHookReceiptHint = exports.isPollerActive = exports.getLastServerResponseTimestamp = exports.getActivePollerCount = void 0;
 exports.clearAllPollerStates = clearAllPollerStates;
 exports.validatePollingContext = validatePollingContext;
 exports.processStopConditionDelta = processStopConditionDelta;
@@ -53,32 +59,30 @@ exports.detectAndRespondToPrompt = detectAndRespondToPrompt;
 exports.startAutoYesPolling = startAutoYesPolling;
 exports.stopAutoYesPolling = stopAutoYesPolling;
 exports.stopAllAutoYesPolling = stopAllAutoYesPolling;
-exports.getAutoYesPollerCompositeKeys = getAutoYesPollerCompositeKeys;
 exports.stopAutoYesPollingByWorktree = stopAutoYesPollingByWorktree;
-exports.isAnyPollerActiveForWorktree = isAnyPollerActiveForWorktree;
-const cli_session_1 = require("./session/cli-session");
 const response_checker_1 = require("./polling/response-checker");
-const antigravity_receipt_episodes_1 = require("./polling/antigravity-receipt-episodes");
-const auto_yes_resolver_1 = require("./polling/auto-yes-resolver");
 const auto_yes_policy_1 = require("./polling/auto-yes-policy");
-const detect_1 = require("./detection/tools/codex/detect");
-const frame_1 = require("./detection/tools/frame");
-const dialog_1 = require("./detection/tools/antigravity/dialog");
-const auto_yes_dialog_gate_1 = require("./polling/auto-yes-dialog-gate");
 const auto_yes_enter_fallback_1 = require("./polling/auto-yes-enter-fallback");
+const auto_yes_decision_state_1 = require("./polling/auto-yes-decision-state");
+const auto_yes_manual_answer_1 = require("./polling/auto-yes-manual-answer");
+const auto_yes_decision_1 = require("../types/auto-yes-decision");
 const task_transition_service_1 = require("./tasks/task-transition-service");
 const db_instance_1 = require("./db/db-instance");
 const chat_db_1 = require("./db/chat-db");
 const worktree_session_ownership_1 = require("./cli-tools/worktree-session-ownership");
 const prompt_answer_sender_1 = require("./prompt-answer-sender");
-const prompt_answer_semantic_1 = require("./prompt-answer-semantic");
-const tmux_1 = require("./tmux/tmux");
 const session_created_signal_1 = require("./tmux/session-created-signal");
 const manager_1 = require("./cli-tools/manager");
 const cli_patterns_1 = require("./detection/cli-patterns");
 const prompt_key_1 = require("./detection/prompt-key");
 const errors_1 = require("./errors");
 const tmux_capture_cache_1 = require("./tmux/tmux-capture-cache");
+const waiting_screen_reading_1 = require("./detection/waiting-screen-reading");
+const status_detector_1 = require("./detection/status-detector");
+const prompt_waiting_composition_1 = require("./session/prompt-waiting-composition");
+const registry_1 = require("./hooks/sources/registry");
+const waiting_episode_binding_1 = require("./session/waiting-episode-binding");
+const waiting_episode_state_1 = require("./session/waiting-episode-state");
 const auto_yes_config_1 = require("../config/auto-yes-config");
 const auto_yes_poller_stop_reason_1 = require("./polling/auto-yes-poller-stop-reason");
 const logger_1 = require("../lib/logger");
@@ -92,7 +96,11 @@ const auto_yes_poller_generation_1 = require("./polling/auto-yes-poller-generati
 const auto_yes_poller_receipt_log_1 = require("./polling/auto-yes-poller-receipt-log");
 const auto_yes_poller_enter_fallback_1 = require("./polling/auto-yes-poller-enter-fallback");
 const auto_yes_poller_capture_1 = require("./polling/auto-yes-poller-capture");
+const prompt_screen_reading_1 = require("./polling/prompt-screen-reading");
 const auto_yes_confirmation_ledger_1 = require("./polling/auto-yes-confirmation-ledger");
+const auto_yes_poller_tick_1 = require("./auto-yes-poller-tick");
+const auto_yes_poller_answer_target_1 = require("./auto-yes-poller-answer-target");
+const auto_yes_poller_session_presence_1 = require("./auto-yes-poller-session-presence");
 const auto_yes_poller_steps_1 = require("./polling/auto-yes-poller-steps");
 // Issue #3783: split out; re-exported so existing importers are unchanged.
 var auto_yes_poller_generation_2 = require("./polling/auto-yes-poller-generation");
@@ -101,6 +109,10 @@ Object.defineProperty(exports, "getLastServerResponseTimestamp", { enumerable: t
 Object.defineProperty(exports, "isPollerActive", { enumerable: true, get: function () { return auto_yes_poller_generation_2.isPollerActive; } });
 var auto_yes_poller_receipt_log_2 = require("./polling/auto-yes-poller-receipt-log");
 Object.defineProperty(exports, "noHookReceiptHint", { enumerable: true, get: function () { return auto_yes_poller_receipt_log_2.noHookReceiptHint; } });
+// Issue #3893: split out; re-exported so existing importers are unchanged.
+var auto_yes_poller_keys_1 = require("./auto-yes-poller-keys");
+Object.defineProperty(exports, "getAutoYesPollerCompositeKeys", { enumerable: true, get: function () { return auto_yes_poller_keys_1.getAutoYesPollerCompositeKeys; } });
+Object.defineProperty(exports, "isAnyPollerActiveForWorktree", { enumerable: true, get: function () { return auto_yes_poller_keys_1.isAnyPollerActiveForWorktree; } });
 var auto_yes_poller_enter_fallback_2 = require("./polling/auto-yes-poller-enter-fallback");
 Object.defineProperty(exports, "AUTO_YES_ENTER_FALLBACK_ANSWER", { enumerable: true, get: function () { return auto_yes_poller_enter_fallback_2.AUTO_YES_ENTER_FALLBACK_ANSWER; } });
 var auto_yes_poller_capture_2 = require("./polling/auto-yes-poller-capture");
@@ -129,6 +141,8 @@ function incrementErrorCount(compositeKey, owner) {
     if (pollerState) {
         pollerState.consecutiveErrors++;
         pollerState.currentInterval = (0, auto_yes_state_1.calculateBackoffInterval)(pollerState.consecutiveErrors);
+        // Issue #3791 (review N1): a failed tick held nothing back with the duplicate guard.
+        (0, auto_yes_poller_generation_1.releaseDuplicateRetry)(pollerState);
         // Issue #499 Item 5: Auto-stop after consecutive error threshold.
         //
         // Issue #3184: this is the `consecutive-errors` row of AUTO_YES_LIFECYCLE
@@ -228,207 +242,6 @@ function processStopConditionDelta(compositeKey, pollerState, cleanOutput) {
     }
     return false;
 }
-/**
- * Issue #3397: is the fresh capture still the screen the Enter was decided for?
- * Re-reads it the way one tick does — prompt reading, the same `promptFrameKey`,
- * codex's launch dialogs and `/model` picker, the dialog gate refusing with no
- * dialog vouched for, and `judgeEnterFallback` (input box off screen, tool
- * alive, not thinking). The policy and the checkbox rule read `promptData`,
- * which the equal `promptFrameKey` already pins (type, question, options).
- */
-function isStillEnterFallbackScreen(prompt, fresh) {
-    const { worktreeId, cliToolId, instanceId, frameKey } = prompt;
-    const clean = (0, cli_patterns_1.stripBoxDrawing)((0, cli_patterns_1.stripAnsi)(fresh));
-    const frame = (0, frame_1.normalizeFrame)(fresh, cliToolId);
-    const detection = (0, response_checker_1.detectPromptOnCleanFrame)(clean, cliToolId, clean.split('\n'), fresh, { worktreeId, instanceId }, frame);
-    if (!detection.isPrompt || !detection.promptData)
-        return false;
-    if ((0, auto_yes_poller_state_1.promptFrameKey)(detection.promptData) !== frameKey)
-        return false;
-    if (cliToolId === 'codex' && ((0, cli_patterns_1.getCodexLifecycleDialog)(frame) || (0, detect_1.isCodexModelPickerFrame)(frame))) {
-        return false;
-    }
-    const gate = (0, auto_yes_dialog_gate_1.evaluateAutoYesDialogGate)(cliToolId, detection.promptData.type, frame);
-    if (gate.allowed || gate.dialog !== null)
-        return false;
-    return (0, auto_yes_enter_fallback_1.judgeEnterFallback)(cliToolId, fresh).eligible;
-}
-/**
- * Issue #3397: a frame the dialog gate refused may still be a choice screen
- * CommandMate cannot read — the one the prompt window offers direct input for.
- * Send ONE Enter there (confirm whatever is selected), under every condition
- * `judgeEnterFallback` and this function check; otherwise record the refusal as
- * step 3.5 always did.
- *
- * Order, each one able to stop the Enter:
- *  1. `judgeEnterFallback` (rollout table, refusal, composer off screen, tool
- *     alive, not thinking) — and the gate must not have vouched for a dialog it
- *     refused to type into (opencode's `keys` strip, #1893);
- *  2. the screen already had its Enter: record `no-effect`, send nothing;
- *  3. the contract policy, exactly as step 4 applies it (mode, allow-listed
- *     types, deny patterns over the question, options and `approvalTarget`);
- *     a prompt the base rules would not answer (multi-select, typed text) gets
- *     nothing either;
- *  4. the screen must have been eligible on the previous tick as well;
- *  5. the session must be this server's (#2865);
- *  6. a capture taken now, past the capture cache, must still be that screen
- *     ({@link isStillEnterFallbackScreen}).
- *
- * Issue #3706: with a `generation` (a tick of `pollAutoYes`), the waits of
- * steps 5 and 6 are each followed by {@link isTickCurrent}; a tick that lost
- * its generation sends nothing and changes nothing.
- *
- * @returns true when the Enter was sent; the caller returns `responded`
- */
-async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput, generation) {
-    const { worktreeId, cliToolId, instanceId, pollerState, promptData, frameKey } = prompt;
-    const judgement = dialogGate.dialog === null ? (0, auto_yes_enter_fallback_1.judgeEnterFallback)(cliToolId, rawOutput) : null;
-    if (judgement === null || !judgement.eligible) {
-        pollerState.enterFallbackCandidateKey = null;
-        (0, auto_yes_prompt_suppression_1.suppressUnclassifiedFrame)(prompt, dialogGate);
-        return false;
-    }
-    const screenKey = (0, auto_yes_enter_fallback_1.enterFallbackScreenKey)(promptData);
-    // 2. The Enter did not move the screen on. Another one would be a guess.
-    if (pollerState.enterFallbackSentKey === frameKey) {
-        pollerState.enterFallbackCandidateKey = null;
-        (0, auto_yes_enter_fallback_1.recordEnterFallbackNoEffect)(worktreeId, cliToolId, instanceId, screenKey);
-        (0, auto_yes_prompt_suppression_1.suppressUnclassifiedFrame)(prompt, dialogGate);
-        (0, auto_yes_poller_state_1.warnOncePerFrame)(pollerState, `${frameKey}\u0000enter-fallback-no-effect`, 'poller:auto-yes-enter-fallback-no-effect', {
-            worktreeId,
-            cliToolId,
-            instanceId,
-            promptType: promptData.type,
-            refusalReason: judgement.refusalReason,
-        });
-        return false;
-    }
-    // 3. The contract policy, as step 4 reads it (Issue #3822: a failed lookup withholds).
-    const policy = (0, auto_yes_policy_1.getSessionAutoYesPolicy)(worktreeId, cliToolId, instanceId);
-    const resolution = (0, auto_yes_resolver_1.resolveAutoAnswerWithPolicy)(promptData, policy);
-    if (resolution.suppressedBy) {
-        pollerState.enterFallbackCandidateKey = null;
-        const mode = (0, auto_yes_resolver_1.policyLookupMode)(policy);
-        (0, auto_yes_prompt_suppression_1.suppressAndWarnOnce)(prompt, {
-            reason: resolution.suppressedBy,
-            mode,
-            promptType: promptData.type,
-            pattern: resolution.pattern,
-        }, `${frameKey}\u0000${resolution.suppressedBy}\u0000${mode ?? ''}\u0000${resolution.pattern ?? ''}`, 'poller:auto-yes-suppressed-by-policy', {
-            reason: resolution.suppressedBy,
-            mode,
-            pattern: resolution.pattern,
-            promptType: promptData.type,
-            enterFallback: true,
-        });
-        return false;
-    }
-    // A checkbox list is out of scope whatever the parser's flag says: the
-    // labels' boxes (`[ ]` / `[x]` / `[X]` / `[✔]`, the one reading in
-    // `prompt-answer-semantic` the sender shares) count too, so an Enter never
-    // submits a half-ticked list (Issue #3397; the base rules' #2755 reading
-    // covers `multiSelect` only).
-    if (resolution.answer === null ||
-        (promptData.type === 'multiple_choice' && (0, prompt_answer_semantic_1.isMultiSelectPrompt)(promptData))) {
-        pollerState.enterFallbackCandidateKey = null;
-        (0, auto_yes_prompt_suppression_1.suppressUnclassifiedFrame)(prompt, dialogGate);
-        return false;
-    }
-    // 4. Seen once: wait for the next tick to see the same screen again.
-    // Nothing is recorded as withheld here: Auto-Yes is about to answer, and a
-    // fresh `lastSuppression` would make `cmate wait` report the prompt to a
-    // human at once instead of holding for Auto-Yes (#2463).
-    if (pollerState.enterFallbackCandidateKey !== frameKey) {
-        pollerState.enterFallbackCandidateKey = frameKey;
-        logger.debug('poller:auto-yes-enter-fallback-candidate', {
-            worktreeId,
-            cliToolId,
-            instanceId,
-            promptType: promptData.type,
-        });
-        return false;
-    }
-    // 5. Never another server's session (Issue #2865).
-    const sessionName = manager_1.CLIToolManager.getInstance().getTool(cliToolId).getSessionName(worktreeId, instanceId);
-    const ownership = await (0, worktree_session_ownership_1.checkWorktreeSessionOwnership)(worktreeId, sessionName);
-    if (generation !== undefined && !(0, auto_yes_poller_generation_1.isTickCurrent)(generation))
-        return false;
-    if (ownership === null || ownership.verdict === 'foreign') {
-        // Issue #3820: the ledger's own reason, as `skippedForUnownedSession` records it.
-        (0, auto_yes_confirmation_ledger_1.withholdLedgerConfirmation)(prompt, 'foreign-session');
-        (0, auto_yes_poller_state_1.warnOncePerFrame)(pollerState, `${frameKey}\u0000${sessionName}\u0000${ownership ? 'foreign' : 'worktree_not_found'}`, 'poller:auto-yes-skipped-foreign-session', {
-            worktreeId,
-            cliToolId,
-            instanceId,
-            sessionName,
-            sessionPath: ownership?.sessionPath ?? null,
-            reason: ownership ? 'foreign' : 'worktree_not_found',
-            enterFallback: true,
-        });
-        return false;
-    }
-    // 6. The last look before the key, at a capture taken NOW. The two ticks of
-    // step 4 read through the capture cache, whose TTL is longer than the poll
-    // interval, so "seen twice" can be one stale frame read twice: a redraw caught
-    // with its input box missing (#2457's repaint) while the real pane already
-    // has the box back. Everything that decided the Enter is judged again on the
-    // fresh frame; any difference sends nothing, and the next tick starts over.
-    const fresh = await (0, cli_session_1.captureSessionOutputFresh)(worktreeId, cliToolId, (rawOutput ?? '').split('\n').length, instanceId);
-    if (generation !== undefined && !(0, auto_yes_poller_generation_1.isTickCurrent)(generation))
-        return false;
-    if (!isStillEnterFallbackScreen(prompt, fresh)) {
-        pollerState.enterFallbackCandidateKey = null;
-        logger.debug('poller:auto-yes-enter-fallback-fresh-frame-differs', {
-            worktreeId,
-            cliToolId,
-            instanceId,
-            promptType: promptData.type,
-        });
-        return false;
-    }
-    const receiptEpisode = (0, auto_yes_poller_receipt_log_1.receiptEpisodeOfSend)(cliToolId, worktreeId, instanceId);
-    // Issue #3820: taken before the await, so the result goes to this confirmation.
-    const ledgerAttempt = (0, auto_yes_confirmation_ledger_1.beginLedgerAttempt)(prompt, 'enter-fallback');
-    try {
-        await (0, tmux_1.sendSpecialKeys)(sessionName, ['Enter']);
-    }
-    catch (error) {
-        // Issue #3796: the Enter may or may not have reached the pane.
-        (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, true, receiptEpisode);
-        (0, auto_yes_confirmation_ledger_1.settleLedgerAttempt)(ledgerAttempt, 'failed');
-        throw error;
-    }
-    finally {
-        (0, tmux_capture_cache_1.invalidateCache)(sessionName);
-    }
-    // Issue #3796 review E: the Enter is out — for the episode it began for only.
-    (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, false, receiptEpisode);
-    (0, auto_yes_confirmation_ledger_1.settleLedgerAttempt)(ledgerAttempt, 'ok');
-    // Issue #3706: the Enter is out, but the per-screen record is the CURRENT
-    // session's: when the poller was stopped (the record was forgotten with it)
-    // or a new session began while `send-keys` was awaited, the return of this
-    // send must not put the record back. The audit row below is kept either way.
-    if (generation === undefined || ((0, auto_yes_poller_generation_1.isPollerCurrent)(generation) && (0, auto_yes_poller_generation_1.isSameSession)(generation))) {
-        pollerState.enterFallbackSentKey = frameKey;
-        pollerState.enterFallbackCandidateKey = null;
-        (0, auto_yes_enter_fallback_1.recordEnterFallbackSent)(worktreeId, cliToolId, instanceId, {
-            promptType: promptData.type,
-            refusalReason: judgement.refusalReason,
-            screenKey,
-            ...(generation !== undefined ? { epoch: generation.sessionEpoch } : {}),
-        });
-    }
-    logger.info('poller:auto-yes-enter-fallback-sent', {
-        worktreeId,
-        cliToolId,
-        instanceId,
-        promptType: promptData.type,
-        refusalReason: judgement.refusalReason,
-        composerState: judgement.composerState,
-    });
-    await finishAnsweredPrompt(prompt, promptDetection, auto_yes_poller_enter_fallback_1.AUTO_YES_ENTER_FALLBACK_ANSWER, generation);
-    return true;
-}
 /**
  * Issue #3214: steps 6 and 7 of `detectAndRespondToPrompt` and everything after
  * them -- what is done once the answer has reached tmux, in the order it always
@@ -444,8 +257,11 @@ async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput,
  *   tick's own poller state only, never to a successor under the same key, and
  *   the response poller restart and the terminal push are skipped when the
  *   session was relaunched meanwhile.
+ * @param capture - Issue #3881 (review P2-2): the tick's frame and its capture
+ *   window, so an audit row this answer creates carries the same reading the
+ *   response poller's save gives a row (`promptDataForStorage`)
  */
-async function finishAnsweredPrompt(prompt, promptDetection, answer, generation) {
+async function finishAnsweredPrompt(prompt, promptDetection, answer, generation, capture) {
     const { worktreeId, cliToolId, instanceId, compositeKey, pollerState, promptData, promptKey } = prompt;
     // Issue #3706: the keys went to the session the tick started on. When a new
     // one was begun while they were being sent, the new process never received
@@ -466,7 +282,7 @@ async function finishAnsweredPrompt(prompt, promptDetection, answer, generation)
     }
     // Issue #3748: what was answered and with what — the question (cut to
     // MAX_LOGGED_QUESTION_LENGTH, never the full text) and the answer sent (the
-    // option number, `y`, or `[Enter]`) — so an answer that should not have been
+    // option number or `y`) — so an answer that should not have been
     // given can be told from the log alone.
     logger.info('poller:response-sent', {
         worktreeId,
@@ -496,7 +312,10 @@ async function finishAnsweredPrompt(prompt, promptDetection, answer, generation)
             worktreeId,
             cliToolId,
             instanceId: instanceId ?? cliToolId,
-            promptData,
+            // Issue #3881 (review P2-2): with the reading of the frame it answered,
+            // so a row this creates is classified as the response poller's row for
+            // the same screen would be — not by whichever of the two wrote first.
+            promptData: auditPromptData(cliToolId, promptDetection, promptData, capture),
             answer,
             answeredBy: 'auto',
             content: promptDetection.rawContent || promptDetection.cleanContent,
@@ -539,111 +358,15 @@ async function finishAnsweredPrompt(prompt, promptDetection, answer, generation)
     void broadcastTerminalSnapshotAfterInteraction(worktreeId, cliToolId, instanceId);
 }
 /**
- * Step 1 of `detectAndRespondToPrompt`: normalise the tick's frame once and
- * read the prompt on it.
- */
-function readPromptFrame(worktreeId, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput) {
-    const receiptScope = { worktreeId, instanceId };
-    // Issue #3183: the ONE frame every judgement below reads — normalised once,
-    // from the capture as captured (the input-box markers are rule rows the
-    // cleaned spelling has blanked), and handed as the same object to the
-    // prompt reading, the codex launch guards and the dialog gate. That is what
-    // makes "the status chain and Auto-Yes read the same live region" a fact
-    // rather than a hope: there is no second normalisation to disagree with.
-    const frame = (0, frame_1.normalizeFrame)(rawOutput ?? cleanOutput, cliToolId);
-    // Issue #3767: bracket the read so the receipt gate can tell when an agy
-    // dialog first appeared, not only what time this tick is.
-    if (cliToolId === 'antigravity')
-        (0, antigravity_receipt_episodes_1.beginAntigravityFrameRead)(worktreeId, instanceId);
-    const promptDetection = (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput, receiptScope, frame);
-    if (cliToolId === 'antigravity')
-        (0, antigravity_receipt_episodes_1.endAntigravityFrameRead)(worktreeId, instanceId);
-    return { frame, promptDetection };
-}
-/**
- * What `detectAndRespondToPrompt` does to the poller state on a frame with no
- * prompt to answer, before it returns `no_prompt`.
- */
-function noteNoPromptOnScreen(tick) {
-    const { worktreeId, cliToolId, instanceId, compositeKey, pollerState, frame, promptDetection, cleanOutput, precomputedLines, rawOutput, } = tick;
-    (0, auto_yes_poller_state_1.forgetPartialAnswer)(compositeKey);
-    pollerState.lastAnsweredPromptKey = null;
-    pollerState.lastAnsweredAt = null;
-    pollerState.enterFallbackCandidateKey = null;
-    // Issue #3757: agy's trust screen reads as no prompt (unnumbered: neither
-    // reader takes it), but it is one nobody here answers — record why, still
-    // as `no_prompt`. Before the warn key is cleared, so the WARN stays once
-    // per screen.
-    // Issue #3820: the trust screen records itself in the ledger when it records
-    // its reason (`suppressAntigravityTrustScreen`).
-    if (cliToolId === 'antigravity' &&
-        (0, auto_yes_prompt_suppression_1.suppressAntigravityTrustScreen)(worktreeId, instanceId, pollerState, frame, manager_1.CLIToolManager.getInstance().getTool(cliToolId).getSessionName(worktreeId, instanceId))) {
-        return;
-    }
-    pollerState.lastSkipWarnKey = null;
-    if (cliToolId === 'antigravity' && !promptDetection.isPrompt) {
-        const seen = (0, auto_yes_poller_receipt_log_1.logIfWithheldForWantOfReceipt)(worktreeId, instanceId, compositeKey, () => (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput));
-        // Issue #3820: past the receipt window the gated reading says "no prompt"
-        // while the dialog is still up. The ungated reading says it is, so the
-        // ledger keeps the same confirmation (and the same withheld interval)
-        // rather than closing it on every tick outside the window.
-        if (seen !== null) {
-            const scope = { compositeKey, worktreeId, cliToolId, instanceId };
-            (0, auto_yes_confirmation_ledger_1.observeLedgerScreen)(scope, (0, auto_yes_poller_state_1.ledgerScreenKey)(seen.promptData), seen.promptData.type, ledgerCallOf(cliToolId, worktreeId, instanceId));
-            if (seen.reason !== null)
-                (0, auto_yes_confirmation_ledger_1.withholdLedgerConfirmation)(scope, seen.reason);
-        }
-    }
-}
-/**
- * Issue #3820 (design §2.4, PR 3): the agy call the receipt episode on screen
- * was accepted for, for the ledger to tie the confirmation to. Asked after the
- * frame was judged; read only to record, and never throws.
- */
-function ledgerCallOf(cliToolId, worktreeId, instanceId) {
-    if (cliToolId !== 'antigravity')
-        return {};
-    try {
-        const callId = (0, antigravity_receipt_episodes_1.getAntigravityAcceptedReceiptCallId)(worktreeId, instanceId);
-        return callId === null ? {} : { callId };
-    }
-    catch {
-        // Recording only: a failure here ties nothing and changes nothing else.
-        return {};
-    }
-}
-/**
- * Issue #3820: the result of a send that threw, as the ledger counts it.
- * `keysSent` is what the sender said (#3706); a throw that says nothing is a
- * failure whose keys may or may not be on the pane.
- */
-function attemptResultOfThrow(keysSent) {
-    if (keysSent === true)
-        return 'partial';
-    if (keysSent === false)
-        return 'no-keys-sent';
-    return 'failed';
-}
-/**
- * Issue #3820: the evidence an answer on the screen path is given on (design
- * §7 PR 1). A tool's own dialog detector vouched for the frame: `L3`. The
- * gate did not judge it (a `legacy` tool, a non-multiple-choice prompt): the
- * generic reading alone, `L4`.
- *
- * agy's gate is `legacy` (`gated: false`), yet its prompts are read by its own
- * reader first (`detectPromptOnCleanFrame` returns that reader's result
- * whenever it reads the frame). Which reader it was is not on the detection
- * result, so it is asked of the same reader on the same text here — for the
- * label only; the answer was decided before this is called. Read by agy's own
- * reader, and through the receipt gate (the tick's reading carried the
- * receipt scope): `L3`, with `receiptAccepted` on the attempt.
+ * The `promptData` an Auto-Yes audit row is recorded with (Issue #3881 review
+ * P2-2): the answered prompt with `promptDataForStorage`'s reading of the
+ * tick's frame. A pending row the response poller saved keeps its own reading
+ * (`recordAnsweredPrompt` spreads it); this is what a row created here, or one
+ * saved without a reading, gets.
  */
-function answerBasisOf(prompt, cleanOutput) {
-    if (prompt.cliToolId === 'antigravity') {
-        return (0, dialog_1.detectAntigravityNumberedDialogPrompt)(cleanOutput) !== null ? 'L3' : 'L4';
-    }
-    const gate = prompt.dialogGate;
-    return gate !== undefined && gate.gated && gate.allowed && gate.dialog !== null ? 'L3' : 'L4';
+function auditPromptData(cliToolId, promptDetection, promptData, capture) {
+    return ((0, prompt_screen_reading_1.promptDataForStorage)(cliToolId, capture?.frame ?? null, { ...promptDetection, promptData }, capture?.captureTop)
+        ?? promptData);
 }
 /**
  * The `catch` of `detectAndRespondToPrompt`: settles the send in flight and
@@ -652,10 +375,17 @@ function answerBasisOf(prompt, cleanOutput) {
 function settleFailedTick(error, tick) {
     const { worktreeId, cliToolId, instanceId, compositeKey, generation, attempt, sendInFlight, receiptEpisode } = tick;
     const keysSent = error instanceof Error && 'keysSent' in error ? Boolean(error.keysSent) : null;
+    // Issue #3880: a tmux call that ended without an exit status may have left
+    // the answer on the pane though no key is known to be there (`keysSent` is
+    // not true, and the ledger counts it `failed`). Held as a partial answer is:
+    // the next tick does not send it again at the same confirmation (step 2.5).
+    // Read off the error like `keysSent` (`AnswerDelivery` in prompt-answer-sender).
+    const delivery = error instanceof Error && 'answerDelivery' in error ? error.answerDelivery : null;
+    const mayBeOnPane = keysSent === true || delivery === 'indeterminate';
     // Issue #3820: the send that was cut short, in the ledger — before the send
     // record below is settled, whose state says whether it had expired.
     if (attempt !== null && sendInFlight) {
-        (0, auto_yes_confirmation_ledger_1.settleLedgerAttempt)(attempt.ledger, attemptResultOfThrow(keysSent), { expired: attempt.state === 'expired' });
+        (0, auto_yes_confirmation_ledger_1.settleLedgerAttempt)(attempt.ledger, (0, auto_yes_poller_tick_1.attemptResultOfThrow)(keysSent), { expired: attempt.state === 'expired' });
     }
     // Issue #3706: a tick that lost its generation — the send stopped part-way
     // (`PromptAnswerAbortedError`), or failed after the grant went — is not a
@@ -665,18 +395,22 @@ function settleFailedTick(error, tick) {
         // answer again over them (step 2.5). Recorded under the attempt's key as
         // it is now — the new one when a worktree ID move carried it (#3713).
         if (attempt !== null)
-            (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, keysSent === true);
+            (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, mayBeOnPane);
         if (sendInFlight)
             (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, true, receiptEpisode);
-        logger.info('poller:auto-yes-answer-abandoned', { worktreeId, cliToolId, instanceId, keysSent });
+        logger.info('poller:auto-yes-answer-abandoned', { worktreeId, cliToolId, instanceId, keysSent, delivery });
         return 'no_answer';
     }
+    // Issue #3839: a failure with keys already on the pane is held the same way —
+    // the next tick must not type the answer again over them (step 2.5); the
+    // screen leaving or changing forgets it (`forgetPartialAnswer`). Issue #3880:
+    // so is a send whose outcome is not known (`mayBeOnPane` above).
     if (attempt !== null)
-        (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, false);
+        (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, mayBeOnPane);
     if (sendInFlight)
         (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, true, receiptEpisode);
     incrementErrorCount(compositeKey, generation?.pollerState);
-    logger.warn('poller:detect-respond-error', { worktreeId, cliToolId, instanceId });
+    logger.warn('poller:detect-respond-error', { worktreeId, cliToolId, instanceId, delivery });
     return 'error';
 }
 /**
@@ -693,14 +427,33 @@ function settleFailedTick(error, tick) {
  *   (Issue #2522). Omitting it costs Command Code's `AskUserQuestion` and
  *   nothing else; see {@link capturePollerFrame}.
  * @param generation - The calling tick's generation (Issue #3706). Given, every
- *   wait before a key — the ownership check, the Enter fallback's fresh capture,
- *   each wait inside the send — is followed by {@link isTickCurrent}, and a tick
+ *   wait before a key — the ownership check and each wait inside the send — is
+ *   followed by {@link isTickCurrent}, and a tick
  *   that lost it types nothing more and returns `no_answer`. Omitted (direct
  *   callers, tests), nothing is checked, as before.
+ * @param observation - Issue #3798: the tick's waiting-episode start, fixed
+ *   before its capture, and when that capture's frame was fetched. The answer
+ *   is observed against them ({@link observeAnsweredPrompt}). Omitted (direct
+ *   callers, tests), the start is fixed here and the frame dated 0.
+ * @param captureWindowLines - Issue #3881 (review P2-1): the window the
+ *   capture was taken with. Given, a capture that filled it is read as
+ *   possibly cut at its top: an approval target that reached that top is
+ *   `top-unknown`, and a deny miss on it is not a pass. Omitted (direct
+ *   callers, tests), nothing is known about the capture's extent, as before.
+ *   The same window says where the audit row's frame begins (`captureTop`).
+ * @param captureHeadCut - Issue #3881 (third review N4): whether that window
+ *   dropped rows from the top of what tmux returned, as the capture layer said
+ *   ({@link capturePollerFrame}'s `headCut`). At a window of the pane's height
+ *   the row count cannot tell. Omitted, judged from the row count as before.
  * @returns 'responded' | 'no_prompt' | 'duplicate' | 'no_answer' | 'error'
  */
-async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, generation) {
+async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, generation, observation, captureWindowLines, captureHeadCut) {
     const compositeKey = (0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId);
+    const captureExtent = captureWindowLines === undefined ? undefined : { windowLines: captureWindowLines, headCut: captureHeadCut };
+    const tickObservation = observation ?? {
+        start: (0, waiting_episode_binding_1.startWaitingObservation)(worktreeId, cliToolId, instanceId),
+        frameTime: { frameCapturedAt: 0, frameFetchedAfterStart: false },
+    };
     // Issue #3706 / #3713: the send in flight, settled without an await once it
     // comes back — as a partial answer when it was stopped with keys on the pane.
     let attempt = null;
@@ -710,8 +463,19 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
     let receiptEpisode = null;
     // Issue #3820: the ledger's tick. A tick that read the screen and saw no
     // confirmation closes the open one as gone when it ends (`endLedgerTick`).
-    const ledgerScope = { compositeKey, worktreeId, cliToolId, instanceId };
+    // Issue #3863: the answer mode this tick acts under, recorded on its ledger lines.
+    const answerMode = (0, auto_yes_poller_steps_1.answerModeOfTick)(worktreeId, cliToolId, instanceId, generation?.grant);
+    const ledgerScope = { compositeKey, worktreeId, cliToolId, instanceId, answerMode };
     const ledgerTick = (0, auto_yes_confirmation_ledger_1.beginLedgerTick)(ledgerScope);
+    // Issue #3821: when this tick began, for the decision's reason (see `tickDecisionRecorder`).
+    const tickStartedAt = Date.now();
+    // Issue #3791 (review N1 / N3): the duplicate guard's reservation outlives
+    // this tick only when the guard holds the prompt back again. It stays up
+    // while the tick goes on to send the retry of the reserved prompt (an answer
+    // still on its way), and is released before any await for another screen,
+    // and in `finally` for everything else — withheld, failed, stopped, or
+    // answered (the new answer restarts the hold).
+    let keepDuplicateRetry = false;
     try {
         // 1. Detect prompt.
         //
@@ -753,20 +517,38 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // such a machine's dialogs alone, which is why `logIfWithheldForWantOfReceipt`
         // says so.
         const epoch = (0, auto_yes_poller_enter_fallback_1.syncEnterFallbackEpoch)(compositeKey, pollerState);
-        const { frame, promptDetection } = readPromptFrame(worktreeId, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput);
+        const { frame, promptDetection } = (0, auto_yes_poller_tick_1.readPromptFrame)(worktreeId, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, captureExtent, response_checker_1.detectPromptOnCleanFrame);
         if (!promptDetection.isPrompt || !promptDetection.promptData) {
-            noteNoPromptOnScreen({
+            // Issue #3821: no prompt, no decision — except agy's dialog the receipt
+            // gate keeps from this reading while the status API still shows it.
+            (0, auto_yes_decision_state_1.forgetAutoYesDecision)(compositeKey);
+            const withheldPastGate = (0, auto_yes_poller_tick_1.noteNoPromptOnScreen)({
                 worktreeId,
                 cliToolId,
                 instanceId,
                 compositeKey,
+                epoch,
                 pollerState,
                 frame,
                 promptDetection,
                 cleanOutput,
                 precomputedLines,
                 rawOutput,
+                captureExtent,
+                detectPromptOnCleanFrame: response_checker_1.detectPromptOnCleanFrame,
             });
+            if (withheldPastGate !== null && withheldPastGate.reason !== null) {
+                (0, auto_yes_poller_tick_1.tickDecisionRecorder)({
+                    worktreeId,
+                    cliToolId,
+                    instanceId,
+                    compositeKey,
+                    promptData: withheldPastGate.promptData,
+                    epoch,
+                    generation,
+                    startedAt: tickStartedAt,
+                }).withheld(withheldPastGate.reason);
+            }
             return 'no_prompt';
         }
         // Issue #3820: computed here, before the duplicate check, so the ledger
@@ -776,16 +558,43 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // that differ by a `>` or an indent are two confirmations to count.
         const screenKey = (0, auto_yes_poller_state_1.partialAnswerScreenKey)(promptDetection.promptData);
         // agy (PR 3): tied to the call the receipt that let it through asked about.
-        (0, auto_yes_confirmation_ledger_1.observeLedgerScreen)(ledgerScope, (0, auto_yes_poller_state_1.ledgerScreenKey)(promptDetection.promptData), promptDetection.promptData.type, ledgerCallOf(cliToolId, worktreeId, instanceId));
+        (0, auto_yes_confirmation_ledger_1.observeLedgerScreen)(ledgerScope, (0, auto_yes_poller_state_1.ledgerScreenKey)(promptDetection.promptData), promptDetection.promptData.type, (0, auto_yes_poller_tick_1.ledgerCallOf)(cliToolId, worktreeId, instanceId));
+        // Issue #3821: what this tick decides about the prompt, for `current-output`.
+        const decision = (0, auto_yes_poller_tick_1.tickDecisionRecorder)({
+            worktreeId,
+            cliToolId,
+            instanceId,
+            compositeKey,
+            promptData: promptDetection.promptData,
+            epoch,
+            generation,
+            startedAt: tickStartedAt,
+        });
+        // 1.5. Issue #3821 (review 2): a person began answering on this instance
+        // moments ago. What is on screen may be the very confirmation they are
+        // answering, so it is theirs until the hold passes; Auto-Yes stays on.
+        if ((0, auto_yes_manual_answer_1.isManualAnswerHolding)(compositeKey)) {
+            decision.withheld(auto_yes_manual_answer_1.ANSWERED_BY_HUMAN_DECISION_REASON);
+            return 'no_answer';
+        }
         // 2. Check for duplicate prompt (Issue #306)
         const promptKey = (0, prompt_key_1.generatePromptKey)(promptDetection.promptData);
         const frameKey = (0, auto_yes_poller_state_1.promptFrameKey)(promptDetection.promptData);
         if ((0, auto_yes_poller_generation_1.isDuplicatePrompt)(pollerState, promptKey)) {
+            // Issue #3791 (review N1): the push gate holds this wait until the retry.
+            (0, auto_yes_poller_generation_1.reserveDuplicateRetry)(pollerState, promptKey, tickStartedAt);
+            keepDuplicateRetry = true;
             // Issue #3820: not answered on this tick either — an interval of its own
             // reason, so the count can tell the wait for an answer to land apart.
             (0, auto_yes_confirmation_ledger_1.withholdLedgerConfirmation)(ledgerScope, 'answered-recently');
+            // Issue #3821: still `answering` only if this is the confirmation the send was for.
+            decision.reaffirmAnswering();
             return 'duplicate';
         }
+        // Issue #3791 (review N3): another screen than the reserved one — released
+        // now, before the awaits below, so the gate never reads it for this screen.
+        if (!(0, auto_yes_poller_generation_1.isDuplicateRetryOf)(pollerState, promptKey))
+            (0, auto_yes_poller_generation_1.releaseDuplicateRetry)(pollerState);
         const judged = {
             worktreeId,
             cliToolId,
@@ -795,6 +604,11 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
             promptData: promptDetection.promptData,
             promptKey,
             frameKey,
+            // Issue #3863: for the `recommended` answer mode's choice among a question's options.
+            ...(promptDetection.optionRecommendations !== undefined
+                ? { optionRecommendations: promptDetection.optionRecommendations }
+                : {}),
+            answerMode,
         };
         // 2.5. Issue #3706: an earlier answer to this prompt was stopped after some
         // of its keys reached the pane (a `y` whose Enter was withheld). Typing the
@@ -805,26 +619,36 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // does not), or the session is relaunched. Recorded as a suppression, so
         // the prompt Push and `cmate wait` see "withheld", not "answering".
         if ((0, auto_yes_poller_steps_1.withheldForEarlierSend)(judged, screenKey, epoch)) {
+            decision.withheld('moved-send-in-flight');
             return 'no_answer';
         }
         // 3., 3.2., 3.5. Frames that are not Auto-Yes's to answer: see
         // `suppressIfNotOursToAnswer`.
         const notOurs = (0, auto_yes_prompt_suppression_1.suppressIfNotOursToAnswer)(judged, frame);
-        if (notOurs.kind !== 'dialog-gate-refused') {
-            pollerState.enterFallbackCandidateKey = null;
-        }
         if (notOurs.kind === 'left-alone') {
+            decision.withheld('unclassified-frame');
             return 'no_answer';
         }
-        // 3.6. Issue #3397: a refused frame may be a choice screen CommandMate
-        // cannot read; with Auto-Yes on it gets one Enter. See `tryEnterFallback`.
+        // 3.6. A frame the dialog gate refused is left to a human, whatever it is.
+        // Issue #3821: including a choice screen CommandMate cannot read, which got
+        // one bare Enter (#3397) until this Issue retired it — an Enter confirms
+        // whatever happens to be selected, and nothing here can say what that is.
         if (notOurs.kind === 'dialog-gate-refused') {
-            if (!(await tryEnterFallback(judged, promptDetection, notOurs.dialogGate, rawOutput, generation))) {
-                return 'no_answer';
-            }
-            return 'responded';
+            (0, auto_yes_prompt_suppression_1.suppressUnclassifiedFrame)(judged, notOurs.dialogGate);
+            decision.withheld('unclassified-frame');
+            return 'no_answer';
+        }
+        // 3.7. Issue #3822: a question to the operator is the human's to answer —
+        // under the `careful` answer mode (Issue #3863); under `recommended` a
+        // question reader's picker goes on to step 4. See `withheldAsQuestion`.
+        if ((0, auto_yes_poller_steps_1.withheldAsQuestion)(judged)) {
+            decision.withheld('question-left-to-human');
+            return 'no_answer';
         }
         // 4. Resolve auto answer under the execution contract's policy (Issue #1547).
+        // Issue #3863: a question the `recommended` mode answers takes its
+        // recommended option, else its default; one whose recommendation cannot
+        // be told is withheld (`recommended-option-unidentified`).
         // Auto-Yes reads the frame itself instead of going through status-detector
         // (it shares the reader, not the verdict), so this is the only place the policy can gate an
         // auto-answer: a prompt the policy withholds is left for a human, and the
@@ -832,6 +656,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // polling/response-checker.ts) is what tells them it is waiting.
         const answer = (0, auto_yes_poller_steps_1.resolveAnswerUnderPolicy)(judged);
         if (answer === null) {
+            decision.withheld(auto_yes_decision_1.NO_AUTO_ANSWER_DECISION_REASON);
             return 'no_answer';
         }
         // 5. Send answer to tmux (Issue #896: resolve the instance-specific session)
@@ -844,14 +669,26 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         if (generation !== undefined && !(0, auto_yes_poller_generation_1.isTickCurrent)(generation))
             return 'no_answer';
         if ((0, auto_yes_poller_steps_1.skippedForUnownedSession)(judged, sessionName, ownership)) {
+            decision.withheld('foreign-session');
+            return 'no_answer';
+        }
+        // 5.5. Issue #3822: the last look before the first key — Auto-Yes still on
+        // and inside its window, and the contract, read past its cache, still
+        // allowing this answer. No wait between here and the send.
+        if ((0, auto_yes_poller_steps_1.withheldAtSend)(judged, generation !== undefined)) {
+            decision.withheld(auto_yes_decision_1.NO_AUTO_ANSWER_DECISION_REASON);
             return 'no_answer';
         }
+        // Issue #3821: from here until the screen is redrawn, Auto-Yes is answering.
+        decision.answering();
         attempt = (0, auto_yes_poller_state_1.beginSendAttempt)(compositeKey, screenKey, generation?.sessionEpoch ?? epoch, 
         // Issue #3820: an agy prompt read past the gate is one a hook receipt let through.
-        (0, auto_yes_confirmation_ledger_1.beginLedgerAttempt)(ledgerScope, answerBasisOf(judged, cleanOutput), {
+        (0, auto_yes_confirmation_ledger_1.beginLedgerAttempt)(ledgerScope, (0, auto_yes_poller_tick_1.answerBasisOf)(judged, cleanOutput), {
             receiptAccepted: cliToolId === 'antigravity',
         }));
         receiptEpisode = (0, auto_yes_poller_receipt_log_1.receiptEpisodeOfSend)(cliToolId, worktreeId, instanceId);
+        // Issue #3798: the wait this answer goes to, fixed as the send begins.
+        const answerTarget = (0, auto_yes_poller_answer_target_1.fixAnswerTarget)(worktreeId, cliToolId, instanceId);
         sendInFlight = true;
         try {
             await (0, prompt_answer_sender_1.sendPromptAnswer)({
@@ -871,11 +708,27 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, false);
         // Issue #3796 review E: the episode the send began for, as on the failure side.
         (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, false, receiptEpisode);
+        // Issue #3798: the wait this answer went to — opened if none is open — so
+        // the frame that shows the confirmation gone closes it. Once the keys are
+        // out, only by a tick that still acts for this instance (#3706: one that
+        // lost its grant or session writes nothing that says "answered"), and only
+        // for the wait fixed as the send began.
+        if (generation === undefined || (0, auto_yes_poller_generation_1.isTickCurrent)(generation)) {
+            observeAnsweredPrompt(judged, screenKey, tickObservation, answerTarget);
+        }
         // 6., 7. The answer reached tmux: see `finishAnsweredPrompt`.
-        await finishAnsweredPrompt(judged, promptDetection, answer, generation);
+        await finishAnsweredPrompt(judged, promptDetection, answer, generation, {
+            // The tick's one normalised frame (#3183), not the capture again.
+            frame,
+            captureTop: (0, auto_yes_poller_tick_1.captureTopOf)(rawOutput ?? cleanOutput, captureExtent, cliToolId),
+        });
         return 'responded';
     }
     catch (error) {
+        // Issue #3821: a tick that failed has decided nothing the next one will not
+        // decide again; until then the prompt is not "being answered".
+        if (generation === undefined || (0, auto_yes_poller_generation_1.isTickCurrent)(generation))
+            (0, auto_yes_decision_state_1.forgetAutoYesDecision)(compositeKey);
         return settleFailedTick(error, {
             worktreeId,
             cliToolId,
@@ -889,6 +742,8 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
     }
     finally {
         (0, auto_yes_confirmation_ledger_1.endLedgerTick)(ledgerScope, ledgerTick);
+        if (!keepDuplicateRetry)
+            (0, auto_yes_poller_generation_1.releaseDuplicateRetry)(pollerState);
     }
 }
 /**
@@ -923,11 +778,15 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
         grant,
         sessionEpoch: (0, auto_yes_enter_fallback_1.getEnterFallbackSessionEpoch)(compositeKey),
         startedAt: Date.now(),
+        // Issue #3821: a person's answer begun after this is read stops the tick.
+        manualAnswerSeq: (0, auto_yes_manual_answer_1.getManualAnswerSeq)(compositeKey),
     };
     // Issue #3796: this is the session wait's tick (it was scheduled as one) —
     // recorded before anything can fail, for the push gate.
     if (pollerState.sessionWaitTickAt !== undefined)
         pollerState.sessionWaitTickRanAt = generation.startedAt;
+    // Issue #3798: the waiting episode as this tick found it, before its first wait.
+    const observationStart = (0, waiting_episode_binding_1.startWaitingObservation)(worktreeId, cliToolId, instanceId);
     try {
         // 2. Capture and clean output
         const captureLines = grant.stopPattern
@@ -937,7 +796,10 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
         // step below exactly as it did; the raw one is carried to the prompt reading
         // so a dialog anchored on box drawing is not invisible to the one path that
         // can answer it without a human.
-        const { raw: rawOutput, clean: cleanOutput } = await (0, auto_yes_poller_capture_1.capturePollerFrame)(worktreeId, cliToolId, captureLines, instanceId);
+        //
+        // Issue #3798: dated by where that frame came from — the capture goes
+        // through the 5 s cache, so it may predate this tick.
+        const { frame: { raw: rawOutput, clean: cleanOutput, headCut }, frameTime, } = await (0, waiting_episode_binding_1.captureObservedFrame)(() => (0, auto_yes_poller_capture_1.capturePollerFrame)(worktreeId, cliToolId, captureLines, instanceId));
         if (!(0, auto_yes_poller_generation_1.isTickCurrent)(generation)) {
             endStaleTick(generation);
             return;
@@ -954,7 +816,10 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
             return;
         }
         // 4. Detect and respond to prompt
-        const result = await detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, lines, instanceId, rawOutput, generation);
+        const result = await detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, lines, instanceId, rawOutput, generation, { start: observationStart, frameTime }, 
+        // Issue #3881 (review P2-1): the window this capture was taken with,
+        // and (third review N4) whether it cut the pane's top.
+        captureLines, headCut);
         if (!(0, auto_yes_poller_generation_1.isTickCurrent)(generation)) {
             endStaleTick(generation);
             return;
@@ -972,6 +837,15 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
         }
         // 5. Thinking check
         if (result === 'no_prompt') {
+            observeWaitingFromTick({
+                worktreeId,
+                cliToolId,
+                instanceId,
+                start: observationStart,
+                frameTime,
+                pollerState: generation.pollerState,
+                rawOutput,
+            });
             const recentLines = lines.slice(-auto_yes_state_1.THINKING_CHECK_LINE_COUNT).join('\n');
             if ((0, cli_patterns_1.detectThinking)(cliToolId, recentLines)) {
                 scheduleNextPoll(generation, auto_yes_config_1.THINKING_POLLING_INTERVAL_MS);
@@ -984,12 +858,24 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
         // the session it answers for (`auto-yes-lifecycle`), and `send --auto-yes`
         // enables it before the session starts — so wait until `expiresAt`, at the
         // backoff cap, instead of counting toward `consecutive_errors`.
-        const sessionMissing = await isSessionMissing(worktreeId, cliToolId, instanceId);
+        const sessionMissing = await (0, auto_yes_poller_session_presence_1.isSessionMissing)(worktreeId, cliToolId, instanceId);
         if (!(0, auto_yes_poller_generation_1.isTickCurrent)(generation)) {
             endStaleTick(generation);
             return;
         }
         if (sessionMissing) {
+            // Issue #3791 (review N1): no screen for the duplicate guard to hold back.
+            (0, auto_yes_poller_generation_1.releaseDuplicateRetry)(generation.pollerState);
+            // Issue #3798: a session that is gone is waiting for nobody.
+            observeWaitingFromTick({
+                worktreeId,
+                cliToolId,
+                instanceId,
+                start: observationStart,
+                frameTime: { frameCapturedAt: 0, frameFetchedAfterStart: false },
+                pollerState: generation.pollerState,
+                rawOutput: null,
+            });
             if (!pollerState.waitingForSession) {
                 pollerState.waitingForSession = true;
                 logger.info('poller:waiting-for-session', { worktreeId, cliToolId, instanceId });
@@ -1003,17 +889,108 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
     scheduleNextPoll(generation);
 }
 /**
- * Whether a failed capture failed because the session does not exist
- * (Issue #3329). Asked of tmux (`has-session`'s exit code), not read off the
- * error text. `unknown` — tmux timed out or could not be run — is not "absent":
- * the failure is counted as before, so a broken tmux still stops Auto-Yes.
+ * The answer the poller just sent, as an observation of the waiting episodes
+ * (Issue #3798, design §2.5 "Auto-Yes poller", PR 3). Called in the
+ * synchronous step the send returns to, before anything else is awaited: the
+ * confirmation answered is a fresh prompt (planned against the episode as it
+ * is now, I5 (d)), so a wait opens if none is open, and a second confirmation
+ * of the same turn after an answer (another screen key) replaces the answered
+ * wait (R1-7) — a new hold, not the old wait's spent one. The episode the plan
+ * leaves open is recorded as `lastAnswer`; a plan refused (another generation,
+ * or a frame fetched before the close of this very confirmation — a stop that
+ * landed during the send) records none, so nothing is closed on the strength
+ * of it. Nor does a send whose wait moved under it (`target`, fixed as the
+ * send began): another wait opened during the send — a hook, another
+ * observer — is not the one these keys answered, and nothing is planned or
+ * recorded for it; `lastAnswer` stays as it was — and so for the same wait
+ * rebound during the send to a person's `screen`. Advisory, like
+ * {@link observeWaitingFromTick}.
+ */
+function observeAnsweredPrompt(prompt, screenKey, observation, target) {
+    const { worktreeId, cliToolId, instanceId, pollerState, promptData } = prompt;
+    try {
+        if (!(0, auto_yes_poller_answer_target_1.answerTargetHolds)(target, worktreeId, cliToolId, instanceId)) {
+            logger.debug('poller:answer-target-moved', { worktreeId, cliToolId, instanceId, target: target.episodeId });
+            return;
+        }
+        const plan = (0, waiting_episode_binding_1.observeWaiting)({
+            worktreeId,
+            cliToolId,
+            instanceId,
+            observer: 'auto-yes-poller',
+            start: observation.start,
+            reading: (0, waiting_screen_reading_1.promptWaitingReading)(promptData),
+            ...observation.frameTime,
+            freshPrompt: true,
+            lastAnswer: pollerState.lastAnswer ?? null,
+        });
+        const episode = plan.action === 'ignored' ? null : (0, waiting_episode_state_1.getWaitingEpisodeRecord)(worktreeId, cliToolId, instanceId);
+        pollerState.lastAnswer = episode === null ? null : { episodeId: episode.episodeId, screenKey, at: plan.at };
+    }
+    catch (error) {
+        pollerState.lastAnswer = null;
+        logger.debug('poller:waiting-observation-failed', {
+            worktreeId,
+            cliToolId,
+            instanceId,
+            error: (0, errors_1.getErrorMessage)(error),
+        });
+    }
+}
+/**
+ * Tell the waiting episodes what this tick saw (Issue #3798, design §2.5,
+ * PR 1b): a frame with nothing for Auto-Yes to answer, read the way the status
+ * probe reads it — without the agy receipt window — or a session that is gone.
+ *
+ * What it can do is table O-1 for a waiting frame (a survey or a picker after
+ * an answer opens, or turns the wait into, a person's `screen`), and on the
+ * closing side a `screen` this tick saw cleared on a frame fetched after it
+ * became one, the wait the poller answered (`lastAnswer`, PR 3), or any wait
+ * of a session that is gone. A wait the poller did not answer — or answered
+ * before it was replaced — is not its to close. Advisory: a failure is logged
+ * and the tick goes on.
  */
-async function isSessionMissing(worktreeId, cliToolId, instanceId) {
+function observeWaitingFromTick(tick) {
+    const { worktreeId, cliToolId, instanceId } = tick;
     try {
-        return (await (0, cli_session_1.getSessionPresence)(worktreeId, cliToolId, instanceId)) === 'absent';
+        let reading = { kind: 'gone' };
+        if (tick.rawOutput !== null) {
+            const lastResponseAt = tick.pollerState.lastServerResponseTimestamp;
+            const lastOutputTimestamp = lastResponseAt ? new Date(lastResponseAt) : undefined;
+            // Without the receipt scope (design I9), and with the structured wait
+            // read the way the status probe reads it — the API-answerable one
+            // (#3184) a `prompt` here too, or the two observers would flip the
+            // episode's kind between `prompt` and `menu` on every tick.
+            const verdict = (0, status_detector_1.detectSessionStatus)(tick.rawOutput, cliToolId, lastOutputTimestamp);
+            const { structured } = (0, prompt_waiting_composition_1.peekPromptWaiting)({ worktreeId, cliToolId, instanceId, scraper: verdict });
+            reading = (0, waiting_screen_reading_1.readWaitingScreen)({
+                cliToolId,
+                output: tick.rawOutput,
+                lastOutputTimestamp,
+                structuredWaiting: structured !== null,
+                structuredSince: structured?.at ?? null,
+                apiAnswerable: (0, prompt_waiting_composition_1.isApiAnswerableStructuredWait)(structured, (0, registry_1.getAgentEventSource)(cliToolId).capabilities.eventIdentity),
+                verdict,
+            });
+        }
+        (0, waiting_episode_binding_1.observeWaiting)({
+            worktreeId,
+            cliToolId,
+            instanceId,
+            observer: 'auto-yes-poller',
+            start: tick.start,
+            reading,
+            ...tick.frameTime,
+            lastAnswer: tick.pollerState.lastAnswer ?? null,
+        });
     }
-    catch {
-        return false;
+    catch (error) {
+        logger.debug('poller:waiting-observation-failed', {
+            worktreeId,
+            cliToolId,
+            instanceId,
+            error: (0, errors_1.getErrorMessage)(error),
+        });
     }
 }
 /**
@@ -1179,6 +1156,8 @@ function stopAutoYesPolling(compositeKey, reason) {
     // cleanup call this for an instance whose poller may already be gone, and the
     // Enter record must not outlive the grant or the session either way.
     (0, auto_yes_enter_fallback_1.forgetEnterFallback)(compositeKey);
+    // Issue #3821: and the decision, for the same reason.
+    (0, auto_yes_decision_state_1.forgetAutoYesDecision)(compositeKey);
     // Issue #3820: before the early return too — a session ended after its
     // poller had already stopped still abandons the confirmation left on it.
     (0, auto_yes_confirmation_ledger_1.noteLedgerPollerStopped)(compositeKey, (0, auto_yes_poller_stop_reason_1.resolvePollerStopReason)(reason, 'unspecified'));
@@ -1214,18 +1193,9 @@ function stopAllAutoYesPolling() {
     }
     auto_yes_poller_generation_1.autoYesPollerStates.clear();
     (0, auto_yes_enter_fallback_1.clearEnterFallbacks)();
+    (0, auto_yes_decision_state_1.clearAutoYesDecisions)();
     (0, auto_yes_poller_state_1.clearPartialAnswers)();
 }
-/**
- * Get all composite keys that have active auto-yes poller entries.
- *
- * Issue #525: Returns composite keys (worktreeId:cliToolId).
- *
- * @returns Array of composite keys present in the autoYesPollerStates Map
- */
-function getAutoYesPollerCompositeKeys() {
-    return Array.from(auto_yes_poller_generation_1.autoYesPollerStates.keys());
-}
 // =============================================================================
 // byWorktree Helpers (Issue #525)
 // =============================================================================
@@ -1248,19 +1218,10 @@ function stopAutoYesPollingByWorktree(worktreeId, options) {
     pollerKeys.forEach(key => stopAutoYesPolling(key, options?.reason));
     // Issue #3397: and the records of instances whose poller had already stopped.
     (0, auto_yes_enter_fallback_1.forgetEnterFallbacksByWorktree)(worktreeId);
+    (0, auto_yes_decision_state_1.forgetAutoYesDecisionsByWorktree)(worktreeId);
     // Issue #3820: and the ledger's confirmations on them — an API approval is
     // opened with Auto-Yes off too, so the running pollers do not name them all.
     (0, auto_yes_confirmation_ledger_1.noteLedgerWorktreeStopped)(worktreeId, (0, auto_yes_poller_stop_reason_1.resolvePollerStopReason)(options?.reason, 'unspecified'));
     if (!options?.keepPartialAnswers)
         (0, auto_yes_poller_state_1.forgetPartialAnswersByWorktree)(worktreeId);
 }
-/**
- * Check if any auto-yes poller is active for a given worktreeId.
- * Uses shared filterCompositeKeysByWorktree (DRY).
- *
- * @param worktreeId - Worktree identifier
- * @returns true if any poller is active for this worktree
- */
-function isAnyPollerActiveForWorktree(worktreeId) {
-    return (0, auto_yes_state_1.filterCompositeKeysByWorktree)(Array.from(auto_yes_poller_generation_1.autoYesPollerStates.keys()), worktreeId).length > 0;
-}