@omnicross/core 0.1.5 → 0.1.7

package/dist/{chunk-4XMYPW46.cjs → chunk-OXHNSZ53.cjs}

@@ -1,4 +1,8 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class;// src/transformer/transformers/AnthropicToolHandling.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class;
+
+var _chunk5RSZYQJHcjs = require('./chunk-5RSZYQJH.cjs');
+
+// src/transformer/transformers/AnthropicToolHandling.ts
 function isServerSideTool(tool) {
   const type = String(tool.type || "");
   return type.startsWith("web_search_") || type.startsWith("code_execution_") || type.startsWith("text_editor_") || type.startsWith("memory_") || type.startsWith("web_fetch_") || type.startsWith("search_tool_");
@@ -25,6 +29,40 @@ function formatBase64(data, mediaType) {
   if (data.startsWith("data:")) return data;
   return `data:${mediaType || "image/png"};base64,${data}`;
 }
+function flattenToolResultContent(content) {
+  if (typeof content === "string") return content;
+  if (content == null) return "";
+  if (!Array.isArray(content)) return JSON.stringify(content);
+  const parts = [];
+  for (const block of content) {
+    if (typeof block === "string") {
+      parts.push(block);
+      continue;
+    }
+    if (!block || typeof block !== "object") continue;
+    const typed = block;
+    if (typed.type === "image" || typed.type === "image_url") {
+      parts.push("[image omitted]");
+    } else if (typeof typed.text === "string") {
+      parts.push(typed.text);
+    }
+  }
+  return parts.filter((text) => text !== "").join("\n");
+}
+
+// src/anthropicMaxTokens.ts
+var _canonicalmodels = require('@omnicross/contracts/canonical-models');
+var ANTHROPIC_FALLBACK_MAX_TOKENS = 128e3;
+function resolveAnthropicMaxTokens(model, requested) {
+  if (typeof requested === "number" && Number.isFinite(requested) && requested > 0) {
+    return requested;
+  }
+  const canonical = model ? _optionalChain([_canonicalmodels.lookupCanonicalCapabilities.call(void 0, model), 'optionalAccess', _ => _.maxTokens]) : void 0;
+  if (typeof canonical === "number" && Number.isFinite(canonical) && canonical > 0) {
+    return canonical;
+  }
+  return ANTHROPIC_FALLBACK_MAX_TOKENS;
+}
 
 // src/transformer/transformers/AnthropicRequestBuilder.ts
 function buildAnthropicRequestBody(request) {
@@ -46,7 +84,7 @@ function buildAnthropicRequestBody(request) {
     }
     if (msg.role === "assistant") {
       const content = [];
-      if (_optionalChain([msg, 'access', _ => _.thinking, 'optionalAccess', _2 => _2.content])) {
+      if (_optionalChain([msg, 'access', _2 => _2.thinking, 'optionalAccess', _3 => _3.content])) {
         const block = {
           type: "thinking",
           thinking: msg.thinking.content
@@ -62,7 +100,7 @@ function buildAnthropicRequestBody(request) {
           content.push({ type: "text", text });
         }
       }
-      if (_optionalChain([msg, 'access', _3 => _3.tool_calls, 'optionalAccess', _4 => _4.length])) {
+      if (_optionalChain([msg, 'access', _4 => _4.tool_calls, 'optionalAccess', _5 => _5.length])) {
         for (const tc of msg.tool_calls) {
           let input;
           try {
@@ -129,7 +167,11 @@ function buildAnthropicRequestBody(request) {
   const body = {
     model: request.model,
     messages: anthropicMessages,
-    max_tokens: request.max_tokens || 4096,
+    // Anthropic requires this field, so an absent caller cap must resolve to
+    // the model's real ceiling — NOT a small constant, which would silently
+    // truncate long responses (and corrupt tool-call JSON mid-stream).
+    // See `resolveAnthropicMaxTokens`.
+    max_tokens: resolveAnthropicMaxTokens(request.model, request.max_tokens),
     stream: _nullishCoalesce(request.stream, () => ( false))
   };
   if (request.temperature !== void 0) {
@@ -138,7 +180,7 @@ function buildAnthropicRequestBody(request) {
   if (systemContent !== void 0) {
     body.system = systemContent;
   }
-  if (_optionalChain([request, 'access', _5 => _5.tools, 'optionalAccess', _6 => _6.length])) {
+  if (_optionalChain([request, 'access', _6 => _6.tools, 'optionalAccess', _7 => _7.length])) {
     body.tools = request.tools.map((tool) => ({
       name: tool.function.name,
       description: tool.function.description || "",
@@ -146,7 +188,7 @@ function buildAnthropicRequestBody(request) {
     }));
   }
   const serverSideTools = request._serverSideTools;
-  if (_optionalChain([serverSideTools, 'optionalAccess', _7 => _7.length])) {
+  if (_optionalChain([serverSideTools, 'optionalAccess', _8 => _8.length])) {
     body.tools = [...body.tools || [], ...serverSideTools];
   }
   if (request.tool_choice) {
@@ -160,7 +202,7 @@ function buildAnthropicRequestBody(request) {
       body.tool_choice = { type: "tool", name: request.tool_choice.function.name };
     }
   }
-  if (_optionalChain([request, 'access', _8 => _8.reasoning, 'optionalAccess', _9 => _9.enabled])) {
+  if (_optionalChain([request, 'access', _9 => _9.reasoning, 'optionalAccess', _10 => _10.enabled])) {
     const budgetMap = { low: 2048, medium: 8192, high: 32768 };
     const budget = request.reasoning.max_tokens || budgetMap[request.reasoning.effort || "medium"] || 8192;
     body.thinking = { type: "enabled", budget_tokens: budget };
@@ -178,7 +220,7 @@ function convertAnthropicResponseToOpenAI(anthropicResponse) {
   const searchResults = content.filter((c) => c.type === "web_search_tool_result");
   for (const sr of searchResults) {
     const searches = sr.content;
-    if (_optionalChain([searches, 'optionalAccess', _10 => _10.length])) {
+    if (_optionalChain([searches, 'optionalAccess', _11 => _11.length])) {
       const formatted = searches.map((s) => `[${s.title}](${s.url}): ${s.page_content || s.snippet || ""}`).join("\n");
       textParts.push(`
 
@@ -223,22 +265,20 @@ ${formatted}`);
       message,
       finish_reason: stopReasonMapping[anthropicResponse.stop_reason] || "stop"
     }],
-    usage: usage ? {
-      prompt_tokens: usage.input_tokens || 0,
-      completion_tokens: usage.output_tokens || 0,
-      total_tokens: (usage.input_tokens || 0) + (usage.output_tokens || 0)
-    } : void 0
+    // Preserve prompt-cache counts (cache-read → prompt_tokens_details.cached_tokens,
+    // cache-creation folded into prompt_tokens) instead of dropping them.
+    usage: _chunk5RSZYQJHcjs.anthropicUsageToChatUsage.call(void 0, usage)
   };
 }
 function convertOpenAIResponseToAnthropic(openaiResponse) {
-  const choice = _optionalChain([openaiResponse, 'access', _11 => _11.choices, 'optionalAccess', _12 => _12[0]]);
+  const choice = _optionalChain([openaiResponse, 'access', _12 => _12.choices, 'optionalAccess', _13 => _13[0]]);
   if (!choice) {
     throw new Error("No choices found in OpenAI response");
   }
   const message = choice.message;
   const content = [];
   const thinking = message.thinking;
-  if (_optionalChain([thinking, 'optionalAccess', _13 => _13.content])) {
+  if (_optionalChain([thinking, 'optionalAccess', _14 => _14.content])) {
     content.push({
       type: "thinking",
       thinking: thinking.content,
@@ -252,7 +292,7 @@ function convertOpenAIResponseToAnthropic(openaiResponse) {
     });
   }
   const toolCalls = message.tool_calls;
-  if (_optionalChain([toolCalls, 'optionalAccess', _14 => _14.length])) {
+  if (_optionalChain([toolCalls, 'optionalAccess', _15 => _15.length])) {
     for (const toolCall of toolCalls) {
       const func = toolCall.function;
       let parsedInput = {};
@@ -278,7 +318,7 @@ function convertOpenAIResponseToAnthropic(openaiResponse) {
     content_filter: "stop_sequence"
   };
   const usage = openaiResponse.usage;
-  const usageDetails = _optionalChain([usage, 'optionalAccess', _15 => _15.prompt_tokens_details]);
+  const usageDetails = _optionalChain([usage, 'optionalAccess', _16 => _16.prompt_tokens_details]);
   return {
     id: openaiResponse.id,
     type: "message",
@@ -288,9 +328,9 @@ function convertOpenAIResponseToAnthropic(openaiResponse) {
     stop_reason: stopReasonMapping[finishReason] || "end_turn",
     stop_sequence: null,
     usage: {
-      input_tokens: (_optionalChain([usage, 'optionalAccess', _16 => _16.prompt_tokens]) || 0) - (_optionalChain([usageDetails, 'optionalAccess', _17 => _17.cached_tokens]) || 0),
-      output_tokens: _optionalChain([usage, 'optionalAccess', _18 => _18.completion_tokens]) || 0,
-      cache_read_input_tokens: _optionalChain([usageDetails, 'optionalAccess', _19 => _19.cached_tokens]) || 0
+      input_tokens: (_optionalChain([usage, 'optionalAccess', _17 => _17.prompt_tokens]) || 0) - (_optionalChain([usageDetails, 'optionalAccess', _18 => _18.cached_tokens]) || 0),
+      output_tokens: _optionalChain([usage, 'optionalAccess', _19 => _19.completion_tokens]) || 0,
+      cache_read_input_tokens: _optionalChain([usageDetails, 'optionalAccess', _20 => _20.cached_tokens]) || 0
     }
   };
 }
@@ -337,7 +377,10 @@ function transformAnthropicRequestToUnified(request) {
         for (const tool of toolParts) {
           messages.push({
             role: "tool",
-            content: typeof tool.content === "string" ? tool.content : JSON.stringify(tool.content),
+            // Claude Code sends tool results as a block ARRAY; stringifying it
+            // fed the model the literal `[{"type":"text","text":"…"}]` envelope
+            // on every tool result.
+            content: flattenToolResultContent(tool.content),
             tool_call_id: tool.tool_use_id,
             cache_control: tool.cache_control
           });
@@ -393,7 +436,7 @@ function transformAnthropicRequestToUnified(request) {
         const thinkingPart = msg.content.find(
           (c) => c.type === "thinking"
         );
-        if (_optionalChain([thinkingPart, 'optionalAccess', _20 => _20.thinking])) {
+        if (_optionalChain([thinkingPart, 'optionalAccess', _21 => _21.thinking])) {
           assistantMessage.thinking = {
             content: thinkingPart.thinking,
             signature: thinkingPart.signature
@@ -412,7 +455,7 @@ function transformAnthropicRequestToUnified(request) {
     max_tokens: anthropicRequest.max_tokens,
     temperature: anthropicRequest.temperature,
     stream: anthropicRequest.stream,
-    tools: _optionalChain([functionTools, 'optionalAccess', _21 => _21.length]) ? functionTools : void 0
+    tools: _optionalChain([functionTools, 'optionalAccess', _22 => _22.length]) ? functionTools : void 0
   };
   if (serverSideTools.length > 0) {
     result._serverSideTools = serverSideTools;
@@ -537,7 +580,7 @@ function convertAnthropicStreamToOpenAI(anthropicStream, logger) {
 `);
                 } else if (event.content_block.type === "web_search_tool_result") {
                   const searches = event.content_block.content;
-                  if (_optionalChain([searches, 'optionalAccess', _22 => _22.length])) {
+                  if (_optionalChain([searches, 'optionalAccess', _23 => _23.length])) {
                     const formatted = searches.map((s) => `[${s.title}](${s.url}): ${s.page_content || s.snippet || ""}`).join("\n");
                     const chunk = {
                       id: messageId,
@@ -578,18 +621,14 @@ ${formatted}` },
                   }]
                 };
                 if (event.usage) {
-                  chunk.usage = {
-                    prompt_tokens: event.usage.input_tokens || 0,
-                    completion_tokens: event.usage.output_tokens || 0,
-                    total_tokens: (event.usage.input_tokens || 0) + (event.usage.output_tokens || 0)
-                  };
+                  chunk.usage = _chunk5RSZYQJHcjs.anthropicUsageToChatUsage.call(void 0, event.usage);
                 }
                 safeEnqueue(`data: ${JSON.stringify(chunk)}
 
 `);
               }
             } catch (e) {
-              _optionalChain([logger, 'optionalAccess', _23 => _23.error, 'call', _24 => _24("Error parsing Anthropic stream event:", e)]);
+              _optionalChain([logger, 'optionalAccess', _24 => _24.error, 'call', _25 => _25("Error parsing Anthropic stream event:", e)]);
             }
           }
         }
@@ -721,20 +760,20 @@ data: ${JSON.stringify({
 
 `);
               }
-              const choice = _optionalChain([chunk, 'access', _25 => _25.choices, 'optionalAccess', _26 => _26[0]]);
+              const choice = _optionalChain([chunk, 'access', _26 => _26.choices, 'optionalAccess', _27 => _27[0]]);
               if (!choice) continue;
               if (chunk.usage) {
                 stopReasonDelta = {
                   type: "message_delta",
                   delta: { stop_reason: "end_turn", stop_sequence: null },
                   usage: {
-                    input_tokens: (chunk.usage.prompt_tokens || 0) - (_optionalChain([chunk, 'access', _27 => _27.usage, 'access', _28 => _28.prompt_tokens_details, 'optionalAccess', _29 => _29.cached_tokens]) || 0),
+                    input_tokens: (chunk.usage.prompt_tokens || 0) - (_optionalChain([chunk, 'access', _28 => _28.usage, 'access', _29 => _29.prompt_tokens_details, 'optionalAccess', _30 => _30.cached_tokens]) || 0),
                     output_tokens: chunk.usage.completion_tokens || 0,
-                    cache_read_input_tokens: _optionalChain([chunk, 'access', _30 => _30.usage, 'access', _31 => _31.prompt_tokens_details, 'optionalAccess', _32 => _32.cached_tokens]) || 0
+                    cache_read_input_tokens: _optionalChain([chunk, 'access', _31 => _31.usage, 'access', _32 => _32.prompt_tokens_details, 'optionalAccess', _33 => _33.cached_tokens]) || 0
                   }
                 };
               }
-              if (_optionalChain([choice, 'access', _33 => _33.delta, 'optionalAccess', _34 => _34.thinking])) {
+              if (_optionalChain([choice, 'access', _34 => _34.delta, 'optionalAccess', _35 => _35.thinking])) {
                 if (!isThinkingStarted) {
                   const thinkingBlockIndex = assignContentBlockIndex();
                   safeEnqueue(`event: content_block_start
@@ -776,7 +815,7 @@ data: ${JSON.stringify({
 `);
                 }
               }
-              if (_optionalChain([choice, 'access', _35 => _35.delta, 'optionalAccess', _36 => _36.content])) {
+              if (_optionalChain([choice, 'access', _36 => _36.delta, 'optionalAccess', _37 => _37.content])) {
                 if (!hasTextContentStarted) {
                   if (currentContentBlockIndex >= 0 && isThinkingStarted) {
                     safeEnqueue(`event: content_block_stop
@@ -808,7 +847,7 @@ data: ${JSON.stringify({
 
 `);
               }
-              if (_optionalChain([choice, 'access', _37 => _37.delta, 'optionalAccess', _38 => _38.tool_calls])) {
+              if (_optionalChain([choice, 'access', _38 => _38.delta, 'optionalAccess', _39 => _39.tool_calls])) {
                 for (const toolCall of choice.delta.tool_calls) {
                   const toolCallIndex = _nullishCoalesce(toolCall.index, () => ( 0));
                   if (!toolCallIndexToContentBlockIndex.has(toolCallIndex)) {
@@ -831,7 +870,7 @@ data: ${JSON.stringify({
                       content_block: {
                         type: "tool_use",
                         id: toolCall.id || `call_${Date.now()}_${toolCallIndex}`,
-                        name: _optionalChain([toolCall, 'access', _39 => _39.function, 'optionalAccess', _40 => _40.name]) || `tool_${toolCallIndex}`,
+                        name: _optionalChain([toolCall, 'access', _40 => _40.function, 'optionalAccess', _41 => _41.name]) || `tool_${toolCallIndex}`,
                         input: {}
                       }
                     })}
@@ -839,7 +878,7 @@ data: ${JSON.stringify({
 `);
                     currentContentBlockIndex = newBlockIndex;
                   }
-                  if (_optionalChain([toolCall, 'access', _41 => _41.function, 'optionalAccess', _42 => _42.arguments])) {
+                  if (_optionalChain([toolCall, 'access', _42 => _42.function, 'optionalAccess', _43 => _43.arguments])) {
                     const blockIndex = toolCallIndexToContentBlockIndex.get(toolCallIndex);
                     if (blockIndex !== void 0) {
                       safeEnqueue(`event: content_block_delta
@@ -868,14 +907,14 @@ data: ${JSON.stringify({
                     stop_sequence: null
                   },
                   usage: {
-                    input_tokens: (_optionalChain([chunk, 'access', _43 => _43.usage, 'optionalAccess', _44 => _44.prompt_tokens]) || 0) - (_optionalChain([chunk, 'access', _45 => _45.usage, 'optionalAccess', _46 => _46.prompt_tokens_details, 'optionalAccess', _47 => _47.cached_tokens]) || 0),
-                    output_tokens: _optionalChain([chunk, 'access', _48 => _48.usage, 'optionalAccess', _49 => _49.completion_tokens]) || 0,
-                    cache_read_input_tokens: _optionalChain([chunk, 'access', _50 => _50.usage, 'optionalAccess', _51 => _51.prompt_tokens_details, 'optionalAccess', _52 => _52.cached_tokens]) || 0
+                    input_tokens: (_optionalChain([chunk, 'access', _44 => _44.usage, 'optionalAccess', _45 => _45.prompt_tokens]) || 0) - (_optionalChain([chunk, 'access', _46 => _46.usage, 'optionalAccess', _47 => _47.prompt_tokens_details, 'optionalAccess', _48 => _48.cached_tokens]) || 0),
+                    output_tokens: _optionalChain([chunk, 'access', _49 => _49.usage, 'optionalAccess', _50 => _50.completion_tokens]) || 0,
+                    cache_read_input_tokens: _optionalChain([chunk, 'access', _51 => _51.usage, 'optionalAccess', _52 => _52.prompt_tokens_details, 'optionalAccess', _53 => _53.cached_tokens]) || 0
                   }
                 };
               }
             } catch (e) {
-              _optionalChain([logger, 'optionalAccess', _53 => _53.error, 'call', _54 => _54("Error parsing stream chunk:", e)]);
+              _optionalChain([logger, 'optionalAccess', _54 => _54.error, 'call', _55 => _55("Error parsing stream chunk:", e)]);
             }
           }
         }
@@ -899,7 +938,7 @@ var AnthropicTransformer = (_class = class {
   __init2() {this.endPoint = "/v1/messages"}
   
   constructor(options) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);
-    this.useBearer = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _55 => _55.UseBearer]), () => ( false));
+    this.useBearer = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _56 => _56.UseBearer]), () => ( false));
   }
   /**
    * Handle authentication - Anthropic uses x-api-key header
@@ -988,4 +1027,5 @@ var AnthropicTransformer = (_class = class {
 
 
 
-exports.AnthropicTransformer = AnthropicTransformer;
+
+exports.resolveAnthropicMaxTokens = resolveAnthropicMaxTokens; exports.AnthropicTransformer = AnthropicTransformer;

package/dist/{chunk-C6OV7GCC.js → chunk-PEGTIPB3.js}

@@ -1,3 +1,7 @@
+import {
+  anthropicUsageToChatUsage
+} from "./chunk-FU7EAR73.js";
+
 // src/transformer/transformers/AnthropicToolHandling.ts
 function isServerSideTool(tool) {
   const type = String(tool.type || "");
@@ -25,6 +29,40 @@ function formatBase64(data, mediaType) {
   if (data.startsWith("data:")) return data;
   return `data:${mediaType || "image/png"};base64,${data}`;
 }
+function flattenToolResultContent(content) {
+  if (typeof content === "string") return content;
+  if (content == null) return "";
+  if (!Array.isArray(content)) return JSON.stringify(content);
+  const parts = [];
+  for (const block of content) {
+    if (typeof block === "string") {
+      parts.push(block);
+      continue;
+    }
+    if (!block || typeof block !== "object") continue;
+    const typed = block;
+    if (typed.type === "image" || typed.type === "image_url") {
+      parts.push("[image omitted]");
+    } else if (typeof typed.text === "string") {
+      parts.push(typed.text);
+    }
+  }
+  return parts.filter((text) => text !== "").join("\n");
+}
+
+// src/anthropicMaxTokens.ts
+import { lookupCanonicalCapabilities } from "@omnicross/contracts/canonical-models";
+var ANTHROPIC_FALLBACK_MAX_TOKENS = 128e3;
+function resolveAnthropicMaxTokens(model, requested) {
+  if (typeof requested === "number" && Number.isFinite(requested) && requested > 0) {
+    return requested;
+  }
+  const canonical = model ? lookupCanonicalCapabilities(model)?.maxTokens : void 0;
+  if (typeof canonical === "number" && Number.isFinite(canonical) && canonical > 0) {
+    return canonical;
+  }
+  return ANTHROPIC_FALLBACK_MAX_TOKENS;
+}
 
 // src/transformer/transformers/AnthropicRequestBuilder.ts
 function buildAnthropicRequestBody(request) {
@@ -129,7 +167,11 @@ function buildAnthropicRequestBody(request) {
   const body = {
     model: request.model,
     messages: anthropicMessages,
-    max_tokens: request.max_tokens || 4096,
+    // Anthropic requires this field, so an absent caller cap must resolve to
+    // the model's real ceiling — NOT a small constant, which would silently
+    // truncate long responses (and corrupt tool-call JSON mid-stream).
+    // See `resolveAnthropicMaxTokens`.
+    max_tokens: resolveAnthropicMaxTokens(request.model, request.max_tokens),
     stream: request.stream ?? false
   };
   if (request.temperature !== void 0) {
@@ -223,11 +265,9 @@ ${formatted}`);
       message,
       finish_reason: stopReasonMapping[anthropicResponse.stop_reason] || "stop"
     }],
-    usage: usage ? {
-      prompt_tokens: usage.input_tokens || 0,
-      completion_tokens: usage.output_tokens || 0,
-      total_tokens: (usage.input_tokens || 0) + (usage.output_tokens || 0)
-    } : void 0
+    // Preserve prompt-cache counts (cache-read → prompt_tokens_details.cached_tokens,
+    // cache-creation folded into prompt_tokens) instead of dropping them.
+    usage: anthropicUsageToChatUsage(usage)
   };
 }
 function convertOpenAIResponseToAnthropic(openaiResponse) {
@@ -337,7 +377,10 @@ function transformAnthropicRequestToUnified(request) {
         for (const tool of toolParts) {
           messages.push({
             role: "tool",
-            content: typeof tool.content === "string" ? tool.content : JSON.stringify(tool.content),
+            // Claude Code sends tool results as a block ARRAY; stringifying it
+            // fed the model the literal `[{"type":"text","text":"…"}]` envelope
+            // on every tool result.
+            content: flattenToolResultContent(tool.content),
             tool_call_id: tool.tool_use_id,
             cache_control: tool.cache_control
           });
@@ -578,11 +621,7 @@ ${formatted}` },
                   }]
                 };
                 if (event.usage) {
-                  chunk.usage = {
-                    prompt_tokens: event.usage.input_tokens || 0,
-                    completion_tokens: event.usage.output_tokens || 0,
-                    total_tokens: (event.usage.input_tokens || 0) + (event.usage.output_tokens || 0)
-                  };
+                  chunk.usage = anthropicUsageToChatUsage(event.usage);
                 }
                 safeEnqueue(`data: ${JSON.stringify(chunk)}
 
@@ -987,5 +1026,6 @@ var AnthropicTransformer = class {
 };
 
 export {
+  resolveAnthropicMaxTokens,
   AnthropicTransformer
 };

package/dist/chunk-PO3XB56Z.js

@@ -0,0 +1,79 @@
+// src/pipeline/ServerOverloadCounter.ts
+var OVERLOAD_RECENT_LIMIT = 64;
+var OVERLOAD_ENTRY_TTL_MS = 24 * 60 * 6e4;
+function entryKey(providerId, accountId, endpoint) {
+  return `${providerId}\0${accountId}\0${endpoint}`;
+}
+var ServerOverloadCounterStore = class {
+  entries = /* @__PURE__ */ new Map();
+  /**
+   * Record one overload event. Creates the entry on first sight, then bumps
+   * `count`, `lastTs`, and prepends the event to the bounded `recent` ring.
+   */
+  recordOverload(input, now = Date.now()) {
+    const key = entryKey(input.providerId, input.accountId, input.endpoint);
+    const existing = this.entries.get(key);
+    if (existing) {
+      existing.count += 1;
+      existing.lastTs = now;
+      existing.recent.unshift(now);
+      if (existing.recent.length > OVERLOAD_RECENT_LIMIT) {
+        existing.recent.length = OVERLOAD_RECENT_LIMIT;
+      }
+      return { ...existing, recent: [...existing.recent] };
+    }
+    const entry = {
+      providerId: input.providerId,
+      accountId: input.accountId,
+      endpoint: input.endpoint,
+      count: 1,
+      firstTs: now,
+      lastTs: now,
+      recent: [now]
+    };
+    this.entries.set(key, entry);
+    return { ...entry, recent: [...entry.recent] };
+  }
+  /**
+   * Snapshot all (optionally filtered) entries, pruning stale ones first. Returns
+   * copies — callers (admin API → JSON) never see the live mutable entries.
+   */
+  list(query = {}, now = Date.now()) {
+    const providerId = query.providerId?.trim();
+    const accountId = query.accountId?.trim();
+    const out = [];
+    for (const [key, entry] of this.entries) {
+      if (now - entry.lastTs > OVERLOAD_ENTRY_TTL_MS) {
+        this.entries.delete(key);
+        continue;
+      }
+      if (providerId && entry.providerId !== providerId) continue;
+      if (accountId && entry.accountId !== accountId) continue;
+      out.push({ ...entry, recent: [...entry.recent] });
+    }
+    return out;
+  }
+  clear() {
+    this.entries.clear();
+  }
+};
+var sharedStore = null;
+function getSharedOverloadCounter() {
+  if (!sharedStore) sharedStore = new ServerOverloadCounterStore();
+  return sharedStore;
+}
+function setSharedOverloadCounter(instance) {
+  sharedStore = instance;
+}
+function __resetSharedOverloadCounterForTests() {
+  sharedStore = null;
+}
+
+export {
+  OVERLOAD_RECENT_LIMIT,
+  OVERLOAD_ENTRY_TTL_MS,
+  ServerOverloadCounterStore,
+  getSharedOverloadCounter,
+  setSharedOverloadCounter,
+  __resetSharedOverloadCounterForTests
+};

package/dist/{chunk-D3TDKWRP.js → chunk-RJ5ZGNI3.js}

@@ -1,8 +1,15 @@
 import {
+  REDACTED_BODY,
   getUpstreamTracePath,
   redactHeaders,
   writeUpstreamTrace
-} from "./chunk-SYQF7OIR.js";
+} from "./chunk-3WD4HTR2.js";
+import {
+  getSharedAccountAllowanceStore
+} from "./chunk-MKF46GNZ.js";
+import {
+  getSharedAccountRouteActivity
+} from "./chunk-GL6XM527.js";
 
 // src/pipeline/upstreamFetch.ts
 import { Agent, buildConnector, ProxyAgent } from "undici";
@@ -102,17 +109,57 @@ function resolveUpstreamDispatcher(ctx) {
 function fetchUpstream(url, init, ctx) {
   const dispatcher = resolveUpstreamDispatcher({ ...ctx ?? {}, url });
   const doFetch = dispatcher ? () => fetch(url, { ...init, dispatcher }) : () => fetch(url, init);
+  const doFetchWithAllowanceTap = () => doFetch().then((response) => {
+    if (ctx?.providerId === "codex" && ctx.accountId) {
+      try {
+        getSharedAccountAllowanceStore().recordCodexHeaders(ctx.accountId, response.headers);
+      } catch {
+      }
+    }
+    return response;
+  });
+  const activity = ctx?.routeActivity;
+  const activityStartedAt = activity && ctx?.providerId && ctx.accountId ? Date.now() : 0;
+  const recordActivity = (status) => {
+    if (!activity || !ctx?.providerId || !ctx.accountId) return;
+    const record = getSharedAccountRouteActivity().record({
+      providerId: ctx.providerId,
+      accountId: ctx.accountId,
+      endpoint: activity.endpoint,
+      sessionKey: activity.sessionKey,
+      sessionSource: activity.sessionSource,
+      model: activity.model,
+      status,
+      durationMs: Math.max(0, Date.now() - activityStartedAt),
+      ts: activityStartedAt
+    });
+    try {
+      activity.onRecorded?.(record);
+    } catch {
+    }
+  };
+  const doFetchWithActivity = () => doFetchWithAllowanceTap().then(
+    (response) => {
+      recordActivity(response.status);
+      return response;
+    },
+    (error) => {
+      recordActivity(0);
+      throw error;
+    }
+  );
   const tracePath = getUpstreamTracePath();
-  if (!tracePath || !ctx?.providerId) return doFetch();
+  if (!tracePath || !ctx?.providerId) return doFetchWithActivity();
   const startedAt = Date.now();
   const method = typeof init.method === "string" ? init.method : "GET";
   const requestHeaders = redactHeaders(
     init.headers
   );
-  const requestBody = typeof init.body === "string" ? init.body : null;
+  const redactBodies = ctx.redactBodies === true;
+  const requestBody = redactBodies ? REDACTED_BODY : typeof init.body === "string" ? init.body : null;
   const providerId = ctx.providerId;
   const accountId = ctx.accountId;
-  return doFetch().then((res) => {
+  return doFetchWithActivity().then((res) => {
     const clone = res.clone();
     const status = res.status;
     const statusText = res.statusText;
@@ -130,7 +177,9 @@ function fetchUpstream(url, init, ctx) {
         status,
         statusText,
         responseHeaders,
-        responseBody: body,
+        // The byte count stays REAL even when redacted — it is a useful
+        // diagnostic and reveals nothing about the token itself.
+        responseBody: redactBodies ? REDACTED_BODY : body,
         responseBytes: Buffer.byteLength(body, "utf8")
       });
     }).catch(() => {