@ljoukov/llm 3.0.2 → 3.0.3

package/dist/index.cjs

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  CHATGPT_MODEL_IDS: () => CHATGPT_MODEL_IDS,
   CODEX_APPLY_PATCH_FREEFORM_TOOL_DESCRIPTION: () => CODEX_APPLY_PATCH_FREEFORM_TOOL_DESCRIPTION,
   CODEX_APPLY_PATCH_JSON_TOOL_DESCRIPTION: () => CODEX_APPLY_PATCH_JSON_TOOL_DESCRIPTION,
   CODEX_APPLY_PATCH_LARK_GRAMMAR: () => CODEX_APPLY_PATCH_LARK_GRAMMAR,
@@ -38,8 +39,15 @@ __export(index_exports, {
   FIREWORKS_DEFAULT_KIMI_MODEL: () => FIREWORKS_DEFAULT_KIMI_MODEL,
   FIREWORKS_DEFAULT_MINIMAX_MODEL: () => FIREWORKS_DEFAULT_MINIMAX_MODEL,
   FIREWORKS_MODEL_IDS: () => FIREWORKS_MODEL_IDS,
+  GEMINI_IMAGE_MODEL_IDS: () => GEMINI_IMAGE_MODEL_IDS,
+  GEMINI_MODEL_IDS: () => GEMINI_MODEL_IDS,
+  GEMINI_TEXT_MODEL_IDS: () => GEMINI_TEXT_MODEL_IDS,
   InMemoryAgentFilesystem: () => InMemoryAgentFilesystem,
+  LLM_IMAGE_MODEL_IDS: () => LLM_IMAGE_MODEL_IDS,
+  LLM_MODEL_IDS: () => LLM_MODEL_IDS,
+  LLM_TEXT_MODEL_IDS: () => LLM_TEXT_MODEL_IDS,
   LlmJsonCallError: () => LlmJsonCallError,
+  OPENAI_MODEL_IDS: () => OPENAI_MODEL_IDS,
   appendMarkdownSourcesSection: () => appendMarkdownSourcesSection,
   applyPatch: () => applyPatch,
   configureGemini: () => configureGemini,
@@ -74,8 +82,15 @@ __export(index_exports, {
   generateText: () => generateText,
   getChatGptAuthProfile: () => getChatGptAuthProfile,
   getCurrentToolCallContext: () => getCurrentToolCallContext,
+  isChatGptModelId: () => isChatGptModelId,
   isFireworksModelId: () => isFireworksModelId,
+  isGeminiImageModelId: () => isGeminiImageModelId,
   isGeminiModelId: () => isGeminiModelId,
+  isGeminiTextModelId: () => isGeminiTextModelId,
+  isLlmImageModelId: () => isLlmImageModelId,
+  isLlmModelId: () => isLlmModelId,
+  isLlmTextModelId: () => isLlmTextModelId,
+  isOpenAiModelId: () => isOpenAiModelId,
   loadEnvFromFile: () => loadEnvFromFile,
   loadLocalEnv: () => loadLocalEnv,
   parseJsonFromLlmText: () => parseJsonFromLlmText,
@@ -263,9 +278,6 @@ function getOpenAiPricing(modelId) {
   if (modelId.includes("gpt-5.3-codex")) {
     return OPENAI_GPT_53_CODEX_PRICING;
   }
-  if (modelId.includes("gpt-5-codex")) {
-    return OPENAI_GPT_53_CODEX_PRICING;
-  }
   if (modelId.includes("gpt-5.2")) {
     return OPENAI_GPT_52_PRICING;
   }
@@ -788,6 +800,22 @@ var ResponsesWebSocketHttpError = class extends Error {
     this.headers = options.headers;
   }
 };
+var UNSUPPORTED_WEBSOCKET_STATUS_CODES = /* @__PURE__ */ new Set([400, 404, 405, 406, 426, 501]);
+var WEBSOCKET_CONNECT_TIMEOUT_MS = 3e4;
+function parseUnexpectedServerResponseStatus(message) {
+  const match = /unexpected server response:\s*(\d+)/i.exec(message);
+  if (!match) {
+    return null;
+  }
+  const status = Number(match[1]);
+  if (!Number.isFinite(status) || status <= 0) {
+    return null;
+  }
+  return status;
+}
+function supportsUnexpectedResponseEvent() {
+  return !("bun" in process.versions);
+}
 function resolveResponsesWebSocketMode(raw, fallback = "auto") {
   const value = raw?.trim().toLowerCase();
   if (value === "auto" || value === "off" || value === "only") {
@@ -822,9 +850,13 @@ function toWebSocketUrl(httpOrHttpsUrl) {
 }
 function isResponsesWebSocketUnsupportedError(error) {
   if (error instanceof ResponsesWebSocketHttpError) {
-    return [400, 404, 405, 406, 426, 501].includes(error.status);
+    return UNSUPPORTED_WEBSOCKET_STATUS_CODES.has(error.status);
   }
   const message = error instanceof Error ? error.message.toLowerCase() : "";
+  const status = parseUnexpectedServerResponseStatus(message);
+  if (status !== null) {
+    return UNSUPPORTED_WEBSOCKET_STATUS_CODES.has(status);
+  }
   return message.includes("unexpected server response: 426");
 }
 function createAdaptiveResponsesStream(options) {
@@ -1063,12 +1095,20 @@ async function createResponsesWebSocketStream(options) {
 }
 async function connectWebSocket(options) {
   return await new Promise((resolve, reject) => {
+    const shouldListenForUnexpectedResponse = supportsUnexpectedResponseEvent();
     const socket = new import_ws.default(options.url, {
       headers: options.headers,
-      handshakeTimeout: 3e4
+      handshakeTimeout: WEBSOCKET_CONNECT_TIMEOUT_MS
     });
     let settled = false;
     let responseBody = "";
+    let connectTimeout = setTimeout(() => {
+      rejectOnce(
+        new Error(
+          `Responses WebSocket connection timed out after ${WEBSOCKET_CONNECT_TIMEOUT_MS}ms.`
+        )
+      );
+    }, WEBSOCKET_CONNECT_TIMEOUT_MS);
     const rejectOnce = (error) => {
       if (settled) {
         return;
@@ -1093,9 +1133,15 @@ async function connectWebSocket(options) {
       rejectOnce(createAbortError(options.signal?.reason));
     };
     const cleanup = (removeAbortListener = true) => {
+      if (connectTimeout) {
+        clearTimeout(connectTimeout);
+        connectTimeout = null;
+      }
       socket.removeListener("open", onOpen);
       socket.removeListener("error", onError);
-      socket.removeListener("unexpected-response", onUnexpectedResponse);
+      if (shouldListenForUnexpectedResponse) {
+        socket.removeListener("unexpected-response", onUnexpectedResponse);
+      }
       if (removeAbortListener && options.signal) {
         options.signal.removeEventListener("abort", onAbort);
       }
@@ -1146,7 +1192,9 @@ async function connectWebSocket(options) {
     };
     socket.once("open", onOpen);
     socket.once("error", onError);
-    socket.once("unexpected-response", onUnexpectedResponse);
+    if (shouldListenForUnexpectedResponse) {
+      socket.once("unexpected-response", onUnexpectedResponse);
+    }
     if (options.signal) {
       if (options.signal.aborted) {
         onAbort();
@@ -1913,7 +1961,7 @@ function getGoogleAuthOptions(scopes) {
 }
 
 // src/google/client.ts
-var GEMINI_MODEL_IDS = [
+var GEMINI_TEXT_MODEL_IDS = [
   "gemini-3-pro-preview",
   "gemini-3.1-pro-preview",
   "gemini-3-flash-preview",
@@ -1921,9 +1969,17 @@ var GEMINI_MODEL_IDS = [
   "gemini-flash-latest",
   "gemini-flash-lite-latest"
 ];
+var GEMINI_IMAGE_MODEL_IDS = ["gemini-3-pro-image-preview"];
+var GEMINI_MODEL_IDS = [...GEMINI_TEXT_MODEL_IDS, ...GEMINI_IMAGE_MODEL_IDS];
 function isGeminiModelId(value) {
   return GEMINI_MODEL_IDS.includes(value);
 }
+function isGeminiTextModelId(value) {
+  return GEMINI_TEXT_MODEL_IDS.includes(value);
+}
+function isGeminiImageModelId(value) {
+  return GEMINI_IMAGE_MODEL_IDS.includes(value);
+}
 var CLOUD_PLATFORM_SCOPE = "https://www.googleapis.com/auth/cloud-platform";
 var DEFAULT_VERTEX_LOCATION = "global";
 var geminiConfiguration = {};
@@ -2342,11 +2398,51 @@ async function runOpenAiCall(fn) {
   return scheduler3.run(async () => fn(getOpenAiClient()));
 }
 
+// src/openai/models.ts
+var OPENAI_MODEL_IDS = [
+  "gpt-5.3-codex",
+  "gpt-5.3-codex-spark",
+  "gpt-5.2",
+  "gpt-5.1-codex-mini"
+];
+function isOpenAiModelId(value) {
+  return OPENAI_MODEL_IDS.includes(value);
+}
+var CHATGPT_MODEL_IDS = [
+  "chatgpt-gpt-5.3-codex",
+  "chatgpt-gpt-5.3-codex-spark",
+  "chatgpt-gpt-5.2",
+  "chatgpt-gpt-5.1-codex-mini"
+];
+function isChatGptModelId(value) {
+  return CHATGPT_MODEL_IDS.includes(value);
+}
+function stripChatGptPrefix(model) {
+  return model.slice("chatgpt-".length);
+}
+
 // src/llm.ts
 var toolCallContextStorage = new import_node_async_hooks.AsyncLocalStorage();
 function getCurrentToolCallContext() {
   return toolCallContextStorage.getStore() ?? null;
 }
+var LLM_TEXT_MODEL_IDS = [
+  ...OPENAI_MODEL_IDS,
+  ...CHATGPT_MODEL_IDS,
+  ...FIREWORKS_MODEL_IDS,
+  ...GEMINI_TEXT_MODEL_IDS
+];
+var LLM_IMAGE_MODEL_IDS = [...GEMINI_IMAGE_MODEL_IDS];
+var LLM_MODEL_IDS = [...LLM_TEXT_MODEL_IDS, ...LLM_IMAGE_MODEL_IDS];
+function isLlmTextModelId(value) {
+  return isOpenAiModelId(value) || isChatGptModelId(value) || isFireworksModelId(value) || isGeminiTextModelId(value);
+}
+function isLlmImageModelId(value) {
+  return isGeminiImageModelId(value);
+}
+function isLlmModelId(value) {
+  return isLlmTextModelId(value) || isLlmImageModelId(value);
+}
 var LlmJsonCallError = class extends Error {
   constructor(message, attempts) {
     super(message);
@@ -2704,17 +2800,22 @@ function convertLlmContentToGeminiContent(content) {
   };
 }
 function resolveProvider(model) {
-  if (model.startsWith("chatgpt-")) {
-    return { provider: "chatgpt", model: model.slice("chatgpt-".length) };
+  if (isChatGptModelId(model)) {
+    return { provider: "chatgpt", model: stripChatGptPrefix(model) };
   }
-  if (model.startsWith("gemini-")) {
+  if (isGeminiTextModelId(model) || isGeminiImageModelId(model)) {
     return { provider: "gemini", model };
   }
-  const fireworksModel = resolveFireworksModelId(model);
-  if (fireworksModel) {
-    return { provider: "fireworks", model: fireworksModel };
+  if (isFireworksModelId(model)) {
+    const fireworksModel = resolveFireworksModelId(model);
+    if (fireworksModel) {
+      return { provider: "fireworks", model: fireworksModel };
+    }
+  }
+  if (isOpenAiModelId(model)) {
+    return { provider: "openai", model };
   }
-  return { provider: "openai", model };
+  throw new Error(`Unsupported text model: ${model}`);
 }
 function isOpenAiCodexModel(modelId) {
   return modelId.includes("codex");
@@ -7298,6 +7399,7 @@ function mergeToolSets(base, extra) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  CHATGPT_MODEL_IDS,
   CODEX_APPLY_PATCH_FREEFORM_TOOL_DESCRIPTION,
   CODEX_APPLY_PATCH_JSON_TOOL_DESCRIPTION,
   CODEX_APPLY_PATCH_LARK_GRAMMAR,
@@ -7306,8 +7408,15 @@ function mergeToolSets(base, extra) {
   FIREWORKS_DEFAULT_KIMI_MODEL,
   FIREWORKS_DEFAULT_MINIMAX_MODEL,
   FIREWORKS_MODEL_IDS,
+  GEMINI_IMAGE_MODEL_IDS,
+  GEMINI_MODEL_IDS,
+  GEMINI_TEXT_MODEL_IDS,
   InMemoryAgentFilesystem,
+  LLM_IMAGE_MODEL_IDS,
+  LLM_MODEL_IDS,
+  LLM_TEXT_MODEL_IDS,
   LlmJsonCallError,
+  OPENAI_MODEL_IDS,
   appendMarkdownSourcesSection,
   applyPatch,
   configureGemini,
@@ -7342,8 +7451,15 @@ function mergeToolSets(base, extra) {
   generateText,
   getChatGptAuthProfile,
   getCurrentToolCallContext,
+  isChatGptModelId,
   isFireworksModelId,
+  isGeminiImageModelId,
   isGeminiModelId,
+  isGeminiTextModelId,
+  isLlmImageModelId,
+  isLlmModelId,
+  isLlmTextModelId,
+  isOpenAiModelId,
   loadEnvFromFile,
   loadLocalEnv,
   parseJsonFromLlmText,