mslxdff 0.1.70 → 0.1.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.70",
+  "version": "0.1.71",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {

package/src/bench/probe.js

@@ -1,7 +1,16 @@
 import { joinUrl } from "../providers/base.js";
+import { getCustomNormalizer } from "../providers/registry.js";
 
-function normalizeModelsPayload(json) {
+function normalizeModelsPayload(json, baseUrl = "") {
   if (!json) return [];
+  // 可扩展：优先走注册表的定制化解析（如 cline.bot 仅 free）
+  try {
+    const custom = getCustomNormalizer(baseUrl);
+    if (custom) {
+      const v = custom(json);
+      if (Array.isArray(v)) return v;
+    }
+  } catch {}
   if (Array.isArray(json)) return json;
   if (Array.isArray(json.data)) return json.data;
   if (Array.isArray(json.models)) return json.models;

package/src/bench/runner.js

@@ -31,7 +31,10 @@ export async function runOne({
   if (!model) return { id: model, ok: false, error: "missing model", label: "配置错误", ttfbMs: null, totalMs: 0, tps: null, charsPerSec: null, tokens: null };
   if (!apiKey) return { id: model, ok: false, error: "missing apiKey", label: "未配置 Key", ttfbMs: null, totalMs: 0, tps: null, charsPerSec: null, tokens: null };
   const url = joinUrl(String(baseUrl).replace(/\/+$/, ""), chatPath);
-  const body = { model: String(model).split("/").pop(), stream: false, messages: [{ role: "user", content: prompt }], max_tokens: maxTokens };
+  let rawModel = String(model || "").trim();
+  // allowlist 已是 raw（如 z-ai/glm-5.3-flash），仅当带供应商前缀时才剥
+  if (providerId && rawModel.startsWith(`${providerId}/`)) rawModel = rawModel.slice(providerId.length + 1);
+  const body = { model: rawModel, stream: false, messages: [{ role: "user", content: prompt }], max_tokens: maxTokens };
   // workbuddy 需额外 workbuddy 透传头由调用方 headers 注入；此处直接透传
   const finalHeaders = { "Content-Type": "application/json", Accept: "application/json", ...headers };
   if (apiKey && !finalHeaders.Authorization) finalHeaders.Authorization = `Bearer ${apiKey}`;

package/src/chat/repl.js

@@ -237,7 +237,8 @@ function printFooter({ model, provider, latency, usage, totalMs, fallback, fallb
   try { gw = collectStats(); } catch {}
   const prov = provider && provider !== "opencode" ? `${provider}/` : "";
   const baseLabel = model ? `${prov}${model}` : "—";
-  const modelLabel = model ? (fallbackGateway || viaGateway ? `${baseLabel} (gateway auto)` : baseLabel) : "—";
+  const via = provider && !baseLabel.startsWith(`${provider}/`) ? `: ${provider}` : "";
+  const modelLabel = model ? (fallbackGateway || viaGateway ? `${baseLabel} (gateway auto${via})` : baseLabel) : "—";
   const latLabel = latency ? `${latency}ms` : "—";
   const totalLabel = totalMs ? ` · 总耗时 ${totalMs}ms` : "";
   const tokLabel = usage ? ` · tokens ${usage.prompt_tokens ?? "?"}→${usage.completion_tokens ?? "?"}` : "";

package/src/providers/cline.js

@@ -0,0 +1,112 @@
+import { createKeyRing } from "./keyring.js";
+import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath } from "../state.js";
+import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createChatRunner, createPreheatRunner } from "./base.js";
+import { joinModelId } from "./model-id.js";
+
+const { UndiciFetch } = getUndici();
+
+function resolveBaseUrl(id, baseUrl) {
+  if (baseUrl) return String(baseUrl).trim().replace(/\/+$/, "");
+  const env = loadProviderBaseUrl(id);
+  if (env) return env;
+  return "https://api.cline.bot";
+}
+
+function isClineBotHost(baseUrl) {
+  try {
+    const u = new URL(baseUrl);
+    return u.hostname === "api.cline.bot" || u.hostname.endsWith(".cline.bot");
+  } catch { return String(baseUrl).includes("cline.bot"); }
+}
+
+export function createClineProvider({
+  id = "cline",
+  baseUrl,
+  apiKeys,
+  apiKey,
+  modelsPath,
+  chatPath,
+  connectTimeoutMs = Number(process.env.MSLXDFF_CLINE_TIMEOUT_MS) || 30_000,
+  cooldownMs = envInt("MSLXDFF_CLINE_COOLDOWN_MS", 30_000),
+  retry = {
+    network: { attempts: 2, delayMs: 300 },
+    429: { attempts: 1, delayMs: 100 },
+    502: { attempts: 1, delayMs: 100 },
+    503: { attempts: 1, delayMs: 100 },
+    504: { attempts: 1, delayMs: 100 },
+  },
+  fetchImpl,
+} = {}) {
+  const resolvedBase = resolveBaseUrl(id, baseUrl);
+  const resolvedModelsPath = modelsPath || loadProviderModelsPath(id) || "/ai/cline/recommended-models";
+  // base 已含 /api/v1 时，chat 仅需 /chat/completions，否则会拼成 /api/v1/v1/...
+  const defaultChat = String(resolvedBase).includes("/api/v1") ? "/chat/completions" : "/v1/chat/completions";
+  const resolvedChatPath = chatPath || loadProviderChatPath(id) || defaultChat;
+  if (!fetchImpl) fetchImpl = UndiciFetch || fetch;
+  const ring = createKeyRing(collectApiKeysGeneric(id, apiKeys, apiKey, loadProviderKeys), { cooldownMs });
+
+  let dispatcher = null;
+  let agent = null;
+  const a = createAgent({
+    keepAliveTimeout: envInt("MSLXDFF_CLINE_KEEPALIVE_TIMEOUT", 30_000),
+    keepAliveMaxTimeout: envInt("MSLXDFF_CLINE_KEEPALIVE_MAX_TIMEOUT", 60_000),
+    connections: envInt("MSLXDFF_CLINE_KEEPALIVE_CONNECTIONS", 20),
+  });
+  agent = a.agent; dispatcher = a.dispatcher;
+
+  function buildHeaders(body, key) {
+    const isStream = body?.stream !== false;
+    return {
+      "Content-Type": "application/json",
+      Accept: isStream ? "text/event-stream" : "*/*",
+      "User-Agent": "mslxdff",
+      ...(key ? { Authorization: `Bearer ${key}` } : {}),
+    };
+  }
+
+  const { runChat } = createChatRunner({
+    id, ring, cooldownMs, retry, fetchImpl, dispatcher, buildHeaders,
+    getUrl: () => joinUrl(resolvedBase, resolvedChatPath),
+    connectTimeoutMs,
+  });
+
+  async function chat(body) { return runChat(body, ring, `MSLXDFF_${id.toUpperCase()}_KEY`); }
+  async function chatWithKeys(body, keys) {
+    const tmp = createKeyRing(keys, { cooldownMs });
+    return runChat(body, tmp, "shared provider keys");
+  }
+
+  async function listModels() {
+    const url = joinUrl(resolvedBase, resolvedModelsPath);
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(new Error(`${id} models timed out`)), 15_000);
+    try {
+      const headers = { Accept: "application/json" };
+      const key = ring.next();
+      if (key) headers["Authorization"] = `Bearer ${key}`;
+      const opts = { headers, signal: controller.signal };
+      if (dispatcher) opts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, opts);
+      if (!res.ok) return [];
+      const json = await res.json().catch(() => ({}));
+      // 定制：cline.bot 域名时，仅取 free 数组；其他回退通用
+      if (isClineBotHost(resolvedBase) && Array.isArray(json.free)) {
+        return json.free.filter((m) => m && typeof m.id === "string").map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+      }
+      const raw = Array.isArray(json.data) ? json.data : Array.isArray(json.models) ? json.models : Array.isArray(json) ? json : [];
+      return raw.filter((m) => m && typeof m.id === "string").map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+    } catch {
+      return [];
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  const { preheat } = createPreheatRunner({
+    dispatcher, fetchImpl, getUrl: () => joinUrl(resolvedBase, resolvedModelsPath),
+    id, ring, loadKeys: loadProviderKeys,
+  });
+
+  async function close() { if (agent?.close) try { await agent.close(); } catch {} }
+  return { id, chat, chatWithKeys, listModels, preheat, close, agent, keyRing: ring, baseUrl: resolvedBase };
+}

package/src/providers/registry.js

@@ -0,0 +1,41 @@
+/**
+ * 可扩展供应商注册表：新增特殊供应商时，仅在此文件注册 + 新增对应 provider 文件即可
+ * 每个条目：{ id, match(id, baseUrl) => bool, load() => Promise<factory> }
+ * 匹配优先级：按数组顺序，首个命中即用；未命中走通用 generic
+ */
+
+export const customProviders = [
+  {
+    id: "workbuddy",
+    match: (id, baseUrl) => id === "workbuddy" || String(baseUrl).includes("copilot.tencent"),
+    load: () => import("./workbuddy.js").then((m) => m.createWorkbuddyProvider),
+  },
+  {
+    id: "cline",
+    match: (id, baseUrl) => id === "cline" || id === "clinebot" || String(baseUrl).includes("cline.bot"),
+    load: () => import("./cline.js").then((m) => m.createClineProvider),
+  },
+];
+
+// 供 bench/probe 等需要定制化解析模型列表的场景
+export const customNormalizers = [
+  {
+    id: "cline",
+    match: (baseUrl) => String(baseUrl).includes("cline.bot"),
+    normalize: (json) => Array.isArray(json?.free) ? json.free : null,
+  },
+];
+
+export async function getCustomProviderFactory(id, baseUrl) {
+  for (const entry of customProviders) {
+    try { if (entry.match(id, baseUrl)) return await entry.load(); } catch {}
+  }
+  return null;
+}
+
+export function getCustomNormalizer(baseUrl) {
+  for (const entry of customNormalizers) {
+    try { if (entry.match(baseUrl)) return entry.normalize; } catch {}
+  }
+  return null;
+}

package/src/runtime/bootstrap.js

@@ -76,24 +76,28 @@ export async function startDaemonMain(VERSION) {
     const genericConfigs = loadProviderConfigs();
     for (const [gid, cfg] of Object.entries(genericConfigs)) {
       if (gid === "opencode" || gid === "openrouter") continue;
-      if (gid === "workbuddy") {
-        const base = String(cfg?.baseUrl || "").trim() || "https://copilot.tencent.com";
-        const keys = Array.isArray(cfg?.keys) ? cfg.keys.filter((k) => typeof k === "string" && k.trim()) : [];
-        const auths = Array.isArray(cfg?.auths) ? cfg.auths : [];
-        if (!keys.length) continue;
+      const base = String(cfg?.baseUrl || "").trim();
+      const keys = Array.isArray(cfg?.keys) ? cfg.keys.filter((k) => typeof k === "string" && k.trim()) : [];
+      const auths = Array.isArray(cfg?.auths) ? cfg.auths : [];
+      // 可扩展：优先走注册表定制 provider（如 workbuddy、cline），新增供应商仅需在 registry.js 注册
+      const { getCustomProviderFactory } = await import("../providers/registry.js");
+      const customFactory = await getCustomProviderFactory(gid, base);
+      if (customFactory) {
+        if (gid === "workbuddy" && !keys.length) continue;
+        if (gid !== "workbuddy" && (!base || !keys.length)) continue;
         try {
-          const { createWorkbuddyProvider } = await import("../providers/workbuddy.js");
-          providers.push(createWorkbuddyProvider({ baseUrl: base, apiKeys: keys, auths }));
-          console.log(`provider enabled: workbuddy (${keys.length} key${keys.length > 1 ? "s" : ""}) baseUrl=${base}`);
-          appendEvent({ ts: Date.now(), type: "provider-enabled", provider: gid, keys: keys.length, baseUrl: base });
+          const provider = gid === "workbuddy"
+            ? await customFactory({ baseUrl: base || "https://copilot.tencent.com", apiKeys: keys, auths })
+            : await customFactory({ id: gid, baseUrl: base, apiKeys: keys });
+          providers.push(provider);
+          console.log(`provider enabled: ${gid} (${keys.length} key${keys.length > 1 ? "s" : ""}) baseUrl=${base || provider.baseUrl} [custom]`);
+          appendEvent({ ts: Date.now(), type: "provider-enabled", provider: gid, keys: keys.length, baseUrl: base || provider.baseUrl });
         } catch (err) {
           console.log(`provider ${gid} failed: ${err?.message || err}`);
           appendEvent({ ts: Date.now(), type: "provider-error", provider: gid, error: String(err?.message || err) });
         }
         continue;
       }
-      const base = String(cfg?.baseUrl || "").trim();
-      const keys = Array.isArray(cfg?.keys) ? cfg.keys.filter((k) => typeof k === "string" && k.trim()) : [];
       if (!base || !keys.length) continue;
       try {
         const { createGenericProvider } = await import("../providers/generic.js");