@mcp-use/agent 2.0.7 → 2.0.8-canary.0

package/dist/index.js

@@ -728,12 +728,19 @@ function tokenUsageFromRecord(raw) {
     "candidatesTokenCount",
     "eval_count"
   );
-  const totalTokens = numberAt(usage, "totalTokens", "total_tokens", "totalTokenCount") ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0);
+  const cacheReadOutsideInput = numberAt(usage, "cache_read_input_tokens");
+  const cacheCreationInputTokens = numberAt(
+    usage,
+    "cacheCreationInputTokens",
+    "cache_creation_input_tokens"
+  );
+  const uncountedCache = (cacheReadOutsideInput ?? 0) + (cacheCreationInputTokens ?? 0);
+  const totalTokens = numberAt(usage, "totalTokens", "total_tokens", "totalTokenCount") ?? (inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens + uncountedCache : void 0);
   const inputDetails = usage.input_tokens_details && typeof usage.input_tokens_details === "object" ? usage.input_tokens_details : void 0;
   const outputDetails = usage.output_tokens_details && typeof usage.output_tokens_details === "object" ? usage.output_tokens_details : void 0;
   const cachedInputTokens = numberAt(usage, "cachedInputTokens", "cache_read_input_tokens") ?? (inputDetails ? numberAt(inputDetails, "cached_tokens") : void 0);
   const reasoningTokens = numberAt(usage, "reasoningTokens", "thoughtsTokenCount") ?? (outputDetails ? numberAt(outputDetails, "reasoning_tokens") : void 0);
-  if (inputTokens === void 0 && outputTokens === void 0 && totalTokens === void 0 && cachedInputTokens === void 0 && reasoningTokens === void 0) {
+  if (inputTokens === void 0 && outputTokens === void 0 && totalTokens === void 0 && cachedInputTokens === void 0 && cacheCreationInputTokens === void 0 && reasoningTokens === void 0) {
     return void 0;
   }
   return {
@@ -741,9 +748,21 @@ function tokenUsageFromRecord(raw) {
     outputTokens,
     totalTokens,
     cachedInputTokens,
+    cacheCreationInputTokens,
     reasoningTokens
   };
 }
+function mergeTokenUsage(base, next) {
+  if (!base) return next;
+  if (!next) return base;
+  const merged = { ...base };
+  for (const [key, value] of Object.entries(next)) {
+    if (value !== void 0) {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 
 // src/llm/providers/anthropic.ts
 var DEFAULT_ENDPOINT = "https://api.anthropic.com/v1/messages";
@@ -905,7 +924,9 @@ async function* streamChat(params) {
       usage = tokenUsageFromRecord(parsed?.message?.usage);
     } else if (t === "message_delta") {
       const deltaUsage = tokenUsageFromRecord(parsed?.usage);
-      if (deltaUsage) usage = { ...usage, ...deltaUsage };
+      if (deltaUsage) {
+        usage = mergeTokenUsage(usage, deltaUsage);
+      }
     } else if (t === "content_block_start") {
       const idx = parsed.index;
       const cb = parsed.content_block ?? {};
@@ -975,7 +996,8 @@ async function* streamChat(params) {
       }
     } else if (t === "message_stop") {
       if (usage) {
-        const totalTokens = usage.totalTokens ?? (usage.inputTokens !== void 0 && usage.outputTokens !== void 0 ? usage.inputTokens + usage.outputTokens : void 0);
+        const billed = (usage.inputTokens ?? 0) + (usage.cachedInputTokens ?? 0) + (usage.cacheCreationInputTokens ?? 0) + (usage.outputTokens ?? 0);
+        const totalTokens = usage.inputTokens === void 0 && usage.outputTokens === void 0 ? usage.totalTokens : billed;
         yield { type: "usage", usage: { ...usage, totalTokens } };
       }
     } else if (t === "error") {
@@ -2671,7 +2693,7 @@ function providerConfigFromOptions(provider, model, config) {
 }
 
 // src/version.ts
-var VERSION = "2.0.7";
+var VERSION = "2.0.8-canary.0";
 function getPackageVersion() {
   return VERSION;
 }