@vellumai/assistant 0.10.12 → 0.11.0-staging.2

package/src/__tests__/conversation-surfaces-action-delivery.test.ts

@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent } from "../api/index.js";
 
-let broadcastedMessages: ServerMessage[] = [];
+let broadcastedMessages: AssistantEvent[] = [];
 const realEventHub = await import("../runtime/assistant-event-hub.js");
 mock.module("../runtime/assistant-event-hub.js", () => ({
   ...realEventHub,
-  broadcastMessage: (msg: ServerMessage) => broadcastedMessages.push(msg),
+  broadcastMessage: (msg: AssistantEvent) => broadcastedMessages.push(msg),
 }));
 
 const { createSurfaceMutex, handleSurfaceAction, surfaceProxyResolver } =
@@ -25,13 +25,15 @@ interface ProcessMessageCall {
   sourceActorPrincipalId?: string;
 }
 
-function makeContext(sent: ServerMessage[] = []): SurfaceConversationContext & {
+function makeContext(
+  sent: AssistantEvent[] = [],
+): SurfaceConversationContext & {
   processMessageCalls: ProcessMessageCall[];
 } {
   const processMessageCalls: ProcessMessageCall[] = [];
   return {
     conversationId: "conv-1",
-    sendToClient: (msg: ServerMessage) => sent.push(msg),
+    sendToClient: (msg: AssistantEvent) => sent.push(msg),
     pendingSurfaceActions: new Map<string, { surfaceType: SurfaceType }>(),
     lastSurfaceAction: new Map<
       string,
@@ -67,7 +69,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("table action button click triggers processMessage with action content", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     // Step 1: Show a table surface with actions
@@ -128,7 +130,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("idle pending follow-up path threads submitter principal into processMessage", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     await surfaceProxyResolver(ctx, "ui_show", {
@@ -161,7 +163,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("idle history-restored path threads submitter principal into processMessage", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     // History-restored surface: surfaceState exists, pendingSurfaceActions
@@ -191,7 +193,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("table action without selection data still triggers processMessage", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     // Show table surface
@@ -267,7 +269,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("action on history-restored surface (no pending) still processes", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     // Simulate a history-restored surface: surfaceState exists, but
@@ -295,7 +297,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("confirmation surface broadcasts ui_surface_complete on action", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     const showResult = await surfaceProxyResolver(ctx, "ui_show", {
@@ -331,7 +333,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("file_upload surface broadcasts ui_surface_complete on action", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     const showResult = await surfaceProxyResolver(ctx, "ui_show", {
@@ -370,7 +372,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("file_upload completion event does not include base64 file blobs", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     await surfaceProxyResolver(ctx, "ui_show", {
@@ -414,7 +416,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("choice surface broadcasts ui_surface_complete on action", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     const showResult = await surfaceProxyResolver(ctx, "ui_show", {
@@ -457,7 +459,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("oauth_connect surface broadcasts ui_surface_complete on action", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     const showResult = await surfaceProxyResolver(ctx, "ui_show", {
@@ -499,7 +501,7 @@ describe("surface action delivery to assistant", () => {
   });
 
   test("table surface does NOT broadcast ui_surface_complete (not one-shot)", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     await surfaceProxyResolver(ctx, "ui_show", {

package/src/__tests__/conversation-surfaces-activation-emit.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent } from "../api/index.js";
 
 // Analytics consent is granted so recordActivationEvent writes rows.
 let shareAnalytics = true;
@@ -9,11 +9,11 @@ mock.module("../platform/consent-cache.js", () => ({
   getRawShareAnalytics: () => shareAnalytics,
 }));
 
-let broadcastedMessages: ServerMessage[] = [];
+let broadcastedMessages: AssistantEvent[] = [];
 const realEventHub = await import("../runtime/assistant-event-hub.js");
 mock.module("../runtime/assistant-event-hub.js", () => ({
   ...realEventHub,
-  broadcastMessage: (msg: ServerMessage) => broadcastedMessages.push(msg),
+  broadcastMessage: (msg: AssistantEvent) => broadcastedMessages.push(msg),
 }));
 
 // Stub the child-conversation launcher so the launch_conversation commit path
@@ -60,14 +60,14 @@ interface ProcessMessageCall {
 
 function makeContext(
   conversationId: string,
-  sent: ServerMessage[] = [],
+  sent: AssistantEvent[] = [],
 ): SurfaceConversationContext & {
   processMessageCalls: ProcessMessageCall[];
 } {
   const processMessageCalls: ProcessMessageCall[] = [];
   return {
     conversationId,
-    sendToClient: (msg: ServerMessage) => sent.push(msg),
+    sendToClient: (msg: AssistantEvent) => sent.push(msg),
     pendingSurfaceActions: new Map<string, { surfaceType: SurfaceType }>(),
     lastSurfaceAction: new Map<
       string,
@@ -103,7 +103,7 @@ function resetTables(): void {
 /** Render a choice surface tagged (or not) with an activation_moment. */
 async function showTaggedChoice(
   ctx: SurfaceConversationContext,
-  sent: ServerMessage[],
+  sent: AssistantEvent[],
   activationMoment?: string,
 ): Promise<string> {
   await surfaceProxyResolver(ctx, "ui_show", {
@@ -134,7 +134,7 @@ describe("activation moment emission from ui_show surface commits", () => {
     markActivationSession("conv-marked");
     expect(isActivationSession("conv-marked")).toBe(true);
 
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-marked", sent);
     const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
 
@@ -152,7 +152,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("a queue-rejected commit does NOT emit; the tag survives for the retry", async () => {
     markActivationSession("conv-rejected");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-rejected", sent);
     const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
 
@@ -183,7 +183,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("first_wow_executed records at SHOW time (no commit) and never double-emits", async () => {
     markActivationSession("conv-wow");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-wow", sent);
 
     // A display-only result surface tagged with the execution moment.
@@ -211,7 +211,7 @@ describe("activation moment emission from ui_show surface commits", () => {
   });
 
   test("first_wow_executed in an UNMARKED session writes no row at show time", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-wow-unmarked", sent);
     await surfaceProxyResolver(ctx, "ui_show", {
       surface_type: "card",
@@ -224,7 +224,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("does not forward the daemon-only tag to the client", async () => {
     markActivationSession("conv-marked-2");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-marked-2", sent);
     await showTaggedChoice(ctx, sent, "moment_2");
 
@@ -239,7 +239,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("untagged surface writes no row", async () => {
     markActivationSession("conv-untagged");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-untagged", sent);
     const surfaceId = await showTaggedChoice(ctx, sent, undefined);
 
@@ -252,7 +252,7 @@ describe("activation moment emission from ui_show surface commits", () => {
   });
 
   test("tagged surface in an UNMARKED session writes no row", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-not-rail", sent);
     const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
 
@@ -266,7 +266,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("an invalid activation_moment token is ignored (no row)", async () => {
     markActivationSession("conv-bad-tag");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-bad-tag", sent);
     const surfaceId = await showTaggedChoice(ctx, sent, "bogus_moment");
 
@@ -280,7 +280,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("FIX 1: launch_conversation commit on a tagged surface records exactly one row", async () => {
     markActivationSession("conv-launch");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-launch", sent);
 
     // A launcher card tagged with a commit-timing moment. The committed action
@@ -312,7 +312,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("FIX 2: commit-timing tag survives a surfaceState restore from history", async () => {
     markActivationSession("conv-restore");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-restore", sent);
     const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
 
@@ -361,7 +361,7 @@ describe("activation moment emission from ui_show surface commits", () => {
 
   test("intermediate selection_changed does NOT emit; the terminal commit does", async () => {
     markActivationSession("conv-table");
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext("conv-table", sent);
 
     // A table surface stays pending across selection_changed (non-terminal).

package/src/__tests__/conversation-surfaces-app-open.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
+import type { AssistantEvent } from "../api/index.js";
 import { DynamicPagePreviewSchema } from "../api/surfaces.js";
 import {
   buildAppOpenPreview,
@@ -7,7 +8,9 @@ import {
   type SurfaceConversationContext,
   surfaceProxyResolver,
 } from "../daemon/conversation-surfaces.js";
-import type { ServerMessage, SurfaceType } from "../daemon/message-protocol.js";
+import type {
+  SurfaceType,
+} from "../daemon/message-protocol.js";
 
 interface ContextOptions {
   hasNoClient?: boolean;
@@ -15,7 +18,7 @@ interface ContextOptions {
 }
 
 function makeContext(
-  sent: ServerMessage[] = [],
+  sent: AssistantEvent[] = [],
   options: ContextOptions = {},
 ): SurfaceConversationContext {
   return {
@@ -43,7 +46,7 @@ function makeContext(
 
 describe("app_open render-capability gate", () => {
   test("returns an error without broadcasting on a clientless turn", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent, { hasNoClient: true });
 
     const result = await surfaceProxyResolver(ctx, "app_open", {
@@ -56,7 +59,7 @@ describe("app_open render-capability gate", () => {
   });
 
   test("returns an error on a channel without dynamic UI (e.g. Slack)", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent, {
       channelCapabilities: { channel: "slack", supportsDynamicUi: false },
     });

package/src/__tests__/conversation-surfaces-data-persist.test.ts

@@ -1,12 +1,12 @@
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent } from "../api/index.js";
 
 const realEventHub = await import("../runtime/assistant-event-hub.js");
 
 mock.module("../runtime/assistant-event-hub.js", () => ({
   ...realEventHub,
-  broadcastMessage: (_msg: ServerMessage) => {},
+  broadcastMessage: (_msg: AssistantEvent) => {},
 }));
 
 // Mock the persistence layer the surface helpers reach into so we can
@@ -53,7 +53,7 @@ import type {
   SurfaceType,
 } from "../daemon/message-protocol.js";
 
-function makeContext(sent: ServerMessage[] = []): SurfaceConversationContext {
+function makeContext(sent: AssistantEvent[] = []): SurfaceConversationContext {
   return {
     conversationId: "conv-persist-1",
     sendToClient: (msg) => sent.push(msg),
@@ -111,7 +111,7 @@ describe("ui_surface_update persistence", () => {
   });
 
   test("ui_update schedules a debounced DB write that lands within ~600ms", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     // Seed an existing in-memory surface and a persisted message that
@@ -164,7 +164,7 @@ describe("ui_surface_update persistence", () => {
   });
 
   test("multiple rapid updates collapse to a single DB write", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
 
     const surfaceId = "surface-debounced-2";
@@ -431,7 +431,7 @@ describe("ui_dismiss persisted-state convergence", () => {
   });
 
   test("passive dismiss drops the surface from the turn snapshot and strips the persisted block", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
     const surfaceId = "surface-dismiss-1";
     // A progress card the model marked `completed` while leaving step 4 spinning.
@@ -479,7 +479,7 @@ describe("ui_dismiss persisted-state convergence", () => {
   });
 
   test("dismiss cancels a pending debounced persist so a stale update cannot re-add the block", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext(sent);
     const surfaceId = "surface-dismiss-2";
     const data: CardSurfaceData = {

package/src/__tests__/conversation-surfaces-standalone-payloads.test.ts

@@ -19,11 +19,11 @@
 
 import { describe, expect, mock, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent } from "../api/index.js";
 
-let broadcastImpl: (msg: ServerMessage) => void = () => {};
+let broadcastImpl: (msg: AssistantEvent) => void = () => {};
 mock.module("../runtime/assistant-event-hub.js", () => ({
-  broadcastMessage: (msg: ServerMessage) => broadcastImpl(msg),
+  broadcastMessage: (msg: AssistantEvent) => broadcastImpl(msg),
 }));
 
 import {
@@ -42,11 +42,11 @@ function createMockContext(
     channel: string;
   }>,
 ): SurfaceConversationContext & {
-  sentMessages: ServerMessage[];
+  sentMessages: AssistantEvent[];
   enqueuedMessages: Array<{ content: string; requestId: string }>;
 } {
-  const sentMessages: ServerMessage[] = [];
-  broadcastImpl = (msg: ServerMessage) => sentMessages.push(msg);
+  const sentMessages: AssistantEvent[] = [];
+  broadcastImpl = (msg: AssistantEvent) => sentMessages.push(msg);
   const enqueuedMessages: Array<{ content: string; requestId: string }> = [];
 
   return {
@@ -59,7 +59,7 @@ function createMockContext(
           supportsDynamicUi: overrides.supportsDynamicUi ?? true,
         }
       : undefined,
-    sendToClient: (msg: ServerMessage) => sentMessages.push(msg),
+    sendToClient: (msg: AssistantEvent) => sentMessages.push(msg),
     pendingSurfaceActions: new Map(),
     lastSurfaceAction: new Map(),
     surfaceState: new Map(),
@@ -91,7 +91,7 @@ function createMockContext(
 type AnyRecord = Record<string, unknown>;
 
 function findByType(
-  messages: ServerMessage[],
+  messages: AssistantEvent[],
   type: string,
 ): AnyRecord | undefined {
   return messages.find(
@@ -99,7 +99,7 @@ function findByType(
   ) as unknown as AnyRecord | undefined;
 }
 
-function findAllByType(messages: ServerMessage[], type: string): AnyRecord[] {
+function findAllByType(messages: AssistantEvent[], type: string): AnyRecord[] {
   return messages.filter(
     (m) => (m as unknown as AnyRecord).type === type,
   ) as unknown as AnyRecord[];

package/src/__tests__/conversation-surfaces-standalone.test.ts

@@ -1,11 +1,11 @@
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent } from "../api/index.js";
 import type { InteractiveUiResult } from "../runtime/interactive-ui.js";
 
-let broadcastImpl: (msg: ServerMessage) => void = () => {};
+let broadcastImpl: (msg: AssistantEvent) => void = () => {};
 mock.module("../runtime/assistant-event-hub.js", () => ({
-  broadcastMessage: (msg: ServerMessage) => broadcastImpl(msg),
+  broadcastMessage: (msg: AssistantEvent) => broadcastImpl(msg),
 }));
 
 import {
@@ -30,11 +30,11 @@ function createMockContext(
     channel: string;
   }>,
 ): SurfaceConversationContext & {
-  sentMessages: ServerMessage[];
+  sentMessages: AssistantEvent[];
   enqueuedMessages: Array<{ content: string; requestId: string }>;
 } {
-  const sentMessages: ServerMessage[] = [];
-  broadcastImpl = (msg: ServerMessage) => sentMessages.push(msg);
+  const sentMessages: AssistantEvent[] = [];
+  broadcastImpl = (msg: AssistantEvent) => sentMessages.push(msg);
   const enqueuedMessages: Array<{ content: string; requestId: string }> = [];
 
   return {
@@ -47,7 +47,7 @@ function createMockContext(
           supportsDynamicUi: overrides.supportsDynamicUi ?? true,
         }
       : undefined,
-    sendToClient: (msg: ServerMessage) => sentMessages.push(msg),
+    sendToClient: (msg: AssistantEvent) => sentMessages.push(msg),
     pendingSurfaceActions: new Map(),
     lastSurfaceAction: new Map(),
     surfaceState: new Map(),
@@ -128,7 +128,7 @@ describe("showStandaloneSurface", () => {
 
   afterEach(() => {
     // Safety cleanup of any lingering timers
-    for (const t of timers) clearTimeout(t);
+    for (const t of timers) {clearTimeout(t);}
   });
 
   test("fails closed when no client is connected", async () => {
@@ -299,7 +299,7 @@ describe("showStandaloneSurface", () => {
   test("timeout still resolves when emit throws", async () => {
     const ctx = createMockContext();
     let showEmitted = false;
-    broadcastImpl = (msg: ServerMessage) => {
+    broadcastImpl = (msg: AssistantEvent) => {
       const type = (msg as unknown as Record<string, unknown>).type;
       if (type === "ui_surface_show") {
         showEmitted = true;
@@ -478,7 +478,7 @@ describe("cleanupStandaloneSurface", () => {
     clearTimeout(timer);
     const tombstoneTimer =
       ctx.recentlyCompletedStandaloneSurfaces!.get("surf-c1");
-    if (tombstoneTimer) clearTimeout(tombstoneTimer);
+    if (tombstoneTimer) {clearTimeout(tombstoneTimer);}
   });
 
   test("is idempotent — safe to call multiple times", () => {
@@ -530,7 +530,7 @@ describe("standalone surface cleanup on conversation dispose", () => {
         type: "ui_surface_dismiss",
         conversationId: ctx.conversationId,
         surfaceId,
-      } as ServerMessage);
+      } as AssistantEvent);
       entry.resolve({ status: "cancelled", surfaceId });
     }
     ctx.pendingStandaloneSurfaces!.clear();
@@ -579,7 +579,7 @@ describe("standalone surface cleanup on conversation dispose", () => {
         type: "ui_surface_dismiss",
         conversationId: ctx.conversationId,
         surfaceId,
-      } as ServerMessage);
+      } as AssistantEvent);
       entry.resolve({ status: "cancelled", surfaceId });
     }
     ctx.pendingStandaloneSurfaces!.clear();

package/src/__tests__/conversation-surfaces-state-update.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
+import type { AssistantEvent } from "../api/index.js";
 import {
   createSurfaceMutex,
   handleSurfaceAction,
@@ -7,7 +8,9 @@ import {
   type SurfaceConversationContext,
   surfaceProxyResolver,
 } from "../daemon/conversation-surfaces.js";
-import type { ServerMessage, SurfaceType } from "../daemon/message-protocol.js";
+import type {
+  SurfaceType,
+} from "../daemon/message-protocol.js";
 
 /**
  * Build a minimal SurfaceConversationContext for testing.
@@ -15,7 +18,7 @@ import type { ServerMessage, SurfaceType } from "../daemon/message-protocol.js";
  * whether an LLM turn was triggered.
  */
 function makeContext(opts?: {
-  sent?: ServerMessage[];
+  sent?: AssistantEvent[];
 }): SurfaceConversationContext & {
   enqueueCalls: Array<{ content: string; requestId: string }>;
   processCalls: Array<{ content: string; requestId?: string }>;
@@ -244,7 +247,7 @@ describe("cleanup on dismiss", () => {
 
 describe("ui_update preserves client-owned keys the daemon schema omits", () => {
   test("a valid patch keeps unmodeled keys on the merged, sent, and stored data", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext({ sent });
     // A document_preview whose stored data carries `content`/`mimeType`
     // (read by the client renderer, not modeled by the daemon schema).
@@ -290,7 +293,7 @@ describe("ui_update preserves client-owned keys the daemon schema omits", () =>
 
 describe("ui_update on a restored unknown surface type", () => {
   test("forwards the merge opaquely instead of throwing on the schema registry", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext({ sent });
     // Restore preserves an unknown-but-non-empty surfaceType verbatim (a
     // newer/custom client-rendered surface). Indexing SURFACE_DATA_SCHEMAS with
@@ -360,7 +363,7 @@ describe("ui_update on a restored unknown surface type", () => {
 
 describe("ui_update normalizes modeled fields for known surface types", () => {
   test("a malformed dynamic_page html patch is stored as its schema-coerced string", async () => {
-    const sent: ServerMessage[] = [];
+    const sent: AssistantEvent[] = [];
     const ctx = makeContext({ sent });
     ctx.surfaceState.set("page-1", {
       surfaceType: "dynamic_page",

package/src/__tests__/conversation-surfaces-table-action.test.ts

@@ -1,11 +1,14 @@
 import { describe, expect, test } from "bun:test";
 
+import type { AssistantEvent } from "../api/index.js";
 import {
   createSurfaceMutex,
   handleSurfaceAction,
   type SurfaceConversationContext,
 } from "../daemon/conversation-surfaces.js";
-import type { ServerMessage, SurfaceType } from "../daemon/message-protocol.js";
+import type {
+  SurfaceType,
+} from "../daemon/message-protocol.js";
 
 /**
  * Build a minimal SurfaceConversationContext for testing table surface actions.
@@ -27,7 +30,7 @@ function makeContext(): SurfaceConversationContext & {
     surfaceId?: string;
     displayContent?: string;
   }>;
-  sentMessages: ServerMessage[];
+  sentMessages: AssistantEvent[];
 } {
   const enqueueCalls: Array<{
     content: string;
@@ -43,7 +46,7 @@ function makeContext(): SurfaceConversationContext & {
     surfaceId?: string;
     displayContent?: string;
   }> = [];
-  const sentMessages: ServerMessage[] = [];
+  const sentMessages: AssistantEvent[] = [];
 
   return {
     conversationId: "test-convo",