@ljoukov/llm 7.0.8 → 7.0.10

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(index_exports, {
   CODEX_APPLY_PATCH_LARK_GRAMMAR: () => CODEX_APPLY_PATCH_LARK_GRAMMAR,
   DEFAULT_FILE_TTL_SECONDS: () => DEFAULT_FILE_TTL_SECONDS,
   DEFAULT_SIGNED_URL_TTL_SECONDS: () => DEFAULT_SIGNED_URL_TTL_SECONDS,
+  EXPERIMENTAL_CHATGPT_MODEL_PREFIX: () => EXPERIMENTAL_CHATGPT_MODEL_PREFIX,
   FIREWORKS_DEFAULT_GLM_MODEL: () => FIREWORKS_DEFAULT_GLM_MODEL,
   FIREWORKS_DEFAULT_GPT_OSS_120B_MODEL: () => FIREWORKS_DEFAULT_GPT_OSS_120B_MODEL,
   FIREWORKS_DEFAULT_KIMI_MODEL: () => FIREWORKS_DEFAULT_KIMI_MODEL,
@@ -90,6 +91,7 @@ __export(index_exports, {
   getChatGptAuthProfile: () => getChatGptAuthProfile,
   getCurrentToolCallContext: () => getCurrentToolCallContext,
   isChatGptModelId: () => isChatGptModelId,
+  isExperimentalChatGptModelId: () => isExperimentalChatGptModelId,
   isFireworksModelId: () => isFireworksModelId,
   isGeminiImageModelId: () => isGeminiImageModelId,
   isGeminiModelId: () => isGeminiModelId,
@@ -318,6 +320,42 @@ function getGeminiImagePricing(modelId) {
   return void 0;
 }
 
+// src/openai/models.ts
+var OPENAI_MODEL_IDS = ["gpt-5.4", "gpt-5.4-mini", "gpt-5.4-nano"];
+function isOpenAiModelId(value) {
+  return OPENAI_MODEL_IDS.includes(value);
+}
+var CHATGPT_MODEL_IDS = [
+  "chatgpt-gpt-5.4",
+  "chatgpt-gpt-5.4-fast",
+  "chatgpt-gpt-5.4-mini",
+  "chatgpt-gpt-5.3-codex-spark"
+];
+var EXPERIMENTAL_CHATGPT_MODEL_PREFIX = "experimental-chatgpt-";
+function isExperimentalChatGptModelId(value) {
+  return value.startsWith(EXPERIMENTAL_CHATGPT_MODEL_PREFIX) && value.length > EXPERIMENTAL_CHATGPT_MODEL_PREFIX.length;
+}
+function isChatGptModelId(value) {
+  return CHATGPT_MODEL_IDS.includes(value) || isExperimentalChatGptModelId(value);
+}
+function stripChatGptPrefix(model) {
+  if (isExperimentalChatGptModelId(model)) {
+    return model.slice(EXPERIMENTAL_CHATGPT_MODEL_PREFIX.length);
+  }
+  return model.slice("chatgpt-".length);
+}
+function resolveChatGptProviderModel(model) {
+  switch (model) {
+    case "chatgpt-gpt-5.4-fast":
+      return "gpt-5.4";
+    default:
+      return stripChatGptPrefix(model);
+  }
+}
+function resolveChatGptServiceTier(model) {
+  return model === "chatgpt-gpt-5.4-fast" ? "priority" : void 0;
+}
+
 // src/openai/pricing.ts
 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"];
@@ -348,6 +386,9 @@ var OPENAI_GPT_54_NANO_PRICING = {
   outputRate: 0.4 / 1e6
 };
 function getOpenAiPricing(modelId) {
+  if (isExperimentalChatGptModelId(modelId)) {
+    return OPENAI_GPT_54_PRICING;
+  }
   if (OPENAI_GPT_54_FAST_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_PRIORITY_PRICING;
   }
@@ -2832,35 +2873,6 @@ async function runOpenAiCall(fn, modelId, runOptions) {
   return getSchedulerForModel3(modelId).run(async () => fn(getOpenAiClient()), runOptions);
 }
 
-// src/openai/models.ts
-var OPENAI_MODEL_IDS = ["gpt-5.4", "gpt-5.4-mini", "gpt-5.4-nano"];
-function isOpenAiModelId(value) {
-  return OPENAI_MODEL_IDS.includes(value);
-}
-var CHATGPT_MODEL_IDS = [
-  "chatgpt-gpt-5.4",
-  "chatgpt-gpt-5.4-fast",
-  "chatgpt-gpt-5.4-mini",
-  "chatgpt-gpt-5.3-codex-spark"
-];
-function isChatGptModelId(value) {
-  return CHATGPT_MODEL_IDS.includes(value);
-}
-function stripChatGptPrefix(model) {
-  return model.slice("chatgpt-".length);
-}
-function resolveChatGptProviderModel(model) {
-  switch (model) {
-    case "chatgpt-gpt-5.4-fast":
-      return "gpt-5.4";
-    default:
-      return stripChatGptPrefix(model);
-  }
-}
-function resolveChatGptServiceTier(model) {
-  return model === "chatgpt-gpt-5.4-fast" ? "priority" : void 0;
-}
-
 // src/agentLogging.ts
 var import_node_async_hooks = require("async_hooks");
 var import_node_buffer2 = require("buffer");
@@ -7936,7 +7948,7 @@ async function runTextCall(params) {
           pushEvent({ type: "blocked" });
         }
         if (result2.model) {
-          modelVersion = providerInfo.serviceTier ? request.model : `chatgpt-${result2.model}`;
+          modelVersion = providerInfo.serviceTier || isExperimentalChatGptModelId(request.model) ? request.model : `chatgpt-${result2.model}`;
           pushEvent({ type: "model", modelVersion });
         }
         latestUsage = extractChatGptUsageTokens(result2.usage);
@@ -9142,7 +9154,7 @@ async function runToolLoop(request) {
             }
           });
           const modelCompletedAtMs = Date.now();
-          modelVersion = response.model && !providerInfo.serviceTier ? `chatgpt-${response.model}` : request.model;
+          modelVersion = response.model && !providerInfo.serviceTier && !isExperimentalChatGptModelId(request.model) ? `chatgpt-${response.model}` : request.model;
           usageTokens = extractChatGptUsageTokens(response.usage);
           const stepCostUsd = estimateCallCostUsd({
             modelId: modelVersion,
@@ -10895,10 +10907,16 @@ function resolveCollabInputText(params) {
     return blocks.join("\n\n");
   }
   if (!params.items || params.items.length === 0) {
+    if (blocks.length > 0) {
+      return blocks.join("\n\n");
+    }
     throw new Error(params.emptyItemsError);
   }
   const itemText = resolveInputItemsText(params.items);
   if (!itemText) {
+    if (blocks.length > 0) {
+      return blocks.join("\n\n");
+    }
     throw new Error(params.emptyItemsError);
   }
   blocks.push(itemText);
@@ -12746,6 +12764,9 @@ async function runAccessHook2(runtime, context) {
   await runtime.checkAccess(context);
 }
 function isCodexModel(model) {
+  if (model.startsWith("experimental-chatgpt-")) {
+    return true;
+  }
   const normalized = model.startsWith("chatgpt-") ? model.slice("chatgpt-".length) : model;
   return normalized.includes("codex") || normalized === "gpt-5.4" || normalized === "gpt-5.4-fast";
 }
@@ -14186,6 +14207,7 @@ async function runCandidateEvolution(options) {
   CODEX_APPLY_PATCH_LARK_GRAMMAR,
   DEFAULT_FILE_TTL_SECONDS,
   DEFAULT_SIGNED_URL_TTL_SECONDS,
+  EXPERIMENTAL_CHATGPT_MODEL_PREFIX,
   FIREWORKS_DEFAULT_GLM_MODEL,
   FIREWORKS_DEFAULT_GPT_OSS_120B_MODEL,
   FIREWORKS_DEFAULT_KIMI_MODEL,
@@ -14240,6 +14262,7 @@ async function runCandidateEvolution(options) {
   getChatGptAuthProfile,
   getCurrentToolCallContext,
   isChatGptModelId,
+  isExperimentalChatGptModelId,
   isFireworksModelId,
   isGeminiImageModelId,
   isGeminiModelId,