@vellumai/assistant 0.7.0 → 0.7.1

package/src/daemon/conversation-surfaces.ts

@@ -1,6 +1,7 @@
 import { v4 as uuid } from "uuid";
 
 import {
+  addAppConversationId,
   getApp,
   getAppDirPath,
   getAppPreview,
@@ -13,6 +14,7 @@ import {
   getMessages,
   updateMessageContent,
 } from "../memory/conversation-crud.js";
+import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import type {
   InteractiveUiRequest,
   InteractiveUiResult,
@@ -255,7 +257,6 @@ export interface SurfaceConversationContext {
     emit(type: string, message: string, meta?: Record<string, unknown>): void;
   };
   sendToClient(msg: ServerMessage): void;
-  broadcastToAllClients?(msg: ServerMessage): void;
   pendingSurfaceActions: Map<string, { surfaceType: SurfaceType }>;
   lastSurfaceAction: Map<
     string,
@@ -325,8 +326,8 @@ export interface SurfaceConversationContext {
   enqueueMessage(
     content: string,
     attachments: UserMessageAttachment[],
-    onEvent: (msg: ServerMessage) => void,
-    requestId: string,
+    onEvent?: (msg: ServerMessage) => void,
+    requestId?: string,
     activeSurfaceId?: string,
     currentPage?: string,
     metadata?: Record<string, unknown>,
@@ -338,7 +339,7 @@ export interface SurfaceConversationContext {
   processMessage(
     content: string,
     attachments: UserMessageAttachment[],
-    onEvent: (msg: ServerMessage) => void,
+    onEvent?: (msg: ServerMessage) => void,
     requestId?: string,
     activeSurfaceId?: string,
     currentPage?: string,
@@ -485,9 +486,7 @@ export function showStandaloneSurface(
       // the client side, preventing stale user interactions from reaching
       // handleSurfaceAction and being misrouted to the LLM.
       try {
-        const emitTimeout =
-          ctx.broadcastToAllClients ?? ctx.sendToClient.bind(ctx);
-        emitTimeout({
+        broadcastMessage({
           type: "ui_surface_complete",
           conversationId: ctx.conversationId,
           surfaceId,
@@ -523,9 +522,7 @@ export function showStandaloneSurface(
       actions,
     });
 
-    // ── Emit to client ──
-    const emit = ctx.broadcastToAllClients ?? ctx.sendToClient.bind(ctx);
-    emit({
+    broadcastMessage({
       type: "ui_surface_show",
       conversationId: ctx.conversationId,
       surfaceId,
@@ -994,9 +991,7 @@ export async function handleSurfaceAction(
       summary,
     };
 
-    // Emit ui_surface_complete so the client transitions the surface chip.
-    const emit = ctx.broadcastToAllClients ?? ctx.sendToClient.bind(ctx);
-    emit({
+    broadcastMessage({
       type: "ui_surface_complete",
       conversationId: ctx.conversationId,
       surfaceId,
@@ -1211,12 +1206,7 @@ export async function handleSurfaceAction(
 
     const requestId = uuid();
     ctx.surfaceActionRequestIds.add(requestId);
-    // Use broadcastToAllClients (publishes to the SSE event hub) instead of
-    // sendToClient, which is reset to a no-op between HTTP requests. Without
-    // this, surface action responses are persisted to DB but never reach the
-    // client's SSE stream.
-    const emit = ctx.broadcastToAllClients ?? ctx.sendToClient.bind(ctx);
-    const onEvent = (msg: ServerMessage) => emit(msg);
+    const onEvent = (msg: ServerMessage) => broadcastMessage(msg);
 
     ctx.traceEmitter.emit("request_received", "Surface action received", {
       requestId,
@@ -1250,7 +1240,7 @@ export async function handleSurfaceAction(
     // Echo the prompt to the client so it appears in the chat UI.
     // Deferred until after rejection check to avoid ghost messages.
     if (prompt) {
-      emit({
+      broadcastMessage({
         type: "user_message_echo",
         text: prompt,
         conversationId: ctx.conversationId,
@@ -1350,16 +1340,11 @@ export async function handleSurfaceAction(
     surfaceData,
   );
 
-  // Use broadcastToAllClients so events reach the SSE hub — sendToClient is
-  // reset to a no-op between HTTP requests (see history-restored path for
-  // full rationale).
-  const emit = ctx.broadcastToAllClients ?? ctx.sendToClient.bind(ctx);
-
   // 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") {
-    emit({
+    broadcastMessage({
       type: "ui_surface_complete",
       conversationId: ctx.conversationId,
       surfaceId,
@@ -1455,7 +1440,7 @@ export async function handleSurfaceAction(
 
   const requestId = uuid();
   ctx.surfaceActionRequestIds.add(requestId);
-  const onEvent = (msg: ServerMessage) => emit(msg);
+  const onEvent = (msg: ServerMessage) => broadcastMessage(msg);
 
   ctx.traceEmitter.emit("request_received", "Surface action received", {
     requestId,
@@ -1503,7 +1488,7 @@ export async function handleSurfaceAction(
   // Echo the user's prompt to the client so it appears in the chat UI.
   // Deferred until after rejection check to avoid ghost messages.
   if (shouldRelayPrompt && prompt) {
-    emit({
+    broadcastMessage({
       type: "user_message_echo",
       text: prompt,
       conversationId: ctx.conversationId,
@@ -1567,6 +1552,7 @@ export async function handleSurfaceAction(
       );
       onEvent({
         type: "error",
+        conversationId: ctx.conversationId,
         message: `Failed to process surface action: ${message}`,
       });
     });
@@ -2016,6 +2002,14 @@ export async function surfaceProxyResolver(
     const openMode = input.open_mode as string | undefined;
     const app = getApp(appId);
     if (!app) return { content: `App not found: ${appId}`, isError: true };
+
+    // Track conversation association (best-effort — failures must not break open flow).
+    try {
+      addAppConversationId(appId, ctx.conversationId);
+    } catch (err) {
+      log.warn({ err, appId }, "Failed to track conversation ID on app_open");
+    }
+
     // 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 conversation restart.

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

@@ -99,29 +99,11 @@ export interface ToolSetupContext extends SurfaceConversationContext {
   trustContext?: TrustContext;
   /** Voice/call session ID, if the conversation originates from a call. Propagated into ToolContext for scoped grant consumption. */
   callSessionId?: string;
-  /** Optional proxy for delegating host_bash execution to a connected client. */
-  hostBashProxy?: import("./host-bash-proxy.js").HostBashProxy;
-  /** Optional proxy for delegating CDP commands to a connected client (managed/cloud-hosted mode). */
-  hostBrowserProxy?: import("./host-browser-proxy.js").HostBrowserProxy;
-  /** Optional proxy for delegating host_file_read/write/edit execution to a connected client. */
-  hostFileProxy?: import("./host-file-proxy.js").HostFileProxy;
-  /** Optional proxy for delegating bidirectional file transfers between sandbox and host. */
-  hostTransferProxy?: import("./host-transfer-proxy.js").HostTransferProxy;
   /** CES RPC client for credential execution operations. Injected when CES tools are enabled and the CES process is available. */
   cesClient?: CesClient;
   /** The interface ID of the connected client driving the current turn (e.g. "macos", "chrome-extension"). Propagated into ToolContext for browser backend selection. */
   readonly transportInterface?: InterfaceId;
-  /**
-   * Registry-routed sender override for the host browser proxy. When set
-   * (non-undefined), indicates the browser proxy sender was replaced by a
-   * ChromeExtensionRegistry WebSocket sender — i.e., an extension connection
-   * was actively wired at turn-start. Propagated into ToolContext as
-   * `hostBrowserRegistryRouted` (boolean) so the CDP factory can distinguish
-   * SSE-backed proxies from extension-backed proxies.
-   */
-  hostBrowserSenderOverride?: (
-    msg: import("./message-protocol.js").ServerMessage,
-  ) => void;
+
   /** Turn-scoped flag: true when any tool call in the current turn received explicit user approval via interactive prompt. Cleared at turn end. */
   approvedViaPromptThisTurn?: boolean;
   /**
@@ -162,7 +144,6 @@ export function createToolExecutor(
   secretPrompter: SecretPrompter,
   ctx: ToolSetupContext,
   handleToolLifecycleEvent: ToolLifecycleEventHandler,
-  broadcastToAllClients?: (msg: ServerMessage) => void,
 ): (
   name: string,
   input: Record<string, unknown>,
@@ -214,14 +195,9 @@ export function createToolExecutor(
       allowedToolNames: ctx.allowedToolNames,
       memoryScopeId: ctx.memoryPolicy.scopeId,
       toolUseId,
-      hostBashProxy: ctx.hostBashProxy,
-      hostBrowserProxy: ctx.hostBrowserProxy,
-      hostFileProxy: ctx.hostFileProxy,
-      hostTransferProxy: ctx.hostTransferProxy,
       isPlatformHosted: getIsPlatform(),
       cesClient: ctx.cesClient,
       transportInterface: ctx.transportInterface,
-      hostBrowserRegistryRouted: !!ctx.hostBrowserSenderOverride,
       overrideProfile: ctx.currentTurnOverrideProfile,
       onToolLifecycleEvent: handleToolLifecycleEvent,
       sendToClient: (msg) => {
@@ -310,10 +286,7 @@ export function createToolExecutor(
         ctx.approvedViaPromptThisTurn = true;
       }
 
-      runPostExecutionSideEffects(toolName, toolInput, result, {
-        ctx,
-        broadcastToAllClients,
-      });
+      runPostExecutionSideEffects(toolName, toolInput, result, { ctx });
 
       return result;
     }
@@ -328,10 +301,7 @@ export function createToolExecutor(
       ctx.approvedViaPromptThisTurn = true;
     }
 
-    runPostExecutionSideEffects(name, input, result, {
-      ctx,
-      broadcastToAllClients,
-    });
+    runPostExecutionSideEffects(name, input, result, { ctx });
 
     return result;
   };

package/src/daemon/conversation-usage.ts

@@ -2,10 +2,13 @@ import { getConfig } from "../config/loader.js";
 import { updateConversationUsage } from "../memory/conversation-crud.js";
 import { recordUsageEvent } from "../memory/llm-usage-store.js";
 import type { UsageActor } from "../usage/actors.js";
+import { resolveUsageAttribution } from "../usage/attribution.js";
 import type {
   AnthropicCacheCreationTokenDetails,
   PricingResult,
   PricingUsage,
+  UsageAttributionInput,
+  UsageAttributionSnapshot,
 } from "../usage/types.js";
 import { getLogger } from "../util/logger.js";
 import {
@@ -117,6 +120,34 @@ function resolveStructuredPricing(
   }
 }
 
+function isUsageAttributionSnapshot(
+  attribution:
+    | UsageAttributionInput
+    | UsageAttributionSnapshot
+    | null
+    | undefined,
+): attribution is UsageAttributionSnapshot {
+  return (
+    attribution != null &&
+    typeof (attribution as UsageAttributionSnapshot).resolvedProvider ===
+      "string" &&
+    typeof (attribution as UsageAttributionSnapshot).resolvedModel === "string"
+  );
+}
+
+function resolveAttribution(
+  attribution:
+    | UsageAttributionInput
+    | UsageAttributionSnapshot
+    | null
+    | undefined,
+): UsageAttributionSnapshot | null {
+  if (attribution == null) return null;
+  return isUsageAttributionSnapshot(attribution)
+    ? attribution
+    : resolveUsageAttribution(attribution);
+}
+
 export function recordUsage(
   ctx: UsageContext,
   inputTokens: number,
@@ -130,6 +161,7 @@ export function recordUsage(
   rawResponse?: unknown,
   llmCallCount = 1,
   contextWindow?: { tokens: number; maxTokens: number },
+  attribution?: UsageAttributionInput | UsageAttributionSnapshot | null,
 ): void {
   if (inputTokens <= 0 && outputTokens <= 0) return;
 
@@ -193,6 +225,7 @@ export function recordUsage(
 
   // Dual-write: persist per-turn usage event to the new ledger table
   try {
+    const attributionSnapshot = resolveAttribution(attribution);
     recordUsageEvent(
       {
         actor,
@@ -206,6 +239,9 @@ export function recordUsage(
         runId: null,
         requestId,
         llmCallCount,
+        callSite: attributionSnapshot?.callSite ?? null,
+        inferenceProfile: attributionSnapshot?.appliedProfile ?? null,
+        inferenceProfileSource: attributionSnapshot?.profileSource ?? null,
       },
       pricing,
     );