@vellumai/assistant 0.6.5 → 0.7.0

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

@@ -30,6 +30,42 @@ 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",
+  makePendingInteractionRegistrar: () => () => {},
+  prepareConversationForMessage: async () => ({}),
+  processMessage: (...args: unknown[]) => {
+    if (_testProcessMessage) return _testProcessMessage(...args);
+    return Promise.resolve({ messageId: "mock-msg-1" });
+  },
+}));
+
+// 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";
@@ -38,12 +74,14 @@ import {
   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 { resetTestTables } from "../memory/raw-query.js";
 import {
   conversations,
   externalConversationBindings,
@@ -51,11 +89,9 @@ import {
 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";
 
 initializeDb();
 initAuthSigningKey(Buffer.from("test-signing-key-at-least-32-bytes-long"));
@@ -206,6 +242,9 @@ beforeEach(() => {
   resetTables();
   ensureTestContact();
   noopProcessMessage.mockClear();
+  _testProcessMessage = undefined;
+  _testApprovalCopyGenerator = undefined;
+  _testApprovalConversationGenerator = undefined;
 });
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -1262,6 +1301,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 +1315,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 +1372,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 +1400,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 +1430,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));
 
@@ -1631,6 +1670,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 +1678,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1688,6 +1727,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 +1735,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1736,6 +1775,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 +1783,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1782,6 +1821,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 +1833,6 @@ describe("conversational approval engine — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1851,6 +1890,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 +1903,6 @@ describe("guardian conversational approval via conversation engine", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1931,6 +1970,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 +1983,6 @@ describe("guardian conversational approval via conversation engine", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -1960,18 +1999,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 +2043,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 +2055,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 +2118,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 +2131,6 @@ describe("guardian conversational approval via conversation engine", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2162,6 +2200,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 +2208,6 @@ describe("keep_pending remains conversational — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2225,6 +2263,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 +2275,6 @@ describe("keep_pending remains conversational — guardian path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2327,6 +2365,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 +2377,6 @@ describe("requester cancel of guardian-gated pending request", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2408,6 +2446,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 +2458,6 @@ describe("requester cancel of guardian-gated pending request", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2483,6 +2521,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 +2533,6 @@ describe("requester cancel of guardian-gated pending request", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2607,6 +2645,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 +2653,6 @@ describe("engine decision race condition — standard path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2679,6 +2717,7 @@ describe("engine decision race condition — guardian path", () => {
         replyText: "Approved the request.",
       };
     });
+    setTestApprovalConversationGenerator(mockConversationGenerator);
 
     const guardianReq = makeInboundRequest({
       content: "approve it",
@@ -2690,7 +2729,6 @@ describe("engine decision race condition — guardian path", () => {
       noopProcessMessage,
       "self",
       undefined,
-      mockConversationGenerator,
     );
     const body = (await res.json()) as Record<string, unknown>;
 
@@ -2874,10 +2912,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 +2978,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 +3025,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 +3079,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 +3285,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 +3298,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>;
 

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

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
+import type { ApprovalAction } from "../runtime/channel-approval-types.js";
 import { parseCallbackData } from "../runtime/routes/channel-route-shared.js";
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -9,9 +10,6 @@ import { parseCallbackData } from "../runtime/routes/channel-route-shared.js";
 describe("parseCallbackData", () => {
   test.each([
     ["apr:req-123:approve_once", "approve_once"],
-    ["apr:req-123:approve_10m", "approve_10m"],
-    ["apr:req-123:approve_conversation", "approve_conversation"],
-    ["apr:req-123:approve_always", "approve_always"],
     ["apr:req-123:reject", "reject"],
   ] as const)('parses "%s" as action "%s"', (data, expectedAction) => {
     const result = parseCallbackData(data);
@@ -21,11 +19,15 @@ describe("parseCallbackData", () => {
     expect(result!.source).toBe("telegram_button");
   });
 
-  test("parses whatsapp source channel", () => {
-    const result = parseCallbackData("apr:req-456:approve_10m", "whatsapp");
+  test.each<[string, string]>([
+    ["apr:req-123:approve_10m", "approve_once"],
+    ["apr:req-123:approve_conversation", "approve_once"],
+    ["apr:req-123:approve_always", "approve_once"],
+  ])('maps legacy action "%s" to %s (backward compat)', (data, expectedAction) => {
+    const result = parseCallbackData(data);
     expect(result).not.toBeNull();
-    expect(result!.action).toBe("approve_10m");
-    expect(result!.source).toBe("whatsapp_button");
+    expect(result!.action).toBe(expectedAction as ApprovalAction);
+    expect(result!.requestId).toBe("req-123");
   });
 
   test("parses slack source channel", () => {