@vellumai/assistant 0.8.9-staging.1 → 0.8.9-staging.3

package/src/__tests__/conversation-runtime-assembly.test.ts

@@ -86,12 +86,14 @@ import {
   loadSlackChronologicalContext,
   loadSlackChronologicalMessages,
   resolveChannelCapabilities,
+  resolveTurnInboundActorContext,
   stripChannelCapabilityContext,
   stripInjectionsForCompaction,
   stripNowScratchpad,
 } from "../daemon/conversation-runtime-assembly.js";
 import type { SurfaceData, SurfaceType } from "../daemon/message-protocol.js";
 import { buildPkbReminder } from "../daemon/pkb-reminder-builder.js";
+import type { TrustContext } from "../daemon/trust-context.js";
 import type { MessageRow } from "../memory/conversation-crud.js";
 import { getDb } from "../memory/db-connection.js";
 import { initializeDb } from "../memory/db-init.js";
@@ -1438,6 +1440,75 @@ describe("applyRuntimeInjections with nowScratchpad", () => {
   });
 });
 
+// ---------------------------------------------------------------------------
+// resolveTurnInboundActorContext
+// ---------------------------------------------------------------------------
+
+describe("resolveTurnInboundActorContext", () => {
+  /**
+   * No trust context means there is no inbound actor to ground the turn on, so
+   * the actor section is suppressed.
+   */
+  test("returns null when there is no trust context", () => {
+    // GIVEN a turn with no trust context
+    // WHEN the inbound actor context is resolved
+    const actorContext = resolveTurnInboundActorContext(undefined, "asst-1");
+
+    // THEN there is no actor context to inject
+    expect(actorContext).toBeNull();
+  });
+
+  /**
+   * Guardian (owner) turns suppress the actor section — the unified turn context
+   * only renders actor fields for non-guardian actors.
+   */
+  test("returns null on guardian turns", () => {
+    // GIVEN a guardian trust context (no requester chat id, so the direct
+    // projection branch is taken)
+    const trustContext: TrustContext = {
+      sourceChannel: "vellum",
+      trustClass: "guardian",
+      requesterDisplayName: "Alice",
+    };
+
+    // WHEN the inbound actor context is resolved
+    const actorContext = resolveTurnInboundActorContext(trustContext, "asst-1");
+
+    // THEN the actor section is suppressed for the owner
+    expect(actorContext).toBeNull();
+  });
+
+  /**
+   * A non-guardian trust context without the identity fields needed for the
+   * unified actor-trust lookup is projected directly into the actor context.
+   */
+  test("projects a non-guardian trust context directly", () => {
+    // GIVEN a trusted-contact trust context lacking requester chat/user ids
+    const trustContext: TrustContext = {
+      sourceChannel: "telegram",
+      trustClass: "trusted_contact",
+      requesterIdentifier: "@bob_handle",
+      requesterDisplayName: "Bob",
+      requesterSenderDisplayName: "Bobby",
+    };
+
+    // WHEN the inbound actor context is resolved
+    const actorContext = resolveTurnInboundActorContext(trustContext, "asst-1");
+
+    // THEN the trust context is projected into the model-facing actor context
+    expect(actorContext).toEqual({
+      sourceChannel: "telegram",
+      canonicalActorIdentity: null,
+      actorIdentifier: "@bob_handle",
+      actorDisplayName: "Bob",
+      actorSenderDisplayName: "Bobby",
+      actorMemberDisplayName: undefined,
+      trustClass: "trusted_contact",
+      guardianIdentity: undefined,
+    });
+  });
+});
+
 // ---------------------------------------------------------------------------
 // buildUnifiedTurnContextBlock
 // ---------------------------------------------------------------------------

package/src/__tests__/conversation-slash-queue.test.ts

@@ -153,7 +153,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/conversation-slash-unknown.test.ts

@@ -154,7 +154,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/conversation-speed-override.test.ts

@@ -170,7 +170,7 @@ mock.module("../memory/retriever.js", () => ({
   injectMemoryRecallAsUserBlock: (msgs: Message[]) => msgs,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

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

@@ -0,0 +1,395 @@
+import { beforeEach, describe, expect, mock, test } from "bun:test";
+
+import type { ServerMessage } from "../daemon/message-protocol.js";
+
+// Silence the logger.
+mock.module("../util/logger.js", () => ({
+  getLogger: () =>
+    new Proxy({} as Record<string, unknown>, {
+      get: () => () => {},
+    }),
+}));
+
+// Usage-data collection is enabled so recordActivationEvent writes rows.
+mock.module("../config/loader.js", () => ({
+  getConfig: () => ({ collectUsageData: true }),
+}));
+
+let broadcastedMessages: ServerMessage[] = [];
+const realEventHub = await import("../runtime/assistant-event-hub.js");
+mock.module("../runtime/assistant-event-hub.js", () => ({
+  ...realEventHub,
+  broadcastMessage: (msg: ServerMessage) => broadcastedMessages.push(msg),
+}));
+
+// Stub the child-conversation launcher so the launch_conversation commit path
+// runs without spinning up a real conversation.
+mock.module("../daemon/conversation-launch.js", () => ({
+  launchConversation: async () => ({ conversationId: "spawned-conv" }),
+}));
+
+const { createSurfaceMutex, handleSurfaceAction, surfaceProxyResolver } =
+  await import("../daemon/conversation-surfaces.js");
+
+import type { SurfaceConversationContext } from "../daemon/conversation-surfaces.js";
+import type { SurfaceType, UiSurfaceShow } from "../daemon/message-protocol.js";
+import {
+  isActivationSession,
+  markActivationSession,
+} from "../memory/activation-session-store.js";
+import { getDb } from "../memory/db-connection.js";
+import { initializeDb } from "../memory/db-init.js";
+import { queryUnreportedOnboardingEvents } from "../memory/onboarding-events-store.js";
+import { activationSessions, onboardingEvents } from "../memory/schema.js";
+
+initializeDb();
+
+interface ProcessMessageCall {
+  content: string;
+  activeSurfaceId?: string;
+}
+
+function makeContext(
+  conversationId: string,
+  sent: ServerMessage[] = [],
+): SurfaceConversationContext & {
+  processMessageCalls: ProcessMessageCall[];
+} {
+  const processMessageCalls: ProcessMessageCall[] = [];
+  return {
+    conversationId,
+    traceEmitter: { emit: () => {} },
+    sendToClient: (msg: ServerMessage) => sent.push(msg),
+    pendingSurfaceActions: new Map<string, { surfaceType: SurfaceType }>(),
+    lastSurfaceAction: new Map<
+      string,
+      { actionId: string; data?: Record<string, unknown> }
+    >(),
+    surfaceState: new Map(),
+    surfaceUndoStacks: new Map<string, string[]>(),
+    accumulatedSurfaceState: new Map<string, Record<string, unknown>>(),
+    surfaceActionRequestIds: new Set<string>(),
+    currentTurnSurfaces: [],
+    isProcessing: () => false,
+    enqueueMessage: () => ({ queued: false, requestId: "req-1" }),
+    getQueueDepth: () => 0,
+    processMessage: async (options) => {
+      processMessageCalls.push({
+        content: options.content,
+        activeSurfaceId: options.activeSurfaceId,
+      });
+      return "msg-1";
+    },
+    withSurface: createSurfaceMutex(),
+    processMessageCalls,
+  } as SurfaceConversationContext & {
+    processMessageCalls: ProcessMessageCall[];
+  };
+}
+
+function resetTables(): void {
+  getDb().delete(onboardingEvents).run();
+  getDb().delete(activationSessions).run();
+}
+
+/** Render a choice surface tagged (or not) with an activation_moment. */
+async function showTaggedChoice(
+  ctx: SurfaceConversationContext,
+  sent: ServerMessage[],
+  activationMoment?: string,
+): Promise<string> {
+  await surfaceProxyResolver(ctx, "ui_show", {
+    surface_type: "choice",
+    title: "Pick an outcome",
+    data: {
+      options: [
+        { id: "inbox", title: "Clean up my inbox" },
+        { id: "calendar", title: "Plan my week" },
+      ],
+    },
+    ...(activationMoment ? { activation_moment: activationMoment } : {}),
+  });
+  const showMessage = sent.find(
+    (msg): msg is UiSurfaceShow => msg.type === "ui_surface_show",
+  ) as UiSurfaceShow;
+  return showMessage.surfaceId;
+}
+
+describe("activation moment emission from ui_show surface commits", () => {
+  beforeEach(() => {
+    broadcastedMessages = [];
+    resetTables();
+  });
+
+  test("committed tagged surface in a marked session writes exactly one row", async () => {
+    markActivationSession("conv-marked");
+    expect(isActivationSession("conv-marked")).toBe(true);
+
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-marked", sent);
+    const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
+
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+
+    const rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.stepName).toBe("activation_moment_2_complete");
+    expect(rows[0]!.stepIndex).toBe(2);
+    expect(rows[0]!.sessionId).toBe("conv-marked");
+  });
+
+  test("a queue-rejected commit does NOT emit; the tag survives for the retry", async () => {
+    markActivationSession("conv-rejected");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-rejected", sent);
+    const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
+
+    // First click while the queue is full: enqueue rejects, action not
+    // accepted. Must NOT record a milestone, and must leave the one-shot tag
+    // intact so the user's retry still emits.
+    ctx.enqueueMessage = () => ({
+      queued: false,
+      requestId: "req-rejected",
+      rejected: true,
+    });
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+    expect(queryUnreportedOnboardingEvents(0, undefined, 10)).toHaveLength(0);
+
+    // Retry is accepted → records exactly one row.
+    ctx.enqueueMessage = () => ({ queued: false, requestId: "req-ok" });
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+    const rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.stepName).toBe("activation_moment_2_complete");
+  });
+
+  test("first_wow_executed records at SHOW time (no commit) and never double-emits", async () => {
+    markActivationSession("conv-wow");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-wow", sent);
+
+    // A display-only result surface tagged with the execution moment.
+    await surfaceProxyResolver(ctx, "ui_show", {
+      surface_type: "card",
+      title: "Inbox cleaned",
+      data: { text: "Archived 1,240 emails" },
+      activation_moment: "first_wow_executed",
+    });
+
+    // Recorded immediately on render — no handleSurfaceAction commit needed.
+    let rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.stepName).toBe("activation_first_wow_executed");
+    expect(rows[0]!.stepIndex).toBe(4);
+
+    // If the card later receives a commit (e.g. it carried an action), it must
+    // NOT double-emit — a show-timing tag is never stored for the commit path.
+    const showMessage = sent.find(
+      (msg): msg is UiSurfaceShow => msg.type === "ui_surface_show",
+    ) as UiSurfaceShow;
+    await handleSurfaceAction(ctx, showMessage.surfaceId, "expand", {});
+    rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+  });
+
+  test("first_wow_executed in an UNMARKED session writes no row at show time", async () => {
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-wow-unmarked", sent);
+    await surfaceProxyResolver(ctx, "ui_show", {
+      surface_type: "card",
+      title: "Result",
+      data: { text: "x" },
+      activation_moment: "first_wow_executed",
+    });
+    expect(queryUnreportedOnboardingEvents(0, undefined, 10)).toHaveLength(0);
+  });
+
+  test("does not forward the daemon-only tag to the client", async () => {
+    markActivationSession("conv-marked-2");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-marked-2", sent);
+    await showTaggedChoice(ctx, sent, "moment_2");
+
+    const showMessage = sent.find(
+      (msg): msg is UiSurfaceShow => msg.type === "ui_surface_show",
+    ) as UiSurfaceShow;
+    expect(
+      (showMessage as unknown as Record<string, unknown>).activation_moment,
+    ).toBeUndefined();
+    expect(JSON.stringify(showMessage)).not.toContain("moment_2");
+  });
+
+  test("untagged surface writes no row", async () => {
+    markActivationSession("conv-untagged");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-untagged", sent);
+    const surfaceId = await showTaggedChoice(ctx, sent, undefined);
+
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+
+    expect(queryUnreportedOnboardingEvents(0, undefined, 10)).toHaveLength(0);
+  });
+
+  test("tagged surface in an UNMARKED session writes no row", async () => {
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-not-rail", sent);
+    const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
+
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+
+    expect(queryUnreportedOnboardingEvents(0, undefined, 10)).toHaveLength(0);
+  });
+
+  test("an invalid activation_moment token is ignored (no row)", async () => {
+    markActivationSession("conv-bad-tag");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-bad-tag", sent);
+    const surfaceId = await showTaggedChoice(ctx, sent, "bogus_moment");
+
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+
+    expect(queryUnreportedOnboardingEvents(0, undefined, 10)).toHaveLength(0);
+  });
+
+  test("FIX 1: launch_conversation commit on a tagged surface records exactly one row", async () => {
+    markActivationSession("conv-launch");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-launch", sent);
+
+    // A launcher card tagged with a commit-timing moment. The committed action
+    // carries `_action: launch_conversation`, so handleSurfaceAction takes the
+    // inline-launch branch (which previously returned before the emit).
+    await surfaceProxyResolver(ctx, "ui_show", {
+      surface_type: "card",
+      title: "Start something",
+      data: { text: "Kick off a draft" },
+      actions: [{ id: "go", label: "Go", style: "primary" }],
+      activation_moment: "moment_1",
+    });
+    const showMessage = sent.find(
+      (msg): msg is UiSurfaceShow => msg.type === "ui_surface_show",
+    ) as UiSurfaceShow;
+    const surfaceId = showMessage.surfaceId;
+
+    await handleSurfaceAction(ctx, surfaceId, "go", {
+      _action: "launch_conversation",
+      title: "Draft",
+      seedPrompt: "Write a draft",
+    });
+
+    const rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.stepName).toBe("activation_moment_1_complete");
+    expect(rows[0]!.sessionId).toBe("conv-launch");
+  });
+
+  test("FIX 2: commit-timing tag survives a surfaceState restore from history", async () => {
+    markActivationSession("conv-restore");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-restore", sent);
+    const surfaceId = await showTaggedChoice(ctx, sent, "moment_2");
+
+    // The daemon-only tag must NOT leak to the client.
+    const showMessage = sent.find(
+      (msg): msg is UiSurfaceShow => msg.type === "ui_surface_show",
+    ) as UiSurfaceShow;
+    expect(
+      (showMessage as unknown as Record<string, unknown>).activation_moment,
+    ).toBeUndefined();
+    expect(JSON.stringify(showMessage)).not.toContain("moment_2");
+
+    // Persist the surface into a history block exactly as the agent loop does
+    // (conversation-agent-loop-handlers): copy the activationMoment through.
+    const persisted = ctx.currentTurnSurfaces.map((s) => ({
+      type: "ui_surface" as const,
+      surfaceId: s.surfaceId,
+      surfaceType: s.surfaceType,
+      title: s.title,
+      data: s.data,
+      actions: s.actions,
+      ...(s.activationMoment ? { activationMoment: s.activationMoment } : {}),
+    }));
+    expect(persisted[0]!.activationMoment).toBe("moment_2");
+
+    // Simulate a reload: drop the in-memory surfaceState, then rebuild it from
+    // the persisted history block the same way restoreSurfaceStateFromHistory
+    // does (including rehydrating the daemon-only tag).
+    ctx.surfaceState.clear();
+    for (const b of persisted) {
+      ctx.surfaceState.set(b.surfaceId, {
+        surfaceType: b.surfaceType,
+        data: b.data,
+        title: b.title,
+        actions: b.actions,
+        ...(b.activationMoment ? { activationMoment: b.activationMoment } : {}),
+      });
+    }
+
+    // A commit after restore still records exactly one row.
+    await handleSurfaceAction(ctx, surfaceId, "inbox", {
+      choiceId: "inbox",
+      selectedIds: ["inbox"],
+    });
+
+    const rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.stepName).toBe("activation_moment_2_complete");
+    expect(rows[0]!.sessionId).toBe("conv-restore");
+  });
+
+  test("intermediate selection_changed does NOT emit; the terminal commit does", async () => {
+    markActivationSession("conv-table");
+    const sent: ServerMessage[] = [];
+    const ctx = makeContext("conv-table", sent);
+
+    // A table surface stays pending across selection_changed (non-terminal).
+    await surfaceProxyResolver(ctx, "ui_show", {
+      surface_type: "table",
+      title: "Tasks",
+      data: {
+        columns: [{ id: "name", label: "Name" }],
+        rows: [
+          { id: "r1", cells: { name: "Task 1" } },
+          { id: "r2", cells: { name: "Task 2" } },
+        ],
+        selectionMode: "multiple",
+      },
+      actions: [{ id: "run", label: "Run", style: "primary" }],
+      activation_moment: "moment_3",
+    });
+    const showMessage = sent.find(
+      (msg): msg is UiSurfaceShow => msg.type === "ui_surface_show",
+    ) as UiSurfaceShow;
+    const surfaceId = showMessage.surfaceId;
+
+    // Intermediate, non-terminal — must NOT emit.
+    await handleSurfaceAction(ctx, surfaceId, "selection_changed", {
+      selectedIds: ["r1"],
+    });
+    expect(queryUnreportedOnboardingEvents(0, undefined, 10)).toHaveLength(0);
+
+    // Terminal commit — emits exactly once.
+    await handleSurfaceAction(ctx, surfaceId, "run", { selectedIds: ["r1"] });
+    const rows = queryUnreportedOnboardingEvents(0, undefined, 10);
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.stepName).toBe("activation_moment_3_complete");
+  });
+});

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

@@ -73,6 +73,7 @@ function buildMockContext(
     proxy: InstanceType<typeof HostAppControlProxy> | undefined,
   ) => void,
   trustGuardianPrincipalId: string | null = DEFAULT_PRINCIPAL,
+  actorPrincipalId: string | null = trustGuardianPrincipalId,
 ): SurfaceConversationContext {
   return {
     conversationId,
@@ -84,6 +85,16 @@ function buildMockContext(
             guardianPrincipalId: trustGuardianPrincipalId,
           }
         : undefined,
+    authContext:
+      actorPrincipalId != null
+        ? ({ actorPrincipalId } as SurfaceConversationContext["authContext"])
+        : undefined,
+    currentTurnAuthContext:
+      actorPrincipalId != null
+        ? ({
+            actorPrincipalId,
+          } as SurfaceConversationContext["currentTurnAuthContext"])
+        : undefined,
     traceEmitter: { emit: () => {} },
     sendToClient: () => {},
     pendingSurfaceActions: new Map(),
@@ -217,6 +228,39 @@ describe("surfaceProxyResolver — app-control tool routing", () => {
       proxy.dispose();
     });
 
+    test("app_control_observe rejects owner client when current requester is a trusted contact", async () => {
+      mockHubClients = [
+        {
+          clientId: "owner-client",
+          capabilities: ["host_app_control"],
+          actorPrincipalId: "owner-user",
+        },
+      ];
+      const proxy = new HostAppControlProxy("conv-1");
+      const ctx = buildMockContext(
+        proxy,
+        "conv-1",
+        undefined,
+        "owner-user",
+        "trusted-contact-user",
+      );
+      _setActiveAppControlSession({
+        conversationId: "conv-1",
+        app: "com.example.editor",
+      });
+
+      const result = await surfaceProxyResolver(ctx, "app_control_observe", {
+        tool: "observe",
+        app: "com.example.editor",
+      });
+
+      expect(result.isError).toBe(true);
+      expect(result.content).toContain("current actor");
+      expect(sentMessages).toHaveLength(0);
+
+      proxy.dispose();
+    });
+
     test("app_control_observe rejects when only another actor has a capable client", async () => {
       mockHubClients = [
         {

package/src/__tests__/conversation-undo.test.ts

@@ -1,10 +1,10 @@
 import { describe, expect, test } from "bun:test";
 
+import { findLastUndoableUserMessageIndex } from "../daemon/conversation.js";
 import {
   CONTEXT_SUMMARY_MARKER,
   createContextSummaryMessage,
-} from "../context/window-manager.js";
-import { findLastUndoableUserMessageIndex } from "../daemon/conversation.js";
+} from "../plugins/defaults/compaction/window-manager.js";
 import type { Message } from "../providers/types.js";
 
 function textMessage(role: "user" | "assistant", text: string): Message {

package/src/__tests__/conversation-workspace-cache-state.test.ts

@@ -137,7 +137,7 @@ mock.module("../memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
 
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     constructor() {}
     updateConfig() {}

package/src/__tests__/conversation-workspace-injection.test.ts

@@ -181,7 +181,7 @@ mock.module("../memory/query-builder.js", () => ({
 mock.module("../memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     updateConfig() {}
     shouldCompact() {

package/src/__tests__/conversation-workspace-tool-tracking.test.ts

@@ -178,7 +178,7 @@ mock.module("../memory/query-builder.js", () => ({
 mock.module("../memory/retrieval-budget.js", () => ({
   computeRecallBudget: () => 0,
 }));
-mock.module("../context/window-manager.js", () => ({
+mock.module("../plugins/defaults/compaction/window-manager.js", () => ({
   ContextWindowManager: class {
     updateConfig() {}
     shouldCompact() {

package/src/__tests__/cu-unified-flow.test.ts

@@ -69,6 +69,7 @@ type SurfaceConversationContext =
 function buildMockContext(
   hostCuProxy?: InstanceType<typeof HostCuProxy>,
   trustGuardianPrincipalId: string | null = DEFAULT_PRINCIPAL,
+  actorPrincipalId: string | null = trustGuardianPrincipalId,
 ): SurfaceConversationContext {
   return {
     conversationId: "test-session",
@@ -80,6 +81,16 @@ function buildMockContext(
             guardianPrincipalId: trustGuardianPrincipalId,
           }
         : undefined,
+    authContext:
+      actorPrincipalId != null
+        ? ({ actorPrincipalId } as SurfaceConversationContext["authContext"])
+        : undefined,
+    currentTurnAuthContext:
+      actorPrincipalId != null
+        ? ({
+            actorPrincipalId,
+          } as SurfaceConversationContext["currentTurnAuthContext"])
+        : undefined,
     traceEmitter: { emit: () => {} },
     sendToClient: () => {},
     pendingSurfaceActions: new Map(),
@@ -665,6 +676,31 @@ describe("surfaceProxyResolver — CU tool routing", () => {
       expect(sentMessages).toHaveLength(0);
     });
 
+    test("rejects untargeted CU dispatch to owner client when current requester is a trusted contact", async () => {
+      sentMessages.length = 0;
+      mockHasClient = true;
+      mockCuClients = [
+        {
+          clientId: "owner-cu-client",
+          capabilities: ["host_cu"],
+          actorPrincipalId: "owner-user",
+        },
+      ];
+      proxy = new HostCuProxy();
+      const ctx = buildMockContext(proxy, "owner-user", "trusted-contact-user");
+
+      const result = await surfaceProxyResolver(ctx, "computer_use_click", {
+        element_id: 1,
+        reasoning: "click",
+      });
+
+      expect(result.isError).toBe(true);
+      expect(result.content).toContain("current actor");
+      expect(proxy.stepCount).toBe(0);
+      expect(proxy.actionHistory).toHaveLength(0);
+      expect(sentMessages).toHaveLength(0);
+    });
+
     test("auto-resolves to the unique same-user CU client when cross-user clients are present", async () => {
       // Regression: previously the dispatch counted only same-user clients
       // for the multi-client guard, so 1 same-user + 1 cross-user passed the