@vellumai/assistant 0.6.5 → 0.7.0

package/src/runtime/routes/inbound-stages/acl-enforcement.ts

@@ -18,8 +18,8 @@ import type {
   ContactChannel,
   ContactWithChannels,
 } from "../../../contacts/types.js";
-import * as deliveryCrud from "../../../memory/delivery-crud.js";
-import * as deliveryStatus from "../../../memory/delivery-status.js";
+import { deleteInbound, recordInbound } from "../../../memory/delivery-crud.js";
+import { markProcessed } from "../../../memory/delivery-status.js";
 import {
   findByInviteCodeHash,
   findByInviteCodeHashAnyChannel,
@@ -38,7 +38,6 @@ import {
   resolveBootstrapToken,
 } from "../../channel-verification-service.js";
 import { deliverChannelReply } from "../../gateway-client.js";
-import { ensureVellumGuardianBinding } from "../../guardian-vellum-migration.js";
 import {
   redeemInvite,
   redeemInviteByCode,
@@ -54,11 +53,13 @@ const log = getLogger("runtime-http");
  * contact, matching the same strategy used by `notifyGuardianOfAccessRequest`.
  * This prevents stale or cross-assistant contacts from leaking a wrong name.
  */
-function resolveGuardianLabel(
-  sourceChannel: ChannelId,
-  canonicalAssistantId: string,
-): string {
-  const anchoredPrincipalId = ensureVellumGuardianBinding(canonicalAssistantId);
+function resolveGuardianLabel(sourceChannel: ChannelId): string {
+  const vellumGuardian = findGuardianForChannel("vellum");
+  const anchoredPrincipalId = vellumGuardian?.contact.principalId;
+
+  if (!anchoredPrincipalId) {
+    return resolveGuardianName(undefined);
+  }
 
   // Try source-channel guardian, but only accept it when the principal
   // matches the assistant's anchor.
@@ -70,17 +71,7 @@ function resolveGuardianLabel(
     return resolveGuardianName(sourceGuardian.contact.displayName);
   }
 
-  // Fall back to the vellum-channel guardian with the same anchor check.
-  const vellumGuardian = findGuardianForChannel("vellum");
-  if (
-    vellumGuardian &&
-    vellumGuardian.contact.principalId === anchoredPrincipalId
-  ) {
-    return resolveGuardianName(vellumGuardian.contact.displayName);
-  }
-
-  // No anchored guardian found — use generic fallback.
-  return resolveGuardianName(undefined);
+  return resolveGuardianName(vellumGuardian.contact.displayName);
 }
 
 // ---------------------------------------------------------------------------
@@ -99,7 +90,6 @@ export interface AclEnforcementParams {
   actorDisplayName: string | undefined;
   actorUsername: string | undefined;
   replyCallbackUrl: string | undefined;
-  mintBearerToken: () => string;
   assistantId: string;
   externalMessageId: string;
 }
@@ -113,7 +103,7 @@ export type ResolvedMember = {
 export interface AclResult {
   resolvedMember: ResolvedMember | null;
   /** When set, the caller must return this response immediately. */
-  earlyResponse?: Response;
+  earlyResponse?: Record<string, unknown>;
   /**
    * Parsed guardian verification code from the message content, if any.
    * Surfaced here so downstream verification intercept logic can use it
@@ -178,7 +168,6 @@ export async function enforceIngressAcl(
     actorDisplayName,
     actorUsername,
     replyCallbackUrl,
-    mintBearerToken,
     assistantId,
     externalMessageId,
   } = params;
@@ -301,7 +290,6 @@ export async function enforceIngressAcl(
           senderName: actorDisplayName,
           senderUsername: actorUsername,
           replyCallbackUrl,
-          bearerToken: mintBearerToken(),
           assistantId,
           canonicalAssistantId,
         });
@@ -327,7 +315,6 @@ export async function enforceIngressAcl(
           senderName: actorDisplayName,
           senderUsername: actorUsername,
           replyCallbackUrl,
-          bearerToken: mintBearerToken(),
           assistantId,
           canonicalAssistantId,
         });
@@ -392,15 +379,11 @@ export async function enforceIngressAcl(
                 // Malformed URL — use as-is
               }
               try {
-                await deliverChannelReply(
-                  dmCallbackUrl,
-                  {
-                    chatId: senderUserId,
-                    text: `I don't recognize you yet! I've let ${resolveGuardianLabel(sourceChannel, canonicalAssistantId)} know you're trying to reach me. They'll need to share a 6-digit verification code with you — ask them directly if you know them. Once you have the code, reply here with it.`,
-                    assistantId,
-                  },
-                  mintBearerToken(),
-                );
+                await deliverChannelReply(dmCallbackUrl, {
+                  chatId: senderUserId,
+                  text: `I don't recognize you yet! I've let ${resolveGuardianLabel(sourceChannel)} know you're trying to reach me. They'll need to share a 6-digit verification code with you — ask them directly if you know them. Once you have the code, reply here with it.`,
+                  assistantId,
+                });
               } catch (err) {
                 log.error(
                   { err, senderUserId },
@@ -411,7 +394,7 @@ export async function enforceIngressAcl(
 
             return {
               resolvedMember: null,
-              earlyResponse: Response.json({
+              earlyResponse: ({
                 accepted: true,
                 denied: true,
                 reason: "verification_challenge_sent",
@@ -448,7 +431,7 @@ export async function enforceIngressAcl(
         }
 
         const replyText = guardianNotified
-          ? `Hmm looks like you don't have access to talk to me. I'll let ${resolveGuardianLabel(sourceChannel, canonicalAssistantId)} know you tried talking to me and get back to you.`
+          ? `Hmm looks like you don't have access to talk to me. I'll let ${resolveGuardianLabel(sourceChannel)} know you tried talking to me and get back to you.`
           : "Sorry, you haven't been approved to message this assistant.";
         let replyDelivered = false;
         if (replyCallbackUrl) {
@@ -463,11 +446,7 @@ export async function enforceIngressAcl(
             replyPayload.user = (canonicalSenderId ?? rawSenderId)!;
           }
           try {
-            await deliverChannelReply(
-              replyCallbackUrl,
-              replyPayload,
-              mintBearerToken(),
-            );
+            await deliverChannelReply(replyCallbackUrl, replyPayload);
             replyDelivered = true;
           } catch (err) {
             log.error(
@@ -479,7 +458,7 @@ export async function enforceIngressAcl(
 
         return {
           resolvedMember: null,
-          earlyResponse: Response.json({
+          earlyResponse: ({
             accepted: true,
             denied: true,
             reason: "not_a_member",
@@ -557,7 +536,6 @@ export async function enforceIngressAcl(
             senderName: actorDisplayName,
             senderUsername: actorUsername,
             replyCallbackUrl,
-            bearerToken: mintBearerToken(),
             assistantId,
             canonicalAssistantId,
           });
@@ -588,7 +566,6 @@ export async function enforceIngressAcl(
             senderName: actorDisplayName,
             senderUsername: actorUsername,
             replyCallbackUrl,
-            bearerToken: mintBearerToken(),
             assistantId,
             canonicalAssistantId,
           });
@@ -659,15 +636,11 @@ export async function enforceIngressAcl(
                   // Malformed URL — use as-is
                 }
                 try {
-                  await deliverChannelReply(
-                    dmCallbackUrl,
-                    {
-                      chatId: senderUserId,
-                      text: `I don't recognize you yet! I've let ${resolveGuardianLabel(sourceChannel, canonicalAssistantId)} know you're trying to reach me. They'll need to share a 6-digit verification code with you — ask them directly if you know them. Once you have the code, reply here with it.`,
-                      assistantId,
-                    },
-                    mintBearerToken(),
-                  );
+                  await deliverChannelReply(dmCallbackUrl, {
+                    chatId: senderUserId,
+                    text: `I don't recognize you yet! I've let ${resolveGuardianLabel(sourceChannel)} know you're trying to reach me. They'll need to share a 6-digit verification code with you — ask them directly if you know them. Once you have the code, reply here with it.`,
+                    assistantId,
+                  });
                 } catch (err) {
                   log.error(
                     { err, senderUserId },
@@ -678,7 +651,7 @@ export async function enforceIngressAcl(
 
               return {
                 resolvedMember,
-                earlyResponse: Response.json({
+                earlyResponse: ({
                   accepted: true,
                   denied: true,
                   reason: "verification_challenge_sent",
@@ -720,7 +693,7 @@ export async function enforceIngressAcl(
           }
 
           const inactiveReplyText = guardianNotified
-            ? `Hmm looks like you don't have access to talk to me. I'll let ${resolveGuardianLabel(sourceChannel, canonicalAssistantId)} know you tried talking to me and get back to you.`
+            ? `Hmm looks like you don't have access to talk to me. I'll let ${resolveGuardianLabel(sourceChannel)} know you tried talking to me and get back to you.`
             : "Sorry, you haven't been approved to message this assistant.";
           let inactiveReplyDelivered = false;
           if (replyCallbackUrl) {
@@ -740,11 +713,7 @@ export async function enforceIngressAcl(
               inactiveReplyPayload.user = (canonicalSenderId ?? rawSenderId)!;
             }
             try {
-              await deliverChannelReply(
-                replyCallbackUrl,
-                inactiveReplyPayload,
-                mintBearerToken(),
-              );
+              await deliverChannelReply(replyCallbackUrl, inactiveReplyPayload);
               inactiveReplyDelivered = true;
             } catch (err) {
               log.error(
@@ -755,7 +724,7 @@ export async function enforceIngressAcl(
           }
           return {
             resolvedMember,
-            earlyResponse: Response.json({
+            earlyResponse: ({
               accepted: true,
               denied: true,
               reason: `member_${channelStatusToMemberStatus(resolvedMember.channel.status)}`,
@@ -785,11 +754,7 @@ export async function enforceIngressAcl(
             denyPayload.user = (canonicalSenderId ?? rawSenderId)!;
           }
           try {
-            await deliverChannelReply(
-              replyCallbackUrl,
-              denyPayload,
-              mintBearerToken(),
-            );
+            await deliverChannelReply(replyCallbackUrl, denyPayload);
             denyReplyDelivered = true;
           } catch (err) {
             log.error(
@@ -800,7 +765,7 @@ export async function enforceIngressAcl(
         }
         return {
           resolvedMember,
-          earlyResponse: Response.json({
+          earlyResponse: ({
             accepted: true,
             denied: true,
             reason: "policy_deny",
@@ -842,10 +807,9 @@ async function handleInviteTokenIntercept(params: {
   senderName?: string;
   senderUsername?: string;
   replyCallbackUrl?: string;
-  bearerToken?: string;
   assistantId?: string;
   canonicalAssistantId: string;
-}): Promise<Response | null> {
+}): Promise<Record<string, unknown> | null> {
   const {
     rawToken,
     sourceChannel,
@@ -855,7 +819,6 @@ async function handleInviteTokenIntercept(params: {
     senderName,
     senderUsername,
     replyCallbackUrl,
-    bearerToken,
     assistantId,
     canonicalAssistantId,
   } = params;
@@ -865,7 +828,7 @@ async function handleInviteTokenIntercept(params: {
   // not be tracked: the first delivery redeems the invite and returns early,
   // then the retry finds an active member, passes ACL, and the raw
   // /start iv_<token> message leaks into the agent pipeline.
-  const dedupResult = deliveryCrud.recordInbound(
+  const dedupResult = recordInbound(
     sourceChannel,
     externalChatId,
     externalMessageId,
@@ -873,7 +836,7 @@ async function handleInviteTokenIntercept(params: {
   );
 
   if (dedupResult.duplicate) {
-    return Response.json({
+    return ({
       accepted: true,
       duplicate: true,
       eventId: dedupResult.eventId,
@@ -909,15 +872,11 @@ async function handleInviteTokenIntercept(params: {
     const replyText = getInviteRedemptionReply(outcome);
     if (replyCallbackUrl) {
       try {
-        await deliverChannelReply(
-          replyCallbackUrl,
-          {
-            chatId: externalChatId,
-            text: replyText,
-            assistantId,
-          },
-          bearerToken,
-        );
+        await deliverChannelReply(replyCallbackUrl, {
+          chatId: externalChatId,
+          text: replyText,
+          assistantId,
+        });
       } catch (err) {
         log.error(
           { err, externalChatId },
@@ -925,8 +884,8 @@ async function handleInviteTokenIntercept(params: {
         );
       }
     }
-    deliveryStatus.markProcessed(dedupResult.eventId);
-    return Response.json({
+    markProcessed(dedupResult.eventId);
+    return ({
       accepted: true,
       eventId: dedupResult.eventId,
       inviteRedemption: "already_member",
@@ -937,15 +896,11 @@ async function handleInviteTokenIntercept(params: {
 
   if (replyCallbackUrl) {
     try {
-      await deliverChannelReply(
-        replyCallbackUrl,
-        {
-          chatId: externalChatId,
-          text: replyText,
-          assistantId,
-        },
-        bearerToken,
-      );
+      await deliverChannelReply(replyCallbackUrl, {
+        chatId: externalChatId,
+        text: replyText,
+        assistantId,
+      });
     } catch (err) {
       log.error(
         { err, externalChatId },
@@ -955,8 +910,8 @@ async function handleInviteTokenIntercept(params: {
   }
 
   if (outcome.ok && outcome.type === "redeemed") {
-    deliveryStatus.markProcessed(dedupResult.eventId);
-    return Response.json({
+    markProcessed(dedupResult.eventId);
+    return ({
       accepted: true,
       eventId: dedupResult.eventId,
       inviteRedemption: "redeemed",
@@ -965,8 +920,8 @@ async function handleInviteTokenIntercept(params: {
   }
 
   // Failed redemption — inform the user and deny
-  deliveryStatus.markProcessed(dedupResult.eventId);
-  return Response.json({
+  markProcessed(dedupResult.eventId);
+  return ({
     accepted: true,
     eventId: dedupResult.eventId,
     denied: true,
@@ -995,10 +950,9 @@ async function handleInviteCodeIntercept(params: {
   senderName?: string;
   senderUsername?: string;
   replyCallbackUrl?: string;
-  bearerToken?: string;
   assistantId?: string;
   canonicalAssistantId: string;
-}): Promise<Response | null> {
+}): Promise<Record<string, unknown> | null> {
   const {
     code,
     sourceChannel,
@@ -1008,7 +962,6 @@ async function handleInviteCodeIntercept(params: {
     senderName,
     senderUsername,
     replyCallbackUrl,
-    bearerToken,
     assistantId,
     canonicalAssistantId,
   } = params;
@@ -1031,7 +984,7 @@ async function handleInviteCodeIntercept(params: {
     if (crossChannelInvite) {
       // Record inbound for dedup tracking — without this, duplicate webhook
       // deliveries would re-enter ACL and send the mismatch reply again.
-      const dedupResult = deliveryCrud.recordInbound(
+      const dedupResult = recordInbound(
         sourceChannel,
         externalChatId,
         externalMessageId,
@@ -1039,7 +992,7 @@ async function handleInviteCodeIntercept(params: {
       );
 
       if (dedupResult.duplicate) {
-        return Response.json({
+        return ({
           accepted: true,
           duplicate: true,
           eventId: dedupResult.eventId,
@@ -1049,15 +1002,11 @@ async function handleInviteCodeIntercept(params: {
       const mismatchReply = "This invite is not valid for this channel.";
       if (replyCallbackUrl) {
         try {
-          await deliverChannelReply(
-            replyCallbackUrl,
-            {
-              chatId: externalChatId,
-              text: mismatchReply,
-              assistantId,
-            },
-            bearerToken,
-          );
+          await deliverChannelReply(replyCallbackUrl, {
+            chatId: externalChatId,
+            text: mismatchReply,
+            assistantId,
+          });
         } catch (err) {
           log.error(
             { err, externalChatId },
@@ -1065,8 +1014,8 @@ async function handleInviteCodeIntercept(params: {
           );
         }
       }
-      deliveryStatus.markProcessed(dedupResult.eventId);
-      return Response.json({
+      markProcessed(dedupResult.eventId);
+      return ({
         accepted: true,
         eventId: dedupResult.eventId,
         denied: true,
@@ -1081,7 +1030,7 @@ async function handleInviteCodeIntercept(params: {
   // deliveries could slip through: the first delivery redeems the invite and
   // activates membership, then a retry finds an active member, passes ACL,
   // and the raw 6-digit message leaks into the agent pipeline.
-  const dedupResult = deliveryCrud.recordInbound(
+  const dedupResult = recordInbound(
     sourceChannel,
     externalChatId,
     externalMessageId,
@@ -1089,7 +1038,7 @@ async function handleInviteCodeIntercept(params: {
   );
 
   if (dedupResult.duplicate) {
-    return Response.json({
+    return ({
       accepted: true,
       duplicate: true,
       eventId: dedupResult.eventId,
@@ -1114,7 +1063,7 @@ async function handleInviteCodeIntercept(params: {
       { err, sourceChannel, externalChatId },
       "Invite code intercept: redemption threw, rolling back dedup record",
     );
-    deliveryCrud.deleteInbound(dedupResult.eventId);
+    deleteInbound(dedupResult.eventId);
     throw err;
   }
 
@@ -1134,15 +1083,11 @@ async function handleInviteCodeIntercept(params: {
     const replyText = getInviteRedemptionReply(outcome);
     if (replyCallbackUrl) {
       try {
-        await deliverChannelReply(
-          replyCallbackUrl,
-          {
-            chatId: externalChatId,
-            text: replyText,
-            assistantId,
-          },
-          bearerToken,
-        );
+        await deliverChannelReply(replyCallbackUrl, {
+          chatId: externalChatId,
+          text: replyText,
+          assistantId,
+        });
       } catch (err) {
         log.error(
           { err, externalChatId },
@@ -1150,8 +1095,8 @@ async function handleInviteCodeIntercept(params: {
         );
       }
     }
-    deliveryStatus.markProcessed(dedupResult.eventId);
-    return Response.json({
+    markProcessed(dedupResult.eventId);
+    return ({
       accepted: true,
       eventId: dedupResult.eventId,
       inviteRedemption: "already_member",
@@ -1162,15 +1107,11 @@ async function handleInviteCodeIntercept(params: {
 
   if (replyCallbackUrl) {
     try {
-      await deliverChannelReply(
-        replyCallbackUrl,
-        {
-          chatId: externalChatId,
-          text: replyText,
-          assistantId,
-        },
-        bearerToken,
-      );
+      await deliverChannelReply(replyCallbackUrl, {
+        chatId: externalChatId,
+        text: replyText,
+        assistantId,
+      });
     } catch (err) {
       log.error(
         { err, externalChatId },
@@ -1180,8 +1121,8 @@ async function handleInviteCodeIntercept(params: {
   }
 
   if (outcome.ok && outcome.type === "redeemed") {
-    deliveryStatus.markProcessed(dedupResult.eventId);
-    return Response.json({
+    markProcessed(dedupResult.eventId);
+    return ({
       accepted: true,
       eventId: dedupResult.eventId,
       inviteRedemption: "redeemed",
@@ -1190,8 +1131,8 @@ async function handleInviteCodeIntercept(params: {
   }
 
   // Failed redemption (expired, revoked, etc.) — inform and deny
-  deliveryStatus.markProcessed(dedupResult.eventId);
-  return Response.json({
+  markProcessed(dedupResult.eventId);
+  return ({
     accepted: true,
     eventId: dedupResult.eventId,
     denied: true,

package/src/runtime/routes/inbound-stages/background-dispatch.test.ts

@@ -20,7 +20,8 @@ mock.module("../../../memory/delivery-status.js", () => ({
   recordProcessingFailure: () => {},
 }));
 
-import type { TrustContext } from "../../../daemon/conversation-runtime-assembly.js";
+
+import type { TrustContext } from "../../../daemon/trust-context.js";
 import {
   clearThreadTs,
   getThreadTs,
@@ -109,7 +110,6 @@ describe("processChannelMessageInBackground — slack thread mapping", () => {
       // Callback URL has no threadTs query param → channel-root event
       // that would otherwise call `clearThreadTs`.
       replyCallbackUrl: `https://example.test/deliver/slack?channel=${channelId}`,
-      mintBearerToken: () => "test-token",
     });
 
     await flush();
@@ -143,7 +143,6 @@ describe("processChannelMessageInBackground — slack thread mapping", () => {
       trustCtx,
       metadataHints: [],
       replyCallbackUrl: `https://example.test/deliver/slack?channel=${channelId}&threadTs=${newThreadTs}`,
-      mintBearerToken: () => "test-token",
     });
 
     await flush();