@sentry/junior 0.185.0 → 0.187.0

package/dist/{chunk-MWOH6CIK.js → chunk-4YD3DET6.js}

@@ -1,40 +1,46 @@
 import {
   createWebAuthorization,
   deleteWebAuthorization
-} from "./chunk-UUULGCKK.js";
+} from "./chunk-ITLYUKGZ.js";
 import {
   AgentRunError,
   executeTurn
-} from "./chunk-W7GCLNIV.js";
+} from "./chunk-OM4SFFJK.js";
 import {
   buildDeliveredTurnStatePatch,
   completeAuthPauseTurn,
   finalizeFailedTurnReplyWithEvent,
   getTurnUserMessage
-} from "./chunk-DAPC2HTM.js";
+} from "./chunk-EIWYZXSM.js";
 import {
   processPluginTask,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-FFHXG2FX.js";
+} from "./chunk-WL3R2KTS.js";
 import {
   ConversationTurnLifecycleService
-} from "./chunk-6Q7YZLCL.js";
+} from "./chunk-VC343WHM.js";
 import {
   coerceThreadConversationState,
   getPersistedSandboxState,
   getPersistedThreadState,
   persistThreadStateById
-} from "./chunk-Y5G23T2D.js";
+} from "./chunk-27T5HZHO.js";
 import {
   healthReportSchema
 } from "./chunk-UTL3MHPC.js";
+import {
+  RESOURCE_EVENT_MESSAGE_AUTHOR,
+  RESOURCE_EVENT_SYSTEM_ACTOR,
+  isResourceEventConversationMessage,
+  isResourceEventMailboxMetadata
+} from "./chunk-MUPPP7A7.js";
 import {
   parseSlackThreadId
-} from "./chunk-X7NCJQAA.js";
+} from "./chunk-4A2R3AQB.js";
 import {
   appendAndEnqueueExclusiveInboundMessage,
   appendAndEnqueueInboundMessage
-} from "./chunk-D63IUQQE.js";
+} from "./chunk-NIKLTFBP.js";
 import {
   TurnInputCommitLostError,
   buildDeterministicTurnId,
@@ -45,7 +51,7 @@ import {
   markTurnClosed,
   markTurnFailed,
   startActiveTurn
-} from "./chunk-U4CTAVWN.js";
+} from "./chunk-NU775DLU.js";
 import {
   abandonTurnRecord,
   buildConversationContext,
@@ -61,35 +67,42 @@ import {
   recordDeliveredAssistantMessage,
   saveTurnCheckpoint,
   upsertConversationMessage
-} from "./chunk-WLKWN4CD.js";
+} from "./chunk-D5BWM37G.js";
 import {
   normalizeSlackConversationId
-} from "./chunk-VH4IU3UC.js";
+} from "./chunk-DUE4EUNL.js";
 import {
   getConversationEventStore,
   getConversationStore,
   getDb
-} from "./chunk-ABAX75GG.js";
+} from "./chunk-WKIS4VRK.js";
 import {
   juniorConversationParticipants,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-LVK4WJKM.js";
+} from "./chunk-HXR3FHTE.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
+import {
+  getSlackBotToken
+} from "./chunk-URZ7UD4P.js";
 import {
   canExposeConversationPayload
-} from "./chunk-EIJCPJOY.js";
+} from "./chunk-Q6OCUQ7W.js";
 import {
   credentialContextForActor
 } from "./chunk-CEMMLV5L.js";
+import {
+  createActor
+} from "./chunk-N7TMSOZH.js";
 import {
   logException,
+  logWarn,
   setTags,
   withLogContext
-} from "./chunk-OMQ2J6F6.js";
+} from "./chunk-6YCIYOVA.js";
 
 // src/handlers/health.ts
 function readHealthReport() {
@@ -129,6 +142,10 @@ function createVercelAttachmentStorage() {
 
 // src/chat/api-turns/routing.ts
 import { z } from "zod";
+import {
+  createLocalSource,
+  createWebSource
+} from "@sentry/junior-plugin-api";
 var apiTurnMailboxMetadataSchema = z.object({
   authorEmail: z.string().email(),
   authorFullName: z.string().min(1).optional(),
@@ -137,6 +154,38 @@ var apiTurnMailboxMetadataSchema = z.object({
   kind: z.literal("api_turn"),
   messageId: z.string().min(1)
 }).strict();
+function turnIdentityFromConversationMessage(message) {
+  if (isResourceEventConversationMessage(message)) {
+    return {
+      actor: RESOURCE_EVENT_SYSTEM_ACTOR,
+      author: message.author ?? RESOURCE_EVENT_MESSAGE_AUTHOR,
+      source: "resource_event"
+    };
+  }
+  const actor = createActor(message.author, {
+    platform: "web",
+    userId: message.author?.userId
+  });
+  if (actor?.platform !== "web") {
+    return void 0;
+  }
+  return {
+    actor,
+    author: message.author ?? { userId: actor.userId },
+    source: "web"
+  };
+}
+function sourceFromTurnInput(args) {
+  switch (args.source) {
+    case "resource_event":
+      return createLocalSource(args.conversationId);
+    case "web":
+      return createWebSource(
+        args.conversationId,
+        args.visibility === "private" ? "private" : "public"
+      );
+  }
+}
 async function getActiveApiTurnId(conversationId) {
   const summaries = await listTurnSummaries(conversationId);
   const active = summaries.filter(
@@ -170,13 +219,52 @@ function parseApiTurnMessages(messages) {
     return [];
   }
   if (parsed.some((entry) => !entry.metadata.success)) {
-    throw new Error("Conversation mailbox mixes web turns and other input");
+    throw new Error("A Turn cannot combine different kinds of input");
   }
   return parsed.map((entry) => {
     if (!entry.metadata.success) {
-      throw new Error("API turn mailbox metadata failed validation");
+      throw new Error("User message has invalid metadata");
     }
-    return { message: entry.message, metadata: entry.metadata.data };
+    const metadata = entry.metadata.data;
+    const actor = {
+      platform: "web",
+      userId: metadata.authorUserId,
+      email: metadata.authorEmail.trim().toLowerCase(),
+      ...metadata.authorFullName ? { fullName: metadata.authorFullName } : void 0,
+      ...metadata.authorUserName ? { userName: metadata.authorUserName } : void 0
+    };
+    return {
+      actor,
+      author: {
+        email: actor.email,
+        ...actor.fullName ? { fullName: actor.fullName } : void 0,
+        userId: actor.userId,
+        ...actor.userName ? { userName: actor.userName } : void 0
+      },
+      message: entry.message,
+      source: "web"
+    };
+  });
+}
+function parseResourceEventMessages(messages) {
+  if (messages.length === 0) {
+    return [];
+  }
+  if (!messages.every(
+    (message) => message.source === "resource_event" && isResourceEventMailboxMetadata(message.input.metadata)
+  )) {
+    return [];
+  }
+  return messages.map((message) => {
+    if (!isResourceEventMailboxMetadata(message.input.metadata)) {
+      throw new Error("Resource event has invalid metadata");
+    }
+    return {
+      actor: RESOURCE_EVENT_SYSTEM_ACTOR,
+      author: RESOURCE_EVENT_MESSAGE_AUTHOR,
+      message,
+      source: "resource_event"
+    };
   });
 }
 async function resolveApiTurnWork(context) {
@@ -184,6 +272,12 @@ async function resolveApiTurnWork(context) {
   if (batch.length > 0) {
     return { kind: "mailbox", batch };
   }
+  if (context.destination?.platform === "local") {
+    const resourceBatch = parseResourceEventMessages(context.attempt.messages);
+    if (resourceBatch.length > 0) {
+      return { kind: "mailbox", batch: resourceBatch };
+    }
+  }
   if (context.attempt.messages.length > 0) {
     return void 0;
   }
@@ -197,16 +291,15 @@ async function isApiTurnWork(context) {
 // src/chat/api-turns/work.ts
 import { createHash } from "crypto";
 import {
-  createWebSource,
   localDestinationSchema
 } from "@sentry/junior-plugin-api";
 
-// src/chat/api-turns/accepted-reply.ts
-async function commitWebAcceptedReply(args) {
+// src/chat/api-turns/assistant-message.ts
+async function commitAssistantMessage(args) {
   const conversationMessageId = recordDeliveredAssistantMessage({
     conversation: args.conversation,
     sessionId: args.sessionId,
-    source: "web",
+    source: args.source,
     text: args.text,
     userMessageId: args.userMessageId
   });
@@ -221,8 +314,8 @@ async function commitWebAcceptedReply(args) {
     );
   } catch (error) {
     logException(
-      new Error("Accepted assistant message persistence failed"),
-      "api.assistant.message_post_delivery_persist.failed",
+      new Error("Assistant message persistence failed"),
+      "conversation.assistant.message_persist.failed",
       {
         "error.type": error instanceof Error ? error.name : typeof error
       }
@@ -287,7 +380,7 @@ function createApiTurnCancellation() {
 }
 async function completeCancelledApiTurn(args) {
   try {
-    const ownsPendingAuthorization = args.conversation.processing.pendingAuth?.sessionId === args.turnId;
+    const pendingAuthorization = args.conversation.processing.pendingAuth?.sessionId === args.turnId ? args.conversation.processing.pendingAuth : void 0;
     await abandonTurnRecord({
       conversationId: args.conversationId,
       turnId: args.turnId,
@@ -303,9 +396,9 @@ async function completeCancelledApiTurn(args) {
       nowMs: Date.now(),
       sessionId: args.turnId
     });
-    if (ownsPendingAuthorization) {
+    if (pendingAuthorization) {
       await deleteWebAuthorization({
-        actorId: args.actorId,
+        actorId: pendingAuthorization.actorId,
         conversationId: args.conversationId
       });
     }
@@ -329,6 +422,11 @@ async function completeCancelledApiTurn(args) {
   await args.acknowledge();
 }
 
+// src/chat/api-turns/mailbox-input.ts
+function joinMailboxText(messages) {
+  return messages.map((message) => message.input.text.trim()).filter(Boolean).join("\n\n");
+}
+
 // src/chat/api-turns/work.ts
 function normalizeEmail(email) {
   return email.trim().toLowerCase();
@@ -364,21 +462,6 @@ function resolveApiTurnDestination(args) {
   }
   return requireLocalDestination(args.conversationId);
 }
-function webSourceForConversation(args) {
-  return createWebSource(
-    args.conversationId,
-    args.visibility === "private" ? "private" : "public"
-  );
-}
-function actorFromMetadata(metadata) {
-  return {
-    platform: "web",
-    userId: metadata.authorUserId,
-    email: normalizeEmail(metadata.authorEmail),
-    ...metadata.authorFullName ? { fullName: metadata.authorFullName } : void 0,
-    ...metadata.authorUserName ? { userName: metadata.authorUserName } : void 0
-  };
-}
 function storedActorFromApi(actor) {
   return {
     ...actor.email ? { email: normalizeEmail(actor.email) } : void 0,
@@ -395,16 +478,6 @@ function webActorFromEmail(email, profile) {
     ...profile?.userName ? { userName: profile.userName } : void 0
   };
 }
-function actorFromStoredConversation(stored) {
-  const email = stored?.email?.trim().toLowerCase();
-  if (!email) {
-    return void 0;
-  }
-  return webActorFromEmail(
-    email,
-    stored?.fullName ? { fullName: stored.fullName } : void 0
-  );
-}
 function buildApiTurnInboundMessage(args) {
   const text = args.message.trim();
   if (!text) {
@@ -450,8 +523,9 @@ async function recordApiConversationActivity(args) {
   });
   const isNewRoot = !existing;
   const visibility = args.rootVisibility === "private" ? "private" : "public";
-  const source = isNewRoot ? webSourceForConversation({
+  const source = isNewRoot ? sourceFromTurnInput({
     conversationId: args.conversationId,
+    source: "web",
     visibility
   }) : void 0;
   await store.recordActivity({
@@ -545,65 +619,84 @@ function createApiTurnWorker(agentRunner, cancellation) {
     const resolved = await resolveApiTurnWork(context);
     if (!resolved) {
       throw new Error(
-        `Conversation API worker received other work for ${context.conversationId}`
+        `Unsupported input for Conversation ${context.conversationId}`
       );
     }
     if (context.publishExternally) {
       throw new Error(
-        `Conversation API work cannot publish to a provider for ${context.conversationId}`
+        `publishExternally must be false for Conversation ${context.conversationId}`
       );
     }
     const lifecycle = new ConversationTurnLifecycleService(
       getConversationEventStore()
     );
     const isResume = resolved.kind === "resume";
-    let actor;
-    let text;
-    let turnId;
-    let userMessageId;
-    let startedAtMs;
-    let inputMessageIds;
+    let turnIdentity;
+    let text = "";
+    let turnId = "";
+    let userMessageId = "";
+    let startedAtMs = Date.now();
+    let inputMessageIds = [];
     const storedConversation = await getConversationStore().get({
       conversationId: context.conversationId
     });
+    const mailboxDestination = resolved.kind === "mailbox" ? resolved.batch[0]?.message.destination : void 0;
+    const destination = resolveApiTurnDestination({
+      conversationId: context.conversationId,
+      existing: context.destination ?? mailboxDestination ?? storedConversation?.destination
+    });
     if (resolved.kind === "mailbox") {
       const first = resolved.batch[0];
-      text = resolved.batch.map((entry) => entry.message.input.text.trim()).filter(Boolean).join("\n\n");
-      actor = actorFromMetadata(first.metadata);
-      turnId = apiTurnIdForMessage(first.metadata.messageId);
-      userMessageId = first.metadata.messageId;
+      text = joinMailboxText(resolved.batch.map((entry) => entry.message));
       startedAtMs = first.message.createdAtMs;
-      inputMessageIds = resolved.batch.map((entry) => entry.metadata.messageId);
+      userMessageId = first.message.inboundMessageId;
+      turnId = apiTurnIdForMessage(userMessageId);
+      inputMessageIds = resolved.batch.map(
+        (entry) => entry.message.inboundMessageId
+      );
+      turnIdentity = first;
     } else {
       turnId = resolved.turnId;
-      const resumedActor = actorFromStoredConversation(
-        storedConversation?.actor
-      );
-      if (!resumedActor) {
+    }
+    const persisted = await getPersistedThreadState(context.conversationId);
+    const conversation = coerceThreadConversationState(persisted);
+    await hydrateConversationMessages({
+      conversation,
+      conversationId: context.conversationId
+    });
+    if (isResume) {
+      const userMessage = getTurnUserMessage(conversation, turnId);
+      if (!userMessage) {
         throw new Error(
-          `Conversation API resume missing actor for ${context.conversationId}`
+          `Unable to locate the persisted user message for Turn "${turnId}"`
         );
       }
-      actor = resumedActor;
-      text = "";
-      userMessageId = "";
-      startedAtMs = Date.now();
-      inputMessageIds = [];
+      turnIdentity = turnIdentityFromConversationMessage(userMessage);
+      userMessageId = userMessage.id;
+      text = userMessage.text;
+      startedAtMs = userMessage.createdAtMs;
+      inputMessageIds = [userMessageId];
     }
-    const destination = resolveApiTurnDestination({
-      conversationId: context.conversationId,
-      existing: context.destination ?? (resolved.kind === "mailbox" ? resolved.batch[0]?.message.destination : void 0) ?? storedConversation?.destination
-    });
-    const source = webSourceForConversation({
+    if (!turnIdentity) {
+      throw new Error(
+        `Resumed Turn is missing an Actor for Conversation ${context.conversationId}`
+      );
+    }
+    const { actor, author } = turnIdentity;
+    const source = sourceFromTurnInput({
       conversationId: context.conversationId,
+      source: turnIdentity.source,
       visibility: storedConversation?.visibility
     });
+    const webActor = actor.platform === "web" ? actor : void 0;
     return await withLogContext(
       {
         conversationId: context.conversationId,
-        platform: "web",
-        userId: actor.userId,
-        ...actor.userName ? { userName: actor.userName } : void 0
+        platform: actor.platform,
+        ...webActor ? {
+          userId: webActor.userId,
+          ...webActor.userName ? { userName: webActor.userName } : void 0
+        } : void 0
       },
       async () => {
         let acknowledged = isResume || context.attempt.messages.length === 0;
@@ -620,12 +713,6 @@ function createApiTurnWorker(agentRunner, cancellation) {
           }
           acknowledged = true;
         };
-        const persisted = await getPersistedThreadState(context.conversationId);
-        const conversation = coerceThreadConversationState(persisted);
-        await hydrateConversationMessages({
-          conversation,
-          conversationId: context.conversationId
-        });
         let sandboxRef = getPersistedSandboxState(persisted);
         const initialSandboxRef = sandboxRef;
         const appSignal = cancellation?.signal(context.conversationId);
@@ -640,7 +727,6 @@ function createApiTurnWorker(agentRunner, cancellation) {
           try {
             await completeCancelledApiTurn({
               acknowledge,
-              actorId: actor.userId,
               cancellation,
               conversation,
               conversationId: context.conversationId,
@@ -658,16 +744,6 @@ function createApiTurnWorker(agentRunner, cancellation) {
           return { status: "completed" };
         };
         if (isResume) {
-          const userMessage = getTurnUserMessage(conversation, turnId);
-          if (!userMessage) {
-            throw new Error(
-              `Unable to locate the persisted user message for Turn "${turnId}"`
-            );
-          }
-          userMessageId = userMessage.id;
-          text = userMessage.text;
-          startedAtMs = userMessage.createdAtMs;
-          inputMessageIds = [userMessageId];
           if (cancellationSignal?.aborted) {
             return await completeCancelledTurn();
           }
@@ -677,16 +753,11 @@ function createApiTurnWorker(agentRunner, cancellation) {
             role: "user",
             text: normalizeConversationText(text),
             createdAtMs: startedAtMs,
-            author: {
-              ...actor.email ? { email: actor.email } : void 0,
-              ...actor.fullName ? { fullName: actor.fullName } : void 0,
-              userId: actor.userId,
-              ...actor.userName ? { userName: actor.userName } : void 0
-            },
+            author,
             meta: {
               explicitMention: true,
               replied: false,
-              source: "web"
+              ...turnIdentity.source === "web" ? { source: "web" } : void 0
             }
           });
           await persistConversationMessages({
@@ -722,11 +793,12 @@ function createApiTurnWorker(agentRunner, cancellation) {
           }
           failureCode = "delivery_failed";
           assistantMessageDelivered = true;
-          await commitWebAcceptedReply({
+          await commitAssistantMessage({
             ...agentMessage ? { agentMessage } : void 0,
             conversation,
             conversationId: context.conversationId,
             sessionId: turnId,
+            ...turnIdentity.source === "web" ? { source: "web" } : void 0,
             text: replyText,
             userMessageId
           });
@@ -737,6 +809,7 @@ function createApiTurnWorker(agentRunner, cancellation) {
             return await completeCancelledTurn();
           }
           if (!isResume) {
+            const pendingAuthorizationActorId = conversation.processing.pendingAuth?.actorId;
             const authParked = (await listTurnSummaries(context.conversationId)).filter(
               (summary) => summary.surface === "api" && !summary.dispatchId && summary.state === "paused" && summary.resumeReason === "auth"
             );
@@ -747,7 +820,7 @@ function createApiTurnWorker(agentRunner, cancellation) {
               await abandonTurnRecord({
                 conversationId: context.conversationId,
                 turnId: parked.turnId,
-                errorMessage: "Auth-parked session superseded by a new user message"
+                errorMessage: "Auth-paused Turn superseded by new input"
               });
               markTurnClosed({
                 conversation,
@@ -755,9 +828,9 @@ function createApiTurnWorker(agentRunner, cancellation) {
                 sessionId: parked.turnId
               });
             }
-            if (authParked.length > 0) {
+            if (authParked.length > 0 && pendingAuthorizationActorId) {
               await deleteWebAuthorization({
-                actorId: actor.userId,
+                actorId: pendingAuthorizationActorId,
                 conversationId: context.conversationId
               });
             }
@@ -790,14 +863,17 @@ function createApiTurnWorker(agentRunner, cancellation) {
               actor,
               credentialContext: credentialContextForActor(actor),
               destination,
+              ...storedConversation?.location ? { location: storedConversation.location } : void 0,
               publishExternally: false,
               source,
               surface: "api",
               ...cancellationSignal ? { signal: cancellationSignal } : void 0,
-              authorization: createWebAuthorization({
-                actorId: actor.userId,
-                conversationId: context.conversationId
-              }),
+              ...webActor ? {
+                authorization: createWebAuthorization({
+                  actorId: webActor.userId,
+                  conversationId: context.conversationId
+                })
+              } : { disabledFeatures: ["interactive-auth"] },
               state: {
                 pendingAuth: conversation.processing.pendingAuth,
                 sandboxRef
@@ -1227,6 +1303,91 @@ async function readConversationAccessFromSql(db, conversationIds, viewer) {
   );
 }
 
+// src/chat/slack/user.ts
+import { z as z2 } from "zod";
+var slackUserInfoSchema = z2.object({
+  ok: z2.literal(true),
+  user: z2.object({
+    name: z2.string().nullish(),
+    profile: z2.object({
+      email: z2.string().nullish(),
+      real_name: z2.string().nullish()
+    }).optional()
+  })
+});
+var USER_CACHE_TTL_MS = 5 * 60 * 1e3;
+var userCache = /* @__PURE__ */ new Map();
+function userCacheKey(teamId, userId) {
+  return `${teamId}:${userId}`;
+}
+function readFromCache(teamId, userId) {
+  const hit = userCache.get(userCacheKey(teamId, userId));
+  if (!hit) return null;
+  if (hit.expiresAt < Date.now()) {
+    userCache.delete(userCacheKey(teamId, userId));
+    return null;
+  }
+  return hit.value;
+}
+function writeToCache(teamId, userId, value) {
+  userCache.set(userCacheKey(teamId, userId), {
+    value,
+    expiresAt: Date.now() + USER_CACHE_TTL_MS
+  });
+}
+async function lookupSlackUser(teamId, userId) {
+  if (!teamId || !userId) {
+    return null;
+  }
+  const cached = readFromCache(teamId, userId);
+  if (cached) {
+    return cached;
+  }
+  const token = getSlackBotToken();
+  if (!token) {
+    return null;
+  }
+  try {
+    const response = await fetch(
+      `https://slack.com/api/users.info?user=${encodeURIComponent(userId)}`,
+      {
+        headers: {
+          authorization: `Bearer ${token}`
+        }
+      }
+    );
+    if (!response.ok) {
+      logWarn("slack.user.lookup.failed", {
+        "enduser.id": userId,
+        "app.slack.team_id": teamId,
+        "http.response.status_code": response.status
+      });
+      return null;
+    }
+    const parsed = slackUserInfoSchema.safeParse(await response.json());
+    if (!parsed.success) {
+      return null;
+    }
+    const payload = parsed.data;
+    const userName = payload.user.name?.trim() || void 0;
+    const fullName = payload.user.profile?.real_name?.trim() || void 0;
+    const result = {
+      userName,
+      fullName,
+      email: payload.user.profile?.email?.trim() || void 0
+    };
+    writeToCache(teamId, userId, result);
+    return result;
+  } catch (error) {
+    logWarn("slack.user.lookup.failed", {
+      "enduser.id": userId,
+      "app.slack.team_id": teamId,
+      "exception.message": error instanceof Error ? error.message : String(error)
+    });
+    return null;
+  }
+}
+
 // src/chat/slack/conversation-context.ts
 function normalizeConversationName(type, channelName) {
   const trimmed = channelName?.trim();
@@ -1315,6 +1476,7 @@ export {
   readHealthReport,
   GET,
   createVercelAttachmentStorage,
+  lookupSlackUser,
   conversationVisibilityFromSlackChannelType,
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,

package/dist/{chunk-INQHUE72.js → chunk-6FGN7ZEG.js}

@@ -29,7 +29,9 @@ function assertRunConsistency(run) {
   switch (source.platform) {
     case "slack": {
       if (destination.platform !== "slack") {
-        throw new TypeError("Run source and destination platforms do not match");
+        throw new TypeError(
+          "Run source and destination platforms do not match"
+        );
       }
       if (source.teamId !== destination.teamId) {
         throw new TypeError("Slack source and destination teams do not match");
@@ -38,7 +40,9 @@ function assertRunConsistency(run) {
     }
     case "local": {
       if (destination.platform !== "local") {
-        throw new TypeError("Run source and destination platforms do not match");
+        throw new TypeError(
+          "Run source and destination platforms do not match"
+        );
       }
       if (source.conversationId !== destination.conversationId) {
         throw new TypeError(