commandmate 0.44.2 → 0.44.3

package/dist/server/src/lib/detection/tools/claude/patterns.js

@@ -2,9 +2,10 @@
 /**
  * Claude Code's own detection patterns (Issue #1927).
  *
- * The regexes shared with other tools stay in `cli-patterns.ts`; what lives here
- * is what Issue #1927 had to measure to give Claude a §4 D1 idle rule, plus the
- * provenance of that measurement.
+ * What comes first is what Issue #1927 had to measure to give Claude a §4 D1
+ * idle rule, plus the provenance of that measurement. Below `VERIFIED_AGAINST`
+ * are the Claude patterns Issue #3217 moved here from `cli-patterns.ts`, which
+ * keeps the per-tool table and re-exports their public names.
  *
  * ## Why Claude needed a new rule at all
  *
@@ -45,7 +46,11 @@
  * argument #1893 used to make opencode's `▣ … · 2.3s` duration mandatory.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VERIFIED_AGAINST = exports.CLAUDE_EFFORT_CHIP_PATTERN = exports.CLAUDE_TRANSCRIPT_USER_TURN_PATTERN = exports.CLAUDE_BANNER_PATTERN = exports.CLAUDE_TURN_COMPLETE_PATTERN = void 0;
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = exports.VERIFIED_AGAINST = exports.CLAUDE_EFFORT_CHIP_PATTERN = exports.CLAUDE_TRANSCRIPT_USER_TURN_PATTERN = exports.CLAUDE_BANNER_PATTERN = exports.CLAUDE_TURN_COMPLETE_PATTERN = void 0;
+exports.findClaudeChromeStart = findClaudeChromeStart;
+exports.resolveClaudeTrustDialogKeys = resolveClaudeTrustDialogKeys;
+exports.isClaudeTrustDialogOpen = isClaudeTrustDialogOpen;
+const composer_text_1 = require("../../composer-text");
 /**
  * Claude's turn-completion marker: a spinner glyph, a verb, and a duration.
  *
@@ -96,3 +101,258 @@ exports.CLAUDE_EFFORT_CHIP_PATTERN = /·\s*\/effort\s*$/;
  */
 var verified_against_1 = require("../verified-against");
 Object.defineProperty(exports, "VERIFIED_AGAINST", { enumerable: true, get: function () { return verified_against_1.CLAUDE_VERIFIED_AGAINST; } });
+/**
+ * The Claude blocks moved out of `../../cli-patterns.ts` (Issue #3217 I-7).
+ * `cli-patterns.ts` re-exports every public name.
+ */
+/**
+ * Claude CLI spinner characters (expanded set)
+ * These are shown when Claude is thinking/processing
+ */
+exports.CLAUDE_SPINNER_CHARS = [
+    '✻', '✽', '⏺', '·', '∴', '✢', '✳', '✶',
+    '⦿', '◉', '●', '○', '◌', '◎', '⊙', '⊚',
+    '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏', // Braille spinner
+];
+/**
+ * Claude thinking pattern
+ * Matches spinner character followed by activity text ending with …
+ * The text can contain spaces (e.g., "Verifying implementation (dead code detection)…")
+ *
+ * Alternative 2: "esc to interrupt" status bar text (Issue #188)
+ * Claude Code shows "esc to interrupt" in the terminal status bar during active processing.
+ * Previous pattern required closing paren `to interrupt\)` matching `(esc to interrupt)`,
+ * but Claude Code v2.x status bar format uses `· esc to interrupt ·` without parens.
+ * Updated to match `esc to interrupt` which covers both formats.
+ */
+exports.CLAUDE_THINKING_PATTERN = new RegExp(`[${exports.CLAUDE_SPINNER_CHARS.join('')}]\\s+.+…|esc to interrupt`, 'm');
+/**
+ * Claude status-bar "esc to interrupt" hint (Issue #805)
+ *
+ * Claude Code shows "esc to interrupt" in the bottom status bar ONLY while it is
+ * actively processing. When idle/ready, the status bar shows shortcut hints
+ * (e.g., "? for shortcuts") instead -- so this token is a reliable "running" signal.
+ *
+ * Why this exists separately from CLAUDE_THINKING_PATTERN's "esc to interrupt"
+ * alternative: status detection evaluates the spinner+ellipsis branch of
+ * CLAUDE_THINKING_PATTERN within a narrow 5-line window (THINKING_TAIL_LINE_COUNT)
+ * to avoid mistaking a completed thinking summary in scrollback for active work
+ * (Issue #188). During /pm-auto-dev + subagent runs, the bottom task panel
+ * ("⏺ main" / "◯ general-purpose ..." rows) pushes both the "✶ Running…" spinner
+ * AND the "esc to interrupt" status bar out of that 5-line window, so the session
+ * was misdetected as Ready (Issue #805). Unlike the spinner+ellipsis summary, the
+ * status-bar text is repainted live and never lingers in scrollback, so it can be
+ * matched in a wider footer window without regressing Issue #188.
+ */
+exports.CLAUDE_INTERRUPT_HINT_PATTERN = /esc to interrupt/;
+/**
+ * Claude prompt pattern (waiting for input)
+ * Supports both legacy '>' and new '❯' (U+276F) prompt characters
+ * Issue #132: Also matches prompts with recommended commands (e.g., "❯ /work-plan")
+ *
+ * Matches:
+ * - Empty prompt: "❯ " or "> "
+ * - Prompt with command: "❯ /work-plan" or "> npm install"
+ */
+exports.CLAUDE_PROMPT_PATTERN = /^[>❯](\s*$|\s+\S)/m;
+/**
+ * Claude separator pattern
+ */
+exports.CLAUDE_SEPARATOR_PATTERN = /^─{10,}$/m;
+/**
+ * Locate the start of Claude Code's bottom-pinned footer within a captured pane.
+ *
+ * Claude Code v2 draws in the alternate screen and reserves the last rows of the
+ * pane for a footer that is never transcript content:
+ *
+ *     <hint row>            ← "◉ xhigh · /effort", "tmux detected · …", or blank
+ *     ────────────────────  ← separator
+ *     ❯ <input box>         ← one or more rows
+ *     ────────────────────  ← separator
+ *     ⏸ manual mode on · ? for shortcuts · ← for agents        focus
+ *
+ * The hint row rotates every few seconds while the conversation sits idle, so
+ * keeping the footer in an extracted response makes its content hash change on
+ * every poll tick. That defeated the content-based dedup added in #1268 and
+ * re-saved the same reply once per tick (#1289).
+ *
+ * The boundary is found structurally rather than by matching hint text: the hint
+ * strings are Claude Code's to change, and pattern-matching them is what let this
+ * regression through (`? for shortcuts` was already listed as a skip pattern, but
+ * the real status bar embeds it mid-line so the anchors never matched). The row
+ * above the opening separator is reserved by Claude Code's layout and stays blank
+ * even when a reply fills the whole pane, so it is always safe to drop.
+ *
+ * @param lines - Captured pane lines; trailing blank rows are tolerated
+ * @returns Index of the first footer row, or -1 when no footer is present
+ */
+function findClaudeChromeStart(lines) {
+    // Issue #1879: the structural search (closing separator → opening separator →
+    // prompt glyph, including the "is this really the input box and not a reply
+    // fenced by two horizontal rules?" check) moved to `findClaudeInputBox` so the
+    // composer reader locates the same box this trimmer does. Behaviour here is
+    // unchanged; only the caller of the search moved.
+    const box = (0, composer_text_1.findClaudeInputBox)(lines);
+    if (box === null)
+        return -1;
+    // Include the reserved hint row directly above the opening separator.
+    return Math.max(0, box.openingSeparator - 1);
+}
+/**
+ * Claude trust dialog pattern (Issue #201)
+ *
+ * Matches the "Quick safety check" dialog displayed by Claude CLI v2.x
+ * when accessing a workspace for the first time.
+ *
+ * Intentionally uses partial matching (no line-start anchor ^):
+ * Other pattern constants (CLAUDE_PROMPT_PATTERN, CLAUDE_SEPARATOR_PATTERN, etc.)
+ * use line-start anchors (^), but this pattern needs to match at any position
+ * within the tmux output buffer because the dialog text may appear after
+ * tmux padding or other output. (SF-001)
+ */
+exports.CLAUDE_TRUST_DIALOG_PATTERN = /Yes, I trust this folder/m;
+/** The option row of the trust dialog's cursor: `❯` (or legacy `>`) after the dialog's left padding. */
+const CLAUDE_TRUST_CURSOR_ROW_PATTERN = /^\s*[>❯]\s+\S/;
+/** How far the cursor row may sit from the `Yes, I trust this folder` row (the dialog has two options). */
+const CLAUDE_TRUST_MAX_CURSOR_DISTANCE = 3;
+/**
+ * Keys that answer Claude Code's folder-trust dialog with "Yes", or null when
+ * no answerable dialog is on screen (Issue #3078).
+ *
+ * The dialog comes in two layouts, and Enter alone is only right for one:
+ *
+ *   - default Yes (Issue #201 era, `tests/unit/lib/claude-session.test.ts`):
+ *     ` ❯ 1. Yes, I trust this folder` / `   2. No, exit` — Enter confirms Yes.
+ *   - default No (2.1.259 `tests/fixtures/chat-dialog-card-2254/claude-trust-2-1-259.txt`,
+ *     2.1.287 with a permission allow-list
+ *     `tests/fixtures/claude-trust-dialog-3078/allowlist-default-no-2-1-287.txt`):
+ *     ` ❯ No, exit` / `   Yes, I trust this folder` — Enter EXITS Claude Code.
+ *
+ * So the answer is read off the screen: the distance from the cursor row to the
+ * Yes row becomes that many `Up`/`Down` presses, then `Enter`. Only the last
+ * dialog in the capture counts, and a dialog followed by Claude's input-box
+ * separator is history in the scrollback, not an open dialog.
+ *
+ * @param output - ANSI-stripped pane output
+ * @returns tmux key names ending in `Enter` (just `['Enter']` when the cursor is
+ *   already on Yes), or null when no open dialog / no readable cursor row
+ */
+function resolveClaudeTrustDialogKeys(output) {
+    const lines = output.split('\n');
+    const yesIndex = findOpenClaudeTrustYesRow(lines);
+    if (yesIndex === -1)
+        return null;
+    for (let distance = 0; distance <= CLAUDE_TRUST_MAX_CURSOR_DISTANCE; distance++) {
+        for (const direction of distance === 0 ? [0] : [-1, 1]) {
+            const index = yesIndex + direction * distance;
+            if (index < 0 || index >= lines.length)
+                continue;
+            if (!CLAUDE_TRUST_CURSOR_ROW_PATTERN.test(lines[index]))
+                continue;
+            // Cursor above Yes → move Down; below → move Up.
+            const key = direction < 0 ? 'Down' : 'Up';
+            return [...Array(distance).fill(key), 'Enter'];
+        }
+    }
+    return null;
+}
+/**
+ * Whether Claude Code's folder-trust dialog is the open screen (Issue #3078).
+ *
+ * The dialog's cursor row (` ❯ No, exit`) has the prompt glyph, so the start
+ * wait asks this before CLAUDE_PROMPT_PATTERN rather than reading the dialog as
+ * a ready prompt.
+ *
+ * @param output - ANSI-stripped pane output
+ */
+function isClaudeTrustDialogOpen(output) {
+    return findOpenClaudeTrustYesRow(output.split('\n')) !== -1;
+}
+/** Row of the last `Yes, I trust this folder`, or -1 when absent or already answered. */
+function findOpenClaudeTrustYesRow(lines) {
+    for (let i = lines.length - 1; i >= 0; i--) {
+        if (!exports.CLAUDE_TRUST_DIALOG_PATTERN.test(lines[i]))
+            continue;
+        // Claude's input box (separator rows) drawn below it: the dialog is scrollback.
+        return lines.slice(i + 1).some((line) => exports.CLAUDE_SEPARATOR_PATTERN.test(line)) ? -1 : i;
+    }
+    return -1;
+}
+/**
+ * [Issue #1495] Footer signature of Claude Code's `/model` local-settings overlay.
+ * Verified against a real Claude Code v2.1.218 capture, the footer reads:
+ *   "Enter to set as default · s to use this session only · Esc to cancel"
+ *
+ * The overlay renders a ❯-marked numbered model list ("1. Default … 5. Haiku")
+ * under a "Select model" header that detectMultipleChoicePrompt() otherwise
+ * matches as a genuine multiple_choice prompt — which let Auto-Yes Enter-confirm
+ * a selection and silently change the user's default model. This "set as default"
+ * phrasing is unique to the model picker: genuine confirmation prompts never
+ * contain it (the trust dialog uses "Enter to confirm · Esc to cancel", Bash-tool
+ * approvals use "Esc to cancel · Tab to amend", AskUserQuestion uses
+ * "Enter to select · … to navigate"), so it is a safe exclusion signal.
+ *
+ * Linear pattern, no nested quantifiers — ReDoS safe (S4-001).
+ */
+exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = /Enter\s+to\s+set\s+as\s+default\b/i;
+/**
+ * Claude CLI selection list footer pattern
+ * Detects Claude CLI's interactive selection prompts that require
+ * arrow key navigation and Enter to select/toggle.
+ *
+ * Matches footer instruction lines (known variants):
+ *   "Enter to select · Tab/Arrow keys to navigate · Esc to cancel"
+ *   "Enter to select · ↑/↓ to navigate · n to add notes · Esc to cancel"
+ *   "Enter to confirm · Esc to exit"  (legacy /model command footer)
+ *   "Enter to set as default · s to use this session only · Esc to cancel"
+ *     (/model command footer as of Claude Code v2.1.218 — Issue #1495)
+ *
+ *   "←/→ to adjust · Enter to confirm · s for this session only · Esc to cancel"
+ *     (/effort slider footer as of Claude Code v2.1.257 — Issue #3052; before
+ *      2.1.257 it was "Enter to confirm · Esc to cancel")
+ *
+ * The /effort branch keys on "Enter to confirm · s for this session only" rather
+ * than "←/→ to adjust": the `s` hint is unique to the pickers (the trust dialog's
+ * "Enter to confirm · Esc to cancel" and approval dialogs never carry it), and
+ * keeping the match under the `Enter to` prefix leaves the pattern a single
+ * linear alternation. Linear, no nested quantifiers — ReDoS safe.
+ *
+ * The "set as default" branch lets status-detector classify the `/model` overlay
+ * as a Claude selection list (NavigationButtons + ESC hatch, hasActivePrompt=false)
+ * once detectPrompt() no longer reports it as a prompt (see
+ * CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN).
+ */
+exports.CLAUDE_SELECTION_LIST_FOOTER = /Enter\s+to\s+(?:select\s+.*to\s+navigate|confirm\s+·\s+(?:Esc|s\s+for\s+this\s+session\s+only)|set\s+as\s+default)/;
+/**
+ * Error patterns that indicate a Claude session failed to start properly
+ * Used by isSessionHealthy() to detect broken sessions (MF-001: SRP)
+ * Style: readonly + as const for type safety (SF-S2-001: follows response-poller.ts precedent)
+ *
+ * SEC-SF-004: Pattern maintenance process:
+ * - When Claude CLI is updated, verify that error messages still match these patterns.
+ * - Test procedure: Intentionally trigger each error condition (e.g., nested session launch)
+ *   and confirm the error message is captured by the patterns.
+ * - If Claude CLI introduces localized error messages, add locale-aware patterns or
+ *   consider switching to exit code-based detection as a more robust alternative.
+ * - Pattern additions should be accompanied by corresponding test cases in
+ *   claude-session.test.ts.
+ *
+ * C-S3-001: Codex/Gemini monitoring note:
+ * These patterns are currently Claude-specific. If Codex or Gemini exhibit similar
+ * "nested session" or startup failure behaviors, analogous error patterns should be
+ * added to their respective tool configurations (codex.ts, gemini.ts) rather than
+ * extending these arrays, to maintain SRP per CLI tool type.
+ */
+exports.CLAUDE_SESSION_ERROR_PATTERNS = [
+    'Claude Code cannot be launched inside another Claude Code session',
+];
+/**
+ * Regex patterns for Claude session errors requiring context matching
+ * Used by isSessionHealthy() for multi-condition error detection (MF-001: SRP)
+ * Style: readonly + as const for type safety (SF-S2-001: follows response-poller.ts precedent)
+ *
+ * SEC-SF-004: See CLAUDE_SESSION_ERROR_PATTERNS JSDoc for pattern maintenance process.
+ */
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = [
+    /^Error:.*Claude Code/,
+];

package/dist/server/src/lib/detection/tools/claude/prompt.js

@@ -63,6 +63,7 @@ exports.detectClaudeDialog = detectClaudeDialog;
 const cli_patterns_1 = require("../../cli-patterns");
 const prompt_detect_multiple_choice_1 = require("../../prompt-detect-multiple-choice");
 const dialog_block_1 = require("../dialog-block");
+const context_above_1 = require("../context-above");
 const picker_chrome_1 = require("./picker-chrome");
 /**
  * Claude's dialog footers, in every spelling measured.
@@ -78,8 +79,6 @@ const picker_chrome_1 = require("./picker-chrome");
 const CLAUDE_DIALOG_FOOTER_PATTERN = /esc\s+to\s+cancel|enter\s+to\s+(?:select|confirm|set\s+as\s+default)/i;
 /** The selection cursor Claude puts on the highlighted option. */
 const CLAUDE_SELECTION_GLYPHS = new Set(['❯', '>']);
-/** How many non-blank rows above the options may hold the question. */
-const QUESTION_SCAN_ROWS = 4;
 /** The permission dialog's question, in the spellings 2.1.x draws. */
 const CLAUDE_PERMISSION_QUESTION_PATTERN = /do you want to\b|allow\b.*\?$/i;
 /** The AskUserQuestion review screen's closing question. */
@@ -94,14 +93,7 @@ const CLAUDE_PICKER_FOOTER_PATTERN = /set\s+as\s+default/i;
  */
 function readContextAbove(lines, firstRow) {
     const tabRow = (0, picker_chrome_1.findAskUserQuestionTabRow)(lines, firstRow, prompt_detect_multiple_choice_1.APPROVAL_TARGET_MAX_LOOKBACK);
-    const rows = [];
-    for (let i = firstRow - 1; i > tabRow && rows.length < QUESTION_SCAN_ROWS; i--) {
-        const row = lines[i].trim();
-        if (row === '')
-            continue;
-        rows.push(row);
-    }
-    return rows.join('\n');
+    return (0, context_above_1.readContextAbove)(lines, firstRow, tabRow);
 }
 /**
  * The non-blank rows in [from, end) — the block's footer — without Claude's

package/dist/server/src/lib/detection/tools/codex/detect.js

@@ -19,15 +19,20 @@ exports.isCodexStalePrompt = isCodexStalePrompt;
 exports.isCodexModelPickerFrame = isCodexModelPickerFrame;
 const cli_patterns_1 = require("../../cli-patterns");
 const prompt_detector_1 = require("../../prompt-detector");
+const verdicts_1 = require("../verdicts");
 const status_reason_1 = require("../../status-reason");
 const cli_patterns_2 = require("./cli-patterns");
 const prompt_1 = require("./prompt");
 const frame_1 = require("../frame");
 const dialog_block_1 = require("../dialog-block");
 const live_region_1 = require("./live-region");
+const patterns_1 = require("./patterns");
 const run_detection_1 = require("../run-detection");
 const verified_against_1 = require("../verified-against");
 const thinking_constants_1 = require("../../../../config/thinking-constants");
+function detectCodexPrompt(clean) {
+    return (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)(clean), (0, cli_patterns_1.buildDetectPromptOptions)('codex'));
+}
 /** codex-cli build these rules were read off (#1628 / #1829 / #1890; value in ../verified-against, #1929). */
 exports.VERIFIED_AGAINST = verified_against_1.CODEX_VERIFIED_AGAINST;
 /**
@@ -132,6 +137,23 @@ function isCodexApprovalRequest(promptDetection, selectionWindow) {
 function isCodexDialogGlyphTail(raw) {
     return (0, cli_patterns_2.findCodexBottomGlyphRow)(raw)?.kind === 'option';
 }
+/**
+ * Issue #3205: the bottom content row as the idle/running branches read it.
+ *
+ * A composer holding several lines puts its continuation rows below the `›`
+ * row, so `lastRow` is then the composer's last line (`  world`), which is
+ * neither the `›` the idle branch looks for nor anything codex is working on —
+ * branch C read every such frame as `running`. When the live region's composer
+ * ends on `lastRow`, the composer's `›` row is returned instead, so its 2nd and
+ * later lines are read as composer text and never as transcript or a working
+ * row. Any other frame keeps `lastRow`.
+ */
+function codexTailRowAboveComposerText(frame, lastRow) {
+    const region = (0, frame_1.liveRegionOf)(frame, 'codex');
+    if (region.anchor !== 'composer' || region.composerEndRow !== lastRow)
+        return lastRow;
+    return region.startRow;
+}
 exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
     tool: 'codex',
     verifiedAgainst: exports.VERIFIED_AGAINST,
@@ -168,14 +190,7 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         // content must not be misread as one. CODEX_PAGER_FOOTER_PATTERN does not match the
         // genuine "/model" selection footer, so the 0.8 path below is unaffected (no regression).
         if (cli_patterns_1.CODEX_PAGER_FOOTER_PATTERN.test(frame.lastLines)) {
-            return {
-                status: 'waiting',
-                confidence: 'high',
-                reason: status_reason_1.STATUS_REASON.CODEX_PAGER,
-                hasActivePrompt: false,
-                evidence: 'positive',
-                promptDetection: (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)(frame.clean), (0, cli_patterns_1.buildDetectPromptOptions)('codex')),
-            };
+            return (0, verdicts_1.positiveVerdictWithPrompt)('waiting', status_reason_1.STATUS_REASON.CODEX_PAGER, detectCodexPrompt(frame.clean));
         }
         // 0.75. Codex: the hooks review screens (Issue #1829)
         // codex-cli 0.148.0 answers "1. Review hooks" with a two-screen review UI:
@@ -190,14 +205,7 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         // ordinary text that must not be read as options.
         const codexLifecycleDialog = (0, cli_patterns_1.getCodexLifecycleDialog)((0, frame_1.withLiveRegion)(frame, 'codex'));
         if (codexLifecycleDialog === 'hooks-list' || codexLifecycleDialog === 'hooks-detail') {
-            return {
-                status: 'waiting',
-                confidence: 'high',
-                reason: status_reason_1.STATUS_REASON.CODEX_HOOKS_REVIEW,
-                hasActivePrompt: false,
-                evidence: 'positive',
-                promptDetection: (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)(frame.clean), (0, cli_patterns_1.buildDetectPromptOptions)('codex')),
-            };
+            return (0, verdicts_1.positiveVerdictWithPrompt)('waiting', status_reason_1.STATUS_REASON.CODEX_HOOKS_REVIEW, detectCodexPrompt(frame.clean));
         }
         // 0.8. Codex: selection list detection BEFORE prompt detection (Issue #622)
         // CODEX_SELECTION_LIST_PATTERN matches "press enter to confirm/select" footer.
@@ -213,11 +221,7 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         // Issue #1150: the status bar is located via CODEX_STATUS_BAR_PATTERN (version-
         // independent; matches both legacy "N% left ·" and v0.141 "model · path" bars),
         // and since #2818 via CODEX_TRAILED_STATUS_BAR_PATTERN too (0.154+ "· <title>").
-        const codexFooterBoundary = (0, live_region_1.findCodexFooterBoundary)(contentLines);
-        let codexContentEnd = codexFooterBoundary >= 0 ? codexFooterBoundary - 1 : contentLines.length - 1;
-        while (codexContentEnd >= 0 && contentLines[codexContentEnd].trim() === '') {
-            codexContentEnd--;
-        }
+        const codexContentEnd = (0, live_region_1.findCodexContentEnd)(contentLines) - 1;
         if (codexContentEnd >= 0) {
             const codexSelectionWindow = contentLines
                 .slice(Math.max(0, codexContentEnd - frame_1.STATUS_CHECK_LINE_COUNT + 1), codexContentEnd + 1)
@@ -230,7 +234,7 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
             if (cli_patterns_1.CODEX_SELECTION_LIST_PATTERN.test(codexSelectionWindow) ||
                 cli_patterns_1.CODEX_PICKER_FOOTER_PATTERN.test(codexLastRow) ||
                 cli_patterns_1.CODEX_EFFORT_PICKER_FOOTER_PATTERN.test(codexLastRow)) {
-                const codexPromptDetection = (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)(frame.clean), (0, cli_patterns_1.buildDetectPromptOptions)('codex'));
+                const codexPromptDetection = detectCodexPrompt(frame.clean);
                 // Issue #1628: an approval request wears the same footer as a menu but is the
                 // agent blocked on the human, so it must surface as an active prompt (exit 10
                 // for `wait`, PromptPanel in the UI) instead of a navigable list. The #1160
@@ -238,23 +242,9 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
                 // still inside the window, with Codex running below it, is dead scrollback.
                 if (isCodexApprovalRequest(codexPromptDetection, codexSelectionWindow) &&
                     !isCodexStalePrompt(contentLines)) {
-                    return {
-                        status: 'waiting',
-                        confidence: 'high',
-                        reason: status_reason_1.STATUS_REASON.PROMPT_DETECTED,
-                        hasActivePrompt: true,
-                        evidence: 'positive',
-                        promptDetection: codexPromptDetection,
-                    };
+                    return (0, verdicts_1.activePromptVerdict)(status_reason_1.STATUS_REASON.PROMPT_DETECTED, codexPromptDetection);
                 }
-                return {
-                    status: 'waiting',
-                    confidence: 'high',
-                    reason: status_reason_1.STATUS_REASON.CODEX_SELECTION_LIST,
-                    hasActivePrompt: false,
-                    evidence: 'positive',
-                    promptDetection: codexPromptDetection,
-                };
+                return (0, verdicts_1.positiveVerdictWithPrompt)('waiting', status_reason_1.STATUS_REASON.CODEX_SELECTION_LIST, codexPromptDetection);
             }
         }
         // 0.85. Codex: every OTHER dialog — recognised by structure (Issue #2310)
@@ -292,25 +282,11 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
             if (!codexDialogFrame.footerRecognised) {
                 (0, cli_patterns_2.reportCodexDialogFooterDrift)(codexDialogFrame.footer);
             }
-            const codexPromptDetection = (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)(frame.clean), (0, cli_patterns_1.buildDetectPromptOptions)('codex'));
+            const codexPromptDetection = detectCodexPrompt(frame.clean);
             if (codexPromptDetection.isPrompt) {
-                return {
-                    status: 'waiting',
-                    confidence: 'high',
-                    reason: status_reason_1.STATUS_REASON.PROMPT_DETECTED,
-                    hasActivePrompt: true,
-                    evidence: 'positive',
-                    promptDetection: codexPromptDetection,
-                };
+                return (0, verdicts_1.activePromptVerdict)(status_reason_1.STATUS_REASON.PROMPT_DETECTED, codexPromptDetection);
             }
-            return {
-                status: 'waiting',
-                confidence: 'high',
-                reason: status_reason_1.STATUS_REASON.CODEX_SELECTION_LIST,
-                hasActivePrompt: false,
-                evidence: 'positive',
-                promptDetection: codexPromptDetection,
-            };
+            return (0, verdicts_1.positiveVerdictWithPrompt)('waiting', status_reason_1.STATUS_REASON.CODEX_SELECTION_LIST, codexPromptDetection);
         }
         return null;
     },
@@ -354,19 +330,18 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
             while (lastContentIdx >= 0 && contentLines[lastContentIdx].trim() === '') {
                 lastContentIdx--;
             }
+            // Issue #3205: a multi-line composer ends on its own `›` row here.
+            lastContentIdx = codexTailRowAboveComposerText(frame, lastContentIdx);
             if (lastContentIdx >= 0) {
                 // A. Check content area for thinking indicators (wider window than the shared step)
                 const codexThinkingWindow = contentLines
                     .slice(Math.max(0, lastContentIdx - thinking_constants_1.THINKING_TAIL_LINE_COUNT + 1), lastContentIdx + 1)
                     .join('\n');
-                if ((0, cli_patterns_1.detectThinking)('codex', codexThinkingWindow)) {
-                    return {
-                        status: 'running',
-                        confidence: 'high',
-                        reason: status_reason_1.STATUS_REASON.THINKING_INDICATOR,
-                        hasActivePrompt: false,
-                        evidence: 'positive',
-                    };
+                // Issue #3337: or the live status row, whatever its bullet and header —
+                // codex 0.160.0's `◦ Working (43s • esc to interrupt)` frame reached B.
+                if ((0, cli_patterns_1.detectThinking)('codex', codexThinkingWindow) ||
+                    patterns_1.CODEX_LIVE_STATUS_ROW_PATTERN.test(codexThinkingWindow)) {
+                    return (0, verdicts_1.positiveVerdict)('running', status_reason_1.STATUS_REASON.THINKING_INDICATOR);
                 }
                 // B. Check if the last content line is the idle › prompt.
                 // The last non-empty line above the status bar is the current active line.
@@ -386,26 +361,14 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
                 // ANSI has been stripped still reports idle exactly as it did before.
                 if (cli_patterns_1.CODEX_PROMPT_PATTERN.test(contentLines[lastContentIdx].trim()) &&
                     !isCodexDialogGlyphTail(frame.raw)) {
-                    return {
-                        status: 'ready',
-                        confidence: 'high',
-                        reason: status_reason_1.STATUS_REASON.INPUT_PROMPT,
-                        hasActivePrompt: false,
-                        evidence: 'positive',
-                    };
+                    return (0, verdicts_1.positiveVerdict)('ready', status_reason_1.STATUS_REASON.INPUT_PROMPT);
                 }
                 // C. Fallback: status bar present but neither thinking nor idle › detected.
                 // This means Codex is actively processing — command output has pushed the
                 // • Ran/• Working indicators beyond the 5-line thinking window.
                 // The status bar ("model · N% left · path") is always visible during Codex
                 // sessions, and the only idle state (›) was checked in B above.
-                return {
-                    status: 'running',
-                    confidence: 'high',
-                    reason: status_reason_1.STATUS_REASON.THINKING_INDICATOR,
-                    hasActivePrompt: false,
-                    evidence: 'positive',
-                };
+                return (0, verdicts_1.positiveVerdict)('running', status_reason_1.STATUS_REASON.THINKING_INDICATOR);
             }
         }
         else {
@@ -426,17 +389,15 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
             while (codexTailIdx >= 0 && contentLines[codexTailIdx].trim() === '') {
                 codexTailIdx--;
             }
+            // Issue #3205: as in 2.7, a multi-line composer is read from its `›` row.
+            codexTailIdx = codexTailRowAboveComposerText(frame, codexTailIdx);
             const codexTailIsIdlePrompt = codexTailIdx >= 0 &&
                 cli_patterns_1.CODEX_PROMPT_PATTERN.test(contentLines[codexTailIdx].trim()) &&
                 !isCodexDialogGlyphTail(frame.raw);
-            if (!codexTailIsIdlePrompt && (0, cli_patterns_1.detectThinking)('codex', frame.lastLines)) {
-                return {
-                    status: 'running',
-                    confidence: 'high',
-                    reason: status_reason_1.STATUS_REASON.THINKING_INDICATOR,
-                    hasActivePrompt: false,
-                    evidence: 'positive',
-                };
+            if (!codexTailIsIdlePrompt &&
+                ((0, cli_patterns_1.detectThinking)('codex', frame.lastLines) ||
+                    patterns_1.CODEX_LIVE_STATUS_ROW_PATTERN.test(frame.lastLines))) {
+                return (0, verdicts_1.positiveVerdict)('running', status_reason_1.STATUS_REASON.THINKING_INDICATOR);
             }
         }
         return null;

package/dist/server/src/lib/detection/tools/codex/live-region.js

@@ -9,6 +9,11 @@
  *   separate readings in two files; they are now the two halves of one marker.
  *   Measured: `codex-dialogs-0157/quoted-approval-idle.txt` L997 (composer) under
  *   the quotation at L40-L49.
+ * - **composer end** — the composer's last row (Issue #3205). A composer holding
+ *   several lines draws its continuation rows under the `›` row, so the bottom
+ *   content row is then the composer's last line, not the `›` row. The extent is
+ *   `composer-text.ts`'s {@link findCodexInputBox} (the #1890 reading), mapped
+ *   onto `contentLines` by {@link findCodexComposerEndRow}.
  * - **dialog top** — not declared. codex removes its composer while a dialog is
  *   open and the dialog takes the bottom of the pane (`codex-dialogs-0157/
  *   approval.txt` L987-L1000), so the whole frame is the right fallback.
@@ -19,8 +24,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CODEX_LIVE_REGION = void 0;
 exports.findCodexFooterBoundary = findCodexFooterBoundary;
 exports.findCodexContentEnd = findCodexContentEnd;
+exports.findCodexComposerEndRow = findCodexComposerEndRow;
 const cli_patterns_1 = require("../../cli-patterns");
 const cli_patterns_2 = require("./cli-patterns");
+const composer_text_1 = require("../../composer-text");
+const ansi_1 = require("../../ansi");
 const live_region_1 = require("../live-region");
 /**
  * Index of the Codex status bar within the last 10 content rows, or -1.
@@ -53,14 +61,37 @@ function findCodexContentEnd(contentLines) {
         end--;
     return end + 1;
 }
+/**
+ * Index into `contentLines` of the composer's last row, given its `›` row
+ * (Issue #3205).
+ *
+ * The rows are counted on the RAW capture by {@link findCodexInputBox}, which
+ * is what reads the composer's text for `send` (#1890), so both answer with the
+ * same rows. `contentLines` has had its blank rows compacted, so the raw index
+ * cannot be used as it is; the composer block holds no blank row, though, so
+ * its row count carries over once its first row is the same text as
+ * `composerRow`. Anything else — no input box found, or a different first row —
+ * answers `composerRow`: the one-row composer every rule read before #3205.
+ */
+function findCodexComposerEndRow(raw, contentLines, composerRow, contentEnd) {
+    const rawLines = raw.split('\n');
+    const box = (0, composer_text_1.findCodexInputBox)(rawLines);
+    if (box === null)
+        return composerRow;
+    if ((0, ansi_1.stripAnsi)(rawLines[box.firstRow]).trim() !== contentLines[composerRow]?.trim())
+        return composerRow;
+    const end = Math.min(composerRow + (box.lastRow - box.firstRow), contentEnd - 1);
+    return Math.max(composerRow, end);
+}
 exports.CODEX_LIVE_REGION = {
     composer: {
         locate({ raw, contentLines }) {
             const contentEnd = findCodexContentEnd(contentLines);
             const atBottom = (0, cli_patterns_2.isCodexComposerAtBottom)(raw, contentLines, contentEnd);
             const row = (0, cli_patterns_1.findCodexComposerRow)(contentLines);
-            if (row >= 0)
-                return { start: row, end: row, atBottom };
+            if (row >= 0) {
+                return { start: row, end: findCodexComposerEndRow(raw, contentLines, row, contentEnd), atBottom };
+            }
             if (!atBottom)
                 return null;
             // The raw glyph row said "composer" although its text reads as a numbered