mslxdff 0.1.62 → 0.1.64

package/bin/mslxdff.js

@@ -232,8 +232,25 @@ if (args.includes("-model") || args.includes("-models")) {
     for (const id of picks) console.log(`  ${id}`);
     process.exit(0);
   }
+  // -model list supports optional provider filter: -model list --provider <id> | -model list <id> | --json
+  let modelListProvider = null;
+  let modelListJson = false;
+  if (sub === "list") {
+    const restArgs = args.slice(idx + 2);
+    for (let i = 0; i < restArgs.length; i++) {
+      const a = String(restArgs[i] || "");
+      if (a === "--json" || a === "-json") modelListJson = true;
+      else if (a === "--provider" || a === "-provider" || a === "--providerId") { modelListProvider = String(restArgs[i + 1] || "").trim() || null; i++; }
+      else if (!a.startsWith("-") && !modelListProvider) modelListProvider = a;
+    }
+    if (modelListProvider) {
+      const { normalizeProviderId } = await import("../src/providers/model-id.js");
+      const nid = normalizeProviderId(modelListProvider);
+      modelListProvider = nid || modelListProvider.toLowerCase();
+    }
+  }
   if (sub !== undefined && sub !== "list") {
-    console.error("usage: mslxdff -models (interactive multi-pick) | mslxdff -model list | mslxdff -model set <id> | mslxdff -model pick <id> | mslxdff -model unpick <id> | mslxdff -model pick clear | mslxdff -model picks | mslxdff -model status | mslxdff -model refresh");
+    console.error("usage: mslxdff -models (interactive multi-pick) | mslxdff -model list [--provider <id>] [--json] | mslxdff -model set <id> | mslxdff -model pick <id> | mslxdff -model unpick <id> | mslxdff -model pick clear | mslxdff -model picks | mslxdff -model status | mslxdff -model refresh");
     process.exit(1);
   }
   const cacheFile = join(logDir(), "models.json");
@@ -275,16 +292,109 @@ if (args.includes("-model") || args.includes("-models")) {
         throw new Error("no cached models and refresh failed");
       }
     }
+    // provider filter: bare ids are opencode, prefixed are <provider>/...
+    if (modelListProvider) {
+      const prov = String(modelListProvider).toLowerCase();
+      const filtered = ids.filter((id) => {
+        const slash = String(id).indexOf("/");
+        const p = slash > 0 ? String(id).slice(0, slash).toLowerCase() : "opencode";
+        return p === prov;
+      });
+      // 非 opencode 供应商的模型不在 opencode 缓存中，改从 allowlist 展示（原名+别名）
+      if (prov !== "opencode" && filtered.length === 0) {
+        try {
+          const { loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderBaseUrl } = await import("../src/state.js");
+          const { loadModelAliases, getAliasForModel } = await import("../src/providers/model-id.js");
+          try { loadModelAliases(); } catch {}
+          const allowed = loadProviderAllowedModels(prov);
+          const allowAny = loadProviderAllowAnyModels(prov);
+          const baseUrl = loadProviderBaseUrl(prov);
+          if (modelListJson) {
+            const data = allowed.length
+              ? allowed.map((raw) => ({ id: `${prov}/${raw}`, object: "model" }))
+              : [];
+            console.log(JSON.stringify({ object: "list", data }, null, 2));
+            process.exit(0);
+          }
+          if (!allowed.length) {
+            if (allowAny) {
+              console.log(`provider "${prov}" allowAny ON (allowlist 空=放行全部)${baseUrl ? `  baseUrl=${baseUrl}` : ""}`);
+              console.log(`  (未设 allowlist，全部模型放行)  查看 live 列表: mslxdff -provider ${prov} models`);
+            } else {
+              console.log(`no models for provider "${prov}" — allowlist 空 + allowAny OFF = 阻塞`);
+              console.log(`  设白名单: mslxdff -provider ${prov} allowlist set <model1> <model2>  或  mslxdff -provider ${prov} allowAny on`);
+              console.log(`  live 查看: mslxdff -provider ${prov} models`);
+            }
+            process.exit(0);
+          }
+          const at2 = cachedAt ? ` (cached ${fmtShanghaiYMDHM(cachedAt)})` : "";
+          console.log(`${allowed.length} model(s) for ${prov}${at2} (allowlist，原名 + 别名):`);
+          const pickedIds2 = loadModelPicks();
+          for (const raw of allowed) {
+            const canonical = `${prov}/${raw}`;
+            let alias = null;
+            try { alias = getAliasForModel(canonical); } catch {}
+            if (!alias && String(canonical).includes("/")) alias = String(canonical).replace(/\//g, "-");
+            const aliasStr = alias && alias !== canonical ? `  (别名: ${alias})` : "";
+            const mark2 = pickedIds2.includes(canonical) || (alias && pickedIds2.includes(alias)) ? "*" : " ";
+            console.log(`  ${mark2} ${canonical}${aliasStr}`);
+          }
+          process.exit(0);
+        } catch {}
+      }
+      ids = filtered;
+      if (modelListJson) {
+        console.log(JSON.stringify({ object: "list", data: ids.map((id) => ({ id, object: "model" })) }, null, 2));
+        process.exit(0);
+      }
+      if (!ids.length) {
+        console.log(`no models for provider "${prov}" — try: mslxdff -provider ${prov} models  or  mslxdff -model refresh`);
+        process.exit(0);
+      }
+    } else if (modelListJson) {
+      console.log(JSON.stringify({ object: "list", data: ids.map((id) => ({ id, object: "model" })) }, null, 2));
+      process.exit(0);
+    }
     if (!ids.length) {
       console.log("no models available — try: mslxdff -model refresh");
       process.exit(0);
     }
-    // TTY：交互式多选勾选常用模型（空格勾选，Enter 保存）；非 TTY（管道/脚本）：保持纯列表并标注勾选
-    if (process.stdin.isTTY && process.stdout.isTTY) {
+    // TTY 交互式：`mslxdff -models`（无 list）走交互；` -model list` 默认列表，但交互入口统一为 -models
+    // 为支持“opencode + 其他供应商 allowlist 原名/别名”一起勾选，交互池 = opencode 免费池 + 各供应商 allowlist + 已勾选的遗留 picks
+    if (sub === undefined && process.stdin.isTTY && process.stdout.isTTY) {
       const statuses = loadModelErrors();
       const current = getPreferredModel();
       const pickedIds = loadModelPicks();
-      const items = ids.map((id) => {
+      // 基础：opencode 免费池
+      const combinedIds = [...ids];
+      const seen = new Set(combinedIds);
+      try {
+        const { loadProviderConfigs, loadProviderAllowedModels } = await import("../src/state.js");
+        const configs = loadProviderConfigs();
+        for (const pid of Object.keys(configs).filter((k) => String(k).toLowerCase() !== "opencode")) {
+          const allowed = loadProviderAllowedModels(pid);
+          for (const raw of allowed) {
+            const canonical = `${pid}/${raw}`;
+            if (!seen.has(canonical)) {
+              seen.add(canonical);
+              combinedIds.push(canonical);
+            }
+            // 别名（dash 版）若已被 picks 选中，也确保可见（便于取消）
+            const aliasDash = String(canonical).replace(/\//g, "-");
+            if (aliasDash !== canonical && pickedIds.includes(aliasDash) && !seen.has(aliasDash)) {
+              // 不直接加入 alias 作为独立选项，保留 canonical 即可（canonical 与 alias 视为同一模型，勾选 canonical）
+            }
+          }
+        }
+      } catch {}
+      // 已勾选但不在上述池中的（例如 workbuddy/* 当 allowAny ON 时无 allowlist，或历史 picks），补齐以便取消
+      for (const pid of pickedIds) {
+        if (!seen.has(pid)) {
+          seen.add(pid);
+          combinedIds.push(pid);
+        }
+      }
+      const items = combinedIds.map((id) => {
         const e = statuses[id];
         return {
           id,
@@ -305,38 +415,158 @@ if (args.includes("-model") || args.includes("-models")) {
     const at = cachedAt ? ` (cached ${fmtShanghaiYMDHM(cachedAt)})` : "";
     const pickedIds = loadModelPicks();
     const mark = (id) => (pickedIds.includes(id) ? "*" : " ");
-    console.log(`${ids.length} free model(s)${at} (${pickedIds.length} picked, * = picked):`);
-    // 加载别名映射，显示原始名+别名
-    let aliasMap = {};
-    let fullAliases = {};
-    try {
-      const { loadModelAliases, getAliasForModel } = await import("../src/providers/model-id.js");
-      loadModelAliases();
-      for (const id of ids) {
-        const alias = getAliasForModel(id);
-        if (alias) aliasMap[id] = alias;
+    // 分组展示：按供应商前缀分组，opencode 裸 id 归为 opencode
+    const groups = {};
+    for (const id of ids) {
+      const prov = String(id).includes("/") ? String(id).split("/")[0] : "opencode";
+      if (!groups[prov]) groups[prov] = [];
+      groups[prov].push(id);
+    }
+    const order = ["opencode", "workbuddy", "clinebot", "openrouter"];
+    const sortedProvs = Object.keys(groups).sort((a, b) => {
+      const ia = order.indexOf(a), ib = order.indexOf(b);
+      if (ia !== -1 || ib !== -1) {
+        if (ia === -1) return 1;
+        if (ib === -1) return -1;
+        return ia - ib;
       }
-      // 读取完整 alias 表（用于展示本地别名，如 clinebot/*）
+      return a.localeCompare(b);
+    });
+    if (modelListProvider) {
+      console.log(`${ids.length} model(s) for ${modelListProvider}${at} (${pickedIds.length} picked, * = picked):`);
+      // 加载别名映射，显示原始名+别名
+      let aliasMap = {};
       try {
-        const aliasesFile = join(homedir(), ".config", "mslxdff", "model-aliases.json");
-        const raw = JSON.parse(readFileSync(aliasesFile, "utf8"));
-        if (raw && typeof raw === "object") fullAliases = raw;
+        const { loadModelAliases, getAliasForModel } = await import("../src/providers/model-id.js");
+        loadModelAliases();
+        for (const id of ids) {
+          const alias = getAliasForModel(id);
+          if (alias) aliasMap[id] = alias;
+          else if (String(id).includes("/")) {
+            const dashAlias = String(id).replace(/\//g, "-");
+            if (dashAlias !== id) aliasMap[id] = dashAlias;
+          }
+        }
       } catch {}
-    } catch {}
-    for (const id of ids) {
-      const alias = aliasMap[id];
-      const aliasStr = alias ? `  (alias: ${alias})` : "";
-      console.log(`  ${mark(id)} ${id}${aliasStr}`);
-    }
-    // 额外展示本地别名（不在上游列表中的，如 clinebot/*）
-    const aliasEntries = Object.entries(fullAliases).filter(([alias, canonical]) => !ids.includes(canonical));
-    if (aliasEntries.length) {
-      console.log(`\nlocal aliases (${aliasEntries.length}):`);
-      for (const [alias, canonical] of aliasEntries) {
-        console.log(`  ${canonical}  =>  ${alias}`);
+      for (const prov of sortedProvs) {
+        const list = groups[prov];
+        console.log(`\n  ── ${prov} (${list.length}) ──`);
+        for (const id of list) {
+          const alias = aliasMap[id];
+          const aliasStr = alias ? `  (别名: ${alias})` : "";
+          console.log(`  ${mark(id)} ${id}${aliasStr}`);
+        }
       }
+      console.log(`\npicked only constrains auto; manage with: mslxdff -models (TTY) | mslxdff -model pick <id> | mslxdff -model unpick <id> | mslxdff -model pick clear`);
+    } else {
+      console.log(`${ids.length} free model(s)${at} (${pickedIds.length} picked, * = picked):`);
+      // 加载别名映射，显示原始名+别名
+      let aliasMap = {};
+      let fullAliases = {};
+      try {
+        const { loadModelAliases, getAliasForModel } = await import("../src/providers/model-id.js");
+        loadModelAliases();
+        for (const id of ids) {
+          const alias = getAliasForModel(id);
+          if (alias) aliasMap[id] = alias;
+          else if (String(id).includes("/")) {
+            const dashAlias = String(id).replace(/\//g, "-");
+            if (dashAlias !== id) aliasMap[id] = dashAlias;
+          }
+        }
+        try {
+          const aliasesFile = join(homedir(), ".config", "mslxdff", "model-aliases.json");
+          const raw = JSON.parse(readFileSync(aliasesFile, "utf8"));
+          if (raw && typeof raw === "object") fullAliases = raw;
+        } catch {}
+      } catch {}
+      for (const prov of sortedProvs) {
+        const list = groups[prov];
+        console.log(`\n  ── ${prov} (${list.length}) ──`);
+        for (const id of list) {
+          const alias = aliasMap[id];
+          const aliasStr = alias ? `  (别名: ${alias})` : "";
+          console.log(`  ${mark(id)} ${id}${aliasStr}`);
+        }
+      }
+      // ── 分隔 + 其他供应商 allowlist（原名 + 别名） ──
+      // 其余供应商的可用模型由 allowlist 决定（空 allowlist + allowAny OFF = 阻塞），此处直接展示 allowlist 条目与别名，不做网络拉取，速度快
+      try {
+        const { loadProviderConfigs, loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderBaseUrl } = await import("../src/state.js");
+        const { loadModelAliases: _la2, getAliasForModel: _gaf } = await import("../src/providers/model-id.js");
+        try { _la2(); } catch {}
+        const configs = loadProviderConfigs();
+        const otherIds = Object.keys(configs).filter((k) => String(k).toLowerCase() !== "opencode");
+        // 仅展示已配置过的供应商（有 baseUrl/keys/allowlist 任一），按固定顺序 + 字典序
+        const order2 = ["workbuddy", "clinebot", "openrouter", "bai"];
+        otherIds.sort((a, b) => {
+          const ia = order2.indexOf(a), ib = order2.indexOf(b);
+          if (ia !== -1 || ib !== -1) {
+            if (ia === -1) return 1;
+            if (ib === -1) return -1;
+            return ia - ib;
+          }
+          return a.localeCompare(b);
+        });
+        if (otherIds.length) {
+          console.log(`\n────────────────────────────────────────`);
+          console.log(`其他供应商 (allowlist，原名 + 别名) (${otherIds.length} providers):`);
+          for (const pid of otherIds) {
+            const allowed = loadProviderAllowedModels(pid);
+            const allowAny = loadProviderAllowAnyModels(pid);
+            const baseUrl = loadProviderBaseUrl(pid) || configs[pid]?.baseUrl || "";
+            const header = allowAny
+              ? (allowed.length ? `allowlist ${allowed.length} (allowAny ON)` : `allowAny ON (allowlist 空=放行全部)`)
+              : (allowed.length ? `allowlist ${allowed.length} (allowAny OFF)` : `allowlist 空 + allowAny OFF = 阻塞`);
+            console.log(`\n  ── ${pid} (${header})${baseUrl ? `  baseUrl=${baseUrl}` : ""} ──`);
+            if (!allowed.length) {
+              if (allowAny) {
+                console.log(`     (未设 allowlist，全部模型放行)  查看 live 列表: mslxdff -provider ${pid} models`);
+                console.log(`     限制可用模型: mslxdff -provider ${pid} allowlist set <model1> <model2>`);
+              } else {
+                console.log(`     阻塞中：无可用模型 — 设白名单: mslxdff -provider ${pid} allowlist set <model1> <model2>`);
+                console.log(`     或放行全部: mslxdff -provider ${pid} allowAny on`);
+              }
+            } else {
+              for (const raw of allowed) {
+                const canonical = `${pid}/${raw}`;
+                let alias = null;
+                try { alias = _gaf(canonical); } catch {}
+                if (!alias && String(canonical).includes("/")) alias = String(canonical).replace(/\//g, "-");
+                const aliasStr = alias && alias !== canonical ? `  (别名: ${alias})` : "";
+                const pickedMark = pickedIds.includes(canonical) || pickedIds.includes(alias || "") ? "*" : " ";
+                console.log(`     ${pickedMark} ${canonical}${aliasStr}`);
+              }
+              console.log(`     管理: mslxdff -provider ${pid} allowlist [list|add|remove|clear] | allowAny on|off`);
+            }
+          }
+        } else {
+          console.log(`\n────────────────────────────────────────`);
+          console.log(`其他供应商 (allowlist，原名 + 别名): (none — 尚未配置)`);
+          console.log(`  添加示例: mslxdff -provider add myapi https://api.example.com/v1 sk-xxx --models-path /v1/models`);
+        }
+        // 额外兜底：本地别名中不在任何 allowlist 里的，单独提示
+        const aliasEntries = Object.entries(fullAliases).filter(([alias, canonical]) => {
+          if (ids.includes(canonical)) return false;
+          // 已在 allowlist 中展示过的别名不重复
+          for (const pid of otherIds) {
+            const allowed = loadProviderAllowedModels(pid);
+            for (const raw of allowed) {
+              const can = `${pid}/${raw}`;
+              if (can === canonical) return false;
+            }
+          }
+          return true;
+        });
+        if (aliasEntries.length) {
+          console.log(`\n  本地别名 (不在 allowlist 里的遗留映射 ${aliasEntries.length}):`);
+          for (const [alias, canonical] of aliasEntries) {
+            console.log(`     ${canonical}  =>  ${alias}`);
+          }
+        }
+      } catch {}
+      console.log(`\npicked only constrains auto; manage with: mslxdff -models (TTY) | mslxdff -model pick <id> | mslxdff -model unpick <id> | mslxdff -model pick clear`);
     }
-    console.log(`\npicked only constrains auto; manage with: mslxdff -models (TTY) | mslxdff -model pick <id> | mslxdff -model unpick <id> | mslxdff -model pick clear`);
   } catch (err) {
     console.error(`could not fetch models: ${String(err?.message || err)}`);
     process.exit(1);
@@ -727,17 +957,21 @@ if (args.includes("-provider") || args.includes("--provider")) {
   const sub = args[idx + 2];
   const rest = args.slice(idx + 2);
   if (!id) {
-    console.error("usage: mslxdff -provider <id> [key...|add|remove|list|clear|share|set-url|allowlist|allowAny]");
+    console.error("usage: mslxdff -provider <id> [key...|add|remove|list|models|clear|share|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");
     console.error("            mslxdff -provider openrouter allowlist set gpt-4 gpt-3.5  manage allowed models (empty=block unless allowAny ON)");
     console.error("            mslxdff -provider openrouter allowAny on|off     empty allowlist = allow all or block all (default OFF, secure)");
     console.error("            mslxdff -provider add myapi https://api.example.com/v1 sk-xxx   add generic OpenAI-compatible provider");
     console.error("            mslxdff -provider add myapi https://api.example.com/v1 sk-xxx gpt-4  add with allowlist");
+    console.error("            mslxdff -provider add myapi https://api.example.com/v1 sk-xxx --models-path /v1/models --chat-path /v1/chat/completions");
     console.error("            mslxdff -provider openrouter                      interactive hidden input (append)");
     console.error("            mslxdff -provider openrouter clear                remove all keys");
     process.exit(1);
@@ -795,9 +1029,10 @@ if (args.includes("-provider") || args.includes("--provider")) {
     const gBase = rest[1];
     const gKey = rest[2];
     if (!gid || !gBase || !gKey) {
-      console.error("usage: mslxdff -provider add <id> <baseUrl> <key> [allowedModel...]");
+      console.error("usage: mslxdff -provider add <id> <baseUrl> <key> [allowedModel...] [--models-path <path>] [--chat-path <path>]");
       console.error("       e.g. mslxdff -provider add myapi https://api.example.com/v1 sk-xxx");
       console.error("            mslxdff -provider add myapi https://api.example.com/v1 sk-xxx gpt-4 gpt-3.5");
+      console.error("            mslxdff -provider add myapi https://api.example.com/v1 sk-xxx --models-path /v1/models --chat-path /v1/chat/completions");
       process.exit(1);
     }
     if (gid === "opencode" || gid === "oc" || gid === "openrouter") {
@@ -809,10 +1044,24 @@ if (args.includes("-provider") || args.includes("--provider")) {
     const nid = normalizeProviderId(gid);
     if (!nid) { console.error(`invalid provider id: ${gid}`); process.exit(1); }
     if (!/^https?:\/\/.+/.test(String(gBase).trim())) { console.error(`invalid baseUrl: ${gBase} (must start with http:// or https://)`); process.exit(1); }
-    const cur = loadProviderConfig(nid) || { baseUrl: "", keys: [], allowedModels: [], auths: [] };
+    const cur = loadProviderConfig(nid) || { baseUrl: "", keys: [], allowedModels: [], auths: [], modelsPath: "", chatPath: "" };
     let keys, auths, baseUrl;
     baseUrl = String(gBase).trim();
-    const extraModels = rest.slice(3).filter((x) => x && !String(x).startsWith("-")).map((m) => String(m).trim()).filter(Boolean);
+    // parse --models-path / --chat-path from tail
+    let parsedModelsPath = null;
+    let parsedChatPath = null;
+    const extraTokens = [];
+    for (let _i = 3; _i < rest.length; _i++) {
+      const tok = String(rest[_i] || "");
+      if (tok === "--models-path" || tok === "--modelsPath" || tok === "--models_path") { parsedModelsPath = String(rest[_i + 1] || "").trim() || null; _i++; }
+      else if (tok.startsWith("--models-path=")) { parsedModelsPath = tok.slice("--models-path=".length).trim() || null; }
+      else if (tok === "--chat-path" || tok === "--chatPath" || tok === "--chat_path") { parsedChatPath = String(rest[_i + 1] || "").trim() || null; _i++; }
+      else if (tok.startsWith("--chat-path=")) { parsedChatPath = tok.slice("--chat-path=".length).trim() || null; }
+      else extraTokens.push(tok);
+    }
+    if (parsedModelsPath && !String(parsedModelsPath).startsWith("/")) { console.error(`invalid --models-path: ${parsedModelsPath} (must start with /)`); process.exit(1); }
+    if (parsedChatPath && !String(parsedChatPath).startsWith("/")) { console.error(`invalid --chat-path: ${parsedChatPath} (must start with /)`); process.exit(1); }
+    const extraModels = extraTokens.filter((x) => x && !String(x).startsWith("-")).map((m) => String(m).trim()).filter(Boolean);
     const allowedModels = extraModels.length ? [...new Set([...(cur.allowedModels || []), ...extraModels])] : (cur.allowedModels || []);
     if (nid === "workbuddy") {
       // workbuddy: keys/auths 一一对应，需解析 uid
@@ -838,7 +1087,12 @@ if (args.includes("-provider") || args.includes("--provider")) {
         while (newKeys.length < newAuths.length) newKeys.push(token);
       }
       keys = newKeys; auths = newAuths;
-      saveProviderConfig(nid, { baseUrl, keys, auths, allowedModels });
+      const cfgToSave = { baseUrl, keys, auths, allowedModels };
+      if (parsedModelsPath) cfgToSave.modelsPath = parsedModelsPath;
+      else if (cur.modelsPath) cfgToSave.modelsPath = cur.modelsPath;
+      if (parsedChatPath) cfgToSave.chatPath = parsedChatPath;
+      else if (cur.chatPath) cfgToSave.chatPath = cur.chatPath;
+      saveProviderConfig(nid, cfgToSave);
       // 同步写 auths/workbuddy-<uid>.json 供 checkin 使用
       try {
         const { writeFileSync, mkdirSync } = await import("node:fs");
@@ -860,7 +1114,12 @@ if (args.includes("-provider") || args.includes("--provider")) {
       }
       keys = [...new Set([...(cur.keys || []), trimmed].filter(Boolean))];
       auths = undefined;
-      saveProviderConfig(nid, { baseUrl, keys, allowedModels });
+      const cfgToSave2 = { baseUrl, keys, allowedModels };
+      if (parsedModelsPath) cfgToSave2.modelsPath = parsedModelsPath;
+      else if (cur.modelsPath) cfgToSave2.modelsPath = cur.modelsPath;
+      if (parsedChatPath) cfgToSave2.chatPath = parsedChatPath;
+      else if (cur.chatPath) cfgToSave2.chatPath = cur.chatPath;
+      saveProviderConfig(nid, cfgToSave2);
     }
     console.log(`added generic provider: ${nid}`);
     console.log(`  baseUrl: ${String(gBase).trim().replace(/\/+$/, "")}`);
@@ -880,6 +1139,40 @@ if (args.includes("-provider") || args.includes("--provider")) {
     process.exit(0);
   }
   const { loadProviderKeys, saveProviderKeys, addProviderKey, removeProviderKeys, loadProviderShareKeys, saveProviderShareKeys, loadProviderConfig, saveProviderConfig, saveProviderBaseUrl, loadProviderConfigs } = await import("../src/state.js");
+  if (sub === "set-models-path" || sub === "setModelsPath" || sub === "models-path") {
+    const p = rest[1];
+    if (!p) {
+      console.error(`usage: mslxdff -provider ${id} set-models-path <path>  (e.g. /v1/models)`);
+      process.exit(1);
+    }
+    if (!String(p).trim().startsWith("/")) {
+      console.error(`invalid modelsPath: ${p} (must start with /)`);
+      process.exit(1);
+    }
+    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
+    const { normalizeProviderId } = await import("../src/providers/model-id.js");
+    const nid = normalizeProviderId(id);
+    saveProviderConfig(nid || id, { baseUrl: cur.baseUrl || "", keys: cur.keys || [], modelsPath: String(p).trim() });
+    console.log(`set ${nid || id} modelsPath: ${String(p).trim()} — restart daemon to activate`);
+    process.exit(0);
+  }
+  if (sub === "set-chat-path" || sub === "setChatPath" || sub === "chat-path") {
+    const p = rest[1];
+    if (!p) {
+      console.error(`usage: mslxdff -provider ${id} set-chat-path <path>  (e.g. /v1/chat/completions)`);
+      process.exit(1);
+    }
+    if (!String(p).trim().startsWith("/")) {
+      console.error(`invalid chatPath: ${p} (must start with /)`);
+      process.exit(1);
+    }
+    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
+    const { normalizeProviderId } = await import("../src/providers/model-id.js");
+    const nid = normalizeProviderId(id);
+    saveProviderConfig(nid || id, { baseUrl: cur.baseUrl || "", keys: cur.keys || [], chatPath: String(p).trim() });
+    console.log(`set ${nid || id} chatPath: ${String(p).trim()} — restart daemon to activate`);
+    process.exit(0);
+  }
   if (sub === "clear") {
     const configs = loadProviderConfigs();
     if (configs[id]) {
@@ -1020,6 +1313,69 @@ if (args.includes("-provider") || args.includes("--provider")) {
     console.error(`       mslxdff -provider ${id} allowAny on|off   (empty allowlist = block or allow all)`);
     process.exit(1);
   }
+  if (sub === "models" || sub === "list-models" || sub === "ls") {
+    const wantsJson = args.includes("--json") || args.includes("-json");
+    const cfg = loadProviderConfig(id);
+    // opencode: use aggregated cache + provider-specific? For opencode, show bare ids from cache
+    if (id === "opencode" || id === "oc") {
+      try {
+        const cacheFile = join(logDir(), "models.json");
+        const { readFileSync } = await import("node:fs");
+        const raw = JSON.parse(readFileSync(cacheFile, "utf8"));
+        const ids = (raw.data || []).map((m) => m.id).filter((x) => !String(x).includes("/"));
+        if (wantsJson) {
+          console.log(JSON.stringify({ object: "list", data: ids.map((id) => ({ id, object: "model" })) }, null, 2));
+        } else {
+          console.log(`opencode models (${ids.length}):`);
+          for (const mid of ids) console.log(`  ${mid}`);
+        }
+      } catch (e) {
+        console.error(`could not read models cache: ${String(e?.message || e)}`);
+        process.exit(1);
+      }
+      process.exit(0);
+    }
+    // generic/workbuddy: live fetch via provider listModels
+    try {
+      const { createGenericProvider } = await import("../src/providers/generic.js");
+      const { createWorkbuddyProvider } = await import("../src/providers/workbuddy.js");
+      const { isModelAllowed } = await import("../src/state.js");
+      const baseUrl = cfg?.baseUrl || (id === "workbuddy" ? "https://copilot.tencent.com" : "");
+      const keys = loadProviderKeys(id);
+      const auths = cfg?.auths || [];
+      let provider;
+      if (id === "workbuddy") {
+        provider = createWorkbuddyProvider({ baseUrl, apiKeys: keys, auths, file: defaultStateFile() });
+      } else {
+        if (!baseUrl) {
+          console.error(`provider ${id}: missing baseUrl — set via: mslxdff -provider ${id} set-url <baseUrl>`);
+          process.exit(1);
+        }
+        provider = createGenericProvider({ id, baseUrl, apiKeys: keys, file: defaultStateFile() });
+      }
+      const all = await provider.listModels();
+      // apply allowlist filtering mirroring dispatcher
+      const filtered = all.filter((m) => {
+        const raw = String(m.id || "").includes("/") ? String(m.id).split("/").slice(1).join("/") : String(m.id);
+        // for workbuddy, raw is like hy3, for generic it's raw id without prefix? joinModelId adds prefix, so need to extract raw
+        const checkRaw = m.id.startsWith(`${id}/`) ? m.id.slice(id.length + 1) : raw;
+        return isModelAllowed(id, checkRaw);
+      });
+      if (wantsJson) {
+        console.log(JSON.stringify({ object: "list", data: filtered }, null, 2));
+      } else {
+        console.log(`${id} models (${filtered.length}${filtered.length !== all.length ? `/${all.length}` : ""}):`);
+        for (const m of filtered) console.log(`  ${m.id}`);
+        if (!filtered.length && all.length) console.log(`  (all ${all.length} filtered by allowlist — use: mslxdff -provider ${id} allowlist list)`);
+        if (!all.length) console.log(`  (no models — check baseUrl/keys or try: curl ${baseUrl}/models)`);
+      }
+      try { await provider.close?.(); } catch {}
+    } catch (e) {
+      console.error(`could not list ${id} models: ${String(e?.message || e)}`);
+      process.exit(1);
+    }
+    process.exit(0);
+  }
   if (sub === "list" || sub === "status") {
     const keys = loadProviderKeys(id);
     const cfg = loadProviderConfig(id);
@@ -1159,7 +1515,8 @@ async function pickInteractive(items, startCursor = 0) {
   let cursor = Math.min(Math.max(startCursor, 0), items.length - 1);
   const draw = () => {
     const lines = [...renderChooser(items, cursor), ...renderChooserHelp()];
-    process.stdout.write("\x1b[G\x1b[J" + lines.join("\n"));
+    // PowerShell 兼容：\x1b[2J 清屏 + \x1b[H 回到左上，比 \x1b[G\x1b[J 更可靠
+    process.stdout.write("\x1b[2J\x1b[H" + lines.join("\n"));
   };
   draw();
   return new Promise((resolve) => {
@@ -1201,7 +1558,7 @@ async function pickInteractiveMulti(items, initialPicked = new Set(), startCurso
   const draw = () => {
     const rows = items.map((it, i) => ({ ...it, picked: picked.has(it.id) }));
     const lines = [...renderChooser(rows, cursor, { multi: true }), ...renderChooserHelp(true)];
-    process.stdout.write("\x1b[G\x1b[J" + lines.join("\n"));
+    process.stdout.write("\x1b[2J\x1b[H" + lines.join("\n"));
   };
   draw();
   return new Promise((resolve) => {

package/package.json

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

package/src/auto.js

@@ -85,6 +85,7 @@ function effectiveCooldown(entry, slowCooldownMs, cooldownMs) {
 function inCooldown(id, errors, now, cooldownMs, slowCooldownMs) {
   const e = normEntry(errors[id]);
   if (!e || !(e.at > 0)) return false;
+  if (e.status === MODEL_STATUS.NORMAL) return false;
   const cd = effectiveCooldown(e, slowCooldownMs, cooldownMs);
   return cd > 0 && now - e.at < cd;
 }
@@ -98,6 +99,16 @@ function normLatency(e) {
 
 export function rankModels(ids, errors = {}, { now = Date.now(), cooldownMs = 0, slowCooldownMs = 0, latencies = {}, preferred } = {}) {
   const pref = preferred ?? getPreferredModel();
+  // 最近一次成功的模型（NORMAL 且非慢且 at 最大），用于“上次成功优先”——慢模型即使刚成功也不应钉死
+  let lastSuccessId = null;
+  let lastSuccessAt = 0;
+  for (const [id, e] of Object.entries(errors)) {
+    const ne = normEntry(e);
+    if (ne && ne.status === MODEL_STATUS.NORMAL && !ne.slow && ne.at > lastSuccessAt) {
+      lastSuccessAt = ne.at;
+      lastSuccessId = id;
+    }
+  }
   return [...new Set(ids)]
     .filter(Boolean)
     .map((id) => ({
@@ -105,12 +116,14 @@ export function rankModels(ids, errors = {}, { now = Date.now(), cooldownMs = 0,
       e: normEntry(errors[id]),
       err: normEntry(errors[id])?.at ?? 0,
       isPreferred: id === pref,
+      isLastSuccess: id === lastSuccessId,
       cooling: inCooldown(id, errors, now, cooldownMs, slowCooldownMs),
       latency: normLatency(latencies[id]) ?? Number.MAX_SAFE_INTEGER,
     }))
     .sort(
       (a, b) =>
         (a.cooling ? 1 : 0) - (b.cooling ? 1 : 0) ||
+        (b.isLastSuccess ? 1 : 0) - (a.isLastSuccess ? 1 : 0) ||
         (b.isPreferred ? 1 : 0) - (a.isPreferred ? 1 : 0) ||
         a.latency - b.latency ||
         a.err - b.err

package/src/chat/config.js

@@ -6,5 +6,6 @@ export const CHAT_HISTORY_MAX_CHARS = 400000;
 export const CHAT_KEEP_RECENT = 40;
 export const CHAT_SUMMARY_TRIGGER = 400000;
 export const CHAT_MAX_TOOL_LOOPS = 6;
-export const CHAT_TIMEOUT_MS = 30000;
+export const CHAT_TIMEOUT_MS = 15000;
+export const CHAT_GATEWAY_TIMEOUT_MS = 25000;
 export const FORBIDDEN = ["-uninstall", "--uninstall"];

package/src/chat/prompt.js

@@ -52,7 +52,7 @@ ${mini}
 - 永远输出精确的命令与模型 id，大小写敏感。
 - 需要执行命令时调用 run_command，需要看文件时调用 read_file，需要检查网络/服务可用性时调用 curl。
 - curl 简写：upstream(=上游 https://opencode.ai/zen/v1/models)、local/health(=本机 /health)、local/models(=本机 /v1/models)，也支持完整 http(s) URL；会自动补上游头、本机 token 与已配置供应商 key（直连 https://api.b.ai/v1/models 会自动带 bai 的 key，无需手动加头）。
-- 查“某供应商有哪些模型”**禁止调用 run_command**：**直接用上方“可用模型”按前缀过滤回答**（如 workbuddy/ 开头的即 workbuddy 供应商，clinebot/ 开头即 clinebot），无需调工具；如需实时刷新，调 curl local/models（GET，自动带本机 token）看网关聚合列表。**错误示例**：用户问 workbuddy有哪些模型 → 调用 -provider workbuddy list（这是查配置，不是查模型！）→ 错。**正确**：直接列 workbuddy/ 前缀的可用模型。禁止为此调用 -showtoken（本机 token 已自动注入）。
+- 查“某供应商有哪些模型”**优先用 CLI 直查**：若上方“可用模型”已能回答，直接前缀过滤回答（如 workbuddy/ 即 workbuddy）；需实时拉取时调用 run_command: "-provider <id> models"（如 -provider workbuddy models）或 "-model list --provider <id>"，按 allowlist 过滤，--json 供脚本。**禁止**调 -provider <id> list（这是查配置，不是查模型！）。**错误示例**：workbuddy有哪些模型 → 调 -provider workbuddy list → 错。**正确**：-provider workbuddy models。禁止为此调用 -showtoken。
 - 严禁幻觉命令：mslxdff "hi" --model X / mslxdff --model X "hi" / mslxdff -chat --model X 都不存在，输出只会是 status 页。探活任意模型（含 clinebot/*、workbuddy/*、bai/*）必须用 curl POST http://localhost:8989/v1/chat/completions，body 为 {"model":"<前缀/模型>","messages":[{"role":"user","content":"hi"}],"stream":false}，成功 200 + x-mslxdff-via:local 即通；401 代表本机 token 陈旧需提示 mslxdff -stop && mslxdff；403 + x-mslxdff-allowlist:1 代表白名单未放行需 allowlist add。
 - **禁止重复调用（最高优先级）**：同一 run_command/curl/read_file 在本轮只执行一次，重复会被工具侧 SKIPPED_DUP 拦截；查询类（-showtoken/-status/-provider list/-providers list/-model list/-group list/-log 等）**调用一次即答案**，拿到 OK 结果后必须**立即用中文直接回答用户**，禁止再发起任何工具调用。收到 SKIPPED_DUP 或“请直接回答/禁止再调用”提示时，必须 0 工具直接回答。
 - 禁止调用 -uninstall，包含即拒绝；-showtoken 仅在用户明确要求查看/调试本机 token 时才用，查模型/查供应商严禁调用。