mslxdff 0.1.203 → 0.1.208

package/src/providers/codearts/dpop.js

@@ -1,95 +1,95 @@
-// DPoP（RFC 9449）证明 JWT：ES256 + P-256，供 STS /v1/oauth2/tokens 请求头使用。
-// refresh_token 与首次换取时的 DPoP 公钥绑定：私钥 JWK 必须随凭证持久化（d 字段），
-// 换新私钥刷新会被 STS 拒（400 invalid refresh token: InvalidDPoPHeader）。
-// 算法对齐 HITZY2002/codearts2api internal/upstream/dpop.go。
-import crypto from "node:crypto";
-
-// P-256 阶 n（用于低 S 归一化：s > n/2 → s = n - s，jose 默认低 S 兼容性更好）。
-const P256_N = 0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551n;
-
-const b64url = (data) => Buffer.from(data).toString("base64url");
-
-/** 生成可持久化的 DPoP 私钥 JWK（kty/crv/x/y/d，均 base64url 无 padding）。 */
-export function newDpopPrivateJwk() {
-  const { publicKey, privateKey } = crypto.generateKeyPairSync("ec", { namedCurve: "P-256" });
-  const pub = publicKey.export({ format: "jwk" });
-  const priv = privateKey.export({ format: "jwk" });
-  return { kty: "EC", crv: "P-256", x: pub.x, y: pub.y, d: priv.d };
-}
-
-export function dpopPublicJwk(privateJwk) {
-  return { kty: "EC", crv: "P-256", x: privateJwk?.x || "", y: privateJwk?.y || "" };
-}
-
-export function isValidDpopJwk(jwk) {
-  return !!jwk && jwk.kty === "EC" && jwk.crv === "P-256" && typeof jwk.d === "string" && jwk.d.length > 0 && !!jwk.x && !!jwk.y;
-}
-
-/** 从持久化 JWK 恢复私钥对象（非法材料直接抛错，调用方须提示重新登录）。 */
-export function dpopPrivateKey(jwk) {
-  if (!isValidDpopJwk(jwk)) throw new Error("codearts: invalid DPoP private JWK — re-login required");
-  try {
-    return crypto.createPrivateKey({ key: { ...jwk }, format: "jwk" });
-  } catch (err) {
-    throw new Error(`codearts: DPoP private JWK unusable (${err?.message || err}) — re-login required`);
-  }
-}
-
-/** 低 S 归一化：ieee-p1363 64 字节 r||s 原地修正 s（合法：ECDSA (r, n-s) 等价）。 */
-function normalizeLowS(sig) {
-  if (sig.length !== 64) return sig;
-  const s = BigInt("0x" + sig.subarray(32, 64).toString("hex"));
-  const half = P256_N >> 1n;
-  if (s <= half || s === 0n) return sig;
-  const fixed = P256_N - s;
-  Buffer.from(fixed.toString(16).padStart(64, "0"), "hex").copy(sig, 32);
-  return sig;
-}
-
-/**
- * 生成 DPoP proof JWT。
- * @param {object} privateJwk 持久化私钥 JWK（含 d）
- * @param {string} htu 目标端点完整 URL（STS token 端点）
- * @returns {string} `b64(header).b64(payload).b64(sig)` 三段 JWT
- */
-export function signDpopProof(privateJwk, htu) {
-  const key = dpopPrivateKey(privateJwk);
-  const header = { alg: "ES256", typ: "dpop+jwt", jwk: dpopPublicJwk(privateJwk) };
-  const payload = {
-    htm: "POST",
-    htu: String(htu || ""),
-    iat: Math.floor(Date.now() / 1000),
-    jti: crypto.randomBytes(32).toString("hex"),
-  };
-  const input = `${b64url(JSON.stringify(header))}.${b64url(JSON.stringify(payload))}`;
-  // 标准 JWS/ES256：对 ASCII(input) 做 SHA256+ECDSA（crypto.sign("SHA256", input)）。
-  // 注意：千万别用 sign(null, sha256(input))——OpenSSL 的 noneWithECDSA 把 digest 当整数标量，
-  // 签出来自验能过、但任何标准验签方（含 WebCrypto/华为 STS）都拒签（真机 400 STS5.1804 实锤）。
-  const sig = normalizeLowS(crypto.sign("SHA256", Buffer.from(input, "utf8"), { key, dsaEncoding: "ieee-p1363" }));
-  return `${input}.${b64url(sig)}`;
-}
-
-/** 验签辅助（测试/诊断用）：校验 JWT 签名是否与 JWK 公钥匹配。 */
-export function verifyDpopProof(proof) {
-  const parts = String(proof || "").split(".");
-  if (parts.length !== 3) return { ok: false };
-  try {
-    const header = JSON.parse(Buffer.from(parts[0], "base64url").toString("utf8"));
-    const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
-    const sig = Buffer.from(parts[2], "base64url");
-    const pub = crypto.createPublicKey({ key: { kty: "EC", crv: "P-256", x: header.jwk.x, y: header.jwk.y }, format: "jwk" });
-    const input = Buffer.from(`${parts[0]}.${parts[1]}`, "utf8");
-    const s = BigInt("0x" + sig.subarray(32, 64).toString("hex"));
-    // 标准 JWS/ES256 验签（与签名端对称；dsaEncoding 必须显式 ieee-p1363，node 默认 DER）。
-    const vopts = { dsaEncoding: "ieee-p1363" };
-    const ok = crypto.verify("SHA256", input, { key: pub, ...vopts }, sig)
-      || (s > P256_N >> 1n && crypto.verify("SHA256", input, { key: pub, ...vopts }, (() => {
-        const alt = Buffer.from(sig);
-        Buffer.from((P256_N - s).toString(16).padStart(64, "0"), "hex").copy(alt, 32);
-        return alt;
-      })()));
-    return { ok, header, payload };
-  } catch {
-    return { ok: false };
-  }
-}
+// DPoP（RFC 9449）证明 JWT：ES256 + P-256，供 STS /v1/oauth2/tokens 请求头使用。
+// refresh_token 与首次换取时的 DPoP 公钥绑定：私钥 JWK 必须随凭证持久化（d 字段），
+// 换新私钥刷新会被 STS 拒（400 invalid refresh token: InvalidDPoPHeader）。
+// 算法对齐 HITZY2002/codearts2api internal/upstream/dpop.go。
+import crypto from "node:crypto";
+
+// P-256 阶 n（用于低 S 归一化：s > n/2 → s = n - s，jose 默认低 S 兼容性更好）。
+const P256_N = 0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551n;
+
+const b64url = (data) => Buffer.from(data).toString("base64url");
+
+/** 生成可持久化的 DPoP 私钥 JWK（kty/crv/x/y/d，均 base64url 无 padding）。 */
+export function newDpopPrivateJwk() {
+  const { publicKey, privateKey } = crypto.generateKeyPairSync("ec", { namedCurve: "P-256" });
+  const pub = publicKey.export({ format: "jwk" });
+  const priv = privateKey.export({ format: "jwk" });
+  return { kty: "EC", crv: "P-256", x: pub.x, y: pub.y, d: priv.d };
+}
+
+export function dpopPublicJwk(privateJwk) {
+  return { kty: "EC", crv: "P-256", x: privateJwk?.x || "", y: privateJwk?.y || "" };
+}
+
+export function isValidDpopJwk(jwk) {
+  return !!jwk && jwk.kty === "EC" && jwk.crv === "P-256" && typeof jwk.d === "string" && jwk.d.length > 0 && !!jwk.x && !!jwk.y;
+}
+
+/** 从持久化 JWK 恢复私钥对象（非法材料直接抛错，调用方须提示重新登录）。 */
+export function dpopPrivateKey(jwk) {
+  if (!isValidDpopJwk(jwk)) throw new Error("codearts: invalid DPoP private JWK — re-login required");
+  try {
+    return crypto.createPrivateKey({ key: { ...jwk }, format: "jwk" });
+  } catch (err) {
+    throw new Error(`codearts: DPoP private JWK unusable (${err?.message || err}) — re-login required`);
+  }
+}
+
+/** 低 S 归一化：ieee-p1363 64 字节 r||s 原地修正 s（合法：ECDSA (r, n-s) 等价）。 */
+function normalizeLowS(sig) {
+  if (sig.length !== 64) return sig;
+  const s = BigInt("0x" + sig.subarray(32, 64).toString("hex"));
+  const half = P256_N >> 1n;
+  if (s <= half || s === 0n) return sig;
+  const fixed = P256_N - s;
+  Buffer.from(fixed.toString(16).padStart(64, "0"), "hex").copy(sig, 32);
+  return sig;
+}
+
+/**
+ * 生成 DPoP proof JWT。
+ * @param {object} privateJwk 持久化私钥 JWK（含 d）
+ * @param {string} htu 目标端点完整 URL（STS token 端点）
+ * @returns {string} `b64(header).b64(payload).b64(sig)` 三段 JWT
+ */
+export function signDpopProof(privateJwk, htu) {
+  const key = dpopPrivateKey(privateJwk);
+  const header = { alg: "ES256", typ: "dpop+jwt", jwk: dpopPublicJwk(privateJwk) };
+  const payload = {
+    htm: "POST",
+    htu: String(htu || ""),
+    iat: Math.floor(Date.now() / 1000),
+    jti: crypto.randomBytes(32).toString("hex"),
+  };
+  const input = `${b64url(JSON.stringify(header))}.${b64url(JSON.stringify(payload))}`;
+  // 标准 JWS/ES256：对 ASCII(input) 做 SHA256+ECDSA（crypto.sign("SHA256", input)）。
+  // 注意：千万别用 sign(null, sha256(input))——OpenSSL 的 noneWithECDSA 把 digest 当整数标量，
+  // 签出来自验能过、但任何标准验签方（含 WebCrypto/华为 STS）都拒签（真机 400 STS5.1804 实锤）。
+  const sig = normalizeLowS(crypto.sign("SHA256", Buffer.from(input, "utf8"), { key, dsaEncoding: "ieee-p1363" }));
+  return `${input}.${b64url(sig)}`;
+}
+
+/** 验签辅助（测试/诊断用）：校验 JWT 签名是否与 JWK 公钥匹配。 */
+export function verifyDpopProof(proof) {
+  const parts = String(proof || "").split(".");
+  if (parts.length !== 3) return { ok: false };
+  try {
+    const header = JSON.parse(Buffer.from(parts[0], "base64url").toString("utf8"));
+    const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
+    const sig = Buffer.from(parts[2], "base64url");
+    const pub = crypto.createPublicKey({ key: { kty: "EC", crv: "P-256", x: header.jwk.x, y: header.jwk.y }, format: "jwk" });
+    const input = Buffer.from(`${parts[0]}.${parts[1]}`, "utf8");
+    const s = BigInt("0x" + sig.subarray(32, 64).toString("hex"));
+    // 标准 JWS/ES256 验签（与签名端对称；dsaEncoding 必须显式 ieee-p1363，node 默认 DER）。
+    const vopts = { dsaEncoding: "ieee-p1363" };
+    const ok = crypto.verify("SHA256", input, { key: pub, ...vopts }, sig)
+      || (s > P256_N >> 1n && crypto.verify("SHA256", input, { key: pub, ...vopts }, (() => {
+        const alt = Buffer.from(sig);
+        Buffer.from((P256_N - s).toString(16).padStart(64, "0"), "hex").copy(alt, 32);
+        return alt;
+      })()));
+    return { ok, header, payload };
+  } catch {
+    return { ok: false };
+  }
+}

package/src/providers/codearts/index.js

@@ -1,175 +1,175 @@
-// codearts 供应商工厂：注册表入口（registry.js → createCodeartsProvider）。
-// key = 凭证 blob（JSON 字符串，一华为账号一条，见 auth-pool.js）；多账号 keyring 自动轮转。
-import { createKeyRing } from "../keyring.js";
-import { loadProviderKeys, loadProviderBaseUrl, saveProviderConfig } from "../../state.js";
-import { getUndici, createAgent, envInt, collectApiKeysGeneric } from "../base.js";
-import { compatFetch } from "../../compat.js";
-import { logDir, appendEvent } from "../../logs.js";
-import { join } from "node:path";
-import { SNAP_BASE, MODELS_CACHE_TTL_MS } from "./const.js";
-import { createAuthPool } from "./auth-pool.js";
-import { createCatalog, discoverAccountModels } from "./models.js";
-import { createChatService } from "./chat.js";
-import { createGate } from "./concurrency.js";
-
-const { UndiciFetch } = getUndici();
-
-function resolveBaseUrl(baseUrl) {
-  if (baseUrl) return String(baseUrl).trim().replace(/\/+$/, "");
-  const env = loadProviderBaseUrl("codearts");
-  return env || SNAP_BASE;
-}
-
-export function createCodeartsProvider({
-  id = "codearts",
-  baseUrl,
-  apiKeys,
-  apiKey,
-  chatPath,
-  stsHost,
-  benefitHost,
-  snapBase,
-  connectTimeoutMs = envInt("MSLXDFF_CODEARTS_TIMEOUT_MS", 30_000),
-  cooldownMs = envInt("MSLXDFF_CODEARTS_COOLDOWN_MS", 30_000),
-  maxConcurrent = Number.parseInt(process.env.MSLXDFF_CODEARTS_MAX_CONCURRENT ?? "", 10) || 3,
-  autoClaim = process.env.MSLXDFF_CODEARTS_AUTO_CLAIM !== "0",
-  fetchImpl,
-  file,
-  clock = Date.now,
-} = {}) {
-  if (id !== "codearts") throw new Error(`codearts provider id mismatch: ${id}`);
-  const resolvedBase = snapBase || resolveBaseUrl(baseUrl);
-  if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
-  const chatSvcBase = resolvedBase;
-
-  const rawKeys = collectApiKeysGeneric(id, apiKeys, apiKey, (pid) => loadProviderKeys(pid, file ? { file } : {}));
-  const allKeys = [...new Set(rawKeys.map((k) => String(k).trim()).filter(Boolean))];
-  const ring = createKeyRing(allKeys, { cooldownMs });
-
-  // 刷新轮转写回：原位替换 providerConfigs.codearts.keys 里的旧 blob + ring/pool 重排
-  const saveFn = async ({ oldBlob, newBlob }) => {
-    try {
-      const cur = loadProviderKeys(id, file ? { file } : {});
-      const idx = cur.indexOf(oldBlob);
-      if (idx < 0) return;
-      const next = [...cur];
-      next[idx] = newBlob;
-      saveProviderConfig(id, { baseUrl: loadProviderBaseUrl(id, file ? { file } : {}) || resolvedBase, keys: next }, file ? { file } : {});
-      ring.replace(oldBlob, newBlob);
-      pool.replace(oldBlob, newBlob);
-    } catch {}
-  };
-  const pool = createAuthPool({ keys: allKeys, fetchImpl, stsHost, clock, saveFn });
-  const catalog = createCatalog();
-  // 该上游对并发极敏感（实测 >3 即坏号/限流）；超限请求 FIFO 排队，不拒绝。
-  const gate = createGate({ limit: maxConcurrent });
-
-  let agent = null; let dispatcher = null;
-  try {
-    const a = createAgent({
-      keepAliveTimeout: envInt("MSLXDFF_CODEARTS_KEEPALIVE_TIMEOUT", 30_000),
-      keepAliveMaxTimeout: envInt("MSLXDFF_CODEARTS_KEEPALIVE_MAX_TIMEOUT", 60_000),
-      connections: envInt("MSLXDFF_CODEARTS_KEEPALIVE_CONNECTIONS", 20),
-    });
-    agent = a.agent;
-    dispatcher = a.dispatcher;
-  } catch {}
-
-  const chatSvc = createChatService({
-    id, baseUrl: chatSvcBase, chatPath, fetchImpl, dispatcher, authPool: pool, catalog, connectTimeoutMs, clock,
-  });
-
-  const onWait = (info) => {
-    try { appendEvent({ type: "codearts-queue", ...info }); } catch {}
-  };
-  async function chat(body, opts = {}) {
-    if (!ring.size) throw new Error("codearts: missing credential — run: mslxdff -provider codearts login");
-    return gate.run(() => chatSvc.runChat(body, ring, opts), onWait);
-  }
-  async function chatWithKeys(body, keys, opts = {}) {
-    const blobs = (keys || []).filter((k) => typeof k === "string" && k.trim().startsWith("{"));
-    if (!blobs.length) throw new Error("codearts: shared keys are not valid credential blobs");
-    const tmpRing = createKeyRing(blobs, { cooldownMs });
-    const tmpPool = createAuthPool({ keys: blobs, fetchImpl, stsHost, clock }); // 借用凭据不写回本节点
-    const tmpSvc = createChatService({ id, baseUrl: chatSvcBase, chatPath, fetchImpl, dispatcher: null, authPool: tmpPool, catalog, connectTimeoutMs, clock });
-    return gate.run(() => tmpSvc.runChat(body, tmpRing, opts), onWait);
-  }
-
-  // 三路发现（主账号）；结果写目录（benefit 判定按账号隔离）
-  let discovering = null;
-  async function discover(force = false) {
-    const candidates = pool.aliveAccounts();
-    if (!candidates.length) throw new Error("codearts: no alive account — run: mslxdff -provider codearts login");
-    if (discovering) return discovering;
-    discovering = (async () => {
-      let lastErr = null;
-      // 逐个账号试（blob 顺序 = 主账号优先）：state 里可能留着已被轮转消费的僵尸凭证（实测 STS5.1806
-      // "the refresh token has been used"，login 只追加不清旧，死号会永远排在第一个）。一个死号绝不能
-      // 把整个目录变成空表——福利套餐轮换出的新模型全靠这里发现。
-      for (const candidate of candidates) {
-        if (!force && !catalog.isStale(candidate.userId, clock())) return catalog.accountModels(candidate.userId);
-        try {
-          const account = await pool.getCredential(candidate.blob);
-          const { models, builtinOk, benefitOk } = await discoverAccountModels({ account, snapBase: resolvedBase, benefitHost, autoClaim, fetchImpl });
-          catalog.setAccount(account.userId, models, { keepBenefit: builtinOk && !benefitOk, now: clock() });
-          return models;
-        } catch (err) {
-          lastErr = err; // 死号/该号三路全空 → 换下一个号
-        }
-      }
-      throw lastErr || new Error("codearts: no account could list models — run: mslxdff -provider codearts login");
-    })().finally(() => { discovering = null; });
-    return discovering;
-  }
-
-  let modelsCache = { at: 0, list: [] };
-  async function listModels() {
-    if (clock() - modelsCache.at < MODELS_CACHE_TTL_MS && modelsCache.list.length) return modelsCache.list;
-    let models;
-    try {
-      models = await discover();
-    } catch {
-      models = catalog.accountModels(pool.pickPrimary()?.userId || "");
-    }
-    if (!models.length) return [];
-    const list = models.map((m) => ({
-      id: `codearts/${m.id}`,
-      object: "model",
-      name: m.name || m.id,
-      ...(m.contextWindow ? { maxInputTokens: m.contextWindow } : {}),
-      ...(m.maxTokens ? { maxOutputTokens: m.maxTokens } : {}),
-      ...(m.benefit ? { tags: ["free:benefit"] } : {}),
-    }));
-    modelsCache = { at: clock(), list };
-    return list;
-  }
-
-  async function preheat() {
-    if (!ring.size) return { ok: false, skipped: true };
-    try {
-      await discover();
-      return { ok: true };
-    } catch (err) {
-      return { ok: false, error: String(err?.message || err).slice(0, 120) };
-    }
-  }
-
-  async function close() { if (agent?.close) try { await agent.close(); } catch {} }
-
-
-  return {
-    id,
-    chat,
-    chatWithKeys,
-    listModels,
-    preheat,
-    close,
-    agent,
-    keyRing: ring,
-    baseUrl: resolvedBase,
-    _pool: pool,
-    _catalog: catalog,
-    _gate: gate,
-    _snapshotPath: join(logDir(), "codearts-models.json"),
-  };
-}
+// codearts 供应商工厂：注册表入口（registry.js → createCodeartsProvider）。
+// key = 凭证 blob（JSON 字符串，一华为账号一条，见 auth-pool.js）；多账号 keyring 自动轮转。
+import { createKeyRing } from "../keyring.js";
+import { loadProviderKeys, loadProviderBaseUrl, saveProviderConfig } from "../../state.js";
+import { getUndici, createAgent, envInt, collectApiKeysGeneric } from "../base.js";
+import { compatFetch } from "../../compat.js";
+import { logDir, appendEvent } from "../../logs.js";
+import { join } from "node:path";
+import { SNAP_BASE, MODELS_CACHE_TTL_MS } from "./const.js";
+import { createAuthPool } from "./auth-pool.js";
+import { createCatalog, discoverAccountModels } from "./models.js";
+import { createChatService } from "./chat.js";
+import { createGate } from "./concurrency.js";
+
+const { UndiciFetch } = getUndici();
+
+function resolveBaseUrl(baseUrl) {
+  if (baseUrl) return String(baseUrl).trim().replace(/\/+$/, "");
+  const env = loadProviderBaseUrl("codearts");
+  return env || SNAP_BASE;
+}
+
+export function createCodeartsProvider({
+  id = "codearts",
+  baseUrl,
+  apiKeys,
+  apiKey,
+  chatPath,
+  stsHost,
+  benefitHost,
+  snapBase,
+  connectTimeoutMs = envInt("MSLXDFF_CODEARTS_TIMEOUT_MS", 30_000),
+  cooldownMs = envInt("MSLXDFF_CODEARTS_COOLDOWN_MS", 30_000),
+  maxConcurrent = Number.parseInt(process.env.MSLXDFF_CODEARTS_MAX_CONCURRENT ?? "", 10) || 3,
+  autoClaim = process.env.MSLXDFF_CODEARTS_AUTO_CLAIM !== "0",
+  fetchImpl,
+  file,
+  clock = Date.now,
+} = {}) {
+  if (id !== "codearts") throw new Error(`codearts provider id mismatch: ${id}`);
+  const resolvedBase = snapBase || resolveBaseUrl(baseUrl);
+  if (!fetchImpl) fetchImpl = UndiciFetch || compatFetch;
+  const chatSvcBase = resolvedBase;
+
+  const rawKeys = collectApiKeysGeneric(id, apiKeys, apiKey, (pid) => loadProviderKeys(pid, file ? { file } : {}));
+  const allKeys = [...new Set(rawKeys.map((k) => String(k).trim()).filter(Boolean))];
+  const ring = createKeyRing(allKeys, { cooldownMs });
+
+  // 刷新轮转写回：原位替换 providerConfigs.codearts.keys 里的旧 blob + ring/pool 重排
+  const saveFn = async ({ oldBlob, newBlob }) => {
+    try {
+      const cur = loadProviderKeys(id, file ? { file } : {});
+      const idx = cur.indexOf(oldBlob);
+      if (idx < 0) return;
+      const next = [...cur];
+      next[idx] = newBlob;
+      saveProviderConfig(id, { baseUrl: loadProviderBaseUrl(id, file ? { file } : {}) || resolvedBase, keys: next }, file ? { file } : {});
+      ring.replace(oldBlob, newBlob);
+      pool.replace(oldBlob, newBlob);
+    } catch {}
+  };
+  const pool = createAuthPool({ keys: allKeys, fetchImpl, stsHost, clock, saveFn });
+  const catalog = createCatalog();
+  // 该上游对并发极敏感（实测 >3 即坏号/限流）；超限请求 FIFO 排队，不拒绝。
+  const gate = createGate({ limit: maxConcurrent });
+
+  let agent = null; let dispatcher = null;
+  try {
+    const a = createAgent({
+      keepAliveTimeout: envInt("MSLXDFF_CODEARTS_KEEPALIVE_TIMEOUT", 30_000),
+      keepAliveMaxTimeout: envInt("MSLXDFF_CODEARTS_KEEPALIVE_MAX_TIMEOUT", 60_000),
+      connections: envInt("MSLXDFF_CODEARTS_KEEPALIVE_CONNECTIONS", 20),
+    });
+    agent = a.agent;
+    dispatcher = a.dispatcher;
+  } catch {}
+
+  const chatSvc = createChatService({
+    id, baseUrl: chatSvcBase, chatPath, fetchImpl, dispatcher, authPool: pool, catalog, connectTimeoutMs, clock,
+  });
+
+  const onWait = (info) => {
+    try { appendEvent({ type: "codearts-queue", ...info }); } catch {}
+  };
+  async function chat(body, opts = {}) {
+    if (!ring.size) throw new Error("codearts: missing credential — run: mslxdff -provider codearts login");
+    return gate.run(() => chatSvc.runChat(body, ring, opts), onWait);
+  }
+  async function chatWithKeys(body, keys, opts = {}) {
+    const blobs = (keys || []).filter((k) => typeof k === "string" && k.trim().startsWith("{"));
+    if (!blobs.length) throw new Error("codearts: shared keys are not valid credential blobs");
+    const tmpRing = createKeyRing(blobs, { cooldownMs });
+    const tmpPool = createAuthPool({ keys: blobs, fetchImpl, stsHost, clock }); // 借用凭据不写回本节点
+    const tmpSvc = createChatService({ id, baseUrl: chatSvcBase, chatPath, fetchImpl, dispatcher: null, authPool: tmpPool, catalog, connectTimeoutMs, clock });
+    return gate.run(() => tmpSvc.runChat(body, tmpRing, opts), onWait);
+  }
+
+  // 三路发现（主账号）；结果写目录（benefit 判定按账号隔离）
+  let discovering = null;
+  async function discover(force = false) {
+    const candidates = pool.aliveAccounts();
+    if (!candidates.length) throw new Error("codearts: no alive account — run: mslxdff -provider codearts login");
+    if (discovering) return discovering;
+    discovering = (async () => {
+      let lastErr = null;
+      // 逐个账号试（blob 顺序 = 主账号优先）：state 里可能留着已被轮转消费的僵尸凭证（实测 STS5.1806
+      // "the refresh token has been used"，login 只追加不清旧，死号会永远排在第一个）。一个死号绝不能
+      // 把整个目录变成空表——福利套餐轮换出的新模型全靠这里发现。
+      for (const candidate of candidates) {
+        if (!force && !catalog.isStale(candidate.userId, clock())) return catalog.accountModels(candidate.userId);
+        try {
+          const account = await pool.getCredential(candidate.blob);
+          const { models, builtinOk, benefitOk } = await discoverAccountModels({ account, snapBase: resolvedBase, benefitHost, autoClaim, fetchImpl });
+          catalog.setAccount(account.userId, models, { keepBenefit: builtinOk && !benefitOk, now: clock() });
+          return models;
+        } catch (err) {
+          lastErr = err; // 死号/该号三路全空 → 换下一个号
+        }
+      }
+      throw lastErr || new Error("codearts: no account could list models — run: mslxdff -provider codearts login");
+    })().finally(() => { discovering = null; });
+    return discovering;
+  }
+
+  let modelsCache = { at: 0, list: [] };
+  async function listModels() {
+    if (clock() - modelsCache.at < MODELS_CACHE_TTL_MS && modelsCache.list.length) return modelsCache.list;
+    let models;
+    try {
+      models = await discover();
+    } catch {
+      models = catalog.accountModels(pool.pickPrimary()?.userId || "");
+    }
+    if (!models.length) return [];
+    const list = models.map((m) => ({
+      id: `codearts/${m.id}`,
+      object: "model",
+      name: m.name || m.id,
+      ...(m.contextWindow ? { maxInputTokens: m.contextWindow } : {}),
+      ...(m.maxTokens ? { maxOutputTokens: m.maxTokens } : {}),
+      ...(m.benefit ? { tags: ["free:benefit"] } : {}),
+    }));
+    modelsCache = { at: clock(), list };
+    return list;
+  }
+
+  async function preheat() {
+    if (!ring.size) return { ok: false, skipped: true };
+    try {
+      await discover();
+      return { ok: true };
+    } catch (err) {
+      return { ok: false, error: String(err?.message || err).slice(0, 120) };
+    }
+  }
+
+  async function close() { if (agent?.close) try { await agent.close(); } catch {} }
+
+
+  return {
+    id,
+    chat,
+    chatWithKeys,
+    listModels,
+    preheat,
+    close,
+    agent,
+    keyRing: ring,
+    baseUrl: resolvedBase,
+    _pool: pool,
+    _catalog: catalog,
+    _gate: gate,
+    _snapshotPath: join(logDir(), "codearts-models.json"),
+  };
+}