commandmate 0.49.0 → 0.49.2

package/dist/cli/utils/api-client.d.ts

@@ -91,6 +91,8 @@ export declare function handleApiError(error: unknown, status?: number, payload?
 export declare class ApiClient {
     private baseUrl;
     private token?;
+    /** Epoch ms after which every request of this client fails (Issue #3983). */
+    private deadlineAt?;
     constructor(options?: {
         baseUrl?: string;
         token?: string;
@@ -107,6 +109,34 @@ export declare class ApiClient {
      * command talk to" only helps if it is the one the request went to.
      */
     get serverUrl(): string;
+    /**
+     * This client with every request bounded by `deadlineAt` (Issue #3983).
+     *
+     * `wait` / `ask` / `verify` take `--timeout` as the deadline of the whole
+     * command, but only the poll's own reads were bounded by it: a task-ledger
+     * read, an `--instance` resolution or a capability probe before the poll had
+     * no deadline at all, so a server that stopped answering held the command for
+     * as long as undici's own timeouts (minutes) and then, swallowed into a
+     * degraded path, kept it going. The derived client carries one deadline for
+     * every method (`get` / `post` / `patch` / `rawGet`), and a request it ends
+     * fails with {@link DeadlineExceededError} — exit 124 — which the
+     * degrade-on-failure catches rethrow ({@link isDeadlineExceeded}).
+     *
+     * One request lasts until its body has been read (`json()` / `text()`), the
+     * body of a {@link rawGet} response included: a server that sends headers and
+     * then stalls the body is not an answer.
+     *
+     * @param deadlineAt - Epoch ms; undefined returns this client unchanged
+     * @returns A client sharing this one's server and token
+     */
+    withDeadline(deadlineAt: number | undefined): ApiClient;
+    /** The deadline this client carries, if any (Issue #3983). */
+    get deadline(): number | undefined;
+    /**
+     * The bound of one request: a signal that fires at the deadline (combined
+     * with the caller's own, when it gave one), or null without a deadline.
+     */
+    private startDeadline;
     private getHeaders;
     /**
      * GET without any status handling, for callers that must read the raw response.
@@ -129,8 +159,15 @@ export declare class ApiClient {
     /**
      * HTTP GET request
      * [DR1-05] Generic type parameter specified at call site
+     *
+     * Issue #3956: `init.signal` bounds the request; an aborted one throws an
+     * `ApiError` like any other network failure, so a caller that set a deadline
+     * reads `signal.aborted` to tell the two apart. Omitted, the request is as
+     * before (no `signal` key on the fetch init).
      */
-    get<T>(path: string): Promise<T>;
+    get<T>(path: string, init?: {
+        signal?: AbortSignal;
+    }): Promise<T>;
     /**
      * HTTP POST request
      * [DR1-05] Generic type parameter specified at call site
@@ -165,6 +202,15 @@ export interface ApiErrorPayload {
     /** Issue #2865: sent with the foreign-session 409 (`session_owned_by_other_server`). */
     sessionName?: string;
     sessionPath?: string | null;
+    /**
+     * Issue #3957/#3992: sent with the send route's errors after a bound relay
+     * was reserved — `not_sent`: nothing reached the session, it may be sent
+     * again; `unknown`: it may have, look before resending. Issue #4011: also
+     * on a failure of a send with no bound relay that was recorded as its
+     * attempt (`not-sent` → `not_sent`, otherwise `unknown`; no 400). Mirrors
+     * src/lib/relay/relay-bind.ts RelaySendOutcome (and ChatMessage.sendOutcome).
+     */
+    sendOutcome?: 'sent' | 'not_sent' | 'unknown';
 }
 /**
  * API Error with exit code for CLI process.exit()
@@ -192,6 +238,28 @@ export declare class ApiError extends Error {
     /** Stable machine code the server assigned to this failure, if any. */
     get apiCode(): string | undefined;
 }
+/**
+ * A request ended by the deadline of a client from {@link ApiClient.withDeadline}
+ * (Issue #3983).
+ *
+ * An `ApiError` with exit 124 so that the commands' own error handling reports
+ * it as the timeout it is, and a class of its own so that a catch which turns
+ * failures into a degraded result ("verification resolves its own task", "use
+ * the selector as an instance id") can tell it apart and rethrow it — see
+ * {@link isDeadlineExceeded}. Wrapped into another `ApiError`, it travels as
+ * that error's `transportError`.
+ */
+export declare class DeadlineExceededError extends ApiError {
+    constructor(serverUrl?: string);
+}
+/**
+ * Whether `error` is — or wraps — a request ended by a command deadline
+ * (Issue #3983). The catches that degrade on failure ask this first and
+ * rethrow: a deadline is the command's answer, not a reason to carry on.
+ */
+export declare function isDeadlineExceeded(error: unknown): error is ApiError;
+/** Rethrow `error` when it is a command deadline; otherwise return (Issue #3983). */
+export declare function rethrowIfDeadlineExceeded(error: unknown): void;
 /**
  * Assert that a parsed API response contains the given required top-level fields
  * (Issue #1357).

package/dist/cli/utils/api-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/api-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/api-client.ts"],"names":[],"mappings":"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"}

package/dist/cli/utils/api-client.js

@@ -9,12 +9,14 @@
  * - ApiClient: HTTP get/post with base URL and auth headers
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiError = exports.ApiClient = exports.FOREIGN_SESSION_ERROR_CODE = exports.MAX_STOP_PATTERN_LENGTH = void 0;
+exports.DeadlineExceededError = exports.ApiError = exports.ApiClient = exports.FOREIGN_SESSION_ERROR_CODE = exports.MAX_STOP_PATTERN_LENGTH = void 0;
 exports.isValidWorktreeId = isValidWorktreeId;
 exports.isValidInstanceId = isValidInstanceId;
 exports.resolveAuthToken = resolveAuthToken;
 exports.foreignSessionMessage = foreignSessionMessage;
 exports.handleApiError = handleApiError;
+exports.isDeadlineExceeded = isDeadlineExceeded;
+exports.rethrowIfDeadlineExceeded = rethrowIfDeadlineExceeded;
 exports.assertResponseShape = assertResponseShape;
 exports.fetchDaemonVersion = fetchDaemonVersion;
 exports.warnIfVersionSkew = warnIfVersionSkew;
@@ -255,6 +257,8 @@ function isLocalhost(url) {
 class ApiClient {
     baseUrl;
     token;
+    /** Epoch ms after which every request of this client fails (Issue #3983). */
+    deadlineAt;
     constructor(options) {
         // Issue #1743: resolve through loadClientEnv() rather than `process.env.CM_PORT || '3000'`.
         // Reading process.env alone ignored ~/.commandmate/.env, so with two servers running,
@@ -289,6 +293,51 @@ class ApiClient {
     get serverUrl() {
         return this.baseUrl;
     }
+    /**
+     * This client with every request bounded by `deadlineAt` (Issue #3983).
+     *
+     * `wait` / `ask` / `verify` take `--timeout` as the deadline of the whole
+     * command, but only the poll's own reads were bounded by it: a task-ledger
+     * read, an `--instance` resolution or a capability probe before the poll had
+     * no deadline at all, so a server that stopped answering held the command for
+     * as long as undici's own timeouts (minutes) and then, swallowed into a
+     * degraded path, kept it going. The derived client carries one deadline for
+     * every method (`get` / `post` / `patch` / `rawGet`), and a request it ends
+     * fails with {@link DeadlineExceededError} — exit 124 — which the
+     * degrade-on-failure catches rethrow ({@link isDeadlineExceeded}).
+     *
+     * One request lasts until its body has been read (`json()` / `text()`), the
+     * body of a {@link rawGet} response included: a server that sends headers and
+     * then stalls the body is not an answer.
+     *
+     * @param deadlineAt - Epoch ms; undefined returns this client unchanged
+     * @returns A client sharing this one's server and token
+     */
+    withDeadline(deadlineAt) {
+        if (deadlineAt === undefined || !Number.isFinite(deadlineAt))
+            return this;
+        // Not `new ApiClient(...)`: the constructor re-resolves the endpoint and
+        // re-prints the --token warning, and the derived client must dial the very
+        // server this one does.
+        const derived = Object.create(Object.getPrototypeOf(this));
+        derived.baseUrl = this.baseUrl;
+        derived.token = this.token;
+        derived.deadlineAt = deadlineAt;
+        return derived;
+    }
+    /** The deadline this client carries, if any (Issue #3983). */
+    get deadline() {
+        return this.deadlineAt;
+    }
+    /**
+     * The bound of one request: a signal that fires at the deadline (combined
+     * with the caller's own, when it gave one), or null without a deadline.
+     */
+    startDeadline(callerSignal) {
+        if (this.deadlineAt === undefined)
+            return null;
+        return startRequestDeadline(this.deadlineAt, this.baseUrl, callerSignal);
+    }
     getHeaders() {
         const headers = {
             'Content-Type': 'application/json',
@@ -314,44 +363,78 @@ class ApiClient {
      * @returns The raw Response, whatever its status
      */
     async rawGet(path, init) {
-        return fetch(`${this.baseUrl}${path}`, {
-            method: 'GET',
-            headers: { ...this.getHeaders(), ...(init?.headers ?? {}) },
-            redirect: 'manual',
-        });
+        const deadline = this.startDeadline();
+        if (!deadline) {
+            return fetch(`${this.baseUrl}${path}`, {
+                method: 'GET',
+                headers: { ...this.getHeaders(), ...(init?.headers ?? {}) },
+                redirect: 'manual',
+            });
+        }
+        // Issue #3983: the caller reads the body, so the deadline is not released
+        // here — it stays armed (unref'd) for the body read, which it also bounds.
+        try {
+            const response = await deadline.run(fetch(`${this.baseUrl}${path}`, {
+                method: 'GET',
+                headers: { ...this.getHeaders(), ...(init?.headers ?? {}) },
+                redirect: 'manual',
+                signal: deadline.signal,
+            }));
+            return boundBodyReads(response, deadline);
+        }
+        catch (error) {
+            throw deadline.classify(error);
+        }
     }
     /**
      * HTTP GET request
      * [DR1-05] Generic type parameter specified at call site
+     *
+     * Issue #3956: `init.signal` bounds the request; an aborted one throws an
+     * `ApiError` like any other network failure, so a caller that set a deadline
+     * reads `signal.aborted` to tell the two apart. Omitted, the request is as
+     * before (no `signal` key on the fetch init).
      */
-    async get(path) {
+    async get(path, init) {
+        // Issue #3983: a client with a deadline bounds the request and its body.
+        const deadline = this.startDeadline(init?.signal);
+        const signal = deadline ? deadline.signal : init?.signal;
         try {
-            const response = await fetch(`${this.baseUrl}${path}`, {
+            const response = await bounded(deadline, fetch(`${this.baseUrl}${path}`, {
                 method: 'GET',
                 headers: this.getHeaders(),
-            });
+                ...(signal ? { signal } : {}),
+            }));
             if (!response.ok) {
                 // Issue #1637: read the body first — handleApiError needs it to surface
                 // the server's reason for a 5xx instead of "check the logs".
-                const payload = await readErrorPayload(response);
+                const payload = await bounded(deadline, readErrorPayload(response));
                 const errResult = handleApiError(null, response.status, payload, { serverUrl: this.baseUrl });
                 throw new ApiError(errResult.message, errResult.exitCode, response.status, payload);
             }
-            return (await response.json());
+            return (await bounded(deadline, response.json()));
         }
         catch (error) {
+            if (deadline) {
+                const classified = deadline.classify(error);
+                if (classified instanceof DeadlineExceededError)
+                    throw classified;
+            }
             if (error instanceof ApiError)
                 throw error;
             const errResult = handleApiError(error);
             throw new ApiError(errResult.message, errResult.exitCode);
         }
+        finally {
+            deadline?.release();
+        }
     }
     /**
      * HTTP POST request
      * [DR1-05] Generic type parameter specified at call site
      */
     async post(path, body) {
-        return sendWithBody(this.baseUrl, 'POST', this.getHeaders(), path, body);
+        return sendWithBody(this.baseUrl, 'POST', this.getHeaders(), path, body, this.startDeadline());
     }
     /**
      * HTTP PATCH request (Issue #1000: agent-instance roster mutations via
@@ -359,37 +442,46 @@ class ApiClient {
      * [DR1-05] Generic type parameter specified at call site
      */
     async patch(path, body) {
-        return sendWithBody(this.baseUrl, 'PATCH', this.getHeaders(), path, body);
+        return sendWithBody(this.baseUrl, 'PATCH', this.getHeaders(), path, body, this.startDeadline());
     }
 }
 exports.ApiClient = ApiClient;
 /** POST / PATCH share everything but the method; an empty body (204) is `undefined`. */
-async function sendWithBody(baseUrl, method, headers, path, body) {
+async function sendWithBody(baseUrl, method, headers, path, body, deadline) {
     try {
-        const response = await fetch(`${baseUrl}${path}`, {
+        const response = await bounded(deadline, fetch(`${baseUrl}${path}`, {
             method,
             headers,
             body: body !== undefined ? JSON.stringify(body) : undefined,
-        });
+            ...(deadline ? { signal: deadline.signal } : {}),
+        }));
         if (!response.ok) {
             // Issue #1637: read the body first — handleApiError needs it to surface
             // the server's reason for a 5xx instead of "check the logs".
-            const payload = await readErrorPayload(response);
+            const payload = await bounded(deadline, readErrorPayload(response));
             const errResult = handleApiError(null, response.status, payload, { serverUrl: baseUrl });
             throw new ApiError(errResult.message, errResult.exitCode, response.status, payload);
         }
         // Handle 204 No Content
-        const text = await response.text();
+        const text = await bounded(deadline, response.text());
         if (!text)
             return undefined;
         return JSON.parse(text);
     }
     catch (error) {
+        if (deadline) {
+            const classified = deadline.classify(error);
+            if (classified instanceof DeadlineExceededError)
+                throw classified;
+        }
         if (error instanceof ApiError)
             throw error;
         const errResult = handleApiError(error);
         throw new ApiError(errResult.message, errResult.exitCode, undefined, undefined, error);
     }
+    finally {
+        deadline?.release();
+    }
 }
 /**
  * Read the typed error body of a failed response.
@@ -448,6 +540,122 @@ class ApiError extends Error {
 }
 exports.ApiError = ApiError;
 // =============================================================================
+// Command deadline (Issue #3983)
+// =============================================================================
+/** The longest delay `setTimeout` honours (2^31-1 ms, ~24.8 days). */
+const MAX_TIMER_MS = 2 ** 31 - 1;
+/**
+ * A request ended by the deadline of a client from {@link ApiClient.withDeadline}
+ * (Issue #3983).
+ *
+ * An `ApiError` with exit 124 so that the commands' own error handling reports
+ * it as the timeout it is, and a class of its own so that a catch which turns
+ * failures into a degraded result ("verification resolves its own task", "use
+ * the selector as an instance id") can tell it apart and rethrow it — see
+ * {@link isDeadlineExceeded}. Wrapped into another `ApiError`, it travels as
+ * that error's `transportError`.
+ */
+class DeadlineExceededError extends ApiError {
+    constructor(serverUrl) {
+        super(withServerUrl('--timeout reached before the server answered', { serverUrl }), types_1.WaitExitCode.TIMEOUT);
+        this.name = 'DeadlineExceededError';
+    }
+}
+exports.DeadlineExceededError = DeadlineExceededError;
+/**
+ * Whether `error` is — or wraps — a request ended by a command deadline
+ * (Issue #3983). The catches that degrade on failure ask this first and
+ * rethrow: a deadline is the command's answer, not a reason to carry on.
+ */
+function isDeadlineExceeded(error) {
+    if (error instanceof DeadlineExceededError)
+        return true;
+    if (error instanceof ApiError && error.transportError instanceof DeadlineExceededError)
+        return true;
+    return error instanceof Error && error.cause instanceof DeadlineExceededError;
+}
+/** Rethrow `error` when it is a command deadline; otherwise return (Issue #3983). */
+function rethrowIfDeadlineExceeded(error) {
+    if (isDeadlineExceeded(error))
+        throw error;
+}
+/**
+ * Arm the deadline of one request. Its signal goes to `fetch` (which then also
+ * aborts the body stream), and every await of the request is raced against it
+ * as well — so a stalled body or a transport that ignores the signal still ends
+ * on time. Past the deadline the signal is already aborted and no request is
+ * sent; started exactly at it, the request gets the current tick (a read at the
+ * deadline may still bring the answer `verify` reports, Issue #1544). Beyond
+ * what a timer can hold the request is left unbounded.
+ */
+function startRequestDeadline(deadlineAt, serverUrl, callerSignal) {
+    const controller = new AbortController();
+    const fire = () => {
+        if (!controller.signal.aborted)
+            controller.abort(new DeadlineExceededError(serverUrl));
+    };
+    const remaining = deadlineAt - Date.now();
+    let timer;
+    if (remaining < 0) {
+        fire();
+    }
+    else if (remaining <= MAX_TIMER_MS) {
+        timer = setTimeout(fire, remaining);
+        // A command that is done must not stay alive for a deadline it no longer needs.
+        timer.unref?.();
+    }
+    const signal = callerSignal ? AbortSignal.any([controller.signal, callerSignal]) : controller.signal;
+    const deadlineError = () => controller.signal.reason instanceof DeadlineExceededError
+        ? controller.signal.reason
+        : new DeadlineExceededError(serverUrl);
+    return {
+        signal,
+        run(promise) {
+            if (controller.signal.aborted) {
+                promise.catch(() => { });
+                return Promise.reject(deadlineError());
+            }
+            return new Promise((resolve, reject) => {
+                const onAbort = () => reject(deadlineError());
+                controller.signal.addEventListener('abort', onAbort, { once: true });
+                promise.then((value) => {
+                    controller.signal.removeEventListener('abort', onAbort);
+                    resolve(value);
+                }, (error) => {
+                    controller.signal.removeEventListener('abort', onAbort);
+                    reject(error);
+                });
+            });
+        },
+        classify(error) {
+            return controller.signal.aborted ? deadlineError() : error;
+        },
+        release() {
+            if (timer !== undefined)
+                clearTimeout(timer);
+        },
+    };
+}
+/** `promise` raced against `deadline`, or `promise` itself without one. */
+function bounded(deadline, promise) {
+    return deadline ? deadline.run(promise) : promise;
+}
+/**
+ * A {@link ApiClient.rawGet} response whose body reads are raced against the
+ * request's deadline (Issue #3983). The caller reads the body, so the bound has
+ * to travel with the response.
+ */
+function boundBodyReads(response, deadline) {
+    const read = (method) => () => deadline.run(method()).catch((error) => {
+        throw deadline.classify(error);
+    });
+    const json = response.json.bind(response);
+    const text = response.text.bind(response);
+    Object.defineProperty(response, 'json', { value: read(json), configurable: true });
+    Object.defineProperty(response, 'text', { value: read(text), configurable: true });
+    return response;
+}
+// =============================================================================
 // Response shape validation & version-skew detection (Issue #1357)
 // =============================================================================
 /**

package/dist/cli/utils/follow-up-command.d.ts

@@ -0,0 +1,38 @@
+/**
+ * The next command a CLI message tells the operator to run, aimed at the
+ * target the command actually addressed (Issue #3982).
+ *
+ * Each hint used to append ` --instance ${options.instance}` itself: the string
+ * the user typed (an alias reached `capture` unresolved), and nothing at all for
+ * `--agent` (so the hint read the worktree default's pane). One of them was
+ * fixed in #3975 and the others were not. These builders take the RESOLVED
+ * target — {@link CommandTarget}, what `resolveCommandTarget` returns — so the
+ * raw option cannot be passed where the hint's target belongs.
+ */
+import type { CommandTarget } from '../commands/command-target';
+/**
+ * The `capture` flags that read a dialog: the pane itself (the stored reply is
+ * not what is on screen), and enough of it to hold the dialog and its numbers.
+ */
+export declare const DIALOG_CAPTURE_FLAGS = "--pane --tail 40";
+/**
+ * ` --instance <id>` for a resolved instance, else ` --agent <tool>` when one
+ * was named, else nothing — a command that named no target keeps naming none.
+ */
+export declare function targetFlags(target: CommandTarget): string;
+/**
+ * `commandmate <verb> <worktree-id>[ <args>]<target flags>[ <trailing>]`.
+ *
+ * @param args - What follows the worktree id, e.g. `<number>` or `"<text>"`
+ * @param trailing - Flags that follow the target, e.g. `--pane --tail 40`
+ */
+export declare function followUpCommand(verb: string, worktreeId: string, target: CommandTarget, args?: string, trailing?: string): string;
+/** The `capture` that shows the target's dialog as it is on screen. */
+export declare function dialogCaptureCommand(worktreeId: string, target: CommandTarget): string;
+/**
+ * `commandmate capture <id>[ target] --pane`: the pane a message went to, to
+ * look at before a resend (Issue #3992). Without a target (a caller that has
+ * none to give) it names none.
+ */
+export declare function paneCaptureCommand(worktreeId: string, target: CommandTarget | undefined): string;
+//# sourceMappingURL=follow-up-command.d.ts.map

package/dist/cli/utils/follow-up-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"follow-up-command.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/follow-up-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAIzD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,aAAa,EACrB,IAAI,CAAC,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAER;AAED,uEAAuE;AACvE,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM,CAEtF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAIhG"}

package/dist/cli/utils/follow-up-command.js

@@ -0,0 +1,57 @@
+"use strict";
+/**
+ * The next command a CLI message tells the operator to run, aimed at the
+ * target the command actually addressed (Issue #3982).
+ *
+ * Each hint used to append ` --instance ${options.instance}` itself: the string
+ * the user typed (an alias reached `capture` unresolved), and nothing at all for
+ * `--agent` (so the hint read the worktree default's pane). One of them was
+ * fixed in #3975 and the others were not. These builders take the RESOLVED
+ * target — {@link CommandTarget}, what `resolveCommandTarget` returns — so the
+ * raw option cannot be passed where the hint's target belongs.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DIALOG_CAPTURE_FLAGS = void 0;
+exports.targetFlags = targetFlags;
+exports.followUpCommand = followUpCommand;
+exports.dialogCaptureCommand = dialogCaptureCommand;
+exports.paneCaptureCommand = paneCaptureCommand;
+/**
+ * The `capture` flags that read a dialog: the pane itself (the stored reply is
+ * not what is on screen), and enough of it to hold the dialog and its numbers.
+ */
+exports.DIALOG_CAPTURE_FLAGS = '--pane --tail 40';
+/**
+ * ` --instance <id>` for a resolved instance, else ` --agent <tool>` when one
+ * was named, else nothing — a command that named no target keeps naming none.
+ */
+function targetFlags(target) {
+    if (target.instanceId)
+        return ` --instance ${target.instanceId}`;
+    if (target.agent)
+        return ` --agent ${target.agent}`;
+    return '';
+}
+/**
+ * `commandmate <verb> <worktree-id>[ <args>]<target flags>[ <trailing>]`.
+ *
+ * @param args - What follows the worktree id, e.g. `<number>` or `"<text>"`
+ * @param trailing - Flags that follow the target, e.g. `--pane --tail 40`
+ */
+function followUpCommand(verb, worktreeId, target, args, trailing) {
+    return `commandmate ${verb} ${worktreeId}${args ? ` ${args}` : ''}${targetFlags(target)}${trailing ? ` ${trailing}` : ''}`;
+}
+/** The `capture` that shows the target's dialog as it is on screen. */
+function dialogCaptureCommand(worktreeId, target) {
+    return followUpCommand('capture', worktreeId, target, undefined, exports.DIALOG_CAPTURE_FLAGS);
+}
+/**
+ * `commandmate capture <id>[ target] --pane`: the pane a message went to, to
+ * look at before a resend (Issue #3992). Without a target (a caller that has
+ * none to give) it names none.
+ */
+function paneCaptureCommand(worktreeId, target) {
+    return target
+        ? followUpCommand('capture', worktreeId, target, undefined, '--pane')
+        : `commandmate capture ${worktreeId} --pane`;
+}

package/dist/cli/utils/reply-ledger.d.ts

@@ -17,7 +17,7 @@
  * and whether an unmarked row may stand in for one — stays with the caller.
  */
 import type { PromptMessageResponse } from '../types/api-responses';
-import type { ApiClient } from './api-client';
+import { type ApiClient } from './api-client';
 /**
  * Chat rows read back per request.
  *
@@ -77,6 +77,85 @@ export declare function replyCandidates(messages: PromptMessageResponse[], since
  * @param turnRowsOnly - Whether an unmarked (scraped) row may stand in
  */
 export declare function pickLatestReply(candidates: ReplyCandidate[], turnRowsOnly: boolean): ReplyCandidate | null;
+/**
+ * Whether another message reached this instance inside `[since, until]`
+ * (Issue #3955).
+ *
+ * codex folds a message typed while a turn is running into that same turn and
+ * answers both with one reply, so an `ask` whose turn also carried somebody
+ * else's message cannot know which of the two the reply answers. The ledger
+ * shows it: `/send` writes a `user` row for every message the instant it is
+ * handed to the pane, so a `user` row in this instance's window whose text is
+ * not this `ask`'s own is a second sender's.
+ *
+ * Text, not id, tells the rows apart: the transcript reader claims the `/send`
+ * row rather than writing a second one (`user-turn-recorder`), so this `ask`'s
+ * own message is one row, or one plus a reader's copy with the same text.
+ *
+ * @param messages - Rows as the messages route serialized them
+ * @param ownContent - The message this `ask` sent
+ * @param since - Epoch ms taken before the send
+ * A row on another instance is not this turn's: `instanceId` keeps a read that
+ * was not scoped to one instance (no `--instance` / `--agent`) from counting a
+ * message somebody sent to a different session. Without it every row counts,
+ * which is right only for a read the server already scoped.
+ *
+ * @param until - Epoch ms at which the turn ended
+ * @param instanceId - The instance this `ask`'s message went to
+ */
+export declare function hasForeignPromptInWindow(messages: PromptMessageResponse[], ownContent: string, since: number, until: number, instanceId?: string): boolean;
+/**
+ * The one instance this `ask`'s own `user` row landed on, or null
+ * (Issue #3955).
+ *
+ * An `ask` with no `--instance` / `--agent` leaves the choice to the server,
+ * and `/send` does not say which it picked to this caller. The ledger does: the
+ * row `/send` wrote carries it. Two rows with this text on different instances
+ * (the same request sent to two sessions at once) say nothing certain, so that
+ * is null too.
+ *
+ * @param messages - Rows as the messages route serialized them
+ * @param ownContent - The message this `ask` sent
+ * Bounded on both sides, like {@link hasForeignPromptInWindow}: the same text
+ * sent to another instance after this turn ended is somebody else's later
+ * request, and must not make this one's instance undecided.
+ *
+ * @param since - Epoch ms taken before the send
+ * @param until - Epoch ms at which the turn ended (`ask` always passes it;
+ *   unbounded when omitted)
+ */
+export declare function ownPromptInstance(messages: PromptMessageResponse[], ownContent: string, since: number, until?: number): string | null;
+/**
+ * User turns read back per page by {@link fetchPromptRowsSince}.
+ *
+ * The route's `unit=pairs` counts user rows, so a turn that wrote many
+ * assistant rows cannot push a user row out of the page the way it can out of
+ * {@link REPLY_LOOKBACK_MESSAGES} rows.
+ */
+export declare const PROMPT_ROWS_PAGE_TURNS = 20;
+/**
+ * Whether a read of {@link REPLY_LOOKBACK_MESSAGES} rows may have cut off rows
+ * stamped at or after `since` (Issue #3955): it came back full and its oldest
+ * row is not older than `since`.
+ */
+export declare function mayHaveDroppedRowsSince(messages: PromptMessageResponse[], since: number): boolean;
+/**
+ * Every `user` row stamped at or after `since`, however many rows came after
+ * it (Issue #3955), or null if the rows cannot be read.
+ *
+ * Pages backwards with the route's existing `unit=pairs` and `before`: a page
+ * holds the newest {@link PROMPT_ROWS_PAGE_TURNS} user rows and every row from
+ * the oldest of them on, so the next page's `before` (that oldest timestamp)
+ * leaves no user row between two pages. Stops at the first page that reaches
+ * back past `since`, or that holds fewer user rows than asked for (nothing
+ * older is left).
+ *
+ * @param client - API client
+ * @param worktreeId - Worktree ID
+ * @param instanceId - Instance to scope to, or undefined for every instance
+ * @param since - Epoch ms taken before the send
+ */
+export declare function fetchPromptRowsSince(client: ApiClient, worktreeId: string, instanceId: string | undefined, since: number): Promise<PromptMessageResponse[] | null>;
 /**
  * The recent chat rows for this instance. Throws what the API client throws.
  *

package/dist/cli/utils/reply-ledger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reply-ledger.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/reply-ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,KAAK,CAAC;AA4B1C;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAMtD,CAAC;AAcH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AAaD,iDAAiD;AACjD,MAAM,WAAW,cAAc;IAC7B,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,cAAc,EAAE,OAAO,CAAC;IACxB,kEAAkE;IAClE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,oEAAoE;IACpE,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,qBAAqB,EAAE,EACjC,KAAK,EAAE,MAAM,GACZ,cAAc,EAAE,CAkBlB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,cAAc,EAAE,EAC5B,YAAY,EAAE,OAAO,GACpB,cAAc,GAAG,IAAI,CAMvB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAUlC;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAMzC"}
+{"version":3,"file":"reply-ledger.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/reply-ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzE;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,KAAK,CAAC;AA4B1C;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAMtD,CAAC;AAcH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AAaD,iDAAiD;AACjD,MAAM,WAAW,cAAc;IAC7B,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,cAAc,EAAE,OAAO,CAAC;IACxB,kEAAkE;IAClE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,oEAAoE;IACpE,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,qBAAqB,EAAE,EACjC,KAAK,EAAE,MAAM,GACZ,cAAc,EAAE,CAkBlB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,cAAc,EAAE,EAC5B,YAAY,EAAE,OAAO,GACpB,cAAc,GAAG,IAAI,CAMvB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,qBAAqB,EAAE,EACjC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAST;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,qBAAqB,EAAE,EACjC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,KAAK,GAAE,MAAiC,GACvC,MAAM,GAAG,IAAI,CAWf;AAED;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,qBAAqB,EAAE,EACjC,KAAK,EAAE,MAAM,GACZ,OAAO,CAIT;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAwBzC;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAUlC;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAQzC"}