commandmate 0.31.2 → 0.32.0

package/.next/types/routes.d.ts

@@ -2,7 +2,7 @@
 // Do not edit this file manually
 
 type AppRoutes = "/" | "/chat" | "/login" | "/more" | "/offline" | "/repositories" | "/review" | "/sessions" | "/skills" | "/skills/[skillId]" | "/skills/installed" | "/worktrees/[id]" | "/worktrees/[id]/files/[...path]" | "/worktrees/[id]/terminal"
-type AppRouteHandlerRoutes = "/api/agents/update" | "/api/agents/versions" | "/api/app/update" | "/api/app/update-check" | "/api/assistant/conversation" | "/api/assistant/current-output" | "/api/assistant/messages" | "/api/assistant/session" | "/api/assistant/start" | "/api/assistant/terminal" | "/api/assistant/tools" | "/api/auth/login" | "/api/auth/logout" | "/api/auth/status" | "/api/capabilities" | "/api/daily-summary" | "/api/daily-summary/status" | "/api/external-apps" | "/api/external-apps/[id]" | "/api/external-apps/[id]/health" | "/api/fs/browse" | "/api/fs/recent-paths" | "/api/hooks/agent-event" | "/api/hooks/claude-done" | "/api/hooks/permission-request" | "/api/metrics/vibe" | "/api/ollama/models" | "/api/push/escalation" | "/api/push/subscriptions" | "/api/push/vapid" | "/api/remote/pair" | "/api/repositories" | "/api/repositories/[id]" | "/api/repositories/[id]/todos" | "/api/repositories/[id]/todos/[todoId]" | "/api/repositories/clone" | "/api/repositories/clone/[jobId]" | "/api/repositories/excluded" | "/api/repositories/restore" | "/api/repositories/scan" | "/api/repositories/sync" | "/api/repositories/validate-path" | "/api/settings/default-agents" | "/api/settings/default-surface-mode" | "/api/sidebar/group-order" | "/api/skills" | "/api/skills/[id]" | "/api/skills/installations" | "/api/skills/operations" | "/api/skills/reindex" | "/api/slash-commands" | "/api/tasks/[taskId]" | "/api/tasks/[taskId]/cancel" | "/api/templates" | "/api/templates/[id]" | "/api/todos" | "/api/verification/runs" | "/api/verification/runs/[runId]" | "/api/worktrees" | "/api/worktrees/[id]" | "/api/worktrees/[id]/auto-yes" | "/api/worktrees/[id]/capture" | "/api/worktrees/[id]/clear-composer" | "/api/worktrees/[id]/cli-reference" | "/api/worktrees/[id]/cli-tool" | "/api/worktrees/[id]/cmate/schedules" | "/api/worktrees/[id]/current-output" | "/api/worktrees/[id]/env" | "/api/worktrees/[id]/execution-logs" | "/api/worktrees/[id]/execution-logs/[logId]" | "/api/worktrees/[id]/files/[...path]" | "/api/worktrees/[id]/git/branch/create" | "/api/worktrees/[id]/git/branch/delete" | "/api/worktrees/[id]/git/branches" | "/api/worktrees/[id]/git/checkout" | "/api/worktrees/[id]/git/commit" | "/api/worktrees/[id]/git/diff" | "/api/worktrees/[id]/git/fetch" | "/api/worktrees/[id]/git/log" | "/api/worktrees/[id]/git/pull" | "/api/worktrees/[id]/git/push" | "/api/worktrees/[id]/git/reset" | "/api/worktrees/[id]/git/revert" | "/api/worktrees/[id]/git/show/[commitHash]" | "/api/worktrees/[id]/git/stage" | "/api/worktrees/[id]/git/staged" | "/api/worktrees/[id]/git/stash" | "/api/worktrees/[id]/git/stash/[index]" | "/api/worktrees/[id]/git/stash/apply" | "/api/worktrees/[id]/git/stash/pop" | "/api/worktrees/[id]/git/stash/push" | "/api/worktrees/[id]/git/status" | "/api/worktrees/[id]/git/unstage" | "/api/worktrees/[id]/git/working-diff" | "/api/worktrees/[id]/instances/opencode" | "/api/worktrees/[id]/interrupt" | "/api/worktrees/[id]/kill-session" | "/api/worktrees/[id]/logs" | "/api/worktrees/[id]/logs/[filename]" | "/api/worktrees/[id]/marp-render" | "/api/worktrees/[id]/memos" | "/api/worktrees/[id]/memos/[memoId]" | "/api/worktrees/[id]/messages" | "/api/worktrees/[id]/opencode/diff" | "/api/worktrees/[id]/opencode/session" | "/api/worktrees/[id]/opencode/share" | "/api/worktrees/[id]/prompt-response" | "/api/worktrees/[id]/resolve-target" | "/api/worktrees/[id]/respond" | "/api/worktrees/[id]/schedules" | "/api/worktrees/[id]/schedules/[scheduleId]" | "/api/worktrees/[id]/schedules/active" | "/api/worktrees/[id]/search" | "/api/worktrees/[id]/send" | "/api/worktrees/[id]/skills" | "/api/worktrees/[id]/skills/[skillId]/git-workflow" | "/api/worktrees/[id]/skills/[skillId]/install" | "/api/worktrees/[id]/skills/[skillId]/plan" | "/api/worktrees/[id]/skills/[skillId]/uninstall" | "/api/worktrees/[id]/skills/[skillId]/uninstall-plan" | "/api/worktrees/[id]/skills/[skillId]/update" | "/api/worktrees/[id]/skills/[skillId]/update-plan" | "/api/worktrees/[id]/slash-commands" | "/api/worktrees/[id]/special-keys" | "/api/worktrees/[id]/tasks" | "/api/worktrees/[id]/terminal" | "/api/worktrees/[id]/timers" | "/api/worktrees/[id]/timers/history" | "/api/worktrees/[id]/todos" | "/api/worktrees/[id]/todos/[todoId]" | "/api/worktrees/[id]/tree" | "/api/worktrees/[id]/tree/[...path]" | "/api/worktrees/[id]/upload/[...path]" | "/api/worktrees/[id]/verify" | "/api/worktrees/[id]/verify/config" | "/api/worktrees/[id]/verify/runs" | "/api/worktrees/[id]/verify/runs/[runId]" | "/api/worktrees/[id]/verify/runs/[runId]/cancel" | "/api/worktrees/[id]/viewed" | "/api/worktrees/apply-default-agents" | "/proxy/[...path]"
+type AppRouteHandlerRoutes = "/api/agents/update" | "/api/agents/versions" | "/api/app/update" | "/api/app/update-check" | "/api/assistant/conversation" | "/api/assistant/current-output" | "/api/assistant/messages" | "/api/assistant/session" | "/api/assistant/start" | "/api/assistant/terminal" | "/api/assistant/tools" | "/api/auth/login" | "/api/auth/logout" | "/api/auth/status" | "/api/capabilities" | "/api/daily-summary" | "/api/daily-summary/status" | "/api/external-apps" | "/api/external-apps/[id]" | "/api/external-apps/[id]/health" | "/api/fs/browse" | "/api/fs/recent-paths" | "/api/hooks/agent-event" | "/api/hooks/claude-done" | "/api/hooks/permission-request" | "/api/metrics/vibe" | "/api/ollama/models" | "/api/push/escalation" | "/api/push/subscriptions" | "/api/push/vapid" | "/api/relays" | "/api/relays/[relayId]/cancel" | "/api/remote/pair" | "/api/repositories" | "/api/repositories/[id]" | "/api/repositories/[id]/todos" | "/api/repositories/[id]/todos/[todoId]" | "/api/repositories/clone" | "/api/repositories/clone/[jobId]" | "/api/repositories/excluded" | "/api/repositories/restore" | "/api/repositories/scan" | "/api/repositories/sync" | "/api/repositories/validate-path" | "/api/settings/default-agents" | "/api/settings/default-surface-mode" | "/api/sidebar/group-order" | "/api/skills" | "/api/skills/[id]" | "/api/skills/installations" | "/api/skills/operations" | "/api/skills/reindex" | "/api/slash-commands" | "/api/tasks/[taskId]" | "/api/tasks/[taskId]/cancel" | "/api/templates" | "/api/templates/[id]" | "/api/todos" | "/api/verification/runs" | "/api/verification/runs/[runId]" | "/api/worktrees" | "/api/worktrees/[id]" | "/api/worktrees/[id]/auto-yes" | "/api/worktrees/[id]/capture" | "/api/worktrees/[id]/clear-composer" | "/api/worktrees/[id]/cli-reference" | "/api/worktrees/[id]/cli-tool" | "/api/worktrees/[id]/cmate/schedules" | "/api/worktrees/[id]/current-output" | "/api/worktrees/[id]/env" | "/api/worktrees/[id]/execution-logs" | "/api/worktrees/[id]/execution-logs/[logId]" | "/api/worktrees/[id]/files/[...path]" | "/api/worktrees/[id]/git/branch/create" | "/api/worktrees/[id]/git/branch/delete" | "/api/worktrees/[id]/git/branches" | "/api/worktrees/[id]/git/checkout" | "/api/worktrees/[id]/git/commit" | "/api/worktrees/[id]/git/diff" | "/api/worktrees/[id]/git/fetch" | "/api/worktrees/[id]/git/log" | "/api/worktrees/[id]/git/pull" | "/api/worktrees/[id]/git/push" | "/api/worktrees/[id]/git/reset" | "/api/worktrees/[id]/git/revert" | "/api/worktrees/[id]/git/show/[commitHash]" | "/api/worktrees/[id]/git/stage" | "/api/worktrees/[id]/git/staged" | "/api/worktrees/[id]/git/stash" | "/api/worktrees/[id]/git/stash/[index]" | "/api/worktrees/[id]/git/stash/apply" | "/api/worktrees/[id]/git/stash/pop" | "/api/worktrees/[id]/git/stash/push" | "/api/worktrees/[id]/git/status" | "/api/worktrees/[id]/git/unstage" | "/api/worktrees/[id]/git/working-diff" | "/api/worktrees/[id]/instances/opencode" | "/api/worktrees/[id]/interrupt" | "/api/worktrees/[id]/kill-session" | "/api/worktrees/[id]/logs" | "/api/worktrees/[id]/logs/[filename]" | "/api/worktrees/[id]/marp-render" | "/api/worktrees/[id]/memos" | "/api/worktrees/[id]/memos/[memoId]" | "/api/worktrees/[id]/messages" | "/api/worktrees/[id]/opencode/diff" | "/api/worktrees/[id]/opencode/session" | "/api/worktrees/[id]/opencode/share" | "/api/worktrees/[id]/prompt-response" | "/api/worktrees/[id]/resolve-target" | "/api/worktrees/[id]/respond" | "/api/worktrees/[id]/schedules" | "/api/worktrees/[id]/schedules/[scheduleId]" | "/api/worktrees/[id]/schedules/active" | "/api/worktrees/[id]/search" | "/api/worktrees/[id]/send" | "/api/worktrees/[id]/skills" | "/api/worktrees/[id]/skills/[skillId]/git-workflow" | "/api/worktrees/[id]/skills/[skillId]/install" | "/api/worktrees/[id]/skills/[skillId]/plan" | "/api/worktrees/[id]/skills/[skillId]/uninstall" | "/api/worktrees/[id]/skills/[skillId]/uninstall-plan" | "/api/worktrees/[id]/skills/[skillId]/update" | "/api/worktrees/[id]/skills/[skillId]/update-plan" | "/api/worktrees/[id]/slash-commands" | "/api/worktrees/[id]/special-keys" | "/api/worktrees/[id]/tasks" | "/api/worktrees/[id]/terminal" | "/api/worktrees/[id]/timers" | "/api/worktrees/[id]/timers/history" | "/api/worktrees/[id]/todos" | "/api/worktrees/[id]/todos/[todoId]" | "/api/worktrees/[id]/tree" | "/api/worktrees/[id]/tree/[...path]" | "/api/worktrees/[id]/upload/[...path]" | "/api/worktrees/[id]/verify" | "/api/worktrees/[id]/verify/config" | "/api/worktrees/[id]/verify/runs" | "/api/worktrees/[id]/verify/runs/[runId]" | "/api/worktrees/[id]/verify/runs/[runId]/cancel" | "/api/worktrees/[id]/viewed" | "/api/worktrees/apply-default-agents" | "/proxy/[...path]"
 type PageRoutes = never
 type LayoutRoutes = "/" | "/worktrees/[id]"
 type RedirectRoutes = never
@@ -42,6 +42,8 @@ interface ParamMap {
   "/api/push/escalation": {}
   "/api/push/subscriptions": {}
   "/api/push/vapid": {}
+  "/api/relays": {}
+  "/api/relays/[relayId]/cancel": { "relayId": string; }
   "/api/remote/pair": {}
   "/api/repositories": {}
   "/api/repositories/[id]": { "id": string; }

package/.next/types/validator.ts

@@ -443,6 +443,24 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   type __Unused = __Check
 }
 
+// Validate ../../src/app/api/relays/[relayId]/cancel/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/relays/[relayId]/cancel">> = Specific
+  const handler = {} as typeof import("../../src/app/api/relays/[relayId]/cancel/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
+// Validate ../../src/app/api/relays/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/relays">> = Specific
+  const handler = {} as typeof import("../../src/app/api/relays/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
 // Validate ../../src/app/api/remote/pair/route.ts
 {
   type __IsExpected<Specific extends RouteHandlerConfig<"/api/remote/pair">> = Specific

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

@@ -0,0 +1,34 @@
+/**
+ * ask Command - one round trip to another agent session (Issue #2376)
+ *
+ *   commandmate ask <worktree-id> "<message>" [--instance <id|alias>]
+ *                   [--agent <tool>] [--timeout <seconds>] [--json]
+ *
+ * ## Why this exists next to send / wait / capture
+ *
+ * Delegation between two agent sessions was a HARNESS, not a command. Session A
+ * had to `send`, then `wait`, then branch on four exit codes, then `capture` and
+ * work out which part of the pane was the reply — and every one of those steps
+ * is a place to get it wrong in a way that fails quietly. Dropping the `wait`
+ * spins; reading the pane without one reads the previous turn; answering the
+ * other session's prompt with `respond` picks whatever option happened to be
+ * highlighted (#1681).
+ *
+ * `ask` is those three steps with the branch already taken. It is deliberately
+ * NOT a new mechanism: the send is the same POST, the wait is `wait`'s own
+ * {@link pollWorktree}, and the exit codes are `wait`'s exit codes. What it adds
+ * is the last step nothing had — turning "the turn ended" into "here is what
+ * they said" — and the two guarantees the brief in the GUI promises: `--auto-yes`
+ * is not offered, and a prompt is reported rather than answered.
+ *
+ * ## Where the reply comes from
+ *
+ * The chat ledger first (`chat_messages`, what the transcript readers and the
+ * structured-history gate write), because that is the agent's reply as text —
+ * no box drawing, no composer, no spinner frames. A tool that has no transcript
+ * reader falls back to the squeezed pane, and `--json` says which of the two
+ * answered in `source` so a caller can tell a real reply from a screen scrape.
+ */
+import { Command } from 'commander';
+export declare function createAskCommand(): Command;
+//# sourceMappingURL=ask.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ask.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsVpC,wBAAgB,gBAAgB,IAAI,OAAO,CAoN1C"}

package/dist/cli/commands/ask.js

@@ -0,0 +1,494 @@
+"use strict";
+/**
+ * ask Command - one round trip to another agent session (Issue #2376)
+ *
+ *   commandmate ask <worktree-id> "<message>" [--instance <id|alias>]
+ *                   [--agent <tool>] [--timeout <seconds>] [--json]
+ *
+ * ## Why this exists next to send / wait / capture
+ *
+ * Delegation between two agent sessions was a HARNESS, not a command. Session A
+ * had to `send`, then `wait`, then branch on four exit codes, then `capture` and
+ * work out which part of the pane was the reply — and every one of those steps
+ * is a place to get it wrong in a way that fails quietly. Dropping the `wait`
+ * spins; reading the pane without one reads the previous turn; answering the
+ * other session's prompt with `respond` picks whatever option happened to be
+ * highlighted (#1681).
+ *
+ * `ask` is those three steps with the branch already taken. It is deliberately
+ * NOT a new mechanism: the send is the same POST, the wait is `wait`'s own
+ * {@link pollWorktree}, and the exit codes are `wait`'s exit codes. What it adds
+ * is the last step nothing had — turning "the turn ended" into "here is what
+ * they said" — and the two guarantees the brief in the GUI promises: `--auto-yes`
+ * is not offered, and a prompt is reported rather than answered.
+ *
+ * ## Where the reply comes from
+ *
+ * The chat ledger first (`chat_messages`, what the transcript readers and the
+ * structured-history gate write), because that is the agent's reply as text —
+ * no box drawing, no composer, no spinner frames. A tool that has no transcript
+ * reader falls back to the squeezed pane, and `--json` says which of the two
+ * answered in `source` so a caller can tell a real reply from a screen scrape.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAskCommand = createAskCommand;
+const commander_1 = require("commander");
+const types_1 = require("../types");
+const api_client_1 = require("../utils/api-client");
+const command_helpers_1 = require("../utils/command-helpers");
+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 wait_1 = require("./wait");
+const capture_1 = require("./capture");
+const relays_1 = require("./relays");
+/**
+ * Code the send API returns when the session is blocked on a prompt.
+ *
+ * Mirrors `PROMPT_WAITING_CODE` in `send.ts`, which mirrors the server's own —
+ * the CLI bundle keeps its own copies of API strings rather than importing the
+ * server's tmux/detection graph for one of them.
+ */
+const PROMPT_WAITING_CODE = 'PROMPT_WAITING';
+/** Default `--timeout`, in seconds. Matches the GUI's delegation brief. */
+const DEFAULT_ASK_TIMEOUT_SECONDS = 1800;
+/**
+ * Chat rows read back after the turn.
+ *
+ * Bounded because only the tail matters and an unbounded read of a long-running
+ * worktree's history is a large response for one line of answer. Generous
+ * enough that a turn which wrote several assistant rows (a tool-use narration
+ * followed by the summary) still has its last one inside the window.
+ */
+const REPLY_LOOKBACK_MESSAGES = 30;
+/** Squeezed pane lines kept for the fallback reply. */
+const PANE_FALLBACK_TAIL = 80;
+/**
+ * The `request_id` namespace every transcript reader mints for a turn.
+ *
+ * `codex-turn:<turn_id>`, `claude-turn:<uuid>`, `antigravity-turn:<id>`,
+ * `command-code-turn:<id>` and opencode's `oc-turn:<msg id>` — mirrored here as
+ * a shape rather than imported, for the reason {@link PROMPT_WAITING_CODE}
+ * gives: the CLI bundle keeps its own copies of API strings instead of pulling
+ * `src/types/agent-transcript.ts` and its dependents into `build:cli`. Matching
+ * the shape rather than a list of five literals is also what stops the sixth
+ * reader from silently landing outside the filter.
+ *
+ * A `:` cannot appear in any of the ids themselves, so this cannot match a row
+ * that merely CONTAINS the text.
+ */
+const TURN_REQUEST_ID_PATTERN = /-turn:/;
+/**
+ * Request-id namespaces CommandMate writes about a session, not for it.
+ *
+ * `chat_messages` has no `system` role, so "the model changed" (Issue #2357)
+ * and "reply from X" (Issue #2377) are both stored as ASSISTANT rows and told
+ * apart by their request id. Neither is anything the other session said, and
+ * delivering the relay notice back as an answer is the smallest possible loop —
+ * `findWorkerReply` steps over the same rows for the same reason.
+ */
+const SYSTEM_ROW_REQUEST_ID_PREFIXES = ['relay-sys:', 'model-changed:'];
+/**
+ * Tools whose reply CommandMate reads out of a transcript rather than a screen.
+ *
+ * For these five the ledger is authoritative and a row with no turn marker is
+ * by definition not the answer, so `ask` may hold out for a marked one. For
+ * every other tool (copilot / gemini / vibe-local) the scraper's row is the
+ * only record there will ever be, and demanding a marker would throw away a
+ * cleaned reply in favour of the raw pane.
+ *
+ * Mirrors the five readers that live under `src/lib/hooks/sources/`.
+ */
+const TRANSCRIPT_READER_TOOLS = new Set([
+    'claude',
+    'codex',
+    'antigravity',
+    'command-code',
+    'opencode',
+]);
+/**
+ * How long `ask` will hold out for the turn row after the turn ends.
+ *
+ * Issue #2386 measured the gap on codex 0.153.4 at 5.2 s: the scraper writes the
+ * idle composer into the ledger in the millisecond BEFORE the send, and the
+ * rollout reader writes the real answer five seconds after `wait` has already
+ * said `basis=hook_stop`. Reading once at that instant is how the junk got
+ * printed as the answer, three times out of three.
+ *
+ * Three times the measured gap, and spent only when the ledger has nothing
+ * marked yet — a session that already answered returns on the first read. When
+ * it does elapse the existing pane fallback takes over, so the cost of guessing
+ * this too low is a screen scrape, never a lost turn.
+ */
+const REPLY_TURN_ROW_GRACE_MS = 15_000;
+/** How often the grace above re-reads the ledger. */
+const REPLY_TURN_ROW_POLL_MS = 1_000;
+/**
+ * ANSI escape sequences, as a pattern built from escapes rather than literals.
+ *
+ * `scripts/check-control-chars.mjs` fails the build on a raw C0 byte in `src/`
+ * (Issue #1432), and a raw ESC here would be one.
+ */
+const ANSI_ESCAPE_PATTERN = /[\u001B\u009B][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PR-TZcf-nqry=><]/g;
+/** Remaining C0/C1 control bytes, once the sequences above are gone. */
+const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F]/g;
+/** Sleep, for the grace window above. */
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * A reply body fit to print, or `''` if nothing survived.
+ *
+ * Issue #2386 asked for this as a belt to the braces: the row the junk came
+ * from held RAW ANSI, and a caller that pipes `ask` into a report or a commit
+ * message should never have to strip escape codes out of an agent's sentence.
+ * Applied to the pane fallback as well as to the ledger, because the pane is
+ * the more likely of the two to carry them.
+ *
+ * @param raw - Reply text as it arrived
+ */
+function sanitizeReply(raw) {
+    return raw.replace(ANSI_ESCAPE_PATTERN, '').replace(CONTROL_CHAR_PATTERN, '').trim();
+}
+/** Whether a row's `request_id` says a transcript reader wrote it. */
+function isTurnRow(requestId) {
+    return typeof requestId === 'string' && TURN_REQUEST_ID_PATTERN.test(requestId);
+}
+/** Whether a row is CommandMate's own furniture rather than the agent's words. */
+function isSystemRow(requestId) {
+    return typeof requestId === 'string'
+        && SYSTEM_ROW_REQUEST_ID_PREFIXES.some((prefix) => requestId.startsWith(prefix));
+}
+/**
+ * The rows that could be this turn's reply, oldest first.
+ *
+ * @param messages - Rows as the messages route serialized them
+ * @param since - Epoch ms taken immediately before the send
+ */
+function replyCandidates(messages, since) {
+    const candidates = [];
+    for (const m of messages) {
+        if (m.role !== 'assistant')
+            continue;
+        if (m.messageType === 'prompt')
+            continue;
+        if (typeof m.content !== 'string')
+            continue;
+        if (!(Date.parse(m.timestamp) >= since))
+            continue;
+        if (isSystemRow(m.requestId))
+            continue;
+        const content = sanitizeReply(m.content);
+        if (content === '')
+            continue;
+        candidates.push({ content, fromTranscript: isTurnRow(m.requestId) });
+    }
+    return candidates;
+}
+/**
+ * The recent chat rows for this instance, or null if they cannot be read.
+ *
+ * @param client - API client
+ * @param worktreeId - Worktree ID
+ * @param instanceId - Resolved instance ID
+ */
+async function fetchRecentMessages(client, worktreeId, instanceId) {
+    const query = new URLSearchParams({ limit: String(REPLY_LOOKBACK_MESSAGES) });
+    if (instanceId)
+        query.set('instance', instanceId);
+    try {
+        // PromptMessageResponse is the CLI's mirror of a serialized chat row; the
+        // `messageType: 'prompt'` filter is the caller's, not the type's, so it is
+        // the right shape for reading normal rows too.
+        const messages = await client.get(`/api/worktrees/${worktreeId}/messages?${query.toString()}`);
+        return Array.isArray(messages) ? messages : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Parse and validate `--timeout <seconds>`.
+ *
+ * A bare `parseInt` is not used (unlike `wait`, which takes commander's) so a
+ * value the shell mangled is an error rather than a NaN that disables the
+ * deadline — an `ask` with no deadline is the unattended hang this command
+ * exists to bound.
+ *
+ * @param raw - Raw option value, if the user passed one
+ * @returns Timeout in seconds
+ */
+function parseTimeout(raw) {
+    if (raw === undefined)
+        return DEFAULT_ASK_TIMEOUT_SECONDS;
+    const value = Number(raw);
+    if (!Number.isInteger(value) || value < 1) {
+        console.error('Error: --timeout must be a positive integer number of seconds.');
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    return value;
+}
+/**
+ * The newest assistant message this instance wrote after `since`, or null.
+ *
+ * `since` is captured before the send, so a reply from the PREVIOUS turn cannot
+ * be mistaken for this one — the failure a bare `capture` after a `wait` has
+ * always had. Prompt rows are excluded: a prompt is reported through the exit
+ * code and the JSON payload, and printing its question as if it were an answer
+ * is what would teach a caller to answer it.
+ *
+ * ## Why a timestamp is not enough (Issue #2386)
+ *
+ * `since` fences off the previous turn; it does nothing about a row written
+ * INSIDE this one that is not a reply. codex's screen scraper writes the idle
+ * composer into the ledger as an assistant row one millisecond before the send
+ * lands — measured 3/3 on codex 0.153.4 — so at the moment `wait` says
+ * `basis=hook_stop` the newest row after `since` is a scrape of an empty input
+ * box, in raw ANSI, and the rollout reader's real answer is still five seconds
+ * away. `ask` printed the box.
+ *
+ * The separator is the row's own `request_id`, which is why #2386 put it on the
+ * wire: a reply a transcript reader wrote is keyed `<tool>-turn:<id>`, a scrape
+ * is keyed nothing at all. For a tool that HAS such a reader the marker is
+ * therefore required, and this waits {@link REPLY_TURN_ROW_GRACE_MS} for one
+ * rather than answering with whatever the screen happened to hold. For a tool
+ * that has none — copilot / gemini / vibe-local — the scraper's row is the only
+ * record there will ever be, so it is taken as it always was, with no wait.
+ *
+ * Never throws. A daemon that cannot serve the ledger is a reason to fall back
+ * to the pane, not a reason to lose a turn that already completed.
+ *
+ * @param client - API client
+ * @param worktreeId - Worktree ID
+ * @param instanceId - Resolved instance ID
+ * @param since - Epoch ms taken immediately before the send
+ * @param cliToolId - Resolved CLI tool, when one is known
+ */
+async function readLatestReply(client, worktreeId, instanceId, since, cliToolId) {
+    const requireTurnRow = cliToolId !== undefined && TRANSCRIPT_READER_TOOLS.has(cliToolId);
+    const deadline = Date.now() + (requireTurnRow ? REPLY_TURN_ROW_GRACE_MS : 0);
+    for (;;) {
+        const messages = await fetchRecentMessages(client, worktreeId, instanceId);
+        const candidates = replyCandidates(messages ?? [], since);
+        // Newest first among the rows a reader wrote. A turn that emitted several
+        // assistant rows (a narration then the summary) still ends on its summary.
+        for (let i = candidates.length - 1; i >= 0; i -= 1) {
+            if (candidates[i].fromTranscript)
+                return candidates[i].content;
+        }
+        if (!requireTurnRow) {
+            // Unchanged behaviour for a tool with no transcript: the newest row after
+            // the send, marker or not.
+            const newest = candidates[candidates.length - 1];
+            return newest ? newest.content : null;
+        }
+        if (Date.now() >= deadline)
+            return null;
+        await sleep(REPLY_TURN_ROW_POLL_MS);
+    }
+}
+/**
+ * The squeezed tail of the pane, for a tool that keeps no transcript.
+ *
+ * copilot / gemini / vibe-local publish no chat rows, so the screen is the only
+ * record of what they said. Through `capture`'s own reader — the same route,
+ * the same squeeze, the same client-side placement — so nothing that consumes
+ * `/capture` sees a different payload because this command exists.
+ *
+ * @param client - API client
+ * @param worktreeId - Worktree ID
+ * @param cliToolId - Resolved CLI tool
+ * @param instanceId - Resolved instance ID
+ */
+async function readPaneTail(client, worktreeId, cliToolId, instanceId) {
+    return (0, capture_1.readSqueezedPaneTail)(client, worktreeId, cliToolId, instanceId, PANE_FALLBACK_TAIL);
+}
+function createAskCommand() {
+    const cmd = new commander_1.Command('ask');
+    cmd
+        .description('Send a message to another agent session and print its reply '
+        + '(send + wait + read, with wait\'s exit codes)')
+        .argument('<worktree-id>', 'Worktree ID')
+        .argument('<message>', 'Message to send')
+        .option('--instance <id>', `${agent_target_options_1.INSTANCE_OPTION_DESCRIPTION} ${instances_1.INSTANCE_ALIAS_HELP_SUFFIX}`)
+        .option('--agent <agent>', agent_target_options_1.AGENT_OPTION_DESCRIPTION)
+        .option('--timeout <seconds>', `Maximum time to wait for the reply (default ${DEFAULT_ASK_TIMEOUT_SECONDS})`)
+        .option('--json', 'Print the reply as JSON with the target and the reply source')
+        .option('--async', 'Do not wait: register a relay, print its id and exit 0. The reply is '
+        + 'delivered into --reply-to\'s composer when the turn ends (defaults to this session)')
+        .option('--reply-to <target>', relays_1.REPLY_TO_OPTION_DESCRIPTION)
+        .option('--allow-relay-chain', relays_1.ALLOW_RELAY_CHAIN_DESCRIPTION)
+        .option('--token <token>', command_helpers_1.TOKEN_WARNING)
+        .addHelpText('after', `
+--async is the same delegation without the block (Issue #2377). Nothing waits,
+stdout is the relay id, and when the other session finishes CommandMate puts
+its answer into your composer prefixed with \`[from <alias> / <worktree>]\`. Use
+\`commandmate relays\` to see what is outstanding and \`relays cancel <id>\` to
+withdraw one. --reply-to / --allow-relay-chain are only meaningful with it.
+
+Exit codes (wait's, unchanged; --async always exits 0 once the relay exists):
+  0    the turn ended; stdout is the reply body
+  10   the other session is waiting on a prompt. stdout carries the prompt JSON
+       (same shape as \`wait --on-prompt agent\`). Report it; do NOT answer it
+       with \`respond\` on the other session's behalf — the number that resolves
+       a dialog is the dialog's own, and a wrong one picks the default (#1681).
+  21   nothing was running to ask
+  124  timed out. Look with \`capture <id> --instance <id> --pane --tail 60\`
+
+There is deliberately no --auto-yes: turning another session's Auto-Yes on is
+a decision about that session's guard rails, not part of asking it a question.
+`)
+        .action(async (worktreeId, message, options) => {
+        try {
+            if (!(0, api_client_1.isValidWorktreeId)(worktreeId)) {
+                console.error('Error: Invalid worktree ID format.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (message.trim() === '') {
+                console.error('Error: Message cannot be empty.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (options.agent && !(0, cli_tool_ids_1.isCliToolId)(options.agent)) {
+                console.error(`Error: Invalid agent. Must be one of: ${cli_tool_ids_1.CLI_TOOL_IDS.join(', ')}`);
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (options.instance && !(0, instances_1.isInstanceSelector)(options.instance)) {
+                console.error(instances_1.INSTANCE_SELECTOR_ERROR);
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            // `--reply-to` / `--allow-relay-chain` only mean something under
+            // `--async`: without it `ask` returns the reply on stdout, and a second
+            // copy arriving in somebody's composer is a surprise, not a feature.
+            if (!options.async && (options.replyTo || options.allowRelayChain)) {
+                console.error('Error: --reply-to and --allow-relay-chain require --async.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            const timeout = parseTimeout(options.timeout);
+            const client = new api_client_1.ApiClient({ token: options.token });
+            // Resolved once, before the send, and reused for the wait and both
+            // reads: the alias-to-id mapping and the roster's tool are the same
+            // facts for all four requests, and asking twice is how two of them end
+            // up addressing different sessions (Issue #1925).
+            const target = options.instance
+                ? await (0, instances_1.resolveInstanceTarget)(client, worktreeId, options.instance, options.agent)
+                : null;
+            const agent = target ? target.cliToolId : options.agent;
+            const instanceId = target?.instanceId;
+            // Taken BEFORE the send so a reply written by the previous turn cannot
+            // be read as this one's. Milliseconds, compared against the row's own
+            // timestamp rather than against a re-derived clock.
+            const askedAt = Date.now();
+            // Issue #2377: registered BEFORE the send, so a session that answers
+            // immediately cannot finish its turn in the window between the message
+            // and the ledger row. A refusal exits 2 having sent nothing.
+            let relayId;
+            if (options.async) {
+                const replyEndpoint = await (0, relays_1.resolveRelayEndpoint)(client, options.replyTo ?? 'self');
+                const workerEndpoint = await (0, relays_1.resolveEndpointForWorktree)(client, worktreeId, options.instance, options.agent);
+                relayId = await (0, relays_1.registerRelay)(client, {
+                    from: replyEndpoint,
+                    to: workerEndpoint,
+                    allowRelayChain: options.allowRelayChain,
+                });
+            }
+            const sendBody = { content: message };
+            if (agent)
+                sendBody.cliToolId = agent;
+            if (instanceId)
+                sendBody.instanceId = instanceId;
+            try {
+                await client.post(`/api/worktrees/${worktreeId}/send`, sendBody);
+            }
+            catch (error) {
+                // The other session is sitting on a dialog, so the message would have
+                // been typed into the dialog's input line instead of reaching the
+                // agent (Issue #1708). Reported as a config error with the server's
+                // own sentence: the answer is to look at that session, never to
+                // re-send.
+                // A relay whose message never arrived can never be answered.
+                if (relayId)
+                    await (0, relays_1.cancelRelayQuietly)(client, relayId);
+                if (error instanceof api_client_1.ApiError && error.apiCode === PROMPT_WAITING_CODE) {
+                    console.error(`Error: ${error.payload?.error
+                        ?? `${worktreeId} is waiting on a prompt; the message was not sent.`}`);
+                    process.exit(types_1.ExitCode.CONFIG_ERROR);
+                }
+                throw error;
+            }
+            // Issue #2377: the whole point of `--async`. Nothing is waited on, so
+            // the caller's own turn ends here and the answer arrives later, in their
+            // composer, as a `relay` row.
+            if (relayId) {
+                if (options.json) {
+                    console.log(JSON.stringify({
+                        worktreeId,
+                        instanceId: instanceId ?? null,
+                        cliToolId: agent ?? null,
+                        relayId,
+                        mode: 'async',
+                    }, null, 2));
+                }
+                else {
+                    console.log(relayId);
+                }
+                console.error('Message sent. The reply will be delivered when the turn ends; '
+                    + 'watch it with `commandmate relays`.');
+                process.exit(types_1.ExitCode.SUCCESS);
+                return;
+            }
+            console.error('Message sent. Waiting for the reply...');
+            // `wait`'s own poller, with `wait`'s own defaults: --on-prompt is left
+            // at `agent`, so a prompt ends this ask with exit 10 and the payload
+            // rather than blocking until the timeout.
+            const result = await (0, wait_1.pollWorktree)(client, worktreeId, {
+                timeout,
+                instance: instanceId,
+                token: options.token,
+            });
+            if (result.exitCode !== types_1.WaitExitCode.SUCCESS) {
+                // Same stdout contract as `wait`: the prompt payload, and nothing
+                // else, so a caller can parse it without stripping progress lines.
+                if (result.output) {
+                    console.log(JSON.stringify(result.output));
+                }
+                process.exit(result.exitCode);
+                return;
+            }
+            let source = 'history';
+            let reply = await readLatestReply(client, worktreeId, instanceId, askedAt, agent);
+            if (reply === null && agent) {
+                source = 'pane';
+                const pane = await readPaneTail(client, worktreeId, agent, instanceId);
+                const cleaned = pane === null ? '' : sanitizeReply(pane);
+                reply = cleaned === '' ? null : cleaned;
+            }
+            if (reply === null) {
+                source = 'none';
+            }
+            if (options.json) {
+                console.log(JSON.stringify({
+                    worktreeId,
+                    instanceId: instanceId ?? null,
+                    cliToolId: agent ?? null,
+                    source,
+                    reply,
+                }, null, 2));
+            }
+            else if (reply === null) {
+                // Not an error exit: the turn DID end, and saying so on stderr keeps
+                // stdout empty rather than filling it with an apology a caller would
+                // paste into a report as the agent's answer.
+                console.error('Warning: the turn completed but no reply could be read '
+                    + '(no transcript row and no readable pane).');
+            }
+            else {
+                console.log(reply);
+            }
+            process.exit(types_1.ExitCode.SUCCESS);
+        }
+        catch (error) {
+            (0, command_helpers_1.handleCommandError)(error);
+        }
+    });
+    return cmd;
+}

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

@@ -5,5 +5,25 @@
  * Issue #1685: `--prompts` lists the resolved-prompt audit trail
  */
 import { Command } from 'commander';
+import { ApiClient } from '../utils/api-client';
+/**
+ * Read one instance's pane and return its squeezed tail, or null.
+ *
+ * Exported for `ask` (Issue #2376), which needs the same read for the tools
+ * that keep no transcript — and which must not import
+ * `lib/tmux/transcript-squeeze` itself: Issue #1922's import guard names this
+ * module in its allowlist as baseline debt that "may only shrink", so the
+ * squeeze stays behind the command that already owns it.
+ *
+ * Null on any failure. Both callers treat an unreadable pane as "no reply to
+ * show", never as an error of their own.
+ *
+ * @param client - API client
+ * @param worktreeId - Worktree ID
+ * @param cliToolId - Resolved CLI tool
+ * @param instanceId - Resolved instance ID, when there is one
+ * @param tail - Lines of squeezed transcript to keep
+ */
+export declare function readSqueezedPaneTail(client: ApiClient, worktreeId: string, cliToolId: string, instanceId: string | undefined, tail: number): Promise<string | null>;
 export declare function createCaptureCommand(): Command;
 //# sourceMappingURL=capture.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/capture.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwYpC,wBAAgB,oBAAoB,IAAI,OAAO,CA4H9C"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/capture.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,EAAE,SAAS,EAAqB,MAAM,qBAAqB,CAAC;AAmVnE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AA2ED,wBAAgB,oBAAoB,IAAI,OAAO,CA8H9C"}