@vellumai/assistant 0.4.55 → 0.4.57

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,12 +23,14 @@ 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";
 import { createToolDomainEventPublisher } from "../events/tool-domain-event-publisher.js";
 import { registerToolMetricsLoggingListener } from "../events/tool-metrics-listener.js";
 import { registerToolNotificationListener } from "../events/tool-notification-listener.js";
+import { registerToolPermissionTelemetryListener } from "../events/tool-permission-telemetry-listener.js";
 import {
   registerToolProfilingListener,
   ToolProfiler,
@@ -45,88 +47,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 +171,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 +212,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 +238,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 +253,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 +284,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);
@@ -287,6 +295,7 @@ export class Session {
     );
     registerToolTraceListener(this.eventBus, this.traceEmitter);
     registerToolProfilingListener(this.eventBus, this.profiler);
+    registerToolPermissionTelemetryListener(this.eventBus);
     const auditToolLifecycleEvent = createToolAuditListener();
     const publishToolDomainEvent = createToolDomainEventPublisher(
       this.eventBus,
@@ -311,12 +320,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 +369,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 +381,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 +453,7 @@ export class Session {
   }
 
   abort(): void {
-    abortSession(this);
+    abortConversation(this);
   }
 
   dispose(): void {
@@ -443,7 +461,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 +567,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 +579,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 +614,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 +687,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 +797,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 +881,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 +912,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 +926,7 @@ export class Session {
     displayContent?: string,
   ): Promise<string> {
     return processMessageImpl(
-      this as ProcessSessionContext,
+      this as ProcessConversationContext,
       content,
       attachments,
       onEvent,
@@ -924,14 +945,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/daemon-control.ts

@@ -133,7 +133,7 @@ function isVellumDaemonProcess(pid: number): boolean {
  *  Wildcard addresses (0.0.0.0, ::) bind all interfaces but aren't
  *  connectable on all platforms — substitute loopback. IPv6 literals
  *  need brackets in URLs. */
-function healthCheckHost(host: string): string {
+export function healthCheckHost(host: string): string {
   if (host === "0.0.0.0") return "127.0.0.1";
   if (host === "::") return "[::1]";
   if (host.includes(":")) return `[${host}]`;

package/src/daemon/date-context.ts

@@ -1,9 +1,8 @@
 /**
- * Temporal context formatter for future weekday/weekend grounding.
+ * Temporal context formatter for date/time grounding.
  *
  * Produces a compact, deterministic payload describing the current date,
- * upcoming weekend/work-week windows, and a short horizon of labelled
- * future dates.  Intended for runtime injection into the model context.
+ * time, and timezone.  Intended for runtime injection into the model context.
  */
 
 export interface TemporalContextOptions {
@@ -17,13 +16,8 @@ export interface TemporalContextOptions {
   configuredUserTimeZone?: string | null;
   /** IANA timezone inferred from user profile/memory (if available). */
   userTimeZone?: string | null;
-  /** Number of future days to list (default 14, hard-capped at 14). */
-  horizonDays?: number;
 }
 
-const MAX_OUTPUT_CHARS = 1500;
-const MAX_HORIZON_ENTRIES = 14;
-
 const WEEKDAY_NAMES = [
   "Sunday",
   "Monday",
@@ -316,35 +310,8 @@ function formatLocalIsoWithOffset(date: Date, timeZone: string): string {
   return `${year}-${month}-${day}T${hour}:${minute}:${second}${offset}`;
 }
 
-/**
- * Advance a date by `days` calendar days in the given timezone.
- *
- * Computes the local date, adds days to the day component, then anchors
- * the result at noon local time to avoid DST-transition edge cases.
- */
-function addDays(date: Date, days: number, timeZone: string): Date {
-  const parts = localDateParts(date, timeZone);
-  // Use Date.UTC for calendar overflow (e.g. Jan 32 → Feb 1).
-  const ref = new Date(Date.UTC(parts.year, parts.month - 1, parts.day + days));
-  const tY = ref.getUTCFullYear();
-  const tM = ref.getUTCMonth() + 1;
-  const tD = ref.getUTCDate();
-  // Noon UTC covers UTC-12 through ~UTC+11.  For far-east timezones
-  // (UTC+12/+13/+14) noon UTC is already the next local day, so fall
-  // back to midnight UTC which resolves correctly there.
-  const noonUTC = new Date(Date.UTC(tY, tM - 1, tD, 12, 0, 0));
-  const r = localDateParts(noonUTC, timeZone);
-  if (r.year === tY && r.month === tM && r.day === tD) {
-    return noonUTC;
-  }
-  return new Date(Date.UTC(tY, tM - 1, tD, 0, 0, 0));
-}
-
 /**
  * Build a compact temporal context string for model injection.
- *
- * Output is hard-capped at {@link MAX_OUTPUT_CHARS} characters and
- * {@link MAX_HORIZON_ENTRIES} horizon entries.
  */
 export function buildTemporalContext(
   options: TemporalContextOptions = {},
@@ -376,67 +343,27 @@ export function buildTemporalContext(
       : resolvedUserTimeZone
         ? "user_profile_memory"
         : "assistant_host_fallback";
-  const horizonDays = Math.min(
-    options.horizonDays ?? MAX_HORIZON_ENTRIES,
-    MAX_HORIZON_ENTRIES,
-  );
-
   const todayParts = localDateParts(now, timeZone);
   const todayStr = formatLocalDate(now, timeZone);
   const todayWeekday = WEEKDAY_NAMES[todayParts.weekday];
 
-  // ── Next weekend (Saturday-Sunday) ──
-  const daysUntilSaturday = (6 - todayParts.weekday + 7) % 7 || 7;
-  const nextSaturday = addDays(now, daysUntilSaturday, timeZone);
-  const nextSunday = addDays(now, daysUntilSaturday + 1, timeZone);
-
-  // ── Next work week (Monday-Friday) ──
-  const daysUntilMonday = (1 - todayParts.weekday + 7) % 7 || 7;
-  const nextMonday = addDays(now, daysUntilMonday, timeZone);
-  const nextFriday = addDays(now, daysUntilMonday + 4, timeZone);
-
-  // ── Horizon list ──
-  const horizonLines: string[] = [];
-  for (let i = 1; i <= horizonDays; i++) {
-    const futureDate = addDays(now, i, timeZone);
-    const futureParts = localDateParts(futureDate, timeZone);
-    const label = WEEKDAY_NAMES[futureParts.weekday];
-    horizonLines.push(`  ${formatLocalDate(futureDate, timeZone)} ${label}`);
-  }
-
   const lines = [
     `<temporal_context>`,
     `Today: ${todayStr} (${todayWeekday})`,
     `Timezone: ${timeZone}`,
     `Current local time: ${formatLocalIsoWithOffset(now, timeZone)}`,
     `Current UTC time: ${now.toISOString()}`,
-    `Clock source: assistant host machine`,
-    `Assistant host timezone: ${resolvedHostTimeZone}`,
-    `User timezone: ${userTimeZone ?? "unknown"}`,
     `Timezone source: ${timeZoneSource}`,
-    ``,
-    `Week definitions: work week = Monday–Friday, weekend = Saturday–Sunday`,
-    ``,
-    `Next weekend: ${formatLocalDate(
-      nextSaturday,
-      timeZone,
-    )} – ${formatLocalDate(nextSunday, timeZone)}`,
-    `Next work week: ${formatLocalDate(
-      nextMonday,
-      timeZone,
-    )} – ${formatLocalDate(nextFriday, timeZone)}`,
-    ``,
-    `Upcoming dates:`,
-    ...horizonLines,
-    `</temporal_context>`,
   ];
 
-  let output = lines.join("\n");
-
-  // Hard cap: truncate if somehow over budget (shouldn't happen with 14 entries).
-  if (output.length > MAX_OUTPUT_CHARS) {
-    output = output.slice(0, MAX_OUTPUT_CHARS - 25) + "\n</temporal_context>";
+  if (userTimeZone && userTimeZone !== timeZone) {
+    lines.push(`User timezone: ${userTimeZone}`);
   }
+  if (resolvedHostTimeZone !== timeZone) {
+    lines.push(`Assistant host timezone: ${resolvedHostTimeZone}`);
+  }
+
+  lines.push(`</temporal_context>`);
 
-  return output;
+  return lines.join("\n");
 }

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,
@@ -548,15 +551,20 @@ export async function handleChannelVerificationSession(
           rebind: msg.rebind,
           originConversationId: msg.originConversationId,
         });
+        if (result._pendingSlackDm) {
+          const { userId, text, assistantId: aid } = result._pendingSlackDm;
+          deliverVerificationSlack(userId, text, aid);
+        }
+        const { _pendingSlackDm: _, ...publicResult } = result;
         ctx.send({
           type: "channel_verification_session_response",
-          ...result,
+          ...publicResult,
         });
       } else {
         const result = createInboundChallenge(
           channel,
           msg.rebind,
-          msg.sessionId,
+          msg.conversationId,
         );
         ctx.send({
           type: "channel_verification_session_response",
@@ -588,9 +596,14 @@ export async function handleChannelVerificationSession(
         channel,
         originConversationId: msg.originConversationId,
       });
+      if (result._pendingSlackDm) {
+        const { userId, text, assistantId: aid } = result._pendingSlackDm;
+        deliverVerificationSlack(userId, text, aid);
+      }
+      const { _pendingSlackDm: _, ...publicResult } = result;
       ctx.send({
         type: "channel_verification_session_response",
-        ...result,
+        ...publicResult,
       });
     } else {
       ctx.send({
@@ -610,4 +623,4 @@ export async function handleChannelVerificationSession(
       channel,
     });
   }
-}
+}