@sentry/junior 0.107.1 → 0.109.0

package/dist/{chunk-EDLNHZH3.js → chunk-IXKSQGIO.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-YFQ7CQDE.js";
-import {
-  JUNIOR_THREAD_STATE_TTL_MS,
-  loadConnectedMcpProviders,
-  loadConversationProjection,
-  openConversationProjection,
   recordAuthorizationRequested,
   recordMcpProviderConnected,
-  recordToolExecutionStarted
-} from "./chunk-4YF7Z6IA.js";
+  recordToolExecutionStarted,
+  updateConversationStats
+} from "./chunk-72OMGPDS.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -34,7 +32,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-SPUAJVVH.js";
+} from "./chunk-HO5NT6OE.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
@@ -44,27 +42,23 @@ import {
 } from "./chunk-UIE3R5XU.js";
 import {
   createPluginHookRunner,
+  createPluginLogger,
   getPluginSystemPromptContributions,
   getPluginTools,
   getPluginUserPromptContributions,
   getPlugins,
   getSlackToolContext,
   resolveChannelCapabilities
-} from "./chunk-RMVOAJRL.js";
-import {
-  createPluginLogger
-} from "./chunk-AUUOHQAT.js";
+} from "./chunk-QY636HZU.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
   SANDBOX_WORKSPACE_ROOT,
+  acquireActiveLock,
+  getStateAdapter,
   sandboxSkillDir,
   sandboxSkillFile
-} from "./chunk-G3E7SCME.js";
-import {
-  acquireActiveLock,
-  getStateAdapter
-} from "./chunk-B2Z2H66D.js";
+} from "./chunk-OUHNWH46.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -74,7 +68,7 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-VH6KWKG2.js";
+} from "./chunk-RGX4V75M.js";
 import {
   contextProvenance,
   getConversationEventStore,
@@ -83,7 +77,7 @@ import {
   getDb,
   instructionActors,
   instructionProvenanceFor
-} from "./chunk-NVOTGWYX.js";
+} from "./chunk-FENLIFJD.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
@@ -126,7 +120,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   unwrapCurrentInstruction
-} from "./chunk-SS67LUOK.js";
+} from "./chunk-JNAVF45E.js";
 import {
   parseSlackThreadId,
   resolveConversationPrivacy,
@@ -136,26 +130,29 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-RT5BUHR5.js";
+} from "./chunk-O3JMSZLI.js";
 import {
   parseDestination
-} from "./chunk-B7PUBQQM.js";
+} from "./chunk-SYAQIR5Z.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-YT72TOEK.js";
+} from "./chunk-WHMOBKT7.js";
+import {
+  pluginCatalogRuntime
+} from "./chunk-3SXUV423.js";
 import {
   CredentialUnavailableError,
   credentialContextSchema,
-  pluginCatalogRuntime,
+  credentialUserSubjectId,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-YIPD3L6L.js";
+} from "./chunk-TT6GMXNA.js";
 import {
   isUserActor
-} from "./chunk-VIXFG2VC.js";
+} from "./chunk-PLB7MRCQ.js";
 import {
   extractGenAiUsageAttributes,
   extractGenAiUsageSummary,
@@ -171,8 +168,9 @@ import {
   setSpanStatus,
   setTags,
   summarizeMessageText,
+  withLogContext,
   withSpan
-} from "./chunk-O24R4DCK.js";
+} from "./chunk-ISMWX44P.js";
 import {
   isRecord
 } from "./chunk-OB42YVAE.js";
@@ -180,16 +178,16 @@ import {
   startInactiveSpan,
   withActiveSpan
 } from "./chunk-6GWA276C.js";
-import {
-  parseSlackChannelId,
-  parseSlackMessageTs,
-  parseSlackUserId
-} from "./chunk-7FBGKXPE.js";
 import {
   listReferenceFiles,
   soulPathCandidates,
   worldPathCandidates
 } from "./chunk-3V7OFJZC.js";
+import {
+  parseSlackChannelId,
+  parseSlackMessageTs,
+  parseSlackUserId
+} from "./chunk-IVVGFRQQ.js";
 
 // src/chat/configuration/defaults.ts
 var installDefaults = {};
@@ -839,8 +837,108 @@ function buildTurnResult(input) {
   };
 }
 
-// src/chat/services/turn-router.ts
+// src/chat/tool-support/structured-result.ts
 import { z } from "zod";
+var juniorToolContinuationSchema = z.object({
+  arguments: z.record(z.string(), z.unknown()),
+  reason: z.string().min(1).optional()
+}).strict();
+var juniorToolBoundContinuationSchema = juniorToolContinuationSchema.extend({
+  tool_name: z.string().min(1)
+});
+var juniorToolErrorSchema = z.object({
+  kind: z.string().min(1),
+  message: z.string().min(1),
+  retryable: z.boolean().optional()
+}).strict();
+var juniorToolResultSchema = z.object({
+  ok: z.boolean(),
+  status: z.enum(["success", "error"]),
+  target: z.string().min(1).optional(),
+  data: z.unknown().optional(),
+  truncated: z.boolean().optional(),
+  continuation: juniorToolContinuationSchema.optional(),
+  error: z.union([juniorToolErrorSchema, z.string()]).optional()
+}).passthrough();
+var juniorToolResultWithBoundContinuationSchema = juniorToolResultSchema.extend({
+  continuation: juniorToolBoundContinuationSchema.optional()
+});
+function sortJsonValue(value) {
+  if (Array.isArray(value)) {
+    return value.map(sortJsonValue);
+  }
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  return Object.fromEntries(
+    Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, sortJsonValue(item)])
+  );
+}
+function isRecord2(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function injectContinuationToolName(details, toolName) {
+  const parsed = juniorToolResultSchema.parse(details);
+  if (!isRecord2(parsed.continuation)) {
+    return parsed;
+  }
+  return juniorToolResultWithBoundContinuationSchema.parse({
+    ...parsed,
+    continuation: {
+      ...parsed.continuation,
+      tool_name: toolName
+    }
+  });
+}
+function makeStructuredToolResult(details, options = {}) {
+  const parsed = juniorToolResultSchema.parse(details);
+  return {
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify(sortJsonValue(parsed))
+      },
+      ...options.content ?? []
+    ],
+    details: parsed
+  };
+}
+
+// src/chat/tool-support/turn-deadline-result.ts
+var TURN_DEADLINE_INTERRUPTION = {
+  cause: "turn_deadline",
+  scope: "execution_slice",
+  task_status: "active"
+};
+function annotateTurnDeadlineToolResult(result) {
+  const parsed = juniorToolResultSchema.safeParse(result.details);
+  if (!parsed.success) {
+    return void 0;
+  }
+  const error = parsed.data.error;
+  if (!error || typeof error !== "object" || error.kind !== "outcome_unknown") {
+    return void 0;
+  }
+  const details = {
+    ...parsed.data,
+    interruption: TURN_DEADLINE_INTERRUPTION,
+    error: {
+      ...error,
+      message: "Tool execution was interrupted when the current execution slice reached its internal deadline. The original task remains active, but this tool call's outcome is unknown and may include side effects."
+    }
+  };
+  const envelope = makeStructuredToolResult(details, {
+    content: result.content.slice(1)
+  });
+  return {
+    content: envelope.content,
+    details: envelope.details,
+    isError: true
+  };
+}
+
+// src/chat/services/turn-router.ts
+import { z as z2 } from "zod";
 var CLASSIFIER_CONFIDENCE_THRESHOLD = 0.75;
 var MAX_ROUTER_CONTEXT_CHARS = 8e3;
 var ROUTER_CONTEXT_HEAD_CHARS = 3e3;
@@ -866,17 +964,17 @@ function coerceClassifierConfidence(value) {
   return CONFIDENCE_LABELS[trimmed] ?? value;
 }
 function createTurnRouteSchema(profiles) {
-  return z.object({
-    reasoning_level: z.enum(TURN_REASONING_LEVELS),
+  return z2.object({
+    reasoning_level: z2.enum(TURN_REASONING_LEVELS),
     profile: modelProfileSchema.refine(
       (profile) => Object.hasOwn(profiles, profile),
       "Profile is not configured"
     ),
-    confidence: z.preprocess(
+    confidence: z2.preprocess(
       coerceClassifierConfidence,
-      z.number().min(0).max(1)
+      z2.number().min(0).max(1)
     ),
-    reason: z.string().min(1)
+    reason: z2.string().min(1)
   });
 }
 var CLASSIFIER_FALLBACK_REASONING_LEVEL = "medium";
@@ -973,9 +1071,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
   };
@@ -1214,7 +1312,7 @@ function parseMcpProviderFromToolName(toolName) {
 
 // src/chat/pi/derived-state.ts
 var MCP_BRIDGE_TOOLS = /* @__PURE__ */ new Set(["callMcpTool", "searchMcpTools"]);
-function isRecord2(value) {
+function isRecord3(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function providerFromToolName(value) {
@@ -1236,7 +1334,7 @@ function addBridgeToolProvider(toolName, value, providers) {
   if (bridgeTool === "searchMcpTools") {
     for (const argsKey of ["input", "args", "arguments", "params"]) {
       const args = value[argsKey];
-      if (isRecord2(args)) {
+      if (isRecord3(args)) {
         addString(providers, args.provider);
       }
     }
@@ -1245,7 +1343,7 @@ function addBridgeToolProvider(toolName, value, providers) {
   if (bridgeTool === "callMcpTool") {
     for (const argsKey of ["input", "args", "arguments", "params"]) {
       const args = value[argsKey];
-      if (isRecord2(args)) {
+      if (isRecord3(args)) {
         addString(providers, providerFromToolName(args.tool_name));
       }
     }
@@ -1258,18 +1356,18 @@ function addMcpResultProvider(message, providers) {
     return;
   }
   if (toolName === "loadSkill") {
-    if (isRecord2(message.details)) {
+    if (isRecord3(message.details)) {
       addString(providers, message.details.mcp_provider);
     }
     addString(providers, message.mcp_provider);
     return;
   }
   if (toolName === "searchMcpTools") {
-    if (isRecord2(message.details)) {
+    if (isRecord3(message.details)) {
       addString(providers, message.details.provider);
       if (Array.isArray(message.details.tools)) {
         for (const tool of message.details.tools) {
-          if (isRecord2(tool)) {
+          if (isRecord3(tool)) {
             addString(providers, providerFromToolName(tool.tool_name));
           }
         }
@@ -1281,11 +1379,11 @@ function addMcpResultProvider(message, providers) {
   if (toolName === "callMcpTool") {
     for (const argsKey of ["input", "args", "arguments", "params"]) {
       const args = message[argsKey];
-      if (isRecord2(args)) {
+      if (isRecord3(args)) {
         addString(providers, providerFromToolName(args.tool_name));
       }
     }
-    if (isRecord2(message.details)) {
+    if (isRecord3(message.details)) {
       addString(providers, message.details.provider);
       addString(providers, providerFromToolName(message.details.tool_name));
     }
@@ -1293,7 +1391,7 @@ function addMcpResultProvider(message, providers) {
   }
 }
 function scanMcpProviders(message, providers) {
-  if (!isRecord2(message)) {
+  if (!isRecord3(message)) {
     return;
   }
   if (message.role === "toolResult") {
@@ -1305,15 +1403,15 @@ function scanMcpProviders(message, providers) {
     return;
   }
   for (const part of content) {
-    if (!isRecord2(part)) {
+    if (!isRecord3(part)) {
       continue;
     }
     addBridgeToolProvider(getToolName(part), part, providers);
   }
 }
 function scanLoadedSkills(message, skills) {
-  if (isRecord2(message) && message.role === "toolResult" && message.toolName === "loadSkill" && message.isError !== true) {
-    if (isRecord2(message.details)) {
+  if (isRecord3(message) && message.role === "toolResult" && message.toolName === "loadSkill" && message.isError !== true) {
+    if (isRecord3(message.details)) {
       addString(skills, message.details.skill_name);
     }
     addString(skills, message.skill_name);
@@ -3817,73 +3915,6 @@ function serializeMcpPayload(payload, privacy, options = {}) {
 // src/chat/tools/sandbox/bash.ts
 import { z as z4 } from "zod";
 
-// src/chat/tool-support/structured-result.ts
-import { z as z2 } from "zod";
-var juniorToolContinuationSchema = z2.object({
-  arguments: z2.record(z2.string(), z2.unknown()),
-  reason: z2.string().min(1).optional()
-}).strict();
-var juniorToolBoundContinuationSchema = juniorToolContinuationSchema.extend({
-  tool_name: z2.string().min(1)
-});
-var juniorToolErrorSchema = z2.object({
-  kind: z2.string().min(1),
-  message: z2.string().min(1),
-  retryable: z2.boolean().optional()
-}).strict();
-var juniorToolResultSchema = z2.object({
-  ok: z2.boolean(),
-  status: z2.enum(["success", "error"]),
-  target: z2.string().min(1).optional(),
-  data: z2.unknown().optional(),
-  truncated: z2.boolean().optional(),
-  continuation: juniorToolContinuationSchema.optional(),
-  error: z2.union([juniorToolErrorSchema, z2.string()]).optional()
-}).passthrough();
-var juniorToolResultWithBoundContinuationSchema = juniorToolResultSchema.extend({
-  continuation: juniorToolBoundContinuationSchema.optional()
-});
-function sortJsonValue(value) {
-  if (Array.isArray(value)) {
-    return value.map(sortJsonValue);
-  }
-  if (!value || typeof value !== "object") {
-    return value;
-  }
-  return Object.fromEntries(
-    Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, sortJsonValue(item)])
-  );
-}
-function isRecord3(value) {
-  return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
-function injectContinuationToolName(details, toolName) {
-  const parsed = juniorToolResultSchema.parse(details);
-  if (!isRecord3(parsed.continuation)) {
-    return parsed;
-  }
-  return juniorToolResultWithBoundContinuationSchema.parse({
-    ...parsed,
-    continuation: {
-      ...parsed.continuation,
-      tool_name: toolName
-    }
-  });
-}
-function makeStructuredToolResult(details, options = {}) {
-  const parsed = juniorToolResultSchema.parse(details);
-  return {
-    content: [
-      {
-        type: "text",
-        text: JSON.stringify(sortJsonValue(parsed))
-      },
-      ...options.content ?? []
-    ],
-    details: parsed
-  };
-}
-
 // src/chat/tool-support/zod-tool.ts
 import { z as z3 } from "zod";
 
@@ -5990,6 +6021,17 @@ async function cancelResourceEventSubscription(input) {
     return next;
   });
 }
+async function cancelSubscriptions(input) {
+  const subscriptions = await listResourceEventSubscriptions(input);
+  for (const subscription of subscriptions) {
+    await cancelResourceEventSubscription({
+      conversationId: input.conversationId,
+      id: subscription.id,
+      nowMs: input.nowMs,
+      state: input.state
+    });
+  }
+}
 async function findMatchingResourceEventSubscriptions(input) {
   const state = input.state ?? getStateAdapter();
   await state.connect();
@@ -11216,12 +11258,11 @@ function buildSandboxEgressNetworkPolicy(input) {
       domain,
       input?.traceConfig
     );
-    allow[domain] = [
-      {
-        ...shouldPropagateTrace && hasTraceHeaders ? { transform: [{ headers: traceHeaders }] } : {},
-        ...policy.forward && forwardURL ? { forwardURL } : {}
-      }
-    ];
+    if (policy.forward && forwardURL) {
+      allow[domain] = [{ forwardURL }];
+    } else if (shouldPropagateTrace && hasTraceHeaders) {
+      allow[domain] = [{ transform: [{ headers: traceHeaders }] }];
+    }
   }
   return { allow };
 }
@@ -14590,7 +14631,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,
@@ -14638,7 +14679,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,
@@ -14659,7 +14700,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,
@@ -14793,32 +14834,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(
@@ -15283,9 +15317,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
@@ -15435,12 +15469,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;
@@ -15517,16 +15574,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
@@ -15746,13 +15794,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({
@@ -15930,6 +15972,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
         }
         return void 0;
       },
+      afterToolCall: async ({ result: result2 }, signal2) => runResume.timedOut && signal2?.aborted ? annotateTurnDeadlineToolResult(result2) : void 0,
       prepareNextTurn: async () => {
         const update = applyPendingHandoff();
         await drainSteeringMessages();
@@ -16259,16 +16302,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"
     );
@@ -16342,6 +16376,7 @@ export {
   buildSlackOutputMessage,
   buildSteeringPiMessage,
   createUserTokenStore,
+  cancelSubscriptions,
   findMatchingResourceEventSubscriptions,
   deliverResourceEventSubscription,
   listThreadReplies,