@sentry/junior 0.146.0 → 0.148.0

package/dist/{chunk-OFPYOC3M.js → chunk-ULAU5ZGU.js}

@@ -1,10 +1,19 @@
 import {
   relayLocalOAuthCallback
 } from "./chunk-FA6POGLH.js";
+import {
+  getTurnRequestDeadline
+} from "./chunk-DUY5CDAM.js";
+import {
+  persistAuthPauseTurnState
+} from "./chunk-LNVEIJ2L.js";
+import {
+  buildSentryConversationUrl
+} from "./chunk-4CODA7P5.js";
 import {
   ensureConversationWake,
   requestConversationWork
-} from "./chunk-X2WMBTS3.js";
+} from "./chunk-HLPLT3NY.js";
 import {
   buildConversationContext,
   buildDeliveredTurnStatePatch,
@@ -15,19 +24,21 @@ import {
   getTurnUserReplyAttachmentContext,
   getTurnUserSlackMessageTs,
   markConversationMessage,
-  persistAuthPauseTurnState,
   recordDeliveredAssistantMessage,
   requireTurnFailureEventId,
   resolveTurnSessionRouting,
   scheduleSessionCompletedPluginTasks,
   turnHasReply
-} from "./chunk-H6U2U3EP.js";
+} from "./chunk-RRJV5UR5.js";
 import {
-  ConversationTurnLifecycleService
-} from "./chunk-Q6QZTTLS.js";
-import {
-  buildSentryConversationUrl
-} from "./chunk-4CODA7P5.js";
+  ConversationTurnLifecycleService,
+  coerceThreadConversationState,
+  configValueSchema,
+  getLocationConfigurationService,
+  getPersistedSandboxState,
+  getPersistedThreadState,
+  persistThreadStateById
+} from "./chunk-IL4EDBMV.js";
 import {
   getVercelConversationWorkQueue
 } from "./chunk-WR76IVA5.js";
@@ -38,11 +49,12 @@ import {
   getMcpAuthSession,
   getMcpProviderErrorAttributes,
   getMcpStoredOAuthCredentials,
+  lookupSlackUserProfile,
   resolvePluginOAuthAccount
-} from "./chunk-47OSH2ZO.js";
+} from "./chunk-XJ42NBP5.js";
 import {
   RetryableDeliveryError
-} from "./chunk-R776HKPK.js";
+} from "./chunk-GDFF3BQG.js";
 import {
   addReactionToMessage,
   escapeSlackMrkdwnText,
@@ -55,95 +67,93 @@ import {
   removeReactionFromMessage,
   resolveBaseUrl,
   truncateStatusText
-} from "./chunk-ZDGHGY74.js";
+} from "./chunk-WCN4YSH7.js";
+import {
+  parseSlackThreadId,
+  readSlackRawMessageContext,
+  resolveSlackChannelIdFromMessage,
+  resolveSlackChannelIdFromThreadId
+} from "./chunk-WOONT5ZP.js";
 import {
   TurnSliceLimitExceededError,
   abandonTurnRecord,
   buildTurnLimitResponse,
   clearPendingAuth,
-  coerceThreadArtifactsState,
-  coerceThreadConversationState,
   commitAcceptedReply,
   failTurnRecord,
   getAssistantReplyText,
-  getChannelConfigurationServiceById,
   getConversationPendingAuth,
-  getPersistedSandboxState,
-  getPersistedThreadState,
   getTurnRecord,
   hydrateConversationMessages,
   isPendingAuthLatestRequest,
   loadProjection,
   loadTurnCheckpoint,
   markTurnFailed,
-  persistThreadStateById,
   persistWithRetry,
   recordAuthenticationLinked,
   recordAuthorizationCompleted,
   recordTurnSummary,
   saveTurnCheckpoint
-} from "./chunk-GDQEU4I7.js";
-import {
-  parseSlackThreadId,
-  readSlackRawMessageContext,
-  resolveSlackChannelIdFromMessage,
-  resolveSlackChannelIdFromThreadId
-} from "./chunk-PH4Q3A6W.js";
+} from "./chunk-VCYSOXON.js";
 import {
   getDashboardConversationLink,
   getPluginSlackConversationLink
-} from "./chunk-SCGVWUZX.js";
+} from "./chunk-ZCHIC2GM.js";
 import {
   SlackActionError,
   getHeaderString,
   getSlackClient,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-V6SRLKUB.js";
+} from "./chunk-V2FXMOEA.js";
 import {
   getConversationEventStore,
-  requireSlackDestination
-} from "./chunk-37EVZP66.js";
+  getSqlExecutor,
+  requireSlackDestination,
+  upsertIdentity,
+  upsertLinkedIdentity
+} from "./chunk-VRHTNBA6.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-GYEKOX7N.js";
+} from "./chunk-2B3PT3V2.js";
 import {
-  FUNCTION_TIMEOUT_BUFFER_SECONDS,
   botConfig,
   escapeXml,
   getChatConfig,
   getRuntimeMetadata,
   normalizeSlackEmojiName,
   standardModelId
-} from "./chunk-MKRIZ4VG.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   discoverSkills
-} from "./chunk-FGHADGIC.js";
+} from "./chunk-4AQZYNHM.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-PB222GIA.js";
+} from "./chunk-HWQGBIH7.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse
-} from "./chunk-37JJDS4H.js";
+} from "./chunk-POSZWRGL.js";
 import {
   createSlackResumeActor,
   isUserActor
 } from "./chunk-HZF5P5UN.js";
 import {
-  parseSlackMessageTs
+  parseSlackMessageTs,
+  parseSlackUserId
 } from "./chunk-F3B2YJ76.js";
 import {
   buildTurnFailureResponse,
   logException,
   logInfo,
   logWarn,
+  runBestEffort,
   setTags,
   toOptionalString,
   withLogContext
-} from "./chunk-B63BF443.js";
+} from "./chunk-EAI67NTM.js";
 import {
   homeDir
 } from "./chunk-H4HBKISO.js";
@@ -1070,33 +1080,6 @@ function buildAuthPauseResponse(slackUserId, providerDisplayName, requestText) {
 I sent you a link.`;
 }
 
-// src/chat/runtime/request-deadline.ts
-import { AsyncLocalStorage } from "async_hooks";
-var requestDeadlineStorage = new AsyncLocalStorage();
-function createTurnRequestDeadline(startedAtMs) {
-  const requestBudgetMs = Math.max(
-    1,
-    getChatConfig().functionMaxDurationSeconds * 1e3 - FUNCTION_TIMEOUT_BUFFER_SECONDS * 1e3
-  );
-  return {
-    startedAtMs,
-    deadlineAtMs: startedAtMs + requestBudgetMs
-  };
-}
-function getTurnRequestDeadline() {
-  return requestDeadlineStorage.getStore();
-}
-function runWithTurnRequestDeadline(callback, startedAtMs = Date.now()) {
-  const existingDeadline = requestDeadlineStorage.getStore();
-  if (existingDeadline) {
-    return callback();
-  }
-  return requestDeadlineStorage.run(
-    createTurnRequestDeadline(startedAtMs),
-    callback
-  );
-}
-
 // src/chat/runtime/slack-resume.ts
 function resolveReplyTimeoutMs(explicitTimeoutMs) {
   if (typeof explicitTimeoutMs === "number" && explicitTimeoutMs > 0) {
@@ -1125,11 +1108,17 @@ async function postSlackMessageBestEffort(channelId, threadTs, text, conversatio
   } catch {
   }
 }
-function createReadOnlyConfigService(values) {
+function createReadOnlyConfigService(rawValues) {
+  const values = Object.fromEntries(
+    Object.entries(rawValues).map(([key, value]) => [
+      key,
+      configValueSchema.parse(value)
+    ])
+  );
   const entries = Object.entries(values).map(([key, value]) => ({
     key,
     value,
-    scope: "conversation",
+    scope: "location",
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   }));
   return {
@@ -1264,7 +1253,7 @@ function createResumeReplyContext(args, statusSession, delivery) {
   }
   const requestDeadline = getTurnRequestDeadline();
   const threadId = args.lockKey ?? getDefaultLockKey(args.channelId, args.threadTs);
-  const persistedChannelConfiguration = replyContext.policy?.channelConfiguration ?? (replyContext.policy?.configuration ? createReadOnlyConfigService(replyContext.policy.configuration) : void 0);
+  const persistedLocationConfiguration = replyContext.policy?.locationConfiguration ?? (replyContext.policy?.configuration ? createReadOnlyConfigService(replyContext.policy.configuration) : void 0);
   return {
     conversationId: args.conversationId,
     turnId: args.turnId,
@@ -1283,7 +1272,7 @@ function createResumeReplyContext(args, statusSession, delivery) {
     policy: {
       ...replyContext.policy,
       turnDeadlineAtMs: replyContext.policy?.turnDeadlineAtMs ?? requestDeadline?.deadlineAtMs,
-      channelConfiguration: persistedChannelConfiguration
+      locationConfiguration: persistedLocationConfiguration
     },
     state: replyContext.state,
     observers: {
@@ -1301,10 +1290,6 @@ function createResumeReplyContext(args, statusSession, delivery) {
           sandboxRef
         });
         await replyContext.durability?.onSandboxRefChanged?.(sandboxRef);
-      },
-      onArtifactStateUpdated: async (artifacts) => {
-        await persistThreadStateById(threadId, { artifacts });
-        await replyContext.durability?.onArtifactStateUpdated?.(artifacts);
       }
     }
   };
@@ -1428,15 +1413,17 @@ async function resumeSlackTurnInContext(args) {
       }
       failureCode = "delivery_failed";
       const deliveryState2 = await getDeliveryConversation();
-      let slackMessageTs;
+      let slackMessageTs = [];
       try {
-        slackMessageTs = await sendSlackReply({
-          channelId: runArgs.channelId,
-          conversationId: runArgs.conversationId,
-          replyAttribution: runArgs.replyContext?.routing.dispatch?.replyAttribution,
-          text,
-          threadTs: runArgs.threadTs
-        });
+        if (runArgs.replyContext?.routing.publishExternally !== false) {
+          slackMessageTs = await sendSlackReply({
+            channelId: runArgs.channelId,
+            conversationId: runArgs.conversationId,
+            replyAttribution: runArgs.replyContext?.routing.dispatch?.replyAttribution,
+            text,
+            threadTs: runArgs.threadTs
+          });
+        }
       } catch (error) {
         if (isRetryableSlackPostError(error)) {
           throw new RetryableDeliveryError(error);
@@ -1885,10 +1872,8 @@ async function persistCompletedReplyState(channelId, threadTs, sessionId, reply)
   const currentState = await getPersistedThreadState(threadId);
   const conversation = coerceThreadConversationState(currentState);
   await hydrateConversationMessages({ conversation, conversationId: threadId });
-  const artifacts = coerceThreadArtifactsState(currentState);
   const userMessage = getTurnUserMessage(conversation, sessionId);
   const statePatch = buildDeliveredTurnStatePatch({
-    artifacts,
     conversation,
     reply,
     sessionId,
@@ -1994,7 +1979,6 @@ async function resumeAuthorizedMcpTurn(args) {
         conversation: lockedConversation,
         conversationId: threadId
       });
-      const lockedArtifacts = coerceThreadArtifactsState(lockedState);
       const lockedPendingAuth = getConversationPendingAuth({
         conversation: lockedConversation,
         kind: "mcp",
@@ -2040,9 +2024,7 @@ async function resumeAuthorizedMcpTurn(args) {
           excludeMessageId: lockedUserMessage.id
         }
       );
-      const lockedChannelConfiguration = getChannelConfigurationServiceById(
-        authSession.channelId
-      );
+      const lockedLocationConfiguration = getLocationConfigurationService(destination);
       let actor;
       try {
         actor = createSlackResumeActor({
@@ -2103,14 +2085,13 @@ async function resumeAuthorizedMcpTurn(args) {
             actor,
             destination,
             source: routing.source,
-            toolChannelId: authSession.toolChannelId ?? lockedArtifacts.assistantContextChannelId ?? authSession.channelId
+            toolChannelId: authSession.toolChannelId ?? authSession.channelId
           },
           policy: {
             configuration: authSession.configuration,
-            channelConfiguration: lockedChannelConfiguration
+            locationConfiguration: lockedLocationConfiguration
           },
           state: {
-            artifactState: lockedArtifacts,
             pendingAuth: lockedPendingAuth,
             sandboxRef: getPersistedSandboxState(lockedState)
           },
@@ -2487,10 +2468,8 @@ async function persistCompletedOAuthReplyState(args) {
     conversation,
     conversationId: args.conversationId
   });
-  const artifacts = coerceThreadArtifactsState(currentState);
   const userMessage = getTurnUserMessage(conversation, args.sessionId);
   const statePatch = buildDeliveredTurnStatePatch({
-    artifacts,
     conversation,
     reply: args.reply,
     sessionId: args.sessionId,
@@ -2624,7 +2603,6 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
         conversation: lockedConversation,
         conversationId: stored.resumeConversationId
       });
-      const lockedArtifacts = coerceThreadArtifactsState(lockedState);
       const lockedPendingAuth = getConversationPendingAuth({
         conversation: lockedConversation,
         kind: "plugin",
@@ -2672,9 +2650,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
           excludeMessageId: lockedUserMessage.id
         }
       );
-      const lockedChannelConfiguration = getChannelConfigurationServiceById(
-        stored.channelId
-      );
+      const lockedLocationConfiguration = getLocationConfigurationService(destination);
       let actor;
       try {
         actor = createSlackResumeActor({
@@ -2740,13 +2716,12 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
             actor,
             destination,
             source: routing.source,
-            toolChannelId: lockedArtifacts.assistantContextChannelId ?? stored.channelId
+            toolChannelId: stored.channelId
           },
           policy: {
-            channelConfiguration: lockedChannelConfiguration
+            locationConfiguration: lockedLocationConfiguration
           },
           state: {
-            artifactState: lockedArtifacts,
             pendingAuth: lockedPendingAuth,
             sandboxRef: getPersistedSandboxState(lockedState)
           },
@@ -2974,27 +2949,61 @@ async function GET2(request, provider, waitUntil, options) {
     ...parsedTokenResponse,
     ...account ? { account } : {}
   });
-  if (stored.resumeConversationId) {
-    try {
-      await recordAuthenticationLinked({
-        conversationId: stored.resumeConversationId,
-        provider,
-        actorId: stored.userId,
-        providerLabel,
-        ...account?.label ? { accountLabel: account.label } : {},
-        ...stored.resumeSessionId ? {
-          authorizationId: pluginAuthorizationId({
-            provider,
-            sessionId: stored.resumeSessionId
-          }),
-          turnId: stored.resumeSessionId
-        } : {}
-      });
-    } catch (error) {
-      logException(error, "oauth.callback.authentication_event.failed", {
-        "app.credential.provider": provider
-      });
-    }
+  const slackActor = stored.actor?.platform === "slack" ? stored.actor : void 0;
+  if (account && slackActor) {
+    await runBestEffort(
+      async () => {
+        const slackUserId = parseSlackUserId(slackActor.userId);
+        if (!slackUserId) {
+          throw new Error("OAuth Slack actor user id is invalid");
+        }
+        const profile = await lookupSlackUserProfile(slackUserId);
+        const slackIdentity = await upsertIdentity(getSqlExecutor(), {
+          kind: "user",
+          provider: "slack",
+          providerTenantId: slackActor.teamId,
+          providerSubjectId: profile.id,
+          displayName: profile.real_name || profile.display_name,
+          handle: profile.name,
+          ...profile.email ? { email: profile.email, emailVerified: true } : {}
+        });
+        if (!slackIdentity.userId) {
+          throw new Error("OAuth Slack identity is not linked to a user");
+        }
+        await upsertLinkedIdentity(getSqlExecutor(), slackIdentity.userId, {
+          kind: "user",
+          provider,
+          providerSubjectId: account.id,
+          displayName: account.displayName,
+          handle: account.handle ?? account.label
+        });
+      },
+      "oauth.callback.identity_link.failed",
+      { "app.credential.provider": provider }
+    );
+  }
+  const resumeConversationId = stored.resumeConversationId;
+  if (resumeConversationId) {
+    await runBestEffort(
+      async () => {
+        await recordAuthenticationLinked({
+          conversationId: resumeConversationId,
+          provider,
+          actorId: stored.userId,
+          providerLabel,
+          ...account?.label ? { accountLabel: account.label } : {},
+          ...stored.resumeSessionId ? {
+            authorizationId: pluginAuthorizationId({
+              provider,
+              sessionId: stored.resumeSessionId
+            }),
+            turnId: stored.resumeSessionId
+          } : {}
+        });
+      },
+      "oauth.callback.authentication_event.failed",
+      { "app.credential.provider": provider }
+    );
   }
   if (stored.destination?.platform !== "local") {
     waitUntil(async () => {
@@ -3155,8 +3164,6 @@ export {
   shouldKeepProcessingReactionForToolInvocation,
   startSlackProcessingReaction,
   buildAuthPauseResponse,
-  getTurnRequestDeadline,
-  runWithTurnRequestDeadline,
   resumeSlackTurn,
   getPausedTurnRequest,
   wakePausedTurn,

package/dist/{chunk-V6SRLKUB.js → chunk-V2FXMOEA.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-EM225ITJ.js";
 import {
   getSlackBotToken
-} from "./chunk-MKRIZ4VG.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   parseSlackChannelReferenceId
 } from "./chunk-F3B2YJ76.js";
@@ -12,7 +12,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-B63BF443.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/slack/client.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";