commandmate 0.49.2 → 0.50.0

package/dist/server/src/lib/relay/relay-system-line.js

@@ -8,8 +8,9 @@
  * chat surface, the History tab and any transcript that happens to be open,
  * without a fourth history surface being invented for four sentences.
  *
- * Idempotent: the request id is `relay-sys:<relayId>:<kind>` and each row is
- * probed for before it is written, so a delivery that is retried — which the
+ * Idempotent: the request id is `relay-sys:<relayId>:<kind>` (Issue #4082:
+ * `…:<kind>:<scope>` for a line written once per payload attempt) and each row
+ * is probed for before it is written, in the same transaction, so a delivery that is retried — which the
  * pump does by design — does not stack four "waiting for the reply" lines.
  *
  * Never throws. A transcript line is the least important of a relay's three
@@ -35,23 +36,35 @@ const logger = (0, logger_1.createLogger)('relay-system-line');
  * @param subject - Whose name the sentence carries (always the worker, B)
  * @param at - Epoch ms
  * @param detail - Issue #3957: the overlap and hold reason a `replied` line names
+ * @param scope - Issue #4082: what makes this line one of several of its kind on
+ *   the relay (`<payloadId>:<attemptId>` for `held`); null for the once-per-relay lines
  * @returns Whether a row was written by this call
  */
-function writeRelaySystemLine(db, relayId, kind, target, subject, at = Date.now(), detail = {}) {
-    const requestId = `${chat_db_1.RELAY_SYSTEM_REQUEST_ID_PREFIX}${relayId}:${kind}`;
+function writeRelaySystemLine(db, relayId, kind, target, subject, at = Date.now(), detail = {}, scope = null) {
+    // Issue #4082: the probe and the write key the line through the same builder.
+    const requestId = (0, chat_db_1.relaySystemRequestId)(relayId, kind, scope);
     try {
-        if ((0, chat_db_1.findMessageByRequestId)(db, target.worktreeId, requestId))
+        // Probe and write in one IMMEDIATE transaction: a second connection (or a
+        // second server on the same file) cannot slip its own copy in between.
+        const message = db
+            .transaction(() => {
+            if ((0, chat_db_1.findMessageByRequestId)(db, target.worktreeId, requestId))
+                return null;
+            const locale = (0, model_change_push_notifier_1.resolveReadersLocale)(db);
+            return (0, chat_db_1.createRelaySystemMessage)(db, {
+                worktreeId: target.worktreeId,
+                cliToolId: target.cliToolId,
+                instanceId: target.instanceId,
+                content: (0, relay_messages_1.buildRelaySystemLine)(locale, kind, subject.alias, detail),
+                relayId,
+                kind,
+                scope,
+                at,
+            });
+        })
+            .immediate();
+        if (message === null)
             return false;
-        const locale = (0, model_change_push_notifier_1.resolveReadersLocale)(db);
-        const message = (0, chat_db_1.createRelaySystemMessage)(db, {
-            worktreeId: target.worktreeId,
-            cliToolId: target.cliToolId,
-            instanceId: target.instanceId,
-            content: (0, relay_messages_1.buildRelaySystemLine)(locale, kind, subject.alias, detail),
-            relayId,
-            kind,
-            at,
-        });
         try {
             (0, ws_server_1.broadcastMessage)('message', {
                 worktreeId: target.worktreeId,

package/dist/server/src/lib/relay/types.js

@@ -10,8 +10,9 @@
  * @module lib/relay/types
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LEGACY_RELAY_BINDING_FIELDS = exports.OPEN_RELAY_STATES = void 0;
+exports.LEGACY_RELAY_BINDING_FIELDS = exports.RELAY_HOLD_ACTIONS = exports.OPEN_RELAY_STATES = void 0;
 exports.isOpenRelayState = isOpenRelayState;
+exports.relayRequesterPaneCommand = relayRequesterPaneCommand;
 exports.emptyRelayCounts = emptyRelayCounts;
 /** The states from which a relay can still produce a delivery. */
 exports.OPEN_RELAY_STATES = ['pending', 'prompt'];
@@ -19,7 +20,17 @@ exports.OPEN_RELAY_STATES = ['pending', 'prompt'];
 function isOpenRelayState(state) {
     return exports.OPEN_RELAY_STATES.includes(state);
 }
-/** The v62 fields of a row with no binding, as a legacy relay reads (Issue #3957). */
+/**
+ * The `capture` that shows the requester's pane — where a held relay payload
+ * went (Issue #4064). The exact instance, so an alias or a worktree default
+ * cannot point at another pane.
+ */
+function relayRequesterPaneCommand(requester) {
+    return `commandmate capture ${requester.worktreeId} --instance ${requester.instanceId} --pane`;
+}
+/** Every {@link RelayHoldAction}, for validation. */
+exports.RELAY_HOLD_ACTIONS = ['confirm', 'retry', 'discard'];
+/** The v62 fields of a row with no binding, as a legacy relay reads (Issue #3957), and no delivery hold (#4064). */
 exports.LEGACY_RELAY_BINDING_FIELDS = {
     bindMode: 'legacy',
     sendState: null,
@@ -29,6 +40,7 @@ exports.LEGACY_RELAY_BINDING_FIELDS = {
     obsState: null,
     holdReason: null,
     overlap: null,
+    deliveryHold: null,
 };
 /** An empty {@link RelayCounts}. */
 function emptyRelayCounts() {

package/dist/server/src/lib/response-cleaner.js

@@ -368,16 +368,26 @@ function cleanCopilotResponse(response) {
  *    with a Build marker. Without this trimming, savePendingAssistantResponse
  *    and Layer 2 accumulator would include previous Q&As in the response.
  * 3. Skip empty lines
- * 4. Skip lines matching any OPENCODE_SKIP_PATTERNS (TUI artifacts)
+ * 4. Skip lines matching any of `skipPatterns` (TUI artifacts)
  * 5. Skip Build summary line (OPENCODE_RESPONSE_COMPLETE, the completion indicator)
  * 6. Join remaining lines
  *
+ * Issue #4188: the skip list is the caller's. The default is the whole
+ * `OPENCODE_SKIP_PATTERNS`, which reads the rows only the chrome draws
+ * (`esc interrupt`, `Ask anything...`, `tab agents  ctrl+p commands`, the spinner
+ * run) by their words, wherever they sit. A caller whose rows are known to lie
+ * above the located chrome — the poller's save of an extracted turn and of the
+ * Layer-2 accumulator — passes `OPENCODE_TRANSCRIPT_SKIP_PATTERNS`, so a reply
+ * quoting those rows keeps them. (This replaced `cleanOpenCodeTurnResponse`, a
+ * copy of this function that differed only in that list.)
+ *
  * @param response - Raw OpenCode response (may contain TUI decoration)
+ * @param skipPatterns - Rows to drop; defaults to `OPENCODE_SKIP_PATTERNS`
  * @returns Cleaned response with TUI artifacts removed
  *
  * @internal Exported for unit testing (response-poller-opencode.test.ts)
  */
-function cleanOpenCodeResponse(response) {
+function cleanOpenCodeResponse(response, skipPatterns = cli_patterns_1.OPENCODE_SKIP_PATTERNS) {
     const lines = response.split('\n');
     // Step 2: Trim to latest response by finding Build markers.
     // Each Q&A exchange ends with "square Build . model . time".
@@ -401,7 +411,7 @@ function cleanOpenCodeResponse(response) {
         if (!cleanLine)
             continue;
         // Skip lines matching any OpenCode skip pattern
-        const shouldSkip = cli_patterns_1.OPENCODE_SKIP_PATTERNS.some(pattern => pattern.test(cleanLine));
+        const shouldSkip = skipPatterns.some(pattern => pattern.test(cleanLine));
         if (shouldSkip)
             continue;
         // Skip the Build summary line (completion indicator)

package/dist/server/src/lib/response-extractor.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveOpenCodeTurnRegion = resolveOpenCodeTurnRegion;
 exports.sliceOpenCodeTurn = sliceOpenCodeTurn;
+exports.sliceOpenCodeTurnWithSkip = sliceOpenCodeTurnWithSkip;
 exports.isOpenCodeComplete = isOpenCodeComplete;
 exports.resolveExtractionStartIndex = resolveExtractionStartIndex;
 const cli_patterns_1 = require("./detection/cli-patterns");
@@ -59,11 +60,35 @@ function resolveOpenCodeTurnRegion(lines) {
  *   on screen yet.
  */
 function sliceOpenCodeTurn(output) {
+    return sliceOpenCodeTurnWithSkip(output).turn;
+}
+/**
+ * {@link sliceOpenCodeTurn} plus the skip list its rows may be cleaned with
+ * (Issue #4188).
+ *
+ * When the chrome was located, the slice ends above it by position, so a row of
+ * the slice with the words only the chrome draws (`esc interrupt`,
+ * `Ask anything...`, `tab agents  ctrl+p commands`, the spinner run) is a reply's
+ * row quoting them: {@link OPENCODE_TRANSCRIPT_SKIP_PATTERNS} keeps it. With no
+ * chrome boundary the slice runs to the end of the pane and the words are the
+ * only reading left: the whole {@link OPENCODE_SKIP_PATTERNS}.
+ *
+ * The Layer-2 accumulator is the caller: its rows reach the save
+ * (`turnHeadTruncated`) one at a time with no position, so the position has to
+ * be read here, where the frame still is.
+ *
+ * @param output - Raw `capture-pane` output.
+ * @returns The region's rows (`''` when none) and the skip list for them
+ *
+ * @internal Exported for unit testing
+ */
+function sliceOpenCodeTurnWithSkip(output) {
     const rawLines = output.split('\n');
     const region = resolveOpenCodeTurnRegion(rawLines.map(cli_patterns_1.stripAnsi));
+    const skipPatterns = region.chromeStart >= 0 ? cli_patterns_1.OPENCODE_TRANSCRIPT_SKIP_PATTERNS : cli_patterns_1.OPENCODE_SKIP_PATTERNS;
     if (region.start >= region.end)
-        return '';
-    return rawLines.slice(region.start, region.end).join('\n');
+        return { turn: '', skipPatterns };
+    return { turn: rawLines.slice(region.start, region.end).join('\n'), skipPatterns };
 }
 /**
  * Check if OpenCode has completed its response.
@@ -119,8 +144,13 @@ function isOpenCodeComplete(output) {
     // processing, and must NOT be blocked on a permission dialog. The last two are
     // read from the WHOLE frame: both live in the chrome the region excludes.
     // The "esc interrupt" indicator appears in the TUI footer during model processing.
+    //
+    // Issue #4188: the hint by position — under the composer's bottom border, where
+    // every measured running frame draws it — as the status reader has read it since
+    // #4175. A reply quoting the hint row whole sits above the border, and kept its
+    // turn from ever completing.
     return (cli_patterns_1.OPENCODE_TURN_COMPLETE_PATTERN.test(turnRegion) &&
-        !cli_patterns_1.OPENCODE_PROCESSING_INDICATOR.test(output) &&
+        !(0, cli_patterns_1.isOpencodeProcessingFooter)(output) &&
         !cli_patterns_1.OPENCODE_PERMISSION_PATTERN.test(output));
 }
 /**
@@ -173,6 +203,11 @@ function resolveExtractionStartIndex(lastCapturedLine, totalLines, bufferReset,
     // doesn't grow -- it's always ~PANE_HEIGHT lines. bufferWasReset is often true because
     // lastCapturedLine = totalLines. Must execute BEFORE Branch 1 to avoid Branch 1's small
     // window (40 lines) which fails to find the second-to-last Build marker in a 200-line pane.
+    // Issue #4187: opencode-v2 is an alternate-screen TUI too, but it is not added here
+    // on purpose. The screen reading never saves a V2 reply (V2 has no rule in
+    // `isTurnComplete`; its replies are written from its own server's document,
+    // `lib/hooks/sources/opencode-v2/history`), so it never reaches a completed
+    // extraction that would read this start.
     if (cliToolId === 'opencode' || cliToolId === 'copilot') {
         const foundUserPrompt = findRecentUserPromptIndex(totalLines);
         return foundUserPrompt >= 0 ? foundUserPrompt + 1 : 0;

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

@@ -47,6 +47,7 @@ const session_starting_state_1 = require("../../lib/session/session-starting-sta
 const auto_yes_enter_fallback_state_1 = require("../../lib/polling/auto-yes-enter-fallback-state");
 const instance_input_lock_1 = require("../../lib/session/instance-input-lock");
 const prompt_submit_receipt_1 = require("../../lib/session/prompt-submit-receipt");
+const role_launch_1 = require("../../lib/session/role-launch");
 const session_name_1 = require("../../lib/cli-tools/session-name");
 const logger_1 = require("../../lib/logger");
 const logger = (0, logger_1.createLogger)('lib/session/agent-session-lifecycle');
@@ -81,6 +82,9 @@ function beginAgentSession(target, at = Date.now()) {
     // 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);
+    // Issue #4115: a second call from one launch means its process was replaced,
+    // so the role's generation moves on with it. The role itself does not change.
+    (0, role_launch_1.noteLaunchProcessReplaced)(target);
     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);
     // Issue #3397: Auto-Yes's Enter belongs to the process whose screen it went
@@ -178,7 +182,11 @@ function prepareAgentLaunch(context) {
  *
  * @param context - The instance, its executable, and the worktree it runs in
  * @returns `NAME='value' … command`, ready for `sendKeys`
+ * @throws {RoleLaunchRefusedError} This launch's role cannot be applied (Issue #4115)
  */
 function buildAgentLaunchCommandLine(context) {
-    return (0, sources_1.renderAgentLaunchCommand)(prepareAgentLaunch(context));
+    // Issue #4115: the role, when this runs inside a launch that has one. Applied
+    // here because every driver gets its line here, and outside `prepareLaunch`
+    // because that one fails open, and a role must not.
+    return (0, role_launch_1.renderLaunchCommandWithRole)(context, prepareAgentLaunch(context));
 }

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

@@ -133,6 +133,16 @@ function truncateOutput(output) {
  * @returns Array of CLI arguments
  */
 function buildCliArgs(message, cliToolId, permission, options) {
+    const args = buildCliArgsWithoutRole(message, cliToolId, permission, options);
+    const role = options?.role;
+    if (!role || role.args.length === 0)
+        return args;
+    if (role.headlessPosition === 'trailing')
+        return [...args, ...role.args];
+    // `gh copilot` is the executable's first word, so the role goes after it.
+    return cliToolId === 'copilot' ? [args[0], ...role.args, ...args.slice(1)] : [...role.args, ...args];
+}
+function buildCliArgsWithoutRole(message, cliToolId, permission, options) {
     switch (cliToolId) {
         case 'codex':
             return ['exec', message, '--sandbox', permission ?? 'workspace-write'];
@@ -872,9 +882,11 @@ async function executeClaudeCommand(message, cwd, cliToolId = 'claude', permissi
     // `opencode.json` read was the one under `PWD`. `opencode2 run` has no `--dir`
     // (v1 has), so the child's `PWD` is set to `cwd`. Other tools keep the
     // environment they had.
-    const env = cliToolId === 'opencode-v2'
+    const baseEnv = cliToolId === 'opencode-v2'
         ? { ...(0, env_sanitizer_1.sanitizeEnvForChildProcess)(), PWD: cwd }
         : (0, env_sanitizer_1.sanitizeEnvForChildProcess)();
+    // Issue #4115: composed by the caller from this same sanitized environment.
+    const env = options?.role ? { ...baseEnv, ...options.role.env } : baseEnv;
     return new Promise((resolve) => {
         const child = (0, child_process_1.execFile)(command, args, {
             cwd,

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

@@ -25,6 +25,7 @@ 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 claude_auto_default_nudge_1 = require("../../lib/cli-tools/claude-auto-default-nudge");
 const session_ownership_1 = require("../../lib/cli-tools/session-ownership");
 const session_name_1 = require("../../lib/cli-tools/session-name");
 const sources_1 = require("../../lib/hooks/sources");
@@ -35,6 +36,7 @@ const agent_event_state_1 = require("../../lib/session/agent-event-state");
 const session_start_error_1 = require("../../lib/session/session-start-error");
 const launch_screen_1 = require("../../lib/session/launch-screen");
 const instance_input_lock_1 = require("../../lib/session/instance-input-lock");
+const launch_answer_skips_1 = require("../../lib/cli-tools/launch-answer-skips");
 const session_launch_flight_1 = require("../../lib/session/session-launch-flight");
 const launch_keys_1 = require("../../lib/cli-tools/launch-keys");
 const logger = (0, logger_1.createLogger)('claude-session');
@@ -156,6 +158,69 @@ const TRUST_DIALOG_MAX_MOVES = 20;
 exports.CLAUDE_TRUST_DIALOG_CURSOR_STUCK = 'trust dialog: cursor did not reach "Yes, I trust this folder"';
 /** Reported when Claude Code quit from the trust dialog (Issue #3089). A fixed string, never captured output. */
 exports.CLAUDE_TRUST_DIALOG_EXITED = 'trust dialog: Claude Code exited to the shell';
+/** The log event of a trust-dialog key that did not go out (Issue #4149). */
+const TRUST_KEY_SKIPPED = 'trust-dialog-key-skipped';
+/**
+ * The start budget ran out with a startup dialog on the screen (Issue #4149).
+ *
+ * Nothing about that is slow, so {@link SessionStartTimeoutError}'s sentence would send
+ * the reader off to wait. Still that error to everything that reads it (`code`): the
+ * session is left alive, nothing was typed, the answer is a 503 and no push is sent. The
+ * message follows the module's rule (SEC-SF-002): built only from fixed strings, the
+ * session name, a number and {@link TrustDialogKeySkip}, never captured output.
+ */
+class ClaudeStartupDialogStalledError extends session_start_error_1.SessionStartTimeoutError {
+    /**
+     * @param where - Says what the session is stopped on, and what became of the keys
+     * @param next - What the reader can do: a send to a running process answers only some dialogs
+     */
+    constructor(sessionName, timeoutMs, where, next) {
+        super('Claude Code', sessionName, timeoutMs);
+        this.message =
+            `Claude Code did not reach its input prompt within ${Math.round(timeoutMs / 1000)}s (initialization timeout): ` +
+                `the tmux session '${sessionName}' is stopped on ${where} This is not a slow start, so waiting will not ` +
+                `move it. The message was not delivered. ${next}`;
+        this.name = 'ClaudeStartupDialogStalledError';
+    }
+}
+/**
+ * The error for a start whose budget ran out, by what its last screen shows.
+ *
+ * @param lastScreen - The last pane output read, or null when none could be
+ */
+function startTimeoutError(sessionName, lastScreen, trust) {
+    if (lastScreen !== null && (0, cli_patterns_1.isClaudeTrustDialogOpen)(lastScreen)) {
+        const keys = trust.answers + trust.moves;
+        const fate = keys === 0
+            ? `no key reached it (${trust.lastSkip ?? 'no key was due'})`
+            : `it stayed open after ${keys} keys`;
+        return new ClaudeStartupDialogStalledError(sessionName, exports.CLAUDE_INIT_TIMEOUT, `the folder-trust dialog, and ${fate}. Enter is never pressed while the cursor is on "No, exit".`, 
+        // The process stays, and a send to a running one reuses it without answering this dialog.
+        'A send on its own does not answer this dialog: run `commandmate capture <worktree-id>` to see it, ' +
+            'clear it in a terminal with `commandmate attach <worktree-id>` (each with --instance for a named instance), ' +
+            'then send the message again. A retry before that will not get through.');
+    }
+    if (lastScreen !== null && (0, cli_patterns_1.isClaudeAutoDefaultNudgeOpen)(lastScreen)) {
+        return new ClaudeStartupDialogStalledError(sessionName, exports.CLAUDE_INIT_TIMEOUT, '"Make auto mode your default permission mode?", which did not take its keys. No keeps the current mode.', 
+        // A send answers this one first (answerClaudeAutoDefaultNudgeBeforeSend).
+        'Send it again, or run `commandmate capture <worktree-id>` to see the dialog.');
+    }
+    return new session_start_error_1.SessionStartTimeoutError('Claude Code', sessionName, exports.CLAUDE_INIT_TIMEOUT);
+}
+/**
+ * Record a key that did not go out, at warn (Issue #4149: at info an ERROR-only setting
+ * hid the only trace of a start that sent nothing). Once per reason in a row: a key that
+ * cannot go out is due again on every poll.
+ *
+ * Issue #4211: the record is the wait's {@link LaunchAnswerSkips} (#4189), which is
+ * also the lock's `repeatScope`: a key that went out ends the streak, and a session
+ * made again (`invalidateInstanceInput`) is a new one. `startedIn` is the life taken
+ * before the key's await, as the nudge and the other tools take it.
+ */
+function noteTrustKeySkipped(sessionName, state, key, reason, startedIn) {
+    (0, launch_answer_skips_1.noteLaunchAnswerSkipped)(logger, state.skips, TRUST_KEY_SKIPPED, { sessionName, key, reason }, startedIn);
+    state.lastSkip = reason;
+}
 /**
  * One poll's answer to the folder-trust dialog (Issue #201 / #3078 / #3089).
  *
@@ -178,9 +243,12 @@ exports.CLAUDE_TRUST_DIALOG_EXITED = 'trust dialog: Claude Code exited to the sh
  * @param dialogScreen - ANSI-stripped pane output when the dialog is open, else null
  * @param state - Mutated in place
  * @param readMark - {@link instanceInputLaunchReadMark} taken before `dialogScreen` was captured
+ * @param screenLife - {@link instanceInputAnswerSkipLife} taken before `dialogScreen` was captured
+ *   (review 4211 P2): a decline judged on that screen alone (`cursor-unreadable`) is
+ *   recorded in the life it was read in, not the one after this function's awaits
  * @throws {SessionStartFailedError} When the move budget is spent
  */
-async function answerTrustDialog(sessionName, dialogScreen, state, readMark = (0, instance_input_lock_1.instanceInputLaunchReadMark)()) {
+async function answerTrustDialog(sessionName, dialogScreen, state, readMark = (0, instance_input_lock_1.instanceInputLaunchReadMark)(), screenLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName)) {
     if (state.pollsSinceAnswer !== null)
         state.pollsSinceAnswer++;
     if (state.pollsSinceMove !== null)
@@ -192,23 +260,34 @@ async function answerTrustDialog(sessionName, dialogScreen, state, readMark = (0
         state.shellTellsExit = await paneCommandIsAgent(sessionName);
     }
     const keys = (0, cli_patterns_1.resolveClaudeTrustDialogKeys)(dialogScreen);
-    if (keys === null)
+    if (keys === null) {
+        // Review 4211 P2: the screen's life, taken before `paneCommandIsAgent`'s await. A
+        // session made again meanwhile makes this an old life's decline: its warn, no record.
+        noteTrustKeySkipped(sessionName, state, null, 'cursor-unreadable', screenLife);
         return;
+    }
     if (keys.length === 1) {
         // Cursor on Yes, on this very screen: the Issue #201 Enter.
         const due = state.pollsSinceAnswer === null ||
             (state.pollsSinceAnswer >= TRUST_DIALOG_REANSWER_POLLS && state.answers < TRUST_DIALOG_MAX_ANSWERS);
         if (!due)
             return;
+        // Issue #4211: the life the answer starts in, before its await.
+        const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
         try {
-            if (!(await sendTrustDialogKey(sessionName, readMark, 'Enter')))
+            const skipped = await sendTrustDialogKey(sessionName, readMark, 'Enter', state.skips);
+            if (skipped !== null) {
+                noteTrustKeySkipped(sessionName, state, 'Enter', skipped, answerLife);
                 return;
+            }
+            (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(state.skips, TRUST_KEY_SKIPPED);
             state.pollsSinceAnswer = 0;
             state.answers++;
             logger.info('trust-dialog-detected', { keys: 'Enter', attempt: state.answers });
         }
         catch {
             // Left unhandled so a later poll answers the dialog again
+            noteTrustKeySkipped(sessionName, state, 'Enter', 'send-failed', answerLife);
         }
         return;
     }
@@ -218,15 +297,22 @@ async function answerTrustDialog(sessionName, dialogScreen, state, readMark = (0
     if (state.moves >= TRUST_DIALOG_MAX_MOVES) {
         throw new session_start_error_1.SessionStartFailedError('Claude Code', sessionName, exports.CLAUDE_TRUST_DIALOG_CURSOR_STUCK);
     }
+    // Issue #4211: the life the answer starts in, before its await.
+    const answerLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
     try {
-        if (!(await sendTrustDialogKey(sessionName, readMark, keys[0])))
+        const skipped = await sendTrustDialogKey(sessionName, readMark, keys[0], state.skips);
+        if (skipped !== null) {
+            noteTrustKeySkipped(sessionName, state, keys[0], skipped, answerLife);
             return;
+        }
+        (0, launch_answer_skips_1.forgetLaunchAnswerSkip)(state.skips, TRUST_KEY_SKIPPED);
         state.pollsSinceMove = 0;
         state.moves++;
         logger.info('trust-dialog-cursor-move', { key: keys[0], attempt: state.moves });
     }
     catch {
         // Left unhandled so a later poll moves the cursor again
+        noteTrustKeySkipped(sessionName, state, keys[0], 'send-failed', answerLife);
     }
 }
 /**
@@ -235,9 +321,13 @@ async function answerTrustDialog(sessionName, dialogScreen, state, readMark = (0
  * the read the key was decided on (`readMark`) and the lock, the dialog is read
  * again and the key goes out only if that screen still calls for it.
  *
- * @returns Whether the key was sent; false when it was not (the next poll decides again)
+ * Issue #4211: `repeatScope` is the wait's record, so the lock's own warn of a
+ * decline (`instance-input-answer-*`) is once per streak, as the nudge's is (#4189).
+ *
+ * @param repeatScope - The wait's {@link LaunchAnswerSkips}
+ * @returns null when the key was sent, otherwise why not (the next poll decides again)
  */
-async function sendTrustDialogKey(sessionName, readMark, key) {
+async function sendTrustDialogKey(sessionName, readMark, key, repeatScope) {
     const outcome = await (0, instance_input_lock_1.answerUnderInstanceInputLock)(sessionName, readMark, async () => {
         const screen = await getCleanPaneOutput(sessionName);
         if (!(0, cli_patterns_1.isClaudeTrustDialogOpen)(screen))
@@ -246,10 +336,8 @@ async function sendTrustDialogKey(sessionName, readMark, key) {
         if (keys === null)
             return false;
         return key === 'Enter' ? keys.length === 1 : keys.length > 1 && keys[0] === key;
-    }, () => (key === 'Enter' ? (0, tmux_1.sendKeys)(sessionName, '', true) : (0, tmux_1.sendSpecialKeys)(sessionName, [key])), { mode: 'exclusive' });
-    if (!outcome.answered)
-        logger.info('trust-dialog-key-skipped', { key, reason: outcome.reason });
-    return outcome.answered;
+    }, () => (key === 'Enter' ? (0, tmux_1.sendKeys)(sessionName, '', true) : (0, tmux_1.sendSpecialKeys)(sessionName, [key])), { mode: 'exclusive', repeatScope });
+    return outcome.answered ? null : outcome.reason;
 }
 /**
  * Whether the pane's foreground process is a shell again (Issue #3089). A
@@ -711,13 +799,17 @@ async function startClaudeSession(options) {
         const startTime = Date.now();
         let initialized = false;
         // Issue #3078 / #3089: the trust dialog's progress this start.
-        const trust = { pollsSinceAnswer: null, pollsSinceMove: null, answers: 0, moves: 0, seen: false, shellTellsExit: false };
+        const trust = { pollsSinceAnswer: null, pollsSinceMove: null, answers: 0, moves: 0, lastSkip: null, skips: (0, launch_answer_skips_1.newLaunchAnswerSkips)(), seen: false, shellTellsExit: false };
+        // Issue #4149: what the budget ran out on.
+        let lastScreen = null;
         while (Date.now() - startTime < maxWaitTime) {
             await new Promise((resolve) => setTimeout(resolve, pollInterval));
             // SF-001: Use getCleanPaneOutput helper (DRY)
             let cleanOutput = null;
             // Issue #3975: before the read the trust keys are decided on.
             const readMark = (0, instance_input_lock_1.instanceInputLaunchReadMark)();
+            // Review 4211 P2: the life the screen is read in, for a decline judged on it alone.
+            const screenLife = (0, instance_input_lock_1.instanceInputAnswerSkipLife)(sessionName);
             try {
                 cleanOutput = await getCleanPaneOutput(sessionName);
             }
@@ -727,11 +819,12 @@ async function startClaudeSession(options) {
             if (cleanOutput === null) {
                 continue;
             }
+            lastScreen = cleanOutput;
             // Issue #201 / #3078 / #3089: answer the folder-trust dialog. Checked
             // BEFORE the prompt: the dialog's cursor row (`❯ No, exit`) wears the
             // prompt glyph, so an open dialog is never read as a ready prompt.
             const trustDialogOpen = (0, cli_patterns_1.isClaudeTrustDialogOpen)(cleanOutput);
-            await answerTrustDialog(sessionName, trustDialogOpen ? cleanOutput : null, trust, readMark);
+            await answerTrustDialog(sessionName, trustDialogOpen ? cleanOutput : null, trust, readMark, screenLife);
             // Claude is ready when we see the prompt (DRY-001)
             // Use CLAUDE_PROMPT_PATTERN from cli-patterns.ts for consistency
             // Note: CLAUDE_SEPARATOR_PATTERN was removed from initialization check (Issue #187, P1-1)
@@ -775,7 +868,7 @@ async function startClaudeSession(options) {
         // carried to the caller by the error type rather than lost in a generic
         // message (CONS-005, IMP-001).
         if (!initialized) {
-            throw new session_start_error_1.SessionStartTimeoutError('Claude Code', sessionName, exports.CLAUDE_INIT_TIMEOUT);
+            throw startTimeoutError(sessionName, lastScreen, trust);
         }
         logger.info('started-claude-session');
     }
@@ -815,7 +908,13 @@ async function sendMessageToClaude(worktreeId, message, instanceId) {
     // (`❯ ` can pass for Claude's prompt) — wait for that launch, or, holding the
     // input lock as the send service does, refuse with nothing typed (R1).
     await (0, session_launch_flight_1.settleSessionLaunch)(sessionName, 'Claude Code');
-    await (0, session_key_sender_1.sendMessageToSession)(sessionName, message, exports.CLAUDE_POST_PROMPT_DELAY, exports.CLAUDE_SEND_PROMPT_WAIT_TIMEOUT);
+    // Issue #4134: a process already parked on this dialog starts no launch, so
+    // nothing else answers it and the prompt wait below could only time out.
+    await (0, claude_auto_default_nudge_1.answerClaudeAutoDefaultNudgeBeforeSend)(sessionName);
+    await (0, session_key_sender_1.sendMessageToSession)(sessionName, message, exports.CLAUDE_POST_PROMPT_DELAY, exports.CLAUDE_SEND_PROMPT_WAIT_TIMEOUT, 
+    // Issue #4048: the instance this send is for, so the first prompt's hook
+    // check reads that instance's entry — the same one the name resolves to.
+    { worktreeId, instanceId });
 }
 /**
  * Capture Claude session output

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

@@ -237,7 +237,7 @@ function readAgentEvents(worktreeId, cliToolId, instanceId, resolvedInstanceId)
  * every value below is derived from the arguments, and nothing is assigned
  * outside this function.
  */
-function composePromptData({ worktreeId, cliToolId, instanceId, output, captureWindowLines, statusResult, startingSince, promptWaiting, askUserQuestion, eventSource, }) {
+function composePromptData({ worktreeId, cliToolId, respondInstanceId, output, captureWindowLines, statusResult, startingSince, promptWaiting, askUserQuestion, eventSource, }) {
     const scraperPromptWaiting = statusResult.hasActivePrompt;
     // Issue #1726: the agent's own account of what it asked. It contributes only
     // where some other layer has already established that a dialog is on screen —
@@ -338,9 +338,9 @@ function composePromptData({ worktreeId, cliToolId, instanceId, output, captureW
         : scraperPromptWaiting
             ? correctedPromptData ??
                 scraperPromptData ??
-                (structuredFacts ? (0, structured_prompt_1.buildStructuredPromptData)(worktreeId, structuredFacts, instanceId) : null)
+                (structuredFacts ? (0, structured_prompt_1.buildStructuredPromptData)(worktreeId, structuredFacts, respondInstanceId) : null)
             : structuredFacts
-                ? (0, structured_prompt_1.buildStructuredPromptData)(worktreeId, structuredFacts, instanceId)
+                ? (0, structured_prompt_1.buildStructuredPromptData)(worktreeId, structuredFacts, respondInstanceId)
                 : null;
     // Issue #2870: whether `/prompt-response` would answer the prompt published
     // above, read by the SAME function it re-verifies with. In #2868 `promptData`
@@ -813,7 +813,7 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
     const { structuredFacts, promptData, promptAnswerable } = composePromptData({
         worktreeId,
         cliToolId,
-        instanceId,
+        respondInstanceId: resolvedInstanceId,
         output,
         captureWindowLines,
         statusResult,
@@ -921,7 +921,9 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
             worktreeId,
             cliToolId,
             instanceId: resolvedInstanceId,
-            respondInstanceId: instanceId,
+            // Issue #4063: the instance the live payload's question names, so the
+            // row says the same `respond` whichever caller wrote it.
+            respondInstanceId: resolvedInstanceId,
             state: promptWaiting,
             facts: structuredFacts,
         });