mslxdff 0.1.140 → 0.1.142

package/package.json

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

package/src/cli/commands/provider/cline-login.js

@@ -119,7 +119,37 @@ export async function handleClineLogin(id, sub) {
   console.log(`✅ 登录成功! 账号: ${email}`);
   console.log(`🔑 refreshToken: ${rt.slice(0, 8)}…${rt.slice(-8)} (${rt.length} 字符)`);
   // 落盘到 state（供应商 id 恒为 cline；写盘前先跑一次性迁移，保证老用户不会再写出 clinebot）
-  const { defaultStateFile, loadProviderKeys, saveProviderConfig, loadProviderConfig } = await import("../../../state.js");
+  // 同邮箱去重：refreshToken 每次 login 都换新串，裸串比对拦不住重复账号，必须按 email 归一。
+  // auths 存 uid=email 索引行（domain=cline.bot），keys 与 auths 双写；老 keys 无映射时用 refresh 反查兜底。
+  const { defaultStateFile, loadProviderKeys, saveProviderConfig, loadProviderConfig, loadProviderAuths } = await import("../../../state.js");
+  function normEmail(v) { return String(v || "").trim().toLowerCase(); }
+  function emailFromJson(j) {
+    try {
+      const d = j?.data && typeof j.data === "object" ? j.data : j;
+      const u = d?.userInfo && typeof d.userInfo === "object" ? d.userInfo : null;
+      const cand = u?.email || d?.email || d?.user?.email || u?.mail || d?.mail || "";
+      if (cand && String(cand).includes("@")) return normEmail(cand);
+      const m = String(JSON.stringify(j || {}).slice(0, 4000)).match(/[\w.+-]+@[\w-]+\.[\w.]+/);
+      return m ? normEmail(m[0]) : "";
+    } catch { return ""; }
+  }
+  async function resolveClineEmail(refreshToken) {
+    try {
+      const baseNoV1 = "https://api.cline.bot";
+      const res = await compatFetch(`${baseNoV1}/api/v1/auth/refresh`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ refreshToken, grantType: "refresh_token" }), ...extraOpts, signal: timeoutSignal(15000) });
+      if (!res.ok) return "";
+      return emailFromJson(await res.json().catch(() => null));
+    } catch { return ""; }
+  }
+  function upsertAuths(list, email, rt) {
+    const norm = normEmail(email);
+    if (!norm || norm === "unknown") return [...(list || [])];
+    const next = [...(list || [])];
+    const i = next.findIndex((a) => normEmail(a?.uid) === norm);
+    if (i >= 0) next[i] = { uid: next[i].uid, domain: "cline.bot", enterpriseId: "", refreshToken: rt };
+    else next.push({ uid: String(email).trim(), domain: "cline.bot", enterpriseId: "", refreshToken: rt });
+    return next;
+  }
   try {
     const { runStateMigrations } = await import("../../../state/migrations.js");
     const mig = await runStateMigrations({ file: defaultStateFile() });
@@ -128,12 +158,51 @@ export async function handleClineLogin(id, sub) {
   try {
     const pid = "cline";
     const cur = loadProviderKeys(pid);
+    const cfg = loadProviderConfig(pid) || { baseUrl: "", keys: [] };
+    const baseUrl = cfg.baseUrl || "https://api.cline.bot";
+    let auths = loadProviderAuths(pid) || [];
+    const norm = normEmail(email);
     if (cur.includes(rt)) {
-      console.log(`   ℹ️ ${pid} 已存在相同 token，跳过`);
+      auths = upsertAuths(auths, email, rt);
+      saveProviderConfig(pid, { baseUrl, keys: cur, auths });
+      console.log(`   ℹ️ ${pid} 已存在相同 token，已补邮箱映射（现 ${cur.length} 个账号）`);
+    } else if (norm && norm !== "unknown") {
+      const ai = auths.findIndex((a) => normEmail(a?.uid) === norm);
+      if (ai >= 0) {
+        const oldRt = String(auths[ai]?.refreshToken || "");
+        const nextKeys = [...cur];
+        const at = oldRt ? nextKeys.indexOf(oldRt) : -1;
+        if (at >= 0) nextKeys[at] = rt;
+        else { const dup = nextKeys.indexOf(rt); if (dup < 0) nextKeys.push(rt); }
+        auths = upsertAuths(auths, email, rt);
+        saveProviderConfig(pid, { baseUrl, keys: [...new Set(nextKeys.filter(Boolean))], auths });
+        console.log(`   ℹ️ ${email} 已存在，token 已替换（仍 ${nextKeys.length} 个账号，未追加）`);
+      } else {
+        let dupIdx = -1;
+        const resolved = [];
+        for (let i = 0; i < cur.length; i++) {
+          const em = await resolveClineEmail(cur[i]);
+          resolved[i] = em;
+          if (em && em === norm) { dupIdx = i; break; }
+          await new Promise((r) => setTimeout(r, 300));
+        }
+        if (dupIdx >= 0) {
+          const nextKeys = [...cur]; nextKeys[dupIdx] = rt;
+          for (let i = 0; i < cur.length; i++) if (resolved[i]) auths = upsertAuths(auths, resolved[i], i === dupIdx ? rt : cur[i]);
+          auths = upsertAuths(auths, email, rt);
+          saveProviderConfig(pid, { baseUrl, keys: [...new Set(nextKeys.filter(Boolean))], auths });
+          console.log(`   ℹ️ ${email} 已存在（位置 ${dupIdx + 1}），token 已替换（仍 ${nextKeys.length} 个账号，未追加）`);
+        } else {
+          const nextKeys = [...new Set([...cur, rt].filter(Boolean))];
+          for (let i = 0; i < cur.length; i++) if (resolved[i]) auths = upsertAuths(auths, resolved[i], cur[i]);
+          auths = upsertAuths(auths, email, rt);
+          saveProviderConfig(pid, { baseUrl, keys: nextKeys, auths });
+          console.log(`   ✅ 已写入 ${pid}（现 ${nextKeys.length} 个账号）`);
+        }
+      }
     } else {
-      const cfg = loadProviderConfig(pid) || { baseUrl: "", keys: [] };
       const nextKeys = [...new Set([...(cfg.keys || cur), rt].filter(Boolean))];
-      saveProviderConfig(pid, { baseUrl: cfg.baseUrl || "https://api.cline.bot", keys: nextKeys });
+      saveProviderConfig(pid, { baseUrl, keys: nextKeys, auths });
       console.log(`   ✅ 已写入 ${pid}（现 ${nextKeys.length} 个账号）`);
     }
   } catch (e) {
@@ -144,6 +213,6 @@ export async function handleClineLogin(id, sub) {
   console.log("  mslxdff -restart                         重启网关使新账号生效");
   console.log("  mslxdff -provider cline bench --json     测速 deepseek 是否 200");
   console.log("  mslxdff -chat                             直接对话，模型选 deepseek/deepseek-v4-flash");
-  console.log("\n多账号：重复 `mslxdff -provider cline login` 追加，二号自动做后备");
+  console.log("\n多账号：重复 `mslxdff -provider cline login` 追加（同邮箱自动替换不追加），二号自动做后备");
   process.exit(0);
 }

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

@@ -17,6 +17,14 @@ export async function handleProviderKeys(id, sub, rest, args) {
           if (a) console.log(`  [${i + 1}]  user=${a.userName || "(未识别)"} uid=${a.userId ? `${a.userId.slice(0, 8)}…` : "(空，请删了重登回填)"} domain=${a.domainId ? a.domainId.slice(0, 8) + "…" : "(空)"} (${k.length} chars)`);
           else console.log(`  [${i + 1}]  ${k.slice(0, 4)}…${k.slice(-4)} (${k.length} chars)`);
         }
+      } else if (id === "cline") {
+        const { loadProviderAuths } = await import("../../../state.js");
+        const auths = loadProviderAuths(id) || [];
+        const byRt = new Map(auths.map((a) => [String(a?.refreshToken || ""), String(a?.uid || "")]));
+        keys.forEach((k, i) => {
+          const em = byRt.get(String(k || "")) || "";
+          console.log(`  [${i + 1}]  ${k.slice(0, 4)}…${k.slice(-4)} (${k.length} chars)${em ? `  ${em}` : "  (邮箱未映射，重登一次回填)"}`);
+        });
       } else keys.forEach((k, i) => console.log(`  [${i + 1}]  ${k.slice(0, 4)}…${k.slice(-4)} (${k.length} chars)`));
       console.log(`  remove by: mslxdff -provider ${id} remove <seq> [seq...] | <key-value>`);
     } else {

package/src/providers/cline/index.js

@@ -1,5 +1,5 @@
 import { createKeyRing } from "../keyring.js";
-import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath, saveProviderConfig } from "../../state.js";
+  import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath, saveProviderConfig, loadProviderAuths } from "../../state.js";
 import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createChatRunner } from "../base.js";
 import { compatFetch } from "../../compat.js";
 import { joinModelId } from "../model-id.js";
@@ -68,8 +68,14 @@ export function createClineProvider({
           const idx = cur.indexOf(oldRefreshToken);
           if (idx >= 0) {
             const next = [...cur]; next[idx] = newRefreshToken;
-            // 优先写 providerConfigs，兼容旧路径由 saveProviderConfig 处理
-            saveProviderConfig(id, { baseUrl: resolvedBase, keys: next }, file ? { file } : {});
+            // 优先写 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 {}

package/src/providers/generic.js

@@ -4,6 +4,9 @@ import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createC
 import { compatFetch } from "../compat.js";
 import crypto from "node:crypto";
 import { genId, opencodeUa, digestIdTail } from "../opencode-identity.js";
+import { isResponsesModel } from "../upstream-responses.js";
+import { createResponsesChannel, resolveResponsesPath, envSlug } from "./responses-channel.js";
+import { resolveEngineMode } from "../upstream-engine/mode.js";
 
 const { UndiciFetch } = getUndici();
 
@@ -41,6 +44,7 @@ export function createGenericProvider({
   apiKey,
   modelsPath,
   chatPath,
+  responsesPath,
   connectTimeoutMs = Number(process.env.MSLXDFF_GENERIC_TIMEOUT_MS) || 30_000,
   cooldownMs = envInt("MSLXDFF_GENERIC_COOLDOWN_MS", 30_000),
   retry = {
@@ -106,12 +110,29 @@ export function createGenericProvider({
     });
   }
 
+  // responses 类模型（muse-spark* 等）只在 /responses 挂载 → 单独通道，出参恒 chat 形状。
+  const responses = createResponsesChannel({
+    id,
+    url: joinUrl(resolvedBase, resolveResponsesPath(id, responsesPath)),
+    connectTimeoutMs,
+    retry,
+    cooldownMs,
+    // 供应商级 <ID>_SDK 未设置即继承全局总闸（MSLXDFF_UPSTREAM_ENGINE）
+    sdkEnabled: resolveEngineMode(process.env, `MSLXDFF_${envSlug(id)}_SDK`) === "sdk",
+    buildHeaders,
+    fetchImpl,
+    dispatcher,
+  });
+
   async function chat(body, opts) {
+    const sourceKey = `MSLXDFF_${envSlug(id)}_KEY`;
+    if (isResponsesModel(body?.model)) return responses.run(body, ring, sourceKey, opts);
     const { runChat } = scopedRunner(ring, opts);
-    return runChat(body, ring, `MSLXDFF_${id.toUpperCase()}_KEY`);
+    return runChat(body, ring, sourceKey);
   }
   async function chatWithKeys(body, keys, opts) {
     const tmp = createKeyRing(keys, { cooldownMs });
+    if (isResponsesModel(body?.model)) return responses.run(body, tmp, "shared provider keys", opts);
     const { runChat } = scopedRunner(tmp, opts);
     return runChat(body, tmp, "shared provider keys");
   }
@@ -131,5 +152,5 @@ export function createGenericProvider({
     if (agent && typeof agent.close === "function") { try { await agent.close(); } catch {} }
   }
 
-  return { id, chat, chatWithKeys, listModels, preheat, close, agent, keyRing: ring, baseUrl: resolvedBase };
+  return { id, chat, chatWithKeys, listModels, preheat, close, agent, keyRing: ring, baseUrl: resolvedBase, responsesUrl: responses.url };
 }

package/src/providers/responses-channel.js

@@ -0,0 +1,120 @@
+// 通用（带 key）供应商的 responses 通道：muse-spark* 这类模型上游只挂 /responses，
+// 打同 host 的 /chat/completions 会 503 "Endpoint is unavailable"（ocgo 实测 2026-09-22）。
+// 判定单一来源 = isResponsesModel（models.dev 模型级 provider.npm + muse-spark 前缀兜底），
+// 与 GET /v1/models 的 capabilities.upstreamApi 同源，新模型无需改码。
+//
+// 契约：run() 的出参恒为 **chat 形状**（SSE 或 JSON），调用方无需再判分支。
+//   · 流式优先 @ai-sdk/openai 的 responses 适配器（含加密思考往返，ADR-0017 复用）；
+//   · SDK 不可用 / 非流式 → 原生 fetch + chatToResponsesBody 正转换 + 反向整形。
+// key 轮换、退避重试、_t 计时与 createChatRunner（base.js）同语义，避免两条通道行为漂移。
+import { chatToResponsesBody, toChatResponse, reshapeResponsesSse } from "../upstream-responses.js";
+import { attemptOnceResponsesSdk } from "../upstream-engine/sdk/responses.js";
+import { ENGINE_MARKER } from "../upstream-engine/sdk/chat.js";
+import { sleep } from "./base.js";
+
+/** 供应商 id → env 片段（`my-api` → `MY_API`），与 providerKeyEnv 同规则 */
+export function envSlug(id) {
+  return String(id || "").toUpperCase().replace(/[^A-Z0-9]/g, "_");
+}
+
+/**
+ * responses 端点路径：显式入参 > env `MSLXDFF_<ID>_RESPONSES_PATH` > 缺省 `/responses`。
+ * 归一为以 `/` 开头（joinUrl 会再拼 baseUrl）。
+ */
+export function resolveResponsesPath(id, responsesPath) {
+  const raw = responsesPath || process.env[`MSLXDFF_${envSlug(id)}_RESPONSES_PATH`] || "";
+  const s = String(raw).trim();
+  if (!s) return "/responses";
+  return s.startsWith("/") ? s : `/${s}`;
+}
+
+/**
+ * 建 responses 通道。
+ * @param {object} o
+ * @param {string} o.id 供应商 id（用于报错文案与 providerName）
+ * @param {string} o.url 已拼好的 responses 绝对 URL
+ * @param {number} o.connectTimeoutMs 单次尝试超时
+ * @param {object} o.retry 重试表（与 createChatRunner 同形状：network/429/50x → {attempts, delayMs}）
+ * @param {number} o.cooldownMs 全 key 冷却时的人话报错文案用
+ * @param {boolean} o.sdkEnabled 是否允许走 AI SDK responses 适配器（流式路径）
+ * @param {Function} o.buildHeaders (body, key, opts) → headers
+ * @param {Function} o.fetchImpl 注入的 fetch（连接池/测试接缝）
+ * @param {object} [o.dispatcher] undici Agent
+ */
+export function createResponsesChannel({
+  id,
+  url,
+  connectTimeoutMs = 30_000,
+  retry = {},
+  cooldownMs = 30_000,
+  sdkEnabled = true,
+  buildHeaders,
+  fetchImpl,
+  dispatcher = null,
+} = {}) {
+  async function attemptOnce(body, key, opts) {
+    const headers = buildHeaders ? buildHeaders(body, key, opts) : {};
+    const wantsStream = body?.stream !== false;
+    if (sdkEnabled && wantsStream) {
+      try {
+        const r = await attemptOnceResponsesSdk({
+          url, body, headers, providerName: id, marker: ENGINE_MARKER, fetchImpl,
+        });
+        if (r) return r; // 适配器已产出 chat SSE
+      } catch (e) {
+        if (!e || (!e._sdkLoadFailed && !e._sdkUnsupported)) throw e;
+        // SDK 装载失败 / URL 异形 → 落原生兜底（保底不变差）
+      }
+    }
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(new Error(`${id} timed out after ${connectTimeoutMs}ms`)), connectTimeoutMs);
+    try {
+      const fetchOpts = { method: "POST", headers, body: JSON.stringify(chatToResponsesBody(body)), signal: controller.signal };
+      if (dispatcher) fetchOpts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, fetchOpts);
+      if (!res.ok) return res;
+      if (wantsStream) return reshapeResponsesSse(res, body?.model);
+      const json = await res.json().catch(() => null);
+      return json ? toChatResponse(res, json) : res;
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  /** key 轮换 + 退避重试 + _t 计时；语义对齐 base.js 的 createChatRunner.runChat */
+  async function run(body, activeRing, sourceKey, opts) {
+    const t0 = performance.now();
+    const attempts = [];
+    let waitMs = 0;
+    const key = activeRing.next();
+    if (!key && activeRing.size > 0) {
+      const err = new Error(`${id}: all API keys are in cooldown (last error < ${cooldownMs}ms ago) — provider temporarily unavailable`);
+      err._t = { attempts: [], waitMs: 0, totalMs: Math.round(performance.now() - t0), cooldownMs };
+      throw err;
+    }
+    for (let attempt = 0; ; attempt++) {
+      const t = performance.now();
+      let result;
+      try {
+        result = await attemptOnce(body, key, opts);
+      } catch (err) {
+        result = err;
+      }
+      attempts.push({ attempt, type: result instanceof Error ? "network" : `http${result?.status}`, ms: Math.round(performance.now() - t) });
+      if (result instanceof Error) {
+        const entry = retry?.network;
+        if (entry && attempt < entry.attempts) { await sleep(entry.delayMs); waitMs += entry.delayMs; continue; }
+        activeRing.onError(key);
+        result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
+        throw result;
+      }
+      const entry = retry?.[result.status];
+      if (entry && attempt < entry.attempts) { await sleep(entry.delayMs); waitMs += entry.delayMs; continue; }
+      if (result.status === 401 || result.status === 403 || result.status === 429 || result.status >= 500) activeRing.onError(key);
+      try { result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) }; } catch {}
+      return result;
+    }
+  }
+
+  return { url, attemptOnce, run };
+}