commandmate 0.41.0 → 0.42.0

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

@@ -4,8 +4,8 @@
  * Shared between response-poller.ts and API routes
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-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_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_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_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 = void 0;
+exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_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 = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.isCodexPromptReady = isCodexPromptReady;
@@ -233,6 +233,17 @@ exports.CLAUDE_TRUST_DIALOG_PATTERN = /Yes, I trust this folder/m;
  * T1.2: Improved to detect empty prompts as well
  */
 exports.CODEX_PROMPT_PATTERN = /^›\s*/m;
+/**
+ * The directory/folder trust dialog's question line, across codex builds
+ * (Issue #2884): `Do you trust the contents of this directory?` (<=0.155.1)
+ * and `Trust this folder?` (0.157.1, which dropped the "Do you trust" wording
+ * entirely -- `tests/fixtures/codex-dialogs-0157/trust.txt`). The two variants
+ * are kept as alternatives of one pattern -- rather than duplicated across
+ * {@link CODEX_DIALOG_PATTERN}, `getCodexActiveDialog` and
+ * `getCodexLifecycleDialog` -- so those three cannot drift into disagreeing
+ * about what counts as the trust dialog.
+ */
+exports.CODEX_TRUST_QUESTION_PATTERN = /Do you trust|Trust this folder\?/;
 /**
  * Codex INTERACTIVE startup dialog pattern (Issue #890)
  *
@@ -243,7 +254,7 @@ exports.CODEX_PROMPT_PATTERN = /^›\s*/m;
  * also confirm no INTERACTIVE dialog is still active. This pattern matches markers
  * that appear ONLY in interactive dialogs:
  *   - Interactive update dialog: "Skip until next version" (the option-3 label)
- *   - Trust dialog:              "Do you trust the contents of this directory?"
+ *   - Trust dialog:              {@link CODEX_TRUST_QUESTION_PATTERN}
  *   - Dialog confirm footer:     "Press enter to continue"
  *   - Numbered selection option: "› 1. ..." (leading ›, a digit, a dot)
  *
@@ -259,7 +270,7 @@ exports.CODEX_PROMPT_PATTERN = /^›\s*/m;
  *
  * No /g flag (would make .test() stateful); no nested quantifiers (ReDoS-safe).
  */
-exports.CODEX_DIALOG_PATTERN = /Skip until next version|Do you trust|Press enter to continue|^\s*›\s*\d+\.\s/m;
+exports.CODEX_DIALOG_PATTERN = new RegExp(`Skip until next version|${exports.CODEX_TRUST_QUESTION_PATTERN.source}|Press enter to continue|^\\s*›\\s*\\d+\\.\\s`, 'm');
 /**
  * Codex genuine input-prompt line (Issue #892).
  *
@@ -353,7 +364,7 @@ function getCodexActiveDialog(output) {
         (active.includes('Update') && active.includes('Skip'))) {
         return 'update';
     }
-    if (active.includes('Do you trust')) {
+    if (exports.CODEX_TRUST_QUESTION_PATTERN.test(active)) {
         return 'trust';
     }
     if (active.includes('Press enter to continue')) {
@@ -427,8 +438,6 @@ const CODEX_UPDATE_DIALOG_ANCHORS = [
     /skip until next version/i,
     /^\s*[›❯]?\s*\d+\.\s*Update now/im,
 ];
-/** The directory-trust dialog's question line. */
-const CODEX_TRUST_DIALOG_ANCHOR = /Do you trust/;
 /**
  * Classify the bottom-most ACTIVE codex lifecycle screen (Issue #1829).
  *
@@ -480,7 +489,7 @@ function getCodexLifecycleDialog(output) {
             return null;
         if (CODEX_UPDATE_DIALOG_ANCHORS.some((pattern) => pattern.test(line)))
             return 'update';
-        if (CODEX_TRUST_DIALOG_ANCHOR.test(line))
+        if (exports.CODEX_TRUST_QUESTION_PATTERN.test(line))
             return 'trust';
         // Both anchors required, so a stray "hooks" mention cannot claim the screen.
         if (line.includes(exports.CODEX_HOOKS_REVIEW_ANCHORS[1]) && text.includes(exports.CODEX_HOOKS_REVIEW_ANCHORS[0])) {
@@ -569,6 +578,35 @@ exports.CODEX_APPROVAL_FOOTER_PATTERN = /esc\s+to\s+cancel/i;
  * No /g flag (keeps .test() stateless), no nested quantifiers (ReDoS-safe).
  */
 exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = /^enter\s+to\s+submit\s*\|\s*esc\s+to\s+cancel$/im;
+/**
+ * Codex CLI 0.157 picker footer pattern (Issue #2868).
+ *
+ * codex-cli 0.157.1 retitled `/model` ("Select Model and Effort") and replaced
+ * its "Press enter to confirm or esc to go back" footer with the terse
+ * `enter select · esc back` row (measured: `tests/fixtures/codex-dialogs-0157/`).
+ * CODEX_SELECTION_LIST_PATTERN no longer matched, so branch 0.8 missed the
+ * picker and the dialog entry gate refused the answer (`prompt_no_longer_active`).
+ *
+ * Same construction as CODEX_FORM_SUBMIT_FOOTER_PATTERN: the whole measured row
+ * (`/m` + `^…$`), tested only against a trimmed single footer row — never a
+ * window — so a transcript quoting the words does not vouch for anything.
+ * CODEX_SELECTION_LIST_PATTERN is deliberately left as is (#2774 / #2841).
+ *
+ * No /g flag (keeps .test() stateless), no nested quantifiers (ReDoS-safe).
+ */
+exports.CODEX_PICKER_FOOTER_PATTERN = /^enter\s+select\s*·\s*esc\s+back$/im;
+/**
+ * Codex CLI 0.157 effort-picker footer pattern (Issue #2868).
+ *
+ * The second `/model` step ("Select Reasoning Level for …") closes with
+ * `enter default · s session · esc back` (measured:
+ * `tests/fixtures/codex-dialogs-0157/model-picker-effort.txt`). Same
+ * construction and rules as CODEX_PICKER_FOOTER_PATTERN: the whole row, tested
+ * only against a single trimmed footer row.
+ *
+ * No /g flag (keeps .test() stateless), no nested quantifiers (ReDoS-safe).
+ */
+exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = /^enter\s+default\s*·\s*s\s+session\s*·\s*esc\s+back$/im;
 /**
  * Codex CLI pager / edit-previous (transcript) mode footer pattern (Issue #1017)
  *

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

@@ -121,10 +121,16 @@ exports.CODEX_GLYPH = '›';
  * the command approval, `/model`, `/experimental`, `/keymap` and the
  * directory-trust screen are `waiting`, and every highlighted row is the
  * one-span shape these rules key on. The rules were first read off 0.153.2.
+ *
+ * Advanced to 0.157.1 by Issue #2884: the 0.157.1 dialog screens
+ * (`codex-dialogs-0157/`) read correctly too, including the directory-trust
+ * screen once its WORDING anchor (`CODEX_TRUST_QUESTION_PATTERN` in
+ * `../../cli-patterns`) learned that build's reworded question line
+ * (`Trust this folder?`) -- see `tests/unit/lib/detection/codex-dialogs-0157.test.ts`.
  */
 exports.CODEX_DIALOG_RULES_VERIFIED_AGAINST = {
-    version: '0.155.1',
-    capturedAt: '2026-09-21',
+    version: '0.157.1',
+    capturedAt: '2026-09-27',
     paneGeometry: '200x1000',
 };
 /**

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

@@ -245,7 +245,14 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
             const codexSelectionWindow = contentLines
                 .slice(Math.max(0, codexContentEnd - frame_1.STATUS_CHECK_LINE_COUNT + 1), codexContentEnd + 1)
                 .join('\n');
-            if (cli_patterns_1.CODEX_SELECTION_LIST_PATTERN.test(codexSelectionWindow)) {
+            // Issue #2868: codex 0.157's `/model` steps close with `enter select · esc
+            // back` and `enter default · s session · esc back`. Only the window's LAST
+            // non-blank row is tested against them (never the whole window), so the
+            // same words quoted in a transcript do not count.
+            const codexLastRow = contentLines[codexContentEnd].trim();
+            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'));
                 // 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

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

@@ -96,9 +96,13 @@ function detectCodexDialog(frame, context) {
     //
     // Issue #2609: the approval form's footer is admitted as its own measured row,
     // not by widening the list pattern — an `esc to cancel` alone still vouches
-    // for nothing.
+    // for nothing. Issue #2868: 0.157's two `/model` footers (`enter select ·
+    // esc back`, then `enter default · s session · esc back`) are admitted the
+    // same way.
     if (!cli_patterns_1.CODEX_SELECTION_LIST_PATTERN.test(block.footer) &&
-        !cli_patterns_1.CODEX_FORM_SUBMIT_FOOTER_PATTERN.test(block.footer)) {
+        !cli_patterns_1.CODEX_FORM_SUBMIT_FOOTER_PATTERN.test(block.footer) &&
+        !cli_patterns_1.CODEX_PICKER_FOOTER_PATTERN.test(block.footer) &&
+        !cli_patterns_1.CODEX_EFFORT_PICKER_FOOTER_PATTERN.test(block.footer)) {
         return null;
     }
     // Issue #1160: an already-answered block still inside the window is not a

package/dist/server/src/lib/detection/tools/verified-against.js

@@ -60,10 +60,19 @@ exports.CLAUDE_VERIFIED_AGAINST = {
  * verdict. **The stamp moved to 0.155.1 because every 0.155.1 frame now reads
  * correctly** (`codex-thread-title-bar-2818.test.ts`,
  * `codex-dialogs-0155-2808.test.ts`).
+ *
+ * ## Advanced to 0.157.1 by Issue #2868
+ *
+ * 0.157.1 reworded the `/model` picker's footer to `enter select · esc back`, so
+ * the picker read `prompt_detected` and `/prompt-response` refused its answers.
+ * #2868 ran the #2842 probe (`tests/fixtures/codex-dialogs-0157/`, 2026-09-27):
+ * of the six standard screens only `model-picker.txt` failed, and it reads
+ * `codex_selection_list` again via `CODEX_PICKER_FOOTER_PATTERN`
+ * (`codex-dialogs-0157.test.ts`).
  */
 exports.CODEX_VERIFIED_AGAINST = {
-    version: '0.155.1',
-    capturedAt: '2026-09-21',
+    version: '0.157.1',
+    capturedAt: '2026-09-27',
     paneGeometry: '200x1000',
 };
 /**

package/dist/server/src/lib/hooks/sources/codex/hooks-config.js

@@ -65,10 +65,26 @@
  * resolving the worktree from `cwd`, which is exactly the hand-configured
  * behaviour of Issue #1549. `CM_AGENT_HOOKS_INJECT=0` turns the whole thing off.
  *
+ * ## The shared app-server daemon (Issue #2874)
+ *
+ * From codex **0.157** the TUI attaches by default (`features.daemon_auto_start`)
+ * to one machine-wide `codex app-server --managed-daemon`, and hooks run inside
+ * *that* process, so they see the daemon's environment — the first instance that
+ * started it — not the launching session's. Every later instance was reported as
+ * that first one.
+ *
+ * `-c features.daemon_auto_start=false` ({@link CODEX_EMBEDDED_MODE_ARGS}) only stops
+ * codex *starting* a daemon; one already running is still attached to (Issue #2891 —
+ * #2874 was observed with none up). `--no-daemon` ({@link CODEX_NO_DAEMON_FLAG}) stays
+ * off it even then, when {@link codexSupportsNoDaemon}; both are kept.
+ * Measured 2026-09-27 on codex-cli 0.157.1.
+ *
  * @module lib/hooks/sources/codex/hooks-config
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CODEX_HOOK_TRUST_POLICY_DEFAULT = exports.CODEX_SUPPORTED_EVENTS = exports.CODEX_PERMISSION_REQUEST_EVENT = exports.CODEX_REGISTERED_EVENTS = exports.CODEX_SESSION_END_TIMEOUT_SECONDS = exports.CODEX_HOOK_TRUST_BYPASS_FLAG = exports.CODEX_HOOK_TRUST_ENV_VAR = exports.CODEX_PERMISSION_URL_ENV_VAR = exports.CODEX_EVENT_URL_ENV_VAR = exports.CODEX_INSTANCE_ID_ENV_VAR = exports.CODEX_WORKTREE_ID_ENV_VAR = exports.CODEX_TOOL_ENV_VAR = exports.CODEX_HOME_ENV_VAR = exports.CODEX_HOOK_MARKER = void 0;
+exports.CODEX_HOOK_TRUST_POLICY_DEFAULT = exports.CODEX_SUPPORTED_EVENTS = exports.CODEX_PERMISSION_REQUEST_EVENT = exports.CODEX_REGISTERED_EVENTS = exports.CODEX_SESSION_END_TIMEOUT_SECONDS = exports.CODEX_NO_DAEMON_FLAG = exports.CODEX_EMBEDDED_MODE_ARGS = exports.CODEX_HOOK_TRUST_BYPASS_FLAG = exports.CODEX_HOOK_TRUST_ENV_VAR = exports.CODEX_PERMISSION_URL_ENV_VAR = exports.CODEX_EVENT_URL_ENV_VAR = exports.CODEX_INSTANCE_ID_ENV_VAR = exports.CODEX_WORKTREE_ID_ENV_VAR = exports.CODEX_TOOL_ENV_VAR = exports.CODEX_HOME_ENV_VAR = exports.CODEX_HOOK_MARKER = void 0;
+exports.codexSupportsNoDaemon = codexSupportsNoDaemon;
+exports.resetCodexNoDaemonSupportCacheForTests = resetCodexNoDaemonSupportCacheForTests;
 exports.resolveCodexHookTrustPolicy = resolveCodexHookTrustPolicy;
 exports.isCodexHookTrustBypassEnabled = isCodexHookTrustBypassEnabled;
 exports.shouldTrustCodexHooks = shouldTrustCodexHooks;
@@ -81,6 +97,7 @@ exports.buildCodexHookSettings = buildCodexHookSettings;
 exports.mergeCodexHookSettings = mergeCodexHookSettings;
 exports.writeCodexHookSettings = writeCodexHookSettings;
 exports.buildCodexLaunchPlan = buildCodexLaunchPlan;
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -89,6 +106,7 @@ const types_1 = require("../../../../lib/cli-tools/types");
 const env_1 = require("../../../../lib/env");
 const hook_settings_generator_1 = require("../../../../lib/hooks/hook-settings-generator");
 const logger_1 = require("../../../../lib/logger");
+const env_sanitizer_1 = require("../../../../lib/security/env-sanitizer");
 const path_validator_1 = require("../../../../lib/security/path-validator");
 const event_mapper_1 = require("../event-mapper");
 const relay_install_1 = require("./relay-install");
@@ -134,6 +152,56 @@ exports.CODEX_PERMISSION_URL_ENV_VAR = 'CM_PERMISSION_HOOK_URL';
 exports.CODEX_HOOK_TRUST_ENV_VAR = 'CM_CODEX_HOOK_TRUST';
 /** codex's own flag for running unreviewed hooks, for one invocation. */
 exports.CODEX_HOOK_TRUST_BYPASS_FLAG = '--dangerously-bypass-hook-trust';
+/** codex 0.157+: keep the TUI off the shared app-server daemon so hooks run with this session's env. */
+exports.CODEX_EMBEDDED_MODE_ARGS = '-c features.daemon_auto_start=false';
+/** codex 0.157+: stay off the shared app-server daemon even when one is already running. */
+exports.CODEX_NO_DAEMON_FLAG = '--no-daemon';
+/** How long `codex --help` may take before {@link codexSupportsNoDaemon} gives up. */
+const CODEX_HELP_PROBE_TIMEOUT_MS = 5000;
+/** `--no-daemon` as a whole option name, not the prefix of a longer one. */
+const CODEX_NO_DAEMON_HELP_PATTERN = new RegExp(`${exports.CODEX_NO_DAEMON_FLAG}(?![\\w-])`);
+const noDaemonSupportCache = new Map();
+/**
+ * Whether `executablePath --help` lists `--no-daemon`. Cached per executable path for the
+ * life of the process. Any failure (spawn error, non-zero exit, timeout) → false.
+ *
+ * Decided from the help text, not from a version number: a version that was
+ * read wrongly, or a build that backported or dropped the option, still gets
+ * the answer the binary itself gives. The failure direction is the safe one — an
+ * unrecognised option would stop codex starting at all, whereas a missing flag
+ * only leaves the #2874 behaviour in place. Failures are cached too, so a codex
+ * that hangs on `--help` costs one timeout, not one per launch.
+ *
+ * Synchronous because `prepareLaunch` is. The child gets the sanitised
+ * environment: `executablePath` may be a bare name resolved off the server's
+ * `PATH`, and a `--help` probe has no use for CommandMate's credentials.
+ */
+function codexSupportsNoDaemon(executablePath) {
+    const cached = noDaemonSupportCache.get(executablePath);
+    if (cached !== undefined)
+        return cached;
+    let supported = false;
+    try {
+        const result = (0, child_process_1.spawnSync)(executablePath, ['--help'], {
+            encoding: 'utf8',
+            timeout: CODEX_HELP_PROBE_TIMEOUT_MS,
+            env: (0, env_sanitizer_1.sanitizeEnvForChildProcess)(),
+        });
+        supported =
+            !result.error &&
+                result.status === 0 &&
+                CODEX_NO_DAEMON_HELP_PATTERN.test(String(result.stdout ?? ''));
+    }
+    catch {
+        supported = false;
+    }
+    noDaemonSupportCache.set(executablePath, supported);
+    return supported;
+}
+/** Forget what {@link codexSupportsNoDaemon} has learned. Tests only. */
+function resetCodexNoDaemonSupportCacheForTests() {
+    noDaemonSupportCache.clear();
+}
 /**
  * `SessionEnd`'s budget, in seconds.
  *
@@ -573,8 +641,15 @@ function buildCodexLaunchPlan(executablePath, target, options = {}) {
             [exports.CODEX_EVENT_URL_ENV_VAR]: `http://${CODEX_HOOK_HOST}:${port}${hook_settings_generator_1.AGENT_EVENT_PATH}`,
             [exports.CODEX_PERMISSION_URL_ENV_VAR]: `http://${CODEX_HOOK_HOST}:${port}${hook_settings_generator_1.PERMISSION_REQUEST_PATH}?${query.toString()}`,
         };
+        const noDaemon = (options.supportsNoDaemon ?? codexSupportsNoDaemon(executablePath))
+            ? ` ${exports.CODEX_NO_DAEMON_FLAG}`
+            : '';
         const trust = isCodexHookTrustBypassEnabled() ? ` ${exports.CODEX_HOOK_TRUST_BYPASS_FLAG}` : '';
-        return { command: `${(0, hook_settings_generator_1.shellQuote)(executablePath)}${trust}`, settingsPath, env };
+        return {
+            command: `${(0, hook_settings_generator_1.shellQuote)(executablePath)} ${exports.CODEX_EMBEDDED_MODE_ARGS}${noDaemon}${trust}`,
+            settingsPath,
+            env,
+        };
     }
     catch (error) {
         logger.warn('codex-hooks-config-write-failed', {

package/dist/server/src/lib/polling/auto-yes-dialog-gate.js

@@ -54,13 +54,18 @@
  * @module lib/polling/auto-yes-dialog-gate
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UNSUPPORTED_DIALOG_LAYOUT_REASON = exports.PROMPT_NO_LONGER_ACTIVE_REASON = exports.AUTO_YES_DIALOG_GATE_ENV_VAR = exports.AUTO_YES_DIALOG_GATE_DEFAULT_MODE = exports.AUTO_YES_DIALOG_GATE_MODES = void 0;
+exports.COMMAND_CODE_UNSUPPORTED_QUESTION_MESSAGE = exports.UNSUPPORTED_DIALOG_LAYOUT_REASON = exports.PROMPT_NO_LONGER_ACTIVE_REASON = exports.AUTO_YES_DIALOG_GATE_ENV_VAR = exports.AUTO_YES_DIALOG_GATE_DEFAULT_MODE = exports.AUTO_YES_DIALOG_GATE_MODES = void 0;
 exports.resolveAutoYesDialogGateMode = resolveAutoYesDialogGateMode;
 exports.evaluateAutoYesDialogGate = evaluateAutoYesDialogGate;
 exports.evaluateDialogPresence = evaluateDialogPresence;
 exports.judgePromptResponse = judgePromptResponse;
+exports.assessPromptAnswerability = assessPromptAnswerability;
 const frame_1 = require("../../lib/detection/tools/frame");
 const registry_1 = require("../../lib/detection/tools/registry");
+const prompt_detector_1 = require("../../lib/detection/prompt-detector");
+const cli_patterns_1 = require("../../lib/detection/cli-patterns");
+const dialog_1 = require("../../lib/detection/tools/antigravity/dialog");
+const dialog_2 = require("../../lib/detection/tools/command-code/dialog");
 /** Every accepted value of {@link AutoYesDialogGateMode}, for parsing and tests. */
 exports.AUTO_YES_DIALOG_GATE_MODES = ['enforce', 'legacy'];
 /**
@@ -309,3 +314,74 @@ function judgePromptResponse(promptCheck, presence) {
     }
     return { reason: exports.PROMPT_NO_LONGER_ACTIVE_REASON };
 }
+/**
+ * The refusal text for a Command Code question screen that is plainly up and
+ * could not be read (Issue #2522 確定仕様 B).
+ *
+ * Shares {@link UNSUPPORTED_DIALOG_LAYOUT_REASON} with Issue #2486's refusal —
+ * the reason code is what `respond --json` and the CLI branch on, and both cases
+ * are the same thing: a picker is on screen whose layout no rule could verify.
+ * The SENTENCE is its own because the next step differs in one respect worth
+ * saying out loud: this screen's LIST is what could not be read, so retrying
+ * once the pane has repainted is genuinely worth a try before walking over to it.
+ *
+ * Fixed text that never quotes the answer or the frame (SEC-003), so it is safe
+ * to return to a client verbatim.
+ */
+exports.COMMAND_CODE_UNSUPPORTED_QUESTION_MESSAGE = 'A Command Code question is on screen, but its option list could not be read, so no key was ' +
+    'sent. Answer it in the terminal, or retry once the screen has settled.';
+/**
+ * May this frame be answered from CommandMate? (Issue #2870)
+ *
+ * The ONE reading both `/prompt-response` (before it sends a key) and the status
+ * API (`promptAnswerable`, before the UI offers Send) use, so the two can no
+ * longer disagree: in #2868 the status API published a prompt off the generic
+ * parser alone while `/prompt-response` refused it, and Send did nothing.
+ *
+ * The order is the route's (#161, #2364, #2457, #2486, #2522): the tool's own
+ * reader (agy's `↑/↓ Navigate` dialog, Command Code's question) → the generic
+ * parser → {@link evaluateDialogPresence} → {@link judgePromptResponse}.
+ *
+ * @param cliToolId - CLI tool the frame came from
+ * @param frame - The capture itself (ANSI and box drawing intact). It is cleaned
+ *   here for the parsers; Command Code's reader and the presence gate read it as
+ *   captured (see {@link evaluateDialogPresence}).
+ */
+function assessPromptAnswerability(cliToolId, frame) {
+    const cleanOutput = (0, cli_patterns_1.stripBoxDrawing)((0, cli_patterns_1.stripAnsi)(frame));
+    const toolDialog = cliToolId === 'antigravity'
+        ? (0, dialog_1.detectAntigravityNumberedDialogPrompt)(cleanOutput)
+        : null;
+    const commandCodeQuestion = cliToolId === 'command-code'
+        ? (0, dialog_2.readCommandCodeQuestionDialog)(frame)
+        : { kind: 'none' };
+    // Plainly up and unreadable: refuse before the generic parser, whose partial
+    // list is exactly what must not reach a keystroke.
+    if (commandCodeQuestion.kind === 'unsupported') {
+        return {
+            promptCheck: { isPrompt: false, cleanContent: cleanOutput },
+            isCommandCodeQuestion: false,
+            refusal: {
+                reason: exports.UNSUPPORTED_DIALOG_LAYOUT_REASON,
+                message: exports.COMMAND_CODE_UNSUPPORTED_QUESTION_MESSAGE,
+            },
+            presence: {
+                present: false,
+                dialog: null,
+                mode: exports.AUTO_YES_DIALOG_GATE_DEFAULT_MODE[cliToolId] ?? 'legacy',
+                gated: false,
+            },
+        };
+    }
+    const isCommandCodeQuestion = commandCodeQuestion.kind === 'prompt';
+    const promptCheck = (commandCodeQuestion.kind === 'prompt' ? commandCodeQuestion.prompt : null)
+        ?? toolDialog
+        ?? (0, prompt_detector_1.detectPrompt)(cleanOutput, (0, cli_patterns_1.buildDetectPromptOptions)(cliToolId));
+    const presence = evaluateDialogPresence(cliToolId, promptCheck.promptData?.type, frame);
+    return {
+        promptCheck,
+        isCommandCodeQuestion,
+        refusal: judgePromptResponse(promptCheck, presence),
+        presence,
+    };
+}

package/dist/server/src/lib/realtime/terminal-broadcast.js

@@ -63,6 +63,11 @@ function snapshotFingerprint(payload) {
         payload.sessionStatus,
         payload.thinking ?? false,
         payload.isPromptWaiting ?? false,
+        // Issue #2887: so a redraw whose only change is this verdict (a dialog's
+        // answerability flipping between `#2870`'s judgement calls) still reaches
+        // the push, the same reason `sessionStatus` and the two dismiss-panel
+        // fields above are here.
+        payload.promptAnswerable ?? null,
         payload.isSelectionListActive ?? false,
         payload.isPagerActive ?? false,
         // Issue #2369: in the fingerprint for the same reason `sessionStatus` is —
@@ -96,6 +101,12 @@ function emitTerminalSnapshot(worktreeId, cliToolId, payload, instanceId) {
         thinking: payload.thinking ?? false,
         isPromptWaiting: payload.isPromptWaiting ?? false,
         promptData: payload.promptData ?? null,
+        // Issue #2887: straight through, unlike its neighbours above — not
+        // `?? false`. `buildCurrentOutput` publishes this only when it judged the
+        // prompt (#2870), and `undefined` here means "no verdict", which
+        // `JSON.stringify` (in `broadcast`) already drops from the wire on its own.
+        // Defaulting it would turn "not judged" into a judgement.
+        promptAnswerable: payload.promptAnswerable,
         isSelectionListActive: payload.isSelectionListActive ?? false,
         isPagerActive: payload.isPagerActive ?? false,
         isDismissablePanelActive: payload.isDismissablePanelActive ?? false,

package/dist/server/src/lib/session/adopt-legacy-sessions.js

@@ -0,0 +1,89 @@
+"use strict";
+/**
+ * Keep using this server's pre-namespace tmux sessions (Issue #2866).
+ *
+ * Once a namespace is set, `resolveSessionName` names a session
+ * `mcbd-{ns}-{cli}-{worktreeId}[-{suffix}]`. A session the same server started
+ * before that is still running under `mcbd-{cli}-{worktreeId}[-{suffix}]`, and
+ * would vanish from the UI while its agent keeps running. It is NOT renamed —
+ * an older CommandMate running beside this one, or this one after a downgrade,
+ * must still find it — but adopted: the new-format name is aliased to the
+ * legacy one (`legacy-session-alias.ts`), and the alias is dropped once the
+ * legacy session is killed or found gone.
+ *
+ * Only a session whose `#{session_path}` is the worktree's own directory is
+ * adopted (Issue #2865): the same legacy name may be another server's session.
+ *
+ * Runs once at startup, after `initSessionNamespace` and the worktree-ID
+ * session reconcile.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adoptLegacySessions = adoptLegacySessions;
+const session_name_1 = require("../../lib/cli-tools/session-name");
+const session_namespace_1 = require("../../lib/cli-tools/session-namespace");
+const session_ownership_1 = require("../../lib/cli-tools/session-ownership");
+const legacy_session_adoption_1 = require("../../lib/cli-tools/legacy-session-adoption");
+const logger_1 = require("../../lib/logger");
+const session_instance_targets_1 = require("./session-instance-targets");
+const logger = (0, logger_1.createLogger)('adopt-legacy-sessions');
+/**
+ * Every worktree row. Queried directly rather than through `worktree-db`, for
+ * the same reason `worktree-session-reconcile.ts` does: suites mock that module.
+ */
+function readWorktrees(db) {
+    return db.prepare('SELECT id, path FROM worktrees').all();
+}
+/**
+ * Alias each worktree instance's new-format session name to its live legacy
+ * session, when the legacy session is this worktree's own and no new-format
+ * session exists yet.
+ *
+ * Never throws — a startup pass must not be able to stop the server.
+ *
+ * @param db - Database instance (worktrees and the agent roster)
+ */
+async function adoptLegacySessions(db, options) {
+    const result = { adopted: [], errors: [] };
+    const namespace = options?.namespace !== undefined ? options.namespace : (0, session_namespace_1.getSessionNamespace)();
+    // No namespace: the current name IS the legacy name, nothing to adopt.
+    if (namespace === null)
+        return result;
+    const list = options?.tmux?.listSessions ?? legacy_session_adoption_1.listSessions;
+    const isOwnedBy = options?.tmux?.isSessionOwnedBy ?? session_ownership_1.isSessionPathOwnedBy;
+    let livePaths;
+    let worktrees;
+    try {
+        const sessions = await list();
+        livePaths = new Map(sessions.map((session) => [session.name, session.path]));
+        worktrees = livePaths.size === 0 ? [] : readWorktrees(db);
+    }
+    catch (error) {
+        result.errors.push(error instanceof Error ? error.message : String(error));
+        logger.warn('adopt-legacy:failed', { error: result.errors[0] });
+        return result;
+    }
+    for (const worktree of worktrees) {
+        for (const { cliToolId, instanceId } of (0, session_instance_targets_1.collectInstanceTargets)(db, [worktree.id])) {
+            try {
+                const legacyName = (0, session_name_1.resolveLegacySessionName)(cliToolId, worktree.id, instanceId);
+                if (!livePaths.has(legacyName))
+                    continue;
+                const newName = (0, session_name_1.resolveNamespacedSessionName)(namespace, cliToolId, worktree.id, instanceId);
+                if (livePaths.has(newName))
+                    continue;
+                if (!isOwnedBy(livePaths.get(legacyName) ?? null, worktree.path))
+                    continue;
+                (0, legacy_session_adoption_1.registerLegacyAlias)(newName, legacyName);
+                result.adopted.push({ worktreeId: worktree.id, newName, legacyName });
+            }
+            catch (error) {
+                result.errors.push(`${worktree.id}/${instanceId}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+    }
+    logger.info('adopt-legacy:complete', {
+        adopted: result.adopted.length,
+        errors: result.errors.length,
+    });
+    return result;
+}

package/dist/server/src/lib/session/claude-session.js

@@ -27,8 +27,9 @@ const child_process_1 = require("child_process");
 const util_1 = require("util");
 const promises_1 = require("fs/promises");
 const logger_1 = require("../../lib/logger");
+const session_ownership_1 = require("../../lib/cli-tools/session-ownership");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
-const types_1 = require("../../lib/cli-tools/types");
+const session_name_1 = require("../../lib/cli-tools/session-name");
 const sources_1 = require("../../lib/hooks/sources");
 const hook_settings_generator_1 = require("../../lib/hooks/hook-settings-generator");
 const cmate_cli_tool_parser_1 = require("../../lib/cmate-cli-tool-parser");
@@ -340,9 +341,9 @@ async function ensureHealthySession(sessionName) {
  * Get tmux session name for a worktree
  *
  * Issue #868: Supports additional agent instances. The primary instance
- * (instanceId omitted or equal to 'claude') keeps the original
- * `mcbd-claude-{worktreeId}` name for backward compatibility. Additional
- * instances append a suffix derived from the instance ID.
+ * (instanceId omitted or equal to 'claude') carries no suffix; additional
+ * instances append a suffix derived from the instance ID. Issue #2866: the
+ * rule is `resolveSessionName`'s (server namespace included).
  *
  * @param worktreeId - Worktree ID
  * @param instanceId - Optional agent instance ID (defaults to primary)
@@ -355,12 +356,11 @@ async function ensureHealthySession(sessionName) {
  * ```
  */
 function getSessionName(worktreeId, instanceId) {
-    const base = `mcbd-claude-${worktreeId}`;
-    if (!instanceId || instanceId === 'claude') {
-        return base;
-    }
-    const suffix = (0, types_1.deriveSessionSuffix)(instanceId, 'claude');
-    return suffix ? `${base}-${suffix}` : base;
+    // Issue #2866: delegated so the server namespace and adopted legacy sessions
+    // apply to Claude exactly as to every other tool. A local copy of the rule
+    // would start, send to and stop `mcbd-claude-*` while capture and the UI
+    // address `mcbd-{ns}-claude-*`.
+    return (0, session_name_1.resolveSessionName)('claude', worktreeId, instanceId);
 }
 /**
  * Check if Claude is installed and available
@@ -486,6 +486,9 @@ async function startClaudeSession(options) {
     // Check if session already exists
     const exists = await (0, tmux_1.hasSession)(sessionName);
     if (exists) {
+        // Issue #2865: a same-named session another CommandMate server created is
+        // refused before the health check can kill or reuse it.
+        await (0, session_ownership_1.assertSessionNotForeign)(sessionName, worktreePath);
         // SF-S2-004: Health check on existing session
         const healthy = await ensureHealthySession(sessionName);
         if (healthy) {

package/dist/server/src/lib/session/current-output-builder.js

@@ -85,6 +85,7 @@ const prompt_waiting_composition_1 = require("../../lib/session/prompt-waiting-c
 const provisional_turn_1 = require("../../lib/session/provisional-turn");
 const status_evidence_1 = require("../../lib/session/status-evidence");
 const ask_user_question_prompt_1 = require("../../lib/session/ask-user-question-prompt");
+const auto_yes_dialog_gate_1 = require("../../lib/polling/auto-yes-dialog-gate");
 const layer_disagreement_1 = require("../../lib/session/layer-disagreement");
 const structured_prompt_1 = require("../../lib/session/structured-prompt");
 const logger = (0, logger_1.createLogger)('current-output-builder');
@@ -632,6 +633,9 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
     const resolvedInstanceId = instanceId ?? cliToolId;
     const manager = manager_1.CLIToolManager.getInstance();
     const cliTool = manager.getTool(cliToolId);
+    // Issue #2886: read once, independent of `isRunning`, so both return paths
+    // below publish the same value the pane is (or would be) reached at.
+    const sessionName = cliTool.getSessionName(worktreeId, instanceId);
     const stopEventAt = (0, agent_event_state_1.getLastStopEventAt)(worktreeId, cliToolId, instanceId);
     const lastEvent = (0, agent_event_state_1.getLastAgentEvent)(worktreeId, cliToolId, instanceId);
     // Issue #1924: the registry answers for every tool — a real implementation
@@ -743,6 +747,7 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
         (0, status_evidence_1.forgetLastKnownStatus)((0, auto_yes_manager_1.buildCompositeKey)(worktreeId, cliToolId, instanceId));
         return {
             isRunning: false,
+            sessionName,
             content: '',
             lineCount: 0,
             cliToolId,
@@ -1029,6 +1034,17 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
         : structuredFacts
             ? (0, structured_prompt_1.buildStructuredPromptData)(worktreeId, structuredFacts)
             : null;
+    // Issue #2870: whether `/prompt-response` would answer the prompt published
+    // above, read by the SAME function it re-verifies with. In #2868 `promptData`
+    // came off the generic parser alone, the route refused it, and the UI's Send
+    // did nothing. Only for a parser-read prompt: the structured form (hook
+    // `decisionId`, degraded) is answered by id or not by number at all, so the
+    // key is left out there, as it is when no prompt is up. `isPromptWaiting` /
+    // `promptData` / `sessionStatus` are untouched — `wait`'s exit 10, Auto-Yes
+    // and push notifications keep reading exactly what they read before.
+    const promptAnswerable = scraperPromptWaiting && (correctedPromptData ?? scraperPromptData)
+        ? (0, auto_yes_dialog_gate_1.assessPromptAnswerability)(cliToolId, output).refusal === null
+        : undefined;
     // Issue #1723 §3: the field data this Epic is being built on. Every line is
     // one poll where the screen and the agent disagreed about what the agent was
     // doing, which is the only way to answer "how wrong was the scraper?" with a
@@ -1165,6 +1181,7 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
     const lastKnown = (0, status_evidence_1.getLastKnownStatus)(compositeKey);
     return {
         isRunning: true,
+        sessionName,
         cliToolId,
         sessionStatus: merged.status,
         sessionStatusReason: merged.reason,
@@ -1181,6 +1198,7 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
         thinkingMessage: merged.thinking ? `${(0, types_2.getCliToolDisplayName)(cliToolId)} is thinking...` : null,
         isPromptWaiting,
         promptData,
+        ...(promptAnswerable !== undefined ? { promptAnswerable } : {}),
         autoYes: {
             enabled: autoYesState?.enabled ?? false,
             expiresAt: autoYesState?.enabled ? autoYesState.expiresAt : null,