@sentry/junior 0.193.0 → 0.194.0

package/dist/{chunk-ZFPEPWOO.js → chunk-OEQOAONV.js}

@@ -7,7 +7,7 @@ import {
   authenticationUnlinkedEvent,
   fallbackShortTitle,
   generateShortTitle
-} from "./chunk-D5YQPCEG.js";
+} from "./chunk-RFE7DCZK.js";
 import {
   bindProviderConversation,
   createSqlConversationEventStore,
@@ -16,18 +16,18 @@ import {
   getSqlExecutor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-2CYWEVOP.js";
+} from "./chunk-ADEACKAH.js";
 import {
   SANDBOX_REPOS_ROOT,
   SANDBOX_WORKSPACE_ROOT,
   sleep
-} from "./chunk-KWXZMHJS.js";
+} from "./chunk-7ANA7PBB.js";
 import {
   MUTATION_LOCK_TTL_MS,
   fenceLock,
   getStateAdapter,
   withLock
-} from "./chunk-IOUUS6H4.js";
+} from "./chunk-V4HXV5MY.js";
 import {
   agentHistoryItemSchema,
   contextProvenance,
@@ -40,17 +40,18 @@ import {
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-WJJDQLVL.js";
+} from "./chunk-U76RWMFR.js";
 import {
   parseSlackMessageTs,
   toStoredSlackActor
 } from "./chunk-N7TMSOZH.js";
 import {
+  buildTurnFailureResponse,
   getActiveTraceId,
   logException,
   logWarn,
   setSpanAttributes
-} from "./chunk-QY2IU47O.js";
+} from "./chunk-X76JVHQ4.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -1241,7 +1242,7 @@ async function commitMessagesLocked(args, executor) {
         content: context.content
       }
     })) ?? [];
-    await eventStore.append(args.conversationId, [
+    const appendedEvents = await eventStore.append(args.conversationId, [
       ...newMessages.map((message, index) => ({
         data: historyItemFromPiMessage(
           message,
@@ -1251,22 +1252,19 @@ async function commitMessagesLocked(args, executor) {
       })),
       ...turnContextEvents
     ]);
-  } else {
-    throw new AgentHistoryBranchError(args.conversationId);
+    const cursor = appendedEvents.at(-1) ?? currentEvents.at(-1);
+    return {
+      committedSeq: cursor?.seq ?? -1,
+      historyVersion: cursor?.historyVersion ?? 0,
+      messageSeqs: [
+        ...current.seqs,
+        ...appendedEvents.slice(0, newMessages.length).map((event) => event.seq)
+      ],
+      messages: nextLocalMessages,
+      provenance: nextLocalProvenance
+    };
   }
-  const committedEvents = await eventStore.loadCurrentHistory(
-    args.conversationId
-  );
-  const committed = projectConversationEvents(committedEvents, {
-    defaultProfile: botConfig.defaultProfile
-  });
-  return {
-    committedSeq: committedEvents.at(-1)?.seq ?? -1,
-    historyVersion: committedEvents.at(-1)?.historyVersion ?? 0,
-    messageSeqs: committed.seqs,
-    messages: nextLocalMessages,
-    provenance: nextLocalProvenance
-  };
+  throw new AgentHistoryBranchError(args.conversationId);
 }
 async function recordMcpProviderConnected(args) {
   const eventStore = getConversationEventStore();
@@ -2074,6 +2072,7 @@ var storedTurnRecordSchema = z2.object({
   committedSeq: seqCursorSchema,
   historyVersion: z2.number().int().nonnegative().optional(),
   errorMessage: z2.string().optional(),
+  cumulativeToolCallCount: z2.number().int().nonnegative().optional(),
   turnStartSeq: seqCursorSchema.optional(),
   runtimeContext: z2.array(piMessageSchema).optional()
 }).strip();
@@ -2175,6 +2174,7 @@ function materializeTurnRecord(stored, piProjection, turnStartMessageIndex, rest
     cumulativeDurationMs: runtimeMetrics?.cumulativeDurationMs ?? 0,
     ...definedProps({
       channelName: runtimeMetrics?.channelName,
+      cumulativeToolCallCount: stored.cumulativeToolCallCount,
       cumulativeUsage: runtimeMetrics?.cumulativeUsage,
       dispatchId: stored.dispatchId,
       dispatchOutcome: stored.dispatchOutcome,
@@ -2246,12 +2246,13 @@ async function materializeStoredTurnRecord(conversationId, turnId, followCurrent
   if (!pinnedProjection) {
     return void 0;
   }
-  const currentHistory = await getConversationEventStore().loadCurrentHistory(conversationId);
-  const currentHistoryVersion = currentHistory.at(-1)?.historyVersion ?? parsed.historyVersion ?? 0;
+  const eventStore = getConversationEventStore();
+  const currentHistoryVersion = await eventStore.loadCurrentHistoryVersion(conversationId);
   const followsReplacement = followCurrentReplacement && (parsed.state === "running" || parsed.state === "paused") && parsed.historyVersion !== void 0 && parsed.historyVersion !== currentHistoryVersion;
-  const piProjection = followsReplacement ? projectConversationEvents(currentHistory, {
-    defaultProfile: botConfig.defaultProfile
-  }) : pinnedProjection;
+  const piProjection = followsReplacement ? projectConversationEvents(
+    await eventStore.loadCurrentHistory(conversationId),
+    { defaultProfile: botConfig.defaultProfile }
+  ) : pinnedProjection;
   const turnStartMessageIndex = followsReplacement ? 0 : parsed.turnStartSeq === void 0 ? void 0 : piProjection.seqs.filter((seq) => seq <= parsed.turnStartSeq).length;
   const conversation = await getConversationStore().get({ conversationId });
   const executionMetrics = executionMetricsForTurn(conversation, turnId);
@@ -2288,6 +2289,7 @@ function buildStoredRecord(args) {
     committedSeq: args.committedSeq,
     ...definedProps({
       actor: args.actor,
+      cumulativeToolCallCount: args.cumulativeToolCallCount,
       dispatchId: args.dispatchId,
       dispatchOutcome: args.dispatchOutcome,
       errorMessage: args.errorMessage,
@@ -2379,6 +2381,7 @@ async function updateTurnState(args) {
       lastProgressAtMs: parsed.lastProgressAtMs,
       previousVersion: parsed.version,
       ...definedProps({
+        cumulativeToolCallCount: args.existing.cumulativeToolCallCount,
         dispatchId: args.existing.dispatchId,
         dispatchOutcome: args.existing.dispatchOutcome,
         errorMessage: args.errorMessage ?? args.existing.errorMessage,
@@ -2473,6 +2476,7 @@ async function upsertTurnRecordLocked(args, fence) {
       historyVersion: commit.historyVersion,
       previousVersion: existingRecord?.version,
       ...definedProps({
+        cumulativeToolCallCount: args.cumulativeToolCallCount ?? existingRecord?.cumulativeToolCallCount,
         dispatchId,
         dispatchOutcome: args.dispatchOutcome ?? existingRecord?.dispatchOutcome,
         errorMessage: args.errorMessage,
@@ -2643,9 +2647,33 @@ var TurnSliceLimitExceededError = class extends Error {
     this.name = "TurnSliceLimitExceededError";
   }
 };
+var TurnToolCallLimitExceededError = class extends Error {
+  constructor(maxToolCalls) {
+    super(`Agent turn exceeded execution limit (${maxToolCalls} tool calls)`);
+    this.name = "TurnToolCallLimitExceededError";
+  }
+};
+function isDirectTurnExecutionLimitError(error) {
+  return error instanceof TurnSliceLimitExceededError || error instanceof TurnToolCallLimitExceededError;
+}
+function isTurnExecutionLimitExceededError(error) {
+  if (isDirectTurnExecutionLimitError(error)) {
+    return true;
+  }
+  return error instanceof Error && isDirectTurnExecutionLimitError(error.cause);
+}
+function assertTurnToolCallLimit(toolCallCount, maxToolCalls) {
+  if (toolCallCount <= maxToolCalls) {
+    return;
+  }
+  throw new TurnToolCallLimitExceededError(maxToolCalls);
+}
 function buildTurnLimitResponse(eventId) {
   return `I couldn't finish this request because this turn reached its execution limit. Please try again with a smaller or more specific request. Reference: \`event_id=${eventId}\`.`;
 }
+function buildTurnErrorResponse(error, eventId) {
+  return isTurnExecutionLimitExceededError(error) ? buildTurnLimitResponse(eventId) : buildTurnFailureResponse(eventId);
+}
 
 // src/chat/task-execution/checkpoint.ts
 function definedProps2(values) {
@@ -2699,7 +2727,8 @@ function sharedWrite(args, latest) {
       source: args.source,
       surface: args.surface ?? latest?.surface,
       traceId: getActiveTraceId() ?? latest?.traceId,
-      turnStartMessageIndex: args.turnStartMessageIndex ?? latest?.turnStartMessageIndex
+      turnStartMessageIndex: args.turnStartMessageIndex ?? latest?.turnStartMessageIndex,
+      cumulativeToolCallCount: args.cumulativeToolCallCount ?? latest?.cumulativeToolCallCount
     })
   };
 }
@@ -2896,7 +2925,9 @@ export {
   buildAgentsInstructionsMessage,
   findVisibleAgentsInstructions,
   TurnSliceLimitExceededError,
-  buildTurnLimitResponse,
+  isTurnExecutionLimitExceededError,
+  assertTurnToolCallLimit,
+  buildTurnErrorResponse,
   persistWithRetry,
   getTurnRecord,
   getTurnRecordForResume,

package/dist/{chunk-3YZ2Q6AW.js → chunk-P2P6MUQ4.js}

@@ -1,12 +1,12 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-DXFUYLHX.js";
+} from "./chunk-WWXJUURQ.js";
 import {
   skillRoots
 } from "./chunk-TXKUKMVO.js";
 import {
   logWarn
-} from "./chunk-QY2IU47O.js";
+} from "./chunk-X76JVHQ4.js";
 
 // src/chat/skills.ts
 import fs from "fs/promises";

package/dist/{chunk-LXRTHE43.js → chunk-QMEF4Z7R.js}

@@ -7,23 +7,23 @@ import {
 import {
   formatProviderLabel,
   startOAuthFlow
-} from "./chunk-COCVPDWX.js";
+} from "./chunk-ENWIHU54.js";
 import {
   abandonReplacedPendingAuth,
   canReusePendingAuthLink
-} from "./chunk-K47OVEO4.js";
+} from "./chunk-G35QGPO2.js";
 import {
   recordAuthorizationRequested
-} from "./chunk-ZFPEPWOO.js";
+} from "./chunk-OEQOAONV.js";
 import {
   AGENT_INVOCATION_MAILBOX_STATUSES
-} from "./chunk-5S6AQFNG.js";
+} from "./chunk-XLWZRHX5.js";
 import {
   TURN_REASONING_LEVELS
 } from "./chunk-D4YV5TDV.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-DXFUYLHX.js";
+} from "./chunk-WWXJUURQ.js";
 import {
   credentialContextSchema
 } from "./chunk-CEMMLV5L.js";

package/dist/{chunk-D5YQPCEG.js → chunk-RFE7DCZK.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-PDO5BLNM.js";
 import {
   botConfig
-} from "./chunk-WJJDQLVL.js";
+} from "./chunk-U76RWMFR.js";
 import {
   logWarn
-} from "./chunk-QY2IU47O.js";
+} from "./chunk-X76JVHQ4.js";
 
 // src/chat/conversations/structured-events.ts
 import {
@@ -174,6 +174,26 @@ function getComponentTotal(usage) {
   }
   return total;
 }
+function agentTurnCostUsd(usage) {
+  if (!usage?.cost) return void 0;
+  const total = getFiniteCost(usage.cost.total);
+  if (total !== void 0) return total;
+  let componentTotal = 0;
+  let hasComponent = false;
+  for (const field of COST_COMPONENT_FIELDS) {
+    const value = getFiniteCost(usage.cost[field]);
+    if (value === void 0) continue;
+    hasComponent = true;
+    componentTotal = addCost(componentTotal, value);
+  }
+  return hasComponent ? componentTotal : void 0;
+}
+function agentTurnTotalTokens(usage) {
+  if (!usage) return void 0;
+  const componentTotal = getComponentTotal(usage);
+  if (componentTotal !== void 0) return componentTotal;
+  return getFiniteCount(usage.totalTokens);
+}
 function addAgentTurnUsage(...usages) {
   const components = {};
   let componentTotal;
@@ -307,5 +327,7 @@ export {
   ToolInputError,
   agentTurnUsageSchema,
   hasAgentTurnUsage,
+  agentTurnCostUsd,
+  agentTurnTotalTokens,
   addAgentTurnUsage
 };

package/dist/{chunk-QWY4KI2V.js → chunk-S7GX44BU.js}

@@ -12,7 +12,7 @@ import {
   logInfo,
   logWarn,
   setSpanAttributes
-} from "./chunk-QY2IU47O.js";
+} from "./chunk-X76JVHQ4.js";
 
 // src/chat/plugins/manifest.ts
 import { z } from "zod";

package/dist/{chunk-WJJDQLVL.js → chunk-U76RWMFR.js}

@@ -7,7 +7,7 @@ import {
   toCanonicalInputMessage,
   toCanonicalOutputMessage,
   toGenAiMessagesTraceAttributes
-} from "./chunk-OICYQPKP.js";
+} from "./chunk-JOI3DHML.js";
 import {
   extractGenAiUsageAttributes,
   logException,
@@ -15,7 +15,7 @@ import {
   normalizeGenAiFinishReason,
   serializeGenAiAttribute,
   withSpan
-} from "./chunk-QY2IU47O.js";
+} from "./chunk-X76JVHQ4.js";
 
 // src/chat/services/provider-error.ts
 var ProviderError = class extends Error {
@@ -674,6 +674,7 @@ function normalizeSlackEmojiName(value) {
 var MIN_AGENT_TURN_TIMEOUT_MS = 10 * 1e3;
 var DEFAULT_AGENT_TURN_TIMEOUT_MS = 12 * 60 * 1e3;
 var MAX_SLICES_PER_TURN = 100;
+var MAX_TOOL_CALLS_PER_TURN = 150;
 var DEFAULT_FUNCTION_MAX_DURATION_SECONDS = 300;
 var DEFAULT_SLACK_SLASH_COMMAND = "/jr";
 var DEFAULT_PROCESSING_REACTION_EMOJI = "eyes";
@@ -902,6 +903,7 @@ function readBotConfig(env, functionMaxDurationSeconds) {
     loadingMessages: parseLoadingMessages(env.JUNIOR_LOADING_MESSAGES),
     visionModelId: validateGatewayModelId(env.AI_VISION_MODEL),
     maxSlicesPerTurn: MAX_SLICES_PER_TURN,
+    maxToolCallsPerTurn: MAX_TOOL_CALLS_PER_TURN,
     turnTimeoutMs: parseAgentTurnTimeoutMs(
       env.AGENT_TURN_TIMEOUT_MS,
       maxTurnTimeoutMs

package/dist/{chunk-IOUUS6H4.js → chunk-V4HXV5MY.js}

@@ -1,6 +1,6 @@
 import {
   getChatConfig
-} from "./chunk-WJJDQLVL.js";
+} from "./chunk-U76RWMFR.js";
 
 // src/chat/state/adapter.ts
 import { createMemoryState } from "@chat-adapter/state-memory";