@vellumai/assistant 0.4.54 → 0.4.56

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

@@ -1,18 +1,18 @@
 /**
- * Session — thin coordinator that delegates to extracted modules.
+ * Conversation — thin coordinator that delegates to extracted modules.
  *
  * Each concern lives in its own file:
- * - session-lifecycle.ts    — loadFromDb, abort, dispose
- * - session-messaging.ts    — enqueueMessage, persistUserMessage, redirectToSecurePrompt
- * - session-agent-loop.ts   — runAgentLoop, generateTitle
- * - session-notifiers.ts    — watch/call notifier registration
- * - session-tool-setup.ts   — tool definitions, executor, resolveTools callback
- * - session-media-retry.ts  — media trimming + raceWithTimeout
- * - session-process.ts      — drainQueue, processMessage
- * - session-history.ts      — undo, regenerate, consolidateAssistantMessages
- * - session-surfaces.ts     — handleSurfaceAction, handleSurfaceUndo
- * - session-workspace.ts    — refreshWorkspaceTopLevelContext
- * - session-usage.ts        — recordUsage
+ * - conversation-lifecycle.ts    — loadFromDb, abort, dispose
+ * - conversation-messaging.ts    — enqueueMessage, persistUserMessage, redirectToSecurePrompt
+ * - conversation-agent-loop.ts   — runAgentLoop, generateTitle
+ * - conversation-notifiers.ts    — watch/call notifier registration
+ * - conversation-tool-setup.ts   — tool definitions, executor, resolveTools callback
+ * - conversation-media-retry.ts  — media trimming + raceWithTimeout
+ * - conversation-process.ts      — drainQueue, processMessage
+ * - conversation-history.ts      — undo, regenerate, consolidateAssistantMessages
+ * - conversation-surfaces.ts     — handleSurfaceAction, handleSurfaceUndo
+ * - conversation-workspace.ts    — refreshWorkspaceTopLevelContext
+ * - conversation-usage.ts        — recordUsage
  */
 
 import type { ResolvedSystemPrompt } from "../agent/loop.js";
@@ -23,6 +23,7 @@ import type {
 } from "../channels/types.js";
 import { getConfig } from "../config/loader.js";
 import { ContextWindowManager } from "../context/window-manager.js";
+import type { CesClient } from "../credential-execution/client.js";
 import { EventBus } from "../events/bus.js";
 import type { AssistantDomainEvents } from "../events/domain-events.js";
 import { createToolAuditListener } from "../events/tool-audit-listener.js";
@@ -45,88 +46,91 @@ import type { Message } from "../providers/types.js";
 import type { Provider } from "../providers/types.js";
 import type { TrustClass } from "../runtime/actor-trust-resolver.js";
 import type { AuthContext } from "../runtime/auth/types.js";
+import * as approvalOverrides from "../runtime/conversation-approval-overrides.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
-import * as approvalOverrides from "../runtime/session-approval-overrides.js";
 import { ToolExecutor } from "../tools/executor.js";
 import type { AssistantAttachmentDraft } from "./assistant-attachments.js";
-import { HostBashProxy } from "./host-bash-proxy.js";
-import type { CuObservationResult } from "./host-cu-proxy.js";
-import { HostCuProxy } from "./host-cu-proxy.js";
-import { HostFileProxy } from "./host-file-proxy.js";
-import type {
-  ServerMessage,
-  SurfaceData,
-  SurfaceType,
-  UsageStats,
-  UserMessageAttachment,
-} from "./message-protocol.js";
-import type {
-  AssistantActivityState,
-  ConfirmationStateChanged,
-} from "./message-types/messages.js";
-import { runAgentLoopImpl } from "./session-agent-loop.js";
-import type { HistorySessionContext } from "./session-history.js";
+import { runAgentLoopImpl } from "./conversation-agent-loop.js";
+import type { HistoryConversationContext } from "./conversation-history.js";
 import {
   regenerate as regenerateImpl,
   undo as undoImpl,
-} from "./session-history.js";
+} from "./conversation-history.js";
 import {
-  abortSession,
-  disposeSession,
+  abortConversation,
+  disposeConversation,
   loadFromDb as loadFromDbImpl,
-} from "./session-lifecycle.js";
-import type { RedirectToSecurePromptOptions } from "./session-messaging.js";
+} from "./conversation-lifecycle.js";
+import type { RedirectToSecurePromptOptions } from "./conversation-messaging.js";
 import {
   enqueueMessage as enqueueMessageImpl,
   persistUserMessage as persistUserMessageImpl,
   redirectToSecurePrompt as redirectToSecurePromptImpl,
-} from "./session-messaging.js";
+} from "./conversation-messaging.js";
 // Extracted modules
-import { registerSessionNotifiers } from "./session-notifiers.js";
-import type { ProcessSessionContext } from "./session-process.js";
+import { registerConversationNotifiers } from "./conversation-notifiers.js";
+import type { ProcessConversationContext } from "./conversation-process.js";
 import {
   drainQueue as drainQueueImpl,
   processMessage as processMessageImpl,
-} from "./session-process.js";
-import type { QueueDrainReason } from "./session-queue-manager.js";
-import { MessageQueue } from "./session-queue-manager.js";
+} from "./conversation-process.js";
+import type { QueueDrainReason } from "./conversation-queue-manager.js";
+import { MessageQueue } from "./conversation-queue-manager.js";
 import type {
   ChannelCapabilities,
   TrustContext,
-} from "./session-runtime-assembly.js";
-import { messagesContainAttachments } from "./session-runtime-assembly.js";
-import type { SkillProjectionCache } from "./session-skill-tools.js";
+} from "./conversation-runtime-assembly.js";
+import { messagesContainAttachments } from "./conversation-runtime-assembly.js";
+import type { SkillProjectionCache } from "./conversation-skill-tools.js";
 import {
   createSurfaceMutex,
   handleSurfaceAction as handleSurfaceActionImpl,
   handleSurfaceUndo as handleSurfaceUndoImpl,
-} from "./session-surfaces.js";
-import type { ToolSetupContext } from "./session-tool-setup.js";
+} from "./conversation-surfaces.js";
+import type { ToolSetupContext } from "./conversation-tool-setup.js";
 import {
   buildToolDefinitions,
   createResolveToolsCallback,
   createToolExecutor,
-} from "./session-tool-setup.js";
-import { refreshWorkspaceTopLevelContextIfNeeded as refreshWorkspaceImpl } from "./session-workspace.js";
+} from "./conversation-tool-setup.js";
+import { refreshWorkspaceTopLevelContextIfNeeded as refreshWorkspaceImpl } from "./conversation-workspace.js";
+import { HostBashProxy } from "./host-bash-proxy.js";
+import type { CuObservationResult } from "./host-cu-proxy.js";
+import { HostCuProxy } from "./host-cu-proxy.js";
+import { HostFileProxy } from "./host-file-proxy.js";
+import type {
+  ServerMessage,
+  SurfaceData,
+  SurfaceType,
+  UsageStats,
+  UserMessageAttachment,
+} from "./message-protocol.js";
+import type {
+  AssistantActivityState,
+  ConfirmationStateChanged,
+} from "./message-types/messages.js";
 import { TraceEmitter } from "./trace-emitter.js";
 
-export interface SessionMemoryPolicy {
+export interface ConversationMemoryPolicy {
   scopeId: string;
   includeDefaultFallback: boolean;
   strictSideEffects: boolean;
 }
 
-export const DEFAULT_MEMORY_POLICY: Readonly<SessionMemoryPolicy> =
+export const DEFAULT_MEMORY_POLICY: Readonly<ConversationMemoryPolicy> =
   Object.freeze({
     scopeId: "default",
     includeDefaultFallback: false,
     strictSideEffects: false,
   });
 
-export { findLastUndoableUserMessageIndex } from "./session-history.js";
-export type { QueueDrainReason, QueuePolicy } from "./session-queue-manager.js";
+export { findLastUndoableUserMessageIndex } from "./conversation-history.js";
+export type {
+  QueueDrainReason,
+  QueuePolicy,
+} from "./conversation-queue-manager.js";
 
-export class Session {
+export class Conversation {
   public readonly conversationId: string;
   /** @internal */ provider: Provider;
   /** @internal */ messages: Message[] = [];
@@ -166,6 +170,7 @@ export class Session {
   /** @internal */ hostBashProxy?: HostBashProxy;
   /** @internal */ hostCuProxy?: HostCuProxy;
   /** @internal */ hostFileProxy?: HostFileProxy;
+  /** @internal */ cesClient?: CesClient;
   /** @internal */ readonly queue = new MessageQueue();
   /** @internal */ currentActiveSurfaceId?: string;
   /** @internal */ currentPage?: string;
@@ -206,7 +211,8 @@ export class Session {
   /** @internal */ workspaceTopLevelContext: string | null = null;
   /** @internal */ workspaceTopLevelDirty = true;
   public readonly traceEmitter: TraceEmitter;
-  public memoryPolicy: SessionMemoryPolicy;
+  public readonly hasSystemPromptOverride: boolean;
+  public memoryPolicy: ConversationMemoryPolicy;
   /** @internal */ streamThinking: boolean;
   /** @internal */ turnCount = 0;
   public lastAssistantAttachments: AssistantAttachmentDraft[] = [];
@@ -231,7 +237,8 @@ export class Session {
     sendToClient: (msg: ServerMessage) => void,
     workingDir: string,
     broadcastToAllClients?: (msg: ServerMessage) => void,
-    memoryPolicy?: SessionMemoryPolicy,
+    memoryPolicy?: ConversationMemoryPolicy,
+    sharedCesClient?: CesClient,
   ) {
     this.conversationId = conversationId;
     this.systemPrompt = systemPrompt;
@@ -245,9 +252,9 @@ export class Session {
     this.prompter = new PermissionPrompter(sendToClient);
     this.prompter.setOnStateChanged((requestId, state, source, toolUseId) => {
       // Route through emitConfirmationStateChanged so the event reaches
-      // the client via sendToClient (wired to the SSE hub for HTTP sessions).
+      // the client via sendToClient (wired to the SSE hub for HTTP conversations).
       this.emitConfirmationStateChanged({
-        sessionId: this.conversationId,
+        conversationId: this.conversationId,
         requestId,
         state,
         source,
@@ -276,7 +283,7 @@ export class Session {
     this.secretPrompter = new SecretPrompter(sendToClient);
 
     // Register watch/call notifiers (reads ctx properties lazily)
-    registerSessionNotifiers(conversationId, this);
+    registerConversationNotifiers(conversationId, this);
 
     // Tool infrastructure
     this.executor = new ToolExecutor(this.prompter);
@@ -311,12 +318,21 @@ export class Session {
 
     const config = getConfig();
     this.streamThinking = config.thinking.streamThinking ?? false;
+
+    // CES (Credential Execution Service) — use the shared server-level client.
+    // The CES sidecar accepts exactly one bootstrap connection, so the
+    // client is owned by DaemonServer and passed in here.
+    if (sharedCesClient) {
+      this.cesClient = sharedCesClient;
+    }
+
     const resolveTools = createResolveToolsCallback(toolDefs, this);
 
     const configuredMaxTokens = maxTokens;
     // When a systemPromptOverride was provided, use it as-is; otherwise
     // rebuild the full prompt each turn (picks up any workspace file changes).
     const hasSystemPromptOverride = systemPrompt !== buildSystemPrompt();
+    this.hasSystemPromptOverride = hasSystemPromptOverride;
 
     const resolveSystemPromptCallback = (
       _history: import("../providers/types.js").Message[],
@@ -351,8 +367,8 @@ export class Session {
       toolTokenBudget: this.agentLoop.getToolTokenBudget(),
     });
 
-    void getHookManager().trigger("session-start", {
-      sessionId: this.conversationId,
+    void getHookManager().trigger("conversation-start", {
+      conversationId: this.conversationId,
       workingDir: this.workingDir,
     });
   }
@@ -363,7 +379,7 @@ export class Session {
     await loadFromDbImpl(this);
     // Scan loaded history for attachment content blocks so that asset
     // tools are available when resuming a conversation that already had
-    // attachments. One-way: once true it stays true for the session.
+    // attachments. One-way: once true it stays true for the conversation.
     // Also picks up the hasAttachments flag set by loadFromDbImpl which
     // scans compacted (sliced-off) messages that aren't in this.messages.
     if (!this.hasAttachments && messagesContainAttachments(this.messages)) {
@@ -435,7 +451,7 @@ export class Session {
   }
 
   abort(): void {
-    abortSession(this);
+    abortConversation(this);
   }
 
   dispose(): void {
@@ -443,7 +459,10 @@ export class Session {
     this.hostBashProxy?.dispose();
     this.hostCuProxy?.dispose();
     this.hostFileProxy?.dispose();
-    disposeSession(this);
+    // CES client is owned by DaemonServer — just drop the reference.
+    // Do NOT close it here; the server manages the CES lifecycle.
+    this.cesClient = undefined;
+    disposeConversation(this);
   }
 
   // ── Messaging ────────────────────────────────────────────────────
@@ -546,7 +565,7 @@ export class Session {
       decisionContext,
     );
 
-    // Mode activation (setTimedMode / setThreadMode) is intentionally NOT
+    // Mode activation (setTimedMode / setConversationMode) is intentionally NOT
     // done here. It is handled in permission-checker.ts where the
     // guardian trust-class and conversation context are available.
 
@@ -558,7 +577,7 @@ export class Session {
         ? ("denied" as const)
         : ("approved" as const);
     this.emitConfirmationStateChanged({
-      sessionId: this.conversationId,
+      conversationId: this.conversationId,
       requestId,
       state: resolvedState,
       source: emissionContext?.source ?? "button",
@@ -593,7 +612,7 @@ export class Session {
    * After resolving one confirmation, auto-resolve other pending
    * confirmations in the same conversation that match the decision.
    *
-   * - allow_10m / allow_thread → approve ALL pending in conversation
+   * - allow_10m / allow_conversation → approve ALL pending in conversation
    * - always_allow / always_allow_high_risk → approve pattern-matching pending
    * - always_deny → deny pattern-matching pending
    * - allow / deny (one-time) → no cascading
@@ -666,7 +685,7 @@ export class Session {
     details?: import("../runtime/pending-interactions.js").ConfirmationDetails,
   ): { allow: boolean } | null {
     // Temporary overrides apply to the entire conversation
-    if (decision === "allow_10m" || decision === "allow_thread") {
+    if (decision === "allow_10m" || decision === "allow_conversation") {
       return { allow: true };
     }
 
@@ -776,7 +795,7 @@ export class Session {
     this.activityVersion++;
     const msg: ServerMessage = {
       type: "assistant_activity_state",
-      sessionId: this.conversationId,
+      conversationId: this.conversationId,
       activityVersion: this.activityVersion,
       phase,
       anchor,
@@ -860,7 +879,7 @@ export class Session {
       await this.ensureActorScopedHistory();
     }
     // One-way flag: once an attachment arrives, asset tools stay available
-    // for the remainder of the session.
+    // for the remainder of the conversation.
     if (!this.hasAttachments && attachments.length > 0) {
       this.hasAttachments = true;
     }
@@ -891,7 +910,7 @@ export class Session {
   }
 
   drainQueue(reason: QueueDrainReason = "loop_complete"): Promise<void> {
-    return drainQueueImpl(this as ProcessSessionContext, reason);
+    return drainQueueImpl(this as ProcessConversationContext, reason);
   }
 
   async processMessage(
@@ -905,7 +924,7 @@ export class Session {
     displayContent?: string,
   ): Promise<string> {
     return processMessageImpl(
-      this as ProcessSessionContext,
+      this as ProcessConversationContext,
       content,
       attachments,
       onEvent,
@@ -924,14 +943,18 @@ export class Session {
   }
 
   undo(): number {
-    return undoImpl(this as HistorySessionContext);
+    return undoImpl(this as HistoryConversationContext);
   }
 
   async regenerate(
     onEvent: (msg: ServerMessage) => void,
     requestId?: string,
   ): Promise<void> {
-    return regenerateImpl(this as HistorySessionContext, onEvent, requestId);
+    return regenerateImpl(
+      this as HistoryConversationContext,
+      onEvent,
+      requestId,
+    );
   }
 
   // ── Surfaces ─────────────────────────────────────────────────────

package/src/daemon/doordash-steps.ts

@@ -1,13 +1,13 @@
 /**
  * DoorDash-specific step-tracking logic for the task_progress surface.
  *
- * Extracted from session-tool-setup.ts so the generic tool executor
+ * Extracted from conversation-tool-setup.ts so the generic tool executor
  * remains clean and extensible.
  */
 
 import { isPlainObject } from "../util/object.js";
+import type { ToolSetupContext } from "./conversation-tool-setup.js";
 import type { CardSurfaceData } from "./message-protocol.js";
-import type { ToolSetupContext } from "./session-tool-setup.js";
 
 interface DoordashStep {
   label: string;
@@ -18,12 +18,13 @@ interface DoordashStep {
 const SURFACE_ID = "doordash-progress";
 
 /**
- * Map a `doordash <subcommand>` (or `vellum doordash <subcommand>`) to the
- * step label it corresponds to.
+ * Map a DoorDash CLI invocation (`doordash <subcommand>`,
+ * `vellum doordash <subcommand>`, or `bun .../doordash-entry.ts <subcommand>`)
+ * to the step label it corresponds to.
  */
 function doordashCommandToStep(cmd: string): string | undefined {
-  // Match both standalone `doordash` and legacy `vellum doordash` prefixes
-  const dd = /(?:vellum )?doordash /;
+  // Match standalone `doordash`, legacy `vellum doordash`, and `bun .../doordash-entry.ts` prefixes
+  const dd = /(?:vellum )?(?:doordash|bun\s+\S*doordash-entry\.ts) /;
   if (
     new RegExp(dd.source + "status\\b").test(cmd) ||
     new RegExp(dd.source + "refresh\\b").test(cmd) ||
@@ -113,7 +114,7 @@ function pushStepsUpdate(
   stored.data = updatedData as CardSurfaceData;
   ctx.sendToClient({
     type: "ui_surface_update",
-    sessionId: ctx.conversationId,
+    conversationId: ctx.conversationId,
     surfaceId: SURFACE_ID,
     data: updatedData,
   });
@@ -191,7 +192,7 @@ export function updateDoordashProgress(
     ctx.surfaceState.set(SURFACE_ID, { surfaceType: "card", data });
     ctx.sendToClient({
       type: "ui_surface_show",
-      sessionId: ctx.conversationId,
+      conversationId: ctx.conversationId,
       surfaceId: SURFACE_ID,
       surfaceType: "card",
       title: "Ordering from DoorDash",

package/src/daemon/guardian-action-generators.ts

@@ -29,7 +29,10 @@ export function createGuardianActionCopyGenerator(): GuardianActionCopyGenerator
     const config = loadConfig();
     let provider;
     try {
-      provider = getFailoverProvider(config.provider, config.providerOrder);
+      provider = getFailoverProvider(
+        config.services.inference.provider,
+        config.providerOrder,
+      );
     } catch {
       return null;
     }
@@ -131,7 +134,10 @@ const VALID_FOLLOWUP_DISPOSITIONS: ReadonlySet<string> = new Set([
 export function createGuardianFollowUpConversationGenerator(): GuardianFollowUpConversationGenerator {
   return async (context) => {
     const config = loadConfig();
-    const provider = getFailoverProvider(config.provider, config.providerOrder);
+    const provider = getFailoverProvider(
+      config.services.inference.provider,
+      config.providerOrder,
+    );
 
     const userPrompt = [
       `Original question from the voice call: "${context.questionText}"`,

package/src/daemon/handlers/config-channels.ts

@@ -78,7 +78,7 @@ export function getReadinessService(): ChannelReadinessService {
 export function createInboundChallenge(
   channel?: ChannelId,
   rebind?: boolean,
-  sessionId?: string,
+  conversationId?: string,
 ): ChannelVerificationSessionResult {
   const resolvedAssistantId = DAEMON_INTERNAL_ASSISTANT_ID;
   const resolvedChannel = channel ?? "telegram";
@@ -97,7 +97,10 @@ export function createInboundChallenge(
     };
   }
 
-  const result = createInboundVerificationSession(resolvedChannel, sessionId);
+  const result = createInboundVerificationSession(
+    resolvedChannel,
+    conversationId,
+  );
 
   return {
     success: true,
@@ -556,7 +559,7 @@ export async function handleChannelVerificationSession(
         const result = createInboundChallenge(
           channel,
           msg.rebind,
-          msg.sessionId,
+          msg.conversationId,
         );
         ctx.send({
           type: "channel_verification_session_response",
@@ -610,4 +613,4 @@ export async function handleChannelVerificationSession(
       channel,
     });
   }
-}
+}

package/src/daemon/handlers/config-model.ts

@@ -1,16 +1,19 @@
 import {
-  API_KEY_PROVIDERS,
   getConfig,
   loadRawConfig,
   saveRawConfig,
 } from "../../config/loader.js";
+import { setServiceField } from "../../config/raw-config-utils.js";
+import {
+  getConfiguredProviders,
+  isProviderAvailable,
+} from "../../providers/provider-availability.js";
 import { initializeProviders } from "../../providers/registry.js";
-import { getSecureKeyAsync } from "../../security/secure-keys.js";
+import { MODEL_TO_PROVIDER } from "../conversation-slash.js";
 import type {
   ImageGenModelSetRequest,
   ModelSetRequest,
 } from "../message-protocol.js";
-import { MODEL_TO_PROVIDER } from "../session-slash.js";
 import {
   CONFIG_RELOAD_DEBOUNCE_MS,
   type HandlerContext,
@@ -30,17 +33,10 @@ export interface ModelInfo {
 /** Return current model configuration. */
 export async function getModelInfo(): Promise<ModelInfo> {
   const config = getConfig();
-  const configured: string[] = [];
-  for (const p of API_KEY_PROVIDERS) {
-    if (await getSecureKeyAsync(p)) {
-      configured.push(p);
-    }
-  }
-  if (!configured.includes("ollama")) configured.push("ollama");
   return {
-    model: config.model,
-    provider: config.provider,
-    configuredProviders: configured,
+    model: config.services.inference.model,
+    provider: config.services.inference.provider,
+    configuredProviders: await getConfiguredProviders(),
   };
 }
 
@@ -49,7 +45,7 @@ export async function getModelInfo(): Promise<ModelInfo> {
  * Keeps the business logic decoupled from transport-specific HandlerContext.
  */
 export interface ModelSetContext {
-  sessions: Map<
+  conversations: Map<
     string,
     { isProcessing(): boolean; dispose(): void; markStale(): void }
   >;
@@ -74,26 +70,27 @@ export async function setModel(
     const current = getConfig();
     const expectedProvider = MODEL_TO_PROVIDER[modelId];
     const providerAligned =
-      !expectedProvider || current.provider === expectedProvider;
-    if (modelId === current.model && providerAligned) {
+      !expectedProvider ||
+      current.services.inference.provider === expectedProvider;
+    if (modelId === current.services.inference.model && providerAligned) {
       return await getModelInfo();
     }
   }
 
-  // Validate API key before switching
+  // Validate provider availability (secure key, env var, or managed proxy) before switching
   const provider = MODEL_TO_PROVIDER[modelId];
-  if (provider && provider !== "ollama") {
-    if (!(await getSecureKeyAsync(provider))) {
-      // Return current model_info so the client resyncs its optimistic state
-      return await getModelInfo();
-    }
+  if (provider && !(await isProviderAvailable(provider))) {
+    // Return current model_info so the client resyncs its optimistic state
+    return await getModelInfo();
   }
 
   // Use raw config to avoid persisting env-var API keys to disk
   const raw = loadRawConfig();
-  raw.model = modelId;
+  setServiceField(raw, "inference", "model", modelId);
   // Infer provider from model ID to keep provider and model in sync
-  raw.provider = provider ?? raw.provider;
+  if (provider) {
+    setServiceField(raw, "inference", "provider", provider);
+  }
 
   // Suppress the file watcher callback — setModel already does
   // the full reload sequence; a redundant watcher-triggered reload
@@ -118,20 +115,24 @@ export async function setModel(
   const config = getConfig();
   await initializeProviders(config);
 
-  // Evict idle sessions immediately; mark busy ones as stale so they
+  // Evict idle conversations immediately; mark busy ones as stale so they
   // get recreated with the new provider once they finish processing.
-  for (const [id, session] of ctx.sessions) {
-    if (!session.isProcessing()) {
-      session.dispose();
-      ctx.sessions.delete(id);
+  for (const [id, conversation] of ctx.conversations) {
+    if (!conversation.isProcessing()) {
+      conversation.dispose();
+      ctx.conversations.delete(id);
     } else {
-      session.markStale();
+      conversation.markStale();
     }
   }
 
   ctx.updateConfigFingerprint();
 
-  return { model: config.model, provider: config.provider };
+  return {
+    model: config.services.inference.model,
+    provider: config.services.inference.provider,
+    configuredProviders: await getConfiguredProviders(),
+  };
 }
 
 /**
@@ -139,7 +140,7 @@ export async function setModel(
  */
 export function setImageGenModel(modelId: string, ctx: ModelSetContext): void {
   const raw = loadRawConfig();
-  raw.imageGenModel = modelId;
+  setServiceField(raw, "image-generation", "model", modelId);
 
   const wasSuppressed = ctx.suppressConfigReload;
   ctx.setSuppressConfigReload(true);