commandmate 0.49.1 → 0.49.2

package/dist/cli/commands/respond.d.ts

@@ -13,8 +13,8 @@ import { Command } from 'commander';
 export declare const ANSWER_NOT_DELIVERED = "answer_not_delivered";
 /**
  * Issue #3975: the answer was stopped part-way — some of its keys may be on
- * the pane. `/prompt-response` answers it as a 500 whose `error` carries this
- * code. Restated from `src/lib/prompt-answer-errors.ts` (`ANSWER_INPUT_LOST_REASON`).
+ * the pane. Both routes answer it as a 500 with this `reason` (Issue #3982).
+ * Restated from `src/lib/prompt-answer-errors.ts` (`ANSWER_INPUT_LOST_REASON`).
  */
 export declare const ANSWER_INPUT_LOST = "answer_input_lost";
 export declare function createRespondCommand(): Command;

package/dist/cli/commands/respond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"respond.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/respond.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgKpC;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAoUrD,wBAAgB,oBAAoB,IAAI,OAAO,CA2I9C"}
+{"version":3,"file":"respond.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/respond.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkKpC;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AA0TrD,wBAAgB,oBAAoB,IAAI,OAAO,CA6I9C"}

package/dist/cli/commands/respond.js

@@ -16,6 +16,8 @@ const cli_tool_ids_1 = require("../config/cli-tool-ids");
 const agent_target_options_1 = require("../config/agent-target-options");
 const instances_1 = require("./instances");
 const command_target_1 = require("./command-target");
+const follow_up_command_1 = require("../utils/follow-up-command");
+const server_capabilities_1 = require("../utils/server-capabilities");
 const respond_strict_1 = require("./respond-strict");
 const kinds_1 = require("../../lib/prompt-observation/kinds");
 /**
@@ -134,37 +136,41 @@ const PROMPT_NO_LONGER_ACTIVE = 'prompt_no_longer_active';
 exports.ANSWER_NOT_DELIVERED = 'answer_not_delivered';
 /**
  * Issue #3975: the answer was stopped part-way — some of its keys may be on
- * the pane. `/prompt-response` answers it as a 500 whose `error` carries this
- * code. Restated from `src/lib/prompt-answer-errors.ts` (`ANSWER_INPUT_LOST_REASON`).
+ * the pane. Both routes answer it as a 500 with this `reason` (Issue #3982).
+ * Restated from `src/lib/prompt-answer-errors.ts` (`ANSWER_INPUT_LOST_REASON`).
  */
 exports.ANSWER_INPUT_LOST = 'answer_input_lost';
-/** Whether a failed `/prompt-response` request is the answer stopped part-way (Issue #3975). */
-function isAnswerInputLost(error) {
+/**
+ * Whether a failed `/prompt-response` request is the answer stopped part-way
+ * (Issue #3975).
+ *
+ * Issue #3982: by `reason` alone on a server that declares
+ * `prompt-answer-reason`. The 500's `error` text can quote the answer (a tmux
+ * failure does), so a reason code found there is not evidence of anything. Only
+ * a server without the token — which put this reason nowhere but that text —
+ * is still read the old way. The probe is the memo `resolveCommandTarget`
+ * filled for this client; nothing is asked unless the request already failed.
+ */
+async function isAnswerInputLost(error, client) {
     if (!(error instanceof api_client_1.ApiError) || (error.statusCode ?? 0) < 500)
         return false;
     const payload = error.payload;
     if (payload?.reason === exports.ANSWER_INPUT_LOST)
         return true;
-    return typeof payload?.error === 'string' && payload.error.includes(exports.ANSWER_INPUT_LOST);
+    if (typeof payload?.error !== 'string' || !payload.error.includes(exports.ANSWER_INPUT_LOST))
+        return false;
+    return !(await (0, server_capabilities_1.serverReportsPromptAnswerReason)(client));
 }
 /**
- * The `capture` that reads the pane the answer was typed at (Issue #3975
- * review P2-2): the target the answer resolved to, never the worktree default,
- * and `--pane`, since the stored reply is not what was partly typed.
+ * Reports an answer stopped part-way (Issue #3975) and sets the exit code. The
+ * `capture` reads the pane the answer was typed at (review P2-2): the target
+ * the answer resolved to, never the worktree default, and `--pane`, since the
+ * stored reply is not what was partly typed.
  */
-function answeredPaneCaptureCommand(worktreeId, target) {
-    const selector = target.instanceId
-        ? ` --instance ${target.instanceId}`
-        : target.agent
-            ? ` --agent ${target.agent}`
-            : '';
-    return `commandmate capture ${worktreeId}${selector} --pane --tail 40`;
-}
-/** Reports an answer stopped part-way (Issue #3975) and sets the exit code. */
 function reportAnswerInputLost(worktreeId, target) {
     console.error(`Warning: The answer may have been only partly typed (reason: ${exports.ANSWER_INPUT_LOST}): the session was ` +
         'replaced part-way, so some of its keys may have reached the agent and the rest did not. ' +
-        `Check the screen with \`${answeredPaneCaptureCommand(worktreeId, target)}\` before answering again.`);
+        `Check the screen with \`${(0, follow_up_command_1.dialogCaptureCommand)(worktreeId, target)}\` before answering again.`);
     // The exit code `decision_not_delivered` uses (Issue #3975: no new code).
     process.exit(types_1.ExitCode.UNEXPECTED_ERROR);
 }
@@ -177,10 +183,6 @@ const PLAN_REVIEW_ACTIONS = ['comment', 'submit', 'approve', 'cancel'];
 function isPlanReviewRefusal(reason) {
     return reason.startsWith('plan_review_');
 }
-/** ` --instance <id>` as the caller spelled it, or nothing. */
-function instanceFlag(instance) {
-    return instance ? ` --instance ${instance}` : '';
-}
 /**
  * `textFollowUp` from a `/prompt-response` success (Issue #3093), read
  * defensively: an older server omits it, and the route's mirror type is not
@@ -264,7 +266,7 @@ function buildPromptResponseBody(useDefault, answer, agent, instanceId, planRevi
     return body;
 }
 /** Reports a `success: false` result and sets the exit code. */
-function reportFailedResponse(result, worktreeId, answer, useDefault, options) {
+function reportFailedResponse(result, worktreeId, answer, useDefault, target) {
     // [DR2-06] Check reason for failure
     const reason = result.reason || 'unknown';
     // Issue #1681 / #1726: these mean the server refused BEFORE sending,
@@ -308,9 +310,9 @@ function reportFailedResponse(result, worktreeId, answer, useDefault, options) {
         // be mapped onto a choice", and only when the answer was not already
         // a number (where the number itself is what was wrong).
         if (reason === 'unresolvable_answer' && answer !== undefined && !/^\d+$/.test(answer.trim())) {
-            const target = options.instance ? ` --instance ${options.instance}` : '';
-            console.error(`Hint: answer with the option number — \`commandmate respond ${worktreeId} <number>${target}\` ` +
-                `(\`commandmate capture ${worktreeId}${target}\` prints the dialog and its numbers).`);
+            // Issue #3982: the resolved target, and the pane — where the numbers are.
+            console.error(`Hint: answer with the option number — \`${(0, follow_up_command_1.followUpCommand)('respond', worktreeId, target, '<number>')}\` ` +
+                `(\`${(0, follow_up_command_1.dialogCaptureCommand)(worktreeId, target)}\` prints the dialog and its numbers).`);
         }
     }
     else {
@@ -322,7 +324,7 @@ function reportFailedResponse(result, worktreeId, answer, useDefault, options) {
         if (reason === PROMPT_NO_LONGER_ACTIVE && !useDefault && answer !== undefined && !/^\d+$/.test(answer.trim())) {
             console.error('Hint: no dialog is open, so this text was not delivered. If you just chose an option that asks ' +
                 'for text (e.g. "No, tell … what to do differently"), the agent is waiting for it in its input box — ' +
-                `send it with \`commandmate send ${worktreeId} "<text>"${instanceFlag(options.instance)}\`.`);
+                `send it with \`${(0, follow_up_command_1.followUpCommand)('send', worktreeId, target, '"<text>"')}\`.`);
         }
     }
     // Issue #1726: an option number the agent's own payload does not offer
@@ -334,15 +336,14 @@ function reportFailedResponse(result, worktreeId, answer, useDefault, options) {
  * What was done on Command Code's plan review (Issue #3125), and the next step:
  * a pinned comment is not delivered to the agent until the review is submitted.
  */
-function printPlanReviewOutcome(result, worktreeId, options) {
+function printPlanReviewOutcome(result, worktreeId, target) {
     const planReview = result.planReview;
     if (!planReview)
         return;
-    const target = instanceFlag(options.instance);
     switch (planReview.action) {
         case 'comment':
             console.log(`Plan review: pinned comment "${planReview.comment ?? ''}".`);
-            console.error(`Next: send the review with \`commandmate respond ${worktreeId} --plan-review submit${target}\` ` +
+            console.error(`Next: send the review with \`${(0, follow_up_command_1.followUpCommand)('respond', worktreeId, target, '--plan-review submit')}\` ` +
                 `(ctrl+r), or approve with \`--plan-review approve\` (comments go along as notes).`);
             break;
         case 'submit':
@@ -358,7 +359,7 @@ function printPlanReviewOutcome(result, worktreeId, options) {
                 console.log('Plan review: approved the plan (ctrl+a).');
                 if (planReview.pendingCommentsBefore > 0) {
                     console.error('Note: with pending comments Command Code may ask how to approve — confirm with ' +
-                        `\`commandmate respond ${worktreeId} --plan-review approve${target}\` again, or go back with \`--plan-review cancel\`.`);
+                        `\`${(0, follow_up_command_1.followUpCommand)('respond', worktreeId, target, '--plan-review approve')}\` again, or go back with \`--plan-review cancel\`.`);
                 }
             }
             break;
@@ -465,8 +466,10 @@ Strict respond (--expect-screen <kind> --observation <token> <label>):
             // and falls back to the worktree default, so `--instance codex` alone
             // answered into a session that was never started. Resolve the tool the
             // instance is registered under first.
-            const { agent, instanceId } = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, options.instance, options.agent);
+            const commandTarget = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, options.instance, options.agent);
+            const { agent, instanceId } = commandTarget;
             // Issue #2376: the resolved id. /prompt-response reads instance ids.
+            // Issue #3982: every hint below names `commandTarget`, never `options.instance`.
             const body = buildPromptResponseBody(useDefault, answer, agent, instanceId, options.planReview);
             // Issue #2040: for an agent that publishes per-decision ids (opencode
             // today, and only opencode), a bare `respond <worktree> 3` names the ONE
@@ -503,18 +506,18 @@ Strict respond (--expect-screen <kind> --observation <token> <label>):
                 catch (error) {
                     // Issue #3975: stopped part-way is not "the server failed" — some
                     // keys may be on the pane, and the operator has to look first.
-                    if (!isAnswerInputLost(error))
+                    if (!(await isAnswerInputLost(error, client)))
                         throw error;
-                    reportAnswerInputLost(worktreeId, { agent, instanceId });
+                    reportAnswerInputLost(worktreeId, commandTarget);
                     return;
                 }
             }
             if (result && !result.success) {
-                reportFailedResponse(result, worktreeId, answer, useDefault, options);
+                reportFailedResponse(result, worktreeId, answer, useDefault, commandTarget);
             }
             printResolvedAudit(result, answer);
             if (result && 'planReview' in result)
-                printPlanReviewOutcome(result, worktreeId, options);
+                printPlanReviewOutcome(result, worktreeId, commandTarget);
             console.error('Response sent.');
             // Issue #3093: the option just chosen continues as typed text, which the
             // dialog no longer takes — name the command that does deliver it.
@@ -522,7 +525,7 @@ Strict respond (--expect-screen <kind> --observation <token> <label>):
             if (followUp) {
                 console.error(`Next: option ${followUp.optionNumber} ("${followUp.optionLabel}") asks for your text, and the dialog ` +
                     'is closed now, so `respond` cannot deliver it — send it with ' +
-                    `\`commandmate send ${worktreeId} "<text>"${instanceFlag(options.instance)}\`.`);
+                    `\`${(0, follow_up_command_1.followUpCommand)('send', worktreeId, commandTarget, '"<text>"')}\`.`);
             }
         }
         catch (error) {

package/dist/cli/commands/send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/send.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0XpC,wBAAgB,iBAAiB,IAAI,OAAO,CAiK3C"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/send.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4XpC,wBAAgB,iBAAiB,IAAI,OAAO,CAmK3C"}

package/dist/cli/commands/send.js

@@ -16,6 +16,7 @@ const model_validation_1 = require("../config/model-validation");
 const agent_instances_1 = require("../utils/agent-instances");
 const instances_1 = require("./instances");
 const command_target_1 = require("./command-target");
+const follow_up_command_1 = require("../utils/follow-up-command");
 const auto_yes_1 = require("./auto-yes");
 const relays_1 = require("./relays");
 const message_dispatch_1 = require("./message-dispatch");
@@ -34,9 +35,10 @@ const SEND_VERIFIED_MAX_LINES = 240;
  * older daemon, or a truncated body. The code is the contract; the sentence is
  * a courtesy, and the CLI must still say what to do without it.
  */
-function promptWaitingFallback(worktreeId) {
+function promptWaitingFallback(worktreeId, target) {
     return (`${worktreeId} is waiting on a prompt; the message was not sent. ` +
-        `Answer it first: \`commandmate respond ${worktreeId} <answer>\`.`);
+        // Issue #3982: the prompt is the resolved target's, not the worktree default's.
+        `Answer it first: \`${(0, follow_up_command_1.followUpCommand)('respond', worktreeId, target, '<answer>')}\`.`);
 }
 /**
  * Resolve --duration to milliseconds, exiting on an invalid value.
@@ -349,7 +351,8 @@ worktree and send a short message that tells the agent to read that file.
             // the roster is the only place that pairs the two. Resolve it once, up
             // front, so the task row, the send and auto-yes all name the same tool
             // as the session that actually starts.
-            const { agent, instanceId } = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, options.instance, options.agent);
+            const commandTarget = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, options.instance, options.agent);
+            const { agent, instanceId } = commandTarget;
             // Issue #2376: the RESOLVED id, never the string the user typed.
             // `--instance "Codex 2"` has to reach /send as `codex-2`; no route but
             // /resolve-target knows how to read an alias.
@@ -426,7 +429,8 @@ worktree and send a short message that tells the agent to read that file.
             await (0, message_dispatch_1.postMessage)(client, worktreeId, sendBody, {
                 relay,
                 onFailure: failTask,
-                promptWaitingFallback: promptWaitingFallback(worktreeId),
+                promptWaitingFallback: promptWaitingFallback(worktreeId, commandTarget),
+                target: commandTarget,
             });
             console.error('Message sent.');
             if (taskId) {

package/dist/cli/commands/wait-instance.d.ts

@@ -3,7 +3,8 @@
  * Issue #3964: split out of wait.ts.
  */
 import type { WaitOptions } from '../types';
-import type { ApiClient } from '../utils/api-client';
+import { type ApiClient } from '../utils/api-client';
+import { type CommandTarget } from './command-target';
 /**
  * `options` with `--instance` resolved from a selector to an instance ID
  * (Issue #2376).
@@ -18,4 +19,11 @@ import type { ApiClient } from '../utils/api-client';
  * @param options - The options as given
  */
 export declare function resolveWaitInstance<T extends WaitOptions>(client: ApiClient, worktreeId: string, options: T): Promise<T>;
+/**
+ * The target `wait`'s hints name (Issue #3982): the `--instance` that
+ * {@link resolveWaitInstance} resolved, or none. `wait` has no `--agent`.
+ *
+ * @param options - Options already passed through {@link resolveWaitInstance}
+ */
+export declare function waitCommandTarget(options: Pick<WaitOptions, 'instance'>): CommandTarget;
 //# sourceMappingURL=wait-instance.d.ts.map

package/dist/cli/commands/wait-instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait-instance.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait-instance.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,WAAW,EAC7D,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,CAAC,CAAC,CAkBZ"}
+{"version":3,"file":"wait-instance.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait-instance.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,WAAW,EAC7D,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,CAAC,CAAC,CAqBZ;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,aAAa,CAKvF"}

package/dist/cli/commands/wait-instance.js

@@ -5,8 +5,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveWaitInstance = resolveWaitInstance;
+exports.waitCommandTarget = waitCommandTarget;
 const types_1 = require("../types");
+const api_client_1 = require("../utils/api-client");
 const instances_1 = require("./instances");
+const command_target_1 = require("./command-target");
 /**
  * `options` with `--instance` resolved from a selector to an instance ID
  * (Issue #2376).
@@ -28,6 +31,9 @@ async function resolveWaitInstance(client, worktreeId, options) {
         return { ...options, instance: target.instanceId ?? options.instance };
     }
     catch (error) {
+        // Issue #3983: `--timeout` ran out while resolving. Exit 124 rather than
+        // degrade: carrying on with the selector would wait past the deadline.
+        (0, api_client_1.rethrowIfDeadlineExceeded)(error);
         // Degrade to the pre-#2376 behaviour rather than failing the wait. An
         // instance ID needs no resolution to reach `/current-output?instance=` —
         // resolution exists here so that an ALIAS can — so a resolver that cannot
@@ -39,3 +45,12 @@ async function resolveWaitInstance(client, worktreeId, options) {
         return options;
     }
 }
+/**
+ * The target `wait`'s hints name (Issue #3982): the `--instance` that
+ * {@link resolveWaitInstance} resolved, or none. `wait` has no `--agent`.
+ *
+ * @param options - Options already passed through {@link resolveWaitInstance}
+ */
+function waitCommandTarget(options) {
+    return (0, command_target_1.commandTargetOf)(options.instance ? { cliToolId: undefined, instanceId: options.instance } : null, undefined);
+}

package/dist/cli/commands/wait-poll-state.d.ts

@@ -39,6 +39,14 @@ export interface PollWorktreeOptions extends WaitOptions {
      * record, read only: nothing `wait` decides depends on it.
      */
     onTurnRecord?: (openedAt: number | null, closedAt: number | null) => void;
+    /**
+     * Epoch ms the command started, from which `--timeout` counts (Issue #3983).
+     *
+     * `--timeout` is the deadline of the whole command, so the reads before the
+     * poll (`--instance` resolution, the task ledger, `ask`'s send) are inside it
+     * rather than in front of it. Absent means the poll's own start, as before.
+     */
+    timeoutStartedAt?: number;
 }
 /**
  * What {@link pollWorktree} carries from one poll to the next: every variable its
@@ -111,7 +119,17 @@ export interface PollContext {
     client: ApiClient;
     worktreeId: string;
     options: PollWorktreeOptions;
+    /**
+     * Where `--timeout` counts from: {@link PollWorktreeOptions.timeoutStartedAt}
+     * when given, else {@link pollStartedAt} (Issue #3983).
+     */
     startTime: number;
+    /**
+     * When this poll began. The turn window (turn adoption, #1975's pending-prompt
+     * hold) is about the poll, not about the command, and stays here so that a
+     * slow send before an `ask`'s poll does not shift it (Issue #3983).
+     */
+    pollStartedAt: number;
     autoYesGraceSeconds: number;
     autoYesGraceMs: number;
 }

package/dist/cli/commands/wait-poll-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait-poll-state.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait-poll-state.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9E;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3E;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;;OAKG;IACH,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC;;;OAGG;IACH,cAAc,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzD,qFAAqF;IACrF,gBAAgB,EAAE,MAAM,CAAC;IACzB,8EAA8E;IAC9E,cAAc,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,cAAc,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC5D;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"wait-poll-state.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait-poll-state.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9E;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC1E;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;;OAKG;IACH,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC;;;OAGG;IACH,cAAc,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzD,qFAAqF;IACrF,gBAAgB,EAAE,MAAM,CAAC;IACzB,8EAA8E;IAC9E,cAAc,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,cAAc,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC5D;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB"}

package/dist/cli/commands/wait-verify.d.ts

@@ -28,7 +28,8 @@ export declare function shouldVerify(exitCode: number, options: WaitOptions): bo
  * run that follows is judged against the contract it was supposed to judge.
  *
  * Never throws: an unreadable ledger costs the attribution, and refusing to
- * verify over it would cost every gate.
+ * verify over it would cost every gate. The one exception is a client deadline
+ * (`--timeout`, Issue #3983), which is rethrown as the exit 124 it is.
  *
  * @returns the task id, or undefined to leave resolution to the server
  */

package/dist/cli/commands/wait-verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait-verify.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait-verify.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAY,MAAM,qBAAqB,CAAC;AAG1D,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAE7D;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAG5E;AAgBD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CASxE"}
+{"version":3,"file":"wait-verify.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait-verify.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAuC,MAAM,qBAAqB,CAAC;AAGrF,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAE7D;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAG5E;AAgBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CASxE"}

package/dist/cli/commands/wait-verify.js

@@ -55,7 +55,8 @@ const IN_FLIGHT_TASK_STATUSES = new Set([
  * run that follows is judged against the contract it was supposed to judge.
  *
  * Never throws: an unreadable ledger costs the attribution, and refusing to
- * verify over it would cost every gate.
+ * verify over it would cost every gate. The one exception is a client deadline
+ * (`--timeout`, Issue #3983), which is rethrown as the exit 124 it is.
  *
  * @returns the task id, or undefined to leave resolution to the server
  */
@@ -68,6 +69,9 @@ async function resolveWaitedTaskId(client, worktreeId) {
         return task.id;
     }
     catch (error) {
+        // Issue #3983: `--timeout` ran out before the poll began — exit 124, and
+        // nothing after it (no poll, no verification) runs.
+        (0, api_client_1.rethrowIfDeadlineExceeded)(error);
         console.error(`Note: could not read the task ledger for ${worktreeId} ` +
             `(${error instanceof Error ? error.message : String(error)}); ` +
             'verification will resolve its own task.');

package/dist/cli/commands/wait.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,KAAK,EAIV,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAA+B,MAAM,qBAAqB,CAAC;AA2C7E,OAAO,KAAK,EAA0B,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAiBrF,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AAk8BjC;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,6EAA6E;IAC7E,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD,CAAC,CAuJD;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAgN3C"}
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,KAAK,EAIV,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAA+B,MAAM,qBAAqB,CAAC;AA2C7E,OAAO,KAAK,EAA0B,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAkBrF,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AAo8BjC;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,6EAA6E;IAC7E,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD,CAAC,CAkKD;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CA8N3C"}

package/dist/cli/commands/wait.js

@@ -39,6 +39,7 @@ const wait_turn_boundary_1 = require("./wait-turn-boundary");
 const wait_hook_stop_settle_1 = require("./wait-hook-stop-settle");
 const wait_verify_1 = require("./wait-verify");
 const wait_instance_1 = require("./wait-instance");
+const follow_up_command_1 = require("../utils/follow-up-command");
 const wait_poll_bookkeeping_1 = require("./wait-poll-bookkeeping");
 // Issue #3964: the split-out modules' exports, re-exported so every import of
 // `./wait` keeps working.
@@ -220,12 +221,13 @@ function buildSelectionListOutput(worktreeId, data) {
  * What `wait` says about a frame that stayed unclassified for the whole dwell
  * (Issue #1708): the stderr line, and the `question` of its exit-10 payload.
  */
-function describeUnclassifiedFrame(worktreeId, data, dwellMs) {
+function describeUnclassifiedFrame(worktreeId, data, dwellMs, options) {
     const dwellSeconds = Math.round(dwellMs / 1000);
     return (`Unclassified interactive frame on ${worktreeId} for ${dwellSeconds}s ` +
         `(status=${data.sessionStatus ?? 'unknown'}/${data.sessionStatusReason ?? 'unknown'}). ` +
         `The detection layer could not parse it; inspect the raw pane with ` +
-        `\`commandmate capture ${worktreeId} --pane\`.` +
+        // Issue #3982: the instance waited on, and enough of its pane for a dialog.
+        `\`${(0, follow_up_command_1.dialogCaptureCommand)(worktreeId, (0, wait_instance_1.waitCommandTarget)(options))}\`.` +
         // Issue #2095: the sidebar is exactly this frame's reason, and the
         // one recovery is a keystroke in the pane. Riding the message keeps
         // the exit-code table (10, `type: unclassified`) unchanged for every
@@ -467,7 +469,7 @@ function unclassifiedStage(poll, state, data) {
             state.unclassifiedSince = Date.now();
         const dwellMs = Date.now() - state.unclassifiedSince;
         if (dwellMs >= UNCLASSIFIED_DWELL_MS) {
-            const question = describeUnclassifiedFrame(worktreeId, data, dwellMs);
+            const question = describeUnclassifiedFrame(worktreeId, data, dwellMs, poll.options);
             // Issue #3730: why Auto-Yes is not there to answer it, if a restart is why.
             const restartNotice = (0, wait_notices_1.formatRestartReleaseNotice)(worktreeId, data, poll.options.instance);
             if (options.onPrompt === 'human') {
@@ -668,7 +670,7 @@ async function unsettledTurnStage(poll, state, data, judgingSettledFrame) {
             `the end of this turn (turnStartedAt=${state.turnStartedAt}, ` +
             `lastStopEventAt=${data.lastStopEventAt ?? 'none'}, ${(0, wait_turn_boundary_1.describeTurnClose)(data)}). ` +
             'Not reporting completion; inspect with ' +
-            `\`commandmate capture ${worktreeId} --json\`.`);
+            `\`${(0, follow_up_command_1.followUpCommand)('capture', worktreeId, (0, wait_instance_1.waitCommandTarget)(poll.options), undefined, '--json')}\`.`);
         return { kind: 'wait' };
     }
     return { kind: 'next' };
@@ -721,7 +723,7 @@ function selfResumeHoldStage(poll, state, data, selfResumeStopAt) {
  * {@link completionStage} needs for its basis.
  */
 async function promptLedgerStage(poll, state, data, judgingSettledFrame) {
-    const { worktreeId, startTime } = poll;
+    const { worktreeId, pollStartedAt } = poll;
     // Issue #1975: the same frame, one question further back. #1839's gate
     // above can only fire once a turn has been ADOPTED, and `send` leaves a
     // window ~1s wide in which nothing has been: the newest structured event
@@ -747,7 +749,7 @@ async function promptLedgerStage(poll, state, data, judgingSettledFrame) {
         state.promptLedgerReadable = ledger.readable;
         if (ledger.readable && ledger.submittedAt !== null) {
             if ((0, wait_turn_boundary_1.outstandingPrompt)(data, ledger.submittedAt)) {
-                const heldMs = Date.now() - startTime;
+                const heldMs = Date.now() - pollStartedAt;
                 if (heldMs < wait_turn_boundary_1.PENDING_PROMPT_HOLD_MS) {
                     console.error(`Waiting: ${worktreeId} is at its composer, but the newest prompt sent to it ` +
                         `has no reported end (sentAt=${new Date(ledger.submittedAt).toISOString()}, ` +
@@ -855,7 +857,10 @@ async function readyStage(poll, state, data, selfResumeStopAt, selfResumeSuffix,
  * {@link resolveWaitInstance}.
  */
 async function pollWorktree(client, worktreeId, options) {
-    const startTime = Date.now();
+    const pollStartedAt = Date.now();
+    // Issue #3983: `--timeout` counts from the command's start when the caller
+    // passed it, so the reads before this poll are inside the deadline.
+    const startTime = options.timeoutStartedAt ?? pollStartedAt;
     const state = {
         lastActivityTime: Date.now(),
         lastContent: '',
@@ -871,7 +876,15 @@ async function pollWorktree(client, worktreeId, options) {
     };
     const autoYesGraceSeconds = options.autoYesGrace ?? AUTO_YES_GRACE_DEFAULT_SECONDS;
     const autoYesGraceMs = autoYesGraceSeconds * 1000;
-    const poll = { client, worktreeId, options, startTime, autoYesGraceSeconds, autoYesGraceMs };
+    const poll = {
+        client,
+        worktreeId,
+        options,
+        startTime,
+        pollStartedAt,
+        autoYesGraceSeconds,
+        autoYesGraceMs,
+    };
     /**
      * What the completion line adds when this wait held for a self-resume, or ''
      * (Issue #2614). `basis=` keeps its word: the verdict is still the agent's own
@@ -922,7 +935,7 @@ async function pollWorktree(client, worktreeId, options) {
                 await (0, wait_timing_1.sleep)(wait_timing_1.POLL_INTERVAL_MS);
                 continue;
             }
-            (0, wait_poll_bookkeeping_1.adoptAndPublishTurn)(state, data, startTime, options);
+            (0, wait_poll_bookkeeping_1.adoptAndPublishTurn)(state, data, pollStartedAt, options);
             // Issue #2614: a self-resume hold is about one `stop`, and ends the first
             // time that `stop` is no longer the newest word — the agent woke (a
             // turn-opening event) or stopped again. Checked on every poll, ahead of
@@ -1086,6 +1099,9 @@ The observation on exit 10 (Issue #3755):
   a missing record does not mean Auto-Yes can answer.
 `)
         .action(async (worktreeIds, options) => {
+        // Issue #3983: `--timeout` is the deadline of the whole command, counted
+        // from here — the reads before the poll included.
+        const commandStartedAt = Date.now();
         try {
             // [SEC4-04] Validate all worktree IDs
             for (const id of worktreeIds) {
@@ -1108,20 +1124,28 @@ The observation on exit 10 (Issue #3755):
                 return;
             }
             const client = new api_client_1.ApiClient({ token: options.token });
+            // Issue #3983: the reads before the poll go through a client bounded by
+            // `--timeout`; one that runs out ends the command with 124 before any
+            // poll or verification. The poll bounds its own reads by the same
+            // clock (`timeoutStartedAt`), and verification — after the wait, and
+            // not part of it — keeps the unbounded `client`.
+            const timeoutStartedAt = options.timeout ? commandStartedAt : undefined;
+            const preflightClient = client.withDeadline(options.timeout ? commandStartedAt + options.timeout * 1000 : undefined);
+            const pollOptions = (resolved) => timeoutStartedAt === undefined ? resolved : { ...resolved, timeoutStartedAt };
             // Issue #2376: resolve the selector PER worktree. `wait a b --instance
             // "Codex 2"` is one alias against two rosters, and the id behind it can
             // legitimately differ — resolving once and reusing the answer would poll
             // the wrong session on the second worktree.
-            const perWorktreeOptions = await Promise.all(worktreeIds.map(id => (0, wait_instance_1.resolveWaitInstance)(client, id, options)));
+            const perWorktreeOptions = await Promise.all(worktreeIds.map(id => (0, wait_instance_1.resolveWaitInstance)(preflightClient, id, options)));
             // Issue #1620: resolved before any polling starts. Once the agent stops
             // there is no reliable way left to tell which contract this wait was
             // about — the agent's own verification may have closed it by then.
             const boundTaskIds = (0, wait_verify_1.verifyRequested)(options)
-                ? await Promise.all(worktreeIds.map(id => (0, wait_verify_1.resolveWaitedTaskId)(client, id)))
+                ? await Promise.all(worktreeIds.map(id => (0, wait_verify_1.resolveWaitedTaskId)(preflightClient, id)))
                 : worktreeIds.map(() => undefined);
             if (worktreeIds.length === 1) {
                 // Single worktree
-                const result = await pollWorktree(client, worktreeIds[0], perWorktreeOptions[0]);
+                const result = await pollWorktree(client, worktreeIds[0], pollOptions(perWorktreeOptions[0]));
                 if (result.output) {
                     // stdout for result (JSON output)
                     console.log(JSON.stringify(result.output));
@@ -1135,7 +1159,7 @@ The observation on exit 10 (Issue #3755):
                 return;
             }
             // [DR1-07] Multiple worktrees: Promise.allSettled for error isolation
-            const results = await Promise.allSettled(worktreeIds.map((id, index) => pollWorktree(client, id, perWorktreeOptions[index])));
+            const results = await Promise.allSettled(worktreeIds.map((id, index) => pollWorktree(client, id, pollOptions(perWorktreeOptions[index]))));
             // Collect results
             const outputs = [];
             let finalExitCode = types_1.WaitExitCode.SUCCESS;

package/dist/cli/commands/whoami.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,aAAa,EAAsC,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAMhD;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAOhC,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,cAAc,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;IACvB,uFAAuF;IACvF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CACvC;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,uFAAuF;IACvF,UAAU,EAAE,MAAM,CAAC;IACnB,kFAAkF;IAClF,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,MAAM,EAAE,cAAc,CAAC;CACxB;AAcD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,IAAI,CASf;AAkDD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAqCjC;AAMD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,SAAS,EAAE,MAAM,GAChB,cAAc,GAAG,IAAI,CAIvB;AASD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAS5E;AAED,mFAAmF;AACnF,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAMzE;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAY9F;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAO/B;AAED,iEAAiE;AACjE,eAAO,MAAM,sBAAsB,QAMmC,CAAC;AAEvE,wBAAgB,mBAAmB,IAAI,OAAO,CA6D7C"}
+{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,aAAa,EAAsC,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,SAAS,EAA6B,MAAM,qBAAqB,CAAC;AAM3E;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAOhC,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,cAAc,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;IACvB,uFAAuF;IACvF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CACvC;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,uFAAuF;IACvF,UAAU,EAAE,MAAM,CAAC;IACnB,kFAAkF;IAClF,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,MAAM,EAAE,cAAc,CAAC;CACxB;AAcD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,IAAI,CASf;AAoDD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAqCjC;AAMD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,SAAS,EAAE,MAAM,GAChB,cAAc,GAAG,IAAI,CAIvB;AASD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAS5E;AAED,mFAAmF;AACnF,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAMzE;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAY9F;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAO/B;AAED,iEAAiE;AACjE,eAAO,MAAM,sBAAsB,QAMmC,CAAC;AAEvE,wBAAgB,mBAAmB,IAAI,OAAO,CA6D7C"}

package/dist/cli/commands/whoami.js

@@ -111,7 +111,9 @@ async function readWorktreeIds(client) {
         const response = await client.get('/api/worktrees');
         return new Set((response.worktrees ?? []).map((wt) => wt.id));
     }
-    catch {
+    catch (error) {
+        // Issue #3983: a command deadline is not "no list" — it stays exit 124.
+        (0, api_client_1.rethrowIfDeadlineExceeded)(error);
         return null;
     }
 }