@sentry/junior 0.108.0 → 0.110.0

package/dist/{chunk-KPMPQ6AA.js → chunk-RHHRKSPI.js}

@@ -1,5 +1,6 @@
 import {
   CooperativeTurnYieldError,
+  JUNIOR_THREAD_STATE_TTL_MS,
   TurnInputCommitLostError,
   TurnSliceLimitExceededError,
   abandonReplacedPendingAuth,
@@ -8,23 +9,20 @@ import {
   getAgentContextCompactionTriggerTokens,
   getInterruptionMarker,
   isTurnInputCommitLostError,
+  loadConnectedMcpProviders,
+  loadConversationProjection,
   loadTurnSessionRecord,
   mergeArtifactsState,
+  openConversationProjection,
   persistAuthPauseSessionRecord,
   persistContinuationSessionRecord,
   persistRunningSessionRecord,
   persistYieldSessionRecord,
-  updateConversationStats
-} from "./chunk-3RGQLX2F.js";
-import {
-  JUNIOR_THREAD_STATE_TTL_MS,
-  loadConnectedMcpProviders,
-  loadConversationProjection,
-  openConversationProjection,
   recordAuthorizationRequested,
   recordMcpProviderConnected,
-  recordToolExecutionStarted
-} from "./chunk-J3B3FPP2.js";
+  recordToolExecutionStarted,
+  updateConversationStats
+} from "./chunk-C5XAFTHY.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -34,7 +32,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-B5I5LMSP.js";
+} from "./chunk-W6RJZG7F.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
@@ -44,27 +42,23 @@ import {
 } from "./chunk-UIE3R5XU.js";
 import {
   createPluginHookRunner,
+  createPluginLogger,
   getPluginSystemPromptContributions,
   getPluginTools,
   getPluginUserPromptContributions,
   getPlugins,
   getSlackToolContext,
   resolveChannelCapabilities
-} from "./chunk-UD6THJ2I.js";
-import {
-  createPluginLogger
-} from "./chunk-AHJR2IFF.js";
+} from "./chunk-2T7TIEXI.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
   SANDBOX_WORKSPACE_ROOT,
+  acquireActiveLock,
+  getStateAdapter,
   sandboxSkillDir,
   sandboxSkillFile
-} from "./chunk-G3E7SCME.js";
-import {
-  acquireActiveLock,
-  getStateAdapter
-} from "./chunk-H3QYZL7K.js";
+} from "./chunk-GK47NBDE.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -74,7 +68,7 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-VH6KWKG2.js";
+} from "./chunk-L5XQPJ7T.js";
 import {
   contextProvenance,
   getConversationEventStore,
@@ -82,8 +76,9 @@ import {
   getConversationStore,
   getDb,
   instructionActors,
-  instructionProvenanceFor
-} from "./chunk-TE4QHJH4.js";
+  instructionProvenanceFor,
+  parseDestination
+} from "./chunk-4QU44P7Q.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
@@ -126,7 +121,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   unwrapCurrentInstruction
-} from "./chunk-SS67LUOK.js";
+} from "./chunk-WNOVRQ67.js";
 import {
   parseSlackThreadId,
   resolveConversationPrivacy,
@@ -136,26 +131,26 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-RT5BUHR5.js";
-import {
-  parseDestination
-} from "./chunk-B7PUBQQM.js";
+} from "./chunk-6Y5L4BOM.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-YT72TOEK.js";
+} from "./chunk-SBOBTS27.js";
+import {
+  pluginCatalogRuntime
+} from "./chunk-3TV7OEHL.js";
 import {
   CredentialUnavailableError,
   credentialContextSchema,
-  pluginCatalogRuntime,
+  credentialUserSubjectId,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-YIPD3L6L.js";
+} from "./chunk-Y3H2DN6F.js";
 import {
   isUserActor
-} from "./chunk-VIXFG2VC.js";
+} from "./chunk-C4MZ3GP5.js";
 import {
   extractGenAiUsageAttributes,
   extractGenAiUsageSummary,
@@ -171,20 +166,19 @@ import {
   setSpanStatus,
   setTags,
   summarizeMessageText,
+  withLogContext,
   withSpan
-} from "./chunk-O24R4DCK.js";
+} from "./chunk-IYKPU7H6.js";
 import {
-  isRecord
-} from "./chunk-OB42YVAE.js";
+  isRecord,
+  parseSlackChannelId,
+  parseSlackMessageTs,
+  parseSlackUserId
+} from "./chunk-42WRQLJ6.js";
 import {
   startInactiveSpan,
   withActiveSpan
 } from "./chunk-6GWA276C.js";
-import {
-  parseSlackChannelId,
-  parseSlackMessageTs,
-  parseSlackUserId
-} from "./chunk-7FBGKXPE.js";
 import {
   listReferenceFiles,
   soulPathCandidates,
@@ -1073,9 +1067,9 @@ async function selectTurnRoute(args) {
     messageText: args.messageText
   });
   const logContext = {
-    slackThreadId: args.context?.threadId,
-    slackChannelId: args.context?.channelId,
-    slackUserId: args.context?.actorId,
+    messageConversationId: args.context?.threadId,
+    destinationName: args.context?.channelId,
+    userId: args.context?.actorId,
     runId: args.context?.runId,
     modelId: args.fastModelId
   };
@@ -1213,6 +1207,15 @@ var AuthorizationPauseError = class extends Error {
     this.providerDisplayName = providerDisplayName;
   }
 };
+var AuthPausePersistenceError = class extends Error {
+  constructor(conversationId, turnId, cause) {
+    super(
+      `Failed to persist auth pause for conversation=${conversationId} turn=${turnId}`,
+      cause === void 0 ? void 0 : { cause }
+    );
+    this.name = "AuthPausePersistenceError";
+  }
+};
 var AuthorizationFlowDisabledError = class extends Error {
   kind;
   provider;
@@ -14633,7 +14636,7 @@ async function writeSandboxGeneratedArtifacts(sandbox, files) {
 // src/chat/agent/tools.ts
 async function wireAgentTools(args) {
   const runSource = args.routing.source;
-  const authActorId = args.routing.credentialContext && "type" in args.routing.credentialContext.actor ? args.routing.credentialContext.actor.userId : void 0;
+  const credentialUserId = args.routing.credentialContext ? credentialUserSubjectId(args.routing.credentialContext) : void 0;
   const userTokenStore = createUserTokenStore();
   const pluginHooks = createPluginHookRunner({
     actor: args.currentActor,
@@ -14681,7 +14684,7 @@ async function wireAgentTools(args) {
     abortAgent: args.abortAgent,
     conversationId: args.conversationId,
     sessionId: args.turnId,
-    actorId: authActorId,
+    actorId: credentialUserId,
     channelId: slackChannelId,
     destination: args.routing.destination,
     source: runSource,
@@ -14702,7 +14705,7 @@ async function wireAgentTools(args) {
     abortAgent: args.abortAgent,
     conversationId: args.conversationId,
     sessionId: args.turnId,
-    actorId: authActorId,
+    actorId: credentialUserId,
     channelId: slackChannelId,
     destination: args.routing.destination,
     source: runSource,
@@ -14836,32 +14839,25 @@ async function wireAgentTools(args) {
     })
   );
   const pendingMcpProvider = args.state.pendingAuth?.kind === "mcp" ? args.state.pendingAuth.provider : void 0;
-  const providersToRestore = /* @__PURE__ */ new Set([
-    ...args.connectedMcpProviders,
-    ...inferActiveMcpProvidersFromPiMessages(args.priorPiMessages)
-  ]);
-  for (const provider of providersToRestore) {
-    if (provider === pendingMcpProvider) {
-      continue;
-    }
-    if (await mcpToolManager.activateProvider(provider)) {
-      await args.recordConnectedMcpProvider(provider);
-    }
-    if (mcpAuth.getPendingPause()) {
-      args.resume.captureResumeSnapshot(args.preAgentPromptMessages());
-      throw mcpAuth.getPendingPause();
-    }
-  }
-  for (const skill of args.activeSkills) {
-    if (skill.pluginProvider === pendingMcpProvider) {
-      continue;
-    }
-    if (await mcpToolManager.activateForSkill(skill)) {
-      await args.recordConnectedMcpProvider(skill.pluginProvider);
-    }
-    if (mcpAuth.getPendingPause()) {
-      args.resume.captureResumeSnapshot(args.preAgentPromptMessages());
-      throw mcpAuth.getPendingPause();
+  if (credentialUserId) {
+    const providersToRestore = /* @__PURE__ */ new Set([
+      ...args.connectedMcpProviders,
+      ...inferActiveMcpProvidersFromPiMessages(args.priorPiMessages),
+      ...args.activeSkills.flatMap(
+        (skill) => skill.pluginProvider ? [skill.pluginProvider] : []
+      )
+    ]);
+    for (const provider of providersToRestore) {
+      if (provider === pendingMcpProvider) {
+        continue;
+      }
+      if (await mcpToolManager.activateProvider(provider)) {
+        await args.recordConnectedMcpProvider(provider);
+      }
+      if (mcpAuth.getPendingPause()) {
+        args.resume.captureResumeSnapshot(args.preAgentPromptMessages());
+        throw mcpAuth.getPendingPause();
+      }
     }
   }
   const activeMcpCatalogs = toActiveMcpCatalogSummaries(
@@ -14920,7 +14916,6 @@ function extractSliceUsage(messages, beforeMessageCount) {
 }
 function createResumeState(args) {
   let beforeMessageCount = 0;
-  let cooperativeYieldError;
   let inputCommitted = false;
   let latestSafeBoundaryMessages = [];
   let timedOut = false;
@@ -14951,9 +14946,6 @@ function createResumeState(args) {
     get timedOut() {
       return timedOut;
     },
-    get cooperativeYieldError() {
-      return cooperativeYieldError;
-    },
     setTurnStartMessageIndex(index) {
       turnStartMessageIndex = index;
     },
@@ -15007,25 +14999,53 @@ function createResumeState(args) {
       }
       return persisted;
     },
-    yieldAtSafeBoundaryIfDue(currentMessages) {
+    /** Prepare a cooperative yield at the current durable boundary. */
+    prepareYieldIfDue(currentMessages) {
       if (!args.durability.shouldYield?.()) {
-        return;
+        return void 0;
       }
       resumeMessages = this.getResumeSnapshot(currentMessages);
-      cooperativeYieldError = new CooperativeTurnYieldError(
+      return new CooperativeTurnYieldError(
         `Agent turn yielded at a safe boundary after ${currentDurationMs()}ms`
       );
-      throw cooperativeYieldError;
     },
-    /**
-     * Persist the continuation for an expected run ending and translate it
-     * into an outcome; returns no outcome for genuine errors so the caller's
-     * error guards run.
-     */
-    async translateExpectedEnding(args2) {
-      const { error } = args2;
-      if (cooperativeYieldError && error instanceof CooperativeTurnYieldError) {
-        const usage = args2.currentUsage ?? extractSliceUsage(resumeMessages, beforeMessageCount);
+    /** Persist an auth pause; only a durable pause may return `awaiting_auth`. */
+    async parkForAuth(pause, currentUsage) {
+      const usage = currentUsage ?? (resumeMessages.length > 0 ? extractSliceUsage(resumeMessages, beforeMessageCount) : void 0);
+      try {
+        await args.recordActiveMcpProviders();
+        const sessionRecord = await persistAuthPauseSessionRecord({
+          ...sessionRecordBase(),
+          currentSliceId,
+          currentDurationMs: currentDurationMs(),
+          currentUsage: usage,
+          messages: resumeMessages,
+          errorMessage: pause.message
+        });
+        if (!sessionRecord) {
+          throw new AuthPausePersistenceError(args.conversationId, args.turnId);
+        }
+        return {
+          status: "awaiting_auth",
+          providerDisplayName: pause.providerDisplayName,
+          ...usage ? { usage } : {}
+        };
+      } catch (error) {
+        if (error instanceof AuthPausePersistenceError) {
+          throw error;
+        }
+        throw new AuthPausePersistenceError(
+          args.conversationId,
+          args.turnId,
+          error
+        );
+      }
+    },
+    /** Persist a yield, retry, or timeout as a suspended run. */
+    async translateSuspension(ending) {
+      const { error } = ending;
+      if (error instanceof CooperativeTurnYieldError) {
+        const usage = ending.currentUsage ?? extractSliceUsage(resumeMessages, beforeMessageCount);
         await args.recordActiveMcpProviders();
         const sessionRecord = await persistYieldSessionRecord({
           ...sessionRecordBase(),
@@ -15041,11 +15061,9 @@ function createResumeState(args) {
           );
         }
         return {
-          outcome: {
-            status: "suspended",
-            resumeVersion: sessionRecord.version,
-            ...usage ? { usage } : {}
-          }
+          status: "suspended",
+          resumeVersion: sessionRecord.version,
+          ...usage ? { usage } : {}
         };
       }
       const resumeReason = error instanceof RetryableDeliveryError ? "retry" : timedOut ? "timeout" : void 0;
@@ -15053,7 +15071,7 @@ function createResumeState(args) {
         if (resumeReason === "retry") {
           resumeMessages = [...latestSafeBoundaryMessages];
         }
-        const usage = args2.currentUsage ?? extractSliceUsage(resumeMessages, beforeMessageCount);
+        const usage = ending.currentUsage ?? extractSliceUsage(resumeMessages, beforeMessageCount);
         await args.recordActiveMcpProviders();
         const sessionRecord = await persistContinuationSessionRecord({
           ...sessionRecordBase(),
@@ -15071,37 +15089,14 @@ function createResumeState(args) {
         }
         if (sessionRecord.state === "awaiting_resume") {
           return {
-            outcome: {
-              status: "suspended",
-              resumeVersion: sessionRecord.version,
-              ...usage ? { usage } : {}
-            }
+            status: "suspended",
+            resumeVersion: sessionRecord.version,
+            ...usage ? { usage } : {}
           };
         }
         throw new TurnSliceLimitExceededError(botConfig.maxSlicesPerTurn);
       }
-      if (error instanceof AuthorizationPauseError) {
-        const usage = args2.currentUsage ?? (resumeMessages.length > 0 ? extractSliceUsage(resumeMessages, beforeMessageCount) : void 0);
-        await args.recordActiveMcpProviders();
-        const sessionRecord = await persistAuthPauseSessionRecord({
-          ...sessionRecordBase(),
-          currentSliceId,
-          currentDurationMs: currentDurationMs(),
-          currentUsage: usage,
-          messages: resumeMessages,
-          errorMessage: error.message
-        });
-        if (sessionRecord) {
-          return {
-            outcome: {
-              status: "awaiting_auth",
-              providerDisplayName: error.providerDisplayName,
-              ...usage ? { usage } : {}
-            }
-          };
-        }
-      }
-      return {};
+      return void 0;
     }
   };
 }
@@ -15326,9 +15321,9 @@ async function maybeCompactWithDeps(args, deps) {
     logWarn(
       "context_compaction_summary_failed",
       {
-        slackThreadId: args.metadata?.threadId,
-        slackUserId: args.metadata?.actorId,
-        slackChannelId: args.metadata?.channelId,
+        messageConversationId: args.metadata?.threadId,
+        userId: args.metadata?.actorId,
+        destinationName: args.metadata?.channelId,
         runId: args.metadata?.runId,
         assistantUserName: botConfig.userName,
         modelId: botConfig.fastModelId
@@ -15419,6 +15414,7 @@ ${await summarizeContext(args, deps)}`;
       type: "handoff",
       modelProfile: args.target.modelProfile,
       modelId: args.target.modelId,
+      ...args.target.reasoningLevel ? { reasoningLevel: args.target.reasoningLevel } : {},
       ...args.triggeringToolCallId ? { triggeringToolCallId: args.triggeringToolCallId } : {},
       replacementHistory: replacementMessages.map((replacementMessage) => ({
         message: replacementMessage,
@@ -15478,12 +15474,35 @@ async function executeAgentRun(request) {
     // a compatibility fallback for callers that have not projected it yet.
     visibility: request.routing.destinationVisibility ?? request.routing.slackConversation?.visibility
   });
-  return runWithConversationPrivacy(
-    conversationPrivacy ?? "private",
-    () => executeAgentRunInPrivacyContext(request, conversationPrivacy)
+  const credentialActor = request.routing.credentialContext?.actor;
+  const actor = actorFromRouting(request.routing);
+  const userActor = actor && "userId" in actor ? actor : void 0;
+  const runLogContext = {
+    conversationId: request.conversationId,
+    platform: request.routing.source.platform,
+    messageConversationId: request.routing.source.platform === "slack" ? request.conversationId : request.routing.source.conversationId,
+    destinationName: request.routing.destination.platform === "slack" ? request.routing.destination.channelId : request.routing.destination.conversationId,
+    userId: userActor?.userId,
+    userName: userActor?.userName,
+    userEmail: userActor?.email,
+    runId: request.runId,
+    actorType: credentialActor ? "type" in credentialActor ? credentialActor.type : "system" : void 0,
+    actorId: credentialActor ? "type" in credentialActor ? credentialActor.userId : credentialActor.name : void 0,
+    assistantUserName: botConfig.userName
+  };
+  return withLogContext(
+    runLogContext,
+    () => runWithConversationPrivacy(
+      conversationPrivacy ?? "private",
+      () => executeAgentRunInPrivacyContext(
+        request,
+        conversationPrivacy,
+        runLogContext
+      )
+    )
   );
 }
-async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
+async function executeAgentRunInPrivacyContext(request, conversationPrivacy, runLogContext) {
   const { conversationId, input, routing, runId, turnId } = request;
   const policy = request.policy ?? {};
   const signal = policy.signal;
@@ -15560,16 +15579,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     activeModelProfile = projection.modelProfile;
     activeModelId = modelIdForProfile(botConfig, activeModelProfile);
     const shouldTrace = shouldEmitDevAgentTrace();
-    const spanContext = {
-      conversationId,
-      slackThreadId: slackSource ? conversationId : void 0,
-      slackUserId: slackActor?.userId,
-      slackChannelId: slackDestination?.channelId,
-      runId,
-      ...credentialActorLogContext,
-      assistantUserName: botConfig.userName,
-      modelId: activeModelId
-    };
+    const spanContext = { modelId: activeModelId };
     const availableSkills = await discoverRunSkills({
       skillDirs: policy.skillDirs,
       spanContext
@@ -15726,12 +15736,13 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       );
       const phaseUsage = hasAgentTurnUsage(standardPhaseUsage) ? standardPhaseUsage : void 0;
       const selectedProfile = profileConfig(botConfig, args.profile);
+      const handoffReasoningLevel = selectedProfile.reasoningLevel ?? turnRoute.reasoningLevel;
       const target = {
         modelId: selectedProfile.modelId,
-        modelProfile: args.profile
+        modelProfile: args.profile,
+        reasoningLevel: handoffReasoningLevel
       };
       const handoffModel = resolveGatewayModel(target.modelId);
-      const handoffReasoningLevel = selectedProfile.reasoningLevel ?? turnRoute.reasoningLevel;
       const handoffThinkingLevel = toPiReasoningLevel(handoffReasoningLevel);
       void (async () => {
         await observers.onStatus?.({ text: "Switching models" });
@@ -15789,13 +15800,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       })
     };
     setTags({
-      conversationId: spanContext.conversationId,
-      slackThreadId: slackSource ? conversationId : void 0,
-      slackUserId: slackActor?.userId,
-      slackChannelId: slackDestination?.channelId,
-      runId,
-      ...credentialActorLogContext,
-      assistantUserName: botConfig.userName,
+      ...runLogContext,
       modelId: activeModelId
     });
     const wiring = await wireAgentTools({
@@ -15954,6 +15959,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       }
     };
     const apiKeyOverride = getPiGatewayApiKey();
+    let pendingPiHookError;
     agent = new Agent({
       ...apiKeyOverride ? { getApiKey: () => apiKeyOverride } : {},
       streamFn: createTracedStreamFn({ conversationPrivacy }),
@@ -15977,7 +15983,11 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       prepareNextTurn: async () => {
         const update = applyPendingHandoff();
         await drainSteeringMessages();
-        runResume.yieldAtSafeBoundaryIfDue(currentAgentMessages());
+        const yieldError = runResume.prepareYieldIfDue(currentAgentMessages());
+        if (yieldError) {
+          pendingPiHookError = yieldError;
+          throw yieldError;
+        }
         return update;
       },
       initialState: {
@@ -16024,7 +16034,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       if (shouldPromptAgent) {
         runResume.setTurnStartMessageIndex(agent.state.messages.length);
       }
-      await withSpan(
+      const authPauseOutcome = await withSpan(
         `invoke_agent ${botConfig.userName}`,
         "gen_ai.invoke_agent",
         spanContext,
@@ -16077,8 +16087,9 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
               });
               removeAbortListener = () => signal.removeEventListener("abort", rejectWithAbort);
             }) : void 0;
+            let result2;
             try {
-              return await Promise.race(
+              result2 = await Promise.race(
                 abortPromise ? [run2, timeoutPromise, abortPromise] : [run2, timeoutPromise]
               );
             } catch (error) {
@@ -16119,11 +16130,12 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
                   runResume.getResumeSnapshot(currentAgentMessages())
                 );
               }
-              if (getPendingAuthPause()) {
+              const pendingAuthPause = getPendingAuthPause();
+              if (pendingAuthPause) {
                 runResume.captureResumeSnapshot(
                   runResume.getResumeSnapshot(currentAgentMessages())
                 );
-                throw getPendingAuthPause();
+                throw pendingAuthPause;
               }
               throw error;
             } finally {
@@ -16132,6 +16144,12 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
               }
               removeAbortListener?.();
             }
+            if (pendingPiHookError) {
+              const error = pendingPiHookError;
+              pendingPiHookError = void 0;
+              throw error;
+            }
+            return result2;
           };
           const requestedProfile = activeModelProfile === STANDARD_MODEL_PROFILE ? turnRoute.profile : void 0;
           let run;
@@ -16160,69 +16178,77 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
             run = shouldPromptAgent ? agent.prompt(freshPromptMessage) : agent.continue();
           }
           let retryUsage;
-          for (let attempt = 0; ; attempt += 1) {
-            await runAgentStep(run);
-            if (assistantMessageDeliveryError) {
-              throw assistantMessageDeliveryError;
-            }
-            signal?.throwIfAborted();
-            if (runResume.cooperativeYieldError) {
-              throw runResume.cooperativeYieldError;
-            }
-            newMessages = agent.state.messages.slice(
-              runResume.beforeMessageCount
-            );
-            const outputMessages = newMessages.filter(isAssistantMessage);
-            const outputMessagesAttribute = serializeGenAiAttribute(
-              conversationPrivacy === "public" ? outputMessages.map(toCanonicalOutputMessage) : void 0
-            );
-            const lastAssistant = outputMessages.at(-1);
-            const usageSummary = extractGenAiUsageSummary(...outputMessages);
-            const currentUsage = hasAgentTurnUsage(usageSummary) ? usageSummary : void 0;
-            const currentPhaseUsage = addAgentTurnUsage(
-              retryUsage,
-              currentUsage
-            );
-            turnUsage = addAgentTurnUsage(handoffPhaseUsage, currentPhaseUsage);
-            setSpanAttributes({
-              ...outputMessagesAttribute ? { "gen_ai.output.messages": outputMessagesAttribute } : {},
-              ...toGenAiMessagesTraceAttributes(
-                "gen_ai.output",
-                outputMessages
-              ),
-              ...lastAssistant ? {
-                "gen_ai.response.finish_reasons": [
-                  normalizeGenAiFinishReason(lastAssistant.stopReason)
-                ]
-              } : {},
-              ...extractGenAiUsageAttributes(usageSummary)
-            });
-            if (getPendingAuthPause()) {
-              runResume.captureResumeSnapshot(
-                runResume.getResumeSnapshot(currentAgentMessages())
+          try {
+            for (let attempt = 0; ; attempt += 1) {
+              await runAgentStep(run);
+              if (assistantMessageDeliveryError) {
+                throw assistantMessageDeliveryError;
+              }
+              signal?.throwIfAborted();
+              newMessages = agent.state.messages.slice(
+                runResume.beforeMessageCount
+              );
+              const outputMessages = newMessages.filter(isAssistantMessage);
+              const outputMessagesAttribute = serializeGenAiAttribute(
+                conversationPrivacy === "public" ? outputMessages.map(toCanonicalOutputMessage) : void 0
+              );
+              const lastAssistant = outputMessages.at(-1);
+              const usageSummary = extractGenAiUsageSummary(...outputMessages);
+              const currentUsage = hasAgentTurnUsage(usageSummary) ? usageSummary : void 0;
+              const currentPhaseUsage = addAgentTurnUsage(
+                retryUsage,
+                currentUsage
+              );
+              turnUsage = addAgentTurnUsage(
+                handoffPhaseUsage,
+                currentPhaseUsage
               );
-              throw getPendingAuthPause();
+              setSpanAttributes({
+                ...outputMessagesAttribute ? { "gen_ai.output.messages": outputMessagesAttribute } : {},
+                ...toGenAiMessagesTraceAttributes(
+                  "gen_ai.output",
+                  outputMessages
+                ),
+                ...lastAssistant ? {
+                  "gen_ai.response.finish_reasons": [
+                    normalizeGenAiFinishReason(lastAssistant.stopReason)
+                  ]
+                } : {},
+                ...extractGenAiUsageAttributes(usageSummary)
+              });
+              const pendingAuthPause = getPendingAuthPause();
+              if (pendingAuthPause) {
+                runResume.captureResumeSnapshot(
+                  runResume.getResumeSnapshot(currentAgentMessages())
+                );
+                throw pendingAuthPause;
+              }
+              const providerRetry = nextProviderRetry({
+                attempt,
+                messages: agent.state.messages,
+                retryableFailure: lastAssistant !== void 0 && isRetryableAssistantError(lastAssistant)
+              });
+              if (!providerRetry) {
+                break;
+              }
+              retryUsage = currentPhaseUsage;
+              agent.state.messages = providerRetry.messages;
+              await runResume.persistSafeBoundary(providerRetry.messages);
+              logWarn(
+                "agent_turn_provider_retry",
+                spanContext,
+                {},
+                "Retrying transient provider failure"
+              );
+              await sleep(providerRetry.delayMs, signal);
+              signal?.throwIfAborted();
+              run = agent.continue();
             }
-            const providerRetry = nextProviderRetry({
-              attempt,
-              messages: agent.state.messages,
-              retryableFailure: lastAssistant !== void 0 && isRetryableAssistantError(lastAssistant)
-            });
-            if (!providerRetry) {
-              break;
+          } catch (error) {
+            if (error instanceof AuthorizationPauseError) {
+              return await runResume.parkForAuth(error, turnUsage);
             }
-            retryUsage = currentPhaseUsage;
-            agent.state.messages = providerRetry.messages;
-            await runResume.persistSafeBoundary(providerRetry.messages);
-            logWarn(
-              "agent_turn_provider_retry",
-              spanContext,
-              {},
-              "Retrying transient provider failure"
-            );
-            await sleep(providerRetry.delayMs, signal);
-            signal?.throwIfAborted();
-            run = agent.continue();
+            throw error;
           }
         },
         {
@@ -16243,6 +16269,9 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
           ...inputMessagesAttribute ? { "gen_ai.input.messages": inputMessagesAttribute } : {}
         }
       );
+      if (authPauseOutcome) {
+        return authPauseOutcome;
+      }
     } finally {
       unsubscribe();
     }
@@ -16273,8 +16302,14 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       throw error.originalError;
     }
     const runError = error instanceof AssistantMessageDeliveryError ? error.originalError : error;
+    if (runError instanceof AuthPausePersistenceError) {
+      throw runError;
+    }
+    if (resume && runError instanceof AuthorizationPauseError) {
+      return await resume.parkForAuth(runError, turnUsage);
+    }
     if (resume) {
-      const { outcome } = await resume.translateExpectedEnding({
+      const outcome = await resume.translateSuspension({
         currentUsage: turnUsage,
         error: runError
       });
@@ -16303,16 +16338,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     logException(
       error,
       "assistant_reply_generation_failed",
-      {
-        conversationId,
-        slackThreadId: slackSource ? conversationId : void 0,
-        slackUserId: slackActor?.userId,
-        slackChannelId: slackDestination?.channelId,
-        runId,
-        ...credentialActorLogContext,
-        assistantUserName: botConfig.userName,
-        modelId: activeModelId
-      },
+      { modelId: activeModelId },
       {},
       "executeAgentRun failed"
     );