@vellumai/assistant 0.10.12-dev.202607250140.9979030 → 0.10.12-staging.2

package/README.md

@@ -145,7 +145,7 @@ All approval prompt delivery paths use a **fail-closed** policy -- if the prompt
 
 ### Plain-Text Fallback for Non-Rich Channels
 
-Channels that do not support rich inline approval UI (e.g., inline keyboards) receive plain-text instructions embedded in the message body. The `supportsInlineOptions` channel capability (`channelSupportsInlineOptions()`) determines whether to send the structured `promptText` (for channels whose adapter renders inline buttons like Telegram) or the `plainTextFallback` string (for all other channels). The fallback text includes instructions so the user can respond via text; the conversational approval engine then classifies the free-text response.
+Channels that do not support rich inline approval UI (e.g., inline keyboards) receive plain-text instructions embedded in the message body. The `channelSupportsRichApprovalUI()` check determines whether to send the structured `promptText` (for rich channels like Telegram) or the `plainTextFallback` string (for all other channels). The fallback text includes instructions so the user can respond via text; the conversational approval engine then classifies the free-text response.
 
 ### Key modules
 

package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/package.json

@@ -17,7 +17,6 @@
     "./rpc": "./src/rpc.ts",
     "./attachment-naming": "./src/attachment-naming.ts",
     "./redacted-credential": "./src/redacted-credential.ts",
-    "./secret-detection": "./src/secret-detection.ts",
     "./error": "./src/error.ts"
   },
   "scripts": {

package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/package.json

@@ -17,7 +17,6 @@
     "./rpc": "./src/rpc.ts",
     "./attachment-naming": "./src/attachment-naming.ts",
     "./redacted-credential": "./src/redacted-credential.ts",
-    "./secret-detection": "./src/secret-detection.ts",
     "./error": "./src/error.ts"
   },
   "scripts": {

package/node_modules/@vellumai/service-contracts/package.json

@@ -17,7 +17,6 @@
     "./rpc": "./src/rpc.ts",
     "./attachment-naming": "./src/attachment-naming.ts",
     "./redacted-credential": "./src/redacted-credential.ts",
-    "./secret-detection": "./src/secret-detection.ts",
     "./error": "./src/error.ts"
   },
   "scripts": {

package/openapi.yaml

@@ -19356,12 +19356,6 @@ paths:
                     - low
                     - medium
                     - high
-                bypassSecretCheck:
-                  description:
-                    When true, skip the secret-ingress scan for this message only. Set exclusively when the user explicitly
-                    confirms a client-side blocked send (the composer's "Send anyway" action); it is per-message and
-                    never persisted.
-                  type: boolean
                 hidden:
                   description:
                     "When true, persist the user message but suppress it from the UI transcript (it stays in LLM-side history
@@ -32459,10 +32453,8 @@ components:
               anyOf:
                 - type: object
                   properties:
-                    provider:
-                      type: string
-                    model:
-                      type: string
+                    mode:
+                      $ref: "#/components/schemas/ServiceMode"
                   additionalProperties: {}
                 - type: "null"
             inference:
@@ -33273,10 +33265,8 @@ components:
             image-generation:
               type: object
               properties:
-                provider:
-                  type: string
-                model:
-                  type: string
+                mode:
+                  $ref: "#/components/schemas/ServiceMode"
               additionalProperties: {}
             inference:
               type: object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/assistant",
-  "version": "0.10.12-dev.202607250140.9979030",
+  "version": "0.10.12-staging.2",
   "license": "MIT",
   "type": "module",
   "exports": {

package/src/__tests__/acp-session.test.ts

@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 import { VellumAcpClientHandler } from "../acp/client-handler.js";
 import { AcpSessionManager } from "../acp/session-manager.js";
-import type { AssistantEvent } from "../daemon/message-protocol.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
 
 // ---------------------------------------------------------------------------
@@ -10,8 +10,8 @@ import * as pendingInteractions from "../runtime/pending-interactions.js";
 // ---------------------------------------------------------------------------
 
 describe("VellumAcpClientHandler", () => {
-  let sent: AssistantEvent[];
-  let sendToVellum: (msg: AssistantEvent) => void;
+  let sent: ServerMessage[];
+  let sendToVellum: (msg: ServerMessage) => void;
   let handler: VellumAcpClientHandler;
 
   beforeEach(() => {

package/src/__tests__/approval-cascade.test.ts

@@ -11,7 +11,7 @@ import { Minimatch } from "minimatch";
 import { CompactionCircuit } from "../agent/compaction-circuit.js";
 import type { AgentEvent } from "../agent/loop.js";
 import type { ConfirmationStateChangedEvent } from "../api/events/confirmation-state-changed.js";
-import type { AssistantEvent } from "../daemon/message-protocol.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
 import type { Message, ProviderResponse } from "../providers/types.js";
 import type { ConfirmationDetails } from "../runtime/pending-interactions.js";
 
@@ -188,7 +188,7 @@ function makeProvider() {
 }
 
 function makeConversation(
-  sendToClient?: (msg: AssistantEvent) => void,
+  sendToClient?: (msg: ServerMessage) => void,
   conversationId = CONV_ID,
 ): Conversation {
   return new Conversation(
@@ -257,7 +257,7 @@ beforeEach(() => {
 
 describe("approval cascading", () => {
   test("allow (one-time) does NOT cascade", () => {
-    const emitted: AssistantEvent[] = [];
+    const emitted: ServerMessage[] = [];
     const conversationObj = makeConversation(
       (msg) => emitted.push(msg),
       CONV_ID,
@@ -291,7 +291,7 @@ describe("approval cascading", () => {
   });
 
   test("deny (one-time) does NOT cascade", () => {
-    const emitted: AssistantEvent[] = [];
+    const emitted: ServerMessage[] = [];
     const conversationObj = makeConversation(
       (msg) => emitted.push(msg),
       CONV_ID,
@@ -325,7 +325,7 @@ describe("approval cascading", () => {
   });
 
   test("already-resolved request handled gracefully", () => {
-    const emitted: AssistantEvent[] = [];
+    const emitted: ServerMessage[] = [];
     const conversationObj = makeConversation(
       (msg) => emitted.push(msg),
       CONV_ID,

package/src/__tests__/approval-routes-http.test.ts

@@ -7,7 +7,7 @@
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 import type { Conversation } from "../daemon/conversation.js";
-import type { AssistantEvent } from "../daemon/message-protocol.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
 import type { SecretPromptResult } from "../permissions/secret-prompt-types.js";
 
 mock.module("../config/env.js", () => ({
@@ -123,7 +123,7 @@ function makeIdleSession(opts?: {
     runAgentLoop: async (
       _content: string,
       _messageId: string,
-      options?: { onEvent?: (msg: AssistantEvent) => void },
+      options?: { onEvent?: (msg: ServerMessage) => void },
     ) => {
       const onEvent = options?.onEvent ?? (() => {});
       onEvent({ type: "assistant_text_delta", text: "Hello!" });
@@ -186,7 +186,7 @@ function makeConfirmationEmittingSession(opts?: {
     runAgentLoop: async (
       _content: string,
       _messageId: string,
-      options?: { onEvent?: (msg: AssistantEvent) => void },
+      options?: { onEvent?: (msg: ServerMessage) => void },
     ) => {
       const onEvent = options?.onEvent ?? (() => {});
       // Simulate PermissionPrompter.prompt(): self-register in pendingInteractions

package/src/__tests__/assistant-event-hub-self-exclusion.test.ts

@@ -14,14 +14,14 @@
  */
 import { describe, expect, test } from "bun:test";
 
-import type { AssistantEventEnvelope } from "../runtime/assistant-event.js";
+import type { AssistantEvent } from "../runtime/assistant-event.js";
 import {
   AssistantEventHub,
   assistantEventHub,
   broadcastMessage,
 } from "../runtime/assistant-event-hub.js";
 
-function makeSyncChangedEvent(originClientId?: string): AssistantEventEnvelope {
+function makeSyncChangedEvent(originClientId?: string): AssistantEvent {
   return {
     id: "evt_test_sync",
     conversationId: undefined,
@@ -37,9 +37,9 @@ function makeSyncChangedEvent(originClientId?: string): AssistantEventEnvelope {
 describe("AssistantEventHub — self-echo suppression (excludeClientId)", () => {
   test("skips the named client and delivers to every other client", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
-    const receivedC: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
+    const receivedC: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "client",
@@ -82,8 +82,8 @@ describe("AssistantEventHub — self-echo suppression (excludeClientId)", () =>
 
   test("delivers to every subscriber when excludeClientId is omitted", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "client",
@@ -112,7 +112,7 @@ describe("AssistantEventHub — self-echo suppression (excludeClientId)", () =>
 
   test("excludeClientId does not match process-type subscribers", async () => {
     const hub = new AssistantEventHub();
-    const receivedProcess: AssistantEventEnvelope[] = [];
+    const receivedProcess: AssistantEvent[] = [];
 
     // A process subscriber sits in the same hub as a client whose id
     // matches `excludeClientId`. It must never be suppressed because
@@ -134,8 +134,8 @@ describe("AssistantEventHub — self-echo suppression (excludeClientId)", () =>
 
   test("excludeClientId composes with conversation-scoped subscribers", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "client",
@@ -159,7 +159,7 @@ describe("AssistantEventHub — self-echo suppression (excludeClientId)", () =>
     });
 
     // Scoped event for sess_x; both clients filter to sess_x; exclude A.
-    const event: AssistantEventEnvelope = {
+    const event: AssistantEvent = {
       id: "evt_scoped",
       conversationId: "sess_x",
       emittedAt: "2026-05-03T00:00:00.000Z",
@@ -179,8 +179,8 @@ describe("AssistantEventHub — self-echo suppression (excludeClientId)", () =>
 
 describe("broadcastMessage — derives excludeClientId from sync_changed.originClientId", () => {
   test("skips the originating client when originClientId is present", async () => {
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     const subA = assistantEventHub.subscribe({
       type: "client",
@@ -221,8 +221,8 @@ describe("broadcastMessage — derives excludeClientId from sync_changed.originC
   });
 
   test("fans out to every client when originClientId is absent", async () => {
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     const subA = assistantEventHub.subscribe({
       type: "client",
@@ -260,7 +260,7 @@ describe("broadcastMessage — derives excludeClientId from sync_changed.originC
   });
 
   test("ignores an empty-string originClientId (treats as absent)", async () => {
-    const receivedA: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
 
     const subA = assistantEventHub.subscribe({
       type: "client",

package/src/__tests__/assistant-event-hub-targeted.test.ts

@@ -13,12 +13,10 @@
  */
 import { describe, expect, test } from "bun:test";
 
-import type { AssistantEventEnvelope } from "../runtime/assistant-event.js";
+import type { AssistantEvent } from "../runtime/assistant-event.js";
 import { AssistantEventHub } from "../runtime/assistant-event-hub.js";
 
-function makeEvent(
-  overrides: Partial<AssistantEventEnvelope> = {},
-): AssistantEventEnvelope {
+function makeEvent(overrides: Partial<AssistantEvent> = {}): AssistantEvent {
   return {
     id: "evt_test",
     conversationId: "sess_web",
@@ -37,8 +35,8 @@ function makeEvent(
 describe("AssistantEventHub — targeted delivery (targetClientId)", () => {
   test("delivers only to the named client, bypassing conversation filter", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     // client-a is subscribed to "sess_macos" — different from the event's "sess_web"
     hub.subscribe({
@@ -77,8 +75,8 @@ describe("AssistantEventHub — targeted delivery (targetClientId)", () => {
 
   test("does not deliver to a client with a different clientId", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "client",
@@ -108,7 +106,7 @@ describe("AssistantEventHub — targeted delivery (targetClientId)", () => {
 
   test("targeted delivery with wrong capability does not deliver", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
 
     // client-a only has host_file capability, NOT host_bash
     hub.subscribe({
@@ -132,7 +130,7 @@ describe("AssistantEventHub — targeted delivery (targetClientId)", () => {
 
   test("targeted delivery with matching capability delivers", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "client",
@@ -154,7 +152,7 @@ describe("AssistantEventHub — targeted delivery (targetClientId)", () => {
 
   test("process-type subscriber is never matched by targetClientId", async () => {
     const hub = new AssistantEventHub();
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "process",
@@ -175,8 +173,8 @@ describe("AssistantEventHub — targeted delivery (targetClientId)", () => {
 describe("AssistantEventHub — untargeted capability targeting is unchanged", () => {
   test("targetCapability without targetClientId still applies conversation scoping", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "client",

package/src/__tests__/assistant-event-hub.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import type { AssistantEventEnvelope } from "../runtime/assistant-event.js";
+import type { AssistantEvent } from "../runtime/assistant-event.js";
 import {
   AssistantEventHub,
   broadcastMessage,
@@ -12,9 +12,7 @@ import {
 } from "../runtime/assistant-stream-state.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
 
-function makeEvent(
-  overrides: Partial<AssistantEventEnvelope> = {},
-): AssistantEventEnvelope {
+function makeEvent(overrides: Partial<AssistantEvent> = {}): AssistantEvent {
   return {
     id: "evt_test",
     conversationId: "sess_1",
@@ -33,7 +31,7 @@ function makeEvent(
 describe("AssistantEventHub — fanout", () => {
   test("delivers event to a single matching subscriber", async () => {
     const hub = new AssistantEventHub();
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "process",
@@ -77,8 +75,8 @@ describe("AssistantEventHub — fanout", () => {
 
   test("conversationId filter further restricts delivery", async () => {
     const hub = new AssistantEventHub();
-    const receivedA: AssistantEventEnvelope[] = [];
-    const receivedB: AssistantEventEnvelope[] = [];
+    const receivedA: AssistantEvent[] = [];
+    const receivedB: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "process",
@@ -103,7 +101,7 @@ describe("AssistantEventHub — fanout", () => {
 
   test("subscriber without conversationId filter receives all conversations", async () => {
     const hub = new AssistantEventHub();
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "process",
@@ -161,7 +159,7 @@ describe("AssistantEventHub — fanout", () => {
 describe("AssistantEventHub — unsubscribe cleanup", () => {
   test("dispose stops event delivery", async () => {
     const hub = new AssistantEventHub();
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
 
     const s = hub.subscribe({
       type: "process",
@@ -236,8 +234,8 @@ describe("AssistantEventHub — unsubscribe cleanup", () => {
 
   test("disposing one subscription does not affect others", async () => {
     const hub = new AssistantEventHub();
-    const received1: AssistantEventEnvelope[] = [];
-    const received2: AssistantEventEnvelope[] = [];
+    const received1: AssistantEvent[] = [];
+    const received2: AssistantEvent[] = [];
 
     const s1 = hub.subscribe({
       type: "process",
@@ -343,7 +341,7 @@ describe("AssistantEventHub — exception isolation", () => {
 describe("AssistantEventHub — re-entrancy / snapshot isolation", () => {
   test("subscriber added during publish does not receive the in-flight event", async () => {
     const hub = new AssistantEventHub();
-    const lateReceived: AssistantEventEnvelope[] = [];
+    const lateReceived: AssistantEvent[] = [];
 
     hub.subscribe({
       type: "process",
@@ -365,7 +363,7 @@ describe("AssistantEventHub — re-entrancy / snapshot isolation", () => {
 
   test("subscriber that disposes itself mid-publish does not affect remaining subscribers", async () => {
     const hub = new AssistantEventHub();
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
     let s: ReturnType<typeof hub.subscribe>;
 
     // eslint-disable-next-line prefer-const

package/src/__tests__/assistant-event.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import type { AssistantEventEnvelope } from "../runtime/assistant-event.js";
+import type { AssistantEvent } from "../runtime/assistant-event.js";
 import {
   formatSseFrame,
   formatSseHeartbeat,
@@ -8,9 +8,9 @@ import {
 
 // ── Type / shape tests ────────────────────────────────────────────────────────
 
-describe("AssistantEventEnvelope shape", () => {
+describe("AssistantEvent shape", () => {
   test("accepts a minimal valid event", () => {
-    const event: AssistantEventEnvelope = {
+    const event: AssistantEvent = {
       id: "evt_001",
       emittedAt: "2026-02-18T21:20:00.000Z",
       message: {
@@ -27,7 +27,7 @@ describe("AssistantEventEnvelope shape", () => {
   });
 
   test("accepts a full event with conversationId", () => {
-    const event: AssistantEventEnvelope = {
+    const event: AssistantEvent = {
       id: "evt_002",
       conversationId: "conv_456",
       emittedAt: "2026-02-18T21:20:00.000Z",
@@ -45,7 +45,7 @@ describe("AssistantEventEnvelope shape", () => {
 // ── SSE framing tests ─────────────────────────────────────────────────────────
 
 describe("formatSseFrame", () => {
-  const baseEvent: AssistantEventEnvelope = {
+  const baseEvent: AssistantEvent = {
     id: "evt_003",
     conversationId: "sess_xyz",
     emittedAt: "2026-02-18T00:00:00.000Z",
@@ -73,7 +73,7 @@ describe("formatSseFrame", () => {
     const dataLine = frame.split("\n").find((l) => l.startsWith("data: "))!;
     const parsed = JSON.parse(
       dataLine.slice("data: ".length),
-    ) as AssistantEventEnvelope;
+    ) as AssistantEvent;
 
     expect(parsed.id).toBe(baseEvent.id);
     expect(parsed.conversationId).toBe(baseEvent.conversationId);
@@ -82,16 +82,13 @@ describe("formatSseFrame", () => {
   });
 
   test("id line uses the event id verbatim", () => {
-    const event: AssistantEventEnvelope = {
-      ...baseEvent,
-      id: "unique-evt-id-xyz",
-    };
+    const event: AssistantEvent = { ...baseEvent, id: "unique-evt-id-xyz" };
     const frame = formatSseFrame(event);
     expect(frame).toContain("id: unique-evt-id-xyz\n");
   });
 
   test("strips newline characters from event.id to prevent SSE frame injection", () => {
-    const event: AssistantEventEnvelope = {
+    const event: AssistantEvent = {
       ...baseEvent,
       id: 'foo\ndata: {"injected":true}',
     };
@@ -116,7 +113,7 @@ describe("formatSseFrame", () => {
   });
 
   test("seq lands in the JSON payload (envelope) when set, never in SSE id", () => {
-    const event: AssistantEventEnvelope = {
+    const event: AssistantEvent = {
       ...baseEvent,
       id: "uuid-event-id",
       seq: 42,

package/src/__tests__/assistant-id-boundary-guard.test.ts

@@ -312,6 +312,64 @@ describe("assistant ID boundary", () => {
   // surfaces invites callers to pass external IDs into daemon scoping.
   // -------------------------------------------------------------------------
 
+  test("message contract types do not contain assistantId for guardian requests", () => {
+    const contractPath = join(
+      import.meta.dir,
+      "..",
+      "daemon",
+      "message-types",
+      "integrations.ts",
+    );
+    const content = readFileSync(contractPath, "utf-8");
+
+    // Extract the interface blocks for the request types and verify
+    // none of them declare an assistantId property.
+    const requestTypeNames = ["ChannelVerificationSessionRequest"];
+
+    for (const typeName of requestTypeNames) {
+      // Find the interface/type block — match from the type name to the next
+      // closing brace at the same indentation level. We use a simple heuristic:
+      // find the line declaring the type, then scan forward to the closing '}'.
+      const typeIndex = content.indexOf(typeName);
+      expect(
+        typeIndex,
+        `Expected to find ${typeName} in message contract`,
+      ).toBeGreaterThan(-1);
+
+      // Extract from the type declaration to the next '}' line
+      const blockStart = content.indexOf("{", typeIndex);
+      if (blockStart === -1) continue;
+      let braceDepth = 0;
+      let blockEnd = blockStart;
+      for (let i = blockStart; i < content.length; i++) {
+        if (content[i] === "{") braceDepth++;
+        if (content[i] === "}") braceDepth--;
+        if (braceDepth === 0) {
+          blockEnd = i + 1;
+          break;
+        }
+      }
+      const block = content.slice(blockStart, blockEnd);
+
+      // The block should not contain an assistantId property declaration
+      // (matches "assistantId?" or "assistantId:" on a non-comment line)
+      const lines = block.split("\n");
+      for (const line of lines) {
+        const trimmed = line.trim();
+        if (
+          trimmed.startsWith("//") ||
+          trimmed.startsWith("*") ||
+          trimmed.startsWith("/*")
+        )
+          continue;
+        expect(
+          /\bassistantId\s*[?:]/.test(trimmed),
+          `${typeName} must not declare an assistantId property. Found: "${trimmed}"`,
+        ).toBe(false);
+      }
+    }
+  });
+
   test("guardian outbound param interfaces do not contain assistantId", () => {
     const actionsPath = join(
       import.meta.dir,

package/src/__tests__/assistant-stream-state.test.ts

@@ -8,7 +8,7 @@ import {
 import { dirname, join } from "node:path";
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import type { AssistantEventEnvelope } from "../runtime/assistant-event.js";
+import type { AssistantEvent } from "../runtime/assistant-event.js";
 import type {
   EventTargeting,
   ReplaySubscriber,
@@ -26,9 +26,7 @@ import {
 
 const CONV = "conv_test";
 
-function mkEvent(
-  overrides: Partial<AssistantEventEnvelope> = {},
-): AssistantEventEnvelope {
+function mkEvent(overrides: Partial<AssistantEvent> = {}): AssistantEvent {
   const conversationId =
     "conversationId" in overrides ? overrides.conversationId : CONV;
   return {
@@ -41,7 +39,7 @@ function mkEvent(
       text: "x",
     },
     ...overrides,
-  } as AssistantEventEnvelope;
+  } as AssistantEvent;
 }
 
 describe("assistant-stream-state", () => {

package/src/__tests__/avatar-identity-sync.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 
 import { SYNC_TAGS } from "../daemon/message-types/sync.js";
-import type { AssistantEventEnvelope } from "../runtime/assistant-event.js";
+import type { AssistantEvent } from "../runtime/assistant-event.js";
 import { assistantEventHub } from "../runtime/assistant-event-hub.js";
 import { ROUTES as AVATAR_ROUTES } from "../runtime/routes/avatar-routes.js";
 import { publishIdentityChanged } from "../runtime/sync/resource-sync-events.js";
@@ -19,7 +19,7 @@ async function waitFor(predicate: () => boolean): Promise<void> {
 
 describe("avatar and identity sync events", () => {
   test("notify_avatar_updated emits legacy avatar event and sync tag", async () => {
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
     const subscription = assistantEventHub.subscribe({
       type: "process",
       callback: (event) => {
@@ -50,7 +50,7 @@ describe("avatar and identity sync events", () => {
   });
 
   test("identity changes emit legacy identity event and identity sync tags", async () => {
-    const received: AssistantEventEnvelope[] = [];
+    const received: AssistantEvent[] = [];
     const subscription = assistantEventHub.subscribe({
       type: "process",
       callback: (event) => {