@ljoukov/llm 7.0.9 → 7.0.11

package/README.md

@@ -450,19 +450,19 @@ Use a `chatgpt-` prefix:
 import { generateText } from "@ljoukov/llm";
 
 const result = await generateText({
-  model: "chatgpt-gpt-5.4",
+  model: "chatgpt-gpt-5.5",
   input: "Return exactly: OK",
 });
 
 console.log(result.text);
 ```
 
-`chatgpt-gpt-5.4-fast` is also supported as a convenience alias for ChatGPT-authenticated `gpt-5.4` with priority processing enabled (`service_tier="priority"`), matching Codex `/fast` semantics.
+`gpt-5.5-fast` and `chatgpt-gpt-5.5-fast` are also supported as convenience aliases for `gpt-5.5` with priority processing enabled (`service_tier="priority"`), matching Codex `/fast` semantics.
 
 Supported OpenAI text model ids are fixed literal unions in code, not arbitrary strings:
 
-- OpenAI API: `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.4-nano`
-- ChatGPT auth: `chatgpt-gpt-5.4`, `chatgpt-gpt-5.4-fast`, `chatgpt-gpt-5.4-mini`, `chatgpt-gpt-5.3-codex-spark`
+- OpenAI API: `gpt-5.5`, `gpt-5.5-fast`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.4-nano`
+- ChatGPT auth: `chatgpt-gpt-5.5`, `chatgpt-gpt-5.5-fast`, `chatgpt-gpt-5.4`, `chatgpt-gpt-5.4-fast`, `chatgpt-gpt-5.4-mini`, `chatgpt-gpt-5.3-codex-spark`
 
 ## JSON outputs
 
@@ -742,7 +742,7 @@ console.log(result.text);
 For read/search/write tasks in a workspace, enable `filesystemTool`. The library auto-selects a tool profile by model
 when `profile: "auto"`:
 
-- Codex-like models (`gpt-5.4`, `chatgpt-gpt-5.4`, `chatgpt-gpt-5.4-fast`, and `chatgpt-gpt-5.3-codex-spark`): Codex-compatible filesystem tool shape.
+- Codex-like models (`gpt-5.5`, `gpt-5.5-fast`, `chatgpt-gpt-5.5`, `chatgpt-gpt-5.5-fast`, `gpt-5.4`, `chatgpt-gpt-5.4`, `chatgpt-gpt-5.4-fast`, and `chatgpt-gpt-5.3-codex-spark`): Codex-compatible filesystem tool shape.
 - Gemini models: Gemini-compatible filesystem tool shape.
 - Other models: model-agnostic profile (currently Gemini-style).
 

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,7 +320,61 @@ function getGeminiImagePricing(modelId) {
   return void 0;
 }
 
+// src/openai/models.ts
+var OPENAI_MODEL_IDS = [
+  "gpt-5.5",
+  "gpt-5.5-fast",
+  "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.5",
+  "chatgpt-gpt-5.5-fast",
+  "chatgpt-gpt-5.4",
+  "chatgpt-gpt-5.4-fast",
+  "chatgpt-gpt-5.4-mini",
+  "chatgpt-gpt-5.3-codex-spark"
+];
+var FAST_MODEL_SUFFIX = "-fast";
+var OPENAI_PRIORITY_MODEL_IDS = ["gpt-5.5-fast"];
+var CHATGPT_PRIORITY_MODEL_IDS = ["chatgpt-gpt-5.5-fast", "chatgpt-gpt-5.4-fast"];
+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 stripFastSuffix(model) {
+  return model.endsWith(FAST_MODEL_SUFFIX) ? model.slice(0, -FAST_MODEL_SUFFIX.length) : model;
+}
+function resolveOpenAiProviderModel(model) {
+  return OPENAI_PRIORITY_MODEL_IDS.includes(model) ? stripFastSuffix(model) : model;
+}
+function resolveOpenAiServiceTier(model) {
+  return OPENAI_PRIORITY_MODEL_IDS.includes(model) ? "priority" : void 0;
+}
+function stripChatGptPrefix(model) {
+  if (isExperimentalChatGptModelId(model)) {
+    return model.slice(EXPERIMENTAL_CHATGPT_MODEL_PREFIX.length);
+  }
+  return model.slice("chatgpt-".length);
+}
+function resolveChatGptProviderModel(model) {
+  const providerModel = stripChatGptPrefix(model);
+  return CHATGPT_PRIORITY_MODEL_IDS.includes(model) ? stripFastSuffix(providerModel) : providerModel;
+}
+function resolveChatGptServiceTier(model) {
+  return CHATGPT_PRIORITY_MODEL_IDS.includes(model) ? "priority" : void 0;
+}
+
 // 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_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"];
@@ -327,6 +383,16 @@ var OPENAI_GPT_53_CODEX_SPARK_MODEL_IDS = [
   "chatgpt-gpt-5.3-codex-spark"
 ];
 var OPENAI_GPT_54_STANDARD_MODEL_IDS = ["gpt-5.4", "chatgpt-gpt-5.4"];
+var OPENAI_GPT_55_PRICING = {
+  inputRate: 5 / 1e6,
+  cachedRate: 0.5 / 1e6,
+  outputRate: 30 / 1e6
+};
+var OPENAI_GPT_55_PRIORITY_PRICING = {
+  inputRate: 12.5 / 1e6,
+  cachedRate: 1.25 / 1e6,
+  outputRate: 75 / 1e6
+};
 var OPENAI_GPT_54_PRICING = {
   inputRate: 2.5 / 1e6,
   cachedRate: 0.25 / 1e6,
@@ -348,6 +414,15 @@ var OPENAI_GPT_54_NANO_PRICING = {
   outputRate: 0.4 / 1e6
 };
 function getOpenAiPricing(modelId) {
+  if (isExperimentalChatGptModelId(modelId)) {
+    return OPENAI_GPT_54_PRICING;
+  }
+  if (OPENAI_GPT_55_FAST_MODEL_IDS.includes(modelId)) {
+    return OPENAI_GPT_55_PRIORITY_PRICING;
+  }
+  if (OPENAI_GPT_55_STANDARD_MODEL_IDS.includes(modelId)) {
+    return OPENAI_GPT_55_PRICING;
+  }
   if (OPENAI_GPT_54_FAST_MODEL_IDS.includes(modelId)) {
     return OPENAI_GPT_54_PRIORITY_PRICING;
   }
@@ -2832,35 +2907,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");
@@ -5058,7 +5104,11 @@ function resolveProvider(model) {
     }
   }
   if (isOpenAiModelId(model)) {
-    return { provider: "openai", model };
+    return {
+      provider: "openai",
+      model: resolveOpenAiProviderModel(model),
+      serviceTier: resolveOpenAiServiceTier(model)
+    };
   }
   throw new Error(`Unsupported text model: ${model}`);
 }
@@ -7832,6 +7882,7 @@ async function runTextCall(params) {
             {
               model: modelForProvider,
               input: openAiInput,
+              ...providerInfo.serviceTier ? { service_tier: providerInfo.serviceTier } : {},
               reasoning,
               text: openAiTextConfig,
               ...openAiTools ? { tools: openAiTools } : {},
@@ -7936,7 +7987,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);
@@ -8717,6 +8768,7 @@ async function runToolLoop(request) {
         const stepRequestPayload = {
           model: providerInfo.model,
           input: preparedInput,
+          ...providerInfo.serviceTier ? { service_tier: providerInfo.serviceTier } : {},
           ...previousResponseId ? { previous_response_id: previousResponseId } : {},
           ...openAiTools.length > 0 ? { tools: openAiTools } : {},
           ...openAiTools.length > 0 ? { parallel_tool_calls: true } : {},
@@ -8745,6 +8797,7 @@ async function runToolLoop(request) {
                 {
                   model: providerInfo.model,
                   input: preparedInput,
+                  ...providerInfo.serviceTier ? { service_tier: providerInfo.serviceTier } : {},
                   ...previousResponseId ? { previous_response_id: previousResponseId } : {},
                   ...openAiTools.length > 0 ? { tools: openAiTools } : {},
                   ...openAiTools.length > 0 ? { parallel_tool_calls: true } : {},
@@ -9142,7 +9195,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,
@@ -12752,8 +12805,11 @@ 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";
+  return normalized.includes("codex") || normalized === "gpt-5.5" || normalized === "gpt-5.5-fast" || normalized === "gpt-5.4" || normalized === "gpt-5.4-fast";
 }
 function isGeminiModel(model) {
   return model.startsWith("gemini-");
@@ -14192,6 +14248,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,
@@ -14246,6 +14303,7 @@ async function runCandidateEvolution(options) {
   getChatGptAuthProfile,
   getCurrentToolCallContext,
   isChatGptModelId,
+  isExperimentalChatGptModelId,
   isFireworksModelId,
   isGeminiImageModelId,
   isGeminiModelId,