@sentry/junior 0.186.0 → 0.188.0

package/dist/{chunk-7EU4YSZ4.js → chunk-LODJKINF.js}

@@ -1,45 +1,46 @@
 import {
   createWebAuthorization,
   deleteWebAuthorization
-} from "./chunk-PZZOGHVR.js";
+} from "./chunk-PSHMPRIU.js";
 import {
   AgentRunError,
   executeTurn
-} from "./chunk-GQMQCY7H.js";
+} from "./chunk-ERZMACYA.js";
 import {
   buildDeliveredTurnStatePatch,
   completeAuthPauseTurn,
   finalizeFailedTurnReplyWithEvent,
   getTurnUserMessage
-} from "./chunk-OZG7E22Y.js";
+} from "./chunk-QDHJTKPE.js";
 import {
   processPluginTask,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-MCLWOBPN.js";
+} from "./chunk-AW77HH54.js";
 import {
   ConversationTurnLifecycleService
-} from "./chunk-STOCCPWH.js";
+} from "./chunk-W42ENMJW.js";
 import {
   coerceThreadConversationState,
   getPersistedSandboxState,
   getPersistedThreadState,
   persistThreadStateById
-} from "./chunk-CM6RTYSO.js";
+} from "./chunk-CIG6WI7Q.js";
 import {
   healthReportSchema
 } from "./chunk-UTL3MHPC.js";
 import {
-  RESOURCE_EVENT_AUTHOR_ID,
+  RESOURCE_EVENT_MESSAGE_AUTHOR,
+  RESOURCE_EVENT_SYSTEM_ACTOR,
   isResourceEventConversationMessage,
   isResourceEventMailboxMetadata
-} from "./chunk-DHYZ4VKG.js";
+} from "./chunk-VFZAUQ5V.js";
 import {
   parseSlackThreadId
-} from "./chunk-7EOWT62G.js";
+} from "./chunk-CVBDVIF4.js";
 import {
   appendAndEnqueueExclusiveInboundMessage,
   appendAndEnqueueInboundMessage
-} from "./chunk-2IBDVE62.js";
+} from "./chunk-MQDIIFZM.js";
 import {
   TurnInputCommitLostError,
   buildDeterministicTurnId,
@@ -50,7 +51,7 @@ import {
   markTurnClosed,
   markTurnFailed,
   startActiveTurn
-} from "./chunk-VOGOTEW7.js";
+} from "./chunk-Z5SKZE5B.js";
 import {
   abandonTurnRecord,
   buildConversationContext,
@@ -66,39 +67,42 @@ import {
   recordDeliveredAssistantMessage,
   saveTurnCheckpoint,
   upsertConversationMessage
-} from "./chunk-H7X2G2KS.js";
+} from "./chunk-6YGFBU3A.js";
 import {
   normalizeSlackConversationId
-} from "./chunk-JFPY6XFF.js";
+} from "./chunk-QCGNHSMA.js";
 import {
   getConversationEventStore,
   getConversationStore,
   getDb
-} from "./chunk-43LODHJM.js";
+} from "./chunk-IUUQWIG2.js";
 import {
   juniorConversationParticipants,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-VXL2LBPK.js";
+} from "./chunk-QVH6FW3T.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
 import {
   getSlackBotToken
-} from "./chunk-AD64YMEC.js";
+} from "./chunk-Q7O74WOO.js";
 import {
   canExposeConversationPayload
-} from "./chunk-FFYDRLXW.js";
+} from "./chunk-FIUCHYT6.js";
 import {
   credentialContextForActor
 } from "./chunk-CEMMLV5L.js";
+import {
+  createActor
+} from "./chunk-N7TMSOZH.js";
 import {
   logException,
   logWarn,
   setTags,
   withLogContext
-} from "./chunk-3CVEE6LA.js";
+} from "./chunk-QIMN3FXL.js";
 
 // src/handlers/health.ts
 function readHealthReport() {
@@ -138,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(),
@@ -146,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(
@@ -179,16 +219,34 @@ 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 parseLocalResourceEventMessages(messages) {
+function parseResourceEventMessages(messages) {
   if (messages.length === 0) {
     return [];
   }
@@ -197,10 +255,17 @@ function parseLocalResourceEventMessages(messages) {
   )) {
     return [];
   }
-  return messages.map((message) => ({
-    message,
-    kind: "resource_event"
-  }));
+  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) {
   const batch = parseApiTurnMessages(context.attempt.messages);
@@ -208,11 +273,9 @@ async function resolveApiTurnWork(context) {
     return { kind: "mailbox", batch };
   }
   if (context.destination?.platform === "local") {
-    const resourceBatch = parseLocalResourceEventMessages(
-      context.attempt.messages
-    );
+    const resourceBatch = parseResourceEventMessages(context.attempt.messages);
     if (resourceBatch.length > 0) {
-      return { kind: "resource_event", batch: resourceBatch };
+      return { kind: "mailbox", batch: resourceBatch };
     }
   }
   if (context.attempt.messages.length > 0) {
@@ -228,17 +291,15 @@ async function isApiTurnWork(context) {
 // src/chat/api-turns/work.ts
 import { createHash } from "crypto";
 import {
-  createLocalSource,
-  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
   });
@@ -253,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
       }
@@ -319,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,
@@ -335,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
       });
     }
@@ -365,14 +426,6 @@ async function completeCancelledApiTurn(args) {
 function joinMailboxText(messages) {
   return messages.map((message) => message.input.text.trim()).filter(Boolean).join("\n\n");
 }
-function localResourceEventActor() {
-  return {
-    platform: "local",
-    userId: RESOURCE_EVENT_AUTHOR_ID,
-    userName: "junior-event",
-    fullName: "Junior event"
-  };
-}
 
 // src/chat/api-turns/work.ts
 function normalizeEmail(email) {
@@ -409,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,
@@ -440,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) {
@@ -495,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({
@@ -590,20 +619,19 @@ 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 isResourceEvent = resolved.kind === "resource_event";
-    let actor;
+    let turnIdentity;
     let text = "";
     let turnId = "";
     let userMessageId = "";
@@ -612,37 +640,23 @@ function createApiTurnWorker(agentRunner, cancellation) {
     const storedConversation = await getConversationStore().get({
       conversationId: context.conversationId
     });
-    const mailboxDestination = resolved.kind === "mailbox" || resolved.kind === "resource_event" ? resolved.batch[0]?.message.destination : void 0;
+    const mailboxDestination = resolved.kind === "mailbox" ? resolved.batch[0]?.message.destination : void 0;
     const destination = resolveApiTurnDestination({
       conversationId: context.conversationId,
       existing: context.destination ?? mailboxDestination ?? storedConversation?.destination
     });
-    const sourceFor = (resourceEvent) => resourceEvent ? createLocalSource(context.conversationId) : webSourceForConversation({
-      conversationId: context.conversationId,
-      visibility: storedConversation?.visibility
-    });
-    let source = sourceFor(isResourceEvent);
     if (resolved.kind === "mailbox") {
       const first = resolved.batch[0];
       text = joinMailboxText(resolved.batch.map((entry) => entry.message));
-      actor = actorFromMetadata(first.metadata);
-      turnId = apiTurnIdForMessage(first.metadata.messageId);
-      userMessageId = first.metadata.messageId;
       startedAtMs = first.message.createdAtMs;
-      inputMessageIds = resolved.batch.map((entry) => entry.metadata.messageId);
-    } else if (resolved.kind === "resource_event") {
-      const first = resolved.batch[0];
-      text = joinMailboxText(resolved.batch.map((entry) => entry.message));
-      actor = localResourceEventActor();
-      turnId = apiTurnIdForMessage(first.message.inboundMessageId);
       userMessageId = first.message.inboundMessageId;
-      startedAtMs = first.message.createdAtMs;
+      turnId = apiTurnIdForMessage(userMessageId);
       inputMessageIds = resolved.batch.map(
         (entry) => entry.message.inboundMessageId
       );
+      turnIdentity = first;
     } else {
       turnId = resolved.turnId;
-      actor = actorFromStoredConversation(storedConversation?.actor);
     }
     const persisted = await getPersistedThreadState(context.conversationId);
     const conversation = coerceThreadConversationState(persisted);
@@ -657,27 +671,32 @@ function createApiTurnWorker(agentRunner, cancellation) {
           `Unable to locate the persisted user message for Turn "${turnId}"`
         );
       }
-      if (isResourceEventConversationMessage(userMessage)) {
-        isResourceEvent = true;
-        actor = localResourceEventActor();
-        source = sourceFor(true);
-      }
+      turnIdentity = turnIdentityFromConversationMessage(userMessage);
       userMessageId = userMessage.id;
       text = userMessage.text;
       startedAtMs = userMessage.createdAtMs;
       inputMessageIds = [userMessageId];
     }
-    if (!actor) {
+    if (!turnIdentity) {
       throw new Error(
-        `Conversation API resume missing actor for ${context.conversationId}`
+        `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: isResourceEvent ? "local" : "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;
@@ -708,7 +727,6 @@ function createApiTurnWorker(agentRunner, cancellation) {
           try {
             await completeCancelledApiTurn({
               acknowledge,
-              actorId: actor.userId,
               cancellation,
               conversation,
               conversationId: context.conversationId,
@@ -735,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,
-              ...isResourceEvent ? void 0 : { source: "web" }
+              ...turnIdentity.source === "web" ? { source: "web" } : void 0
             }
           });
           await persistConversationMessages({
@@ -780,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
           });
@@ -795,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"
             );
@@ -805,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,
@@ -813,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
               });
             }
@@ -849,18 +864,20 @@ function createApiTurnWorker(agentRunner, cancellation) {
               credentialContext: credentialContextForActor(actor),
               destination,
               publishExternally: false,
-              source,
+              source: storedConversation?.location ? { ...source, location: storedConversation.location } : 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
               },
-              delivery: deliverAssistantMessage,
+              delivery: { send: deliverAssistantMessage },
               durability: {
                 onInputCommitted: acknowledge,
                 shouldYield: context.shouldYield,

package/dist/{chunk-2IBDVE62.js → chunk-MQDIIFZM.js}

@@ -8,14 +8,14 @@ import {
   getConversationStore,
   parseDestination,
   sameDestination
-} from "./chunk-43LODHJM.js";
+} from "./chunk-IUUQWIG2.js";
 import {
   getDefaultRedisStateAdapterFor,
   getStateAdapter
-} from "./chunk-DOP3FIQC.js";
+} from "./chunk-ZX7RSBQ6.js";
 import {
   getChatConfig
-} from "./chunk-AD64YMEC.js";
+} from "./chunk-Q7O74WOO.js";
 import {
   parseStoredSlackActor
 } from "./chunk-N7TMSOZH.js";
@@ -23,7 +23,7 @@ import {
   isRecord,
   toOptionalNumber,
   toOptionalString
-} from "./chunk-3CVEE6LA.js";
+} from "./chunk-QIMN3FXL.js";
 
 // src/chat/task-execution/state.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-NRMAOGRS.js → chunk-NZLZ4KYZ.js}

@@ -1,6 +1,6 @@
 import {
   createPluginCatalogRuntime
-} from "./chunk-64WF2GQ3.js";
+} from "./chunk-QIOUTXTZ.js";
 
 // src/chat/plugins/catalog-runtime.ts
 var pluginCatalogRuntime = createPluginCatalogRuntime();

package/dist/{chunk-PZZOGHVR.js → chunk-PSHMPRIU.js}

@@ -1,6 +1,6 @@
 import {
   getStateAdapter
-} from "./chunk-DOP3FIQC.js";
+} from "./chunk-ZX7RSBQ6.js";
 import {
   getClient
 } from "./chunk-PEQXYSSE.js";

package/dist/{chunk-AD64YMEC.js → chunk-Q7O74WOO.js}

@@ -7,7 +7,7 @@ import {
   toCanonicalInputMessage,
   toCanonicalOutputMessage,
   toGenAiMessagesTraceAttributes
-} from "./chunk-FFYDRLXW.js";
+} from "./chunk-FIUCHYT6.js";
 import {
   extractGenAiUsageAttributes,
   logException,
@@ -15,7 +15,7 @@ import {
   normalizeGenAiFinishReason,
   serializeGenAiAttribute,
   withSpan
-} from "./chunk-3CVEE6LA.js";
+} from "./chunk-QIMN3FXL.js";
 
 // src/chat/services/provider-error.ts
 var ProviderError = class extends Error {

package/dist/{chunk-JFPY6XFF.js → chunk-QCGNHSMA.js}

@@ -5,7 +5,7 @@ import {
   getConversationEventStore,
   getDb,
   getSqlExecutor
-} from "./chunk-43LODHJM.js";
+} from "./chunk-IUUQWIG2.js";
 import {
   juniorCodeChanges,
   juniorCodeRepositories,
@@ -16,7 +16,7 @@ import {
   juniorUsers,
   juniorWorkspaceRepos,
   juniorWorkspaces
-} from "./chunk-VXL2LBPK.js";
+} from "./chunk-QVH6FW3T.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   getVercelSandboxCredentials,
@@ -24,16 +24,16 @@ import {
   isSandboxMissingError,
   runNonInteractiveCommand,
   sleep
-} from "./chunk-HWXP6RHG.js";
+} from "./chunk-X55FOVZO.js";
 import {
   getStateAdapter
-} from "./chunk-DOP3FIQC.js";
+} from "./chunk-ZX7RSBQ6.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken
-} from "./chunk-AD64YMEC.js";
+} from "./chunk-Q7O74WOO.js";
 import {
   defaultModelId
 } from "./chunk-D4YV5TDV.js";
@@ -52,7 +52,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-3CVEE6LA.js";
+} from "./chunk-QIMN3FXL.js";
 
 // src/chat/plugins/agent-hooks.ts
 import {