mslxdff 0.1.130 → 0.1.132

package/package.json

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

package/src/chat/cooling.js

@@ -79,21 +79,3 @@ export function createCooling({
 
   return { isCooling, isCoolingAsync, recordError, recordChatError, recordOk, recordChatOk };
 }
-
-// 默认实例（对接真实 state.js）
-let _default = null;
-export function getDefaultCooling() {
-  if (_default) return _default;
-  // 懒加载 state，避免循环
-  _default = createCooling({
-    loadModelErrors: () => {
-      try { const s = require("../state.js"); return s.loadModelErrors(); } catch { return {}; }
-    },
-    saveModelErrors: (o) => { try { const s = require("../state.js"); s.saveModelErrors(o); } catch {} },
-    loadModelLatencies: () => { try { const s = require("../state.js"); return s.loadModelLatencies(); } catch { return {}; } },
-    saveModelLatencies: (o) => { try { const s = require("../state.js"); s.saveModelLatencies(o); } catch {} },
-    flush: () => { try { const s = require("../state.js"); s.flushStateSync(); } catch {} },
-    now: () => Date.now(),
-  });
-  return _default;
-}

package/src/chat/gateway.js

@@ -24,8 +24,14 @@ export function createGatewayClient({
       return String(loaded?.token || "").trim();
     } catch { return ""; }
   });
-  const _getPort = getPort || (() => {
-    try { const s = require("../state.js"); const p = s.getPort(); if (Number.isInteger(p) && p > 0) return p; } catch {}
+  // 默认实现与 loadToken/readModelsJson 同款：懒加载 state（ESM 里没有 require）
+  // Note: 这里曾用 require 导致 state.port 被静默忽略 — 见 .agents/notes/implemented/bug-fix/2026-09-17-esm-dead-require-and-orphan-cooling.md
+  const _getPort = getPort || (async () => {
+    try {
+      const s = await import("../state.js");
+      const p = s.getPort();
+      if (Number.isInteger(p) && p > 0) return p;
+    } catch {}
     const v = Number(env.MSLXDFF_PORT);
     if (Number.isInteger(v) && v > 0) return v;
     return defaultPort;
@@ -48,7 +54,7 @@ export function createGatewayClient({
     let token = "";
     try {
       token = String((await _loadToken()) || "").trim();
-      const p = _getPort();
+      const p = await _getPort();
       if (Number.isInteger(p) && p > 0) port = p;
     } catch {}
     if (!token) {

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

@@ -16,7 +16,7 @@ export async function handleProviderAdd(id, sub, rest) {
     console.error(`provider "${gid}" is built-in — use: mslxdff -provider ${gid} add <key>  or  mslxdff -provider ${gid} set-url <url>`);
     process.exit(1);
   }
-  const { saveProviderConfig, loadProviderConfig, loadProviderShareKeys } = await import("../../../state.js");
+  const { saveProviderConfig, loadProviderConfig } = await import("../../../state.js");
   const { normalizeProviderId } = await import("../../../providers/model-id.js");
   const nid = normalizeProviderId(gid);
   if (!nid) { console.error(`invalid provider id: ${gid}`); process.exit(1); }
@@ -98,7 +98,7 @@ export async function handleProviderAdd(id, sub, rest) {
   console.log(`  keys: ${keys.length} (${keys.map((k) => `${k.slice(0, 4)}…${k.slice(-4)}`).join(", ")})`);
   if (allowedModels.length) console.log(`  allowedModels: ${allowedModels.length} (${allowedModels.join(", ")})`);
   else console.log(`  allowedModels: (none — BLOCKED, otherwise unusable)  → mslxdff -provider ${nid} allowlist set <model...>  OR  mslxdff -provider ${nid} allowAny on (allow all)`);
-  console.log(`  share: ${loadProviderShareKeys(nid) ? "ON" : "off"}   (mslxdff -provider ${nid} share on|off)`);
+  console.log(`  share: 借出（默认，key 随转发自动附带，ADR-0019）`);
   console.log(`  allowAny: OFF (secure, empty allowlist = 403 block before upstream) — enable via: mslxdff -provider ${nid} allowAny on`);
   console.log(`  use as: ${nid}/<model-id>  — restart daemon to activate`);
   if (allowedModels.length) console.log(`  opencode 中使用: mslxdff -setto opencode ${nid}/${allowedModels[0]}  (同步进 opencode.json，会一并设为默认模型)`);

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

@@ -5,7 +5,7 @@ export async function handleProviderConfig(id, sub, rest) {
       console.error("opencode 是内置供应商，不能删除");
       process.exit(1);
     }
-    const { loadProviderConfigs, saveProviderConfig, saveProviderShareKeys } = await import("../../../state.js");
+    const { loadProviderConfigs, saveProviderConfig } = await import("../../../state.js");
     const { isPidAlive, readPid } = await import("../../../daemon.js");
     const configs = loadProviderConfigs();
     if (!configs[id] && !configs[nid]) {
@@ -33,16 +33,9 @@ export async function handleProviderConfig(id, sub, rest) {
         writeStateImmediate(file, { providerKeys: nk });
         changed = true;
       }
-      if (raw.providerShareKeys && raw.providerShareKeys[id] !== undefined) {
-        const ns = { ...raw.providerShareKeys };
-        delete ns[id];
-        writeStateImmediate(file, { providerShareKeys: ns });
-        changed = true;
-      }
       // 清理模型错误/延迟中该供应商前缀的条目（可选，不阻塞）
       void changed;
     } catch {}
-    try { saveProviderShareKeys(id, false); } catch {}
     console.log(`已删除供应商: ${id} — 配置已清空`);
     // 需要重启才生效，自动重启
     const pid = readPid();
@@ -122,21 +115,5 @@ export async function handleProviderConfig(id, sub, rest) {
     console.log(`set ${id} baseUrl: ${String(url).trim().replace(/\/+$/, "")} — restart daemon to activate`);
     process.exit(0);
   }
-  if (sub === "share") {
-    const { loadProviderShareKeys, saveProviderShareKeys } = await import("../../../state.js");
-    const on = rest[1];
-    if (!on) {
-      console.log(`share keys to peers: ${loadProviderShareKeys(id) ? "ON" : "off"}`);
-      process.exit(0);
-    }
-    if (!["on", "off", "1", "0", "true", "false"].includes(String(on).toLowerCase())) {
-      console.error("usage: mslxdff -provider openrouter share on|off");
-      process.exit(1);
-    }
-    const state = ["on", "1", "true"].includes(String(on).toLowerCase());
-    saveProviderShareKeys(id, state);
-    console.log(`share keys to peers: ${state ? "ON" : "off"} — restart daemon to activate`);
-    process.exit(0);
-  }
   return false;
 }

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

@@ -25,13 +25,12 @@ export async function handleProvider(args) {
   const sub = args[idx + 2];
   const rest = args.slice(idx + 2);
   if (!id) {
-    console.error("usage: mslxdff -provider <id> [key...|add|remove|list|models|clear|share|set-url|allowlist|allowAny]");
+    console.error("usage: mslxdff -provider <id> [key...|add|remove|list|models|clear|set-url|allowlist|allowAny]");
     console.error("       e.g. mslxdff -provider openrouter sk-1 sk-2 sk-3      set multiple keys (replaces all)");
     console.error("            mslxdff -provider openrouter add sk-4             append one key");
     console.error("            mslxdff -provider openrouter remove sk-1          remove a key by value");
     console.error("            mslxdff -provider openrouter list                 list all keys (masked)");
     console.error("            mslxdff -provider openrouter models [--json]      list provider models (allowlist filtered)");
-    console.error("            mslxdff -provider openrouter share on|off         share keys with peers on outgoing forward (ADR-0008)");
     console.error("            mslxdff -provider openrouter set-url https://api.example.com/v1");
     console.error("            mslxdff -provider openrouter set-models-path /v1/models");
     console.error("            mslxdff -provider openrouter set-chat-path /v1/chat/completions");

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

@@ -1,6 +1,6 @@
 export async function handleProviderKeys(id, sub, rest, args) {
   if (sub === "list" || sub === "status") {
-    const { loadProviderKeys, loadProviderConfig, loadProviderShareKeys, loadProviderAllowedModels, loadProviderAllowAnyModels } = await import("../../../state.js");
+    const { loadProviderKeys, loadProviderConfig, loadProviderAllowedModels, loadProviderAllowAnyModels } = await import("../../../state.js");
     const keys = loadProviderKeys(id);
     const cfg = loadProviderConfig(id);
     const allowed = loadProviderAllowedModels(id);
@@ -15,7 +15,7 @@ export async function handleProviderKeys(id, sub, rest, args) {
     } else {
       console.log(`  keys: (no keys configured)`);
     }
-    console.log(`  share keys to peers:   ${loadProviderShareKeys(id) ? "ON" : "off"}   (mslxdff -provider ${id} share on|off)`);
+    console.log(`  share keys to peers:   借出（默认，key 随转发自动附带，ADR-0019）`);
     console.log(`  allowAnyModels: ${allowAny ? "ON (empty allowlist = allow all)" : "OFF (empty allowlist = BLOCK ALL)"}  (mslxdff -provider ${id} allowAny on|off)`);
     if (allowed.length) console.log(`  allowedModels: ${allowed.length} (${allowed.join(", ")})  — only these can be used`);
     else console.log(`  allowedModels: (none — ${allowAny ? "allow all" : "BLOCK ALL"})  (mslxdff -provider ${id} allowlist set <model...>  or  allowAny on)`);

package/src/cli/provider-row.js

@@ -1,5 +1,5 @@
 import { readFileSync, existsSync } from "node:fs";
-import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderShareKeys, loadProviderBaseUrl } from "../state.js";
+import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderBaseUrl } from "../state.js";
 
 /**
  * 聚合 genericIds：来自 providerConfigs + providerKeys + env MSLXDFF_*_KEY
@@ -37,12 +37,10 @@ export function buildProviderRows({ stateFile, env = process.env } = {}) {
     const cfg = configs[gid];
     let keys = [];
     let baseUrl = "";
-    let share = false;
     let allowed = [];
     let allowAny = false;
     try { keys = loadProviderKeys(gid, stateFile ? { file: stateFile } : undefined); } catch {}
     try { baseUrl = loadProviderBaseUrl(gid, stateFile ? { file: stateFile } : undefined) || cfg?.baseUrl || (gid === "openrouter" ? "https://openrouter.ai/api/v1" : gid === "workbuddy" ? "https://copilot.tencent.com" : ""); } catch { baseUrl = cfg?.baseUrl || ""; }
-    try { share = loadProviderShareKeys(gid, stateFile ? { file: stateFile } : undefined); } catch {}
     try { allowed = loadProviderAllowedModels(gid, stateFile ? { file: stateFile } : undefined); } catch {}
     try { allowAny = loadProviderAllowAnyModels(gid, stateFile ? { file: stateFile } : undefined); } catch {}
     // openrouter 特殊：opencode 例外默认 allowAny true，其余默认 false
@@ -61,7 +59,7 @@ export function buildProviderRows({ stateFile, env = process.env } = {}) {
     } else if (gid === "workbuddy" && auths.length && auths.length !== keys.length) {
       note = `${auths.length} auth(s) / ${keys.length} key(s) — 数量不一致请重跑 workbuddy-token-auto.js`;
     }
-    rows.push({ id: gid, enabled, baseUrl: baseUrl || "(none)", keys, allowed, allowAny, share, note, authCount: auths.length });
+    rows.push({ id: gid, enabled, baseUrl: baseUrl || "(none)", keys, allowed, allowAny, note, authCount: auths.length });
   }
   return rows;
 }
@@ -94,8 +92,8 @@ export function formatProviderRow(p) {
     const more = p.allowed.length > 2 ? ` …+${p.allowed.length - 2}` : "";
     allowInfo = `allow ${p.allowed.length} → ${head}${more}`;
   }
-  // share
-  const shareInfo = p.id === "opencode" ? "无法共享" : `共享 ${p.share ? "开" : "关"}`;
+  // share（ADR-0019：默认借出，无开关）
+  const shareInfo = p.id === "opencode" ? "无法共享" : "共享 借出";
   // base
   const base = p.baseUrl && p.baseUrl !== "(none)" ? p.baseUrl : "(none)";
   const baseLine = `    └ ${base}${p.note ? `  · ${p.note}` : ""}`;

package/src/cli/status.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 import { readPid, readPidVersion, isPidAlive, pidFile } from "../daemon.js";
 import { defaultStateFile, getPort, loadGroupsJoined, loadModelErrors, loadModelStats, loadModelPicks } from "../state.js";
 import { resolvePort } from "../server.js";
-import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, loadProviderAllowedModels, loadProviderShareKeys, loadProviderBaseUrl } from "../state.js";
+import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, loadProviderAllowedModels, loadProviderBaseUrl } from "../state.js";
 import { loadToken } from "../state.js";
 import { logDir } from "../logs.js";
 import { createGroupsService } from "../groups.js";

package/src/metrics.js

@@ -47,7 +47,6 @@ export function extractUsageFromSseText(sseText) {
     try {
       const j = JSON.parse(data);
       if (j.usage) return extractUsageFromJson(j);
-      if (j.choices?.[0]?.finish_reason && j.usage) return extractUsageFromJson(j);
     } catch {}
   }
   return null;

package/src/providers/share-keys.js

@@ -1,29 +1,25 @@
-// ADR-0008：供应商 key 瞬时共享 —— 转发时附带、组员一次性借用，用完即弃。
+// ADR-0019：借道 = 用你的 key —— 转发时自动借出，无开关、无白名单（组内互信是前提）。
 // header: `x-mslxdff-share-keys: <providerId>=<key1>,<key2>;<providerId2>=<key3>`
 import { splitModelId, DEFAULT_PROVIDER } from "./model-id.js";
-import { loadProviderKeys, loadProviderShareKeys } from "../state.js";
+import { classifyProvider } from "./classify.js";
+import { loadProviderKeys, listProviderIdsWithKeys } from "../state.js";
 
 export const SHARE_KEYS_HEADER = "x-mslxdff-share-keys";
 
-// 本节点应 cast key 到出站转发的供应商 id 集合（开启 share 且配了 key 的）。
-// share 只在"有 key 且开关为 true"时发生；否则不附带，避免空头泄露配置意图。
-// 默认供应商（opencode）恒排除：它无 key 可共享（public 即可），限流以 IP 为主，
-// 分散 IP 由 peer 转发天然实现，不需要也不应走 key 共享。
+// 硬排除：refresh-token 型凭据（对端刷新会轮换 token，与本机互相踢下线）——正确性问题。
+const NEVER_SHARE_IDS = new Set(["cline", "clinebot"]);
+
+// 本节点应 cast key 到出站转发的供应商 id 集合 = 所有「本机有 key」的供应商，
+// 减去：opencode（无 key 且恒排除）、local-only（workbuddy，本就不走组员）、刷新型凭据。
 export function shareableProviderIds({ file } = {}) {
-  const ids = new Set();
-  const raw = process.env.MSLXDFF_SHARE_PROVIDERS || ""; // 高级：显式白名单，逗号分隔
-  const explicit = raw.split(",").map((s) => s.trim()).filter(Boolean);
-  if (explicit.length) {
-    for (const id of explicit) {
-      if (id === DEFAULT_PROVIDER) continue; // opencode 永远不可 share
-      ids.add(id);
-    }
-    return [...ids];
-  }
-  for (const id of ["openrouter"]) {
-    if (id !== DEFAULT_PROVIDER && loadProviderKeys(id, { file }).length && loadProviderShareKeys(id, { file })) ids.add(id);
+  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 {}
+    ids.push(id);
   }
-  return [...ids];
+  return ids;
 }
 
 // 组装 share header 值（只含 shareable 且当前请求命中前缀的供应商）。

package/src/providers/workbuddy/account-store.js

@@ -1,19 +1,33 @@
-// WorkBuddy 账号落盘：auths/workbuddy-<uid>.json（0600 tmp+rename）+ state.json keys/auths 按 uid 去重追加。
-// token-auto 与 device-login 共用，保证两种入口写出完全一致。
+// WorkBuddy 账号落盘单一源：auths/workbuddy-<uid>.json（0600 tmp+rename）+ state.json keys/auths 按 uid 去重。
+// token-auto / device-login / 刷新（服务端 saveFn 与 CLI 定时任务）共用同一实现，安全细节只维护一份。
+// Note: 刷新落盘只走 applyTokenRefresh，别再各自内联一套 — 见 .agents/notes/implemented/architecture/2026-09-17-workbuddy-persist-single-seam.md
 import { writeFileSync, mkdirSync, existsSync, renameSync, unlinkSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { tmpdir } from "node:os";
+import { isTestEnv } from "../../state/store.js";
 
 export function resolveAuthDir() {
   if (process.env.WORKBUDDY_AUTH_DIR) return process.env.WORKBUDDY_AUTH_DIR;
   const sf = process.env.MSLXDFF_STATE_FILE || "";
-  if (sf.includes("mslxdff-test") || process.env.NODE_ENV === "test") return join(tmpdir(), "mslxdff-test-auths");
+  if (sf.includes("mslxdff-test") || isTestEnv()) return join(tmpdir(), "mslxdff-test-auths");
   if (sf && sf.includes("mslxdff-")) return join(dirname(sf), "auths");
   return join(process.cwd(), "auths");
 }
 
-export async function saveWorkbuddyAccount({ uid, enterpriseId = "", nickname = "", accessToken, refreshToken = "", expiresAt = 0, domain = "www.codebuddy.cn", file } = {}) {
-  if (!uid || !accessToken) throw new Error("saveWorkbuddyAccount: 缺少 uid/accessToken");
+function jwtExp(token) {
+  try {
+    const payload = String(token || "").split(".")[1];
+    if (!payload) return 0;
+    let b64 = payload.replace(/-/g, "+").replace(/_/g, "/");
+    const pad = b64.length % 4;
+    if (pad) b64 += "=".repeat(4 - pad);
+    return Number(JSON.parse(Buffer.from(b64, "base64").toString("utf8")).exp || 0);
+  } catch {
+    return 0;
+  }
+}
+
+function writeAccountFile({ uid, accessToken, refreshToken = "", expiresAt = 0, domain = "www.codebuddy.cn", enterpriseId = "", nickname = "" }) {
   const authDir = resolveAuthDir();
   mkdirSync(authDir, { recursive: true });
   const exp = expiresAt || Math.floor(Date.now() / 1000) + 5184000;
@@ -26,16 +40,81 @@ export async function saveWorkbuddyAccount({ uid, enterpriseId = "", nickname =
     renameSync(tmp, fp);
   } catch {
     writeFileSync(fp, JSON.stringify(doc, null, 2), { mode: 0o600 });
+    try { unlinkSync(tmp); } catch {} // 失败路径别把含凭据的 .tmp 留在盘上
   }
-  // 同步 state（对话轮换只读 state）
+  return fp;
+}
+
+// state.json 落盘单一实现：按 uid 配对更新（存在→更新该账号行，不存在→追加）；extraKeys 为没有 auth 行的裸 key，原样保留。
+async function persistAccounts(accounts, file, extraKeys = []) {
   const { loadProviderConfigs, saveProviderConfig } = await import("../../state.js");
   const cfg = (loadProviderConfigs(file ? { file } : {})?.workbuddy) || {};
   const keys = [...(Array.isArray(cfg.keys) ? cfg.keys : [])];
   const auths = [...(Array.isArray(cfg.auths) ? cfg.auths : [])];
-  const row = { uid, domain, enterpriseId, refreshToken };
-  const atIdx = auths.findIndex((a) => a?.uid === uid);
-  if (atIdx >= 0) { keys[atIdx] = accessToken; auths[atIdx] = row; }
-  else { keys.push(accessToken); auths.push(row); }
+  let updated = 0;
+  for (const acc of accounts) {
+    if (!acc?.uid || !acc?.accessToken) continue;
+    const row = { uid: acc.uid, domain: acc.domain || "www.codebuddy.cn", enterpriseId: acc.enterpriseId || "", refreshToken: acc.refreshToken || "" };
+    const atIdx = auths.findIndex((a) => a?.uid === acc.uid);
+    if (atIdx >= 0) { keys[atIdx] = acc.accessToken; auths[atIdx] = row; updated += 1; }
+    else { keys.push(acc.accessToken); auths.push(row); }
+  }
+  for (const k of extraKeys) {
+    if (k && !keys.includes(k)) keys.push(k);
+  }
   saveProviderConfig("workbuddy", { baseUrl: cfg.baseUrl || "https://copilot.tencent.com", keys, auths }, file ? { file } : {});
-  return { file: fp, accounts: keys.length, updated: atIdx >= 0 };
+  return { keys, auths, updated };
+}
+
+export async function saveWorkbuddyAccount({ uid, enterpriseId = "", nickname = "", accessToken, refreshToken = "", expiresAt = 0, domain = "www.codebuddy.cn", file } = {}) {
+  if (!uid || !accessToken) throw new Error("saveWorkbuddyAccount: 缺少 uid/accessToken");
+  const fp = writeAccountFile({ uid, accessToken, refreshToken, expiresAt, domain, enterpriseId, nickname });
+  const st = await persistAccounts([{ uid, accessToken, refreshToken, domain, enterpriseId }], file);
+  return { file: fp, accounts: st.keys.length, updated: st.updated > 0 };
+}
+
+// 由平行数组（keys[i] ↔ authList[i]，provider 构造时即如此）还原账号列表；没有 auth 行的裸 key 走 extraKeys 原样保留。
+function accountsFromArrays(keys, authList) {
+  const accounts = [];
+  const extraKeys = [];
+  const n = Math.max(keys.length, authList.length);
+  for (let i = 0; i < n; i++) {
+    const a = authList[i];
+    if (a && typeof a === "object" && a.uid) {
+      accounts.push({ uid: a.uid, accessToken: keys[i] || "", refreshToken: a.refreshToken || "", domain: a.domain, enterpriseId: a.enterpriseId });
+    } else if (keys[i]) {
+      extraKeys.push(keys[i]);
+    }
+  }
+  return { accounts, extraKeys };
+}
+
+// 刷新后的 token 落盘：keys 与 authList 是两条平行数组，按下标更新命中的槽位（旧 key 命中优先，
+// 否则按 uid 命中；都没有 → 追加），再把整表经 persistAccounts 单点落 state + auths 文件。
+// 服务端 saveFn 与 CLI/定时任务共用。
+export async function applyTokenRefresh({ uid, oldKey, newToken, refreshToken = "", domain = "www.codebuddy.cn", enterpriseId = "", auth = null, keys = [], authList = [], file } = {}) {
+  if (!uid || !newToken) return { updated: false, accounts: keys.length, file: null };
+  const keyIdx = keys.indexOf(oldKey);
+  const uidIdx = authList.findIndex((a) => a && String(a.uid) === String(uid));
+  // 平行数组约定：命中任一侧即用该下标（keys[i] 与 authList[i] 同属一个账号，不会覆盖他人）
+  const idx = keyIdx >= 0 ? keyIdx : uidIdx;
+  const matched = idx >= 0;
+  if (idx >= 0) keys[idx] = newToken;
+  else if (!keys.includes(newToken)) keys.push(newToken);
+  if (uidIdx >= 0) {
+    const prev = authList[uidIdx] && typeof authList[uidIdx] === "object" ? authList[uidIdx] : null;
+    authList[uidIdx] = {
+      ...(prev || auth || {}),
+      uid,
+      domain: prev?.domain || auth?.domain || domain,
+      enterpriseId: prev?.enterpriseId || auth?.enterpriseId || enterpriseId,
+      refreshToken,
+    };
+  } else {
+    authList.push({ ...(auth || {}), uid, domain: auth?.domain || domain, enterpriseId: auth?.enterpriseId || enterpriseId, refreshToken });
+  }
+  const fp = writeAccountFile({ uid, accessToken: newToken, refreshToken, expiresAt: jwtExp(newToken), domain, enterpriseId });
+  const { accounts, extraKeys } = accountsFromArrays(keys, authList);
+  const st = await persistAccounts(accounts, file, extraKeys);
+  return { updated: matched, accounts: st.keys.length, file: fp };
 }

package/src/providers/workbuddy/auth.js

@@ -1,6 +1,7 @@
 import { joinUrl } from "../base.js";
 import { compatFetch } from "../../compat.js";
 import { WORKBUDDY_DEFAULT_BASE_URL } from "../../state/schemas/provider.js";
+import { applyTokenRefresh } from "./account-store.js";
 
 export function decodeJwtExp(token) {
   try {
@@ -45,11 +46,7 @@ export function createAuthService({
   saveFn,
 } = {}) {
   const resolvedBase = baseUrl ? String(baseUrl).trim().replace(/\/+$/, "") : WORKBUDDY_DEFAULT_BASE_URL;
-  if (!fetchImpl) {
-    // 兼容层统一取（undici 优先，老 Node 兜底）
-    fetchImpl = compatFetch;
-  }
-  // lazy resolve UndiciFetch if not provided
+  // 兼容层统一取（undici 优先，老 Node 兜底）
   if (!fetchImpl) fetchImpl = compatFetch;
 
   const inflightRefresh = new Map();
@@ -84,50 +81,29 @@ export function createAuthService({
         if (j.code === 0 && j.data?.accessToken) {
           const newAt = j.data.accessToken;
           const newRt = j.data.refreshToken || rt;
-          // attempt to persist if store provided
+          // attempt to persist if store provided（落盘细节单一源：account-store.applyTokenRefresh）
           try {
             if (saveFn) {
               await saveFn({ newAt, newRt, uid, oldKey: key, auth });
             } else if (store && typeof store.save === "function") {
               await store.save({ newAt, newRt, uid, oldKey: key, auth });
             } else if (store && Array.isArray(store.keys) && Array.isArray(store.authList)) {
-              // direct mutation fallback (legacy shape)
-              const idx = store.keys.indexOf(key);
-              if (idx >= 0) {
-                store.keys[idx] = newAt;
-                store.authList[idx] = { ...auth, refreshToken: newRt };
-                try {
-                  const { saveProviderConfig } = await import("../../state.js");
-                  saveProviderConfig("workbuddy", { baseUrl: resolvedBase, keys: [...store.keys], auths: [...store.authList] }, file ? { file } : {});
-                } catch {}
-                try {
-                  const { writeFileSync, mkdirSync, existsSync } = await import("node:fs");
-                  const { join, dirname } = await import("node:path");
-                  const { tmpdir } = await import("node:os");
-                  const isTest = process.env.NODE_ENV === "test" || (process.env.MSLXDFF_STATE_FILE && String(process.env.MSLXDFF_STATE_FILE).includes("mslxdff-test"));
-                  const authDir = process.env.WORKBUDDY_AUTH_DIR || (isTest ? join(tmpdir(), "mslxdff-test-auths") : (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths")));
-                  mkdirSync(authDir, { recursive: true });
-                  const expAt = (() => { try { return JSON.parse(Buffer.from(newAt.split(".")[1], "base64").toString()).exp; } catch { return Math.floor(Date.now() / 1000) + 5184000; } })();
-                  const doc = { account: { uid, enterpriseId: auth.enterpriseId || "", nickname: "" }, auth: { accessToken: newAt, refreshToken: newRt, expiresAt: expAt, domain: auth.domain || "www.codebuddy.cn" } };
-                  const fp = join(authDir, `workbuddy-${uid}.json`);
-                  const tmp = fp + ".tmp";
-                  writeFileSync(tmp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-                  try {
-                    if (existsSync(fp)) {
-                      const { unlinkSync, renameSync } = await import("node:fs");
-                      unlinkSync(fp);
-                      renameSync(tmp, fp);
-                    } else {
-                      const { renameSync } = await import("node:fs");
-                      renameSync(tmp, fp);
-                    }
-                  } catch {
-                    writeFileSync(fp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-                  }
-                } catch {}
-              }
+              await applyTokenRefresh({
+                uid,
+                oldKey: key,
+                newToken: newAt,
+                refreshToken: newRt,
+                domain: auth.domain || "www.codebuddy.cn",
+                enterpriseId: auth.enterpriseId || "",
+                auth,
+                keys: store.keys,
+                authList: store.authList,
+                file: file || undefined,
+              });
             }
-          } catch {}
+          } catch (err) {
+            console.error(`[workbuddy] token 落盘失败（刷新已成功，重启将丢失）: ${String(err?.message || err).slice(0, 200)}`);
+          }
           return newAt;
         }
       } catch {}
@@ -155,18 +131,3 @@ export function createAuthService({
 
   return { refreshTokenFor, maybeProactiveRefresh, decodeJwtExp, isAuthError, isInsufficientStatus, _inflight: inflightRefresh };
 }
-
-function awaitImportUndici() {
-  try {
-    // dynamic to avoid top-level await
-    let UndiciFetch = null;
-    try {
-      // eslint-disable-next-line no-undef
-      const mod = globalThis.__mslxdff_undici || null;
-      if (mod) return mod;
-    } catch {}
-    return { UndiciFetch: null };
-  } catch {
-    return { UndiciFetch: null };
-  }
-}

package/src/providers/workbuddy/index.js

@@ -1,11 +1,11 @@
 import { createKeyRing } from "../keyring.js";
-import { loadProviderKeys, loadProviderAuths, loadProviderBaseUrl, loadProviderShareKeys, saveProviderConfig, WORKBUDDY_DEFAULT_BASE_URL, loadProviderModelsPath, loadProviderChatPath } from "../../state.js";
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { loadProviderKeys, loadProviderAuths, loadProviderBaseUrl, WORKBUDDY_DEFAULT_BASE_URL, loadProviderModelsPath, loadProviderChatPath } from "../../state.js";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { compatFetch } from "../../compat.js";
-import { join, dirname } from "node:path";
-import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { envInt, joinUrl, getUndici, createAgent } from "../base.js";
 import { createAuthService, isAuthError, isInsufficientStatus, decodeJwtExp } from "./auth.js";
+import { applyTokenRefresh, resolveAuthDir } from "./account-store.js";
 import { createChatService } from "./chat.js";
 import { createModelsService } from "./models.js";
 import { createBalanceCache, getCachedBalance as defaultGetCached, setCachedBalance as defaultSetCached } from "./balance.js";
@@ -13,15 +13,6 @@ import { defaultLogger } from "./rotation-log.js";
 
 const { UndiciAgent, UndiciFetch } = getUndici();
 
-function isTestEnv() {
-  if (process.env.NODE_ENV === "test") return true;
-  if (process.env.MSLXDFF_STATE_FILE && String(process.env.MSLXDFF_STATE_FILE).includes("mslxdff-test")) return true;
-  if (process.argv.some((a) => String(a).includes("--test") || String(a).endsWith(".test.js"))) return true;
-  if (Array.isArray(process.execArgv) && process.execArgv.some((a) => String(a).includes("--test"))) return true;
-  if (process.env.NODE_TEST_CONTEXT) return true;
-  return false;
-}
-
 function resolveBaseUrl(baseUrl) {
   if (baseUrl) return String(baseUrl).trim().replace(/\/+$/, "");
   const env = loadProviderBaseUrl("workbuddy");
@@ -71,7 +62,7 @@ export function createWorkbuddyProvider({
 
   if (!authList.length && !keys.length) {
     try {
-      const authDir = process.env.WORKBUDDY_AUTH_DIR || (isTestEnv() ? join(tmpdir(), "mslxdff-test-auths") : (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths")));
+      const authDir = resolveAuthDir();
       if (existsSync(authDir)) {
         const files = readdirSync(authDir).filter((f) => f.startsWith("workbuddy-") && f.endsWith(".json"));
         for (const f of files) {
@@ -112,48 +103,28 @@ export function createWorkbuddyProvider({
 
   const logger = loggerOpt || defaultLogger;
 
-  // authService with saveFn that mutates outer keys/authList/ring and persists
   const authService = createAuthService({
     baseUrl: resolvedBase,
     fetchImpl,
     clock,
     dispatcher,
     file,
+    // 落盘细节单一源：account-store.applyTokenRefresh（数组就地更新 + state + auths 文件）
     saveFn: async ({ newAt, newRt, uid, oldKey, auth }) => {
-      const idx = keys.indexOf(oldKey);
-      if (idx >= 0) {
-        keys[idx] = newAt;
-        authList[idx] = { ...(authList[idx] || auth), refreshToken: newRt };
-        try { ring.replace(oldKey, newAt); } catch {}
-        try { saveProviderConfig(id, { baseUrl: resolvedBase, keys: [...keys], auths: [...authList] }, file ? { file } : {}); } catch {}
-        try {
-          const authDir = process.env.WORKBUDDY_AUTH_DIR || (isTestEnv() ? join(tmpdir(), "mslxdff-test-auths") : (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths")));
-          mkdirSync(authDir, { recursive: true });
-          const expAt = (() => { try { return JSON.parse(Buffer.from(newAt.split(".")[1], "base64").toString()).exp; } catch { return Math.floor(Date.now() / 1000) + 5184000; } })();
-          const doc = { account: { uid, enterpriseId: auth.enterpriseId || "", nickname: "" }, auth: { accessToken: newAt, refreshToken: newRt, expiresAt: expAt, domain: auth.domain || "www.codebuddy.cn" } };
-          const fp = join(authDir, `workbuddy-${uid}.json`);
-          const tmp = fp + ".tmp";
-          writeFileSync(tmp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-          try {
-            if (existsSync(fp)) {
-              const { unlinkSync, renameSync } = await import("node:fs");
-              unlinkSync(fp);
-              renameSync(tmp, fp);
-            } else {
-              const { renameSync } = await import("node:fs");
-              renameSync(tmp, fp);
-            }
-          } catch {
-            writeFileSync(fp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-          }
-        } catch {}
-      } else {
-        if (!keys.includes(newAt)) {
-          keys.push(newAt);
-          authList.push({ ...(auth || {}), uid, refreshToken: newRt });
-          try { ring.replace(oldKey, newAt); } catch {}
-        }
-      }
+      const r = await applyTokenRefresh({
+        uid,
+        oldKey,
+        newToken: newAt,
+        refreshToken: newRt,
+        domain: auth?.domain || "www.codebuddy.cn",
+        enterpriseId: auth?.enterpriseId || "",
+        auth,
+        keys,
+        authList,
+        file,
+      });
+      try { ring.replace(oldKey, newAt); } catch {}
+      return r;
     },
   });
 
@@ -205,15 +176,7 @@ export function createWorkbuddyProvider({
   }
 
   async function chatWithKeys(body, keysOverride) {
-    const shareOn = (() => {
-      try { return loadProviderShareKeys(id, file ? { file } : {}); } catch { return false; }
-    })();
-    // allow injected balanceCache/logger to bypass share check for isolated tests:
-    // if keysOverride provided and logger is injected (test mode), permit share without state flag
-    const isTestInjection = !!balanceCacheOpt || !!loggerOpt;
-    if (!shareOn && !isTestInjection) {
-      return chatSvc.runChat(body, ring);
-    }
+    // 借入的 key（ADR-0019：转发时自动附带）——用隔离的 tmp ring/auth，不改动本机 ring。
     // Isolated tmp ring and auth without mutating shared arrays
     const tmpKeys = [...keysOverride].filter((k) => typeof k === "string" && k.trim().length).map((k) => k.trim());
     const tmpAuth = authList[0] || { uid: "", domain: "www.codebuddy.cn", enterpriseId: "", refreshToken: "" };

package/src/routes/chat/relay-pipeline.js

@@ -1,7 +1,7 @@
 import { runHook } from "../../plugins.js";
 import { recordModelStats } from "../../state.js";
 import { normalizeFullId } from "../../providers/model-id.js";
-import { computeMetrics, extractUsageFromJson, extractUsageFromSseText } from "../../metrics.js";
+import { computeMetrics } from "../../metrics.js";
 
 // 唯一/最后候选没有 failover 去向：首块闸门退化为纯"防连接泄漏"，放宽避免误杀慢模型
 // （参考 opencode：zen 通道不设超时；openai responses 硬编码 300s headerTimeout）
@@ -109,11 +109,12 @@ export function createRelayPipeline({
       totalMs: out.totalMs,
       aborted: out.aborted,
       interrupted: out.interrupted ?? false,
+      timedOut: out.timedOut ?? false,
       detail: out.detail ?? null,
     });
 
-    // 5a. 首块超时未写字节 → 回退
-    if (streamTimeoutMs > 0 && out.status === streamTimeoutMs) {
+    // 5a. 首块超时未写字节 → 回退（显式 timedOut 字段，status 只是 HTTP 语义展示）
+    if (out.timedOut === true) {
       if (auto) try { await auto.recordError(actual, { status: 502, slow: true, note: `stream timeout ${streamTimeoutMs}ms` }); } catch {}
       try { _logError(actual, 502, `stream timeout ${streamTimeoutMs}ms`); } catch {}
       _evt("upstream-error", { reqId, model: actual, status: 502, message: "stream timeout", timing: null });

package/src/routes/chat/via-route-handler.js

@@ -2,8 +2,7 @@ import { createRelayPipeline } from "./relay-pipeline.js";
 import { relay, SLOW_TOTAL_MS, STREAM_TIMEOUT_MS, STALL_TIMEOUT_MS, SCORE_STALL_MS } from "../stream.js";
 import { buildFallbackInfo } from "../fallback.js";
 import { getViaRoute } from "../../bench/via-routes.js";
-import { loadProviderKeys } from "../../state.js";
-import { SHARE_KEYS_HEADER } from "../../providers/share-keys.js";
+import { buildShareKeysHeader, SHARE_KEYS_HEADER } from "../../providers/share-keys.js";
 import { errMsg } from "../helpers.js";
 import { compatFetch } from "../../compat.js";
 
@@ -61,12 +60,9 @@ export async function handleViaRoute({
   evt("via-route-hit", { reqId: handlerCtx.reqId, model, peer: peer.url, peerLabel, routeBest: route.best, at: route.at });
   // 单路径转发，不并发：直接打 best peer
   const hops = handlerCtx.hops || 0;
-  const providerId = String(model).split("/")[0] || "";
-  let shareHeader = null;
-  try {
-    const keys = loadProviderKeys(providerId) || [];
-    if (keys.length) shareHeader = `${providerId}=${keys.join(",")}`;
-  } catch {}
+  // ADR-0019：借道 = 用 A 的 key —— 转发时自动附带（组内互信，无开关），与 peers.js 共用同一组装点。
+  // Note: 见 .agents/notes/implemented/architecture/2026-09-17-share-keys-no-switch.md
+  const shareHeader = buildShareKeysHeader(model);
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(new Error("via-route timeout 30000ms")), 30000);
   let upRes;

package/src/routes/peers.js

@@ -122,7 +122,7 @@ async function forwardToPeer(peer, body, model, hops, controller = new AbortCont
       "x-mslxdff-model-lock": model,
       "Accept": "text/event-stream",
     };
-    // ADR-0008：该模型命中的供应商若开启 share → 附带瞬时 key 给组员借用（opencode 恒排除）
+    // ADR-0019：命中供应商的 key 随转发自动借出（组内互信，无开关；opencode/workbuddy/cline 硬排除）
     const shareHeader = buildShareKeysHeader(model);
     if (shareHeader) headers[SHARE_KEYS_HEADER] = shareHeader;
     const dispatcher = getPeerDispatcher();

package/src/routes/stream.js

@@ -1,6 +1,7 @@
 import { performance } from "node:perf_hooks";
 import { applyFallbackHeaders, enrichNonStreamJson, enrichSseChunkText } from "./fallback.js";
 import { json } from "./helpers.js";
+import { extractUsageFromJson, extractUsageFromSseText } from "../metrics.js";
 
 // SDK 通道（TextEncoder）产出 Uint8Array，legacy 通道为 Buffer；
 // 统一转文本，避免 [DONE]/finish_reason/usage/chars 统计在 SDK 路径下静默失效。
@@ -163,8 +164,8 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
             if (txt.includes("[DONE]")) detail.sawDone = true;
             const m = txt.match(/"finish_reason"\s*:\s*"([^"]+)"/);
             if (m) detail.sawFinishReason = m[1];
-            // 尝试提取 usage（流式末帧）
-            if (txt.includes("\"usage\"") || txt.includes("prompt_tokens")) {
+            // 尝试提取 usage（流式末帧）：口径收口到 metrics.js，与未流式分支共用
+            if (txt.includes("\"usage\"") || txt.includes("\"prompt_tokens\"")) {
               try {
                 const lines = txt.split("\n");
                 for (const line of lines) {
@@ -172,28 +173,22 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
                   if (!t.startsWith("data:")) continue;
                   const d = t.slice(5).trim();
                   if (d === "[DONE]" || !d) continue;
-                  const j = JSON.parse(d);
-                  if (j && j.usage && typeof j.usage === "object") {
-                    const u = j.usage;
-                    const pt = Number(u.prompt_tokens ?? u.promptTokens ?? u.input_tokens);
-                    const ct = Number(u.completion_tokens ?? u.completionTokens ?? u.output_tokens);
-                    const tt = Number(u.total_tokens ?? u.totalTokens);
-                    const cur = {};
-                    if (Number.isFinite(pt)) cur.prompt_tokens = pt;
-                    if (Number.isFinite(ct)) cur.completion_tokens = ct;
-                    if (Number.isFinite(tt)) cur.total_tokens = tt;
-                    if (Object.keys(cur).length) detail.usage = cur;
+                  // 行级隔离：单行坏 JSON 不拖累同 chunk 其余行
+                  try {
+                    const j = JSON.parse(d);
+                    if (!j || typeof j !== "object") continue;
+                    const u = extractUsageFromJson(j);
+                    if (u) detail.usage = u;
                     // 兜底 chars：从 choices 文本长度累加
                     const delta = j.choices?.[0]?.delta?.content || j.choices?.[0]?.message?.content || "";
                     if (delta) detail.chars += String(delta).length;
-                  }
+                  } catch { /* 单行坏帧忽略 */ }
                 }
               } catch {}
             } else {
               // 非 usage 的普通 delta 也累 chars
               try {
-                const txt2 = chunkText(chunk);
-                const ms = txt2.match(/"content"\s*:\s*"([^"]*)"/g);
+                const ms = txt.match(/"content"\s*:\s*"([^"]*)"/g);
                 if (ms) for (const mm of ms) {
                   const c = JSON.parse(`{${mm}}`);
                   if (c.content) detail.chars += String(c.content).length;
@@ -250,14 +245,15 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
       }
       if (timedOut && !wroteAny) {
         res.removeListener("close", onClose);
-        return { status: streamTimeoutMs, ttfMs: null, totalMs: Math.round(performance.now() - t0), aborted: true, interrupted: false, detail };
+        // Note: 超时是显式字段（timedOut），别再用 status 数值当信号 — 见 .agents/notes/implemented/architecture/2026-09-17-relay-timedout-explicit-and-metrics-seam.md
+        return { status: 504, timedOut: true, ttfMs: null, totalMs: Math.round(performance.now() - t0), aborted: true, interrupted: false, detail };
       }
       if ((stalled || tooLong) && wroteAny) {
         interrupted = true;
         detail.exitReason = detail.exitReason || (stalled ? "stall" : "max");
         res.removeListener("close", onClose);
         try { res.end(); } catch { /* ignore */ }
-        return { status: 200, ttfMs: ttf, totalMs: Math.round(performance.now() - t0), aborted: false, interrupted, detail };
+        return { status: 200, timedOut: false, ttfMs: ttf, totalMs: Math.round(performance.now() - t0), aborted: false, interrupted, detail };
       }
     } else {
       detail.exitReason = "empty-body";
@@ -267,7 +263,7 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
     finishedNormally = true;
     res.removeListener("close", onClose);
     try { res.end(); } catch { /* ignore */ }
-    return { status: 200, ttfMs: ttf, totalMs, aborted: false, interrupted: false, detail };
+    return { status: 200, timedOut: false, ttfMs: ttf, totalMs, aborted: false, interrupted: false, detail };
   }
 
   finishedNormally = true;
@@ -275,32 +271,24 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
   const text = await upRes.text();
   detail.receivedBytes = Buffer.byteLength(text);
   detail.exitReason = "normal-non-stream";
-  // 非流式 usage 与 chars 提取
+  // 非流式 usage 与 chars 提取（口径与流式分支共用 metrics.js）
   try {
     const parsed = JSON.parse(text);
-    const u = parsed.usage;
-    if (u && typeof u === "object") {
-      const pt = Number(u.prompt_tokens ?? u.promptTokens ?? u.input_tokens);
-      const ct = Number(u.completion_tokens ?? u.completionTokens ?? u.output_tokens);
-      const tt = Number(u.total_tokens ?? u.totalTokens);
-      const cur = {};
-      if (Number.isFinite(pt)) cur.prompt_tokens = pt;
-      if (Number.isFinite(ct)) cur.completion_tokens = ct;
-      if (Number.isFinite(tt)) cur.total_tokens = tt;
-      if (Object.keys(cur).length) detail.usage = cur;
-      if (parsed.choices?.[0]?.message?.content) detail.chars = String(parsed.choices[0].message.content).length;
-      else if (parsed.choices?.[0]?.text) detail.chars = String(parsed.choices[0].text).length;
-    }
+    const u = extractUsageFromJson(parsed);
+    if (u) detail.usage = u;
+    if (parsed.choices?.[0]?.message?.content) detail.chars = String(parsed.choices[0].message.content).length;
+    else if (parsed.choices?.[0]?.text) detail.chars = String(parsed.choices[0].text).length;
     const enriched = enrichNonStreamJson(parsed, fallback);
     json(res, upRes.status, enriched);
   } catch {
     res.statusCode = upRes.status;
     res.setHeader("Content-Type", contentType || "text/plain");
     res.end(text);
-    // 纯文本时按长度估 chars
+    // 纯文本时按长度估 chars；若文本其实是 SSE（client 未要流但上游给流）仍尝试提 usage
     try { detail.chars = text.length; } catch {}
+    try { const u = extractUsageFromSseText(text); if (u) detail.usage = u; } catch {}
   }
   // 非流式 ttf 视为 total（一次性返回）
   const totalMs = Math.round(performance.now() - t0);
-  return { status: upRes.status, ttfMs: totalMs, totalMs, aborted: false, interrupted: false, detail };
+  return { status: upRes.status, timedOut: false, ttfMs: totalMs, totalMs, aborted: false, interrupted: false, detail };
 }

package/src/state/facade.js

@@ -5,16 +5,14 @@ export {
   WORKBUDDY_DEFAULT_BASE_URL,
   providerKeyEnv,
   providerBaseUrlEnv,
-  providerShareEnv,
   loadProviderKeys,
   loadProviderKey,
+  listProviderIdsWithKeys,
   saveProviderKeys,
   saveProviderKey,
   addProviderKey,
   removeProviderKey,
   removeProviderKeys,
-  loadProviderShareKeys,
-  saveProviderShareKeys,
   loadProviderConfigs,
   loadProviderConfig,
   loadProviderBaseUrl,

package/src/state/merge.js

@@ -5,7 +5,6 @@
 export const COLD_WINS = new Set([
   "providerConfigs",
   "providerKeys",
-  "providerShareKeys",
   "port",
   "token",
   "preferredModel",

package/src/state/provider-config.js

@@ -56,10 +56,9 @@ export function defaultChatPath(id) {
 
 export const providerKeyEnv = (id) => `MSLXDFF_${String(id || "").toUpperCase().replace(/[^A-Z0-9]/g, "_")}_KEY`;
 export const providerBaseUrlEnv = (id) => `MSLXDFF_${String(id || "").toUpperCase().replace(/[^A-Z0-9]/g, "_")}_BASE_URL`;
-export const providerShareEnv = (id) => `MSLXDFF_${String(id || "").toUpperCase().replace(/[^A-Z0-9]/g, "_")}_SHARE_KEYS`;
 
 /**
- * validate 7 字段：baseUrl, keys, auths, allowedModels, modelsPath, chatPath, shareKeys?（share 单独）
+ * validate 7 字段：baseUrl, keys, auths, allowedModels, modelsPath, chatPath（share 已删，key 随转发自动借出）
  * 返回 {ok, clean, errors}
  */
 export function validateProviderConfig(raw = {}, providerId = "") {

package/src/state/schemas/provider.js

@@ -9,7 +9,6 @@ export {
   defaultChatPath,
   providerKeyEnv,
   providerBaseUrlEnv,
-  providerShareEnv,
 } from "../provider-config.js";
 import {
   normalizeBaseUrl as _normalizeBaseUrl,
@@ -20,7 +19,6 @@ import {
   defaultChatPath as _defaultChatPath,
   providerKeyEnv as _providerKeyEnv,
   providerBaseUrlEnv as _providerBaseUrlEnv,
-  providerShareEnv as _providerShareEnv,
   WORKBUDDY_DEFAULT_BASE_URL as _WORKBUDDY,
 } from "../provider-config.js";
 
@@ -52,6 +50,16 @@ export function loadProviderKeys(id, { file = defaultStateFile() } = {}) {
   return [];
 }
 export function loadProviderKey(id, opts = {}) { return loadProviderKeys(id, opts)[0] || ""; }
+// 本节点所有「有 key」的供应商 id（providerConfigs ∪ providerKeys，含 env 覆盖）——
+// 转发时默认借出的候选集合由它枚举；见 src/providers/share-keys.js
+export function listProviderIdsWithKeys({ file = defaultStateFile() } = {}) {
+  const st = readState(file);
+  const ids = new Set();
+  for (const src of [st.providerConfigs, st.providerKeys]) {
+    if (src && typeof src === "object" && !Array.isArray(src)) for (const id of Object.keys(src)) ids.add(id);
+  }
+  return [...ids].filter((id) => loadProviderKeys(id, { file }).length > 0);
+}
 export function saveProviderKeys(id, list, { file = defaultStateFile() } = {}) {
   const keys = { ...(readState(file).providerKeys || {}) };
   const clean = [...new Set((Array.isArray(list) ? list : []).map((k) => String(k || "").trim()).filter(Boolean))];
@@ -72,18 +80,6 @@ export function removeProviderKeys(id, targets = [], opts = {}) {
   const list = loadProviderKeys(id, opts).filter((k) => !set.has(k));
   return saveProviderKeys(id, list, opts);
 }
-export function loadProviderShareKeys(id, { file = defaultStateFile() } = {}) {
-  const env = process.env[_providerShareEnv(id)] || "";
-  if (env) return ["1", "true", "on", "yes"].includes(String(env).trim().toLowerCase());
-  const map = readState(file).providerShareKeys;
-  return !!(map && typeof map === "object" && map[id]);
-}
-export function saveProviderShareKeys(id, on, { file = defaultStateFile() } = {}) {
-  const map = { ...(readState(file).providerShareKeys || {}) };
-  if (on) map[id] = true; else delete map[id];
-  writeStateImmediate(file, { providerShareKeys: map });
-  return !!on;
-}
 export function loadProviderConfigs({ file = defaultStateFile() } = {}) {
   const v = readState(file).providerConfigs;
   if (v && typeof v === "object" && !Array.isArray(v)) return v;

package/src/state/store.js

@@ -8,7 +8,7 @@ import { mergeState, COLD_WINS } from "./merge.js";
 
 export const DEFAULT_PORT = 8989;
 
-function isTestEnv() {
+export function isTestEnv() {
   if (process.env.NODE_ENV === "test") return true;
   if (process.env.MSLXDFF_STATE_FILE && String(process.env.MSLXDFF_STATE_FILE).includes("mslxdff-test")) return true;
   if (process.argv.some((a) => String(a).includes("--test") || String(a).endsWith(".test.js"))) return true;