commandmate 0.19.0 → 0.21.0

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

@@ -2,9 +2,9 @@
 // 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/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 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]/skills/[skillId]/update" | "/api/worktrees/[id]/skills/[skillId]/update-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
@@ -116,6 +116,8 @@ interface ParamMap {
   "/api/worktrees/[id]/skills/[skillId]/plan": { "id": string; "skillId": string; }
   "/api/worktrees/[id]/skills/[skillId]/uninstall": { "id": string; "skillId": string; }
   "/api/worktrees/[id]/skills/[skillId]/uninstall-plan": { "id": string; "skillId": string; }
+  "/api/worktrees/[id]/skills/[skillId]/update": { "id": string; "skillId": string; }
+  "/api/worktrees/[id]/skills/[skillId]/update-plan": { "id": string; "skillId": string; }
   "/api/worktrees/[id]/slash-commands": { "id": string; }
   "/api/worktrees/[id]/special-keys": { "id": string; }
   "/api/worktrees/[id]/start-polling": { "id": string; }
@@ -153,6 +155,7 @@ export type ParamsOf<Route extends Routes> = ParamMap[Route]
 
 interface LayoutSlotMap {
   "/": never
+  "/worktrees/[id]": never
 }
 
 

package/.next/types/validator.ts

@@ -1091,6 +1091,24 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   type __Unused = __Check
 }
 
+// Validate ../../src/app/api/worktrees/[id]/skills/[skillId]/update-plan/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/skills/[skillId]/update-plan">> = Specific
+  const handler = {} as typeof import("../../src/app/api/worktrees/[id]/skills/[skillId]/update-plan/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
+// Validate ../../src/app/api/worktrees/[id]/skills/[skillId]/update/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/skills/[skillId]/update">> = Specific
+  const handler = {} as typeof import("../../src/app/api/worktrees/[id]/skills/[skillId]/update/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
 // Validate ../../src/app/api/worktrees/[id]/skills/route.ts
 {
   type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/skills">> = Specific
@@ -1274,3 +1292,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;AASpC,wBAAgB,oBAAoB,IAAI,OAAO,CAoG9C"}
+{"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,7 @@ 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');
@@ -20,9 +21,9 @@ function createAutoYesCommand() {
         .option('--enable', 'Enable auto-yes')
         .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('--stop-pattern <pattern>', 'Stop pattern (regex, max 500 chars). Matched against terminal output; cannot block commands (build logs mentioning the pattern also trigger it). To suppress auto-responses per command, use the task contract\'s autoYes.denyPatterns')
+        .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 {

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

@@ -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)
+ * Issue #1685: `--prompts` lists the resolved-prompt audit trail
  */
 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;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6HpC,wBAAgB,oBAAoB,IAAI,OAAO,CA+E9C"}
+{"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;AA2OpC,wBAAgB,oBAAoB,IAAI,OAAO,CAkG9C"}

package/dist/cli/commands/capture.js

@@ -3,14 +3,17 @@
  * capture Command - Get current terminal output
  * Issue #518: [DR1-08] Factory pattern
  * Issue #1623: `--pane` reads the raw tmux pane as a transcript (案B)
+ * Issue #1685: `--prompts` lists the resolved-prompt audit trail
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCaptureCommand = createCaptureCommand;
 const commander_1 = require("commander");
 const types_1 = require("../types");
+const history_display_config_1 = require("../../config/history-display-config");
 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");
@@ -72,6 +75,96 @@ async function resolvePaneCliTool(client, worktreeId, agent, instance) {
     const worktree = await client.get(`/api/worktrees/${worktreeId}`);
     return worktree.cliToolId || 'claude';
 }
+/** Default number of prompts `--prompts` lists (Issue #1685). */
+const DEFAULT_PROMPTS_LIMIT = 20;
+/**
+ * Parse and validate `--limit N` for the `--prompts` listing.
+ *
+ * @param raw - Raw option value, if the user passed one
+ * @returns The parsed count (defaults to {@link DEFAULT_PROMPTS_LIMIT})
+ */
+function parsePromptsLimit(raw) {
+    if (raw === undefined)
+        return DEFAULT_PROMPTS_LIMIT;
+    const value = Number(raw);
+    if (!Number.isInteger(value) || value < 1 || value > history_display_config_1.MAX_MESSAGES_LIMIT) {
+        console.error(`Error: --limit must be an integer between 1 and ${history_display_config_1.MAX_MESSAGES_LIMIT}.`);
+        process.exit(types_1.ExitCode.CONFIG_ERROR);
+    }
+    return value;
+}
+/**
+ * Render one prompt option for the text listing. Handles both the
+ * multiple-choice object shape ({number, label, isDefault}) and plain strings
+ * (yes_no options).
+ */
+function formatPromptOption(option) {
+    if (option !== null && typeof option === 'object') {
+        const { number: num, label, isDefault } = option;
+        const body = `${num !== undefined ? `${num}) ` : ''}${label ?? ''}`.trim();
+        return isDefault ? `${body} (default)` : body;
+    }
+    return String(option);
+}
+/**
+ * `--prompts` path (Issue #1685): list the resolved-prompt audit trail.
+ *
+ * Reads prompt messages from chat history instead of the live pane, so the
+ * question / options / answer / answeredBy of a prompt Auto-Yes already
+ * resolved remain retrievable after the fact — the case where `wait` never
+ * exited 10 and `capture --json`'s promptData is already null.
+ */
+async function capturePrompts(worktreeId, options) {
+    const client = new api_client_1.ApiClient({ token: options.token });
+    const limit = parsePromptsLimit(options.limit);
+    const query = new URLSearchParams({ messageType: 'prompt', limit: String(limit) });
+    if (options.agent)
+        query.set('cliTool', options.agent);
+    if (options.instance)
+        query.set('instance', options.instance);
+    const messages = await client.get(`/api/worktrees/${worktreeId}/messages?${query.toString()}`);
+    // Defensive: the endpoint already filters, but promptData-less rows would
+    // render as empty entries.
+    const prompts = messages.filter((m) => m.messageType === 'prompt' && m.promptData);
+    if (options.json) {
+        console.log(JSON.stringify({
+            worktreeId,
+            count: prompts.length,
+            prompts: prompts.map((m) => ({
+                id: m.id,
+                timestamp: m.timestamp,
+                cliToolId: m.cliToolId ?? null,
+                instanceId: m.instanceId ?? null,
+                type: m.promptData.type,
+                question: m.promptData.question,
+                options: m.promptData.options ?? null,
+                status: m.promptData.status ?? null,
+                answer: m.promptData.answer ?? null,
+                answeredAt: m.promptData.answeredAt ?? null,
+                answeredBy: m.promptData.answeredBy ?? null,
+            })),
+        }, null, 2));
+        return;
+    }
+    if (prompts.length === 0) {
+        console.log('No prompt history.');
+        return;
+    }
+    const blocks = prompts.map((m) => {
+        const p = m.promptData;
+        const answered = p.status === 'answered';
+        const header = `${m.timestamp}  ${m.cliToolId ?? '-'}/${m.instanceId ?? '-'}  [${answered ? `answered:${p.answeredBy ?? 'unknown'}` : 'pending'}]`;
+        const lines = [header, `  Q: ${p.question}`];
+        if (Array.isArray(p.options) && p.options.length > 0) {
+            lines.push(`  options: ${p.options.map(formatPromptOption).join('  ')}`);
+        }
+        if (answered) {
+            lines.push(`  A: ${p.answer ?? '-'}${p.answeredAt ? `  (${p.answeredAt})` : ''}`);
+        }
+        return lines.join('\n');
+    });
+    console.log(blocks.join('\n'));
+}
 /**
  * `--pane` path: read the raw tmux pane and render it as a readable transcript.
  *
@@ -116,8 +209,11 @@ function createCaptureCommand() {
         .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('--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 #1685: audit trail of resolved prompts (question/options/answer/answeredBy)
+        .option('--prompts', 'List recent prompts from chat history (including ones Auto-Yes already resolved)')
+        .option('--limit <n>', `With --prompts: number of most recent prompts to list (default ${DEFAULT_PROMPTS_LIMIT})`)
+        .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 {
@@ -141,6 +237,20 @@ function createCaptureCommand() {
                 console.error('Error: --tail and --raw require --pane.');
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
+            // Issue #1685: --prompts reads history, --pane reads the live pane —
+            // asking for both at once has no meaningful answer.
+            if (options.prompts && options.pane) {
+                console.error('Error: --prompts cannot be combined with --pane.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (!options.prompts && options.limit !== undefined) {
+                console.error('Error: --limit requires --prompts.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (options.prompts) {
+                await capturePrompts(worktreeId, options);
+                return;
+            }
             if (options.pane) {
                 await capturePane(worktreeId, options);
                 return;

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;AASpC,wBAAgB,oBAAoB,IAAI,OAAO,CAyE9C"}
+{"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,CAgG9C"}

package/dist/cli/commands/respond.js

@@ -12,15 +12,17 @@ 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.')
+        .argument('[answer]', 'Response answer (yes, no, number, or free text)')
+        .option('--default', "Select the prompt's default option (mutually exclusive with <answer>)")
+        .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 {
@@ -39,9 +41,14 @@ function createRespondCommand() {
                 console.error('Error: Invalid --instance. Must be an alphanumeric/underscore/hyphen identifier (max 64 chars).');
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
-            // Validate answer is not empty
-            if (!answer.trim()) {
-                console.error('Error: Answer cannot be empty.');
+            // Issue #1681: exactly one of <answer> / --default
+            const useDefault = options.default === true;
+            if (useDefault && answer !== undefined) {
+                console.error('Error: <answer> and --default are mutually exclusive.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            if (!useDefault && (answer === undefined || !answer.trim())) {
+                console.error('Error: Answer cannot be empty. Provide an answer or --default.');
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
             const client = new api_client_1.ApiClient({ token: options.token });
@@ -53,7 +60,7 @@ function createRespondCommand() {
                 ? 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 };
+            const body = useDefault ? { useDefault: true } : { answer };
             if (agent) {
                 body.cliTool = agent;
             }
@@ -65,9 +72,28 @@ function createRespondCommand() {
             if (result && !result.success) {
                 // [DR2-06] Check reason for failure
                 const reason = result.reason || 'unknown';
-                console.error(`Warning: Response may not have been applied. Reason: ${reason}`);
+                if (reason === 'unresolvable_answer') {
+                    // Issue #1681: nothing was sent to the terminal.
+                    console.error(`Error: Answer was not sent. Reason: ${reason}${result.message ? ` (${result.message})` : ''}`);
+                }
+                else {
+                    console.error(`Warning: Response may not have been applied. Reason: ${reason}`);
+                }
                 process.exit(types_1.ExitCode.UNEXPECTED_ERROR);
             }
+            // Issue #1681: audit trail — print which option was actually selected.
+            const resolved = result?.resolved;
+            if (resolved) {
+                if (resolved.via === 'semantic') {
+                    console.log(`Resolved "${answer}" to option ${resolved.optionNumber}: ${resolved.optionLabel}`);
+                }
+                else if (resolved.optionNumber !== undefined) {
+                    console.log(`Selected default option ${resolved.optionNumber}: ${resolved.optionLabel}`);
+                }
+                else {
+                    console.log(`Selected default answer: ${resolved.optionLabel}`);
+                }
+            }
             console.error('Response sent.');
         }
         catch (error) {

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;AAgKpC,wBAAgB,iBAAiB,IAAI,OAAO,CAoK3C"}
+{"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,6 +11,7 @@ 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");
@@ -132,13 +133,13 @@ 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('--auto-yes', 'Enable auto-yes before sending (session-wide, no policy guard; for unattended runs prefer --contract with an autoYes policy)')
         .option('--duration <duration>', `Auto-yes duration (${duration_constants_1.ALLOWED_DURATIONS.join(', ')})`)
-        .option('--stop-pattern <pattern>', 'Auto-yes stop pattern (regex)')
+        .option('--stop-pattern <pattern>', 'Auto-yes stop pattern (regex). Matched against terminal output; cannot block commands (use the task contract\'s autoYes.denyPatterns for that)')
         .option('--contract <path>', 'Execution contract path relative to the worktree root (e.g. .commandmate/tasks/my-task.yaml). Records a task and sends the contract preamble plus its goal.')
         .option('--token <token>', command_helpers_1.TOKEN_WARNING)
         .action(async (worktreeId, message, options) => {

package/dist/cli/commands/skill-format.d.ts

@@ -7,7 +7,7 @@
  * Nothing here prints an absolute path, a token or an artifact URL: the API does
  * not serve them, and these functions must not reconstruct them either.
  */
-import type { SkillCatalogMeta, SkillCatalogSummary, SkillInstallPlan, SkillUninstallPlan } from '../types/api-responses';
+import type { SkillCatalogMeta, SkillCatalogSummary, SkillInstallPlan, SkillUninstallPlan, SkillUpdatePlan } from '../types/api-responses';
 /**
  * Freshness notice for a Catalog response, or null when it was confirmed current.
  * Belongs on stderr: it qualifies the listing rather than being part of it.
@@ -23,6 +23,12 @@ export declare function formatSkillDetail(skill: SkillCatalogSummary, version?:
 export declare function formatInstallRoots(roots: readonly string[] | undefined, primary: string): string;
 /** The install preview: what lands, where, at what risk, and what stands in the way. */
 export declare function formatInstallPlan(plan: SkillInstallPlan): string;
+/**
+ * The update preview (Issue #1243): the version move, the security-relevant
+ * differences, the file diff totals, and every reason the update is refused.
+ * Shows the same facts the browser dialog shows, in the same order.
+ */
+export declare function formatUpdatePlan(plan: SkillUpdatePlan): string;
 /** The uninstall preview: what would be deleted, what would stay, and why. */
 export declare function formatUninstallPlan(plan: SkillUninstallPlan): string;
 //# sourceMappingURL=skill-format.d.ts.map

package/dist/cli/commands/skill-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-format.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/skill-format.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAgBhC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAI/E;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAatE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CA2CtF;AAMD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEhG;AAED,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CA8ChE;AAED,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CA2BpE"}
+{"version":3,"file":"skill-format.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/skill-format.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAgBhC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAI/E;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAatE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CA2CtF;AAMD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEhG;AAED,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CA8ChE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAwE9D;AAED,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CA2BpE"}

package/dist/cli/commands/skill-format.js

@@ -14,6 +14,7 @@ exports.formatSkillTable = formatSkillTable;
 exports.formatSkillDetail = formatSkillDetail;
 exports.formatInstallRoots = formatInstallRoots;
 exports.formatInstallPlan = formatInstallPlan;
+exports.formatUpdatePlan = formatUpdatePlan;
 exports.formatUninstallPlan = formatUninstallPlan;
 /** [DR1-08 consistency] Mirrors ls.ts / instances.ts table rendering. */
 function formatTable(headers, rows) {
@@ -133,6 +134,72 @@ function formatInstallPlan(plan) {
     }
     return lines.join('\n');
 }
+/**
+ * The update preview (Issue #1243): the version move, the security-relevant
+ * differences, the file diff totals, and every reason the update is refused.
+ * Shows the same facts the browser dialog shows, in the same order.
+ */
+function formatUpdatePlan(plan) {
+    const { skill, target, update, securityDiff, stats } = plan;
+    const lines = [
+        `Update plan: ${skill.name} (${skill.id}) ${update.fromVersion} -> ${update.toVersion}`,
+        '',
+        `Target:       ${target.repositoryName} / ${target.worktreeName} (${target.worktreeId})`,
+        `Branch:       ${target.branch ?? `(${target.headState})`}${target.workingTreeDirty ? ' [working tree dirty]' : ''}`,
+        `Install root: ${formatInstallRoots(target.installRoots, target.installRoot)}`,
+        `Risk:         ${securityDiff.risk.from.effective} -> ${securityDiff.risk.to.effective}${securityDiff.risk.increased ? ' [RISK INCREASE]' : ''}`,
+        `Compatibility: ${skill.compatibility.commandmate.status} — ${skill.compatibility.commandmate.message}`,
+    ];
+    if (update.latestVersion && update.latestVersion !== update.toVersion) {
+        lines.push(`Newest:       ${update.latestVersion} (not selected)`);
+    }
+    if (securityDiff.permissions.added.length > 0) {
+        lines.push(formatList('Perms added:  ', securityDiff.permissions.added));
+    }
+    if (securityDiff.permissions.removed.length > 0) {
+        lines.push(formatList('Perms removed:', securityDiff.permissions.removed));
+    }
+    if (securityDiff.scripts.added.length > 0) {
+        lines.push(formatList('New scripts:  ', securityDiff.scripts.added));
+    }
+    if (securityDiff.scripts.removed.length > 0) {
+        lines.push(formatList('Scripts gone: ', securityDiff.scripts.removed));
+    }
+    if (securityDiff.executables.added.length > 0) {
+        lines.push(formatList('New execs:    ', securityDiff.executables.added));
+    }
+    lines.push(`Changes:      +${stats.added} added, ~${stats.updated} updated, -${stats.removed} removed, =${stats.unchanged} unchanged`);
+    const localFindings = stats.localModified + stats.localMissing + stats.localUnknown + stats.irregular;
+    if (localFindings > 0) {
+        lines.push(`Local:        ${stats.localModified} modified, ${stats.localMissing} missing, ${stats.localUnknown} unmanaged, ${stats.irregular} irregular`);
+    }
+    for (const entry of securityDiff.changelogs) {
+        lines.push(`Changelog ${entry.version}:`);
+        for (const changelogLine of entry.changelog.split('\n')) {
+            lines.push(`  ${changelogLine}`);
+        }
+    }
+    if (plan.warnings.length > 0) {
+        lines.push(`Warnings:     ${plan.warnings.join(', ')}`);
+    }
+    if (plan.blockers.length > 0) {
+        lines.push('Blockers:');
+        for (const blocker of plan.blockers) {
+            lines.push(`  - ${blocker.code}${blocker.detail ? ` (${blocker.detail})` : ''}${blocker.path ? `: ${blocker.path}` : ''}`);
+        }
+    }
+    lines.push(plan.updatable
+        ? 'Updatable:    yes'
+        : 'Updatable:    no — nothing would be written');
+    if (plan.requiresRiskAcknowledgement) {
+        lines.push(`High risk:    applying this update will require an explicit acknowledgement of ${skill.id}@${update.toVersion}`);
+    }
+    if (plan.riskIncreased) {
+        lines.push('Risk rises:   applying this update will require a separate risk-increase confirmation');
+    }
+    lines.push(`Next action:  ${plan.nextActionKey}`);
+    return lines.join('\n');
+}
 /** The uninstall preview: what would be deleted, what would stay, and why. */
 function formatUninstallPlan(plan) {
     const { skill, target, stats } = plan;

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

@@ -5,6 +5,8 @@
  *   commandmate skill list [--json]
  *   commandmate skill info <skill-id> [--version <v>] [--json]
  *   commandmate skill plan <skill-id> --worktree <id> [--version <v>] [--json]
+ *   commandmate skill update-plan <skill-id> --worktree <id> [--version <v>] [--range <r>] [--json]
+ *   commandmate skill update <skill-id> --worktree <id> [--version <v>] [--dry-run] [--yes] [--ack-risk <id>@<version>] [--ack-risk-increase]
  *   commandmate skill install <skill-id> --worktree <id> --version <exact> [--dry-run] [--yes] [--ack-risk <id>@<version>] [--git current|dedicated] [--push] [--pr]
  *   commandmate skill uninstall <skill-id> --worktree <id> [--dry-run] [--yes] [--json]
  *   commandmate skill status <skill-id> --worktree <id> [--json]

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

@@ -1 +1 @@
-{"version":3,"file":"skill.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/skill.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0gBpC,wBAAgB,kBAAkB,IAAI,OAAO,CAkJ5C"}
+{"version":3,"file":"skill.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/skill.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2qBpC,wBAAgB,kBAAkB,IAAI,OAAO,CAgM5C"}