mslxdff 0.1.85 → 0.1.87

package/package.json

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

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

@@ -1,4 +1,64 @@
 export async function handleProviderConfig(id, sub, rest) {
+  if (sub === "del" || sub === "delete" || sub === "rm" || sub === "remove-provider" || sub === "del-provider") {
+    const nid = String(id || "").trim().toLowerCase();
+    if (nid === "opencode" || nid === "oc") {
+      console.error("opencode 是内置供应商，不能删除");
+      process.exit(1);
+    }
+    const { loadProviderConfigs, saveProviderConfig, saveProviderShareKeys } = await import("../../../state.js");
+    const { isPidAlive, readPid } = await import("../../../daemon.js");
+    const configs = loadProviderConfigs();
+    if (!configs[id] && !configs[nid]) {
+      // 也查旧的 providerKeys
+      const { readState } = await import("../../../state/store.js");
+      const { defaultStateFile } = await import("../../../state/store.js");
+      const raw = readState(defaultStateFile());
+      const hasLegacy = raw.providerKeys && raw.providerKeys[id];
+      if (!hasLegacy) {
+        console.error(`provider not found: ${id}`);
+        process.exit(1);
+      }
+    }
+    // 真删：空对象会触发 saveProviderConfig 的 delete 分支
+    saveProviderConfig(id, { baseUrl: "", keys: [], auths: [], allowedModels: [], modelsPath: "", chatPath: "" });
+    // 兼容旧路径的残留
+    try {
+      const { readState, writeStateImmediate, defaultStateFile } = await import("../../../state/store.js");
+      const file = defaultStateFile();
+      const raw = readState(file);
+      let changed = false;
+      if (raw.providerKeys && raw.providerKeys[id] !== undefined) {
+        const nk = { ...raw.providerKeys };
+        delete nk[id];
+        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();
+    if (pid && isPidAlive(pid)) {
+      console.log("检测到 daemon 运行中，自动重启以生效…");
+      const { spawnSync } = await import("node:child_process");
+      const { fileURLToPath } = await import("node:url");
+      const bin = fileURLToPath(new URL("../../../../bin/mslxdff.js", import.meta.url));
+      const r = spawnSync(process.execPath, [bin, "-restart"], { stdio: "inherit" });
+      if (r.status !== 0) console.log("自动重启失败，请手动执行: mslxdff -restart");
+      else console.log("已自动重启完成");
+    } else {
+      console.log("daemon 未运行，下次启动时生效");
+    }
+    process.exit(0);
+  }
   if (sub === "set-models-path" || sub === "setModelsPath" || sub === "models-path") {
     const p = rest[1];
     if (!p) {

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

@@ -6,73 +6,12 @@ export async function handleProviders(args) {
   const idx = args.findIndex((x) => x === "-providers" || x === "--providers");
   const sub = args[idx + 1];
   if (!sub || sub === "list" || sub === "status") {
-    const { loadProviderConfigs, loadProviderKeys, loadProviderShareKeys, loadProviderBaseUrl, loadProviderAllowedModels } = await import("../../../state.js");
-    const configs = loadProviderConfigs();
-    const opencodeEnabled = true;
-    const opencodeBase = process.env.UPSTREAM_BASE_URL || "https://opencode.ai";
-    const orKeys = loadProviderKeys("openrouter");
-    const orBase = "https://openrouter.ai/api/v1";
-    const orShare = loadProviderShareKeys("openrouter");
-    const orAllowed = loadProviderAllowedModels("openrouter");
-    const genericIds = new Set(Object.keys(configs).filter((id) => id !== "opencode" && id !== "openrouter"));
-    try {
-      const raw = JSON.parse(readFileSync(defaultStateFile(), "utf8"));
-      const pk = raw.providerKeys || {};
-      for (const id of Object.keys(pk)) if (id !== "opencode" && id !== "openrouter") genericIds.add(id);
-      const cfgRaw = raw.providerConfigs || {};
-      for (const id of Object.keys(cfgRaw)) if (id !== "opencode" && id !== "openrouter") genericIds.add(id);
-    } catch {}
-    for (const k of Object.keys(process.env)) {
-      const m = k.match(/^MSLXDFF_(.+)_KEY$/);
-      if (m) {
-        const id = m[1].toLowerCase().replace(/__/g, "-");
-        if (id !== "openrouter" && id !== "opencode") genericIds.add(id);
-      }
-    }
-    try {
-      const raw = JSON.parse(readFileSync(defaultStateFile(), "utf8"));
-      const cfgs = raw.providerConfigs || {};
-      for (const id of Object.keys(cfgs)) {
-        if (id === "opencode" || id === "openrouter") continue;
-        const am = cfgs[id]?.allowedModels;
-        if (Array.isArray(am) && am.length) genericIds.add(id);
-      }
-    } catch {}
-    const list = [];
-    const { loadProviderAllowAnyModels: _la0 } = await import("../../../state.js");
-    const opAllowAny = _la0("opencode");
-    const orAllowAny = _la0("openrouter");
-    const opAllowed = loadProviderAllowedModels("opencode");
-    list.push({ id: "opencode", enabled: opencodeEnabled, baseUrl: opencodeBase, keys: [], share: false, allowed: opAllowed, allowAny: opAllowAny, note: "built-in, no key, cannot share" });
-    list.push({ id: "openrouter", enabled: orKeys.length > 0, baseUrl: orBase, keys: orKeys, share: orShare, allowed: orAllowed, allowAny: orAllowAny, note: orKeys.length ? "" : "no keys" });
-    for (const gid of [...genericIds].sort()) {
-      const cfg = configs[gid];
-      const keys = loadProviderKeys(gid);
-      const baseUrl = loadProviderBaseUrl(gid) || cfg?.baseUrl || "";
-      const share = loadProviderShareKeys(gid);
-      const allowed = loadProviderAllowedModels(gid);
-      const allowAny = _la0(gid);
-      const enabled = Boolean(baseUrl && keys.length);
-      let note = "";
-      if (!baseUrl && !keys.length && !allowed.length && allowAny === false) note = "no baseUrl, no keys, BLOCKED (allowAny OFF)";
-      else if (!baseUrl && !keys.length && !allowed.length) note = "no baseUrl, no keys";
-      else if (!baseUrl && !allowed.length && !allowAny) note = "missing baseUrl, BLOCKED";
-      else if (!keys.length && !allowed.length && !allowAny) note = "no keys, BLOCKED";
-      else if (!baseUrl) note = "missing baseUrl";
-      else if (!keys.length) note = "no keys";
-      list.push({ id: gid, enabled, baseUrl: baseUrl || "(none)", keys, share, allowed, allowAny, note });
-    }
-    console.log(`providers (${list.length}):`);
-    for (const p of list) {
-      const state = p.enabled ? "enabled " : "disabled";
-      const keysInfo = p.keys.length ? `${p.keys.length} key${p.keys.length > 1 ? "s" : ""} ${p.keys.map((k) => `${k.slice(0, 4)}…${k.slice(-4)}`).join(", ")}` : "0 keys";
-      const shareInfo = p.id === "opencode" ? "cannot share" : `share=${p.share ? "ON" : "off"}`;
-      const allowInfo = p.allowed.length ? `allow=${p.allowed.length}(${p.allowed.slice(0, 3).join(",")}${p.allowed.length > 3 ? "..." : ""})` : (p.allowAny ? "allow=all" : "allow=none(BLOCKED)");
-      const note = p.note ? `  (${p.note})` : "";
-      console.log(`  ${p.id.padEnd(12)} ${state}  ${keysInfo.padEnd(28)}  ${allowInfo.padEnd(22)}  baseUrl=${p.baseUrl}  ${shareInfo}${note}`);
-    }
-    console.log(`\nuse: mslxdff -provider <id> list  to inspect one,  mslxdff -provider <id> allowlist set <model...>  to restrict`);
-    console.log(`     mslxdff -provider <id> allowAny on|off  (empty allowlist = block or allow all)`);
+    const { buildProviderRows, formatProviderSection } = await import("../../provider-row.js");
+    const rows = buildProviderRows({});
+    const enabled = rows.filter((r) => r.enabled).length;
+    console.log(`providers  ${rows.length} 个 · ${enabled} 已启用  —  mslxdff -provider <id> list 查看详情`);
+    console.log(formatProviderSection(rows));
+    console.log(`\n提示: mslxdff -provider <id> list 单看一个 · allowlist set <model...> 限制模型 · allowAny on|off 空名单放行/阻断`);
     process.exit(0);
   }
   console.error("usage: mslxdff -providers list");
@@ -106,68 +45,11 @@ export async function handleProvider(args) {
     process.exit(1);
   }
   if (id === "list" || id === "status") {
-    const { loadProviderConfigs, loadProviderKeys, loadProviderShareKeys, loadProviderBaseUrl } = await import("../../../state.js");
-    const configs = loadProviderConfigs();
-    const opencodeBase = process.env.UPSTREAM_BASE_URL || "https://opencode.ai";
-    const orKeys = loadProviderKeys("openrouter");
-    const orBase = "https://openrouter.ai/api/v1";
-    const orShare = loadProviderShareKeys("openrouter");
-    const genericIds = new Set(Object.keys(configs).filter((x) => x !== "opencode" && x !== "openrouter"));
-    try {
-      const raw = JSON.parse(readFileSync(defaultStateFile(), "utf8"));
-      const pk = raw.providerKeys || {};
-      for (const k of Object.keys(pk)) if (k !== "opencode" && k !== "openrouter") genericIds.add(k);
-      const cfgRaw = raw.providerConfigs || {};
-      for (const k of Object.keys(cfgRaw)) if (k !== "opencode" && k !== "openrouter") genericIds.add(k);
-    } catch {}
-    for (const k of Object.keys(process.env)) {
-      const m = k.match(/^MSLXDFF_(.+)_KEY$/);
-      if (m) {
-        const gid = m[1].toLowerCase().replace(/__/g, "-");
-        if (gid !== "openrouter" && gid !== "opencode") genericIds.add(gid);
-      }
-    }
-    try {
-      const raw = JSON.parse(readFileSync(defaultStateFile(), "utf8"));
-      const cfgs = raw.providerConfigs || {};
-      for (const gid of Object.keys(cfgs)) {
-        if (gid === "opencode" || gid === "openrouter") continue;
-        const am = cfgs[gid]?.allowedModels;
-        if (Array.isArray(am) && am.length) genericIds.add(gid);
-      }
-    } catch {}
-    const list = [];
-    const { loadProviderAllowAnyModels: _la0 } = await import("../../../state.js");
-    const { loadProviderAllowedModels } = await import("../../../state.js");
-    const opAllowed = loadProviderAllowedModels("opencode");
-    const opAllowAny = _la0("opencode");
-    const orAllowed = loadProviderAllowedModels("openrouter");
-    const orAllowAny = _la0("openrouter");
-    list.push({ id: "opencode", enabled: true, baseUrl: opencodeBase, keys: [], share: false, allowed: opAllowed, allowAny: opAllowAny, note: "built-in, no key, cannot share" });
-    list.push({ id: "openrouter", enabled: orKeys.length > 0, baseUrl: orBase, keys: orKeys, share: orShare, allowed: orAllowed, allowAny: orAllowAny, note: orKeys.length ? "" : "no keys" });
-    for (const gid of [...genericIds].sort()) {
-      const cfg = configs[gid];
-      const keys = loadProviderKeys(gid);
-      const baseUrl = loadProviderBaseUrl(gid) || cfg?.baseUrl || "";
-      const share = loadProviderShareKeys(gid);
-      const allowed = loadProviderAllowedModels(gid);
-      const allowAny = _la0(gid);
-      const enabled = Boolean(baseUrl && keys.length);
-      let note = "";
-      if (!baseUrl && !keys.length) note = "no baseUrl, no keys";
-      else if (!baseUrl) note = "missing baseUrl";
-      else if (!keys.length) note = "no keys";
-      list.push({ id: gid, enabled, baseUrl: baseUrl || "(none)", keys, share, note });
-    }
-    console.log(`providers (${list.length}):`);
-    for (const p of list) {
-      const state = p.enabled ? "enabled " : "disabled";
-      const keysInfo = p.keys.length ? `${p.keys.length} key${p.keys.length > 1 ? "s" : ""} ${p.keys.map((k) => `${k.slice(0, 4)}…${k.slice(-4)}`).join(", ")}` : "0 keys";
-      const shareInfo = p.id === "opencode" ? "cannot share" : `share=${p.share ? "ON" : "off"}`;
-      const note = p.note ? `  (${p.note})` : "";
-      console.log(`  ${p.id.padEnd(12)} ${state}  ${keysInfo.padEnd(28)}  baseUrl=${p.baseUrl}  ${shareInfo}${note}`);
-    }
-    console.log(`\nuse: mslxdff -provider <id> list  to inspect one,  mslxdff -provider add <id> <baseUrl> <key>  to add generic`);
+    const { buildProviderRows, formatProviderSection } = await import("../../provider-row.js");
+    const rows = buildProviderRows({});
+    const enabled = rows.filter((r) => r.enabled).length;
+    console.log(`providers  ${rows.length} 个 · ${enabled} 已启用  —  mslxdff -provider <id> list 单看一个`);
+    console.log(formatProviderSection(rows));
     process.exit(0);
   }
   if (id === "add") {

package/src/cli/commands/sync.js

@@ -1,9 +1,9 @@
 import { join } from "node:path";
-import { loadToken, getPort, savePreferredModel, loadPreferredModel } from "../../state.js";
+import { loadToken, getPort, savePreferredModel, loadPreferredModel, loadModelPicks } from "../../state.js";
 import { getPreferredModel as getPref } from "../../auto.js";
 import { normalizeModel } from "../../reasoning.js";
 import { syncToWorkbuddy, workbuddyModelsPath } from "../../sync-workbuddy.js";
-import { syncToOpencode, opencodeConfigPath, toExternalAlias, toInternalId } from "../../sync-opencode.js";
+import { syncToOpencode, opencodeConfigPath } from "../../sync-opencode.js";
 import { createModelsService } from "../../models.js";
 import { createUpstreamClient } from "../../upstream.js";
 import { logDir } from "../../logs.js";
@@ -13,13 +13,46 @@ export async function handleSetto(args) {
   const idx = args.findIndex((x) => x === "-setto" || x === "--setto");
   const target = args[idx + 1];
   if (!["workbuddy", "opencode"].includes(target)) {
-    console.error("usage: mslxdff -setto workbuddy [modelId] | mslxdff -setto opencode [modelId]");
+    console.error("usage: mslxdff -setto workbuddy [modelId] | mslxdff -setto opencode [modelId|--all]");
     process.exit(1);
   }
   if (target === "opencode") {
+    const wantsAll = args.includes("--all") || args.includes("-a") || args[idx + 2] === "all";
+    if (wantsAll) {
+      const picks = loadModelPicks();
+      const list = picks.length ? picks : [loadPreferredModel() || getPref()].filter(Boolean);
+      if (!list.length) {
+        console.error("no picks and no preferred model; use: mslxdff -setto opencode <modelId>");
+        process.exit(1);
+      }
+      try {
+        const { token } = await loadToken();
+        const persisted = getPort();
+        const envPort = Number(process.env.MSLXDFF_PORT);
+        const port = persisted !== null ? persisted : (Number.isInteger(envPort) && envPort > 0 ? envPort : 8989);
+        const file = opencodeConfigPath();
+        let inserted = 0, updated = 0;
+        for (const rawId of list) {
+          const norm = normalizeModel(rawId);
+          if (!norm || norm === "auto") continue;
+          // 首次循环也同步 preferred（保持 daemon 热重载语义）
+          if (rawId === list[0]) savePreferredModel(norm);
+          const r = await syncToOpencode({ id: norm, token, port, file });
+          if (r.action === "inserted") inserted++; else updated++;
+          console.log(`  ${r.action} "${r.id}" -> ${r.internal} @ ${file}`);
+        }
+        console.log(`synced to opencode: ${inserted} inserted, ${updated} updated, total ${list.length} @ ${file}`);
+        console.log(`  url: http://127.0.0.1:${port}/v1`);
+        console.log(`  models: ${list.map((x) => normalizeModel(x)).join(", ")}`);
+        console.log(`  opencode 选 mslxdff/<model> 直达本地，同名如 mslxdff/deepseek-v4-flash-free 或 mslxdff/bai-deepseek-v4-flash`);
+      } catch (err) {
+        console.error(`failed to sync to opencode: ${String(err?.message || err)}`);
+        process.exit(1);
+      }
+      process.exit(0);
+    }
     const raw = args[idx + 2] && !String(args[idx + 2]).startsWith("-") ? String(args[idx + 2]).trim() : null;
     let id;
-    let internal;
     if (raw) {
       if (raw === "auto" || !raw) {
         console.error("modelId 不能为 auto 或空");
@@ -32,8 +65,7 @@ export async function handleSetto(args) {
       }
       savePreferredModel(norm);
       console.log(`default model set to: ${norm} (daemon hot-reloads on next request)`);
-      internal = toInternalId(norm);
-      id = toExternalAlias(internal);
+      id = norm;
     } else {
       const pref = loadPreferredModel() || getPref();
       if (!pref) {
@@ -45,9 +77,9 @@ export async function handleSetto(args) {
         console.error("modelId 不能为空");
         process.exit(1);
       }
-      internal = toInternalId(norm);
-      id = toExternalAlias(internal);
+      id = norm;
     }
+    // 可选：校验是否在 free 列表
     try {
       const cacheFile = join(logDir(), "models.json");
       const models = createModelsService({
@@ -62,8 +94,10 @@ export async function handleSetto(args) {
       ]);
       if (fresh?.data?.length) {
         const ids = fresh.data.map((m) => m.id);
-        if (!ids.includes(internal) && !ids.includes(id)) {
-          console.log(`warn: "${internal}" not in current free list (${ids.length} models), still syncing to opencode (alias ${id})`);
+        // 对 slash 形态也做 dash 兼容检查
+        const dashId = id.includes("/") ? id.replace(/\//g, "-") : id;
+        if (!ids.includes(id) && !ids.includes(dashId)) {
+          console.log(`warn: "${id}" not in current free list (${ids.length} models), still syncing to opencode`);
         }
       }
     } catch {}
@@ -74,11 +108,9 @@ export async function handleSetto(args) {
       const port = persisted !== null ? persisted : (Number.isInteger(envPort) && envPort > 0 ? envPort : 8989);
       const file = opencodeConfigPath();
       const r = await syncToOpencode({ id, token, port, file });
-      const aliasLabel = r.alias && r.alias !== r.id ? ` (alias ${r.alias} 对应内部 ${r.internal})` : (r.id !== r.internal ? ` (alias for "${r.internal}", 原名仍兼容)` : ` (原名兼容)`);
-      console.log(`synced to opencode: ${r.action} "${r.id}"${aliasLabel} @ ${file}`);
+      console.log(`synced to opencode: ${r.action} "${r.id}" @ ${file}`);
       console.log(`  url: http://127.0.0.1:${port}/v1`);
-      if (r.id !== r.internal) console.log(`  alias: ${r.id} -> ${r.internal} (opencode 选 mslxdff/${r.id} 直达本地 ${r.internal})`);
-      else console.log(`  alias: ${r.internal} (原名直用，opencode 选 mslxdff/${r.id} 直达本地 ${r.internal})`);
+      console.log(`  opencode 选 mslxdff/${r.id} 直达本地 ${r.internal}${r.storageKey !== r.internal ? ` (dash→${r.internal} 自动映射)` : ""}`);
     } catch (err) {
       console.error(`failed to sync to opencode: ${String(err?.message || err)}`);
       process.exit(1);

package/src/cli/provider-row.js

@@ -1,5 +1,5 @@
 import { readFileSync, existsSync } from "node:fs";
-import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, loadProviderAllowedModels, loadProviderShareKeys, loadProviderBaseUrl } from "../state.js";
+import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderShareKeys, loadProviderBaseUrl } from "../state.js";
 
 /**
  * 聚合 genericIds：来自 providerConfigs + providerKeys + env MSLXDFF_*_KEY
@@ -12,7 +12,8 @@ export function buildProviderRows({ stateFile, env = process.env } = {}) {
   const upstreamBase = env.UPSTREAM_BASE_URL || "https://opencode.ai";
   const rows = [];
   const opAllowed = (() => { try { return loadProviderAllowedModels("opencode", stateFile ? { file: stateFile } : undefined); } catch { return []; } })();
-  rows.push({ id: "opencode", enabled: true, baseUrl: upstreamBase, keys: [], allowed: opAllowed, share: false, note: "built-in, no key, cannot share", authCount: 0 });
+  const opAllowAny = (() => { try { return loadProviderAllowAnyModels("opencode", stateFile ? { file: stateFile } : undefined); } catch { return true; } })();
+  rows.push({ id: "opencode", enabled: true, baseUrl: upstreamBase, keys: [], allowed: opAllowed, allowAny: opAllowAny !== false, share: false, note: "built-in, no key, cannot share", authCount: 0 });
 
   const genericIds = new Set(Object.keys(configs).filter((id) => id !== "opencode"));
   try {
@@ -30,16 +31,22 @@ export function buildProviderRows({ stateFile, env = process.env } = {}) {
     }
   }
 
+  // 保证 openrouter 始终可见（即使 0 keys，供用户发现）
+  genericIds.add("openrouter");
   for (const gid of [...genericIds].sort()) {
     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
+    if (gid === "opencode") allowAny = true;
     let enabled = Boolean(baseUrl && keys.length) || (gid === "openrouter" && keys.length > 0);
     const auths = gid === "workbuddy" ? (() => { try { return loadProviderAuths(gid, stateFile ? { file: stateFile } : undefined) || []; } catch { return []; } })() : [];
     let note = "";
@@ -54,20 +61,68 @@ 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, share, note, authCount: auths.length });
+    rows.push({ id: gid, enabled, baseUrl: baseUrl || "(none)", keys, allowed, allowAny, share, note, authCount: auths.length });
   }
   return rows;
 }
 
+function maskKey(k) {
+  const s = String(k || "").trim();
+  if (s.length <= 8) return `${s.slice(0, 3)}…${s.slice(-2)}`;
+  return `${s.slice(0, 3)}…${s.slice(-4)}`;
+}
+
 export function formatProviderRow(p) {
-  const dot = p.enabled ? "●" : "○";
-  const state = p.enabled ? "enabled " : "disabled";
+  const isBlocked = !p.allowed.length && !p.allowAny && p.id !== "opencode";
+  const dot = !p.enabled ? "○" : isBlocked ? "◐" : "●";
+  const state = !p.enabled ? "未启用" : isBlocked ? "已启用·阻断" : "已启用";
+  // keys
   let keysInfo;
-  if (p.id === "opencode") keysInfo = "无需 key (内置)";
-  else keysInfo = p.keys.length ? `${p.keys.length} key${p.keys.length > 1 ? "s" : ""} ${p.keys.map((k) => `${k.slice(0, 3)}…${k.slice(-3)}`).join(", ")}` : "0 keys";
-  const authInfo = p.authCount ? ` ${p.authCount} acc` : "";
-  const allowInfo = p.allowed.length ? `allow=${p.allowed.length}(${p.allowed.slice(0, 2).join(",")}${p.allowed.length > 2 ? "…" : ""})` : "allow=all";
-  const shareInfo = p.id === "opencode" ? "cannot share" : `share=${p.share ? "ON" : "off"}`;
-  const note = p.note ? `  (${p.note})` : "";
-  return `  ${dot} ${p.id.padEnd(12)} ${state}  ${keysInfo}${authInfo}  ${allowInfo.padEnd(18)}  baseUrl=${p.baseUrl}  ${shareInfo}${note}`;
+  if (p.id === "opencode") keysInfo = "无需 key";
+  else if (!p.keys.length) keysInfo = "0 keys";
+  else if (p.keys.length === 1) keysInfo = `1 key ${maskKey(p.keys[0])}`;
+  else keysInfo = `${p.keys.length} keys ${p.keys.slice(0, 2).map(maskKey).join(", ")}${p.keys.length > 2 ? ` +${p.keys.length - 2}` : ""}`;
+  if (p.authCount) keysInfo += ` · ${p.authCount} acc`;
+  // allow — 空名单 + allowAny OFF = 阻断（安全默认）
+  let allowInfo;
+  if (!p.allowed.length) {
+    if (p.id === "opencode") allowInfo = "allow all";
+    else if (p.allowAny) allowInfo = "allow all";
+    else allowInfo = "allow none (BLOCKED)";
+  } else {
+    const head = p.allowed.slice(0, 2).join(", ");
+    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 ? "开" : "关"}`;
+  // base
+  const base = p.baseUrl && p.baseUrl !== "(none)" ? p.baseUrl : "(none)";
+  const baseLine = `    └ ${base}${p.note ? `  · ${p.note}` : ""}`;
+  // 主行：id 固定 12，状态 6，keys 22，allow 自适应，share 固定
+  const main = `  ${dot} ${p.id.padEnd(12)}  ${state}  ${keysInfo.padEnd(22)}  ${allowInfo.padEnd(28)}  ${shareInfo}`;
+  return `${main}\n${baseLine}`;
+}
+
+export function formatProviderSection(rows) {
+  if (!rows.length) {
+    return [
+      "  (空) 暂无供应商 — 加一个试试：",
+      "    mslxdff -provider add myapi https://api.example.com/v1 sk-xxx",
+      "    或  node workbuddy-token-auto.js  (WorkBuddy 一键接入)",
+    ].join("\n");
+  }
+  const enabled = rows.filter((r) => r.enabled);
+  const disabled = rows.filter((r) => !r.enabled);
+  const out = [];
+  if (enabled.length) {
+    out.push(`  已启用 (${enabled.length})`);
+    for (const p of enabled) out.push(formatProviderRow(p));
+  }
+  if (disabled.length) {
+    if (enabled.length) out.push("");
+    out.push(`  未启用 / 需配置 (${disabled.length})`);
+    for (const p of disabled) out.push(formatProviderRow(p));
+  }
+  return out.join("\n");
 }

package/src/cli/status.js

@@ -13,7 +13,7 @@ import { refreshGroupMembers } from "../groups.js";
 import { fmtShanghaiYMDHM } from "../time.js";
 import { fmtStatus, fmtUptime, fmtTs } from "./format.js";
 import { compareSemver } from "./policy.js";
-import { buildProviderRows, formatProviderRow } from "./provider-row.js";
+import { buildProviderRows, formatProviderRow, formatProviderSection } from "./provider-row.js";
 
 export async function printStatus(VERSION) {
   const daemon = readPid();
@@ -53,12 +53,12 @@ export async function printStatus(VERSION) {
   try {
     const providerRows = buildProviderRows({});
     const enabledCount = providerRows.filter((r) => r.enabled).length;
-    console.log(`\nupstream providers (${providerRows.length}, ${enabledCount} enabled)  —  mslxdff -providers list 查看详情`);
-    for (const p of providerRows) {
-      console.log(formatProviderRow(p));
-    }
+    console.log(`\nupstream providers  ${providerRows.length} 个 · ${enabledCount} 已启用  —  mslxdff -providers list 查看详情`);
+    console.log(formatProviderSection(providerRows));
     if (enabledCount === 1 && providerRows.length === 1) {
-      console.log(`  (仅 opencode 内置免费通道；按需加：mslxdff -provider add bai https://api.b.ai/v1 <key>  或  node workbuddy-token-auto.js)`);
+      console.log(`\n  空状态：仅 opencode 内置免费通道`);
+      console.log(`    → 加一个私有上游：mslxdff -provider add bai https://api.b.ai/v1 <key>`);
+      console.log(`    → 或 WorkBuddy 一键接入：node workbuddy-token-auto.js`);
     }
   } catch (e) {
     console.log(`\nupstream providers: (unavailable — ${String(e?.message || e).slice(0, 80)})`);

package/src/routes/chat/gateway.js

@@ -1,7 +1,6 @@
 import { performance } from "node:perf_hooks";
 import { injectReasoningContent, normalizeModel } from "../../reasoning.js";
 import { isAutoModel } from "../../auto.js";
-import { toInternalId as aliasToInternal } from "../../sync-opencode.js";
 import { clientIp, json, readBody, parseHops, summarizePrompt, errMsg } from "../helpers.js";
 import { hedgeDelayMs, shouldHedge } from "../hedge.js";
 import { runHook } from "../../plugins.js";
@@ -53,25 +52,20 @@ export function createChatGateway({ upstream, auto, logs, peers, maxHops, groups
     if (aliasResolved) { normalizedRequested = aliasResolved; body = { ...body, model: aliasResolved }; }
     let requested = normalizedRequested;
     let aliasInfo = null;
-    if (requested.startsWith("mslxdff-")) {
-      const internal = aliasToInternal(requested);
-      if (internal) { aliasInfo = `${requested} -> ${internal}`; requested = internal; }
-    } else if (requested.includes("/")) {
-      const slashIdx = requested.indexOf("/");
-      const rawPart = requested.slice(slashIdx + 1);
-      const providerPart = requested.slice(0, slashIdx);
-      if (rawPart.startsWith("mslxdff-")) {
-        const internal = aliasToInternal(rawPart);
-        if (internal) {
-          aliasInfo = `${requested} -> ${providerPart}/${internal} (alias stripped)`;
-          requested = `${providerPart}/${internal}`;
-          if (providerPart === "mslxdff") { requested = internal; aliasInfo = `${rawModel} -> ${internal} (mslxdff alias stripped)`; }
-        }
-      } else if (providerPart === "mslxdff") {
-        aliasInfo = `${requested} -> ${rawPart} (mslxdff provider stripped, 原名兼容)`;
-        requested = rawPart;
+    // opencode 侧 provider.mslxdff 模型会以 mslxdff/<id> 形式到达，剥掉前缀即得真实模型
+    if (requested.startsWith("mslxdff/")) {
+      const rawPart = requested.slice("mslxdff/".length);
+      aliasInfo = `${requested} -> ${rawPart} (mslxdff provider stripped)`;
+      requested = rawPart;
+      // mslxdff/bai-deepseek... 这类 dash 形态二次走 alias 表还原为 bai/...
+      const alias2 = getModelAlias(requested);
+      if (alias2) {
+        aliasInfo = `${rawModel} -> ${alias2} (mslxdff + alias)`;
+        requested = alias2;
+        body = { ...body, model: alias2 };
       }
     }
+    // 非 mslxdff 前缀的 dash 形态（如 bai-deepseek）已在首轮 aliasResolved 处理
     const useAuto = isAutoModel(requested);
     mark("parsed");
     if (aliasInfo) { try { res.setHeader("x-mslxdff-alias", aliasInfo); } catch {} }

package/src/sync-opencode.js

@@ -8,6 +8,7 @@ export function opencodeConfigPath() {
   return join(os.homedir(), ".config", "opencode", "opencode.json");
 }
 
+//  legacy mslxdff- 前缀（保留做兼容剥离，新写入不再使用）
 export function toExternalAlias(id) {
   const s = String(id || "").trim();
   if (!s) return "";
@@ -20,9 +21,28 @@ export function toInternalId(aliasOrRaw) {
   return s.startsWith("mslxdff-") ? s.slice("mslxdff-".length) : s;
 }
 
+// 新存储键：/ → -（与 WorkBuddy 一致），裸 id 原样
+export function toStorageKey(canonical) {
+  const s = String(canonical || "").trim();
+  if (!s) return "";
+  // 先剥 legacy 前缀
+  const internal = toInternalId(s);
+  return internal.includes("/") ? internal.replace(/\//g, "-") : internal;
+}
+
+// 从存储键还原为内部 canonical（需查 alias 表，调用方用 getModelAlias）
+export function storageKeyToCanonical(storageKey) {
+  const s = String(storageKey || "").trim();
+  if (!s) return "";
+  const internal = toInternalId(s);
+  return internal;
+}
+
 export function buildOpencodeProvider({ id, token, port }) {
   const p = Number(port) || 8989;
-  const alias = toExternalAlias(id);
+  const internal = toInternalId(String(id || "").trim());
+  const storageKey = internal.includes("/") ? internal.replace(/\//g, "-") : internal;
+  const key = storageKey || toExternalAlias(id); // fallback 兼容
   return {
     name: "mslxdff",
     npm: "@ai-sdk/openai-compatible",
@@ -31,7 +51,7 @@ export function buildOpencodeProvider({ id, token, port }) {
       baseURL: `http://127.0.0.1:${p}/v1`,
     },
     models: {
-      [alias]: { name: alias },
+      [key]: { name: key },
     },
   };
 }
@@ -43,12 +63,11 @@ export function isOpencodeLocalUrl(url) {
 
 export async function syncToOpencode({ id, token, port, file } = {}) {
   const targetFile = file || opencodeConfigPath();
-  // id 可能是 alias 或原名，统一以 internal 去重、以 external 入库（原名兼容）
   const normalizedRaw = String(id || "").trim();
   if (!normalizedRaw) throw new Error("model id required");
   const internal = toInternalId(normalizedRaw);
   if (!internal) throw new Error("model id required");
-  const external = toExternalAlias(internal);
+  const storageKey = internal.includes("/") ? internal.replace(/\//g, "-") : internal;
   const cleanToken = String(token || "");
   const p = Number(port) || 8989;
 
@@ -81,32 +100,49 @@ export async function syncToOpencode({ id, token, port, file } = {}) {
     : null;
 
   let action;
-  let effectiveId = external;
+  let effectiveId = storageKey;
   if (oldProvider) {
     const oldModels = oldProvider.models && typeof oldProvider.models === "object" && !Array.isArray(oldProvider.models)
       ? oldProvider.models
       : {};
-    // 去重：internal 或 external 任一已存在即视为已存在（原名兼容，以 internal 为基准）
-    const hasExternal = Object.prototype.hasOwnProperty.call(oldModels, external);
-    const hasInternal = Object.prototype.hasOwnProperty.call(oldModels, internal);
-    const exists = hasExternal || hasInternal;
+    // 归一所有旧 key 到 storageKey 维度，判断是否已存在（兼容 mslxdff- 前缀与 / 形态）
+    const normalizeToStorage = (k) => {
+      const inner = toInternalId(String(k));
+      return inner.includes("/") ? inner.replace(/\//g, "-") : inner;
+    };
+    let existingKey = null;
+    for (const k of Object.keys(oldModels)) {
+      if (normalizeToStorage(k) === storageKey) { existingKey = k; break; }
+    }
+    // 也兼容直接 internal（slash）形态
+    if (!existingKey && Object.prototype.hasOwnProperty.call(oldModels, internal)) existingKey = internal;
+    if (!existingKey && Object.prototype.hasOwnProperty.call(oldModels, storageKey)) existingKey = storageKey;
+
     const nextModels = { ...oldModels };
-    if (exists) {
-      if (hasExternal) {
-        nextModels[external] = { name: external, ...(oldModels[external] && typeof oldModels[external] === "object" ? oldModels[external] : {}), name: external };
-        effectiveId = external;
-      } else if (hasInternal) {
-        // 仅原名存在：保留原名不强制迁移为 alias，视为 updated（原名兼容）
-        nextModels[internal] = { name: internal, ...(oldModels[internal] && typeof oldModels[internal] === "object" ? oldModels[internal] : {}), name: internal };
-        effectiveId = internal;
+    if (existingKey) {
+      // 已存在：迁移到 storageKey（新规范），清理旧的 legacy 键
+      const oldEntry = oldModels[existingKey];
+      const merged = oldEntry && typeof oldEntry === "object" && !Array.isArray(oldEntry) ? oldEntry : {};
+      // 若 existingKey !== storageKey，需要把旧键删掉，统一到 storageKey
+      if (existingKey !== storageKey) {
+        // 收集所有同逻辑的旧键一起清理
+        for (const k of Object.keys(oldModels)) {
+          if (normalizeToStorage(k) === storageKey) delete nextModels[k];
+        }
+        // 也清理 legacy mslxdff- 前缀变体
+        const legacyAlias = toExternalAlias(storageKey);
+        const legacyInternal = toExternalAlias(internal);
+        if (nextModels[legacyAlias]) delete nextModels[legacyAlias];
+        if (legacyInternal !== legacyAlias && nextModels[legacyInternal]) delete nextModels[legacyInternal];
       }
+      nextModels[storageKey] = { ...merged, name: storageKey };
+      effectiveId = storageKey;
       action = "updated";
     } else {
-      nextModels[external] = { name: external };
-      effectiveId = external;
+      nextModels[storageKey] = { name: storageKey };
+      effectiveId = storageKey;
       action = "inserted";
     }
-    // 合并 provider：保留 name/npm，覆盖 options.baseURL/apiKey，合并 models
     const nextProvider = {
       ...oldProvider,
       name: oldProvider.name || "mslxdff",
@@ -118,18 +154,26 @@ export async function syncToOpencode({ id, token, port, file } = {}) {
       },
       models: nextModels,
     };
-    // 若插入的是 alias 但原名已存在，上面已处理为不新增；否则正常
     data.provider.mslxdff = nextProvider;
-    // 若是新插入且 external 不等于 internal，且 internal 已存在时，需避免双键，上面已处理
-    // 若是新插入 external 且 internal 不存在，正常插入
-    if (!exists) {
-      data.provider.mslxdff.models = nextModels;
-    }
   } else {
-    data.provider.mslxdff = buildOpencodeProvider({ id: external, token: cleanToken, port: p });
+    data.provider.mslxdff = buildOpencodeProvider({ id: storageKey, token: cleanToken, port: p });
+    // buildOpencodeProvider 已用 storageKey，这里再确保
+    if (!data.provider.mslxdff.models[storageKey]) {
+      data.provider.mslxdff.models = { [storageKey]: { name: storageKey } };
+    }
     action = "inserted";
   }
 
+  // 若内部含 /，注册 dash→slash 别名，供网关 mslxdff 侧自动映射（与 WorkBuddy 同表）
+  if (internal.includes("/") && storageKey !== internal) {
+    try {
+      const { loadModelAliases, registerModelAlias, persistModelAliases } = await import("./providers/model-id.js");
+      loadModelAliases();
+      registerModelAlias(storageKey, internal);
+      persistModelAliases();
+    } catch {}
+  }
+
   // 原子写
   mkdirSync(dirname(targetFile), { recursive: true });
   const tmp = `${targetFile}.tmp.${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
@@ -148,5 +192,5 @@ export async function syncToOpencode({ id, token, port, file } = {}) {
     }
   } catch {}
 
-  return { action, file: targetFile, id: effectiveId, alias: external, internal, corrupted };
+  return { action, file: targetFile, id: effectiveId, alias: storageKey, internal, corrupted, storageKey };
 }