commandmate 0.42.2 → 0.44.0

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

@@ -1 +1 @@
-{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ask.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsVpC,wBAAgB,gBAAgB,IAAI,OAAO,CA6N1C"}
+{"version":3,"file":"ask.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ask.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4LpC,wBAAgB,gBAAgB,IAAI,OAAO,CA0O1C"}

package/dist/cli/commands/ask.js

@@ -36,6 +36,7 @@ const commander_1 = require("commander");
 const types_1 = require("../types");
 const api_client_1 = require("../utils/api-client");
 const command_helpers_1 = require("../utils/command-helpers");
+const reply_ledger_1 = require("../utils/reply-ledger");
 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");
@@ -52,60 +53,8 @@ const relays_1 = require("./relays");
 const PROMPT_WAITING_CODE = 'PROMPT_WAITING';
 /** Default `--timeout`, in seconds. Matches the GUI's delegation brief. */
 const DEFAULT_ASK_TIMEOUT_SECONDS = 1800;
-/**
- * Chat rows read back after the turn.
- *
- * Bounded because only the tail matters and an unbounded read of a long-running
- * worktree's history is a large response for one line of answer. Generous
- * enough that a turn which wrote several assistant rows (a tool-use narration
- * followed by the summary) still has its last one inside the window.
- */
-const REPLY_LOOKBACK_MESSAGES = 30;
 /** Squeezed pane lines kept for the fallback reply. */
 const PANE_FALLBACK_TAIL = 80;
-/**
- * The `request_id` namespace every transcript reader mints for a turn.
- *
- * `codex-turn:<turn_id>`, `claude-turn:<uuid>`, `antigravity-turn:<id>`,
- * `command-code-turn:<id>` and opencode's `oc-turn:<msg id>` — mirrored here as
- * a shape rather than imported, for the reason {@link PROMPT_WAITING_CODE}
- * gives: the CLI bundle keeps its own copies of API strings instead of pulling
- * `src/types/agent-transcript.ts` and its dependents into `build:cli`. Matching
- * the shape rather than a list of five literals is also what stops the sixth
- * reader from silently landing outside the filter.
- *
- * A `:` cannot appear in any of the ids themselves, so this cannot match a row
- * that merely CONTAINS the text.
- */
-const TURN_REQUEST_ID_PATTERN = /-turn:/;
-/**
- * Request-id namespaces CommandMate writes about a session, not for it.
- *
- * `chat_messages` has no `system` role, so "the model changed" (Issue #2357)
- * and "reply from X" (Issue #2377) are both stored as ASSISTANT rows and told
- * apart by their request id. Neither is anything the other session said, and
- * delivering the relay notice back as an answer is the smallest possible loop —
- * `findWorkerReply` steps over the same rows for the same reason.
- */
-const SYSTEM_ROW_REQUEST_ID_PREFIXES = ['relay-sys:', 'model-changed:'];
-/**
- * Tools whose reply CommandMate reads out of a transcript rather than a screen.
- *
- * For these five the ledger is authoritative and a row with no turn marker is
- * by definition not the answer, so `ask` may hold out for a marked one. For
- * every other tool (copilot / gemini / vibe-local) the scraper's row is the
- * only record there will ever be, and demanding a marker would throw away a
- * cleaned reply in favour of the raw pane.
- *
- * Mirrors the five readers that live under `src/lib/hooks/sources/`.
- */
-const TRANSCRIPT_READER_TOOLS = new Set([
-    'claude',
-    'codex',
-    'antigravity',
-    'command-code',
-    'opencode',
-]);
 /**
  * How long `ask` will hold out for the turn row after the turn ends.
  *
@@ -123,90 +72,10 @@ const TRANSCRIPT_READER_TOOLS = new Set([
 const REPLY_TURN_ROW_GRACE_MS = 15_000;
 /** How often the grace above re-reads the ledger. */
 const REPLY_TURN_ROW_POLL_MS = 1_000;
-/**
- * ANSI escape sequences, as a pattern built from escapes rather than literals.
- *
- * `scripts/check-control-chars.mjs` fails the build on a raw C0 byte in `src/`
- * (Issue #1432), and a raw ESC here would be one.
- */
-const ANSI_ESCAPE_PATTERN = /[\u001B\u009B][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PR-TZcf-nqry=><]/g;
-/** Remaining C0/C1 control bytes, once the sequences above are gone. */
-const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F]/g;
 /** Sleep, for the grace window above. */
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-/**
- * A reply body fit to print, or `''` if nothing survived.
- *
- * Issue #2386 asked for this as a belt to the braces: the row the junk came
- * from held RAW ANSI, and a caller that pipes `ask` into a report or a commit
- * message should never have to strip escape codes out of an agent's sentence.
- * Applied to the pane fallback as well as to the ledger, because the pane is
- * the more likely of the two to carry them.
- *
- * @param raw - Reply text as it arrived
- */
-function sanitizeReply(raw) {
-    return raw.replace(ANSI_ESCAPE_PATTERN, '').replace(CONTROL_CHAR_PATTERN, '').trim();
-}
-/** Whether a row's `request_id` says a transcript reader wrote it. */
-function isTurnRow(requestId) {
-    return typeof requestId === 'string' && TURN_REQUEST_ID_PATTERN.test(requestId);
-}
-/** Whether a row is CommandMate's own furniture rather than the agent's words. */
-function isSystemRow(requestId) {
-    return typeof requestId === 'string'
-        && SYSTEM_ROW_REQUEST_ID_PREFIXES.some((prefix) => requestId.startsWith(prefix));
-}
-/**
- * The rows that could be this turn's reply, oldest first.
- *
- * @param messages - Rows as the messages route serialized them
- * @param since - Epoch ms taken immediately before the send
- */
-function replyCandidates(messages, since) {
-    const candidates = [];
-    for (const m of messages) {
-        if (m.role !== 'assistant')
-            continue;
-        if (m.messageType === 'prompt')
-            continue;
-        if (typeof m.content !== 'string')
-            continue;
-        if (!(Date.parse(m.timestamp) >= since))
-            continue;
-        if (isSystemRow(m.requestId))
-            continue;
-        const content = sanitizeReply(m.content);
-        if (content === '')
-            continue;
-        candidates.push({ content, fromTranscript: isTurnRow(m.requestId) });
-    }
-    return candidates;
-}
-/**
- * The recent chat rows for this instance, or null if they cannot be read.
- *
- * @param client - API client
- * @param worktreeId - Worktree ID
- * @param instanceId - Resolved instance ID
- */
-async function fetchRecentMessages(client, worktreeId, instanceId) {
-    const query = new URLSearchParams({ limit: String(REPLY_LOOKBACK_MESSAGES) });
-    if (instanceId)
-        query.set('instance', instanceId);
-    try {
-        // PromptMessageResponse is the CLI's mirror of a serialized chat row; the
-        // `messageType: 'prompt'` filter is the caller's, not the type's, so it is
-        // the right shape for reading normal rows too.
-        const messages = await client.get(`/api/worktrees/${worktreeId}/messages?${query.toString()}`);
-        return Array.isArray(messages) ? messages : null;
-    }
-    catch {
-        return null;
-    }
-}
 /**
  * Parse and validate `--timeout <seconds>`.
  *
@@ -265,24 +134,16 @@ function parseTimeout(raw) {
  * @param cliToolId - Resolved CLI tool, when one is known
  */
 async function readLatestReply(client, worktreeId, instanceId, since, cliToolId) {
-    const requireTurnRow = cliToolId !== undefined && TRANSCRIPT_READER_TOOLS.has(cliToolId);
+    const requireTurnRow = cliToolId !== undefined && reply_ledger_1.TRANSCRIPT_READER_TOOLS.has(cliToolId);
     const deadline = Date.now() + (requireTurnRow ? REPLY_TURN_ROW_GRACE_MS : 0);
     for (;;) {
-        const messages = await fetchRecentMessages(client, worktreeId, instanceId);
-        const candidates = replyCandidates(messages ?? [], since);
-        // Newest first among the rows a reader wrote. A turn that emitted several
-        // assistant rows (a narration then the summary) still ends on its summary.
-        for (let i = candidates.length - 1; i >= 0; i -= 1) {
-            if (candidates[i].fromTranscript)
-                return candidates[i].content;
-        }
-        if (!requireTurnRow) {
-            // Unchanged behaviour for a tool with no transcript: the newest row after
-            // the send, marker or not.
-            const newest = candidates[candidates.length - 1];
-            return newest ? newest.content : null;
-        }
-        if (Date.now() >= deadline)
+        const messages = await (0, reply_ledger_1.fetchRecentMessages)(client, worktreeId, instanceId);
+        // The rules are `reply`'s too (Issue #3039). A tool with no transcript
+        // takes the newest row after the send, marker or not, with no wait.
+        const reply = (0, reply_ledger_1.pickLatestReply)((0, reply_ledger_1.replyCandidates)(messages ?? [], since), requireTurnRow);
+        if (reply)
+            return reply.content;
+        if (!requireTurnRow || Date.now() >= deadline)
             return null;
         await sleep(REPLY_TURN_ROW_POLL_MS);
     }
@@ -332,6 +193,9 @@ Exit codes (wait's, unchanged; --async always exits 0 once the relay exists):
        (same shape as \`wait --on-prompt agent\`). Report it; do NOT answer it
        with \`respond\` on the other session's behalf — the number that resolves
        a dialog is the dialog's own, and a wrong one picks the default (#1681).
+  11   the turn never ran: an upstream fault is on the screen. stderr and --json
+       name it (id=...). id=context-limit: the conversation is over the model's
+       limit; \`instances <id> kill <instance>\` and ask again in a fresh session
   21   nothing was running to ask
   124  timed out. Look with \`capture <id> --instance <id> --pane --tail 60\`
 
@@ -453,6 +317,8 @@ a decision about that session's guard rails, not part of asking it a question.
                 timeout,
                 instance: instanceId,
                 token: options.token,
+                // Always on (Issue #3011): a turn that never ran must not read as a reply.
+                failOnUpstreamFault: true,
             });
             if (result.exitCode !== types_1.WaitExitCode.SUCCESS) {
                 // Same stdout contract as `wait`: the prompt payload, and nothing
@@ -460,6 +326,14 @@ a decision about that session's guard rails, not part of asking it a question.
                 if (result.output) {
                     console.log(JSON.stringify(result.output));
                 }
+                if (result.upstreamFault && options.json) {
+                    console.log(JSON.stringify({
+                        worktreeId,
+                        instanceId: instanceId ?? null,
+                        cliToolId: agent ?? null,
+                        upstreamFault: result.upstreamFault,
+                    }, null, 2));
+                }
                 process.exit(result.exitCode);
                 return;
             }
@@ -468,7 +342,7 @@ a decision about that session's guard rails, not part of asking it a question.
             if (reply === null && agent) {
                 source = 'pane';
                 const pane = await readPaneTail(client, worktreeId, agent, instanceId);
-                const cleaned = pane === null ? '' : sanitizeReply(pane);
+                const cleaned = pane === null ? '' : (0, reply_ledger_1.sanitizeReply)(pane);
                 reply = cleaned === '' ? null : cleaned;
             }
             if (reply === null) {

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;AAKpC,OAAO,EAAE,SAAS,EAAqB,MAAM,qBAAqB,CAAC;AAmVnE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AA2ED,wBAAgB,oBAAoB,IAAI,OAAO,CA8H9C"}
+{"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;AAKpC,OAAO,EAAE,SAAS,EAAqB,MAAM,qBAAqB,CAAC;AAwVnE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AA2ED,wBAAgB,oBAAoB,IAAI,OAAO,CAoI9C"}

package/dist/cli/commands/capture.js

@@ -46,6 +46,9 @@ const MAX_FOLLOW_INTERVAL_MS = 60_000;
  * keeps its own copy of the API shapes (see api-responses.ts).
  */
 const UNCLASSIFIED_FRAME_TYPE = 'unclassified';
+/** Shown by the default text mode when there is no transcript to print (Issue #3128). */
+const EMPTY_TRANSCRIPT_HINT = 'No transcript yet. A prompt (e.g. "Trust this folder?") may be waiting on screen; '
+    + 'read it with `commandmate capture <worktree-id> --instance <instance> --pane --tail 40`.';
 /**
  * Format capture output as JSON (excluding fullOutput for size).
  *
@@ -493,7 +496,14 @@ function createCaptureCommand() {
             }
             else {
                 // Default: plain text output (content field)
-                console.log(data.content);
+                // Issue #3128: no transcript yet (e.g. a trust-folder dialog before the
+                // first turn) reads as a dead session. Point at the pane, where it shows.
+                if (data.content.trim() === '') {
+                    console.log(EMPTY_TRANSCRIPT_HINT);
+                }
+                else {
+                    console.log(data.content);
+                }
             }
         }
         catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"docs.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/docs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiDpC;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CA8E3C"}
+{"version":3,"file":"docs.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/docs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsDpC;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CA8E3C"}

package/dist/cli/commands/docs.js

@@ -20,6 +20,7 @@ const commander_1 = require("commander");
 const types_1 = require("../types");
 const docs_reader_1 = require("../utils/docs-reader");
 const agent_operations_1 = require("../docs/agent-operations");
+const setup_guide_1 = require("../docs/setup-guide");
 /**
  * Sections this command carries itself (Issue #2376).
  *
@@ -32,9 +33,13 @@ const agent_operations_1 = require("../docs/agent-operations");
  *
  * The next change to touch `docs-reader.ts` should fold this into
  * `EMBEDDED_SECTIONS` and delete the three branches below.
+ *
+ * `setup` (Issue #3059) is the agent-facing setup guide, served on the site as
+ * `website/setup.md`; registered here for the same reason as `delegation`.
  */
 const LOCAL_SECTIONS = {
     delegation: agent_operations_1.AGENT_DELEGATION_GUIDE,
+    setup: setup_guide_1.SETUP_GUIDE,
 };
 /** Every section name, the reader's plus {@link LOCAL_SECTIONS}. */
 function allSectionNames() {

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

@@ -5,6 +5,7 @@
  *   commandmate remote            # up (default): start, publish, show the QR
  *   commandmate remote status     # Provider / URL / expiry / pairing state
  *   commandmate remote stop       # close the door, keeping the server running
+ *   commandmate remote pair       # show a new pairing link, same URL (Issue #3127)
  *
  *   commandmate remote --auth remote-only   # only the phone's route authenticates
  *
@@ -301,6 +302,28 @@ export declare function formatRemaining(ms: number): string;
  * @returns The exit code the caller should terminate with
  */
 export declare function runRemoteStatus(options: RemoteOptions): Promise<ExitCode>;
+/**
+ * Printed with every re-issued link (Issue #3127). The link may stay behind in
+ * an agent's chat history, so its limits are said next to it.
+ */
+export declare const PAIRING_LINK_NOTICE: string;
+/**
+ * `remote pair`: show a new pairing link for the live session (Issue #3127).
+ *
+ * The plaintext code from `remote up` is never stored, so "show it again"
+ * means minting a replacement and swapping its hash into the existing handoff
+ * file (`reissuePairingCode`). The server, the Provider and the published URL
+ * are left exactly as they are — no new way in is opened — and the session
+ * token is never printed: the only secret in the output is the one-time code.
+ *
+ * Refused unless the code is still unused: a consumed code means a device
+ * already holds the token, and an expired one closed its window on purpose.
+ * Both are answered with the `remote stop` -> `remote` route instead.
+ *
+ * @param options - Parsed command options (`--json`)
+ * @returns SUCCESS with a link, CONFIG_ERROR without one
+ */
+export declare function runRemotePair(options: RemoteOptions): Promise<ExitCode>;
 /**
  * Run the `stop` flow (§6.3-4).
  *
@@ -321,7 +344,7 @@ export declare function runRemoteStop(options: RemoteOptions): Promise<ExitCode>
  * future caller (a `quickstart --remote`, say) would compose, exactly as
  * `runStart` / `startCommand` are split (#1195).
  *
- * @param action - `up` (default), `status` or `stop`
+ * @param action - `up` (default), `status`, `stop` or `pair`
  * @param options - Parsed command options
  */
 export declare function remoteCommand(action: string | undefined, options: RemoteOptions): Promise<void>;

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

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

package/dist/cli/commands/remote.js

@@ -6,6 +6,7 @@
  *   commandmate remote            # up (default): start, publish, show the QR
  *   commandmate remote status     # Provider / URL / expiry / pairing state
  *   commandmate remote stop       # close the door, keeping the server running
+ *   commandmate remote pair       # show a new pairing link, same URL (Issue #3127)
  *
  *   commandmate remote --auth remote-only   # only the phone's route authenticates
  *
@@ -47,7 +48,7 @@
  *    local session down along with the remote one (§5.3).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REMOTE_INGRESS_HOST = exports.DEFAULT_REMOTE_AUTH_SCOPE = exports.REMOTE_AUTH_SCOPES = exports.REMOTE_ONLY_LAUNCH_ENV_KEYS = exports.REMOTE_LAUNCH_ENV_KEYS = exports.PUBLIC_TUNNEL_PROVIDERS = exports.REMOTE_PROVIDER_ALIASES = exports.MAX_PAIRING_TTL_MS = exports.MIN_PAIRING_TTL_MS = exports.DEFAULT_PAIRING_EXPIRES = exports.DEFAULT_REMOTE_EXPIRES = void 0;
+exports.PAIRING_LINK_NOTICE = exports.REMOTE_INGRESS_HOST = exports.DEFAULT_REMOTE_AUTH_SCOPE = exports.REMOTE_AUTH_SCOPES = exports.REMOTE_ONLY_LAUNCH_ENV_KEYS = exports.REMOTE_LAUNCH_ENV_KEYS = exports.PUBLIC_TUNNEL_PROVIDERS = exports.REMOTE_PROVIDER_ALIASES = exports.MAX_PAIRING_TTL_MS = exports.MIN_PAIRING_TTL_MS = exports.DEFAULT_PAIRING_EXPIRES = exports.DEFAULT_REMOTE_EXPIRES = void 0;
 exports.buildRemoteLaunchEnv = buildRemoteLaunchEnv;
 exports.applyRemoteLaunchEnv = applyRemoteLaunchEnv;
 exports.parsePairingDuration = parsePairingDuration;
@@ -60,6 +61,7 @@ exports.buildPairingUrl = buildPairingUrl;
 exports.derivePairingState = derivePairingState;
 exports.formatRemaining = formatRemaining;
 exports.runRemoteStatus = runRemoteStatus;
+exports.runRemotePair = runRemotePair;
 exports.runRemoteStop = runRemoteStop;
 exports.remoteCommand = remoteCommand;
 exports.createRemoteCommand = createRemoteCommand;
@@ -72,9 +74,11 @@ const logger_1 = require("../utils/logger");
 const prompt_1 = require("../utils/prompt");
 const qr_terminal_1 = require("../utils/qr-terminal");
 const remote_state_1 = require("../utils/remote-state");
+const remote_pairing_1 = require("../utils/remote-pairing");
 const server_url_1 = require("../utils/server-url");
 const security_logger_1 = require("../utils/security-logger");
 const server_ready_1 = require("../utils/server-ready");
+const server_identity_1 = require("../utils/server-identity");
 const remote_1 = require("../../lib/remote");
 const auth_1 = require("../../lib/security/auth");
 const pairing_code_1 = require("../../lib/security/pairing-code");
@@ -410,7 +414,7 @@ function parseEndpoint(url) {
         const port = parsed.port ? parseInt(parsed.port, 10) : parsed.protocol === 'https:' ? 443 : 80;
         if (Number.isNaN(port))
             return null;
-        return { host: parsed.hostname, port };
+        return { host: parsed.hostname, port, protocol: parsed.protocol === 'https:' ? 'https' : 'http' };
     }
     catch {
         return null;
@@ -619,6 +623,33 @@ async function runRemoteUp(options) {
         }
         logger.success(`Remote listener: ${exports.REMOTE_INGRESS_HOST}:${remoteIngressPort} (authentication required)`);
     }
+    // 6c. Issue #3087: a listening port is not proof that it is OUR server. An
+    // orphan from an earlier `start --daemon` (no authentication) can hold the
+    // port while the server started above dies on EADDRINUSE, and every TCP
+    // check passes against it. Before the irreversible step, the exact port to
+    // be published must refuse an unknown token (authentication is on) and
+    // accept the token minted above (only the server launched with its hash
+    // can). Anything short of both is a refusal: nothing is published.
+    const publishedHost = remoteIngressPort !== undefined ? exports.REMOTE_INGRESS_HOST : endpoint.host;
+    const identity = await (0, server_identity_1.verifyLaunchedServer)({
+        protocol: endpoint.protocol,
+        host: publishedHost,
+        port: remoteIngressPort ?? endpoint.port,
+        sessionToken,
+    });
+    if (!identity.ok) {
+        logger.error(`Refusing to publish: ${identity.reason}.`);
+        logger.info('Nothing was published. Another process may be holding the port (for example an earlier ' +
+            'CommandMate server that was not stopped). Stop it and re-run "commandmate remote".');
+        await rollback(daemonManager, pairing.filePath, restoreEnv);
+        (0, security_logger_1.logSecurityEvent)({
+            timestamp: new Date().toISOString(),
+            command: 'remote',
+            action: 'failure',
+            details: `up: listener identity not verified, nothing published (${provider.id})`,
+        });
+        return types_1.ExitCode.START_FAILED;
+    }
     // 7. Open the outside door. The Provider is handed 127.0.0.1 explicitly; it
     // never reads CM_BIND (§9.1).
     //
@@ -748,7 +779,7 @@ function buildPairingUrl(url, code) {
  *
  * @param pairingUrl - The `/login#code=` URL
  */
-function announcePairing(pairingUrl) {
+function announcePairing(pairingUrl, alwaysShowUrl = false) {
     const qr = (0, qr_terminal_1.formatQrForTerminal)(pairingUrl, {
         columns: process.stdout.columns,
         color: process.stdout.isTTY === true,
@@ -761,6 +792,12 @@ function announcePairing(pairingUrl) {
     else {
         console.log(qr);
         logger.info('Scan this with your phone. The code works once, and only until it expires.');
+        // Issue #3127: an agent's chat pane folds long output and cuts the QR off,
+        // so `remote pair` prints the link as text too.
+        if (alwaysShowUrl) {
+            logger.info('Or open this URL on the phone:');
+            logger.info(`  ${pairingUrl}`);
+        }
     }
     logger.blank();
 }
@@ -908,6 +945,9 @@ async function runRemoteStatus(options) {
         logger.info(`Remote expires:  ${new Date(state.expiresAt).toISOString()} (${formatRemaining(state.expiresAt - now)})`);
         logger.info(`Pairing:         ${pairing}`);
         logger.info(`Server:          ${describeServer(server)}`);
+        if (!expired) {
+            logger.info(describePairingNextStep(pairing));
+        }
     }
     if (closed !== null && !options.json) {
         if (closed.ok) {
@@ -931,6 +971,112 @@ async function runRemoteStatus(options) {
  * @param state - The recorded session
  * @returns The text after `Auth scope:`
  */
+/**
+ * One line telling the user how to get a pairing link from this state
+ * (Issue #3127). `status` itself never prints a link or a code (§5.4).
+ *
+ * @param pairing - Derived pairing state
+ * @returns The hint line
+ */
+function describePairingNextStep(pairing) {
+    if (pairing === 'unused') {
+        return 'Lost the QR code? "commandmate remote pair" shows a new pairing link for the same URL.';
+    }
+    return PAIRING_RESTART_HINT;
+}
+/** What to do when no unused pairing code is left (Issue #3127). */
+const PAIRING_RESTART_HINT = 'To pair a device now, run "commandmate remote stop", then "commandmate remote" for a new QR code.';
+/**
+ * Printed with every re-issued link (Issue #3127). The link may stay behind in
+ * an agent's chat history, so its limits are said next to it.
+ */
+exports.PAIRING_LINK_NOTICE = 'This link works once and expires at the time shown. Any earlier pairing link no longer works. ' +
+    'When you are done with remote access, run "commandmate remote stop".';
+/**
+ * @param reason - Why no code was issued
+ * @returns The pairing state to report for it
+ */
+function failureToPairingState(reason) {
+    if (reason === 'consumed' || reason === 'expired')
+        return reason;
+    return 'unavailable';
+}
+/**
+ * `remote pair`: show a new pairing link for the live session (Issue #3127).
+ *
+ * The plaintext code from `remote up` is never stored, so "show it again"
+ * means minting a replacement and swapping its hash into the existing handoff
+ * file (`reissuePairingCode`). The server, the Provider and the published URL
+ * are left exactly as they are — no new way in is opened — and the session
+ * token is never printed: the only secret in the output is the one-time code.
+ *
+ * Refused unless the code is still unused: a consumed code means a device
+ * already holds the token, and an expired one closed its window on purpose.
+ * Both are answered with the `remote stop` -> `remote` route instead.
+ *
+ * @param options - Parsed command options (`--json`)
+ * @returns SUCCESS with a link, CONFIG_ERROR without one
+ */
+async function runRemotePair(options) {
+    const state = (0, remote_state_1.readRemoteState)();
+    const now = Date.now();
+    const refuse = (pairing, message) => {
+        if (options.json) {
+            console.log(JSON.stringify({ action: 'pair', pairingUrl: null, pairing: { state: pairing }, error: message, hint: PAIRING_RESTART_HINT }, null, 2));
+        }
+        else {
+            logger.error(message);
+            logger.info(PAIRING_RESTART_HINT);
+        }
+        (0, security_logger_1.logSecurityEvent)({
+            timestamp: new Date().toISOString(),
+            command: 'remote',
+            action: 'failure',
+            details: `pair: not reissued (${pairing ?? 'no-remote-state'})`,
+        });
+        return types_1.ExitCode.CONFIG_ERROR;
+    };
+    if (state === null) {
+        return refuse(null, 'No remote session is recorded, so there is no pairing to show.');
+    }
+    if (now > state.expiresAt) {
+        return refuse(null, 'The remote session has expired.');
+    }
+    const pairing = derivePairingState((0, fs_1.existsSync)(state.pairing.filePath), state.pairing.expiresAt, now);
+    if (pairing !== 'unused') {
+        return refuse(pairing, pairing === 'consumed'
+            ? 'The pairing code has already been used.'
+            : 'The pairing code has expired.');
+    }
+    const reissued = (0, remote_pairing_1.reissuePairingCode)(state.pairing.filePath, now);
+    if (!reissued.ok) {
+        return refuse(failureToPairingState(reissued.reason), `Could not issue a new pairing code (${reissued.reason}).`);
+    }
+    const pairingUrl = buildPairingUrl(state.url, reissued.code);
+    const expiresAt = new Date(reissued.expiresAt).toISOString();
+    (0, security_logger_1.logSecurityEvent)({
+        timestamp: new Date().toISOString(),
+        command: 'remote',
+        action: 'success',
+        // Neither the pairing code nor the token appears here (§5.2).
+        details: `pair: reissued provider=${state.provider}`,
+    });
+    if (options.json) {
+        console.log(JSON.stringify({
+            action: 'pair',
+            url: state.url,
+            pairingUrl,
+            pairing: { state: 'unused', expiresAt },
+            notice: exports.PAIRING_LINK_NOTICE,
+        }, null, 2));
+    }
+    else {
+        announcePairing(pairingUrl, true);
+        logger.info(`Pairing expires: ${expiresAt} (${formatRemaining(reissued.expiresAt - now)})`);
+        logger.info(exports.PAIRING_LINK_NOTICE);
+    }
+    return types_1.ExitCode.SUCCESS;
+}
 function describeAuthScope(state) {
     const scope = state.authScope ?? exports.DEFAULT_REMOTE_AUTH_SCOPE;
     if (scope !== 'remote-only') {
@@ -1009,7 +1155,7 @@ async function runRemoteStop(options) {
  * future caller (a `quickstart --remote`, say) would compose, exactly as
  * `runStart` / `startCommand` are split (#1195).
  *
- * @param action - `up` (default), `status` or `stop`
+ * @param action - `up` (default), `status`, `stop` or `pair`
  * @param options - Parsed command options
  */
 async function remoteCommand(action, options) {
@@ -1025,8 +1171,11 @@ async function remoteCommand(action, options) {
             case 'stop':
                 exitCode = await runRemoteStop(options);
                 break;
+            case 'pair':
+                exitCode = await runRemotePair(options);
+                break;
             default:
-                logger.error(`Unknown action '${action}'. Valid actions: up, status, stop.`);
+                logger.error(`Unknown action '${action}'. Valid actions: up, status, stop, pair.`);
                 exitCode = types_1.ExitCode.CONFIG_ERROR;
         }
     }
@@ -1055,7 +1204,7 @@ function createRemoteCommand() {
     const cmd = new commander_1.Command('remote');
     cmd
         .description('Expose this server to your phone over a provider tunnel and pair it with a QR code')
-        .argument('[action]', 'up (default), status, or stop')
+        .argument('[action]', 'up (default), status, stop, or pair (show a new pairing link)')
         .option('--provider <name>', 'Force a provider instead of choosing one (tailscale or cloudflare)')
         .option('--expires <duration>', `Remote session TTL, 1h-30d (default: ${exports.DEFAULT_REMOTE_EXPIRES})`)
         .option('--pairing-expires <duration>', `Pairing code TTL, 1m-24h (default: ${exports.DEFAULT_PAIRING_EXPIRES})`)

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

@@ -0,0 +1,40 @@
+/**
+ * reply Command - read an agent session's latest reply (Issue #3039)
+ *
+ *   commandmate reply <worktree-id> [--instance <id|alias>] [--agent <tool>]
+ *                     [--since <iso8601>] [--json]
+ *
+ * ## Why this exists next to ask / capture
+ *
+ * `ask` reads the reply to the turn IT sent. A supervisor that nudged a worker
+ * with a plain `send` ("stop and report") had no way to read the answer short
+ * of opening the tool's transcript file itself — which works for Claude, whose
+ * path is computable from the cwd, and not for Command Code, whose project slug
+ * is not. `capture` is no substitute: the pane also holds the nudge's own echo,
+ * and a pane line cannot be attributed to a turn.
+ *
+ * The server already has the reply: the transcript readers write each turn into
+ * the chat ledger keyed `<tool>-turn:<id>`, and `ask` reads it from there. This
+ * command is that read on its own, through the same shared rules
+ * (`utils/reply-ledger`), so the two can never disagree about what a reply is.
+ *
+ * ## What it deliberately does not do
+ *
+ * - No pane fallback. A row off the screen is exactly what cannot be attributed
+ *   to a turn; returning it would re-introduce the problem this command solves.
+ *   Only transcript-reader rows count, for every tool.
+ * - No wait. It is one read; "no reply yet" is an answer (exit 0, empty stdout,
+ *   `reply: null`), not an error, so a caller can poll or give up on its terms.
+ */
+import { Command } from 'commander';
+/** The `--json` payload. `reply` is null when there is no reply yet. */
+export interface ReplyJsonPayload {
+    worktreeId: string;
+    instanceId: string | null;
+    cliToolId: string | null;
+    reply: string | null;
+    requestId: string | null;
+    at: string | null;
+}
+export declare function createReplyCommand(): Command;
+//# sourceMappingURL=reply.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reply.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuBpC,wEAAwE;AACxE,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB;AAuBD,wBAAgB,kBAAkB,IAAI,OAAO,CA8E5C"}