@vellumai/assistant 0.4.54 → 0.4.56

package/src/daemon/{session-agent-loop.ts → conversation-agent-loop.ts}

@@ -1,10 +1,10 @@
 /**
- * Agent loop execution extracted from Session.runAgentLoop.
+ * Agent loop execution extracted from Conversation.runAgentLoop.
  *
  * This module contains the core agent loop orchestration: pre-flight
  * setup, event handling, retry logic, history reconstruction, and
- * completion event emission.  The Session class delegates its
- * runAgentLoop method here via the AgentLoopSessionContext interface.
+ * completion event emission.  The Conversation class delegates its
+ * runAgentLoop method here via the AgentLoopConversationContext interface.
  */
 
 import { v4 as uuid } from "uuid";
@@ -28,8 +28,8 @@ import type { ContextWindowManager } from "../context/window-manager.js";
 import type { ToolProfiler } from "../events/tool-profiling-listener.js";
 import { getHookManager } from "../hooks/manager.js";
 import {
-  clearSentrySessionContext,
-  setSentrySessionContext,
+  clearSentryConversationContext,
+  setSentryConversationContext,
 } from "../instrument.js";
 import { commitAppTurnChanges } from "../memory/app-git-service.js";
 import { getApp, listAppFiles } from "../memory/app-store.js";
@@ -71,38 +71,26 @@ import {
   reduceContextOverflow,
   type ReducerState,
 } from "./context-overflow-reducer.js";
-import {
-  buildTemporalContext,
-  extractUserTimeZoneFromRecall,
-} from "./date-context.js";
-import { deepRepairHistory, repairHistory } from "./history-repair.js";
-import type {
-  DynamicPageSurfaceData,
-  ServerMessage,
-  SurfaceData,
-  SurfaceType,
-  UsageStats,
-} from "./message-protocol.js";
 import {
   createEventHandlerState,
   dispatchAgentEvent,
   type EventHandlerDeps,
-} from "./session-agent-loop-handlers.js";
+} from "./conversation-agent-loop-handlers.js";
 import {
   approveHostAttachmentRead,
   formatAttachmentWarnings,
   resolveAssistantAttachments,
-} from "./session-attachments.js";
+} from "./conversation-attachments.js";
 import {
-  buildSessionErrorMessage,
-  classifySessionError,
+  buildConversationErrorMessage,
+  classifyConversationError,
   isUserCancellation,
-} from "./session-error.js";
-import { consolidateAssistantMessages } from "./session-history.js";
-import { raceWithTimeout } from "./session-media-retry.js";
-import { prepareMemoryContext } from "./session-memory.js";
-import type { MessageQueue } from "./session-queue-manager.js";
-import type { QueueDrainReason } from "./session-queue-manager.js";
+} from "./conversation-error.js";
+import { consolidateAssistantMessages } from "./conversation-history.js";
+import { raceWithTimeout } from "./conversation-media-retry.js";
+import { prepareMemoryContext } from "./conversation-memory.js";
+import type { MessageQueue } from "./conversation-queue-manager.js";
+import type { QueueDrainReason } from "./conversation-queue-manager.js";
 import type {
   ActiveSurfaceContext,
   ChannelCapabilities,
@@ -111,19 +99,31 @@ import type {
   InjectionMode,
   InterfaceTurnContextParams,
   TrustContext,
-} from "./session-runtime-assembly.js";
+} from "./conversation-runtime-assembly.js";
 import {
   applyRuntimeInjections,
   inboundActorContextFromTrust,
   inboundActorContextFromTrustContext,
   stripInjectedContext,
-} from "./session-runtime-assembly.js";
-import type { SkillProjectionCache } from "./session-skill-tools.js";
-import { resolveTrustClass } from "./session-tool-setup.js";
-import { recordUsage } from "./session-usage.js";
+} from "./conversation-runtime-assembly.js";
+import type { SkillProjectionCache } from "./conversation-skill-tools.js";
+import { resolveTrustClass } from "./conversation-tool-setup.js";
+import { recordUsage } from "./conversation-usage.js";
+import {
+  buildTemporalContext,
+  extractUserTimeZoneFromRecall,
+} from "./date-context.js";
+import { deepRepairHistory, repairHistory } from "./history-repair.js";
+import type {
+  DynamicPageSurfaceData,
+  ServerMessage,
+  SurfaceData,
+  SurfaceType,
+  UsageStats,
+} from "./message-protocol.js";
 import type { TraceEmitter } from "./trace-emitter.js";
 
-const log = getLogger("session-agent-loop");
+const log = getLogger("conversation-agent-loop");
 
 /**
  * Parse the actual token count reported by the provider in a context-too-large
@@ -187,7 +187,7 @@ type GitServiceInitializer = {
 
 // ── Context Interface ────────────────────────────────────────────────
 
-export interface AgentLoopSessionContext {
+export interface AgentLoopConversationContext {
   readonly conversationId: string;
   messages: Message[];
   processing: boolean;
@@ -287,7 +287,7 @@ export interface AgentLoopSessionContext {
   ): void;
 
   /**
-   * Optional callback invoked by the Session when a confirmation state changes.
+   * Optional callback invoked by the Conversation when a confirmation state changes.
    * The agent loop registers this to track requestId → toolUseId mappings
    * and record confirmation outcomes for persistence.
    */
@@ -314,7 +314,7 @@ export interface AgentLoopSessionContext {
 // ── runAgentLoop ─────────────────────────────────────────────────────
 
 export async function runAgentLoopImpl(
-  ctx: AgentLoopSessionContext,
+  ctx: AgentLoopConversationContext,
   content: string,
   userMessageId: string,
   onEvent: (msg: ServerMessage) => void,
@@ -387,10 +387,10 @@ export async function runAgentLoopImpl(
   ctx.profiler.startRequest();
   let turnStarted = false;
 
-  // Populate Sentry scope with session-specific tags so any exception
+  // Populate Sentry scope with conversation-specific tags so any exception
   // captured during this turn (e.g. inside agent/loop.ts) can be
   // filtered by conversation, assistant, or user in the dashboard.
-  setSentrySessionContext({
+  setSentryConversationContext({
     assistantId: ctx.assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID,
     conversationId: ctx.conversationId,
     messageCount: ctx.messages.length,
@@ -410,7 +410,7 @@ export async function runAgentLoopImpl(
         if (entry.surfaceType === "dynamic_page") continue;
         onEvent({
           type: "ui_surface_complete",
-          sessionId: ctx.conversationId,
+          conversationId: ctx.conversationId,
           surfaceId,
           summary: "Dismissed",
         });
@@ -419,7 +419,7 @@ export async function runAgentLoopImpl(
     }
 
     const preMessageResult = await getHookManager().trigger("pre-message", {
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       messagePreview: truncate(content, 200, ""),
     });
 
@@ -428,7 +428,7 @@ export async function runAgentLoopImpl(
         ctx.messages.pop();
         deleteMessageById(userMessageId);
       }
-      // Replace loading placeholder so the thread isn't stuck as "Generating title..."
+      // Replace loading placeholder so the conversation isn't stuck as "Generating title..."
       const currentConv = getConversation(ctx.conversationId);
       if (
         isReplaceableTitle(currentConv?.title ?? null) &&
@@ -436,8 +436,8 @@ export async function runAgentLoopImpl(
       ) {
         updateConversationTitle(ctx.conversationId, UNTITLED_FALLBACK);
         onEvent({
-          type: "session_title_updated",
-          sessionId: ctx.conversationId,
+          type: "conversation_title_updated",
+          conversationId: ctx.conversationId,
           title: UNTITLED_FALLBACK,
         });
       }
@@ -466,8 +466,8 @@ export async function runAgentLoopImpl(
           userMessage: options?.titleText ?? content,
           onTitleUpdated: (title) => {
             onEvent({
-              type: "session_title_updated",
-              sessionId: ctx.conversationId,
+              type: "conversation_title_updated",
+              conversationId: ctx.conversationId,
               title,
             });
           },
@@ -649,9 +649,9 @@ export async function runAgentLoopImpl(
     };
 
     // Resolve the inbound actor context for the model's <inbound_actor_context>
-    // block. When the session carries enough identity info, use the unified
+    // block. When the conversation carries enough identity info, use the unified
     // actor trust resolver so member status/policy and guardian binding details
-    // are fresh for this turn. The session runtime context remains the source
+    // are fresh for this turn. The conversation runtime context remains the source
     // for policy gating; this block is model-facing grounding metadata.
     let resolvedInboundActorContext: InboundActorContext | null = null;
     if (ctx.trustContext) {
@@ -859,7 +859,7 @@ export async function runAgentLoopImpl(
 
       // Mid-loop token budget check: estimate current context size and
       // yield if we're approaching the preflight budget. This lets the
-      // session-agent-loop run compaction before the provider rejects.
+      // conversation-agent-loop run compaction before the provider rejects.
       if (overflowRecovery.enabled) {
         const midLoopThreshold = preflightBudget * 0.85;
         const estimated = estimatePromptTokens(
@@ -1196,6 +1196,21 @@ export async function runAgentLoopImpl(
           reqId,
           onCheckpoint,
         );
+
+        // If the rerun still yields at checkpoint, the turn is still
+        // incomplete — continue reducing through the remaining tiers
+        // instead of silently dropping the incomplete state.
+        if (yieldedForBudget && !abortController.signal.aborted) {
+          rlog.warn(
+            {
+              phase: "convergence",
+              attempt: convergenceAttempts,
+              appliedTiers: reducerState.appliedTiers,
+            },
+            "Post-convergence rerun still yielded at checkpoint — continuing reduction",
+          );
+          state.contextTooLargeDetected = true;
+        }
       }
 
       // All reducer tiers exhausted but provider still rejects —
@@ -1280,12 +1295,12 @@ export async function runAgentLoopImpl(
             );
           } else {
             // User denied compression — emit a graceful assistant explanation
-            // instead of a session_error, and end the turn cleanly.
+            // instead of a conversation_error, and end the turn cleanly.
             state.contextTooLargeDetected = false;
             const denyText =
               "The conversation has grown too long for the model to process, " +
               "and compression was declined. Please start a new conversation " +
-              "or manually shorten the thread to continue.";
+              "or manually shorten the conversation to continue.";
             const loopChannelMeta = {
               ...provenanceFromTrustContext(ctx.trustContext),
               userMessageChannel: capturedTurnChannelContext.userMessageChannel,
@@ -1307,7 +1322,7 @@ export async function runAgentLoopImpl(
             onEvent({
               type: "assistant_text_delta",
               text: denyText,
-              sessionId: ctx.conversationId,
+              conversationId: ctx.conversationId,
             });
             // Prevent the final error fallback from firing
             state.providerErrorUserMessage = null;
@@ -1388,20 +1403,20 @@ export async function runAgentLoopImpl(
 
       // Final fallback: all recovery paths exhausted
       if (state.contextTooLargeDetected) {
-        const classified = classifySessionError(
+        const classified = classifyConversationError(
           new Error("context_length_exceeded"),
           { phase: "agent_loop" },
         );
-        onEvent(buildSessionErrorMessage(ctx.conversationId, classified));
+        onEvent(buildConversationErrorMessage(ctx.conversationId, classified));
       }
     }
 
     if (state.deferredOrderingError) {
-      const classified = classifySessionError(
+      const classified = classifyConversationError(
         new Error(state.deferredOrderingError),
         { phase: "agent_loop" },
       );
-      onEvent(buildSessionErrorMessage(ctx.conversationId, classified));
+      onEvent(buildConversationErrorMessage(ctx.conversationId, classified));
     }
 
     // Reconcile synthesized cancellation tool_results
@@ -1497,7 +1512,7 @@ export async function runAgentLoopImpl(
       onEvent({
         type: "assistant_text_delta",
         text: state.providerErrorUserMessage,
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
       });
     }
 
@@ -1525,7 +1540,7 @@ export async function runAgentLoopImpl(
     );
 
     void getHookManager().trigger("post-message", {
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
     });
 
     // Fast-path: when the user cancelled, skip expensive post-loop work
@@ -1541,7 +1556,10 @@ export async function runAgentLoopImpl(
           status: "warning",
         },
       );
-      onEvent({ type: "generation_cancelled", sessionId: ctx.conversationId });
+      onEvent({
+        type: "generation_cancelled",
+        conversationId: ctx.conversationId,
+      });
     } else {
       // Resolve attachments (only when not cancelled — this is expensive async I/O)
       const attachmentResult = await resolveAssistantAttachments(
@@ -1572,7 +1590,7 @@ export async function runAgentLoopImpl(
         onEvent({
           type: "assistant_text_delta",
           text: warningText,
-          sessionId: ctx.conversationId,
+          conversationId: ctx.conversationId,
         });
       }
 
@@ -1589,7 +1607,7 @@ export async function runAgentLoopImpl(
         );
         onEvent({
           type: "generation_cancelled",
-          sessionId: ctx.conversationId,
+          conversationId: ctx.conversationId,
         });
       } else if (yieldedForHandoff) {
         ctx.traceEmitter.emit(
@@ -1603,7 +1621,7 @@ export async function runAgentLoopImpl(
         );
         onEvent({
           type: "generation_handoff",
-          sessionId: ctx.conversationId,
+          conversationId: ctx.conversationId,
           requestId: reqId,
           queuedCount: ctx.getQueueDepth(),
           ...(emittedAttachments.length > 0
@@ -1625,7 +1643,7 @@ export async function runAgentLoopImpl(
         );
         onEvent({
           type: "message_complete",
-          sessionId: ctx.conversationId,
+          conversationId: ctx.conversationId,
           ...(emittedAttachments.length > 0
             ? { attachments: emittedAttachments }
             : {}),
@@ -1646,8 +1664,8 @@ export async function runAgentLoopImpl(
         provider: ctx.provider,
         onTitleUpdated: (title) => {
           onEvent({
-            type: "session_title_updated",
-            sessionId: ctx.conversationId,
+            type: "conversation_title_updated",
+            conversationId: ctx.conversationId,
             title,
           });
         },
@@ -1670,13 +1688,16 @@ export async function runAgentLoopImpl(
           status: "warning",
         },
       );
-      onEvent({ type: "generation_cancelled", sessionId: ctx.conversationId });
+      onEvent({
+        type: "generation_cancelled",
+        conversationId: ctx.conversationId,
+      });
     } else {
       ctx.emitActivityState("idle", "error_terminal", "global", reqId);
       const message = err instanceof Error ? err.message : String(err);
       const errorClass = err instanceof Error ? err.constructor.name : "Error";
-      rlog.error({ err }, "Session processing error");
-      const classified = classifySessionError(err, errorCtx);
+      rlog.error({ err }, "Conversation processing error");
+      const classified = classifyConversationError(err, errorCtx);
       ctx.traceEmitter.emit("request_error", truncate(message, 200, ""), {
         requestId: reqId,
         status: "error",
@@ -1688,12 +1709,12 @@ export async function runAgentLoopImpl(
         },
       });
       onEvent({ type: "error", message: classified.userMessage });
-      onEvent(buildSessionErrorMessage(ctx.conversationId, classified));
+      onEvent(buildConversationErrorMessage(ctx.conversationId, classified));
       void getHookManager().trigger("on-error", {
         error: err instanceof Error ? err.name : "Error",
         message,
         stack: err instanceof Error ? err.stack : undefined,
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
       });
     }
   } finally {
@@ -1746,9 +1767,9 @@ export async function runAgentLoopImpl(
 
     ctx.drainQueue(yieldedForHandoff ? "checkpoint_handoff" : "loop_complete");
 
-    // Clear session tags so they don't leak into unrelated error captures
+    // Clear conversation tags so they don't leak into unrelated error captures
     // (e.g. unhandledRejection from a different async chain).
-    clearSentrySessionContext();
+    clearSentryConversationContext();
   }
 }
 
@@ -1756,7 +1777,7 @@ export async function runAgentLoopImpl(
 
 function emitUsage(
   ctx: Pick<
-    AgentLoopSessionContext,
+    AgentLoopConversationContext,
     "conversationId" | "provider" | "usageStats"
   >,
   inputTokens: number,

package/src/daemon/{session-attachments.ts → conversation-attachments.ts}

@@ -1,8 +1,11 @@
 import {
   AttachmentUploadError,
+  FILE_BACKED_THRESHOLD_BYTES,
   linkAttachmentToMessage,
   setAttachmentThumbnail,
   uploadAttachment,
+  uploadFileBackedAttachment,
+  writeAttachmentToDisk,
 } from "../memory/attachments-store.js";
 import {
   check,
@@ -25,9 +28,12 @@ import {
   validateDrafts,
 } from "./assistant-attachments.js";
 import type { UserMessageAttachment } from "./message-protocol.js";
-import { generateVideoThumbnail } from "./video-thumbnail.js";
+import {
+  generateVideoThumbnail,
+  generateVideoThumbnailFromPath,
+} from "./video-thumbnail.js";
 
-const log = getLogger("session-attachments");
+const log = getLogger("conversation-attachments");
 
 /**
  * Approve reading a host file for assistant attachment resolution.
@@ -205,13 +211,28 @@ export async function resolveAssistantAttachments(
   if (assistantAttachments.length > 0 && lastAssistantMessageId) {
     for (let i = 0; i < assistantAttachments.length; i++) {
       const draft = assistantAttachments[i];
+      const isFileBacked = draft.sizeBytes > FILE_BACKED_THRESHOLD_BYTES;
       let stored;
+      let diskFilePath: string | undefined;
       try {
-        stored = uploadAttachment(
-          draft.filename,
-          draft.mimeType,
-          draft.dataBase64,
-        );
+        if (isFileBacked) {
+          diskFilePath = writeAttachmentToDisk(
+            draft.dataBase64,
+            draft.filename,
+          );
+          stored = uploadFileBackedAttachment(
+            draft.filename,
+            draft.mimeType,
+            diskFilePath,
+            draft.sizeBytes,
+          );
+        } else {
+          stored = uploadAttachment(
+            draft.filename,
+            draft.mimeType,
+            draft.dataBase64,
+          );
+        }
       } catch (err) {
         if (err instanceof AttachmentUploadError) {
           log.warn(
@@ -227,7 +248,9 @@ export async function resolveAssistantAttachments(
       }
       linkAttachmentToMessage(lastAssistantMessageId, stored.id, i);
       const isVideo = draft.mimeType.startsWith("video/");
-      const omitData = isVideo && draft.dataBase64.length > MAX_INLINE_B64_SIZE;
+      const omitData =
+        isFileBacked ||
+        (isVideo && draft.dataBase64.length > MAX_INLINE_B64_SIZE);
 
       // Generate and persist a thumbnail for video attachments.
       let thumbnailData: string | undefined;
@@ -236,7 +259,9 @@ export async function resolveAssistantAttachments(
         if (existing) {
           thumbnailData = existing;
         } else {
-          const generated = await generateVideoThumbnail(draft.dataBase64);
+          const generated = diskFilePath
+            ? await generateVideoThumbnailFromPath(diskFilePath)
+            : await generateVideoThumbnail(draft.dataBase64);
           if (generated) {
             setAttachmentThumbnail(stored.id, generated);
             thumbnailData = generated;
@@ -250,6 +275,7 @@ export async function resolveAssistantAttachments(
         mimeType: draft.mimeType,
         data: omitData ? "" : draft.dataBase64,
         ...(omitData ? { sizeBytes: draft.sizeBytes } : {}),
+        ...(isFileBacked ? { fileBacked: true } : {}),
         ...(thumbnailData ? { thumbnailData } : {}),
       });
     }

package/src/daemon/{session-error.ts → conversation-error.ts}

@@ -1,14 +1,14 @@
 import { ProviderError } from "../util/errors.js";
 import type {
-  SessionErrorCode,
-  SessionErrorMessage,
+  ConversationErrorCode,
+  ConversationErrorMessage,
 } from "./message-protocol.js";
 
 /**
- * Classified session error ready for client emission.
+ * Classified conversation error ready for client emission.
  */
-export interface ClassifiedSessionError {
-  code: SessionErrorCode;
+export interface ClassifiedConversationError {
+  code: ConversationErrorCode;
   userMessage: string;
   retryable: boolean;
   debugDetails?: string;
@@ -85,7 +85,7 @@ const WEB_SEARCH_ORDERING_PATTERNS = [
   /web_search.*tool_result/i,
 ];
 
-// User-initiated cancellation patterns — these should NOT produce session_error
+// User-initiated cancellation patterns — these should NOT produce conversation_error
 const CANCEL_PATTERNS = [/abort/i, /cancel/i];
 
 /**
@@ -101,7 +101,7 @@ export interface ErrorContext {
 /**
  * Returns true if the error looks like a user-initiated cancellation
  * (AbortError or explicit cancel). These should use `generation_cancelled`
- * instead of `session_error`.
+ * instead of `conversation_error`.
  */
 export function isUserCancellation(error: unknown, ctx: ErrorContext): boolean {
   if (!ctx.aborted) return false;
@@ -122,7 +122,7 @@ function truncateDebugDetails(details: string): string {
 }
 
 /**
- * Classify an unknown error into a structured session error.
+ * Classify an unknown error into a structured conversation error.
  * Does NOT handle user-initiated cancellation — callers should check
  * `isUserCancellation` first and emit `generation_cancelled` instead.
  *
@@ -131,10 +131,10 @@ function truncateDebugDetails(details: string): string {
  * 2. ProviderError.statusCode (deterministic for provider failures)
  * 3. Regex fallback for network/cancel/unknown errors
  */
-export function classifySessionError(
+export function classifyConversationError(
   error: unknown,
   ctx: ErrorContext,
-): ClassifiedSessionError {
+): ClassifiedConversationError {
   const message = error instanceof Error ? error.message : String(error);
   const rawDetails =
     (error instanceof Error ? error.stack : undefined) ?? message;
@@ -167,14 +167,14 @@ export function classifySessionError(
 function classifyCore(
   error: unknown,
   message: string,
-): Omit<ClassifiedSessionError, "debugDetails"> {
+): Omit<ClassifiedConversationError, "debugDetails"> {
   // ProviderError with statusCode — deterministic classification
   if (error instanceof ProviderError && error.statusCode !== undefined) {
     if (error.statusCode === 413) {
       return {
         code: "CONTEXT_TOO_LARGE",
         userMessage:
-          "This conversation is too long. Please start a new thread.",
+          "This conversation is too long. Please start a new conversation.",
         retryable: false,
         errorCategory: "context_too_large",
       };
@@ -187,6 +187,15 @@ function classifyCore(
         errorCategory: "provider_billing",
       };
     }
+    if (error.statusCode === 402) {
+      return {
+        code: "PROVIDER_BILLING",
+        userMessage:
+          "You've run out of credits. Add funds to continue using the assistant.",
+        retryable: false,
+        errorCategory: "credits_exhausted",
+      };
+    }
     if (error.statusCode === 429) {
       return {
         code: "PROVIDER_RATE_LIMIT",
@@ -209,7 +218,7 @@ function classifyCore(
         return {
           code: "CONTEXT_TOO_LARGE",
           userMessage:
-            "This conversation is too long. Please start a new thread.",
+            "This conversation is too long. Please start a new conversation.",
           retryable: false,
           errorCategory: "context_too_large",
         };
@@ -281,12 +290,13 @@ export function isOrderingError(message: string): boolean {
 
 function classifyByMessage(
   message: string,
-): Omit<ClassifiedSessionError, "debugDetails"> {
+): Omit<ClassifiedConversationError, "debugDetails"> {
   // Check context-too-large before other patterns
   if (isContextTooLarge(message)) {
     return {
       code: "CONTEXT_TOO_LARGE",
-      userMessage: "This conversation is too long. Please start a new thread.",
+      userMessage:
+        "This conversation is too long. Please start a new conversation.",
       retryable: false,
       errorCategory: "context_too_large",
     };
@@ -366,7 +376,7 @@ function classifyByMessage(
   for (const pattern of CANCEL_PATTERNS) {
     if (pattern.test(message)) {
       return {
-        code: "SESSION_ABORTED",
+        code: "CONVERSATION_ABORTED",
         userMessage: "The request was interrupted.",
         retryable: true,
         errorCategory: "session_aborted",
@@ -387,7 +397,7 @@ function classifyByMessage(
     ? `Processing failed: ${summary}`
     : "Something went wrong processing your message. Please try again.";
   return {
-    code: "SESSION_PROCESSING_FAILED",
+    code: "CONVERSATION_PROCESSING_FAILED",
     userMessage,
     retryable: false,
     errorCategory: "processing_failed",
@@ -395,15 +405,15 @@ function classifyByMessage(
 }
 
 /**
- * Build a `session_error` server message from a classified error.
+ * Build a `conversation_error` server message from a classified error.
  */
-export function buildSessionErrorMessage(
-  sessionId: string,
-  classified: ClassifiedSessionError,
-): SessionErrorMessage {
+export function buildConversationErrorMessage(
+  conversationId: string,
+  classified: ClassifiedConversationError,
+): ConversationErrorMessage {
   return {
-    type: "session_error",
-    sessionId,
+    type: "conversation_error",
+    conversationId,
     code: classified.code,
     userMessage: classified.userMessage,
     retryable: classified.retryable,