@sentry/junior 0.149.0 → 0.150.0

package/dist/{chunk-DK5UT6PQ.js → chunk-TZLYAO2J.js}

@@ -7,7 +7,7 @@ import {
   PluginCredentialFailureError,
   agentNameSchema,
   createPluginAuthOrchestration
-} from "./chunk-XPYWWMHR.js";
+} from "./chunk-QPIPYVGE.js";
 import {
   authorizationId
 } from "./chunk-DIB4GX3G.js";
@@ -32,15 +32,15 @@ import {
   searchSlackUsers,
   selectPluginGrant,
   toMcpProviderError
-} from "./chunk-RB26T3LU.js";
+} from "./chunk-MCNP7A7T.js";
 import {
   RetryableDeliveryError,
-  actorFromRouting,
-  assertRunRoutingConsistency,
+  actorFromRun,
+  assertRunConsistency,
   isAgentRunFeatureDisabled,
-  surfaceFromRouting,
+  surfaceFromRun,
   toolInvocationDestination
-} from "./chunk-GDFF3BQG.js";
+} from "./chunk-RF6J3DIO.js";
 import {
   addReactionToMessage,
   deliverOAuthAuthorization,
@@ -48,7 +48,7 @@ import {
   getSlackMessagePermalink,
   resolveBaseUrl,
   uploadFilesToConversation
-} from "./chunk-JMH3DBM5.js";
+} from "./chunk-DWETNV66.js";
 import {
   parseSandboxEgressAuthRequiredSignal,
   parseSandboxEgressPermissionDeniedSignal,
@@ -77,7 +77,7 @@ import {
   runNonInteractiveCommand,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-2P6BQQER.js";
+} from "./chunk-ZBOGYZ53.js";
 import {
   SCHEDULED_TASK_SYSTEM_ACTOR,
   compactEventTask,
@@ -109,10 +109,10 @@ import {
   saveEventTask,
   scheduledTaskAttributes,
   writableEventTask
-} from "./chunk-URDCZAL4.js";
+} from "./chunk-P43QM7JY.js";
 import {
   parseSlackThreadId
-} from "./chunk-MEMURSBG.js";
+} from "./chunk-H2RLIJ7G.js";
 import {
   AGENTS_REMOVAL_NOTICE,
   AGENTS_REPLACEMENT_NOTICE,
@@ -182,7 +182,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   truncateText
-} from "./chunk-EW2LNCRL.js";
+} from "./chunk-IPGNWXA3.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
 } from "./chunk-3Y47VMHV.js";
@@ -198,7 +198,7 @@ import {
   getSlackToolContext,
   readActorIdentity,
   resolveChannelCapabilities
-} from "./chunk-7BH46NB4.js";
+} from "./chunk-UOFQEVR5.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -207,7 +207,7 @@ import {
   isConversationScopedChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-SWHPVZBV.js";
+} from "./chunk-64K7GKRW.js";
 import {
   KNOWN_CONVERSATION_EVENT_TYPES,
   contextProvenance,
@@ -219,10 +219,10 @@ import {
   instructionActors,
   instructionProvenanceFor,
   sameActorIdentity
-} from "./chunk-3GYZ5YEH.js";
+} from "./chunk-ILYL6YFD.js";
 import {
   juniorIdentities
-} from "./chunk-3I2IVWSZ.js";
+} from "./chunk-F5NMSEBL.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -234,7 +234,7 @@ import {
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-25SC7D6Z.js";
+} from "./chunk-6PFDWAK2.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -267,7 +267,7 @@ import {
   resolveGatewayCredential,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-32CXPIZE.js";
+} from "./chunk-3ZMKDHCT.js";
 import {
   canExposeConversationPayload,
   resolveConversationPrivacy,
@@ -277,16 +277,16 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-3KGQOKIG.js";
+} from "./chunk-SHDREBGC.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-4JGM7FXO.js";
+} from "./chunk-NNOCRVQO.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-X22XXSZA.js";
+} from "./chunk-7NLW2NF5.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -294,7 +294,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-2JHKISQA.js";
+} from "./chunk-ZUQT35YC.js";
 import {
   credentialUserSubjectId
 } from "./chunk-RUIXF3YQ.js";
@@ -324,7 +324,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-RLVZIWNQ.js";
+} from "./chunk-JQXJ2E53.js";
 import {
   startInactiveSpan,
   withActiveSpan
@@ -2243,12 +2243,13 @@ function buildUserTurnInput(args) {
   }
   return { contextContentParts: [], routerBlocks, userContentParts };
 }
-function buildPromptInput(input) {
-  const promptConversationContext = input.piMessages && input.piMessages.length > 0 && !input.includeConversationContextWithPiMessages ? void 0 : input.conversationContext;
+function buildPromptInput(args) {
+  const { instruction, history } = args;
+  const promptConversationContext = history && history.length > 0 && !instruction.includeConversationContextWithHistory ? void 0 : instruction.context;
   const promptInput = buildUserTurnInput({
-    omittedImageAttachmentCount: input.omittedImageAttachmentCount ?? 0,
-    userAttachments: input.userAttachments,
-    userTurnText: buildUserTurnText(input.messageText, input.actor)
+    omittedImageAttachmentCount: instruction.omittedImageAttachmentCount ?? 0,
+    userAttachments: instruction.attachments ? [...instruction.attachments] : void 0,
+    userTurnText: buildUserTurnText(instruction.text, instruction.actor)
   });
   const trimmedContext = promptConversationContext?.trim();
   return {
@@ -2259,7 +2260,7 @@ function buildPromptInput(input) {
 function buildSteeringPiMessage(message) {
   const { userContentParts } = buildUserTurnInput({
     userTurnText: buildUserTurnText(message.text, message.actor),
-    userAttachments: message.userAttachments,
+    userAttachments: message.attachments ? [...message.attachments] : void 0,
     omittedImageAttachmentCount: message.omittedImageAttachmentCount ?? 0
   });
   return {
@@ -2333,7 +2334,7 @@ function checkpointedPrompt(args) {
   };
 }
 async function assemblePrompt(args) {
-  const source = args.routing.source;
+  const source = args.run.source;
   const hasPromptCheckpoint = args.resumedFromSessionRecord && args.existingTurnStartMessageIndex !== void 0;
   const shouldPromptAgent = !args.resumedFromSessionRecord || !hasPromptCheckpoint;
   const requestContentParts = args.userContentParts;
@@ -2365,11 +2366,11 @@ async function assemblePrompt(args) {
     toolGuidance: args.toolGuidance,
     runtime: {
       conversationId: args.spanContext.conversationId,
-      slackConversation: args.routing.slackConversation
+      slackConversation: args.run.slackConversation
     },
-    dispatch: args.routing.dispatch ? {
-      ...args.routing.dispatch,
-      destination: args.routing.destination,
+    dispatch: args.run.dispatch ? {
+      ...args.run.dispatch,
+      destination: args.run.destination,
       source
     } : void 0,
     actor: isUserActor(args.currentActor) ? args.currentActor : void 0,
@@ -15918,8 +15919,8 @@ async function tryRecordSkillLoadStat(skill) {
   }
 }
 function resolveToolRuntimeRoute(args) {
-  const destination = toolInvocationDestination(args.routing);
-  switch (args.routing.source.platform) {
+  const destination = toolInvocationDestination(args.run);
+  switch (args.run.source.platform) {
     case "slack": {
       if (destination.platform !== "slack") {
         throw new TypeError("Slack tool runtime requires a Slack destination");
@@ -15927,8 +15928,8 @@ function resolveToolRuntimeRoute(args) {
       return {
         destination,
         actor: args.actor?.platform === "slack" ? args.actor : void 0,
-        source: args.routing.source,
-        slackActionToken: args.routing.slackActionToken
+        source: args.run.source,
+        slackActionToken: args.run.slackActionToken
       };
     }
     case "local": {
@@ -15938,20 +15939,20 @@ function resolveToolRuntimeRoute(args) {
       return {
         destination,
         actor: args.actor?.platform === "local" ? args.actor : void 0,
-        source: args.routing.source
+        source: args.run.source
       };
     }
     case "web":
       return {
         destination,
         actor: args.actor?.platform === "web" ? args.actor : void 0,
-        source: args.routing.source
+        source: args.run.source
       };
   }
 }
 async function wireAgentTools(args) {
-  const runSource = args.routing.source;
-  const credentialUserId = args.routing.credentialContext ? credentialUserSubjectId(args.routing.credentialContext) : void 0;
+  const runSource = args.run.source;
+  const credentialUserId = args.run.credentialContext ? credentialUserSubjectId(args.run.credentialContext) : void 0;
   const userTokenStore = createUserTokenStore();
   const pluginHooks = createPluginHookRunner({
     actor: args.currentActor,
@@ -15961,54 +15962,54 @@ async function wireAgentTools(args) {
     sandboxRef: args.state.sandboxRef,
     skills: args.availableSkills,
     traceContext: args.spanContext,
-    tracePropagation: args.policy.sandboxTracePropagation,
-    egressSignals: args.policy.sandboxEgressSignals,
-    credentialEgress: args.routing.credentialContext,
+    tracePropagation: args.run.environment?.sandboxTracePropagation,
+    egressSignals: args.run.environment?.sandboxEgressSignals,
+    credentialEgress: args.run.credentialContext,
     actor: args.currentActor,
-    locationConfiguration: args.policy.locationConfiguration,
+    locationConfiguration: args.run.environment?.locationConfiguration,
     configurationValues: args.configurationValues,
     getActiveSkill: () => args.skillSandbox.getActiveSkill(),
     prepareSandbox: pluginHooks.prepareSandbox,
     onSandboxRefChanged: args.onSandboxRefChanged,
     persistSandboxRef: args.durability.onSandboxRefChanged
   });
-  const slackDestination = args.routing.destination.platform === "slack" ? args.routing.destination : void 0;
+  const slackDestination = args.run.destination.platform === "slack" ? args.run.destination : void 0;
   const slackChannelId = slackDestination?.channelId;
   const mcpAuth = createMcpAuthOrchestration({
     abortAgent: args.abortAgent,
-    conversationId: args.conversationId,
-    sessionId: args.turnId,
+    conversationId: args.run.conversationId,
+    sessionId: args.run.turnId,
     actorId: credentialUserId,
     channelId: slackChannelId,
-    destination: args.routing.destination,
+    destination: args.run.destination,
     source: runSource,
-    threadTs: args.routing.source.platform === "slack" ? args.routing.source.threadTs : void 0,
-    toolChannelId: args.routing.toolChannelId,
+    threadTs: args.run.source.platform === "slack" ? args.run.source.threadTs : void 0,
+    toolChannelId: args.run.toolChannelId,
     userMessage: args.userInput,
     pendingAuth: args.state.pendingAuth,
     getConfiguration: () => args.configurationValues,
     recordPendingAuth: args.durability.recordPendingAuth,
     interactiveAuthEnabled: !isAgentRunFeatureDisabled(
-      args.policy,
+      args.run.disabledFeatures,
       "interactive-auth"
     ),
     authorization: args.authorization
   });
   const pluginAuth = createPluginAuthOrchestration({
     abortAgent: args.abortAgent,
-    conversationId: args.conversationId,
-    sessionId: args.turnId,
+    conversationId: args.run.conversationId,
+    sessionId: args.run.turnId,
     actorId: credentialUserId,
     actor: args.currentActor,
     channelId: slackChannelId,
-    destination: args.routing.destination,
+    destination: args.run.destination,
     source: runSource,
-    threadTs: args.routing.source.platform === "slack" ? args.routing.source.threadTs : void 0,
+    threadTs: args.run.source.platform === "slack" ? args.run.source.threadTs : void 0,
     userMessage: args.userInput,
     pendingAuth: args.state.pendingAuth,
     recordPendingAuth: args.durability.recordPendingAuth,
     interactiveAuthEnabled: !isAgentRunFeatureDisabled(
-      args.policy,
+      args.run.disabledFeatures,
       "interactive-auth"
     ),
     userTokenStore,
@@ -16022,7 +16023,7 @@ async function wireAgentTools(args) {
       onToolSuccess: async (input) => {
         await pluginHooks.afterMcpTool({
           ...input,
-          conversationId: args.conversationId
+          conversationId: args.run.conversationId
         });
       }
     }
@@ -16035,11 +16036,11 @@ async function wireAgentTools(args) {
     args.invokedSkill && args.activeSkills.some((skill) => skill.name === args.invokedSkill?.name)
   );
   const commonToolRuntimeContext = {
-    conversationId: args.conversationId,
+    conversationId: args.run.conversationId,
     userText: args.userInput,
     configuration: args.configurationValues,
     egress: createPluginEgress({
-      credentialContext: args.routing.credentialContext,
+      credentialContext: args.run.credentialContext,
       pluginAuth: {
         async handleAuthRequired(signal) {
           await pluginAuth.maybeHandleAuthSignal({
@@ -16067,7 +16068,7 @@ async function wireAgentTools(args) {
   };
   const toolRoute = resolveToolRuntimeRoute({
     actor: args.currentActor,
-    routing: args.routing
+    run: args.run
   });
   const toolRuntimeContext = {
     ...commonToolRuntimeContext,
@@ -16076,16 +16077,16 @@ async function wireAgentTools(args) {
   const actionReview = createToolActionReview({
     context: {
       actor: args.currentActor,
-      conversationId: args.conversationId,
-      credentialContext: args.routing.credentialContext,
+      conversationId: args.run.conversationId,
+      credentialContext: args.run.credentialContext,
       destination: toolRoute.destination,
       source: runSource,
       userIntent: args.currentUserIntent,
       evidence: () => buildToolActionEvidence(args.currentAgentMessages())
     },
     onDecision: ({ toolCallId, toolName, decision }) => recordGuardianActionReviewed({
-      conversationId: args.conversationId,
-      turnId: args.turnId,
+      conversationId: args.run.conversationId,
+      turnId: args.run.turnId,
       toolCallId,
       toolName,
       costUsd: decision.costUsd,
@@ -16108,7 +16109,7 @@ async function wireAgentTools(args) {
         args.generatedFiles.push(...files);
         return refs;
       },
-      toolOverrides: args.policy.toolOverrides,
+      toolOverrides: args.run.environment?.toolOverrides,
       onSkillLoaded: async (loadedSkill) => {
         const resolvedSkill = await args.skillSandbox.loadSkill(
           loadedSkill.name
@@ -16180,10 +16181,12 @@ async function wireAgentTools(args) {
   const activeMcpCatalogs = toActiveMcpCatalogSummaries(
     mcpToolManager.getActiveToolCatalog()
   );
+  const emitEvent = args.onEvent;
   const onToolCall = async (toolCallId, toolName, params) => {
     args.toolCalls.push(toolName);
     try {
-      await args.observers.onToolInvocation?.({
+      await emitEvent?.({
+        type: "tool_started",
         params,
         toolCallId,
         toolName
@@ -16195,17 +16198,23 @@ async function wireAgentTools(args) {
       });
     }
   };
+  const onStatus = emitEvent ? async (status) => {
+    await emitEvent({ type: "status", text: status.text });
+  } : void 0;
+  const onToolResult = emitEvent ? async (report) => {
+    await emitEvent({ type: "tool_finished", report });
+  } : void 0;
   const agentTools = createPiAgentTools(
     tools,
     args.skillSandbox,
     args.spanContext,
-    args.observers.onStatus,
+    onStatus,
     agentSandbox.tools,
     pluginAuth,
     onToolCall,
     pluginHooks,
     args.conversationPrivacy,
-    args.observers.onToolResult,
+    onToolResult,
     actionReview
   );
   return {
@@ -17026,33 +17035,33 @@ function waitForAbortSettlement(promise, timeoutMs) {
     );
   });
 }
-async function executeAgentRun(request, streamFn) {
-  if (!request.routing.destination) {
+async function executeAgentRun(run, streamFn) {
+  if (!run.destination) {
     throw new TypeError("Assistant reply generation requires a destination");
   }
   const destinationVisibility = await resolveDestinationVisibility({
-    destination: request.routing.destination,
-    visibility: request.routing.destinationVisibility
+    destination: run.destination,
+    visibility: run.destinationVisibility
   });
   const conversationPrivacy = resolveConversationPrivacy({
     visibility: destinationVisibility
   });
-  const resolvedRequest = destinationVisibility ? {
-    ...request,
-    routing: { ...request.routing, destinationVisibility }
-  } : request;
-  const credentialActor = request.routing.credentialContext?.actor;
-  const actor = actorFromRouting(request.routing);
+  const resolvedRun = destinationVisibility ? {
+    ...run,
+    destinationVisibility
+  } : run;
+  const credentialActor = run.credentialContext?.actor;
+  const actor = actorFromRun(run);
   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,
+    conversationId: run.conversationId,
+    platform: run.source.platform,
+    messageConversationId: run.source.platform === "slack" ? run.conversationId : run.source.conversationId,
+    destinationName: run.destination.platform === "slack" ? run.destination.channelId : run.destination.conversationId,
     userId: userActor?.userId,
     userName: userActor?.userName,
     userEmail: userActor?.email,
-    runId: request.runId,
+    runId: run.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
@@ -17062,7 +17071,7 @@ async function executeAgentRun(request, streamFn) {
     () => runWithConversationPrivacy(
       conversationPrivacy,
       () => executeAgentRunInPrivacyContext(
-        resolvedRequest,
+        resolvedRun,
         conversationPrivacy,
         runLogContext,
         streamFn
@@ -17070,17 +17079,68 @@ async function executeAgentRun(request, streamFn) {
     )
   );
 }
-async function executeAgentRunInPrivacyContext(request, conversationPrivacy, runLogContext, streamFn) {
-  const { conversationId, input, routing, runId, turnId } = request;
-  const policy = request.policy ?? {};
+async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogContext, streamFn) {
+  const conversationId = run.conversationId;
+  const turnId = run.turnId;
+  const runId = run.runId;
+  const input = {
+    actor: run.instruction.actor,
+    includeConversationContextWithPiMessages: run.instruction.includeConversationContextWithHistory,
+    messageText: run.instruction.text,
+    userAttachments: run.instruction.attachments ? [...run.instruction.attachments] : void 0,
+    inboundAttachmentCount: run.instruction.inboundAttachmentCount,
+    omittedImageAttachmentCount: run.instruction.omittedImageAttachmentCount,
+    piMessages: run.history ? [...run.history] : void 0,
+    conversationContext: run.instruction.context
+  };
+  const routing = {
+    actor: run.actor,
+    credentialContext: run.credentialContext,
+    source: run.source,
+    slackConversation: run.slackConversation,
+    slackActionToken: run.slackActionToken,
+    destination: run.destination,
+    publishExternally: run.publishExternally,
+    destinationVisibility: run.destinationVisibility,
+    surface: run.surface,
+    dispatch: run.dispatch,
+    toolChannelId: run.toolChannelId
+  };
+  const policy = {
+    disabledFeatures: run.disabledFeatures,
+    turnDeadlineAtMs: run.deadlineAtMs,
+    signal: run.signal,
+    reasoningLevel: run.reasoning,
+    configuration: run.environment?.configuration,
+    locationConfiguration: run.environment?.locationConfiguration,
+    skillDirs: run.environment?.skillDirs,
+    sandboxTracePropagation: run.environment?.sandboxTracePropagation,
+    sandboxEgressSignals: run.environment?.sandboxEgressSignals,
+    toolOverrides: run.environment?.toolOverrides
+  };
   const signal = policy.signal;
-  const state = request.state ?? {};
-  const observers = request.observers ?? {};
-  const delivery = request.delivery;
-  const authorization = request.authorization;
-  const durability = request.durability ?? {};
+  const state = run.state ?? {};
+  const observers = {
+    onStatus: run.onEvent ? async (status) => {
+      await run.onEvent?.({ type: "status", text: status.text });
+    } : void 0,
+    onToolInvocation: run.onEvent ? async (invocation) => {
+      await run.onEvent?.({
+        type: "tool_started",
+        params: invocation.params,
+        toolCallId: invocation.toolCallId,
+        toolName: invocation.toolName
+      });
+    } : void 0,
+    onToolResult: run.onEvent ? async (report) => {
+      await run.onEvent?.({ type: "tool_finished", report });
+    } : void 0
+  };
+  const delivery = run.delivery;
+  const authorization = run.authorization;
+  const durability = run.durability ?? {};
   signal?.throwIfAborted();
-  assertRunRoutingConsistency(request);
+  assertRunConsistency(run);
   const replyStartedAtMs = Date.now();
   const configuredTurnDeadlineAtMs = replyStartedAtMs + botConfig.turnTimeoutMs;
   const policyTurnDeadlineAtMs = typeof policy.turnDeadlineAtMs === "number" && Number.isFinite(policy.turnDeadlineAtMs) ? Math.floor(policy.turnDeadlineAtMs) : void 0;
@@ -17107,8 +17167,8 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
   ) : void 0;
   let activeModelProfile = STANDARD_MODEL_PROFILE;
   let activeModelId = modelIdForProfile(botConfig, activeModelProfile);
-  const actor = actorFromRouting(routing);
-  const surface = surfaceFromRouting(routing);
+  const actor = actorFromRun(run);
+  const surface = surfaceFromRun(run);
   const runSource = routing.source;
   const slackSource = runSource.platform === "slack" ? runSource : void 0;
   const slackDestination = routing.destination.platform === "slack" ? routing.destination : void 0;
@@ -17234,9 +17294,12 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       skillSandbox
     });
     const explicitSkill = invokedSkill ? activeSkills.find((skill) => skill.name === invokedSkill.name) ?? null : null;
-    const { contextContentParts, routerBlocks, userContentParts } = buildPromptInput(input);
+    const { contextContentParts, routerBlocks, userContentParts } = buildPromptInput({
+      instruction: run.instruction,
+      history: run.history
+    });
     const preAgentPromptMessages = () => existingSessionRecord?.piMessages ?? [...input.piMessages ?? []];
-    const handoffEnabled = !isAgentRunFeatureDisabled(policy, "handoff");
+    const handoffEnabled = !isAgentRunFeatureDisabled(policy.disabledFeatures, "handoff");
     const storedTurnRoute = await loadTurnRoute({ conversationId, turnId });
     if (storedTurnRoute) {
       const resumedAfterHandoff = handoffEnabled && activeModelProfile !== STANDARD_MODEL_PROFILE && activeModelProfile !== storedTurnRoute.modelProfile;
@@ -17431,7 +17494,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       authorization,
       generatedFiles,
       invokedSkill,
-      observers,
+      onEvent: run.onEvent,
       onFatalToolError(error) {
         pendingPiHookError = error;
         agent?.abort();
@@ -17439,15 +17502,12 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       onSandboxRefChanged: (sandboxRef) => {
         lastKnownSandboxRef = sandboxRef;
       },
-      policy,
       preAgentPromptMessages,
       priorPiMessages,
       recordConnectedMcpProvider,
       requestHandoff,
       resume: runResume,
-      routing,
-      conversationId,
-      turnId,
+      run,
       skillSandbox,
       spanContext,
       state,
@@ -17529,7 +17589,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       explicitSkill,
       priorPiMessages,
       resumedFromSessionRecord,
-      routing,
+      run,
       spanContext,
       turnId,
       toolGuidance: wiring.toolGuidance,
@@ -17838,7 +17898,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
               tools: agent.state.tools
             });
           }
-          const runAgentStep = async (run2, abortRun = () => agent.abort()) => {
+          const runAgentStep = async (run3, abortRun = () => agent.abort()) => {
             let timeoutId;
             let removeAbortListener;
             const timeoutPromise = new Promise((_, reject) => {
@@ -17875,7 +17935,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
             let result2;
             try {
               result2 = await Promise.race(
-                abortPromise ? [run2, timeoutPromise, abortPromise] : [run2, timeoutPromise]
+                abortPromise ? [run3, timeoutPromise, abortPromise] : [run3, timeoutPromise]
               );
             } catch (error) {
               if (runResume.timedOut) {
@@ -17893,7 +17953,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
                   )
                 });
                 const settled = await waitForAbortSettlement(
-                  run2,
+                  run3,
                   AGENT_ABORT_SETTLE_GRACE_MS
                 );
                 if (!settled) {
@@ -17927,7 +17987,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
             return result2;
           };
           const requestedProfile = activeModelProfile === STANDARD_MODEL_PROFILE ? turnRoute.profile : void 0;
-          let run;
+          let run2;
           let handoffApplied = false;
           if (requestedProfile && requestedProfile !== STANDARD_MODEL_PROFILE) {
             const handoffAbortController = new AbortController();
@@ -17967,7 +18027,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
               freshPromptMessage
             ]);
           }
-          run = shouldPromptAgent && !capacityUpdate ? agent.prompt(freshPromptMessage) : agent.continue();
+          run2 = shouldPromptAgent && !capacityUpdate ? agent.prompt(freshPromptMessage) : agent.continue();
           let discardedRetryUsage;
           let actionConfirmationRetryUsed = false;
           let providerRetryAttempt = 0;
@@ -17983,7 +18043,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
           };
           try {
             for (; ; ) {
-              await runAgentStep(run);
+              await runAgentStep(run2);
               if (assistantMessageDeliveryError) {
                 throw assistantMessageDeliveryError;
               }
@@ -18027,7 +18087,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
               if (confirmationRetry) {
                 actionConfirmationRetryUsed = true;
                 await prepareRetry(confirmationRetry);
-                run = agent.continue();
+                run2 = agent.continue();
                 continue;
               }
               const emptyOutputContinuation = nextEmptyOutputContinuation({
@@ -18041,7 +18101,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
                 logWarn("agent.turn.empty_output.retrying", {
                   "app.ai.empty_output.attempt": emptyOutputAttempt
                 });
-                run = agent.continue();
+                run2 = agent.continue();
                 continue;
               }
               if (emptyOutputContinuation.kind === "exhausted") {
@@ -18061,7 +18121,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
               await prepareRetry(providerRetry.messages);
               logWarn("agent.turn.provider.retrying");
               await sleep(providerRetry.delayMs, signal);
-              run = agent.continue();
+              run2 = agent.continue();
             }
           } catch (error) {
             if (error instanceof AuthorizationPauseError) {
@@ -18207,29 +18267,28 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
 }
 
 // src/chat/runtime/agent-runner.ts
-function createAgentRunner(run, options) {
+function createAgentRunner(execute, options) {
+  const streamFn = options?.streamFn;
   const tracePropagation = options?.tracePropagation;
   const bindSpawnAgent = options?.bindSpawnAgent;
   const canBindSpawn = Boolean(bindSpawnAgent) && isExperimentalFeatureEnabled("subagents");
-  if (!tracePropagation && !canBindSpawn) {
-    return { run };
-  }
   return {
-    run: async (request) => {
-      const spawnAgent = bindSpawnAgent && canBindSpawn && !isAgentRunFeatureDisabled(request.policy, "subagents") ? bindSpawnAgent(request) : void 0;
-      return await run({
-        ...request,
-        policy: {
-          ...request.policy,
-          sandboxTracePropagation: request.policy?.sandboxTracePropagation ?? tracePropagation
+    run: async (run) => {
+      const spawnAgent = bindSpawnAgent && canBindSpawn && !isAgentRunFeatureDisabled(run.disabledFeatures, "subagents") ? bindSpawnAgent(run) : void 0;
+      const nextRun = {
+        ...run,
+        environment: {
+          ...run.environment,
+          sandboxTracePropagation: run.environment?.sandboxTracePropagation ?? tracePropagation
         },
         ...spawnAgent ? {
           durability: {
-            ...request.durability,
+            ...run.durability,
             spawnAgent
           }
         } : {}
-      });
+      };
+      return await execute(nextRun, streamFn);
     }
   };
 }