@unbrained/pm-cli 2026.10.17 → 2026.10.18

package/node_modules/@sentry/core/build/esm/tracing/ai/gen-ai-attributes.js

@@ -29,8 +29,6 @@ const GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE = "gen_ai.response.tool_calls";
 const GEN_AI_AGENT_NAME_ATTRIBUTE = "gen_ai.agent.name";
 const GEN_AI_PIPELINE_NAME_ATTRIBUTE = "gen_ai.pipeline.name";
 const GEN_AI_CONVERSATION_ID_ATTRIBUTE = "gen_ai.conversation.id";
-const GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE = "gen_ai.usage.cache_creation_input_tokens";
-const GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE = "gen_ai.usage.cache_read_input_tokens";
 const GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE = "gen_ai.usage.input_tokens.cache_write";
 const GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE = "gen_ai.usage.input_tokens.cached";
 const GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE = "gen_ai.invoke_agent";
@@ -44,5 +42,5 @@ const GEN_AI_TOOL_INPUT_ATTRIBUTE = "gen_ai.tool.input";
 const GEN_AI_TOOL_OUTPUT_ATTRIBUTE = "gen_ai.tool.output";
 const GEN_AI_TOOL_DESCRIPTION_ATTRIBUTE = "gen_ai.tool.description";
 
-export { GEN_AI_AGENT_NAME_ATTRIBUTE, GEN_AI_CONVERSATION_ID_ATTRIBUTE, GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, GEN_AI_EMBEDDINGS_OPERATION_ATTRIBUTE, GEN_AI_EXECUTE_TOOL_OPERATION_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_OUTPUT_MESSAGES_ATTRIBUTE, GEN_AI_PIPELINE_NAME_ATTRIBUTE, GEN_AI_PROMPT_ATTRIBUTE, GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE, GEN_AI_REQUEST_ENCODING_FORMAT_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_TOP_K_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_STOP_REASON_ATTRIBUTE, GEN_AI_RESPONSE_STREAMING_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE, GEN_AI_SYSTEM_INSTRUCTIONS_ATTRIBUTE, GEN_AI_TOOL_CALL_ID_ATTRIBUTE, GEN_AI_TOOL_DESCRIPTION_ATTRIBUTE, GEN_AI_TOOL_INPUT_ATTRIBUTE, GEN_AI_TOOL_NAME_ATTRIBUTE, GEN_AI_TOOL_OUTPUT_ATTRIBUTE, GEN_AI_TOOL_TYPE_ATTRIBUTE, GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE };
+export { GEN_AI_AGENT_NAME_ATTRIBUTE, GEN_AI_CONVERSATION_ID_ATTRIBUTE, GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, GEN_AI_EMBEDDINGS_OPERATION_ATTRIBUTE, GEN_AI_EXECUTE_TOOL_OPERATION_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_OUTPUT_MESSAGES_ATTRIBUTE, GEN_AI_PIPELINE_NAME_ATTRIBUTE, GEN_AI_PROMPT_ATTRIBUTE, GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE, GEN_AI_REQUEST_ENCODING_FORMAT_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_TOP_K_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_STOP_REASON_ATTRIBUTE, GEN_AI_RESPONSE_STREAMING_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE, GEN_AI_SYSTEM_INSTRUCTIONS_ATTRIBUTE, GEN_AI_TOOL_CALL_ID_ATTRIBUTE, GEN_AI_TOOL_DESCRIPTION_ATTRIBUTE, GEN_AI_TOOL_INPUT_ATTRIBUTE, GEN_AI_TOOL_NAME_ATTRIBUTE, GEN_AI_TOOL_OUTPUT_ATTRIBUTE, GEN_AI_TOOL_TYPE_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE };
 //# sourceMappingURL=gen-ai-attributes.js.map

package/node_modules/@sentry/core/build/esm/tracing/ai/utils.js

@@ -1,7 +1,8 @@
+import { GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, GEN_AI_USAGE_REASONING_OUTPUT_TOKENS } from '@sentry/conventions/attributes';
 import { getClient } from '../../currentScopes.js';
 import { hasSpanStreamingEnabled } from '../spans/hasSpanStreamingEnabled.js';
 import { isThenable } from '../../utils/is.js';
-import { GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, GEN_AI_RESPONSE_STREAMING_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE } from './gen-ai-attributes.js';
+import { GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_RESPONSE_STREAMING_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE } from './gen-ai-attributes.js';
 import { truncateGenAiStringInput, truncateGenAiMessages } from './messageTruncation.js';
 
 function resolveAIRecordingOptions(options) {
@@ -25,23 +26,26 @@ function shouldEnableTruncation(enableTruncation) {
 function buildMethodPath(currentPath, prop) {
   return currentPath ? `${currentPath}.${prop}` : prop;
 }
-function setTokenUsageAttributes(span, promptTokens, completionTokens, cachedInputTokens, cachedOutputTokens) {
-  if (promptTokens !== void 0) {
-    span.setAttributes({
-      [GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: promptTokens
-    });
-  }
-  if (completionTokens !== void 0) {
-    span.setAttributes({
-      [GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: completionTokens
-    });
-  }
-  if (promptTokens !== void 0 || completionTokens !== void 0 || cachedInputTokens !== void 0 || cachedOutputTokens !== void 0) {
-    const totalTokens = (promptTokens ?? 0) + (completionTokens ?? 0) + (cachedInputTokens ?? 0) + (cachedOutputTokens ?? 0);
-    span.setAttributes({
-      [GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: totalTokens
-    });
+function getTokenUsageAttributes(promptTokens, completionTokens, cacheCreationInputTokens, cacheReadInputTokens, totalTokens) {
+  const attributes = {};
+  if (typeof promptTokens === "number") {
+    attributes[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE] = promptTokens;
   }
+  if (typeof cacheCreationInputTokens === "number") {
+    attributes[GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS] = cacheCreationInputTokens;
+  }
+  if (typeof cacheReadInputTokens === "number") {
+    attributes[GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS] = cacheReadInputTokens;
+  }
+  if (typeof completionTokens === "number") {
+    attributes[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE] = completionTokens;
+  }
+  if (typeof totalTokens === "number") {
+    attributes[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = totalTokens;
+  } else if (typeof promptTokens === "number" || typeof completionTokens === "number") {
+    attributes[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = (typeof promptTokens === "number" ? promptTokens : 0) + (typeof completionTokens === "number" ? completionTokens : 0);
+  }
+  return attributes;
 }
 function endStreamSpan(span, state, recordOutputs) {
   if (!span.isRecording()) {
@@ -52,12 +56,18 @@ function endStreamSpan(span, state, recordOutputs) {
   };
   if (state.responseId) attrs[GEN_AI_RESPONSE_ID_ATTRIBUTE] = state.responseId;
   if (state.responseModel) attrs[GEN_AI_RESPONSE_MODEL_ATTRIBUTE] = state.responseModel;
-  if (state.promptTokens !== void 0) attrs[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE] = state.promptTokens;
-  if (state.completionTokens !== void 0) attrs[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE] = state.completionTokens;
-  if (state.totalTokens !== void 0) {
-    attrs[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = state.totalTokens;
-  } else if (state.promptTokens !== void 0 || state.completionTokens !== void 0 || state.cacheCreationInputTokens !== void 0 || state.cacheReadInputTokens !== void 0) {
-    attrs[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = (state.promptTokens ?? 0) + (state.completionTokens ?? 0) + (state.cacheCreationInputTokens ?? 0) + (state.cacheReadInputTokens ?? 0);
+  Object.assign(
+    attrs,
+    getTokenUsageAttributes(
+      state.promptTokens,
+      state.completionTokens,
+      state.cacheCreationInputTokens,
+      state.cacheReadInputTokens,
+      state.totalTokens
+    )
+  );
+  if (typeof state.reasoningOutputTokens === "number") {
+    attrs[GEN_AI_USAGE_REASONING_OUTPUT_TOKENS] = state.reasoningOutputTokens;
   }
   if (state.finishReasons.length) {
     attrs[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE] = JSON.stringify(state.finishReasons);
@@ -130,5 +140,5 @@ function wrapPromiseWithMethods(originalPromiseLike, instrumentedPromise) {
   });
 }
 
-export { buildMethodPath, endStreamSpan, extractSystemInstructions, getTruncatedJsonString, resolveAIRecordingOptions, setTokenUsageAttributes, shouldEnableTruncation, wrapPromiseWithMethods };
+export { buildMethodPath, endStreamSpan, extractSystemInstructions, getTokenUsageAttributes, getTruncatedJsonString, resolveAIRecordingOptions, shouldEnableTruncation, wrapPromiseWithMethods };
 //# sourceMappingURL=utils.js.map

package/node_modules/@sentry/core/build/esm/tracing/anthropic-ai/index.js

@@ -2,7 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes.js';
 import { SPAN_STATUS_ERROR } from '../spanstatus.js';
 import { startSpan, startSpanManual } from '../trace.js';
 import { GEN_AI_PROMPT_ATTRIBUTE, GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_REQUEST_TOP_K_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
-import { resolveAIRecordingOptions, setTokenUsageAttributes, shouldEnableTruncation, wrapPromiseWithMethods } from '../ai/utils.js';
+import { resolveAIRecordingOptions, getTokenUsageAttributes, shouldEnableTruncation, wrapPromiseWithMethods } from '../ai/utils.js';
 import { ANTHROPIC_METHOD_REGISTRY } from './constants.js';
 import { instrumentAsyncIterableStream, instrumentMessageStream } from './streaming.js';
 import { messagesFromParams, setMessagesAttribute, handleResponseError } from './utils.js';
@@ -75,12 +75,13 @@ function addMetadataAttributes(span, response) {
       [GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: response.model
     });
     if ("usage" in response && response.usage) {
-      setTokenUsageAttributes(
-        span,
-        response.usage.input_tokens,
-        response.usage.output_tokens,
-        response.usage.cache_creation_input_tokens,
-        response.usage.cache_read_input_tokens
+      span.setAttributes(
+        getTokenUsageAttributes(
+          response.usage.input_tokens + (response.usage.cache_creation_input_tokens ?? 0) + (response.usage.cache_read_input_tokens ?? 0),
+          response.usage.output_tokens,
+          response.usage.cache_creation_input_tokens,
+          response.usage.cache_read_input_tokens
+        )
       );
     }
   }

package/node_modules/@sentry/core/build/esm/tracing/anthropic-ai/streaming.js

@@ -26,7 +26,9 @@ function handleMessageMetadata(event, state) {
     if (message.id) state.responseId = message.id;
     if (message.model) state.responseModel = message.model;
     if (message.usage) {
-      if (typeof message.usage.input_tokens === "number") state.promptTokens = message.usage.input_tokens;
+      if (typeof message.usage.input_tokens === "number") {
+        state.promptTokens = message.usage.input_tokens + (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0);
+      }
       if (typeof message.usage.cache_creation_input_tokens === "number")
         state.cacheCreationInputTokens = message.usage.cache_creation_input_tokens;
       if (typeof message.usage.cache_read_input_tokens === "number")

package/node_modules/@sentry/core/build/esm/tracing/google-genai/index.js

@@ -1,10 +1,11 @@
+import { GEN_AI_USAGE_REASONING_OUTPUT_TOKENS } from '@sentry/conventions/attributes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes.js';
 import { stringify } from '../../utils/string.js';
 import { SPAN_STATUS_ERROR } from '../spanstatus.js';
 import { startSpanManual, startSpan } from '../trace.js';
 import { handleCallbackErrors } from '../../utils/handleCallbackErrors.js';
-import { GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, GEN_AI_SYSTEM_INSTRUCTIONS_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_REQUEST_TOP_K_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
-import { extractSystemInstructions, getTruncatedJsonString, resolveAIRecordingOptions, shouldEnableTruncation, buildMethodPath } from '../ai/utils.js';
+import { GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, GEN_AI_SYSTEM_INSTRUCTIONS_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_REQUEST_TOP_K_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
+import { extractSystemInstructions, getTruncatedJsonString, getTokenUsageAttributes, resolveAIRecordingOptions, shouldEnableTruncation, buildMethodPath } from '../ai/utils.js';
 import { GOOGLE_GENAI_SYSTEM_NAME, GOOGLE_GENAI_METHOD_REGISTRY } from './constants.js';
 import { instrumentStream } from './streaming.js';
 import { contentUnionToMessages } from './utils.js';
@@ -112,20 +113,18 @@ function addResponseAttributes(span, response, recordOutputs) {
   }
   if (response.usageMetadata && typeof response.usageMetadata === "object") {
     const usage = response.usageMetadata;
-    if (typeof usage.promptTokenCount === "number") {
-      span.setAttributes({
-        [GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: usage.promptTokenCount
-      });
-    }
-    if (typeof usage.candidatesTokenCount === "number") {
-      span.setAttributes({
-        [GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: usage.candidatesTokenCount
-      });
-    }
-    if (typeof usage.totalTokenCount === "number") {
-      span.setAttributes({
-        [GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: usage.totalTokenCount
-      });
+    const hasOutput = typeof usage.candidatesTokenCount === "number" || typeof usage.thoughtsTokenCount === "number";
+    span.setAttributes(
+      getTokenUsageAttributes(
+        usage.promptTokenCount,
+        hasOutput ? (usage.candidatesTokenCount ?? 0) + (usage.thoughtsTokenCount ?? 0) : void 0,
+        void 0,
+        usage.cachedContentTokenCount,
+        usage.totalTokenCount
+      )
+    );
+    if (typeof usage.thoughtsTokenCount === "number") {
+      span.setAttribute(GEN_AI_USAGE_REASONING_OUTPUT_TOKENS, usage.thoughtsTokenCount);
     }
   }
   if (recordOutputs && Array.isArray(response.candidates) && response.candidates.length > 0) {

package/node_modules/@sentry/core/build/esm/tracing/google-genai/streaming.js

@@ -20,8 +20,13 @@ function handleResponseMetadata(chunk, state) {
   const usage = chunk.usageMetadata;
   if (usage) {
     if (typeof usage.promptTokenCount === "number") state.promptTokens = usage.promptTokenCount;
-    if (typeof usage.candidatesTokenCount === "number") state.completionTokens = usage.candidatesTokenCount;
+    if (typeof usage.candidatesTokenCount === "number") state.candidateTokens = usage.candidatesTokenCount;
+    if (typeof usage.thoughtsTokenCount === "number") state.reasoningOutputTokens = usage.thoughtsTokenCount;
+    if (state.candidateTokens !== void 0 || state.reasoningOutputTokens !== void 0) {
+      state.completionTokens = (state.candidateTokens ?? 0) + (state.reasoningOutputTokens ?? 0);
+    }
     if (typeof usage.totalTokenCount === "number") state.totalTokens = usage.totalTokenCount;
+    if (typeof usage.cachedContentTokenCount === "number") state.cacheReadInputTokens = usage.cachedContentTokenCount;
   }
 }
 function handleCandidateContent(chunk, state, recordOutputs) {

package/node_modules/@sentry/core/build/esm/tracing/langchain/utils.js

@@ -1,8 +1,10 @@
+import { GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS } from '@sentry/conventions/attributes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes.js';
 import { stringify } from '../../utils/string.js';
-import { GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_STOP_REASON_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_SYSTEM_INSTRUCTIONS_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_AGENT_NAME_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
+import { isObjectLike } from '../../utils/is.js';
+import { GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_STOP_REASON_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_SYSTEM_ATTRIBUTE, GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE, GEN_AI_SYSTEM_INSTRUCTIONS_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_AGENT_NAME_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
 import { isContentMedia, stripInlineMediaFromSingleMessage } from '../ai/mediaStripping.js';
-import { extractSystemInstructions, getTruncatedJsonString } from '../ai/utils.js';
+import { extractSystemInstructions, getTruncatedJsonString, getTokenUsageAttributes } from '../ai/utils.js';
 import { LANGCHAIN_ORIGIN, ROLE_MAP } from './constants.js';
 
 const setIfDefined = (target, key, value) => {
@@ -170,29 +172,76 @@ function addToolCallsAttributes(generations, attrs) {
     setIfDefined(attrs, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, stringify(toolCalls, String));
   }
 }
-function addTokenUsageAttributes(llmOutput, attrs) {
+function extractMessageTokenUsageAttributes(message) {
+  const usage = message.usage_metadata;
+  if (isObjectLike(usage)) {
+    const details = isObjectLike(usage.input_token_details) ? usage.input_token_details : void 0;
+    return getTokenUsageAttributes(
+      usage.input_tokens,
+      usage.output_tokens,
+      details?.cache_creation,
+      details?.cache_read,
+      usage.total_tokens
+    );
+  }
+  const metadata = message.response_metadata;
+  const tokenUsage = isObjectLike(metadata) && isObjectLike(metadata.tokenUsage) ? metadata.tokenUsage : void 0;
+  return getTokenUsageAttributes(
+    tokenUsage?.promptTokens,
+    tokenUsage?.completionTokens,
+    void 0,
+    void 0,
+    tokenUsage?.totalTokens
+  );
+}
+function addTokenUsageAttributes(llmResult, attrs) {
+  const normalizedUsage = {};
+  const legacyMessageUsage = {};
+  for (const generations of llmResult.generations ?? []) {
+    const message = generations[0]?.message;
+    if (message) {
+      const usage = isObjectLike(message.usage_metadata) ? normalizedUsage : legacyMessageUsage;
+      for (const [key, value] of Object.entries(extractMessageTokenUsageAttributes(message))) {
+        usage[key] = (usage[key] ?? 0) + value;
+      }
+    }
+  }
+  Object.assign(attrs, Object.keys(normalizedUsage).length > 0 ? normalizedUsage : legacyMessageUsage);
+  const llmOutput = llmResult.llmOutput;
   if (!llmOutput) return;
   const tokenUsage = llmOutput.tokenUsage;
   const anthropicUsage = llmOutput.usage;
-  if (tokenUsage) {
-    setNumberIfDefined(attrs, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, tokenUsage.promptTokens);
-    setNumberIfDefined(attrs, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, tokenUsage.completionTokens);
-    setNumberIfDefined(attrs, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, tokenUsage.totalTokens);
-  } else if (anthropicUsage) {
-    setNumberIfDefined(attrs, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, anthropicUsage.input_tokens);
-    setNumberIfDefined(attrs, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, anthropicUsage.output_tokens);
-    const input = Number(anthropicUsage.input_tokens);
-    const output = Number(anthropicUsage.output_tokens);
-    const total = (Number.isNaN(input) ? 0 : input) + (Number.isNaN(output) ? 0 : output);
-    if (total > 0) setNumberIfDefined(attrs, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, total);
-    if (anthropicUsage.cache_creation_input_tokens !== void 0)
-      setNumberIfDefined(
-        attrs,
-        GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE,
-        anthropicUsage.cache_creation_input_tokens
-      );
-    if (anthropicUsage.cache_read_input_tokens !== void 0)
-      setNumberIfDefined(attrs, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE, anthropicUsage.cache_read_input_tokens);
+  if (anthropicUsage && Object.keys(normalizedUsage).length === 0 && Object.keys(legacyMessageUsage).length === 0) {
+    const { input_tokens, output_tokens, cache_creation_input_tokens, cache_read_input_tokens } = anthropicUsage;
+    const hasInput = input_tokens !== void 0 || cache_creation_input_tokens !== void 0 || cache_read_input_tokens !== void 0;
+    Object.assign(
+      attrs,
+      getTokenUsageAttributes(
+        hasInput ? (input_tokens ?? 0) + (cache_creation_input_tokens ?? 0) + (cache_read_input_tokens ?? 0) : void 0,
+        output_tokens,
+        cache_creation_input_tokens,
+        cache_read_input_tokens
+      )
+    );
+  } else if (tokenUsage && Object.keys(normalizedUsage).length === 0 && Object.keys(legacyMessageUsage).length === 0) {
+    Object.assign(
+      attrs,
+      getTokenUsageAttributes(
+        tokenUsage.promptTokens,
+        tokenUsage.completionTokens,
+        void 0,
+        void 0,
+        tokenUsage.totalTokens
+      )
+    );
+  }
+  if (anthropicUsage) {
+    if (typeof anthropicUsage.cache_creation_input_tokens === "number" && !(GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS in attrs)) {
+      attrs[GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS] = anthropicUsage.cache_creation_input_tokens;
+    }
+    if (typeof anthropicUsage.cache_read_input_tokens === "number" && !(GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS in attrs)) {
+      attrs[GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS] = anthropicUsage.cache_read_input_tokens;
+    }
   }
 }
 function extractLlmResponseAttributes(llmResult, recordOutputs) {
@@ -219,7 +268,7 @@ function extractLlmResponseAttributes(llmResult, recordOutputs) {
       }
     }
   }
-  addTokenUsageAttributes(llmResult.llmOutput, attrs);
+  addTokenUsageAttributes(llmResult, attrs);
   const llmOutput = llmResult.llmOutput;
   const firstGeneration = llmResult.generations?.[0]?.[0];
   const v1Message = firstGeneration?.message;
@@ -288,5 +337,5 @@ function _INTERNAL_mergeLangChainCallbackHandler(existing, sentryHandler) {
   return [...handlers, sentryHandler];
 }
 
-export { _INTERNAL_mergeLangChainCallbackHandler, extractChatModelRequestAttributes, extractLLMRequestAttributes, extractLlmResponseAttributes, extractToolDefinitions, getAgentNameFromMetadata, getInvocationParams, normalizeLangChainMessages };
+export { _INTERNAL_mergeLangChainCallbackHandler, extractChatModelRequestAttributes, extractLLMRequestAttributes, extractLlmResponseAttributes, extractMessageTokenUsageAttributes, extractToolDefinitions, getAgentNameFromMetadata, getInvocationParams, normalizeLangChainMessages };
 //# sourceMappingURL=utils.js.map

package/node_modules/@sentry/core/build/esm/tracing/langgraph/utils.js

@@ -1,8 +1,9 @@
+import { GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS, GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS } from '@sentry/conventions/attributes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes.js';
 import { SPAN_STATUS_ERROR } from '../spanstatus.js';
 import { startSpan } from '../trace.js';
 import { GEN_AI_EXECUTE_TOOL_OPERATION_ATTRIBUTE, GEN_AI_TOOL_INPUT_ATTRIBUTE, GEN_AI_TOOL_OUTPUT_ATTRIBUTE, GEN_AI_TOOL_TYPE_ATTRIBUTE, GEN_AI_TOOL_NAME_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_AGENT_NAME_ATTRIBUTE, GEN_AI_TOOL_DESCRIPTION_ATTRIBUTE, GEN_AI_TOOL_CALL_ID_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
-import { normalizeLangChainMessages } from '../langchain/utils.js';
+import { normalizeLangChainMessages, extractMessageTokenUsageAttributes } from '../langchain/utils.js';
 import { LANGGRAPH_ORIGIN } from './constants.js';
 
 function extractLLMFromParams(args) {
@@ -116,39 +117,14 @@ function extractToolCalls(messages) {
   return toolCalls.length > 0 ? toolCalls : null;
 }
 function extractTokenUsageFromMessage(message) {
-  const msg = message;
-  let inputTokens = 0;
-  let outputTokens = 0;
-  let totalTokens = 0;
-  if (msg.usage_metadata && typeof msg.usage_metadata === "object") {
-    const usage = msg.usage_metadata;
-    if (typeof usage.input_tokens === "number") {
-      inputTokens = usage.input_tokens;
-    }
-    if (typeof usage.output_tokens === "number") {
-      outputTokens = usage.output_tokens;
-    }
-    if (typeof usage.total_tokens === "number") {
-      totalTokens = usage.total_tokens;
-    }
-    return { inputTokens, outputTokens, totalTokens };
-  }
-  if (msg.response_metadata && typeof msg.response_metadata === "object") {
-    const metadata = msg.response_metadata;
-    if (metadata.tokenUsage && typeof metadata.tokenUsage === "object") {
-      const tokenUsage = metadata.tokenUsage;
-      if (typeof tokenUsage.promptTokens === "number") {
-        inputTokens = tokenUsage.promptTokens;
-      }
-      if (typeof tokenUsage.completionTokens === "number") {
-        outputTokens = tokenUsage.completionTokens;
-      }
-      if (typeof tokenUsage.totalTokens === "number") {
-        totalTokens = tokenUsage.totalTokens;
-      }
-    }
-  }
-  return { inputTokens, outputTokens, totalTokens };
+  const attributes = extractMessageTokenUsageAttributes(message);
+  return {
+    inputTokens: attributes[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE] ?? 0,
+    outputTokens: attributes[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE] ?? 0,
+    totalTokens: attributes[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] ?? 0,
+    cacheCreationInputTokens: attributes[GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS],
+    cacheReadInputTokens: attributes[GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS]
+  };
 }
 function extractModelMetadata(span, message) {
   const msg = message;
@@ -196,11 +172,19 @@ function setResponseAttributes(span, inputMessages, result) {
   let totalInputTokens = 0;
   let totalOutputTokens = 0;
   let totalTokens = 0;
+  let cacheCreationInputTokens;
+  let cacheReadInputTokens;
   for (const message of newMessages) {
     const tokens = extractTokenUsageFromMessage(message);
     totalInputTokens += tokens.inputTokens;
     totalOutputTokens += tokens.outputTokens;
     totalTokens += tokens.totalTokens;
+    if (tokens.cacheCreationInputTokens !== void 0) {
+      cacheCreationInputTokens = (cacheCreationInputTokens ?? 0) + tokens.cacheCreationInputTokens;
+    }
+    if (tokens.cacheReadInputTokens !== void 0) {
+      cacheReadInputTokens = (cacheReadInputTokens ?? 0) + tokens.cacheReadInputTokens;
+    }
     extractModelMetadata(span, message);
   }
   if (totalInputTokens > 0) {
@@ -212,6 +196,12 @@ function setResponseAttributes(span, inputMessages, result) {
   if (totalTokens > 0) {
     span.setAttribute(GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, totalTokens);
   }
+  if (cacheCreationInputTokens !== void 0) {
+    span.setAttribute(GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS, cacheCreationInputTokens);
+  }
+  if (cacheReadInputTokens !== void 0) {
+    span.setAttribute(GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, cacheReadInputTokens);
+  }
 }
 
 export { extractAgentNameFromParams, extractLLMFromParams, extractModelMetadata, extractTokenUsageFromMessage, extractToolCalls, extractToolsFromCompiledGraph, setResponseAttributes, wrapToolsWithSpans };

package/node_modules/@sentry/core/build/esm/tracing/openai/streaming.js

@@ -31,6 +31,8 @@ function processChatCompletionChunk(chunk, state, recordOutputs) {
     state.promptTokens = chunk.usage.prompt_tokens;
     state.completionTokens = chunk.usage.completion_tokens;
     state.totalTokens = chunk.usage.total_tokens;
+    state.cacheReadInputTokens = chunk.usage.prompt_tokens_details?.cached_tokens ?? state.cacheReadInputTokens;
+    state.cacheCreationInputTokens = chunk.usage.prompt_tokens_details?.cache_write_tokens ?? state.cacheCreationInputTokens;
   }
   for (const choice of chunk.choices ?? []) {
     if (recordOutputs) {
@@ -84,6 +86,8 @@ function processResponsesApiEvent(streamEvent, state, recordOutputs, span) {
       state.promptTokens = response.usage.input_tokens;
       state.completionTokens = response.usage.output_tokens;
       state.totalTokens = response.usage.total_tokens;
+      state.cacheReadInputTokens = response.usage.input_tokens_details?.cached_tokens ?? state.cacheReadInputTokens;
+      state.cacheCreationInputTokens = response.usage.input_tokens_details?.cache_write_tokens ?? state.cacheCreationInputTokens;
     }
     if (response.status) {
       state.finishReasons.push(response.status);
@@ -103,6 +107,8 @@ async function* instrumentStream(stream, span, recordOutputs) {
     promptTokens: void 0,
     completionTokens: void 0,
     totalTokens: void 0,
+    cacheReadInputTokens: void 0,
+    cacheCreationInputTokens: void 0,
     chatCompletionToolCalls: {},
     responsesApiToolCalls: []
   };

package/node_modules/@sentry/core/build/esm/tracing/openai/utils.js

@@ -1,3 +1,5 @@
+import { GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS } from '@sentry/conventions/attributes';
+import { isObjectLike } from '../../utils/is.js';
 import { GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE, GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE, GEN_AI_REQUEST_TOP_P_ATTRIBUTE, GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE, GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_REQUEST_ENCODING_FORMAT_ATTRIBUTE, GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE, GEN_AI_CONVERSATION_ID_ATTRIBUTE, GEN_AI_RESPONSE_ID_ATTRIBUTE, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
 
 function isResponsesApiStreamEvent(event) {
@@ -32,6 +34,15 @@ function addResponseAttributes(span, result, recordOutputs) {
     if (typeof usage.total_tokens === "number") {
       attrs[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = usage.total_tokens;
     }
+    const inputDetails = usage.prompt_tokens_details ?? usage.input_tokens_details;
+    if (isObjectLike(inputDetails)) {
+      if (typeof inputDetails.cached_tokens === "number") {
+        attrs[GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS] = inputDetails.cached_tokens;
+      }
+      if (typeof inputDetails.cache_write_tokens === "number") {
+        attrs[GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS] = inputDetails.cache_write_tokens;
+      }
+    }
   }
   if (Array.isArray(response.choices)) {
     const choices = response.choices;

package/node_modules/@sentry/core/build/esm/tracing/workers-ai/utils.js

@@ -1,7 +1,7 @@
 import { GEN_AI_REQUEST_TEMPERATURE, GEN_AI_REQUEST_MAX_TOKENS, GEN_AI_REQUEST_TOP_P, GEN_AI_REQUEST_TOP_K, GEN_AI_REQUEST_FREQUENCY_PENALTY, GEN_AI_REQUEST_PRESENCE_PENALTY, GEN_AI_EMBEDDINGS_INPUT, GEN_AI_SYSTEM_INSTRUCTIONS, GEN_AI_INPUT_MESSAGES, GEN_AI_REQUEST_MODEL, GEN_AI_OPERATION_NAME, GEN_AI_PROVIDER_NAME } from '@sentry/conventions/attributes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes.js';
 import { GEN_AI_REQUEST_STREAM_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, GEN_AI_RESPONSE_TEXT_ATTRIBUTE, GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, GEN_AI_OUTPUT_MESSAGES_ATTRIBUTE } from '../ai/gen-ai-attributes.js';
-import { extractSystemInstructions, getTruncatedJsonString, setTokenUsageAttributes } from '../ai/utils.js';
+import { extractSystemInstructions, getTruncatedJsonString, getTokenUsageAttributes } from '../ai/utils.js';
 import { stringify } from '../../utils/string.js';
 import { WORKERS_AI_ORIGIN, WORKERS_AI_PROVIDER_NAME } from './constants.js';
 
@@ -111,7 +111,7 @@ function addResponseAttributes(span, result, recordOutputs) {
   }
   const response = result;
   if (response.usage) {
-    setTokenUsageAttributes(span, response.usage.prompt_tokens, response.usage.completion_tokens);
+    span.setAttributes(getTokenUsageAttributes(response.usage.prompt_tokens, response.usage.completion_tokens));
   }
   if (recordOutputs) {
     let responseText;

package/node_modules/@sentry/core/build/esm/utils/eventUtils.js

@@ -1,3 +1,6 @@
+function isInternalException(hint) {
+  return hint.data?.__sentry__ === true;
+}
 function getPossibleEventMessages(event) {
   const possibleMessages = [];
   if (event.message) {
@@ -16,5 +19,5 @@ function getPossibleEventMessages(event) {
   return possibleMessages;
 }
 
-export { getPossibleEventMessages };
+export { getPossibleEventMessages, isInternalException };
 //# sourceMappingURL=eventUtils.js.map

package/node_modules/@sentry/core/build/esm/utils/prepareEvent.js

@@ -2,6 +2,7 @@ import { DEFAULT_ENVIRONMENT } from '../constants.js';
 import { notifyEventProcessors } from '../eventProcessors.js';
 import { Scope } from '../scope.js';
 import { getFilenameToDebugIdMap } from './debug-ids.js';
+import { isInternalException } from './eventUtils.js';
 import { uuid4, addExceptionMechanism } from './misc.js';
 import { normalize } from './normalize.js';
 import { getCombinedScopeData, applyScopeDataToEvent } from './scopeData.js';
@@ -41,8 +42,7 @@ function prepareEvent(options, event, hint, scope, client, isolationScope) {
     // Run scope event processors _after_ all other processors
     ...data.eventProcessors
   ];
-  const isInternalException = hint.data && hint.data.__sentry__ === true;
-  const result = isInternalException ? resolvedSyncPromise(prepared) : notifyEventProcessors(eventProcessors, prepared, hint);
+  const result = isInternalException(hint) ? resolvedSyncPromise(prepared) : notifyEventProcessors(eventProcessors, prepared, hint);
   return result.then((evt) => {
     if (evt) {
       applyDebugMeta(evt);

package/node_modules/@sentry/core/build/esm/utils/version.js

@@ -1,4 +1,4 @@
-const SDK_VERSION = "10.76.0" ;
+const SDK_VERSION = "10.76.2" ;
 
 export { SDK_VERSION };
 //# sourceMappingURL=version.js.map

package/node_modules/@sentry/core/build/types/tracing/ai/utils.d.ts

@@ -40,14 +40,9 @@ export declare function shouldEnableTruncation(enableTruncation: boolean | undef
  */
 export declare function buildMethodPath(currentPath: string, prop: string): string;
 /**
- * Set token usage attributes
- * @param span - The span to add attributes to
- * @param promptTokens - The number of prompt tokens
- * @param completionTokens - The number of completion tokens
- * @param cachedInputTokens - The number of cached input tokens
- * @param cachedOutputTokens - The number of cached output tokens
+ * Build token usage attributes. Input tokens include cache reads and writes, which are subsets.
  */
-export declare function setTokenUsageAttributes(span: Span, promptTokens?: number, completionTokens?: number, cachedInputTokens?: number, cachedOutputTokens?: number): void;
+export declare function getTokenUsageAttributes(promptTokens?: number, completionTokens?: number, cacheCreationInputTokens?: number, cacheReadInputTokens?: number, totalTokens?: number): Record<string, number>;
 export interface StreamResponseState {
     responseId?: string;
     responseModel?: string;
@@ -59,6 +54,7 @@ export interface StreamResponseState {
     totalTokens?: number;
     cacheCreationInputTokens?: number;
     cacheReadInputTokens?: number;
+    reasoningOutputTokens?: number;
 }
 /**
  * Ends a streaming span by setting all accumulated response attributes and ending the span.

package/node_modules/@sentry/core/build/types/tracing/anthropic-ai/types.d.ts

@@ -49,8 +49,8 @@ type SuccessfulResponse = {
     usage?: {
         input_tokens: number;
         output_tokens: number;
-        cache_creation_input_tokens: number;
-        cache_read_input_tokens: number;
+        cache_creation_input_tokens?: number;
+        cache_read_input_tokens?: number;
     };
     error?: never;
 };

package/node_modules/@sentry/core/build/types/tracing/langchain/types.d.ts

@@ -54,11 +54,26 @@ export interface LangChainMessage {
     };
     role?: string;
     additional_kwargs?: Record<string, unknown>;
+    usage_metadata?: {
+        input_tokens?: number;
+        output_tokens?: number;
+        total_tokens?: number;
+        input_token_details?: {
+            cache_read?: number;
+            cache_creation?: number;
+        };
+    };
     lc?: number;
     id?: string[] | string;
     response_metadata?: {
+        [key: string]: unknown;
         model_name?: string;
         finish_reason?: string;
+        tokenUsage?: {
+            promptTokens?: number;
+            completionTokens?: number;
+            totalTokens?: number;
+        };
     };
     kwargs?: {
         [key: string]: unknown;

package/node_modules/@sentry/core/build/types/tracing/langchain/utils.d.ts

@@ -47,6 +47,7 @@ export declare function extractLLMRequestAttributes(llm: LangChainSerialized, pr
  * - Provider system value falls back to `serialized.id?.[2]`.
  */
 export declare function extractChatModelRequestAttributes(llm: LangChainSerialized, langChainMessages: LangChainMessage[][], recordInputs: boolean, enableTruncation: boolean, invocationParams?: Record<string, unknown>, langSmithMetadata?: Record<string, unknown>): Record<string, SpanAttributeValue | undefined>;
+export declare function extractMessageTokenUsageAttributes(message: LangChainMessage): Record<string, number>;
 /**
  * Extracts response-related attributes based on a `LangChainLLMResult`.
  *

package/node_modules/@sentry/core/build/types/tracing/langgraph/utils.d.ts

@@ -27,6 +27,8 @@ export declare function extractTokenUsageFromMessage(message: LangChainMessage):
     inputTokens: number;
     outputTokens: number;
     totalTokens: number;
+    cacheCreationInputTokens?: number;
+    cacheReadInputTokens?: number;
 };
 /**
  * Extract model and finish reason from a message's response_metadata