commandmate 0.44.1 → 0.44.3

package/dist/cli/commands/capture.js

@@ -16,8 +16,10 @@ 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 command_target_1 = require("./command-target");
 const pager_1 = require("../utils/pager");
 const transcript_squeeze_1 = require("../../lib/tmux/transcript-squeeze");
+const prompt_view_1 = require("../../lib/session/prompt-view");
 /**
  * Rows of pane history the `--pane` viewer asks for.
  *
@@ -39,13 +41,6 @@ const DEFAULT_FOLLOW_INTERVAL_MS = 2000;
 /** Floor and ceiling for `--interval`. */
 const MIN_FOLLOW_INTERVAL_MS = 250;
 const MAX_FOLLOW_INTERVAL_MS = 60_000;
-/**
- * `promptData.type` the server writes for a frame the detection layer could not
- * classify (Issue #1708). Mirrors UNCLASSIFIED_PROMPT_TYPE in
- * src/types/models.ts; duplicated rather than imported because the CLI bundle
- * keeps its own copy of the API shapes (see api-responses.ts).
- */
-const UNCLASSIFIED_FRAME_TYPE = 'unclassified';
 /** Shown by the default text mode when there is no transcript to print (Issue #3128). */
 const EMPTY_TRANSCRIPT_HINT = 'No transcript yet. A prompt (e.g. "Trust this folder?") may be waiting on screen; '
     + 'read it with `commandmate capture <worktree-id> --instance <instance> --pane --tail 40`.';
@@ -219,7 +214,12 @@ async function capturePrompts(worktreeId, options) {
         // Issue #1708: a row recording that detection FAILED must not read as a
         // prompt that was seen and is merely unanswered — that reading is what would
         // send an operator looking for an answer path that never existed.
-        const unclassified = p.type === UNCLASSIFIED_FRAME_TYPE;
+        //
+        // Issue #3184: "a row nobody can answer" is the shared view's `unreadable`
+        // — every history record of type `unclassified` is one, since neither
+        // degraded record carries a decision id. Read through `derivePromptView`
+        // rather than a restated copy of the sentinel.
+        const unclassified = (0, prompt_view_1.derivePromptView)(p)?.kind === 'unreadable';
         // Issue #1725: the same row type now has two origins, and they mean
         // opposite things about coverage. `detection-failed` is "nothing saw this";
         // `hook-<source>` is "the agent told us, and the scraper still did not see
@@ -416,7 +416,7 @@ function createCaptureCommand() {
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
             if (options.agent && !(0, cli_tool_ids_1.isCliToolId)(options.agent)) {
-                console.error('Error: Invalid 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);
             }
             // Issue #868 / #2376: an instance id or a roster alias.
@@ -475,10 +475,7 @@ function createCaptureCommand() {
             // alone captured the wrong (claude-named) session. Resolve the tool the
             // instance is registered under before asking. Issue #1925: 'read-only',
             // because capture looks rather than acts — see resolvePaneCliTool.
-            const target = options.instance
-                ? await (0, instances_1.resolveInstanceTarget)(client, worktreeId, options.instance, options.agent, 'read-only')
-                : null;
-            const agent = target ? target.cliToolId : options.agent;
+            const { target, agent } = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, options.instance, options.agent, 'read-only');
             // Build path with optional cliTool/instance query parameters. Issue
             // #2376: the RESOLVED instance id — /current-output cannot read an alias.
             const query = new URLSearchParams();

package/dist/cli/commands/command-target.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Resolution of the `--instance` / `--agent` pair into the tool and instance a
+ * command addresses (Issue #3224).
+ *
+ * Lives beside, not inside, `./instances` so that a test which replaces
+ * `resolveInstanceTarget` on that module is still seen by every caller here.
+ */
+import type { ApiClient } from '../utils/api-client';
+import type { InstanceConflictMode, ResolvedInstanceTarget } from './instances';
+export interface CommandTarget {
+    /** The roster target, or null when no selector was given */
+    target: ResolvedInstanceTarget | null;
+    /** The tool the instance is registered under, else the `--agent` value */
+    agent: string | undefined;
+    /** The RESOLVED instance id, never the string the user typed */
+    instanceId: string | undefined;
+}
+/**
+ * @param selector - Falsy means "no instance": nothing is requested of the server
+ * @param mode - Passed on only when given, so the call shape stays as it was
+ */
+export declare function resolveCommandTarget(client: ApiClient, worktreeId: string, selector: string | undefined, requestedAgent: string | undefined, mode?: InstanceConflictMode): Promise<CommandTarget>;
+//# sourceMappingURL=command-target.d.ts.map

package/dist/cli/commands/command-target.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-target.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/command-target.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAEhF,MAAM,WAAW,aAAa;IAC5B,4DAA4D;IAC5D,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtC,0EAA0E;IAC1E,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,gEAAgE;IAChE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,IAAI,CAAC,EAAE,oBAAoB,GAC1B,OAAO,CAAC,aAAa,CAAC,CASxB"}

package/dist/cli/commands/command-target.js

@@ -0,0 +1,25 @@
+"use strict";
+/**
+ * Resolution of the `--instance` / `--agent` pair into the tool and instance a
+ * command addresses (Issue #3224).
+ *
+ * Lives beside, not inside, `./instances` so that a test which replaces
+ * `resolveInstanceTarget` on that module is still seen by every caller here.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveCommandTarget = resolveCommandTarget;
+const instances_1 = require("./instances");
+/**
+ * @param selector - Falsy means "no instance": nothing is requested of the server
+ * @param mode - Passed on only when given, so the call shape stays as it was
+ */
+async function resolveCommandTarget(client, worktreeId, selector, requestedAgent, mode) {
+    const target = selector
+        ? mode === undefined
+            ? await (0, instances_1.resolveInstanceTarget)(client, worktreeId, selector, requestedAgent)
+            : await (0, instances_1.resolveInstanceTarget)(client, worktreeId, selector, requestedAgent, mode)
+        : null;
+    const agent = target ? target.cliToolId : requestedAgent;
+    const instanceId = target?.instanceId;
+    return { target, agent, instanceId };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"instances.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/instances.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,SAAS,EAAkD,MAAM,qBAAqB,CAAC;AAyIhG;;;;;;;;;;GAUG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,IAAI,GAAE,oBAA+B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAiBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKzD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,QAE6D,CAAC;AAErG,4EAA4E;AAC5E,eAAO,MAAM,uBAAuB,QAE0B,CAAC;AAE/D,8EAA8E;AAC9E,MAAM,WAAW,sBAAsB;IACrC,wEAAwE;IACxE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B;;;;;;;;;;;;OAYG;IACH,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,IAAI,GAAE,oBAA+B,GACpC,OAAO,CAAC,sBAAsB,CAAC,CAmCjC;AAyPD,wBAAgB,sBAAsB,IAAI,OAAO,CAgFhD"}
+{"version":3,"file":"instances.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/instances.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,SAAS,EAAkD,MAAM,qBAAqB,CAAC;AA6IhG;;;;;;;;;;GAUG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,IAAI,GAAE,oBAA+B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAiBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKzD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,QAE6D,CAAC;AAErG,4EAA4E;AAC5E,eAAO,MAAM,uBAAuB,QAE0B,CAAC;AAE/D,8EAA8E;AAC9E,MAAM,WAAW,sBAAsB;IACrC,wEAAwE;IACxE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B;;;;;;;;;;;;OAYG;IACH,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,IAAI,GAAE,oBAA+B,GACpC,OAAO,CAAC,sBAAsB,CAAC,CAmCjC;AAuSD,wBAAgB,sBAAsB,IAAI,OAAO,CAgFhD"}

package/dist/cli/commands/instances.js

@@ -247,10 +247,39 @@ async function fetchOpencodeSessions(client, worktreeId, instances) {
     }
     return result;
 }
+/**
+ * Which instances have Auto-Yes armed, keyed by instance id, or null when the
+ * server does not say (Issue #3300).
+ *
+ * Auto-Yes is armed per worktree x instance and outlives the session it answers
+ * for (`auto-yes --enable` needs no session), so `current-output` cannot answer
+ * for it: a session that is not running is answered there with no `autoYes` key
+ * at all, and an armed, stopped instance was printed as `no`. This asks the
+ * state store instead — what `commandmate ls` prints from, for one worktree.
+ * An instance the map does not name has no state, which is "not armed".
+ *
+ * Null — never an error — when the request fails or the answer carries no
+ * `instances` map (a daemon older than #896). The caller then keeps each
+ * session's own reading, which is what this command printed before.
+ */
+async function fetchArmedAutoYes(client, worktreeId) {
+    try {
+        const response = await client.get(`/api/worktrees/${worktreeId}/auto-yes`);
+        const states = response?.instances;
+        if (!states || typeof states !== 'object')
+            return null;
+        return new Map(Object.entries(states).map(([instanceId, state]) => [instanceId, state?.enabled === true]));
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * List action: roster + live running/auto-yes status per instance.
  * Probes GET .../current-output?cliTool=&instance= per instance (same
  * endpoint capture.ts uses) since the roster itself carries no session state.
+ * Auto-Yes is not session state, and is read from GET .../auto-yes — see
+ * {@link fetchArmedAutoYes}.
  */
 async function listInstances(client, worktreeId, options) {
     const instances = await (0, agent_instances_1.fetchAgentInstances)(client, worktreeId);
@@ -258,7 +287,7 @@ async function listInstances(client, worktreeId, options) {
     // is an opencode instance to ask about — the endpoint is opencode-only and a
     // roster without one has nothing to learn from it.
     const opencodeSessions = await fetchOpencodeSessions(client, worktreeId, instances);
-    const rows = await Promise.all(instances.map(async (inst) => {
+    const sessionRows = await Promise.all(instances.map(async (inst) => {
         const query = new URLSearchParams({ cliTool: inst.cliTool, instance: inst.id });
         const output = await client.get(`/api/worktrees/${worktreeId}/current-output?${query.toString()}`);
         return {
@@ -266,6 +295,9 @@ async function listInstances(client, worktreeId, options) {
             alias: inst.alias,
             cliTool: inst.cliTool,
             running: output.isRunning,
+            // The session's own reading: absent — so `false` — whenever the session
+            // is not running. Replaced below when the server names the armed
+            // instances itself (Issue #3300).
             autoYes: output.autoYes?.enabled ?? false,
             // Issue #1785: pass-through. `?? null` collapses "this daemon predates
             // the field" into the same null the server sends for "nothing knows" —
@@ -285,6 +317,13 @@ async function listInstances(client, worktreeId, options) {
             tmuxSession: deriveInstanceSession(worktreeId, inst),
         };
     }));
+    // Issue #3300: one request for the whole worktree, whatever the roster's
+    // size, and none for an empty one. Asked after the probes above, so the
+    // column is the latest of the readings this listing takes.
+    const armed = instances.length > 0 ? await fetchArmedAutoYes(client, worktreeId) : null;
+    const rows = armed === null
+        ? sessionRows
+        : sessionRows.map(row => ({ ...row, autoYes: armed.get(row.instanceId) ?? false }));
     if (options.json) {
         console.log(JSON.stringify(rows, null, 2));
         return;
@@ -300,7 +339,7 @@ async function addInstance(client, worktreeId, options) {
         process.exit(types_1.ExitCode.CONFIG_ERROR);
     }
     if (!(0, cli_tool_ids_1.isCliToolId)(options.agent)) {
-        console.error('Error: Invalid --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.id && !(0, api_client_1.isValidInstanceId)(options.id)) {

package/dist/cli/commands/message-dispatch.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Steps `send` and `ask` share when they hand a message to another session:
+ * registering the relay before the message goes out, and posting the message
+ * with the PROMPT_WAITING refusal reported the same way.
+ *
+ * Kept in its own module (not in send.ts / ask.ts) because tests mock those
+ * modules' internals; what differs per command is passed in as arguments.
+ */
+import { ApiClient } from '../utils/api-client';
+/**
+ * Code the send API returns when the session is blocked on a prompt (Issue
+ * #1708). Mirrors PROMPT_WAITING_CODE in src/lib/session/prompt-waiting-guard.ts;
+ * duplicated rather than imported so the CLI bundle does not pull the server's
+ * tmux/detection graph in for one string.
+ */
+export declare const PROMPT_WAITING_CODE = "PROMPT_WAITING";
+export interface RegisterRelayForMessageInput {
+    worktreeId: string;
+    /** The raw `--reply-to` value (callers decide the default). */
+    replyTo: string;
+    instance?: string;
+    agent?: string;
+    allowRelayChain?: boolean;
+}
+/** Resolve both endpoints and open the relay; returns the relay id. */
+export declare function registerRelayForMessage(client: ApiClient, input: RegisterRelayForMessageInput): Promise<string>;
+export interface PostMessageOptions {
+    relayId?: string;
+    /** Runs first when the post fails, before the relay is cancelled. */
+    onFailure?: () => Promise<void>;
+    /** Printed (after `Error: `) when PROMPT_WAITING carried no message body. */
+    promptWaitingFallback: string;
+}
+/** Post the message; on failure cancel the relay and report PROMPT_WAITING. */
+export declare function postMessage(client: ApiClient, worktreeId: string, sendBody: Record<string, unknown>, options: PostMessageOptions): Promise<void>;
+//# sourceMappingURL=message-dispatch.d.ts.map

package/dist/cli/commands/message-dispatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-dispatch.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/message-dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,SAAS,EAAY,MAAM,qBAAqB,CAAC;AAQ1D;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAEpD,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,uEAAuE;AACvE,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,6EAA6E;IAC7E,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,+EAA+E;AAC/E,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA2Bf"}

package/dist/cli/commands/message-dispatch.js

@@ -0,0 +1,63 @@
+"use strict";
+/**
+ * Steps `send` and `ask` share when they hand a message to another session:
+ * registering the relay before the message goes out, and posting the message
+ * with the PROMPT_WAITING refusal reported the same way.
+ *
+ * Kept in its own module (not in send.ts / ask.ts) because tests mock those
+ * modules' internals; what differs per command is passed in as arguments.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PROMPT_WAITING_CODE = void 0;
+exports.registerRelayForMessage = registerRelayForMessage;
+exports.postMessage = postMessage;
+const types_1 = require("../types");
+const api_client_1 = require("../utils/api-client");
+const relays_1 = require("./relays");
+/**
+ * Code the send API returns when the session is blocked on a prompt (Issue
+ * #1708). Mirrors PROMPT_WAITING_CODE in src/lib/session/prompt-waiting-guard.ts;
+ * duplicated rather than imported so the CLI bundle does not pull the server's
+ * tmux/detection graph in for one string.
+ */
+exports.PROMPT_WAITING_CODE = 'PROMPT_WAITING';
+/** Resolve both endpoints and open the relay; returns the relay id. */
+async function registerRelayForMessage(client, input) {
+    const replyEndpoint = await (0, relays_1.resolveRelayEndpoint)(client, input.replyTo);
+    const workerEndpoint = await (0, relays_1.resolveEndpointForWorktree)(client, input.worktreeId, input.instance, input.agent);
+    return (0, relays_1.registerRelay)(client, {
+        from: replyEndpoint,
+        to: workerEndpoint,
+        allowRelayChain: input.allowRelayChain,
+    });
+}
+/** Post the message; on failure cancel the relay and report PROMPT_WAITING. */
+async function postMessage(client, worktreeId, sendBody, options) {
+    const { relayId } = options;
+    try {
+        await client.post(`/api/worktrees/${worktreeId}/send`, sendBody);
+    }
+    catch (error) {
+        if (options.onFailure) {
+            await options.onFailure();
+        }
+        // A relay whose message never arrived can never be answered; leaving
+        // it open would have the requester waiting 24h for a turn that was
+        // never started.
+        if (relayId) {
+            await (0, relays_1.cancelRelayQuietly)(client, relayId);
+        }
+        // Issue #1708: the session is sitting on a prompt, so the message
+        // would have been typed into the prompt's input line rather than
+        // reaching the agent. Reported on its own so an unattended runner sees
+        // "answer the prompt", not a generic HTTP failure.
+        if (error instanceof api_client_1.ApiError && error.apiCode === exports.PROMPT_WAITING_CODE) {
+            // The server's own sentence, not error.message: handleApiError maps a
+            // bare 409 to "Unexpected HTTP status: 409", which says nothing about
+            // what to do next.
+            console.error(`Error: ${error.payload?.error ?? options.promptWaitingFallback}`);
+            process.exit(types_1.ExitCode.CONFIG_ERROR);
+        }
+        throw error;
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"reply.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuBpC,wEAAwE;AACxE,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB;AAuBD,wBAAgB,kBAAkB,IAAI,OAAO,CA8E5C"}
+{"version":3,"file":"reply.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuBpC,wEAAwE;AACxE,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB;AAuBD,wBAAgB,kBAAkB,IAAI,OAAO,CA0E5C"}

package/dist/cli/commands/reply.js

@@ -36,6 +36,7 @@ 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 command_target_1 = require("./command-target");
 const reply_ledger_1 = require("../utils/reply-ledger");
 /**
  * A date-time that starts with a calendar date. Date.parse alone would also
@@ -95,11 +96,7 @@ says so in one line, and the exit code is 0. --json prints "reply": null.
             // Resolved exactly as `ask` resolves it: `--agent` alone names that
             // tool's primary instance (Issue #2479).
             const selector = options.instance ?? options.agent;
-            const target = selector
-                ? await (0, instances_1.resolveInstanceTarget)(client, worktreeId, selector, options.agent)
-                : null;
-            const cliToolId = target ? target.cliToolId : options.agent;
-            const instanceId = target?.instanceId;
+            const { agent: cliToolId, instanceId } = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, selector, options.agent);
             // Unlike `ask`, a failed read is not swallowed: there is no turn this
             // command completed that a fallback would be protecting.
             const messages = await (0, reply_ledger_1.requestRecentMessages)(client, worktreeId, instanceId);

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;AA8apC,wBAAgB,oBAAoB,IAAI,OAAO,CA6F9C"}
+{"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;AA8apC,wBAAgB,oBAAoB,IAAI,OAAO,CAyF9C"}

package/dist/cli/commands/respond.js

@@ -14,6 +14,7 @@ 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 command_target_1 = require("./command-target");
 /**
  * Whether this instance's agent can be answered by naming a decision
  * (Issue #2040).
@@ -158,7 +159,7 @@ function validateRespondArgs(worktreeId, answer, options) {
     }
     // Validate agent if provided
     if (options.agent && !(0, cli_tool_ids_1.isCliToolId)(options.agent)) {
-        console.error('Error: Invalid 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);
     }
     // Issue #868 / #2376: an instance id or a roster alias.
@@ -374,12 +375,8 @@ function createRespondCommand() {
             // 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 target = options.instance
-                ? await (0, instances_1.resolveInstanceTarget)(client, worktreeId, options.instance, options.agent)
-                : null;
-            const agent = target ? target.cliToolId : options.agent;
+            const { agent, instanceId } = await (0, command_target_1.resolveCommandTarget)(client, worktreeId, options.instance, options.agent);
             // Issue #2376: the resolved id. /prompt-response reads instance ids.
-            const instanceId = target?.instanceId;
             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

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;AAmNpC,wBAAgB,iBAAiB,IAAI,OAAO,CA2Q3C"}
+{"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;AAoUpC,wBAAgB,iBAAiB,IAAI,OAAO,CA2J3C"}