commandmate 0.45.0 → 0.46.0

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

@@ -7,8 +7,9 @@
  *
  * Issue #525: Composite key migration (worktreeId:cliToolId) for per-agent auto-yes.
  *
- * Dependencies: auto-yes-state.ts (one-way dependency).
- * auto-yes-poller.ts -> auto-yes-state.ts
+ * 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/*.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -67,7 +68,6 @@ 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 auto_yes_suppression_state_1 = require("./polling/auto-yes-suppression-state");
 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 task_transition_service_1 = require("./tasks/task-transition-service");
@@ -88,6 +88,8 @@ const logger = (0, logger_1.createLogger)('auto-yes-poller');
 const path_validator_1 = require("./security/path-validator");
 const auto_yes_state_1 = require("./auto-yes-state");
 const global_state_1 = require("./global-state");
+const auto_yes_poller_state_1 = require("./polling/auto-yes-poller-state");
+const auto_yes_prompt_suppression_1 = require("./polling/auto-yes-prompt-suppression");
 /** In-memory storage for poller states (globalThis for hot reload persistence) */
 const autoYesPollerStates = (0, global_state_1.getOrInitGlobal)('__autoYesPollerStates', () => new Map());
 /**
@@ -221,45 +223,6 @@ function isDuplicatePrompt(pollerState, promptKey) {
         return false;
     return (Date.now() - pollerState.lastAnsweredAt) < auto_yes_state_1.DUPLICATE_RETRY_EXPIRY_MS;
 }
-/**
- * Issue #2995: print a "did not answer" line as WARN once per frame.
- *
- * The poller re-reads a static pane every 2s, so a frame Auto-Yes leaves alone
- * (a reply quoting `1. Yes / 2. No`, a launch dialog, a policy-withheld prompt,
- * a foreign session) would otherwise print the same WARN on every tick. The
- * first one stays WARN -- it is what tells a silently stalled worker apart --
- * and repeats for the same frame drop to `debug`. The frame is identified by
- * the event, `promptFrameKey()` and the event's own detail; a different
- * prompt, a different reason, or a tick with no prompt / an answer sent (both
- * clear the key) makes the next line WARN again.
- * `recordPolicySuppression()` is not throttled: `capture --json` and `wait`
- * read the latest record, not the log.
- */
-/**
- * Issue #2995: what makes two ticks "the same prompt" for `warnOncePerFrame`.
- *
- * `generatePromptKey` alone is type + question, and the question the detector
- * extracts from an agent's reply is often a fixed line above the list, so two
- * different lists would share it. The option rows (and where the cursor sits)
- * plus `approvalTarget` -- the current prompt's own panel, which leaves out
- * scrollback and footers that change while the prompt does not -- separate them.
- * Not the whole pane: a status bar that ticks every second would defeat it.
- */
-function promptFrameKey(promptData) {
-    const options = promptData.type === 'multiple_choice'
-        ? promptData.options.map((o) => `${o.isDefault ? '>' : ''}${o.number}.${o.label}`).join('\n')
-        : '';
-    return [(0, prompt_key_1.generatePromptKey)(promptData), options, promptData.approvalTarget ?? ''].join('\u0000');
-}
-function warnOncePerFrame(pollerState, frameKey, event, fields) {
-    const key = `${event}\u0000${frameKey}`;
-    if (pollerState.lastSkipWarnKey === key) {
-        logger.debug(event, { ...fields, repeated: true });
-        return;
-    }
-    pollerState.lastSkipWarnKey = key;
-    logger.warn(event, fields);
-}
 // =============================================================================
 // Extracted Functions for pollAutoYes (Issue #323: SRP decomposition)
 // =============================================================================
@@ -395,116 +358,6 @@ function logIfWithheldForWantOfReceipt(worktreeId, instanceId, compositeKey, rea
         hint: 'hook の受信記録が直近に無いため Auto-Yes は答えなかった。~/.gemini/config/hooks.json の向き先（#2622）を確認',
     });
 }
-/**
- * Issue #3214: the form the four suppression exits of `detectAndRespondToPrompt`
- * share. Records why Auto-Yes left the prompt alone (`recordPolicySuppression`,
- * not throttled), then prints the WARN once per frame (`warnOncePerFrame`).
- *
- * @param suppression - Handed to `recordPolicySuppression` as is
- * @param warnFrameKey - Handed to `warnOncePerFrame` as is: the prompt's
- *   `frameKey` plus the exit's own detail
- * @param event - The WARN's log name
- * @param detail - The WARN's fields after `worktreeId`, `cliToolId` and `instanceId`
- */
-function suppressAndWarnOnce(prompt, suppression, warnFrameKey, event, detail) {
-    const { worktreeId, cliToolId, instanceId } = prompt;
-    (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, suppression);
-    warnOncePerFrame(prompt.pollerState, warnFrameKey, event, {
-        worktreeId,
-        cliToolId,
-        instanceId,
-        ...detail,
-    });
-}
-/**
- * Issue #3214: steps 3, 3.2 and 3.5 of `detectAndRespondToPrompt` -- the frames
- * that read as a prompt and are still not Auto-Yes's to answer, judged in the
- * order they always were. "The detection above" in the comments below is that
- * function's step 1.
- *
- * Issue #3397: step 3.5 no longer records its refusal here. It hands the gate's
- * verdict back so `tryEnterFallback` can look at the frame first, and records
- * through {@link suppressUnclassifiedFrame} when that sends nothing. Steps 3 and
- * 3.2 still win: an Enter never reaches codex's launch dialogs or its `/model`
- * picker.
- *
- * @param frame - The tick's one normalised frame (Issue #3183)
- */
-function suppressIfNotOursToAnswer(prompt, frame) {
-    const { cliToolId, promptData, frameKey } = prompt;
-    // 3. Issue #1829: codex's own launch dialogs are CodexTool.waitForReady()'s
-    // to answer, not the poller's. Every one of them defaults to option 1, and
-    // the base rules answer the default:
-    //
-    //   "Hooks need review"  -> 1. Review hooks   (undoes Issue #1760; the pane
-    //                           then sits two screens deep in a review UI that
-    //                           only `t`/`esc` leave, reported as `running`)
-    //   "Update available"   -> 1. Update now     (undoes Issue #890; runs
-    //                           `npm install -g @openai/codex`, killing codex)
-    //   "Do you trust …"     -> 1. Yes, continue
-    //
-    // waitForReady answers the same screens deliberately and differently ('3',
-    // '2', '1' — each without a trailing Enter), but only during startSession,
-    // while this poller runs on its own 2s phase for the life of the session.
-    // Whichever sees the dialog first decides, so the fix is to leave them all
-    // to the tool. Auto-answer layer only: the detection above still reports the
-    // prompt, so the human keeps seeing the screen and the response poller
-    // still notifies them about it.
-    const launchDialog = cliToolId === 'codex' ? (0, cli_patterns_1.getCodexLifecycleDialog)(frame) : null;
-    if (launchDialog) {
-        // Recorded through the #1684 channel so `capture --json` and `cmate wait`
-        // can name the reason instead of showing a worker that went quiet.
-        suppressAndWarnOnce(prompt, { reason: 'agent-launch-dialog', mode: null, promptType: promptData.type }, `${frameKey}\u0000${launchDialog}`, 'poller:auto-yes-skipped-launch-dialog', { dialog: launchDialog, promptType: promptData.type });
-        return { kind: 'left-alone' };
-    }
-    // 3.2. Issue #3062: codex's `/model` picker (both stages) is not ours to
-    // answer. A digit there is an immediate decision, so the base rules'
-    // default would choose the model and effort for the operator. Judged by the
-    // picker's own footer, not by `kind: picker`, which the hooks screens share.
-    // The tool's `detectPrompt` still reports the prompt, so `/prompt-response`
-    // (the human's answer) is unaffected. Reuses `unclassified-frame`: the tool
-    // recognised the frame and deliberately declined it.
-    if (cliToolId === 'codex' && (0, detect_1.isCodexModelPickerFrame)(frame)) {
-        suppressAndWarnOnce(prompt, { reason: 'unclassified-frame', mode: null, promptType: promptData.type }, `${frameKey}\u0000codex-model-picker`, 'poller:auto-yes-skipped-model-picker', { promptType: promptData.type });
-        return { kind: 'left-alone' };
-    }
-    // 3.5. Issue #1928 (§4 D1 decision 4): the generic numbered-list inference is
-    // not enough to send an answer. The detection above judges the ROWS, and the
-    // rows of an agent's own reply can be indistinguishable from a dialog's --
-    // opencode 1.18 answering "list three options and ask which one" is the
-    // reported case (#1896), and the `1` this poller sent in reply was not
-    // answering anything, it was SENT AS A USER UTTERANCE. What separates the two
-    // is position and chrome, which only the tool's own module knows, so the
-    // decision is delegated to `detectDialog` (the seam #1927 declared).
-    //
-    // Per tool, and only for tools whose dialogs were measured from their own
-    // live captures -- see AUTO_YES_DIALOG_GATE_DEFAULT_MODE. An ungated tool
-    // reaches `allowed: true` without being judged, which is the pre-#1928
-    // behaviour and the right one where nobody has measured anything.
-    //
-    // Recorded through the #1684 channel with the reason code #1924 landed for
-    // exactly this position, so `capture --json` and `cmate wait` can name the
-    // gap instead of showing a worker that silently went quiet.
-    const dialogGate = (0, auto_yes_dialog_gate_1.evaluateAutoYesDialogGate)(cliToolId, promptData.type, frame);
-    if (!dialogGate.allowed) {
-        return { kind: 'dialog-gate-refused', dialogGate };
-    }
-    return { kind: 'ours' };
-}
-/**
- * Step 3.5's record: the tool's dialog detector did not vouch for the frame and
- * nothing was sent (Issue #1928). Split out of `suppressIfNotOursToAnswer` by
- * Issue #3397, unchanged, so it runs after `tryEnterFallback` declined.
- */
-function suppressUnclassifiedFrame(prompt, dialogGate) {
-    const { promptData, frameKey } = prompt;
-    suppressAndWarnOnce(prompt, { reason: 'unclassified-frame', mode: null, promptType: promptData.type }, `${frameKey}\u0000${dialogGate.dialog?.kind ?? ''}\u0000${dialogGate.mode}`, 'poller:auto-yes-skipped-unclassified-frame', {
-        promptType: promptData.type,
-        dialogKind: dialogGate.dialog?.kind ?? null,
-        answerMode: dialogGate.dialog?.answerMode ?? null,
-        gateMode: dialogGate.mode,
-    });
-}
 /**
  * The audit row's `answer` for the Enter (Issue #3397): not a digit, so the
  * History reads as "Auto-Yes pressed Enter" rather than as a chosen option.
@@ -525,7 +378,7 @@ function isStillEnterFallbackScreen(prompt, fresh) {
     const detection = (0, response_checker_1.detectPromptOnCleanFrame)(clean, cliToolId, clean.split('\n'), fresh, { worktreeId, instanceId }, frame);
     if (!detection.isPrompt || !detection.promptData)
         return false;
-    if (promptFrameKey(detection.promptData) !== frameKey)
+    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;
@@ -563,7 +416,7 @@ async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput)
     const judgement = dialogGate.dialog === null ? (0, auto_yes_enter_fallback_1.judgeEnterFallback)(cliToolId, rawOutput) : null;
     if (judgement === null || !judgement.eligible) {
         pollerState.enterFallbackCandidateKey = null;
-        suppressUnclassifiedFrame(prompt, dialogGate);
+        (0, auto_yes_prompt_suppression_1.suppressUnclassifiedFrame)(prompt, dialogGate);
         return false;
     }
     const screenKey = (0, auto_yes_enter_fallback_1.enterFallbackScreenKey)(promptData);
@@ -571,8 +424,8 @@ async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput)
     if (pollerState.enterFallbackSentKey === frameKey) {
         pollerState.enterFallbackCandidateKey = null;
         (0, auto_yes_enter_fallback_1.recordEnterFallbackNoEffect)(worktreeId, cliToolId, instanceId, screenKey);
-        suppressUnclassifiedFrame(prompt, dialogGate);
-        warnOncePerFrame(pollerState, `${frameKey}\u0000enter-fallback-no-effect`, 'poller:auto-yes-enter-fallback-no-effect', {
+        (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,
@@ -586,7 +439,7 @@ async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput)
     const resolution = (0, auto_yes_resolver_1.resolveAutoAnswerWithPolicy)(promptData, policy);
     if (resolution.suppressedBy) {
         pollerState.enterFallbackCandidateKey = null;
-        suppressAndWarnOnce(prompt, {
+        (0, auto_yes_prompt_suppression_1.suppressAndWarnOnce)(prompt, {
             reason: resolution.suppressedBy,
             mode: policy?.mode ?? null,
             promptType: promptData.type,
@@ -608,7 +461,7 @@ async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput)
     if (resolution.answer === null ||
         (promptData.type === 'multiple_choice' && (0, prompt_answer_semantic_1.isMultiSelectPrompt)(promptData))) {
         pollerState.enterFallbackCandidateKey = null;
-        suppressUnclassifiedFrame(prompt, dialogGate);
+        (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.
@@ -629,7 +482,7 @@ async function tryEnterFallback(prompt, promptDetection, dialogGate, rawOutput)
     const sessionName = manager_1.CLIToolManager.getInstance().getTool(cliToolId).getSessionName(worktreeId, instanceId);
     const ownership = await (0, worktree_session_ownership_1.checkWorktreeSessionOwnership)(worktreeId, sessionName);
     if (ownership === null || ownership.verdict === 'foreign') {
-        warnOncePerFrame(pollerState, `${frameKey}\u0000${sessionName}\u0000${ownership ? 'foreign' : 'worktree_not_found'}`, 'poller:auto-yes-skipped-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,
@@ -841,7 +694,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         }
         // 2. Check for duplicate prompt (Issue #306)
         const promptKey = (0, prompt_key_1.generatePromptKey)(promptDetection.promptData);
-        const frameKey = promptFrameKey(promptDetection.promptData);
+        const frameKey = (0, auto_yes_poller_state_1.promptFrameKey)(promptDetection.promptData);
         if (isDuplicatePrompt(pollerState, promptKey)) {
             return 'duplicate';
         }
@@ -857,7 +710,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         };
         // 3., 3.2., 3.5. Frames that are not Auto-Yes's to answer: see
         // `suppressIfNotOursToAnswer`.
-        const notOurs = suppressIfNotOursToAnswer(judged, frame);
+        const notOurs = (0, auto_yes_prompt_suppression_1.suppressIfNotOursToAnswer)(judged, frame);
         if (notOurs.kind !== 'dialog-gate-refused') {
             pollerState.enterFallbackCandidateKey = null;
         }
@@ -883,7 +736,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
             // Issue #1684: the log line alone leaves a CLI-driven pipeline blind to
             // why its worker stalled. Record the suppression so buildCurrentOutput
             // can publish it (`autoYes.lastSuppression` in capture --json).
-            suppressAndWarnOnce(judged, {
+            (0, auto_yes_prompt_suppression_1.suppressAndWarnOnce)(judged, {
                 reason: resolution.suppressedBy,
                 mode: policy?.mode ?? null,
                 promptType: promptDetection.promptData.type,
@@ -907,7 +760,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // server created. The poller keeps running; it just does not type.
         const ownership = await (0, worktree_session_ownership_1.checkWorktreeSessionOwnership)(worktreeId, sessionName);
         if (ownership === null || ownership.verdict === 'foreign') {
-            warnOncePerFrame(pollerState, `${frameKey}\u0000${sessionName}\u0000${ownership ? 'foreign' : 'worktree_not_found'}`, 'poller:auto-yes-skipped-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,

package/dist/server/src/lib/polling/auto-yes-enter-fallback-state.js

@@ -30,7 +30,7 @@ const global_state_1 = require("../global-state");
  * What tells two prompts apart for the published record: the type, the
  * question and the option labels.
  *
- * Not the poller's `promptFrameKey`: that one also carries the cursor and
+ * Not the poller's `promptFrameKey` (in `auto-yes-poller-state.ts`): that one also carries the cursor and
  * `approvalTarget`, and the status API reads a different number of rows than
  * the poller does, so `approvalTarget` can differ between the two readings of
  * one screen. The record is matched against the status API's prompt (to say

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

@@ -0,0 +1,52 @@
+"use strict";
+/**
+ * Auto-Yes poller state and its once-per-frame WARN (Issue #3411).
+ *
+ * Moved out of auto-yes-poller.ts unchanged; the poller re-exports
+ * `AutoYesPollerState`. Must not import auto-yes-poller.ts (cycle).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptFrameKey = promptFrameKey;
+exports.warnOncePerFrame = warnOncePerFrame;
+const prompt_key_1 = require("../detection/prompt-key");
+const logger_1 = require("../../lib/logger");
+const logger = (0, logger_1.createLogger)('auto-yes-poller');
+/**
+ * Issue #2995: what makes two ticks "the same prompt" for `warnOncePerFrame`.
+ *
+ * `generatePromptKey` alone is type + question, and the question the detector
+ * extracts from an agent's reply is often a fixed line above the list, so two
+ * different lists would share it. The option rows (and where the cursor sits)
+ * plus `approvalTarget` -- the current prompt's own panel, which leaves out
+ * scrollback and footers that change while the prompt does not -- separate them.
+ * Not the whole pane: a status bar that ticks every second would defeat it.
+ */
+function promptFrameKey(promptData) {
+    const options = promptData.type === 'multiple_choice'
+        ? promptData.options.map((o) => `${o.isDefault ? '>' : ''}${o.number}.${o.label}`).join('\n')
+        : '';
+    return [(0, prompt_key_1.generatePromptKey)(promptData), options, promptData.approvalTarget ?? ''].join('\u0000');
+}
+/**
+ * Issue #2995: print a "did not answer" line as WARN once per frame.
+ *
+ * The poller re-reads a static pane every 2s, so a frame Auto-Yes leaves alone
+ * (a reply quoting `1. Yes / 2. No`, a launch dialog, a policy-withheld prompt,
+ * a foreign session) would otherwise print the same WARN on every tick. The
+ * first one stays WARN -- it is what tells a silently stalled worker apart --
+ * and repeats for the same frame drop to `debug`. The frame is identified by
+ * the event, `promptFrameKey()` and the event's own detail; a different
+ * prompt, a different reason, or a tick with no prompt / an answer sent (both
+ * clear the key) makes the next line WARN again.
+ * `recordPolicySuppression()` is not throttled: `capture --json` and `wait`
+ * read the latest record, not the log.
+ */
+function warnOncePerFrame(pollerState, frameKey, event, fields) {
+    const key = `${event}\u0000${frameKey}`;
+    if (pollerState.lastSkipWarnKey === key) {
+        logger.debug(event, { ...fields, repeated: true });
+        return;
+    }
+    pollerState.lastSkipWarnKey = key;
+    logger.warn(event, fields);
+}

package/dist/server/src/lib/polling/auto-yes-prompt-suppression.js

@@ -0,0 +1,125 @@
+"use strict";
+/**
+ * The suppression exits of `detectAndRespondToPrompt` (Issue #3214), moved out
+ * of auto-yes-poller.ts unchanged (Issue #3411). Must not import
+ * auto-yes-poller.ts (cycle) or `../tmux/tmux` (tmux import allowlist).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.suppressAndWarnOnce = suppressAndWarnOnce;
+exports.suppressIfNotOursToAnswer = suppressIfNotOursToAnswer;
+exports.suppressUnclassifiedFrame = suppressUnclassifiedFrame;
+const detect_1 = require("../detection/tools/codex/detect");
+const cli_patterns_1 = require("../detection/cli-patterns");
+const auto_yes_suppression_state_1 = require("./auto-yes-suppression-state");
+const auto_yes_dialog_gate_1 = require("./auto-yes-dialog-gate");
+const auto_yes_poller_state_1 = require("./auto-yes-poller-state");
+/**
+ * Issue #3214: the form the four suppression exits of `detectAndRespondToPrompt`
+ * share. Records why Auto-Yes left the prompt alone (`recordPolicySuppression`,
+ * not throttled), then prints the WARN once per frame (`warnOncePerFrame`).
+ *
+ * @param suppression - Handed to `recordPolicySuppression` as is
+ * @param warnFrameKey - Handed to `warnOncePerFrame` as is: the prompt's
+ *   `frameKey` plus the exit's own detail
+ * @param event - The WARN's log name
+ * @param detail - The WARN's fields after `worktreeId`, `cliToolId` and `instanceId`
+ */
+function suppressAndWarnOnce(prompt, suppression, warnFrameKey, event, detail) {
+    const { worktreeId, cliToolId, instanceId } = prompt;
+    (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, suppression);
+    (0, auto_yes_poller_state_1.warnOncePerFrame)(prompt.pollerState, warnFrameKey, event, {
+        worktreeId,
+        cliToolId,
+        instanceId,
+        ...detail,
+    });
+}
+/**
+ * Issue #3214: steps 3, 3.2 and 3.5 of `detectAndRespondToPrompt` -- the frames
+ * that read as a prompt and are still not Auto-Yes's to answer, judged in the
+ * order they always were. "The detection above" in the comments below is that
+ * function's step 1.
+ *
+ * Issue #3397: step 3.5 no longer records its refusal here. It hands the gate's
+ * verdict back so `tryEnterFallback` can look at the frame first, and records
+ * through {@link suppressUnclassifiedFrame} when that sends nothing. Steps 3 and
+ * 3.2 still win: an Enter never reaches codex's launch dialogs or its `/model`
+ * picker.
+ *
+ * @param frame - The tick's one normalised frame (Issue #3183)
+ */
+function suppressIfNotOursToAnswer(prompt, frame) {
+    const { cliToolId, promptData, frameKey } = prompt;
+    // 3. Issue #1829: codex's own launch dialogs are CodexTool.waitForReady()'s
+    // to answer, not the poller's. Every one of them defaults to option 1, and
+    // the base rules answer the default:
+    //
+    //   "Hooks need review"  -> 1. Review hooks   (undoes Issue #1760; the pane
+    //                           then sits two screens deep in a review UI that
+    //                           only `t`/`esc` leave, reported as `running`)
+    //   "Update available"   -> 1. Update now     (undoes Issue #890; runs
+    //                           `npm install -g @openai/codex`, killing codex)
+    //   "Do you trust …"     -> 1. Yes, continue
+    //
+    // waitForReady answers the same screens deliberately and differently ('3',
+    // '2', '1' — each without a trailing Enter), but only during startSession,
+    // while this poller runs on its own 2s phase for the life of the session.
+    // Whichever sees the dialog first decides, so the fix is to leave them all
+    // to the tool. Auto-answer layer only: the detection above still reports the
+    // prompt, so the human keeps seeing the screen and the response poller
+    // still notifies them about it.
+    const launchDialog = cliToolId === 'codex' ? (0, cli_patterns_1.getCodexLifecycleDialog)(frame) : null;
+    if (launchDialog) {
+        // Recorded through the #1684 channel so `capture --json` and `cmate wait`
+        // can name the reason instead of showing a worker that went quiet.
+        suppressAndWarnOnce(prompt, { reason: 'agent-launch-dialog', mode: null, promptType: promptData.type }, `${frameKey}\u0000${launchDialog}`, 'poller:auto-yes-skipped-launch-dialog', { dialog: launchDialog, promptType: promptData.type });
+        return { kind: 'left-alone' };
+    }
+    // 3.2. Issue #3062: codex's `/model` picker (both stages) is not ours to
+    // answer. A digit there is an immediate decision, so the base rules'
+    // default would choose the model and effort for the operator. Judged by the
+    // picker's own footer, not by `kind: picker`, which the hooks screens share.
+    // The tool's `detectPrompt` still reports the prompt, so `/prompt-response`
+    // (the human's answer) is unaffected. Reuses `unclassified-frame`: the tool
+    // recognised the frame and deliberately declined it.
+    if (cliToolId === 'codex' && (0, detect_1.isCodexModelPickerFrame)(frame)) {
+        suppressAndWarnOnce(prompt, { reason: 'unclassified-frame', mode: null, promptType: promptData.type }, `${frameKey}\u0000codex-model-picker`, 'poller:auto-yes-skipped-model-picker', { promptType: promptData.type });
+        return { kind: 'left-alone' };
+    }
+    // 3.5. Issue #1928 (§4 D1 decision 4): the generic numbered-list inference is
+    // not enough to send an answer. The detection above judges the ROWS, and the
+    // rows of an agent's own reply can be indistinguishable from a dialog's --
+    // opencode 1.18 answering "list three options and ask which one" is the
+    // reported case (#1896), and the `1` this poller sent in reply was not
+    // answering anything, it was SENT AS A USER UTTERANCE. What separates the two
+    // is position and chrome, which only the tool's own module knows, so the
+    // decision is delegated to `detectDialog` (the seam #1927 declared).
+    //
+    // Per tool, and only for tools whose dialogs were measured from their own
+    // live captures -- see AUTO_YES_DIALOG_GATE_DEFAULT_MODE. An ungated tool
+    // reaches `allowed: true` without being judged, which is the pre-#1928
+    // behaviour and the right one where nobody has measured anything.
+    //
+    // Recorded through the #1684 channel with the reason code #1924 landed for
+    // exactly this position, so `capture --json` and `cmate wait` can name the
+    // gap instead of showing a worker that silently went quiet.
+    const dialogGate = (0, auto_yes_dialog_gate_1.evaluateAutoYesDialogGate)(cliToolId, promptData.type, frame);
+    if (!dialogGate.allowed) {
+        return { kind: 'dialog-gate-refused', dialogGate };
+    }
+    return { kind: 'ours' };
+}
+/**
+ * Step 3.5's record: the tool's dialog detector did not vouch for the frame and
+ * nothing was sent (Issue #1928). Split out of `suppressIfNotOursToAnswer` by
+ * Issue #3397, unchanged, so it runs after `tryEnterFallback` declined.
+ */
+function suppressUnclassifiedFrame(prompt, dialogGate) {
+    const { promptData, frameKey } = prompt;
+    suppressAndWarnOnce(prompt, { reason: 'unclassified-frame', mode: null, promptType: promptData.type }, `${frameKey}\u0000${dialogGate.dialog?.kind ?? ''}\u0000${dialogGate.mode}`, 'poller:auto-yes-skipped-unclassified-frame', {
+        promptType: promptData.type,
+        dialogKind: dialogGate.dialog?.kind ?? null,
+        answerMode: dialogGate.dialog?.answerMode ?? null,
+        gateMode: dialogGate.mode,
+    });
+}

package/dist/server/src/lib/polling/prompt-dedup-state.js

@@ -37,6 +37,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.recordPromptDedupSkip = recordPromptDedupSkip;
 exports.getPromptDedupSkips = getPromptDedupSkips;
 exports.renamePromptDedupSkips = renamePromptDedupSkips;
+exports.renamePromptDedupSkipsBatch = renamePromptDedupSkipsBatch;
 exports.clearPromptDedupSkips = clearPromptDedupSkips;
 const auto_yes_state_1 = require("../../lib/auto-yes-state");
 const global_state_1 = require("../global-state");
@@ -80,13 +81,31 @@ function getPromptDedupSkips(worktreeId, cliToolId, instanceId) {
  * No-op when the IDs match or nothing is recorded under the old one.
  */
 function renamePromptDedupSkips(oldWorktreeId, newWorktreeId, cliToolId, instanceId) {
-    if (oldWorktreeId === newWorktreeId)
-        return;
-    const oldKey = (0, auto_yes_state_1.buildCompositeKey)(oldWorktreeId, cliToolId, instanceId);
-    const record = promptDedupSkips.get(oldKey);
-    promptDedupSkips.delete(oldKey);
-    if (record !== undefined) {
-        promptDedupSkips.set((0, auto_yes_state_1.buildCompositeKey)(newWorktreeId, cliToolId, instanceId), record);
+    renamePromptDedupSkipsBatch([{ oldWorktreeId, newWorktreeId, cliToolId, instanceId }]);
+}
+/**
+ * Carry the tallies of a whole batch of sessions across a worktree-ID rename
+ * (Issue #3553).
+ *
+ * Every source tally is lifted before any is written, so a swap (A→B, B→A) or
+ * a chain (A→B→C) cannot overwrite a tally that has not moved yet. Per entry
+ * this is exactly {@link renamePromptDedupSkips}.
+ */
+function renamePromptDedupSkipsBatch(renames) {
+    const lifted = [];
+    for (const { oldWorktreeId, newWorktreeId, cliToolId, instanceId } of renames) {
+        if (oldWorktreeId === newWorktreeId)
+            continue;
+        const oldKey = (0, auto_yes_state_1.buildCompositeKey)(oldWorktreeId, cliToolId, instanceId);
+        lifted.push({
+            newKey: (0, auto_yes_state_1.buildCompositeKey)(newWorktreeId, cliToolId, instanceId),
+            record: promptDedupSkips.get(oldKey),
+        });
+        promptDedupSkips.delete(oldKey);
+    }
+    for (const { newKey, record } of lifted) {
+        if (record !== undefined)
+            promptDedupSkips.set(newKey, record);
     }
 }
 /** Drop every recorded tally. Test seam. */