commandmate 0.44.1 → 0.44.3

package/dist/server/src/lib/hooks/sources/antigravity/history.js

@@ -120,7 +120,7 @@ exports.antigravityTranscriptPath = antigravityTranscriptPath;
 exports.acceptAntigravityTranscriptPath = acceptAntigravityTranscriptPath;
 exports.captureAntigravityTranscriptTurn = captureAntigravityTranscriptTurn;
 exports.resolveAntigravityTranscriptPath = resolveAntigravityTranscriptPath;
-const promises_1 = require("fs/promises");
+const global_state_1 = require("../../../../lib/global-state");
 const os_1 = require("os");
 const path_1 = require("path");
 const auto_yes_state_1 = require("../../../../lib/auto-yes-state");
@@ -129,6 +129,7 @@ const user_turn_recorder_1 = require("../../../../lib/history/user-turn-recorder
 const assistant_response_saver_1 = require("../../../../lib/assistant-response-saver");
 const logger_1 = require("../../../../lib/logger");
 const agent_transcript_1 = require("../../../../types/agent-transcript");
+const transcript_history_1 = require("../transcript-history");
 const transcript_1 = require("./transcript");
 const logger = (0, logger_1.createLogger)('lib/hooks/sources/antigravity/history');
 /**
@@ -178,7 +179,7 @@ const ANTIGRAVITY_CONVERSATION_ID_PATTERN = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9
  * agy sends `conversationId` on every event it delivers — but a future one that
  * did not would otherwise blank the pointer mid-session.
  */
-const conversationPointers = (globalThis.__antigravityTranscriptConversations ??= new Map());
+const conversationPointers = (0, global_state_1.getOrInitGlobal)('__antigravityTranscriptConversations', () => new Map());
 /**
  * How many written-but-unconfirmed turns one instance may be following (#2443).
  *
@@ -212,7 +213,7 @@ exports.ANTIGRAVITY_UNSETTLED_TURN_LIMIT = 16;
  * coverage #2438 shipped. Persisting it would make a row's repair depend on a
  * table that outlives the transcript window it can only be repaired from.
  */
-const unsettledTurns = (globalThis.__antigravityUnsettledTurns ??= new Map());
+const unsettledTurns = (0, global_state_1.getOrInitGlobal)('__antigravityUnsettledTurns', () => new Map());
 function keyOf(target) {
     return (0, auto_yes_state_1.buildCompositeKey)(target.worktreeId, target.cliToolId, target.instanceId);
 }
@@ -346,24 +347,7 @@ async function resolveAntigravityStopAt(target) {
  * status quo.
  */
 async function resolveAntigravityConversationId(target) {
-    const key = keyOf(target);
-    try {
-        const { getLastAgentEvent } = await Promise.resolve().then(() => __importStar(require('../../../../lib/session/agent-event-state')));
-        const conversationId = getLastAgentEvent(target.worktreeId, target.cliToolId, target.instanceId)?.sessionId;
-        if (typeof conversationId === 'string' && conversationId.length > 0) {
-            conversationPointers.set(key, conversationId);
-            return conversationId;
-        }
-    }
-    catch (error) {
-        // A state module that cannot be reached is one that knows no conversation.
-        logger.debug('antigravity-transcript-conversation-lookup-failed', {
-            worktreeId: target.worktreeId,
-            instanceId: target.instanceId ?? target.cliToolId,
-            error: error instanceof Error ? error.message : String(error),
-        });
-    }
-    return conversationPointers.get(key) ?? null;
+    return (0, transcript_history_1.resolveSessionIdFromEvents)(target, conversationPointers, keyOf(target), logger, 'antigravity-transcript-conversation-lookup-failed');
 }
 /**
  * `~/.gemini/antigravity-cli`.
@@ -408,15 +392,7 @@ function antigravityTranscriptPath(agyHome, conversationId) {
  * @returns The resolved path, or null when it is not acceptable
  */
 function acceptAntigravityTranscriptPath(agyHome, candidate) {
-    if (!candidate.endsWith(transcript_1.ANTIGRAVITY_TRANSCRIPT_EXTENSION))
-        return null;
-    if (candidate.includes('\0'))
-        return null;
-    const root = (0, path_1.resolve)(antigravityBrainRoot(agyHome));
-    const resolved = (0, path_1.resolve)(candidate);
-    if (resolved !== root && !resolved.startsWith(root + path_1.sep))
-        return null;
-    return resolved;
+    return (0, transcript_history_1.acceptPathUnderRoot)(antigravityBrainRoot(agyHome), transcript_1.ANTIGRAVITY_TRANSCRIPT_EXTENSION, candidate);
 }
 /**
  * Read this instance's unwritten turns out of its transcript and write them.
@@ -616,7 +592,7 @@ async function captureAntigravityTranscriptTurn(target, capture = {}, report) {
         let captured = false;
         for (let index = 0; index < pending.turns.length; index += 1) {
             const turn = pending.turns[index];
-            captured = await writeAntigravityTurn(target, turn, (0, transcript_1.renderAntigravityTurn)(turn), resolveAssistantTimestampMs(turn, userRows[index], (0, transcript_1.antigravityTurnLastRecordAt)(turn), nextTurnOpensAt(pending.turns, userRows, index)), path, report);
+            captured = await writeAntigravityTurn(target, turn, (0, transcript_1.renderAntigravityTurn)(turn), (0, transcript_history_1.resolveAssistantTimestampMs)(turn, userRows[index], (0, transcript_1.antigravityTurnLastRecordAt)(turn), (0, transcript_history_1.nextTurnOpensAt)(pending.turns, userRows, index)), path, report);
             // Issue #2443: a row now exists for this turn, and whether it is the body
             // agy finished on is a separate question from whether it could be saved.
             // An unconfirmed one joins the follow list so that its conclusion is still
@@ -675,27 +651,7 @@ async function resolveAntigravityTranscriptPath(target, capture = {}) {
  * @param turns - Every turn in the window, oldest first
  */
 async function selectUnwrittenAntigravityTurns(target, turns) {
-    const [{ getDbInstance }, { findMessageByRequestId }] = await Promise.all([
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db/db-instance'))),
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db'))),
-    ]);
-    const db = getDbInstance();
-    for (let index = turns.length - 1; index >= 0; index -= 1) {
-        const turn = turns[index];
-        const requestId = (0, agent_transcript_1.antigravityTurnRequestId)(turn.conversationId, turn.stepIndex);
-        if (!findMessageByRequestId(db, target.worktreeId, requestId))
-            continue;
-        return {
-            turns: turns.slice(index + 1),
-            previousStartedAt: turn.startedAt,
-            anchored: true,
-        };
-    }
-    return {
-        turns: turns.slice(-1),
-        previousStartedAt: turns.length > 1 ? turns[turns.length - 2].startedAt : 0,
-        anchored: false,
-    };
+    return (0, transcript_history_1.selectUnwrittenTurns)(target, turns, (turn) => (0, agent_transcript_1.antigravityTurnRequestId)(turn.conversationId, turn.stepIndex));
 }
 /**
  * The transcript file for this conversation, or null.
@@ -712,15 +668,7 @@ async function locateAntigravityTranscript(agyHome, conversationId) {
     const accepted = acceptAntigravityTranscriptPath(agyHome, candidate);
     if (!accepted)
         return null;
-    return (await isReadableFile(accepted)) ? accepted : null;
-}
-async function isReadableFile(path) {
-    try {
-        return (await (0, promises_1.stat)(path)).isFile();
-    }
-    catch {
-        return false;
-    }
+    return (await (0, transcript_history_1.isReadableFile)(accepted)) ? accepted : null;
 }
 /**
  * Record the prompt this turn answers, before the reply is written (#2196).
@@ -757,7 +705,7 @@ async function recordAntigravityUserTurn(target, turn, previousStartedAt = 0) {
     }
     return recorded;
 }
-/**
+/*
  * When the assistant row for this turn is dated.
  *
  * **The turn's LAST record, not its first (Issue #2273).** #2196 dated the reply
@@ -789,14 +737,7 @@ async function recordAntigravityUserTurn(target, turn, previousStartedAt = 0) {
  * @param nextTurnOpensAt - Epoch ms of the next turn's user row, or null when
  *   this is the newest turn in the window
  */
-function resolveAssistantTimestampMs(turn, userRow, lastRecordAt = 0, nextTurnOpensAt = null) {
-    const earliest = userRow.timestampMs === null
-        ? turn.startedAt
-        : Math.max(turn.startedAt, userRow.timestampMs + 1);
-    const latest = nextTurnOpensAt === null ? Number.POSITIVE_INFINITY : nextTurnOpensAt - 1;
-    return Math.max(earliest, Math.min(lastRecordAt, latest));
-}
-/**
+/*
  * The instant the next pending turn's prompt row carries, or null (Issue #2273).
  *
  * The user row's own timestamp when there is one, because that is what History
@@ -805,12 +746,6 @@ function resolveAssistantTimestampMs(turn, userRow, lastRecordAt = 0, nextTurnOp
  * prompt is while the previous turn was still running. The turn's start is the
  * fallback for a turn that produced no row at all.
  */
-function nextTurnOpensAt(turns, userRows, index) {
-    const next = turns[index + 1];
-    if (!next)
-        return null;
-    return userRows[index + 1]?.timestampMs ?? next.startedAt;
-}
 /**
  * How many already-written turns are re-rendered and compared (Issue #2438).
  *

package/dist/server/src/lib/hooks/sources/antigravity/hooks-config.js

@@ -80,10 +80,12 @@ exports.buildAntigravityStopHookCommand = buildAntigravityStopHookCommand;
 exports.buildAntigravityPermissionHookCommand = buildAntigravityPermissionHookCommand;
 exports.buildAntigravityHookConfig = buildAntigravityHookConfig;
 exports.mergeAntigravityHooksConfig = mergeAntigravityHooksConfig;
+exports.inspectAntigravityHooksConfigReadOnly = inspectAntigravityHooksConfigReadOnly;
 exports.writeAntigravityHooksConfig = writeAntigravityHooksConfig;
 exports.buildAntigravityLaunchCommand = buildAntigravityLaunchCommand;
 const os_1 = require("os");
 const path_1 = require("path");
+const uat_isolation_1 = require("../../../../config/uat-isolation");
 const types_1 = require("../../../../lib/cli-tools/types");
 const agent_event_types_1 = require("../../../../lib/hooks/agent-event-types");
 const hook_settings_generator_1 = require("../../../../lib/hooks/hook-settings-generator");
@@ -359,9 +361,58 @@ function buildAntigravityHookConfig(relayPath) {
 function mergeAntigravityHooksConfig(existing, config) {
     return { ...existing, [exports.ANTIGRAVITY_HOOK_NAME]: config };
 }
+/**
+ * Whether the shared `~/.gemini/config/hooks.json` may be used, unwritten, by a
+ * server in UAT isolation mode (`CM_UAT_ISOLATION=1`, Issue #3360).
+ *
+ * Usable only when the file holds CommandMate's named hook and nothing else,
+ * exactly as this build writes it. A comparison against the merge with what is
+ * there would keep the user's own hooks (one may post straight to production)
+ * and still compare equal, so any other top-level key is refused, with its own
+ * reason.
+ */
+function inspectAntigravityHooksConfigReadOnly(options = {}) {
+    const configPath = getAntigravityHooksConfigPath(options);
+    if (!(0, hook_settings_generator_1.isHookInjectionEnabled)()) {
+        return {
+            usable: false,
+            reason: 'CM_AGENT_HOOKS_INJECT=0',
+            fix: 'Do not combine CM_AGENT_HOOKS_INJECT=0 with UAT isolation.',
+        };
+    }
+    const relayPath = (0, hook_settings_generator_1.resolveRelayScriptPath)();
+    if (!relayPath) {
+        return { usable: false, reason: 'this build ships no relay script', fix: uat_isolation_1.UAT_SAME_BUILD_FIX };
+    }
+    const existing = (0, shared_config_tree_1.readJsonObjectFile)(configPath);
+    if (existing === null) {
+        logger.info('antigravity-hooks-config-absent-readonly', { configPath });
+        return { usable: false, reason: `${configPath} does not exist or cannot be read`, fix: uat_isolation_1.UAT_SAME_BUILD_FIX };
+    }
+    if (Object.keys(existing).some((key) => key !== exports.ANTIGRAVITY_HOOK_NAME)) {
+        logger.info('antigravity-hooks-config-foreign-readonly', { configPath });
+        return {
+            usable: false,
+            reason: `${configPath} also holds hooks (or keys) CommandMate did not write, which would run in the UAT session`,
+            fix: 'Skip antigravity scenarios in this UAT, or run it where the shared hooks file holds only the hook CommandMate writes.',
+        };
+    }
+    const own = mergeAntigravityHooksConfig(null, buildAntigravityHookConfig(relayPath));
+    if (JSON.stringify(existing) !== JSON.stringify(own)) {
+        logger.info('antigravity-hooks-config-differs-readonly', { configPath });
+        return { usable: false, reason: `${configPath} differs from what this build writes`, fix: uat_isolation_1.UAT_SAME_BUILD_FIX };
+    }
+    return { usable: true, configPath };
+}
 /**
  * Write `~/.gemini/config/hooks.json`.
  *
+ * Under `CM_UAT_ISOLATION=1` (Issue #3360) nothing is written: an existing file
+ * that already holds exactly this config is reused, anything else answers null
+ * (and `source.prepareLaunch` then refuses the launch). Under `own-home`
+ * (Issue #3312) it is written once the path checks out, else this throws
+ * `UatIsolationLaunchRefusedError`.
+ *
  * @returns The path written, or null when injection is off or not possible
  */
 function writeAntigravityHooksConfig(options = {}) {
@@ -373,9 +424,20 @@ function writeAntigravityHooksConfig(options = {}) {
         return null;
     }
     const configPath = getAntigravityHooksConfigPath(options);
+    // Issue #3312: outside the fail-open `try` on purpose — under `own-home` a
+    // path outside the dedicated user's HOME refuses the launch.
+    const policy = (0, uat_isolation_1.sharedHookWritePolicy)('antigravity', [configPath]);
     try {
+        if (policy === 'read-only') {
+            // Issue #3360: the file is the user's, shared with their production
+            // server, and names a relay by this checkout's path. A UAT server writes
+            // nothing to it; see {@link inspectAntigravityHooksConfigReadOnly}.
+            const inspection = inspectAntigravityHooksConfigReadOnly(options);
+            return inspection.usable ? inspection.configPath : null;
+        }
         const existing = (0, shared_config_tree_1.readJsonObjectFile)(configPath);
-        (0, shared_config_tree_1.writeJsonObjectFile)(configPath, mergeAntigravityHooksConfig(existing, buildAntigravityHookConfig(relayPath)));
+        const merged = mergeAntigravityHooksConfig(existing, buildAntigravityHookConfig(relayPath));
+        (0, shared_config_tree_1.writeJsonObjectFile)(configPath, merged);
         return configPath;
     }
     catch (error) {

package/dist/server/src/lib/hooks/sources/antigravity/source.js

@@ -66,6 +66,7 @@ exports.antigravityAgentEventSource = void 0;
 exports.parseAntigravityPermissionRequest = parseAntigravityPermissionRequest;
 exports.encodeAntigravityVerdict = encodeAntigravityVerdict;
 exports.extractAntigravityEventDetail = extractAntigravityEventDetail;
+const uat_isolation_1 = require("../../../../config/uat-isolation");
 const agent_event_types_1 = require("../../../../lib/hooks/agent-event-types");
 const permission_request_payload_1 = require("../../../../lib/hooks/permission-request-payload");
 const define_source_1 = require("../define-source");
@@ -263,6 +264,21 @@ exports.antigravityAgentEventSource = (0, define_source_1.definePushHookSource)(
     // so no worktree path is needed and `prepareLaunch` really does write it.
     prepareLaunch: ({ target, executablePath }) => {
         const settingsPath = (0, hooks_config_1.writeAntigravityHooksConfig)();
+        // Issue #3360: under UAT isolation the shared file is never written, and a
+        // file this build did not produce is refused rather than launched against —
+        // agy reads `~/.gemini/config/hooks.json` whatever this server passes, so
+        // "without hooks" would mean production's hooks in the UAT session.
+        if (settingsPath === null && (0, uat_isolation_1.isUatIsolationEnabled)()) {
+            // Issue #3312: under `own-home` the file is written, not inspected, so a
+            // null here is a write that failed — still refused, never started bare.
+            if ((0, uat_isolation_1.getUatIsolationMode)() === 'own-home') {
+                throw new uat_isolation_1.UatIsolationLaunchRefusedError('antigravity', '~/.gemini/config/hooks.json could not be prepared', uat_isolation_1.UAT_SAME_BUILD_FIX);
+            }
+            const inspection = (0, hooks_config_1.inspectAntigravityHooksConfigReadOnly)();
+            throw inspection.usable
+                ? new uat_isolation_1.UatIsolationLaunchRefusedError('antigravity', '~/.gemini/config/hooks.json could not be prepared', uat_isolation_1.UAT_SAME_BUILD_FIX)
+                : new uat_isolation_1.UatIsolationLaunchRefusedError('antigravity', inspection.reason, inspection.fix);
+        }
         // #1846: the two correlation URLs are the plan's `env`. `worktreePath` is
         // in the context now and deliberately unused here — agy's config is one
         // file for the machine, so there is nothing per-worktree to write.

package/dist/server/src/lib/hooks/sources/antigravity/transcript.js

@@ -174,7 +174,7 @@ function readAntigravityToolCall(value) {
     const detail = args
         ? ((0, event_mapper_1.readStringField)(args, 'toolAction') ?? (0, event_mapper_1.readStringField)(args, 'toolSummary'))
         : null;
-    return { name, detail: detail ? boundDetailText(collapseToLine(detail)) : null };
+    return { name, detail: detail ? boundDetailText((0, turn_body_1.collapseToLine)(detail)) : null };
 }
 /**
  * Read one parsed transcript line.
@@ -379,13 +379,8 @@ function renderThinking(text) {
         .join('\n');
     return `> **${exports.ANTIGRAVITY_THINKING_LABEL}**\n>\n${quoted}`;
 }
-function collapseToLine(value) {
-    return value.replace(/\s+/g, ' ').trim();
-}
 function boundDetailText(value) {
-    return value.length <= exports.MAX_ANTIGRAVITY_TOOL_DETAIL_LENGTH
-        ? value
-        : `${value.slice(0, exports.MAX_ANTIGRAVITY_TOOL_DETAIL_LENGTH - 1)}…`;
+    return (0, turn_body_1.boundDetail)(value, exports.MAX_ANTIGRAVITY_TOOL_DETAIL_LENGTH);
 }
 /**
  * Render one turn to Markdown.
@@ -432,11 +427,7 @@ function renderAntigravityTurn(turn) {
             unknown.add(record.type);
     }
     let body = (0, turn_body_1.separateTurnBody)(rendered).body;
-    if (body.length > exports.MAX_ANTIGRAVITY_TURN_BODY_LENGTH) {
-        body =
-            body.slice(0, exports.MAX_ANTIGRAVITY_TURN_BODY_LENGTH - exports.ANTIGRAVITY_TURN_TRUNCATION_MARKER.length) +
-                exports.ANTIGRAVITY_TURN_TRUNCATION_MARKER;
-    }
+    body = (0, turn_body_1.truncateTurnBody)(body, exports.MAX_ANTIGRAVITY_TURN_BODY_LENGTH, exports.ANTIGRAVITY_TURN_TRUNCATION_MARKER);
     return {
         conversationId: turn.conversationId,
         stepIndex: turn.stepIndex,

package/dist/server/src/lib/hooks/sources/claude/history.js

@@ -99,6 +99,7 @@ exports.acceptClaudeTranscriptHint = acceptClaudeTranscriptHint;
 exports.captureClaudeTranscriptTurn = captureClaudeTranscriptTurn;
 exports.resolveClaudeTranscriptPath = resolveClaudeTranscriptPath;
 exports.readClaudeTurnProgress = readClaudeTurnProgress;
+const global_state_1 = require("../../../../lib/global-state");
 const promises_1 = require("fs/promises");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -107,6 +108,7 @@ const user_turn_recorder_1 = require("../../../../lib/history/user-turn-recorder
 const assistant_response_saver_1 = require("../../../../lib/assistant-response-saver");
 const logger_1 = require("../../../../lib/logger");
 const agent_transcript_1 = require("../../../../types/agent-transcript");
+const transcript_history_1 = require("../transcript-history");
 const transcript_1 = require("./transcript");
 const logger = (0, logger_1.createLogger)('lib/hooks/sources/claude/history');
 /**
@@ -180,7 +182,7 @@ const CLAUDE_TRANSCRIPT_EXTENSION = '.jsonl';
  * mid-session. Same reasoning as `getLastKnownAgentModel`, which latches for the
  * same reason.
  */
-const sessionPointers = (globalThis.__claudeTranscriptSessions ??= new Map());
+const sessionPointers = (0, global_state_1.getOrInitGlobal)('__claudeTranscriptSessions', () => new Map());
 function keyOf(target) {
     return (0, auto_yes_state_1.buildCompositeKey)(target.worktreeId, target.cliToolId, target.instanceId);
 }
@@ -196,24 +198,7 @@ function resetClaudeTranscriptSessions() {
  * become a static dependency of the poller.
  */
 async function resolveClaudeSessionId(target) {
-    const key = keyOf(target);
-    try {
-        const { getLastAgentEvent } = await Promise.resolve().then(() => __importStar(require('../../../../lib/session/agent-event-state')));
-        const sessionId = getLastAgentEvent(target.worktreeId, target.cliToolId, target.instanceId)?.sessionId;
-        if (typeof sessionId === 'string' && sessionId.length > 0) {
-            sessionPointers.set(key, sessionId);
-            return sessionId;
-        }
-    }
-    catch (error) {
-        // A state module that cannot be reached is one that knows no session id.
-        logger.debug('claude-transcript-session-lookup-failed', {
-            worktreeId: target.worktreeId,
-            instanceId: target.instanceId ?? target.cliToolId,
-            error: error instanceof Error ? error.message : String(error),
-        });
-    }
-    return sessionPointers.get(key) ?? null;
+    return (0, transcript_history_1.resolveSessionIdFromEvents)(target, sessionPointers, keyOf(target), logger, 'claude-transcript-session-lookup-failed');
 }
 /** `<home>/.claude/projects`. */
 function claudeProjectsRoot(homeDir) {
@@ -249,15 +234,7 @@ function claudeTranscriptPath(homeDir, worktreePath, sessionId) {
  * @returns The resolved path, or null when it is not acceptable
  */
 function acceptClaudeTranscriptHint(homeDir, hint) {
-    if (!hint.endsWith(CLAUDE_TRANSCRIPT_EXTENSION))
-        return null;
-    if (hint.includes('\0'))
-        return null;
-    const root = (0, path_1.resolve)(claudeProjectsRoot(homeDir));
-    const resolved = (0, path_1.resolve)(hint);
-    if (resolved !== root && !resolved.startsWith(root + path_1.sep))
-        return null;
-    return resolved;
+    return (0, transcript_history_1.acceptPathUnderRoot)(claudeProjectsRoot(homeDir), CLAUDE_TRANSCRIPT_EXTENSION, hint);
 }
 /**
  * Read this instance's unwritten turns out of its transcript and write them.
@@ -467,7 +444,7 @@ async function captureClaudeTranscriptTurn(target, capture, report) {
         let captured = false;
         for (let index = 0; index < pending.turns.length; index += 1) {
             const turn = pending.turns[index];
-            captured = await writeClaudeTurn(target, turn, (0, transcript_1.renderClaudeTurn)(turn), resolveAssistantTimestampMs(turn, userRows[index], lastRecordAt.get(turn.promptUuid) ?? 0, nextTurnOpensAt(pending.turns, userRows, index)), path, report);
+            captured = await writeClaudeTurn(target, turn, (0, transcript_1.renderClaudeTurn)(turn), (0, transcript_history_1.resolveAssistantTimestampMs)(turn, userRows[index], lastRecordAt.get(turn.promptUuid) ?? 0, (0, transcript_history_1.nextTurnOpensAt)(pending.turns, userRows, index)), path, report);
         }
         if (captured) {
             // Issue #2437: History now holds this turn as the agent's own Markdown.
@@ -518,26 +495,7 @@ async function captureClaudeTranscriptTurn(target, capture, report) {
  * @param turns - Every turn in the window, oldest first
  */
 async function selectUnwrittenClaudeTurns(target, turns) {
-    const [{ getDbInstance }, { findMessageByRequestId }] = await Promise.all([
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db/db-instance'))),
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db'))),
-    ]);
-    const db = getDbInstance();
-    for (let index = turns.length - 1; index >= 0; index -= 1) {
-        const requestId = (0, agent_transcript_1.claudeTurnRequestId)(turns[index].promptUuid);
-        if (!findMessageByRequestId(db, target.worktreeId, requestId))
-            continue;
-        return {
-            turns: turns.slice(index + 1),
-            previousStartedAt: turns[index].startedAt,
-            anchored: true,
-        };
-    }
-    return {
-        turns: turns.slice(-1),
-        previousStartedAt: turns.length > 1 ? turns[turns.length - 2].startedAt : 0,
-        anchored: false,
-    };
+    return (0, transcript_history_1.selectUnwrittenTurns)(target, turns, (turn) => (0, agent_transcript_1.claudeTurnRequestId)(turn.promptUuid));
 }
 /**
  * The transcript file this instance would be read from, or null (Issue #2246).
@@ -780,43 +738,6 @@ async function recordClaudeUserTurn(target, turn, previousStartedAt = 0) {
     }
     return recorded;
 }
-/**
- * When the assistant row for this turn is dated.
- *
- * **The turn's LAST assistant record, not its prompt (Issue #2273).** #2121
- * dated the reply by the prompt record's clock so that a row written a poll late
- * still sorted where the conversation put it, and #2196 moved it one millisecond
- * on so that `groupMessagesIntoPairs` — which orders by timestamp and nothing
- * else — could never return the answer above the question. Both properties
- * survive: `earliest` is a floor this never goes under.
- *
- * What neither accounted for is the row that lands BETWEEN the prompt and the
- * reply. A tool approval is written when the dialog appears, seconds into the
- * turn, and the chat surface orders its rows by timestamp — so a reply dated at
- * the turn's start draws ABOVE an approval that really happened before it. The
- * measured case is in the Issue: prompt `04:49:50.989Z`, reply `04:49:54.000Z`,
- * approval `04:49:57.513Z`, rendered as question → answer → approval.
- *
- * The turn's last assistant record is the moment the reply was finished, so
- * everything the turn produced on the way sorts before it. `lastRecordAt` is 0
- * when the window held no timestamped assistant record for the turn, and the row
- * is then dated exactly where #2196 put it.
- *
- * `nextTurnOpensAt` is the ceiling. The next turn's prompt row may be a `/send`
- * row written while THIS turn was still running — a queued prompt — and a reply
- * that overtook it would be paired with the wrong question.
- *
- * @param lastRecordAt - Epoch ms of the turn's last assistant record, or 0
- * @param nextTurnOpensAt - Epoch ms of the next turn's user row, or null when
- *   this is the newest turn in the window
- */
-function resolveAssistantTimestampMs(turn, userRow, lastRecordAt = 0, nextTurnOpensAt = null) {
-    const earliest = userRow.timestampMs === null
-        ? turn.startedAt
-        : Math.max(turn.startedAt, userRow.timestampMs + 1);
-    const latest = nextTurnOpensAt === null ? Number.POSITIVE_INFINITY : nextTurnOpensAt - 1;
-    return Math.max(earliest, Math.min(lastRecordAt, latest));
-}
 /**
  * When each turn's last assistant record was written (Issue #2273).
  *
@@ -850,21 +771,6 @@ function lastClaudeAssistantRecordAt(records) {
     }
     return at;
 }
-/**
- * The instant the next pending turn's prompt row carries, or null (Issue #2273).
- *
- * The user row's own timestamp when there is one, because that is what History
- * sorts on and it can be EARLIER than the turn's start — an adopted `/send` row
- * was written when CommandMate handed the text to the pane, which for a queued
- * prompt is while the previous turn was still running. The turn's start is the
- * fallback for a turn that produced no row at all.
- */
-function nextTurnOpensAt(turns, userRows, index) {
-    const next = turns[index + 1];
-    if (!next)
-        return null;
-    return userRows[index + 1]?.timestampMs ?? next.startedAt;
-}
 /**
  * The transcript file for this instance, or null.
  *
@@ -876,25 +782,17 @@ function nextTurnOpensAt(turns, userRows, index) {
 async function locateClaudeTranscript(homeDir, capture, sessionId) {
     if (sessionId) {
         const path = claudeTranscriptPath(homeDir, capture.worktreePath, sessionId);
-        if (await isReadableFile(path))
+        if (await (0, transcript_history_1.isReadableFile)(path))
             return path;
     }
     const hint = capture.transcriptPathHint;
     if (typeof hint === 'string' && hint.length > 0) {
         const accepted = acceptClaudeTranscriptHint(homeDir, hint);
-        if (accepted && (await isReadableFile(accepted)))
+        if (accepted && (await (0, transcript_history_1.isReadableFile)(accepted)))
             return accepted;
     }
     return null;
 }
-async function isReadableFile(path) {
-    try {
-        return (await (0, promises_1.stat)(path)).isFile();
-    }
-    catch {
-        return false;
-    }
-}
 /** `\n`, which in UTF-8 is one byte and never part of another character. */
 const LINE_FEED = 0x0a;
 /**
@@ -1156,7 +1054,7 @@ async function captureHeadlessClaudeTurn(target, records, sessionId, path, repor
     const captured = await writeClaudeTurn(target, turn, 
     // An empty body stays empty, so the writer hands the turn back to the
     // scraper instead of saving a row that is nothing but the marker.
-    rendered.body.length === 0 ? rendered : markClaudeTurnHeadMissing(rendered), resolveAssistantTimestampMs(turn, NO_USER_ROW, headless.lastRecordAt, null), path, report);
+    rendered.body.length === 0 ? rendered : markClaudeTurnHeadMissing(rendered), (0, transcript_history_1.resolveAssistantTimestampMs)(turn, NO_USER_ROW, headless.lastRecordAt, null), path, report);
     if (captured) {
         // Issue #2437, for the reason the prompt-opened path gives.
         await (0, assistant_response_saver_1.advanceCapturedLineForTranscriptTurn)(target);
@@ -1218,32 +1116,7 @@ exports.CLAUDE_TURN_RECHECK_LIMIT = 3;
  * @returns Whether the row was replaced
  */
 async function growClaudeTurnRow(target, existing, rendered, path) {
-    const instanceId = target.instanceId ?? target.cliToolId;
-    const previousLength = existing.content.length;
-    if (rendered.body.length <= previousLength)
-        return false;
-    const [{ getDbInstance }, { updateMessageContent }, { broadcastMessage }] = await Promise.all([
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db/db-instance'))),
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db'))),
-        Promise.resolve().then(() => __importStar(require('../../../../lib/ws-server'))),
-    ]);
-    updateMessageContent(getDbInstance(), existing.id, rendered.body);
-    broadcastMessage('message_updated', {
-        worktreeId: target.worktreeId,
-        message: { ...existing, content: rendered.body },
-    });
-    logger.info('claude-transcript-turn-updated', {
-        worktreeId: target.worktreeId,
-        instanceId,
-        sessionId: rendered.sessionId,
-        requestId: existing.requestId,
-        path,
-        previousLength,
-        bodyLength: rendered.body.length,
-        textBlocks: rendered.textBlocks,
-        toolBlocks: rendered.toolBlocks,
-    });
-    return true;
+    return (0, transcript_history_1.growTurnRowTo)(target, existing, rendered, path, logger, 'claude-transcript-turn-updated');
 }
 /**
  * Re-read the newest already-written turns and grow the short ones (#2264).
@@ -1266,24 +1139,12 @@ async function growClaudeTurnRow(target, existing, rendered, path) {
  * @returns How many rows were replaced
  */
 async function refreshClaudeTurnRows(target, candidates, path) {
-    if (candidates.length === 0)
-        return 0;
-    const [{ getDbInstance }, { findMessageByRequestId }] = await Promise.all([
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db/db-instance'))),
-        Promise.resolve().then(() => __importStar(require('../../../../lib/db'))),
-    ]);
-    const db = getDbInstance();
-    let updated = 0;
-    for (const turn of candidates) {
-        if (!(0, transcript_1.isClaudeTurnWritable)(turn))
-            continue;
-        const existing = findMessageByRequestId(db, target.worktreeId, (0, agent_transcript_1.claudeTurnRequestId)(turn.promptUuid));
-        if (!existing)
-            continue;
-        if (await growClaudeTurnRow(target, existing, (0, transcript_1.renderClaudeTurn)(turn), path))
-            updated += 1;
-    }
-    return updated;
+    return (0, transcript_history_1.refreshTurnRowsTo)(target, candidates, path, {
+        isWritable: transcript_1.isClaudeTurnWritable,
+        requestIdOf: (turn) => (0, agent_transcript_1.claudeTurnRequestId)(turn.promptUuid),
+        render: transcript_1.renderClaudeTurn,
+        grow: growClaudeTurnRow,
+    });
 }
 /**
  * Write one rendered turn, unless it is already there.

package/dist/server/src/lib/hooks/sources/claude/queued-notice.js

@@ -0,0 +1,53 @@
+"use strict";
+/**
+ * A `UserPromptSubmit` that is a queued notice joining the running turn
+ * (Issue #3330).
+ *
+ * Claude Code queues the completion notice of a background task (a `Bash` run
+ * with `run_in_background`, a subagent) and hands it to the model the next time
+ * it can: after a tool result inside a running turn, or as the prompt of a turn
+ * of its own when the session is idle. Either way it fires `UserPromptSubmit`
+ * once per notice, and the prompt it reports is the notice — the text the
+ * transcript records as `queue-operation` content, which starts with
+ * `<task-notification>`.
+ *
+ * Measured on the server logs and transcripts of 2026-10-02 to 2026-10-05: of
+ * the 188 Claude `user_prompt_submit`s applied while a turn of theirs was still
+ * open, 178 matched a `queue-operation: remove` (`reason: absorbed_mid_turn`)
+ * of a `<task-notification>` one for one. A prompt the operator typed into a
+ * running turn is absorbed the same way but fires no hook at all (9 of 9
+ * removes of other content had no delivery beside them).
+ *
+ * The answer is about the payload only. Whether there is a running turn to join
+ * is the state's question (`applyTurnTransition`), and a notice that arrives
+ * while the agent is idle opens its turn as before.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QUEUED_NOTICE_FIELD = exports.CLAUDE_TASK_NOTIFICATION_PREFIX = void 0;
+exports.isClaudeQueuedNoticePrompt = isClaudeQueuedNoticePrompt;
+/** The tag every queued background-task notice begins with. */
+exports.CLAUDE_TASK_NOTIFICATION_PREFIX = '<task-notification>';
+/**
+ * The body field the relay script (`scripts/hooks/cmate-agent-event.sh`) sets
+ * to `true` in place of the prompt.
+ *
+ * The relay rebuilds the body it posts and does not forward the prompt — the
+ * operator's text has no business in a request whose receiver needs one bit of
+ * it — so it answers the question below itself and sends the answer.
+ */
+exports.QUEUED_NOTICE_FIELD = 'queuedNotice';
+/**
+ * Whether this `UserPromptSubmit` payload is a queued background-task notice.
+ *
+ * Two shapes say so: Claude's own payload (the injected `type: "http"` hook),
+ * whose `prompt` starts with the tag, and the relay script's body, which
+ * carries {@link QUEUED_NOTICE_FIELD} `: true` instead. Anything else —
+ * including a relay too old to send the field — answers false, which is the
+ * behaviour before this Issue.
+ */
+function isClaudeQueuedNoticePrompt(payload) {
+    if (payload[exports.QUEUED_NOTICE_FIELD] === true)
+        return true;
+    const prompt = payload.prompt;
+    return typeof prompt === 'string' && prompt.trimStart().startsWith(exports.CLAUDE_TASK_NOTIFICATION_PREFIX);
+}