@sentry/junior 0.147.0 → 0.148.0

package/dist/{chunk-AYU72WO7.js → chunk-ULAU5ZGU.js}

@@ -1,10 +1,19 @@
 import {
   relayLocalOAuthCallback
 } from "./chunk-FA6POGLH.js";
+import {
+  getTurnRequestDeadline
+} from "./chunk-DUY5CDAM.js";
+import {
+  persistAuthPauseTurnState
+} from "./chunk-LNVEIJ2L.js";
+import {
+  buildSentryConversationUrl
+} from "./chunk-4CODA7P5.js";
 import {
   ensureConversationWake,
   requestConversationWork
-} from "./chunk-CWP5RHVX.js";
+} from "./chunk-HLPLT3NY.js";
 import {
   buildConversationContext,
   buildDeliveredTurnStatePatch,
@@ -15,13 +24,12 @@ import {
   getTurnUserReplyAttachmentContext,
   getTurnUserSlackMessageTs,
   markConversationMessage,
-  persistAuthPauseTurnState,
   recordDeliveredAssistantMessage,
   requireTurnFailureEventId,
   resolveTurnSessionRouting,
   scheduleSessionCompletedPluginTasks,
   turnHasReply
-} from "./chunk-6H5SZR24.js";
+} from "./chunk-RRJV5UR5.js";
 import {
   ConversationTurnLifecycleService,
   coerceThreadConversationState,
@@ -30,10 +38,7 @@ import {
   getPersistedSandboxState,
   getPersistedThreadState,
   persistThreadStateById
-} from "./chunk-AZ7EAOBE.js";
-import {
-  buildSentryConversationUrl
-} from "./chunk-4CODA7P5.js";
+} from "./chunk-IL4EDBMV.js";
 import {
   getVercelConversationWorkQueue
 } from "./chunk-WR76IVA5.js";
@@ -46,10 +51,10 @@ import {
   getMcpStoredOAuthCredentials,
   lookupSlackUserProfile,
   resolvePluginOAuthAccount
-} from "./chunk-Q4R73I43.js";
+} from "./chunk-XJ42NBP5.js";
 import {
   RetryableDeliveryError
-} from "./chunk-R776HKPK.js";
+} from "./chunk-GDFF3BQG.js";
 import {
   addReactionToMessage,
   escapeSlackMrkdwnText,
@@ -62,7 +67,13 @@ import {
   removeReactionFromMessage,
   resolveBaseUrl,
   truncateStatusText
-} from "./chunk-7UQIVT6G.js";
+} from "./chunk-WCN4YSH7.js";
+import {
+  parseSlackThreadId,
+  readSlackRawMessageContext,
+  resolveSlackChannelIdFromMessage,
+  resolveSlackChannelIdFromThreadId
+} from "./chunk-WOONT5ZP.js";
 import {
   TurnSliceLimitExceededError,
   abandonTurnRecord,
@@ -83,55 +94,48 @@ import {
   recordAuthorizationCompleted,
   recordTurnSummary,
   saveTurnCheckpoint
-} from "./chunk-AIOK6LAG.js";
-import {
-  parseSlackThreadId,
-  readSlackRawMessageContext,
-  resolveSlackChannelIdFromMessage,
-  resolveSlackChannelIdFromThreadId
-} from "./chunk-CSZINQJ2.js";
+} from "./chunk-VCYSOXON.js";
 import {
   getDashboardConversationLink,
   getPluginSlackConversationLink
-} from "./chunk-YHDERDRO.js";
+} from "./chunk-ZCHIC2GM.js";
 import {
   SlackActionError,
   getHeaderString,
   getSlackClient,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-SGZO7UWH.js";
+} from "./chunk-V2FXMOEA.js";
 import {
   getConversationEventStore,
   getSqlExecutor,
   requireSlackDestination,
   upsertIdentity,
   upsertLinkedIdentity
-} from "./chunk-YSB2N563.js";
+} from "./chunk-VRHTNBA6.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-ORO3PWKQ.js";
+} from "./chunk-2B3PT3V2.js";
 import {
-  FUNCTION_TIMEOUT_BUFFER_SECONDS,
   botConfig,
   escapeXml,
   getChatConfig,
   getRuntimeMetadata,
   normalizeSlackEmojiName,
   standardModelId
-} from "./chunk-7NVJVJID.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   discoverSkills
-} from "./chunk-YBVXBNSV.js";
+} from "./chunk-4AQZYNHM.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-JUUKWRBE.js";
+} from "./chunk-HWQGBIH7.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse
-} from "./chunk-GGB4WL5A.js";
+} from "./chunk-POSZWRGL.js";
 import {
   createSlackResumeActor,
   isUserActor
@@ -149,7 +153,7 @@ import {
   setTags,
   toOptionalString,
   withLogContext
-} from "./chunk-4LJO56OJ.js";
+} from "./chunk-EAI67NTM.js";
 import {
   homeDir
 } from "./chunk-H4HBKISO.js";
@@ -1076,33 +1080,6 @@ function buildAuthPauseResponse(slackUserId, providerDisplayName, requestText) {
 I sent you a link.`;
 }
 
-// src/chat/runtime/request-deadline.ts
-import { AsyncLocalStorage } from "async_hooks";
-var requestDeadlineStorage = new AsyncLocalStorage();
-function createTurnRequestDeadline(startedAtMs) {
-  const requestBudgetMs = Math.max(
-    1,
-    getChatConfig().functionMaxDurationSeconds * 1e3 - FUNCTION_TIMEOUT_BUFFER_SECONDS * 1e3
-  );
-  return {
-    startedAtMs,
-    deadlineAtMs: startedAtMs + requestBudgetMs
-  };
-}
-function getTurnRequestDeadline() {
-  return requestDeadlineStorage.getStore();
-}
-function runWithTurnRequestDeadline(callback, startedAtMs = Date.now()) {
-  const existingDeadline = requestDeadlineStorage.getStore();
-  if (existingDeadline) {
-    return callback();
-  }
-  return requestDeadlineStorage.run(
-    createTurnRequestDeadline(startedAtMs),
-    callback
-  );
-}
-
 // src/chat/runtime/slack-resume.ts
 function resolveReplyTimeoutMs(explicitTimeoutMs) {
   if (typeof explicitTimeoutMs === "number" && explicitTimeoutMs > 0) {
@@ -1436,15 +1413,17 @@ async function resumeSlackTurnInContext(args) {
       }
       failureCode = "delivery_failed";
       const deliveryState2 = await getDeliveryConversation();
-      let slackMessageTs;
+      let slackMessageTs = [];
       try {
-        slackMessageTs = await sendSlackReply({
-          channelId: runArgs.channelId,
-          conversationId: runArgs.conversationId,
-          replyAttribution: runArgs.replyContext?.routing.dispatch?.replyAttribution,
-          text,
-          threadTs: runArgs.threadTs
-        });
+        if (runArgs.replyContext?.routing.publishExternally !== false) {
+          slackMessageTs = await sendSlackReply({
+            channelId: runArgs.channelId,
+            conversationId: runArgs.conversationId,
+            replyAttribution: runArgs.replyContext?.routing.dispatch?.replyAttribution,
+            text,
+            threadTs: runArgs.threadTs
+          });
+        }
       } catch (error) {
         if (isRetryableSlackPostError(error)) {
           throw new RetryableDeliveryError(error);
@@ -3185,8 +3164,6 @@ export {
   shouldKeepProcessingReactionForToolInvocation,
   startSlackProcessingReaction,
   buildAuthPauseResponse,
-  getTurnRequestDeadline,
-  runWithTurnRequestDeadline,
   resumeSlackTurn,
   getPausedTurnRequest,
   wakePausedTurn,

package/dist/{chunk-SGZO7UWH.js → chunk-V2FXMOEA.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-EM225ITJ.js";
 import {
   getSlackBotToken
-} from "./chunk-7NVJVJID.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   parseSlackChannelReferenceId
 } from "./chunk-F3B2YJ76.js";
@@ -12,7 +12,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-4LJO56OJ.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/slack/client.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";

package/dist/{chunk-AIOK6LAG.js → chunk-VCYSOXON.js}

@@ -1,11 +1,6 @@
 import {
-  JUNIOR_NATIVE_EVENT_NAMESPACE,
-  ToolInputError,
-  addAgentTurnUsage,
-  agentsInstructionsUpdatedEvent,
-  authenticationLinkedEvent,
-  authenticationUnlinkedEvent
-} from "./chunk-HLXXQI5Q.js";
+  usageSchema
+} from "./chunk-PDO5BLNM.js";
 import {
   agentHistoryItemSchema,
   bindProviderConversation,
@@ -18,7 +13,7 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-YSB2N563.js";
+} from "./chunk-VRHTNBA6.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   sleep
@@ -28,18 +23,18 @@ import {
   fenceLock,
   getStateAdapter,
   withLock
-} from "./chunk-ORO3PWKQ.js";
+} from "./chunk-2B3PT3V2.js";
 import {
   botConfig,
   unwrapCurrentInstruction
-} from "./chunk-7NVJVJID.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   toStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
 import {
   getActiveTraceId,
   logException
-} from "./chunk-4LJO56OJ.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -397,6 +392,131 @@ var piContentMessageSchema = z.object({
   role: z.string().min(1)
 }).passthrough().transform((value) => value);
 
+// src/chat/conversations/structured-events.ts
+import {
+  conversationEventPresentationSchema,
+  defineConversationEvent
+} from "@sentry/junior-plugin-api";
+import { z as z2 } from "zod";
+var JUNIOR_NATIVE_EVENT_NAMESPACE = "junior";
+var authenticationEventContentSchema = z2.object({
+  accountLabel: z2.string().trim().min(1).max(120).optional(),
+  actorId: z2.string().min(1),
+  authorizationId: z2.string().min(1).optional(),
+  provider: z2.string().regex(/^[a-z][a-z0-9-]*$/),
+  providerLabel: z2.string().trim().min(1).max(80).optional()
+}).strict();
+var agentsInstructionsUpdatedContentSchema = z2.object({
+  action: z2.enum(["loaded", "replaced", "cleared"]),
+  directory: z2.string().trim().min(1).max(500).optional(),
+  fingerprint: z2.string().trim().min(1).max(128),
+  sources: z2.array(
+    z2.object({
+      content: z2.string().min(1).max(32 * 1024),
+      path: z2.string().trim().min(1).max(500)
+    }).strict()
+  ).max(32),
+  textBytes: z2.number().int().nonnegative().optional()
+}).strict();
+function providerTitle(content) {
+  return content.providerLabel?.trim() || content.provider;
+}
+function agentsInstructionsTitle(action) {
+  if (action === "loaded") return "Loaded AGENTS.md";
+  if (action === "replaced") return "Updated AGENTS.md";
+  return "Cleared AGENTS.md";
+}
+function sourceFilename(sourcePath) {
+  return sourcePath.split("/").at(-1) || sourcePath;
+}
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes} bytes`;
+  const kilobytes = bytes / 1024;
+  return `${Number.isInteger(kilobytes) ? kilobytes : kilobytes.toFixed(1)} KB`;
+}
+function agentsInstructionsPreview(content) {
+  const source = content.sources[0];
+  if (!source) return void 0;
+  const filename = sourceFilename(source.path);
+  const label = content.sources.length === 1 ? filename : `${content.sources.length} AGENTS.md files`;
+  return typeof content.textBytes === "number" ? `${label} \xB7 ${formatBytes(content.textBytes)}` : label;
+}
+var authenticationLinkedEvent = defineConversationEvent({
+  name: "authentication_linked",
+  version: 1,
+  schema: authenticationEventContentSchema,
+  renderEvent(event) {
+    const provider = providerTitle(event);
+    return {
+      icon: "link",
+      title: `${provider} connected`,
+      ...event.accountLabel ? { preview: `Connected as \`${event.accountLabel}\`` } : {},
+      details: [
+        {
+          title: `${provider} connected`,
+          ...event.accountLabel ? { description: `Connected as \`${event.accountLabel}\`` } : {},
+          metadata: [event.provider]
+        }
+      ]
+    };
+  }
+});
+var authenticationUnlinkedEvent = defineConversationEvent({
+  name: "authentication_unlinked",
+  version: 1,
+  schema: authenticationEventContentSchema,
+  renderEvent(event) {
+    const provider = providerTitle(event);
+    return {
+      icon: "key",
+      title: `${provider} disconnected`,
+      details: [
+        {
+          title: `${provider} disconnected`,
+          metadata: [event.provider]
+        }
+      ]
+    };
+  }
+});
+var agentsInstructionsUpdatedEvent = defineConversationEvent({
+  name: "agents_instructions_updated",
+  version: 1,
+  schema: agentsInstructionsUpdatedContentSchema,
+  renderEvent(event) {
+    const title = agentsInstructionsTitle(event.action);
+    const preview = agentsInstructionsPreview(event);
+    return {
+      icon: "brain",
+      title,
+      ...preview ? { preview } : {},
+      ...event.sources.length > 0 ? {
+        details: event.sources.map((source) => ({
+          title: sourceFilename(source.path),
+          content: source.content
+        }))
+      } : {}
+    };
+  }
+});
+var NATIVE_EVENT_DEFINITIONS = [
+  authenticationLinkedEvent,
+  authenticationUnlinkedEvent,
+  agentsInstructionsUpdatedEvent
+];
+function getJuniorNativeEventDefinition(args) {
+  return NATIVE_EVENT_DEFINITIONS.find(
+    (definition) => definition.eventName === args.name && definition.version === args.version
+  );
+}
+function renderJuniorNativeConversationEvent(args) {
+  if (args.namespace !== JUNIOR_NATIVE_EVENT_NAMESPACE) return void 0;
+  const definition = getJuniorNativeEventDefinition(args);
+  if (!definition) return void 0;
+  const presentation = definition.renderEvent(definition.parse(args.content));
+  return presentation === void 0 ? void 0 : conversationEventPresentationSchema.parse(presentation);
+}
+
 // src/chat/pi/conversation-events.ts
 function authorizationObservationMessage(data, createdAtMs) {
   const label = data.kind === "mcp" ? "MCP authorization" : "Authorization";
@@ -1131,7 +1251,7 @@ async function persistWithRetry(persist) {
 }
 
 // src/chat/task-execution/turn-cursor.ts
-import { z as z2 } from "zod";
+import { z as z3 } from "zod";
 
 // src/chat/repository-instructions.ts
 import { createHash as createHash2 } from "crypto";
@@ -1139,6 +1259,16 @@ import path2 from "path";
 
 // src/chat/tools/sandbox/file-utils.ts
 import path from "path";
+
+// src/chat/tools/execution/tool-input-error.ts
+var ToolInputError = class extends Error {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "ToolInputError";
+  }
+};
+
+// src/chat/tools/sandbox/file-utils.ts
 var MAX_TEXT_CHARS = 6e4;
 var RIPGREP_EXCLUDED_GLOBS = [
   "!**/.git/**",
@@ -1524,63 +1654,64 @@ function definedProps(values) {
     Object.entries(values).filter(([, value]) => value !== void 0)
   );
 }
-var turnStatusSchema = z2.enum([
+var turnStatusSchema = z3.enum([
   "running",
   "paused",
   "completed",
   "failed",
   "abandoned"
 ]);
-var turnSurfaceSchema = z2.enum([
+var turnSurfaceSchema = z3.enum([
   "slack",
   "api",
   "scheduler",
   "internal"
 ]);
-var turnPauseReasonSchema = z2.enum([
+var turnPauseReasonSchema = z3.enum([
   "timeout",
   "auth",
   "yield",
   "retry"
 ]);
-var nonNegativeNumberSchema = z2.number().finite().nonnegative();
-var seqCursorSchema = z2.number().int().min(-1);
-var storedTurnSummarySchema = z2.object({
-  schemaVersion: z2.literal(TURN_CURSOR_SCHEMA_VERSION),
-  version: z2.number().int().nonnegative(),
-  conversationId: z2.string().min(1),
-  dispatchId: z2.string().min(1).optional(),
-  dispatchOutcome: z2.enum(["blocked", "completed", "failed"]).optional(),
-  resultMessageId: z2.string().min(1).optional(),
+var nonNegativeNumberSchema = z3.number().finite().nonnegative();
+var seqCursorSchema = z3.number().int().min(-1);
+var storedTurnSummarySchema = z3.object({
+  schemaVersion: z3.literal(TURN_CURSOR_SCHEMA_VERSION),
+  version: z3.number().int().nonnegative(),
+  conversationId: z3.string().min(1),
+  dispatchId: z3.string().min(1).optional(),
+  dispatchOutcome: z3.enum(["blocked", "completed", "failed"]).optional(),
+  resultMessageId: z3.string().min(1).optional(),
   resumeReason: turnPauseReasonSchema.optional(),
-  turnId: z2.string().min(1),
-  sliceId: z2.number().int().nonnegative(),
+  turnId: z3.string().min(1),
+  sliceId: z3.number().int().nonnegative(),
   state: turnStatusSchema,
   surface: turnSurfaceSchema.optional(),
   updatedAtMs: nonNegativeNumberSchema
 }).strip();
-var storedTurnRecordSchema = z2.object({
-  schemaVersion: z2.literal(TURN_CURSOR_SCHEMA_VERSION),
-  version: z2.number().int().nonnegative(),
-  conversationId: z2.string().min(1),
-  dispatchId: z2.string().min(1).optional(),
-  dispatchOutcome: z2.enum(["blocked", "completed", "failed"]).optional(),
-  resultMessageId: z2.string().min(1).optional(),
+var storedTurnRecordSchema = z3.object({
+  schemaVersion: z3.literal(TURN_CURSOR_SCHEMA_VERSION),
+  version: z3.number().int().nonnegative(),
+  conversationId: z3.string().min(1),
+  dispatchId: z3.string().min(1).optional(),
+  dispatchOutcome: z3.enum(["blocked", "completed", "failed"]).optional(),
+  resultMessageId: z3.string().min(1).optional(),
   lastProgressAtMs: nonNegativeNumberSchema,
   resumeReason: turnPauseReasonSchema.optional(),
-  resumedFromSliceId: z2.number().int().nonnegative().optional(),
-  turnId: z2.string().min(1),
-  sliceId: z2.number().int().nonnegative(),
+  publishExternally: z3.boolean().optional(),
+  resumedFromSliceId: z3.number().int().nonnegative().optional(),
+  turnId: z3.string().min(1),
+  sliceId: z3.number().int().nonnegative(),
   startedAtMs: nonNegativeNumberSchema,
   state: turnStatusSchema,
   surface: turnSurfaceSchema.optional(),
-  traceId: z2.string().optional(),
+  traceId: z3.string().optional(),
   updatedAtMs: nonNegativeNumberSchema,
   committedSeq: seqCursorSchema,
-  historyVersion: z2.number().int().nonnegative().optional(),
-  errorMessage: z2.string().optional(),
+  historyVersion: z3.number().int().nonnegative().optional(),
+  errorMessage: z3.string().optional(),
   turnStartSeq: seqCursorSchema.optional(),
-  runtimeContext: z2.array(piMessageSchema).optional()
+  runtimeContext: z3.array(piMessageSchema).optional()
 }).strip();
 function conversationExecutionFromSummary(summary) {
   const status = summary.state === "completed" || summary.state === "abandoned" ? "idle" : summary.state;
@@ -1629,7 +1760,7 @@ async function recordConversationActivityMetadata(args) {
   });
   const isChild = Boolean(conversation?.lineage);
   const destination = isChild ? void 0 : args.destination;
-  const activitySource = isChild ? "internal" : destination?.platform === "local" ? "local" : destination ? args.summary.surface : void 0;
+  const activitySource = isChild ? "internal" : args.source?.platform === "web" ? "web" : destination?.platform === "local" ? "local" : destination ? args.summary.surface : void 0;
   await conversationStore.recordActivity({
     activityAtMs: args.summary.updatedAtMs,
     channelName: args.summary.channelName,
@@ -1681,6 +1812,7 @@ function materializeTurnRecord(stored, piProjection, turnStartMessageIndex, rest
       dispatchOutcome: stored.dispatchOutcome,
       errorMessage: stored.errorMessage,
       resumeReason: stored.resumeReason,
+      publishExternally: stored.publishExternally,
       resultMessageId: stored.resultMessageId,
       resumedFromSliceId: stored.resumedFromSliceId,
       surface: stored.surface,
@@ -1790,6 +1922,7 @@ function buildStoredRecord(args) {
       errorMessage: args.errorMessage,
       historyVersion: args.historyVersion,
       resumeReason: args.resumeReason,
+      publishExternally: args.publishExternally,
       resultMessageId: args.resultMessageId,
       resumedFromSliceId: args.resumedFromSliceId,
       runtimeContext: args.runtimeContext && args.runtimeContext.length > 0 ? args.runtimeContext : void 0,
@@ -1877,6 +2010,7 @@ async function updateTurnState(args) {
         errorMessage: args.errorMessage ?? args.existing.errorMessage,
         historyVersion: parsed.historyVersion,
         resumeReason: args.existing.resumeReason,
+        publishExternally: args.existing.publishExternally,
         resultMessageId: args.resultMessageId ?? args.existing.resultMessageId,
         resumedFromSliceId: args.existing.resumedFromSliceId,
         surface: args.existing.surface,
@@ -1964,6 +2098,7 @@ async function upsertTurnRecordLocked(args, fence) {
         errorMessage: args.errorMessage,
         lastProgressAtMs: args.lastProgressAtMs,
         resumeReason: args.resumeReason,
+        publishExternally: args.publishExternally ?? existingRecord?.publishExternally,
         resultMessageId: args.resultMessageId ?? existingRecord?.resultMessageId,
         resumedFromSliceId: args.resumedFromSliceId,
         runtimeContext: args.state === "running" || args.state === "paused" ? retainedRuntimeContext : void 0,
@@ -2120,6 +2255,96 @@ async function failTurnRecord(args) {
   );
 }
 
+// src/chat/usage.ts
+var agentTurnUsageSchema = usageSchema;
+var COMPONENT_USAGE_FIELDS = [
+  "inputTokens",
+  "outputTokens",
+  "cachedInputTokens",
+  "cacheCreationTokens"
+];
+var COST_COMPONENT_FIELDS = [
+  "input",
+  "output",
+  "cacheRead",
+  "cacheWrite"
+];
+function hasAgentTurnUsage(usage) {
+  return Boolean(
+    usage && (Object.entries(usage).some(
+      ([field, value]) => field !== "cost" && typeof value === "number" && Number.isFinite(value)
+    ) || Object.values(usage.cost ?? {}).some(
+      (value) => typeof value === "number" && Number.isFinite(value)
+    ))
+  );
+}
+function getFiniteCount(value) {
+  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : void 0;
+}
+function getFiniteCost(value) {
+  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : void 0;
+}
+function addCost(left, right) {
+  return Math.round(((left ?? 0) + right) * 1e12) / 1e12;
+}
+function getComponentTotal(usage) {
+  let total;
+  for (const field of COMPONENT_USAGE_FIELDS) {
+    const value = getFiniteCount(usage[field]);
+    if (value === void 0) continue;
+    total = (total ?? 0) + value;
+  }
+  return total;
+}
+function addAgentTurnUsage(...usages) {
+  const components = {};
+  let componentTotal;
+  let totalOnlyTokens;
+  let reasoningTokens;
+  const cost = {};
+  for (const usage of usages) {
+    if (!usage) continue;
+    const reasoning = getFiniteCount(usage.reasoningTokens);
+    if (reasoning !== void 0) {
+      reasoningTokens = (reasoningTokens ?? 0) + reasoning;
+    }
+    if (usage.cost) {
+      for (const field of [...COST_COMPONENT_FIELDS, "total"]) {
+        const value = getFiniteCost(usage.cost[field]);
+        if (value === void 0) continue;
+        cost[field] = addCost(cost[field], value);
+      }
+    }
+    const usageComponentTotal = getComponentTotal(usage);
+    if (usageComponentTotal !== void 0) {
+      componentTotal = (componentTotal ?? 0) + usageComponentTotal;
+      for (const field of COMPONENT_USAGE_FIELDS) {
+        const value = getFiniteCount(usage[field]);
+        if (value === void 0) continue;
+        components[field] = (components[field] ?? 0) + value;
+      }
+      continue;
+    }
+    const totalTokens = getFiniteCount(usage.totalTokens);
+    if (totalTokens !== void 0) {
+      totalOnlyTokens = (totalOnlyTokens ?? 0) + totalTokens;
+    }
+  }
+  if (totalOnlyTokens !== void 0) {
+    return {
+      totalTokens: totalOnlyTokens + (componentTotal ?? 0),
+      ...reasoningTokens !== void 0 ? { reasoningTokens } : {},
+      ...Object.keys(cost).length > 0 ? { cost } : {}
+    };
+  }
+  const result = {
+    ...components,
+    ...reasoningTokens !== void 0 ? { reasoningTokens } : {},
+    ...Object.keys(cost).length > 0 ? { cost } : {}
+  };
+  return hasAgentTurnUsage(result) ? result : void 0;
+}
+
 // src/chat/services/turn-limit.ts
 var TurnSliceLimitExceededError = class extends Error {
   constructor(maxSlices) {
@@ -2180,6 +2405,7 @@ function sharedWrite(args, latest) {
       destination: args.destination,
       destinationVisibility: args.destinationVisibility,
       dispatchId: args.dispatchId ?? latest?.dispatchId,
+      publishExternally: args.publishExternally ?? latest?.publishExternally,
       source: args.source,
       surface: args.surface ?? latest?.surface,
       traceId: getActiveTraceId() ?? latest?.traceId,
@@ -2371,6 +2597,7 @@ function isPendingAuthLatestRequest(conversation, pendingAuth) {
 }
 
 export {
+  renderJuniorNativeConversationEvent,
   TURN_CONTEXT_TAG,
   isAssistantMessage,
   isToolResultMessage,
@@ -2407,6 +2634,7 @@ export {
   recordTurnRoute,
   recordToolExecutionStarted,
   recordGuardianActionReviewed,
+  ToolInputError,
   MAX_TEXT_CHARS,
   RIPGREP_EXCLUDED_GLOBS,
   DEFAULT_SEARCH_COMMAND_TIMEOUT_MS,
@@ -2445,6 +2673,9 @@ export {
   sanitizeAssistantText,
   decideReply,
   getAssistantReplyText,
+  agentTurnUsageSchema,
+  hasAgentTurnUsage,
+  addAgentTurnUsage,
   TurnSliceLimitExceededError,
   buildTurnLimitResponse,
   persistWithRetry,