@ljoukov/llm 7.0.17 → 7.0.19

package/dist/index.d.cts

@@ -15,8 +15,9 @@ type LlmUsageTokens = {
     readonly totalTokens?: number;
     readonly toolUsePromptTokens?: number;
 };
-declare function estimateCallCostUsd({ modelId, tokens, responseImages, imageSize, imageQuality, }: {
+declare function estimateCallCostUsd({ modelId, pricingModelId, tokens, responseImages, imageSize, imageQuality, }: {
     modelId: string;
+    pricingModelId?: string;
     tokens: LlmUsageTokens | undefined;
     responseImages: number;
     imageSize?: string;

package/dist/index.d.ts

@@ -15,8 +15,9 @@ type LlmUsageTokens = {
     readonly totalTokens?: number;
     readonly toolUsePromptTokens?: number;
 };
-declare function estimateCallCostUsd({ modelId, tokens, responseImages, imageSize, imageQuality, }: {
+declare function estimateCallCostUsd({ modelId, pricingModelId, tokens, responseImages, imageSize, imageQuality, }: {
     modelId: string;
+    pricingModelId?: string;
     tokens: LlmUsageTokens | undefined;
     responseImages: number;
     imageSize?: string;

package/dist/index.js

@@ -344,6 +344,7 @@ function resolveChatGptServiceTier(model) {
 // src/openai/pricing.ts
 var OPENAI_GPT_55_FAST_MODEL_IDS = ["gpt-5.5-fast", "chatgpt-gpt-5.5-fast"];
 var OPENAI_GPT_55_STANDARD_MODEL_IDS = ["gpt-5.5", "chatgpt-gpt-5.5"];
+var OPENAI_GPT_55_CONCRETE_MODEL_ID_RE = /^(?:chatgpt-)?gpt-5\.5-\d{4}-\d{2}-\d{2}$/u;
 var OPENAI_GPT_54_FAST_MODEL_IDS = ["gpt-5.4-fast", "chatgpt-gpt-5.4-fast"];
 var OPENAI_GPT_54_MINI_MODEL_IDS = ["gpt-5.4-mini", "chatgpt-gpt-5.4-mini"];
 var OPENAI_GPT_54_NANO_MODEL_IDS = ["gpt-5.4-nano"];
@@ -410,7 +411,7 @@ function getOpenAiPricing(modelId) {
   if (OPENAI_GPT_55_FAST_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_55_PRIORITY_PRICING;
   }
-  if (OPENAI_GPT_55_STANDARD_MODEL_IDS.includes(modelId)) {
+  if (OPENAI_GPT_55_STANDARD_MODEL_IDS.includes(modelId) || OPENAI_GPT_55_CONCRETE_MODEL_ID_RE.test(modelId)) {
     return OPENAI_GPT_55_PRICING;
   }
   if (OPENAI_GPT_54_FAST_MODEL_IDS.includes(modelId)) {
@@ -443,12 +444,14 @@ function resolveUsageNumber(value) {
 }
 function estimateCallCostUsd({
   modelId,
+  pricingModelId,
   tokens,
   responseImages,
   imageSize,
   imageQuality
 }) {
-  const openAiImagePricing = getOpenAiImagePricing(modelId);
+  const pricingModelIds = resolvePricingModelIds(modelId, pricingModelId);
+  const openAiImagePricing = resolvePricing(pricingModelIds, getOpenAiImagePricing);
   if (openAiImagePricing) {
     return estimateOpenAiImageCostUsd({
       pricing: openAiImagePricing,
@@ -468,7 +471,7 @@ function estimateCallCostUsd({
   const toolUsePromptTokens = resolveUsageNumber(tokens.toolUsePromptTokens);
   const promptTokenTotal = promptTokens + toolUsePromptTokens;
   const nonCachedPrompt = Math.max(0, promptTokenTotal - cachedTokens);
-  const imagePreviewPricing = getGeminiImagePricing(modelId);
+  const imagePreviewPricing = resolvePricing(pricingModelIds, getGeminiImagePricing);
   if (imagePreviewPricing) {
     const resolvedImageSize = imageSize && imagePreviewPricing.imagePrices[imageSize] ? imageSize : "2K";
     const imageRate = imagePreviewPricing.imagePrices[resolvedImageSize] ?? 0;
@@ -488,7 +491,7 @@ function estimateCallCostUsd({
     const imageOutputCost = imageTokensForPricing * imagePreviewPricing.outputImageRate;
     return inputCost + cachedCost + textOutputCost + imageOutputCost;
   }
-  const geminiPricing = getGeminiProPricing(modelId);
+  const geminiPricing = resolvePricing(pricingModelIds, getGeminiProPricing);
   if (geminiPricing) {
     const useHighTier = promptTokenTotal > geminiPricing.threshold;
     const inputRate = useHighTier ? geminiPricing.inputRateHigh : geminiPricing.inputRateLow;
@@ -500,7 +503,7 @@ function estimateCallCostUsd({
     const outputCost = outputTokens * outputRate;
     return inputCost + cachedCost + outputCost;
   }
-  const fireworksPricing = getFireworksPricing(modelId);
+  const fireworksPricing = resolvePricing(pricingModelIds, getFireworksPricing);
   if (fireworksPricing) {
     const inputCost = nonCachedPrompt * fireworksPricing.inputRate;
     const cachedCost = cachedTokens * fireworksPricing.cachedRate;
@@ -508,7 +511,7 @@ function estimateCallCostUsd({
     const outputCost = outputTokens * fireworksPricing.outputRate;
     return inputCost + cachedCost + outputCost;
   }
-  const openAiPricing = getOpenAiPricing(modelId);
+  const openAiPricing = resolvePricing(pricingModelIds, getOpenAiPricing);
   if (openAiPricing) {
     const inputCost = nonCachedPrompt * openAiPricing.inputRate;
     const cachedCost = cachedTokens * openAiPricing.cachedRate;
@@ -518,6 +521,21 @@ function estimateCallCostUsd({
   }
   return 0;
 }
+function resolvePricingModelIds(modelId, pricingModelId) {
+  if (pricingModelId && pricingModelId !== modelId) {
+    return [pricingModelId, modelId];
+  }
+  return [modelId];
+}
+function resolvePricing(modelIds, resolve) {
+  for (const modelId of modelIds) {
+    const pricing = resolve(modelId);
+    if (pricing) {
+      return pricing;
+    }
+  }
+  return void 0;
+}
 function estimateOpenAiImageCostUsd({
   pricing,
   responseImages,
@@ -557,6 +575,10 @@ function resolveOpenAiImagePriceResolution(imageSize) {
 import os2 from "os";
 import { TextDecoder as TextDecoder2 } from "util";
 
+// src/utils/env.ts
+import fs from "fs";
+import path from "path";
+
 // src/utils/runtimeSingleton.ts
 var runtimeSingletonStoreKey = /* @__PURE__ */ Symbol.for("@ljoukov/llm.runtimeSingletonStore");
 function getRuntimeSingletonStore() {
@@ -585,16 +607,7 @@ function getRuntimeSingleton(key, create) {
   return createdValue;
 }
 
-// src/openai/chatgpt-auth.ts
-import { Buffer as Buffer2 } from "buffer";
-import fs2 from "fs";
-import os from "os";
-import path2 from "path";
-import { z } from "zod";
-
 // src/utils/env.ts
-import fs from "fs";
-import path from "path";
 var envState = getRuntimeSingleton(/* @__PURE__ */ Symbol.for("@ljoukov/llm.envState"), () => ({
   envLoaded: false
 }));
@@ -656,6 +669,11 @@ function parseEnvLine(line) {
 }
 
 // src/openai/chatgpt-auth.ts
+import { Buffer as Buffer2 } from "buffer";
+import fs2 from "fs";
+import os from "os";
+import path2 from "path";
+import { z } from "zod";
 var CHATGPT_AUTH_TOKEN_PROVIDER_URL_ENV = "CHATGPT_AUTH_TOKEN_PROVIDER_URL";
 var CHATGPT_AUTH_TOKEN_PROVIDER_STORE_ENV = "CHATGPT_AUTH_TOKEN_PROVIDER_STORE";
 var CHATGPT_AUTH_API_KEY_ENV = "CHATGPT_AUTH_API_KEY";
@@ -1563,19 +1581,21 @@ function createAbortError(reason) {
 
 // src/openai/chatgpt-codex.ts
 var CHATGPT_CODEX_ENDPOINT = "https://chatgpt.com/backend-api/codex/responses";
+var CHATGPT_CODEX_ENDPOINT_ENV = "CHATGPT_CODEX_ENDPOINT";
+var CHATGPT_CODEX_PROXY_URL_ENV = "CHATGPT_CODEX_PROXY_URL";
+var CHATGPT_CODEX_PROXY_API_KEY_ENV = "CHATGPT_CODEX_PROXY_API_KEY";
 var CHATGPT_RESPONSES_EXPERIMENTAL_HEADER = "responses=experimental";
 var chatGptCodexState = getRuntimeSingleton(/* @__PURE__ */ Symbol.for("@ljoukov/llm.chatGptCodexState"), () => ({
   cachedResponsesWebSocketMode: null,
   chatGptResponsesWebSocketDisabled: false
 }));
 async function streamChatGptCodexResponse(options) {
-  const { access, accountId } = await getChatGptAuthProfile();
+  const endpointConfig = await resolveChatGptCodexEndpointConfig();
   const mode = resolveChatGptResponsesWebSocketMode();
   const fallbackStreamFactory = () => {
     const streamPromise = streamChatGptCodexResponseSse({
       request: options.request,
-      access,
-      accountId,
+      endpointConfig,
       sessionId: options.sessionId,
       signal: options.signal
     });
@@ -1597,15 +1617,14 @@ async function streamChatGptCodexResponse(options) {
     return fallbackStreamFactory();
   }
   const websocketHeaders = buildChatGptCodexHeaders({
-    access,
-    accountId,
+    endpointConfig,
     sessionId: options.sessionId,
     useWebSocket: true
   });
   return createAdaptiveResponsesStream({
     mode,
     createWebSocketStream: async () => await createResponsesWebSocketStream({
-      url: toWebSocketUrl(CHATGPT_CODEX_ENDPOINT),
+      url: toWebSocketUrl(endpointConfig.url),
       headers: websocketHeaders,
       request: options.request,
       signal: options.signal
@@ -1618,14 +1637,13 @@ async function streamChatGptCodexResponse(options) {
 }
 async function streamChatGptCodexResponseSse(options) {
   const headers = buildChatGptCodexHeaders({
-    access: options.access,
-    accountId: options.accountId,
+    endpointConfig: options.endpointConfig,
     sessionId: options.sessionId,
     useWebSocket: false
   });
   headers.Accept = "text/event-stream";
   headers["Content-Type"] = "application/json";
-  const response = await fetch(CHATGPT_CODEX_ENDPOINT, {
+  const response = await fetch(options.endpointConfig.url, {
     method: "POST",
     headers,
     body: JSON.stringify(options.request),
@@ -1645,24 +1663,66 @@ function resolveChatGptResponsesWebSocketMode() {
   if (chatGptCodexState.cachedResponsesWebSocketMode) {
     return chatGptCodexState.cachedResponsesWebSocketMode;
   }
+  const explicitMode = process.env.CHATGPT_RESPONSES_WEBSOCKET_MODE ?? process.env.OPENAI_RESPONSES_WEBSOCKET_MODE;
+  const defaultMode = resolveChatGptCodexProxyConfig() ? "off" : "auto";
   chatGptCodexState.cachedResponsesWebSocketMode = resolveResponsesWebSocketMode(
-    process.env.CHATGPT_RESPONSES_WEBSOCKET_MODE ?? process.env.OPENAI_RESPONSES_WEBSOCKET_MODE,
-    "auto"
+    explicitMode,
+    defaultMode
   );
   return chatGptCodexState.cachedResponsesWebSocketMode;
 }
+async function resolveChatGptCodexEndpointConfig() {
+  const proxy = resolveChatGptCodexProxyConfig();
+  if (proxy) {
+    return proxy;
+  }
+  const { access, accountId } = await getChatGptAuthProfile();
+  return {
+    kind: "direct",
+    url: resolveChatGptCodexEndpoint(),
+    access,
+    accountId
+  };
+}
+function resolveChatGptCodexEndpoint() {
+  loadLocalEnv();
+  return process.env[CHATGPT_CODEX_ENDPOINT_ENV]?.trim() || CHATGPT_CODEX_ENDPOINT;
+}
+function resolveChatGptCodexProxyConfig() {
+  loadLocalEnv();
+  const url = process.env[CHATGPT_CODEX_PROXY_URL_ENV]?.trim();
+  if (!url) {
+    return null;
+  }
+  const apiKey = process.env[CHATGPT_CODEX_PROXY_API_KEY_ENV]?.trim();
+  if (!apiKey) {
+    throw new Error(
+      `${CHATGPT_CODEX_PROXY_API_KEY_ENV} must be provided when ${CHATGPT_CODEX_PROXY_URL_ENV} is set.`
+    );
+  }
+  return {
+    kind: "proxy",
+    url,
+    apiKey
+  };
+}
 function buildChatGptCodexHeaders(options) {
   const openAiBeta = options.useWebSocket ? mergeOpenAiBetaHeader(
     CHATGPT_RESPONSES_EXPERIMENTAL_HEADER,
     OPENAI_BETA_RESPONSES_WEBSOCKETS_V2
   ) : CHATGPT_RESPONSES_EXPERIMENTAL_HEADER;
   const headers = {
-    Authorization: `Bearer ${options.access}`,
-    "chatgpt-account-id": options.accountId,
     "OpenAI-Beta": openAiBeta,
     originator: "llm",
     "User-Agent": buildUserAgent()
   };
+  if (options.endpointConfig.kind === "proxy") {
+    headers.Authorization = `Bearer ${options.endpointConfig.apiKey}`;
+    headers["x-codex-proxy-auth"] = options.endpointConfig.apiKey;
+  } else {
+    headers.Authorization = `Bearer ${options.endpointConfig.access}`;
+    headers["chatgpt-account-id"] = options.endpointConfig.accountId;
+  }
   if (options.sessionId) {
     headers.session_id = options.sessionId;
   }
@@ -8329,6 +8389,7 @@ async function runTextCall(params) {
       const outputAttachments = collectLoggedAttachmentsFromLlmParts(mergedParts, "output");
       const costUsd = estimateCallCostUsd({
         modelId: modelVersion,
+        pricingModelId: request.model,
         tokens: latestUsage,
         responseImages,
         imageSize: request.imageSize
@@ -9072,6 +9133,7 @@ async function runToolLoop(request) {
           const modelCompletedAtMs = Date.now();
           const stepCostUsd = estimateCallCostUsd({
             modelId: modelVersion,
+            pricingModelId: request.model,
             tokens: usageTokens,
             responseImages: 0
           });
@@ -9403,6 +9465,7 @@ async function runToolLoop(request) {
           usageTokens = extractChatGptUsageTokens(response.usage);
           const stepCostUsd = estimateCallCostUsd({
             modelId: modelVersion,
+            pricingModelId: request.model,
             tokens: usageTokens,
             responseImages: 0
           });
@@ -9731,6 +9794,7 @@ async function runToolLoop(request) {
           usageTokens = extractFireworksUsageTokens(response.usage);
           const stepCostUsd = estimateCallCostUsd({
             modelId: modelVersion,
+            pricingModelId: request.model,
             tokens: usageTokens,
             responseImages: 0
           });
@@ -10093,6 +10157,7 @@ async function runToolLoop(request) {
         );
         const stepCostUsd = estimateCallCostUsd({
           modelId: modelVersion,
+          pricingModelId: request.model,
           tokens: usageTokens,
           responseImages: 0
         });