@vellumai/assistant 0.4.42 → 0.4.44

package/src/daemon/session-agent-loop-handlers.ts

@@ -13,8 +13,12 @@ import type {
   TurnChannelContext,
   TurnInterfaceContext,
 } from "../channels/types.js";
-import * as conversationStore from "../memory/conversation-store.js";
-import { provenanceFromTrustContext } from "../memory/conversation-store.js";
+import {
+  addMessage,
+  getMessageById,
+  provenanceFromTrustContext,
+  updateMessageContent,
+} from "../memory/conversation-crud.js";
 import { recordRequestLog } from "../memory/llm-request-log-store.js";
 import type { ContentBlock, ImageContent } from "../providers/types.js";
 import type { DirectiveRequest } from "./assistant-attachments.js";
@@ -22,7 +26,7 @@ import {
   cleanAssistantContent,
   drainDirectiveDisplayBuffer,
 } from "./assistant-attachments.js";
-import type { ServerMessage } from "./ipc-protocol.js";
+import type { ServerMessage } from "./message-protocol.js";
 import type { AgentLoopSessionContext } from "./session-agent-loop.js";
 import {
   buildSessionErrorMessage,
@@ -45,7 +49,10 @@ export interface EventHandlerState {
   pendingDirectiveDisplayBuffer: string;
   firstAssistantText: string;
   exchangeInputTokens: number;
+  exchangeCacheCreationInputTokens: number;
+  exchangeCacheReadInputTokens: number;
   exchangeOutputTokens: number;
+  readonly exchangeRawResponses: unknown[];
   model: string;
   orderingErrorDetected: boolean;
   deferredOrderingError: string | null;
@@ -106,7 +113,10 @@ export function createEventHandlerState(): EventHandlerState {
     pendingDirectiveDisplayBuffer: "",
     firstAssistantText: "",
     exchangeInputTokens: 0,
+    exchangeCacheCreationInputTokens: 0,
+    exchangeCacheReadInputTokens: 0,
     exchangeOutputTokens: 0,
+    exchangeRawResponses: [],
     model: "",
     orderingErrorDetected: false,
     deferredOrderingError: null,
@@ -471,7 +481,7 @@ export function handleToolResult(
     return ts && ts.completedAt != null;
   });
   if (allToolsDone && state.currentTurnToolUseIds.length > 0) {
-    annotatePersistedAssistantMessage(state);
+    annotatePersistedAssistantMessage(state, deps);
   }
 }
 
@@ -481,11 +491,14 @@ export function handleToolResult(
  * and update the DB. This runs post-tool-execution so the metadata maps are
  * fully populated (unlike message_complete which fires before tools run).
  */
-function annotatePersistedAssistantMessage(state: EventHandlerState): void {
+function annotatePersistedAssistantMessage(
+  state: EventHandlerState,
+  deps: EventHandlerDeps,
+): void {
   const messageId = state.lastAssistantMessageId;
   if (!messageId) return;
 
-  const row = conversationStore.getMessageById(messageId);
+  const row = getMessageById(messageId);
   if (!row) return;
 
   let content: ContentBlock[];
@@ -519,8 +532,27 @@ function annotatePersistedAssistantMessage(state: EventHandlerState): void {
     }
   }
 
+  // Persist any surfaces created during tool execution.
+  // message_complete fires BEFORE tools run, so currentTurnSurfaces is empty
+  // at write time. We append them here after all tools have completed.
+  if (deps.ctx.currentTurnSurfaces.length > 0) {
+    for (const surface of deps.ctx.currentTurnSurfaces) {
+      content.push({
+        type: "ui_surface",
+        surfaceId: surface.surfaceId,
+        surfaceType: surface.surfaceType,
+        title: surface.title,
+        data: surface.data,
+        actions: surface.actions,
+        display: surface.display,
+      } as unknown as ContentBlock);
+    }
+    modified = true;
+    deps.ctx.currentTurnSurfaces = [];
+  }
+
   if (modified) {
-    conversationStore.updateMessageContent(messageId, JSON.stringify(content));
+    updateMessageContent(messageId, JSON.stringify(content));
   }
 
   // Clear for the next turn
@@ -593,7 +625,7 @@ export async function handleMessageComplete(
       assistantMessageInterface:
         deps.turnInterfaceContext.assistantMessageInterface,
     };
-    await conversationStore.addMessage(
+    await addMessage(
       deps.ctx.conversationId,
       "user",
       JSON.stringify(toolResultBlocks),
@@ -655,7 +687,7 @@ export async function handleMessageComplete(
     assistantMessageInterface:
       deps.turnInterfaceContext.assistantMessageInterface,
   };
-  const assistantMsg = await conversationStore.addMessage(
+  const assistantMsg = await addMessage(
     deps.ctx.conversationId,
     "assistant",
     JSON.stringify(contentWithSurfaces),
@@ -691,8 +723,13 @@ export function handleUsage(
   event: Extract<AgentEvent, { type: "usage" }>,
 ): void {
   state.exchangeInputTokens += event.inputTokens;
+  state.exchangeCacheCreationInputTokens += event.cacheCreationInputTokens ?? 0;
+  state.exchangeCacheReadInputTokens += event.cacheReadInputTokens ?? 0;
   state.exchangeOutputTokens += event.outputTokens;
   state.model = event.model;
+  if (event.rawResponse !== undefined) {
+    state.exchangeRawResponses.push(event.rawResponse);
+  }
 
   if (event.rawRequest && event.rawResponse) {
     try {

package/src/daemon/session-agent-loop.ts

@@ -28,12 +28,16 @@ import type { ToolProfiler } from "../events/tool-profiling-listener.js";
 import { getHookManager } from "../hooks/manager.js";
 import { commitAppTurnChanges } from "../memory/app-git-service.js";
 import { getApp, listAppFiles } from "../memory/app-store.js";
-import * as conversationStore from "../memory/conversation-store.js";
 import {
+  addMessage,
+  deleteMessageById,
+  getConversation,
   getConversationOriginChannel,
   getConversationOriginInterface,
   provenanceFromTrustContext,
-} from "../memory/conversation-store.js";
+  updateConversationContextWindow,
+  updateConversationTitle,
+} from "../memory/conversation-crud.js";
 import {
   isReplaceableTitle,
   queueGenerateConversationTitle,
@@ -73,7 +77,7 @@ import type {
   SurfaceData,
   SurfaceType,
   UsageStats,
-} from "./ipc-protocol.js";
+} from "./message-protocol.js";
 import {
   createEventHandlerState,
   dispatchAgentEvent,
@@ -233,11 +237,11 @@ export interface AgentLoopSessionContext {
     statusText?: string,
   ): void;
   emitConfirmationStateChanged(
-    params: import("./ipc-contract/messages.js").ConfirmationStateChanged extends {
+    params: import("./message-types/messages.js").ConfirmationStateChanged extends {
       type: infer _;
     }
       ? Omit<
-          import("./ipc-contract/messages.js").ConfirmationStateChanged,
+          import("./message-types/messages.js").ConfirmationStateChanged,
           "type"
         >
       : never,
@@ -371,18 +375,15 @@ export async function runAgentLoopImpl(
     if (preMessageResult.blocked) {
       if (!options?.skipPreMessageRollback) {
         ctx.messages.pop();
-        conversationStore.deleteMessageById(userMessageId);
+        deleteMessageById(userMessageId);
       }
       // Replace loading placeholder so the thread isn't stuck as "Generating title..."
-      const currentConv = conversationStore.getConversation(ctx.conversationId);
+      const currentConv = getConversation(ctx.conversationId);
       if (
         isReplaceableTitle(currentConv?.title ?? null) &&
         currentConv?.title !== UNTITLED_FALLBACK
       ) {
-        conversationStore.updateConversationTitle(
-          ctx.conversationId,
-          UNTITLED_FALLBACK,
-        );
+        updateConversationTitle(ctx.conversationId, UNTITLED_FALLBACK);
         onEvent({
           type: "session_title_updated",
           sessionId: ctx.conversationId,
@@ -405,9 +406,7 @@ export async function runAgentLoopImpl(
     // Deferred via setTimeout so the main agent loop LLM call enqueues
     // first, avoiding rate-limit slot contention on strict configs.
     if (
-      isReplaceableTitle(
-        conversationStore.getConversation(ctx.conversationId)?.title ?? null,
-      )
+      isReplaceableTitle(getConversation(ctx.conversationId)?.title ?? null)
     ) {
       setTimeout(() => {
         queueGenerateConversationTitle({
@@ -427,16 +426,29 @@ export async function runAgentLoopImpl(
 
     const isFirstMessage = ctx.messages.length === 1;
 
+    const compactCheck = ctx.contextWindowManager.shouldCompact(ctx.messages);
+    if (compactCheck.needed) {
+      ctx.emitActivityState(
+        "thinking",
+        "thinking_delta",
+        "assistant_turn",
+        reqId,
+        "Compacting context",
+      );
+    }
     const compacted = await ctx.contextWindowManager.maybeCompact(
       ctx.messages,
       abortController.signal,
-      { lastCompactedAt: ctx.contextCompactedAt ?? undefined },
+      {
+        lastCompactedAt: ctx.contextCompactedAt ?? undefined,
+        precomputedEstimate: compactCheck.estimatedTokens,
+      },
     );
     if (compacted.compacted) {
       ctx.messages = compacted.messages;
       ctx.contextCompactedMessageCount += compacted.compactedPersistedMessages;
       ctx.contextCompactedAt = Date.now();
-      conversationStore.updateConversationContextWindow(
+      updateConversationContextWindow(
         ctx.conversationId,
         compacted.summaryText,
         ctx.contextCompactedMessageCount,
@@ -461,6 +473,9 @@ export async function runAgentLoopImpl(
         onEvent,
         "context_compactor",
         reqId,
+        compacted.summaryCacheCreationInputTokens ?? 0,
+        compacted.summaryCacheReadInputTokens ?? 0,
+        collapseRawResponses(compacted.summaryRawResponses),
       );
     }
 
@@ -667,6 +682,13 @@ export async function runAgentLoopImpl(
         !reducerState.exhausted
       ) {
         preflightAttempts++;
+        ctx.emitActivityState(
+          "thinking",
+          "thinking_delta",
+          "assistant_turn",
+          reqId,
+          "Compacting context",
+        );
         const step = await reduceContextOverflow(
           ctx.messages,
           {
@@ -689,7 +711,7 @@ export async function runAgentLoopImpl(
           ctx.contextCompactedMessageCount +=
             step.compactionResult.compactedPersistedMessages;
           ctx.contextCompactedAt = Date.now();
-          conversationStore.updateConversationContextWindow(
+          updateConversationContextWindow(
             ctx.conversationId,
             step.compactionResult.summaryText,
             ctx.contextCompactedMessageCount,
@@ -715,6 +737,9 @@ export async function runAgentLoopImpl(
             onEvent,
             "context_compactor",
             reqId,
+            step.compactionResult.summaryCacheCreationInputTokens ?? 0,
+            step.compactionResult.summaryCacheReadInputTokens ?? 0,
+            collapseRawResponses(step.compactionResult.summaryRawResponses),
           );
         }
 
@@ -747,7 +772,7 @@ export async function runAgentLoopImpl(
     let preRunHistoryLength = runMessages.length;
 
     const shouldGenerateTitle = isReplaceableTitle(
-      conversationStore.getConversation(ctx.conversationId)?.title ?? null,
+      getConversation(ctx.conversationId)?.title ?? null,
     );
 
     const deps: EventHandlerDeps = {
@@ -854,6 +879,13 @@ export async function runAgentLoopImpl(
           "Context too large — applying next reducer tier",
         );
 
+        ctx.emitActivityState(
+          "thinking",
+          "thinking_delta",
+          "assistant_turn",
+          reqId,
+          "Compacting context",
+        );
         const step = await reduceContextOverflow(
           ctx.messages,
           {
@@ -876,7 +908,7 @@ export async function runAgentLoopImpl(
           ctx.contextCompactedMessageCount +=
             step.compactionResult.compactedPersistedMessages;
           ctx.contextCompactedAt = Date.now();
-          conversationStore.updateConversationContextWindow(
+          updateConversationContextWindow(
             ctx.conversationId,
             step.compactionResult.summaryText,
             ctx.contextCompactedMessageCount,
@@ -902,6 +934,9 @@ export async function runAgentLoopImpl(
             onEvent,
             "context_compactor",
             reqId,
+            step.compactionResult.summaryCacheCreationInputTokens ?? 0,
+            step.compactionResult.summaryCacheReadInputTokens ?? 0,
+            collapseRawResponses(step.compactionResult.summaryRawResponses),
           );
         }
 
@@ -953,7 +988,7 @@ export async function runAgentLoopImpl(
               ctx.contextCompactedMessageCount +=
                 emergencyCompact.compactedPersistedMessages;
               ctx.contextCompactedAt = Date.now();
-              conversationStore.updateConversationContextWindow(
+              updateConversationContextWindow(
                 ctx.conversationId,
                 emergencyCompact.summaryText,
                 ctx.contextCompactedMessageCount,
@@ -979,6 +1014,9 @@ export async function runAgentLoopImpl(
                 onEvent,
                 "context_compactor",
                 reqId,
+                emergencyCompact.summaryCacheCreationInputTokens ?? 0,
+                emergencyCompact.summaryCacheReadInputTokens ?? 0,
+                collapseRawResponses(emergencyCompact.summaryRawResponses),
               );
             }
 
@@ -1016,7 +1054,7 @@ export async function runAgentLoopImpl(
                 capturedTurnInterfaceContext.assistantMessageInterface,
             };
             const denyMessage = createAssistantMessage(denyText);
-            await conversationStore.addMessage(
+            await addMessage(
               ctx.conversationId,
               "assistant",
               JSON.stringify(denyMessage.content),
@@ -1033,6 +1071,13 @@ export async function runAgentLoopImpl(
           }
         } else if (action === "auto_compress_latest_turn") {
           // Non-interactive — auto-compress without asking
+          ctx.emitActivityState(
+            "thinking",
+            "thinking_delta",
+            "assistant_turn",
+            reqId,
+            "Compacting context",
+          );
           const emergencyCompact = await ctx.contextWindowManager.maybeCompact(
             ctx.messages,
             abortController.signal,
@@ -1048,7 +1093,7 @@ export async function runAgentLoopImpl(
             ctx.contextCompactedMessageCount +=
               emergencyCompact.compactedPersistedMessages;
             ctx.contextCompactedAt = Date.now();
-            conversationStore.updateConversationContextWindow(
+            updateConversationContextWindow(
               ctx.conversationId,
               emergencyCompact.summaryText,
               ctx.contextCompactedMessageCount,
@@ -1074,6 +1119,9 @@ export async function runAgentLoopImpl(
               onEvent,
               "context_compactor",
               reqId,
+              emergencyCompact.summaryCacheCreationInputTokens ?? 0,
+              emergencyCompact.summaryCacheReadInputTokens ?? 0,
+              collapseRawResponses(emergencyCompact.summaryRawResponses),
             );
           }
 
@@ -1168,7 +1216,7 @@ export async function runAgentLoopImpl(
         assistantMessageInterface:
           capturedTurnInterfaceContext.assistantMessageInterface,
       };
-      await conversationStore.addMessage(
+      await addMessage(
         ctx.conversationId,
         "user",
         JSON.stringify(toolResultBlocks),
@@ -1210,7 +1258,7 @@ export async function runAgentLoopImpl(
       const errorAssistantMessage = createAssistantMessage(
         state.providerErrorUserMessage,
       );
-      await conversationStore.addMessage(
+      await addMessage(
         ctx.conversationId,
         "assistant",
         JSON.stringify(errorAssistantMessage.content),
@@ -1244,6 +1292,9 @@ export async function runAgentLoopImpl(
       onEvent,
       "main_agent",
       reqId,
+      state.exchangeCacheCreationInputTokens,
+      state.exchangeCacheReadInputTokens,
+      collapseRawResponses(state.exchangeRawResponses),
     );
 
     void getHookManager().trigger("post-message", {
@@ -1449,6 +1500,9 @@ function emitUsage(
   onEvent: (msg: ServerMessage) => void,
   actor: UsageActor,
   requestId: string | null = null,
+  cacheCreationInputTokens = 0,
+  cacheReadInputTokens = 0,
+  rawResponse?: unknown,
 ): void {
   recordUsage(
     {
@@ -1462,5 +1516,13 @@ function emitUsage(
     onEvent,
     actor,
     requestId,
+    cacheCreationInputTokens,
+    cacheReadInputTokens,
+    rawResponse,
   );
 }
+
+function collapseRawResponses(rawResponses?: unknown[]): unknown | undefined {
+  if (!rawResponses || rawResponses.length === 0) return undefined;
+  return rawResponses.length === 1 ? rawResponses[0] : rawResponses;
+}

package/src/daemon/session-attachments.ts

@@ -24,7 +24,7 @@ import {
   resolveDirectives,
   validateDrafts,
 } from "./assistant-attachments.js";
-import type { UserMessageAttachment } from "./ipc-protocol.js";
+import type { UserMessageAttachment } from "./message-protocol.js";
 import { generateVideoThumbnail } from "./video-thumbnail.js";
 
 const log = getLogger("session-attachments");

package/src/daemon/session-error.ts

@@ -1,5 +1,5 @@
 import { ProviderError } from "../util/errors.js";
-import type { SessionErrorCode, SessionErrorMessage } from "./ipc-protocol.js";
+import type { SessionErrorCode, SessionErrorMessage } from "./message-protocol.js";
 
 /**
  * Classified session error ready for IPC emission.

package/src/daemon/session-history.ts

@@ -1,13 +1,20 @@
 import { v4 as uuid } from "uuid";
 
 import { getSummaryFromContextMessage } from "../context/window-manager.js";
-import * as conversationStore from "../memory/conversation-store.js";
+import {
+  deleteLastExchange,
+  deleteMessageById,
+  getMessages,
+  relinkAttachments,
+  updateMessageContent,
+} from "../memory/conversation-crud.js";
+import { isLastUserMessageToolResult } from "../memory/conversation-queries.js";
 import { enqueueMemoryJob } from "../memory/jobs-store.js";
 import { withQdrantBreaker } from "../memory/qdrant-circuit-breaker.js";
 import { getQdrantClient } from "../memory/qdrant-client.js";
 import type { ContentBlock, Message } from "../providers/types.js";
 import { getLogger } from "../util/logger.js";
-import type { ServerMessage } from "./ipc-protocol.js";
+import type { ServerMessage } from "./message-protocol.js";
 import type { TraceEmitter } from "./trace-emitter.js";
 
 const log = getLogger("session-history");
@@ -117,7 +124,7 @@ export function consolidateAssistantMessages(
   conversationId: string,
   userMessageId: string,
 ): void {
-  const allMessages = conversationStore.getMessages(conversationId);
+  const allMessages = getMessages(conversationId);
   const userMsgIndex = allMessages.findIndex((m) => m.id === userMessageId);
   if (userMsgIndex === -1) return;
 
@@ -159,7 +166,7 @@ export function consolidateAssistantMessages(
     const allSegmentIds: string[] = [];
     const allOrphanedItemIds: string[] = [];
     for (const id of messagesToDelete) {
-      const deleted = conversationStore.deleteMessageById(id);
+      const deleted = deleteMessageById(id);
       allSegmentIds.push(...deleted.segmentIds);
       allOrphanedItemIds.push(...deleted.orphanedItemIds);
     }
@@ -260,7 +267,7 @@ export function consolidateAssistantMessages(
 
   // Update the first assistant message with all content
   const firstAssistantMsg = messagesToConsolidate[0];
-  conversationStore.updateMessageContent(
+  updateMessageContent(
     firstAssistantMsg.id,
     JSON.stringify(consolidatedContent),
   );
@@ -273,7 +280,7 @@ export function consolidateAssistantMessages(
     ...messagesToDelete,
   ];
   if (messageIdsToDelete.length > 0) {
-    const relinked = conversationStore.relinkAttachments(
+    const relinked = relinkAttachments(
       messageIdsToDelete,
       firstAssistantMsg.id,
     );
@@ -290,14 +297,12 @@ export function consolidateAssistantMessages(
   const allSegmentIds: string[] = [];
   const allOrphanedItemIds: string[] = [];
   for (let i = 1; i < messagesToConsolidate.length; i++) {
-    const deleted = conversationStore.deleteMessageById(
-      messagesToConsolidate[i].id,
-    );
+    const deleted = deleteMessageById(messagesToConsolidate[i].id);
     allSegmentIds.push(...deleted.segmentIds);
     allOrphanedItemIds.push(...deleted.orphanedItemIds);
   }
   for (const id of messagesToDelete) {
-    const deleted = conversationStore.deleteMessageById(id);
+    const deleted = deleteMessageById(id);
     allSegmentIds.push(...deleted.segmentIds);
     allOrphanedItemIds.push(...deleted.orphanedItemIds);
   }
@@ -376,15 +381,15 @@ export function undo(session: HistorySessionContext): number {
   // deleteLastExchange when the loop peeled back tool_result messages.
   let hadToolResult = false;
   do {
-    conversationStore.deleteLastExchange(session.conversationId);
-    if (conversationStore.isLastUserMessageToolResult(session.conversationId)) {
+    deleteLastExchange(session.conversationId);
+    if (isLastUserMessageToolResult(session.conversationId)) {
       hadToolResult = true;
     } else {
       break;
     }
   } while (true);
   if (hadToolResult) {
-    conversationStore.deleteLastExchange(session.conversationId);
+    deleteLastExchange(session.conversationId);
   }
 
   return removed;
@@ -455,7 +460,7 @@ export async function regenerate(
 
   // Find DB message IDs to delete: get all messages from the DB, then
   // identify the ones that come after the last user message.
-  const dbMessages = conversationStore.getMessages(session.conversationId);
+  const dbMessages = getMessages(session.conversationId);
 
   // Walk backwards to find the last real (non-tool_result) user message in the DB.
   let dbUserMsgIdx = -1;
@@ -504,7 +509,7 @@ export async function regenerate(
   const allSegmentIds: string[] = [];
   const allOrphanedItemIds: string[] = [];
   for (const msg of messagesToDelete) {
-    const deleted = conversationStore.deleteMessageById(msg.id);
+    const deleted = deleteMessageById(msg.id);
     allSegmentIds.push(...deleted.segmentIds);
     allOrphanedItemIds.push(...deleted.orphanedItemIds);
   }

package/src/daemon/session-lifecycle.ts

@@ -9,7 +9,11 @@ import type { EventBus } from "../events/bus.js";
 import type { AssistantDomainEvents } from "../events/domain-events.js";
 import type { ToolProfiler } from "../events/tool-profiling-listener.js";
 import { getHookManager } from "../hooks/manager.js";
-import * as conversationStore from "../memory/conversation-store.js";
+import {
+  getConversation,
+  getMessages,
+  type MessageRow,
+} from "../memory/conversation-crud.js";
 import type { PermissionPrompter } from "../permissions/prompter.js";
 import type { SecretPrompter } from "../permissions/secret-prompter.js";
 import type { ContentBlock, Message } from "../providers/types.js";
@@ -20,7 +24,7 @@ import {
 import { unregisterSessionSender } from "../tools/browser/browser-screencast.js";
 import { getLogger } from "../util/logger.js";
 import { repairHistory } from "./history-repair.js";
-import type { SurfaceData, SurfaceType, UsageStats } from "./ipc-protocol.js";
+import type { SurfaceData, SurfaceType, UsageStats } from "./message-protocol.js";
 import {
   unregisterCallNotifiers,
   unregisterWatchNotifiers,
@@ -50,9 +54,7 @@ function parseProvenanceTrustClass(
   return undefined;
 }
 
-function filterMessagesForUntrustedActor(
-  messages: conversationStore.MessageRow[],
-): conversationStore.MessageRow[] {
+function filterMessagesForUntrustedActor(messages: MessageRow[]): MessageRow[] {
   return messages.filter((m) => {
     const provenanceTrustClass = parseProvenanceTrustClass(m.metadata);
     return (
@@ -105,12 +107,12 @@ export interface DisposeContext extends AbortContext {
 
 export async function loadFromDb(ctx: LoadFromDbContext): Promise<void> {
   const trustClass = ctx.trustContext?.trustClass;
-  const allDbMessages = conversationStore.getMessages(ctx.conversationId);
+  const allDbMessages = getMessages(ctx.conversationId);
   const dbMessages = isUntrustedTrustClass(trustClass)
     ? filterMessagesForUntrustedActor(allDbMessages)
     : allDbMessages;
 
-  const conv = conversationStore.getConversation(ctx.conversationId);
+  const conv = getConversation(ctx.conversationId);
   const contextSummary = !isUntrustedTrustClass(trustClass)
     ? conv?.contextSummary?.trim() || null
     : null;

package/src/daemon/session-memory.ts

@@ -12,7 +12,7 @@ import {
 import type { ScopePolicyOverride } from "../memory/search/types.js";
 import type { Message } from "../providers/types.js";
 import type { Provider } from "../providers/types.js";
-import type { ServerMessage } from "./ipc-protocol.js";
+import type { ServerMessage } from "./message-protocol.js";
 import type { ConflictGate } from "./session-conflict-gate.js";
 import { injectDynamicProfileIntoUserMessage } from "./session-dynamic-profile.js";
 
@@ -202,6 +202,13 @@ export async function prepareMemoryContext(
     type: "memory_status",
     enabled: recall.enabled,
     degraded: recall.degraded,
+    degradation: recall.degradation
+      ? {
+          semanticUnavailable: recall.degradation.semanticUnavailable,
+          reason: recall.degradation.reason,
+          fallbackSources: [...recall.degradation.fallbackSources],
+        }
+      : undefined,
     reason: recall.reason,
     provider: recall.provider,
     model: recall.model,
@@ -235,6 +242,13 @@ export async function prepareMemoryContext(
         type: "memory_recalled",
         provider: recall.provider ?? "unknown",
         model: recall.model ?? "unknown",
+        degradation: recall.degradation
+          ? {
+              semanticUnavailable: recall.degradation.semanticUnavailable,
+              reason: recall.degradation.reason,
+              fallbackSources: [...recall.degradation.fallbackSources],
+            }
+          : undefined,
         lexicalHits: recall.lexicalHits,
         semanticHits: recall.semanticHits,
         recencyHits: recall.recencyHits,

package/src/daemon/session-messaging.ts

@@ -19,12 +19,16 @@ import {
   uploadAttachment,
   validateAttachmentUpload,
 } from "../memory/attachments-store.js";
-import * as conversationStore from "../memory/conversation-store.js";
-import { provenanceFromTrustContext } from "../memory/conversation-store.js";
+import {
+  addMessage,
+  provenanceFromTrustContext,
+  setConversationOriginChannelIfUnset,
+  setConversationOriginInterfaceIfUnset,
+} from "../memory/conversation-crud.js";
 import type { SecretPrompter } from "../permissions/secret-prompter.js";
 import type { Message } from "../providers/types.js";
 import { getLogger } from "../util/logger.js";
-import type { ServerMessage, UserMessageAttachment } from "./ipc-protocol.js";
+import type { ServerMessage, UserMessageAttachment } from "./message-protocol.js";
 import type { MessageQueue } from "./session-queue-manager.js";
 import type { TrustContext } from "./session-runtime-assembly.js";
 
@@ -317,7 +321,7 @@ export async function persistUserMessage(
           ).content,
         )
       : JSON.stringify(userMessage.content);
-    const persistedUserMessage = await conversationStore.addMessage(
+    const persistedUserMessage = await addMessage(
       ctx.conversationId,
       "user",
       contentToPersist,
@@ -325,13 +329,13 @@ export async function persistUserMessage(
     );
 
     if (turnCtx) {
-      conversationStore.setConversationOriginChannelIfUnset(
+      setConversationOriginChannelIfUnset(
         ctx.conversationId,
         turnCtx.userMessageChannel,
       );
     }
     if (turnIfCtx) {
-      conversationStore.setConversationOriginInterfaceIfUnset(
+      setConversationOriginInterfaceIfUnset(
         ctx.conversationId,
         turnIfCtx.userMessageInterface,
       );