mslxdff 0.1.126 → 0.1.128

package/package.json

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

package/src/cli/commands/provider/models.js

@@ -34,6 +34,10 @@ export async function handleProviderModels(id, sub, args, rest) {
     let provider;
     if (id === "workbuddy") {
       provider = createWorkbuddyProvider({ baseUrl, apiKeys: keys, auths, file: defaultStateFile() });
+    } else if (id === "cline" || id === "clinebot") {
+      // 与聚合目录同源：recommended-models 的 free（generic 的 /api/v1/models 是全量目录，含大量不可用条目）
+      const { createClineProvider } = await import("../../../providers/cline.js");
+      provider = createClineProvider({ id, baseUrl: baseUrl || undefined, apiKeys: keys, file: defaultStateFile() });
     } else {
       if (!baseUrl) {
         console.error(`provider ${id}: missing baseUrl — set via: mslxdff -provider ${id} set-url <baseUrl>`);

package/src/providers/cline/index.js

@@ -3,6 +3,8 @@ import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProv
 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";
@@ -24,6 +26,7 @@ export function createClineProvider({
   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 } },
@@ -105,7 +108,8 @@ export function createClineProvider({
     return oldRunner.runChat(body, tmpRing, "shared provider keys");
   }
 
-  const modelsSvc = createModelsService({ id, baseUrl: resolvedBase, modelsPath: resolvedModelsPath, fetchImpl, dispatcher, ring, loadKeys: (pid) => loadProviderKeys(pid, file ? { file } : {}) });
+  // 快照文件供 daemon 启动自检 free 列表增删（默认 logDir 下，gitignored；测试可注入 tmp 路径）
+  const modelsSvc = createModelsService({ id, baseUrl: resolvedBase, modelsPath: resolvedModelsPath, fetchImpl, dispatcher, ring, loadKeys: (pid) => loadProviderKeys(pid, file ? { file } : {}), snapshotPath: snapshotPath || join(logDir(), "cline-free.json") });
 
   async function listModels() {
     const list = await modelsSvc.listModels();
@@ -113,10 +117,10 @@ export function createClineProvider({
     return list;
   }
 
-  const { preheat } = (() => {
-    try { return modelsSvc; } catch { return { preheat: async () => ({ ok: false }) }; }
+  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, close, agent, keyRing: ring, baseUrl: resolvedBase, _authPool: authPool };
+  return { id, chat, chatWithKeys, listModels, preheat, checkFreeUpdates, close, agent, keyRing: ring, baseUrl: resolvedBase, _authPool: authPool };
 }

package/src/providers/cline/models.js

@@ -1,6 +1,8 @@
 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";
 
 const { UndiciFetch } = getUndici();
 
@@ -8,7 +10,7 @@ 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 } = {}) {
+export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispatcher, ring, loadKeys, snapshotPath } = {}) {
   if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
   const resolvedBase = String(baseUrl).trim().replace(/\/+$/, "");
   const resolvedPath = modelsPath || "/ai/cline/recommended-models";
@@ -16,11 +18,13 @@ export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispat
   let cache = null;
   let fetchedAt = 0;
 
-  // 离线兜底：对标官方 FALLBACK（free 数组实证含 z-ai/glm-5.3-flash）。
+  // 离线兜底：与上游 recommended-models 的 free 对齐（2026-09-16 实测 5 个）。
   // 上游挂了/401 时也不返回空数组，保证 -provider clinebot models 与 picks 仍有免费可用。
   const FALLBACK_FREE = [
-    { id: "deepseek/deepseek-v4-flash", name: "deepseek-v4-flash" },
+    { id: "cline-free/deepseek-v4.1-flash", name: "deepseek-v4.1-flash" },
+    { id: "cline-free/muse-spark-1.3-contributor", name: "muse-spark-1.3-contributor" },
     { id: "z-ai/glm-5.3-flash", name: "glm-5.3-flash" },
+    { id: "cline-free/solar-pro4", name: "solar-pro4" },
     { id: "poolside/laguna-s-2.1:free", name: "laguna-s-2.1:free" },
   ];
 
@@ -67,7 +71,41 @@ export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispat
     } catch { return fallbackList(); } finally { clearTimeout(timer); }
   }
 
-  async function preheat() {
+  // 每次 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: clinebot free 目录三处同源（CLI 直查/聚合目录/兜底）+ 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 增删。
+  async function checkFreeUpdates() {
     const url = resolveModelsUrl();
     const t0 = performance.now();
     try {
@@ -77,12 +115,38 @@ export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispat
       const opts = { headers };
       if (dispatcher) opts.dispatcher = dispatcher;
       const res = await fetchImpl(url, opts);
-      try { if (res.body) await res.text().catch(() => {}); } catch {}
-      return { ok: res.ok, status: res.status, ms: Math.round(performance.now() - t0) };
+      let freeIds = null;
+      try {
+        const text = await res.text().catch(() => "");
+        if (res.ok && text && isClineBotHost(resolvedBase)) {
+          const json = JSON.parse(text);
+          if (Array.isArray(json.free)) {
+            const valid = json.free.filter((m) => m && typeof m.id === "string");
+            if (valid.length) {
+              cache = valid.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+              fetchedAt = Date.now();
+              freeIds = valid.map((m) => m.id);
+            }
+          }
+        }
+      } catch {}
+      let change = null;
+      if (freeIds && snapshotPath) { try { change = detectFreeChanges(freeIds); } catch {} }
+      return {
+        ok: res.ok,
+        status: res.status,
+        ms: Math.round(performance.now() - t0),
+        ...(change?.added ? { freeAdded: change.added, freeRemoved: change.removed } : {}),
+      };
     } catch (err) {
       return { ok: false, error: String(err?.message || err), ms: Math.round(performance.now() - t0) };
     }
   }
 
-  return { listModels, preheat };
+  // preheat 保留为别名：dispatcher 已不再调 clinebot，手动/测试/未来钩子仍可用，行为与自检一致
+  async function preheat() {
+    return checkFreeUpdates();
+  }
+
+  return { listModels, preheat, checkFreeUpdates };
 }

package/src/providers/dispatcher.js

@@ -92,17 +92,18 @@ export function createProviderDispatcher(providers = [], opts = {}) {
     return out;
   }
 
+  // 只预热默认供应商（opencode）：连接池与模型缓存预热是其主链路收益；
+  // 其他供应商按需在首次请求时自拉（10min 缓存）。不再逐家预热，避免 daemon 每次启动
+  // 对所有上游各发一次 GET；MSLXDFF_PREHEAT=0 的关闭由唯一被调的 opencode preheat 自行尊重。
+  // 见 .agents/notes/implemented/simplification/2026-09-16-preheat-opencode-only.md
   async function preheat() {
-    const results = [];
-    for (const p of providers) {
-      if (typeof p.preheat !== "function") continue;
-      try {
-        results.push(await p.preheat());
-      } catch {
-        results.push({ ok: false, error: "preheat failed" });
-      }
+    const p = byId.get(DEFAULT_PROVIDER);
+    if (!p || typeof p.preheat !== "function") return { ok: false, skipped: true };
+    try {
+      return await p.preheat();
+    } catch {
+      return { ok: false, error: "preheat failed" };
     }
-    return results.length ? results[0] : { ok: false, skipped: true };
   }
 
   async function close() {

package/src/runtime/server-lifecycle.js

@@ -123,6 +123,12 @@ export async function startServerLifecycle({ VERSION, token, created, upstream,
       else if (r.ok) console.log(`[preheat] opencode models ok ${r.status} ${r.ms}ms`);
       else console.log(`[preheat] opencode models failed ${r.error || r.status || ""} ${r.ms || 0}ms`);
     }).catch(() => {});
+    // clinebot free 目录自检（独立于 opencode 连接预热：dispatcher.preheat 只做默认供应商）
+    // 见 .agents/notes/implemented/simplification/2026-09-16-preheat-opencode-only.md
+    try {
+      const cline = upstream?.byId?.get?.("clinebot") ?? upstream?.byId?.get?.("cline");
+      if (cline?.checkFreeUpdates) void cline.checkFreeUpdates().catch(() => {});
+    } catch {}
   }, 100).unref?.();
 
   // responses 模型判定改元数据驱动（models.dev provider.npm）：就绪后注入，每小时重查使新模型自动识别