@omnicross/core 0.1.6 → 0.1.7

package/dist/ApiConverter.cjs

@@ -9,7 +9,7 @@
 
 
 
-var _chunkWYTEQ4Q5cjs = require('./chunk-WYTEQ4Q5.cjs');
+var _chunkGDIXXKF2cjs = require('./chunk-GDIXXKF2.cjs');
 
 
 
@@ -21,4 +21,4 @@ var _chunkWYTEQ4Q5cjs = require('./chunk-WYTEQ4Q5.cjs');
 
 
 
-exports.convertAnthropicRequestToOpenAI = _chunkWYTEQ4Q5cjs.convertAnthropicRequestToOpenAI; exports.convertAnthropicStreamToOpenAI = _chunkWYTEQ4Q5cjs.convertAnthropicStreamToOpenAI; exports.convertAnthropicToOpenAI = _chunkWYTEQ4Q5cjs.convertAnthropicToOpenAI; exports.convertAnthropicToOpenAIWithThinking = _chunkWYTEQ4Q5cjs.convertAnthropicToOpenAIWithThinking; exports.convertOpenAIResponseToAnthropic = _chunkWYTEQ4Q5cjs.convertOpenAIResponseToAnthropic; exports.convertOpenAIStreamToAnthropic = _chunkWYTEQ4Q5cjs.convertOpenAIStreamToAnthropic; exports.convertOpenAIToAnthropic = _chunkWYTEQ4Q5cjs.convertOpenAIToAnthropic; exports.convertOpenAIToAnthropicWithThinking = _chunkWYTEQ4Q5cjs.convertOpenAIToAnthropicWithThinking; exports.hasImageContent = _chunkWYTEQ4Q5cjs.hasImageContent; exports.hasThinkingEnabled = _chunkWYTEQ4Q5cjs.hasThinkingEnabled;
+exports.convertAnthropicRequestToOpenAI = _chunkGDIXXKF2cjs.convertAnthropicRequestToOpenAI; exports.convertAnthropicStreamToOpenAI = _chunkGDIXXKF2cjs.convertAnthropicStreamToOpenAI; exports.convertAnthropicToOpenAI = _chunkGDIXXKF2cjs.convertAnthropicToOpenAI; exports.convertAnthropicToOpenAIWithThinking = _chunkGDIXXKF2cjs.convertAnthropicToOpenAIWithThinking; exports.convertOpenAIResponseToAnthropic = _chunkGDIXXKF2cjs.convertOpenAIResponseToAnthropic; exports.convertOpenAIStreamToAnthropic = _chunkGDIXXKF2cjs.convertOpenAIStreamToAnthropic; exports.convertOpenAIToAnthropic = _chunkGDIXXKF2cjs.convertOpenAIToAnthropic; exports.convertOpenAIToAnthropicWithThinking = _chunkGDIXXKF2cjs.convertOpenAIToAnthropicWithThinking; exports.hasImageContent = _chunkGDIXXKF2cjs.hasImageContent; exports.hasThinkingEnabled = _chunkGDIXXKF2cjs.hasThinkingEnabled;

package/dist/ApiConverter.js

@@ -9,7 +9,7 @@ import {
   convertOpenAIToAnthropicWithThinking,
   hasImageContent,
   hasThinkingEnabled
-} from "./chunk-AT7B7SOZ.js";
+} from "./chunk-5NJLQ6T6.js";
 export {
   convertAnthropicRequestToOpenAI,
   convertAnthropicStreamToOpenAI,

package/dist/auth/GeminiCodeAssistProjectResolver.cjs

@@ -5,9 +5,10 @@ var _chunkOKMJLEXXcjs = require('../chunk-OKMJLEXX.cjs');
 require('../chunk-KBM2W6UY.cjs');
 
 
-var _chunkKCVJWJSTcjs = require('../chunk-KCVJWJST.cjs');
-require('../chunk-3Z5BQZFM.cjs');
+var _chunkRJUONLUQcjs = require('../chunk-RJUONLUQ.cjs');
+require('../chunk-235MXAGX.cjs');
 require('../chunk-HVBBDBS3.cjs');
+require('../chunk-NKVZ6Z3Y.cjs');
 
 // src/auth/GeminiCodeAssistProjectResolver.ts
 var FREE_TIER_ID = "free-tier";
@@ -27,7 +28,7 @@ var GeminiCodeAssistHandshakeError = class extends Error {
 var GeminiCodeAssistProjectResolver = (_class = class {
   // upstream-proxy: the Code Assist handshake is upstream egress → honor the
   // gemini proxy by default (still injectable for tests).
-  constructor(fetchImpl = (url, init) => _chunkKCVJWJSTcjs.fetchUpstream.call(void 0, url, init, { providerId: "gemini" })) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);
+  constructor(fetchImpl = (url, init) => _chunkRJUONLUQcjs.fetchUpstream.call(void 0, url, init, { providerId: "gemini" })) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);
     this.fetchImpl = fetchImpl;
   }
   

package/dist/auth/GeminiCodeAssistProjectResolver.js

@@ -5,9 +5,10 @@ import {
 import "../chunk-TOVPMMHM.js";
 import {
   fetchUpstream
-} from "../chunk-SIZQQD6T.js";
-import "../chunk-SYQF7OIR.js";
+} from "../chunk-RJ5ZGNI3.js";
+import "../chunk-3WD4HTR2.js";
 import "../chunk-MKF46GNZ.js";
+import "../chunk-GL6XM527.js";
 
 // src/auth/GeminiCodeAssistProjectResolver.ts
 var FREE_TIER_ID = "free-tier";

package/dist/{chunk-3Z5BQZFM.cjs → chunk-235MXAGX.cjs}

@@ -2,6 +2,7 @@
 var _promises = require('fs/promises');
 var _path = require('path');
 var tracePath = null;
+var REDACTED_BODY = "***REDACTED (credential exchange)***";
 var SECRET_HEADER_NAMES = /* @__PURE__ */ new Set([
   "authorization",
   "api-key",
@@ -49,4 +50,5 @@ function __resetUpstreamTraceForTests() {
 
 
 
-exports.setUpstreamTracePath = setUpstreamTracePath; exports.getUpstreamTracePath = getUpstreamTracePath; exports.redactHeaders = redactHeaders; exports.writeUpstreamTrace = writeUpstreamTrace; exports.__resetUpstreamTraceForTests = __resetUpstreamTraceForTests;
+
+exports.REDACTED_BODY = REDACTED_BODY; exports.setUpstreamTracePath = setUpstreamTracePath; exports.getUpstreamTracePath = getUpstreamTracePath; exports.redactHeaders = redactHeaders; exports.writeUpstreamTrace = writeUpstreamTrace; exports.__resetUpstreamTraceForTests = __resetUpstreamTraceForTests;

package/dist/{chunk-DLXZEZWO.cjs → chunk-2E42SAW3.cjs}

@@ -4,7 +4,7 @@
 
 var _pricingtypes = require('@omnicross/contracts/pricing-types');
 var PricingEngine = (_class = class {
-  constructor(store, logger, options = {}) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);
+  constructor(store, logger, options = {}) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);_class.prototype.__init5.call(this);
     this.store = store;
     this.logger = logger;
     this.options = options;
@@ -21,9 +21,18 @@ var PricingEngine = (_class = class {
    * non-wildcard entry per model wins.
    */
   __init2() {this.cacheByModel = /* @__PURE__ */ new Map()}
-  __init3() {this.cacheLoaded = false}
+  /**
+   * Last-resort fuzzy index: `[normalizedModelId, entry]` pairs over the same
+   * non-wildcard, non-openrouter rows as `cacheByModel`. Used when even the
+   * model-name fallback misses — e.g. usage recorded under a bare model id
+   * (`glm-5.2`) while the catalog only knows prefixed slugs
+   * (`cloudflare/@cf/zai-org/glm-5.2`). This is an ESTIMATE: the matched row
+   * may be an aggregate-route price rather than the direct-vendor rate.
+   */
+  __init3() {this.fuzzyEntries = []}
+  __init4() {this.cacheLoaded = false}
   /** Coalesce manual and background refreshes to prevent a catalog stampede. */
-  __init4() {this.refreshInFlight = null}
+  __init5() {this.refreshInFlight = null}
   // ===== Cache management =====
   /** Lazy-load and cache the full pricing table. */
   async ensureCache() {
@@ -31,9 +40,11 @@ var PricingEngine = (_class = class {
     const rows = await this.store.getAll();
     this.cache = new Map(rows.map((r) => [keyOf(r.providerId, r.modelId), r]));
     this.cacheByModel = /* @__PURE__ */ new Map();
+    this.fuzzyEntries = [];
     for (const r of rows) {
       if (r.providerId === "*" || r.providerId === "openrouter" || r.source === "openrouter") continue;
       if (!this.cacheByModel.has(r.modelId)) this.cacheByModel.set(r.modelId, r);
+      this.fuzzyEntries.push([normalizeModelId(r.modelId), r]);
     }
     this.cacheLoaded = true;
   }
@@ -53,10 +64,36 @@ var PricingEngine = (_class = class {
    *   2. wildcard provider ('*', modelId)
    *   3. model name alone (any provider) — tolerates a runtime-alias vs
    *      canonical provider-id mismatch for the same model.
+   *   4. normalized fuzzy match (last resort) — matches a bare id like
+   *      `glm-5.2` against prefixed catalog slugs like
+   *      `cloudflare/@cf/zai-org/glm-5.2`. ESTIMATE only: the matched row may
+   *      be an aggregate-route price, not the direct-vendor rate.
    */
   async getEntry(providerId, modelId) {
     await this.ensureCache();
-    return _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(this.cache.get(keyOf(providerId, modelId)), () => ( this.cache.get(keyOf("*", modelId)))), () => ( this.cacheByModel.get(modelId))), () => ( null));
+    const exact = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(this.cache.get(keyOf(providerId, modelId)), () => ( this.cache.get(keyOf("*", modelId)))), () => ( this.cacheByModel.get(modelId))), () => ( null));
+    if (exact) return exact;
+    return this.fuzzyMatch(modelId);
+  }
+  /**
+   * Normalized substring match over the catalog's non-openrouter rows. Lowercases
+   * and strips all non-alphanumerics, then matches bidirectionally, preferring
+   * the shortest catalog key (tightest match) to reduce over-matching version
+   * variants. Returns null when nothing matches.
+   */
+  fuzzyMatch(modelId) {
+    const normQuery = normalizeModelId(modelId);
+    if (!normQuery) return null;
+    let best = null;
+    let bestLen = Infinity;
+    for (const [key, entry] of this.fuzzyEntries) {
+      if (!key || !key.includes(normQuery) && !normQuery.includes(key)) continue;
+      if (key.length < bestLen) {
+        best = entry;
+        bestLen = key.length;
+      }
+    }
+    return best;
   }
   // ===== Cost calculation =====
   /**
@@ -187,6 +224,7 @@ var PricingEngine = (_class = class {
   }
 }, _class);
 var keyOf = (providerId, modelId) => `${providerId}::${modelId}`;
+var normalizeModelId = (modelId) => (_nullishCoalesce(modelId, () => ( ""))).toLowerCase().replace(/[^a-z0-9]/g, "");
 var PROVIDER_ALIASES = {
   vertex_ai: "gemini",
   google: "gemini",

package/dist/{chunk-7AK7B36B.cjs → chunk-2Z4XM3H5.cjs}

@@ -1,15 +1,15 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkV4TXMEJScjs = require('./chunk-V4TXMEJS.cjs');
+var _chunkOXHNSZ53cjs = require('./chunk-OXHNSZ53.cjs');
 
 
-var _chunk6VUQPOV3cjs = require('./chunk-6VUQPOV3.cjs');
+var _chunkV4TXMEJScjs = require('./chunk-V4TXMEJS.cjs');
 
 
-var _chunkOF3BECU2cjs = require('./chunk-OF3BECU2.cjs');
+var _chunkOVQBNVSVcjs = require('./chunk-OVQBNVSV.cjs');
 
 
-var _chunk4VLRHHFEcjs = require('./chunk-4VLRHHFE.cjs');
+var _chunkOF3BECU2cjs = require('./chunk-OF3BECU2.cjs');
 
 
 var _chunkOKMJLEXXcjs = require('./chunk-OKMJLEXX.cjs');
@@ -19,8 +19,8 @@ var BuiltinTransformers = {
   OpenAITransformer: _chunkOF3BECU2cjs.OpenAITransformer,
   GeminiTransformer: _chunkV4TXMEJScjs.GeminiTransformer,
   GeminiCodeAssistTransformer: _chunkOKMJLEXXcjs.GeminiCodeAssistTransformer,
-  AnthropicTransformer: _chunk4VLRHHFEcjs.AnthropicTransformer,
-  OpenAIResponseTransformer: _chunk6VUQPOV3cjs.OpenAIResponseTransformer
+  AnthropicTransformer: _chunkOXHNSZ53cjs.AnthropicTransformer,
+  OpenAIResponseTransformer: _chunkOVQBNVSVcjs.OpenAIResponseTransformer
 };
 function getBuiltinTransformers() {
   return BuiltinTransformers;

package/dist/{chunk-OEWZUX4G.js → chunk-32O35CIF.js}

@@ -1,3 +1,8 @@
+import {
+  chatUsageToResponsesUsage,
+  responsesUsageToChatUsage
+} from "./chunk-FU7EAR73.js";
+
 // src/transformer/transformers/OpenAIResponseTransformer.ts
 var OpenAIResponseTransformer = class {
   static TransformerName = "openai-response";
@@ -433,11 +438,7 @@ function convertResponseApiJsonToOpenAI(data) {
         finish_reason: toolCalls.length > 0 ? "tool_calls" : "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
+    usage: responsesUsageToChatUsage(usage)
   };
 }
 function convertOpenAIJsonToResponseApi(data, codexTools) {
@@ -475,11 +476,7 @@ function convertOpenAIJsonToResponseApi(data, codexTools) {
     status: "completed",
     model: data.model || "unknown",
     output,
-    usage: usage ? {
-      input_tokens: usage.prompt_tokens || 0,
-      output_tokens: usage.completion_tokens || 0,
-      total_tokens: usage.total_tokens || (usage.prompt_tokens || 0) + (usage.completion_tokens || 0)
-    } : void 0
+    usage: chatUsageToResponsesUsage(usage)
   };
 }
 function convertResponseApiStreamToOpenAI(responseApiStream) {
@@ -589,11 +586,7 @@ function convertResponseApiStreamToOpenAI(responseApiStream) {
                 case "response.completed": {
                   const resp = event.response;
                   const respUsage = resp?.usage;
-                  const usage = respUsage ? {
-                    prompt_tokens: respUsage.input_tokens || 0,
-                    completion_tokens: respUsage.output_tokens || 0,
-                    total_tokens: (respUsage.input_tokens || 0) + (respUsage.output_tokens || 0)
-                  } : void 0;
+                  const usage = responsesUsageToChatUsage(respUsage);
                   emitChunk([{ index: 0, delta: {}, finish_reason: hasToolCalls ? "tool_calls" : "stop" }], usage);
                   safeEnqueue("data: [DONE]\n\n");
                   break;
@@ -801,11 +794,7 @@ function convertOpenAIStreamToResponseApi(openaiStream, codexTools) {
                     status: "completed",
                     model,
                     output,
-                    usage: chunk.usage ? {
-                      input_tokens: chunk.usage.prompt_tokens || 0,
-                      output_tokens: chunk.usage.completion_tokens || 0,
-                      total_tokens: chunk.usage.total_tokens || 0
-                    } : void 0
+                    usage: chatUsageToResponsesUsage(chunk.usage)
                   }
                 });
               }

package/dist/chunk-3SCOLIPT.cjs

@@ -0,0 +1,63 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/provider-proxy/identity/headerMerge.ts
+function fillMissingHeaders(headers, source) {
+  const present = new Set(Object.keys(headers).map((k) => k.toLowerCase()));
+  for (const [key, value] of Object.entries(source)) {
+    const lower = key.toLowerCase();
+    if (present.has(lower)) continue;
+    headers[lower] = value;
+    present.add(lower);
+  }
+}
+function flattenHeaderValue(raw) {
+  if (raw === void 0) return void 0;
+  const value = Array.isArray(raw) ? raw.filter((v) => typeof v === "string").join(", ") : raw;
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+var NEVER_FORWARD_HEADERS = /* @__PURE__ */ new Set([
+  "authorization",
+  "x-api-key",
+  "cookie",
+  "proxy-authorization",
+  "host",
+  "connection",
+  "content-length",
+  "content-type",
+  "accept-encoding"
+]);
+
+// src/provider-proxy/identity/codexCliHeaders.ts
+var DEFAULT_CODEX_CLI_HEADERS = Object.freeze({
+  originator: "codex_cli_rs",
+  "user-agent": "codex_cli_rs/0.144.5",
+  version: "0.144.5"
+});
+var CODEX_FORWARD_ALLOWLIST = /* @__PURE__ */ new Set([
+  "version",
+  "openai-beta",
+  "session_id",
+  "originator",
+  "user-agent"
+]);
+function extractCodexClientHeaders(reqHeaders) {
+  const out = {};
+  for (const [rawKey, rawVal] of Object.entries(reqHeaders)) {
+    const key = rawKey.toLowerCase();
+    if (NEVER_FORWARD_HEADERS.has(key)) continue;
+    if (!CODEX_FORWARD_ALLOWLIST.has(key)) continue;
+    const value = flattenHeaderValue(rawVal);
+    if (value !== void 0) out[key] = value;
+  }
+  return out;
+}
+function codexAcceptHeader(isStream) {
+  return isStream ? "text/event-stream" : "application/json";
+}
+
+
+
+
+
+
+
+
+exports.fillMissingHeaders = fillMissingHeaders; exports.flattenHeaderValue = flattenHeaderValue; exports.NEVER_FORWARD_HEADERS = NEVER_FORWARD_HEADERS; exports.DEFAULT_CODEX_CLI_HEADERS = DEFAULT_CODEX_CLI_HEADERS; exports.extractCodexClientHeaders = extractCodexClientHeaders; exports.codexAcceptHeader = codexAcceptHeader;

package/dist/{chunk-SYQF7OIR.js → chunk-3WD4HTR2.js}

@@ -2,6 +2,7 @@
 import { appendFile, mkdir } from "fs/promises";
 import { dirname } from "path";
 var tracePath = null;
+var REDACTED_BODY = "***REDACTED (credential exchange)***";
 var SECRET_HEADER_NAMES = /* @__PURE__ */ new Set([
   "authorization",
   "api-key",
@@ -44,6 +45,7 @@ function __resetUpstreamTraceForTests() {
 }
 
 export {
+  REDACTED_BODY,
   setUpstreamTracePath,
   getUpstreamTracePath,
   redactHeaders,