commandmate 0.43.0 → 0.44.1

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_STARTING_WINDOW_MS = exports.COMMAND_CODE_EXIT_COMMAND = exports.COMMAND_CODE_LAUNCH_FLAGS = exports.COMMAND_CODE_COMMAND = void 0;
+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.buildCommandCodeLaunchCommand = buildCommandCodeLaunchCommand;
 exports.isCommandCodeReady = isCommandCodeReady;
 const base_1 = require("./base");
@@ -51,7 +51,9 @@ 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");
 const install_hints_1 = require("./install-hints");
+const plan_review_state_1 = require("../detection/tools/command-code/plan-review-state");
 const session_start_error_1 = require("../../lib/session/session-start-error");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/command-code');
 /** The executable CommandMate launches. See the module docblock for why not `cmd`. */
 exports.COMMAND_CODE_COMMAND = 'commandcode';
@@ -144,6 +146,16 @@ function isCommandCodeReady(rawOutput) {
         return false;
     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).
+ *
+ * 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`.
+ */
+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).';
 /**
  * Command Code CLI tool implementation.
  * Manages `commandcode` sessions using tmux.
@@ -247,11 +259,11 @@ class CommandCodeTool extends base_1.BaseCLITool {
                 });
                 await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.TUI_SESSION_CREATE_WAIT_MS));
             }
-            await (0, tmux_1.sendKeys)(sessionName, buildCommandCodeLaunchCommand({
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(buildCommandCodeLaunchCommand({
                 target: { worktreeId, cliToolId: tool_id_1.COMMAND_CODE_CLI_TOOL_ID, instanceId },
                 executablePath: this.command,
                 worktreePath,
-            }), true);
+            })), true);
             await new Promise((resolve) => setTimeout(resolve, cli_tool_timing_config_1.COMMAND_CODE_INIT_WAIT_MS));
             await this.waitForReady(sessionName);
             logger.info('started-command-code-session');
@@ -301,15 +313,21 @@ 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
+     *   the plan review overlay is on screen (Issue #3125)
      * @throws Error when the composer is not detected within the timeout
      */
     async waitForPrompt(sessionName) {
         const startTime = Date.now();
         const pollInterval = 500;
+        let planReviewPolls = 0;
         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);
-                if (isCommandCodeReady(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)) {
                     this.composerPendingSince.delete(sessionName);
                     return;
                 }
@@ -317,6 +335,14 @@ class CommandCodeTool extends base_1.BaseCLITool {
             catch {
                 // Capture may fail - continue polling
             }
+            // 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
+            // still carry the footer (`after-cancel-partial-redraw.txt`, #2763).
+            planReviewPolls = planReviewUp ? planReviewPolls + 1 : 0;
+            if (planReviewPolls >= 2) {
+                logger.info('command-code-plan-review-blocks-send', { sessionName });
+                throw new Error(exports.COMMAND_CODE_PLAN_REVIEW_SEND_MESSAGE);
+            }
             await new Promise((resolve) => setTimeout(resolve, pollInterval));
         }
         const launchedAt = this.composerPendingSince.get(sessionName);

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

@@ -35,6 +35,7 @@ const tool_id_1 = require("../../lib/hooks/sources/copilot/tool-id");
 const errors_1 = require("../../lib/errors");
 const logger_1 = require("../../lib/logger");
 const install_hints_1 = require("./install-hints");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/copilot');
 /** Interval for polling prompt detection */
 const COPILOT_POLL_INTERVAL_MS = 1000;
@@ -369,7 +370,7 @@ class CopilotTool extends base_1.BaseCLITool {
                 worktreePath,
             });
             // Start Copilot CLI in interactive mode
-            await (0, tmux_1.sendKeys)(sessionName, launchCommand, true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
             // Issue #1907: no blind sleep before this. The 4-second one that used to
             // sit here was a guess at how long copilot takes to paint (measured on
             // 1.0.80: banner at ~1.3 s, folder-trust dialog at ~2.5 s), and it was

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

@@ -22,6 +22,7 @@ const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifec
 const logger_1 = require("../../lib/logger");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/gemini');
 /**
  * Extract error message from unknown error type (DRY)
@@ -128,7 +129,7 @@ class GeminiTool extends base_1.BaseCLITool {
                 executablePath: this.command,
                 worktreePath,
             });
-            await (0, tmux_1.sendKeys)(sessionName, launchCommand, true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
             // Wait for Gemini to initialize (minimum wait for banner/auth)
             await new Promise((resolve) => setTimeout(resolve, GEMINI_INIT_WAIT_MS));
             // Poll until Gemini interactive prompt is ready

package/dist/server/src/lib/cli-tools/liveness-spec.js

@@ -90,22 +90,40 @@ const ADDED_TOOL_DEFAULTS = {
  */
 const LIVENESS_SPECS = {
     /**
-     * claude's is `isSessionHealthy`, unchanged, expressed as a declaration.
+     * claude's is `isSessionHealthy`, expressed as a declaration.
      *
-     * Three fields carry that history and are claude's alone: `aliveTailLines:
-     * null` (the check has always tested the whole frame), `shellPromptPatterns:
-     * []` (the length gate and the endings are the whole rule), and
+     * Two fields carry that history and are claude's alone: `aliveTailLines:
+     * null` (the check has always tested the whole frame) and
      * `unreadableIsExited: true` (an empty pane and a capture that threw have
-     * both meant "unhealthy" since it was written). Issue #2070's acceptance
-     * condition is that claude's verdicts do not move, so none of the three may be
-     * "improved" here — a change would have to be its own Issue, with its own
-     * measurements.
+     * both meant "unhealthy" since it was written). Neither is "improved" here.
+     *
+     * `shellPromptPatterns` is NOT claude's alone any more (Issue #3191). #2070
+     * left it `[]` so claude's verdicts would not move, which kept claude on the
+     * length-gated endings rule — and that rule cannot see a prompt of 40
+     * characters or more. Measured 2026-10-04: after `/exit` the pane fell back
+     * to `maenokota@MAENOnoMac-Studio uat-repo-wt2 %` (42 characters) and the
+     * session stayed `running`, so the next send sat in `waitForPrompt` until
+     * `Prompt detection timeout (10000ms)`; the author's everyday prompt
+     * (`… MyCodeBranchDesk %`, 46) is past the gate too.
+     *
+     * The positive `user@host …` forms are therefore claude's as well. What made
+     * that safe to adopt unnarrowed: every row of every claude screen fixture in
+     * the repository (`tests/fixtures/claude-*`, `tests/unit/detection/tools/
+     * claude/fixtures/`, the #2070 frames — composer, transcript, dialogs,
+     * pickers, banners) was swept against both patterns and NONE matched, not
+     * just none on the bottom row; `tool-liveness-3191.test.ts` keeps that
+     * sweep. The whole-frame `CLAUDE_PROMPT_PATTERN` check still runs first, so
+     * a pane with claude's composer anywhere on it stays alive regardless. Below
+     * the 40-character gate the verdicts are unchanged — a pattern match there
+     * already ended in `$` / `%` / `#` — only the reason reads `shell prompt
+     * detected` instead of `shell prompt ending detected` for a `user@host:…`
+     * row.
      */
     claude: {
         ...SHARED,
         alivePatterns: [cli_patterns_1.CLAUDE_PROMPT_PATTERN],
         aliveTailLines: null,
-        shellPromptPatterns: [],
+        shellPromptPatterns: tool_liveness_1.SHELL_PROMPT_LINE_PATTERNS,
         unreadableIsExited: true,
         fatalPatterns: cli_patterns_1.CLAUDE_SESSION_ERROR_PATTERNS,
         fatalRegexPatterns: cli_patterns_1.CLAUDE_SESSION_ERROR_REGEX_PATTERNS,

package/dist/server/src/lib/cli-tools/opencode-v2.js

@@ -57,6 +57,7 @@ const graceful_exit_1 = require("./graceful-exit");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
 const opencode_executable_1 = require("./opencode-executable");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/opencode-v2');
 const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
 /** Interval between composer polls (launch and send). */
@@ -232,7 +233,7 @@ class OpenCodeV2Tool extends base_1.BaseCLITool {
             if (port === null) {
                 logger.warn('opencode-v2-launch-without-server', { worktreeId, instanceId });
             }
-            await (0, tmux_1.sendKeys)(sessionName, (0, agent_session_lifecycle_1.buildAgentLaunchCommandLine)({ target, executablePath: executable.path, worktreePath }), true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)((0, agent_session_lifecycle_1.buildAgentLaunchCommandLine)({ target, executablePath: executable.path, worktreePath })), true);
             await this.waitForReady(sessionName);
             await (0, runtime_1.attachOpencodeV2EventStream)(target);
             logger.info('started-opencode-v2-session');

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

@@ -75,6 +75,7 @@ const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
 const opencode_executable_1 = require("./opencode-executable");
 const log_diagnosis_1 = require("../../lib/hooks/sources/opencode/log-diagnosis");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/opencode');
 const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
 /**
@@ -393,7 +394,7 @@ class OpenCodeTool extends base_1.BaseCLITool {
                 });
             }
             const launchedAt = Date.now();
-            await (0, tmux_1.sendKeys)(sessionName, launchCommand, true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(launchCommand), true);
             // Issue #1908: poll for opencode's own composer instead of sleeping 15 s.
             await this.waitForReady(sessionName);
             // Issue #1763: subscribe once the server is up. Health-checked first, so

package/dist/server/src/lib/cli-tools/vibe-local.js

@@ -21,6 +21,7 @@ const logger_1 = require("../../lib/logger");
 const cli_tool_timing_config_1 = require("../../config/cli-tool-timing-config");
 const install_hints_1 = require("./install-hints");
 const agent_session_lifecycle_1 = require("../../lib/session/agent-session-lifecycle");
+const launch_screen_1 = require("../../lib/session/launch-screen");
 const logger = (0, logger_1.createLogger)('cli-tools/vibe-local');
 /**
  * Extract error message from unknown error type (DRY)
@@ -123,7 +124,7 @@ class VibeLocalTool extends base_1.BaseCLITool {
             }
             // Start vibe-local in interactive mode with auto-approve (-y)
             // -y flag skips the permission confirmation prompt
-            await (0, tmux_1.sendKeys)(sessionName, vibeLocalCommand, true);
+            await (0, tmux_1.sendKeys)(sessionName, (0, launch_screen_1.withLaunchScreenCleared)(vibeLocalCommand), true);
             // Wait for vibe-local to initialize (banner + model loading)
             await new Promise((resolve) => setTimeout(resolve, VIBE_LOCAL_INIT_WAIT_MS));
             logger.info('started-vibe-local-session:sessionname');

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

@@ -8,6 +8,9 @@ exports.findOpencodeV2DialogTitle = exports.OPENCODE_V2_DIALOG_TITLE_PATTERN = e
 exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_V2_SKIP_PATTERNS = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
+exports.resolveClaudeTrustDialogKeys = resolveClaudeTrustDialogKeys;
+exports.isClaudeTrustDialogOpen = isClaudeTrustDialogOpen;
+exports.isShellPaneCommand = isShellPaneCommand;
 exports.isCodexPromptReady = isCodexPromptReady;
 exports.getCodexActiveDialog = getCodexActiveDialog;
 exports.getCodexLifecycleDialog = getCodexLifecycleDialog;
@@ -229,6 +232,86 @@ function findClaudeChromeStart(lines) {
  * 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;
+}
+/** `#{pane_current_command}` values of an interactive shell, with tmux's `-` login prefix removed. */
+const SHELL_PANE_COMMANDS = new Set(['sh', 'bash', 'zsh', 'fish', 'dash', 'ksh', 'tcsh', 'csh']);
+/**
+ * Whether a pane's foreground command is a shell rather than an agent
+ * (Issue #3089). Claude Code shows up as `claude`, `node` or its version
+ * string (`2.1.287`), never as one of these, so a shell here after the agent
+ * was seen running means the agent has exited.
+ *
+ * @param command - `#{pane_current_command}` of the pane
+ */
+function isShellPaneCommand(command) {
+    return SHELL_PANE_COMMANDS.has(command.trim().replace(/^-/, ''));
+}
+/** 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;
+}
 /**
  * Codex prompt pattern
  * T1.2: Improved to detect empty prompts as well
@@ -1470,12 +1553,22 @@ exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = /Enter\s+to\s+set\s+as\s+default\b
  *   "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|set\s+as\s+default)/;
+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)/;
 /**
  * OpenCode TUI separator pattern (Issue #379)
  * Matches lines composed entirely of box-drawing / TUI decoration characters.

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

@@ -115,6 +115,23 @@ exports.STATUS_REASON = {
     OPENCODE_RESPONSE_COMPLETE: 'opencode_response_complete',
     INPUT_PROMPT: 'input_prompt',
     NO_RECENT_OUTPUT: 'no_recent_output',
+    /**
+     * Issue #3179: the agent's launch is still in progress.
+     *
+     * Published by `current-output-builder` and `worktree-status-helper` while
+     * `lib/session/session-starting-state` holds a record for the instance — from
+     * `beginAgentSession` until `startSession` returns or throws, bounded by the
+     * tool's readiness wait and released early by a dialog the launch does not
+     * answer. The frame underneath (a shell prompt and the launch line, or a trust
+     * dialog the launch is about to answer) is not read while it is up: the status
+     * is `running`, and `isUnclassifiedActive` / `isSelectionListActive` /
+     * `isPromptWaiting` are all false, so no pad, no answer sheet and no `wait`
+     * exit 10 is raised for a screen nobody has to drive.
+     *
+     * ADDITIVE in the sense {@link STATUS_REASON.EXITED} is: a reader that does not
+     * know the token sees a `running` session.
+     */
+    STARTING: 'starting',
     /**
      * Issue #2070: the tmux session is there, and the TOOL is not.
      *

package/dist/server/src/lib/detection/tool-liveness.js

@@ -49,7 +49,9 @@ exports.SHELL_PROMPT_ENDINGS = ['$', '%', '#'];
  * reproduced on renders as `maenokota@MAENOnoMac-Studio work-codex %` — forty
  * characters exactly, i.e. one past this gate — so a codex session that had
  * genuinely fallen back to the shell read as alive. See
- * {@link SHELL_PROMPT_LINE_PATTERNS}.
+ * {@link SHELL_PROMPT_LINE_PATTERNS}. Issue #3191 found the same gap for claude
+ * (`… uat-repo-wt2 %`, 42 characters, after `/exit`), and claude now takes the
+ * line patterns too.
  */
 exports.MAX_SHELL_PROMPT_LENGTH = 40;
 /**

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

@@ -16,12 +16,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.codexStatusDetector = exports.VERIFIED_AGAINST = void 0;
 exports.isCodexStalePrompt = isCodexStalePrompt;
+exports.isCodexModelPickerFrame = isCodexModelPickerFrame;
 const cli_patterns_1 = require("../../cli-patterns");
 const prompt_detector_1 = require("../../prompt-detector");
 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 run_detection_1 = require("../run-detection");
 const verified_against_1 = require("../verified-against");
 const thinking_constants_1 = require("../../../../config/thinking-constants");
@@ -463,3 +465,27 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
         return null;
     },
 });
+/**
+ * Issue #3062: is this frame codex's `/model` picker (either stage)?
+ *
+ * Auto-Yes must not answer it: the digit is an immediate decision, so the
+ * poller would pick the model and the reasoning effort for the operator. It is
+ * judged by the picker's own footer row (`enter select · esc back`, `enter
+ * default · s session · esc back`) rather than by `detectDialog`'s `picker`
+ * kind, which also covers the hooks list/detail screens whose Auto-Yes
+ * behaviour is unchanged. The footer must sit under the option block of a frame
+ * `detectDialog` vouches for, so the same words quoted in a reply do not count.
+ * `/prompt-response` does not call this and keeps accepting an answer.
+ *
+ * @param cleanOutput - The capture Auto-Yes judged (ANSI and box drawing stripped)
+ */
+function isCodexModelPickerFrame(cleanOutput) {
+    const frame = (0, frame_1.normalizeFrame)(cleanOutput);
+    if (!exports.codexStatusDetector.detectDialog(frame))
+        return false;
+    const contentEnd = findCodexContentEnd(frame.contentLines);
+    const block = (0, dialog_block_1.findNumberedOptionBlock)((0, cli_patterns_1.stripBoxDrawing)(frame.clean).split('\n'), contentEnd);
+    return (block !== null &&
+        (cli_patterns_1.CODEX_PICKER_FOOTER_PATTERN.test(block.footer) ||
+            cli_patterns_1.CODEX_EFFORT_PICKER_FOOTER_PATTERN.test(block.footer)));
+}

package/dist/server/src/lib/detection/tools/command-code/plan-review-state.js

@@ -0,0 +1,75 @@
+"use strict";
+/**
+ * Which part of Command Code's plan review overlay has the keyboard
+ * (Issue #3125).
+ *
+ * The detector already says THAT the overlay is up
+ * (`command_code_plan_review`, see `detect.ts`). Answering it needs one more
+ * fact, because the same keys mean different things depending on where the
+ * focus is — measured on 1.58.0 (`tests/fixtures/command-code-plan-review-2763/`)
+ * and unchanged in the 1.74.0 rows #3059 observed
+ * (`tests/fixtures/command-code-plan-review-3125/`):
+ *
+ * | phase            | hint bar (last content row)                  | `Enter` does            |
+ * |------------------|----------------------------------------------|-------------------------|
+ * | `body`           | `type + enter to comment · …`                | opens / pins a comment  |
+ * | `comment-box`    | `enter to pin · esc discard`                 | pins what is typed      |
+ * | `action-focus`   | `↑/↓ choose · enter to run` (a `❯` on a row) | RUNS the focused action |
+ * | `approve-choice` | `←/→ choose · enter confirm · esc back`      | confirms the approval   |
+ *
+ * The body cursor itself is drawn by background colour alone and cannot be read
+ * off a plain capture; the hint bar and the `❯` can, which is all this needs.
+ *
+ * Browser-safe and pure, like `selection-shape.ts` it builds on.
+ *
+ * @module lib/detection/tools/command-code/plan-review-state
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readCommandCodePlanReviewState = readCommandCodePlanReviewState;
+const ansi_1 = require("../../ansi");
+const selection_shape_1 = require("../../selection-shape");
+/** Rows read from the end of the frame — the same 15 the detector reads. */
+const TAIL_CONTENT_ROWS = 15;
+const BODY_HINT = /^\s*type \+ enter to comment\b/i;
+const COMMENT_BOX_HINT = /^\s*enter to pin\s*·\s*esc discard\s*$/i;
+const ACTION_FOCUS_HINT = /^\s*↑\/↓ choose\s*·\s*enter to run\s*$/i;
+const FOCUSED_ACTION_ROW = /^\s*❯ +(?:Submit review\b|Approve\s+ctrl\+a\b|Cancel\s+esc\b)/im;
+const PENDING_BADGE = /^\s*REVIEW\s+(\d+)\s+pending comments?\b/im;
+const APPROVE_WITH_COMMENTS_SELECTED = /\(•\)\s+with\s+\d+\s+comments?\s+as\s+notes/i;
+/**
+ * Read the plan review overlay's focus off a capture.
+ *
+ * @param frame - a raw `capture-pane` frame, ANSI intact or stripped
+ * @returns null when the overlay is not at the bottom of this frame
+ */
+function readCommandCodePlanReviewState(frame) {
+    if (!frame)
+        return null;
+    const rows = (0, ansi_1.stripAnsi)(frame.replace(/\r\n/g, '\n'))
+        .split('\n')
+        .filter((row) => row.trim() !== '')
+        .slice(-TAIL_CONTENT_ROWS);
+    if (rows.length === 0)
+        return null;
+    const tail = rows.join('\n');
+    const pendingMatch = PENDING_BADGE.exec(tail);
+    const pendingComments = pendingMatch ? Number(pendingMatch[1]) : 0;
+    if ((0, selection_shape_1.isCommandCodePlanApproveChoice)(tail)) {
+        return {
+            phase: 'approve-choice',
+            pendingComments,
+            approveChoice: APPROVE_WITH_COMMENTS_SELECTED.test(tail) ? 'with-comments' : 'discard-comments',
+        };
+    }
+    if (!(0, selection_shape_1.hasCommandCodePlanReviewFooterAtBottom)(tail))
+        return null;
+    const hint = rows[rows.length - 1];
+    let phase = 'unknown';
+    if (FOCUSED_ACTION_ROW.test(tail) || ACTION_FOCUS_HINT.test(hint))
+        phase = 'action-focus';
+    else if (COMMENT_BOX_HINT.test(hint))
+        phase = 'comment-box';
+    else if (BODY_HINT.test(hint))
+        phase = 'body';
+    return { phase, pendingComments, approveChoice: null };
+}

package/dist/server/src/lib/hooks/sources/claude/transcript.js

@@ -59,6 +59,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLAUDE_END_TURN_STOP_REASON = exports.CLAUDE_HUMAN_PROMPT_SOURCES = exports.CLAUDE_HUMAN_ORIGIN_KIND = exports.CLAUDE_SLASH_COMMAND_PREFIX = exports.CLAUDE_THINKING_LABEL = exports.MAX_CLAUDE_TOOL_DETAIL_LENGTH = exports.MAX_CLAUDE_TURN_BLOCKS = exports.CLAUDE_TURN_TRUNCATION_MARKER = exports.MAX_CLAUDE_TURN_BODY_LENGTH = exports.CLAUDE_PROJECTS_DIR_SEGMENTS = void 0;
 exports.claudeProjectSlug = claudeProjectSlug;
 exports.claudeSlashCommandPrompt = claudeSlashCommandPrompt;
+exports.claudePastedContentPrompt = claudePastedContentPrompt;
 exports.readClaudeContentBlock = readClaudeContentBlock;
 exports.readClaudeTranscriptRecord = readClaudeTranscriptRecord;
 exports.parseClaudeTranscript = parseClaudeTranscript;
@@ -210,6 +211,37 @@ function claudeSlashCommandPrompt(text) {
     const args = CLAUDE_COMMAND_ARGS_PATTERN.exec(trimmed)?.[1].trim() ?? '';
     return args.length === 0 ? name : `${name} ${args}`;
 }
+/**
+ * A paste's wrapper: `<pasted_content id="X">` … `</pasted_content id="X">`.
+ *
+ * The closing tag repeats the opening tag's id (`\1`), so a pair whose ids
+ * differ — or a tag only mentioned in prose — is not a wrapper and is left alone.
+ * One newline just inside each tag is the wrapper's own framing, not the body's.
+ */
+const CLAUDE_PASTED_CONTENT_PATTERN = /<pasted_content id="([^"<>\s]+)">\n?([\s\S]*?)\n?<\/pasted_content id="\1">/g;
+/**
+ * The text a person sent, with Claude Code's paste wrapper taken off (Issue #3102).
+ *
+ * Claude Code records a multi-line message that arrived as a paste — which is
+ * what CommandMate's tmux send looks like to it — with the body wrapped in
+ * `<pasted_content id="X">…</pasted_content id="X">`. `recordUserTurn` compares
+ * the transcript's text with the `/send` row (and a relay row) byte for byte, so
+ * the wrapper made every such prompt look like a different message and a second
+ * `user` row was written. Unwrapping here lets the existing adoption rules match.
+ *
+ * Every wrapper in the text is replaced by its body, including one inside a
+ * sentence the person typed around a paste. When the result is empty the original
+ * is returned, so this never turns a record into a blank prompt.
+ *
+ * @param text - The record's text, as {@link ClaudeTranscriptRecord.text} holds it
+ * @returns The text without wrappers, or `text` itself when there is none to remove
+ */
+function claudePastedContentPrompt(text) {
+    if (!text.includes('<pasted_content id='))
+        return text;
+    const unwrapped = text.replace(CLAUDE_PASTED_CONTENT_PATTERN, (_match, _id, body) => body);
+    return unwrapped.trim().length === 0 ? text : unwrapped;
+}
 /**
  * Read one `message.content` element.
  *
@@ -517,7 +549,7 @@ function createClaudeTurn(record, sessionId) {
         // A slash command's record is XML and the operator typed a line; #2265 puts
         // the line on the turn so that the `user` row reads `/release v0.30.1` and
         // the `/send` row holding those same bytes is adopted rather than doubled.
-        promptText: claudeSlashCommandPrompt(record.text) ?? record.text,
+        promptText: claudeSlashCommandPrompt(record.text) ?? claudePastedContentPrompt(record.text),
         promptIsOperatorInput: isClaudeOperatorPromptRecord(record),
         blocks: [],
         assistantRecords: 0,

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

@@ -75,6 +75,9 @@ function snapshotFingerprint(payload) {
         // client, or the Esc card outlives the panel it dismisses.
         payload.isDismissablePanelActive ?? false,
         payload.isUnclassifiedActive ?? false,
+        // Issue #3179: the launch ending is a change the client has to see even
+        // when the frame and every flag above are unchanged.
+        payload.startingSince ?? null,
     ]);
 }
 async function captureFreshPayload(worktreeId, cliToolId, instanceId) {
@@ -111,6 +114,8 @@ function emitTerminalSnapshot(worktreeId, cliToolId, payload, instanceId) {
         isPagerActive: payload.isPagerActive ?? false,
         isDismissablePanelActive: payload.isDismissablePanelActive ?? false,
         isUnclassifiedActive: payload.isUnclassifiedActive ?? false,
+        // Issue #3179: so the push and the poll agree on "still starting".
+        startingSince: payload.startingSince ?? null,
         version: nextVersion(key),
     });
 }

package/dist/server/src/lib/session/agent-session-lifecycle.js

@@ -43,6 +43,7 @@ exports.buildAgentLaunchCommandLine = buildAgentLaunchCommandLine;
 const sources_1 = require("../../lib/hooks/sources");
 const agent_event_state_1 = require("../../lib/session/agent-event-state");
 const session_generation_archive_1 = require("../../lib/session/session-generation-archive");
+const session_starting_state_1 = require("../../lib/session/session-starting-state");
 const logger_1 = require("../../lib/logger");
 const logger = (0, logger_1.createLogger)('lib/session/agent-session-lifecycle');
 /**
@@ -66,6 +67,16 @@ const logger = (0, logger_1.createLogger)('lib/session/agent-session-lifecycle')
  * @param at - Epoch ms; defaults to now
  */
 function beginAgentSession(target, at = Date.now()) {
+    // Issue #3179: the launch is in progress from here until
+    // `BaseCLITool.startSession` returns or throws (it clears the record in a
+    // `finally`). First, so the screen stops reading the about-to-be-created pane
+    // as a running agent before anything else here can fail.
+    // Issue #3195: the record is written under the token `startSession` is
+    // running the launch with (an `AsyncLocalStorage`, read inside
+    // `markSessionStarting`), which is how that `finally` knows the record is
+    // its own. A second call from the same launch (codex's
+    // `relaunchIntoSamePane`) rewrites the same launch's record.
+    (0, session_starting_state_1.markSessionStarting)(target.worktreeId, target.cliToolId, target.instanceId, at);
     const before = (0, agent_event_state_1.getAgentEventDropCounts)(target.worktreeId, target.cliToolId, target.instanceId).decisionEvicted;
     (0, agent_event_state_1.beginAgentEventGeneration)(target.worktreeId, target.cliToolId, target.instanceId, at);
     const after = (0, agent_event_state_1.getAgentEventDropCounts)(target.worktreeId, target.cliToolId, target.instanceId).decisionEvicted;

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

@@ -50,8 +50,8 @@ const opencode_executable_1 = require("../../lib/cli-tools/opencode-executable")
 exports.MAX_OUTPUT_SIZE = 10 * 1024 * 1024;
 /** Maximum output size stored in DB (100KB) */
 exports.MAX_STORED_OUTPUT_SIZE = 100 * 1024;
-/** Execution timeout in milliseconds (15 minutes) */
-exports.EXECUTION_TIMEOUT_MS = 15 * 60 * 1000;
+/** Execution timeout in milliseconds (30 minutes, Issue #3107; was 15) */
+exports.EXECUTION_TIMEOUT_MS = 30 * 60 * 1000;
 /** Maximum message length sent to claude -p */
 exports.MAX_MESSAGE_LENGTH = 10000;
 /** Allowed CLI tool identifiers for scheduled execution [DR2-002] derived from CLI_TOOL_IDS */