@sentry/junior 0.183.0 → 0.185.0

package/dist/{chunk-QZV76CM4.js → chunk-6DOAUXLD.js}

@@ -7,7 +7,7 @@ import {
   PluginCredentialFailureError,
   agentNameSchema,
   createPluginAuthOrchestration
-} from "./chunk-35PM4YY5.js";
+} from "./chunk-EWEH2PJW.js";
 import {
   parseSandboxEgressAuthRequiredSignal,
   parseSandboxEgressPermissionDeniedSignal,
@@ -38,15 +38,7 @@ import {
   searchSlackUsers,
   selectPluginGrant,
   toMcpProviderError
-} from "./chunk-2EPYYVJC.js";
-import {
-  RetryableDeliveryError,
-  actorFromRun,
-  assertRunConsistency,
-  isAgentRunFeatureDisabled,
-  surfaceFromRun,
-  toolInvocationDestination
-} from "./chunk-RF6J3DIO.js";
+} from "./chunk-4HA36IWS.js";
 import {
   addReactionToMessage,
   deliverOAuthAuthorization,
@@ -54,11 +46,13 @@ import {
   getSlackMessagePermalink,
   resolveBaseUrl,
   uploadFilesToConversation
-} from "./chunk-QI5JW5AG.js";
+} from "./chunk-ZKKGFUWM.js";
 import {
   SCHEDULED_TASK_SYSTEM_ACTOR,
+  canRouteResourceEvents,
   compactEventTask,
   createEventTask,
+  createResourceEventTeamIdResolver,
   createScheduledTask,
   deleteEventTask,
   eventNamespaceSchema,
@@ -90,13 +84,21 @@ import {
   saveScheduledTask,
   storeAttachments,
   writableEventTask
-} from "./chunk-R767Y7QV.js";
+} from "./chunk-QZKHHG3B.js";
 import {
   parseSlackThreadId
-} from "./chunk-SQHFVIMZ.js";
+} from "./chunk-X7NCJQAA.js";
+import {
+  RetryableDeliveryError,
+  actorFromRun,
+  assertRunConsistency,
+  isAgentRunFeatureDisabled,
+  surfaceFromRun,
+  toolInvocationDestination
+} from "./chunk-INQHUE72.js";
 import {
   appendAndEnqueueInboundMessage
-} from "./chunk-HUK5XIZL.js";
+} from "./chunk-D63IUQQE.js";
 import {
   CooperativeTurnYieldError,
   NO_REPLY_MARKER,
@@ -111,7 +113,7 @@ import {
   isTurnInputCommitLostError,
   isTurnInputDeferredError,
   sanitizeAssistantText
-} from "./chunk-56XONJPF.js";
+} from "./chunk-U4CTAVWN.js";
 import {
   AGENTS_REMOVAL_NOTICE,
   AGENTS_REPLACEMENT_NOTICE,
@@ -120,6 +122,7 @@ import {
   RIPGREP_EXCLUDED_GLOBS,
   SHORT_TITLE_MAX_LENGTH,
   TURN_CONTEXT_TAG,
+  ToolInputError,
   TurnSliceLimitExceededError,
   addAgentTurnUsage,
   buildAgentsInstructionsMessage,
@@ -170,7 +173,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   truncateText
-} from "./chunk-24OJZ5OU.js";
+} from "./chunk-WLKWN4CD.js";
 import {
   bindSandboxFileSystem,
   createSandboxSession,
@@ -181,7 +184,7 @@ import {
   resolve,
   setSnapshotSpanAttributes,
   stopSession
-} from "./chunk-37IQ6DGU.js";
+} from "./chunk-QCT4226Q.js";
 import {
   privateTraceResultAttributes
 } from "./chunk-UIE3R5XU.js";
@@ -194,7 +197,7 @@ import {
 } from "./chunk-DKIJ2RP5.js";
 import {
   getTurnRequestDeadline
-} from "./chunk-FJMTMGBC.js";
+} from "./chunk-FTVMXDNN.js";
 import {
   RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS,
   RESOURCE_SUBSCRIPTION_MAX_TTL_MS,
@@ -202,15 +205,11 @@ import {
   SANDBOX_RUNTIME,
   STOP_WATCHING_TOOL_NAME,
   SlackActionError,
-  ToolInputError,
   WorkspaceValidationError,
-  canRouteResourceEvents,
-  canUseResourceEventSubscriptionTools,
   cancelResourceEventSubscription,
   cancelSubscriptions,
   createPluginHookRunner,
   createResourceEventSubscription,
-  createResourceEventTeamIdResolver,
   createWorkspace,
   deleteWorkspace,
   deleteWorkspaceSnapshotBuilders,
@@ -235,7 +234,6 @@ import {
   loadSnapshotsForProfile,
   normalizeSlackConversationId,
   readActorIdentity,
-  requireResourceWatchConversation,
   resolveChannelCapabilities,
   runWithSlackInstallationToken,
   setWorkspaceSnapshot,
@@ -244,26 +242,21 @@ import {
   updateWorkspace,
   withSlackRetries,
   workspaceRepoCheckoutPath
-} from "./chunk-AHMWPFIW.js";
+} from "./chunk-VH4IU3UC.js";
 import {
-  KNOWN_CONVERSATION_EVENT_TYPES,
-  contextProvenance,
   createSlackDestination,
   getConversationEventStore,
   getConversationMessageSearchStore,
   getConversationStore,
   getDb,
   getSqlExecutor,
-  instructionActors,
-  instructionProvenanceFor,
-  requireSlackDestination,
-  sameActorIdentity
-} from "./chunk-AX3UDIMA.js";
+  requireSlackDestination
+} from "./chunk-ABAX75GG.js";
 import {
   juniorArtifacts,
   juniorIdentities,
   juniorSchedulerRuns
-} from "./chunk-6UXDTPEN.js";
+} from "./chunk-LVK4WJKM.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_REPOS_ROOT,
@@ -290,12 +283,19 @@ import {
   sleep,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-X52ESOBP.js";
+} from "./chunk-EJYP3NQ4.js";
 import {
   fenceLock,
   getStateAdapter,
   withLock
-} from "./chunk-G2B2XZQW.js";
+} from "./chunk-PNYJOEVV.js";
+import {
+  KNOWN_CONVERSATION_EVENT_TYPES,
+  contextProvenance,
+  instructionActors,
+  instructionProvenanceFor,
+  sameActorIdentity
+} from "./chunk-GFBR4S3Q.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -304,9 +304,7 @@ import {
   GEN_AI_SERVER_PORT,
   MISSING_GATEWAY_CREDENTIALS_ERROR,
   MODEL_HANDOFF_SUMMARY_PREFIX,
-  ModelProfileNotConfiguredError,
   ProviderError,
-  TURN_REASONING_LEVELS,
   botConfig,
   completeObject,
   completeText,
@@ -318,15 +316,19 @@ import {
   hasCompactedConversationContext,
   isCompactionSummaryText,
   isProviderRetryError,
-  modelIdForProfile,
-  modelProfileSchema,
   normalizeSlackEmojiName,
-  profileConfig,
   renderCurrentInstruction,
   resolveGatewayCredential,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-LMNMMESF.js";
+} from "./chunk-LRI5IRGY.js";
+import {
+  ModelProfileNotConfiguredError,
+  TURN_REASONING_LEVELS,
+  modelIdForProfile,
+  modelProfileSchema,
+  profileConfig
+} from "./chunk-D4YV5TDV.js";
 import {
   canExposeConversationPayload,
   resolveConversationPrivacy,
@@ -336,16 +338,16 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-2ADFGSUS.js";
+} from "./chunk-EIJCPJOY.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-KTXOGLNE.js";
+} from "./chunk-ATUWN6Z3.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-E3OBGRHN.js";
+} from "./chunk-GJTIZQGJ.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -353,7 +355,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-EENQGEIP.js";
+} from "./chunk-7MHNIGHP.js";
 import {
   credentialContextForActor,
   credentialUserSubjectId
@@ -393,7 +395,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-LZBPGX5A.js";
+} from "./chunk-OMQ2J6F6.js";
 import {
   startInactiveSpan,
   withActiveSpan
@@ -1738,6 +1740,11 @@ function buildChatEndAttributes(message, mode) {
   if (message.model) {
     attributes["gen_ai.response.model"] = message.model;
   }
+  if (message.stopReason === "error") {
+    const providerError = createProviderError(message.errorMessage ?? "");
+    Object.assign(attributes, getProviderErrorAttributes(providerError));
+    attributes["error.type"] = providerError.kind;
+  }
   return attributes;
 }
 function createTracedStreamFn(baseOrOptions = streamSimple) {
@@ -1770,14 +1777,16 @@ function createTracedStreamFn(baseOrOptions = streamSimple) {
       stream.result().then(
         (finalMessage) => {
           try {
-            for (const [key, value] of Object.entries(
-              buildChatEndAttributes(finalMessage, mode)
-            )) {
+            const endAttributes = buildChatEndAttributes(finalMessage, mode);
+            for (const [key, value] of Object.entries(endAttributes)) {
               span.setAttribute(key, value);
             }
             if (finalMessage.stopReason === "error") {
-              span.setAttribute("error.type", "provider_error");
-              span.setStatus({ code: 2, message: "LLM stream failed" });
+              const summary = endAttributes["app.ai.provider_error.summary"];
+              span.setStatus({
+                code: 2,
+                message: typeof summary === "string" ? summary : "LLM stream failed"
+              });
             }
           } finally {
             span.end();
@@ -1948,7 +1957,7 @@ function nextProviderRetry(args) {
   if (tailRole !== "user" && tailRole !== "toolResult") {
     return void 0;
   }
-  return { delayMs, messages };
+  return { delayMs, messages, providerError };
 }
 
 // src/chat/services/empty-output-continuation.ts
@@ -3675,11 +3684,15 @@ var SANDBOX_EGRESS_AUTH_SIGNAL_PREFIX = "sandbox-egress-auth-required";
 var SANDBOX_EGRESS_PERMISSION_SIGNAL_PREFIX = "sandbox-egress-permission-denied";
 var SANDBOX_EGRESS_LEASE_PREFIX = "sandbox-egress-lease";
 var DEFAULT_SESSION_TTL_MS = 30 * 60 * 1e3;
+var LEASE_REFRESH_BUFFER_MS = 5 * 60 * 1e3;
 function leaseKey(provider, grant, context) {
+  if (grant.name.startsWith("installation-")) {
+    return `${SANDBOX_EGRESS_LEASE_PREFIX}:${provider}:${grant.name}:shared`;
+  }
   const actor = context.credentials.actor;
-  const actorKey = "type" in actor ? `user:${actor.userId}` : `system:${actor.name}`;
-  const grantKey = grant.leaseScope ? `${grant.name}:${grant.leaseScope}` : grant.name;
-  return `${SANDBOX_EGRESS_LEASE_PREFIX}:${provider}:${grantKey}:${actorKey}:${context.egressId}:${context.contextId}`;
+  const subject = "subject" in context.credentials ? context.credentials.subject : void 0;
+  const ownerKey = subject ? `subject:${subject.userId}` : "type" in actor ? `user:${actor.userId}` : `system:${actor.name}`;
+  return `${SANDBOX_EGRESS_LEASE_PREFIX}:${provider}:${grant.name}:${ownerKey}`;
 }
 function authSignalKey(egressId, access) {
   return `${SANDBOX_EGRESS_AUTH_SIGNAL_PREFIX}:${egressId}:${access}`;
@@ -3720,7 +3733,7 @@ function parseLease(value) {
     return void 0;
   }
   const expiresAtMs = Date.parse(result.data.expiresAt);
-  if (!Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now()) {
+  if (!Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now() + LEASE_REFRESH_BUFFER_MS) {
     return void 0;
   }
   return result.data;
@@ -3774,10 +3787,7 @@ async function setSandboxEgressCredentialLease(context, lease) {
   if (!Number.isFinite(leaseExpiresAtMs) || leaseExpiresAtMs <= Date.now()) {
     return;
   }
-  const ttlMs2 = Math.max(
-    1,
-    Math.min(leaseExpiresAtMs, context.expiresAtMs) - Date.now()
-  );
+  const ttlMs2 = Math.max(1, leaseExpiresAtMs - Date.now());
   const state = getStateAdapter();
   await state.connect();
   await state.set(leaseKey(lease.provider, lease.grant, context), lease, ttlMs2);
@@ -9349,9 +9359,8 @@ function createListResourceEventSubscriptionsTool(context) {
     inputSchema: z19.object({}).strict(),
     outputSchema,
     async execute() {
-      const conversationId = requireResourceWatchConversation(context);
       const subscriptions = await listResourceEventSubscriptions({
-        conversationId
+        conversationId: context.conversationId
       });
       const details = {
         subscriptions: subscriptions.map((subscription) => ({
@@ -9486,11 +9495,10 @@ function createStopWatchingResourcesTool(context) {
     inputSchema: z21.object({ id: z21.string().min(1).nullable().optional() }).strict(),
     outputSchema: outputSchema3,
     async execute({ id }) {
-      const conversationId = requireResourceWatchConversation(context);
       let stoppedIds;
       if (id) {
         const stopped = await cancelResourceEventSubscription({
-          conversationId,
+          conversationId: context.conversationId,
           id
         });
         if (!stopped) {
@@ -9501,9 +9509,9 @@ function createStopWatchingResourcesTool(context) {
         stoppedIds = [stopped.id];
       } else {
         const subscriptions = await listResourceEventSubscriptions({
-          conversationId
+          conversationId: context.conversationId
         });
-        await cancelSubscriptions({ conversationId });
+        await cancelSubscriptions({ conversationId: context.conversationId });
         stoppedIds = subscriptions.map((subscription) => subscription.id);
       }
       const details = {
@@ -9598,7 +9606,6 @@ function createWatchResourceEventsTool(context, catalog) {
     inputSchema: inputSchema(catalog),
     outputSchema: outputSchema4,
     async execute(input) {
-      const conversationId = requireResourceWatchConversation(context);
       const events = cleanStrings(input.events);
       for (const eventType of events) {
         if (!pluginSupportsEvent(
@@ -9621,7 +9628,7 @@ function createWatchResourceEventsTool(context, catalog) {
       });
       const nowMs = Date.now();
       const subscription = await createResourceEventSubscription({
-        conversationId,
+        conversationId: context.conversationId,
         destination: context.destination,
         events,
         expiresAtMs: nowMs + ttlMs(input),
@@ -9661,15 +9668,9 @@ function createWatchResourceEventsTool(context, catalog) {
 // src/chat/tools/resource-events.ts
 function createResourceEventTools(context, catalog) {
   const enabled = Object.keys(catalog).length > 0;
-  const discoveryTools = context.destination.platform === "slack" && enabled ? {
-    searchResourceEventTypes: createSearchResourceEventTypesTool(catalog)
-  } : {};
-  if (!canUseResourceEventSubscriptionTools(context)) {
-    return discoveryTools;
-  }
   return {
-    ...discoveryTools,
     ...enabled ? {
+      searchResourceEventTypes: createSearchResourceEventTypesTool(catalog),
       watchResourceEvents: createWatchResourceEventsTool(context, catalog)
     } : void 0,
     listResourceEventSubscriptions: createListResourceEventSubscriptionsTool(context),
@@ -14424,12 +14425,7 @@ function createSearchConversationEventsTool(context) {
     }).strict(),
     outputSchema: searchConversationEventsOutputSchema,
     execute: async (input) => {
-      const currentConversationId = context.conversationId?.trim();
-      if (!currentConversationId) {
-        throw new ToolInputError(
-          "searchConversationEvents requires an active conversation"
-        );
-      }
+      const currentConversationId = context.conversationId;
       const conversationId = input.conversation_id?.trim() || currentConversationId;
       const afterSeq = input.after_seq ?? void 0;
       const beforeSeq = input.before_seq ?? void 0;
@@ -15572,7 +15568,7 @@ function createWorkspaceTools(context) {
           workspaceId: workspace.id,
           workspaceName: workspace.name
         });
-        const conversationId = canRouteResourceEvents() && canUseResourceEventSubscriptionTools(context) ? requireResourceWatchConversation(context) : void 0;
+        const conversationId = canRouteResourceEvents() && context.destination.platform === "slack" ? context.conversationId.trim() : void 0;
         const subscription = conversationId ? await createResourceEventSubscription({
           conversationId,
           destination: context.destination,
@@ -15671,9 +15667,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
     ...createScheduledTaskTools(context),
     ...createWorkspaceTools(context)
   };
-  if (context.conversationId) {
-    tools.searchConversationEvents = createSearchConversationEventsTool(context);
-  }
+  tools.searchConversationEvents = createSearchConversationEventsTool(context);
   if (context.supportsImageInput) {
     tools.viewImage = createViewImageTool(
       context.workspace,
@@ -15693,7 +15687,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
       hooks.toolOverrides?.imageGenerate
     );
   }
-  if (context.attachmentStorage && context.conversationId) {
+  if (context.attachmentStorage) {
     tools.publishImage = createPublishImageTool({
       conversationId: context.conversationId,
       db: getSqlExecutor(),
@@ -15721,7 +15715,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
     tools.slackCanvasWrite = createSlackCanvasWriteTool(state);
     tools.slackThreadRead = createSlackThreadReadTool(slackContext);
     tools.slackChannelJoin = createSlackChannelJoinTool(slackContext);
-    if (context.conversationId && slackContext.source.visibility === "public") {
+    if (slackContext.source.visibility === "public") {
       tools.searchConversationMessages = createSlackConversationMessageSearchTool(
         {
           kind: "public_provider_tenant",
@@ -15764,7 +15758,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
         slackContext,
         state,
         (input) => readSandboxFileUpload(context.workspace, input),
-        context.conversationId && context.attachmentStorage ? {
+        context.attachmentStorage ? {
           conversationId: context.conversationId,
           db: getSqlExecutor(),
           storage: context.attachmentStorage
@@ -16074,9 +16068,6 @@ function actionCredential(credentialContext) {
   };
 }
 function assertAuthoritativeContext(context) {
-  if (!context.conversationId?.trim()) {
-    throw new ToolActionReviewUnavailableError();
-  }
   if (!context.actor) {
     throw new ToolActionReviewUnavailableError();
   }
@@ -17432,7 +17423,7 @@ function githubPermissionHeaders(upstream) {
   };
 }
 function permissionDeniedMessage(provider, grant) {
-  return `${provider} returned HTTP 403 after Junior injected the ${grant.name} grant. Junior forwarded the request; this is not a local runtime block.`;
+  return `${provider} returned HTTP 403 after the runtime injected the ${grant.name} grant. The request was forwarded; this is not a local runtime block.`;
 }
 function isEgressAuthRequired(error) {
   return error instanceof EgressAuthRequired || error instanceof Error && error.name === "EgressAuthRequired";
@@ -17692,15 +17683,17 @@ async function executeCredentialedEgressRequest(input) {
   const clearCredentialLease = deps.clearCredentialLease ?? clearSandboxEgressCredentialLease;
   const recordAuthRequired = deps.recordAuthRequired ?? recordSandboxAuthRequired;
   const recordPermissionDenied = deps.recordPermissionDenied ?? recordSandboxPermissionDenied;
-  let lease;
-  try {
-    lease = await issueCredentialLease(
-      provider,
-      grantSelection,
-      credentialContext
-    );
-  } catch (error) {
-    if (error instanceof SandboxEgressCredentialError) {
+  async function resolveLease() {
+    try {
+      return await issueCredentialLease(
+        provider,
+        grantSelection,
+        credentialContext
+      );
+    } catch (error) {
+      if (!(error instanceof SandboxEgressCredentialError)) {
+        throw error;
+      }
       await recordAuthRequired({
         credentialContext,
         provider: error.provider,
@@ -17733,20 +17726,24 @@ async function executeCredentialedEgressRequest(input) {
         message: error.message
       });
     }
-    throw error;
   }
-  const attributes = (status, upstream2) => leaseLogAttributes({
+  let leaseOrResponse = await resolveLease();
+  if (leaseOrResponse instanceof Response) {
+    return leaseOrResponse;
+  }
+  let lease = leaseOrResponse;
+  const attributes = (activeLease, status, upstream) => leaseLogAttributes({
     egressId: activeEgressId,
-    lease,
+    lease: activeLease,
     provider,
     request,
     status,
-    ...upstream2 ? { upstream: upstream2 } : void 0,
+    ...upstream ? { upstream } : void 0,
     upstreamUrl
   });
   if (!hasSandboxEgressLeaseTransformForHost(lease, upstreamUrl.hostname)) {
     logWarn("sandbox.egress.transform.missing", {
-      ...attributes(403),
+      ...attributes(lease, 403),
       "app.sandbox.egress.transform_domains": lease.headerTransforms.map(
         (transform) => transform.domain
       )
@@ -17757,103 +17754,92 @@ async function executeCredentialedEgressRequest(input) {
     );
   }
   const fetchImpl = deps.fetch ?? fetch;
-  const headers = requestHeaders(
-    request,
-    lease,
-    upstreamUrl.hostname,
-    deps.tracePropagation ?? {}
-  );
   const body = bodyForGrantSelection ?? await requestBodyBytes(request);
-  const intercepted = await deps.interceptHttp?.({
-    provider,
-    request: new Request(upstreamUrl, {
-      method: request.method,
-      headers,
-      ...body !== void 0 ? { body } : void 0
-    }),
-    upstreamUrl
-  });
-  if (intercepted) {
-    return intercepted;
-  }
-  const upstream = await fetchImpl(upstreamUrl, {
-    method: request.method,
-    headers,
-    ...body !== void 0 ? { body } : void 0,
-    redirect: "manual"
-  });
-  try {
-    const effects = await onPluginEgressResponse({
+  let retriedAfter403 = false;
+  while (true) {
+    const headers = requestHeaders(
+      request,
+      lease,
+      upstreamUrl.hostname,
+      deps.tracePropagation ?? {}
+    );
+    const intercepted = await deps.interceptHttp?.({
       provider,
-      grant: lease.grant,
+      request: new Request(upstreamUrl, {
+        method: request.method,
+        headers,
+        ...body !== void 0 ? { body } : void 0
+      }),
+      upstreamUrl
+    });
+    if (intercepted) {
+      return intercepted;
+    }
+    const requestBody = body instanceof ArrayBuffer ? body.slice(0) : body;
+    const upstream = await fetchImpl(upstreamUrl, {
       method: request.method,
-      ...operation ? { operation } : void 0,
-      upstreamUrl,
-      response: {
-        headers: new Headers(upstream.headers),
-        readText: async (maxBytes) => await responseTextWithinLimit(upstream, maxBytes),
-        status: upstream.status
-      }
+      headers,
+      ...requestBody !== void 0 ? { body: requestBody } : void 0,
+      redirect: "manual"
     });
-    if (effects.permissionDenied) {
-      await recordPermissionDenied({
+    let pluginPermissionDenied;
+    try {
+      const effects = await onPluginEgressResponse({
+        provider,
+        grant: lease.grant,
+        method: request.method,
+        ...operation ? { operation } : void 0,
+        upstreamUrl,
+        response: {
+          headers: new Headers(upstream.headers),
+          readText: async (maxBytes) => await responseTextWithinLimit(upstream, maxBytes),
+          status: upstream.status
+        }
+      });
+      pluginPermissionDenied = effects.permissionDenied;
+    } catch (error) {
+      if (!isEgressAuthRequired(error)) {
+        throw error;
+      }
+      await clearCredentialLease(provider, lease.grant, credentialContext);
+      await recordAuthRequired({
         credentialContext,
         provider,
-        lease,
-        message: effects.permissionDenied.message,
-        upstream,
-        upstreamUrl
+        grant: lease.grant,
+        authorization: error.authorization ?? lease.authorization,
+        message: error.message
       });
-      logWarn("sandbox.egress.upstream_permission.classified", {
-        ...attributes(upstream.status, upstream)
+      logWarn("sandbox.egress.upstream_auth_requirement.classified", {
+        ...attributes(lease, upstream.status, upstream)
+      });
+      await upstream.body?.cancel().catch(() => void 0);
+      return authRequiredResponse({
+        provider,
+        grant: lease.grant,
+        message: error.message
       });
     }
-  } catch (error) {
-    if (!isEgressAuthRequired(error)) {
-      throw error;
-    }
-    await clearCredentialLease(provider, lease.grant, credentialContext);
-    await recordAuthRequired({
-      credentialContext,
-      provider,
-      grant: lease.grant,
-      authorization: error.authorization ?? lease.authorization,
-      message: error.message
-    });
-    logWarn("sandbox.egress.upstream_auth_requirement.classified", {
-      ...attributes(upstream.status, upstream)
-    });
-    await upstream.body?.cancel().catch(() => void 0);
-    return authRequiredResponse({
+    logSandboxEgressUpstreamRequest({
+      egressId: activeEgressId,
+      grantAccess: lease.grant.access,
+      grantName: lease.grant.name,
+      grantReason: lease.grant.reason,
       provider,
-      grant: lease.grant,
-      message: error.message
-    });
-  }
-  logSandboxEgressUpstreamRequest({
-    egressId: activeEgressId,
-    grantAccess: lease.grant.access,
-    grantName: lease.grant.name,
-    grantReason: lease.grant.reason,
-    provider,
-    request,
-    upstream,
-    upstreamUrl
-  });
-  if (upstream.status >= 400) {
-    logWarn("sandbox.egress.upstream_response.failed", {
-      ...attributes(upstream.status, upstream),
-      "error.type": `http_${upstream.status}`
-    });
-  }
-  if (upstream.status === UPSTREAM_TOKEN_REJECTION_STATUS || upstream.status === UPSTREAM_PERMISSION_REJECTION_STATUS) {
-    logWarn("sandbox.egress.upstream_auth.rejected", {
-      ...attributes(upstream.status, upstream),
-      ...upstream.status === UPSTREAM_TOKEN_REJECTION_STATUS ? {
-        "app.sandbox.egress.www_authenticate": upstream.headers.get("www-authenticate") ?? void 0
-      } : void 0
+      request,
+      upstream,
+      upstreamUrl
     });
+    if (upstream.status >= 400) {
+      logWarn("sandbox.egress.upstream_response.failed", {
+        ...attributes(lease, upstream.status, upstream),
+        "error.type": `http_${upstream.status}`
+      });
+    }
     if (upstream.status === UPSTREAM_TOKEN_REJECTION_STATUS) {
+      logWarn("sandbox.egress.upstream_auth.rejected", {
+        ...attributes(lease, upstream.status, upstream),
+        "app.sandbox.egress.www_authenticate": upstream.headers.get("www-authenticate") ?? void 0
+      });
       await clearCredentialLease(provider, lease.grant, credentialContext);
       await recordAuthRequired({
         credentialContext,
@@ -17869,23 +17855,67 @@ async function executeCredentialedEgressRequest(input) {
         message: `Provider rejected the injected ${provider} credential.
 `
       });
-    } else {
+    }
+    if (upstream.status === UPSTREAM_PERMISSION_REJECTION_STATUS && !retriedAfter403) {
+      logWarn("sandbox.egress.upstream_auth.rejected", {
+        ...attributes(lease, upstream.status, upstream)
+      });
+      await clearCredentialLease(provider, lease.grant, credentialContext);
+      await upstream.body?.cancel().catch(() => void 0);
+      logWarn("sandbox.egress.upstream_auth.retrying", {
+        ...attributes(lease, upstream.status, upstream)
+      });
+      leaseOrResponse = await resolveLease();
+      if (leaseOrResponse instanceof Response) {
+        return leaseOrResponse;
+      }
+      lease = leaseOrResponse;
+      retriedAfter403 = true;
+      continue;
+    }
+    if (upstream.status === UPSTREAM_PERMISSION_REJECTION_STATUS) {
+      logWarn("sandbox.egress.upstream_auth.rejected", {
+        ...attributes(lease, upstream.status, upstream)
+      });
       await clearCredentialLease(provider, lease.grant, credentialContext);
       await recordPermissionDenied({
         credentialContext,
         provider,
         lease,
-        message: permissionDeniedMessage(provider, lease.grant),
+        message: pluginPermissionDenied?.message ?? permissionDeniedMessage(provider, lease.grant),
         upstream,
         upstreamUrl
       });
+      if (pluginPermissionDenied) {
+        logWarn("sandbox.egress.upstream_permission.classified", {
+          ...attributes(lease, upstream.status, upstream)
+        });
+      }
+      return new Response(upstream.body, {
+        status: upstream.status,
+        statusText: upstream.statusText,
+        headers: responseHeaders(upstream)
+      });
     }
+    if (pluginPermissionDenied) {
+      await recordPermissionDenied({
+        credentialContext,
+        provider,
+        lease,
+        message: pluginPermissionDenied.message,
+        upstream,
+        upstreamUrl
+      });
+      logWarn("sandbox.egress.upstream_permission.classified", {
+        ...attributes(lease, upstream.status, upstream)
+      });
+    }
+    return new Response(upstream.body, {
+      status: upstream.status,
+      statusText: upstream.statusText,
+      headers: responseHeaders(upstream)
+    });
   }
-  return new Response(upstream.body, {
-    status: upstream.status,
-    statusText: upstream.statusText,
-    headers: responseHeaders(upstream)
-  });
 }
 
 // src/chat/egress/plugin.ts
@@ -20472,7 +20502,10 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
               }
               providerRetryAttempt += 1;
               await prepareRetry(providerRetry.messages);
-              logWarn("agent.turn.provider.retrying");
+              logWarn("agent.turn.provider.retrying", {
+                ...getProviderErrorAttributes(providerRetry.providerError),
+                "app.ai.provider_error.retry_attempt": providerRetryAttempt
+              });
               await sleep(providerRetry.delayMs, signal);
               run2 = agent.continue();
             }