@vellumai/assistant 0.10.8 → 0.10.9-dev.202607152225.ec6fdbf

package/src/__tests__/tool-start-timestamp.test.ts

@@ -10,35 +10,6 @@
  */
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
-// ── Mock platform (must precede imports that read it) ─────────────────────────
-mock.module("../util/logger.js", () => ({
-  getLogger: () =>
-    new Proxy({} as Record<string, unknown>, {
-      get: () => () => {},
-    }),
-}));
-
-mock.module("../config/loader.js", () => ({
-  getConfig: () => ({
-    skills: {
-      entries: {},
-      load: { extraDirs: [], watch: false, watchDebounceMs: 0 },
-      install: { nodeManager: "npm" },
-      allowBundled: null,
-      remoteProviders: {
-        skillssh: { enabled: true },
-        clawhub: { enabled: true },
-      },
-      remotePolicy: {
-        blockSuspicious: true,
-        blockMalware: true,
-        maxSkillsShRisk: "medium",
-      },
-    },
-  }),
-  loadConfig: () => ({}),
-}));
-
 let mockedRowContent = "";
 const updates: Array<{ id: string; content: string }> = [];
 
@@ -47,7 +18,7 @@ mock.module("../persistence/conversation-crud.js", () => ({
   isConversationProcessing: () => false,
   addMessage: () => ({ id: "mock-msg-id" }),
   getMessageById: (id: string) =>
-    mockedRowContent ? { id, content: mockedRowContent } : null,
+    mockedRowContent ? { id, content: JSON.parse(mockedRowContent) } : null,
   updateMessageContent: (id: string, content: string) => {
     updates.push({ id, content });
   },
@@ -122,7 +93,9 @@ function findBlockById(
 ): Record<string, unknown> {
   const parsed = JSON.parse(rawContent) as Array<Record<string, unknown>>;
   const block = parsed.find((b) => b.id === id);
-  if (!block) throw new Error(`block ${id} not found`);
+  if (!block) {
+    throw new Error(`block ${id} not found`);
+  }
   return block;
 }
 

package/src/__tests__/tools-get-route.test.ts

@@ -77,7 +77,8 @@ const handler = (() => {
  */
 function registerFakeConversation(id: string, toolNames: string[]): void {
   setConversation(id, {
-    getRegisteredToolNames: () => new Set(toolNames),
+    getRegisteredToolDefinitions: () =>
+      toolNames.map((name) => ({ name, description: "", input_schema: {} })),
   } as unknown as Conversation);
 }
 

package/src/__tests__/trust-context-guards.test.ts

@@ -38,8 +38,12 @@ describe("trust-context guards", () => {
     let braceDepth = 0;
     let blockEnd = blockStart;
     for (let i = blockStart; i < source.length; i++) {
-      if (source[i] === "{") braceDepth++;
-      if (source[i] === "}") braceDepth--;
+      if (source[i] === "{") {
+        braceDepth++;
+      }
+      if (source[i] === "}") {
+        braceDepth--;
+      }
       if (braceDepth === 0) {
         blockEnd = i + 1;
         break;
@@ -89,8 +93,12 @@ describe("trust-context guards", () => {
     let braceDepth = 0;
     let blockEnd = blockStart;
     for (let i = blockStart; i < source.length; i++) {
-      if (source[i] === "{") braceDepth++;
-      if (source[i] === "}") braceDepth--;
+      if (source[i] === "{") {
+        braceDepth++;
+      }
+      if (source[i] === "}") {
+        braceDepth--;
+      }
       if (braceDepth === 0) {
         blockEnd = i + 1;
         break;
@@ -182,8 +190,12 @@ describe("trust-context guards", () => {
     let braceDepth = 0;
     let blockEnd = blockStart;
     for (let i = blockStart; i < source.length; i++) {
-      if (source[i] === "{") braceDepth++;
-      if (source[i] === "}") braceDepth--;
+      if (source[i] === "{") {
+        braceDepth++;
+      }
+      if (source[i] === "}") {
+        braceDepth--;
+      }
       if (braceDepth === 0) {
         blockEnd = i + 1;
         break;
@@ -202,7 +214,7 @@ describe("trust-context guards", () => {
     // Must be `guardianPrincipalId: string | null` — a gateway guardian row
     // with no principal is UNRESOLVED. Callers repair via the vellum anchor
     // or fail closed; a plain `string` type invites `?? ""` coercion, which
-    // creates undecidable canonical requests (LUM-2665).
+    // creates undecidable guardian requests (LUM-2665).
     expect(
       principalLine!.includes("string | null") ||
         principalLine!.includes("null | string"),

package/src/__tests__/trusted-contact-inline-approval-integration.test.ts

@@ -25,14 +25,6 @@ const testDir = process.env.VELLUM_WORKSPACE_DIR!;
 // Mocks — must be set before any production imports
 // ---------------------------------------------------------------------------
 
-mock.module("../util/logger.js", () => ({
-  getLogger: () =>
-    new Proxy({} as Record<string, unknown>, {
-      get: () => () => {},
-    }),
-  truncateForLog: (value: string) => value,
-}));
-
 // Mock notification emission — capture calls
 const emittedSignals: Array<Record<string, unknown>> = [];
 mock.module("../notifications/emit-signal.js", () => ({
@@ -166,15 +158,18 @@ mock.module("../config/env.js", () => ({
 // Production imports (AFTER mocks)
 // ---------------------------------------------------------------------------
 
-import { applyCanonicalGuardianDecision } from "../approvals/guardian-decision-primitive.js";
+// Guardian-request creation, delivery recording, and decisions all go through
+// the gateway client; the sim serves that whole surface.
+import { createGuardianGatewaySim } from "./guardian-gateway-sim.js";
+
+const sim = createGuardianGatewaySim();
+// The verification secret transits via the atomic decide's mintedSession.
+sim.state.mintedSecret = "123456";
+mock.module("../channels/gateway-guardian-requests.js", () => sim.module);
+
+import { applyGuardianDecision } from "../approvals/guardian-decision-primitive.js";
 import type { ActorContext } from "../approvals/guardian-request-resolvers.js";
 import { getResolver } from "../approvals/guardian-request-resolvers.js";
-import {
-  createCanonicalGuardianRequest,
-  getCanonicalGuardianRequest,
-  listCanonicalGuardianRequests,
-  updateCanonicalGuardianRequest,
-} from "../contacts/canonical-guardian-store.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
@@ -196,8 +191,7 @@ function resetTables(): void {
   db.delete(scopedApprovalGrants).run();
   db.run("DELETE FROM messages");
   db.run("DELETE FROM conversations");
-  db.run("DELETE FROM canonical_guardian_deliveries");
-  db.run("DELETE FROM canonical_guardian_requests");
+  sim.reset();
 }
 
 // ---------------------------------------------------------------------------
@@ -272,12 +266,12 @@ describe("(a) target flow: trusted-contact inline guardian approval end-to-end",
     expect(routing.guardianRouteResolvable).toBe(true);
 
     // Step 2: Verify the inline grant wait primitive works correctly end-to-end.
-    // Create a canonical request (as the escalation path would), then approve.
-    const req = createCanonicalGuardianRequest({
+    // Create a guardian request (as the escalation path would), then approve.
+    const req = sim.seedRequest({
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-1",
+      sourceConversationId: "conv-1",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -287,13 +281,14 @@ describe("(a) target flow: trusted-contact inline guardian approval end-to-end",
     });
 
     // Stamp inline_wait_active
-    updateCanonicalGuardianRequest(req.id, {
-      followupState: "inline_wait_active:" + Date.now(),
+    const waitMarker = "inline_wait_active:" + Date.now();
+    await sim.module.updateGuardianRequest(req.id, {
+      followupState: waitMarker,
     });
 
     const approvalPromise = (async () => {
       await new Promise((r) => setTimeout(r, 80));
-      await applyCanonicalGuardianDecision({
+      await applyGuardianDecision({
         requestId: req.id,
         action: "approve_once",
         actorContext: guardianActor(),
@@ -342,12 +337,12 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
   });
 
   test("trusted-contact confirmation_request emits guardian.question and creates delivery records", async () => {
-    const canonicalRequest = createCanonicalGuardianRequest({
+    const guardianRequest = sim.seedRequest({
       id: `req-bridge-${Date.now()}`,
       kind: "tool_approval",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-bridge-1",
+      sourceConversationId: "conv-bridge-1",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -359,7 +354,7 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
     const trustContext = makeTrustedContactTrustContext();
 
     const result = await bridgeConfirmationRequestToGuardian({
-      canonicalRequest,
+      guardianRequest,
       trustContext,
       conversationId: "conv-bridge-1",
       toolName: "bash",
@@ -372,7 +367,7 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
     expect(emittedSignals[0].sourceEventName).toBe("guardian.question");
 
     const payload = emittedSignals[0].contextPayload as Record<string, unknown>;
-    expect(payload.requestId).toBe(canonicalRequest.id);
+    expect(payload.requestId).toBe(guardianRequest.id);
     expect(payload.toolName).toBe("bash");
     expect(payload.requesterIdentifier).toBe("@requester");
   });
@@ -381,12 +376,12 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
     // The confirmation_request bridge and tool_grant_request helper both
     // use 'guardian.question' as the notification signal, ensuring consistent
     // guardian routing regardless of the approval path.
-    const canonicalRequest = createCanonicalGuardianRequest({
+    const guardianRequest = sim.seedRequest({
       id: `req-unified-${Date.now()}`,
       kind: "tool_approval",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-unified-1",
+      sourceConversationId: "conv-unified-1",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -398,7 +393,7 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
     const trustContext = makeTrustedContactTrustContext();
 
     await bridgeConfirmationRequestToGuardian({
-      canonicalRequest,
+      guardianRequest,
       trustContext,
       conversationId: "conv-unified-1",
       toolName: "bash",
@@ -438,12 +433,12 @@ describe("(c) no-binding flow: trusted contact fails fast without guardian bindi
   });
 
   test("bridge skips when no guardian binding exists for channel", async () => {
-    const canonicalRequest = createCanonicalGuardianRequest({
+    const guardianRequest = sim.seedRequest({
       id: `req-nobinding-${Date.now()}`,
       kind: "tool_approval",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-nobinding",
+      sourceConversationId: "conv-nobinding",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -455,7 +450,7 @@ describe("(c) no-binding flow: trusted contact fails fast without guardian bindi
     const trustContext = makeTrustedContactTrustContext();
 
     const result = await bridgeConfirmationRequestToGuardian({
-      canonicalRequest,
+      guardianRequest,
       trustContext,
       conversationId: "conv-nobinding",
       toolName: "bash",
@@ -519,8 +514,8 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
     // Unknown actors get the verified-identity message
     expect(result.result.content).toContain("verified channel identity");
 
-    // No canonical request created — unknown actors don't escalate
-    const requests = listCanonicalGuardianRequests({
+    // No guardian request created — unknown actors don't escalate
+    const requests = await sim.module.listGuardianRequestsOrEmpty({
       kind: "tool_grant_request",
       status: "pending",
     });
@@ -548,12 +543,12 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
   });
 
   test("bridge skips unknown actor sessions entirely", async () => {
-    const canonicalRequest = createCanonicalGuardianRequest({
+    const guardianRequest = sim.seedRequest({
       id: `req-unknown-${Date.now()}`,
       kind: "tool_approval",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-unknown",
+      sourceConversationId: "conv-unknown",
       requesterExternalUserId: "unknown-user",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -568,7 +563,7 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
     };
 
     const result = await bridgeConfirmationRequestToGuardian({
-      canonicalRequest,
+      guardianRequest,
       trustContext,
       conversationId: "conv-unknown",
       toolName: "bash",
@@ -691,11 +686,11 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
   test("inline wait timeout clears followupState so later approval sends retry notification", async () => {
     // Test via waitForInlineGrant directly: timeout clears followupState so
     // a later guardian approval sends the retry notification.
-    const req = createCanonicalGuardianRequest({
+    const req = sim.seedRequest({
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-1",
+      sourceConversationId: "conv-1",
       requesterExternalUserId: "requester-1",
       requesterChatId: "requester-chat-1",
       guardianExternalUserId: "guardian-1",
@@ -706,7 +701,7 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
     });
 
     // Stamp inline_wait_active (as checkPreExecutionGates would do)
-    updateCanonicalGuardianRequest(req.id, {
+    await sim.module.updateGuardianRequest(req.id, {
       followupState: "inline_wait_active:" + Date.now(),
     });
 
@@ -728,13 +723,13 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
 
     // waitForInlineGrant does NOT clear followupState — the caller (checkPreExecutionGates) does.
     // For this test, manually clear it to simulate what checkPreExecutionGates does after timeout.
-    updateCanonicalGuardianRequest(req.id, { followupState: null });
+    await sim.module.updateGuardianRequest(req.id, { followupState: null });
 
     // After followupState is cleared, later guardian approval sends retry notification
-    const freshReq = getCanonicalGuardianRequest(req.id);
+    const freshReq = sim.getRequest(req.id);
     expect(freshReq?.followupState).toBeNull();
 
-    const approvalResult = await applyCanonicalGuardianDecision({
+    const approvalResult = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor(),
@@ -757,15 +752,15 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
   });
 
   test("inline_wait_active staleness guard: expired marker allows retry notification", async () => {
-    // Create a canonical request with a stale inline_wait_active marker
+    // Create a guardian request with a stale inline_wait_active marker
     // that simulates a daemon crash during the wait.
     const staleTimestamp = Date.now() - TC_GRANT_WAIT_MAX_MS - 60_000;
-    const req = createCanonicalGuardianRequest({
+    const req = sim.seedRequest({
       id: `req-stale-${Date.now()}`,
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-stale-1",
+      sourceConversationId: "conv-stale-1",
       requesterExternalUserId: "requester-1",
       requesterChatId: "requester-chat-1",
       guardianExternalUserId: "guardian-1",
@@ -776,17 +771,17 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
     });
 
     // Set a stale inline_wait_active marker
-    updateCanonicalGuardianRequest(req.id, {
+    await sim.module.updateGuardianRequest(req.id, {
       followupState: `inline_wait_active:${staleTimestamp}`,
     });
 
     // Verify marker is stale
-    const freshReq = getCanonicalGuardianRequest(req.id);
+    const freshReq = sim.getRequest(req.id);
     expect(freshReq?.followupState).toContain("inline_wait_active:");
 
     // Guardian approves — the resolver should detect the stale marker
     // and send the retry notification instead of suppressing it.
-    const approvalResult = await applyCanonicalGuardianDecision({
+    const approvalResult = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor(),
@@ -810,12 +805,12 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
   test("fresh inline_wait_active marker suppresses retry notification", async () => {
     // Create a request with a FRESH inline_wait_active marker
     const freshTimestamp = Date.now();
-    const req = createCanonicalGuardianRequest({
+    const req = sim.seedRequest({
       id: `req-fresh-${Date.now()}`,
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-fresh-1",
+      sourceConversationId: "conv-fresh-1",
       requesterExternalUserId: "requester-1",
       requesterChatId: "requester-chat-1",
       guardianExternalUserId: "guardian-1",
@@ -825,13 +820,13 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
       expiresAt: Date.now() + 60_000,
     });
 
-    updateCanonicalGuardianRequest(req.id, {
+    await sim.module.updateGuardianRequest(req.id, {
       followupState: `inline_wait_active:${freshTimestamp}`,
     });
 
     // Guardian approves while an active inline waiter is running
     deliveredReplies.length = 0;
-    const approvalResult = await applyCanonicalGuardianDecision({
+    const approvalResult = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor(),
@@ -855,11 +850,11 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
 
   test("denied inline wait produces explicit denial (no false success)", async () => {
     // Test via waitForInlineGrant directly: rejection produces "denied" outcome.
-    const req = createCanonicalGuardianRequest({
+    const req = sim.seedRequest({
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-1",
+      sourceConversationId: "conv-1",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -871,7 +866,7 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
     // Schedule rejection after 80ms
     const rejectionPromise = (async () => {
       await new Promise((r) => setTimeout(r, 80));
-      await applyCanonicalGuardianDecision({
+      await applyGuardianDecision({
         requestId: req.id,
         action: "reject",
         actorContext: guardianActor(),
@@ -898,11 +893,11 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
 
   test("timeout produces explicit timeout outcome (no false success)", async () => {
     // Test via waitForInlineGrant directly: timeout produces "timeout" outcome.
-    const req = createCanonicalGuardianRequest({
+    const req = sim.seedRequest({
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-1",
+      sourceConversationId: "conv-1",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -972,12 +967,12 @@ describe("cross-milestone integration checks", () => {
     // use the guardian binding's guardianExternalUserId to route notifications.
     // Verify this consistency:
 
-    const canonicalRequest = createCanonicalGuardianRequest({
+    const guardianRequest = sim.seedRequest({
       id: `req-consistency-${Date.now()}`,
       kind: "tool_approval",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-consistency",
+      sourceConversationId: "conv-consistency",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -989,7 +984,7 @@ describe("cross-milestone integration checks", () => {
     const trustContext = makeTrustedContactTrustContext();
 
     const bridgeResult = await bridgeConfirmationRequestToGuardian({
-      canonicalRequest,
+      guardianRequest,
       trustContext,
       conversationId: "conv-consistency",
       toolName: "bash",
@@ -1048,11 +1043,11 @@ describe("cross-milestone integration checks", () => {
 
   test("M4: abort signal during inline wait produces aborted outcome", async () => {
     // Test via waitForInlineGrant directly: abort signal produces "aborted" outcome.
-    const req = createCanonicalGuardianRequest({
+    const req = sim.seedRequest({
       kind: "tool_grant_request",
       sourceType: "channel",
       sourceChannel: "telegram",
-      conversationId: "conv-1",
+      sourceConversationId: "conv-1",
       requesterExternalUserId: "requester-1",
       guardianExternalUserId: "guardian-1",
       guardianPrincipalId: "test-principal-id",
@@ -1062,8 +1057,9 @@ describe("cross-milestone integration checks", () => {
     });
 
     // Stamp inline_wait_active
-    updateCanonicalGuardianRequest(req.id, {
-      followupState: "inline_wait_active:" + Date.now(),
+    const waitMarker = "inline_wait_active:" + Date.now();
+    await sim.module.updateGuardianRequest(req.id, {
+      followupState: waitMarker,
     });
 
     const controller = new AbortController();
@@ -1090,10 +1086,10 @@ describe("cross-milestone integration checks", () => {
     expect(elapsed).toBeLessThan(1_000);
 
     // Simulate what checkPreExecutionGates does after abort: clear followupState
-    updateCanonicalGuardianRequest(req.id, { followupState: null });
+    await sim.module.updateGuardianRequest(req.id, { followupState: null });
 
     // After followupState is cleared, a later guardian approval should send retry notification
-    const freshReq = getCanonicalGuardianRequest(req.id);
+    const freshReq = sim.getRequest(req.id);
     expect(freshReq?.followupState).toBeNull();
   });
 });
@@ -1113,12 +1109,12 @@ describe("(g) access_request resolver: requester code delivery", () => {
   const GUARDIAN_UID = "U_GUARDIAN";
 
   function createAccessRequest(overrides: Record<string, unknown> = {}) {
-    return createCanonicalGuardianRequest({
+    return sim.seedRequest({
       id: `access-req-${Date.now()}-${Math.random().toString(36).slice(2)}`,
       kind: "access_request",
       sourceType: "channel",
       sourceChannel: "slack",
-      conversationId: "conv-access-slack",
+      sourceConversationId: "conv-access-slack",
       requesterExternalUserId: REQUESTER_UID,
       requesterChatId: "C_SHARED_CHANNEL",
       guardianExternalUserId: GUARDIAN_UID,
@@ -1139,7 +1135,7 @@ describe("(g) access_request resolver: requester code delivery", () => {
   test("on-channel Slack approval DMs the verification code to the requester", async () => {
     const req = createAccessRequest();
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor({
@@ -1185,7 +1181,7 @@ describe("(g) access_request resolver: requester code delivery", () => {
   test("desktop-decided approval DMs the code to the Slack requester via the deliver path", async () => {
     const req = createAccessRequest();
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       // Desktop decision: no channelDeliveryContext, actor on the vellum channel.
@@ -1222,7 +1218,7 @@ describe("(g) access_request resolver: requester code delivery", () => {
     // Fail the direct DM and the courier fallback (both target the requester).
     failDeliveryWhen = (payload) => payload.chatId === REQUESTER_UID;
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor({
@@ -1252,10 +1248,10 @@ describe("(g) access_request resolver: requester code delivery", () => {
     const req = createAccessRequest({
       sourceChannel: "email",
       requesterChatId: "requester@example.com",
-      conversationId: "conv-access-email",
+      sourceConversationId: "conv-access-email",
     });
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor({
@@ -1286,10 +1282,10 @@ describe("(g) access_request resolver: requester code delivery", () => {
     const req = createAccessRequest({
       sourceChannel: "telegram",
       requesterChatId: "requester-chat-1",
-      conversationId: "conv-access-telegram",
+      sourceConversationId: "conv-access-telegram",
     });
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor({
@@ -1321,7 +1317,7 @@ describe("(g) access_request resolver: requester code delivery", () => {
     // Make the direct DM (to the U... user ID) fail so the courier fallback runs.
     failDeliveryWhen = (payload) => payload.chatId === REQUESTER_UID;
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       actorContext: guardianActor({
@@ -1363,7 +1359,7 @@ describe("(g) access_request resolver: requester code delivery", () => {
 
     const req = createAccessRequest();
 
-    const result = await applyCanonicalGuardianDecision({
+    const result = await applyGuardianDecision({
       requestId: req.id,
       action: "approve_once",
       // Desktop decision → resolver returns guardianReplyText for assertion.