commandmate 0.44.1 → 0.44.3

package/dist/cli/commands/send.js

@@ -15,7 +15,9 @@ const agent_target_options_1 = require("../config/agent-target-options");
 const model_validation_1 = require("../config/model-validation");
 const agent_instances_1 = require("../utils/agent-instances");
 const instances_1 = require("./instances");
+const command_target_1 = require("./command-target");
 const relays_1 = require("./relays");
+const message_dispatch_1 = require("./message-dispatch");
 /** Auto-yes duration used when --duration is omitted. */
 const DEFAULT_AUTO_YES_DURATION = '1h';
 /**
@@ -28,13 +30,6 @@ const DEFAULT_AUTO_YES_DURATION = '1h';
  */
 const SEND_VERIFIED_MAX_KIB = 48;
 const SEND_VERIFIED_MAX_LINES = 240;
-/**
- * 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.
- */
-const PROMPT_WAITING_CODE = 'PROMPT_WAITING';
 /**
  * What to print when a PROMPT_WAITING response carried no message body — an
  * older daemon, or a truncated body. The code is the contract; the sentence is
@@ -154,6 +149,114 @@ async function reportTaskStatus(client, taskId, status) {
         console.error(`Warning: could not record task ${taskId} as ${status}.`);
     }
 }
+/** Option checks before any side effect. Returns --duration in ms. A mocked `process.exit` returns, so nothing here stops early. */
+function validateSendArgs(worktreeId, message, options) {
+    // [SEC4-04] Validate worktree ID
+    if (!(0, api_client_1.isValidWorktreeId)(worktreeId)) {
+        console.error('Error: Invalid worktree ID format.');
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    // Issue #1545: the contract supplies the message, so accepting both
+    // would leave which one the agent receives ambiguous.
+    if (options.contract && message !== undefined) {
+        console.error('Error: --contract supplies the message; do not pass a message argument as well.');
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    if (!options.contract && message === undefined) {
+        console.error('Error: a message argument is required unless --contract is given.');
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    // Validate agent if provided
+    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);
+    }
+    // Issue #868 / #2376: Validate the instance SELECTOR if provided. An id
+    // or an alias — which of the two it is, only the roster knows.
+    if (options.instance && !(0, instances_1.isInstanceSelector)(options.instance)) {
+        console.error(instances_1.INSTANCE_SELECTOR_ERROR);
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    // Issue #1000: --register requires --instance, and requires --agent
+    // unless the instance id is itself a primary CLI tool id (e.g. claude).
+    if (options.register) {
+        if (!options.instance) {
+            console.error('Error: --register requires --instance.');
+            process.exit(types_1.ExitCode.CONFIG_ERROR);
+        }
+        if (!options.agent && !(0, cli_tool_ids_1.isCliToolId)(options.instance)) {
+            console.error('Error: --register requires --agent when --instance is not a primary instance id (e.g. claude, codex).');
+            process.exit(types_1.ExitCode.CONFIG_ERROR);
+        }
+    }
+    // [SEC4-06] Validate stop-pattern length
+    if (options.stopPattern && options.stopPattern.length > api_client_1.MAX_STOP_PATTERN_LENGTH) {
+        console.error(`Error: stop-pattern exceeds maximum length of ${api_client_1.MAX_STOP_PATTERN_LENGTH} characters.`);
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    // Issue #1608: every option that can be judged from its own value is
+    // judged here, before the first side effect. --duration used to be the
+    // exception: enableAutoYes() validated it, and that runs after
+    // --contract has already created the task row, so `--duration 2h` left
+    // a `pending` task for a message that was never sent. Validated
+    // unconditionally, like --stop-pattern and --model above: a value the
+    // CLI cannot honour is an error whether or not --auto-yes accompanies it.
+    return resolveAutoYesDurationMs(options.duration);
+}
+/** --model checks against the resolved agent. */
+function validateSendModel(options, agent) {
+    // Issue #576/#588/#989: Validate --model option via shared validator (DR1-003).
+    // Issue #1925: judged against the RESOLVED agent, not against --agent.
+    // `--instance copilot-2 --model gpt-5` names a copilot session in the
+    // only way the roster understands, and this check used to reject it for
+    // not repeating `--agent copilot` — the tool-dependent option was being
+    // validated before the tool was known (design §4 D5 決定 3). Still ahead
+    // of every side effect: resolution only reads.
+    //
+    // Issue #2771: claude joins the list. `agent` is undefined when neither
+    // --instance nor --agent was given, and the server would then pick the
+    // worktree's default tool — which the CLI cannot know, so it cannot pick
+    // a validator either. The target has to be named.
+    if (options.model) {
+        if (agent !== 'copilot' && agent !== 'antigravity' && agent !== 'claude') {
+            console.error('Error: --model option requires --agent copilot, --agent antigravity or --agent claude'
+                + ' (or an --instance registered as one)');
+            process.exit(types_1.ExitCode.CONFIG_ERROR);
+        }
+        const modelValidation = agent === 'antigravity'
+            ? (0, model_validation_1.validateAntigravityModelName)(options.model)
+            : agent === 'claude'
+                ? (0, model_validation_1.validateClaudeModelName)(options.model)
+                : (0, model_validation_1.validateCopilotModelName)(options.model);
+        if (!modelValidation.valid) {
+            console.error(`Error: Invalid model name: ${modelValidation.reason}`);
+            process.exit(types_1.ExitCode.CONFIG_ERROR);
+        }
+    }
+}
+/** The `/send` request body. */
+function buildSendBody(content, agent, instanceId, options) {
+    // [DR2-05] Send API uses "content" not "message"
+    const sendBody = { content };
+    if (agent) {
+        sendBody.cliToolId = agent;
+    }
+    // Issue #868: Include instance ID in send body
+    if (instanceId) {
+        sendBody.instanceId = instanceId;
+    }
+    // Issue #576: Include model in send body
+    if (options.model) {
+        sendBody.model = options.model;
+    }
+    // Issue #1737: waive the structured half of the prompt guard for this
+    // send. Sent only when asked for, so an older daemon that does not know
+    // the field sees exactly the body it always did.
+    if (options.ignoreStructuredPrompt) {
+        sendBody.ignoreStructuredPromptGuard = true;
+    }
+    return sendBody;
+}
 function createSendCommand() {
     const cmd = new commander_1.Command('send');
     cmd
@@ -194,98 +297,17 @@ worktree and send a short message that tells the agent to read that file.
 `)
         .action(async (worktreeId, message, options) => {
         try {
-            // [SEC4-04] Validate worktree ID
-            if (!(0, api_client_1.isValidWorktreeId)(worktreeId)) {
-                console.error('Error: Invalid worktree ID format.');
-                process.exit(types_1.ExitCode.CONFIG_ERROR);
-            }
-            // Issue #1545: the contract supplies the message, so accepting both
-            // would leave which one the agent receives ambiguous.
-            if (options.contract && message !== undefined) {
-                console.error('Error: --contract supplies the message; do not pass a message argument as well.');
-                process.exit(types_1.ExitCode.CONFIG_ERROR);
-            }
-            if (!options.contract && message === undefined) {
-                console.error('Error: a message argument is required unless --contract is given.');
-                process.exit(types_1.ExitCode.CONFIG_ERROR);
-            }
-            // Validate agent if provided
-            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);
-            }
-            // Issue #868 / #2376: Validate the instance SELECTOR if provided. An id
-            // or an alias — which of the two it is, only the roster knows.
-            if (options.instance && !(0, instances_1.isInstanceSelector)(options.instance)) {
-                console.error(instances_1.INSTANCE_SELECTOR_ERROR);
-                process.exit(types_1.ExitCode.CONFIG_ERROR);
-            }
-            // Issue #1000: --register requires --instance, and requires --agent
-            // unless the instance id is itself a primary CLI tool id (e.g. claude).
-            if (options.register) {
-                if (!options.instance) {
-                    console.error('Error: --register requires --instance.');
-                    process.exit(types_1.ExitCode.CONFIG_ERROR);
-                }
-                if (!options.agent && !(0, cli_tool_ids_1.isCliToolId)(options.instance)) {
-                    console.error('Error: --register requires --agent when --instance is not a primary instance id (e.g. claude, codex).');
-                    process.exit(types_1.ExitCode.CONFIG_ERROR);
-                }
-            }
-            // [SEC4-06] Validate stop-pattern length
-            if (options.stopPattern && options.stopPattern.length > api_client_1.MAX_STOP_PATTERN_LENGTH) {
-                console.error(`Error: stop-pattern exceeds maximum length of ${api_client_1.MAX_STOP_PATTERN_LENGTH} characters.`);
-                process.exit(types_1.ExitCode.CONFIG_ERROR);
-            }
-            // Issue #1608: every option that can be judged from its own value is
-            // judged here, before the first side effect. --duration used to be the
-            // exception: enableAutoYes() validated it, and that runs after
-            // --contract has already created the task row, so `--duration 2h` left
-            // a `pending` task for a message that was never sent. Validated
-            // unconditionally, like --stop-pattern and --model above: a value the
-            // CLI cannot honour is an error whether or not --auto-yes accompanies it.
-            const autoYesDurationMs = resolveAutoYesDurationMs(options.duration);
+            const autoYesDurationMs = validateSendArgs(worktreeId, message, options);
             const client = new api_client_1.ApiClient({ token: options.token });
             // Issue #1629: --instance names an agent instance, not a CLI tool, and
             // the roster is the only place that pairs the two. Resolve it once, up
             // front, so the task row, the send and auto-yes all name the same tool
             // as the session that actually starts.
-            const 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, never the string the user typed.
             // `--instance "Codex 2"` has to reach /send as `codex-2`; no route but
             // /resolve-target knows how to read an alias.
-            const instanceId = target?.instanceId;
-            // Issue #576/#588/#989: Validate --model option via shared validator (DR1-003).
-            // Issue #1925: judged against the RESOLVED agent, not against --agent.
-            // `--instance copilot-2 --model gpt-5` names a copilot session in the
-            // only way the roster understands, and this check used to reject it for
-            // not repeating `--agent copilot` — the tool-dependent option was being
-            // validated before the tool was known (design §4 D5 決定 3). Still ahead
-            // of every side effect: resolution only reads.
-            //
-            // Issue #2771: claude joins the list. `agent` is undefined when neither
-            // --instance nor --agent was given, and the server would then pick the
-            // worktree's default tool — which the CLI cannot know, so it cannot pick
-            // a validator either. The target has to be named.
-            if (options.model) {
-                if (agent !== 'copilot' && agent !== 'antigravity' && agent !== 'claude') {
-                    console.error('Error: --model option requires --agent copilot, --agent antigravity or --agent claude'
-                        + ' (or an --instance registered as one)');
-                    process.exit(types_1.ExitCode.CONFIG_ERROR);
-                }
-                const modelValidation = agent === 'antigravity'
-                    ? (0, model_validation_1.validateAntigravityModelName)(options.model)
-                    : agent === 'claude'
-                        ? (0, model_validation_1.validateClaudeModelName)(options.model)
-                        : (0, model_validation_1.validateCopilotModelName)(options.model);
-                if (!modelValidation.valid) {
-                    console.error(`Error: Invalid model name: ${modelValidation.reason}`);
-                    process.exit(types_1.ExitCode.CONFIG_ERROR);
-                }
-            }
+            validateSendModel(options, agent);
             // Issue #1545: resolve the contract before anything with a side effect,
             // so an invalid contract cannot leave auto-yes enabled for a message
             // that was never sent.
@@ -298,6 +320,14 @@ worktree and send a short message that tells the agent to read that file.
                 console.error(`Task created: ${taskId}`);
                 console.log(taskId);
             }
+            // A task whose message never arrived is a failed task, not a pending
+            // one: nothing is working on it and nothing ever will. Every step
+            // between the task row and the delivered message reports through this.
+            const failTask = async () => {
+                if (taskId) {
+                    await reportTaskStatus(client, taskId, 'failed');
+                }
+            };
             // --auto-yes: enable auto-yes first (unless --model is specified, then after send) [DR2-02]
             //
             // Issue #2771: claude is the exception to the exception. The deferral
@@ -306,7 +336,20 @@ worktree and send a short message that tells the agent to read that file.
             // contract send must have Auto-Yes on BEFORE the worker starts working.
             const deferAutoYes = Boolean(options.model) && agent !== 'claude';
             if (options.autoYes && !deferAutoYes) {
-                await enableAutoYes(client, worktreeId, options, autoYesDurationMs, agent, instanceId);
+                // Issue #3290: the server can refuse this — 409 when the session by
+                // that name belongs to another CommandMate server — and the command
+                // then stops here, after --contract created the task row and before
+                // anything is sent. That is the outcome a failed send has, so it gets
+                // the same record; left alone the row stayed `pending` for a message
+                // that never went out, which is the state #1608 removed for a bad
+                // --duration.
+                try {
+                    await enableAutoYes(client, worktreeId, options, autoYesDurationMs, agent, instanceId);
+                }
+                catch (error) {
+                    await failTask();
+                    throw error;
+                }
             }
             // Issue #2377: the relay is registered BEFORE the message goes out, so a
             // session that answers immediately cannot finish its turn in the window
@@ -315,11 +358,11 @@ worktree and send a short message that tells the agent to read that file.
             // A refusal exits 2 here, having sent nothing.
             let relayId;
             if (options.replyTo) {
-                const replyEndpoint = await (0, relays_1.resolveRelayEndpoint)(client, options.replyTo);
-                const workerEndpoint = await (0, relays_1.resolveEndpointForWorktree)(client, worktreeId, options.instance, options.agent);
-                relayId = await (0, relays_1.registerRelay)(client, {
-                    from: replyEndpoint,
-                    to: workerEndpoint,
+                relayId = await (0, message_dispatch_1.registerRelayForMessage)(client, {
+                    worktreeId,
+                    replyTo: options.replyTo,
+                    instance: options.instance,
+                    agent: options.agent,
                     allowRelayChain: options.allowRelayChain,
                 });
                 // stderr, not stdout: `--contract` already owns this command's stdout
@@ -328,54 +371,12 @@ worktree and send a short message that tells the agent to read that file.
                 // is the form that hands the relay id back on stdout.
                 console.error(`Relay registered: ${relayId}`);
             }
-            // [DR2-05] Send API uses "content" not "message"
-            const sendBody = { content };
-            if (agent) {
-                sendBody.cliToolId = agent;
-            }
-            // Issue #868: Include instance ID in send body
-            if (instanceId) {
-                sendBody.instanceId = instanceId;
-            }
-            // Issue #576: Include model in send body
-            if (options.model) {
-                sendBody.model = options.model;
-            }
-            // Issue #1737: waive the structured half of the prompt guard for this
-            // send. Sent only when asked for, so an older daemon that does not know
-            // the field sees exactly the body it always did.
-            if (options.ignoreStructuredPrompt) {
-                sendBody.ignoreStructuredPromptGuard = true;
-            }
-            try {
-                await client.post(`/api/worktrees/${worktreeId}/send`, sendBody);
-            }
-            catch (error) {
-                // A task whose message never arrived is a failed task, not a pending
-                // one: nothing is working on it and nothing ever will.
-                if (taskId) {
-                    await reportTaskStatus(client, taskId, 'failed');
-                }
-                // 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 — nudging a stalled
-                // worker is exactly what made #1708 worse.
-                if (error instanceof api_client_1.ApiError && error.apiCode === 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 ?? promptWaitingFallback(worktreeId)}`);
-                    process.exit(types_1.ExitCode.CONFIG_ERROR);
-                }
-                throw error;
-            }
+            const sendBody = buildSendBody(content, agent, instanceId, options);
+            await (0, message_dispatch_1.postMessage)(client, worktreeId, sendBody, {
+                relayId,
+                onFailure: failTask,
+                promptWaitingFallback: promptWaitingFallback(worktreeId),
+            });
             console.error('Message sent.');
             if (taskId) {
                 await reportTaskStatus(client, taskId, 'running');
@@ -386,7 +387,9 @@ worktree and send a short message that tells the agent to read that file.
                 await registerInstance(client, worktreeId, instanceId, options.agent ?? instanceId);
             }
             // Issue #576: Enable auto-yes AFTER send when --model is specified
-            // This avoids auto-yes interfering with the /model command interaction
+            // This avoids auto-yes interfering with the /model command interaction.
+            // A failure here does not fail the task: the message was delivered and
+            // the task is running, which is what the row already says.
             if (options.autoYes && deferAutoYes) {
                 await enableAutoYes(client, worktreeId, options, autoYesDurationMs, agent, instanceId);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAMV,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAA+B,MAAM,qBAAqB,CAAC;AAwD7E;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,wBAAwB,EAAE,WAAW,CAAC,MAAM,CAIvD,CAAC;AA2WH;;;;;;;;;GASG;AACH,eAAO,MAAM,0BAA0B,wBAAwB,CAAC;AAEhE;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,0BAA0B,CAAC;AAE9D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,mBAAmB,QAAiB,CAAC;AA2JlD;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAwCD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,6EAA6E;IAC7E,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD,CAAC,CAuhBD;AAwKD,wBAAgB,iBAAiB,IAAI,OAAO,CAqM3C"}
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAOV,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAA+B,MAAM,qBAAqB,CAAC;AA6E7E;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,wBAAwB,EAAE,WAAW,CAAC,MAAM,CAIvD,CAAC;AA0YH;;;;;;;;;GASG;AACH,eAAO,MAAM,0BAA0B,wBAAwB,CAAC;AAEhE;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,0BAA0B,CAAC;AAE9D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,mBAAmB,QAAiB,CAAC;AA2JlD;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAkuBD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,6EAA6E;IAC7E,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD,CAAC,CAuID;AAwKD,wBAAgB,iBAAiB,IAAI,OAAO,CAqM3C"}