@omnicross/core 0.1.4 → 0.1.5

package/dist/{chunk-TIER4SUC.js → chunk-BODMAL6G.js}

@@ -45,10 +45,12 @@ var OpenAIResponseTransformer = class {
         if (msg.role === "assistant" && msg.tool_calls?.length) {
           input.push(entry);
           for (const tc of msg.tool_calls) {
+            const callId = tc.id;
+            const itemId = callId.startsWith("fc_") ? callId : `fc_${callId.replace(/^(call_|fc_)/, "")}`;
             input.push({
               type: "function_call",
-              id: tc.id,
-              call_id: tc.id,
+              id: itemId,
+              call_id: callId,
               name: tc.function.name,
               arguments: tc.function.arguments
             });
@@ -61,7 +63,11 @@ var OpenAIResponseTransformer = class {
     const body = {
       model: request.model,
       input,
-      stream: request.stream ?? false,
+      // codex's backend REQUIRES `stream:true` (it 400s with "Stream must be
+      // set to true" otherwise). Always force it; a non-streaming CLIENT is
+      // served by aggregating the SSE upstream of the wire (the ingress buffers
+      // it into a single message), not by asking codex for a non-streaming reply.
+      stream: true,
       // `store:false` is required by the codex backend and accepted by the
       // public Responses API (which defaults to store:true). Always set it so
       // codex relays (no discoverable url token) work without configuration.
@@ -335,6 +341,7 @@ function convertResponseApiStreamToOpenAI(responseApiStream) {
       const messageId = `chatcmpl-${Date.now()}`;
       let model = "unknown";
       let hasEmittedRole = false;
+      let hasToolCalls = false;
       const safeEnqueue = (str) => {
         if (!isClosed) {
           try {
@@ -391,6 +398,42 @@ function convertResponseApiStreamToOpenAI(responseApiStream) {
                     }]);
                   }
                   break;
+                case "response.output_item.added": {
+                  const item = event.item;
+                  if (item?.type !== "function_call") break;
+                  if (!hasEmittedRole) {
+                    emitChunk([{ index: 0, delta: { role: "assistant", content: null }, finish_reason: null }]);
+                    hasEmittedRole = true;
+                  }
+                  hasToolCalls = true;
+                  emitChunk([{
+                    index: 0,
+                    delta: {
+                      tool_calls: [{
+                        index: event.output_index ?? 0,
+                        id: item.call_id,
+                        type: "function",
+                        function: { name: item.name, arguments: "" }
+                      }]
+                    },
+                    finish_reason: null
+                  }]);
+                  break;
+                }
+                case "response.function_call_arguments.delta": {
+                  hasToolCalls = true;
+                  emitChunk([{
+                    index: 0,
+                    delta: {
+                      tool_calls: [{
+                        index: event.output_index ?? 0,
+                        function: { arguments: event.delta ?? "" }
+                      }]
+                    },
+                    finish_reason: null
+                  }]);
+                  break;
+                }
                 case "response.completed": {
                   const resp = event.response;
                   const respUsage = resp?.usage;
@@ -399,7 +442,7 @@ function convertResponseApiStreamToOpenAI(responseApiStream) {
                     completion_tokens: respUsage.output_tokens || 0,
                     total_tokens: (respUsage.input_tokens || 0) + (respUsage.output_tokens || 0)
                   } : void 0;
-                  emitChunk([{ index: 0, delta: {}, finish_reason: "stop" }], usage);
+                  emitChunk([{ index: 0, delta: {}, finish_reason: hasToolCalls ? "tool_calls" : "stop" }], usage);
                   safeEnqueue("data: [DONE]\n\n");
                   break;
                 }
@@ -442,6 +485,9 @@ function convertOpenAIStreamToResponseApi(openaiStream) {
       let accumulatedContent = "";
       let model = "unknown";
       const responseId = `resp_${Date.now()}`;
+      const toolCalls = /* @__PURE__ */ new Map();
+      const toolOutputIndex = /* @__PURE__ */ new Map();
+      let nextOutputIndex = 1;
       const safeEnqueue = (str) => {
         if (!isClosed) {
           try {
@@ -487,21 +533,83 @@ function convertOpenAIStreamToResponseApi(openaiStream) {
                   delta: choice.delta.thinking.content
                 });
               }
+              if (choice.delta?.tool_calls) {
+                for (const tc of choice.delta.tool_calls) {
+                  const tcIndex = typeof tc["index"] === "number" ? tc["index"] : 0;
+                  const func = tc["function"] ?? {};
+                  let entry = toolCalls.get(tcIndex);
+                  if (!entry) {
+                    const callId = typeof tc["id"] === "string" ? tc["id"] : `call_${Date.now()}_${tcIndex}`;
+                    const name = typeof func["name"] === "string" ? func["name"] : "";
+                    entry = { callId, name, arguments: "" };
+                    toolCalls.set(tcIndex, entry);
+                    const outIdx = nextOutputIndex++;
+                    toolOutputIndex.set(tcIndex, outIdx);
+                    const itemId = callId.startsWith("fc_") ? callId : `fc_${callId.replace(/^(call_|fc_)/, "")}`;
+                    emitEvent({
+                      type: "response.output_item.added",
+                      output_index: outIdx,
+                      item: {
+                        id: itemId,
+                        type: "function_call",
+                        status: "in_progress",
+                        call_id: callId,
+                        name,
+                        arguments: ""
+                      }
+                    });
+                  }
+                  const argsFragment = typeof func["arguments"] === "string" ? func["arguments"] : "";
+                  if (argsFragment) {
+                    entry.arguments += argsFragment;
+                    emitEvent({
+                      type: "response.function_call_arguments.delta",
+                      output_index: toolOutputIndex.get(tcIndex),
+                      delta: argsFragment
+                    });
+                  }
+                }
+              }
               if (choice.finish_reason) {
                 emitEvent({ type: "response.output_text.done", text: accumulatedContent });
+                const output = [];
+                if (accumulatedContent) {
+                  output.push({
+                    type: "message",
+                    role: "assistant",
+                    content: [{ type: "output_text", text: accumulatedContent }]
+                  });
+                }
+                for (const [tcIndex, entry] of toolCalls) {
+                  const itemId = entry.callId.startsWith("fc_") ? entry.callId : `fc_${entry.callId.replace(/^(call_|fc_)/, "")}`;
+                  output.push({
+                    id: itemId,
+                    type: "function_call",
+                    status: "completed",
+                    call_id: entry.callId,
+                    name: entry.name,
+                    arguments: entry.arguments
+                  });
+                  emitEvent({
+                    type: "response.output_item.done",
+                    output_index: toolOutputIndex.get(tcIndex),
+                    item: {
+                      id: itemId,
+                      type: "function_call",
+                      status: "completed",
+                      call_id: entry.callId,
+                      name: entry.name,
+                      arguments: entry.arguments
+                    }
+                  });
+                }
                 emitEvent({
                   type: "response.completed",
                   response: {
                     id: responseId,
                     status: "completed",
                     model,
-                    output: [
-                      {
-                        type: "message",
-                        role: "assistant",
-                        content: [{ type: "output_text", text: accumulatedContent }]
-                      }
-                    ],
+                    output,
                     usage: chunk.usage ? {
                       input_tokens: chunk.usage.prompt_tokens || 0,
                       output_tokens: chunk.usage.completion_tokens || 0,

package/dist/{chunk-DKPXN34V.cjs → chunk-CGKLE6IW.cjs}

@@ -3,16 +3,16 @@
 var _chunkHQP3K7PUcjs = require('./chunk-HQP3K7PU.cjs');
 
 
-var _chunk4VAVYUZScjs = require('./chunk-4VAVYUZS.cjs');
+var _chunk46ZIFWYGcjs = require('./chunk-46ZIFWYG.cjs');
 
 
-var _chunk7YN22L2Hcjs = require('./chunk-7YN22L2H.cjs');
+var _chunk4XMYPW46cjs = require('./chunk-4XMYPW46.cjs');
 
 
-var _chunkSU2GCLACcjs = require('./chunk-SU2GCLAC.cjs');
+var _chunkK52THW2Ccjs = require('./chunk-K52THW2C.cjs');
 
 
-var _chunk46ZIFWYGcjs = require('./chunk-46ZIFWYG.cjs');
+var _chunk3Q6Z6JTOcjs = require('./chunk-3Q6Z6JTO.cjs');
 
 
 var _chunkGBHYAGX3cjs = require('./chunk-GBHYAGX3.cjs');
@@ -80,14 +80,14 @@ var _chunkVACWOIREcjs = require('./chunk-VACWOIRE.cjs');
 var _chunkA2YMUCBTcjs = require('./chunk-A2YMUCBT.cjs');
 
 
-var _chunkE3UCVHLPcjs = require('./chunk-E3UCVHLP.cjs');
+var _chunkUNWKG6EIcjs = require('./chunk-UNWKG6EI.cjs');
 
 
 
 var _chunkSUEGJ75Dcjs = require('./chunk-SUEGJ75D.cjs');
 
 
-var _chunkOCEUVQHWcjs = require('./chunk-OCEUVQHW.cjs');
+var _chunkPG7PS2NNcjs = require('./chunk-PG7PS2NN.cjs');
 
 
 var _chunkJMJBSACDcjs = require('./chunk-JMJBSACD.cjs');
@@ -517,17 +517,17 @@ function getSharedExecutor() {
 }
 var sharedResponses = null;
 function getResponsesEndpointTransformer() {
-  if (!sharedResponses) sharedResponses = new (0, _chunkSU2GCLACcjs.OpenAIResponseTransformer)();
+  if (!sharedResponses) sharedResponses = new (0, _chunk3Q6Z6JTOcjs.OpenAIResponseTransformer)();
   return sharedResponses;
 }
 var sharedAnthropic = null;
 function getAnthropicEndpointTransformer() {
-  if (!sharedAnthropic) sharedAnthropic = new (0, _chunk4VAVYUZScjs.AnthropicTransformer)();
+  if (!sharedAnthropic) sharedAnthropic = new (0, _chunk4XMYPW46cjs.AnthropicTransformer)();
   return sharedAnthropic;
 }
 var sharedGemini = null;
 function getGeminiEndpointTransformer() {
-  if (!sharedGemini) sharedGemini = new (0, _chunk7YN22L2Hcjs.GeminiTransformer)();
+  if (!sharedGemini) sharedGemini = new (0, _chunkK52THW2Ccjs.GeminiTransformer)();
   return sharedGemini;
 }
 function readBody(req) {
@@ -651,6 +651,95 @@ async function relayResponse(res, providerResponse, isStream, rewriteModel) {
   res.end(clientText);
   return bodyText;
 }
+async function aggregateAnthropicSseToJsonBody(response, rewriteModel) {
+  const text = await response.text();
+  const message = {
+    type: "message",
+    role: "assistant",
+    content: [],
+    stop_reason: null,
+    stop_sequence: null,
+    usage: {}
+  };
+  const blocks = /* @__PURE__ */ new Map();
+  for (const raw of text.split("\n")) {
+    const line = raw.trim();
+    if (!line.startsWith("data:")) continue;
+    const payload = line.slice(5).trim();
+    if (!payload || payload === "[DONE]") continue;
+    let ev;
+    try {
+      ev = JSON.parse(payload);
+    } catch (e7) {
+      continue;
+    }
+    switch (ev["type"]) {
+      case "message_start": {
+        const m = _nullishCoalesce(ev["message"], () => ( {}));
+        if (typeof m["id"] === "string") message["id"] = m["id"];
+        if (typeof m["model"] === "string") message["model"] = m["model"];
+        if (m["usage"]) message["usage"] = { ...m["usage"] };
+        break;
+      }
+      case "content_block_start": {
+        const idx = Number(ev["index"]);
+        const cb = _nullishCoalesce(ev["content_block"], () => ( {}));
+        blocks.set(idx, {
+          type: typeof cb["type"] === "string" ? cb["type"] : "text",
+          text: typeof cb["text"] === "string" ? cb["text"] : "",
+          id: typeof cb["id"] === "string" ? cb["id"] : void 0,
+          name: typeof cb["name"] === "string" ? cb["name"] : void 0,
+          inputJson: ""
+        });
+        break;
+      }
+      case "content_block_delta": {
+        const b = blocks.get(Number(ev["index"]));
+        if (!b) break;
+        const d = _nullishCoalesce(ev["delta"], () => ( {}));
+        if (d["type"] === "text_delta" && typeof d["text"] === "string") b.text += d["text"];
+        else if (d["type"] === "input_json_delta" && typeof d["partial_json"] === "string")
+          b.inputJson += d["partial_json"];
+        else if (d["type"] === "thinking_delta" && typeof d["thinking"] === "string")
+          b.text += d["thinking"];
+        else if (d["type"] === "signature_delta" && typeof d["signature"] === "string")
+          b.signature = (b.signature || "") + d["signature"];
+        break;
+      }
+      case "message_delta": {
+        const d = _nullishCoalesce(ev["delta"], () => ( {}));
+        if (d["stop_reason"] !== void 0) message["stop_reason"] = d["stop_reason"];
+        if (d["stop_sequence"] !== void 0) message["stop_sequence"] = d["stop_sequence"];
+        if (ev["usage"])
+          message["usage"] = { ...message["usage"], ...ev["usage"] };
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  message["content"] = [...blocks.keys()].sort((a, b) => a - b).map((idx) => {
+    const blk = blocks.get(idx);
+    if (!blk) return void 0;
+    if (blk.type === "tool_use") {
+      let input = {};
+      try {
+        input = blk.inputJson ? JSON.parse(blk.inputJson) : {};
+      } catch (e8) {
+        input = {};
+      }
+      return { type: "tool_use", id: _nullishCoalesce(blk.id, () => ( "")), name: _nullishCoalesce(blk.name, () => ( "")), input };
+    }
+    if (blk.type === "thinking") {
+      const out = { type: "thinking", thinking: blk.text };
+      if (blk.signature) out.signature = blk.signature;
+      return out;
+    }
+    return { type: blk.type || "text", text: blk.text };
+  }).filter((b) => b !== void 0);
+  if (rewriteModel) message["model"] = rewriteModel;
+  return JSON.stringify(message);
+}
 function writeError(res, status, message) {
   if (res.headersSent) return;
   res.writeHead(status, { "Content-Type": "application/json" });
@@ -816,7 +905,7 @@ async function runPipeline(anthropicBody, plan, reportSelection) {
     },
     fetchFn: (url, headers, body) => {
       console.info(`[ProviderProxy:anthropic] -> ${url} model=${resolvedModel} stream=${isStream}`);
-      return _chunkOCEUVQHWcjs.fetchUpstream.call(void 0, 
+      return _chunkPG7PS2NNcjs.fetchUpstream.call(void 0, 
         url,
         { method: "POST", headers, body: JSON.stringify(body) },
         { providerId: proxyProviderId(plan), accountId: proxyAccountId }
@@ -859,7 +948,7 @@ async function runSubscriptionSameFormatFetch(rawBody, plan, reportSelection, op
   console.info(
     `[ProviderProxy:anthropic] (subscription same-format) -> ${plan.upstreamUrl} model=${outboundModel} stream=${plan.isStream}`
   );
-  const response = await _chunkOCEUVQHWcjs.fetchUpstream.call(void 0, 
+  const response = await _chunkPG7PS2NNcjs.fetchUpstream.call(void 0, 
     plan.upstreamUrl,
     { method: "POST", headers, body: outboundBody },
     { providerId: proxyProviderId(plan), accountId: proxyAccountId }
@@ -875,7 +964,7 @@ function rewriteBodyModel(rawBody, model) {
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return rawBody;
     parsed.model = model;
     return JSON.stringify(parsed);
-  } catch (e7) {
+  } catch (e9) {
     return rawBody;
   }
 }
@@ -903,7 +992,7 @@ async function readBoundedBody(response, max = 2048) {
   try {
     const text = await response.clone().text();
     return text.slice(0, max);
-  } catch (e8) {
+  } catch (e10) {
     return void 0;
   }
 }
@@ -1014,7 +1103,7 @@ async function handleAnthropicMessagesByo(res, rawBody, route, deps, options = {
   let anthropicBody;
   try {
     anthropicBody = JSON.parse(rawBody);
-  } catch (e9) {
+  } catch (e11) {
     writeError(res, 400, "Invalid JSON in request body");
     return;
   }
@@ -1026,7 +1115,21 @@ async function handleAnthropicMessagesByo(res, rawBody, route, deps, options = {
     if (!plan) return;
     anthropicBody.model = plan.resolvedModel;
     const providerResponse = route.authMode === "subscription" ? await runPipelineWithSubscriptionRetry(anthropicBody, rawBody, plan, route, deps, options) : await runPipelineWithPoolReporting(anthropicBody, rawBody, plan, options);
-    const bodyText = await relayResponse(res, providerResponse.response, isStream, route.requestedModel);
+    const upstreamResponse = providerResponse.response;
+    const upstreamSse = (_nullishCoalesce(upstreamResponse.headers.get("content-type"), () => ( ""))).includes(
+      "text/event-stream"
+    );
+    let bodyText;
+    if (!isStream && upstreamSse) {
+      bodyText = await aggregateAnthropicSseToJsonBody(upstreamResponse, route.requestedModel);
+      res.writeHead(
+        upstreamResponse.status && upstreamResponse.status >= 100 ? upstreamResponse.status : 200,
+        { "Content-Type": "application/json" }
+      );
+      res.end(bodyText);
+    } else {
+      bodyText = await relayResponse(res, upstreamResponse, isStream, route.requestedModel);
+    }
     if (bodyText && deps.usageRecorder) {
       recordAnthropicNonStreamUsage(deps.usageRecorder, bodyText, {
         sessionId: route.sessionId,
@@ -1111,7 +1214,7 @@ async function runSameFormatFetch(bodyToSend, plan, options, keyOverride) {
   _chunkGBHYAGX3cjs.injectExtendedContextBeta.call(void 0, headers, resolvedModel, _nullishCoalesce(extendedContextEnabled, () => ( false)));
   const url = _chunkA2YMUCBTcjs.buildProviderApiUrl.call(void 0, provider, { model: resolvedModel, stream: isStream });
   console.info(`[ProviderProxy:anthropic] (same-format) -> ${url} model=${resolvedModel} stream=${isStream}`);
-  const response = await _chunkOCEUVQHWcjs.fetchUpstream.call(void 0, 
+  const response = await _chunkPG7PS2NNcjs.fetchUpstream.call(void 0, 
     url,
     { method: "POST", headers, body: bodyToSend },
     { providerId: "byo" }
@@ -1123,7 +1226,7 @@ function resolveSameFormatBody(anthropicBody, rawBody, plan) {
   try {
     const m = JSON.parse(rawBody).model;
     originalModel = typeof m === "string" ? m : void 0;
-  } catch (e10) {
+  } catch (e12) {
     originalModel = void 0;
   }
   return plan.resolvedModel !== originalModel ? JSON.stringify(anthropicBody) : rawBody;
@@ -1223,7 +1326,7 @@ function recordGeminiNonStreamUsage(recorder, bodyText, attribution) {
       usage: tapped,
       rawUsage: parsed.usageMetadata
     });
-  } catch (e11) {
+  } catch (e13) {
   }
 }
 
@@ -1247,7 +1350,7 @@ async function handleGeminiGenerateContentRequest(res, rawBody, url, route, deps
   let geminiBody;
   try {
     geminiBody = JSON.parse(rawBody);
-  } catch (e12) {
+  } catch (e14) {
     writeError(res, 400, "Invalid JSON in request body");
     return;
   }
@@ -1346,7 +1449,7 @@ async function runPipeline2(geminiBody, plan) {
     },
     fetchFn: (url, headers, body) => {
       console.log(`[ProviderProxy:gemini] -> ${url} model=${resolvedModel} stream=${isStream}`);
-      return _chunkOCEUVQHWcjs.fetchUpstream.call(void 0, 
+      return _chunkPG7PS2NNcjs.fetchUpstream.call(void 0, 
         url,
         { method: "POST", headers, body: JSON.stringify(body) },
         { providerId: "byo" }
@@ -1408,7 +1511,7 @@ function recordChatCompletionsNonStreamUsage(recorder, bodyText, attribution) {
       usage: tapped,
       rawUsage: parsed.usage
     });
-  } catch (e13) {
+  } catch (e15) {
   }
 }
 
@@ -1424,7 +1527,7 @@ async function handleOpenAIChatRequest(res, rawBody, route, deps) {
   let chatBody;
   try {
     chatBody = JSON.parse(rawBody);
-  } catch (e14) {
+  } catch (e16) {
     writeError(res, 400, "Invalid JSON in request body");
     return;
   }
@@ -1569,7 +1672,7 @@ async function runPipeline3(chatBody, plan) {
     },
     fetchFn: (url, headers, body) => {
       console.log(`[ProviderProxy:chat] -> ${url} model=${resolvedModel} stream=${isStream}`);
-      return _chunkOCEUVQHWcjs.fetchUpstream.call(void 0, 
+      return _chunkPG7PS2NNcjs.fetchUpstream.call(void 0, 
         url,
         { method: "POST", headers, body: JSON.stringify(body) },
         { providerId: plan.proxyProviderId, accountId: proxyAccountId }
@@ -1642,7 +1745,7 @@ function recordResponsesNonStreamUsage(recorder, bodyText, attribution) {
       usage: tapped,
       rawUsage: parsed.usage
     });
-  } catch (e15) {
+  } catch (e17) {
   }
 }
 
@@ -1656,7 +1759,7 @@ async function handleOpenAIResponsesRequest(res, rawBody, route, deps) {
   let responsesBody;
   try {
     responsesBody = JSON.parse(rawBody);
-  } catch (e16) {
+  } catch (e18) {
     writeError(res, 400, "Invalid JSON in request body");
     return;
   }
@@ -1815,7 +1918,7 @@ async function runPipeline4(responsesBody, plan) {
     },
     fetchFn: (url, headers, body) => {
       console.log(`[ProviderProxy:responses] -> ${url} model=${resolvedModel} stream=${isStream}`);
-      return _chunkOCEUVQHWcjs.fetchUpstream.call(void 0, 
+      return _chunkPG7PS2NNcjs.fetchUpstream.call(void 0, 
         url,
         { method: "POST", headers, body: JSON.stringify(body) },
         { providerId: plan.proxyProviderId, accountId: proxyAccountId }
@@ -3096,7 +3199,7 @@ async function handleVoucherRedeem(req, res, deps, voucherEnabled, redeemLimiter
   let code;
   try {
     code = raw ? JSON.parse(raw)["code"] : void 0;
-  } catch (e17) {
+  } catch (e19) {
     writeErr(res, 400, "Invalid JSON in request body");
     return;
   }
@@ -3255,7 +3358,7 @@ function shimAuthHeader(req, routeToken) {
 }
 async function handleOutboundRequest(req, res, deps, config, rateLimiter, serialQueue, concurrencyGate, redeemLimiter, redeemMutex) {
   const now = Date.now();
-  const audit = _chunkE3UCVHLPcjs.beginAuditCapture.call(void 0, req, res, now);
+  const audit = _chunkUNWKG6EIcjs.beginAuditCapture.call(void 0, req, res, now);
   const billing = _chunkAPYG5QD7cjs.beginBillingCapture.call(void 0, req, res, now);
   const presented = extractPresentedKey(req);
   const verification = await verifyKey(deps.db, presented, now);
@@ -3366,7 +3469,7 @@ async function handleOutboundRequest(req, res, deps, config, rateLimiter, serial
     let parsedBody = {};
     try {
       parsedBody = rawBody ? JSON.parse(rawBody) : {};
-    } catch (e18) {
+    } catch (e20) {
       writeJsonError(res, 400, "Invalid JSON in request body");
       return;
     }
@@ -3595,6 +3698,7 @@ var OutboundApiServer = (_class11 = class {
   }
   /** Per-request handler. Auth is enforced on EVERY request (incl. loopback). */
   onRequest(req, res) {
+    if (req.url) req.url = normalizeDoubledEndpointPath(req.url);
     if (this.deps.healthReportProvider && this.tryServeHealth(req, res)) return;
     handleOutboundRequest(
       req,
@@ -3717,6 +3821,16 @@ function firstLanIPv4() {
   }
   return null;
 }
+function normalizeDoubledEndpointPath(url) {
+  const queryIdx = url.indexOf("?");
+  const path = queryIdx === -1 ? url : url.slice(0, queryIdx);
+  const query = queryIdx === -1 ? "" : url.slice(queryIdx);
+  const collapsed = path.replace(
+    /^(.*?)(\/v1\/(?:messages|responses|chat\/completions))\2$/,
+    "$1$2"
+  );
+  return collapsed + query;
+}
 
 // src/outbound-api/keySpendTracker.ts
 function startOfLocalDay(ts) {
@@ -5967,4 +6081,5 @@ ${description}`;
 
 
 
-exports.CompletionService = CompletionService; exports.register = register; exports.emit = emit; exports.attach = attach; exports.release = release; exports.convertMessageToOpenAI = convertMessageToOpenAI; exports.convertMessageToAnthropic = convertMessageToAnthropic; exports.convertMessageToGemini = convertMessageToGemini; exports.getOpenRouterProviderConfig = getOpenRouterProviderConfig; exports.addOpenRouterProviderToRequest = addOpenRouterProviderToRequest; exports.DEFAULT_ROUTE_IDLE_MS = DEFAULT_ROUTE_IDLE_MS; exports.ProviderProxyRouteMap = ProviderProxyRouteMap; exports.getSharedExecutor = getSharedExecutor; exports.getResponsesEndpointTransformer = getResponsesEndpointTransformer; exports.getAnthropicEndpointTransformer = getAnthropicEndpointTransformer; exports.getGeminiEndpointTransformer = getGeminiEndpointTransformer; exports.readBody = readBody; exports.relayResponse = relayResponse; exports.writeError = writeError; exports.resolvePoolBoundKey = resolvePoolBoundKey; exports.extractRouteToken = extractRouteToken; exports.isLoopbackAddress = isLoopbackAddress; exports.ProviderProxy = ProviderProxy; exports.getProviderProxy = getProviderProxy; exports.__resetProviderProxyForTests = __resetProviderProxyForTests; exports.KeyedMutex = KeyedMutex; exports.OUTBOUND_API_SERVER_CONFIG_KEY = OUTBOUND_API_SERVER_CONFIG_KEY; exports.DEFAULT_USER_MESSAGE_QUEUE = DEFAULT_USER_MESSAGE_QUEUE; exports.DEFAULT_CONCURRENCY_QUEUE = DEFAULT_CONCURRENCY_QUEUE; exports.DEFAULT_ACCOUNT_PROBE = DEFAULT_ACCOUNT_PROBE; exports.normalizeAccountProbe = normalizeAccountProbe; exports.normalizeAudit = normalizeAudit; exports.normalizeBilling = normalizeBilling; exports.DEFAULT_FINGERPRINT = DEFAULT_FINGERPRINT; exports.normalizeFingerprint = normalizeFingerprint; exports.normalizeVoucher = normalizeVoucher; exports.normalizeProxyConfig = normalizeProxyConfig; exports.normalizeProxySegment = normalizeProxySegment; exports.normalizeWebhookDestination = normalizeWebhookDestination; exports.normalizeWebhookSegment = normalizeWebhookSegment; exports.normalizeQueueSegments = normalizeQueueSegments; exports.normalizePrefixTargets = normalizePrefixTargets; exports.defaultServerConfig = defaultServerConfig; exports.normalizeServerConfig = normalizeServerConfig; exports.loadServerConfig = loadServerConfig; exports.saveServerConfig = saveServerConfig; exports.mergeServerConfig = mergeServerConfig; exports.computeKeyExpiry = computeKeyExpiry; exports.checkKeyQuota = checkKeyQuota; exports.randomBase62 = randomBase62; exports.hashKey = hashKey; exports.createNamedKey = createNamedKey; exports.verifyKey = verifyKey; exports.verifyPresentedKey = verifyPresentedKey; exports.ConcurrencyQueueFullError = ConcurrencyQueueFullError; exports.ConcurrencyWaitTimeoutError = ConcurrencyWaitTimeoutError; exports.ConcurrencyWaitCancelledError = ConcurrencyWaitCancelledError; exports.isConcurrencyRejection = isConcurrencyRejection; exports.OutboundConcurrencyGate = OutboundConcurrencyGate; exports.OutboundRateLimiter = OutboundRateLimiter; exports.isUserMessageRequest = isUserMessageRequest; exports.SerialQueueTimeoutError = SerialQueueTimeoutError; exports.isSerialQueueTimeout = isSerialQueueTimeout; exports.UserMessageSerialQueue = UserMessageSerialQueue; exports.generateVoucherCode = generateVoucherCode; exports.hashVoucherCode = hashVoucherCode; exports.voucherCodePrefix = voucherCodePrefix; exports.newVoucherId = newVoucherId; exports.computeVoucherGrant = computeVoucherGrant; exports.toVoucherInfo = toVoucherInfo; exports.isRedeemRequest = isRedeemRequest; exports.handleVoucherRedeem = handleVoucherRedeem; exports.DEFAULT_OUTBOUND_PORT = DEFAULT_OUTBOUND_PORT; exports.OutboundApiConfigError = OutboundApiConfigError; exports.OutboundApiServer = OutboundApiServer; exports.formatUrls = formatUrls; exports.startOfLocalDay = startOfLocalDay; exports.startOfLocalWeek = startOfLocalWeek; exports.KeySpendTracker = KeySpendTracker; exports.getOutboundApiServer = getOutboundApiServer; exports.__resetOutboundApiServerForTests = __resetOutboundApiServerForTests;
+
+exports.CompletionService = CompletionService; exports.register = register; exports.emit = emit; exports.attach = attach; exports.release = release; exports.convertMessageToOpenAI = convertMessageToOpenAI; exports.convertMessageToAnthropic = convertMessageToAnthropic; exports.convertMessageToGemini = convertMessageToGemini; exports.getOpenRouterProviderConfig = getOpenRouterProviderConfig; exports.addOpenRouterProviderToRequest = addOpenRouterProviderToRequest; exports.DEFAULT_ROUTE_IDLE_MS = DEFAULT_ROUTE_IDLE_MS; exports.ProviderProxyRouteMap = ProviderProxyRouteMap; exports.getSharedExecutor = getSharedExecutor; exports.getResponsesEndpointTransformer = getResponsesEndpointTransformer; exports.getAnthropicEndpointTransformer = getAnthropicEndpointTransformer; exports.getGeminiEndpointTransformer = getGeminiEndpointTransformer; exports.readBody = readBody; exports.relayResponse = relayResponse; exports.aggregateAnthropicSseToJsonBody = aggregateAnthropicSseToJsonBody; exports.writeError = writeError; exports.resolvePoolBoundKey = resolvePoolBoundKey; exports.extractRouteToken = extractRouteToken; exports.isLoopbackAddress = isLoopbackAddress; exports.ProviderProxy = ProviderProxy; exports.getProviderProxy = getProviderProxy; exports.__resetProviderProxyForTests = __resetProviderProxyForTests; exports.KeyedMutex = KeyedMutex; exports.OUTBOUND_API_SERVER_CONFIG_KEY = OUTBOUND_API_SERVER_CONFIG_KEY; exports.DEFAULT_USER_MESSAGE_QUEUE = DEFAULT_USER_MESSAGE_QUEUE; exports.DEFAULT_CONCURRENCY_QUEUE = DEFAULT_CONCURRENCY_QUEUE; exports.DEFAULT_ACCOUNT_PROBE = DEFAULT_ACCOUNT_PROBE; exports.normalizeAccountProbe = normalizeAccountProbe; exports.normalizeAudit = normalizeAudit; exports.normalizeBilling = normalizeBilling; exports.DEFAULT_FINGERPRINT = DEFAULT_FINGERPRINT; exports.normalizeFingerprint = normalizeFingerprint; exports.normalizeVoucher = normalizeVoucher; exports.normalizeProxyConfig = normalizeProxyConfig; exports.normalizeProxySegment = normalizeProxySegment; exports.normalizeWebhookDestination = normalizeWebhookDestination; exports.normalizeWebhookSegment = normalizeWebhookSegment; exports.normalizeQueueSegments = normalizeQueueSegments; exports.normalizePrefixTargets = normalizePrefixTargets; exports.defaultServerConfig = defaultServerConfig; exports.normalizeServerConfig = normalizeServerConfig; exports.loadServerConfig = loadServerConfig; exports.saveServerConfig = saveServerConfig; exports.mergeServerConfig = mergeServerConfig; exports.computeKeyExpiry = computeKeyExpiry; exports.checkKeyQuota = checkKeyQuota; exports.randomBase62 = randomBase62; exports.hashKey = hashKey; exports.createNamedKey = createNamedKey; exports.verifyKey = verifyKey; exports.verifyPresentedKey = verifyPresentedKey; exports.ConcurrencyQueueFullError = ConcurrencyQueueFullError; exports.ConcurrencyWaitTimeoutError = ConcurrencyWaitTimeoutError; exports.ConcurrencyWaitCancelledError = ConcurrencyWaitCancelledError; exports.isConcurrencyRejection = isConcurrencyRejection; exports.OutboundConcurrencyGate = OutboundConcurrencyGate; exports.OutboundRateLimiter = OutboundRateLimiter; exports.isUserMessageRequest = isUserMessageRequest; exports.SerialQueueTimeoutError = SerialQueueTimeoutError; exports.isSerialQueueTimeout = isSerialQueueTimeout; exports.UserMessageSerialQueue = UserMessageSerialQueue; exports.generateVoucherCode = generateVoucherCode; exports.hashVoucherCode = hashVoucherCode; exports.voucherCodePrefix = voucherCodePrefix; exports.newVoucherId = newVoucherId; exports.computeVoucherGrant = computeVoucherGrant; exports.toVoucherInfo = toVoucherInfo; exports.isRedeemRequest = isRedeemRequest; exports.handleVoucherRedeem = handleVoucherRedeem; exports.DEFAULT_OUTBOUND_PORT = DEFAULT_OUTBOUND_PORT; exports.OutboundApiConfigError = OutboundApiConfigError; exports.OutboundApiServer = OutboundApiServer; exports.formatUrls = formatUrls; exports.startOfLocalDay = startOfLocalDay; exports.startOfLocalWeek = startOfLocalWeek; exports.KeySpendTracker = KeySpendTracker; exports.getOutboundApiServer = getOutboundApiServer; exports.__resetOutboundApiServerForTests = __resetOutboundApiServerForTests;

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

@@ -1,3 +1,9 @@
+import {
+  getUpstreamTracePath,
+  redactHeaders,
+  writeUpstreamTrace
+} from "./chunk-SYQF7OIR.js";
+
 // src/pipeline/upstreamFetch.ts
 import { Agent, buildConnector, ProxyAgent } from "undici";
 import { SocksClient } from "socks";
@@ -95,8 +101,60 @@ function resolveUpstreamDispatcher(ctx) {
 }
 function fetchUpstream(url, init, ctx) {
   const dispatcher = resolveUpstreamDispatcher({ ...ctx ?? {}, url });
-  if (!dispatcher) return fetch(url, init);
-  return fetch(url, { ...init, dispatcher });
+  const doFetch = dispatcher ? () => fetch(url, { ...init, dispatcher }) : () => fetch(url, init);
+  const tracePath = getUpstreamTracePath();
+  if (!tracePath || !ctx?.providerId) return doFetch();
+  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 providerId = ctx.providerId;
+  const accountId = ctx.accountId;
+  return doFetch().then((res) => {
+    const clone = res.clone();
+    const status = res.status;
+    const statusText = res.statusText;
+    const responseHeaders = redactHeaders(res.headers);
+    void clone.text().then((body) => {
+      writeUpstreamTrace({
+        ts: startedAt,
+        durationMs: Date.now() - startedAt,
+        providerId,
+        accountId,
+        url,
+        method,
+        requestHeaders,
+        requestBody,
+        status,
+        statusText,
+        responseHeaders,
+        responseBody: body,
+        responseBytes: Buffer.byteLength(body, "utf8")
+      });
+    }).catch(() => {
+    });
+    return res;
+  }).catch((err) => {
+    const msg = err instanceof Error ? err.message : String(err);
+    writeUpstreamTrace({
+      ts: startedAt,
+      durationMs: Date.now() - startedAt,
+      providerId,
+      accountId,
+      url,
+      method,
+      requestHeaders,
+      requestBody,
+      status: 0,
+      statusText: "",
+      responseHeaders: {},
+      responseBody: `<UPSTREAM FETCH ERROR: ${msg}>`,
+      responseBytes: 0
+    });
+    throw err;
+  });
 }
 function __resetUpstreamProxyForTests() {
   resolver = null;