@sentry/junior 0.179.0 → 0.180.0

package/dist/{chunk-JT4WMD3C.js → chunk-CP73FKME.js}

@@ -1,88 +1,90 @@
 import {
   createWebAuthorization,
   deleteWebAuthorization
-} from "./chunk-FTGD2FBP.js";
-import {
-  appendAndEnqueueInboundMessage
-} from "./chunk-5IRROPA5.js";
+} from "./chunk-MXEUIGHO.js";
 import {
   buildDeliveredTurnStatePatch,
   completeAuthPauseTurn,
   finalizeFailedTurnReplyWithEvent,
-  getTurnUserMessage,
+  getTurnUserMessage
+} from "./chunk-EWHP2IRG.js";
+import {
   processPluginTask,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-KJLHIHFF.js";
+} from "./chunk-3ILJBWP7.js";
+import {
+  ConversationTurnLifecycleService
+} from "./chunk-M3QYTBQ6.js";
 import {
-  ConversationTurnLifecycleService,
   coerceThreadConversationState,
   getPersistedSandboxState,
   getPersistedThreadState,
   persistThreadStateById
-} from "./chunk-CJLBLELR.js";
+} from "./chunk-5TUR4M3M.js";
 import {
   healthReportSchema
 } from "./chunk-UTL3MHPC.js";
 import {
   parseSlackThreadId
-} from "./chunk-FAS6AIMF.js";
+} from "./chunk-CCDXTDSY.js";
+import {
+  appendAndEnqueueInboundMessage
+} from "./chunk-L7LTGN4Z.js";
 import {
   TurnInputCommitLostError,
-  abandonTurnRecord,
-  buildConversationContext,
   buildDeterministicTurnId,
   clearPendingAuth,
   getAssistantReplyText,
   getConversationTurnBoundaryError,
+  isTurnInputCommitLostError,
+  markTurnClosed,
+  markTurnFailed,
+  startActiveTurn
+} from "./chunk-GUKXEPMX.js";
+import {
+  abandonTurnRecord,
+  buildConversationContext,
   getTurnRecord,
   hydrateConversationMessages,
-  isTurnInputCommitLostError,
   listTurnSummaries,
   loadProjection,
   markConversationMessage,
-  markTurnClosed,
-  markTurnFailed,
   normalizeConversationText,
   persistConversationMessages,
   persistWithRetry,
   recordDeliveredAssistantMessage,
   saveTurnCheckpoint,
-  startActiveTurn,
   upsertConversationMessage
-} from "./chunk-FIDMHAO6.js";
+} from "./chunk-GPXAHUQH.js";
 import {
   normalizeSlackConversationId
-} from "./chunk-3I7XE3PA.js";
+} from "./chunk-DHLOGWYH.js";
 import {
   getConversationEventStore,
   getConversationStore,
   getDb
-} from "./chunk-VP4OVRDD.js";
+} from "./chunk-S7YRTOSQ.js";
 import {
   juniorApiTokens,
   juniorConversationParticipants,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-R6U7N4FS.js";
-import {
-  getSlackBotToken
-} from "./chunk-GENV6KF2.js";
+} from "./chunk-FGC3PHNH.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
 import {
   canExposeConversationPayload
-} from "./chunk-XSPSCWLH.js";
+} from "./chunk-6YCEWOLO.js";
 import {
   credentialContextForActor
-} from "./chunk-CGA4ERJ5.js";
+} from "./chunk-CEMMLV5L.js";
 import {
   logException,
-  logWarn,
   setTags,
   withLogContext
-} from "./chunk-HQNE5APD.js";
+} from "./chunk-RAZG3YHC.js";
 
 // src/handlers/health.ts
 function readHealthReport() {
@@ -259,6 +261,7 @@ function createApiTurnCancellation() {
 }
 async function completeCancelledApiTurn(args) {
   try {
+    const ownsPendingAuthorization = args.conversation.processing.pendingAuth?.sessionId === args.turnId;
     await abandonTurnRecord({
       conversationId: args.conversationId,
       turnId: args.turnId,
@@ -274,10 +277,12 @@ async function completeCancelledApiTurn(args) {
       nowMs: Date.now(),
       sessionId: args.turnId
     });
-    await deleteWebAuthorization({
-      actorId: args.actorId,
-      conversationId: args.conversationId
-    });
+    if (ownsPendingAuthorization) {
+      await deleteWebAuthorization({
+        actorId: args.actorId,
+        conversationId: args.conversationId
+      });
+    }
     await persistThreadStateById(args.conversationId, {
       conversation: args.conversation,
       sandboxRef: args.sandboxRef
@@ -306,6 +311,21 @@ var apiTurnMailboxMetadataSchema = z.object({
   kind: z.literal("api_turn"),
   messageId: z.string().min(1)
 }).strict();
+async function getActiveApiTurnId(conversationId) {
+  const summaries = await listTurnSummaries(conversationId);
+  const active = summaries.filter(
+    (summary) => summary.surface === "api" && !summary.dispatchId && (summary.state === "paused" || summary.state === "running")
+  );
+  if (active.length > 1) {
+    throw new Error(
+      `Conversation ${conversationId} has multiple active web turns`
+    );
+  }
+  const turnId = active[0]?.turnId;
+  if (!turnId) return void 0;
+  const record = await getTurnRecord(conversationId, turnId);
+  return record && record.surface === "api" && !record.dispatchId && (record.state === "paused" || record.state === "running") ? turnId : void 0;
+}
 function parseApiTurnMessages(messages) {
   if (messages.length === 0) {
     return [];
@@ -335,24 +355,8 @@ async function resolveApiTurnWork(context) {
   if (context.attempt.messages.length > 0) {
     return void 0;
   }
-  const summaries = await listTurnSummaries(context.conversationId);
-  const active = summaries.filter(
-    (summary) => summary.surface === "api" && !summary.dispatchId && (summary.state === "paused" || summary.state === "running")
-  );
-  if (active.length > 1) {
-    throw new Error(
-      `Conversation ${context.conversationId} has multiple active web turns`
-    );
-  }
-  const turnId = active[0]?.turnId;
-  if (!turnId) {
-    return void 0;
-  }
-  const record = await getTurnRecord(context.conversationId, turnId);
-  if (!record || record.surface !== "api" || Boolean(record.dispatchId) || record.state !== "paused" && record.state !== "running") {
-    return void 0;
-  }
-  return { kind: "resume", turnId };
+  const turnId = await getActiveApiTurnId(context.conversationId);
+  return turnId ? { kind: "resume", turnId } : void 0;
 }
 async function isApiTurnWork(context) {
   return await resolveApiTurnWork(context) !== void 0;
@@ -371,7 +375,7 @@ function createApiConversationId(args) {
     args.idempotencyKey
   )}`;
 }
-function apiMessageId(args) {
+function apiConversationMessageId(args) {
   return `api-msg:${stableHex(args.conversationId, args.idempotencyKey)}`;
 }
 function apiTurnIdForMessage(messageId) {
@@ -404,14 +408,14 @@ function actorFromMetadata(metadata2) {
     platform: "web",
     userId: metadata2.authorUserId,
     email: normalizeEmail2(metadata2.authorEmail),
-    ...metadata2.authorFullName ? { fullName: metadata2.authorFullName } : {},
-    ...metadata2.authorUserName ? { userName: metadata2.authorUserName } : {}
+    ...metadata2.authorFullName ? { fullName: metadata2.authorFullName } : void 0,
+    ...metadata2.authorUserName ? { userName: metadata2.authorUserName } : void 0
   };
 }
 function storedActorFromApi(actor) {
   return {
-    ...actor.email ? { email: normalizeEmail2(actor.email) } : {},
-    ...actor.fullName ? { fullName: actor.fullName } : {}
+    ...actor.email ? { email: normalizeEmail2(actor.email) } : void 0,
+    ...actor.fullName ? { fullName: actor.fullName } : void 0
   };
 }
 function webActorFromEmail(email, profile) {
@@ -420,8 +424,8 @@ function webActorFromEmail(email, profile) {
     platform: "web",
     userId: `dashboard:${stableHex(normalized)}`,
     email: normalized,
-    ...profile?.fullName ? { fullName: profile.fullName } : {},
-    ...profile?.userName ? { userName: profile.userName } : {}
+    ...profile?.fullName ? { fullName: profile.fullName } : void 0,
+    ...profile?.userName ? { userName: profile.userName } : void 0
   };
 }
 function actorFromStoredConversation(stored) {
@@ -458,9 +462,9 @@ function buildApiTurnInboundMessage(args) {
       text,
       metadata: {
         authorEmail: normalizeEmail2(args.actor.email),
-        ...args.actor.fullName ? { authorFullName: args.actor.fullName } : {},
+        ...args.actor.fullName ? { authorFullName: args.actor.fullName } : void 0,
         authorUserId: args.actor.userId,
-        ...args.actor.userName ? { authorUserName: args.actor.userName } : {},
+        ...args.actor.userName ? { authorUserName: args.actor.userName } : void 0,
         kind: "api_turn",
         messageId: args.messageId
       }
@@ -490,9 +494,9 @@ async function recordApiConversationActivity(args) {
     actor: storedActorFromApi(args.actor),
     // Do not rewrite a Slack root's origin source when a dashboard participant
     // continues it. Mailbox entries still carry source "web" per turn.
-    ...isNewRoot ? { source: "web" } : {},
-    ...source ? { sessionSource: source } : {},
-    ...isNewRoot ? { visibility } : {}
+    ...isNewRoot ? { source: "web" } : void 0,
+    ...source ? { sessionSource: source } : void 0,
+    ...isNewRoot ? { visibility } : void 0
   });
   return destination;
 }
@@ -524,7 +528,7 @@ async function appendAndEnqueueApiConversationMessage(input, options) {
     throw new Error("API conversation actor requires a verified email");
   }
   const nowMs = options.nowMs ?? Date.now();
-  const messageId = apiMessageId({
+  const messageId = apiConversationMessageId({
     conversationId: input.conversationId,
     idempotencyKey: input.idempotencyKey
   });
@@ -533,7 +537,7 @@ async function appendAndEnqueueApiConversationMessage(input, options) {
     conversationId: input.conversationId,
     conversationStore: options.conversationStore,
     nowMs,
-    ...input.rootVisibility ? { rootVisibility: input.rootVisibility } : {}
+    ...input.rootVisibility ? { rootVisibility: input.rootVisibility } : void 0
   });
   const result = await appendAndEnqueueInboundMessage({
     message: buildApiTurnInboundMessage({
@@ -558,7 +562,7 @@ async function appendAndEnqueueApiConversationMessage(input, options) {
 function captureApiBoundaryFailure(args) {
   const eventId = logException(args.error, `api.turn.${args.failureCode}`, {
     conversationId: args.conversationId,
-    ...args.runId ? { runId: args.runId } : {},
+    ...args.runId ? { runId: args.runId } : void 0,
     turnId: args.turnId
   });
   return typeof eventId === "string" ? eventId : void 0;
@@ -628,7 +632,7 @@ function createApiTurnWorker(options) {
         conversationId: context.conversationId,
         platform: "web",
         userId: actor.userId,
-        ...actor.userName ? { userName: actor.userName } : {}
+        ...actor.userName ? { userName: actor.userName } : void 0
       },
       async () => {
         let acknowledged = isResume || context.attempt.messages.length === 0;
@@ -653,6 +657,36 @@ function createApiTurnWorker(options) {
         });
         let sandboxRef = getPersistedSandboxState(persisted);
         const initialSandboxRef = sandboxRef;
+        const appSignal = options.cancellation?.signal(context.conversationId);
+        const stopSignal = context.stopSignal?.();
+        const cancellationSignal = appSignal && stopSignal ? AbortSignal.any([appSignal, stopSignal]) : appSignal ?? stopSignal;
+        const finishCancellation = () => {
+          if (appSignal) {
+            options.cancellation?.finish(context.conversationId, appSignal);
+          }
+        };
+        const completeCancelledTurn = async () => {
+          try {
+            await completeCancelledApiTurn({
+              acknowledge,
+              actorId: actor.userId,
+              cancellation: options.cancellation,
+              conversation,
+              conversationId: context.conversationId,
+              lifecycle,
+              sandboxRef,
+              signal: appSignal,
+              turnId,
+              userMessageId
+            });
+          } catch (error) {
+            if (hasLostTurnInputCommit(error)) {
+              return { status: "lost_lease" };
+            }
+            throw error;
+          }
+          return { status: "completed" };
+        };
         if (isResume) {
           const userMessage = getTurnUserMessage(conversation, turnId);
           if (!userMessage) {
@@ -664,38 +698,20 @@ function createApiTurnWorker(options) {
           text = userMessage.text;
           startedAtMs = userMessage.createdAtMs;
           inputMessageIds = [userMessageId];
-        } else {
-          const authParked = (await listTurnSummaries(context.conversationId)).filter(
-            (summary) => summary.surface === "api" && !summary.dispatchId && summary.state === "paused" && summary.resumeReason === "auth"
-          );
-          for (const parked of authParked) {
-            await abandonTurnRecord({
-              conversationId: context.conversationId,
-              turnId: parked.turnId,
-              errorMessage: "Auth-parked session superseded by a new user message"
-            });
-            markTurnClosed({
-              conversation,
-              nowMs: Date.now(),
-              sessionId: parked.turnId
-            });
-          }
-          if (authParked.length > 0) {
-            await deleteWebAuthorization({
-              actorId: actor.userId,
-              conversationId: context.conversationId
-            });
+          if (cancellationSignal?.aborted) {
+            return await completeCancelledTurn();
           }
+        } else {
           upsertConversationMessage(conversation, {
             id: userMessageId,
             role: "user",
             text: normalizeConversationText(text),
             createdAtMs: startedAtMs,
             author: {
-              ...actor.email ? { email: actor.email } : {},
-              ...actor.fullName ? { fullName: actor.fullName } : {},
+              ...actor.email ? { email: actor.email } : void 0,
+              ...actor.fullName ? { fullName: actor.fullName } : void 0,
               userId: actor.userId,
-              ...actor.userName ? { userName: actor.userName } : {}
+              ...actor.userName ? { userName: actor.userName } : void 0
             },
             meta: {
               explicitMention: true,
@@ -714,6 +730,9 @@ function createApiTurnWorker(options) {
             surface: "api",
             turnId
           });
+          if (cancellationSignal?.aborted) {
+            return await completeCancelledTurn();
+          }
           startActiveTurn({
             conversation,
             nextTurnId: turnId
@@ -725,39 +744,6 @@ function createApiTurnWorker(options) {
         let modelFailureEventId;
         let modelFailureCaptureAttempted = false;
         let reply;
-        const cancellationSignal = options.cancellation?.signal(
-          context.conversationId
-        );
-        const finishCancellation = () => {
-          if (cancellationSignal) {
-            options.cancellation?.finish(
-              context.conversationId,
-              cancellationSignal
-            );
-          }
-        };
-        const completeCancelledTurn = async () => {
-          try {
-            await completeCancelledApiTurn({
-              acknowledge,
-              actorId: actor.userId,
-              cancellation: options.cancellation,
-              conversation,
-              conversationId: context.conversationId,
-              lifecycle,
-              sandboxRef,
-              signal: cancellationSignal,
-              turnId,
-              userMessageId
-            });
-          } catch (error) {
-            if (hasLostTurnInputCommit(error)) {
-              return { status: "lost_lease" };
-            }
-            throw error;
-          }
-          return { status: "completed" };
-        };
         const deliverAssistantMessage = async (value) => {
           const replyText = typeof value === "string" ? value : getAssistantReplyText(value);
           if (!replyText?.trim()) {
@@ -791,6 +777,35 @@ function createApiTurnWorker(options) {
           failureCode = "agent_run_failed";
         };
         try {
+          if (cancellationSignal?.aborted) {
+            return await completeCancelledTurn();
+          }
+          if (!isResume) {
+            const authParked = (await listTurnSummaries(context.conversationId)).filter(
+              (summary) => summary.surface === "api" && !summary.dispatchId && summary.state === "paused" && summary.resumeReason === "auth"
+            );
+            for (const parked of authParked) {
+              if (cancellationSignal?.aborted) {
+                return await completeCancelledTurn();
+              }
+              await abandonTurnRecord({
+                conversationId: context.conversationId,
+                turnId: parked.turnId,
+                errorMessage: "Auth-parked session superseded by a new user message"
+              });
+              markTurnClosed({
+                conversation,
+                nowMs: Date.now(),
+                sessionId: parked.turnId
+              });
+            }
+            if (authParked.length > 0) {
+              await deleteWebAuthorization({
+                actorId: actor.userId,
+                conversationId: context.conversationId
+              });
+            }
+          }
           await persistThreadStateById(context.conversationId, {
             conversation
           });
@@ -820,7 +835,7 @@ function createApiTurnWorker(options) {
             publishExternally: false,
             source,
             surface: "api",
-            ...cancellationSignal ? { signal: cancellationSignal } : {},
+            ...cancellationSignal ? { signal: cancellationSignal } : void 0,
             authorization: createWebAuthorization({
               actorId: actor.userId,
               conversationId: context.conversationId
@@ -864,14 +879,11 @@ function createApiTurnWorker(options) {
               conversation,
               sandboxRef
             });
-            if (cancellationSignal) {
-              options.cancellation?.park(
-                context.conversationId,
-                cancellationSignal
-              );
+            if (appSignal) {
+              options.cancellation?.park(context.conversationId, appSignal);
             }
             await acknowledge();
-            return { status: "completed" };
+            return { status: "paused" };
           }
           finishCancellation();
           reply = outcome.result;
@@ -954,7 +966,7 @@ function createApiTurnWorker(options) {
             await lifecycle.fail({
               conversationId: context.conversationId,
               createdAtMs: Date.now(),
-              ...modelFailureEventId ? { eventId: modelFailureEventId } : {},
+              ...modelFailureEventId ? { eventId: modelFailureEventId } : void 0,
               failureCode: "model_execution_failed",
               turnId
             });
@@ -1002,7 +1014,7 @@ function createApiTurnWorker(options) {
           await lifecycle.fail({
             conversationId: context.conversationId,
             createdAtMs: Date.now(),
-            ...failureEventId ? { eventId: failureEventId } : {},
+            ...failureEventId ? { eventId: failureEventId } : void 0,
             failureCode,
             turnId
           });
@@ -1252,91 +1264,6 @@ 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();
@@ -1390,8 +1317,8 @@ function resolveSlackConversationContext(input) {
   );
   return {
     type,
-    ...name ? { name } : {},
-    ...visibility ? { visibility } : {}
+    ...name ? { name } : void 0,
+    ...visibility ? { visibility } : void 0
   };
 }
 function resolveSlackConversationContextFromThreadId(input) {
@@ -1425,7 +1352,6 @@ export {
   readHealthReport,
   GET,
   createVercelAttachmentStorage,
-  lookupSlackUser,
   conversationVisibilityFromSlackChannelType,
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,