mslxdff 0.1.86 → 0.1.87

package/package.json

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

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/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 };
 }