commandmate 0.44.1 → 0.44.2

package/dist/lib/session/prompt-view.js

@@ -0,0 +1,267 @@
+"use strict";
+/**
+ * How a waiting prompt is shown and answered, decided once (Issue #3184).
+ *
+ * Before this module every reader of a prompt payload re-derived the same three
+ * facts for itself — "can it be answered?", "where are the choices?", "is the
+ * answer a keystroke or an API call?" — from `type`, `options`,
+ * `decisionOptions`, `decisionId` and `askUserQuestion`. The panel, the phone
+ * sheet, the chat surface, Auto-Yes and `wait` each combined them a little
+ * differently, and a fix to one surface kept missing the others (#2775 →
+ * #2810 → #2822, #3181). {@link derivePromptView} is the one combination; a
+ * reader takes its {@link PromptView} and does not look at the raw fields to
+ * decide what to show.
+ *
+ * ## No imports, on purpose
+ *
+ * The CLI (`tsconfig.cli.json`) compiles with `"paths": {}`, so it can reach a
+ * module under `src/lib` by a relative path only when nothing in that module's
+ * graph uses the `@/` alias. `types/models` and `session/structured-prompt` both
+ * do. The input is therefore a structural type ({@link PromptViewSource}) that
+ * every existing prompt shape — `LivePromptData`, `StoredPromptData`, the CLI's
+ * own `PromptData` mirror — satisfies without a cast, and this file stays
+ * importable from a client component, the server and the CLI alike.
+ *
+ * ## What it does not replace
+ *
+ * `isAnswerablePromptData()` (`types/models`) stays: it narrows to the closed
+ * `PromptData` union (#1725) for the code that builds an answer body. The two
+ * agree by construction — `derivePromptView(x)?.kind === 'screen-choices'`
+ * exactly when `isAnswerablePromptData(x)` — and
+ * `tests/unit/session/prompt-view-3184.test.ts` holds that over every fixture.
+ *
+ * @module lib/session/prompt-view
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TYPED_TEXT_FIELD_LABEL_PATTERNS = exports.UNCLASSIFIED_PROMPT_VIEW_TYPE = void 0;
+exports.promptHeadingMessage = promptHeadingMessage;
+exports.optionTakesTypedText = optionTakesTypedText;
+exports.readDecisionId = readDecisionId;
+exports.readQuestionChoices = readQuestionChoices;
+exports.readDecisionHeading = readDecisionHeading;
+exports.derivePromptView = derivePromptView;
+exports.readPromptView = readPromptView;
+/**
+ * `promptData.type` for a frame nothing could classify. Same value as
+ * `UNCLASSIFIED_PROMPT_TYPE` in `types/models`, restated because this module may
+ * not import it (see the module note); the test asserts the two are equal.
+ */
+exports.UNCLASSIFIED_PROMPT_VIEW_TYPE = 'unclassified';
+function promptHeadingMessage(heading) {
+    switch (heading.kind) {
+        case 'question':
+            return { text: heading.text };
+        case 'approval':
+            return heading.toolName
+                ? { key: 'structuredApprovalTitle', values: { toolName: heading.toolName } }
+                : { key: 'structuredApprovalTitleNoTool' };
+        case 'agent-question':
+            return { key: 'structuredQuestionTitle' };
+        case 'unreadable':
+            return { key: 'unclassifiedTitle' };
+    }
+}
+// =============================================================================
+// Field readers (moved from components/worktree/prompt-decision-id, #1932/#2039/#3181)
+// =============================================================================
+/**
+ * The option labels measured to be a text field on screen (Issue #2573).
+ * Restated from `TYPED_TEXT_FIELD_LABEL_PATTERNS` in
+ * `lib/detection/prompt-detect-multiple-choice`, whose graph reaches `fs`.
+ */
+exports.TYPED_TEXT_FIELD_LABEL_PATTERNS = [
+    /^[^\S\n]*type\s+something\b/i,
+];
+/**
+ * Whether an option is a text field on screen, so its answer is the typed TEXT
+ * rather than its number (Issue #2573). `requiresTextInput` alone is also true
+ * for a menu row such as `No, tell Command Code what to do differently`.
+ */
+function optionTakesTypedText(option) {
+    return option.requiresTextInput === true
+        && exports.TYPED_TEXT_FIELD_LABEL_PATTERNS.some((pattern) => pattern.test(option.label));
+}
+/**
+ * The decision id a payload names, or null (Issue #1932). A validating read:
+ * absent, empty or not a string is "no addressable decision".
+ */
+function readDecisionId(source) {
+    if (!source)
+        return null;
+    const candidate = source.decisionId;
+    return typeof candidate === 'string' && candidate !== '' ? candidate : null;
+}
+function hasDecisionOptions(source) {
+    return Array.isArray(source.decisionOptions) && source.decisionOptions.length > 0;
+}
+/**
+ * The choices a question offers when it may be answered over the API, or null
+ * (Issue #2039). All three must hold: a decision id, exactly one question with
+ * a complete label list, and NO approval verdicts on the same payload.
+ */
+function readQuestionChoices(source) {
+    if (!source || readDecisionId(source) === null)
+        return null;
+    if (hasDecisionOptions(source))
+        return null;
+    const asked = source.askUserQuestion;
+    if (!asked || typeof asked.question !== 'string' || asked.question === '')
+        return null;
+    if (!Array.isArray(asked.labels) || asked.labels.length === 0)
+        return null;
+    const labels = asked.labels.filter((label) => typeof label === 'string' && label !== '');
+    // Partial is worse than none: the numbers are positions in this list.
+    if (labels.length !== asked.labels.length)
+        return null;
+    const questionCount = typeof asked.questionCount === 'number' ? asked.questionCount : 1;
+    if (questionCount !== 1)
+        return null;
+    return {
+        question: asked.question,
+        labels,
+        questionCount,
+        ...(asked.custom === true ? { custom: true } : {}),
+    };
+}
+/** The heading for addressable choices, or null when there is nothing to click (#3181). */
+function readDecisionHeading(source) {
+    if (!source || readDecisionId(source) === null)
+        return null;
+    if (hasDecisionOptions(source)) {
+        return {
+            kind: 'approval',
+            toolName: typeof source.toolName === 'string' && source.toolName ? source.toolName : null,
+        };
+    }
+    return readQuestionChoices(source) ? { kind: 'question' } : null;
+}
+// =============================================================================
+// The view
+// =============================================================================
+function screenChoices(source) {
+    const options = Array.isArray(source.options) ? source.options : [];
+    const choices = [];
+    for (const option of options) {
+        if (typeof option === 'string') {
+            // yes_no: `['yes', 'no']`, answered by the word itself.
+            choices.push({
+                answer: option,
+                label: option,
+                isDefault: source.defaultOption === option,
+                takesText: false,
+            });
+            continue;
+        }
+        if (!option || typeof option !== 'object')
+            continue;
+        const o = option;
+        if (typeof o.number !== 'number' || typeof o.label !== 'string')
+            continue;
+        choices.push({
+            answer: String(o.number),
+            label: o.label,
+            isDefault: o.isDefault === true,
+            takesText: optionTakesTypedText({ label: o.label, requiresTextInput: o.requiresTextInput === true }),
+            ...(typeof o.description === 'string' ? { description: o.description } : {}),
+        });
+    }
+    return choices;
+}
+function decisionChoices(decisionOptions) {
+    if (!Array.isArray(decisionOptions))
+        return [];
+    const choices = [];
+    for (const option of decisionOptions) {
+        const o = option;
+        if (!o || typeof o.number !== 'number' || typeof o.label !== 'string')
+            continue;
+        choices.push({ answer: String(o.number), label: o.label, isDefault: false, takesText: false });
+    }
+    return choices;
+}
+const UNREADABLE_VIEW = {
+    kind: 'unreadable',
+    heading: { kind: 'unreadable' },
+    choices: [],
+    multiSelect: false,
+    freeText: null,
+    decisionId: null,
+    apiTarget: null,
+};
+/**
+ * Decide how a prompt payload is shown and answered (Issue #3184).
+ *
+ * Evaluated in this order (design §2.3):
+ *  1. any `type` but the unclassified sentinel → `screen-choices`;
+ *  2. unclassified + decision id + approval verdicts → `api-choices` (approval);
+ *  3. unclassified + decision id + one complete question → `api-choices` (question);
+ *  4. every other unclassified payload — no id, #1932's options-without-id half
+ *     state, and both stored history records — → `unreadable`.
+ *
+ * @param source - A live or stored prompt payload, or null
+ * @returns The view, or null when there is no prompt
+ */
+function derivePromptView(source) {
+    if (source == null)
+        return null;
+    if (source.type !== exports.UNCLASSIFIED_PROMPT_VIEW_TYPE) {
+        const choices = screenChoices(source);
+        return {
+            kind: 'screen-choices',
+            heading: { kind: 'question', text: typeof source.question === 'string' ? source.question : '' },
+            choices,
+            multiSelect: source.multiSelect === true,
+            freeText: choices.some((choice) => choice.takesText) ? { via: 'screen' } : null,
+            decisionId: null,
+            apiTarget: null,
+        };
+    }
+    const decisionId = readDecisionId(source);
+    if (decisionId !== null && hasDecisionOptions(source)) {
+        const choices = decisionChoices(source.decisionOptions);
+        if (choices.length > 0) {
+            return {
+                kind: 'api-choices',
+                heading: {
+                    kind: 'approval',
+                    toolName: typeof source.toolName === 'string' && source.toolName ? source.toolName : null,
+                },
+                choices,
+                multiSelect: false,
+                freeText: null,
+                decisionId,
+                apiTarget: 'approval',
+            };
+        }
+    }
+    const question = readQuestionChoices(source);
+    if (decisionId !== null && question !== null) {
+        return {
+            kind: 'api-choices',
+            heading: { kind: 'agent-question', text: question.question },
+            choices: question.labels.map((label, index) => ({
+                answer: String(index + 1),
+                label,
+                isDefault: false,
+                takesText: false,
+            })),
+            multiSelect: false,
+            freeText: question.custom === true ? { via: 'api' } : null,
+            decisionId,
+            apiTarget: 'question',
+        };
+    }
+    return UNREADABLE_VIEW;
+}
+/**
+ * The view a `current-output` payload carries, falling back to deriving it.
+ *
+ * `??`, not `||`: a server from before #3184 sends no `promptView`, and its
+ * absence means "this daemon does not publish the field" — the same function
+ * then decides from `promptData`, so old and new servers reach the same answer.
+ */
+function readPromptView(payload) {
+    if (!payload)
+        return null;
+    return payload.promptView ?? derivePromptView(payload.promptData);
+}

package/dist/server/server.js

@@ -71,7 +71,7 @@ const ws_server_1 = require("./src/lib/ws-server");
 const worktrees_1 = require("./src/lib/git/worktrees");
 const db_instance_1 = require("./src/lib/db/db-instance");
 const response_poller_1 = require("./src/lib/polling/response-poller");
-const auto_yes_manager_1 = require("./src/lib/polling/auto-yes-manager");
+const auto_yes_lifecycle_1 = require("./src/lib/auto-yes-lifecycle");
 const schedule_manager_1 = require("./src/lib/schedule-manager");
 const timer_manager_1 = require("./src/lib/timer-manager");
 const resource_cleanup_1 = require("./src/lib/resource-cleanup");
@@ -825,8 +825,10 @@ app.prepare().then(() => {
         }
         // Stop polling first
         (0, response_poller_1.stopAllPolling)();
-        // Issue #138: Stop all auto-yes pollers
-        (0, auto_yes_manager_1.stopAllAutoYesPolling)();
+        // Issue #138: Stop all auto-yes pollers. Issue #3184: the `server-shutdown`
+        // row of the Auto-Yes lifecycle table — the state itself is in memory and
+        // goes with the process; nothing is persisted for the next start.
+        (0, auto_yes_lifecycle_1.releaseAutoYes)('server-shutdown', { scope: 'all' });
         // Issue #294: Stop all scheduled executions (SIGKILL fire-and-forget)
         (0, schedule_manager_1.stopAllSchedules)();
         // Issue #534: Stop all timer-based delayed messages

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

@@ -0,0 +1,133 @@
+"use strict";
+/**
+ * When Auto-Yes state is released, decided in one table (Issue #3184).
+ *
+ * Auto-Yes lives per worktree x instance with its own expiry, independent of
+ * the session it answers for. Every path that ends that relationship — a killed
+ * session (#3182), a removed instance, a deleted worktree, the orphan sweep,
+ * a poller giving up on errors, server shutdown — used to decide for itself
+ * what to do with the state, and one of them (instance removal) decided
+ * nothing at all, leaving a grant that silently approved the next session to
+ * claim the id. {@link AUTO_YES_LIFECYCLE} is the decision; each path calls
+ * {@link releaseAutoYes} (or its two halves) with the event it is.
+ *
+ * ## disable vs delete
+ *
+ * - `disable` keeps the entry with `enabled: false` (and the `stopReason`), for
+ *   an instance that still exists — the UI can say why Auto-Yes went off.
+ * - `delete` drops the entry, for an instance or worktree that no longer
+ *   exists. Kept, it would never be swept: the orphan sweep works per worktree.
+ *
+ * ## Not in the table
+ *
+ * Manual disable, expiry and the stop pattern are Auto-Yes's own conditions,
+ * not lifecycle events, and stay in `auto-yes-state` / the auto-yes route. A
+ * worktree ID rename MOVES the state (`worktree-session-reconcile`) rather than
+ * releasing it. The "starting" record (#3179) is cleared by kill-session beside
+ * this call, not by it: it has its own token rules (#3195).
+ *
+ * ## Imports go through the auto-yes-manager barrel
+ *
+ * The cleanup modules' tests mock `@/lib/polling/auto-yes-manager`, and so must
+ * this module's imports resolve to it. That barrel re-exports the poller, so
+ * `auto-yes-poller` must NOT import this module (it would be a cycle); its
+ * consecutive-errors path applies the same row directly, and
+ * `tests/unit/lib/auto-yes-lifecycle-3184.test.ts` holds the two equal.
+ *
+ * @module lib/auto-yes-lifecycle
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AUTO_YES_LIFECYCLE = void 0;
+exports.stopAutoYesPollersFor = stopAutoYesPollersFor;
+exports.applyAutoYesStateRule = applyAutoYesStateRule;
+exports.releaseAutoYes = releaseAutoYes;
+const auto_yes_manager_1 = require("./polling/auto-yes-manager");
+/**
+ * The table (design §8.2).
+ *
+ * `session-killed` is #3182's decision as #3188 shipped it: disable with no
+ * reason (no new reason was added), for the instance only. `server-shutdown`
+ * deliberately does not persist anything: the state lives in memory, and a
+ * restarted server starting with every grant off is the safe side.
+ */
+exports.AUTO_YES_LIFECYCLE = {
+    'session-killed': { state: 'disable', poller: 'stop' },
+    'instance-removed': { state: 'delete', poller: 'stop' },
+    'worktree-deleted': { state: 'delete', poller: 'stop' },
+    'orphan-swept': { state: 'delete', poller: 'stop' },
+    'consecutive-errors': { state: 'disable', stopReason: 'consecutive_errors', poller: 'stop' },
+    'server-shutdown': { state: 'none', poller: 'stop' },
+};
+/**
+ * Stop the pollers the event's target names (the poller half of the table).
+ * Separate from {@link applyAutoYesStateRule} so a caller that reports the two
+ * failures apart (`session-cleanup`) can keep doing so.
+ */
+function stopAutoYesPollersFor(event, target) {
+    if (exports.AUTO_YES_LIFECYCLE[event].poller !== 'stop')
+        return;
+    switch (target.scope) {
+        case 'instance':
+            (0, auto_yes_manager_1.stopAutoYesPolling)((0, auto_yes_manager_1.buildCompositeKey)(target.worktreeId, target.cliToolId, target.instanceId));
+            return;
+        case 'worktree':
+            (0, auto_yes_manager_1.stopAutoYesPollingByWorktree)(target.worktreeId);
+            return;
+        case 'key':
+            (0, auto_yes_manager_1.stopAutoYesPolling)(target.compositeKey);
+            return;
+        case 'all':
+            (0, auto_yes_manager_1.stopAllAutoYesPolling)();
+            return;
+    }
+}
+function disableKey(compositeKey, stopReason) {
+    const cliToolId = (0, auto_yes_manager_1.extractCliToolId)(compositeKey);
+    if (!cliToolId)
+        return;
+    (0, auto_yes_manager_1.disableAutoYes)((0, auto_yes_manager_1.extractWorktreeId)(compositeKey), cliToolId, stopReason, (0, auto_yes_manager_1.extractInstanceId)(compositeKey) ?? undefined);
+}
+/** Apply the event's state rule to its target (the state half of the table). */
+function applyAutoYesStateRule(event, target) {
+    const rule = exports.AUTO_YES_LIFECYCLE[event];
+    if (rule.state === 'none')
+        return;
+    switch (target.scope) {
+        case 'instance':
+            if (rule.state === 'disable') {
+                (0, auto_yes_manager_1.disableAutoYes)(target.worktreeId, target.cliToolId, rule.stopReason, target.instanceId);
+            }
+            else {
+                (0, auto_yes_manager_1.deleteAutoYesState)((0, auto_yes_manager_1.buildCompositeKey)(target.worktreeId, target.cliToolId, target.instanceId));
+            }
+            return;
+        case 'worktree':
+            if (rule.state === 'disable') {
+                (0, auto_yes_manager_1.getCompositeKeysByWorktree)(target.worktreeId).forEach((key) => disableKey(key, rule.stopReason));
+            }
+            else {
+                (0, auto_yes_manager_1.deleteAutoYesStateByWorktree)(target.worktreeId);
+            }
+            return;
+        case 'key':
+            if (rule.state === 'disable') {
+                disableKey(target.compositeKey, rule.stopReason);
+            }
+            else {
+                (0, auto_yes_manager_1.deleteAutoYesState)(target.compositeKey);
+            }
+            return;
+        case 'all':
+            (0, auto_yes_manager_1.getAutoYesStateCompositeKeys)().forEach((key) => rule.state === 'disable' ? disableKey(key, rule.stopReason) : (0, auto_yes_manager_1.deleteAutoYesState)(key));
+            return;
+    }
+}
+/**
+ * Release Auto-Yes for an event: stop the pollers first, then apply the state
+ * rule — the order `session-cleanup` has kept since #404. Both halves are
+ * synchronous, so no poll can run between them.
+ */
+function releaseAutoYes(event, target) {
+    stopAutoYesPollersFor(event, target);
+    applyAutoYesStateRule(event, target);
+}

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

@@ -65,6 +65,7 @@ const antigravity_permission_receipts_1 = require("./polling/antigravity-permiss
 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 task_transition_service_1 = require("./tasks/task-transition-service");
@@ -182,6 +183,13 @@ function incrementErrorCount(compositeKey) {
         pollerState.consecutiveErrors++;
         pollerState.currentInterval = (0, auto_yes_state_1.calculateBackoffInterval)(pollerState.consecutiveErrors);
         // Issue #499 Item 5: Auto-stop after consecutive error threshold.
+        //
+        // Issue #3184: this is the `consecutive-errors` row of AUTO_YES_LIFECYCLE
+        // (`lib/auto-yes-lifecycle`) — disable with `consecutive_errors`, stop the
+        // poller — applied here directly rather than through `releaseAutoYes`:
+        // that module reaches this one through the auto-yes-manager barrel, so
+        // importing it back would be a cycle. `auto-yes-lifecycle-3184.test.ts`
+        // holds this call and the table row equal.
         if (pollerState.consecutiveErrors >= auto_yes_config_1.AUTO_STOP_ERROR_THRESHOLD) {
             const worktreeId = (0, auto_yes_state_1.extractWorktreeId)(compositeKey);
             const cliToolId = (0, auto_yes_state_1.extractCliToolId)(compositeKey);
@@ -439,7 +447,14 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // such a machine's dialogs alone, which is why `logIfWithheldForWantOfReceipt`
         // says so.
         const receiptScope = { worktreeId, instanceId };
-        const promptDetection = (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput, receiptScope);
+        // 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);
+        const promptDetection = (0, response_checker_1.detectPromptOnCleanFrame)(cleanOutput, cliToolId, precomputedLines, rawOutput, receiptScope, frame);
         if (!promptDetection.isPrompt || !promptDetection.promptData) {
             pollerState.lastAnsweredPromptKey = null;
             pollerState.lastAnsweredAt = null;
@@ -473,7 +488,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // 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)(cleanOutput) : null;
+        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.
@@ -498,7 +513,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // 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)(cleanOutput)) {
+        if (cliToolId === 'codex' && (0, detect_1.isCodexModelPickerFrame)(frame)) {
             (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, {
                 reason: 'unclassified-frame',
                 mode: null,
@@ -529,7 +544,7 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // 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, promptDetection.promptData.type, cleanOutput);
+        const dialogGate = (0, auto_yes_dialog_gate_1.evaluateAutoYesDialogGate)(cliToolId, promptDetection.promptData.type, frame);
         if (!dialogGate.allowed) {
             (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, {
                 reason: 'unclassified-frame',

package/dist/server/src/lib/cli-tools/antigravity.js

@@ -150,7 +150,7 @@ function readInputBoxStatusRow(contentLines) {
  * @returns True when the input box is live and agy is idle
  */
 function isAntigravityReady(output) {
-    const frame = (0, frame_1.normalizeFrame)(output);
+    const frame = (0, frame_1.normalizeFrame)(output, 'antigravity');
     if (cli_patterns_1.ANTIGRAVITY_SELECTION_LIST_PATTERN.test(frame.lastLines))
         return false;
     if (ANTIGRAVITY_TRUST_DIALOG_PATTERN.test(frame.lastLines))

package/dist/server/src/lib/detection/cli-patterns.js

@@ -4,14 +4,15 @@
  * Shared between response-poller.ts and API routes
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findOpencodeV2DialogTitle = exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = exports.OPENCODE_V2_THINKING_PATTERN = exports.OPENCODE_V2_FOOTER_PATTERN = exports.OPENCODE_V2_IDLE_COMPOSER_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_TRAILED_STATUS_BAR_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = exports.CODEX_PICKER_FOOTER_PATTERN = exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_TRUST_QUESTION_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
-exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_V2_SKIP_PATTERNS = void 0;
+exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = exports.OPENCODE_V2_THINKING_PATTERN = exports.OPENCODE_V2_FOOTER_PATTERN = exports.OPENCODE_V2_IDLE_COMPOSER_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_TRAILED_STATUS_BAR_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = exports.CODEX_PICKER_FOOTER_PATTERN = exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_GENUINE_PROMPT_LINE = exports.CODEX_DIALOG_PATTERN = exports.CODEX_TRUST_QUESTION_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_V2_SKIP_PATTERNS = exports.findOpencodeV2DialogTitle = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.resolveClaudeTrustDialogKeys = resolveClaudeTrustDialogKeys;
 exports.isClaudeTrustDialogOpen = isClaudeTrustDialogOpen;
 exports.isShellPaneCommand = isShellPaneCommand;
 exports.isCodexPromptReady = isCodexPromptReady;
+exports.findCodexComposerRow = findCodexComposerRow;
 exports.getCodexActiveDialog = getCodexActiveDialog;
 exports.getCodexLifecycleDialog = getCodexLifecycleDialog;
 exports.findCodexChromeStart = findCodexChromeStart;
@@ -364,7 +365,7 @@ exports.CODEX_DIALOG_PATTERN = new RegExp(`Skip until next version|${exports.COD
  * distinguishes the genuine input line from a dialog option line. Single-line
  * (no /m, no /g) -- callers test it per line to locate the prompt's position.
  */
-const CODEX_GENUINE_PROMPT_LINE = /^\s*›(?!\s*\d+\.)/;
+exports.CODEX_GENUINE_PROMPT_LINE = /^\s*›(?!\s*\d+\.)/;
 /**
  * Decide whether Codex output shows a genuine interactive input prompt rather than
  * a startup dialog (Issue #890, reworked in Issue #892).
@@ -395,7 +396,7 @@ function isCodexPromptReady(output) {
             lastDialogMarkerIdx = i;
             continue;
         }
-        if (CODEX_GENUINE_PROMPT_LINE.test(line)) {
+        if (exports.CODEX_GENUINE_PROMPT_LINE.test(line)) {
             lastPromptIdx = i;
         }
     }
@@ -415,32 +416,49 @@ function isCodexPromptReady(output) {
  * on the update dialog could confirm the default "1. Update now" (npm install).
  */
 /**
- * The lines of Codex's ACTIVE region: everything strictly below the bottom-most
- * genuine input-prompt line, or the whole frame when there is no prompt line
- * (Issue #892).
+ * Index of codex's bottom-most genuine input-prompt row, or -1 (Issue #892).
+ *
+ * This is codex's live-region composer marker (Issue #3183): the declaration in
+ * `tools/codex/live-region.ts` is built on it, so `NormalizedFrame.liveRegion`
+ * starts at this row, and the string entries below — which keep a caller that
+ * has no `NormalizedFrame` (codex's own launch loop) — read the same row.
  *
- * This is the one rule that keeps every Codex dialog classifier honest.
  * capturePane returns scrollback, so a dialog that was answered minutes ago is
  * still in the frame; only what sits BELOW the live prompt is still awaiting a
  * key. Shared by getCodexActiveDialog and getCodexLifecycleDialog so the two
  * cannot drift into disagreeing about what "active" means.
  */
-function codexActiveRegionLines(output) {
-    const lines = output.split('\n');
-    // Index of the bottom-most genuine input-prompt line (-1 if none).
-    let promptIdx = -1;
+function findCodexComposerRow(lines) {
     for (let i = lines.length - 1; i >= 0; i--) {
-        if (CODEX_GENUINE_PROMPT_LINE.test(lines[i])) {
-            promptIdx = i;
-            break;
+        if (exports.CODEX_GENUINE_PROMPT_LINE.test(lines[i]))
+            return i;
+    }
+    return -1;
+}
+/**
+ * The rows of codex's ACTIVE region: everything strictly below the composer
+ * row, or the whole frame when there is none (Issue #892).
+ *
+ * A {@link NormalizedFrame} carries that answer already (Issue #3183); a string
+ * is read with the same marker, {@link findCodexComposerRow}.
+ */
+function codexActiveRows(input) {
+    if (typeof input !== 'string') {
+        const region = input.liveRegion;
+        if (region.tool === 'codex') {
+            return region.anchor === 'composer'
+                ? input.contentLines.slice((region.composerEndRow ?? region.startRow) + 1)
+                : input.contentLines;
         }
+        return codexActiveRows(input.clean);
     }
-    return lines.slice(promptIdx + 1);
+    const lines = input.split('\n');
+    return lines.slice(findCodexComposerRow(lines) + 1);
 }
 function getCodexActiveDialog(output) {
     // Residual dialog text above a live prompt is excluded, so a dialog lingering
     // in scrollback is never treated as active.
-    const active = codexActiveRegionLines(output).join('\n');
+    const active = codexActiveRows(output).join('\n');
     if (active === '') {
         return null;
     }
@@ -525,7 +543,7 @@ const CODEX_UPDATE_DIALOG_ANCHORS = [
 /**
  * Classify the bottom-most ACTIVE codex lifecycle screen (Issue #1829).
  *
- * Position-based, via {@link codexActiveRegionLines}: a dialog left in
+ * Position-based, via {@link codexActiveRows}: a dialog left in
  * scrollback above a live prompt is not active and returns `null`. That is not
  * a detail — the auto-answer guard in the Auto-Yes poller is built on this
  * function, and a whole-frame version of it would switch Auto-Yes off for the
@@ -540,11 +558,11 @@ const CODEX_UPDATE_DIALOG_ANCHORS = [
  * reports these screens, so a human still sees them; what this function gates is
  * only whether a machine may answer on their behalf.
  *
- * @param output - ANSI-stripped pane capture
+ * @param output - ANSI-stripped pane capture, or a frame `normalizeFrame(…, 'codex')` built
  * @returns The active lifecycle screen, or null when none is
  */
 function getCodexLifecycleDialog(output) {
-    const activeLines = codexActiveRegionLines(output);
+    const activeLines = codexActiveRows(output);
     const window = [];
     for (let i = activeLines.length - 1; i >= 0 && window.length < CODEX_LIFECYCLE_TAIL_LINES; i--) {
         if (activeLines[i].trim() === '')

package/dist/server/src/lib/detection/status-detector.js

@@ -139,7 +139,7 @@ Object.defineProperty(exports, "STATUS_CHECK_LINE_COUNT", { enumerable: true, ge
  * @returns Detection result with status, confidence, reason, hasActivePrompt, evidence and promptDetection
  */
 function detectSessionStatus(output, cliToolId, lastOutputTimestamp) {
-    const frame = (0, frame_1.normalizeFrame)(output);
+    const frame = (0, frame_1.normalizeFrame)(output, cliToolId);
     const verdict = (0, registry_1.getToolStatusDetector)(cliToolId).detect(frame, {
         lastOutputTimestamp,
         // Issue #2991: the same presence reading Auto-Yes and History use, so an