@nvae/llmswitch 1.0.0 → 1.2.0

package/dist/bridge/server.js

@@ -6,6 +6,7 @@ import { anthropicToChatRequest } from "./anthropic-translate-request.js";
 import { chatChunkToAnthropicEvents, chatCompletionToAnthropicMessage, createAnthropicStreamState, forceCompleteAnthropicStream, parseChatSseLine, } from "./anthropic-translate-response.js";
 import { collectCustomToolNames, responsesToChatRequest, responsesToCompletionsRequest, } from "./translate-request.js";
 import { chatChunkToResponsesEvents, chatCompletionToResponse, createStreamState, forceCompleteStream, parseChatSseLine as parseChatSseLineResponses, } from "./translate-response.js";
+import { modelItemId, modelsFromPayload } from "../utils/fetch-models.js";
 function headerValue(value) {
     return Array.isArray(value) ? value[0] : value;
 }
@@ -149,8 +150,7 @@ async function fetchModelsJson(upstream) {
     }
     try {
         const json = (await response.json());
-        const data = Array.isArray(json.data) ? json.data : [];
-        return { ok: true, status: 200, data: data };
+        return { ok: true, status: 200, data: modelsFromPayload(json) };
     }
     catch {
         return { ok: false, status: 502, data: [] };
@@ -175,13 +175,14 @@ async function proxyModelsMerged(_req, res, upstreams) {
         if (!result.ok)
             continue;
         for (const item of result.data) {
-            const id = item && typeof item === "object" && "id" in item
-                ? String(item.id)
-                : "";
+            const id = modelItemId(item);
             if (!id || seen.has(id))
                 continue;
             seen.add(id);
-            merged.push(item);
+            const row = item && typeof item === "object"
+                ? item
+                : {};
+            merged.push(row.id ? item : { ...row, id });
         }
     }
     if (!merged.length && results.every((r) => !r.ok)) {

package/dist/utils/fetch-models.js

@@ -69,7 +69,25 @@ export function buildModelsRequestHeaders(apiFormat, apiKey, customHeaders = {})
     }
     return headers;
 }
-export function parseModelIds(payload) {
+/**
+ * Extract a model identifier from a list item. Providers disagree on the field
+ * name: OpenAI uses `id`, some gateways `name`/`model`, and Codex-style
+ * catalogs (e.g. BigModel) use `slug`.
+ */
+export function modelItemId(item) {
+    if (typeof item === "string")
+        return item.trim();
+    if (!item || typeof item !== "object")
+        return "";
+    const row = item;
+    const id = row.id ?? row.name ?? row.model ?? row.slug;
+    return typeof id === "string" ? id.trim() : "";
+}
+/**
+ * Collect the model-array buckets from a /models payload, accepting the common
+ * `data` and `models` shapes plus a bare array.
+ */
+export function modelsFromPayload(payload) {
     if (!payload || typeof payload !== "object")
         return [];
     const root = payload;
@@ -80,18 +98,14 @@ export function parseModelIds(payload) {
         buckets.push(...root.models);
     if (Array.isArray(payload))
         buckets.push(...payload);
+    return buckets;
+}
+export function parseModelIds(payload) {
     const ids = new Set();
-    for (const item of buckets) {
-        if (typeof item === "string" && item.trim()) {
-            ids.add(item.trim());
-            continue;
-        }
-        if (!item || typeof item !== "object")
-            continue;
-        const row = item;
-        const id = row.id ?? row.name ?? row.model;
-        if (typeof id === "string" && id.trim())
-            ids.add(id.trim());
+    for (const item of modelsFromPayload(payload)) {
+        const id = modelItemId(item);
+        if (id)
+            ids.add(id);
     }
     return Array.from(ids).sort((a, b) => a.localeCompare(b));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nvae/llmswitch",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "CLI to switch LLM providers and models for Claude Code, Codex, and OpenCode",
   "type": "module",
   "bin": {