@vellumai/assistant 0.4.55 → 0.4.57

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

@@ -1,8 +1,8 @@
 /**
- * Session-time projection of active skill tools.
+ * Conversation-time projection of active skill tools.
  *
  * On each agent turn the conversation history (and any pre-activated IDs from
- * config or slash commands) determine which skills are "active".  This module
+ * config or programmatic injection) determine which skills are "active".  This module
  * computes the union, loads tool manifests, registers new skill tools, tears
  * down tools for skills that are no longer active, and returns the projected
  * tool definitions so the agent loop can include them in the next request.
@@ -29,7 +29,7 @@ import {
 import { createSkillToolsFromManifest } from "../tools/skills/skill-tool-factory.js";
 import { getLogger } from "../util/logger.js";
 
-const log = getLogger("session-skill-tools");
+const log = getLogger("conversation-skill-tools");
 
 // ---------------------------------------------------------------------------
 // Public types
@@ -43,10 +43,10 @@ export interface SkillToolProjection {
 }
 
 /**
- * Session-scoped cache for skill projection. Avoids re-scanning the entire
+ * Conversation-scoped cache for skill projection. Avoids re-scanning the entire
  * conversation history and re-reading the filesystem on every agent turn.
  *
- * Each session should own its own cache instance to prevent cross-session
+ * Each conversation should own its own cache instance to prevent cross-conversation
  * state bleed.
  */
 export interface SkillProjectionCache {
@@ -63,7 +63,7 @@ export interface SkillProjectionCache {
     /** The accumulated active skill entries. */
     entries: ActiveSkillEntry[];
   };
-  /** Cached skill catalog. Invalidated when the session is marked stale
+  /** Cached skill catalog. Invalidated when the conversation is marked stale
    *  (e.g. skill directories changed on disk while a run is in progress). */
   catalog?: SkillSummary[];
 }
@@ -72,15 +72,15 @@ export interface ProjectSkillToolsOptions {
   /** Skill IDs that should be treated as active regardless of history markers. */
   preactivatedSkillIds?: string[];
   /**
-   * Session-scoped tracking map of previously active skill IDs to their
-   * version hashes. Each session should own its own map to prevent
-   * cross-session state bleed when the daemon serves multiple concurrent
-   * sessions. When a skill's hash changes between turns, its tools are
+   * Conversation-scoped tracking map of previously active skill IDs to their
+   * version hashes. Each conversation should own its own map to prevent
+   * cross-conversation state bleed when the daemon serves multiple concurrent
+   * conversations. When a skill's hash changes between turns, its tools are
    * unregistered and re-registered with the updated definitions.
    */
   previouslyActiveSkillIds?: Map<string, string>;
   /**
-   * Session-scoped projection cache. When provided, projectSkillTools will
+   * Conversation-scoped projection cache. When provided, projectSkillTools will
    * avoid redundant deriveActiveSkills scans and loadSkillCatalog filesystem
    * reads across agent turns.
    */
@@ -122,7 +122,7 @@ function loadManifestForSkill(skill: SkillSummary): SkillToolManifest | null {
 /**
  * Return active skill entries, using the projection cache when available.
  *
- * History is append-only within a session (messages are only added, never
+ * History is append-only within a conversation (messages are only added, never
  * mutated in place). If history.length hasn't changed since the last scan,
  * the cached result is returned immediately. If new messages were appended,
  * only the delta is scanned and merged. If history shrank (e.g. compression
@@ -192,8 +192,8 @@ function getCachedActiveSkills(
 /**
  * Return the skill catalog, caching it across agent turns.
  *
- * The cache is invalidated when the session is marked stale (e.g. skill
- * directories changed on disk while the session is still processing).
+ * The cache is invalidated when the conversation is marked stale (e.g. skill
+ * directories changed on disk while the conversation is still processing).
  */
 function getCachedCatalog(cache?: SkillProjectionCache): SkillSummary[] {
   if (!cache) return loadSkillCatalog();
@@ -209,7 +209,7 @@ function getCachedCatalog(cache?: SkillProjectionCache): SkillSummary[] {
 // ---------------------------------------------------------------------------
 
 /**
- * Compute the set of active skill tools for the current session turn.
+ * Compute the set of active skill tools for the current conversation turn.
  *
  * 1. Derives active skill IDs from conversation history markers.
  * 2. Merges with any preactivated IDs (union).
@@ -240,7 +240,7 @@ export function projectSkillTools(
   const contextIds = contextEntries.map((e) => e.id);
   const allCandidateIds = new Set<string>([...contextIds, ...preactivated]);
 
-  // Load the catalog (cached for session lifetime) and index by ID
+  // Load the catalog (cached for conversation lifetime) and index by ID
   const catalog = getCachedCatalog(options?.cache);
   const catalogById = new Map<string, SkillSummary>();
   for (const skill of catalog) {
@@ -398,7 +398,7 @@ export function projectSkillTools(
     }
   }
 
-  // Update the session-scoped tracking map in-place — only include skills
+  // Update the conversation-scoped tracking map in-place — only include skills
   // that were successfully processed so failed skills can be retried next turn.
   prevActive.clear();
   for (const [id, hash] of successfulEntries) {
@@ -413,7 +413,7 @@ export function projectSkillTools(
 
 /**
  * Reset the projection state and unregister all skill tools tracked in the
- * given map. Used for session teardown and tests.
+ * given map. Used for conversation teardown and tests.
  */
 export function resetSkillToolProjection(
   trackedIds?: Map<string, string>,

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

@@ -5,29 +5,21 @@ import { join } from "node:path";
 import QRCode from "qrcode";
 
 import { getGatewayPort, getIngressPublicBaseUrl } from "../config/env.js";
+import { getConfig, loadRawConfig, saveRawConfig } from "../config/loader.js";
+import { setServiceField } from "../config/raw-config-utils.js";
 import {
-  API_KEY_PROVIDERS,
-  getConfig,
-  loadRawConfig,
-  saveRawConfig,
-} from "../config/loader.js";
-import { resolveSkillStates } from "../config/skill-state.js";
-import { loadSkillCatalog } from "../config/skills.js";
+  getConfiguredProviders,
+  isProviderAvailable,
+} from "../providers/provider-availability.js";
 import { initializeProviders } from "../providers/registry.js";
-import { getSecureKeyAsync } from "../security/secure-keys.js";
-import {
-  buildInvocableSlashCatalog,
-  resolveSlashSkillCommand,
-  rewriteKnownSlashCommandPrompt,
-} from "../skills/slash-commands.js";
 import { getLocalIPv4 } from "../util/network-info.js";
 import { getWorkspaceDir } from "../util/platform.js";
+import { silentlyWithLog } from "../util/silently.js";
 import { getAssistantName } from "./identity-helpers.js";
 import type { PairingStore } from "./pairing-store.js";
 
 export type SlashResolution =
   | { kind: "passthrough"; content: string }
-  | { kind: "rewritten"; content: string; skillId: string }
   | { kind: "unknown"; message: string; qrFilename?: string };
 
 // ── /pair command — module-level pairing context ────────────────────
@@ -89,34 +81,15 @@ const PROVIDER_MODEL_SHORTCUTS: Record<
     model: "claude-haiku-4-5-20251001",
     displayName: "Claude Haiku 4.5",
   },
-
-  // OpenAI
-  gpt4: { provider: "openai", model: "gpt-4", displayName: "GPT-4" },
-  gpt4o: { provider: "openai", model: "gpt-4o", displayName: "GPT-4o" },
-  gpt5: { provider: "openai", model: "gpt-5.2", displayName: "GPT-5.2" },
-
-  // Gemini
-  gemini: {
-    provider: "gemini",
-    model: "gemini-3-flash",
-    displayName: "Gemini 3 Flash",
-  },
-
-  // Ollama
-  ollama: { provider: "ollama", model: "llama3.2", displayName: "Llama 3.2" },
-
-  // Fireworks
-  fireworks: {
-    provider: "fireworks",
-    model: "accounts/fireworks/models/kimi-k2p5",
-    displayName: "Kimi K2.5",
+  "grok-beta": {
+    provider: "openrouter",
+    model: "x-ai/grok-4.20-beta",
+    displayName: "Grok 4.20 Beta (OpenRouter)",
   },
-
-  // OpenRouter
-  openrouter: {
+  "grok-multi": {
     provider: "openrouter",
-    model: "x-ai/grok-4",
-    displayName: "Grok 4 (OpenRouter)",
+    model: "x-ai/grok-4.20-beta",
+    displayName: "Grok 4.20 Beta (OpenRouter)",
   },
 };
 
@@ -163,8 +136,8 @@ async function resolveProviderModelCommand(
   const config = getConfig();
   const name = getAssistantName();
 
-  // Check if API key exists for this provider (Ollama doesn't require an API key)
-  if (provider !== "ollama" && !(await getSecureKeyAsync(provider))) {
+  // Check if provider is available (secure key, env var, managed proxy, or no key needed)
+  if (!(await isProviderAvailable(provider))) {
     return {
       kind: "unknown",
       message: `Cannot switch to ${displayName}. No API key configured for ${provider}.\n\nSet it with: \`keys set ${provider} <your-key>\``,
@@ -172,7 +145,10 @@ async function resolveProviderModelCommand(
   }
 
   // Check if already using this provider+model
-  if (config.provider === provider && config.model === model) {
+  if (
+    config.services.inference.provider === provider &&
+    config.services.inference.model === model
+  ) {
     const alreadyMsg = name
       ? `${name} is already running on **${displayName}**.`
       : `Already using **${displayName}**.`;
@@ -184,8 +160,8 @@ async function resolveProviderModelCommand(
 
   // Update config with both provider and model
   const raw = loadRawConfig();
-  raw.provider = provider;
-  raw.model = model;
+  setServiceField(raw, "inference", "provider", provider);
+  setServiceField(raw, "inference", "model", model);
   saveRawConfig(raw);
 
   // Re-initialize providers with new config
@@ -205,13 +181,8 @@ async function resolveProviderModelCommand(
 async function resolveModelList(): Promise<SlashResolution> {
   const config = getConfig();
 
-  // Build a set of providers that have a configured API key.
-  const configuredProviders = new Set<string>(["ollama"]);
-  for (const p of API_KEY_PROVIDERS) {
-    if (await getSecureKeyAsync(p)) {
-      configuredProviders.add(p);
-    }
-  }
+  // Build a set of providers that are usable (secure key, env var, or managed proxy).
+  const configuredProviders = new Set<string>(await getConfiguredProviders());
 
   const lines = ["Available models:\n"];
 
@@ -219,7 +190,9 @@ async function resolveModelList(): Promise<SlashResolution> {
     PROVIDER_MODEL_SHORTCUTS,
   )) {
     const hasKey = configuredProviders.has(provider);
-    const isCurrent = config.provider === provider && config.model === model;
+    const isCurrent =
+      config.services.inference.provider === provider &&
+      config.services.inference.model === model;
     const status = hasKey ? "✓" : "✗";
     const current = isCurrent ? " **[current]**" : "";
     lines.push(`- **${displayName}** (/${cmd}) ${status}${current}`);
@@ -253,11 +226,13 @@ async function resolveModelCommand(
   if (!args) {
     // Show current model
     const config = getConfig();
-    const displayName = MODEL_DISPLAY_NAMES[config.model] ?? config.model;
+    const displayName =
+      MODEL_DISPLAY_NAMES[config.services.inference.model] ??
+      config.services.inference.model;
     const prefix = name ? `${name} is running on` : `Currently using`;
     return {
       kind: "unknown",
-      message: `${prefix} **${displayName}** (\`${config.model}\`).`,
+      message: `${prefix} **${displayName}** (\`${config.services.inference.model}\`).`,
     };
   }
 
@@ -280,7 +255,7 @@ async function resolveModelCommand(
 
   // Check if already using this model
   const currentConfig = getConfig();
-  if (currentConfig.model === matched) {
+  if (currentConfig.services.inference.model === matched) {
     const displayName = MODEL_DISPLAY_NAMES[matched] ?? matched;
     const alreadyMsg = name
       ? `${name} is already running on **${displayName}**.`
@@ -291,8 +266,8 @@ async function resolveModelCommand(
     };
   }
 
-  // Validate that Anthropic provider is available
-  if (!(await getSecureKeyAsync("anthropic"))) {
+  // Validate that Anthropic provider is available (secure key, env var, or managed proxy)
+  if (!(await isProviderAvailable("anthropic"))) {
     const displayName = MODEL_DISPLAY_NAMES[matched] ?? matched;
     return {
       kind: "unknown",
@@ -302,8 +277,8 @@ async function resolveModelCommand(
 
   // Change model: save config and re-initialize providers
   const raw = loadRawConfig();
-  raw.provider = "anthropic"; // Ensure provider is set for Anthropic models
-  raw.model = matched;
+  setServiceField(raw, "inference", "provider", "anthropic"); // Ensure provider is set for Anthropic models
+  setServiceField(raw, "inference", "model", matched);
   saveRawConfig(raw);
   const config = getConfig();
   await initializeProviders(config);
@@ -338,7 +313,7 @@ function resolveStatusCommand(context: SlashContext): SlashResolution {
   const displayName = MODEL_DISPLAY_NAMES[model] ?? model;
 
   const lines = [
-    "Session Status\n",
+    "Conversation Status\n",
     `Context:  ${bar}  ${pct}%  (${fmt(inputTokens)} / ${fmt(
       maxInputTokens,
     )} tokens)`,
@@ -352,7 +327,7 @@ function resolveStatusCommand(context: SlashContext): SlashResolution {
 }
 
 /**
- * Resolve slash commands against the current skill catalog.
+ * Resolve built-in slash commands (/model, /status, /commands, /pair, provider shortcuts).
  * Returns `unknown` with a deterministic message, or the (possibly rewritten) content.
  */
 export async function resolveSlash(
@@ -391,7 +366,7 @@ export async function resolveSlash(
       "/pair — Generate pairing info for connecting a mobile device",
     ];
     if (context) {
-      lines.push("/status — Show session status and context usage");
+      lines.push("/status — Show conversation status and context usage");
     }
     return {
       kind: "unknown",
@@ -399,30 +374,6 @@ export async function resolveSlash(
     };
   }
 
-  const config = getConfig();
-  const catalog = loadSkillCatalog();
-  const resolved = resolveSkillStates(catalog, config);
-  const invocable = buildInvocableSlashCatalog(catalog, resolved);
-  const resolution = resolveSlashSkillCommand(content, invocable);
-
-  if (resolution.kind === "known") {
-    const skill = invocable.get(resolution.skillId.toLowerCase());
-    return {
-      kind: "rewritten",
-      content: rewriteKnownSlashCommandPrompt({
-        rawInput: content,
-        skillId: resolution.skillId,
-        skillName: skill?.name ?? resolution.skillId,
-        trailingArgs: resolution.trailingArgs,
-      }),
-      skillId: resolution.skillId,
-    };
-  }
-
-  if (resolution.kind === "unknown") {
-    return { kind: "unknown", message: resolution.message };
-  }
-
   return { kind: "passthrough", content };
 }
 
@@ -514,7 +465,10 @@ function resolvePairCommand(content: string): SlashResolution | null {
   // so the synchronous slash resolution is not blocked).
   const payloadJson = JSON.stringify(payload);
   const qrFilename = buildPairingQRCodeFilename();
-  savePairingQRCodePng(payloadJson, qrFilename).catch(() => {});
+  silentlyWithLog(
+    savePairingQRCodePng(payloadJson, qrFilename),
+    "save pairing QR code PNG",
+  );
 
   const lines = [
     "Pairing Ready\n",

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;
@@ -662,6 +662,20 @@ export function handleSurfaceAction(
     mergedData,
     surfaceData,
   );
+
+  // Forms are one-shot surfaces — auto-complete immediately so the client
+  // transitions from the "Submitting…" spinner to a completion chip without
+  // requiring the LLM to call ui_dismiss.
+  if (pending.surfaceType === "form") {
+    ctx.sendToClient({
+      type: "ui_surface_complete",
+      conversationId: ctx.conversationId,
+      surfaceId,
+      summary,
+      submittedData: mergedData,
+    });
+  }
+
   let fallbackContent = `[User action on ${pending.surfaceType} surface: ${summary}]`;
   // Append structured data so the LLM has access to IDs/values it needs
   // to act on (e.g. selectedIds for archiving).
@@ -735,7 +749,7 @@ export function handleSurfaceAction(
     ctx.sendToClient({
       type: "user_message_echo",
       text: prompt,
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
     });
   }
   if (result.queued) {
@@ -745,7 +759,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 +772,7 @@ export function handleSurfaceAction(
     );
     onEvent({
       type: "message_queued",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       requestId,
       position,
     });
@@ -800,7 +814,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 +841,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 +852,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 +950,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 +1091,7 @@ export async function surfaceProxyResolver(
 
     ctx.sendToClient({
       type: "ui_surface_show",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       surfaceType,
       title,
@@ -1142,12 +1156,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 +1185,7 @@ export async function surfaceProxyResolver(
       );
       ctx.sendToClient({
         type: "ui_surface_complete",
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
         surfaceId,
         summary,
         submittedData: lastAction.data,
@@ -1179,7 +1193,7 @@ export async function surfaceProxyResolver(
     } else {
       ctx.sendToClient({
         type: "ui_surface_dismiss",
-        sessionId: ctx.conversationId,
+        conversationId: ctx.conversationId,
         surfaceId,
       });
     }
@@ -1201,7 +1215,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 +1236,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 +1264,7 @@ export async function surfaceProxyResolver(
 
     ctx.sendToClient({
       type: "ui_surface_show",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId,
       surfaceType: "dynamic_page",
       title: app.name,