@vellumai/assistant 0.6.6 → 0.7.1

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

@@ -8,8 +8,6 @@ import {
   test,
 } from "bun:test";
 
-import { eq } from "drizzle-orm";
-
 mock.module("../util/logger.js", () => ({
   getLogger: () =>
     new Proxy({} as Record<string, unknown>, {
@@ -17,6 +15,11 @@ mock.module("../util/logger.js", () => ({
     }),
 }));
 
+const _conversationMocks = new Map<string, unknown>();
+mock.module("../daemon/conversation-store.js", () => ({
+  findConversation: (id: string) => _conversationMocks.get(id),
+}));
+
 // Mock render to return the raw content as text
 mock.module("../daemon/handlers/shared.js", () => ({
   renderHistoryContent: (content: unknown) => ({
@@ -30,32 +33,65 @@ mock.module("../daemon/handlers/shared.js", () => ({
   }),
 }));
 
+// The handler imports processMessage directly — provide a controllable mock so
+// background dispatch doesn't attempt a real agent loop (no LLM provider in tests).
+// Tests that need a custom processMessage can override via setTestProcessMessage().
+let _testProcessMessage: ((...args: unknown[]) => unknown) | undefined;
+
+function setTestProcessMessage(fn: (...args: any[]) => any): void {
+  _testProcessMessage = fn;
+}
+
+mock.module("../daemon/process-message.js", () => ({
+  // Only processMessage is imported by inbound-message-handler; stub the rest.
+  resolveTurnChannel: () => "telegram",
+  resolveTurnInterface: () => "telegram",
+  prepareConversationForMessage: async () => ({}),
+  processMessage: (...args: unknown[]) => {
+    if (_testProcessMessage) return _testProcessMessage(...args);
+    return Promise.resolve({ messageId: "mock-msg-1" });
+  },
+  processMessageInBackground: async () => ({ messageId: "mock-bg" }),
+}));
+
+// Approval generators require a configured LLM provider. Expose module-level
+// overrides so individual tests can inject custom generators (e.g. conversation
+// engine mocks) while defaulting to undefined for the plain-text matching path.
+let _testApprovalCopyGenerator: unknown = undefined;
+let _testApprovalConversationGenerator: unknown = undefined;
+
+function setTestApprovalConversationGenerator(gen: unknown): void {
+  _testApprovalConversationGenerator = gen;
+}
+
+mock.module("../daemon/approval-generators.js", () => ({
+  createApprovalCopyGenerator: () => _testApprovalCopyGenerator,
+  createApprovalConversationGenerator: () => _testApprovalConversationGenerator,
+}));
+
 import { upsertContact } from "../contacts/contact-store.js";
-import { createGuardianBinding } from "../contacts/contacts-write.js";
 import type { Conversation } from "../daemon/conversation.js";
 import {
   createCanonicalGuardianDelivery,
   createCanonicalGuardianRequest,
   getCanonicalGuardianRequest,
 } from "../memory/canonical-guardian-store.js";
-import { getDb, initializeDb, resetDb, resetTestTables } from "../memory/db.js";
+import { getDb, resetDb } from "../memory/db-connection.js";
+import { initializeDb } from "../memory/db-init.js";
 import * as deliveryChannels from "../memory/delivery-channels.js";
 import {
   createApprovalRequest,
   getAllPendingApprovalsByGuardianChat,
 } from "../memory/guardian-approvals.js";
-import {
-  conversations,
-  externalConversationBindings,
-} from "../memory/schema.js";
+import { resetTestTables } from "../memory/raw-query.js";
+import { conversations } from "../memory/schema.js";
 import { initAuthSigningKey } from "../runtime/auth/token-service.js";
 import * as gatewayClient from "../runtime/gateway-client.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
-import {
-  _setTestPollMaxWait,
-  handleChannelInbound,
-  sweepExpiredGuardianApprovals,
-} from "../runtime/routes/channel-routes.js";
+import { sweepExpiredGuardianApprovals } from "../runtime/routes/channel-guardian-routes.js";
+import { _setTestPollMaxWait } from "../runtime/routes/channel-route-shared.js";
+import { handleChannelInbound } from "./helpers/channel-test-adapter.js";
+import { createGuardianBinding } from "./helpers/create-guardian-binding.js";
 
 initializeDb();
 initAuthSigningKey(Buffer.from("test-signing-key-at-least-32-bytes-long"));
@@ -124,13 +160,13 @@ function registerPendingInteraction(
   },
 ): ReturnType<typeof mock> {
   const handleConfirmationResponse = mock(() => {});
-  const mockSession = {
+  const _mockSession = {
     handleConfirmationResponse,
     ensureActorScopedHistory: async () => {},
   } as unknown as Conversation;
+  _conversationMocks.set(conversationId, _mockSession);
 
   pendingInteractions.register(requestId, {
-    conversation: mockSession,
     conversationId,
     kind: "confirmation",
     confirmationDetails: {
@@ -206,6 +242,9 @@ beforeEach(() => {
   resetTables();
   ensureTestContact();
   noopProcessMessage.mockClear();
+  _testProcessMessage = undefined;
+  _testApprovalCopyGenerator = undefined;
+  _testApprovalConversationGenerator = undefined;
 });
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -983,141 +1022,6 @@ describe("plain-text channel approval decisions", () => {
 });
 
 // ═══════════════════════════════════════════════════════════════════════════
-// 16. Guardian verify intercept
-// ═══════════════════════════════════════════════════════════════════════════
-
-describe("telegram guardian verify intercept", () => {
-  test("verification code reply works with sourceChannel telegram", async () => {
-    const { createInboundVerificationSession } =
-      await import("../runtime/channel-verification-service.js");
-    const { secret } = createInboundVerificationSession("telegram");
-
-    const deliverSpy = spyOn(
-      gatewayClient,
-      "deliverChannelReply",
-    ).mockResolvedValue({ ok: true });
-
-    const req = new Request("http://localhost/channels/inbound", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        sourceChannel: "telegram",
-        interface: "telegram",
-        conversationExternalId: "tg-chat-verify",
-        externalMessageId: `msg-${Date.now()}-${Math.random()}`,
-        content: secret,
-        actorExternalId: "tg-user-42",
-        replyCallbackUrl: "https://gateway.test/deliver",
-      }),
-    });
-
-    const res = await handleChannelInbound(req, noopProcessMessage);
-    const body = (await res.json()) as Record<string, unknown>;
-
-    expect(body.accepted).toBe(true);
-    expect(body.verificationOutcome).toBe("verified");
-
-    expect(deliverSpy).toHaveBeenCalled();
-    const replyArgs = deliverSpy.mock.calls[0];
-    const replyPayload = replyArgs[1] as { chatId: string; text: string };
-    expect(replyPayload.chatId).toBe("tg-chat-verify");
-    expect(typeof replyPayload.text).toBe("string");
-    expect(replyPayload.text.toLowerCase()).toContain("guardian");
-    expect(replyPayload.text.toLowerCase()).toContain("verif");
-
-    deliverSpy.mockRestore();
-  });
-
-  test("invalid verification code returns failed via telegram", async () => {
-    const { createInboundVerificationSession } =
-      await import("../runtime/channel-verification-service.js");
-    // Ensure there is a pending challenge so bare-code verification is intercepted.
-    createInboundVerificationSession("telegram");
-
-    const deliverSpy = spyOn(
-      gatewayClient,
-      "deliverChannelReply",
-    ).mockResolvedValue({ ok: true });
-
-    const req = new Request("http://localhost/channels/inbound", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        sourceChannel: "telegram",
-        interface: "telegram",
-        conversationExternalId: "tg-chat-verify-fail",
-        externalMessageId: `msg-${Date.now()}-${Math.random()}`,
-        content: "000000",
-        actorExternalId: "tg-user-43",
-        replyCallbackUrl: "https://gateway.test/deliver",
-      }),
-    });
-
-    const res = await handleChannelInbound(req, noopProcessMessage);
-    const body = (await res.json()) as Record<string, unknown>;
-
-    expect(body.accepted).toBe(true);
-    expect(body.verificationOutcome).toBe("failed");
-
-    expect(deliverSpy).toHaveBeenCalled();
-    const replyArgs = deliverSpy.mock.calls[0];
-    const replyPayload = replyArgs[1] as { chatId: string; text: string };
-    expect(typeof replyPayload.text).toBe("string");
-    expect(replyPayload.text.toLowerCase()).toContain("verif");
-    expect(replyPayload.text.toLowerCase()).toContain("invalid");
-
-    deliverSpy.mockRestore();
-  });
-
-  test("64-char hex verification codes are intercepted when a pending challenge exists", async () => {
-    const { createHash, randomBytes } = await import("node:crypto");
-    const { createInboundSession } =
-      await import("../memory/channel-verification-sessions.js");
-
-    const secret = randomBytes(32).toString("hex");
-    const challengeHash = createHash("sha256").update(secret).digest("hex");
-    createInboundSession({
-      id: `challenge-hex-${Date.now()}`,
-      channel: "telegram",
-      challengeHash,
-      expiresAt: Date.now() + 600_000,
-    });
-
-    let processMessageCalled = false;
-    const processMessage = async () => {
-      processMessageCalled = true;
-      return { messageId: "msg-hex-not-verify" };
-    };
-
-    const req = new Request("http://localhost/channels/inbound", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        sourceChannel: "telegram",
-        interface: "telegram",
-        conversationExternalId: "tg-chat-hex-message",
-        externalMessageId: `msg-${Date.now()}-${Math.random()}`,
-        content: secret,
-        actorExternalId: "tg-user-hex",
-        replyCallbackUrl: "https://gateway.test/deliver",
-      }),
-    });
-
-    const res = await handleChannelInbound(req, processMessage);
-    const body = (await res.json()) as Record<string, unknown>;
-
-    expect(body.accepted).toBe(true);
-    expect(body.verificationOutcome).toBe("verified");
-    expect(processMessageCalled).toBe(false);
-  });
-});
-
 // ═══════════════════════════════════════════════════════════════════════════
 // 21. Guardian decision scoping — callback for older request
 // ═══════════════════════════════════════════════════════════════════════════
@@ -1262,6 +1166,7 @@ describe("ambiguous plain-text decision with multiple pending requests", () => {
       disposition: "keep_pending" as const,
       replyText: "You have 2 pending requests. Which one?",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     // Guardian sends plain-text "yes" — ambiguous because two approvals are pending
     const req = makeInboundRequest({
@@ -1275,7 +1180,6 @@ describe("ambiguous plain-text decision with multiple pending requests", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1333,7 +1237,7 @@ describe("expired guardian approval auto-denies via sweep", () => {
     });
 
     // Run the sweep
-    sweepExpiredGuardianApprovals("https://gateway.test", () => "token");
+    sweepExpiredGuardianApprovals();
 
     // Wait for async notifications
     await new Promise((resolve) => setTimeout(resolve, 10));
@@ -1361,7 +1265,7 @@ describe("expired guardian approval auto-denies via sweep", () => {
     // Verify the delivery URL is constructed per-channel
     const allDeliverCalls = deliverSpy.mock.calls;
     for (const call of allDeliverCalls) {
-      expect(call[0]).toBe("https://gateway.test/deliver/telegram");
+      expect(call[0]).toBe("/deliver/telegram");
     }
 
     deliverSpy.mockRestore();
@@ -1391,7 +1295,7 @@ describe("expired guardian approval auto-denies via sweep", () => {
       expiresAt: Date.now() + 300_000, // still valid
     });
 
-    sweepExpiredGuardianApprovals("https://gateway.test", () => "token");
+    sweepExpiredGuardianApprovals();
 
     await new Promise((resolve) => setTimeout(resolve, 10));
 
@@ -1433,157 +1337,6 @@ describe("deliver-once idempotency guard", () => {
   });
 });
 
-// ═══════════════════════════════════════════════════════════════════════════
-// 26. Assistant-scoped guardian verification via handleChannelInbound
-// ═══════════════════════════════════════════════════════════════════════════
-
-describe("assistant-scoped guardian verification via handleChannelInbound", () => {
-  test("verification code uses the threaded assistantId (default: self)", async () => {
-    const { createInboundVerificationSession } =
-      await import("../runtime/channel-verification-service.js");
-    const { secret } = createInboundVerificationSession("telegram");
-
-    const deliverSpy = spyOn(
-      gatewayClient,
-      "deliverChannelReply",
-    ).mockResolvedValue({ ok: true });
-
-    const req = makeInboundRequest({
-      content: secret,
-      actorExternalId: "user-default-asst",
-    });
-
-    const res = await handleChannelInbound(req, noopProcessMessage);
-    const body = (await res.json()) as Record<string, unknown>;
-
-    expect(body.accepted).toBe(true);
-    expect(body.verificationOutcome).toBe("verified");
-
-    deliverSpy.mockRestore();
-  });
-
-  test("verification code with explicit assistantId resolves against canonical scope", async () => {
-    const { createInboundVerificationSession } =
-      await import("../runtime/channel-verification-service.js");
-    const { getGuardianBinding } =
-      await import("../runtime/channel-verification-service.js");
-
-    // All assistant IDs canonicalize to 'self' in the single-tenant daemon
-    const { secret } = createInboundVerificationSession("telegram");
-
-    const deliverSpy = spyOn(
-      gatewayClient,
-      "deliverChannelReply",
-    ).mockResolvedValue({ ok: true });
-
-    const req = makeInboundRequest({
-      content: secret,
-      actorExternalId: "user-for-asst-x",
-    });
-
-    const res = await handleChannelInbound(
-      req,
-      noopProcessMessage,
-      "asst-route-X",
-    );
-    const body = (await res.json()) as Record<string, unknown>;
-
-    expect(body.accepted).toBe(true);
-    expect(body.verificationOutcome).toBe("verified");
-
-    const bindingX = getGuardianBinding("self", "telegram");
-    expect(bindingX).not.toBeNull();
-    expect(bindingX!.guardianExternalUserId).toBe("user-for-asst-x");
-
-    deliverSpy.mockRestore();
-  });
-
-  test("all assistant IDs share canonical scope for verification", async () => {
-    const { createInboundVerificationSession } =
-      await import("../runtime/channel-verification-service.js");
-
-    // Both IDs canonicalize to 'self', so the challenge is found
-    const { secret } = createInboundVerificationSession("telegram");
-
-    const deliverSpy = spyOn(
-      gatewayClient,
-      "deliverChannelReply",
-    ).mockResolvedValue({ ok: true });
-
-    const req = makeInboundRequest({
-      content: secret,
-      actorExternalId: "user-cross-test",
-    });
-
-    const res = await handleChannelInbound(
-      req,
-      noopProcessMessage,
-      "asst-B-cross",
-    );
-    const body = (await res.json()) as Record<string, unknown>;
-
-    expect(body.accepted).toBe(true);
-    expect(body.verificationOutcome).toBe("verified");
-
-    deliverSpy.mockRestore();
-  });
-
-  test("inbound with explicit assistantId does not mutate existing external bindings", async () => {
-    upsertContact({
-      displayName: "Incoming User",
-      channels: [
-        {
-          type: "telegram",
-          address: "incoming-user",
-          externalUserId: "incoming-user",
-          status: "active",
-          policy: "allow",
-        },
-      ],
-    });
-
-    const db = getDb();
-    const now = Date.now();
-    ensureConversation("conv-existing-binding");
-    db.insert(externalConversationBindings)
-      .values({
-        conversationId: "conv-existing-binding",
-        sourceChannel: "telegram",
-        externalChatId: "chat-existing-999",
-        externalUserId: "existing-user",
-        createdAt: now,
-        updatedAt: now,
-        lastInboundAt: now,
-      })
-      .run();
-
-    const req = makeInboundRequest({
-      content: "hello from non-self assistant",
-      actorExternalId: "incoming-user",
-    });
-
-    const res = await handleChannelInbound(
-      req,
-      noopProcessMessage,
-      "asst-non-self",
-    );
-    expect(res.status).toBe(200);
-
-    const binding = db
-      .select()
-      .from(externalConversationBindings)
-      .where(
-        eq(
-          externalConversationBindings.conversationId,
-          "conv-existing-binding",
-        ),
-      )
-      .get();
-    expect(binding).not.toBeNull();
-    expect(binding!.externalUserId).toBe("existing-user");
-  });
-});
-
 // Sections 28-29 (verifyGatewayOrigin / gatewayOriginSecret integration) removed:
 // gateway-origin proof is now handled by JWT auth — the gateway proves its
 // identity by minting a daemon-audience token with the shared signing key.
@@ -1631,6 +1384,7 @@ describe("conversational approval engine — standard path", () => {
       replyText:
         "There is a pending shell command. Would you like to approve or deny it?",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({ content: "what does this command do?" });
     const res = await handleChannelInbound(
@@ -1638,7 +1392,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1688,6 +1441,7 @@ describe("conversational approval engine — standard path", () => {
       disposition: "approve_once" as const,
       replyText: "Got it, approving the shell command.",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({ content: "yeah go ahead and run it" });
     const res = await handleChannelInbound(
@@ -1695,7 +1449,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1736,6 +1489,7 @@ describe("conversational approval engine — standard path", () => {
       disposition: "reject" as const,
       replyText: "No problem, I've cancelled the shell command.",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({ content: "nevermind, don't run that" });
     const res = await handleChannelInbound(
@@ -1743,7 +1497,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1782,6 +1535,7 @@ describe("conversational approval engine — standard path", () => {
       disposition: "keep_pending" as const,
       replyText: "This should not be called",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "",
@@ -1793,7 +1547,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1851,6 +1604,7 @@ describe("guardian conversational approval via conversation engine", () => {
       disposition: "keep_pending" as const,
       replyText: "Could you clarify which action you want me to approve?",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "hmm what does this do?",
@@ -1863,7 +1617,6 @@ describe("guardian conversational approval via conversation engine", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1931,6 +1684,7 @@ describe("guardian conversational approval via conversation engine", () => {
       disposition: "approve_once" as const,
       replyText: "Approved! The shell command will proceed.",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "yes go ahead and run it",
@@ -1943,7 +1697,6 @@ describe("guardian conversational approval via conversation engine", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1960,18 +1713,17 @@ describe("guardian conversational approval via conversation engine", () => {
     );
     expect(pending).toHaveLength(0);
 
-    // The engine context excluded approve_always for guardians
+    // The engine context only allows approve_once and reject
     const callCtx = mockConversationGenerator.mock.calls[0][0] as Record<
       string,
       unknown
     >;
     expect(callCtx.allowedActions).toEqual(["approve_once", "reject"]);
-    expect(callCtx.allowedActions as string[]).not.toContain("approve_always");
 
     deliverSpy.mockRestore();
   });
 
-  test("guardian callback button approve_always is downgraded to approve_once", async () => {
+  test("guardian callback button approve_always is mapped to approve_once (backward compat)", async () => {
     createGuardianBinding({
       channel: "telegram",
       guardianExternalUserId: "guardian-dg-user",
@@ -2005,7 +1757,8 @@ describe("guardian conversational approval via conversation engine", () => {
       expiresAt: Date.now() + 300_000,
     });
 
-    // Guardian clicks approve_always via callback button
+    // Guardian sends an approve_always callback — legacy action is mapped to
+    // approve_once by LEGACY_CALLBACK_MAP for backward compat with in-flight buttons.
     const req = makeInboundRequest({
       content: "",
       conversationExternalId: "guardian-dg-chat",
@@ -2016,11 +1769,10 @@ describe("guardian conversational approval via conversation engine", () => {
     const res = await handleChannelInbound(req, noopProcessMessage, "self");
     const body = (await res.json()) as Record<string, unknown>;
 
+    // The legacy action is canonicalized to approve_once — the pending
+    // interaction IS resolved (backward compat).
     expect(body.accepted).toBe(true);
-    expect(body.approval).toBe("guardian_decision_applied");
-
-    // approve_always should have been downgraded to approve_once ('allow')
-    expect(sessionMock).toHaveBeenCalledWith("req-gdg-1", "allow");
+    expect(sessionMock).toHaveBeenCalled();
 
     deliverSpy.mockRestore();
   });
@@ -2080,6 +1832,7 @@ describe("guardian conversational approval via conversation engine", () => {
       disposition: "keep_pending" as const,
       replyText: "You have 2 pending requests: shell and file_edit. Which one?",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "approve it",
@@ -2092,7 +1845,6 @@ describe("guardian conversational approval via conversation engine", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2162,6 +1914,7 @@ describe("keep_pending remains conversational — standard path", () => {
       disposition: "keep_pending" as const,
       replyText: "Before deciding, can you confirm the intent?",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({ content: "approve" });
     const res = await handleChannelInbound(
@@ -2169,7 +1922,6 @@ describe("keep_pending remains conversational — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2225,6 +1977,7 @@ describe("keep_pending remains conversational — guardian path", () => {
       disposition: "keep_pending" as const,
       replyText: "Which run are you approving?",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const guardianReq = makeInboundRequest({
       content: "yes",
@@ -2236,7 +1989,6 @@ describe("keep_pending remains conversational — guardian path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2327,6 +2079,7 @@ describe("requester cancel of guardian-gated pending request", () => {
       disposition: "reject" as const,
       replyText: "Cancelling this request now.",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "deny",
@@ -2338,7 +2091,6 @@ describe("requester cancel of guardian-gated pending request", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2408,6 +2160,7 @@ describe("requester cancel of guardian-gated pending request", () => {
       disposition: "reject" as const,
       replyText: "OK, I have cancelled the pending request.",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "actually never mind, cancel it",
@@ -2419,7 +2172,6 @@ describe("requester cancel of guardian-gated pending request", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2483,6 +2235,7 @@ describe("requester cancel of guardian-gated pending request", () => {
       disposition: "keep_pending" as const,
       replyText: "Still waiting.",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({
       content: "what is happening?",
@@ -2494,7 +2247,6 @@ describe("requester cancel of guardian-gated pending request", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2607,6 +2359,7 @@ describe("engine decision race condition — standard path", () => {
         replyText: "Approved! Running the command now.",
       };
     });
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const req = makeInboundRequest({ content: "go ahead" });
     const res = await handleChannelInbound(
@@ -2614,7 +2367,6 @@ describe("engine decision race condition — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2679,6 +2431,7 @@ describe("engine decision race condition — guardian path", () => {
         replyText: "Approved the request.",
       };
     });
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const guardianReq = makeInboundRequest({
       content: "approve it",
@@ -2690,7 +2443,6 @@ describe("engine decision race condition — guardian path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2874,10 +2626,8 @@ describe("background channel processing approval prompts", () => {
       externalMessageId: "msg-bg-1",
     });
 
-    const res = await handleChannelInbound(
-      req,
-      processMessage as unknown as typeof noopProcessMessage,
-    );
+    setTestProcessMessage(processMessage);
+    const res = await handleChannelInbound(req);
     const body = (await res.json()) as Record<string, unknown>;
     expect(body.accepted).toBe(true);
 
@@ -2942,10 +2692,8 @@ describe("background channel processing approval prompts", () => {
       externalMessageId: "msg-bg-format-1",
     });
 
-    const res = await handleChannelInbound(
-      req,
-      processMessage as unknown as typeof noopProcessMessage,
-    );
+    setTestProcessMessage(processMessage);
+    const res = await handleChannelInbound(req);
     const body = (await res.json()) as Record<string, unknown>;
     expect(body.accepted).toBe(true);
 
@@ -2991,10 +2739,8 @@ describe("background channel processing approval prompts", () => {
       externalMessageId: "msg-ng-1",
     });
 
-    const res = await handleChannelInbound(
-      req,
-      processMessage as unknown as typeof noopProcessMessage,
-    );
+    setTestProcessMessage(processMessage);
+    const res = await handleChannelInbound(req);
     const body = (await res.json()) as Record<string, unknown>;
     expect(body.accepted).toBe(true);
 
@@ -3047,10 +2793,8 @@ describe("background channel processing approval prompts", () => {
       externalMessageId: "msg-bg-unverified-1",
     });
 
-    const res = await handleChannelInbound(
-      req,
-      processMessage as unknown as typeof noopProcessMessage,
-    );
+    setTestProcessMessage(processMessage);
+    const res = await handleChannelInbound(req);
     const body = (await res.json()) as Record<string, unknown>;
     expect(body.accepted).toBe(true);
 
@@ -3255,6 +2999,7 @@ describe("trusted-contact self-approval blocked before guardian approval row exi
       disposition: "approve_once" as const,
       replyText: "Approved!",
     }));
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     // Trusted contact sends "yes" to try to self-approve
     const req = makeInboundRequest({
@@ -3267,7 +3012,6 @@ describe("trusted-contact self-approval blocked before guardian approval row exi
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;