mslxdff 0.1.203 → 0.1.207

package/src/providers/cline/index.js

@@ -1,130 +1,130 @@
-import { createKeyRing } from "../keyring.js";
-  import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath, saveProviderConfig, loadProviderAuths, loadProviderAllowedModels, saveProviderAllowedModels, normalizeAllowedModel } from "../../state.js";
-import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createChatRunner } from "../base.js";
-import { compatFetch } from "../../compat.js";
-import { joinModelId } from "../model-id.js";
-import { logDir } from "../../logs.js";
-import { join } from "node:path";
-import { createAuthPool } from "./auth.js";
-import { clineHeaders, isRefreshToken } from "./headers.js";
-import { createChatService } from "./chat.js";
-import { createModelsService } from "./models.js";
-import { createAllowlistSync } from "./allowlist-sync.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";
-}
-
-export function createClineProvider({
-  id = "cline",
-  baseUrl,
-  apiKeys,
-  apiKey,
-  modelsPath,
-  chatPath,
-  snapshotPath,
-  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,
-  file,
-} = {}) {
-  const resolvedBase = resolveBaseUrl(id, baseUrl);
-  const _cfgModels = modelsPath ? null : loadProviderModelsPath(id, file ? { file } : {});
-  const resolvedModelsPath = modelsPath || (_cfgModels && _cfgModels !== "/models" ? _cfgModels : null) || "/ai/cline/recommended-models";
-  const defaultChat = String(resolvedBase).includes("/api/v1") ? "/chat/completions" : "/api/v1/chat/completions";
-  const resolvedChatPath = chatPath || loadProviderChatPath(id, file ? { file } : {}) || defaultChat;
-  if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
-
-  const rawKeys = collectApiKeysGeneric(id, apiKeys, apiKey, (pid) => loadProviderKeys(pid, file ? { file } : {}));
-  const allKeys = [...new Set(rawKeys.map((k) => String(k).trim()).filter(Boolean))];
-  const hasRefresh = allKeys.some((k) => isRefreshToken(k, id));
-  const ring = createKeyRing(allKeys.filter((k) => !isRefreshToken(k, id)), { 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;
-
-  // 旧直连模式（兼容 sk_ 匿名）
-  function buildHeadersOld(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 oldRunner = createChatRunner({ id, ring, cooldownMs, retry, fetchImpl, dispatcher, buildHeaders: buildHeadersOld, getUrl: () => joinUrl(resolvedBase, resolvedChatPath), connectTimeoutMs });
-
-  // 新 refreshToken 模式
-  let authPool = null; let newChatSvc = null;
-  if (hasRefresh) {
-    const refreshTokens = allKeys.filter((k) => isRefreshToken(k, id));
-    authPool = createAuthPool({
-      id, keys: refreshTokens, fetchImpl, dispatcher, baseUrl: resolvedBase, file,
-      saveFn: async ({ oldRefreshToken, newRefreshToken }) => {
-        try {
-          const cur = loadProviderKeys(id, file ? { file } : {});
-          const idx = cur.indexOf(oldRefreshToken);
-          if (idx >= 0) {
-            const next = [...cur]; next[idx] = newRefreshToken;
-            // 优先写 providerConfigs，兼容旧路径由 saveProviderConfig 处理；auths 邮箱映射同步新串防漂移
-            let auths;
-            try {
-              const list = loadProviderAuths(id, file ? { file } : {});
-              const ai = list.findIndex((a) => String(a?.refreshToken || "") === String(oldRefreshToken || ""));
-              if (ai >= 0) { auths = [...list]; auths[ai] = { ...auths[ai], refreshToken: newRefreshToken }; }
-            } catch {}
-            saveProviderConfig(id, { baseUrl: resolvedBase, keys: next, ...(auths ? { auths } : {}) }, file ? { file } : {});
-          }
-          // 只回写 cline 自己（旧 id 轮换回写已随 id 统一删除，见 .scratch/cline-unify/SPEC.md §4.1）
-        } catch {}
-      },
-    });
-    newChatSvc = createChatService({ id, baseUrl: resolvedBase, chatPath: resolvedChatPath, fetchImpl, dispatcher, authPool, connectTimeoutMs, retry });
-  }
-
-  async function chat(body) {
-    if (hasRefresh && newChatSvc) return newChatSvc.runChat(body, ring, id);
-    return oldRunner.runChat(body, ring, `MSLXDFF_${id.toUpperCase()}_KEY`);
-  }
-
-  async function chatWithKeys(body, keys) {
-    const refreshSubset = (keys || []).filter((k) => isRefreshToken(k, id));
-    if (refreshSubset.length && hasRefresh) {
-      const tmpPool = createAuthPool({ id, keys: refreshSubset, fetchImpl, dispatcher, baseUrl: resolvedBase, file });
-      const tmpSvc = createChatService({ id, baseUrl: resolvedBase, chatPath: resolvedChatPath, fetchImpl, dispatcher, authPool: tmpPool, connectTimeoutMs, retry });
-      return tmpSvc.runChat(body, createKeyRing([], { cooldownMs }), "shared");
-    }
-    const tmpRing = createKeyRing((keys || []).filter((k) => !isRefreshToken(k, id)), { cooldownMs });
-    return oldRunner.runChat(body, tmpRing, "shared provider keys");
-  }
-
-  // 快照文件供 daemon 启动自检 free 列表增删（默认 logDir 下，gitignored；测试可注入 tmp 路径）
-  // 白名单 auto-sync（上游列表 = 真相）：每次成功取 recommended-models 后，把 free + clinePass
-  // 并进 providerConfigs.cline.allowedModels，只增不减——解决上游新上架/换通道的免费模型被静态快照拦成 blocked。
-  // persist 复用 saveProviderAllowedModels（保留 keys/auths/baseUrl，并保留 allowAnyModels）。
-  // 关掉：MSLXDFF_CLINE_AUTOSYNC=0；无新增不写盘。
-  const allowlistSync = createAllowlistSync({
-    providerId: id,
-    loadCurrent: () => loadProviderAllowedModels(id, file ? { file } : {}),
-    persist: (pid, list) => saveProviderAllowedModels(pid, list, file ? { file } : {}),
-    normalize: normalizeAllowedModel,
-    onLog: (msg) => console.log(msg),
-  });
-  const modelsSvc = createModelsService({ id, baseUrl: resolvedBase, modelsPath: resolvedModelsPath, fetchImpl, dispatcher, ring, loadKeys: (pid) => loadProviderKeys(pid, file ? { file } : {}), snapshotPath: snapshotPath || join(logDir(), "cline-free.json"), onModelsRefreshed: (list) => allowlistSync.syncIds(list) });
-
-  async function listModels() {
-    const list = await modelsSvc.listModels();
-    // 若新模式且上游返回 free，再尝试带 token 的 models（兼容私有）
-    return list;
-  }
-
-  const { preheat, checkFreeUpdates } = (() => {
-    try { return modelsSvc; } catch { return { preheat: async () => ({ ok: false }), checkFreeUpdates: async () => ({ ok: false }) }; }
-  })();
-
-  async function close() { if (agent?.close) try { await agent.close(); } catch {} }
-  return { id, chat, chatWithKeys, listModels, preheat, checkFreeUpdates, close, agent, keyRing: ring, baseUrl: resolvedBase, _authPool: authPool };
-}
+import { createKeyRing } from "../keyring.js";
+  import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath, saveProviderConfig, loadProviderAuths, loadProviderAllowedModels, saveProviderAllowedModels, normalizeAllowedModel } from "../../state.js";
+import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createChatRunner } from "../base.js";
+import { compatFetch } from "../../compat.js";
+import { joinModelId } from "../model-id.js";
+import { logDir } from "../../logs.js";
+import { join } from "node:path";
+import { createAuthPool } from "./auth.js";
+import { clineHeaders, isRefreshToken } from "./headers.js";
+import { createChatService } from "./chat.js";
+import { createModelsService } from "./models.js";
+import { createAllowlistSync } from "./allowlist-sync.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";
+}
+
+export function createClineProvider({
+  id = "cline",
+  baseUrl,
+  apiKeys,
+  apiKey,
+  modelsPath,
+  chatPath,
+  snapshotPath,
+  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,
+  file,
+} = {}) {
+  const resolvedBase = resolveBaseUrl(id, baseUrl);
+  const _cfgModels = modelsPath ? null : loadProviderModelsPath(id, file ? { file } : {});
+  const resolvedModelsPath = modelsPath || (_cfgModels && _cfgModels !== "/models" ? _cfgModels : null) || "/ai/cline/recommended-models";
+  const defaultChat = String(resolvedBase).includes("/api/v1") ? "/chat/completions" : "/api/v1/chat/completions";
+  const resolvedChatPath = chatPath || loadProviderChatPath(id, file ? { file } : {}) || defaultChat;
+  if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
+
+  const rawKeys = collectApiKeysGeneric(id, apiKeys, apiKey, (pid) => loadProviderKeys(pid, file ? { file } : {}));
+  const allKeys = [...new Set(rawKeys.map((k) => String(k).trim()).filter(Boolean))];
+  const hasRefresh = allKeys.some((k) => isRefreshToken(k, id));
+  const ring = createKeyRing(allKeys.filter((k) => !isRefreshToken(k, id)), { 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;
+
+  // 旧直连模式（兼容 sk_ 匿名）
+  function buildHeadersOld(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 oldRunner = createChatRunner({ id, ring, cooldownMs, retry, fetchImpl, dispatcher, buildHeaders: buildHeadersOld, getUrl: () => joinUrl(resolvedBase, resolvedChatPath), connectTimeoutMs });
+
+  // 新 refreshToken 模式
+  let authPool = null; let newChatSvc = null;
+  if (hasRefresh) {
+    const refreshTokens = allKeys.filter((k) => isRefreshToken(k, id));
+    authPool = createAuthPool({
+      id, keys: refreshTokens, fetchImpl, dispatcher, baseUrl: resolvedBase, file,
+      saveFn: async ({ oldRefreshToken, newRefreshToken }) => {
+        try {
+          const cur = loadProviderKeys(id, file ? { file } : {});
+          const idx = cur.indexOf(oldRefreshToken);
+          if (idx >= 0) {
+            const next = [...cur]; next[idx] = newRefreshToken;
+            // 优先写 providerConfigs，兼容旧路径由 saveProviderConfig 处理；auths 邮箱映射同步新串防漂移
+            let auths;
+            try {
+              const list = loadProviderAuths(id, file ? { file } : {});
+              const ai = list.findIndex((a) => String(a?.refreshToken || "") === String(oldRefreshToken || ""));
+              if (ai >= 0) { auths = [...list]; auths[ai] = { ...auths[ai], refreshToken: newRefreshToken }; }
+            } catch {}
+            saveProviderConfig(id, { baseUrl: resolvedBase, keys: next, ...(auths ? { auths } : {}) }, file ? { file } : {});
+          }
+          // 只回写 cline 自己（旧 id 轮换回写已随 id 统一删除，见 .scratch/cline-unify/SPEC.md §4.1）
+        } catch {}
+      },
+    });
+    newChatSvc = createChatService({ id, baseUrl: resolvedBase, chatPath: resolvedChatPath, fetchImpl, dispatcher, authPool, connectTimeoutMs, retry });
+  }
+
+  async function chat(body) {
+    if (hasRefresh && newChatSvc) return newChatSvc.runChat(body, ring, id);
+    return oldRunner.runChat(body, ring, `MSLXDFF_${id.toUpperCase()}_KEY`);
+  }
+
+  async function chatWithKeys(body, keys) {
+    const refreshSubset = (keys || []).filter((k) => isRefreshToken(k, id));
+    if (refreshSubset.length && hasRefresh) {
+      const tmpPool = createAuthPool({ id, keys: refreshSubset, fetchImpl, dispatcher, baseUrl: resolvedBase, file });
+      const tmpSvc = createChatService({ id, baseUrl: resolvedBase, chatPath: resolvedChatPath, fetchImpl, dispatcher, authPool: tmpPool, connectTimeoutMs, retry });
+      return tmpSvc.runChat(body, createKeyRing([], { cooldownMs }), "shared");
+    }
+    const tmpRing = createKeyRing((keys || []).filter((k) => !isRefreshToken(k, id)), { cooldownMs });
+    return oldRunner.runChat(body, tmpRing, "shared provider keys");
+  }
+
+  // 快照文件供 daemon 启动自检 free 列表增删（默认 logDir 下，gitignored；测试可注入 tmp 路径）
+  // 白名单 auto-sync（上游列表 = 真相）：每次成功取 recommended-models 后，把 free + clinePass
+  // 并进 providerConfigs.cline.allowedModels，只增不减——解决上游新上架/换通道的免费模型被静态快照拦成 blocked。
+  // persist 复用 saveProviderAllowedModels（保留 keys/auths/baseUrl，并保留 allowAnyModels）。
+  // 关掉：MSLXDFF_CLINE_AUTOSYNC=0；无新增不写盘。
+  const allowlistSync = createAllowlistSync({
+    providerId: id,
+    loadCurrent: () => loadProviderAllowedModels(id, file ? { file } : {}),
+    persist: (pid, list) => saveProviderAllowedModels(pid, list, file ? { file } : {}),
+    normalize: normalizeAllowedModel,
+    onLog: (msg) => console.log(msg),
+  });
+  const modelsSvc = createModelsService({ id, baseUrl: resolvedBase, modelsPath: resolvedModelsPath, fetchImpl, dispatcher, ring, loadKeys: (pid) => loadProviderKeys(pid, file ? { file } : {}), snapshotPath: snapshotPath || join(logDir(), "cline-free.json"), onModelsRefreshed: (list) => allowlistSync.syncIds(list) });
+
+  async function listModels() {
+    const list = await modelsSvc.listModels();
+    // 若新模式且上游返回 free，再尝试带 token 的 models（兼容私有）
+    return list;
+  }
+
+  const { preheat, checkFreeUpdates } = (() => {
+    try { return modelsSvc; } catch { return { preheat: async () => ({ ok: false }), checkFreeUpdates: async () => ({ ok: false }) }; }
+  })();
+
+  async function close() { if (agent?.close) try { await agent.close(); } catch {} }
+  return { id, chat, chatWithKeys, listModels, preheat, checkFreeUpdates, close, agent, keyRing: ring, baseUrl: resolvedBase, _authPool: authPool };
+}

package/src/providers/cline/models.js

@@ -1,150 +1,150 @@
-import { joinUrl, getUndici } from "../base.js";
-import { compatFetch } from "../../compat.js";
-import { joinModelId } from "../model-id.js";
-import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
-import { dirname } from "node:path";
-import { fetchFreeCatalog, catalogUrl, FALLBACK_FREE as BUNDLED_FREE } from "./free-catalog.js";
-
-const { UndiciFetch } = getUndici();
-
-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 createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispatcher, ring, loadKeys, snapshotPath, onModelsRefreshed } = {}) {
-  // 白名单 auto-sync 通知：只在上游成功取数后调用（内置兜底不是上游真相，不触发）。
-  // 异常一律吞掉——同步是增益动作，绝不打断模型列表读取与请求链路。
-  function notifyRefresh(list) {
-    if (!onModelsRefreshed) return;
-    try {
-      const r = onModelsRefreshed(list);
-      if (r && typeof r.catch === "function") r.catch(() => {});
-    } catch {}
-  }
-  if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
-  const resolvedBase = String(baseUrl).trim().replace(/\/+$/, "");
-  const resolvedPath = modelsPath || "/ai/cline/recommended-models";
-  const CACHE_TTL = 10 * 60 * 1000;
-  let cache = null;
-  let fetchedAt = 0;
-
-  // 离线兜底：与上游 recommended-models 的 free 对齐（常量在 free-catalog.js，2026-09-20 实测 5 个）。
-  // 上游挂了/401 时也不返回空数组，保证 -provider cline models 与 picks 仍有免费可用。
-
-  function fallbackList() {
-    const out = BUNDLED_FREE.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
-    cache = out; fetchedAt = Date.now();
-    return out;
-  }
-
-  // 端点归一化：官方取 {bareHost}/api/v1/ai/cline/recommended-models（URL 拼装与 CLI 共用 free-catalog.catalogUrl）。
-  // baseUrl 可能是裸 host（https://api.cline.bot）也可能是带 /api/v1 的，统一收敛；用户自定义 path 原样尊重。
-  function resolveModelsUrl() {
-    const custom = modelsPath && modelsPath !== "/models" && modelsPath !== "/ai/cline/recommended-models";
-    if (custom) return joinUrl(resolvedBase, resolvedPath);
-    return catalogUrl(resolvedBase);
-  }
-
-  async function listModels() {
-    const now = Date.now();
-    if (cache && now - fetchedAt < CACHE_TTL) return cache;
-    const url = resolveModelsUrl();
-    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 = (loadKeys ? loadKeys(id)[0] : null) || (ring ? ring.next() : null);
-      if (key && !String(key).includes(".")) 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 fallbackList();
-      const json = await res.json().catch(() => ({}));
-      if (isClineBotHost(resolvedBase) && json && typeof json === "object") {
-        const all = [];
-        for (const k of ["free", "clinePass"]) {
-          const arr = Array.isArray(json[k]) ? json[k] : null;
-          if (!arr || !arr.length) continue;
-          for (const m of arr) {
-            if (!m || typeof m.id !== "string") continue;
-            const mid = joinModelId(id, m.id);
-            if (!all.some((x) => x.id === mid)) all.push({ ...m, id: mid });
-          }
-        }
-        if (!all.length) return fallbackList();
-        cache = all; fetchedAt = now; notifyRefresh(all); return all;
-      }
-      const raw = Array.isArray(json.data) ? json.data : Array.isArray(json.models) ? json.models : Array.isArray(json) ? json : [];
-      const out = raw.filter((m) => m && typeof m.id === "string").map((m) => ({ ...m, id: joinModelId(id, m.id) }));
-      if (!out.length) return fallbackList();
-      cache = out; fetchedAt = now; notifyRefresh(out); return out;
-    } catch { return fallbackList(); } finally { clearTimeout(timer); }
-  }
-
-  // 每次 daemon 启动自检 free 列表（server-lifecycle 显式调 checkFreeUpdates，不经 dispatcher.preheat）：
-  // 对比快照报增删并留痕（daemon.log），顺带把结果填缓存（省一次 listModels 请求）。
-  // 快照路径由 index.js 注入 logDir 下文件；未注入时仅跳过自检，不影响拉取。
-  function readSnapshotFree() {
-    try { const j = JSON.parse(readFileSync(snapshotPath, "utf8")); return Array.isArray(j?.free) ? j.free : null; } catch { return null; }
-  }
-
-  function writeSnapshotFree(ids) {
-    try {
-      mkdirSync(dirname(snapshotPath), { recursive: true });
-      writeFileSync(snapshotPath, JSON.stringify({ ts: Date.now(), free: ids }, null, 2));
-    } catch {}
-  }
-
-  // Note: cline free 目录三处同源（CLI 直查/聚合目录/兜底，统一在 free-catalog.js）+ daemon 启动自检快照（diff 写 daemon.log，不自动改 picks）— 见 .agents/notes/implemented/bug-fix/2026-09-16-clinebot-free-catalog-unify.md
-  function detectFreeChanges(ids) {
-    const prev = readSnapshotFree();
-    if (!prev) {
-      writeSnapshotFree(ids);
-      console.log(`[${id}] free snapshot created (${ids.length} models)`);
-      return { first: true };
-    }
-    const added = ids.filter((x) => !prev.includes(x));
-    const removed = prev.filter((x) => !ids.includes(x));
-    if (!added.length && !removed.length) return { unchanged: true };
-    writeSnapshotFree(ids);
-    const parts = [];
-    if (added.length) parts.push(`+${added.join(" +")}`);
-    if (removed.length) parts.push(`-${removed.join(" -")}`);
-    console.log(`[${id}] free models updated (${ids.length} total): ${parts.join(" ")}`);
-    return { added, removed };
-  }
-
-  // 启动自检入口：拉 recommended-models → 填缓存 → 对比快照报 free 增删（拉取与 CLI 共用 free-catalog.fetchFreeCatalog）。
-  async function checkFreeUpdates() {
-    const t0 = performance.now();
-    const key = (loadKeys ? loadKeys(id)[0] : null) || (ring ? ring.next() : null);
-    const authorization = key && !String(key).includes(".") ? `Bearer ${key}` : undefined;
-    const cat = await fetchFreeCatalog({ baseUrl: resolvedBase, fetchImpl, dispatcher, authorization });
-    const ms = () => Math.round(performance.now() - t0);
-    const httpOk = cat.status >= 200 && cat.status < 300;
-    if (!httpOk || !cat.models.length || !isClineBotHost(resolvedBase)) {
-      return { ok: httpOk, status: cat.status, ...(httpOk ? {} : { error: cat.error }), ms: ms() };
-    }
-    const valid = cat.models;
-    // 注意：只做快照 diff，不碰 listModels 的合并缓存——缓存里是 free+clinePass 全量，
-    // 这里 cat.models 只有 free，写进去会把 pass 挤掉 10 分钟（daemon 启动后 /v1/models 就缺 pass）。
-    let change = null;
-    if (snapshotPath) { try { change = detectFreeChanges(valid.map((m) => m.id)); } catch {} }
-    // 自检同样是一次「读取上游」，故也喂给白名单 auto-sync：开机后即便没人访问 /v1/models，
-    // 新上架免费模型也已可用。这里只有 free（fetchFreeCatalog 只抽 free），clinePass 由 listModels 成功路径补齐。
-    notifyRefresh(valid);
-    return {
-      ok: true,
-      status: cat.status,
-      ms: ms(),
-      ...(change?.added ? { freeAdded: change.added, freeRemoved: change.removed } : {}),
-    };
-  }
-
-  // preheat 保留为别名：dispatcher 已不再调 cline，手动/测试/未来钩子仍可用，行为与自检一致
-  async function preheat() {
-    return checkFreeUpdates();
-  }
-
-  return { listModels, preheat, checkFreeUpdates };
-}
+import { joinUrl, getUndici } from "../base.js";
+import { compatFetch } from "../../compat.js";
+import { joinModelId } from "../model-id.js";
+import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { dirname } from "node:path";
+import { fetchFreeCatalog, catalogUrl, FALLBACK_FREE as BUNDLED_FREE } from "./free-catalog.js";
+
+const { UndiciFetch } = getUndici();
+
+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 createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispatcher, ring, loadKeys, snapshotPath, onModelsRefreshed } = {}) {
+  // 白名单 auto-sync 通知：只在上游成功取数后调用（内置兜底不是上游真相，不触发）。
+  // 异常一律吞掉——同步是增益动作，绝不打断模型列表读取与请求链路。
+  function notifyRefresh(list) {
+    if (!onModelsRefreshed) return;
+    try {
+      const r = onModelsRefreshed(list);
+      if (r && typeof r.catch === "function") r.catch(() => {});
+    } catch {}
+  }
+  if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
+  const resolvedBase = String(baseUrl).trim().replace(/\/+$/, "");
+  const resolvedPath = modelsPath || "/ai/cline/recommended-models";
+  const CACHE_TTL = 10 * 60 * 1000;
+  let cache = null;
+  let fetchedAt = 0;
+
+  // 离线兜底：与上游 recommended-models 的 free 对齐（常量在 free-catalog.js，2026-09-20 实测 5 个）。
+  // 上游挂了/401 时也不返回空数组，保证 -provider cline models 与 picks 仍有免费可用。
+
+  function fallbackList() {
+    const out = BUNDLED_FREE.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+    cache = out; fetchedAt = Date.now();
+    return out;
+  }
+
+  // 端点归一化：官方取 {bareHost}/api/v1/ai/cline/recommended-models（URL 拼装与 CLI 共用 free-catalog.catalogUrl）。
+  // baseUrl 可能是裸 host（https://api.cline.bot）也可能是带 /api/v1 的，统一收敛；用户自定义 path 原样尊重。
+  function resolveModelsUrl() {
+    const custom = modelsPath && modelsPath !== "/models" && modelsPath !== "/ai/cline/recommended-models";
+    if (custom) return joinUrl(resolvedBase, resolvedPath);
+    return catalogUrl(resolvedBase);
+  }
+
+  async function listModels() {
+    const now = Date.now();
+    if (cache && now - fetchedAt < CACHE_TTL) return cache;
+    const url = resolveModelsUrl();
+    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 = (loadKeys ? loadKeys(id)[0] : null) || (ring ? ring.next() : null);
+      if (key && !String(key).includes(".")) 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 fallbackList();
+      const json = await res.json().catch(() => ({}));
+      if (isClineBotHost(resolvedBase) && json && typeof json === "object") {
+        const all = [];
+        for (const k of ["free", "clinePass"]) {
+          const arr = Array.isArray(json[k]) ? json[k] : null;
+          if (!arr || !arr.length) continue;
+          for (const m of arr) {
+            if (!m || typeof m.id !== "string") continue;
+            const mid = joinModelId(id, m.id);
+            if (!all.some((x) => x.id === mid)) all.push({ ...m, id: mid });
+          }
+        }
+        if (!all.length) return fallbackList();
+        cache = all; fetchedAt = now; notifyRefresh(all); return all;
+      }
+      const raw = Array.isArray(json.data) ? json.data : Array.isArray(json.models) ? json.models : Array.isArray(json) ? json : [];
+      const out = raw.filter((m) => m && typeof m.id === "string").map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+      if (!out.length) return fallbackList();
+      cache = out; fetchedAt = now; notifyRefresh(out); return out;
+    } catch { return fallbackList(); } finally { clearTimeout(timer); }
+  }
+
+  // 每次 daemon 启动自检 free 列表（server-lifecycle 显式调 checkFreeUpdates，不经 dispatcher.preheat）：
+  // 对比快照报增删并留痕（daemon.log），顺带把结果填缓存（省一次 listModels 请求）。
+  // 快照路径由 index.js 注入 logDir 下文件；未注入时仅跳过自检，不影响拉取。
+  function readSnapshotFree() {
+    try { const j = JSON.parse(readFileSync(snapshotPath, "utf8")); return Array.isArray(j?.free) ? j.free : null; } catch { return null; }
+  }
+
+  function writeSnapshotFree(ids) {
+    try {
+      mkdirSync(dirname(snapshotPath), { recursive: true });
+      writeFileSync(snapshotPath, JSON.stringify({ ts: Date.now(), free: ids }, null, 2));
+    } catch {}
+  }
+
+  // Note: cline free 目录三处同源（CLI 直查/聚合目录/兜底，统一在 free-catalog.js）+ daemon 启动自检快照（diff 写 daemon.log，不自动改 picks）— 见 .agents/notes/implemented/bug-fix/2026-09-16-clinebot-free-catalog-unify.md
+  function detectFreeChanges(ids) {
+    const prev = readSnapshotFree();
+    if (!prev) {
+      writeSnapshotFree(ids);
+      console.log(`[${id}] free snapshot created (${ids.length} models)`);
+      return { first: true };
+    }
+    const added = ids.filter((x) => !prev.includes(x));
+    const removed = prev.filter((x) => !ids.includes(x));
+    if (!added.length && !removed.length) return { unchanged: true };
+    writeSnapshotFree(ids);
+    const parts = [];
+    if (added.length) parts.push(`+${added.join(" +")}`);
+    if (removed.length) parts.push(`-${removed.join(" -")}`);
+    console.log(`[${id}] free models updated (${ids.length} total): ${parts.join(" ")}`);
+    return { added, removed };
+  }
+
+  // 启动自检入口：拉 recommended-models → 填缓存 → 对比快照报 free 增删（拉取与 CLI 共用 free-catalog.fetchFreeCatalog）。
+  async function checkFreeUpdates() {
+    const t0 = performance.now();
+    const key = (loadKeys ? loadKeys(id)[0] : null) || (ring ? ring.next() : null);
+    const authorization = key && !String(key).includes(".") ? `Bearer ${key}` : undefined;
+    const cat = await fetchFreeCatalog({ baseUrl: resolvedBase, fetchImpl, dispatcher, authorization });
+    const ms = () => Math.round(performance.now() - t0);
+    const httpOk = cat.status >= 200 && cat.status < 300;
+    if (!httpOk || !cat.models.length || !isClineBotHost(resolvedBase)) {
+      return { ok: httpOk, status: cat.status, ...(httpOk ? {} : { error: cat.error }), ms: ms() };
+    }
+    const valid = cat.models;
+    // 注意：只做快照 diff，不碰 listModels 的合并缓存——缓存里是 free+clinePass 全量，
+    // 这里 cat.models 只有 free，写进去会把 pass 挤掉 10 分钟（daemon 启动后 /v1/models 就缺 pass）。
+    let change = null;
+    if (snapshotPath) { try { change = detectFreeChanges(valid.map((m) => m.id)); } catch {} }
+    // 自检同样是一次「读取上游」，故也喂给白名单 auto-sync：开机后即便没人访问 /v1/models，
+    // 新上架免费模型也已可用。这里只有 free（fetchFreeCatalog 只抽 free），clinePass 由 listModels 成功路径补齐。
+    notifyRefresh(valid);
+    return {
+      ok: true,
+      status: cat.status,
+      ms: ms(),
+      ...(change?.added ? { freeAdded: change.added, freeRemoved: change.removed } : {}),
+    };
+  }
+
+  // preheat 保留为别名：dispatcher 已不再调 cline，手动/测试/未来钩子仍可用，行为与自检一致
+  async function preheat() {
+    return checkFreeUpdates();
+  }
+
+  return { listModels, preheat, checkFreeUpdates };
+}