B1: persistence primitives — reserveMessage + updateContent pipeline ops

assistant/src/__tests__/agent-loop-override-profile.test.ts

@@ -353,6 +353,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   // Always return undefined for the row read so the test fails fast unless
   // executeSubagentSpawn reads from context.overrideProfile first.
   getConversationOverrideProfile: () => undefined,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 import { getSubagentManager } from "../subagent/index.js";

assistant/src/__tests__/agent-wake-disk-pressure-callsite.test.ts

@@ -22,6 +22,7 @@ import type { Message } from "../providers/types.js";
 
 mock.module("../memory/conversation-crud.js", () => ({
   getConversationOverrideProfile: () => undefined,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../config/loader.js", () => ({

assistant/src/__tests__/agent-wake-override-profile.test.ts

@@ -32,6 +32,7 @@ let mockOverrideProfile: string | undefined = undefined;
 
 mock.module("../memory/conversation-crud.js", () => ({
   getConversationOverrideProfile: (_id: string) => mockOverrideProfile,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 // Mutable stub for `getConfig().llm` consumed by `RetryProvider`'s

assistant/src/__tests__/annotate-risk-options.test.ts

@@ -57,6 +57,7 @@ mock.module("../memory/conversation-crud.js", () => ({
     updates.push({ id, content });
   },
   provenanceFromTrustContext: () => ({}),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/llm-request-log-store.js", () => ({

assistant/src/__tests__/approval-cascade.test.ts

@@ -151,6 +151,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   addMessage: () => ({ id: `msg-${Date.now()}` }),
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/background-workers-disk-pressure.test.ts

@@ -152,6 +152,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   setLastNotifiedInferenceProfile: mock(() => {}),
   setConversationHistoryStrippedAt: mock(() => {}),
   wipeConversation: mock(() => ({ memoryIds: [] })),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-title-service.js", () => ({

assistant/src/__tests__/btw-routes.test.ts

@@ -38,6 +38,7 @@ const mockAddMessage = mock(() => {});
 
 mock.module("../memory/conversation-crud.js", () => ({
   addMessage: mockAddMessage,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 const MOCK_TOOLS = [

assistant/src/__tests__/channel-reply-delivery.test.ts

@@ -128,6 +128,7 @@ mock.module("../memory/conversation-crud.js", () => ({
         : {};
     row.metadata = JSON.stringify({ ...existing, ...updates });
   },
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/attachments-store.js", () => ({

assistant/src/__tests__/compaction-events.test.ts

@@ -150,6 +150,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   addMessage: () => ({ id: `msg-${Date.now()}` }),
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/compactor-call-site-logging.test.ts

@@ -31,6 +31,7 @@ mock.module("../util/logger.js", () => ({
 
 mock.module("../memory/conversation-crud.js", () => ({
   getMessages: () => [],
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/attachments-store.js", () => ({

assistant/src/__tests__/compactor-preserved-tail-count.test.ts

@@ -23,6 +23,7 @@ mock.module("../util/logger.js", () => ({
 
 mock.module("../memory/conversation-crud.js", () => ({
   getMessages: () => [],
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/attachments-store.js", () => ({

assistant/src/__tests__/conversation-abort-tool-results.test.ts

@@ -138,6 +138,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationTitle: () => {},
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-agent-loop-disk-pressure.test.ts

@@ -100,6 +100,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   setConversationHistoryStrippedAt: () => {},
   updateConversationContextWindow: () => {},
   updateConversationSlackContextWatermark: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 import { runAgentLoopImpl } from "../daemon/conversation-agent-loop.js";

assistant/src/__tests__/conversation-agent-loop-inference-profile.test.ts

@@ -170,6 +170,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
   setLastNotifiedInferenceProfile: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-disk-view.js", () => ({

assistant/src/__tests__/conversation-agent-loop-overflow.test.ts

@@ -198,6 +198,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   setLastNotifiedInferenceProfile: () => {},
   getLastUserTimestampBefore: () => 0,
   getConversationOverrideProfileFromRow: () => undefined,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 afterAll(() => {

assistant/src/__tests__/conversation-agent-loop.test.ts

@@ -197,6 +197,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   getConversationOriginChannel: () => null,
   getMessageById: () => mockMessageById,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 afterAll(() => {

assistant/src/__tests__/conversation-analysis-routes.test.ts

@@ -26,6 +26,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   getMessages: mockGetMessages,
   createConversation: mockCreateConversation,
   addMessage: mockAddMessage,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../export/transcript-formatter.js", () => ({

assistant/src/__tests__/conversation-app-control-lifecycle.test.ts

@@ -92,6 +92,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   addMessage: async () => ({ id: "persisted-1" }),
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-confirmation-signals.test.ts

@@ -142,6 +142,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   addMessage: () => ({ id: `msg-${Date.now()}` }),
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-history-web-search.test.ts

@@ -50,6 +50,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   },
   relinkAttachments: () => 0,
   deleteLastExchange: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-lifecycle.test.ts

@@ -102,6 +102,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   },
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-load-history-repair.test.ts

@@ -104,6 +104,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   },
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-load-history-stripped.test.ts

@@ -87,6 +87,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   setConversationHistoryStrippedAt: () => {},
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-pairing.test.ts

@@ -67,6 +67,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   createConversation: createConversationMock,
   addMessage: addMessageMock,
   getConversation: getConversationMock,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 /** Simulated bindings for external-conversation-store mock. */

assistant/src/__tests__/conversation-process-app-control-preactivation.test.ts

@@ -50,6 +50,7 @@ mock.module("../memory/conversation-crud.js", () => ({
     trustContext: undefined,
   }),
   addMessage: () => ({ id: "msg-mock" }),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/canonical-guardian-store.js", () => ({

assistant/src/__tests__/conversation-process-callsite.test.ts

@@ -183,6 +183,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationTitle: () => {},
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-provider-retry-repair.test.ts

@@ -185,6 +185,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   provenanceFromTrustContext: () => ({}),
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-queue.test.ts

@@ -193,6 +193,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationTitle: () => {},
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-routes-guardian-reply.test.ts

@@ -83,6 +83,7 @@ mock.module("../memory/conversation-crud.js", () => ({
     content: string,
     metadata?: Record<string, unknown>,
   ) => addMessageMock(conversationId, role, content, metadata),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../runtime/local-actor-identity.js", () => ({

assistant/src/__tests__/conversation-routes-slash-commands.test.ts

@@ -139,6 +139,7 @@ mock.module("../memory/conversation-crud.js", () => ({
       : { provenanceTrustClass: "unknown" },
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../daemon/conversation-process.js", () => ({

assistant/src/__tests__/conversation-slash-queue.test.ts

@@ -135,6 +135,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationTitle: () => {},
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-slash-unknown.test.ts

@@ -136,6 +136,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationTitle: () => {},
   getMessageById: () => null,
   getLastUserTimestampBefore: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-speed-override.test.ts

@@ -150,6 +150,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   addMessage: () => ({ id: `msg-${Date.now()}` }),
   updateConversationUsage: () => {},
   updateConversationTitle: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-surfaces-data-persist.test.ts

@@ -29,6 +29,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   getMessages: (conversationId: string) => getMessagesImpl(conversationId),
   updateMessageContent: (id: string, content: string) =>
     updateMessageContentSpy(id, content),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 // Imports must come AFTER mock.module so the surface module picks up

assistant/src/__tests__/conversation-title-service.test.ts

@@ -37,6 +37,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   getConversation: mockGetConversation,
   getMessages: mockGetMessages,
   updateConversationTitle: mockUpdateConversationTitle,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../providers/provider-send-message.js", () => ({

assistant/src/__tests__/conversation-usage.test.ts

@@ -36,6 +36,7 @@ mock.module("../memory/conversation-crud.js", () => ({
       estimatedCost,
     });
   },
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 import { recordUsage } from "../daemon/conversation-usage.js";

assistant/src/__tests__/conversation-workspace-cache-state.test.ts

@@ -111,6 +111,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   updateConversationContextWindow: () => {},
   deleteMessageById: () => ({ segmentIds: [], deletedSummaryIds: [] }),
   deleteLastExchange: () => 0,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-workspace-injection.test.ts

@@ -145,6 +145,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   setLastNotifiedInferenceProfile: () => {},
   getConversationOverrideProfileFromRow: () => undefined,
   updateMessageMetadata: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/conversation-workspace-tool-tracking.test.ts

@@ -142,6 +142,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   setLastNotifiedInferenceProfile: () => {},
   getConversationOverrideProfileFromRow: () => undefined,
   updateMessageMetadata: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-queries.js", () => ({

assistant/src/__tests__/dm-persistence.test.ts

@@ -43,6 +43,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   provenanceFromTrustContext: () => ({}),
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-disk-view.js", () => ({

assistant/src/__tests__/filing-service.test.ts

@@ -83,6 +83,7 @@ mock.module("../memory/conversation-crud.js", () => ({
     createdConversations.push(opts);
     return { id: `conv-${++conversationIdCounter}`, ...opts };
   },
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 // Mock logger

assistant/src/__tests__/handlers-user-message-approval-consumption.test.ts

@@ -92,6 +92,7 @@ mock.module("../runtime/pending-interactions.js", () => ({
 
 mock.module("../memory/conversation-crud.js", () => ({
   addMessage: mock(async () => ({ id: "persisted-message-id" })),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../config/loader.js", () => ({

assistant/src/__tests__/heartbeat-disk-pressure.test.ts

@@ -74,6 +74,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   // addMessage. Disk-pressure short-circuits before addMessage ever runs,
   // but the mock module must still expose every name the real module does.
   addMessage: () => Promise.resolve({ id: "mock-msg-id" }),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 const mockProcessMessage = mock(() => Promise.resolve({ messageId: "msg-1" }));

assistant/src/__tests__/heartbeat-service.test.ts

@@ -159,6 +159,7 @@ mock.module("../memory/conversation-crud.js", () => ({
     createdConversations.push(opts);
     return { id: `conv-${++conversationIdCounter}`, ...opts };
   },
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 // Mock logger — capture warn calls for unreachable-credential assertions

assistant/src/__tests__/http-user-message-parity.test.ts

@@ -100,6 +100,7 @@ mock.module("../memory/conversation-crud.js", () => ({
     content: string,
     metadata?: Record<string, unknown>,
   ) => addMessageMock(conversationId, role, content, metadata),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../runtime/local-actor-identity.js", () => ({

assistant/src/__tests__/inbound-slack-persistence.test.ts

@@ -48,6 +48,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   provenanceFromTrustContext: () => ({}),
   setConversationOriginChannelIfUnset: () => {},
   setConversationOriginInterfaceIfUnset: () => {},
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-disk-view.js", () => ({

assistant/src/__tests__/messaging-send-tool.test.ts

@@ -79,6 +79,7 @@ const getBindingByChannelChatMock = mock(
 mock.module("../memory/conversation-crud.js", () => ({
   addMessage: addMessageMock,
   getConversation: getConversationMock,
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/conversation-disk-view.js", () => ({

assistant/src/__tests__/outbound-slack-persistence.test.ts

@@ -111,6 +111,7 @@ mock.module("../memory/conversation-crud.js", () => ({
   // The handler treats provenance as a flat spread; returning {} keeps the
   // metadata snapshot focused on the fields under test.
   provenanceFromTrustContext: () => ({}),
+  reserveMessage: mock(async () => ({ id: "msg-reserve" })),
 }));
 
 mock.module("../memory/llm-request-log-store.js", () => ({