mslxdff 0.1.135 → 0.1.138

package/src/model-capabilities/merge.js

@@ -0,0 +1,127 @@
+// /v1/models 能力富化（ADR-0022）：把 models.dev 目录（+ workbuddy 原生字段兜底）
+// 的能力合并进 /v1/models 每条 data 条目的 `capabilities` 子对象，客户端与 CLI 一眼可读。
+// 逃生门：GET /v1/models?raw=1 保持 ADR-0016 的原始透传形状；codex 调用者恒原始 + 空 models:[]。
+// 全程 best-effort：目录不可用 → 原样返回，绝不让 /models 因富化失败挂掉。
+import { globalCapabilities } from "./index.js";
+
+// "cline/deepseek/deepseek-v4-flash" → { provider: "cline", raw: "deepseek/deepseek-v4-flash" }；裸 id 归 opencode
+export function splitModelId(id) {
+  const s = String(id || "").trim();
+  const i = s.indexOf("/");
+  if (i > 0) return { provider: s.slice(0, i).toLowerCase(), raw: s.slice(i + 1) };
+  return { provider: "opencode", raw: s };
+}
+
+function stripFreeSuffix(raw) {
+  return raw.replace(/-free$/i, "");
+}
+
+// 上游原生 wire API：muse-spark* 只认 /responses（zen /chat 500 实测）；
+// models.dev 标 npm @ai-sdk/openai 的模型上游走 responses；其余 chat。
+export function upstreamApiFor(caps, raw) {
+  const bare = stripFreeSuffix(String(raw || ""));
+  if (/^muse-spark/i.test(bare)) return "responses";
+  if (caps?.npm === "@ai-sdk/openai") return "responses";
+  return "chat";
+}
+
+// caps → 对外 capabilities 子对象（只填有值的键，未收录字段不硬造）
+export function capsPayloadFor(caps, raw) {
+  if (!caps) return null;
+  const payload = {
+    reasoning: Boolean(caps.reasoning),
+    ...(caps.effortType ? { effortType: caps.effortType } : {}),
+    ...(Array.isArray(caps.effortValues) && caps.effortValues.length
+      ? { effortValues: caps.effortValues.map(String) }
+      : {}),
+    ...(caps.defaultEffort ? { defaultEffort: String(caps.defaultEffort) } : {}),
+    imageInput: Boolean(caps.imageInput),
+    inputModalities: Array.isArray(caps.inputModalities) && caps.inputModalities.length
+      ? caps.inputModalities
+      : ["text"],
+    outputModalities: Array.isArray(caps.outputModalities) && caps.outputModalities.length
+      ? caps.outputModalities
+      : ["text"],
+    toolCall: Boolean(caps.toolCall),
+    ...(Number(caps.context) > 0 ? { context: Number(caps.context) } : {}),
+    ...(Number(caps.maxOutput) > 0 ? { maxOutput: Number(caps.maxOutput) } : {}),
+    ...((caps.costIn != null || caps.costOut != null)
+      ? { costIn: Number(caps.costIn) || 0, costOut: Number(caps.costOut) || 0 }
+      : {}),
+    // 网关两侧端点都收：/v1/responses 复用 ChatPipeline 翻译层；upstreamApi 记上游原生协议
+    endpoints: ["chat", "responses"],
+    upstreamApi: upstreamApiFor(caps, raw),
+  };
+  return payload;
+}
+
+// 单条 id 的目录匹配：精确裸 id → 剥 -free 后缀 → 二级厂商前缀（cline/deepseek/x → deepseek/x）
+function lookupCaps(svc, provider, raw) {
+  return (
+    svc.get(provider, raw) ||
+    svc.get(provider, stripFreeSuffix(raw)) ||
+    null
+  );
+}
+
+function lookupCapsDeep(svc, provider, raw) {
+  const direct = lookupCaps(svc, provider, raw);
+  if (direct) return direct;
+  const parts = raw.split("/");
+  if (parts.length >= 2) {
+    const head = parts[0];
+    const rest = parts.slice(1).join("/");
+    return svc.get(head, rest) || svc.get(head, stripFreeSuffix(rest)) || null;
+  }
+  return null;
+}
+
+/**
+ * 把能力合并进 { object:"list", data:[...] } 的每条条目。
+ * capsSvc/wbSource 为测试接缝；生产用全局单例（models.dev 24h 缓存）+ workbuddy 动态源。
+ * wbSource 显式 null 禁用 workbuddy 兜底（测试用）。
+ */
+export async function mergeModelsList(data, { capsSvc, wbSource } = {}) {
+  const svc = capsSvc === undefined ? globalCapabilities() : capsSvc;
+  const entries = Array.isArray(data?.data) ? data.data : [];
+  if (!svc || !entries.length) return data;
+  // 只用内存/磁盘缓存热身；冷缓存绝不阻塞请求（后台拉新，下次请求即富化）
+  try {
+    const warmed = svc.readyWarm ? await svc.readyWarm() : await svc.ready();
+    if (!warmed) return data;
+  } catch {
+    return data;
+  }
+  // 第一遍：目录直查；workbuddy 未命中记下，第二遍走上游原生字段
+  const resolved = new Map(); // index -> caps
+  const needWb = []; // [index, raw]
+  entries.forEach((entry, i) => {
+    const id = String(entry?.id || "");
+    if (!id) return;
+    const { provider, raw } = splitModelId(id);
+    const caps = lookupCapsDeep(svc, provider, raw);
+    if (caps) resolved.set(i, caps);
+    else if (provider === "workbuddy" && wbSource !== null) needWb.push([i, raw]);
+  });
+  if (needWb.length) {
+    try {
+      const { workbuddyCapsFromModels, workbuddyAllModels } = await import("./index.js");
+      const wbMap = await workbuddyCapsFromModels(wbSource || workbuddyAllModels)();
+      for (const [i, raw] of needWb) {
+        const caps = wbMap?.[raw] || null;
+        if (caps) resolved.set(i, caps);
+      }
+    } catch {
+      // workbuddy 源不可用：这些条目保持无能力，不拖垮整个列表
+    }
+  }
+  if (!resolved.size) return data;
+  const next = entries.map((entry, i) => {
+    const caps = resolved.get(i);
+    if (!caps) return entry;
+    const { raw } = splitModelId(String(entry?.id || ""));
+    const payload = capsPayloadFor(caps, raw);
+    return payload ? { ...entry, capabilities: payload } : entry;
+  });
+  return { ...data, data: next };
+}

package/src/providers/classify.js

@@ -1,10 +1,10 @@
 // ADR-0015：供应商路由分类三态 + EMA 纯函数（零依赖，防循环 import）
-// local-only：本机账号绑定（workbuddy），组员转发无效
+// local-only：本机账号绑定（workbuddy/cline 系），组员转发无效
 // quota-pool：图额度不图速度（opencode free），直连先行、429 后组员兜底
 // latency-compare：key/token 类，direct vs link+remote 比延迟
 export function classifyProvider(id) {
   const s = String(id || "").trim().toLowerCase();
-  if (s === "workbuddy") return "local-only";
+  if (s === "workbuddy" || s === "cline") return "local-only";
   if (s === "opencode") return "quota-pool";
   return "latency-compare";
 }

package/src/providers/cline/auth.js

@@ -120,7 +120,7 @@ export function createAuthPool({
     if (account.dead) throw new Error("invalid_grant");
     if (account.cooldownUntil > now) throw new Error("account_cooldown");
     if (account.accessToken && now < account.expiry) return account.accessToken;
-    // base 可能已含 /api/v1（state 里 clinebot baseUrl 就是 …/api/v1），直接拼会 double 成
+    // base 可能已含 /api/v1（老 clinebot 配置就是 …/api/v1），直接拼会 double 成
     // …/api/v1/api/v1/auth/refresh → 上游回 401 Unauthorized（版本/重认证提示），绝不能当 token 死。
     const baseNoV1 = resolvedBase.replace(/\/api\/v1\/?$/, "");
     const url = joinUrl(baseNoV1, "/api/v1/auth/refresh");

package/src/providers/cline/chat.js

@@ -1,20 +1,20 @@
 import { joinUrl, sleep } from "../base.js";
 import { clineHeaders } from "./headers.js";
 import { createTransport } from "../../transport/index.js";
+import { normalizeProviderId } from "../model-id.js";
 import { createSdkDispatch } from "../../upstream-engine/sdk/dispatch.js";
 
 function genSessionId() { return `sess_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`; }
 
-// stripProviderPrefix 去掉本地供应商前缀，发上游用裸模型 id。
-// 上游（对标 cline2api-workers MODELS）只认裸 id："deepseek/deepseek-v4-flash"、
-// "poolside/laguna-s-2.1:free"；本地 "clinebot/deepseek/..." 需取后两段。
-// 两段及以内视为已是裸 id，原样透传。
-function stripProviderPrefix(id) {
-  const parts = String(id || "").split("/").filter(Boolean);
-  if (parts.length > 2) return parts.slice(1).join("/");
-  return String(id || "");
+// stripProviderPrefix 只剥「本供应商」前缀（cline/<裸 id> → 裸 id），非本前缀（含上游自带多段 id
+// 如 meta/vendor/x）原样透传，不误削首段（旧实现按段数剥曾是潜在 bug）。
+function stripProviderPrefix(model, providerId) {
+  const s = String(model || "");
+  const i = s.indexOf("/");
+  if (i <= 0) return s;
+  const low = (v) => normalizeProviderId(String(v || "").toLowerCase());
+  return low(s.slice(0, i)) === low(providerId) ? s.slice(i + 1) : s;
 }
-
 function unwrapData(obj) {
   if (obj && obj.data && typeof obj.data === "object") {
     const d = obj.data;
@@ -169,7 +169,7 @@ export function createChatService({
     const model = body?.model || "deepseek/deepseek-v4-flash";
     const sessionId = genSessionId();
     const isStream = body?.stream === true;
-    const upstreamModel = stripProviderPrefix(model);
+    const upstreamModel = stripProviderPrefix(model, id);
     // token 口径双写：对标官方 withMaxCompletionTokensForReasoningModels——
     // cline 上游默认 reasoning_effort high，推理模型认 max_completion_tokens，
     // 只发 max_tokens 会被部分通道拒；双写兼容最稳。
@@ -182,7 +182,10 @@ export function createChatService({
       reasoning_effort: body?.reasoning_effort || body?.reasoningEffort || "high",
       messages: body?.messages || [],
     };
-    const forceStream = !isStream && String(upstreamModel).startsWith("deepseek/");
+    // 部分免费通道（deepseek 家族，含 cline-free/deepseek-*）原生非流式不可靠
+    //（500 empty response）：这类模型在内部走 stream+聚合成 JSON，对外仍按请求方
+    // stream 标志返回（true 直透，false 聚合）。其它模型完全尊重请求方，不强制。
+    const forceStream = !isStream && String(upstreamModel).toLowerCase().includes("deepseek");
     if (isStream || forceStream) upstreamBody.stream = true;
     for (const k of ["temperature", "top_p", "tools", "tool_choice", "stop", "presence_penalty", "frequency_penalty", "response_format", "user", "n", "seed"]) {
       if (body[k] !== undefined) upstreamBody[k] = body[k];

package/src/providers/cline/free-catalog.js

@@ -0,0 +1,71 @@
+/**
+ * Cline 免费目录深模块：只认上游 `free` 数组（公开接口，无需鉴权、无凭据）。
+ * GET {bareHost}/api/v1/ai/cline/recommended-models → { recommended, free, clinePass, clineCloud }
+ * 供 cline/models.js（聚合目录 + 启动自检）与 `-provider cline free` CLI 共用；缓存由调用方持有。
+ */
+import { compatFetch } from "../../compat.js";
+import { joinUrl } from "../base.js";
+
+export const FREE_CATALOG_PATH = "/api/v1/ai/cline/recommended-models";
+export const DEFAULT_CLINE_BASE = "https://api.cline.bot";
+
+// 上游不可达时的内置兜底（2026-09-20 实测 5 个；只有 id 与短名，无凭据）
+export const FALLBACK_FREE = Object.freeze([
+  { 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" },
+]);
+export const FALLBACK_FREE_IDS = FALLBACK_FREE.map((m) => m.id);
+
+/** 目录 URL 归一：baseUrl 可能是裸 host 或带 /api/v1 的老 clinebot 形态；customPath 尊重用户自定义端点 */
+export function catalogUrl(baseUrl, customPath) {
+  const raw = String(baseUrl || "").trim() || DEFAULT_CLINE_BASE;
+  const bare = raw.replace(/\/+$/, "").replace(/\/api\/v1\/?$/, "") || DEFAULT_CLINE_BASE;
+  const p = String(customPath || "").trim();
+  if (p && p !== "/models" && p !== FREE_CATALOG_PATH) return joinUrl(bare, p);
+  return joinUrl(bare, FREE_CATALOG_PATH);
+}
+
+/** 只取 json.free（对象 {id,name,...} 或裸字符串两种形态都容忍） */
+function pickFree(json) {
+  const arr = Array.isArray(json?.free) ? json.free : [];
+  const out = [];
+  for (const m of arr) {
+    if (typeof m === "string" && m.trim()) out.push({ id: m.trim() });
+    else if (m && typeof m.id === "string" && m.id.trim()) out.push({ ...m, id: m.id.trim(), name: String(m.name || "") });
+  }
+  return out;
+}
+
+/**
+ * 拉免费目录。
+ * @returns {Promise<{ok:boolean, status:number, url:string, models:object[], ids:string[], error?:string}>}
+ *   ok=false 时 models/ids 为空（兜底由调用方决定）；authorization 供私有/自定义目录可选透传。
+ */
+export async function fetchFreeCatalog({ baseUrl, customPath, fetchImpl, dispatcher, authorization, timeoutMs = 15_000 } = {}) {
+  const url = catalogUrl(baseUrl, customPath);
+  const impl = fetchImpl || compatFetch;
+  const headers = { Accept: "application/json" };
+  if (authorization) headers.Authorization = authorization;
+  const opts = { headers };
+  if (dispatcher) opts.dispatcher = dispatcher;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(new Error("cline free catalog timed out")), timeoutMs);
+  timer.unref?.();
+  opts.signal = controller.signal;
+  try {
+    const res = await impl(url, opts);
+    const status = Number(res?.status) || 0;
+    if (!res?.ok) return { ok: false, status, url, models: [], ids: [], error: `HTTP ${status}` };
+    const json = await res.json().catch(() => null);
+    const models = pickFree(json);
+    if (!models.length) return { ok: false, status, url, models: [], ids: [], error: "empty free list" };
+    return { ok: true, status, url, models, ids: models.map((m) => m.id) };
+  } catch (err) {
+    return { ok: false, status: 0, url, models: [], ids: [], error: String(err?.message || err) };
+  } finally {
+    clearTimeout(timer);
+  }
+}

package/src/providers/cline/index.js

@@ -41,14 +41,7 @@ export function createClineProvider({
   if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
 
   const rawKeys = collectApiKeysGeneric(id, apiKeys, apiKey, (pid) => loadProviderKeys(pid, file ? { file } : {}));
-  // 同时兼容 cline 与 clinebot 两个 id 的 keys（用户可能配在任一）
-  let extraKeys = [];
-  try {
-    const altId = id === "cline" ? "clinebot" : "cline";
-    const alt = loadProviderKeys(altId, file ? { file } : {});
-    if (alt.length) extraKeys = alt;
-  } catch {}
-  const allKeys = [...new Set([...rawKeys, ...extraKeys].map((k) => String(k).trim()).filter(Boolean))];
+  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 });
 
@@ -78,14 +71,7 @@ export function createClineProvider({
             // 优先写 providerConfigs，兼容旧路径由 saveProviderConfig 处理
             saveProviderConfig(id, { baseUrl: resolvedBase, keys: next }, file ? { file } : {});
           }
-          // altId 同步
-          const altId = id === "cline" ? "clinebot" : "cline";
-          const cur2 = loadProviderKeys(altId, file ? { file } : {});
-          const idx2 = cur2.indexOf(oldRefreshToken);
-          if (idx2 >= 0) {
-            const next2 = [...cur2]; next2[idx2] = newRefreshToken;
-            saveProviderConfig(altId, { baseUrl: resolvedBase, keys: next2 }, file ? { file } : {});
-          }
+          // 只回写 cline 自己（旧 id 轮换回写已随 id 统一删除，见 .scratch/cline-unify/SPEC.md §4.1）
         } catch {}
       },
     });

package/src/providers/cline/models.js

@@ -3,6 +3,7 @@ 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();
 
@@ -18,30 +19,21 @@ export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispat
   let cache = null;
   let fetchedAt = 0;
 
-  // 离线兜底：与上游 recommended-models 的 free 对齐（2026-09-16 实测 5 个）。
-  // 上游挂了/401 时也不返回空数组，保证 -provider clinebot models 与 picks 仍有免费可用。
-  const FALLBACK_FREE = [
-    { 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" },
-  ];
+  // 离线兜底：与上游 recommended-models 的 free 对齐（常量在 free-catalog.js，2026-09-20 实测 5 个）。
+  // 上游挂了/401 时也不返回空数组，保证 -provider cline models 与 picks 仍有免费可用。
 
   function fallbackList() {
-    const out = FALLBACK_FREE.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+    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。
-  // baseUrl 可能是裸 host（https://api.cline.bot）也可能是带 /api/v1 的，
-  // 统一收敛到 …/api/v1/ai/cline/recommended-models；用户自定义 path 原样尊重。
+  // 端点归一化：官方取 {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);
-    const bare = resolvedBase.replace(/\/api\/v1\/?$/, "");
-    return joinUrl(bare, "/api/v1/ai/cline/recommended-models");
+    return catalogUrl(resolvedBase);
   }
 
   async function listModels() {
@@ -85,7 +77,7 @@ export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispat
     } catch {}
   }
 
-  // Note: clinebot free 目录三处同源（CLI 直查/聚合目录/兜底）+ daemon 启动自检快照（diff 写 daemon.log，不自动改 picks）— 见 .agents/notes/implemented/bug-fix/2026-09-16-clinebot-free-catalog-unify.md
+  // 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) {
@@ -104,46 +96,31 @@ export function createModelsService({ id, baseUrl, modelsPath, fetchImpl, dispat
     return { added, removed };
   }
 
-  // 启动自检入口：拉 recommended-models → 填缓存 → 对比快照报 free 增删。
+  // 启动自检入口：拉 recommended-models → 填缓存 → 对比快照报 free 增删（拉取与 CLI 共用 free-catalog.fetchFreeCatalog）。
   async function checkFreeUpdates() {
-    const url = resolveModelsUrl();
     const t0 = performance.now();
-    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 };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      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) };
+    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;
+    cache = valid.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+    fetchedAt = Date.now();
+    let change = null;
+    if (snapshotPath) { try { change = detectFreeChanges(valid.map((m) => m.id)); } catch {} }
+    return {
+      ok: true,
+      status: cat.status,
+      ms: ms(),
+      ...(change?.added ? { freeAdded: change.added, freeRemoved: change.removed } : {}),
+    };
   }
 
-  // preheat 保留为别名：dispatcher 已不再调 clinebot，手动/测试/未来钩子仍可用，行为与自检一致
+  // preheat 保留为别名：dispatcher 已不再调 cline，手动/测试/未来钩子仍可用，行为与自检一致
   async function preheat() {
     return checkFreeUpdates();
   }

package/src/providers/dispatcher.js

@@ -50,7 +50,7 @@ export function createProviderDispatcher(providers = [], opts = {}) {
     // ADR-0008：本请求携带瞬时共享 key（shareKeys 由组员侧按 header 解析后传入）。
     const sharedKeys = opts?.shareKeys?.[provider.id];
     if (sharedKeys && sharedKeys.length && typeof provider.chatWithKeys === "function") {
-      return provider.chatWithKeys(forwarded, sharedKeys);
+      return provider.chatWithKeys(forwarded, sharedKeys, opts);
     }
     if (provider.id === "workbuddy" && workbuddyUid) {
       return provider.chat(forwarded, { ...opts, workbuddyUid });

package/src/providers/generic.js

@@ -2,6 +2,8 @@ import { createKeyRing } from "./keyring.js";
 import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath } from "../state.js";
 import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createChatRunner, createListModelsRunner, createPreheatRunner } from "./base.js";
 import { compatFetch } from "../compat.js";
+import crypto from "node:crypto";
+import { genId, opencodeUa, digestIdTail } from "../opencode-identity.js";
 
 const { UndiciFetch } = getUndici();
 
@@ -12,6 +14,26 @@ function resolveBaseUrl(id, baseUrl) {
   return "";
 }
 
+function isOpencodeHost(baseUrl) {
+  return /opencode\.ai/i.test(String(baseUrl || ""));
+}
+
+// Console Go (zen/go) 要求 x-opencode-session 才能路由（缺失 → 400 MissingSessionID）。
+// 会话取值：已合规（ses_ 前缀）直接用；客户端透传的任意串做 sha1 摘要派生（稳定+合规）；
+// 无则每请求 fresh（与 -chat curl / bench 直连行为一致）。
+function resolveGoSession(sessionId) {
+  const raw = String(sessionId || "").trim();
+  if (/^ses_/.test(raw)) return raw;
+  if (raw) {
+    try {
+      return `ses_${digestIdTail(crypto.createHash("sha1").update(raw).digest())}`;
+    } catch {
+      return genId("ses_");
+    }
+  }
+  return genId("ses_");
+}
+
 export function createGenericProvider({
   id,
   baseUrl,
@@ -41,6 +63,7 @@ export function createGenericProvider({
   const resolvedModelsPath = modelsPath || loadProviderModelsPath(id, file ? { file } : {});
   const resolvedChatPath = chatPath || loadProviderChatPath(id, file ? { file } : {});
   const ring = createKeyRing(collectApiKeysGeneric(id, apiKeys, apiKey, loadProviderKeys), { cooldownMs });
+  const goHost = isOpencodeHost(resolvedBase);
 
   let dispatcher = null;
   let agent = null;
@@ -53,7 +76,7 @@ export function createGenericProvider({
     agent = a.agent; dispatcher = a.dispatcher;
   }
 
-  function buildHeaders(body, key) {
+  function buildHeaders(body, key, opts) {
     const isStream = body?.stream !== false;
     const h = {
       "Content-Type": "application/json",
@@ -61,20 +84,35 @@ export function createGenericProvider({
       "User-Agent": "mslxdff",
     };
     if (key) h["Authorization"] = `Bearer ${key}`;
-    return { ...h, ...extraHeaders };
+    const out = { ...h, ...extraHeaders };
+    // ocgo（opencode.ai 域名）：补 Console Go 路由所需的 opencode 身份头
+    if (goHost) {
+      out["User-Agent"] = opencodeUa();
+      out["x-opencode-client"] = "desktop";
+      out["x-opencode-session"] = resolveGoSession(opts?.sessionId);
+      out["x-opencode-request"] = genId("msg_");
+      out["x-opencode-project"] = "global";
+    }
+    return out;
   }
 
-  const { runChat } = createChatRunner({
-    id, ring, cooldownMs, retry, fetchImpl, dispatcher, buildHeaders,
-    getUrl: () => joinUrl(resolvedBase, resolvedChatPath),
-    connectTimeoutMs,
-  });
+  // base 的 attemptOnce 只调 buildHeaders(body, key)：用闭包把 opts.sessionId 带进去
+  function scopedRunner(activeRing, opts) {
+    return createChatRunner({
+      id, ring: activeRing, cooldownMs, retry, fetchImpl, dispatcher,
+      buildHeaders: (b, k) => buildHeaders(b, k, opts),
+      getUrl: () => joinUrl(resolvedBase, resolvedChatPath),
+      connectTimeoutMs,
+    });
+  }
 
-  async function chat(body) {
+  async function chat(body, opts) {
+    const { runChat } = scopedRunner(ring, opts);
     return runChat(body, ring, `MSLXDFF_${id.toUpperCase()}_KEY`);
   }
-  async function chatWithKeys(body, keys) {
+  async function chatWithKeys(body, keys, opts) {
     const tmp = createKeyRing(keys, { cooldownMs });
+    const { runChat } = scopedRunner(tmp, opts);
     return runChat(body, tmp, "shared provider keys");
   }
 

package/src/providers/model-id.js

@@ -12,9 +12,9 @@ import os from "node:os";
 
 export const DEFAULT_PROVIDER = "opencode";
 
-const ALIASES = { oc: "opencode", opencode: "opencode" };
+const ALIASES = { oc: "opencode", opencode: "opencode", clinebot: "cline", "cline-bot": "cline" };
 
-// WorkBuddy 别名映射（alias → canonical）：clinebot-z-ai-glm-5.3-flash → clinebot/z-ai/glm-5.3-flash
+// WorkBuddy 别名映射（alias → canonical）：cline-z-ai-glm-5.3-flash → cline/z-ai/glm-5.3-flash
 const _modelAliases = new Map();
 
 function aliasFile() {
@@ -62,7 +62,7 @@ export function getModelAlias(id) {
   return _modelAliases.get(key) || null;
 }
 
-// 反向查询：canonical id → alias（如 clinebot/z-ai/glm-5.3-flash → clinebot-z-ai-glm-5.3-flash）
+// 反向查询：canonical id → alias（如 cline/z-ai/glm-5.3-flash → cline-z-ai-glm-5.3-flash）
 export function getAliasForModel(canonicalId) {
   const c = String(canonicalId || "").trim();
   if (!_aliasLoaded) { try { loadModelAliases(); } catch {} }
@@ -116,7 +116,7 @@ export function toFullId(provider, raw) {
 export function normalizeFullId(id, knownProviders = []) {
   const s = String(id || "").trim();
   if (!s) return "";
-  // 1. 查别名表（clinebot-z-ai-glm-5.3-flash → clinebot/z-ai/glm-5.3-flash）
+  // 1. 查别名表（cline-z-ai-glm-5.3-flash → cline/z-ai/glm-5.3-flash）
   const aliased = getModelAlias(s);
   if (aliased) return aliased;
   // 2. 已含 /，走原有逻辑

package/src/providers/registry.js

@@ -12,7 +12,7 @@ export const customProviders = [
   },
   {
     id: "cline",
-    match: (id, baseUrl) => id === "cline" || id === "clinebot" || String(baseUrl).includes("cline.bot"),
+    match: (id, baseUrl) => id === "cline" || String(baseUrl).includes("cline.bot"),
     load: () => import("./cline.js").then((m) => m.createClineProvider),
   },
 ];

package/src/providers/share-keys.js

@@ -3,20 +3,25 @@
 import { splitModelId, DEFAULT_PROVIDER } from "./model-id.js";
 import { classifyProvider } from "./classify.js";
 import { loadProviderKeys, listProviderIdsWithKeys } from "../state.js";
+import { isRefreshToken } from "./cline/headers.js";
 
 export const SHARE_KEYS_HEADER = "x-mslxdff-share-keys";
 
 // 硬排除：refresh-token 型凭据（对端刷新会轮换 token，与本机互相踢下线）——正确性问题。
-const NEVER_SHARE_IDS = new Set(["cline", "clinebot"]);
+// 二层保护：① 按 id 硬排除（cline 恒 local-only）；② 按凭据形状兜底（见 shareableProviderIds）。
+const NEVER_SHARE_IDS = new Set(["cline"]);
 
 // 本节点应 cast key 到出站转发的供应商 id 集合 = 所有「本机有 key」的供应商，
-// 减去：opencode（无 key 且恒排除）、local-only（workbuddy，本就不走组员）、刷新型凭据。
+// 减去：opencode（无 key 且恒排除）、local-only（workbuddy/cline系，本就不走组员）、刷新型凭据。
 export function shareableProviderIds({ file } = {}) {
   const ids = [];
   for (const id of listProviderIdsWithKeys({ file })) {
     if (id === DEFAULT_PROVIDER) continue;
     if (NEVER_SHARE_IDS.has(id)) continue;
     try { if (classifyProvider(id) === "local-only") continue; } catch {}
+    // 形状兜底：id 白名单可能有残留（迁移未跑/回滚/手改 config），只要该供应商现有 key 里
+    // 有一个是 refreshToken 形态，就一律不外借——refreshToken 借出去会被对端刷新轮换，双向踢下线。
+    try { if (loadProviderKeys(id, { file }).some((k) => isRefreshToken(k, id))) continue; } catch {}
     ids.push(id);
   }
   return ids;