@nvae/llmswitch 0.4.0 → 0.5.0

package/dist/utils/detect-format.js

@@ -0,0 +1,178 @@
+import { supportedFormats } from "../formats/compatibility.js";
+import { requestWithNodeTransport } from "../bridge/transport.js";
+import { baseUrlFromModelsEndpoint, buildModelsRequestHeaders, modelListEndpoints, parseModelIds, } from "./fetch-models.js";
+const PROBE_TIMEOUT_MS = 4000;
+async function probe(url, method, headers, proxy, body) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS);
+    try {
+        const res = await requestWithNodeTransport({
+            url,
+            method,
+            headers,
+            proxy,
+            body: body === undefined ? undefined : JSON.stringify(body),
+            signal: controller.signal,
+            totalTimeoutMs: PROBE_TIMEOUT_MS,
+        });
+        let json = null;
+        try {
+            json = await res.json();
+        }
+        catch {
+            return null;
+        }
+        return { status: res.status, json };
+    }
+    catch {
+        return null;
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
+/** GET /models（Anthropic 头）成功且返回模型 → anthropic 兼容。 */
+async function probeAnthropicModels(baseUrl, apiKey, proxy) {
+    const headers = buildModelsRequestHeaders("anthropic", apiKey);
+    for (const endpoint of modelListEndpoints(baseUrl)) {
+        const res = await probe(endpoint, "GET", headers, proxy);
+        if (res &&
+            res.status >= 200 &&
+            res.status < 300 &&
+            parseModelIds(res.json).length > 0) {
+            return true;
+        }
+    }
+    return false;
+}
+/** GET /models（Bearer 头）成功 → OpenAI 兼容。 */
+async function probeOpenAiModels(baseUrl, apiKey, proxy) {
+    const headers = buildModelsRequestHeaders("openai-chat", apiKey);
+    for (const endpoint of modelListEndpoints(baseUrl)) {
+        const res = await probe(endpoint, "GET", headers, proxy);
+        if (res &&
+            res.status >= 200 &&
+            res.status < 300 &&
+            parseModelIds(res.json).length > 0) {
+            return endpoint;
+        }
+    }
+    return null;
+}
+/**
+ * POST 探测某一路由是否存在：404/501 或非 JSON 响应视为不存在；
+ * 400/401/422/200 等带 JSON body 的响应视为路由存在。
+ */
+async function routeExists(baseUrl, suffix, apiKey, proxy, body) {
+    const base = baseUrl.trim().replace(/\/+$/, "");
+    const candidates = [];
+    if (/\/v1$/i.test(base)) {
+        candidates.push(`${base}/${suffix}`);
+    }
+    else {
+        candidates.push(`${base}/${suffix}`);
+        candidates.push(`${base}/v1/${suffix}`);
+    }
+    const headers = {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+    };
+    if (apiKey.trim())
+        headers.Authorization = `Bearer ${apiKey.trim()}`;
+    for (const endpoint of candidates) {
+        const res = await probe(endpoint, "POST", headers, proxy, body);
+        if (!res)
+            continue;
+        if (res.status === 404 || res.status === 501 || res.status === 405) {
+            continue;
+        }
+        if (res.json === null)
+            continue;
+        return true;
+    }
+    return false;
+}
+/** GET /api/tags（Ollama 原生）成功且返回模型 → 本地 Ollama。 */
+async function probeOllamaTags(baseUrl, proxy) {
+    const base = baseUrl.trim().replace(/\/+$/, "");
+    const endpoint = `${base}/api/tags`;
+    const res = await probe(endpoint, "GET", { Accept: "application/json" }, proxy);
+    return (res !== null &&
+        res.status >= 200 &&
+        res.status < 300 &&
+        parseModelIds(res.json).length > 0);
+}
+/**
+ * 自动识别上游接口类型。探测策略（每个请求 4s 超时，串行）：
+ * 1. Anthropic /models（有 Key 且工具支持时，claude/opencode 优先原生）
+ * 2. OpenAI /models（无 Key 也探测，覆盖 Ollama /vLLM 等本地服务）
+ * 3. Ollama 原生 /api/tags（兼容 OpenAI 兼容层缺失的旧版本）
+ * 4. /models 全失败且有 Key 时兜底探测 /v1/chat/completions 路由
+ * 全部失败返回 detected: false，由调用方回退到人工选择。
+ */
+export async function detectApiFormat(tool, opts) {
+    const base = opts.baseUrl.trim();
+    const key = opts.apiKey.trim();
+    const supported = supportedFormats(tool);
+    const fallback = {
+        apiFormat: "openai-chat",
+        detected: false,
+    };
+    // 没有 URL 无法探测
+    if (!base)
+        return fallback;
+    const chatResult = {
+        apiFormat: "openai-chat",
+        bridgeMode: tool === "codex" ? "chat" : undefined,
+        detected: true,
+        source: "openai-models",
+    };
+    if (key && supported.includes("anthropic")) {
+        const antOk = await probeAnthropicModels(base, key, opts.proxy);
+        if (antOk) {
+            return {
+                apiFormat: "anthropic",
+                detected: true,
+                source: "anthropic",
+                resolvedBaseUrl: base.replace(/\/+$/, ""),
+            };
+        }
+    }
+    const modelsEndpoint = await probeOpenAiModels(base, key, opts.proxy);
+    if (modelsEndpoint) {
+        const resolvedBaseUrl = baseUrlFromModelsEndpoint(modelsEndpoint) || base.replace(/\/+$/, "");
+        // 无 Key 时不做 POST 探测（本地服务默认 chat 最兼容）
+        if (key && supported.includes("openai-responses")) {
+            const responsesOk = await routeExists(resolvedBaseUrl, "responses", key, opts.proxy, { model: "", input: "hi" });
+            if (responsesOk) {
+                return {
+                    apiFormat: "openai-responses",
+                    detected: true,
+                    source: "openai-models",
+                    resolvedBaseUrl,
+                };
+            }
+        }
+        return { ...chatResult, resolvedBaseUrl };
+    }
+    // Ollama 原生 API（/v1 兼容层可能缺失）：映射到 OpenAI Chat + /v1
+    if (supported.includes("openai-chat")) {
+        const ollamaOk = await probeOllamaTags(base, opts.proxy);
+        if (ollamaOk) {
+            return {
+                ...chatResult,
+                source: "ollama-tags",
+                resolvedBaseUrl: `${base.replace(/\/+$/, "")}/v1`,
+            };
+        }
+    }
+    if (key && supported.includes("openai-chat")) {
+        const chatOk = await routeExists(base, "chat/completions", key, opts.proxy, {
+            model: "",
+            messages: [],
+        });
+        if (chatOk)
+            return { ...chatResult, source: "openai-route" };
+    }
+    return fallback;
+}

package/dist/utils/fetch-models.js

@@ -104,11 +104,17 @@ export async function fetchModelList(options) {
     if (!baseUrl?.trim()) {
         throw new Error("Base URL 为空，无法拉取模型列表");
     }
-    if (!apiKey?.trim()) {
-        throw new Error("API Key 为空，无法拉取模型列表");
-    }
     const effectiveBaseUrl = normalizeBaseUrlForFormat(apiFormat, baseUrl);
     const endpoints = modelListEndpoints(effectiveBaseUrl);
+    // 无 Key 的本地服务（如 Ollama 原生 API）兜底探测 /api/tags
+    if (!apiKey?.trim()) {
+        const root = effectiveBaseUrl
+            .replace(/\/v1$/i, "")
+            .replace(/\/+$/, "");
+        const tags = `${root}/api/tags`;
+        if (!endpoints.includes(tags))
+            endpoints.push(tags);
+    }
     const headers = buildModelsRequestHeaders(apiFormat, apiKey.trim(), customHeaders);
     const errors = [];
     for (const endpoint of endpoints) {

package/dist/utils/version.js

@@ -0,0 +1,9 @@
+import { readFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const packageJsonPath = resolve(__dirname, "../../package.json");
+export function getVersion() {
+    const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+    return pkg.version ?? "unknown";
+}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@nvae/llmswitch",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "CLI to switch LLM providers and models for Claude Code, Codex, and OpenCode",
   "type": "module",
   "bin": {
     "llms": "dist/index.js",
+    "llm-switch": "dist/index.js",
     "llmswitch": "dist/index.js"
   },
   "files": [