@vellumai/assistant 0.10.12 → 0.11.0-staging.2

package/src/daemon/conversation-surfaces.ts

@@ -2,6 +2,7 @@ import { v4 as uuid, v7 as uuidv7 } from "uuid";
 import { z } from "zod";
 
 import { SurfaceActionSchema } from "../api/events/ui-surface-show.js";
+import type { AssistantEvent } from "../api/index.js";
 import {
   CardSurfaceDataSchema,
   ChoiceSurfaceDataSchema,
@@ -17,11 +18,10 @@ import {
   SurfaceTypeSchema,
 } from "../api/surfaces.js";
 import {
-  addAppConversationId,
   getApp,
   getAppDirPath,
   getAppPreview,
-  listAppsByConversation,
+  linkAppToConversationLineage,
   resolveAppDir,
   resolveEffectiveAppHtml,
   updateApp,
@@ -52,6 +52,7 @@ import {
   activationStepNameForMomentParam,
   isActivationMomentParam,
 } from "../telemetry/activation-funnel.js";
+import { resolveAppId } from "../tools/apps/resolve-app-id.js";
 import type { ToolExecutionResult } from "../tools/types.js";
 import { getLogger } from "../util/logger.js";
 import { isPlainObject } from "../util/object.js";
@@ -76,7 +77,6 @@ import type {
   DynamicPagePreview,
   DynamicPageSurfaceData,
   FormSurfaceData,
-  ServerMessage,
   SurfaceAction,
   SurfaceData,
   SurfaceType,
@@ -818,7 +818,7 @@ export interface SurfaceConversationContext {
     channel: string;
     supportsDynamicUi: boolean;
   };
-  sendToClient(msg: ServerMessage): void;
+  sendToClient(msg: AssistantEvent): void;
   pendingSurfaceActions: Map<string, { surfaceType: SurfaceType }>;
   lastSurfaceAction: Map<
     string,
@@ -2001,7 +2001,7 @@ export async function handleSurfaceAction(
     // Pass conversationId so events without an inline conversationId (e.g.
     // text_delta) are published with the correct conversation scope and
     // reach the SSE subscriber filtered to this conversation.
-    const onEvent = (msg: ServerMessage) =>
+    const onEvent = (msg: AssistantEvent) =>
       broadcastMessage(msg, ctx.conversationId);
 
     const result = ctx.enqueueMessage({
@@ -2228,7 +2228,7 @@ export async function handleSurfaceAction(
   // Pass conversationId so events without an inline conversationId (e.g.
   // text_delta) are published with the correct conversation scope and
   // reach the SSE subscriber filtered to this conversation.
-  const onEvent = (msg: ServerMessage) =>
+  const onEvent = (msg: AssistantEvent) =>
     broadcastMessage(msg, ctx.conversationId);
 
   log.info(
@@ -3387,13 +3387,7 @@ export async function surfaceProxyResolver(
       };
     }
 
-    // Weaker models routinely omit app_id even though the active app is in
-    // context. Fall back to the conversation's most-recently-updated app
-    // rather than failing with "Invalid ID: undefined".
-    let appId = typeof input.app_id === "string" ? input.app_id : "";
-    if (appId.trim().length === 0) {
-      appId = listAppsByConversation(ctx.conversationId)[0]?.id ?? "";
-    }
+    const appId = resolveAppId(input, ctx.conversationId) ?? "";
     const preview = isPlainObject(input.preview)
       ? DynamicPagePreviewSchema.parse(input.preview)
       : undefined;
@@ -3411,7 +3405,7 @@ export async function surfaceProxyResolver(
 
     // Track conversation association (best-effort — failures must not break open flow).
     try {
-      addAppConversationId(appId, ctx.conversationId);
+      linkAppToConversationLineage(appId, ctx.conversationId);
     } catch (err) {
       log.warn({ err, appId }, "Failed to track conversation ID on app_open");
     }

package/src/daemon/conversation-tool-setup.ts

@@ -6,12 +6,14 @@
  * keeping the constructor body focused on wiring.
  */
 
+import type { AssistantEvent } from "../api/index.js";
 import {
   type HostProxyCapability,
   supportsHostProxy,
 } from "../channels/types.js";
 import { getIsPlatform } from "../config/env-registry.js";
 import { getConfig } from "../config/loader.js";
+import { isMemoryEnabled } from "../config/memory-v3-gate.js";
 import type { PermissionPrompter } from "../permissions/prompter.js";
 import type { SecretPrompter } from "../permissions/secret-prompter.js";
 import { getBindingByConversation } from "../persistence/external-conversation-store.js";
@@ -62,7 +64,10 @@ import {
   type UsageAttributionSnapshot,
 } from "../usage/attribution.js";
 import { getLogger } from "../util/logger.js";
-import { conversationSupportsDynamicUi } from "./channel-ui-capability.js";
+import {
+  conversationSupportsDynamicUi,
+  conversationSupportsGuardianQuestionCards,
+} from "./channel-ui-capability.js";
 import type { Conversation } from "./conversation.js";
 import { projectSkillTools } from "./conversation-skill-tools.js";
 import {
@@ -73,7 +78,6 @@ import {
   isDoordashCommand,
   markDoordashStepInProgress,
 } from "./doordash-steps.js";
-import type { ServerMessage } from "./message-protocol.js";
 import { runPostExecutionSideEffects } from "./tool-side-effects.js";
 import { FALLBACK_TURN_TRUST, resolveTrustClass } from "./trust-context.js";
 
@@ -176,8 +180,8 @@ export function getEffectiveEnabledPluginSet(conv: {
 // ── read-only pass classification ────────────────────────────────────
 
 /**
- * The ONLY tools allowed in a read-only subagent pass (the live-voice background
- * continuation, `subagentDenySideEffects`). This is a strict fail-safe allowlist
+ * The ONLY tools allowed in a read-only subagent pass
+ * (`subagentDenySideEffects`). This is a strict fail-safe allowlist
  * of tools known to be read-only. Everything else is refused, because:
  * - A side-effect denylist is inherently incomplete — low-risk core mutators
  *   (`remember`, `notify_parent`, `computer_use_*`, `delete_memory_page`, …) are
@@ -391,8 +395,8 @@ export function createToolExecutor(
       enabledPluginSet: effectiveEnabledPluginSet,
       sendToClient: (msg) => {
         // Tool context's sendToClient uses a loose { type: string; [key: string]: unknown }
-        // signature, but at runtime these are always ServerMessage instances.
-        ctx.sendToClient(msg as ServerMessage);
+        // signature, but at runtime these are always AssistantEvent instances.
+        ctx.sendToClient(msg as AssistantEvent);
         if (msg.type === "ui_surface_show") {
           // The tool-context sendToClient signature is loose, so the show
           // message's fields are untyped here; map them through the same
@@ -423,6 +427,8 @@ export function createToolExecutor(
       // channels that can't render dynamic surfaces (Telegram, SMS) instead of
       // emitting one the channel silently drops.
       supportsDynamicUi: conversationSupportsDynamicUi(ctx),
+      supportsGuardianQuestionCards:
+        conversationSupportsGuardianQuestionCards(ctx),
       proxyToolResolver: (
         toolName: string,
         proxyInput: Record<string, unknown>,
@@ -717,7 +723,7 @@ export function isToolActiveForContext(
   }
   if (name === "remember") {
     try {
-      return getConfig().memory?.enabled !== false;
+      return isMemoryEnabled(getConfig());
     } catch {
       return true;
     }

package/src/daemon/conversation-usage.ts

@@ -1,3 +1,4 @@
+import type { AssistantEvent } from "../api/index.js";
 import { getConfig } from "../config/loader.js";
 import { updateConversationUsage } from "../persistence/conversation-crud.js";
 import { recordUsageEvent } from "../persistence/llm-usage-store.js";
@@ -16,7 +17,7 @@ import {
   resolvePricingForUsageWithOverrides,
   usesAnthropicPricingRules,
 } from "../util/pricing.js";
-import type { ServerMessage, UsageStats } from "./message-protocol.js";
+import type { UsageStats } from "./message-protocol.js";
 
 const log = getLogger("conversation-usage");
 
@@ -27,12 +28,12 @@ export interface UsageContext {
 }
 
 function normalizeTokenCount(value: number | null | undefined): number {
-  if (typeof value !== "number" || !Number.isFinite(value)) return 0;
+  if (typeof value !== "number" || !Number.isFinite(value)) {return 0;}
   return Math.max(value, 0);
 }
 
 function asRecord(value: unknown): Record<string, unknown> | null {
-  if (typeof value !== "object" || value == null) return null;
+  if (typeof value !== "object" || value == null) {return null;}
   return value as Record<string, unknown>;
 }
 
@@ -42,7 +43,7 @@ function extractAnthropicCacheCreationFromResponse(
   const rawResponse = asRecord(response);
   const usage = asRecord(rawResponse?.usage);
   const cacheCreation = asRecord(usage?.cache_creation);
-  if (!cacheCreation) return null;
+  if (!cacheCreation) {return null;}
 
   return {
     ephemeral_5m_input_tokens: normalizeTokenCount(
@@ -64,7 +65,7 @@ function extractAnthropicCacheCreation(
 
   for (const response of responses) {
     const details = extractAnthropicCacheCreationFromResponse(response);
-    if (!details) continue;
+    if (!details) {continue;}
     foundDetails = true;
     ephemeral5mInputTokens += normalizeTokenCount(
       details.ephemeral_5m_input_tokens,
@@ -74,7 +75,7 @@ function extractAnthropicCacheCreation(
     );
   }
 
-  if (!foundDetails) return null;
+  if (!foundDetails) {return null;}
 
   return {
     ephemeral_5m_input_tokens: ephemeral5mInputTokens,
@@ -96,8 +97,8 @@ function extractAnthropicSpeed(
   for (const response of responses) {
     const rec = asRecord(response);
     const usage = asRecord(rec?.usage);
-    if (usage?.speed === "fast") return "fast";
-    if (usage?.speed === "standard") foundStandard = true;
+    if (usage?.speed === "fast") {return "fast";}
+    if (usage?.speed === "standard") {foundStandard = true;}
   }
   return foundStandard ? "standard" : null;
 }
@@ -143,7 +144,7 @@ function resolveAttribution(
     | null
     | undefined,
 ): UsageAttributionSnapshot | null {
-  if (attribution == null) return null;
+  if (attribution == null) {return null;}
   return isUsageAttributionSnapshot(attribution)
     ? attribution
     : resolveUsageAttribution(attribution);
@@ -154,7 +155,7 @@ export function recordUsage(
   inputTokens: number,
   outputTokens: number,
   model: string,
-  onEvent: (msg: ServerMessage) => void,
+  onEvent: (msg: AssistantEvent) => void,
   actor: UsageActor,
   requestId: string | null = null,
   cacheCreationInputTokens = 0,
@@ -165,7 +166,7 @@ export function recordUsage(
   attribution?: UsageAttributionInput | UsageAttributionSnapshot | null,
   cronRunId: string | null = null,
 ): void {
-  if (inputTokens <= 0 && outputTokens <= 0) return;
+  if (inputTokens <= 0 && outputTokens <= 0) {return;}
 
   const normalizedCacheCreationInputTokens = normalizeTokenCount(
     cacheCreationInputTokens,

package/src/daemon/conversation.ts

@@ -19,6 +19,7 @@ import type { AgentLoopConfig } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
 import type { AssistantActivityStateEvent } from "../api/events/assistant-activity-state.js";
 import type { ConfirmationStateChangedEvent } from "../api/events/confirmation-state-changed.js";
+import type { AssistantEvent } from "../api/index.js";
 import { decideGuardianRequest } from "../channels/gateway-guardian-requests.js";
 import type {
   ChannelId,
@@ -125,6 +126,7 @@ import { registerConversationNotifiers } from "./conversation-notifiers.js";
 import type { ProcessMessageOptions } from "./conversation-process.js";
 import {
   drainQueue as drainQueueImpl,
+  kickQueueDrain as kickQueueDrainImpl,
   processMessage as processMessageImpl,
 } from "./conversation-process.js";
 import type {
@@ -163,11 +165,7 @@ import { canonicalizeTimeZone } from "./date-context.js";
 import { HostAppControlProxy } from "./host-app-control-proxy.js";
 import { HostCuProxy } from "./host-cu-proxy.js";
 import { shouldAttachHostProxyForCapability } from "./host-proxy-preactivation.js";
-import type {
-  ServerMessage,
-  SurfaceType,
-  UsageStats,
-} from "./message-protocol.js";
+import type { SurfaceType, UsageStats } from "./message-protocol.js";
 import { filterMessagesForUntrustedActor } from "./message-provenance.js";
 import type { ConversationTransportMetadata } from "./message-types/conversations.js";
 import { isHostProxyTransport } from "./message-types/conversations.js";
@@ -320,7 +318,7 @@ export class Conversation {
   /** @internal */ prompter: PermissionPrompter;
   /** @internal */ secretPrompter: SecretPrompter;
   private executor: ToolExecutor;
-  /** @internal */ sendToClient: (msg: ServerMessage) => void;
+  /** @internal */ sendToClient: (msg: AssistantEvent) => void;
   /** @internal */ workingDir: string;
   /** @internal */ allowedToolNames?: Set<string>;
   /**
@@ -345,6 +343,15 @@ export class Conversation {
    * @internal
    */
   subagentDenySideEffects?: boolean;
+  /**
+   * When true, mid-run subagent → parent notifications (`notify_parent`) are
+   * suppressed for this child. Set on synchronous (spawnAndAwait) subagents:
+   * the awaiting caller is their only parent channel, so injecting a
+   * user-role turn into the live parent mid-await would start an unsolicited
+   * parent run. Checked in `notifyParentFromChild`.
+   * @internal
+   */
+  subagentSuppressParentNotifications?: boolean;
   /**
    * Tool names a subagent attempted but that its role allowlist
    * ({@link subagentAllowedTools}) denied. Recorded by the tool executor;
@@ -672,7 +679,7 @@ export class Conversation {
   originChannel: ChannelId | undefined = undefined;
   /** @internal */ activityVersion = 0;
   /** Last emitted activity state message, retained for replay on SSE reconnection. */
-  /** @internal */ lastActivityStateMsg: ServerMessage | null = null;
+  /** @internal */ lastActivityStateMsg: AssistantEvent | null = null;
   /** Set by the agent loop to track confirmation outcomes for persistence. */
   onConfirmationOutcome?: (
     requestId: string,
@@ -685,7 +692,7 @@ export class Conversation {
     conversationId: string,
     provider: Provider,
     systemPrompt: string,
-    sendToClient: (msg: ServerMessage) => void,
+    sendToClient: (msg: AssistantEvent) => void,
     workingDir: string,
     options?: ConversationConstructorOptions,
   ) {
@@ -1431,7 +1438,7 @@ export class Conversation {
   }
 
   updateClient(
-    sendToClient: (msg: ServerMessage) => void,
+    sendToClient: (msg: AssistantEvent) => void,
     hasNoClient = false,
   ): void {
     this.sendToClient = sendToClient;
@@ -1453,7 +1460,7 @@ export class Conversation {
   }
 
   /** Returns the current sendToClient reference for identity comparison. */
-  getCurrentSender(): (msg: ServerMessage) => void {
+  getCurrentSender(): (msg: AssistantEvent) => void {
     return this.sendToClient;
   }
 
@@ -1465,6 +1472,10 @@ export class Conversation {
     this.subagentDenySideEffects = deny;
   }
 
+  setSubagentSuppressParentNotifications(suppress: boolean): void {
+    this.subagentSuppressParentNotifications = suppress;
+  }
+
   /**
    * Set the conversation's per-chat plugin scope, updating both the persisted
    * `enabled_plugins` row and the live instance (source of truth for the
@@ -1866,10 +1877,10 @@ export class Conversation {
   emitConfirmationStateChanged(
     params: Omit<ConfirmationStateChangedEvent, "type">,
   ): void {
-    const msg: ServerMessage = {
+    const msg: AssistantEvent = {
       type: "confirmation_state_changed",
       ...params,
-    } as ServerMessage;
+    } as AssistantEvent;
     try {
       this.sendToClient(msg);
     } catch (err) {
@@ -1891,7 +1902,7 @@ export class Conversation {
   ): void {
     const { anchor = "assistant_turn", requestId, statusText } = options ?? {};
     this.activityVersion++;
-    const msg: ServerMessage = {
+    const msg: AssistantEvent = {
       type: "assistant_activity_state",
       conversationId: this.conversationId,
       activityVersion: this.activityVersion,
@@ -1900,7 +1911,7 @@ export class Conversation {
       requestId,
       reason,
       ...(statusText ? { statusText } : {}),
-    } as ServerMessage;
+    } as AssistantEvent;
     this.lastActivityStateMsg = msg;
     try {
       this.sendToClient(msg);
@@ -2454,7 +2465,7 @@ export class Conversation {
     content: string,
     userMessageId: string,
     options?: {
-      onEvent?: (msg: ServerMessage) => void;
+      onEvent?: (msg: AssistantEvent) => void;
       isInteractive?: boolean;
       isUserMessage?: boolean;
       titleText?: string;
@@ -2493,6 +2504,18 @@ export class Conversation {
     return drainQueueImpl(this, reason);
   }
 
+  /**
+   * Never-rejecting drain trigger for fire-and-forget call sites. See
+   * `kickQueueDrain` in conversation-process.ts for the retry/notify
+   * semantics.
+   */
+  kickDrainQueue(
+    reason: QueueDrainReason = "loop_complete",
+    origin?: string,
+  ): Promise<void> {
+    return kickQueueDrainImpl(this, reason, origin);
+  }
+
   async processMessage(options: ProcessMessageOptions): Promise<string> {
     this.cacheWarmAbort?.abort();
     this.cacheWarmAbort = undefined;

package/src/daemon/disk-pressure-guard.ts

@@ -3,8 +3,7 @@ import {
   type DiskPressureState,
   type DiskPressureStatus,
 } from "../api/events/disk-pressure-status-changed.js";
-import { buildAssistantEvent } from "../runtime/assistant-event.js";
-import { assistantEventHub } from "../runtime/assistant-event-hub.js";
+import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import { cancelBackgroundTools } from "../tools/background-tool-registry.js";
 import { getDiskUsageInfo } from "../util/disk-usage.js";
 import { getLogger } from "../util/logger.js";
@@ -107,16 +106,10 @@ function statusFingerprint(status: DiskPressureStatus): string {
 function publishStatusChangedIfNeeded(previous: DiskPressureStatus): void {
   if (statusFingerprint(previous) === statusFingerprint(state.status)) return;
   const status = cloneStatus(state.status);
-  assistantEventHub
-    .publish(
-      buildAssistantEvent({
-        type: "disk_pressure_status_changed",
-        status,
-      }),
-    )
-    .catch((err) => {
-      log.warn({ err }, "Failed to publish disk pressure status change");
-    });
+  broadcastMessage({
+    type: "disk_pressure_status_changed",
+    status,
+  });
 }
 
 function replaceStatus(next: DiskPressureStatus): DiskPressureStatus {

package/src/daemon/embedding-reconcile.ts

@@ -19,7 +19,11 @@ import {
   saveRawConfig,
   setNestedValue,
 } from "../config/loader.js";
-import { isMemoryV3Live } from "../config/memory-v3-gate.js";
+import {
+  isMemoryEnabled,
+  isMemoryV2ExplicitlyDisabled,
+  isMemoryV3Live,
+} from "../config/memory-v3-gate.js";
 import type { AssistantConfig } from "../config/types.js";
 import {
   probeBackendDimension,
@@ -30,14 +34,14 @@ import {
   enqueueMemoryJob,
   hasActiveJobOfType,
 } from "../persistence/jobs-store.js";
+import {
+  ensureConceptPageCollection,
+  recreateConceptPageCollection,
+} from "../plugins/defaults/memory/substrate/qdrant.js";
 import {
   ensureSectionCollection,
   recreateSectionCollection,
 } from "../plugins/defaults/memory/v3/section-dense-store.js";
-import {
-  ensureConceptPageCollection,
-  recreateConceptPageCollection,
-} from "../plugins/defaults/memory/v3/substrate/qdrant.js";
 import { getLogger } from "../util/logger.js";
 
 const log = getLogger("embedding-reconcile");
@@ -157,7 +161,7 @@ async function defaultRecreateCollectionsAtDim(
  * the same type. `memory_v2_reembed` can be enqueued from two startup sites that
  * both guard on this in-flight check: the credential-arrival reconcile retry
  * (reconcile-vs-reconcile), and the lifecycle reconcile-then-rebuild interleaving
- * where `maybeRebuildMemoryV2Concepts` also enqueues a reembed when it finds the
+ * where `maybeRebuildConceptCollection` also enqueues a reembed when it finds the
  * just-(re)created collection empty. The guard keeps the corpus re-embed to a
  * single round-trip across either path.
  */
@@ -226,7 +230,7 @@ export async function reconcileEmbeddingIdentity(
   // persist/recreate/enqueue. `memory.enabled` defaults to true; gate strictly
   // on the explicit `false`. This gate covers both the lifecycle startup call
   // and the credential-arrival retry call.
-  if (config.memory.enabled === false) {
+  if (!isMemoryEnabled(config)) {
     log.info("Memory disabled — skipping embedding-identity reconcile");
     return { action: "noop", dim: null };
   }
@@ -239,8 +243,9 @@ export async function reconcileEmbeddingIdentity(
   // dimension recreate). Running here would enqueue `memory_v2_reembed` against
   // the disabled v2 index and persist a `vectorSize` after the v1 client was
   // already initialized at the old dimension. Defaults to true; gate strictly
-  // on the explicit `false` (and tolerate a missing `v2` node in test configs).
-  if (config.memory.v2?.enabled === false) {
+  // on the explicit `false` (and tolerate a missing `v2` node in test
+  // configs) — the semantics `isMemoryV2ExplicitlyDisabled` names.
+  if (isMemoryV2ExplicitlyDisabled(config)) {
     log.info(
       "Memory v2 disabled — skipping embedding-identity reconcile; v1 path owns its collection dimension",
     );