commandmate 0.26.1 → 0.27.0

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

@@ -2,7 +2,7 @@
 // Do not edit this file manually
 
 type AppRoutes = "/" | "/chat" | "/login" | "/more" | "/offline" | "/repositories" | "/review" | "/sessions" | "/skills" | "/skills/[skillId]" | "/skills/installed" | "/worktrees/[id]" | "/worktrees/[id]/files/[...path]" | "/worktrees/[id]/terminal"
-type AppRouteHandlerRoutes = "/api/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/hooks/permission-request" | "/api/metrics/vibe" | "/api/ollama/models" | "/api/push/escalation" | "/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 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/capabilities" | "/api/daily-summary" | "/api/daily-summary/status" | "/api/external-apps" | "/api/external-apps/[id]" | "/api/external-apps/[id]/health" | "/api/fs/browse" | "/api/fs/recent-paths" | "/api/hooks/agent-event" | "/api/hooks/claude-done" | "/api/hooks/permission-request" | "/api/metrics/vibe" | "/api/ollama/models" | "/api/push/escalation" | "/api/push/subscriptions" | "/api/push/vapid" | "/api/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]/clear-composer" | "/api/worktrees/[id]/cli-tool" | "/api/worktrees/[id]/cmate/schedules" | "/api/worktrees/[id]/current-output" | "/api/worktrees/[id]/env" | "/api/worktrees/[id]/execution-logs" | "/api/worktrees/[id]/execution-logs/[logId]" | "/api/worktrees/[id]/files/[...path]" | "/api/worktrees/[id]/git/branch/create" | "/api/worktrees/[id]/git/branch/delete" | "/api/worktrees/[id]/git/branches" | "/api/worktrees/[id]/git/checkout" | "/api/worktrees/[id]/git/commit" | "/api/worktrees/[id]/git/diff" | "/api/worktrees/[id]/git/fetch" | "/api/worktrees/[id]/git/log" | "/api/worktrees/[id]/git/pull" | "/api/worktrees/[id]/git/push" | "/api/worktrees/[id]/git/reset" | "/api/worktrees/[id]/git/revert" | "/api/worktrees/[id]/git/show/[commitHash]" | "/api/worktrees/[id]/git/stage" | "/api/worktrees/[id]/git/staged" | "/api/worktrees/[id]/git/stash" | "/api/worktrees/[id]/git/stash/[index]" | "/api/worktrees/[id]/git/stash/apply" | "/api/worktrees/[id]/git/stash/pop" | "/api/worktrees/[id]/git/stash/push" | "/api/worktrees/[id]/git/status" | "/api/worktrees/[id]/git/unstage" | "/api/worktrees/[id]/git/working-diff" | "/api/worktrees/[id]/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]/resolve-target" | "/api/worktrees/[id]/respond" | "/api/worktrees/[id]/schedules" | "/api/worktrees/[id]/schedules/[scheduleId]" | "/api/worktrees/[id]/schedules/active" | "/api/worktrees/[id]/search" | "/api/worktrees/[id]/send" | "/api/worktrees/[id]/skills" | "/api/worktrees/[id]/skills/[skillId]/git-workflow" | "/api/worktrees/[id]/skills/[skillId]/install" | "/api/worktrees/[id]/skills/[skillId]/plan" | "/api/worktrees/[id]/skills/[skillId]/uninstall" | "/api/worktrees/[id]/skills/[skillId]/uninstall-plan" | "/api/worktrees/[id]/skills/[skillId]/update" | "/api/worktrees/[id]/skills/[skillId]/update-plan" | "/api/worktrees/[id]/slash-commands" | "/api/worktrees/[id]/special-keys" | "/api/worktrees/[id]/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 = "/" | "/worktrees/[id]"
 type RedirectRoutes = never
@@ -24,6 +24,7 @@ interface ParamMap {
   "/api/auth/login": {}
   "/api/auth/logout": {}
   "/api/auth/status": {}
+  "/api/capabilities": {}
   "/api/daily-summary": {}
   "/api/daily-summary/status": {}
   "/api/external-apps": {}
@@ -68,9 +69,11 @@ interface ParamMap {
   "/api/worktrees/[id]": { "id": string; }
   "/api/worktrees/[id]/auto-yes": { "id": string; }
   "/api/worktrees/[id]/capture": { "id": string; }
+  "/api/worktrees/[id]/clear-composer": { "id": string; }
   "/api/worktrees/[id]/cli-tool": { "id": string; }
   "/api/worktrees/[id]/cmate/schedules": { "id": string; }
   "/api/worktrees/[id]/current-output": { "id": string; }
+  "/api/worktrees/[id]/env": { "id": string; }
   "/api/worktrees/[id]/execution-logs": { "id": string; }
   "/api/worktrees/[id]/execution-logs/[logId]": { "id": string; "logId": string; }
   "/api/worktrees/[id]/files/[...path]": { "id": string; "path": string[]; }
@@ -106,6 +109,7 @@ interface ParamMap {
   "/api/worktrees/[id]/memos/[memoId]": { "id": string; "memoId": string; }
   "/api/worktrees/[id]/messages": { "id": string; }
   "/api/worktrees/[id]/prompt-response": { "id": string; }
+  "/api/worktrees/[id]/resolve-target": { "id": string; }
   "/api/worktrees/[id]/respond": { "id": string; }
   "/api/worktrees/[id]/schedules": { "id": string; }
   "/api/worktrees/[id]/schedules/[scheduleId]": { "id": string; "scheduleId": string; }

package/.next/types/validator.ts

@@ -281,6 +281,15 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   type __Unused = __Check
 }
 
+// Validate ../../src/app/api/capabilities/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/capabilities">> = Specific
+  const handler = {} as typeof import("../../src/app/api/capabilities/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
 // Validate ../../src/app/api/daily-summary/route.ts
 {
   type __IsExpected<Specific extends RouteHandlerConfig<"/api/daily-summary">> = Specific
@@ -659,6 +668,15 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   type __Unused = __Check
 }
 
+// Validate ../../src/app/api/worktrees/[id]/clear-composer/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/clear-composer">> = Specific
+  const handler = {} as typeof import("../../src/app/api/worktrees/[id]/clear-composer/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
 // Validate ../../src/app/api/worktrees/[id]/cli-tool/route.ts
 {
   type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/cli-tool">> = Specific
@@ -686,6 +704,15 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   type __Unused = __Check
 }
 
+// Validate ../../src/app/api/worktrees/[id]/env/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/env">> = Specific
+  const handler = {} as typeof import("../../src/app/api/worktrees/[id]/env/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
 // Validate ../../src/app/api/worktrees/[id]/execution-logs/[logId]/route.ts
 {
   type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/execution-logs/[logId]">> = Specific
@@ -1001,6 +1028,15 @@ type RouteHandlerConfig<Route extends AppRouteHandlerRoutes = AppRouteHandlerRou
   type __Unused = __Check
 }
 
+// Validate ../../src/app/api/worktrees/[id]/resolve-target/route.ts
+{
+  type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/resolve-target">> = Specific
+  const handler = {} as typeof import("../../src/app/api/worktrees/[id]/resolve-target/route.js")
+  type __Check = __IsExpected<typeof handler>
+  // @ts-ignore
+  type __Unused = __Check
+}
+
 // Validate ../../src/app/api/worktrees/[id]/respond/route.ts
 {
   type __IsExpected<Specific extends RouteHandlerConfig<"/api/worktrees/[id]/respond">> = Specific

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;AAUpC,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;AAuDpC,wBAAgB,oBAAoB,IAAI,OAAO,CAuG9C"}

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

@@ -13,6 +13,44 @@ 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");
+/**
+ * Report what arming Auto-Yes actually did: which agent (Issue #1909) and what
+ * it answered on the way in (Issue #1898-2).
+ *
+ * Both halves are read off the response rather than worked out here. For the
+ * agent that is a rule, not a convenience: a bare `auto-yes <id> --enable`
+ * deliberately sends no `cliToolId`, the server applies the precedence chain
+ * (roster > explicit > primary anchor > worktree default) that `send` / `wait` /
+ * `capture` also get, and resolving it a second time in the CLI is how the two
+ * answers diverged in the first place (design §4 D5 決定 1 / DR2-008). The
+ * server names what it chose; this only prints it.
+ *
+ * @param worktreeId - Worktree the command targeted
+ * @param result - Body of the auto-yes POST, or undefined from an old daemon
+ */
+function reportEnabled(worktreeId, result) {
+    const agent = result?.cliToolId;
+    const instanceId = result?.instanceId;
+    // `instanceId === cliToolId` is how the primary instance is spelled (#868);
+    // repeating it as "copilot (copilot)" would be noise.
+    const label = agent && instanceId && instanceId !== agent
+        ? `${agent}, instance ${instanceId}`
+        : agent;
+    console.error(label
+        ? `Auto-yes enabled for ${worktreeId} (${label}).`
+        : `Auto-yes enabled for ${worktreeId}.`);
+    // Issue #1898-2: enabling Auto-Yes under a dialog that was already up used to
+    // do nothing at all, silently. If it answered something on the way in, say so
+    // — that is the difference between "armed for next time" and "the worker you
+    // were unsticking is moving again". Printed after the agent line because the
+    // approvals it re-judged are that agent's (#1909).
+    const pending = result?.pendingDecisions;
+    if (pending && pending.examined > 0) {
+        console.error(`Re-judged ${pending.examined} pending approval(s): ` +
+            `${pending.delivered} answered` +
+            `${pending.skipped > 0 ? `, ${pending.skipped} skipped (limit)` : ''}.`);
+    }
+}
 function createAutoYesCommand() {
     const cmd = new commander_1.Command('auto-yes');
     cmd
@@ -86,9 +124,9 @@ function createAutoYesCommand() {
             if (options.instance) {
                 body.instanceId = options.instance;
             }
-            await client.post(`/api/worktrees/${worktreeId}/auto-yes`, body);
+            const result = await client.post(`/api/worktrees/${worktreeId}/auto-yes`, body);
             if (options.enable) {
-                console.error(`Auto-yes enabled for ${worktreeId}.`);
+                reportEnabled(worktreeId, result);
             }
             else {
                 console.error(`Auto-yes disabled for ${worktreeId}.`);

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

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/capture.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6QpC,wBAAgB,oBAAoB,IAAI,OAAO,CAkG9C"}
+{"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;AA8RpC,wBAAgB,oBAAoB,IAAI,OAAO,CAmG9C"}

package/dist/cli/commands/capture.js

@@ -15,6 +15,7 @@ const command_helpers_1 = require("../utils/command-helpers");
 const cli_tool_ids_1 = require("../config/cli-tool-ids");
 const agent_target_options_1 = require("../config/agent-target-options");
 const instances_1 = require("./instances");
+const session_target_1 = require("../utils/session-target");
 const pager_1 = require("../utils/pager");
 const transcript_squeeze_1 = require("../../lib/tmux/transcript-squeeze");
 /**
@@ -66,10 +67,20 @@ function parseTail(raw) {
 /**
  * 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.
+ * POST /capture demands an explicit `cliToolId`, so unlike GET /current-output
+ * this path cannot leave the choice to the server. Issue #1925 moved the choice
+ * itself to the server anyway — `resolveSessionTarget` asks
+ * `/resolve-target`, which applies the same precedence every other route now
+ * uses, so bare `capture <id> --pane` reads the session the rest of the CLI
+ * addresses instead of a locally-guessed one.
+ *
+ * Reading is not a side effect, so a `--agent` that contradicts the roster
+ * warns and reads the roster's agent rather than failing: `capture` is the
+ * inner call of unbounded monitor loops, and a non-zero exit there is a poll
+ * skipped forever rather than an error anyone sees (DR3-015).
+ *
+ * The tail of this function only runs against a server too old to resolve, the
+ * one case where the CLI still has to name a default itself.
  *
  * @param client - API client
  * @param worktreeId - Worktree ID
@@ -78,15 +89,18 @@ function parseTail(raw) {
  * @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;
+    const target = await (0, session_target_1.resolveSessionTarget)(client, worktreeId, {
+        instanceId: instance,
+        requestedCliTool: agent,
+    });
+    if (target.conflict) {
+        console.error(`Warning: ${(0, session_target_1.describeSessionTargetConflict)(target.conflict)} `
+            + `Reading ${target.conflict.rosterCliTool}.`);
     }
-    if (agent)
-        return agent;
+    if (target.cliToolId)
+        return target.cliToolId;
     const worktree = await client.get(`/api/worktrees/${worktreeId}`);
-    return worktree.cliToolId || 'claude';
+    return worktree.cliToolId || cli_tool_ids_1.DEFAULT_CLI_TOOL_ID;
 }
 /** Default number of prompts `--prompts` lists (Issue #1685). */
 const DEFAULT_PROMPTS_LIMIT = 20;
@@ -294,9 +308,10 @@ function createCaptureCommand() {
             // 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.
+            // instance is registered under before asking. Issue #1925: 'read-only',
+            // because capture looks rather than acts — see resolvePaneCliTool.
             const agent = options.instance
-                ? await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, options.instance, options.agent)
+                ? await (0, instances_1.resolveInstanceCliTool)(client, worktreeId, options.instance, options.agent, 'read-only')
                 : options.agent;
             // Build path with optional cliTool/instance query parameters
             const query = new URLSearchParams();

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

@@ -11,27 +11,39 @@
 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`.
+ * How the caller wants a roster contradiction handled (Issue #1925, DR3-015).
  *
- * `--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.
+ * `strict` is for commands with a side effect: refuse rather than pick one of
+ * two contradicting declarations and type into whichever session that names.
+ * `read-only` is for `capture`, which resolves in order to *look* — and which
+ * `.claude/skills/orchestrate-monitor/scripts/monitor.sh` polls in an
+ * unbounded loop, skipping the poll and never advancing its idle streak
+ * whenever capture exits non-zero. A worker whose `--agent` disagrees with the
+ * roster would leave that loop silently spinning forever.
+ */
+export type InstanceConflictMode = 'strict' | 'read-only';
+/**
+ * Resolve which CLI tool backs `instanceId`. Shared by every command that
+ * targets an instance: `send`, `respond`, `capture` and `auto-yes`.
+ *
+ * Issue #1925 turned this into a thin client over the server's resolver
+ * (`GET /api/worktrees/:id/resolve-target`). It used to resolve locally, with
+ * two of the server's four precedence stages — no primary anchor — so the same
+ * `--instance codex` against a roster that never registered `codex` resolved to
+ * codex on the server and to the worktree default here. The tool id is half the
+ * tmux session name, so two answers meant two sessions.
  *
- * 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.
+ * The roster still wins over `--agent`: it is the user-maintained declaration
+ * of what a named instance is. What changed is that `capture` no longer dies of
+ * the contradiction (see {@link InstanceConflictMode}).
  *
- * @returns the CLI tool to send, or undefined to let the server decide
+ * @param client - API client aimed at the server
+ * @param worktreeId - Worktree ID
+ * @param instanceId - The `--instance` value
+ * @param requestedAgent - The `--agent` value, if the user gave one
+ * @param mode - What a roster contradiction means for this caller
+ * @returns the CLI tool to send, or undefined to let an older server decide
  */
-export declare function resolveInstanceCliTool(client: ApiClient, worktreeId: string, instanceId: string, requestedAgent: string | undefined): Promise<string | undefined>;
+export declare function resolveInstanceCliTool(client: ApiClient, worktreeId: string, instanceId: string, requestedAgent: string | undefined, mode?: InstanceConflictMode): 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;AAIpC,OAAO,EAAE,SAAS,EAAwC,MAAM,qBAAqB,CAAC;AAsEtF;;;;;;;;;;;;;;;;;;;;;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;AAkLD,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;AAuEtF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,IAAI,GAAE,oBAA+B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiB7B;AAkLD,wBAAgB,sBAAsB,IAAI,OAAO,CAqEhD"}

package/dist/cli/commands/instances.js

@@ -18,6 +18,7 @@ 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_instances_1 = require("../utils/agent-instances");
+const session_target_1 = require("../utils/session-target");
 /**
  * Format instance rows as a table for terminal display.
  * [DR1-08 consistency] Mirrors ls.ts's formatTable().
@@ -48,47 +49,42 @@ function formatInstancesTable(rows) {
     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`.
+ * Resolve which CLI tool backs `instanceId`. 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.
+ * Issue #1925 turned this into a thin client over the server's resolver
+ * (`GET /api/worktrees/:id/resolve-target`). It used to resolve locally, with
+ * two of the server's four precedence stages — no primary anchor — so the same
+ * `--instance codex` against a roster that never registered `codex` resolved to
+ * codex on the server and to the worktree default here. The tool id is half the
+ * tmux session name, so two answers meant two sessions.
  *
- * 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.
+ * The roster still wins over `--agent`: it is the user-maintained declaration
+ * of what a named instance is. What changed is that `capture` no longer dies of
+ * the contradiction (see {@link InstanceConflictMode}).
  *
- * @returns the CLI tool to send, or undefined to let the server decide
+ * @param client - API client aimed at the server
+ * @param worktreeId - Worktree ID
+ * @param instanceId - The `--instance` value
+ * @param requestedAgent - The `--agent` value, if the user gave one
+ * @param mode - What a roster contradiction means for this caller
+ * @returns the CLI tool to send, or undefined to let an older 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;
+async function resolveInstanceCliTool(client, worktreeId, instanceId, requestedAgent, mode = 'strict') {
+    const target = await (0, session_target_1.resolveSessionTarget)(client, worktreeId, {
+        instanceId,
+        requestedCliTool: requestedAgent,
+    });
+    if (target.conflict) {
+        const detail = (0, session_target_1.describeSessionTargetConflict)(target.conflict);
+        if (mode === 'strict') {
+            console.error(`Error: ${detail}`);
+            process.exit(types_1.ExitCode.CONFIG_ERROR);
+            return requestedAgent;
+        }
+        console.error(`Warning: ${detail} Reading ${target.conflict.rosterCliTool}.`);
     }
-    return registered.cliTool;
+    return target.cliToolId;
 }
 /**
  * List action: roster + live running/auto-yes status per instance.

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,CA8CzC"}
+{"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;AAiIpC;;;GAGG;AACH,wBAAgB,eAAe,IAAI,OAAO,CA8CzC"}

package/dist/cli/commands/ls.js

@@ -10,6 +10,10 @@ const api_client_1 = require("../utils/api-client");
 const command_helpers_1 = require("../utils/command-helpers");
 /**
  * Derive display status from worktree flags.
+ *
+ * Deliberately still the three-way boolean branch (design DR3-005 says so in as
+ * many words): Issue #1926 adds a reason column beside this, not a fourth
+ * branch inside it. The status vocabulary is unchanged.
  */
 function deriveStatus(wt) {
     if (wt.isWaitingForResponse)
@@ -20,17 +24,72 @@ function deriveStatus(wt) {
         return 'ready';
     return 'idle';
 }
+/**
+ * The per-tool status entry that explains this row's STATUS (Issue #1926).
+ *
+ * `deriveStatus` folds every tool of the worktree into one word, so the reason
+ * beside it has to come from the tool that produced that word — printing the
+ * worktree default's reason next to a `waiting` raised by a second agent would
+ * be a sentence about the wrong session. The worktree default is preferred among
+ * the candidates, because on the ordinary single-agent worktree it is the only
+ * one and on a multi-agent one it is the session the operator means.
+ *
+ * Returns undefined for `idle` (nothing is running, so nothing read a frame) and
+ * for a server older than #1926, which sends no such fields.
+ */
+function pickStatusEntry(wt, status) {
+    const byCli = wt.sessionStatusByCli;
+    if (!byCli)
+        return undefined;
+    const explains = (entry) => {
+        if (!entry)
+            return false;
+        if (status === 'waiting')
+            return entry.isWaitingForResponse;
+        if (status === 'running')
+            return entry.isProcessing;
+        if (status === 'ready')
+            return entry.isRunning;
+        return false;
+    };
+    const preferred = wt.cliToolId ? byCli[wt.cliToolId] : undefined;
+    if (explains(preferred))
+        return preferred;
+    return Object.values(byCli).find(explains);
+}
+/**
+ * The REASON cell: why the STATUS beside it says what it says (Issue #1926).
+ *
+ * `-` when the server does not say — it predates #1926, the session is not
+ * running, or the tool has two or more instances and the aggregate dropped the
+ * reason (see `mergeSessionStatus` server-side; `--json` still carries the
+ * per-tool rows).
+ *
+ * `(no evidence)` marks `statusEvidence: 'none'` — the frame was interactive and
+ * nothing on it could be read either way, so the STATUS beside it is a fallback
+ * rather than a reading. Today that is exactly the `default` and
+ * `no_recent_output` reasons; design Phase 3 widens it per tool, and the marker
+ * is what makes the widening visible here without the reason token changing.
+ */
+function deriveReason(wt) {
+    const entry = pickStatusEntry(wt, deriveStatus(wt));
+    const reason = entry?.sessionStatusReason;
+    if (!reason)
+        return '-';
+    return entry?.statusEvidence === 'none' ? `${reason} (no evidence)` : reason;
+}
 /**
  * Format worktrees as a table for terminal display.
  */
 function formatTable(worktrees) {
     if (worktrees.length === 0)
         return 'No worktrees found.';
-    const headers = ['ID', 'NAME', 'STATUS', 'DEFAULT'];
+    const headers = ['ID', 'NAME', 'STATUS', 'REASON', 'DEFAULT'];
     const rows = worktrees.map(wt => [
         wt.id,
         wt.name,
         deriveStatus(wt),
+        deriveReason(wt),
         wt.cliToolId || '-',
     ]);
     // Calculate column widths
@@ -42,6 +101,19 @@ function formatTable(worktrees) {
 }
 /**
  * Format output based on options [DR1-02]
+ *
+ * `--json` prints the server's rows verbatim, and Issue #1926 does not change
+ * that. `statusEvidence` / `sessionStatusReason` / `lastKnownStatus` /
+ * `lastKnownStatusAt` ride along inside `sessionStatusByCli.<tool>`, which is
+ * where the server puts them:
+ *
+ *     commandmate ls --json | jq -r '.[] | "\(.id) \(.sessionStatusByCli.claude.statusEvidence)"'
+ *
+ * Deliberately not hoisted to the top level of each row. A synthesised
+ * `statusEvidence` there would read as a server field to anyone holding
+ * `WorktreeItem`, would need the same tool-picking rule the REASON column
+ * applies for display, and would make `ls --json` disagree with
+ * `GET /api/worktrees` — three costs for a shorter jq path.
  */
 function formatOutput(worktrees, options) {
     if (options.json) {

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;AAUpC,wBAAgB,oBAAoB,IAAI,OAAO,CAyG9C"}
+{"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,CA6H9C"}

package/dist/cli/commands/respond.js

@@ -76,6 +76,15 @@ function createRespondCommand() {
                 // sending, so the terminal is untouched — worth saying plainly,
                 // because the other reasons leave the answer's fate unknown.
                 const refusedBeforeSending = reason === 'unresolvable_answer' || reason === 'answer_out_of_range';
+                // Issue #1898: the verdict was addressed to the agent's own API and
+                // the POST did not land. Distinct from the two above — the answer was
+                // resolved and an attempt was made — and distinct from a keystroke,
+                // whose fate is never knowable.
+                if (reason === 'decision_not_delivered') {
+                    console.error(`Error: The approval could not be delivered to the agent (reason: ${reason}). ` +
+                        'The dialog is still open; answer it in the terminal.');
+                    process.exit(types_1.ExitCode.UNEXPECTED_ERROR);
+                }
                 if (refusedBeforeSending) {
                     console.error(`Error: Answer was not sent. Reason: ${reason}${result.message ? ` (${result.message})` : ''}`);
                 }
@@ -90,7 +99,15 @@ function createRespondCommand() {
             // Issue #1681: audit trail — print which option was actually selected.
             const resolved = result?.resolved;
             if (resolved) {
-                if (resolved.via === 'semantic') {
+                if (resolved.via === 'structured-decision') {
+                    // Issue #1898: no key was sent. The verdict went to the agent's own
+                    // API by decision id, which is the only way an opencode approval can
+                    // be answered at all — worth saying, because "Response sent." on
+                    // this path would read as "a 1 was typed into the pane".
+                    console.log(`Answered approval ${resolved.decisionId ?? '(unknown id)'} with ` +
+                        `option ${resolved.optionNumber}: ${resolved.optionLabel}`);
+                }
+                else if (resolved.via === 'semantic') {
                     console.log(`Resolved "${answer}" to option ${resolved.optionNumber}: ${resolved.optionLabel}`);
                 }
                 else if (resolved.optionNumber !== undefined) {

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;AAqLpC,wBAAgB,iBAAiB,IAAI,OAAO,CAuL3C"}
+{"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;AAqLpC,wBAAgB,iBAAiB,IAAI,OAAO,CA+L3C"}