commandmate 0.49.2 → 0.50.0

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

@@ -15,6 +15,7 @@ const tool_liveness_1 = require("../detection/tool-liveness");
 const codex_update_dialog_config_1 = require("../../config/codex-update-dialog-config");
 const updates_1 = require("../../lib/updates");
 const logger_1 = require("../../lib/logger");
+const launch_answer_skips_1 = require("./launch-answer-skips");
 const sources_1 = require("../../lib/hooks/sources");
 const hooks_config_1 = require("../../lib/hooks/sources/codex/hooks-config");
 const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifecycle");
@@ -29,6 +30,16 @@ const CODEX_INIT_WAIT_MS = 3000;
 const CODEX_POLL_INTERVAL_MS = 1000;
 /** Max attempts for initialization polling (30 * 1000ms = 30s total window) */
 const CODEX_INIT_MAX_ATTEMPTS = 30;
+/**
+ * Issue #4175: the pause after a launch answer the input lock declined. It is
+ * the poll's own, {@link CODEX_POLL_INTERVAL_MS}: a skip used to `continue` past
+ * it, and a lock that declines at once (`recheck-failed`, `session-replaced`,
+ * `input-lock-lost`) then spent all {@link CODEX_INIT_MAX_ATTEMPTS} in no time.
+ * An answer that went out waits `CODEX_DIALOG_SETTLE_MS` instead, never both.
+ */
+function pauseAfterLaunchAnswerSkip() {
+    return new Promise((resolve) => setTimeout(resolve, CODEX_POLL_INTERVAL_MS));
+}
 /**
  * Extra polls `waitForReady` may spend waiting out `npm install -g
  * @openai/codex` under the `update` policy (Issue #2068).
@@ -75,6 +86,10 @@ const CODEX_PROMPT_WAIT_TIMEOUT_MS = 15000;
  * a trailing Enter is so costly here — the number having already advanced the
  * screen, the Enter lands on the NEXT one, which is precisely how a pane ends up
  * two screens deep in the hooks review UI.
+ *
+ * Not so on 0.166.0 (Issue #4134): the footer reads `enter confirm · esc skip`
+ * and the number only moves the cursor. {@link readCodexEnterConfirmedCursor}
+ * tells the two apart; see `sendCodexHooksScreenKey`.
  */
 const CODEX_HOOKS_REVIEW_DECLINE_KEY = '3';
 /**
@@ -124,13 +139,21 @@ const CODEX_HOOKS_TRUST_KEY = 't';
  * more attempts, and only a screen that will not respond at all runs out.
  *
  * Three per screen, because each screen has at most two keys worth trying
- * (`2` then `1` on the review dialog; `t` or `esc` below it) plus one spare for
- * a redraw landing between the capture and the send.
+ * (`2` then `1` on the review dialog, `2` then Enter on 0.166.0; `t` or `esc`
+ * below it) plus one spare for a redraw landing between the capture and the send.
  */
 const CODEX_HOOKS_SCREEN_MAX_ATTEMPTS = 3;
+/**
+ * Enter presses a launch may spend on the folder trust screen of 0.166.0, where
+ * the digit only moves the cursor (Issue #4134). One poll apart.
+ */
+const CODEX_TRUST_ENTER_MAX_PRESSES = 3;
+function isCodexHooksScreen(screen) {
+    return screen === 'hooks-review' || screen === 'hooks-list' || screen === 'hooks-detail' || screen === 'hooks-settled';
+}
 /** A fresh {@link CodexHooksScreenState}. */
 function newHooksScreenState() {
-    return { screen: null, attempts: 0 };
+    return { screen: null, attempts: 0, skips: (0, launch_answer_skips_1.newLaunchAnswerSkips)() };
 }
 /**
  * Whether the pane is sitting on the hooks review dialog.
@@ -293,9 +316,12 @@ class CodexTool extends base_1.BaseCLITool {
         // update branch re-sends "2" every poll and the live prompt gets "222...".
         let updateDialogHandled = false;
         let trustDialogHandled = false;
+        /** Issue #4134: Enter presses spent on a trust screen whose digit only moves the cursor. */
+        let trustEnterPresses = 0;
         // Issue #2315: one budget per hooks screen, reset whenever the screen
         // changes, in place of #1829's single launch-wide escape count.
         const hooksScreenState = newHooksScreenState();
+        const answerSkips = (0, launch_answer_skips_1.newLaunchAnswerSkips)();
         // Issue #2068. Resolved once per launch rather than per poll: the operator
         // does not get to change their mind halfway through one session start, and
         // one reading is one fewer thing that can differ between the frame that saw
@@ -344,10 +370,8 @@ class CodexTool extends base_1.BaseCLITool {
                     // line, so it names a hooks screen only when that screen is what the
                     // pane is actually showing.
                     const lifecycleScreen = (0, cli_patterns_1.getCodexLifecycleDialog)(output);
-                    if (lifecycleScreen === 'hooks-review' ||
-                        lifecycleScreen === 'hooks-list' ||
-                        lifecycleScreen === 'hooks-detail') {
-                        const sent = await this.answerCodexHooksScreen(sessionName, lifecycleScreen, hooksScreenState, trustHooks, readMark);
+                    if (isCodexHooksScreen(lifecycleScreen)) {
+                        const sent = await this.answerCodexHooksScreen(sessionName, lifecycleScreen, output, hooksScreenState, trustHooks, readMark);
                         if (sent) {
                             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.CODEX_DIALOG_SETTLE_MS));
                             continue;
@@ -507,16 +531,21 @@ class CodexTool extends base_1.BaseCLITool {
                             // Issue #3952: as the composer's writer, and only while the update
                             // dialog is still the active one once a send holding it is over.
                             const digit = keyToSend;
-                            const updateOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, () => this.isActiveDialogStill(sessionName, 'update'), () => (0, tmux_1.sendKeys)(sessionName, digit, false));
+                            // Issue #4189: the session's life before the answer's await; a decline of an older life writes no record for the new one.
+                            const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
+                            const updateOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, () => this.isActiveDialogStill(sessionName, 'update'), () => (0, tmux_1.sendKeys)(sessionName, digit, false), { repeatScope: answerSkips });
                             if (!updateOutcome.answered) {
                                 // Nothing typed: the install this lock covers never started.
                                 if (updateLockHeld) {
                                     updateLockHeld = false;
                                     (0, updates_1.releaseAgentUpdateLock)(CODEX_UPDATE_LOCK_TOOL);
                                 }
-                                logger.info('codex-update-dialog-answer-skipped', { sessionName, reason: updateOutcome.reason });
+                                (0, launch_answer_skips_1.noteLaunchAnswerSkipped)(logger, answerSkips, 'codex-update-dialog-answer-skipped', { sessionName, reason: updateOutcome.reason }, answerLife);
+                                // Issue #4175: the poll's own pause, which `continue` would skip.
+                                await pauseAfterLaunchAnswerSkip();
                                 continue;
                             }
+                            (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(answerSkips, 'codex-update-dialog-answer-skipped');
                             updateDialogHandled = true;
                             if (keyToSend === codex_update_dialog_config_1.CODEX_UPDATE_DIALOG_KEYS.update) {
                                 // codex is about to become `npm install`. The prompt this method
@@ -536,11 +565,16 @@ class CodexTool extends base_1.BaseCLITool {
                     // Numbered selection dialogs are dismissed by the number key above, so this
                     // branch is reached only when no number selection is pending.
                     if (activeDialog === 'press-enter') {
-                        const enterOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, () => this.isActiveDialogStill(sessionName, 'press-enter'), () => (0, tmux_1.sendSpecialKey)(sessionName, 'Enter'));
+                        // Issue #4189: the session's life before the answer's await; a decline of an older life writes no record for the new one.
+                        const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
+                        const enterOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, () => this.isActiveDialogStill(sessionName, 'press-enter'), () => (0, tmux_1.sendSpecialKey)(sessionName, 'Enter'), { repeatScope: answerSkips });
                         if (!enterOutcome.answered) {
-                            logger.info('codex-notification-answer-skipped', { sessionName, reason: enterOutcome.reason });
+                            (0, launch_answer_skips_1.noteLaunchAnswerSkipped)(logger, answerSkips, 'codex-notification-answer-skipped', { sessionName, reason: enterOutcome.reason }, answerLife);
+                            // Issue #4175: the poll's own pause, which `continue` would skip.
+                            await pauseAfterLaunchAnswerSkip();
                             continue;
                         }
+                        (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(answerSkips, 'codex-notification-answer-skipped');
                         logger.info('dismissed-codex-notification');
                         await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.CODEX_DIALOG_SETTLE_MS));
                         continue;
@@ -549,16 +583,47 @@ class CodexTool extends base_1.BaseCLITool {
                     // Options: › 1. Yes, continue / 2. No, quit
                     if (activeDialog === 'trust' && !trustDialogHandled) {
                         // Issue #890: number-key selection confirms instantly; no trailing Enter.
-                        const trustOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, () => this.isActiveDialogStill(sessionName, 'trust'), () => (0, tmux_1.sendKeys)(sessionName, '1', false));
+                        // Issue #4189: the session's life before the answer's await; a decline of an older life writes no record for the new one.
+                        const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
+                        const trustOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, () => this.isActiveDialogStill(sessionName, 'trust'), () => (0, tmux_1.sendKeys)(sessionName, '1', false), { repeatScope: answerSkips });
                         if (!trustOutcome.answered) {
-                            logger.info('codex-trust-dialog-answer-skipped', { sessionName, reason: trustOutcome.reason });
+                            (0, launch_answer_skips_1.noteLaunchAnswerSkipped)(logger, answerSkips, 'codex-trust-dialog-answer-skipped', { sessionName, reason: trustOutcome.reason }, answerLife);
+                            // Issue #4175: the poll's own pause, which `continue` would skip.
+                            await pauseAfterLaunchAnswerSkip();
                             continue;
                         }
+                        (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(answerSkips, 'codex-trust-dialog-answer-skipped');
                         trustDialogHandled = true;
                         logger.info('auto-trusted-folder-for-codex');
                         await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.CODEX_DIALOG_SETTLE_MS));
                         continue;
                     }
+                    // Issue #4134: on 0.166.0 the digit above only put the cursor on the
+                    // option, and the screen is still up. Enter, while THIS frame shows the
+                    // cursor on `1. Trust and continue`: Enter on the row below it leaves the
+                    // session (`Back to Agent Command Center`, `Quit`). The second read asks
+                    // for the screen as well as the row: `1. Review hooks` is a row 1 too.
+                    if (activeDialog === 'trust' &&
+                        trustEnterPresses < CODEX_TRUST_ENTER_MAX_PRESSES &&
+                        (0, cli_patterns_1.readCodexEnterConfirmedCursor)(output) === 1) {
+                        // Issue #4189: the session's life before the answer's await; a decline of an older life writes no record for the new one.
+                        const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
+                        const enterOutcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, async () => {
+                            const again = (0, cli_patterns_1.stripAnsi)(await (0, tmux_1.capturePane)(sessionName, 50));
+                            return (0, cli_patterns_1.getCodexActiveDialog)(again) === 'trust' && (0, cli_patterns_1.readCodexEnterConfirmedCursor)(again) === 1;
+                        }, () => (0, tmux_1.sendSpecialKey)(sessionName, 'Enter'), { repeatScope: answerSkips });
+                        if (!enterOutcome.answered) {
+                            (0, launch_answer_skips_1.noteLaunchAnswerSkipped)(logger, answerSkips, 'codex-trust-dialog-answer-skipped', { sessionName, reason: enterOutcome.reason }, answerLife);
+                            // Issue #4175: the poll's own pause, which `continue` would skip.
+                            await pauseAfterLaunchAnswerSkip();
+                            continue;
+                        }
+                        (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(answerSkips, 'codex-trust-dialog-answer-skipped');
+                        trustEnterPresses++;
+                        logger.info('auto-trusted-folder-for-codex', { confirmedWith: 'Enter', attempt: trustEnterPresses });
+                        await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.CODEX_DIALOG_SETTLE_MS));
+                        continue;
+                    }
                 }
                 catch {
                     // Capture may fail during initialization - continue polling
@@ -613,6 +678,11 @@ class CodexTool extends base_1.BaseCLITool {
      * When it is withheld — `CM_CODEX_HOOK_TRUST=never`, or a worktree carrying
      * its own `.codex/hooks.json` — it is the pre-#2315 path: `3`, then `esc`.
      *
+     * On 0.166.0 (Issue #4134) the launch dialog's digit only moves the cursor, so
+     * the answer there is the digit and then Enter, read off the frame each time;
+     * and `t` leaves the list or detail open with nothing to review
+     * (`hooks-settled`), which takes `esc` either way.
+     *
      * The launch dialog gets a second, different key on its second attempt.
      * Numbered options are a menu position codex is free to renumber (this method
      * has been re-pinned for that twice already), so if `2`/`3` did not move the
@@ -621,6 +691,7 @@ class CodexTool extends base_1.BaseCLITool {
      *
      * @param sessionName - tmux session name
      * @param screen - The bottom-most active hooks screen, from `getCodexLifecycleDialog`
+     * @param frame - ANSI-stripped capture that showed `screen`
      * @param state - Per-screen budget, carried across polls by the caller
      * @param trust - Whether trust may be granted, from {@link shouldTrustCodexHooks}
      * @param readMark - {@link instanceInputReadMark} taken before the frame that showed `screen` was read
@@ -628,12 +699,13 @@ class CodexTool extends base_1.BaseCLITool {
      *   found the screen gone (Issue #3952) — either way the caller polls again;
      *   false when this screen's budget is spent
      */
-    async answerCodexHooksScreen(sessionName, screen, state, trust, readMark) {
+    async answerCodexHooksScreen(sessionName, screen, frame, state, trust, readMark) {
         if (state.screen !== screen) {
             // Progress. The pane moved, so the previous screen's spent attempts say
             // nothing about this one.
             state.screen = screen;
             state.attempts = 0;
+            (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(state.skips, 'codex-hooks-screen-answer-skipped');
         }
         if (state.attempts >= CODEX_HOOKS_SCREEN_MAX_ATTEMPTS) {
             logger.warn('codex-hooks-screen-unresponsive', { sessionName, screen, trust });
@@ -644,18 +716,42 @@ class CodexTool extends base_1.BaseCLITool {
         // send that holds it — and is not typed if the hooks screen it was chosen
         // for is gone once that send is over. Inside `sendMessage` under
         // `sendUserMessage`'s lock it joins that lock instead.
-        const outcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, async () => (0, cli_patterns_1.getCodexLifecycleDialog)((0, cli_patterns_1.stripAnsi)(await (0, tmux_1.capturePane)(sessionName, 50))) === screen, () => this.sendCodexHooksScreenKey(sessionName, screen, attempt, trust));
+        // Issue #4189: the session's life before the answer's await; a decline of an older life writes no record for the new one.
+        const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
+        const outcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, async () => {
+            const again = (0, cli_patterns_1.stripAnsi)(await (0, tmux_1.capturePane)(sessionName, 50));
+            // The cursor too: on 0.166.0 the key is chosen from where it stands.
+            return ((0, cli_patterns_1.getCodexLifecycleDialog)(again) === screen &&
+                (0, cli_patterns_1.readCodexEnterConfirmedCursor)(again) === (0, cli_patterns_1.readCodexEnterConfirmedCursor)(frame));
+        }, () => this.sendCodexHooksScreenKey(sessionName, screen, frame, attempt, trust), { repeatScope: state.skips });
         if (!outcome.answered) {
             // Nothing was typed, so this screen's budget is not spent; poll again.
-            logger.info('codex-hooks-screen-answer-skipped', { sessionName, screen, reason: outcome.reason });
+            (0, launch_answer_skips_1.noteLaunchAnswerSkipped)(logger, state.skips, 'codex-hooks-screen-answer-skipped', { sessionName, screen, reason: outcome.reason }, answerLife);
             return true;
         }
         state.attempts = attempt;
+        (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(state.skips, 'codex-hooks-screen-answer-skipped');
         return true;
     }
     /** The key {@link answerCodexHooksScreen} chose, typed as the composer's writer. */
-    async sendCodexHooksScreenKey(sessionName, screen, attempt, trust) {
+    async sendCodexHooksScreenKey(sessionName, screen, frame, attempt, trust) {
         if (screen === 'hooks-review') {
+            // Issue #4134: a digit that only moves the cursor. Enter goes out only when
+            // this frame shows the cursor on the answer: row 1 opens the list and row 3
+            // turns the hooks off, and neither may be confirmed by accident.
+            const cursor = (0, cli_patterns_1.readCodexEnterConfirmedCursor)(frame);
+            if (cursor !== null) {
+                const answer = trust ? CODEX_HOOKS_REVIEW_TRUST_KEY : CODEX_HOOKS_REVIEW_DECLINE_KEY;
+                if (String(cursor) === answer) {
+                    await (0, tmux_1.sendSpecialKey)(sessionName, 'Enter');
+                    logger.info('codex-hooks-review-confirmed', { sessionName, key: answer, attempt, trust });
+                }
+                else {
+                    await (0, tmux_1.sendKeys)(sessionName, answer, false);
+                    logger.info('codex-hooks-review-cursor-moved', { sessionName, key: answer, attempt, trust });
+                }
+                return;
+            }
             const key = attempt === 1
                 ? trust
                     ? CODEX_HOOKS_REVIEW_TRUST_KEY
@@ -667,7 +763,7 @@ class CodexTool extends base_1.BaseCLITool {
             logger.info('codex-hooks-review-answered', { sessionName, key, attempt, trust });
             return;
         }
-        if (trust) {
+        if (trust && screen !== 'hooks-settled') {
             // `t`, the key screens 2 and 3 print in their own footers. Literal, so
             // tmux sends the character rather than resolving it as a key name.
             await (0, tmux_1.sendKeys)(sessionName, CODEX_HOOKS_TRUST_KEY, false, { literal: true });
@@ -701,6 +797,10 @@ class CodexTool extends base_1.BaseCLITool {
         const hooksScreenState = newHooksScreenState();
         /** Resolved lazily — one tmux call, and only if a hooks screen shows up. */
         let trustHooks = null;
+        /** The hooks screen the last read showed, for the error (Issue #4134). */
+        let lastHooksScreen = null;
+        /** The dialog the last read showed; a send does not answer these (Issue #4134). */
+        let lastDialog = null;
         while (Date.now() - startTime < CODEX_PROMPT_WAIT_TIMEOUT_MS) {
             try {
                 const readMark = (0, instance_input_lock_1.instanceInputReadMark)();
@@ -710,7 +810,9 @@ class CodexTool extends base_1.BaseCLITool {
                 // painted OVER a live composer leaves `isCodexPromptReady` true, and
                 // returning there types the user's message into the review UI.
                 const screen = (0, cli_patterns_1.getCodexLifecycleDialog)(output);
-                if (screen === 'hooks-review' || screen === 'hooks-list' || screen === 'hooks-detail') {
+                lastHooksScreen = isCodexHooksScreen(screen) ? screen : null;
+                lastDialog = (0, cli_patterns_1.getCodexActiveDialog)(output);
+                if (isCodexHooksScreen(screen)) {
                     if (trustHooks === null) {
                         // The pane's own directory, for the same reason `relaunchIfToolExited`
                         // asks tmux for it: `sendMessage` is handed a worktree id, not a path,
@@ -718,7 +820,7 @@ class CodexTool extends base_1.BaseCLITool {
                         const worktreePath = await (0, tmux_1.getSessionWorkingDirectory)(sessionName);
                         trustHooks = worktreePath !== null && (0, hooks_config_1.shouldTrustCodexHooks)(worktreePath);
                     }
-                    await this.answerCodexHooksScreen(sessionName, screen, hooksScreenState, trustHooks, readMark);
+                    await this.answerCodexHooksScreen(sessionName, screen, output, hooksScreenState, trustHooks, readMark);
                 }
                 else if ((0, cli_patterns_1.isCodexPromptReady)(output)) {
                     // Issue #890/#892: position-based guard so a residual update/trust dialog
@@ -733,7 +835,18 @@ class CodexTool extends base_1.BaseCLITool {
             await new Promise((resolve) => setTimeout(resolve, pollInterval));
         }
         logger.info('codex-prompt-not-detected');
-        throw new Error('Codex prompt not ready: timed out waiting for the input prompt before sending');
+        if (lastHooksScreen !== null) {
+            // Issue #4134: the reason, in the message `send` reports. Names only the
+            // screen and the setting, nothing captured.
+            // Issue #4161: "did not respond" is untrue of a screen no key reached.
+            const fate = hooksScreenState.attempts === 0 && hooksScreenState.skips.last !== null
+                ? `got no key (${hooksScreenState.skips.last})`
+                : 'did not respond to its keys';
+            throw new Error(`Codex prompt not ready: codex's hook review (${lastHooksScreen}) ${fate}. ` +
+                'Answer it in the terminal, or set CM_CODEX_HOOK_TRUST=bypass');
+        }
+        throw new Error('Codex prompt not ready: timed out waiting for the input prompt before sending' +
+            (lastDialog === null ? '' : ` (the ${lastDialog} dialog is open: answer it in the terminal)`));
     }
     /**
      * Send a message to Codex session

package/dist/server/src/lib/cli-tools/command-code.js

@@ -36,7 +36,7 @@
  * only the correlation.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandCodeTool = exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE = exports.COMMAND_CODE_STARTING_WINDOW_MS = exports.COMMAND_CODE_EXIT_COMMAND = exports.COMMAND_CODE_LAUNCH_FLAGS = exports.COMMAND_CODE_COMMAND = void 0;
+exports.CommandCodeTool = exports.commandCodePlanReviewSendMessage = exports.COMMAND_CODE_STARTING_WINDOW_MS = exports.COMMAND_CODE_EXIT_COMMAND = exports.COMMAND_CODE_LAUNCH_FLAGS = exports.COMMAND_CODE_COMMAND = void 0;
 exports.buildCommandCodeLaunchCommand = buildCommandCodeLaunchCommand;
 exports.isCommandCodeReady = isCommandCodeReady;
 const base_1 = require("./base");
@@ -47,7 +47,10 @@ const tmux_capture_cache_1 = require("../tmux/tmux-capture-cache");
 const cli_patterns_1 = require("../detection/cli-patterns");
 const errors_1 = require("../../lib/errors");
 const logger_1 = require("../../lib/logger");
+const status_detector_1 = require("../detection/status-detector");
 const send_attempt_types_1 = require("../../lib/session/send-attempt-types");
+const respond_target_1 = require("../../lib/session/respond-target");
+Object.defineProperty(exports, "commandCodePlanReviewSendMessage", { enumerable: true, get: function () { return respond_target_1.commandCodePlanReviewSendMessage; } });
 const tool_id_1 = require("../../lib/hooks/sources/command-code/tool-id");
 const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifecycle");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
@@ -147,15 +150,24 @@ function isCommandCodeReady(rawOutput) {
     return !cli_patterns_1.COMMAND_CODE_THINKING_PATTERN.test((0, cli_patterns_1.stripAnsi)(rawOutput));
 }
 /**
- * Why `send` stops at the plan review overlay (Issue #3125).
+ * What held the pane when the wait for the composer ran out (Issue #4161), for the
+ * refusal `send` reports. Names the screen only: nothing captured goes into it.
  *
- * The overlay replaces the composer until a human decides, so waiting for the
- * composer only ran out the clock (`prompt not ready` after the full timeout).
- * Its comments, Submit review, approval and cancel go through `respond`.
+ * @param output - The last capture, ANSI intact; null when the last read failed
  */
-exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE = 'Command Code is showing a plan review (REVIEW), which takes review comments, not messages. ' +
-    'Comment with `commandmate respond <worktree-id> "<text>"`, then `--plan-review submit` (ctrl+r), ' +
-    '`--plan-review approve` (ctrl+a) or `--plan-review cancel` (esc).';
+function describeCommandCodePaneHold(output) {
+    if (output === null)
+        return 'the pane could not be read';
+    if ((0, plan_review_state_1.readCommandCodePlanReviewState)(output) !== null)
+        return 'the plan review is open: answer it in the terminal';
+    const status = (0, status_detector_1.detectSessionStatus)(output, 'command-code');
+    if ((0, status_detector_1.isGeneratingStatus)(status) || cli_patterns_1.COMMAND_CODE_THINKING_PATTERN.test((0, cli_patterns_1.stripAnsi)(output))) {
+        return 'a turn is still being generated';
+    }
+    if (status.hasActivePrompt || status.status === 'waiting')
+        return 'a dialog is open: answer it in the terminal';
+    return 'no composer on the pane: command code may still be starting';
+}
 /**
  * Command Code CLI tool implementation.
  * Manages `commandcode` sessions using tmux.
@@ -295,18 +307,20 @@ class CommandCodeTool extends base_1.BaseCLITool {
      *
      * @throws SessionStartTimeoutError when a just-launched session's composer
      *   has still not appeared
-     * @throws Error ({@link COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE}) at once when
+     * @throws Error ({@link commandCodePlanReviewSendMessage}) at once when
      *   the plan review overlay is on screen (Issue #3125)
      * @throws Error when the composer is not detected within the timeout
      */
-    async waitForPrompt(sessionName) {
+    async waitForPrompt(sessionName, worktreeId, instanceId) {
         const startTime = Date.now();
         const pollInterval = 500;
         let planReviewPolls = 0;
+        let lastOutput = null;
         while (Date.now() - startTime < COMMAND_CODE_PROMPT_WAIT_TIMEOUT_MS) {
             let planReviewUp = false;
             try {
                 const rawOutput = await (0, tmux_1.capturePane)(sessionName, COMMAND_CODE_READINESS_CAPTURE_LINES);
+                lastOutput = rawOutput;
                 // Read first: a focused action row (`❯ Approve  ctrl+a`) is a `❯` row.
                 planReviewUp = (0, plan_review_state_1.readCommandCodePlanReviewState)(rawOutput) !== null;
                 if (!planReviewUp && isCommandCodeReady(rawOutput)) {
@@ -316,6 +330,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
             }
             catch {
                 // Capture may fail - continue polling
+                lastOutput = null;
             }
             // Issue #3125: no composer comes back until a human answers the review.
             // Two polls in a row, because the frame redrawn just after `Esc` can
@@ -323,7 +338,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
             planReviewPolls = planReviewUp ? planReviewPolls + 1 : 0;
             if (planReviewPolls >= 2) {
                 logger.info('command-code-plan-review-blocks-send', { sessionName });
-                throw Object.assign(new Error(exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE), {
+                throw Object.assign(new Error((0, respond_target_1.commandCodePlanReviewSendMessage)(worktreeId, instanceId)), {
                     code: send_attempt_types_1.PLAN_REVIEW_SEND_REFUSED_CODE,
                 });
             }
@@ -340,7 +355,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
             this.composerPendingSince.delete(sessionName);
         }
         logger.info('command-code-prompt-not-ready');
-        throw new Error('Command Code prompt not ready: timed out waiting for the composer before sending');
+        throw new Error(`Command Code prompt not ready: timed out waiting for the composer before sending (${describeCommandCodePaneHold(lastOutput)})`);
     }
     /**
      * Send a message to the Command Code session.
@@ -355,7 +370,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
         // pane when the tool is gone; costs one `capture-pane` when it is not.
         await this.requireSession('Command Code', worktreeId, instanceId, { relaunch: true });
         try {
-            await this.waitForPrompt(sessionName);
+            await this.waitForPrompt(sessionName, worktreeId, instanceId);
             // Issue #1471: body/Enter separation + read-back submit verification.
             await (0, submit_verified_sender_1.sendMessageWithSubmitVerification)({
                 sessionName,