commandmate 0.49.2 → 0.50.0

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

@@ -4,6 +4,8 @@
  *   commandmate relays [--worktree <id>] [--instance <id|alias>] [--json]
  *   commandmate relays --id <relay-id> [--json]   (Issue #3957: one relay, open or closed)
  *   commandmate relays cancel <relay-id>
+ *   commandmate relays resolve <relay-id> --payload <id> --attempt <id> --confirm|--retry|--discard
+ *     (Issue #4082: settle a delivery held as uncertain)
  *
  * ## Why a command and not a flag on `ls`
  *
@@ -77,6 +79,11 @@ export interface RegisterRelayInput {
     /** The session being asked. */
     to: RelayEndpointArg;
     allowRelayChain?: boolean;
+    /**
+     * Runs when the relay could not be opened, refused or not, before the command ends
+     * (Issue #4133): a refusal exits right here, past any caller's own handling.
+     */
+    onFailure?: () => Promise<void>;
 }
 /** A relay {@link registerRelay} opened (Issue #3957). */
 export interface RegisteredRelay {

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

@@ -1 +1 @@
-{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/relays.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,OAAO,EAAE,SAAS,EAA+B,MAAM,qBAAqB,CAAC;AAI7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AActD;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,aAM9B,CAAC;AAEH,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,4EAA4E;AAC5E,eAAO,MAAM,2BAA2B,QAEiD,CAAC;AAE1F,yDAAyD;AACzD,eAAO,MAAM,6BAA6B,QAER,CAAC;AAEnC;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC,CAyB3B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,CAAC,CA0B3B;AAED,wCAAwC;AACxC,MAAM,WAAW,kBAAkB;IACjC,+CAA+C;IAC/C,IAAI,EAAE,gBAAgB,CAAC;IACvB,+BAA+B;IAC/B,EAAE,EAAE,gBAAgB,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,0DAA0D;AAC1D,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,yEAAyE;AACzE,eAAO,MAAM,mBAAmB,QAEkD,CAAC;AAEnF;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,eAAe,CAAC,CAkB1B;AAED,+EAA+E;AAC/E,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY1F;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,IAAI,CAW9G;AAwCD,wBAAgB,mBAAmB,IAAI,OAAO,CAuJ7C"}
+{"version":3,"file":"relays.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/relays.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,OAAO,EAAE,SAAS,EAA+B,MAAM,qBAAqB,CAAC;AAI7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AActD;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,aAM9B,CAAC;AAEH,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,4EAA4E;AAC5E,eAAO,MAAM,2BAA2B,QAEiD,CAAC;AAE1F,yDAAyD;AACzD,eAAO,MAAM,6BAA6B,QAER,CAAC;AAEnC;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC,CAyB3B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,CAAC,CA0B3B;AAED,wCAAwC;AACxC,MAAM,WAAW,kBAAkB;IACjC,+CAA+C;IAC/C,IAAI,EAAE,gBAAgB,CAAC;IACvB,+BAA+B;IAC/B,EAAE,EAAE,gBAAgB,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,0DAA0D;AAC1D,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,yEAAyE;AACzE,eAAO,MAAM,mBAAmB,QAEkD,CAAC;AAEnF;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,eAAe,CAAC,CAmB1B;AAED,+EAA+E;AAC/E,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY1F;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,IAAI,CAW9G;AAoHD,wBAAgB,mBAAmB,IAAI,OAAO,CA4Q7C"}

package/dist/cli/commands/relays.js

@@ -5,6 +5,8 @@
  *   commandmate relays [--worktree <id>] [--instance <id|alias>] [--json]
  *   commandmate relays --id <relay-id> [--json]   (Issue #3957: one relay, open or closed)
  *   commandmate relays cancel <relay-id>
+ *   commandmate relays resolve <relay-id> --payload <id> --attempt <id> --confirm|--retry|--discard
+ *     (Issue #4082: settle a delivery held as uncertain)
  *
  * ## Why a command and not a flag on `ls`
  *
@@ -166,6 +168,7 @@ async function registerRelay(client, input) {
         return { id: response.relay.id, bound };
     }
     catch (error) {
+        await input.onFailure?.();
         if (error instanceof api_client_1.ApiError && error.apiCode && exports.RELAY_REFUSAL_CODES.has(error.apiCode)) {
             console.error(`Error: ${error.payload?.error ?? error.apiCode}`);
             process.exit(types_1.ExitCode.CONFIG_ERROR);
@@ -223,9 +226,47 @@ function printRelayLine(relay) {
         fields.push(`overlap=${relay.overlap}`);
     if (relay.holdReason)
         fields.push(`hold=${relay.holdReason}`);
+    // Issue #4064: a payload whose delivery may have reached the requester. It
+    // is never resent automatically; the pane named is where to look.
+    const delivery = relay.deliveryHold;
+    if (delivery) {
+        fields.push(`delivery=${delivery.state}`);
+        if (delivery.kind)
+            fields.push(`payload=${delivery.kind}:${delivery.payloadId ?? '-'}`);
+        // Issue #4082: what `relays resolve --attempt` names. Absent on an older server.
+        if (delivery.attemptId)
+            fields.push(`attempt=${delivery.attemptId}`);
+        if (delivery.reason)
+            fields.push(`reason=${delivery.reason}`);
+        fields.push(`check=${delivery.checkCommand}`);
+    }
+    // Issue #4105: the payload waiting in the slot, and what its last delivery
+    // attempt stopped for — an observation with its time, not a current state.
+    // Nothing is printed when the server did not observe one (or is older):
+    // that is "not known", never "deliverable".
+    if (relay.pendingKind && !delivery)
+        fields.push(`pending=${relay.pendingKind}`);
+    const block = relay.lastDeliveryBlock;
+    if (block && typeof block.reason === 'string') {
+        const at = typeof block.observedAt === 'number' ? `@${new Date(block.observedAt).toISOString()}` : '';
+        fields.push(`blocked=${block.reason}${at}`);
+    }
     console.log(fields.join('\t'));
 }
 /** `relays --id <id>`: one relay, whatever its state (Issue #3957). */
+/**
+ * `--json` / `--token` of a `relays` subcommand, the parent's included.
+ *
+ * The parent `relays` declares both options too, and commander gives an
+ * option the parent knows to the parent — `relays --token T resolve …`, and
+ * `relays resolve … --json` likewise — so the subcommand's own `options` never
+ * see it and a token would fall back to `CM_AUTH_TOKEN`. The subcommand's own
+ * value wins when both are given.
+ */
+function subcommandGlobals(options, command) {
+    const all = command.optsWithGlobals();
+    return { json: options.json === true || all.json === true, token: options.token ?? all.token };
+}
 async function showOneRelay(client, relayId, json) {
     const response = await client.get(`/api/relays/${relayId}`);
     if (json) {
@@ -234,6 +275,25 @@ async function showOneRelay(client, relayId, json) {
     }
     printRelayLine(response.relay);
 }
+/** The codes `POST /api/relays/:id/resolve` refuses with (409). Mirrors the route. */
+const RELAY_HOLD_REFUSAL_CODES = new Set([
+    'RELAY_HOLD_NOT_FOUND',
+    'RELAY_HOLD_ATTEMPTING',
+    'RELAY_HOLD_STALE',
+    'RELAY_HOLD_NOT_ALLOWED',
+]);
+/** The one action given, or null when none or more than one was. */
+function resolveAction(options) {
+    const given = ['confirm', 'retry', 'discard'].filter((action) => options[action] === true);
+    return given.length === 1 ? given[0] : null;
+}
+/** What each action prints. `retry` says queued, never delivered. */
+const RESOLVED_MESSAGES = {
+    confirm: (relayId, response) => `Relay ${relayId}: the held payload is recorded as delivered (relay is ${response.relay.state}).`,
+    retry: (relayId) => `Relay ${relayId}: the held payload is queued for delivery again (not delivered yet). `
+        + `Follow it with \`commandmate relays --id ${relayId}\`.`,
+    discard: (relayId, response) => `Relay ${relayId}: the held payload was discarded without sending (relay is ${response.relay.state}).`,
+};
 function createRelaysCommand() {
     const cmd = new commander_1.Command('relays');
     cmd
@@ -246,9 +306,26 @@ function createRelaysCommand() {
         .addHelpText('after', `
 Columns: <relay-id>  <state>  <requester> <- <worker>  hops=<n>  expires=<iso>
          [send=<state>]  [overlap=<none|later|earlier|both|unknown>]  [hold=<reason>]
+         [delivery=<attempting|uncertain>  payload=<kind>:<id>  attempt=<id>  reason=<r>  check=<cmd>]
+         [pending=<reply|prompt|expired>]  [blocked=<reason>@<iso>]
 
 States: pending (the worker has not finished), prompt (it stopped on a
-confirmation and the requester was told), delivered / expired / cancelled.
+confirmation at some point and a notice to the requester was queued -- not
+necessarily delivered yet; a record, not "still waiting": it stays after the
+confirmation is answered and pending=reply replaces the notice),
+delivered / expired / cancelled.
+
+pending= / blocked= (Issue #4105): pending= is the payload waiting to be
+typed into the requester's composer. blocked= is why the LAST delivery
+attempt of that payload stopped, and when it was observed: prompt_waiting
+(the requester's pane shows a confirmation dialog -- nothing is typed into
+it; answer it and the next pass, about every 15 s, delivers), generating,
+session_stopped, foreign_session. Left alone until the deadline, the payload
+is replaced by the expiry notice. Absent = no observation by this server
+process (after a restart, or before the first attempt), not "deliverable".
+A closed relay whose expiry notice is still stopped (Issue #4193) is listed
+under "# closed, notice not delivered yet" (state=expired, pending=expired,
+blocked=...) until the notice goes out; it is not counted as open.
 
 send= / overlap= / hold= appear on a relay tied to its send (Issue #3957):
 send= is awaiting / input_started / sent / failed / unknown; hold= says why a
@@ -257,6 +334,18 @@ server_restarted, ...); overlap= says the reply may share a turn with another
 request (unknown is not "none"). \`--id <relay-id>\` shows one relay even after
 it closed.
 
+delivery= (Issue #4064) marks a payload whose delivery to the requester may
+have happened (uncertain: indeterminate, failed after it was sent, or the
+server restarted mid-send). It is NOT resent automatically and the relay's
+later payloads wait behind it. Look at the pane check= names first. Cancelling
+the relay stops later deliveries; it cannot take back what may already be in
+the requester's composer.
+
+Settle an uncertain hold (Issue #4082) after looking at that pane:
+  commandmate relays resolve <relay-id> --payload <id> --attempt <id> --confirm
+  (it arrived), --retry (it did not: queue it again, sent once when the
+  requester can take it), or --discard (drop it, send nothing).
+
 Withdraw one with \`commandmate relays cancel <relay-id>\`.
 `)
         .action(async (options) => {
@@ -304,8 +393,36 @@ Withdraw one with \`commandmate relays cancel <relay-id>\`.
                     + 'printing counts only.');
             }
             const { counts } = response;
+            // Issue #4082: `held=` is its own axis (uncertain now, open or closed),
+            // not one of the states. Left out — never printed as 0 — when an older
+            // server did not answer it.
+            const held = typeof response.heldCount === 'number' ? ` held=${response.heldCount}` : '';
             console.error(`relays: pending=${counts.pending} prompt=${counts.prompt} `
-                + `delivered=${counts.delivered} expired=${counts.expired} cancelled=${counts.cancelled}`);
+                + `delivered=${counts.delivered} expired=${counts.expired} cancelled=${counts.cancelled}${held}`);
+            // Issue #4064: listed even when no relay is open — a held payload's
+            // relay may have expired or been cancelled since.
+            // Issue #4082: the API's `held` also carries deliveries being typed
+            // right now (`attempting`). Only `uncertain` ones are the holds to
+            // settle — the same set `held=` counts — so the two are listed apart.
+            const heldRelays = response.held ?? [];
+            const uncertain = heldRelays.filter((relay) => relay.deliveryHold?.state === 'uncertain');
+            const inProgress = heldRelays.filter((relay) => relay.deliveryHold?.state !== 'uncertain');
+            if (uncertain.length > 0) {
+                console.error(`# delivery not confirmed, not resent (${uncertain.length})`);
+                uncertain.forEach(printRelayLine);
+            }
+            if (inProgress.length > 0) {
+                console.error(`# delivery in progress (${inProgress.length})`);
+                inProgress.forEach(printRelayLine);
+            }
+            // Issue #4193: a closed relay whose payload to the requester (the
+            // expiry notice) is still stopped — listed apart from the open ones,
+            // and never counted in them. Absent on an older server.
+            const closedBlocked = response.closedBlocked ?? [];
+            if (closedBlocked.length > 0) {
+                console.error(`# closed, notice not delivered yet (${closedBlocked.length})`);
+                closedBlocked.forEach(printRelayLine);
+            }
             if (response.awaiting.length === 0 && response.owed.length === 0) {
                 console.error('No open relays.');
                 return;
@@ -325,20 +442,21 @@ Withdraw one with \`commandmate relays cancel <relay-id>\`.
     });
     cmd
         .command('cancel')
-        .description('Withdraw an open relay so its reply is never delivered')
+        .description('Withdraw an open relay and stop its later deliveries (a delivery already held as uncertain may have reached you)')
         .argument('<relay-id>', 'Relay ID')
         .option('--json', 'JSON output')
         .option('--token <token>', command_helpers_1.TOKEN_WARNING)
-        .action(async (relayId, options) => {
+        .action(async (relayId, options, command) => {
         try {
+            const { json, token } = subcommandGlobals(options, command);
             if (!RELAY_ID_PATTERN.test(relayId)) {
                 console.error('Error: Invalid relay ID format.');
                 process.exit(types_1.ExitCode.CONFIG_ERROR);
             }
-            const client = new api_client_1.ApiClient({ token: options.token });
+            const client = new api_client_1.ApiClient({ token });
             try {
                 const response = await client.post(`/api/relays/${relayId}/cancel`);
-                if (options.json) {
+                if (json) {
                     console.log(JSON.stringify(response, null, 2));
                 }
                 else {
@@ -366,5 +484,60 @@ Withdraw one with \`commandmate relays cancel <relay-id>\`.
             (0, command_helpers_1.handleCommandError)(error);
         }
     });
+    cmd
+        .command('resolve')
+        .description('Settle a delivery held as uncertain (look at the requester\'s pane first): confirm, retry or discard it')
+        .argument('<relay-id>', 'Relay ID')
+        .requiredOption('--payload <id>', 'The held payload id (payload=<kind>:<id> in `relays --id`)')
+        .requiredOption('--attempt <id>', 'The held attempt id (attempt=<id> in `relays --id`)')
+        .option('--confirm', 'It reached the requester: record it as delivered (types nothing)')
+        .option('--retry', 'It did not: queue it again; sent once when the requester can take it')
+        .option('--discard', 'Drop it without sending (types nothing)')
+        .option('--json', 'JSON output')
+        .option('--token <token>', command_helpers_1.TOKEN_WARNING)
+        .action(async (relayId, options, command) => {
+        try {
+            const { json, token } = subcommandGlobals(options, command);
+            if (!RELAY_ID_PATTERN.test(relayId)) {
+                console.error('Error: Invalid relay ID format.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            const action = resolveAction(options);
+            if (action === null) {
+                console.error('Error: give exactly one of --confirm, --retry or --discard.');
+                process.exit(types_1.ExitCode.CONFIG_ERROR);
+            }
+            const client = new api_client_1.ApiClient({ token });
+            try {
+                const response = await client.post(`/api/relays/${relayId}/resolve`, { payloadId: options.payload, attemptId: options.attempt, action });
+                if (json) {
+                    console.log(JSON.stringify(response, null, 2));
+                }
+                else {
+                    console.error(RESOLVED_MESSAGES[action](relayId, response));
+                    if (response.promoted) {
+                        console.error('  The reply that waited behind it is queued for delivery.');
+                    }
+                    // Issue #4082: a closed relay delivers nothing more.
+                    if (response.replyDiscarded) {
+                        console.error('  The reply that waited behind it was discarded: the relay is closed, so it is not delivered.');
+                    }
+                }
+            }
+            catch (error) {
+                // A stale, in-progress or not-allowed hold: nothing was changed, and
+                // re-reading the relay is what the operator does next.
+                if (error instanceof api_client_1.ApiError && error.apiCode && RELAY_HOLD_REFUSAL_CODES.has(error.apiCode)) {
+                    console.error(`Error: ${error.payload?.error ?? error.apiCode}`);
+                    console.error(`  Nothing was changed. Read it again with \`commandmate relays --id ${relayId}\`.`);
+                    process.exit(types_1.ExitCode.CONFIG_ERROR);
+                }
+                throw error;
+            }
+        }
+        catch (error) {
+            (0, command_helpers_1.handleCommandError)(error);
+        }
+    });
     return cmd;
 }

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

@@ -5,7 +5,12 @@
  */
 import { Command } from 'commander';
 import type { RelayCountsResponse } from '../types/api-responses';
-/** The relay line, in the same shape as the four above it. */
-export declare function formatRelayCounts(counts: RelayCountsResponse): string;
+/**
+ * The relay line, in the same shape as the four above it.
+ *
+ * @param held - Issue #4082: payloads held as `uncertain` NOW (not narrowed by
+ *   the window, not one of the states); omitted from the line when null/absent
+ */
+export declare function formatRelayCounts(counts: RelayCountsResponse, held?: number | null): string;
 export declare function createReportCommand(): Command;
 //# sourceMappingURL=report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/report.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,OAAO,KAAK,EAGV,mBAAmB,EAKpB,MAAM,wBAAwB,CAAC;AA+EhC,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAKrE;AAmBD,wBAAgB,mBAAmB,IAAI,OAAO,CAiL7C"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/report.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,OAAO,KAAK,EAGV,mBAAmB,EAKpB,MAAM,wBAAwB,CAAC;AAqFhC;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,IAAI,GAAE,MAAM,GAAG,IAAW,GAAG,MAAM,CAMjG;AAmBD,wBAAgB,mBAAmB,IAAI,OAAO,CAuL7C"}

package/dist/cli/commands/report.js

@@ -71,16 +71,29 @@ function formatRate(value) {
 async function readRelayCounts(client, days) {
     try {
         const response = await client.get(`/api/relays?days=${encodeURIComponent(String(days))}`);
-        return response.counts ?? null;
+        if (!response.counts)
+            return null;
+        // Issue #4082: the held count is "now", not the window's; null (never 0)
+        // when the server did not answer it.
+        return {
+            counts: response.counts,
+            held: typeof response.heldCount === 'number' ? response.heldCount : null,
+        };
     }
     catch {
         return null;
     }
 }
-/** The relay line, in the same shape as the four above it. */
-function formatRelayCounts(counts) {
+/**
+ * The relay line, in the same shape as the four above it.
+ *
+ * @param held - Issue #4082: payloads held as `uncertain` NOW (not narrowed by
+ *   the window, not one of the states); omitted from the line when null/absent
+ */
+function formatRelayCounts(counts, held = null) {
+    const heldPart = held === null ? '' : `, ${held} held now`;
     return (`Relays:       ${counts.delivered} delivered / ${counts.prompt} waiting on a prompt `
-        + `/ ${counts.expired} expired  (${counts.pending} still open, ${counts.cancelled} cancelled)`);
+        + `/ ${counts.expired} expired  (${counts.pending} still open, ${counts.cancelled} cancelled${heldPart})`);
 }
 function formatVibeMetrics(m) {
     const { tasks, verification, intervention } = m;
@@ -242,12 +255,12 @@ function createReportCommand() {
             // until now it was the only kind that left no mark on the metrics.
             const relays = await readRelayCounts(client, days);
             if (options.json) {
-                console.log(JSON.stringify({ ...data.metrics, relays }, null, 2));
+                console.log(JSON.stringify({ ...data.metrics, relays: relays?.counts ?? null, relaysHeld: relays?.held ?? null }, null, 2));
             }
             else {
                 console.log(formatVibeMetrics(data.metrics));
                 if (relays)
-                    console.log(formatRelayCounts(relays));
+                    console.log(formatRelayCounts(relays.counts, relays.held));
             }
         }
         catch (error) {

package/dist/cli/commands/respond-strict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"respond-strict.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/respond-strict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAgB/C,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAOhE;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,IAAI,CA2B7G;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAMhG;AA0CD,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,cAAc,EAAE,OAAO,GAAG,OAAO,CAS/D;AA+FD,kDAAkD;AAClD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CA0Cf"}
+{"version":3,"file":"respond-strict.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/respond-strict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAgB/C,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAOhE;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,IAAI,CA2B7G;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAMhG;AA0CD,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,cAAc,EAAE,OAAO,GAAG,OAAO,CAS/D;AAsGD,kDAAkD;AAClD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CA0Cf"}

package/dist/cli/commands/respond-strict.js

@@ -148,14 +148,21 @@ function verdictOfApiError(error, options, operationId) {
  * The commands the strict respond's failure hints name (Issue #4031), aimed at
  * the target the request resolved to (#3982's `followUpCommand`). A request
  * that named no target keeps the hints as they were.
+ *
+ * Issue #4049: `prompt` takes no `--agent`, so an `--agent`-only request names
+ * the tool's primary instance, whose id is the tool id (#868). The server
+ * resolves `--instance <tool>` to the same session as `--agent <tool>` alone
+ * (`resolveSessionTarget`: 'primary' without a roster row, the row's own tool
+ * with one).
  */
 function strictRespondHints(worktreeId, target) {
     if ((0, follow_up_command_1.targetFlags)(target) === '') {
         return { prompt: '`commandmate prompt`', look: '`commandmate prompt` / `capture --pane`' };
     }
     // `prompt` takes `--instance` only; `capture` takes either flag.
-    const prompt = target.instanceId
-        ? `\`commandmate prompt ${worktreeId} --instance ${target.instanceId}\``
+    const promptInstance = target.instanceId ?? target.agent;
+    const prompt = promptInstance
+        ? `\`commandmate prompt ${worktreeId} --instance ${promptInstance}\``
         : `\`commandmate prompt ${worktreeId}\``;
     return { prompt, look: `${prompt} / \`${(0, follow_up_command_1.paneCaptureCommand)(worktreeId, target)}\`` };
 }

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

@@ -0,0 +1,11 @@
+/**
+ * roles Command - define roles and set their defaults, without a screen (Issue #4116).
+ *
+ * A thin client over `/api/roles`, `/api/settings/agent-role-defaults` and
+ * `/api/repositories/:id/role-defaults`. The rules are the server's; what is here
+ * is naming things the way a person does (`utils/agent-roles.ts`) and saying what a
+ * change reaches.
+ */
+import { Command } from 'commander';
+export declare function createRolesCommand(): Command;
+//# sourceMappingURL=roles.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/roles.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2dpC,wBAAgB,kBAAkB,IAAI,OAAO,CA8D5C"}