commandmate 0.33.3 → 0.34.1

package/dist/server/src/lib/session/resolve-session-target.js

@@ -27,9 +27,12 @@
  *
  * The roster outranks the explicit request because it is the user-maintained
  * declaration of what a named instance is; a contradiction is reported rather
- * than silently resolved. Callers decide what to do with it: routes with a side
- * effect answer 400, read-only routes answer 200 and surface the conflict in
- * the payload (design §4 D5 / DR3-015).
+ * than silently resolved. A tool-named instance id is a declaration too — the
+ * id `codex` says which agent it is — so with no roster row an explicit request
+ * for another tool is reported against the primary anchor the same way (Issue
+ * #2487). Callers decide what to do with it: routes with a side effect answer
+ * 400, read-only routes answer 200 and surface the conflict in the payload
+ * (design §4 D5 / DR3-015).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.INSTANCE_TOOL_CONFLICT = exports.DEFAULT_SESSION_CLI_TOOL = void 0;
@@ -61,7 +64,8 @@ exports.INSTANCE_TOOL_CONFLICT = 'instance_tool_conflict';
  * @param db - Database instance
  * @param worktreeId - Worktree ID (already canonicalized and validated)
  * @param options - Targeting signals carried by the request
- * @returns The resolved target, with `conflict` set when the request contradicts the roster
+ * @returns The resolved target, with `conflict` set when the request contradicts
+ *   the roster or the primary-instance anchor
  */
 function resolveSessionTarget(db, worktreeId, options = {}) {
     const { instanceId, requestedCliTool } = options;
@@ -94,9 +98,27 @@ function resolveSessionTarget(db, worktreeId, options = {}) {
         }
         return target;
     }
-    // The roster does not know this instance (the ad-hoc `send --instance <new-id>`
-    // flow), so an explicit tool is the only declaration there is.
+    // The roster does not know this instance, so for an ad-hoc id (the
+    // `send --instance <new-id>` flow) an explicit tool is the only declaration
+    // there is. A tool-named id declares itself (#868, below), and a request for
+    // a different tool contradicts that exactly as it would a roster row (Issue
+    // #2487). Taking the request instead started `mcbd-<requested>-<wt>-<id>`, a
+    // session nothing that names the id alone ever reads: `ask --instance
+    // antigravity --agent command-code` sent there, then waited on agy.
     if (requestedCliTool) {
+        if ((0, types_1.isCliToolType)(instanceId) && requestedCliTool !== instanceId) {
+            return {
+                cliToolId: instanceId,
+                instanceId,
+                resolvedBy: 'primary',
+                conflict: {
+                    instanceId,
+                    rosterCliTool: instanceId,
+                    requestedCliTool,
+                    primaryAnchor: true,
+                },
+            };
+        }
         return { cliToolId: requestedCliTool, instanceId, resolvedBy: 'explicit' };
     }
     // #868: an instance id that names a CLI tool *is* that tool's primary
@@ -145,11 +167,17 @@ function resolveSessionTargetStrict(db, worktreeId, options = {}) {
     return { ok: true, target };
 }
 /**
- * The sentence shown to a human when the roster and the request disagree.
- * Names both declarations and the three ways out, because the operator has to
- * pick which one is wrong.
+ * The sentence shown to a human when the instance's declaration and the
+ * request disagree. Names both declarations and the three ways out, because the
+ * operator has to pick which one is wrong. A primary-anchor conflict has no
+ * roster entry to update, so its third way out is another instance.
  */
 function describeSessionTargetConflict(conflict) {
+    if (conflict.primaryAnchor) {
+        return (`Agent instance '${conflict.instanceId}' is the primary instance of ${conflict.rosterCliTool}, `
+            + `but ${conflict.requestedCliTool} was requested. `
+            + `Omit the agent, pass ${conflict.rosterCliTool}, or target a ${conflict.requestedCliTool} instance instead.`);
+    }
     return (`Agent instance '${conflict.instanceId}' is registered as ${conflict.rosterCliTool}, `
         + `but ${conflict.requestedCliTool} was requested. `
         + `Omit the agent, pass ${conflict.rosterCliTool}, or update the instance's roster entry.`);

package/dist/server/src/lib/verification/env-clean-gate.js

@@ -20,7 +20,9 @@
  *      the pkill (#1739) and `kill-server` (#1624) case. New things are a
  *      violation *unless they are attributable to another worker*, because
  *      parallel delegations legitimately start their own sessions and servers
- *      inside each other's measurement windows.
+ *      inside each other's measurement windows — or unless they are the one
+ *      agent session the delegation itself started (#2472), which the baseline
+ *      names and which is excused by that exact name only.
  *
  * Server-only: consumes snapshots produced by env-snapshot.
  *
@@ -31,11 +33,15 @@ exports.ENV_CLEAN_GUIDANCE = exports.MAX_REPORTED_ENV_CHANGES = exports.REQUIRE_
 exports.resolveRequireEnvClean = resolveRequireEnvClean;
 exports.attributeSessionName = attributeSessionName;
 exports.attributeAnchor = attributeAnchor;
+exports.resolveTaskSessionName = resolveTaskSessionName;
+exports.recordTaskSession = recordTaskSession;
+exports.readTaskSession = readTaskSession;
 exports.diffEnvSnapshots = diffEnvSnapshots;
 exports.formatEnvCleanReport = formatEnvCleanReport;
 exports.envCleanNoBaseline = envCleanNoBaseline;
 exports.evaluateEnvClean = evaluateEnvClean;
 const path_1 = require("path");
+const session_name_1 = require("../../lib/cli-tools/session-name");
 const types_1 = require("../../lib/cli-tools/types");
 const env_snapshot_1 = require("./env-snapshot");
 const verify_config_1 = require("./verify-config");
@@ -139,6 +145,41 @@ function attributeEntry(probeId, entry, context) {
             return 'unattributed';
     }
 }
+/**
+ * The tmux session a task's delegation runs in.
+ *
+ * `resolveSessionName` is the function that names the session when it is
+ * started, so the naming rule stays in one place: a second copy here would be
+ * free to drift, and the drift would read as a leak.
+ *
+ * @returns null when the row cannot name a session — a CLI tool id this build
+ *          does not know, or a name `validateSessionName` refuses
+ */
+function resolveTaskSessionName(task) {
+    if (!(0, types_1.isCliToolType)(task.cliToolId))
+        return null;
+    try {
+        return (0, session_name_1.resolveSessionName)(task.cliToolId, task.worktreeId, task.instanceId ?? undefined);
+    }
+    catch {
+        return null;
+    }
+}
+/** A freshly captured baseline, stamped with its task's own agent session. */
+function recordTaskSession(snapshot, task) {
+    return { ...snapshot, taskSession: resolveTaskSessionName(task) };
+}
+/**
+ * The session a baseline excuses: its name, `null` when it was recorded as
+ * unresolvable, or `undefined` when the baseline predates the field. Only a
+ * non-empty string excuses anything.
+ */
+function readTaskSession(baseline) {
+    if (!('taskSession' in baseline))
+        return undefined;
+    const recorded = baseline.taskSession;
+    return typeof recorded === 'string' && recorded !== '' ? recorded : null;
+}
 function toChange(entry, owner) {
     return { key: entry.key, detail: entry.detail, owner };
 }
@@ -151,6 +192,7 @@ function toChange(entry, owner) {
  * than useless, and treating it as equal would be the fail-open.
  */
 function diffEnvSnapshots(baseline, final, context) {
+    const taskSession = readTaskSession(baseline);
     const probes = env_snapshot_1.ENV_PROBE_IDS.map((probeId) => {
         const before = baseline.probes[probeId];
         const after = final.probes[probeId];
@@ -161,6 +203,7 @@ function diffEnvSnapshots(baseline, final, context) {
                 reason: `baseline probe unavailable: ${before?.reason ?? 'not recorded'}`,
                 added: [],
                 ignoredAdded: [],
+                taskSessionAdded: [],
                 removed: [],
             };
         }
@@ -171,6 +214,7 @@ function diffEnvSnapshots(baseline, final, context) {
                 reason: `current probe unavailable: ${after?.reason ?? 'not recorded'}`,
                 added: [],
                 ignoredAdded: [],
+                taskSessionAdded: [],
                 removed: [],
             };
         }
@@ -178,10 +222,17 @@ function diffEnvSnapshots(baseline, final, context) {
         const afterKeys = new Set(after.entries.map((entry) => entry.key));
         const added = [];
         const ignoredAdded = [];
+        const taskSessionAdded = [];
         for (const entry of after.entries) {
             if (beforeKeys.has(entry.key))
                 continue;
             const owner = attributeEntry(probeId, entry, context);
+            if (probeId === 'tmux-sessions' && taskSession && entry.key === taskSession) {
+                // Additions only: a task session that existed at task start and is gone
+                // falls through to `removed` below like everything else (#1624).
+                taskSessionAdded.push(toChange(entry, owner));
+                continue;
+            }
             (owner === 'other' ? ignoredAdded : added).push(toChange(entry, owner));
         }
         const removed = before.entries
@@ -193,6 +244,7 @@ function diffEnvSnapshots(baseline, final, context) {
             reason: null,
             added,
             ignoredAdded,
+            taskSessionAdded,
             removed,
         };
     });
@@ -204,7 +256,7 @@ function diffEnvSnapshots(baseline, final, context) {
         : probes.some((probe) => probe.status === 'unknown')
             ? 'unknown'
             : 'clean';
-    return { status, probes };
+    return { status, taskSession, probes };
 }
 // =============================================================================
 // Reporting
@@ -217,7 +269,9 @@ exports.MAX_REPORTED_ENV_CHANGES = 25;
  * different actions.
  */
 exports.ENV_CLEAN_GUIDANCE = 'Anything listed under "+" was started or created during this task and left behind — ' +
-    'stop it by PID and remove it. Anything under "-" existed when the task started and is ' +
+    'stop it by PID and remove it. The one exception is a "+" line marked "task session, ' +
+    'excused": that is the agent session this delegation itself started, it is not counted, ' +
+    'and it must be left running. Anything under "-" existed when the task started and is ' +
     'now gone — it was killed or deleted; restart or restore it. Never stop a process by ' +
     'pattern (`pkill -f`): it takes every process whose command line matches, which is how ' +
     'the production server was stopped in #1739.';
@@ -232,6 +286,27 @@ function formatChanges(sign, changes) {
         lines.push(`    ... and ${remainder} more`);
     return lines;
 }
+/**
+ * The excused task session, listed rather than dropped (#2472): a verdict that
+ * silently discounted a session would read exactly like one that never saw it.
+ */
+function formatTaskSessionChanges(changes) {
+    return changes.map((change) => {
+        const detail = change.detail ? ` ${change.detail}` : '';
+        return `    + ${change.key}${detail} [task session, excused]`;
+    });
+}
+/**
+ * The header's account of what could be excused, so a report judged against a
+ * baseline written before #2472 says why the task's own session was not.
+ */
+function describeTaskSession(taskSession) {
+    if (taskSession === undefined)
+        return 'unrecorded (baseline predates #2472; nothing excused)';
+    if (taskSession === null)
+        return 'unresolved (nothing excused)';
+    return taskSession;
+}
 /** Render a diff for `log_tail`. */
 function formatEnvCleanReport(diff) {
     const lines = [];
@@ -246,11 +321,13 @@ function formatEnvCleanReport(diff) {
                 ? ` (${probe.ignoredAdded.length} addition(s) attributed to another worktree)`
                 : '';
             lines.push(`  ${probe.probeId} clean (${label})${excused}`);
+            lines.push(...formatTaskSessionChanges(probe.taskSessionAdded));
             continue;
         }
         lines.push(`  ${probe.probeId} VIOLATED (${label}): +${probe.added.length} -${probe.removed.length}`);
         lines.push(...formatChanges('+', probe.added));
         lines.push(...formatChanges('-', probe.removed));
+        lines.push(...formatTaskSessionChanges(probe.taskSessionAdded));
         for (const excused of probe.ignoredAdded) {
             lines.push(`    · ${excused.key} (ignored: belongs to another worktree)`);
         }
@@ -308,7 +385,7 @@ async function evaluateEnvClean(input) {
     }
     const diff = diffEnvSnapshots(input.baseline, final, input);
     const header = `${verify_config_1.ENV_CLEAN_GATE_ID}: baseline=${new Date(input.baseline.capturedAt).toISOString()} ` +
-        `status=${diff.status}`;
+        `status=${diff.status} task-session=${describeTaskSession(diff.taskSession)}`;
     const report = `${header}\n${formatEnvCleanReport(diff)}`;
     if (diff.status === 'clean')
         return done('passed', report, 0);

package/dist/server/src/lib/ws-server.js

@@ -5,7 +5,9 @@
  * Issue #331: WebSocket authentication via Cookie header
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__internal = exports.WORKTREE_RENAMED_EVENT_TYPE = void 0;
+exports.__internal = exports.WORKTREE_RENAMED_EVENT_TYPE = exports.REMOTE_ONLY_AUTH_SCOPE = exports.CM_INGRESS_HEADER = void 0;
+exports.stampIngress = stampIngress;
+exports.isIngressAuthExempt = isIngressAuthExempt;
 exports.handleProxyUpgrade = handleProxyUpgrade;
 exports.setupWebSocket = setupWebSocket;
 exports.broadcast = broadcast;
@@ -61,6 +63,59 @@ const TERMINAL_FALLBACK_CAPTURE_LINES = -200;
  * Issue #671.
  */
 const PROXY_ALLOWED_HOSTS = new Set(['localhost', '127.0.0.1']);
+/**
+ * The header `server.ts` overwrites on every request and upgrade.
+ *
+ * Written out as a literal in `server.ts` would be a second spelling of the same
+ * name, so it lives here and `server.ts` imports it — that file already imports
+ * this module at eval time (`setupWebSocket`), which is why this is the one
+ * place the constant can live without adding a module graph to `server.ts`'s
+ * eval-time graph (see the `x-cm-raw-url` comment there for what that costs).
+ * `middleware.ts` cannot import it: it runs on the Edge runtime and this module
+ * is Node-only, so it inlines the same literal under the C001 rule that already
+ * duplicates the auth constants.
+ */
+exports.CM_INGRESS_HEADER = 'x-cm-ingress';
+/**
+ * Value of `CM_AUTH_SCOPE` that exempts the local listener from authentication.
+ *
+ * Any other value — absent, misspelt, `all` — leaves every listener
+ * authenticated, which is the pre-#2489 behaviour and the fail-closed default.
+ */
+exports.REMOTE_ONLY_AUTH_SCOPE = 'remote-only';
+/**
+ * Stamp the listener identity onto a request, discarding whatever the client
+ * sent under the same name.
+ *
+ * A plain assignment, not a merge: Node joins a repeated unknown header into
+ * one comma-separated string, and assigning replaces that string wholesale.
+ * Called for EVERY request on EVERY listener — a listener that forgot to stamp
+ * would leave the caller's own value in place, which is the one way this scheme
+ * can fail open.
+ *
+ * @param headers - The mutable `req.headers` of an incoming request or upgrade
+ * @param ingress - The listener the request arrived on
+ */
+function stampIngress(headers, ingress) {
+    headers[exports.CM_INGRESS_HEADER] = ingress;
+}
+/**
+ * Whether this request may skip authentication because of where it arrived.
+ *
+ * Fail-closed on both halves: the scope has to be exactly `remote-only`, and
+ * the stamp has to be exactly `local`. An unstamped request (no listener
+ * claimed it), an array value (a repeated header that somehow survived) and an
+ * unknown value all authenticate.
+ *
+ * @param headers - Request headers, after `server.ts` has stamped them
+ * @param env - Environment to read `CM_AUTH_SCOPE` from; defaults to the process's
+ * @returns true when the request came in on the local listener of a `remote-only` server
+ */
+function isIngressAuthExempt(headers, env = process.env) {
+    if (env.CM_AUTH_SCOPE !== exports.REMOTE_ONLY_AUTH_SCOPE)
+        return false;
+    return headers[exports.CM_INGRESS_HEADER] === 'local';
+}
 /**
  * Write a minimal HTTP error response to a raw upgrade socket and destroy it.
  * Used for 4xx / 5xx rejections in the /proxy/<prefix> upgrade branch.
@@ -239,6 +294,7 @@ function isExpectedWebSocketError(error) {
  * Issue #331: Added auth check on WebSocket upgrade
  *
  * @param server - HTTP or HTTPS server instance
+ * @param options - Extra listeners to serve the same WebSocket from (Issue #2489)
  *
  * @example
  * ```typescript
@@ -247,7 +303,7 @@ function isExpectedWebSocketError(error) {
  * server.listen(3000);
  * ```
  */
-function setupWebSocket(server) {
+function setupWebSocket(server, options) {
     wss = new ws_1.WebSocketServer({ noServer: true });
     // Issue #2220: this instance now owns the sockets, so publish the capability
     // the other module instances have to borrow. Registered before anything can
@@ -262,7 +318,7 @@ function setupWebSocket(server) {
     // map, which is what a broadcast has to reach.
     (0, waiting_broadcast_1.startWaitingStatusBroadcast)(handleBroadcast);
     // Handle upgrade requests - only accept app WebSocket connections, not Next.js HMR
-    server.on('upgrade', (request, socket, head) => {
+    const handleUpgrade = (request, socket, head) => {
         const pathname = request.url || '/';
         // Let Next.js handle its own HMR WebSocket connections in development.
         // In production there are no /_next/ WebSocket connections (no HMR).
@@ -292,7 +348,13 @@ function setupWebSocket(server) {
             }
         }
         // Issue #331: WebSocket authentication via Cookie header
-        if ((0, auth_1.isAuthEnabled)()) {
+        //
+        // Issue #2489: `isIngressAuthExempt` is the ONLY thing that can skip this,
+        // and it reads the same stamped header `middleware.ts` reads. HTTP and WS
+        // have to agree here: a phone drives the terminal over this socket, so a WS
+        // path that exempted more than the HTTP path would hand the tunnel a live
+        // shell while the screen behind it still asked for a password.
+        if ((0, auth_1.isAuthEnabled)() && !isIngressAuthExempt(request.headers)) {
             const cookieHeader = request.headers.cookie || '';
             const cookies = (0, auth_1.parseCookies)(cookieHeader);
             const token = cookies[auth_1.AUTH_COOKIE_NAME];
@@ -334,7 +396,14 @@ function setupWebSocket(server) {
         wss.handleUpgrade(request, socket, head, (ws) => {
             wss.emit('connection', ws, request);
         });
-    });
+    };
+    // Issue #2489: every listener gets the same handler, and therefore the same
+    // auth decision. `server.ts` has already stamped `x-cm-ingress` by the time
+    // this runs (its stamping listener is registered first, and listeners fire in
+    // registration order), so the handler never has to know which socket it is on.
+    for (const target of [server, ...(options?.additionalServers ?? [])]) {
+        target.on('upgrade', handleUpgrade);
+    }
     // Handle WebSocket server errors (e.g., invalid frames from clients)
     wss.on('error', (error) => {
         logger.error('server:error', { error: error.message });

package/dist/server/src/types/agent-transcript.js

@@ -39,17 +39,20 @@
  * @module types/agent-transcript
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AGENT_MARKDOWN_REQUEST_ID_PREFIXES = exports.COMMAND_CODE_PROMPT_REQUEST_ID_PREFIX = exports.COMMAND_CODE_MARKDOWN_REQUEST_ID_PREFIX = exports.ANTIGRAVITY_PROMPT_REQUEST_ID_PREFIX = exports.ANTIGRAVITY_MARKDOWN_REQUEST_ID_PREFIX = exports.CODEX_PROMPT_REQUEST_ID_PREFIX = exports.CODEX_MARKDOWN_REQUEST_ID_PREFIX = exports.CLAUDE_PROMPT_REQUEST_ID_PREFIX = exports.CLAUDE_MARKDOWN_REQUEST_ID_PREFIX = exports.AGENT_MARKDOWN_REQUEST_ID_PREFIX = void 0;
+exports.CLAUDE_HEADLESS_TURN_ID_PREFIX = exports.AGENT_MARKDOWN_REQUEST_ID_PREFIXES = exports.COMMAND_CODE_PROMPT_REQUEST_ID_PREFIX = exports.COMMAND_CODE_MARKDOWN_REQUEST_ID_PREFIX = exports.ANTIGRAVITY_PROMPT_REQUEST_ID_PREFIX = exports.ANTIGRAVITY_MARKDOWN_REQUEST_ID_PREFIX = exports.CODEX_PROMPT_REQUEST_ID_PREFIX = exports.CODEX_MARKDOWN_REQUEST_ID_PREFIX = exports.CLAUDE_PROMPT_REQUEST_ID_PREFIX = exports.CLAUDE_MARKDOWN_REQUEST_ID_PREFIX = exports.AGENT_MARKDOWN_REQUEST_ID_PREFIX = void 0;
 exports.isAgentAuthoredMarkdown = isAgentAuthoredMarkdown;
 exports.opencodeTurnRequestId = opencodeTurnRequestId;
 exports.claudeTurnRequestId = claudeTurnRequestId;
 exports.claudePromptRequestId = claudePromptRequestId;
+exports.claudeHeadlessTurnId = claudeHeadlessTurnId;
 exports.codexTurnRequestId = codexTurnRequestId;
 exports.codexPromptRequestId = codexPromptRequestId;
 exports.antigravityTurnRequestId = antigravityTurnRequestId;
 exports.antigravityPromptRequestId = antigravityPromptRequestId;
 exports.commandCodeTurnRequestId = commandCodeTurnRequestId;
 exports.commandCodePromptRequestId = commandCodePromptRequestId;
+exports.resolveAgentTurnKey = resolveAgentTurnKey;
+exports.correlatedPromptRequestId = correlatedPromptRequestId;
 /**
  * Prefix on `chat_messages.request_id` for a row whose `content` is opencode's
  * own Markdown rather than a scrape of its terminal.
@@ -269,6 +272,53 @@ function claudeTurnRequestId(promptUuid) {
 function claudePromptRequestId(promptUuid) {
     return `${exports.CLAUDE_PROMPT_REQUEST_ID_PREFIX}${promptUuid}`;
 }
+/**
+ * The segment a Claude turn id opens with when no prompt record names the turn
+ * (Issue #2199, made durable by Issue #2470).
+ *
+ * `partial:` cannot be the start of a UUID, so no turn id built on it can equal
+ * a prompt record's `uuid` — which is what keeps every key built on it apart
+ * from {@link claudeTurnRequestId} of a real prompt.
+ */
+exports.CLAUDE_HEADLESS_TURN_ID_PREFIX = 'partial:';
+/**
+ * The turn id for a Claude reply whose prompt record could not be read (Issue #2470).
+ *
+ * `partial:<sessionId>:<closingRecordUuid>`, handed to {@link claudeTurnRequestId}
+ * where a prompt `uuid` would otherwise go. A turn longer than the widest window
+ * `lib/hooks/sources/claude/history` reads back has no prompt record in reach,
+ * and #2470 saves what can be read of it rather than nothing. That row still
+ * needs a key that does both jobs every key in this module does — idempotency
+ * and provenance — without the record that normally provides one.
+ *
+ * Three candidates were available, and the other two fail on the first job:
+ *
+ *  - **`partial:<sessionId>`**, the live bubble's key (#2199). One per session,
+ *    so a second long turn in the same session would find the first one's row,
+ *    read "already saved" and be lost. It stays the live key and only that.
+ *  - **The first assistant record in the window.** The window is the file's last
+ *    N bytes, and Claude keeps appending after a turn closes — measured on
+ *    2026-09-11 over 298 transcripts, the records between a closing `end_turn`
+ *    and the next prompt were `attachment` (1,929), `system:turn_duration`
+ *    (1,927), `system:stop_hook_summary` (1,923), `queue-operation` (1,487) and
+ *    more. Every one of them moves the window's head, so two reads of one
+ *    finished turn could name two different records and write the reply twice.
+ *  - **The record that closed the turn** — its last assistant record. In the
+ *    same census, across 1,973 closed turns, not one assistant record followed a
+ *    closing `end_turn` before the next prompt. Every read that can see the turn
+ *    at all therefore names the same record, and no two turns share one.
+ *
+ * The second `:` is what separates this from the live key: a session id is a
+ * UUID and has none. {@link correlatedPromptRequestId} turns it into a
+ * `claude-prompt:partial:…` id that no writer produces, which is correct — a
+ * turn with no prompt record in reach gets no user row.
+ *
+ * @param sessionId - The session the turn was read from
+ * @param closingRecordUuid - `uuid` of the turn's last assistant record
+ */
+function claudeHeadlessTurnId(sessionId, closingRecordUuid) {
+    return `${exports.CLAUDE_HEADLESS_TURN_ID_PREFIX}${sessionId}:${closingRecordUuid}`;
+}
 /**
  * The row id for one codex turn (Issue #2197).
  *
@@ -386,3 +436,95 @@ function commandCodeTurnRequestId(promptId) {
 function commandCodePromptRequestId(promptId) {
     return `${exports.COMMAND_CODE_PROMPT_REQUEST_ID_PREFIX}${promptId}`;
 }
+// ============================================================================
+// Turn keys, read back off a saved row (Issue #2458)
+// ============================================================================
+/**
+ * Every turn prefix paired with the **prompt** prefix that names the same turn.
+ *
+ * Three tools, and the two that are absent are absent for a reason rather than
+ * by oversight:
+ *
+ *  - **codex** keys its assistant row on `turn_id` and its user row on the
+ *    `UserMessage` item's own id (see {@link CODEX_PROMPT_REQUEST_ID_PREFIX} for
+ *    the measurement that forces that). The two are different ids in the
+ *    database, so there is no string this map could produce that would find the
+ *    prompt, and producing one anyway would silently correlate a turn with
+ *    whatever row happened to carry that id.
+ *  - **opencode** names a turn by the user message it answers
+ *    ({@link opencodeTurnRequestId}), but the user row itself is not written
+ *    with a matching `oc-prompt:` marker — there is no such constant — so the
+ *    same objection applies.
+ *
+ * Issue #2458 therefore shows a turn boundary for all five tools and a
+ * start-side time for these three only. That asymmetry is the contract, not a
+ * gap in it: the alternative is guessing which prompt opened a turn, and a
+ * guessed clock time is worse than no clock time.
+ */
+const TURN_PREFIX_TO_PROMPT_PREFIX = [
+    [exports.CLAUDE_MARKDOWN_REQUEST_ID_PREFIX, exports.CLAUDE_PROMPT_REQUEST_ID_PREFIX],
+    [exports.ANTIGRAVITY_MARKDOWN_REQUEST_ID_PREFIX, exports.ANTIGRAVITY_PROMPT_REQUEST_ID_PREFIX],
+    [exports.COMMAND_CODE_MARKDOWN_REQUEST_ID_PREFIX, exports.COMMAND_CODE_PROMPT_REQUEST_ID_PREFIX],
+];
+/**
+ * The turn a saved row belongs to, as a comparable key, or `null`.
+ *
+ * The key is the **whole `request_id`**, prefix included, and that is
+ * load-bearing: `antigravity-turn:53b7…#0` and `claude-turn:53b7…#0` are
+ * different turns even if the suffixes ever collided, and comparing suffixes
+ * alone would fold two tools' turns into one. It also means a caller never
+ * needs to know which prefix matched — which is the point of this helper
+ * existing at all, since Issue #2458's rule ("the key CHANGED") is a string
+ * comparison and nothing more.
+ *
+ * Conservative in exactly the way {@link isAgentAuthoredMarkdown} is:
+ *
+ *  - a non-string (`undefined`, `null`, or a number that survived a bad
+ *    round-trip) is unknown;
+ *  - an unrecognised prefix — the scraper's `req_…`, a `claude-prompt:` user
+ *    row, anything a future producer invents — is unknown;
+ *  - a recognised prefix with an EMPTY or whitespace-only suffix is unknown.
+ *    `claude-turn:` on its own names no turn, and treating it as one would make
+ *    every such row read as the same turn as every other such row.
+ *
+ * "Unknown" never means "a new turn" at the call site: see
+ * `buildChatTranscriptRows`, which carries the last known key across unknown
+ * rows rather than letting one split a reply in half.
+ *
+ * @param requestId - `ChatMessage.requestId`, which is usually absent
+ * @returns The full `request_id`, or `null` when it names no known turn
+ */
+function resolveAgentTurnKey(requestId) {
+    if (typeof requestId !== 'string')
+        return null;
+    for (const prefix of exports.AGENT_MARKDOWN_REQUEST_ID_PREFIXES) {
+        if (!requestId.startsWith(prefix))
+            continue;
+        return requestId.slice(prefix.length).trim().length === 0 ? null : requestId;
+    }
+    return null;
+}
+/**
+ * The `request_id` the **user row** of this turn would carry, or `null`.
+ *
+ * `claude-turn:<uuid>` → `claude-prompt:<uuid>`, and the same for antigravity
+ * and Command Code. `null` for codex, for opencode, and for anything that is
+ * not a turn key at all — see {@link TURN_PREFIX_TO_PROMPT_PREFIX} for why
+ * those two are refused rather than approximated.
+ *
+ * This is a pure rename of the id, not a lookup: whether a row with that id
+ * exists, is in the same scope, is on screen and is older than the reply are
+ * four separate questions the caller answers against the rows it actually has.
+ *
+ * @param turnKey - A key from {@link resolveAgentTurnKey}
+ * @returns The correlated prompt `request_id`, or `null` when none can be named
+ */
+function correlatedPromptRequestId(turnKey) {
+    for (const [turnPrefix, promptPrefix] of TURN_PREFIX_TO_PROMPT_PREFIX) {
+        if (!turnKey.startsWith(turnPrefix))
+            continue;
+        const suffix = turnKey.slice(turnPrefix.length);
+        return suffix.trim().length === 0 ? null : `${promptPrefix}${suffix}`;
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.33.3",
+  "version": "0.34.1",
   "description": "A local control plane for agent CLIs — orchestration and visibility for Claude Code, Codex, Gemini CLI, and more across Git worktrees",
   "keywords": [
     "claude-code",

package/.next/server/chunks/1068.js

@@ -1 +0,0 @@
-"use strict";exports.id=1068,exports.ids=[1068,2839,5220],exports.modules={23197:(a,b,c)=>{c.d(b,{$M:()=>e,H1:()=>d,q5:()=>f});let d="__global__",e=2e3,f=900},39687:(a,b,c)=>{c.d(b,{d:()=>p});var d=c(56791),e=c(43234),f=c(15194),g=c(95220),h=c(12462),i=c(49640),j=c(54325),k=c(72626),l=c(58707),m=c(41466);let n=(0,k.h)("session/send-user-message");function o(a){return a instanceof Error?a.message:String(a)}async function p(a,b){let{worktreeId:c,content:k,cliToolId:p,instanceId:q,absoluteImagePath:r,copilotModel:s}=b,t=b.messageType??"normal",u=q??p,v=e.CLIToolManager.getInstance().getTool(p),w=await (0,l.a3)(c,p,q,{ignoreStructured:b.ignoreStructuredPromptGuard});if(w.waiting)return n.info("send-refused-prompt-waiting",{worktreeId:c,cliToolId:p,reason:w.reason,blockedBy:w.blockedBy}),{ok:!1,stage:"prompt_waiting",error:(0,l.br)(c,w.blockedBy)};let x=new Date;try{await (0,h.o4)(a,c,p,x,q)}catch(a){n.error("failed-to-save-pending-assistant-response:",{error:o(a)})}let y=null;try{let b=(0,d.getMessages)(a,c,{limit:1,cliToolId:p,instanceId:u,matchResolvedInstance:!0});b.length>0&&"user"===b[0].role&&b[0].content===k&&(y=b[0].id)}catch(a){n.error("failed-to-detect-orphaned-messages:",{error:o(a)})}if(s&&"copilot"===p)try{await v.sendModelCommand(c,s,q),n.info("copilot-model-command-sent",{model:s})}catch(a){return n.error("failed-to-send-model-command:",{error:o(a)}),{ok:!1,stage:"model",error:o(a)}}try{r?(0,f._J)(v)?await v.sendMessageWithImage(c,k,r,q):await v.sendMessage(c,(0,m.TZ)(k,r),q):await v.sendMessage(c,k,q)}catch(a){return n.error("failed-to-send-message-to:",{error:o(a)}),{ok:!1,stage:"send",error:o(a)}}let z=(0,d.createMessage)(a,{worktreeId:c,role:"user",content:k,messageType:t,timestamp:x,cliToolId:p,instanceId:q,requestId:b.requestId});try{(0,i.broadcastMessage)("message",{worktreeId:c,message:{...z,cliToolId:p,instanceId:u}})}catch(a){n.warn("user-message-broadcast-failed",{error:o(a)})}if(y)try{if((0,d.deleteMessageById)(a,y)){n.info("cleaned-up-orphaned-user");try{(0,i.broadcastMessage)(j.dz,{worktreeId:c,cliToolId:p,instanceId:u,reason:"orphan_cleanup"})}catch(a){n.warn("orphan-cleanup-broadcast-failed",{error:o(a)})}}}catch(a){n.error("failed-to-clean-up-orphaned-message:",{error:o(a)})}return(0,d.updateLastUserMessage)(a,c,k,x),(0,d.clearInProgressMessageId)(a,c,p,q),n.info("cleared-in-progress-message-for"),(0,g.startPolling)(c,p,q),{ok:!0,message:z}}},58707:(a,b,c)=>{c.d(b,{$n:()=>k,a3:()=>l,br:()=>m});var d=c(43234),e=c(31990),f=c(95595),g=c(34405),h=c(72626),i=c(30008);let j=(0,h.h)("prompt-waiting-guard"),k="PROMPT_WAITING";async function l(a,b,c,h){try{let k=d.CLIToolManager.getInstance().getTool(b);if(!await k.isRunning(a,c))return{waiting:!1};let l=await (0,e.Wh)(a,b,g._,c),m=(0,f.WC)(l,b),n=(0,i._G)({worktreeId:a,cliToolId:b,instanceId:c,scraper:{status:m.status,reason:m.reason,hasActivePrompt:m.hasActivePrompt},ignoreStructured:h?.ignoreStructured});if(!n.blocksSend)return null!==n.structuredSendBlockSuppressed&&j.info("structured-send-guard-not-applied",{worktreeId:a,cliToolId:b,instanceId:c,suppressed:n.structuredSendBlockSuppressed,promptWaitingSince:n.structured?.at??null}),{waiting:!1};return{waiting:!0,reason:n.blockReason??void 0,blockedBy:n.blockedBy??void 0}}catch(c){return j.warn("prompt-waiting-check-failed",{worktreeId:a,cliToolId:b,error:c instanceof Error?c.message:String(c)}),{waiting:!1}}}function m(a,b){let c=`${a} is waiting on a prompt. Sending now would type into the prompt's input line instead of reaching the agent, and would leave that text in place for the next answer. Answer the prompt first: \`commandmate respond ${a} <answer>\`.`;if("structured"!==b)return c;let d=Math.round(i.j0/6e4);return`${c} This dialog was reported by the agent's own hooks and is not visible to the terminal scraper, so if the pane looks idle the record has outlived its dialog: it stops blocking sends ${d} minutes after it was reported, or immediately with \`commandmate send ${a} <message> --ignore-structured-prompt\` (server-wide: ${i.F1}=off).`}},61068:(a,b,c)=>{c.d(b,{Nz:()=>u,EB:()=>v,l7:()=>x});var d=c(95220),e=c(45017),f=c(11099),g=c(85775),h=c(72626),i=c(43234),j=c(79892);let k=(0,h.h)("global-session-poller"),l=new Map,m=new Map;var n=c(93997),o=c(15194),p=c(23197),q=c(77093),r=c(82325);let s=(0,h.h)("session-cleanup");async function t(a,b){let c={worktreeId:a,sessionsKilled:[],sessionErrors:[],pollersStopped:[],pollerErrors:[]};for(let e of((0,n.pc)(),o.XH)){try{await b(a,e)&&(c.sessionsKilled.push(e),s.info("session:killed",{worktreeId:a,cliToolId:e}))}catch(d){let b=`${e}: ${(0,q.u1)(d)}`;c.sessionErrors.push(b),s.warn("session:kill-failed",{worktreeId:a,cliToolId:e,error:d instanceof Error?d.message:String(d)})}try{(0,d.stopPolling)(a,e),c.pollersStopped.push(`response-poller:${e}`)}catch(d){let b=`response-poller:${e}: ${(0,q.u1)(d)}`;c.pollerErrors.push(b),s.warn("response-poller:stop-failed",{worktreeId:a,cliToolId:e,error:d instanceof Error?d.message:String(d)})}}try{(0,e._C)(a),c.pollersStopped.push("auto-yes-poller")}catch(d){let b=`auto-yes-poller: ${(0,q.u1)(d)}`;c.pollerErrors.push(b),s.warn("auto-yes-poller:stop-failed",{worktreeId:a,error:d instanceof Error?d.message:String(d)})}try{(0,e.LP)(a),c.pollersStopped.push("auto-yes-state")}catch(d){let b=`auto-yes-state: ${(0,q.u1)(d)}`;c.pollerErrors.push(b),s.warn("auto-yes-state:delete-failed",{worktreeId:a,error:d instanceof Error?d.message:String(d)})}try{(0,f.Yg)(a),c.pollersStopped.push("schedule-manager")}catch(d){let b=`schedule-manager: ${(0,q.u1)(d)}`;c.pollerErrors.push(b),s.warn("schedule-manager:stop-failed",{worktreeId:a,error:d instanceof Error?d.message:String(d)})}try{(0,g.Tm)(a),c.pollersStopped.push("timer-manager")}catch(d){let b=`timer-manager: ${(0,q.u1)(d)}`;c.pollerErrors.push(b),s.warn("timer-manager:stop-failed",{worktreeId:a,error:d instanceof Error?d.message:String(d)})}return c}async function u(a,b){let c=await Promise.allSettled(a.map(a=>t(a,b))),d=[],e=[];for(let b=0;b<c.length;b++){let f=c[b],g=a[b];if("fulfilled"===f.status){let a=f.value;for(let b of(d.push(a),a.sessionErrors))e.push(`Session kill error (${g}): ${b}`);for(let b of a.pollerErrors)e.push(`Poller stop error (${g}): ${b}`)}else e.push(`Cleanup failed (${g}): ${(0,q.u1)(f.reason)}`)}return{results:d,warnings:e}}async function v(a,b){try{let c=i.CLIToolManager.getInstance().getTool(b);if(!await c.isRunning(a))return!1;let e=`${a}:${b}`;(0,d.clearPromptHashCache)(e);let f=c.getSessionName(a);return(0,j.fY)(f)}catch{return!1}}async function w(){for(let a of l.keys()){let b=l.get(a);b&&clearTimeout(b)}l.clear(),m.clear(),k.info("poll:all-stopped");let a=0,b=i.CLIToolManager.getInstance();for(let c of o.XH)try{let d=b.getTool(c).getSessionName(p.H1);await (0,j.N)(d)&&await (0,j.fY)(d)&&(a++,s.info("global-session:killed",{cliToolId:c,sessionName:d}))}catch(a){s.warn("global-session:kill-failed",{cliToolId:c,error:(0,q.u1)(a)})}return a}async function x(a,b){let c=(0,r.L0)(a,b);try{await w()}catch(a){s.warn("sync:global-cleanup-failed",{error:(0,q.u1)(a)})}let d=[];if(c.deletedIds.length>0)try{let a=await u(c.deletedIds,v);a.warnings.length>0&&(s.warn("sync:cleanup-warnings",{warnings:a.warnings}),d=[`${a.warnings.length} session cleanup warning(s) occurred`])}catch(a){s.error("sync:cleanup-failed",{error:(0,q.u1)(a)}),d=["Session cleanup encountered an error"]}return{syncResult:c,cleanupWarnings:d}}},82325:(a,b,c)=>{c.d(b,{Hz:()=>o,L0:()=>r,Mg:()=>s,YM:()=>p,Yp:()=>q});var d=c(79646),e=c(28354),f=c(29021),g=c.n(f),h=c(33873),i=c.n(h),j=c(23718),k=c(56791),l=c(72626),m=c(64185);let n=(0,l.h)("worktrees");function o(){let a=process.env.WORKTREE_REPOS;return a&&a.trim()?a.split(",").map(a=>a.trim()).filter(a=>a.length>0):[]}async function p(a){let b=(0,e.promisify)(d.exec);if(function(a){if(!a)return!1;try{return g().lstatSync(a),!1}catch(b){let a=b.code;return"ENOENT"===a||"ENOTDIR"===a}}(a))return n.warn("repository:scan-skipped-missing-dir",{repoPath:a}),[];try{let{stdout:c}=await b("git worktree list",{cwd:a}),d=function(a){if(!a||""===a.trim())return[];let b=a.trim().split("\n"),c=[];for(let a of b){let b=a.trim();if(!b)continue;let d=b.match(/^(.+?)\s+([a-z0-9]+)\s+(?:\[(.+?)\]|\(detached HEAD\))/);if(d){let[,a,b,e]=d;c.push({path:a.trim(),branch:e||`detached-${b}`,commit:b})}}return c}(c),e=i().resolve(a),f=i().basename(e);return(0,m.oZ)(e),d.map(a=>{let b=i().resolve(a.path);return{id:(0,j.ko)(b),name:a.branch,branch:a.branch,path:b,repositoryPath:e,repositoryName:f}}).filter(a=>["/etc","/root","/sys","/proc","/dev","/boot","/bin","/sbin","/usr/bin","/usr/sbin"].some(b=>a.path.startsWith(b))?(n.warn("worktree:unsafe-path-skipped",{path:a.path}),!1):!(a.path.includes("\0")||a.path.includes(".."))||(n.warn("worktree:malicious-path-skipped",{path:a.path}),!1))}catch(c){let a=c instanceof Error?c.message:String(c),b=c.code;if(a?.includes("not a git repository")||128===b)return[];throw c}}async function q(a){let b=await Promise.allSettled(a.map(async a=>{n.info("repository:scan-start",{repoPath:a});let b=await p(a);return n.info("repository:scan-complete",{repoPath:a,worktreeCount:b.length}),b})),c=[];for(let d=0;d<b.length;d++){let e=b[d];"fulfilled"===e.status?c.push(...e.value):n.error("repository:scan-failed",{repoPath:a[d],error:e.reason instanceof Error?e.reason.message:String(e.reason)})}return c}function r(a,b){if(0===b.length)return{deletedIds:[],upsertedCount:0};let c=[],d=0,e=new Map;for(let a of b){let b=a.repositoryPath||"";e.has(b)||e.set(b,[]),e.get(b).push(a)}let f=new Set([...(0,k.getAllWorktreeIds)(a),...(0,k.getAliasedWorktreeIds)(a)]),g=new Map((0,k.getAllWorktreePathIds)(a).map(a=>[i().resolve(a.path),a.id])),h=new Map,l=new Map;for(let[a,b]of g)h.set(a,new Set([b])),l.set(b,a);for(let b of(0,k.getAllWorktreeAliases)(a)){let a=l.get(b.worktreeId);a&&h.get(a)?.add(b.oldId)}let m=new Set(b.map(a=>i().resolve(a.path)));for(let[b,o]of e){if(!b)continue;let e=(0,k.getWorktreesByRepository)(a,b).filter(a=>!m.has(i().resolve(a.path))).map(a=>a.id);if(e.length>0){let b=(0,k.deleteWorktreesByIds)(a,e);for(let a of(c.push(...e),e)){f.delete(a);let b=l.get(a);void 0!==b&&(g.delete(b),h.delete(b))}n.info("worktree:cleanup",{deletedCount:b.deletedCount})}for(let b of o){let c=i().resolve(b.path),e=g.get(c),m=b.id,n=e??(m&&!f.has(m)?m:function(a,b,c){if(!c||0===c.size)return(0,j.ko)(a,b);let d=new Set(b);for(let a of c)d.delete(a);return(0,j.ko)(a,d)}(c,f,h.get(c)));f.add(n),g.set(c,n),l.set(n,c),(0,k.upsertWorktree)(a,{...b,id:n,name:b.branch??b.name}),d++}}return{deletedIds:c,upsertedCount:d}}function s(a,b){let c=new Set(b.map(a=>a.repositoryPath).filter(a=>!!a)),d=[];for(let b of(0,k.getRepositories)(a)){let e=b.path;if(!e||c.has(e)||function(a){if(!a)return!1;try{return g().existsSync(a)&&g().existsSync(i().join(a,".git"))}catch{return!0}}(e))continue;let f=(0,k.getWorktreesByRepository)(a,e).map(a=>a.id);if(0===f.length)continue;let h=(0,k.deleteWorktreesByIds)(a,f);d.push(...f),n.info("worktree:stale-repo-pruned",{repoPath:e,deletedCount:h.deletedCount})}return d}},85775:(a,b,c)=>{c.d(b,{Tm:()=>o,x4:()=>m,xJ:()=>n});var d=c(34129),e=c(43234),f=c(88807),g=c(72626),h=c(87374),i=c(39687);let j=(0,g.h)("timer-manager");function k(){return globalThis.__timerManagerState||(globalThis.__timerManagerState={timers:new Map,timerWorktrees:new Map,initialized:!1}),globalThis.__timerManagerState}async function l(a){let b=k(),c=(0,f.getDbInstance)();try{let b=(0,d.kx)(c,a);if(!b||"pending"!==b.status)return;let f=e.CLIToolManager.getInstance().getTool(b.cliToolId),g=b.instanceId;if(!await f.isRunning(b.worktreeId,g)){j.warn("timer:no-session",{timerId:a,worktreeId:b.worktreeId,instanceId:g}),(0,d.j2)(c,a,h.HR.NO_SESSION);return}(0,d.j2)(c,a,"sending");let k=await (0,i.d)(c,{worktreeId:b.worktreeId,content:b.message,cliToolId:b.cliToolId,instanceId:g});if(!k.ok){let b=`[${k.stage}] ${k.error}`;(0,d.j2)(c,a,"failed",void 0,b),j.error("timer:send-failed",{timerId:a,stage:k.stage,error:k.error});return}(0,d.j2)(c,a,"sent",Date.now()),j.info("timer:sent",{timerId:a,worktreeId:b.worktreeId})}catch(e){let b=e instanceof Error?e.message:String(e);try{(0,d.j2)(c,a,"failed",void 0,b)}catch{}j.error("timer:send-failed",{timerId:a,error:b})}finally{b.timers.delete(a),b.timerWorktrees.delete(a)}}function m(a,b,c){let d=k(),e=setTimeout(()=>{l(a)},c);d.timers.set(a,e),d.timerWorktrees.set(a,b)}function n(a){let b=k(),c=b.timers.get(a);c&&(clearTimeout(c),b.timers.delete(a),b.timerWorktrees.delete(a));let e=(0,f.getDbInstance)();(0,d.Ud)(e,a)}function o(a){let b=k(),c=(0,f.getDbInstance)();for(let[c,d]of b.timerWorktrees)if(d===a){let a=b.timers.get(c);a&&clearTimeout(a),b.timers.delete(c),b.timerWorktrees.delete(c)}(0,d.$$)(c,a)}},95220:(a,b,c)=>{c.r(b),c.d(b,{accumulateTuiContent:()=>g.IZ,cleanClaudeResponse:()=>f.NN,cleanCopilotResponse:()=>f.LH,cleanGeminiResponse:()=>f.IS,cleanOpenCodeResponse:()=>f.aW,clearPromptHashCache:()=>h.iX,clearTuiAccumulator:()=>g.q1,extractCopilotContentLines:()=>g.o0,extractTuiContentLines:()=>g.K0,findOverlapIndex:()=>g.vQ,getAccumulatedContent:()=>g.Uz,getActivePollers:()=>d.KQ,initTuiAccumulator:()=>g.tb,isDuplicatePrompt:()=>h.gv,isOpenCodeComplete:()=>e.bE,migrateResponsePollerWorktreeIds:()=>d.sR,normalizeCopilotLine:()=>g.IW,normalizePromptForDedup:()=>h.zm,renamePromptHashCacheKey:()=>h.i2,resolveExtractionStartIndex:()=>e.QM,startPolling:()=>d.g8,stopAllPolling:()=>d.fq,stopPolling:()=>d.Et,truncateMessage:()=>f.Sj});var d=c(45146),e=c(60),f=c(82450),g=c(13033),h=c(72457)}};

package/.next/server/chunks/6808.js

@@ -1 +0,0 @@
-"use strict";exports.id=6808,exports.ids=[6808],exports.modules={3421:(a,b,c)=>{Object.defineProperty(b,"I",{enumerable:!0,get:function(){return g}});let d=c(71237),e=c(55088),f=c(17679);async function g(a,b,c,g){if((0,d.isNodeNextResponse)(b)){var h;b.statusCode=c.status,b.statusMessage=c.statusText;let d=["set-cookie","www-authenticate","proxy-authenticate","vary"];null==(h=c.headers)||h.forEach((a,c)=>{if("x-middleware-set-cookie"!==c.toLowerCase())if("set-cookie"===c.toLowerCase())for(let d of(0,f.splitCookiesString)(a))b.appendHeader(c,d);else{let e=void 0!==b.getHeader(c);(d.includes(c.toLowerCase())||!e)&&b.appendHeader(c,a)}});let{originalResponse:i}=b;c.body&&"HEAD"!==a.method?await (0,e.pipeToNodeResponse)(c.body,i,g):i.end()}}},7329:(a,b,c)=>{c.d(b,{Hv:()=>m,W3:()=>k,uK:()=>l});var d=c(90787),e=c(52660),f=c(18201),g=c(23854),h=c(49798),i=c(67164);let j=(0,c(72626).h)("relay-service");function k(a,b){for(let c of[b.from.worktreeId,b.to.worktreeId])if(!(0,h.r)(a,c))return{ok:!1,refusal:{code:"RELAY_WORKTREE_NOT_FOUND",message:`Worktree '${c}' not found`,worktreeId:c}};let c=(0,g.$G)({from:b.from,to:b.to,parentHops:function(a,b){try{let g=(0,h.S)(a,b),i=(0,e.getMessages)(a,b.worktreeId,{limit:5,limitUnit:"pairs",cliToolId:g.cliToolId,instanceId:b.instanceId,matchResolvedInstance:!0}).filter(a=>"user"===a.role),j=i.findIndex(a=>"relay"===a.messageType);if(-1===j)return null;let k=i[j];for(let a=0;a<j;a+=1){var c;if(c=i[a],c.timestamp.getTime()<k.timestamp.getTime()||(0,f.pk)(c.content)!==(0,f.pk)(k.content))return null}let l=(0,e.parseRelayRequestId)(k.requestId);if(!l)return null;return(0,d.Ip)(a,l)?.hops??null}catch(a){return j.warn("relay-parent-lookup-failed",{worktreeId:b.worktreeId,instanceId:b.instanceId,error:a instanceof Error?a.message:String(a)}),null}}(a,b.from),allowRelayChain:!0===b.allowRelayChain,openBetween:(0,d.Oz)(a,b.from,b.to)});if((0,g.Qe)(c))return{ok:!1,refusal:c};let k=b.now??Date.now(),l=(0,d.CR)(a,{from:b.from,to:b.to,hops:c.hops,expiresAt:k+(0,g.AL)(b.ttlMs),now:k});return j.info("relay-opened",{relayId:l.id,from:`${l.from.worktreeId}/${l.from.instanceId}`,to:`${l.to.worktreeId}/${l.to.instanceId}`,hops:l.hops}),(0,i._)(a,l.id,"requested",(0,h.S)(a,l.from),(0,h.S)(a,l.to),k),{ok:!0,relay:l}}function l(a,b,c=Date.now()){let e=(0,d.Ip)(a,b);return e?(0,d.m_)(a,b,c)?(j.info("relay-cancelled",{relayId:b}),{ok:!0,relay:(0,d.Ip)(a,b)??e}):{ok:!1,reason:"already_closed",relay:e}:{ok:!1,reason:"not_found",relay:null}}function m(a,b){return(0,d.M4)(a,b)}},18201:(a,b,c)=>{c.d(b,{Ce:()=>g,pk:()=>e});let d=(0,c(72626).h)("lib/history/user-turn-recorder");function e(a){return a.replace(/\r\n?/g,"\n").split("\n").map(a=>a.replace(/[ \t　]+$/u,"")).join("\n").trim()}function f(a){return{worktreeId:a.worktreeId,cliToolId:a.cliToolId,instanceId:a.instanceId??a.cliToolId}}async function g(a,b,h,i,j={}){let k=a.instanceId??a.cliToolId,l=e(h);if(0===b.length||0===l.length)return{outcome:"skipped",messageId:null,timestampMs:null};try{let[{getDbInstance:g},m,{broadcastMessage:n}]=await Promise.all([Promise.resolve().then(c.bind(c,88807)),Promise.resolve().then(c.bind(c,52660)),Promise.resolve().then(c.bind(c,49640))]),o=g(),p=m.findMessageByRequestId(o,a.worktreeId,b);if(p)return{outcome:"already-recorded",messageId:p.id,timestampMs:p.timestamp.getTime()};let q=i>0?i:Date.now(),r=function(a,b,c,g,h,i,j,k){var l,m,n;let o=Math.min(j-12e4,k.adoptionFromMs??1/0),p=(l=a.findUnkeyedUserMessages(b,{worktreeId:c.worktreeId,cliToolId:c.cliToolId,instanceId:g,fromMs:o,toMs:j+12e4,includeRelayDelivered:!0}),m=i,n=j,l.filter(a=>e(a.content)===m).sort((a,b)=>Math.abs(a.timestamp.getTime()-n)-Math.abs(b.timestamp.getTime()-n)));for(let e of p)if(!e.requestId&&a.setMessageRequestId(b,e.id,h))return d.info("user-turn-adopted",{...f(c),requestId:h,messageId:e.id,driftMs:e.timestamp.getTime()-j}),{outcome:"adopted",messageId:e.id,timestampMs:e.timestamp.getTime()};let q=p.find(a=>a.requestId);return q?(d.info("user-turn-already-relayed",{...f(c),requestId:h,messageId:q.id,relayRequestId:q.requestId??null,driftMs:q.timestamp.getTime()-j}),{outcome:"already-recorded",messageId:q.id,timestampMs:q.timestamp.getTime()}):null}(m,o,a,k,b,l,q,j);if(r)return r;let s=m.createMessage(o,{worktreeId:a.worktreeId,role:"user",content:h,messageType:"normal",timestamp:new Date(q),cliToolId:a.cliToolId,instanceId:k,requestId:b});return n("message",{worktreeId:a.worktreeId,message:s}),d.info("user-turn-recorded",{...f(a),requestId:b,contentLength:h.length}),{outcome:"inserted",messageId:s.id,timestampMs:q}}catch(c){return d.error("user-turn-record-failed",{...f(a),requestId:b,error:c instanceof Error?c.message:String(c)}),{outcome:"failed",messageId:null,timestampMs:null}}}},95736:(a,b,c)=>{a.exports=c(44870)}};