commandmate 0.18.0 → 0.20.0

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

@@ -4,7 +4,7 @@
 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/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/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/metrics/vibe" | "/api/ollama/models" | "/api/push/subscriptions" | "/api/push/vapid" | "/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/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]/cli-tool" | "/api/worktrees/[id]/cmate/schedules" | "/api/worktrees/[id]/current-output" | "/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]/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]/prompt-response" | "/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]/slash-commands" | "/api/worktrees/[id]/special-keys" | "/api/worktrees/[id]/start-polling" | "/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/runs" | "/api/worktrees/[id]/verify/runs/[runId]" | "/api/worktrees/[id]/viewed" | "/proxy/[...path]"
 type PageRoutes = never
-type LayoutRoutes = "/"
+type LayoutRoutes = "/" | "/worktrees/[id]"
 type RedirectRoutes = never
 type RewriteRoutes = never
 type Routes = AppRoutes | PageRoutes | LayoutRoutes | RedirectRoutes | RewriteRoutes | AppRouteHandlerRoutes
@@ -153,6 +153,7 @@ export type ParamsOf<Route extends Routes> = ParamMap[Route]
 
 interface LayoutSlotMap {
   "/": never
+  "/worktrees/[id]": never
 }
 
 

package/.next/types/validator.ts

@@ -1274,3 +1274,12 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   // @ts-ignore
   type __Unused = __Check
 }
+
+// Validate ../../src/app/worktrees/[id]/layout.tsx
+{
+  type __IsExpected<Specific extends LayoutConfig<"/worktrees/[id]">> = Specific
+  const handler = {} as typeof import("../../src/app/worktrees/[id]/layout.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}

package/README.md

@@ -204,8 +204,9 @@ Operate agent sessions from the CLI. See the [CLI Operations Guide](./docs/en/us
 | `commandmate ls --id <prefix>` | Filter by worktree ID prefix |
 | `commandmate send <id> "message"` | Send a message to an agent |
 | `commandmate send <id> "msg" --auto-yes` | Send with auto-yes enabled |
-| `commandmate send <id> "msg" --agent codex` | Send to a specific agent |
+| `commandmate send <id> "msg" --instance codex` | Send to a specific agent instance |
 | `commandmate wait <id> --timeout 300` | Wait for agent completion (exit 0) or prompt (exit 10) |
+| `commandmate wait <id> --instance codex` | Wait on a specific agent instance |
 | `commandmate wait <id> --on-prompt human` | Wait, let human respond to prompts via browser UI |
 | `commandmate respond <id> "yes"` | Respond to an agent's prompt |
 | `commandmate capture <id>` | Get current terminal output |
@@ -213,6 +214,14 @@ Operate agent sessions from the CLI. See the [CLI Operations Guide](./docs/en/us
 | `commandmate auto-yes <id> --enable` | Enable auto-yes (default 1h) |
 | `commandmate auto-yes <id> --disable` | Disable auto-yes |
 
+> **Name the target with `--instance`, on every command.** It is the only target
+> flag `wait` accepts — `wait --agent` fails with `unknown option`. Naming the
+> agent only on `send` leaves `wait` watching the worktree's *default* agent, so
+> a worktree cut for Codex silently waits for Claude Code. `--agent` still works
+> on `send`/`respond`/`capture`/`auto-yes` as the supplement for instances the
+> roster does not know (it is what `--register` needs). See the
+> [CLI Operations Guide](./docs/en/user-guide/cli-operations-guide.md).
+
 **Typical workflow:**
 
 ```bash

package/dist/cli/commands/auto-yes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-yes.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/auto-yes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,oBAAoB,IAAI,OAAO,CA6F9C"}
+{"version":3,"file":"auto-yes.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/auto-yes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,wBAAgB,oBAAoB,IAAI,OAAO,CAoG9C"}

package/dist/cli/commands/auto-yes.js

@@ -11,6 +11,8 @@ const api_client_1 = require("../utils/api-client");
 const command_helpers_1 = require("../utils/command-helpers");
 const duration_constants_1 = require("../config/duration-constants");
 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");
 function createAutoYesCommand() {
     const cmd = new commander_1.Command('auto-yes');
     cmd
@@ -20,8 +22,8 @@ function createAutoYesCommand() {
         .option('--disable', 'Disable auto-yes')
         .option('--duration <duration>', `Duration (${duration_constants_1.ALLOWED_DURATIONS.join(', ')})`)
         .option('--stop-pattern <pattern>', 'Stop pattern (regex, max 500 chars)')
-        .option('--agent <agent>', 'CLI tool agent (claude, codex, gemini, vibe-local, opencode, copilot, antigravity)')
-        .option('--instance <id>', 'Agent instance ID: <agent> or <agent>-<n> (e.g. claude-2). Defaults to the agent\'s primary instance.')
+        .option('--instance <id>', agent_target_options_1.INSTANCE_OPTION_DESCRIPTION)
+        .option('--agent <agent>', agent_target_options_1.AGENT_OPTION_DESCRIPTION)
         .option('--token <token>', command_helpers_1.TOKEN_WARNING)
         .action(async (worktreeId, options) => {
         try {
@@ -71,8 +73,14 @@ function createAutoYesCommand() {
                     body.stopPattern = options.stopPattern;
                 }
             }
-            if (options.agent) {
-                body.cliToolId = options.agent;
+            // Issue #1629: the auto-yes poller keys on (worktree, cliTool, instance)
+            // and watches the session cliTool names, so the instance must be paired
+            // with the CLI tool its roster entry declares.
+            const agent = options.instance
+                ? await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, options.instance, options.agent)
+                : options.agent;
+            if (agent) {
+                body.cliToolId = agent;
             }
             // Issue #896: per-instance auto-yes
             if (options.instance) {

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

@@ -1,6 +1,7 @@
 /**
  * capture Command - Get current terminal output
  * Issue #518: [DR1-08] Factory pattern
+ * Issue #1623: `--pane` reads the raw tmux pane as a transcript (案B)
  */
 import { Command } from 'commander';
 export declare function createCaptureCommand(): Command;

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;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgBpC,wBAAgB,oBAAoB,IAAI,OAAO,CAsD9C"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/capture.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8HpC,wBAAgB,oBAAoB,IAAI,OAAO,CA+E9C"}

package/dist/cli/commands/capture.js

@@ -2,6 +2,7 @@
 /**
  * capture Command - Get current terminal output
  * Issue #518: [DR1-08] Factory pattern
+ * Issue #1623: `--pane` reads the raw tmux pane as a transcript (案B)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCaptureCommand = createCaptureCommand;
@@ -10,6 +11,20 @@ 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 pager_1 = require("../utils/pager");
+const transcript_squeeze_1 = require("../../lib/tmux/transcript-squeeze");
+/**
+ * Rows of pane history the `--pane` viewer asks for.
+ *
+ * Deliberately NOT configurable and deliberately equal to the capture route's
+ * own default: Issue #1623 has to leave the detection pipeline's view of the
+ * pane untouched, and the cheapest way to guarantee that is for the viewer to
+ * make exactly the request everything else already makes. `--tail` narrows the
+ * RESULT instead (see {@link CaptureOptions.tail}).
+ */
+const PANE_CAPTURE_LINES = 1000;
 /**
  * Format capture output as JSON (excluding fullOutput for size).
  */
@@ -17,14 +32,93 @@ function formatJson(data) {
     const { fullOutput: _fullOutput, ...rest } = data;
     return JSON.stringify(rest, null, 2);
 }
+/**
+ * Parse and validate `--tail N`.
+ *
+ * @param raw - Raw option value, if the user passed one
+ * @returns The parsed count, or undefined when the option was absent
+ */
+function parseTail(raw) {
+    if (raw === undefined)
+        return undefined;
+    const value = Number(raw);
+    if (!Number.isInteger(value) || value < 1) {
+        console.error('Error: --tail must be a positive integer.');
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    return value;
+}
+/**
+ * Resolve which CLI tool's session the pane should be read from.
+ *
+ * POST /capture demands an explicit `cliToolId`, while GET /current-output falls
+ * back to the worktree's own default server-side. Mirroring that fallback here
+ * (`worktree.cliToolId || 'claude'`, matching the route) keeps bare
+ * `capture <id> --pane` pointed at the same session the rest of the CLI uses.
+ *
+ * @param client - API client
+ * @param worktreeId - Worktree ID
+ * @param agent - Value of `--agent`, already validated
+ * @param instance - Value of `--instance`, already validated
+ * @returns CLI tool ID to capture
+ */
+async function resolvePaneCliTool(client, worktreeId, agent, instance) {
+    if (instance) {
+        const resolved = await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, instance, agent);
+        if (resolved)
+            return resolved;
+    }
+    if (agent)
+        return agent;
+    const worktree = await client.get(`/api/worktrees/${worktreeId}`);
+    return worktree.cliToolId || 'claude';
+}
+/**
+ * `--pane` path: read the raw tmux pane and render it as a readable transcript.
+ *
+ * The squeeze happens CLIENT-side on purpose. The server keeps returning the
+ * unmodified frame, so nothing that consumes `/capture` — detection, Auto-Yes,
+ * the response saver — sees a different payload because this command exists.
+ */
+async function capturePane(worktreeId, options) {
+    const client = new api_client_1.ApiClient({ token: options.token });
+    const tail = parseTail(options.tail);
+    const cliToolId = await resolvePaneCliTool(client, worktreeId, options.agent, options.instance);
+    const data = await client.post(`/api/worktrees/${worktreeId}/capture`, {
+        cliToolId,
+        lines: PANE_CAPTURE_LINES,
+        ...(options.instance ? { instanceId: options.instance } : {}),
+    });
+    const raw = data.output ?? '';
+    const squeezed = (0, transcript_squeeze_1.squeezeTranscript)(raw, { tail });
+    const text = options.raw ? raw : squeezed.text;
+    if (options.json) {
+        console.log(JSON.stringify({
+            cliToolId,
+            instanceId: options.instance ?? null,
+            output: text,
+            lines: options.raw ? squeezed.rawLines : squeezed.lines,
+            rawLines: squeezed.rawLines,
+            squeezed: !options.raw,
+            tailed: !options.raw && squeezed.tailed,
+        }, null, 2));
+        return;
+    }
+    (0, pager_1.printMaybePaged)(text);
+}
 function createCaptureCommand() {
     const cmd = new commander_1.Command('capture');
     cmd
         .description('Capture current terminal output from a worktree')
         .argument('<worktree-id>', 'Worktree ID')
         .option('--json', 'JSON output (excludes fullOutput)')
-        .option('--agent <agent>', 'CLI tool agent (claude, codex, gemini, vibe-local, opencode, copilot, antigravity)')
-        .option('--instance <id>', 'Agent instance ID: <agent> or <agent>-<n> (e.g. claude-2). Defaults to the agent\'s primary instance.')
+        // Issue #1623: reading mode. Works without attaching and without tmux 3.2+,
+        // which is why it is the fallback the popup binding degrades to.
+        .option('--pane', 'Read the raw tmux pane as a transcript, with blank layout rows squeezed')
+        .option('--tail <n>', 'With --pane: keep only the last N lines OF THE SQUEEZED transcript')
+        .option('--raw', 'With --pane: skip the squeeze and print the pane verbatim')
+        .option('--instance <id>', agent_target_options_1.INSTANCE_OPTION_DESCRIPTION)
+        .option('--agent <agent>', agent_target_options_1.AGENT_OPTION_DESCRIPTION)
         .option('--token <token>', command_helpers_1.TOKEN_WARNING)
         .action(async (worktreeId, options) => {
         try {
@@ -42,11 +136,28 @@ function createCaptureCommand() {
                 console.error('Error: Invalid --instance. Must be an alphanumeric/underscore/hyphen identifier (max 64 chars).');
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
+            // Issue #1623: --tail / --raw only mean anything for the pane viewer.
+            // Silently ignoring them would look like the flag had no effect.
+            if (!options.pane && (options.tail !== undefined || options.raw)) {
+                console.error('Error: --tail and --raw require --pane.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (options.pane) {
+                await capturePane(worktreeId, options);
+                return;
+            }
             const client = new api_client_1.ApiClient({ token: options.token });
+            // Issue #1629: /current-output takes the CLI tool at face value and
+            // otherwise falls back to the worktree default, so `--instance codex`
+            // alone captured the wrong (claude-named) session. Resolve the tool the
+            // instance is registered under before asking.
+            const agent = options.instance
+                ? await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, options.instance, options.agent)
+                : options.agent;
             // Build path with optional cliTool/instance query parameters
             const query = new URLSearchParams();
-            if (options.agent) {
-                query.set('cliTool', options.agent);
+            if (agent) {
+                query.set('cliTool', agent);
             }
             if (options.instance) {
                 query.set('instance', options.instance);

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

@@ -9,5 +9,29 @@
  *   commandmate instances <worktree-id> kill <instance-id>
  */
 import { Command } from 'commander';
+import { ApiClient } from '../utils/api-client';
+/**
+ * Resolve which CLI tool backs `instanceId`, from the worktree's roster
+ * (Issue #1629). Shared by every command that targets an instance: `send`,
+ * `respond`, `capture` and `auto-yes`.
+ *
+ * `--instance <id>` on its own carries no CLI tool, so the server used to fall
+ * back to the worktree default. Since the tool id is part of the tmux session
+ * name, `send --instance codex` against a claude-default worktree started
+ * Claude in `mcbd-claude-<worktree>-codex`. Resolving here means the resolved
+ * tool is sent explicitly to every endpoint the command touches — including
+ * `/tasks`, `/current-output` and `/prompt-response`, which have no other way
+ * to learn it.
+ *
+ * The roster wins over `--agent`: it is the user-maintained declaration of what
+ * a named instance is, so a contradiction is an error rather than a session
+ * whose name disagrees with the agent inside it. An instance the roster does
+ * not know (the ad-hoc `send --instance <new-id>` flow) keeps `--agent` as
+ * given, and an unreadable roster degrades to a warning so an older daemon
+ * behaves as it did before.
+ *
+ * @returns the CLI tool to send, or undefined to let the server decide
+ */
+export declare function resolveInstanceCliTool(client: ApiClient, worktreeId: string, instanceId: string, requestedAgent: string | undefined): Promise<string | undefined>;
 export declare function createInstancesCommand(): Command;
 //# sourceMappingURL=instances.d.ts.map

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;AA6NpC,wBAAgB,sBAAsB,IAAI,OAAO,CAqEhD"}
+{"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,EAAwC,MAAM,qBAAqB,CAAC;AAmDtF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA0B7B;AAwKD,wBAAgB,sBAAsB,IAAI,OAAO,CAqEhD"}

package/dist/cli/commands/instances.js

@@ -10,6 +10,7 @@
  *   commandmate instances <worktree-id> kill <instance-id>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveInstanceCliTool = resolveInstanceCliTool;
 exports.createInstancesCommand = createInstancesCommand;
 const commander_1 = require("commander");
 const types_1 = require("../types");
@@ -38,6 +39,49 @@ function formatInstancesTable(rows) {
     const dataLines = dataRows.map(r => r.map((cell, i) => cell.padEnd(colWidths[i])).join('  '));
     return [headerLine, separator, ...dataLines].join('\n');
 }
+/**
+ * Resolve which CLI tool backs `instanceId`, from the worktree's roster
+ * (Issue #1629). Shared by every command that targets an instance: `send`,
+ * `respond`, `capture` and `auto-yes`.
+ *
+ * `--instance <id>` on its own carries no CLI tool, so the server used to fall
+ * back to the worktree default. Since the tool id is part of the tmux session
+ * name, `send --instance codex` against a claude-default worktree started
+ * Claude in `mcbd-claude-<worktree>-codex`. Resolving here means the resolved
+ * tool is sent explicitly to every endpoint the command touches — including
+ * `/tasks`, `/current-output` and `/prompt-response`, which have no other way
+ * to learn it.
+ *
+ * The roster wins over `--agent`: it is the user-maintained declaration of what
+ * a named instance is, so a contradiction is an error rather than a session
+ * whose name disagrees with the agent inside it. An instance the roster does
+ * not know (the ad-hoc `send --instance <new-id>` flow) keeps `--agent` as
+ * given, and an unreadable roster degrades to a warning so an older daemon
+ * behaves as it did before.
+ *
+ * @returns the CLI tool to send, or undefined to let the server decide
+ */
+async function resolveInstanceCliTool(client, worktreeId, instanceId, requestedAgent) {
+    let registered;
+    try {
+        const instances = await (0, agent_instances_1.fetchAgentInstances)(client, worktreeId);
+        registered = instances.find((inst) => inst.id === instanceId);
+    }
+    catch (error) {
+        console.error(`Warning: could not read the agent-instance roster (${(0, types_1.getErrorMessage)(error)}); using --agent as given.`);
+        return requestedAgent;
+    }
+    if (!registered) {
+        return requestedAgent;
+    }
+    if (requestedAgent && requestedAgent !== registered.cliTool) {
+        console.error(`Error: instance '${instanceId}' is registered as ${registered.cliTool}, but --agent ${requestedAgent} was given. `
+            + `Drop --agent, pass --agent ${registered.cliTool}, or re-register the instance.`);
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+        return requestedAgent;
+    }
+    return registered.cliTool;
+}
 /**
  * List action: roster + live running/auto-yes status per instance.
  * Probes GET .../current-output?cliTool=&instance= per instance (same

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

@@ -1 +1 @@
-{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ls.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyDpC;;;GAGG;AACH,wBAAgB,eAAe,IAAI,OAAO,CAwCzC"}
+{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ls.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyDpC;;;GAGG;AACH,wBAAgB,eAAe,IAAI,OAAO,CA8CzC"}

package/dist/cli/commands/ls.js

@@ -77,9 +77,15 @@ function createLsCommand() {
                 worktrees = worktrees.filter(wt => (wt.branch ?? wt.name).startsWith(options.branch));
             }
             // Issue #1005: Filter by worktree id prefix. Independent of `--branch`
-            // (AND-combined when both are given). Front-match / case-sensitive;
-            // the prefix does not guarantee uniqueness because ids are
-            // `<repo>-<branch>` slugs and startsWith can match sibling slugs.
+            // (AND-combined when both are given). Front-match / case-sensitive.
+            //
+            // Matched against the CURRENT ids only (Issue #1621): `/api/worktrees`
+            // returns live rows, and historical ids resolve exactly — never by
+            // prefix — via the alias table on the routes that take an `<id>`
+            // argument. A prefix still does not guarantee uniqueness: ids are now
+            // directory-basename slugs (`commandmate-issue-1644`), so sibling
+            // worktrees of the same feature share a prefix just as `<repo>-<branch>`
+            // slugs used to.
             if (options.id) {
                 worktrees = worktrees.filter(wt => wt.id.startsWith(options.id));
             }

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;AAQpC,wBAAgB,oBAAoB,IAAI,OAAO,CAiE9C"}
+{"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;AAUpC,wBAAgB,oBAAoB,IAAI,OAAO,CAyE9C"}

package/dist/cli/commands/respond.js

@@ -12,14 +12,16 @@ 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");
 function createRespondCommand() {
     const cmd = new commander_1.Command('respond');
     cmd
         .description("Respond to an agent's prompt (yes/no, number, or text)")
         .argument('<worktree-id>', 'Worktree ID')
         .argument('<answer>', 'Response answer (yes, no, number, or free text)')
-        .option('--agent <agent>', 'CLI tool agent (claude, codex, gemini, vibe-local, opencode, copilot, antigravity)')
-        .option('--instance <id>', 'Agent instance ID: <agent> or <agent>-<n> (e.g. claude-2). Defaults to the agent\'s primary instance.')
+        .option('--instance <id>', agent_target_options_1.INSTANCE_OPTION_DESCRIPTION)
+        .option('--agent <agent>', agent_target_options_1.AGENT_OPTION_DESCRIPTION)
         .option('--token <token>', command_helpers_1.TOKEN_WARNING)
         .action(async (worktreeId, answer, options) => {
         try {
@@ -44,10 +46,17 @@ function createRespondCommand() {
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
             const client = new api_client_1.ApiClient({ token: options.token });
+            // Issue #1629: /prompt-response derives the session name from cliTool
+            // and falls back to the worktree default, so `--instance codex` alone
+            // answered into a session that was never started. Resolve the tool the
+            // instance is registered under first.
+            const agent = options.instance
+                ? await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, options.instance, options.agent)
+                : options.agent;
             // [DR2-06] Use prompt-response API with cliTool (not cliToolId)
             const body = { answer };
-            if (options.agent) {
-                body.cliTool = options.agent;
+            if (agent) {
+                body.cliTool = agent;
             }
             // Issue #868: target a specific agent instance
             if (options.instance) {

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;AA4JpC,wBAAgB,iBAAiB,IAAI,OAAO,CA4J3C"}
+{"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;AAiKpC,wBAAgB,iBAAiB,IAAI,OAAO,CAoK3C"}

package/dist/cli/commands/send.js

@@ -11,8 +11,10 @@ const api_client_1 = require("../utils/api-client");
 const command_helpers_1 = require("../utils/command-helpers");
 const duration_constants_1 = require("../config/duration-constants");
 const cli_tool_ids_1 = require("../config/cli-tool-ids");
+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");
 /** Auto-yes duration used when --duration is omitted. */
 const DEFAULT_AUTO_YES_DURATION = '1h';
 /**
@@ -38,14 +40,15 @@ function resolveAutoYesDurationMs(duration) {
  * @param worktreeId - Target worktree ID
  * @param options - Send command options containing auto-yes settings
  * @param durationMs - Duration already validated by resolveAutoYesDurationMs()
+ * @param agent - CLI tool resolved for --instance (Issue #1629), else --agent
  */
-async function enableAutoYes(client, worktreeId, options, durationMs) {
+async function enableAutoYes(client, worktreeId, options, durationMs, agent) {
     const autoYesBody = {
         enabled: true,
         duration: durationMs,
     };
-    if (options.agent) {
-        autoYesBody.cliToolId = options.agent;
+    if (agent) {
+        autoYesBody.cliToolId = agent;
     }
     // Issue #896: per-instance auto-yes. When --instance is given, the poller keys
     // on worktreeId:cliToolId:instanceId so the targeted instance is auto-answered
@@ -85,10 +88,10 @@ async function registerInstance(client, worktreeId, instanceId, cliTool) {
  * from that worktree's verify.yaml. Every violation the server found is printed
  * before exiting, so a broken contract is fixed in one pass (Issue #1545).
  */
-async function createContractTask(client, worktreeId, options) {
+async function createContractTask(client, worktreeId, options, agent) {
     const body = { contractPath: options.contract };
-    if (options.agent) {
-        body.cliToolId = options.agent;
+    if (agent) {
+        body.cliToolId = agent;
     }
     if (options.instance) {
         body.instanceId = options.instance;
@@ -130,9 +133,9 @@ function createSendCommand() {
         .description('Send a message to a worktree agent')
         .argument('<worktree-id>', 'Worktree ID')
         .argument('[message]', 'Message to send (omit when using --contract)')
-        .option('--agent <agent>', 'CLI tool agent (claude, codex, gemini, vibe-local, opencode, copilot, antigravity)')
-        .option('--instance <id>', 'Agent instance ID: <agent> or <agent>-<n> (e.g. claude-2). Defaults to the agent\'s primary instance.')
-        .option('--register', 'Register the --instance session into the agent-instance roster (Issue #1000)')
+        .option('--instance <id>', agent_target_options_1.INSTANCE_OPTION_DESCRIPTION)
+        .option('--agent <agent>', agent_target_options_1.AGENT_OPTION_DESCRIPTION)
+        .option('--register', 'Register the --instance session into the agent-instance roster (needs --agent unless the instance id is itself a CLI tool id)')
         .option('--model <model>', 'Specify AI model for Copilot or Antigravity agent')
         .option('--auto-yes', 'Enable auto-yes before sending')
         .option('--duration <duration>', `Auto-yes duration (${duration_constants_1.ALLOWED_DURATIONS.join(', ')})`)
@@ -207,13 +210,20 @@ function createSendCommand() {
             // CLI cannot honour is an error whether or not --auto-yes accompanies it.
             const autoYesDurationMs = resolveAutoYesDurationMs(options.duration);
             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 agent = options.instance
+                ? await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, options.instance, options.agent)
+                : 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.
             let taskId;
             let content = message;
             if (options.contract) {
-                const task = await createContractTask(client, worktreeId, options);
+                const task = await createContractTask(client, worktreeId, options, agent);
                 taskId = task.taskId;
                 content = task.message;
                 console.error(`Task created: ${taskId}`);
@@ -221,12 +231,12 @@ function createSendCommand() {
             }
             // --auto-yes: enable auto-yes first (unless --model is specified, then after send) [DR2-02]
             if (options.autoYes && !options.model) {
-                await enableAutoYes(client, worktreeId, options, autoYesDurationMs);
+                await enableAutoYes(client, worktreeId, options, autoYesDurationMs, agent);
             }
             // [DR2-05] Send API uses "content" not "message"
             const sendBody = { content };
-            if (options.agent) {
-                sendBody.cliToolId = options.agent;
+            if (agent) {
+                sendBody.cliToolId = agent;
             }
             // Issue #868: Include instance ID in send body
             if (options.instance) {
@@ -259,7 +269,7 @@ function createSendCommand() {
             // Issue #576: Enable auto-yes AFTER send when --model is specified
             // This avoids auto-yes interfering with the /model command interaction
             if (options.autoYes && options.model) {
-                await enableAutoYes(client, worktreeId, options, autoYesDurationMs);
+                await enableAutoYes(client, worktreeId, options, autoYesDurationMs, agent);
             }
         }
         catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAuBzE;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwP9E"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAKH,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAmCzE;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwP9E"}