@vellumai/assistant 0.4.54 → 0.4.56

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

@@ -4,6 +4,7 @@ import { getApp, getAppPreview, updateApp } from "../memory/app-store.js";
 import type { ToolExecutionResult } from "../tools/types.js";
 import { getLogger } from "../util/logger.js";
 import { isPlainObject } from "../util/object.js";
+import { buildConversationErrorMessage } from "./conversation-error.js";
 import type {
   CardSurfaceData,
   DynamicPageSurfaceData,
@@ -17,9 +18,8 @@ import type {
   UiSurfaceShow,
 } from "./message-protocol.js";
 import { INTERACTIVE_SURFACE_TYPES } from "./message-protocol.js";
-import { buildSessionErrorMessage } from "./session-error.js";
 
-const log = getLogger("session-surfaces");
+const log = getLogger("conversation-surfaces");
 
 const MAX_UNDO_DEPTH = 10;
 const TASK_PROGRESS_TEMPLATE_FIELDS = ["title", "status", "steps"] as const;
@@ -153,11 +153,11 @@ function normalizeTaskProgressCardPatch(
 }
 
 /**
- * Subset of Session state that surface helpers need access to.
- * The Session class implements this interface so its instances can be
+ * Subset of Conversation state that surface helpers need access to.
+ * The Conversation class implements this interface so its instances can be
  * passed directly to the extracted functions.
  */
-export interface SurfaceSessionContext {
+export interface SurfaceConversationContext {
   readonly conversationId: string;
   readonly channelCapabilities?: {
     channel: string;
@@ -274,7 +274,7 @@ export function createSurfaceMutex(): SurfaceMutex {
  * Auto-saves the document content to the app store.
  */
 function handleDocumentContentChanged(
-  ctx: SurfaceSessionContext,
+  ctx: SurfaceConversationContext,
   surfaceId: string,
   data?: Record<string, unknown>,
 ): void {
@@ -363,14 +363,14 @@ export function pushUndoState(
 }
 
 export function handleSurfaceUndo(
-  ctx: SurfaceSessionContext,
+  ctx: SurfaceConversationContext,
   surfaceId: string,
 ): void {
   const stack = ctx.surfaceUndoStacks.get(surfaceId);
   if (!stack || stack.length === 0) {
     ctx.sendToClient({
       type: "ui_surface_undo_result",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       success: false,
       remainingUndos: 0,
@@ -383,7 +383,7 @@ export function handleSurfaceUndo(
   if (!stored || stored.surfaceType !== "dynamic_page") {
     ctx.sendToClient({
       type: "ui_surface_undo_result",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       success: false,
       remainingUndos: stack.length,
@@ -413,7 +413,7 @@ export function handleSurfaceUndo(
       s.data = revertedData;
       ctx.sendToClient({
         type: "ui_surface_update",
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
         surfaceId: sid,
         data: revertedData,
       });
@@ -444,7 +444,7 @@ export function handleSurfaceUndo(
     stored.data = revertedData;
     ctx.sendToClient({
       type: "ui_surface_update",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       data: revertedData,
     });
@@ -452,7 +452,7 @@ export function handleSurfaceUndo(
 
   ctx.sendToClient({
     type: "ui_surface_undo_result",
-    sessionId: ctx.conversationId,
+    conversationId: ctx.conversationId,
     surfaceId,
     success: true,
     remainingUndos: stack.length,
@@ -535,7 +535,7 @@ export function buildDeselectionDescription(
 }
 
 export function handleSurfaceAction(
-  ctx: SurfaceSessionContext,
+  ctx: SurfaceConversationContext,
   surfaceId: string,
   actionId: string,
   data?: Record<string, unknown>,
@@ -584,18 +584,18 @@ export function handleSurfaceAction(
     ctx.sendToClient({
       type: "user_message_echo",
       text: prompt,
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
     });
 
     if (result.queued) {
       log.info(
         { surfaceId, actionId, requestId },
-        "Relay prompt queued (session busy, history-restored)",
+        "Relay prompt queued (conversation busy, history-restored)",
       );
       return;
     }
 
-    // Session is idle — process the message immediately.
+    // Conversation is idle — process the message immediately.
     log.info(
       { surfaceId, actionId, requestId },
       "Processing relay prompt immediately (history-restored)",
@@ -609,8 +609,8 @@ export function handleSurfaceAction(
           "Failed to process history-restored relay prompt",
         );
         onEvent(
-          buildSessionErrorMessage(ctx.conversationId, {
-            code: "SESSION_PROCESSING_FAILED",
+          buildConversationErrorMessage(ctx.conversationId, {
+            code: "CONVERSATION_PROCESSING_FAILED",
             userMessage: `Something went wrong: ${message}`,
             retryable: false,
             debugDetails: `History-restored relay prompt processing failed: ${message}`,
@@ -632,7 +632,7 @@ export function handleSurfaceAction(
   }
 
   // content_changed is a non-terminal state update for document auto-save
-  // Save the document content and don't forward to the session
+  // Save the document content and don't forward to the conversation
   if (actionId === "content_changed") {
     handleDocumentContentChanged(ctx, surfaceId, data);
     return;
@@ -735,7 +735,7 @@ export function handleSurfaceAction(
     ctx.sendToClient({
       type: "user_message_echo",
       text: prompt,
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
     });
   }
   if (result.queued) {
@@ -745,7 +745,7 @@ export function handleSurfaceAction(
     }
     log.info(
       { surfaceId, actionId, requestId },
-      "Surface action queued (session busy)",
+      "Surface action queued (conversation busy)",
     );
     ctx.traceEmitter.emit(
       "request_queued",
@@ -758,7 +758,7 @@ export function handleSurfaceAction(
     );
     onEvent({
       type: "message_queued",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       requestId,
       position,
     });
@@ -800,7 +800,7 @@ export function handleSurfaceAction(
  * After an app_update, refresh any active surface that displays the updated app.
  */
 export function refreshSurfacesForApp(
-  ctx: SurfaceSessionContext,
+  ctx: SurfaceConversationContext,
   appId: string,
   opts?: { fileChange?: boolean; status?: string },
 ): boolean {
@@ -827,7 +827,7 @@ export function refreshSurfacesForApp(
     };
     stored.data = updatedData;
 
-    // Keep the persisted snapshot in sync so updates survive session restart.
+    // Keep the persisted snapshot in sync so updates survive conversation restart.
     const idx = ctx.currentTurnSurfaces.findIndex(
       (s) => s.surfaceId === surfaceId,
     );
@@ -838,7 +838,7 @@ export function refreshSurfacesForApp(
     // Push the update to the client
     ctx.sendToClient({
       type: "ui_surface_update",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       data: updatedData,
     });
@@ -936,7 +936,7 @@ export function buildUserFacingLabel(
  * Handles ui_show, ui_update, ui_dismiss, computer_use_* proxy tools, and app_open.
  */
 export async function surfaceProxyResolver(
-  ctx: SurfaceSessionContext,
+  ctx: SurfaceConversationContext,
   toolName: string,
   input: Record<string, unknown>,
   signal?: AbortSignal,
@@ -1077,7 +1077,7 @@ export async function surfaceProxyResolver(
 
     ctx.sendToClient({
       type: "ui_surface_show",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       surfaceType,
       title,
@@ -1142,12 +1142,12 @@ export async function surfaceProxyResolver(
 
     ctx.sendToClient({
       type: "ui_surface_update",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       data: mergedData,
     });
 
-    // Keep the persisted snapshot in sync so updates survive session restart.
+    // Keep the persisted snapshot in sync so updates survive conversation restart.
     const idx = ctx.currentTurnSurfaces.findIndex(
       (s) => s.surfaceId === surfaceId,
     );
@@ -1171,7 +1171,7 @@ export async function surfaceProxyResolver(
       );
       ctx.sendToClient({
         type: "ui_surface_complete",
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
         surfaceId,
         summary,
         submittedData: lastAction.data,
@@ -1179,7 +1179,7 @@ export async function surfaceProxyResolver(
     } else {
       ctx.sendToClient({
         type: "ui_surface_dismiss",
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
         surfaceId,
       });
     }
@@ -1201,7 +1201,7 @@ export async function surfaceProxyResolver(
     if (!app) return { content: `App not found: ${appId}`, isError: true };
     // Generate a minimal fallback preview from app metadata so that the
     // surface is always rendered as a clickable preview card (not an
-    // un-clickable fallback chip) after session restart.
+    // un-clickable fallback chip) after conversation restart.
     const defaultPreview = { title: app.name, subtitle: app.description };
 
     const storedPreview = getAppPreview(app.id);
@@ -1222,7 +1222,7 @@ export async function surfaceProxyResolver(
       // this as a tappable inline card that opens the app on demand.
       ctx.sendToClient({
         type: "ui_surface_show",
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
         surfaceId,
         surfaceType: "dynamic_page",
         title: app.name,
@@ -1250,7 +1250,7 @@ export async function surfaceProxyResolver(
 
     ctx.sendToClient({
       type: "ui_surface_show",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       surfaceType: "dynamic_page",
       title: app.name,

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

@@ -1,12 +1,13 @@
 /**
- * Tool definitions and executor setup extracted from Session constructor.
+ * Tool definitions and executor setup extracted from Conversation constructor.
  *
- * The Session constructor delegates tool definition building and tool
+ * The Conversation constructor delegates tool definition building and tool
  * executor callback creation to the helper functions exported here,
  * keeping the constructor body focused on wiring.
  */
 
 import { isHttpAuthDisabled } from "../config/env.js";
+import type { CesClient } from "../credential-execution/client.js";
 import { getBindingByConversation } from "../memory/external-conversation-store.js";
 import {
   generateAllowlistOptions,
@@ -22,9 +23,9 @@ import {
 import { isAllowDecision } from "../permissions/types.js";
 import type { Message, ToolDefinition } from "../providers/types.js";
 import type { TrustClass } from "../runtime/actor-trust-resolver.js";
-import { getEffectiveMode } from "../runtime/session-approval-overrides.js";
+import { getEffectiveMode } from "../runtime/conversation-approval-overrides.js";
 import { coreAppProxyTools } from "../tools/apps/definitions.js";
-import { registerSessionSender } from "../tools/browser/browser-screencast.js";
+import { registerConversationSender } from "../tools/browser/browser-screencast.js";
 import type { ToolExecutor } from "../tools/executor.js";
 import {
   getAllToolDefinitions,
@@ -43,21 +44,21 @@ import type {
 } from "../tools/types.js";
 import { allUiSurfaceTools } from "../tools/ui-surface/definitions.js";
 import { getLogger } from "../util/logger.js";
+import type { TrustContext } from "./conversation-runtime-assembly.js";
+import {
+  projectSkillTools,
+  type SkillProjectionCache,
+} from "./conversation-skill-tools.js";
+import type { SurfaceConversationContext } from "./conversation-surfaces.js";
+import { surfaceProxyResolver } from "./conversation-surfaces.js";
 import {
   isDoordashCommand,
   markDoordashStepInProgress,
 } from "./doordash-steps.js";
 import type { ServerMessage, UiSurfaceShow } from "./message-protocol.js";
-import type { TrustContext } from "./session-runtime-assembly.js";
-import {
-  projectSkillTools,
-  type SkillProjectionCache,
-} from "./session-skill-tools.js";
-import type { SurfaceSessionContext } from "./session-surfaces.js";
-import { surfaceProxyResolver } from "./session-surfaces.js";
 import { runPostExecutionSideEffects } from "./tool-side-effects.js";
 
-const log = getLogger("session-tool-setup");
+const log = getLogger("conversation-tool-setup");
 
 /**
  * Resolve the effective trust class for tool execution.
@@ -65,7 +66,7 @@ const log = getLogger("session-tool-setup");
  * When HTTP auth is disabled (dev bypass), always returns `'guardian'`
  * so that control-plane gates don't block local development.
  *
- * When no trust context is available (e.g. desktop-only sessions that
+ * When no trust context is available (e.g. desktop-only conversations that
  * don't go through channel trust resolution), defaults to `'unknown'`
  * to fail-closed.
  */
@@ -79,11 +80,11 @@ export function resolveTrustClass(
 // ── Context Interface ────────────────────────────────────────────────
 
 /**
- * Subset of Session state that the tool executor callback reads at
+ * Subset of Conversation state that the tool executor callback reads at
  * call time (not construction time). These are captured by the
  * returned closure, so they must be live references.
  */
-export interface ToolSetupContext extends SurfaceSessionContext {
+export interface ToolSetupContext extends SurfaceConversationContext {
   readonly conversationId: string;
   assistantId?: string;
   currentRequestId?: string;
@@ -92,22 +93,24 @@ export interface ToolSetupContext extends SurfaceSessionContext {
   abortController: AbortController | null;
   /** When set, only tools in this set may execute during the current turn. */
   allowedToolNames?: Set<string>;
-  /** Session memory policy — used to propagate scopeId and strictSideEffects into ToolContext. */
+  /** Conversation memory policy — used to propagate scopeId and strictSideEffects into ToolContext. */
   memoryPolicy: { scopeId: string; strictSideEffects: boolean };
-  /** True when the session has no connected client (HTTP-only path). */
+  /** True when the conversation has no connected client (HTTP-only path). */
   hasNoClient?: boolean;
-  /** When true, the session is executing a task run and must not become interactive. */
+  /** When true, the conversation is executing a task run and must not become interactive. */
   headlessLock?: boolean;
-  /** When set, this session is executing a task run. Used to retrieve ephemeral permission rules. */
+  /** When set, this conversation is executing a task run. Used to retrieve ephemeral permission rules. */
   taskRunId?: string;
-  /** Guardian runtime context for the session — trustClass is propagated into ToolContext for control-plane policy enforcement. */
+  /** Guardian runtime context for the conversation — trustClass is propagated into ToolContext for control-plane policy enforcement. */
   trustContext?: TrustContext;
-  /** Voice/call session ID, if the session originates from a call. Propagated into ToolContext for scoped grant consumption. */
+  /** Voice/call session ID, if the conversation originates from a call. Propagated into ToolContext for scoped grant consumption. */
   callSessionId?: string;
   /** Optional proxy for delegating host_bash execution to a connected client. */
   hostBashProxy?: import("./host-bash-proxy.js").HostBashProxy;
   /** Optional proxy for delegating host_file_read/write/edit execution to a connected client. */
   hostFileProxy?: import("./host-file-proxy.js").HostFileProxy;
+  /** CES RPC client for credential execution operations. Injected when CES tools are enabled and the CES process is available. */
+  cesClient?: CesClient;
 }
 
 // ── buildToolDefinitions ─────────────────────────────────────────────
@@ -129,7 +132,7 @@ export function buildToolDefinitions(): ToolDefinition[] {
 /**
  * Build the tool executor callback that the AgentLoop calls for each
  * tool_use block. The returned function closes over `ctx` so it sees
- * live Session state (workingDir, currentRequestId, abortController,
+ * live Conversation state (workingDir, currentRequestId, abortController,
  * etc.) at invocation time.
  */
 export function createToolExecutor(
@@ -145,8 +148,10 @@ export function createToolExecutor(
   onOutput?: (chunk: string) => void,
   toolUseId?: string,
 ) => Promise<ToolExecutionResult> {
-  // Register the session's sendToClient for browser screencast surface messages
-  registerSessionSender(ctx.conversationId, (msg) => ctx.sendToClient(msg));
+  // Register the conversation's sendToClient for browser screencast surface messages
+  registerConversationSender(ctx.conversationId, (msg) =>
+    ctx.sendToClient(msg),
+  );
 
   return async (
     name: string,
@@ -162,7 +167,6 @@ export function createToolExecutor(
     // path and the regular executor path.
     const toolContext: ToolContext = {
       workingDir: ctx.workingDir,
-      sessionId: ctx.conversationId,
       conversationId: ctx.conversationId,
       assistantId: ctx.assistantId,
       requestId: ctx.currentRequestId,
@@ -187,6 +191,7 @@ export function createToolExecutor(
       toolUseId,
       hostBashProxy: ctx.hostBashProxy,
       hostFileProxy: ctx.hostFileProxy,
+      cesClient: ctx.cesClient,
       onToolLifecycleEvent: handleToolLifecycleEvent,
       sendToClient: (msg) => {
         // Tool context's sendToClient uses a loose { type: string; [key: string]: unknown }
@@ -452,14 +457,14 @@ export function createProxyApprovalCallback(
 
     const scopeOptions = generateScopeOptions(ctx.workingDir);
 
-    // Non-interactive sessions have no client to prompt — fast-deny to avoid
+    // Non-interactive conversations have no client to prompt — fast-deny to avoid
     // blocking for the full permission timeout before auto-denying.
     if (ctx.hasNoClient) {
       return false;
     }
 
     // Proxied network requests require per-invocation approval and must
-    // not be auto-approved by temporary overrides (allow_10m / allow_thread).
+    // not be auto-approved by temporary overrides (allow_10m / allow_conversation).
     // Unlike regular tool invocations, these represent outbound network
     // actions that should always receive explicit confirmation.
 
@@ -531,12 +536,12 @@ export function createProxyApprovalCallback(
 /**
  * Bundled skills that must always be active regardless of conversation
  * history or explicit preactivation. Without this, their tools are
- * unavailable in fresh sessions until `skill_load` is called.
+ * unavailable in fresh conversations until `skill_load` is called.
  */
 const DEFAULT_PREACTIVATED_SKILL_IDS = ["tasks", "notifications"];
 
 /**
- * Subset of Session state that the resolveTools callback reads at each
+ * Subset of Conversation state that the resolveTools callback reads at each
  * agent turn. Properties are read lazily from this reference.
  */
 export interface SkillProjectionContext {
@@ -573,7 +578,7 @@ const PLATFORM_TOOL_NAMES = new Set(["request_system_permission"]);
 
 /**
  * Determine whether a tool should be included in the LLM tool definitions
- * for the current turn based on session context. Tools not active for the
+ * for the current turn based on conversation context. Tools not active for the
  * current context are omitted from the definitions sent to the provider,
  * reducing noise and preventing the model from attempting calls that would
  * fail.
@@ -609,11 +614,11 @@ export function isToolActiveForContext(
  * allowedToolNames so newly-activated skill tools aren't blocked by
  * the executor's stale gate.
  *
- * Core (non-MCP) tool definitions are captured at session creation and
+ * Core (non-MCP) tool definitions are captured at conversation creation and
  * reused on each turn. MCP tool definitions are re-read from the global
- * registry on each turn so that tools registered after session creation
+ * registry on each turn so that tools registered after conversation creation
  * (e.g. via `vellum mcp reload`) are automatically picked up without
- * requiring session disposal or app restart.
+ * requiring conversation disposal or app restart.
  */
 export function createResolveToolsCallback(
   toolDefs: ToolDefinition[],
@@ -632,7 +637,7 @@ export function createResolveToolsCallback(
       mcpCount: initialMcpDefs.length,
       mcpTools: initialMcpDefs.map((d) => d.name),
     },
-    "Session tool resolver initialized",
+    "Conversation tool resolver initialized",
   );
 
   return (history: Message[]) => {
@@ -644,14 +649,14 @@ export function createResolveToolsCallback(
       return [];
     }
 
-    // Filter core tools based on current session context so that tools
+    // Filter core tools based on current conversation context so that tools
     // irrelevant to this turn (e.g. UI tools when no client is connected)
     // are omitted from the definitions sent to the provider.
     const filteredCoreDefs = coreToolDefs.filter((d) =>
       isToolActiveForContext(d.name, ctx),
     );
 
-    // Re-read MCP tool definitions from the registry each turn so sessions
+    // Re-read MCP tool definitions from the registry each turn so conversations
     // automatically pick up tools added/removed by `vellum mcp reload`.
     const currentMcpDefs = getMcpToolDefinitions();
     log.debug(

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

@@ -11,7 +11,7 @@ import { getLogger } from "../util/logger.js";
 import { resolvePricingForUsageWithOverrides } from "../util/pricing.js";
 import type { ServerMessage, UsageStats } from "./message-protocol.js";
 
-const log = getLogger("session-usage");
+const log = getLogger("conversation-usage");
 
 export interface UsageContext {
   conversationId: string;

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

@@ -2,9 +2,9 @@ import { renderWorkspaceTopLevelContext } from "../workspace/top-level-renderer.
 import { scanTopLevelDirectories } from "../workspace/top-level-scanner.js";
 
 /**
- * Subset of Session state that workspace context helpers need.
+ * Subset of Conversation state that workspace context helpers need.
  */
-export interface WorkspaceSessionContext {
+export interface WorkspaceConversationContext {
   workingDir: string;
   workspaceTopLevelContext: string | null;
   workspaceTopLevelDirty: boolean;
@@ -12,7 +12,7 @@ export interface WorkspaceSessionContext {
 
 /** Refresh workspace top-level directory context if needed. */
 export function refreshWorkspaceTopLevelContextIfNeeded(
-  ctx: WorkspaceSessionContext,
+  ctx: WorkspaceConversationContext,
 ): void {
   if (!ctx.workspaceTopLevelDirty && ctx.workspaceTopLevelContext != null)
     return;