commandmate 0.32.0 → 0.32.1

package/README.md

@@ -12,7 +12,7 @@
 **[commandmate website →](https://kewton.github.io/CommandMate/)**
 
 <p align="center">
-  <img src="./docs/images/demo-desktop.gif" width="600" alt="A task contract is sent, the verification gates run, and the exit code returns RESULT passed" />
+  <img src="./docs/images/demo-hero.en.gif" width="600" alt="Switch repos from the tab bar, delegate to another agent from the chat, open the file it names, and do the same from a phone" />
 </p>
 
 > **From vibe coding to Vibe Engineering.**
@@ -30,8 +30,12 @@ npx commandmate@latest
 CommandMate adds the machinery — a contract before the work, verification gates after it, Skills that carry the method — on top of the agent CLIs you already use.
 It does not replace tmux, Git worktrees, your terminal, or your agent CLI. It puts a frame around them, so the work arrives verified instead of merely finished.
 
+## Verified, not vibe-checked
+
+Gates you declared decide whether the work is done, and the exit code is the verdict.
+
 <p align="center">
-  <img src="./docs/images/demo-mobile.gif" width="300" alt="A waiting agent reaches you, and the prompt is answered from a phone" />
+  <img src="./docs/images/demo-contract-verify.gif" width="600" alt="A task contract is sent, the verification gates run, and the exit code returns RESULT passed" />
 </p>
 
 Works on desktop and mobile — monitor and steer sessions from any browser, including your phone.

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

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

package/dist/cli/commands/instances.js

@@ -22,6 +22,10 @@ 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");
+// Issue #2404: "the worktree is not on this server" is a different failure from
+// "the worktree id is wrong", and only the session's own identity can tell them
+// apart.
+const whoami_1 = require("./whoami");
 // Issue #2317: the tmux session name each instance runs in, so `commandmate
 // attach` / `tmux attach` need no hand-assembly of `mcbd-<tool>-<wt>[-<suffix>]`.
 const session_name_1 = require("../../lib/cli-tools/session-name");
@@ -243,8 +247,7 @@ async function fetchOpencodeSessions(client, worktreeId, instances) {
  * Probes GET .../current-output?cliTool=&instance= per instance (same
  * endpoint capture.ts uses) since the roster itself carries no session state.
  */
-async function listInstances(worktreeId, options) {
-    const client = new api_client_1.ApiClient({ token: options.token });
+async function listInstances(client, worktreeId, options) {
     const instances = await (0, agent_instances_1.fetchAgentInstances)(client, worktreeId);
     // Issue #2038: one extra request for the whole worktree, and only when there
     // is an opencode instance to ask about — the endpoint is opencode-only and a
@@ -286,7 +289,7 @@ async function listInstances(worktreeId, options) {
 /**
  * Add action: append a new instance to the roster (PATCH full replacement).
  */
-async function addInstance(worktreeId, options) {
+async function addInstance(client, worktreeId, options) {
     if (!options.agent) {
         console.error('Error: add requires --agent <tool>.');
         process.exit(types_1.ExitCode.CONFIG_ERROR);
@@ -303,7 +306,6 @@ async function addInstance(worktreeId, options) {
         console.error(`Error: --alias exceeds ${agent_instances_1.MAX_AGENT_ALIAS_LENGTH} characters.`);
         process.exit(types_1.ExitCode.CONFIG_ERROR);
     }
-    const client = new api_client_1.ApiClient({ token: options.token });
     const existing = await (0, agent_instances_1.fetchAgentInstances)(client, worktreeId);
     if (existing.length >= agent_instances_1.MAX_AGENT_INSTANCES) {
         console.error(`Error: worktree already has the maximum of ${agent_instances_1.MAX_AGENT_INSTANCES} agent instances.`);
@@ -332,12 +334,11 @@ async function addInstance(worktreeId, options) {
  * Remove action: drop an instance from the roster. Kills the session first
  * (when --kill) so the server can still resolve its CLI tool from the roster.
  */
-async function removeInstance(worktreeId, instanceId, options) {
+async function removeInstance(client, worktreeId, instanceId, options) {
     if (!(0, api_client_1.isValidInstanceId)(instanceId)) {
         console.error('Error: Invalid instance id. Must be an alphanumeric/underscore/hyphen identifier (max 64 chars).');
         process.exit(types_1.ExitCode.CONFIG_ERROR);
     }
-    const client = new api_client_1.ApiClient({ token: options.token });
     const existing = await (0, agent_instances_1.fetchAgentInstances)(client, worktreeId);
     if (!existing.some(inst => inst.id === instanceId)) {
         console.error(`Error: instance '${instanceId}' not found in roster.`);
@@ -363,7 +364,7 @@ async function removeInstance(worktreeId, instanceId, options) {
 /**
  * Alias action: rename an existing instance's display label.
  */
-async function renameInstance(worktreeId, instanceId, alias, options) {
+async function renameInstance(client, worktreeId, instanceId, alias) {
     if (!(0, api_client_1.isValidInstanceId)(instanceId)) {
         console.error('Error: Invalid instance id. Must be an alphanumeric/underscore/hyphen identifier (max 64 chars).');
         process.exit(types_1.ExitCode.CONFIG_ERROR);
@@ -372,7 +373,6 @@ async function renameInstance(worktreeId, instanceId, alias, options) {
         console.error(`Error: alias must be 1-${agent_instances_1.MAX_AGENT_ALIAS_LENGTH} characters.`);
         process.exit(types_1.ExitCode.CONFIG_ERROR);
     }
-    const client = new api_client_1.ApiClient({ token: options.token });
     const existing = await (0, agent_instances_1.fetchAgentInstances)(client, worktreeId);
     const index = existing.findIndex(inst => inst.id === instanceId);
     if (index === -1) {
@@ -388,15 +388,33 @@ async function renameInstance(worktreeId, instanceId, alias, options) {
  * The server resolves the backing CLI tool from the roster via the `instance`
  * query param (kill-session/route.ts), so no extra lookup is needed here.
  */
-async function killInstance(worktreeId, instanceId, options) {
+async function killInstance(client, worktreeId, instanceId) {
     if (!(0, api_client_1.isValidInstanceId)(instanceId)) {
         console.error('Error: Invalid instance id. Must be an alphanumeric/underscore/hyphen identifier (max 64 chars).');
         process.exit(types_1.ExitCode.CONFIG_ERROR);
     }
-    const client = new api_client_1.ApiClient({ token: options.token });
     await client.post(`/api/worktrees/${worktreeId}/kill-session?instance=${encodeURIComponent(instanceId)}`);
     console.error(`Session killed: ${instanceId}`);
 }
+/**
+ * Print the "you are on another server" hint when that is what a 404 means
+ * (Issue #2404).
+ *
+ * Runs only on a failure path, so the extra `tmux display-message` +
+ * `GET /api/worktrees` it costs buys the difference between a correct diagnosis
+ * and a wrong one. Never throws: {@link describeServerMismatch} swallows its own
+ * failures, and a diagnosis must not replace the error being diagnosed.
+ *
+ * @param client - The client whose request failed
+ * @param error - The caught error, diagnosed only when it is a 404
+ */
+async function warnIfDifferentServer(client, error) {
+    if (!(error instanceof api_client_1.ApiError) || error.statusCode !== 404)
+        return;
+    const mismatch = await (0, whoami_1.describeServerMismatch)(client);
+    if (mismatch)
+        console.error((0, whoami_1.formatServerMismatchHint)(mismatch));
+}
 function createInstancesCommand() {
     const cmd = new commander_1.Command('instances');
     cmd
@@ -411,6 +429,10 @@ function createInstancesCommand() {
         .option('--kill', 'Also kill the running session when removing an instance')
         .option('--token <token>', command_helpers_1.TOKEN_WARNING)
         .action(async (worktreeId, action, rest, options) => {
+        // One client for the whole invocation (Issue #2404): every action built
+        // its own identical one, and the failure path below has to report the URL
+        // the request actually went to — a second construction is a second answer.
+        const client = new api_client_1.ApiClient({ token: options.token });
         try {
             if (!(0, api_client_1.isValidWorktreeId)(worktreeId)) {
                 console.error('Error: Invalid worktree ID format.');
@@ -418,10 +440,10 @@ function createInstancesCommand() {
             }
             switch (action ?? 'list') {
                 case 'list':
-                    await listInstances(worktreeId, options);
+                    await listInstances(client, worktreeId, options);
                     break;
                 case 'add':
-                    await addInstance(worktreeId, options);
+                    await addInstance(client, worktreeId, options);
                     break;
                 case 'remove': {
                     const [instanceId] = rest;
@@ -429,7 +451,7 @@ function createInstancesCommand() {
                         console.error('Error: remove requires an <instance-id> argument.');
                         process.exit(types_1.ExitCode.CONFIG_ERROR);
                     }
-                    await removeInstance(worktreeId, instanceId, options);
+                    await removeInstance(client, worktreeId, instanceId, options);
                     break;
                 }
                 case 'alias': {
@@ -439,7 +461,7 @@ function createInstancesCommand() {
                         console.error('Error: alias requires <instance-id> and <new-alias> arguments.');
                         process.exit(types_1.ExitCode.CONFIG_ERROR);
                     }
-                    await renameInstance(worktreeId, instanceId, alias, options);
+                    await renameInstance(client, worktreeId, instanceId, alias);
                     break;
                 }
                 case 'kill': {
@@ -448,7 +470,7 @@ function createInstancesCommand() {
                         console.error('Error: kill requires an <instance-id> argument.');
                         process.exit(types_1.ExitCode.CONFIG_ERROR);
                     }
-                    await killInstance(worktreeId, instanceId, options);
+                    await killInstance(client, worktreeId, instanceId);
                     break;
                 }
                 default:
@@ -457,6 +479,13 @@ function createInstancesCommand() {
             }
         }
         catch (error) {
+            // Issue #2404: a 404 here says "no such worktree ON THIS SERVER", and
+            // `Resource not found. Check the worktree ID.` reads as "you typed it
+            // wrong". When the caller's own session belongs to a worktree this
+            // server does not list, the id was never the problem — say so before
+            // handleCommandError() exits, so nobody re-checks a correct id and then
+            // delegates to whatever this server does have.
+            await warnIfDifferentServer(client, error);
             (0, command_helpers_1.handleCommandError)(error);
         }
     });

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

@@ -1 +1 @@
-{"version":3,"file":"peers.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/peers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAiB,YAAY,EAAwB,MAAM,wBAAwB,CAAC;AAIhG,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB;;;;;;;;GAQG;AACH,UAAU,gBAAiB,SAAQ,YAAY;IAC7C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,kCAAkC;AAClC,UAAU,OAAO;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC;IAChB,2DAA2D;IAC3D,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAuED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,gBAAgB,EAAE,EAC7B,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,EAAE,CAuBX;AAoBD,wBAAgB,kBAAkB,IAAI,OAAO,CAkD5C"}
+{"version":3,"file":"peers.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/peers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAiB,YAAY,EAAwB,MAAM,wBAAwB,CAAC;AAIhG,OAAO,EAML,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB;;;;;;;;GAQG;AACH,UAAU,gBAAiB,SAAQ,YAAY;IAC7C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,kCAAkC;AAClC,UAAU,OAAO;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC;IAChB,2DAA2D;IAC3D,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAuED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,gBAAgB,EAAE,EAC7B,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,EAAE,CAuBX;AAoBD,wBAAgB,kBAAkB,IAAI,OAAO,CAkE5C"}

package/dist/cli/commands/peers.js

@@ -175,13 +175,25 @@ function createPeersCommand() {
             // authority on the one string the caller pastes into a shell.
             const binary = (0, command_reference_1.resolveCommandMateBinary)();
             const rows = buildPeerRows(worktrees, identity, binary);
+            // Issue #2404: the listing above is empty precisely when the caller's own
+            // worktree is absent from `worktrees` — which is what "you are on another
+            // server" looks like from here, and which `No peer sessions found.` reads
+            // as "you have no siblings". The list is already in hand, so the check is
+            // free and applies whichever source named the worktree.
+            const mismatch = (0, whoami_1.detectServerMismatch)(identity, new Set(worktrees.map((wt) => wt.id)), client.serverUrl);
+            if (mismatch)
+                console.error((0, whoami_1.formatServerMismatchWarning)(mismatch));
             if (options.json) {
                 console.log(JSON.stringify({
+                    // `self` is unchanged: it answers "who is asking", and the server is
+                    // not part of that. The connection target is its own top-level field.
                     self: {
                         worktreeId: identity.worktreeId,
                         instanceId: identity.instanceId,
                         cliToolId: identity.cliToolId,
                     },
+                    serverUrl: client.serverUrl,
+                    ...(mismatch ? { serverMismatch: true } : {}),
                     peers: rows,
                 }, null, 2));
                 return;

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

@@ -57,6 +57,29 @@ export interface SessionIdentity {
     source: IdentitySource;
     /** The tmux session, when the identity came from (or could be checked against) one. */
     sessionName: string | null;
+    /**
+     * Every worktree id the server answered with while this identity was resolved,
+     * or null/undefined when no list was read (Issue #2404).
+     *
+     * Carried rather than discarded because it is the whole evidence for
+     * {@link detectServerMismatch}: the tmux path already fetches it to break the
+     * `-<n>` ambiguity, so "is my own worktree on the server I am dialling?" costs
+     * no second request. Absent on the env path, which never asks — and that is
+     * the reason a `source: 'env'` identity never reports a mismatch here.
+     */
+    knownWorktreeIds?: Set<string> | null;
+}
+/**
+ * The caller is on a session one server started and is talking to another
+ * (Issue #2404).
+ */
+export interface ServerMismatch {
+    /** The worktree this session belongs to, as {@link resolveSessionIdentity} read it. */
+    worktreeId: string;
+    /** The server this CLI is dialling — the one that does NOT list that worktree. */
+    serverUrl: string;
+    /** Where the worktree id came from, so the warning can say how it is known. */
+    source: IdentitySource;
 }
 /**
  * The tmux session this process is running inside, or null.
@@ -95,6 +118,50 @@ export declare function parseSessionName(sessionName: string): ParsedSessionName
  * @returns The identity, or null when nothing establishes one
  */
 export declare function resolveSessionIdentity(client: ApiClient, env?: Readonly<Record<string, string | undefined>>): Promise<SessionIdentity | null>;
+/**
+ * Whether the caller's own worktree is missing from the server it is dialling.
+ *
+ * The contradiction this names was, until now, unnameable: `whoami` answers
+ * from the tmux session name and therefore succeeds, while `ls` / `instances` /
+ * `peers` answer from a *different* server's ledger and therefore say the
+ * worktree does not exist. Both are correct and they disagree, and an agent
+ * reading them concluded the reasonable, wrong thing — "I must not be in the
+ * ledger" — and delegated its work into an unrelated worktree on the other
+ * server (#2403). Exit codes said nothing: `ask` returned 0.
+ *
+ * Deliberately NOT gated on {@link IdentitySource}. The gate is having a list at
+ * all: the env path never fetches one, so it passes null and cannot flag, while
+ * `peers` — which has just fetched the whole list for its own listing — can
+ * check an env-derived identity for free. A missing list is never a mismatch:
+ * a stopped server must not be reported as the wrong server.
+ *
+ * @param identity - Who the caller is
+ * @param knownWorktreeIds - Worktree ids from the server, or null when unread
+ * @param serverUrl - The URL those ids came from ({@link ApiClient.serverUrl})
+ * @returns The mismatch, or null when there is nothing to report
+ */
+export declare function detectServerMismatch(identity: SessionIdentity, knownWorktreeIds: Set<string> | null | undefined, serverUrl: string): ServerMismatch | null;
+/**
+ * The multi-line warning printed when {@link detectServerMismatch} fires.
+ *
+ * Says what is wrong, why it is not a typo, and what it costs to ignore —
+ * because the failure it describes is silent by construction: every command
+ * involved keeps exiting 0 while answering about the wrong machine's worktrees.
+ */
+export declare function formatServerMismatchWarning(mismatch: ServerMismatch): string;
+/** The one-line form, for a command that has already failed for another reason. */
+export declare function formatServerMismatchHint(mismatch: ServerMismatch): string;
+/**
+ * Resolve the caller's identity and report a mismatch, or null.
+ *
+ * For commands that only need this on a failure path: it costs a `tmux
+ * display-message` and one `GET /api/worktrees`, and it is called after the
+ * request that already failed. Never throws — a diagnosis that fails must not
+ * replace the error it was diagnosing.
+ *
+ * @param client - The client whose 404 is being explained
+ */
+export declare function describeServerMismatch(client: ApiClient): Promise<ServerMismatch | null>;
 /**
  * The roster row for this identity, or null.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,aAAa,EAAsC,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKhD;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAUhC,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,cAAc,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;IACvB,uFAAuF;IACvF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAcD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,IAAI,CASf;AAED,gFAAgF;AAChF,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAa9E;AAkDD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAoCjC;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAO/B;AAED,iEAAiE;AACjE,eAAO,MAAM,sBAAsB,QAMmC,CAAC;AAEvE,wBAAgB,mBAAmB,IAAI,OAAO,CA0C7C"}
+{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,aAAa,EAAsC,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKhD;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAUhC,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,cAAc,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;IACvB,uFAAuF;IACvF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CACvC;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,uFAAuF;IACvF,UAAU,EAAE,MAAM,CAAC;IACnB,kFAAkF;IAClF,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,MAAM,EAAE,cAAc,CAAC;CACxB;AAcD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,IAAI,CASf;AAED,gFAAgF;AAChF,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAa9E;AAkDD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAqCjC;AAMD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,SAAS,EAAE,MAAM,GAChB,cAAc,GAAG,IAAI,CAIvB;AASD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAS5E;AAED,mFAAmF;AACnF,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAMzE;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAY9F;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAO/B;AAED,iEAAiE;AACjE,eAAO,MAAM,sBAAsB,QAMmC,CAAC;AAEvE,wBAAgB,mBAAmB,IAAI,OAAO,CA6D7C"}

package/dist/cli/commands/whoami.js

@@ -38,6 +38,10 @@ exports.NOT_IN_SESSION_MESSAGE = exports.NOT_IN_SESSION = void 0;
 exports.readTmuxSessionName = readTmuxSessionName;
 exports.parseSessionName = parseSessionName;
 exports.resolveSessionIdentity = resolveSessionIdentity;
+exports.detectServerMismatch = detectServerMismatch;
+exports.formatServerMismatchWarning = formatServerMismatchWarning;
+exports.formatServerMismatchHint = formatServerMismatchHint;
+exports.describeServerMismatch = describeServerMismatch;
 exports.readOwnRosterEntry = readOwnRosterEntry;
 exports.createWhoamiCommand = createWhoamiCommand;
 const child_process_1 = require("child_process");
@@ -205,8 +209,95 @@ async function resolveSessionIdentity(client, env = process.env) {
         cliToolId: parsed.cliToolId,
         source: 'tmux-session',
         sessionName,
+        knownWorktreeIds: known,
     };
 }
+// ===========================================================================
+// "Am I even talking to the server that started me?" (Issue #2404)
+// ===========================================================================
+/**
+ * Whether the caller's own worktree is missing from the server it is dialling.
+ *
+ * The contradiction this names was, until now, unnameable: `whoami` answers
+ * from the tmux session name and therefore succeeds, while `ls` / `instances` /
+ * `peers` answer from a *different* server's ledger and therefore say the
+ * worktree does not exist. Both are correct and they disagree, and an agent
+ * reading them concluded the reasonable, wrong thing — "I must not be in the
+ * ledger" — and delegated its work into an unrelated worktree on the other
+ * server (#2403). Exit codes said nothing: `ask` returned 0.
+ *
+ * Deliberately NOT gated on {@link IdentitySource}. The gate is having a list at
+ * all: the env path never fetches one, so it passes null and cannot flag, while
+ * `peers` — which has just fetched the whole list for its own listing — can
+ * check an env-derived identity for free. A missing list is never a mismatch:
+ * a stopped server must not be reported as the wrong server.
+ *
+ * @param identity - Who the caller is
+ * @param knownWorktreeIds - Worktree ids from the server, or null when unread
+ * @param serverUrl - The URL those ids came from ({@link ApiClient.serverUrl})
+ * @returns The mismatch, or null when there is nothing to report
+ */
+function detectServerMismatch(identity, knownWorktreeIds, serverUrl) {
+    if (!knownWorktreeIds)
+        return null;
+    if (knownWorktreeIds.has(identity.worktreeId))
+        return null;
+    return { worktreeId: identity.worktreeId, serverUrl, source: identity.source };
+}
+/** How the worktree id was established, as a phrase for the warning. */
+function describeSource(source) {
+    return source === 'tmux-session'
+        ? 'read from the tmux session name'
+        : 'read from the CM_* variables on this session\'s launch line';
+}
+/**
+ * The multi-line warning printed when {@link detectServerMismatch} fires.
+ *
+ * Says what is wrong, why it is not a typo, and what it costs to ignore —
+ * because the failure it describes is silent by construction: every command
+ * involved keeps exiting 0 while answering about the wrong machine's worktrees.
+ */
+function formatServerMismatchWarning(mismatch) {
+    return [
+        `Warning: this session is worktree '${mismatch.worktreeId}' (${describeSource(mismatch.source)}), `
+            + `but the server this CLI is talking to (${mismatch.serverUrl}) does not list it.`,
+        '  You are almost certainly connected to a DIFFERENT CommandMate server than the one that started this session.',
+        '  Everything that reads the server ledger — ls / instances / peers / ask — is answering about that other server,',
+        '  so anything delegated from here can land in an unrelated worktree while still exiting 0.',
+        '  Aim the CLI at the right server (CM_PORT=<port> commandmate …) or check ~/.commandmate/.env, then re-run.',
+    ].join('\n');
+}
+/** The one-line form, for a command that has already failed for another reason. */
+function formatServerMismatchHint(mismatch) {
+    return (`Hint: this session is worktree '${mismatch.worktreeId}' (${describeSource(mismatch.source)}), `
+        + `which the server at ${mismatch.serverUrl} does not list — this CLI is probably connected to a `
+        + 'different CommandMate server than the one that started this session, so the id is not the problem.');
+}
+/**
+ * Resolve the caller's identity and report a mismatch, or null.
+ *
+ * For commands that only need this on a failure path: it costs a `tmux
+ * display-message` and one `GET /api/worktrees`, and it is called after the
+ * request that already failed. Never throws — a diagnosis that fails must not
+ * replace the error it was diagnosing.
+ *
+ * @param client - The client whose 404 is being explained
+ */
+async function describeServerMismatch(client) {
+    try {
+        const identity = await resolveSessionIdentity(client);
+        if (!identity)
+            return null;
+        // The env path carries no list, so ask for one here: this runs only after a
+        // command has already failed, where one extra request buys the difference
+        // between "check the worktree ID" and the actual cause.
+        const known = identity.knownWorktreeIds ?? (await readWorktreeIds(client));
+        return detectServerMismatch(identity, known, client.serverUrl);
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * The roster row for this identity, or null.
  *
@@ -245,6 +336,14 @@ function createWhoamiCommand() {
                 return;
             }
             const roster = await readOwnRosterEntry(client, identity);
+            // Issue #2404: no extra request — `resolveSessionIdentity` already read
+            // the list on the tmux path, which is the path that can be wrong.
+            const mismatch = detectServerMismatch(identity, identity.knownWorktreeIds, client.serverUrl);
+            // stderr in both modes: it must not corrupt `--json` stdout, and a skill
+            // that reports "I asked <url>" needs to see it whichever mode it ran in.
+            // Exit code stays 0 — whoami still answered the question it was asked.
+            if (mismatch)
+                console.error(formatServerMismatchWarning(mismatch));
             if (options.json) {
                 console.log(JSON.stringify({
                     worktreeId: identity.worktreeId,
@@ -253,6 +352,12 @@ function createWhoamiCommand() {
                     alias: roster?.alias ?? null,
                     source: identity.source,
                     sessionName: identity.sessionName,
+                    // Always present: "where did this answer come from" is half of what
+                    // makes the answer checkable (Issue #2404).
+                    serverUrl: client.serverUrl,
+                    // Absent, not false, when everything agrees: a reader tests for the
+                    // flag, and an ordinary session's output carries no trace of it.
+                    ...(mismatch ? { serverMismatch: true } : {}),
                 }, null, 2));
                 return;
             }
@@ -262,6 +367,7 @@ function createWhoamiCommand() {
             console.log(`alias:     ${roster?.alias ?? '-'}`);
             console.log(`source:    ${identity.source}`);
             console.log(`tmux:      ${identity.sessionName ?? '-'}`);
+            console.log(`server:    ${client.serverUrl}`);
         }
         catch (error) {
             (0, command_helpers_1.handleCommandError)(error);

package/dist/cli/utils/api-client.d.ts

@@ -38,6 +38,22 @@ export interface ApiErrorResult {
     message: string;
     exitCode: number;
 }
+/**
+ * What this function knows about the request, beyond its status (Issue #2404).
+ *
+ * `handleApiError` is a pure classifier over `(status, payload)` and has no way
+ * to know which server answered — which is exactly the fact a 404 needs. The
+ * caller's `Resource not found. Check the worktree ID.` sent an agent looking
+ * for a typo in an id that was correct: the CLI was dialling a *different*
+ * CommandMate server than the one that had started its session, and the id it
+ * was asking about lived on the other one. Optional so the two callers that
+ * classify without a client ({@link ApiClient} aside, `server-capabilities.ts`)
+ * keep compiling and keep their wording.
+ */
+export interface ApiErrorContext {
+    /** The base URL the failing request was actually sent to. */
+    serverUrl?: string;
+}
 /**
  * Classify API errors into user-friendly messages and exit codes.
  * [IA3-09] Covers: ECONNREFUSED, 400, 401/403, 404, 429, 500, timeout
@@ -47,9 +63,12 @@ export interface ApiErrorResult {
  * @param payload - Parsed error body, when the response carried one (Issue #1637).
  *   Used for 5xx only: the 4xx messages below are already specific, and are
  *   pinned by tests as the CLI's own wording.
+ * @param context - Which server answered, when the caller knows (Issue #2404).
+ *   Read by the 404 branch only; the other messages do not send anyone looking
+ *   in the wrong place.
  * @returns User-friendly error message and exit code
  */
-export declare function handleApiError(error: unknown, status?: number, payload?: ApiErrorPayload): ApiErrorResult;
+export declare function handleApiError(error: unknown, status?: number, payload?: ApiErrorPayload, context?: ApiErrorContext): ApiErrorResult;
 /**
  * API Client for CLI HTTP communication.
  * Uses Node.js built-in fetch. Handles auth headers and error mapping.
@@ -61,6 +80,16 @@ export declare class ApiClient {
         baseUrl?: string;
         token?: string;
     });
+    /**
+     * The base URL this client actually dials (Issue #2404).
+     *
+     * Resolved once in the constructor through the precedence in
+     * `loadClientEnv()` (`--base-url` > exported `CM_PORT` > `~/.commandmate/.env`
+     * > 3000), which is why it is read from here rather than re-derived by each
+     * caller: a second derivation is a second answer, and "which server did this
+     * command talk to" only helps if it is the one the request went to.
+     */
+    get serverUrl(): string;
     private getHeaders;
     /**
      * GET without any status handling, for callers that must read the raw response.

package/dist/cli/utils/api-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/api-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/api-client.ts"],"names":[],"mappings":"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"}

package/dist/cli/utils/api-client.js

@@ -87,6 +87,10 @@ function serverErrorDetail(payload) {
         ? `${detail.slice(0, MAX_SERVER_ERROR_DETAIL)}…`
         : detail;
 }
+/** Append `(server: <url>)` when the caller named one. */
+function withServerUrl(message, context) {
+    return context?.serverUrl ? `${message} (server: ${context.serverUrl})` : message;
+}
 /**
  * Classify API errors into user-friendly messages and exit codes.
  * [IA3-09] Covers: ECONNREFUSED, 400, 401/403, 404, 429, 500, timeout
@@ -96,9 +100,12 @@ function serverErrorDetail(payload) {
  * @param payload - Parsed error body, when the response carried one (Issue #1637).
  *   Used for 5xx only: the 4xx messages below are already specific, and are
  *   pinned by tests as the CLI's own wording.
+ * @param context - Which server answered, when the caller knows (Issue #2404).
+ *   Read by the 404 branch only; the other messages do not send anyone looking
+ *   in the wrong place.
  * @returns User-friendly error message and exit code
  */
-function handleApiError(error, status, payload) {
+function handleApiError(error, status, payload, context) {
     // HTTP status-based errors
     if (status !== undefined) {
         switch (status) {
@@ -114,8 +121,12 @@ function handleApiError(error, status, payload) {
                     exitCode: types_1.ExitCode.CONFIG_ERROR,
                 };
             case 404:
+                // Issue #2404: the sentence stays, so everything matching on it keeps
+                // matching; the URL is appended because "check the worktree ID" is
+                // advice about the wrong thing whenever the id is fine and the SERVER
+                // is the one that is wrong.
                 return {
-                    message: 'Resource not found. Check the worktree ID.',
+                    message: withServerUrl('Resource not found. Check the worktree ID.', context),
                     exitCode: types_1.ExitCode.UNEXPECTED_ERROR,
                 };
             case 429:
@@ -205,6 +216,18 @@ class ApiClient {
             console.error('Warning: Connecting to remote server over HTTP. Auth token will be sent in plaintext. Use HTTPS for non-localhost connections.');
         }
     }
+    /**
+     * The base URL this client actually dials (Issue #2404).
+     *
+     * Resolved once in the constructor through the precedence in
+     * `loadClientEnv()` (`--base-url` > exported `CM_PORT` > `~/.commandmate/.env`
+     * > 3000), which is why it is read from here rather than re-derived by each
+     * caller: a second derivation is a second answer, and "which server did this
+     * command talk to" only helps if it is the one the request went to.
+     */
+    get serverUrl() {
+        return this.baseUrl;
+    }
     getHeaders() {
         const headers = {
             'Content-Type': 'application/json',
@@ -250,7 +273,7 @@ class ApiClient {
                 // Issue #1637: read the body first — handleApiError needs it to surface
                 // the server's reason for a 5xx instead of "check the logs".
                 const payload = await readErrorPayload(response);
-                const errResult = handleApiError(null, response.status, payload);
+                const errResult = handleApiError(null, response.status, payload, { serverUrl: this.baseUrl });
                 throw new ApiError(errResult.message, errResult.exitCode, response.status, payload);
             }
             return (await response.json());
@@ -277,7 +300,7 @@ class ApiClient {
                 // Issue #1637: read the body first — handleApiError needs it to surface
                 // the server's reason for a 5xx instead of "check the logs".
                 const payload = await readErrorPayload(response);
-                const errResult = handleApiError(null, response.status, payload);
+                const errResult = handleApiError(null, response.status, payload, { serverUrl: this.baseUrl });
                 throw new ApiError(errResult.message, errResult.exitCode, response.status, payload);
             }
             // Handle 204 No Content
@@ -309,7 +332,7 @@ class ApiClient {
                 // Issue #1637: read the body first — handleApiError needs it to surface
                 // the server's reason for a 5xx instead of "check the logs".
                 const payload = await readErrorPayload(response);
-                const errResult = handleApiError(null, response.status, payload);
+                const errResult = handleApiError(null, response.status, payload, { serverUrl: this.baseUrl });
                 throw new ApiError(errResult.message, errResult.exitCode, response.status, payload);
             }
             const text = await response.text();