@sentry/junior 0.188.0 → 0.190.0

package/dist/{chunk-WW2Y7JIA.js → chunk-F3K2267N.js}

@@ -1,14 +1,10 @@
 import {
   relayLocalOAuthCallback
 } from "./chunk-FA6POGLH.js";
-import {
-  buildSentryConversationUrl,
-  deleteWebAuthorization
-} from "./chunk-PSHMPRIU.js";
 import {
   AgentRunError,
   executeTurn
-} from "./chunk-ERZMACYA.js";
+} from "./chunk-IRQ3RSX3.js";
 import {
   buildDeliveredTurnStatePatch,
   finalizeFailedTurnReplyWithEvent,
@@ -19,14 +15,14 @@ import {
   getTurnUserSlackMessageTs,
   persistAuthPauseTurnState,
   requireTurnFailureEventId
-} from "./chunk-QDHJTKPE.js";
+} from "./chunk-7Y7XMI6P.js";
 import {
   resolveTurnSessionRouting,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-AW77HH54.js";
+} from "./chunk-ECOR3OXY.js";
 import {
   getTurnLifecycle
-} from "./chunk-W42ENMJW.js";
+} from "./chunk-6H7YU6XH.js";
 import {
   coerceThreadConversationState,
   configValueSchema,
@@ -34,7 +30,11 @@ import {
   getPersistedSandboxState,
   getPersistedThreadState,
   persistThreadStateById
-} from "./chunk-CIG6WI7Q.js";
+} from "./chunk-W2C4TPLB.js";
+import {
+  buildSentryConversationUrl,
+  deleteWebAuthorization
+} from "./chunk-OON4IQHH.js";
 import {
   createUserTokenStore,
   deleteMcpAuthSession,
@@ -44,8 +44,9 @@ import {
   getMcpStoredOAuthCredentials,
   lookupSlackUserProfile,
   resolvePluginOAuthAccount
-} from "./chunk-W2DDJCPS.js";
+} from "./chunk-FVFJ57RK.js";
 import {
+  RetryableDeliveryError,
   addReactionToMessage,
   escapeSlackMrkdwnText,
   formatProviderLabel,
@@ -57,20 +58,7 @@ import {
   removeReactionFromMessage,
   resolveBaseUrl,
   truncateStatusText
-} from "./chunk-UVUXFRYN.js";
-import {
-  parseSlackThreadId,
-  readSlackRawMessageContext,
-  resolveSlackChannelIdFromMessage,
-  resolveSlackChannelIdFromThreadId
-} from "./chunk-CVBDVIF4.js";
-import {
-  RetryableDeliveryError
-} from "./chunk-6FGN7ZEG.js";
-import {
-  ensureConversationWake,
-  requestConversationWork
-} from "./chunk-MQDIIFZM.js";
+} from "./chunk-GWCFXTB6.js";
 import {
   CooperativeTurnYieldError,
   clearPendingAuth,
@@ -79,7 +67,7 @@ import {
   isCooperativeTurnYieldError,
   isPendingAuthLatestRequest,
   markTurnFailed
-} from "./chunk-Z5SKZE5B.js";
+} from "./chunk-67MMSYSE.js";
 import {
   TurnSliceLimitExceededError,
   abandonTurnRecord,
@@ -99,13 +87,23 @@ import {
   recordTurnSummary,
   saveTurnCheckpoint,
   turnHasReply
-} from "./chunk-6YGFBU3A.js";
+} from "./chunk-BGOLRC36.js";
 import {
-  getVercelConversationWorkQueue
-} from "./chunk-DKIJ2RP5.js";
+  parseSlackThreadId,
+  readSlackRawMessageContext,
+  resolveSlackChannelIdFromMessage,
+  resolveSlackChannelIdFromThreadId
+} from "./chunk-BUJU6C2J.js";
+import {
+  ensureConversationWake,
+  requestConversationWork
+} from "./chunk-YFU4DGZY.js";
 import {
   getTurnRequestDeadline
-} from "./chunk-WGZJ5SU4.js";
+} from "./chunk-7UJ6IJCK.js";
+import {
+  getVercelConversationWorkQueue
+} from "./chunk-DKIJ2RP5.js";
 import {
   SlackActionError,
   getDashboardConversationLink,
@@ -114,38 +112,39 @@ import {
   getSlackClient,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-QCGNHSMA.js";
+} from "./chunk-2MRF22J4.js";
 import {
+  getConversationStore,
   getSqlExecutor,
   requireSlackDestination,
   upsertIdentity,
   upsertLinkedIdentity
-} from "./chunk-IUUQWIG2.js";
+} from "./chunk-OKAHLUSU.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-ZX7RSBQ6.js";
+} from "./chunk-6BXUSF7J.js";
 import {
   botConfig,
   escapeXml,
   getChatConfig,
   getRuntimeMetadata,
   normalizeSlackEmojiName
-} from "./chunk-Q7O74WOO.js";
+} from "./chunk-VWNIDTFR.js";
 import {
   defaultModelId
 } from "./chunk-D4YV5TDV.js";
 import {
   discoverSkills
-} from "./chunk-3HEZWDS5.js";
+} from "./chunk-REVH4BZU.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-NZLZ4KYZ.js";
+} from "./chunk-4PKEJK5B.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse
-} from "./chunk-QIOUTXTZ.js";
+} from "./chunk-663DQH5W.js";
 import {
   createSlackResumeActor,
   isUserActor,
@@ -164,7 +163,7 @@ import {
   setTags,
   toOptionalString,
   withLogContext
-} from "./chunk-QIMN3FXL.js";
+} from "./chunk-Y4WL4OYD.js";
 
 // src/chat/slack/assistant-thread/status-render.ts
 var DEFAULT_STATUS_CONTEXTS = {
@@ -1269,7 +1268,7 @@ function buildResumedRun(args, statusSession, delivery) {
       ...savedRun.instruction ?? { text: args.messageText },
       text: args.messageText
     },
-    source: source.platform === "slack" ? {
+    source: source.kind === "slack" ? {
       ...source,
       channelId: args.channelId,
       ...args.threadTs ? { threadTs: args.threadTs } : void 0
@@ -1374,6 +1373,7 @@ async function resumeSlackTurnInContext(args) {
     }
     status.update(runArgs.initialStatus);
     const conversationId = runArgs.conversationId;
+    const visibility = (await getConversationStore().get({ conversationId }))?.visibility;
     const visibleConversationId = lockKey;
     const sessionId = runArgs.turnId;
     let deliveryConversation;
@@ -1481,7 +1481,7 @@ async function resumeSlackTurnInContext(args) {
             () => recordTurnSummary({
               conversationId: runArgs.conversationId,
               destination: savedRun.destination,
-              destinationVisibility: savedRun.destinationVisibility,
+              destinationVisibility: visibility,
               dispatchId,
               resultMessageId: messageTs,
               turnId: runArgs.turnId,
@@ -1502,10 +1502,7 @@ async function resumeSlackTurnInContext(args) {
       deliveryState.conversation,
       sessionId
     );
-    const run = buildResumedRun(runArgs, status, {
-      ...runArgs.run?.publishExternally !== false && runArgs.run?.source.location ? { location: runArgs.run.source.location } : void 0,
-      send: deliverAssistantMessage
-    });
+    const run = buildResumedRun(runArgs, status, deliverAssistantMessage);
     if (runArgs.inputMessageIds?.length) {
       await turnLifecycle.start({
         conversationId: runArgs.conversationId,
@@ -1540,7 +1537,7 @@ async function resumeSlackTurnInContext(args) {
             durationMs: reply.diagnostics.durationMs,
             usage: reply.diagnostics.usage,
             destination: run.destination,
-            destinationVisibility: run.destinationVisibility,
+            destinationVisibility: visibility,
             dispatchId: run.dispatch?.id,
             dispatchOutcome: reply.diagnostics.outcome === "success" ? "completed" : "failed",
             ...dispatchErrorMessage ? { errorMessage: dispatchErrorMessage } : void 0,
@@ -1554,7 +1551,7 @@ async function resumeSlackTurnInContext(args) {
           await recordTurnSummary({
             conversationId: runArgs.conversationId,
             destination: run.destination,
-            destinationVisibility: run.destinationVisibility,
+            destinationVisibility: visibility,
             dispatchId: run.dispatch?.id,
             dispatchOutcome: reply.diagnostics.outcome === "success" ? "completed" : "failed",
             ...acceptedDeliveryId ? { resultMessageId: acceptedDeliveryId } : void 0,
@@ -2036,6 +2033,7 @@ async function resumeAuthorizedMcpTurn(args) {
       let actor;
       try {
         actor = createSlackResumeActor({
+          actor: lockedSessionRecord.actor,
           teamId: destination.teamId,
           userId: authSession.userId
         });
@@ -2092,6 +2090,7 @@ async function resumeAuthorizedMcpTurn(args) {
           },
           actor,
           destination,
+          ...routing.location ? { location: routing.location } : void 0,
           source: routing.source,
           toolChannelId: authSession.toolChannelId ?? authSession.channelId,
           environment: {
@@ -2180,7 +2179,7 @@ async function isCurrentMcpAuthorizationAttempt(authSession, provider) {
   return pendingAuth?.authSessionId === authSession.authSessionId && pendingAuth.sessionId === authSession.sessionId;
 }
 function mcpConversationId(authSession) {
-  if (authSession.destination?.platform === "local" || authSession.source?.platform === "web") {
+  if (authSession.destination?.platform === "local" || authSession.source?.kind === "web") {
     return authSession.conversationId;
   }
   if (authSession.channelId && authSession.threadTs) {
@@ -2276,7 +2275,7 @@ async function GET(request, provider, waitUntil, options) {
         "app.credential.provider": provider
       });
     }
-    if (authSession.source?.platform === "web" && authSession.destination) {
+    if (authSession.source?.kind === "web" && authSession.destination) {
       waitUntil(async () => {
         const turn = await getTurnRecord(
           authSession.conversationId,
@@ -2321,7 +2320,7 @@ async function GET(request, provider, waitUntil, options) {
     return htmlResponse("success", {
       // Web roots keep a local destination for conversation-only delivery.
       // Only the CLI path should get the local-client success copy.
-      local: authSession.destination?.platform === "local" && authSession.source?.platform !== "web"
+      local: authSession.destination?.platform === "local" && authSession.source?.kind !== "web"
     });
   } catch (callbackError) {
     if (callbackError instanceof McpOAuthAttemptExpiredError) {
@@ -2696,6 +2695,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
       let actor;
       try {
         actor = createSlackResumeActor({
+          actor: lockedSessionRecord.actor,
           teamId: destination.teamId,
           userId: lockedUserMessage.author.userId
         });
@@ -2757,6 +2757,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
           },
           actor,
           destination,
+          ...routing.location ? { location: routing.location } : void 0,
           source: routing.source,
           toolChannelId: stored.channelId,
           environment: {
@@ -3046,7 +3047,7 @@ async function GET2(request, provider, waitUntil, options) {
       { "app.credential.provider": provider }
     );
   }
-  if (stored.destination?.platform !== "local" && stored.source?.platform !== "web") {
+  if (stored.destination?.platform !== "local" && stored.source?.kind !== "web") {
     waitUntil(async () => {
       try {
         await publishAppHomeView(
@@ -3059,7 +3060,7 @@ async function GET2(request, provider, waitUntil, options) {
     });
   }
   const resumesWebTurn = Boolean(
-    stored.source?.platform === "web" && stored.destination && stored.resumeConversationId && stored.resumeSessionId
+    stored.source?.kind === "web" && stored.destination && stored.resumeConversationId && stored.resumeSessionId
   );
   const resumesAgentTurn = Boolean(
     stored.destination?.platform !== "local" && stored.resumeConversationId && stored.resumeSessionId

package/dist/{chunk-W2DDJCPS.js → chunk-FVFJ57RK.js}

@@ -1,32 +1,32 @@
 import {
   resolveBaseUrl
-} from "./chunk-UVUXFRYN.js";
+} from "./chunk-GWCFXTB6.js";
 import {
   createPluginLogger,
   getPlugins,
   getSlackClient,
   withSlackRetries
-} from "./chunk-QCGNHSMA.js";
+} from "./chunk-2MRF22J4.js";
 import {
   getDb,
   parseDestination
-} from "./chunk-IUUQWIG2.js";
+} from "./chunk-OKAHLUSU.js";
 import {
   sleep
-} from "./chunk-X55FOVZO.js";
+} from "./chunk-HI5KXE3C.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-ZX7RSBQ6.js";
+} from "./chunk-6BXUSF7J.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-NZLZ4KYZ.js";
+} from "./chunk-4PKEJK5B.js";
 import {
   fetchWithBoundedOAuthErrorBodies
-} from "./chunk-QIOUTXTZ.js";
+} from "./chunk-663DQH5W.js";
 import {
   isRecord
-} from "./chunk-QIMN3FXL.js";
+} from "./chunk-Y4WL4OYD.js";
 
 // src/chat/capabilities/router.ts
 var ProviderCredentialRouter = class {

package/dist/{chunk-UVUXFRYN.js → chunk-GWCFXTB6.js}

@@ -1,3 +1,6 @@
+import {
+  isExperimentalFeatureEnabled
+} from "./chunk-2LYHWMR4.js";
 import {
   SlackActionError,
   applyPluginFormatMarkdown,
@@ -5,19 +8,19 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-QCGNHSMA.js";
+} from "./chunk-2MRF22J4.js";
 import {
   parseDestination
-} from "./chunk-IUUQWIG2.js";
+} from "./chunk-OKAHLUSU.js";
 import {
   getStateAdapter
-} from "./chunk-ZX7RSBQ6.js";
+} from "./chunk-6BXUSF7J.js";
 import {
   normalizeSlackEmojiName
-} from "./chunk-Q7O74WOO.js";
+} from "./chunk-VWNIDTFR.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-NZLZ4KYZ.js";
+} from "./chunk-4PKEJK5B.js";
 import {
   parseSlackMessageTs,
   parseSlackUserId
@@ -26,7 +29,200 @@ import {
   isRecord,
   logInfo,
   logWarn
-} from "./chunk-QIMN3FXL.js";
+} from "./chunk-Y4WL4OYD.js";
+
+// src/chat/agent/types.ts
+var RetryableDeliveryError = class extends Error {
+  constructor(cause) {
+    super("Assistant delivery was transient or ambiguous", { cause });
+    this.name = "RetryableDeliveryError";
+  }
+};
+function isAgentRunFeatureDisabled(disabledFeatures, feature) {
+  return disabledFeatures?.includes(feature) ?? false;
+}
+function actorFromRun(run) {
+  if (run.dispatch?.actor) {
+    return run.dispatch.actor;
+  }
+  if (run.actor) {
+    return run.actor;
+  }
+  if (run.credentialContext && !("type" in run.credentialContext.actor)) {
+    return run.credentialContext.actor;
+  }
+  return void 0;
+}
+function assertRunConsistency(run) {
+  const { destination, source } = run;
+  switch (source.kind) {
+    case "slack": {
+      if (destination.platform !== "slack") {
+        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");
+      }
+      break;
+    }
+    case "local": {
+      if (destination.platform !== "local") {
+        throw new TypeError(
+          "Run source and destination platforms do not match"
+        );
+      }
+      if (source.conversationId !== destination.conversationId) {
+        throw new TypeError(
+          "Source and destination conversation IDs do not match"
+        );
+      }
+      if (run.surface !== "internal" && destination.conversationId !== run.conversationId) {
+        throw new TypeError(
+          "Source, destination, and run conversation IDs do not match"
+        );
+      }
+      break;
+    }
+    case "web": {
+      if (run.surface !== "internal" && source.conversationId !== run.conversationId) {
+        throw new TypeError("Web source and run conversation IDs do not match");
+      }
+      switch (destination.platform) {
+        case "local": {
+          if (source.conversationId !== destination.conversationId) {
+            throw new TypeError(
+              "Source and destination conversation IDs do not match"
+            );
+          }
+          if (run.surface !== "internal" && destination.conversationId !== run.conversationId) {
+            throw new TypeError(
+              "Source, destination, and run conversation IDs do not match"
+            );
+          }
+          break;
+        }
+        case "slack":
+          break;
+      }
+      break;
+    }
+    case "resource_event":
+      break;
+  }
+  const actor = run.dispatch?.actor ?? run.actor;
+  if (!actor || actor.platform === "system") {
+    return;
+  }
+  if (actor.platform !== source.kind) {
+    throw new TypeError(
+      `Actor platform "${actor.platform}" does not match Source kind "${source.kind}"`
+    );
+  }
+  if (actor.platform === "slack" && source.kind === "slack" && actor.teamId !== source.teamId) {
+    throw new TypeError("Slack Actor team does not match Source team");
+  }
+}
+function toolInvocationDestination(run) {
+  if (run.destination.platform !== "slack" || !run.toolChannelId) {
+    return run.destination;
+  }
+  return {
+    platform: "slack",
+    teamId: run.destination.teamId,
+    channelId: run.toolChannelId
+  };
+}
+function surfaceFromRun(run) {
+  if (run.surface) {
+    return run.surface;
+  }
+  if (run.source.kind === "slack") {
+    return "slack";
+  }
+  if (run.source.kind === "web") {
+    return "api";
+  }
+  return "internal";
+}
+
+// src/chat/runtime/agent-runner.ts
+var AGENT_ABORT_SETTLE_GRACE_MS = 5e3;
+function createAgentRunner(execute, options) {
+  const attachmentStorage = options?.attachmentStorage;
+  const streamFn = options?.streamFn;
+  const tracePropagation = options?.tracePropagation;
+  const bindSpawnAgent = options?.bindSpawnAgent;
+  const canBindSpawn = Boolean(bindSpawnAgent) && isExperimentalFeatureEnabled("subagents");
+  return {
+    run: async (run) => {
+      const spawnAgent = bindSpawnAgent && canBindSpawn && !isAgentRunFeatureDisabled(run.disabledFeatures, "subagents") ? bindSpawnAgent(run) : void 0;
+      const nextRun = {
+        ...run,
+        environment: {
+          ...run.environment,
+          attachmentStorage: run.environment?.attachmentStorage ?? attachmentStorage,
+          sandboxTracePropagation: run.environment?.sandboxTracePropagation ?? tracePropagation
+        },
+        ...spawnAgent ? {
+          durability: {
+            ...run.durability,
+            spawnAgent
+          }
+        } : void 0
+      };
+      return await execute(nextRun, streamFn);
+    }
+  };
+}
+async function waitForAgentSettlement(runPromise) {
+  let timeoutId;
+  const settleGrace = new Promise((resolve) => {
+    timeoutId = setTimeout(resolve, AGENT_ABORT_SETTLE_GRACE_MS);
+    timeoutId.unref?.();
+  });
+  await Promise.race([
+    runPromise.then(
+      () => void 0,
+      () => void 0
+    ),
+    settleGrace
+  ]);
+  if (timeoutId) {
+    clearTimeout(timeoutId);
+  }
+}
+async function runAgentWithTimeout(agentRunner, run, timeoutMs) {
+  if (typeof timeoutMs !== "number") {
+    return await agentRunner.run(run);
+  }
+  const timeoutError = new Error(
+    `executeAgentRun timed out after ${timeoutMs}ms`
+  );
+  const abortController = new AbortController();
+  const signal = run.signal ? AbortSignal.any([run.signal, abortController.signal]) : abortController.signal;
+  const runPromise = agentRunner.run({ ...run, signal });
+  let timeoutId;
+  const timeoutPromise = new Promise((_, reject) => {
+    timeoutId = setTimeout(() => {
+      abortController.abort(timeoutError);
+      reject(timeoutError);
+    }, timeoutMs);
+  });
+  try {
+    return await Promise.race([runPromise, timeoutPromise]);
+  } catch (error) {
+    if (abortController.signal.aborted) {
+      await waitForAgentSettlement(runPromise);
+    }
+    throw error;
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
 
 // src/chat/slack/outbound.ts
 var MAX_SLACK_MESSAGE_TEXT_CHARS = 4e4;
@@ -705,6 +901,12 @@ async function startOAuthFlow(provider, input) {
 }
 
 export {
+  RetryableDeliveryError,
+  isAgentRunFeatureDisabled,
+  actorFromRun,
+  assertRunConsistency,
+  toolInvocationDestination,
+  surfaceFromRun,
   getSlackMessagePermalink,
   postSlackMessage,
   uploadFilesToConversation,
@@ -719,5 +921,7 @@ export {
   formatProviderLabel,
   resolveBaseUrl,
   deliverOAuthAuthorization,
-  startOAuthFlow
+  startOAuthFlow,
+  createAgentRunner,
+  runAgentWithTimeout
 };

package/dist/{chunk-X55FOVZO.js → chunk-HI5KXE3C.js}

@@ -1,13 +1,13 @@
 import {
   toOptionalTrimmed
-} from "./chunk-Q7O74WOO.js";
+} from "./chunk-VWNIDTFR.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-NZLZ4KYZ.js";
+} from "./chunk-4PKEJK5B.js";
 import {
   setSpanAttributes,
   setSpanStatus
-} from "./chunk-QIMN3FXL.js";
+} from "./chunk-Y4WL4OYD.js";
 
 // src/chat/sandbox/paths.ts
 function normalizeWorkspaceRoot(input) {

package/dist/{chunk-ERZMACYA.js → chunk-IRQ3RSX3.js}

@@ -1,12 +1,12 @@
 import {
   ConversationTurnLifecycleService
-} from "./chunk-W42ENMJW.js";
+} from "./chunk-6H7YU6XH.js";
 import {
   runAgentWithTimeout
-} from "./chunk-6FGN7ZEG.js";
+} from "./chunk-GWCFXTB6.js";
 import {
   getConversationEventStore
-} from "./chunk-IUUQWIG2.js";
+} from "./chunk-OKAHLUSU.js";
 
 // src/chat/runtime/turn-execution.ts
 var AgentRunError = class extends Error {

package/dist/{chunk-32XSSFZV.js → chunk-JV7U4665.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@sentry/junior",
-  version: "0.188.0",
+  version: "0.190.0",
   private: false,
   publishConfig: {
     access: "public"