@vellumai/assistant 0.4.26 → 0.4.29

package/src/__tests__/guardian-control-plane-policy.test.ts

@@ -118,7 +118,7 @@ function makeContext(overrides?: Partial<ToolContext>): ToolContext {
     workingDir: "/tmp/project",
     sessionId: "session-1",
     conversationId: "conversation-1",
-    guardianTrustClass: "guardian",
+    trustClass: "guardian",
     ...overrides,
   };
 }
@@ -607,7 +607,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
         command:
           "curl -X POST http://localhost:3000/v1/integrations/guardian/outbound/start",
       },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("restricted to guardian users");
@@ -618,7 +618,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "network_request",
       { url: "https://api.example.com/v1/integrations/guardian/challenge" },
-      makeContext({ guardianTrustClass: "unknown" }),
+      makeContext({ trustClass: "unknown" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("restricted to guardian users");
@@ -632,7 +632,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
         command:
           "curl -X POST http://localhost:3000/v1/integrations/guardian/outbound/start",
       },
-      makeContext({ guardianTrustClass: "guardian" }),
+      makeContext({ trustClass: "guardian" }),
     );
     expect(result.isError).toBe(false);
     expect(result.content).toBe("ok");
@@ -643,7 +643,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "bash",
       { command: "curl http://localhost:3000/v1/integrations/guardian/status" },
-      makeContext(), // defaults to guardianTrustClass: 'guardian'
+      makeContext(), // defaults to trustClass: 'guardian'
     );
     expect(result.isError).toBe(false);
     expect(result.content).toBe("ok");
@@ -654,7 +654,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "bash",
       { command: "curl http://localhost:3000/v1/messages" },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("requires guardian approval");
@@ -665,7 +665,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "file_read",
       { path: "README.md" },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(false);
     expect(result.content).toBe("ok");
@@ -681,7 +681,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
           "curl http://localhost:3000/v1/integrations/guardian/outbound/cancel",
       },
       makeContext({
-        guardianTrustClass: "trusted_contact",
+        trustClass: "trusted_contact",
         onToolLifecycleEvent: (event: ToolLifecycleEvent) => {
           if (event.type === "permission_denied") {
             capturedEvent = event as ToolPermissionDeniedEvent;
@@ -699,7 +699,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "web_fetch",
       { url: "http://localhost:3000/v1/integrations/guardian/outbound/resend" },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("restricted to guardian users");
@@ -710,7 +710,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "browser_navigate",
       { url: "http://localhost:3000/v1/integrations/guardian/status" },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("restricted to guardian users");
@@ -724,7 +724,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
         command:
           "curl -X POST https://internal:8080/v1/integrations/guardian/challenge",
       },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("restricted to guardian users");
@@ -744,7 +744,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
       const result = await executor.execute(
         "network_request",
         { url: `https://api.example.com${path}` },
-        makeContext({ guardianTrustClass: "trusted_contact" }),
+        makeContext({ trustClass: "trusted_contact" }),
       );
       expect(result.isError).toBe(true);
       expect(result.content).toContain("restricted to guardian users");
@@ -756,7 +756,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "host_file_read",
       { path: "/Users/noaflaherty/.ssh/config" },
-      makeContext({ guardianTrustClass: "trusted_contact" }),
+      makeContext({ trustClass: "trusted_contact" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("requires guardian approval");
@@ -767,7 +767,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "reminder_create",
       { fire_at: "2026-02-27T12:00:00-05:00", label: "test", message: "hello" },
-      makeContext({ guardianTrustClass: "unknown" }),
+      makeContext({ trustClass: "unknown" }),
     );
     expect(result.isError).toBe(true);
     expect(result.content).toContain("verified channel identity");
@@ -778,7 +778,7 @@ describe("ToolExecutor guardian-only policy gate", () => {
     const result = await executor.execute(
       "reminder_create",
       { fire_at: "2026-02-27T12:00:00-05:00", label: "test", message: "hello" },
-      makeContext({ guardianTrustClass: "guardian" }),
+      makeContext({ trustClass: "guardian" }),
     );
     expect(result.isError).toBe(false);
     expect(result.content).toBe("ok");

package/src/__tests__/guardian-dispatch.test.ts

@@ -134,7 +134,6 @@ function resetTables(): void {
   db.run("DELETE FROM canonical_guardian_requests");
   db.run("DELETE FROM guardian_action_deliveries");
   db.run("DELETE FROM guardian_action_requests");
-  db.run("DELETE FROM channel_guardian_bindings");
   db.run("DELETE FROM call_pending_questions");
   db.run("DELETE FROM call_events");
   db.run("DELETE FROM call_sessions");
@@ -696,6 +695,85 @@ describe("guardian-dispatch", () => {
     });
   });
 
+  test("ASK_GUARDIAN_APPROVAL path (toolName present) uses same-thread affinity on second dispatch", async () => {
+    const convId = "conv-dispatch-affinity-tool";
+    ensureConversation(convId);
+
+    const sharedConversationId = "conv-affinity-tool-guardian";
+
+    const session = createCallSession({
+      conversationId: convId,
+      provider: "twilio",
+      fromNumber: "+15550001111",
+      toNumber: "+15550002222",
+    });
+
+    // First dispatch — tool-approval style pending_question (toolName set)
+    const pq1 = createPendingQuestion(
+      session.id,
+      "Allow send_email to bob@example.com?",
+    );
+    mockEmitResult = {
+      signalId: "sig-tool-affinity-1",
+      deduplicated: false,
+      dispatched: true,
+      reason: "ok",
+      deliveryResults: [
+        {
+          channel: "vellum",
+          destination: "vellum",
+          status: "sent",
+          conversationId: sharedConversationId,
+        },
+      ],
+    };
+
+    await dispatchGuardianQuestion({
+      callSessionId: session.id,
+      conversationId: convId,
+      assistantId: "self",
+      pendingQuestion: pq1,
+      toolName: "send_email",
+    });
+
+    const firstParams = emitCalls[0] as Record<string, unknown>;
+    expect(firstParams.conversationAffinityHint).toBeUndefined();
+
+    // Second dispatch — also with toolName
+    emitCalls.length = 0;
+    const pq2 = createPendingQuestion(
+      session.id,
+      "Allow run_script with sudo?",
+    );
+    mockEmitResult = {
+      signalId: "sig-tool-affinity-2",
+      deduplicated: false,
+      dispatched: true,
+      reason: "ok",
+      deliveryResults: [
+        {
+          channel: "vellum",
+          destination: "vellum",
+          status: "sent",
+          conversationId: sharedConversationId,
+        },
+      ],
+    };
+
+    await dispatchGuardianQuestion({
+      callSessionId: session.id,
+      conversationId: convId,
+      assistantId: "self",
+      pendingQuestion: pq2,
+      toolName: "run_script",
+    });
+
+    const secondParams = emitCalls[0] as Record<string, unknown>;
+    expect(secondParams.conversationAffinityHint).toEqual({
+      vellum: sharedConversationId,
+    });
+  });
+
   test("third guardian question in same call session also carries affinity hint", async () => {
     const convId = "conv-dispatch-affinity-2";
     ensureConversation(convId);

package/src/__tests__/guardian-grant-minting.test.ts

@@ -47,6 +47,7 @@ mock.module("../util/logger.js", () => ({
 
 import { GRANT_TTL_MS } from "../approvals/guardian-decision-primitive.js";
 import type { Session } from "../daemon/session.js";
+import type { TrustContext } from "../daemon/session-runtime-assembly.js";
 import {
   createApprovalRequest,
   type GuardianApprovalRequest,
@@ -55,7 +56,6 @@ import { getDb, initializeDb, resetDb } from "../memory/db.js";
 import * as approvalMessageComposer from "../runtime/approval-message-composer.js";
 import * as gatewayClient from "../runtime/gateway-client.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
-import type { GuardianContext } from "../runtime/routes/channel-route-shared.js";
 import { handleApprovalInterception } from "../runtime/routes/guardian-approval-interception.js";
 import { computeToolApprovalDigest } from "../security/tool-approval-digest.js";
 
@@ -145,7 +145,7 @@ function registerPendingInteraction(
   return handleConfirmationResponse;
 }
 
-function makeGuardianContext(): GuardianContext {
+function makeTrustContext(): TrustContext {
   return {
     sourceChannel: "telegram",
     trustClass: "guardian",
@@ -218,7 +218,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -266,7 +266,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -297,7 +297,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -341,7 +341,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -375,7 +375,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: "wrong-guardian-user",
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -406,7 +406,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -445,7 +445,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
       approvalConversationGenerator: mockGenerator,
     });
@@ -491,7 +491,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
       approvalConversationGenerator: mockGenerator,
     });
@@ -526,7 +526,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -567,7 +567,7 @@ describe("guardian grant minting on tool-approval decisions", () => {
       sourceChannel: "telegram",
       actorExternalId: GUARDIAN_USER,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: makeGuardianContext(),
+      trustCtx: makeTrustContext(),
       assistantId: ASSISTANT_ID,
     });
 
@@ -619,7 +619,7 @@ describe("approval interception trust-class regression coverage", () => {
       sourceChannel: "telegram",
       actorExternalId: "intruder-user-1",
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: {
+      trustCtx: {
         sourceChannel: "telegram",
         trustClass: "unknown",
       },
@@ -651,7 +651,7 @@ describe("approval interception trust-class regression coverage", () => {
       sourceChannel: "telegram",
       actorExternalId: undefined,
       replyCallbackUrl: "https://gateway.test/deliver",
-      guardianCtx: {
+      trustCtx: {
         sourceChannel: "telegram",
         trustClass: "unknown",
         denialReason: "no_identity",

package/src/__tests__/guardian-outbound-http.test.ts

@@ -123,7 +123,7 @@ globalThis.fetch = (async (
     return new Response(JSON.stringify({ ok: true }), { status: 200 });
   }
   return originalFetch(input, init as never);
-}) as typeof fetch;
+}) as unknown as typeof fetch;
 
 // ---------------------------------------------------------------------------
 // Now import modules under test (after mocks are in place)
@@ -157,7 +157,6 @@ afterAll(() => {
 
 function resetTables(): void {
   const db = getDb();
-  db.run("DELETE FROM channel_guardian_bindings");
   db.run("DELETE FROM channel_guardian_verification_challenges");
   try {
     db.run("DELETE FROM channel_guardian_approval_requests");

package/src/__tests__/guardian-principal-id-roundtrip.test.ts

@@ -33,10 +33,6 @@ import {
   updateCanonicalGuardianRequest,
 } from "../memory/canonical-guardian-store.js";
 import { getDb, initializeDb, resetDb } from "../memory/db.js";
-import {
-  createBinding,
-  getActiveBinding,
-} from "../memory/guardian-bindings.js";
 
 initializeDb();
 
@@ -44,7 +40,6 @@ function resetTables(): void {
   const db = getDb();
   db.run("DELETE FROM canonical_guardian_deliveries");
   db.run("DELETE FROM canonical_guardian_requests");
-  db.run("DELETE FROM channel_guardian_bindings");
 }
 
 describe("guardianPrincipalId roundtrip", () => {
@@ -61,42 +56,6 @@ describe("guardianPrincipalId roundtrip", () => {
     }
   });
 
-  // ── channel_guardian_bindings ────────────────────────────────────────
-
-  describe("channel_guardian_bindings", () => {
-    test("creates binding with guardianPrincipalId and reads it back", () => {
-      const binding = createBinding({
-        assistantId: "self",
-        channel: "telegram",
-        guardianExternalUserId: "tg-user-123",
-        guardianDeliveryChatId: "tg-chat-123",
-        guardianPrincipalId: "principal-abc-def",
-      });
-
-      expect(binding.guardianPrincipalId).toBe("principal-abc-def");
-
-      const fetched = getActiveBinding("self", "telegram");
-      expect(fetched).not.toBeNull();
-      expect(fetched!.guardianPrincipalId).toBe("principal-abc-def");
-    });
-
-    test("guardianPrincipalId is always persisted (non-null)", () => {
-      const binding = createBinding({
-        assistantId: "self",
-        channel: "sms",
-        guardianExternalUserId: "sms-user-456",
-        guardianDeliveryChatId: "sms-chat-456",
-        guardianPrincipalId: "sms-user-456",
-      });
-
-      expect(binding.guardianPrincipalId).toBe("sms-user-456");
-
-      const fetched = getActiveBinding("self", "sms");
-      expect(fetched).not.toBeNull();
-      expect(fetched!.guardianPrincipalId).toBe("sms-user-456");
-    });
-  });
-
   // ── canonical_guardian_requests ──────────────────────────────────────
 
   describe("canonical_guardian_requests", () => {

package/src/__tests__/guardian-routing-invariants.test.ts

@@ -211,13 +211,10 @@ describe("routing invariant: all decision paths reference applyCanonicalGuardian
     expect(source).not.toContain("getPendingDeliveriesByConversation");
   });
 
-  test("daemon/session-process.ts seeds router hints from delivery and conversation scopes", () => {
+  test("daemon/session-process.ts seeds router hints via listPendingRequestsByConversationScope", () => {
     const fullPath = join(srcRoot, "daemon/session-process.ts");
     const source = readFileSync(fullPath, "utf-8");
-    expect(source).toContain(
-      "listPendingCanonicalGuardianRequestsByDestinationConversation",
-    );
-    expect(source).toContain("listCanonicalGuardianRequests");
+    expect(source).toContain("listPendingRequestsByConversationScope");
   });
 
   test("guardian-reply-router routes all decisions through applyCanonicalGuardianDecision", () => {

package/src/__tests__/guardian-routing-state.test.ts

@@ -37,46 +37,18 @@ mock.module("../security/secret-ingress.js", () => ({
   checkIngressForSecrets: () => ({ blocked: false }),
 }));
 
-// Mock ingress member store with a configurable member lookup.
-// By default returns an active member so ACL passes.
-let mockFindMember: (() => unknown) | null = null;
-mock.module("../memory/ingress-member-store.js", () => ({
-  findMember: (..._args: unknown[]) => {
-    if (mockFindMember) return mockFindMember();
-    return {
-      id: "member-test-default",
-      assistantId: "self",
-      sourceChannel: "telegram",
-      externalUserId: "telegram-user-default",
-      externalChatId: null,
-      displayName: null,
-      username: null,
-      status: "active",
-      policy: "allow",
-      inviteId: null,
-      createdBySessionId: null,
-      revokedReason: null,
-      blockedReason: null,
-      lastSeenAt: null,
-      createdAt: Date.now(),
-      updatedAt: Date.now(),
-    };
-  },
-  updateLastSeen: () => {},
-  upsertMember: () => {},
-}));
-
+import { upsertContact } from "../contacts/contact-store.js";
+import { createGuardianBinding } from "../contacts/contacts-write.js";
+import type { TrustContext } from "../daemon/session-runtime-assembly.js";
 import * as channelDeliveryStore from "../memory/channel-delivery-store.js";
-import { createBinding } from "../memory/channel-guardian-store.js";
 import { getDb, initializeDb, resetDb } from "../memory/db.js";
 import { channelInboundEvents, messages } from "../memory/schema.js";
 import { sweepFailedEvents } from "../runtime/channel-retry-sweep.js";
+import { handleChannelInbound } from "../runtime/routes/channel-routes.js";
 import {
-  type GuardianContext,
   resolveRoutingState,
   resolveRoutingStateFromRuntime,
-} from "../runtime/guardian-context-resolver.js";
-import { handleChannelInbound } from "../runtime/routes/channel-routes.js";
+} from "../runtime/trust-context-resolver.js";
 
 initializeDb();
 
@@ -92,14 +64,14 @@ afterAll(() => {
 function resetTables(): void {
   const db = getDb();
   db.run("DELETE FROM channel_inbound_events");
-  db.run("DELETE FROM channel_guardian_bindings");
   db.run("DELETE FROM channel_guardian_approval_requests");
   db.run("DELETE FROM canonical_guardian_requests");
   db.run("DELETE FROM conversation_keys");
   db.run("DELETE FROM messages");
   db.run("DELETE FROM conversations");
-  db.run("DELETE FROM assistant_ingress_members");
   db.run("DELETE FROM external_conversation_bindings");
+  db.run("DELETE FROM contact_channels");
+  db.run("DELETE FROM contacts");
 }
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -108,7 +80,7 @@ function resetTables(): void {
 
 describe("resolveRoutingState", () => {
   test("guardian actors are always interactive and route-resolvable", () => {
-    const ctx: GuardianContext = {
+    const ctx: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "guardian",
       guardianExternalUserId: "guardian-123",
@@ -124,7 +96,7 @@ describe("resolveRoutingState", () => {
 
   test("guardian actors are interactive even without guardianExternalUserId", () => {
     // Edge case: guardian is chatting in their own chat, no separate binding needed
-    const ctx: GuardianContext = {
+    const ctx: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "guardian",
     };
@@ -134,7 +106,7 @@ describe("resolveRoutingState", () => {
   });
 
   test("trusted contact with resolvable guardian route is interactive", () => {
-    const ctx: GuardianContext = {
+    const ctx: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-456",
@@ -149,7 +121,7 @@ describe("resolveRoutingState", () => {
   });
 
   test("trusted contact without guardian route is NOT interactive (fail-fast)", () => {
-    const ctx: GuardianContext = {
+    const ctx: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "trusted_contact",
       // No guardianExternalUserId — no guardian binding for this channel
@@ -163,12 +135,12 @@ describe("resolveRoutingState", () => {
   });
 
   test("unknown actors are never interactive regardless of guardian route", () => {
-    const withRoute: GuardianContext = {
+    const withRoute: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "unknown",
       guardianExternalUserId: "guardian-789",
     };
-    const withoutRoute: GuardianContext = {
+    const withoutRoute: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "unknown",
     };
@@ -210,7 +182,20 @@ describe("resolveRoutingStateFromRuntime", () => {
 describe("inbound-message-handler trusted-contact interactivity", () => {
   beforeEach(() => {
     resetTables();
-    mockFindMember = null;
+    // Insert a test contact so the contacts-based ACL lookup passes
+    upsertContact({
+      displayName: "Test User",
+      assistantId: "self",
+      channels: [
+        {
+          type: "telegram",
+          address: "telegram-user-default",
+          externalUserId: "telegram-user-default",
+          status: "active",
+          policy: "allow",
+        },
+      ],
+    });
   });
 
   function makeInboundRequest(
@@ -226,7 +211,9 @@ describe("inbound-message-handler trusted-contact interactivity", () => {
         sourceChannel: "telegram",
         interface: "telegram",
         conversationExternalId: "chat-123",
-        externalMessageId: `msg-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        externalMessageId: `msg-${Date.now()}-${Math.random()
+          .toString(36)
+          .slice(2, 8)}`,
         content: "hello",
         actorExternalId: "telegram-user-default",
         replyCallbackUrl: "https://gateway.test/deliver/telegram",
@@ -236,8 +223,8 @@ describe("inbound-message-handler trusted-contact interactivity", () => {
   }
 
   test("trusted contact with guardian binding gets interactive turn", async () => {
-    // Create guardian binding so the trusted contact has a resolvable route
-    createBinding({
+    // Create guardian binding in contacts table so the trust resolver finds it
+    createGuardianBinding({
       assistantId: "self",
       channel: "telegram",
       guardianExternalUserId: "guardian-user-for-tc",
@@ -337,8 +324,8 @@ describe("inbound-message-handler trusted-contact interactivity", () => {
   });
 
   test("guardian actors remain interactive regardless", async () => {
-    // Guardian binding matches the sender
-    createBinding({
+    // Guardian binding matches the sender — use contacts-first so trust resolver finds it
+    createGuardianBinding({
       assistantId: "self",
       channel: "telegram",
       guardianExternalUserId: "telegram-user-default",
@@ -389,10 +376,8 @@ describe("inbound-message-handler trusted-contact interactivity", () => {
   });
 
   test("unknown actors remain non-interactive (denied at gate)", async () => {
-    // No member record => non-member denied at the ACL gate,
+    // No contact record => non-member denied at the ACL gate,
     // which is the strongest form of "not interactive".
-    mockFindMember = () => null;
-
     const req = makeInboundRequest({
       externalMessageId: `msg-unknown-${Date.now()}`,
       actorExternalId: "unknown-user-no-member",
@@ -414,7 +399,6 @@ describe("inbound-message-handler trusted-contact interactivity", () => {
 describe("channel-retry-sweep routing state", () => {
   beforeEach(() => {
     resetTables();
-    mockFindMember = null;
   });
 
   function seedFailedEvent(
@@ -430,7 +414,7 @@ describe("channel-retry-sweep routing state", () => {
       content: "retry me",
       sourceChannel: "telegram",
       interface: "telegram",
-      guardianCtx: {
+      trustCtx: {
         trustClass,
         sourceChannel: "telegram",
         requesterExternalUserId: "test-user",