mslxdff 0.1.57 → 0.1.62

package/src/providers/model-id.js

@@ -1,10 +1,77 @@
 // 模型 ID 前缀解析：`<provider>/<rawId>`。默认供应商（opencode）保持裸 id（向后兼容），
 // 其它供应商必须带前缀，请求按前缀路由到对应上游通道。
+//
+// WorkBuddy 别名系统：
+// WorkBuddy 不支持模型 ID 中的 /，写入 models.json 时替换为 -
+// mslxdff 在收到请求时通过固定映射表还原为 / 格式
+// 映射表持久化在 ~/.config/mslxdff/model-aliases.json
+
+import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import os from "node:os";
 
 export const DEFAULT_PROVIDER = "opencode";
 
 const ALIASES = { oc: "opencode", opencode: "opencode" };
 
+// WorkBuddy 别名映射（alias → canonical）：clinebot-z-ai-glm-5.3-flash → clinebot/z-ai/glm-5.3-flash
+const _modelAliases = new Map();
+
+function aliasFile() {
+  const env = process.env.MSLXDFF_ALIASES_FILE;
+  if (typeof env === "string" && env.trim()) return env.trim();
+  return join(os.homedir(), ".config", "mslxdff", "model-aliases.json");
+}
+
+export function loadModelAliases(file) {
+  const fp = file || aliasFile();
+  try {
+    const raw = JSON.parse(readFileSync(fp, "utf8"));
+    if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+      for (const [k, v] of Object.entries(raw)) {
+        if (typeof v === "string" && v) _modelAliases.set(String(k), v);
+      }
+      _aliasLoaded = true;
+    }
+  } catch {}
+}
+
+export function registerModelAlias(alias, canonical) {
+  const a = String(alias || "").trim();
+  const c = String(canonical || "").trim();
+  if (!a || !c || a === c) return;
+  _modelAliases.set(a, c);
+}
+
+export function persistModelAliases(file) {
+  const fp = file || aliasFile();
+  try {
+    mkdirSync(dirname(fp), { recursive: true });
+    const obj = Object.fromEntries(_modelAliases);
+    writeFileSync(fp, JSON.stringify(obj, null, 2), "utf8");
+  } catch {}
+}
+
+let _aliasLoaded = false;
+export function getModelAlias(id) {
+  const key = String(id || "").trim();
+  let hit = _modelAliases.get(key);
+  if (hit) return hit;
+  // 未命中时尝试加载（支持 daemon 运行期间由 -setto 进程写入的新 alias）
+  try { loadModelAliases(); } catch {}
+  return _modelAliases.get(key) || null;
+}
+
+// 反向查询：canonical id → alias（如 clinebot/z-ai/glm-5.3-flash → clinebot-z-ai-glm-5.3-flash）
+export function getAliasForModel(canonicalId) {
+  const c = String(canonicalId || "").trim();
+  if (!_aliasLoaded) { try { loadModelAliases(); } catch {} }
+  for (const [alias, target] of _modelAliases) {
+    if (target === c) return alias;
+  }
+  return null;
+}
+
 export function normalizeProviderId(p) {
   const id = String(p || "").trim();
   return ALIASES[id] || id;
@@ -33,4 +100,35 @@ export function joinModelId(provider, raw, { force = false } = {}) {
   raw = String(raw || "");
   if (provider === DEFAULT_PROVIDER && !force) return raw;
   return `${provider}/${raw}`;
+}
+
+// 观测用全称：始终带前缀（opencode 也带），用于 modelStats / calls.log 聚合主键
+export function toFullId(provider, raw) {
+  provider = normalizeProviderId(provider || "");
+  raw = String(raw || "").trim();
+  if (!raw) return "";
+  if (!provider || provider === DEFAULT_PROVIDER) return `${DEFAULT_PROVIDER}/${raw}`;
+  return `${provider}/${raw}`;
+}
+
+// 归一任意输入为全称：裸 id -> opencode/xxx，已带前缀保持不变（大小写保留，provider 归一）
+// 优先查 WorkBuddy 别名表（固定映射），命中直接还原为 / 格式
+export function normalizeFullId(id, knownProviders = []) {
+  const s = String(id || "").trim();
+  if (!s) return "";
+  // 1. 查别名表（clinebot-z-ai-glm-5.3-flash → clinebot/z-ai/glm-5.3-flash）
+  const aliased = getModelAlias(s);
+  if (aliased) return aliased;
+  // 2. 已含 /，走原有逻辑
+  const idx = s.indexOf("/");
+  if (idx > 0) {
+    const head = normalizeProviderId(s.slice(0, idx));
+    if (knownProviders.length) {
+      const known = new Set([DEFAULT_PROVIDER, ...knownProviders.map(normalizeProviderId)]);
+      if (known.has(head)) return `${head}/${s.slice(idx + 1)}`;
+      return `${DEFAULT_PROVIDER}/${s}`;
+    }
+    return `${head}/${s.slice(idx + 1)}`;
+  }
+  return `${DEFAULT_PROVIDER}/${s}`;
 }

package/src/providers/workbuddy.js

@@ -3,6 +3,7 @@ import { createKeyRing } from "./keyring.js";
 import { loadProviderKeys, loadProviderAuths, loadProviderBaseUrl, loadProviderShareKeys, saveProviderConfig, WORKBUDDY_DEFAULT_BASE_URL } from "../state.js";
 import { writeFileSync, existsSync, mkdirSync, readdirSync, readFileSync, appendFileSync, statSync } from "node:fs";
 import { join, dirname } from "node:path";
+import { tmpdir } from "node:os";
 import { getCachedBalance, setCachedBalance } from "./workbuddy-balance.js";
 
 let UndiciAgent = null;
@@ -17,6 +18,14 @@ function envInt(name, fallback) {
   const v = Number(process.env[name]);
   return Number.isInteger(v) && v > 0 ? v : fallback;
 }
+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(/\/+$/, "");
@@ -143,7 +152,7 @@ export function createWorkbuddyProvider({
   // fallback scan auths/workbuddy-*.json if still empty
   if (!authList.length && !keys.length) {
     try {
-      const authDir = process.env.WORKBUDDY_AUTH_DIR || (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths"));
+      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")));
       if (existsSync(authDir)) {
         const files = readdirSync(authDir).filter((f) => f.startsWith("workbuddy-") && f.endsWith(".json"));
         for (const f of files) {
@@ -223,7 +232,7 @@ export function createWorkbuddyProvider({
             saveProviderConfig(id, { baseUrl: resolvedBase, keys: [...keys], auths: [...authList] }, file ? { file } : {});
           } catch {}
           try {
-            const authDir = process.env.WORKBUDDY_AUTH_DIR || (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths"));
+            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" } };

package/src/routes/chat/index.js

@@ -11,6 +11,7 @@ import { handleLocalRelay } from "./local-handler.js";
 import { handlePeerRelay } from "./peer-handler.js";
 import { handleBroadbandRelay } from "./broadband-handler.js";
 import { handleExhaustedLocal, handleExhaustedAll } from "./exhausted-handler.js";
+import { normalizeFullId, getModelAlias } from "../../providers/model-id.js";
 
 export async function chatHandler({ req, res, upstream, auto, logs, peers, maxHops, groups, bus, token, plugins }) {
   let body;
@@ -40,7 +41,13 @@ export async function chatHandler({ req, res, upstream, auto, logs, peers, maxHo
   const workbuddyUid = (req.headers["x-mslxdff-workbuddy-uid"] || req.headers["x-workbuddy-uid"] || "").toString().trim();
   const lockModel = req.headers["x-mslxdff-model-lock"] || "";
   const rawModel = body.model || "";
-  const normalizedRequested = normalizeModel(lockModel || rawModel || "");
+  let normalizedRequested = normalizeModel(lockModel || rawModel || "");
+  // WorkBuddy 别名还原：clinebot-z-ai-glm-5.3-flash → clinebot/z-ai/glm-5.3-flash
+  const aliasResolved = getModelAlias(normalizedRequested);
+  if (aliasResolved) {
+    normalizedRequested = aliasResolved;
+    body = { ...body, model: aliasResolved };
+  }
   // alias 还原：mslxdff-deepseek -> deepseek（原名仍兼容，双向支持 mslxdff/mslxdff-deepseek 与裸 mslxdff-deepseek/裸 deepseek）
   let requested = normalizedRequested;
   let aliasInfo = null;
@@ -118,7 +125,7 @@ export async function chatHandler({ req, res, upstream, auto, logs, peers, maxHo
     for (const e of sel.errors) evt("plugin-hook-error", { reqId, hook: "model:select", plugin: e.plugin, error: e.error });
   }
 
-  const handlerCtx = { reqId, model: null, body, hops, peers, plugins, evt, logError, logCall };
+  const handlerCtx = { reqId, model: null, body, hops, peers, plugins, evt, logError, logCall, logs };
 
   let lastErr = null;
   for (let idx = 0; idx < order.length; idx++) {

package/src/routes/stream.js

@@ -61,6 +61,8 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
     exitReason: null,
     upstreamError: null,
     downstreamClosed: false,
+    usage: null,
+    chars: 0,
   };
   let prevChunkAt = t0;
   const onClose = () => {
@@ -125,6 +127,43 @@ 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")) {
+              try {
+                const lines = txt.split("\n");
+                for (const line of lines) {
+                  const t = line.trim();
+                  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;
+                    // 兜底 chars：从 choices 文本长度累加
+                    const delta = j.choices?.[0]?.delta?.content || j.choices?.[0]?.message?.content || "";
+                    if (delta) detail.chars += String(delta).length;
+                  }
+                }
+              } catch {}
+            } else {
+              // 非 usage 的普通 delta 也累 chars
+              try {
+                const txt2 = Buffer.isBuffer(chunk) ? chunk.toString("utf8") : String(chunk);
+                const ms = txt2.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;
+                }
+              } catch {}
+            }
           } catch { /* ignore */ }
           if (timedOut || stalled || tooLong) break;
           if (first) {
@@ -190,14 +229,32 @@ 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 提取
   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 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
+    try { detail.chars = text.length; } catch {}
   }
-  return { status: upRes.status, ttfMs: null, totalMs: Math.round(performance.now() - t0), aborted: false, interrupted: false, detail };
+  // 非流式 ttf 视为 total（一次性返回）
+  const totalMs = Math.round(performance.now() - t0);
+  return { status: upRes.status, ttfMs: totalMs, totalMs, aborted: false, interrupted: false, detail };
 }

package/src/state.js

@@ -1,14 +1,46 @@
 import { randomBytes } from "node:crypto";
-import { mkdirSync, readFileSync, writeFileSync, statSync } from "node:fs";
+import { mkdirSync, readFileSync, writeFileSync, statSync, renameSync, unlinkSync, existsSync } from "node:fs";
 import { writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import os from "node:os";
 
 export const DEFAULT_PORT = 8989;
 
+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;
+  // Node test runner sets this
+  if (process.env.NODE_TEST_CONTEXT) return true;
+  return false;
+}
+
 export function defaultStateFile() {
-  return process.env.MSLXDFF_STATE_FILE ||
-    join(os.homedir(), ".config", "mslxdff", "state.json");
+  if (process.env.MSLXDFF_STATE_FILE) return process.env.MSLXDFF_STATE_FILE;
+  if (isTestEnv()) {
+    return join(os.tmpdir(), "mslxdff-test-state.json");
+  }
+  return join(os.homedir(), ".config", "mslxdff", "state.json");
+}
+
+export function tokenFile(file) {
+  if (process.env.MSLXDFF_TOKEN_FILE) return process.env.MSLXDFF_TOKEN_FILE;
+  const sf = file || defaultStateFile();
+  const realDefault = join(os.homedir(), ".config", "mslxdff", "state.json");
+  if (sf !== realDefault) return join(dirname(sf), "token");
+  if (isTestEnv()) {
+    return join(os.tmpdir(), "mslxdff-test-token");
+  }
+  return join(os.homedir(), ".config", "mslxdff", "token");
+}
+
+function syncTokenFile(token, file) {
+  try {
+    const tf = tokenFile(file);
+    mkdirSync(dirname(tf), { recursive: true });
+    writeFileSync(tf, String(token || "").trim() + "\n", "utf8");
+  } catch {}
 }
 
 export function generateToken() {
@@ -93,7 +125,14 @@ function writeStateImmediate(file, patch) {
     e.timer = null;
   }
   mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, JSON.stringify(merged, null, 2), { mode: 0o600 });
+  const tmp = `${file}.tmp.${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
+  writeFileSync(tmp, JSON.stringify(merged, null, 2), { mode: 0o600 });
+  try {
+    renameSync(tmp, file);
+  } catch {
+    try { writeFileSync(file, JSON.stringify(merged, null, 2), { mode: 0o600 }); } catch {}
+    try { unlinkSync(tmp); } catch {}
+  }
   try {
     e.mtimeMs = statSync(file).mtimeMs;
   } catch {
@@ -174,13 +213,31 @@ export function clearStateCache(file) {
 export async function loadToken({ file = defaultStateFile() } = {}) {
   const state = readState(file);
   if (typeof state.token === "string" && state.token.length > 0) {
+    syncTokenFile(state.token, file);
     return { token: state.token, created: false };
   }
-  return { token: writeStateImmediate(file, { token: generateToken(), createdAt: new Date().toISOString() }).token, created: true };
+  if (existsSync(file)) {
+    try {
+      const raw = JSON.parse(readFileSync(file, "utf8"));
+      if (typeof raw.token === "string" && raw.token.length > 0) {
+        syncTokenFile(raw.token, file);
+        const e = getEntry(file);
+        e.data = raw;
+        try { e.mtimeMs = statSync(file).mtimeMs; } catch {}
+        return { token: raw.token, created: false };
+      }
+    } catch {}
+  }
+  const tok = generateToken();
+  const saved = writeStateImmediate(file, { token: tok, createdAt: new Date().toISOString() }).token;
+  syncTokenFile(saved, file);
+  return { token: saved, created: true };
 }
 
 export async function refreshToken({ file = defaultStateFile() } = {}) {
-  return writeStateImmediate(file, { token: generateToken(), createdAt: new Date().toISOString() }).token;
+  const tok = writeStateImmediate(file, { token: generateToken(), createdAt: new Date().toISOString() }).token;
+  syncTokenFile(tok, file);
+  return tok;
 }
 
 export function setPort(port, { file = defaultStateFile() } = {}) {
@@ -212,6 +269,16 @@ export function saveModelLatencies(latencies, { file = defaultStateFile() } = {}
   return latencies;
 }
 
+export function loadModelStats({ file = defaultStateFile() } = {}) {
+  const s = readState(file).modelStats;
+  return s && typeof s === "object" && !Array.isArray(s) ? s : {};
+}
+
+export function saveModelStats(stats, { file = defaultStateFile() } = {}) {
+  writeStateDeferred(file, { modelStats: stats });
+  return stats;
+}
+
 export function loadPreferredModel({ file = defaultStateFile() } = {}) {
   const v = readState(file).preferredModel;
   return typeof v === "string" && v.trim() ? v.trim() : null;
@@ -487,11 +554,30 @@ export function removeProviderAllowedModels(id, targets = [], opts = {}) {
   return saveProviderAllowedModels(id, next, opts);
 }
 
+function normalizeAllowAny(v, id) {
+  if (typeof v === "boolean") return v;
+  if (String(id || "").toLowerCase() === "opencode") return true;
+  return false;
+}
+export function loadProviderAllowAnyModels(id, { file = defaultStateFile() } = {}) {
+  const cfg = readState(file).providerConfigs?.[id];
+  if (cfg && typeof cfg.allowAnyModels === "boolean") return cfg.allowAnyModels;
+  return normalizeAllowAny(undefined, id);
+}
+export function saveProviderAllowAnyModels(id, allowAny, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  const cfgs = { ...(state.providerConfigs || {}) };
+  const cur = cfgs[id] || {};
+  cfgs[id] = { ...cur, allowAnyModels: normalizeAllowAny(allowAny, id) };
+  writeStateImmediate(file, { providerConfigs: cfgs });
+  return cfgs[id].allowAnyModels;
+}
 export function isModelAllowed(id, rawModel, { file = defaultStateFile() } = {}) {
   const raw = String(rawModel || "").trim();
   if (!raw) return true;
   const allowed = loadProviderAllowedModels(id, { file });
-  if (!allowed.length) return true;
+  const allowAny = loadProviderAllowAnyModels(id, { file });
+  if (!allowed.length) return allowAny;
   const norm = normalizeAllowedModel(raw, id);
   return allowed.includes(norm);
 }

package/src/sync-workbuddy.js

@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, renameSync } from "node:fs";
 import { dirname, join } from "node:path";
 import os from "node:os";
+import { loadModelAliases, registerModelAlias, persistModelAliases } from "./providers/model-id.js";
 
 export function workbuddyModelsPath() {
   const env = process.env.WORKBUDDY_MODELS_FILE || process.env.WORKBUDDY_MODELS_PATH;
@@ -8,11 +9,17 @@ export function workbuddyModelsPath() {
   return join(os.homedir(), ".workbuddy", "models.json");
 }
 
+// WorkBuddy 不支持模型 ID 中的 /，写入时替换为 -
+// mslxdff 需保留原始 / 格式用于路由，所以同时存原始 id
+const toWorkbuddyId = (id) => String(id).replace(/\//g, "-");
+
 export function buildWorkbuddyEntry({ id, token, port }) {
   const p = Number(port) || 8989;
+  const originalId = String(id);
+  const wbId = toWorkbuddyId(originalId);
   return {
-    id: String(id),
-    name: String(id),
+    id: wbId,
+    name: wbId,
     vendor: "Custom",
     url: `http://127.0.0.1:${p}/v1/chat/completions`,
     apiKey: String(token || ""),
@@ -30,8 +37,13 @@ export function isLocalUrl(url) {
 
 function isTargetEntry(m, id) {
   if (!m || typeof m !== "object") return false;
-  if (m.id !== id) return false;
-  return isLocalUrl(m.url);
+  if (!isLocalUrl(m.url)) return false;
+  // 匹配原始 id（/ 格式）和 WorkBuddy id（- 格式）
+  if (m.id === id) return true;
+  if (m.id === toWorkbuddyId(id)) return true;
+  // 兜底：匹配 _mslxdffOriginalId 字段
+  if (m._mslxdffOriginalId === id) return true;
+  return false;
 }
 
 export async function syncToWorkbuddy({ id, token, port, file } = {}) {
@@ -66,11 +78,19 @@ export async function syncToWorkbuddy({ id, token, port, file } = {}) {
 
   // find exact target (id + local url, any port -> will update port)
   let idx = arr.findIndex((m) => isTargetEntry(m, cleanId));
+  const wbId = toWorkbuddyId(cleanId);
   let action;
   if (idx >= 0) {
     // update token/url/name, preserve other fields
     const old = arr[idx];
-    arr[idx] = { ...old, id: cleanId, name: cleanId, url: `http://127.0.0.1:${p}/v1/chat/completions`, apiKey: cleanToken };
+    const { _mslxdffOriginalId, ...oldClean } = old;
+    arr[idx] = {
+      ...oldClean,
+      id: wbId,
+      name: wbId,
+      url: `http://127.0.0.1:${p}/v1/chat/completions`,
+      apiKey: cleanToken,
+    };
     if (!arr[idx].vendor) arr[idx].vendor = "Custom";
     if (arr[idx].supportsToolCall === undefined) arr[idx].supportsToolCall = true;
     if (arr[idx].supportsImages === undefined) arr[idx].supportsImages = true;
@@ -78,7 +98,12 @@ export async function syncToWorkbuddy({ id, token, port, file } = {}) {
     if (arr[idx].useCustomProtocol === undefined) arr[idx].useCustomProtocol = false;
     action = "updated";
   } else {
-    // ensure existence: no reuse, always insert new entry (preserves other local entries like x-preview)
+    // 检查归一化 id 是否与已有条目冲突（如已存在 clinebot-z-ai-glm-5.3-flash 但不是本地 URL）
+    const conflict = arr.findIndex((m) => m && m.id === wbId);
+    if (conflict >= 0) {
+      // 已有同名条目且非我们写的，跳过不覆盖
+      return { action: "skipped-conflict", file: targetFile, id: cleanId, conflictId: arr[conflict].id, corrupted: false };
+    }
     arr.push(buildWorkbuddyEntry({ id: cleanId, token: cleanToken, port: p }));
     action = "inserted";
   }
@@ -100,5 +125,12 @@ export async function syncToWorkbuddy({ id, token, port, file } = {}) {
   // cleanup tmp if still exists
   try { if (existsSync(tmp)) { const { unlinkSync } = await import("node:fs"); unlinkSync(tmp); } } catch {}
 
+  // 注册 WorkBuddy 别名：/ → -（仅原始 id 含 / 时）
+  if (cleanId.includes("/")) {
+    loadModelAliases();
+    registerModelAlias(wbId, cleanId);
+    persistModelAliases();
+  }
+
   return { action, file: targetFile, id: cleanId, corrupted };
 }