mslxdff 0.1.131 → 0.1.132

package/package.json

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

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/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/index.js

@@ -1,5 +1,5 @@
 import { createKeyRing } from "../keyring.js";
-import { loadProviderKeys, loadProviderAuths, loadProviderBaseUrl, loadProviderShareKeys, WORKBUDDY_DEFAULT_BASE_URL, loadProviderModelsPath, loadProviderChatPath } from "../../state.js";
+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 } from "node:path";
@@ -176,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/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/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;