@vellumai/assistant 0.4.26 → 0.4.30

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

@@ -8,9 +8,9 @@ import { describe, expect, it } from "bun:test";
  * These tests prevent reintroduction of removed compatibility patterns
  * by scanning source files for type invariants:
  *
- *  (a) guardianPrincipalId in GuardianRuntimeContext must be `?: string`
+ *  (a) guardianPrincipalId in TrustContext must be `?: string`
  *      (optional string), NOT `string | null`.
- *  (b) guardianTrustClass in ToolContext must be a required field (no `?`).
+ *  (b) trustClass in ToolContext must be a required field (no `?`).
  *  (c) The channel retry sweep parser must not reference `actorRole`.
  *  (d) guardianPrincipalId in GuardianBinding must be `string` (non-null,
  *      non-optional).
@@ -23,16 +23,14 @@ describe("trust-context guards", () => {
   // (a) No `string | null` for guardianPrincipalId in runtime types
   // -----------------------------------------------------------------------
 
-  it("guardianPrincipalId is not typed as string | null in GuardianRuntimeContext", () => {
+  it("guardianPrincipalId is not typed as string | null in TrustContext", () => {
     const source = readFileSync(
       join(srcDir, "daemon", "session-runtime-assembly.ts"),
       "utf-8",
     );
 
-    // Extract the GuardianRuntimeContext interface block
-    const ifaceStart = source.indexOf(
-      "export interface GuardianRuntimeContext",
-    );
+    // Extract the TrustContext interface block
+    const ifaceStart = source.indexOf("export interface TrustContext");
     expect(ifaceStart).toBeGreaterThan(-1);
 
     const blockStart = source.indexOf("{", ifaceStart);
@@ -54,13 +52,13 @@ describe("trust-context guards", () => {
       .find((l) => l.includes("guardianPrincipalId"));
     expect(
       principalLine,
-      "Expected to find guardianPrincipalId in GuardianRuntimeContext",
+      "Expected to find guardianPrincipalId in TrustContext",
     ).toBeDefined();
 
     expect(
       principalLine!.includes("string | null") ||
         principalLine!.includes("null | string"),
-      "guardianPrincipalId must not be typed as nullable in GuardianRuntimeContext. " +
+      "guardianPrincipalId must not be typed as nullable in TrustContext. " +
         "Use `guardianPrincipalId?: string` (optional, non-nullable) instead. " +
         `Found: "${principalLine!.trim()}"`,
     ).toBe(false);
@@ -69,17 +67,17 @@ describe("trust-context guards", () => {
     // principal exists should be able to omit it.
     expect(
       /guardianPrincipalId\s*\?/.test(principalLine!),
-      "guardianPrincipalId must remain optional (`?:`) in GuardianRuntimeContext. " +
+      "guardianPrincipalId must remain optional (`?:`) in TrustContext. " +
         "Channels without a guardian principal need to omit this field. " +
         `Found: "${principalLine!.trim()}"`,
     ).toBe(true);
   });
 
   // -----------------------------------------------------------------------
-  // (b) guardianTrustClass is required in ToolContext
+  // (b) trustClass is required in ToolContext
   // -----------------------------------------------------------------------
 
-  it("guardianTrustClass is a required field in ToolContext", () => {
+  it("trustClass is a required field in ToolContext", () => {
     const source = readFileSync(join(srcDir, "tools", "types.ts"), "utf-8");
 
     // Extract the ToolContext interface block
@@ -99,18 +97,16 @@ describe("trust-context guards", () => {
     }
     const block = source.slice(blockStart, blockEnd);
 
-    const trustLine = block
-      .split("\n")
-      .find((l) => l.includes("guardianTrustClass"));
+    const trustLine = block.split("\n").find((l) => l.includes("trustClass"));
     expect(
       trustLine,
-      "Expected to find guardianTrustClass in ToolContext",
+      "Expected to find trustClass in ToolContext",
     ).toBeDefined();
 
     // The field must NOT have a `?` before the colon — it must be required.
     expect(
-      /guardianTrustClass\s*\?/.test(trustLine!),
-      "guardianTrustClass must be a required field in ToolContext (no `?`). " +
+      /trustClass\s*\?/.test(trustLine!),
+      "trustClass must be a required field in ToolContext (no `?`). " +
         "Explicit trust gates must not be optional — every tool execution " +
         `must carry a trust classification. Found: "${trustLine!.trim()}"`,
     ).toBe(false);
@@ -126,9 +122,9 @@ describe("trust-context guards", () => {
       "utf-8",
     );
 
-    // The parseGuardianRuntimeContext function must use strict trustClass
+    // The parseTrustRuntimeContext function must use strict trustClass
     // parsing only — no legacy actorRole fallback.
-    const parserStart = source.indexOf("function parseGuardianRuntimeContext");
+    const parserStart = source.indexOf("function parseTrustRuntimeContext");
     expect(parserStart).toBeGreaterThan(-1);
 
     // Find the end of the function (next function-level declaration or EOF)
@@ -138,30 +134,30 @@ describe("trust-context guards", () => {
 
     expect(
       parserSource.includes("actorRole"),
-      "parseGuardianRuntimeContext must not reference `actorRole`. " +
+      "parseTrustRuntimeContext must not reference `actorRole`. " +
         "The retry sweep uses strict `trustClass` parsing — no legacy actorRole fallback.",
     ).toBe(false);
   });
 
   // -----------------------------------------------------------------------
-  // (d) Retry sweep never passes undefined guardianContext to processMessage
+  // (d) Retry sweep never passes undefined trustContext to processMessage
   // -----------------------------------------------------------------------
 
-  it("retry sweep always provides an explicit guardianContext (never undefined)", () => {
+  it("retry sweep always provides an explicit trustContext (never undefined)", () => {
     const source = readFileSync(
       join(srcDir, "runtime", "channel-retry-sweep.ts"),
       "utf-8",
     );
 
-    // The sweep must synthesize a trust context when guardianCtx is absent,
-    // so `guardianContext` should never be conditionally undefined at the
+    // The sweep must synthesize a trust context when trustCtx is absent,
+    // so `trustContext` should never be conditionally undefined at the
     // processMessage callsite. Look for the pattern that ensures this:
-    // a `const guardianContext: GuardianRuntimeContext = parsedGuardianContext ?? {`
+    // a `const trustContext: TrustContext = parsedTrustContext ?? {`
     // fallback that synthesizes trustClass: 'unknown'.
     expect(
-      source.includes("trustClass: 'unknown'"),
+      source.includes('trustClass: "unknown"'),
       "The retry sweep must synthesize an explicit `trustClass: 'unknown'` context " +
-        "when guardianCtx is absent from stored payloads. This prevents downstream " +
+        "when trustCtx is absent from stored payloads. This prevents downstream " +
         "defaults from granting implicit guardian trust on replay.",
     ).toBe(true);
   });
@@ -172,7 +168,7 @@ describe("trust-context guards", () => {
 
   it("guardianPrincipalId is typed as string (non-null) in GuardianBinding", () => {
     const source = readFileSync(
-      join(srcDir, "memory", "guardian-bindings.ts"),
+      join(srcDir, "memory", "channel-guardian-store.ts"),
       "utf-8",
     );
 

package/src/__tests__/trusted-contact-approval-notifier.test.ts

@@ -128,7 +128,7 @@ mock.module("../config/user-reference.js", () => ({
 // Import module under test AFTER mocks are set up
 import type { ChannelId } from "../channels/types.js";
 import { resolveUserReference } from "../config/user-reference.js";
-import type { GuardianContext } from "../runtime/guardian-context-resolver.js";
+import type { TrustContext } from "../daemon/session-runtime-assembly.js";
 
 // We need to test the private functions by importing the module.
 // Since startTrustedContactApprovalNotifier is not exported, we test it
@@ -156,7 +156,7 @@ async function simulateNotifierPoll(params: {
   conversationId: string;
   sourceChannel: ChannelId;
   externalChatId: string;
-  guardianTrustClass: GuardianContext["trustClass"];
+  trustClass: TrustContext["trustClass"];
   guardianExternalUserId?: string;
   replyCallbackUrl: string;
   bearerToken?: string;
@@ -165,13 +165,13 @@ async function simulateNotifierPoll(params: {
 }): Promise<boolean> {
   const {
     conversationId,
-    guardianTrustClass,
+    trustClass,
     guardianExternalUserId,
     notifiedRequestIds,
   } = params;
 
   // Gate check: only trusted contacts with guardian route
-  if (guardianTrustClass !== "trusted_contact" || !guardianExternalUserId) {
+  if (trustClass !== "trusted_contact" || !guardianExternalUserId) {
     return false;
   }
 
@@ -226,7 +226,9 @@ async function simulateNotifierPoll(params: {
     }
   }
 
-  const waitingText = `Waiting for ${guardianName ?? resolveUserReference()}'s approval...`;
+  const waitingText = `Waiting for ${
+    guardianName ?? resolveUserReference()
+  }'s approval...`;
 
   try {
     await deliverChannelReply(
@@ -285,7 +287,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       bearerToken: "test-token",
@@ -322,7 +324,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -355,7 +357,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -384,7 +386,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -416,7 +418,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram" as ChannelId,
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact" as const,
+      trustClass: "trusted_contact" as const,
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -444,7 +446,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram" as ChannelId,
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact" as const,
+      trustClass: "trusted_contact" as const,
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -497,7 +499,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-A",
       sourceChannel: "telegram",
       externalChatId: "chat-A",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -512,7 +514,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-B",
       sourceChannel: "telegram",
       externalChatId: "chat-B",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -535,7 +537,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-A",
       sourceChannel: "telegram",
       externalChatId: "chat-A",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -559,7 +561,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "guardian",
+      trustClass: "guardian",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -584,7 +586,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "unknown",
+      trustClass: "unknown",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
     });
@@ -608,7 +610,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: undefined,
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -638,7 +640,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram" as ChannelId,
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact" as const,
+      trustClass: "trusted_contact" as const,
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -666,7 +668,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -699,7 +701,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,
@@ -731,7 +733,7 @@ describe("trusted-contact pending-approval notifier", () => {
       conversationId: "conv-1",
       sourceChannel: "telegram",
       externalChatId: "chat-123",
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       replyCallbackUrl: "http://localhost:3000/deliver/telegram",
       notifiedRequestIds: notified,

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

@@ -2,7 +2,7 @@
  * End-to-end integration tests for the trusted-contact inline guardian approval feature.
  *
  * Verifies the full integration of M1-M4 milestones:
- *   M1: RoutingState (guardian-context-resolver.ts)
+ *   M1: RoutingState (trust-context-resolver.ts)
  *   M2: Confirmation request guardian bridge (confirmation-request-guardian-bridge.ts)
  *   M3: Pending approval notifier (inbound-message-handler.ts)
  *   M4: Inline grant wait-and-resume (tool-approval-handler.ts) +
@@ -182,7 +182,7 @@ mock.module("../config/env.js", () => ({
 import { applyCanonicalGuardianDecision } from "../approvals/guardian-decision-primitive.js";
 import type { ActorContext } from "../approvals/guardian-request-resolvers.js";
 import { getResolver } from "../approvals/guardian-request-resolvers.js";
-import type { GuardianRuntimeContext } from "../daemon/session-runtime-assembly.js";
+import type { TrustContext } from "../daemon/session-runtime-assembly.js";
 import {
   createCanonicalGuardianRequest,
   getCanonicalGuardianRequest,
@@ -192,10 +192,7 @@ import {
 import { getDb, initializeDb, resetDb } from "../memory/db.js";
 import { scopedApprovalGrants } from "../memory/schema.js";
 import { bridgeConfirmationRequestToGuardian } from "../runtime/confirmation-request-guardian-bridge.js";
-import {
-  type GuardianContext,
-  resolveRoutingState,
-} from "../runtime/guardian-context-resolver.js";
+import { resolveRoutingState } from "../runtime/trust-context-resolver.js";
 import {
   TC_GRANT_WAIT_MAX_MS,
   ToolApprovalHandler,
@@ -231,7 +228,7 @@ function makeToolContext(overrides: Partial<ToolContext> = {}): ToolContext {
     conversationId: "conv-1",
     assistantId: "self",
     requestId: "req-1",
-    guardianTrustClass: "trusted_contact",
+    trustClass: "trusted_contact",
     executionChannel: "telegram",
     requesterExternalUserId: "requester-1",
     ...overrides,
@@ -247,7 +244,7 @@ function guardianActor(overrides: Partial<ActorContext> = {}): ActorContext {
   };
 }
 
-function makeTrustedContactGuardianContext(): GuardianRuntimeContext {
+function makeTrustedContactTrustContext(): TrustContext {
   return {
     sourceChannel: "telegram",
     trustClass: "trusted_contact",
@@ -292,7 +289,7 @@ describe("(a) target flow: trusted-contact inline guardian approval end-to-end",
   test("trusted contact requests tool, guardian approves mid-wait, tool executes inline", async () => {
     const toolName = "bash";
     const input = { command: "echo hello" };
-    const context = makeToolContext({ guardianTrustClass: "trusted_contact" });
+    const context = makeToolContext({ trustClass: "trusted_contact" });
 
     // Schedule guardian approval after 100ms during the inline wait
     const approvalPromise = (async () => {
@@ -349,20 +346,20 @@ describe("(a) target flow: trusted-contact inline guardian approval end-to-end",
 
   test("complete flow: routing state allows interactive + bridge notifies guardian + tool resumes", async () => {
     // Step 1: Verify routing state allows interactive turns for trusted contacts
-    const guardianCtx: GuardianContext = {
+    const trustCtx: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       guardianChatId: "guardian-chat-1",
     };
-    const routing = resolveRoutingState(guardianCtx);
+    const routing = resolveRoutingState(trustCtx);
     expect(routing.promptWaitingAllowed).toBe(true);
     expect(routing.guardianRouteResolvable).toBe(true);
 
     // Step 2: Tool invocation creates escalation + waits inline + guardian approves
     const toolName = "bash";
     const input = { command: "deploy" };
-    const context = makeToolContext({ guardianTrustClass: "trusted_contact" });
+    const context = makeToolContext({ trustClass: "trusted_contact" });
 
     const approvalPromise = (async () => {
       await new Promise((r) => setTimeout(r, 80));
@@ -431,11 +428,11 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
       expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
     });
 
-    const guardianContext = makeTrustedContactGuardianContext();
+    const trustContext = makeTrustedContactTrustContext();
 
     const result = bridgeConfirmationRequestToGuardian({
       canonicalRequest,
-      guardianContext,
+      trustContext,
       conversationId: "conv-bridge-1",
       toolName: "bash",
     });
@@ -470,11 +467,11 @@ describe("(b) prompt-path flow: confirmation_request bridges to guardian", () =>
       expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
     });
 
-    const guardianContext = makeTrustedContactGuardianContext();
+    const trustContext = makeTrustedContactTrustContext();
 
     bridgeConfirmationRequestToGuardian({
       canonicalRequest,
-      guardianContext,
+      trustContext,
       conversationId: "conv-unified-1",
       toolName: "bash",
     });
@@ -505,7 +502,7 @@ describe("(c) no-binding flow: trusted contact fails fast without guardian bindi
   });
 
   test("routing state blocks prompt waiting when no guardian binding exists", () => {
-    const ctx: GuardianContext = {
+    const ctx: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "trusted_contact",
       // No guardianExternalUserId — mirrors no binding
@@ -521,7 +518,7 @@ describe("(c) no-binding flow: trusted contact fails fast without guardian bindi
     const toolName = "bash";
     const input = { command: "ls" };
     const context = makeToolContext({
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       executionChannel: "telegram",
     });
 
@@ -569,11 +566,11 @@ describe("(c) no-binding flow: trusted contact fails fast without guardian bindi
       expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
     });
 
-    const guardianContext = makeTrustedContactGuardianContext();
+    const trustContext = makeTrustedContactTrustContext();
 
     const result = bridgeConfirmationRequestToGuardian({
       canonicalRequest,
-      guardianContext,
+      trustContext,
       conversationId: "conv-nobinding",
       toolName: "bash",
     });
@@ -614,7 +611,7 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
     const toolName = "bash";
     const input = { command: "ls" };
     const context = makeToolContext({
-      guardianTrustClass: "unknown",
+      trustClass: "unknown",
       executionChannel: "telegram",
       requesterExternalUserId: "unknown-user",
     });
@@ -649,12 +646,12 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
   });
 
   test("unknown actors have promptWaitingAllowed=false regardless of guardian route", () => {
-    const withRoute: GuardianContext = {
+    const withRoute: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "unknown",
       guardianExternalUserId: "guardian-1",
     };
-    const withoutRoute: GuardianContext = {
+    const withoutRoute: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "unknown",
     };
@@ -680,14 +677,14 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
       expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
     });
 
-    const guardianContext: GuardianRuntimeContext = {
+    const trustContext: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "unknown",
     };
 
     const result = bridgeConfirmationRequestToGuardian({
       canonicalRequest,
-      guardianContext,
+      trustContext,
       conversationId: "conv-unknown",
       toolName: "bash",
     });
@@ -710,12 +707,12 @@ describe("(d) unknown actor flow: fail-closed with no interactive approval", ()
  * flags as always-false under strict literal narrowing — TS2367/TS2872).
  */
 function checkIsBoundGuardianActor(params: {
-  guardianTrustClass: string;
+  trustClass: string;
   guardianExternalUserId: string | undefined;
   requesterExternalUserId: string;
 }): boolean {
   return (
-    params.guardianTrustClass === "guardian" &&
+    params.trustClass === "guardian" &&
     !!params.guardianExternalUserId &&
     params.requesterExternalUserId === params.guardianExternalUserId
   );
@@ -741,7 +738,7 @@ describe("(e) guardian-only prompt delivery invariant", () => {
     // actors matching the binding receive the prompt.
 
     const result = checkIsBoundGuardianActor({
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
       requesterExternalUserId: "requester-1",
     });
@@ -752,7 +749,7 @@ describe("(e) guardian-only prompt delivery invariant", () => {
 
   test("unknown actors do NOT receive approval prompt UI", () => {
     const result = checkIsBoundGuardianActor({
-      guardianTrustClass: "unknown",
+      trustClass: "unknown",
       guardianExternalUserId: "guardian-1",
       requesterExternalUserId: "unknown-user",
     });
@@ -762,7 +759,7 @@ describe("(e) guardian-only prompt delivery invariant", () => {
 
   test("guardian actor that matches binding DOES receive approval prompt UI", () => {
     const result = checkIsBoundGuardianActor({
-      guardianTrustClass: "guardian",
+      trustClass: "guardian",
       guardianExternalUserId: "guardian-1",
       requesterExternalUserId: "guardian-1",
     });
@@ -773,7 +770,7 @@ describe("(e) guardian-only prompt delivery invariant", () => {
   test("guardian actor with identity mismatch does NOT receive approval prompt UI", () => {
     // After guardian rotation, old guardian identity should not receive prompts
     const result = checkIsBoundGuardianActor({
-      guardianTrustClass: "guardian",
+      trustClass: "guardian",
       guardianExternalUserId: "new-guardian-2",
       requesterExternalUserId: "old-guardian-1",
     });
@@ -810,7 +807,7 @@ 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 () => {
     const toolName = "bash";
     const input = { command: "echo stale" };
-    const context = makeToolContext({ guardianTrustClass: "trusted_contact" });
+    const context = makeToolContext({ trustClass: "trusted_contact" });
 
     // Let the tool invocation time out (no guardian approval within 100ms)
     const result = await handler.checkPreExecutionGates(
@@ -966,7 +963,7 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
   test("denied inline wait produces explicit denial (no false success)", async () => {
     const toolName = "bash";
     const input = { command: "rm -rf /" };
-    const context = makeToolContext({ guardianTrustClass: "trusted_contact" });
+    const context = makeToolContext({ trustClass: "trusted_contact" });
 
     // Schedule guardian rejection after 80ms
     const rejectionPromise = (async () => {
@@ -1009,7 +1006,7 @@ describe("(f) timeout/stale flow: stale guardian decision after inline wait time
   test("timeout produces explicit timeout message (no false success)", async () => {
     const toolName = "bash";
     const input = { command: "curl example.com" };
-    const context = makeToolContext({ guardianTrustClass: "trusted_contact" });
+    const context = makeToolContext({ trustClass: "trusted_contact" });
 
     const result = await handler.checkPreExecutionGates(
       toolName,
@@ -1054,7 +1051,7 @@ describe("cross-milestone integration checks", () => {
 
   test("M1+M4: routing state interactivity drives inline wait eligibility", async () => {
     // With guardian binding: interactive + inline wait allowed
-    const withBinding: GuardianContext = {
+    const withBinding: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "trusted_contact",
       guardianExternalUserId: "guardian-1",
@@ -1062,7 +1059,7 @@ describe("cross-milestone integration checks", () => {
     expect(resolveRoutingState(withBinding).promptWaitingAllowed).toBe(true);
 
     // Without guardian binding: not interactive + inline wait should not enter dead-end
-    const withoutBinding: GuardianContext = {
+    const withoutBinding: TrustContext = {
       sourceChannel: "telegram",
       trustClass: "trusted_contact",
     };
@@ -1090,11 +1087,11 @@ describe("cross-milestone integration checks", () => {
       expiresAt: new Date(Date.now() + 5 * 60_000).toISOString(),
     });
 
-    const guardianContext = makeTrustedContactGuardianContext();
+    const trustContext = makeTrustedContactTrustContext();
 
     const bridgeResult = bridgeConfirmationRequestToGuardian({
       canonicalRequest,
-      guardianContext,
+      trustContext,
       conversationId: "conv-consistency",
       toolName: "bash",
     });
@@ -1125,7 +1122,7 @@ describe("cross-milestone integration checks", () => {
     const toolName = "bash";
     const input = { command: "ls" };
     const context = makeToolContext({
-      guardianTrustClass: "guardian",
+      trustClass: "guardian",
       executionChannel: "telegram",
       requesterExternalUserId: "guardian-1",
     });
@@ -1158,7 +1155,7 @@ describe("cross-milestone integration checks", () => {
     const input = { command: "aborted-command" };
     const controller = new AbortController();
     const context = makeToolContext({
-      guardianTrustClass: "trusted_contact",
+      trustClass: "trusted_contact",
       signal: controller.signal,
     });