mslxdff 0.1.54 → 0.1.55

package/bin/mslxdff.js

@@ -8,7 +8,7 @@ import { DEFAULT_PORT, defaultStateFile } from "../src/state.js";
 import { createRouter } from "../src/routes.js";
 import { createUpstreamClient } from "../src/upstream.js";
 import { createModelsService } from "../src/models.js";
-import { loadToken, refreshToken, setPort, getPort, loadGroupsJoined, saveGroupsJoined, loadModelErrors, savePreferredModel, loadPreferredModel } from "../src/state.js";
+import { loadToken, refreshToken, setPort, getPort, loadGroupsJoined, saveGroupsJoined, loadModelErrors, savePreferredModel, loadPreferredModel, loadModelPicks, saveModelPicks } from "../src/state.js";
 import { getPreferredModel } from "../src/auto.js";
 import { normalizeModel } from "../src/reasoning.js";
 import { syncToWorkbuddy, workbuddyModelsPath } from "../src/sync-workbuddy.js";
@@ -185,11 +185,42 @@ if (args.includes("-model") || args.includes("-models")) {
   if (sub === "set" && args[idx + 2]) {
     const id = args[idx + 2];
     savePreferredModel(id);
+    const picks = [...new Set([...loadModelPicks(), id])];
+    saveModelPicks(picks);
     console.log(`default model set to: ${id} (daemon hot-reloads on next request)`);
+    console.log(`picked: ${picks.join(", ") || "(none)"} (auto will pick within these)`);
+    process.exit(0);
+  }
+  // -model pick <id> | -model unpick <id> | -model picks : 常用模型勾选集管理（非 TTY 用）
+  if (sub === "pick" && args[idx + 2] && args[idx + 2] !== "clear") {
+    const picks = [...new Set([...loadModelPicks(), args[idx + 2]])];
+    saveModelPicks(picks);
+    console.log(`picked: ${picks.join(", ") || "(none)"} (auto will pick within these)`);
+    process.exit(0);
+  }
+  if (sub === "pick" && args[idx + 2] === "clear") {
+    saveModelPicks([]);
+    console.log("picks cleared — auto uses the full model list again");
+    process.exit(0);
+  }
+  if (sub === "unpick" && args[idx + 2]) {
+    const picks = loadModelPicks().filter((x) => x !== args[idx + 2]);
+    saveModelPicks(picks);
+    console.log(`picked: ${picks.join(", ") || "(none)"}${picks.length === 0 ? " (auto uses full list)" : ""}`);
+    process.exit(0);
+  }
+  if (sub === "picks") {
+    const picks = loadModelPicks();
+    if (!picks.length) {
+      console.log("no picks — auto uses the full model list");
+    } else {
+      console.log(`${picks.length} picked model(s), auto only selects within these:`);
+    }
+    for (const id of picks) console.log(`  ${id}`);
     process.exit(0);
   }
   if (sub !== undefined && sub !== "list") {
-    console.error("usage: mslxdff -models (interactive picker) | mslxdff -model list | mslxdff -model set <id> | mslxdff -model status | mslxdff -model refresh");
+    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");
     process.exit(1);
   }
   const cacheFile = join(logDir(), "models.json");
@@ -235,31 +266,35 @@ if (args.includes("-model") || args.includes("-models")) {
       console.log("no models available — try: mslxdff -model refresh");
       process.exit(0);
     }
-    // TTY：交互式箭头选择默认模型；非 TTY（管道/脚本）：保持纯列表
+    // TTY：交互式多选勾选常用模型（空格勾选，Enter 保存）；非 TTY（管道/脚本）：保持纯列表并标注勾选
     if (process.stdin.isTTY && process.stdout.isTTY) {
       const statuses = loadModelErrors();
       const current = getPreferredModel();
+      const pickedIds = loadModelPicks();
       const items = ids.map((id) => {
         const e = statuses[id];
         return {
           id,
           status: typeof e === "number" ? "error" : e?.status || "normal",
           current: id === current,
+          picked: pickedIds.includes(id),
         };
       });
-      const picked = await pickInteractive(items, Math.max(0, items.findIndex((x) => x.current)));
-      if (!picked) {
-        console.log("cancelled — default model unchanged");
+      const result = await pickInteractiveMulti(items, new Set(pickedIds), Math.max(0, items.findIndex((x) => x.current)));
+      if (!result) {
+        console.log("cancelled — picks unchanged");
         process.exit(0);
       }
-      savePreferredModel(picked);
-      console.log(`default model set to: ${picked} (daemon hot-reloads on next request)`);
+      saveModelPicks([...result]);
+      console.log(`saved ${result.size} picked model(s): ${[...result].join(", ") || "(none — auto uses full list)"}`);
       process.exit(0);
     }
     const at = cachedAt ? ` (cached ${new Date(cachedAt).toISOString().slice(0, 16).replace("T", " ")})` : "";
-    console.log(`${ids.length} free model(s)${at}:`);
-    for (const id of ids) console.log(`  ${id}`);
-    console.log(`\ninteractive pick needs a TTY; set directly with: mslxdff -model set <id>`);
+    const pickedIds = loadModelPicks();
+    const mark = (id) => (pickedIds.includes(id) ? "*" : " ");
+    console.log(`${ids.length} free model(s)${at} (${pickedIds.length} picked, * = picked):`);
+    for (const id of ids) console.log(`  ${mark(id)} ${id}`);
+    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);
@@ -375,6 +410,53 @@ async function pickInteractive(items, startCursor = 0) {
   });
 }
 
+// 多选勾选：↑/↓ 移动，Space 勾选/取消，Enter 保存，q/Esc 取消（返回 Set 或 null）
+async function pickInteractiveMulti(items, initialPicked = new Set(), startCursor = 0) {
+  const { renderChooser, renderChooserHelp, parseKey } = await import("../src/chooser.js");
+  let cursor = Math.min(Math.max(startCursor, 0), items.length - 1);
+  const picked = new Set(items.filter((it) => initialPicked.has(it.id)).map((it) => it.id));
+  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"));
+  };
+  draw();
+  return new Promise((resolve) => {
+    const wasRaw = process.stdin.isRaw;
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.setEncoding("utf8");
+    const cleanup = () => {
+      process.stdin.removeListener("data", onData);
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+      process.stdout.write("\n");
+    };
+    const onData = (chunk) => {
+      const key = parseKey(String(chunk));
+      if (key === "up") {
+        cursor = (cursor - 1 + items.length) % items.length;
+        draw();
+      } else if (key === "down") {
+        cursor = (cursor + 1) % items.length;
+        draw();
+      } else if (key === "space") {
+        const id = items[cursor].id;
+        if (picked.has(id)) picked.delete(id);
+        else picked.add(id);
+        draw();
+      } else if (key === "enter") {
+        cleanup();
+        resolve(new Set(picked));
+      } else if (key === "cancel") {
+        cleanup();
+        resolve(null);
+      }
+    };
+    process.stdin.on("data", onData);
+  });
+}
+
 // -debug: stop the background daemon and run the server in THIS terminal
 // (foreground), printing every event to stdout in real time via the in-memory
 // event bus — no filesystem polling. Ctrl+C / SIGTERM restarts the daemon in
@@ -876,6 +958,7 @@ const models = createModelsService({
 const auto = createAutoSelector({
   cooldownMs: modelCooldownMs(),
   slowCooldownMs: slowCooldownMs(),
+  file: defaultStateFile(),
   loadCandidates: async () => {
     try {
       return (await models.get()).data.map((m) => m.id);

package/package.json

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

package/src/auto.js

@@ -1,5 +1,5 @@
 import { statSync } from "node:fs";
-import { loadModelErrors, saveModelErrors, loadModelLatencies, saveModelLatencies, loadPreferredModel, defaultStateFile } from "./state.js";
+import { loadModelErrors, saveModelErrors, loadModelLatencies, saveModelLatencies, loadPreferredModel, loadModelPicks, saveModelPicks, defaultStateFile } from "./state.js";
 
 // 出厂默认首选模型（state.json 的 preferredModel / env MSLXDFF_PREFERRED_MODEL 可覆盖）
 export const DEFAULT_PREFERRED_MODEL = "big-pickle";
@@ -129,6 +129,8 @@ export function createAutoSelector({
   latencies: seedLatencies,
   persist = (errors, f = file) => saveModelErrors(errors, f ? { file: f } : {}),
   persistLatencies = (latencies, f = file) => saveModelLatencies(latencies, f ? { file: f } : {}),
+  loadPicks = () => (file ? loadModelPicks({ file }) : []),
+  persistPicks = (picks) => (file ? saveModelPicks(picks, { file }) : picks),
 } = {}) {
   const lastErrorAt = { ...(seedErrors ?? loadModelErrors(file ? { file } : {})) };
   const latencies = { ...(seedLatencies ?? loadModelLatencies(file ? { file } : {})) };
@@ -144,13 +146,29 @@ export function createAutoSelector({
     return [...new Set(list)].filter(Boolean);
   }
 
+  // 勾选集 = auto 候选池白名单：只在勾选的模型里择优；空勾选或勾选中无可用模型时回退全量
+  async function pickedPool(list) {
+    const picks = loadPicks();
+    if (!picks.length) return list;
+    const pickedSet = new Set(picks);
+    const filtered = list.filter((id) => pickedSet.has(id));
+    return filtered.length ? filtered : list;
+  }
+
   async function candidates() {
-    return rankModels(await loadList(), lastErrorAt, { now: now(), cooldownMs, slowCooldownMs, latencies, preferred: getPreferredModel({ file: file ?? undefined }) });
+    const list = await loadList();
+    const pool = await pickedPool(list);
+    return rankModels(pool, lastErrorAt, { now: now(), cooldownMs, slowCooldownMs, latencies, preferred: getPreferredModel({ file: file ?? undefined }) });
   }
 
   async function candidatesFor(requested) {
     if (!requested) return candidates();
     const list = await loadList();
+    // 显式指定某模型 = 认可它，自动加入勾选集（仅当它是真实上游 free 模型时，避免垃圾 id 污染）
+    const picks = loadPicks();
+    if (list.includes(requested) && !picks.includes(requested) && persistPicks) {
+      await persistPicks([...picks, requested]);
+    }
     const all = list.includes(requested) ? list : [requested, ...list];
     const others = rankModels(all.filter((id) => id !== requested), lastErrorAt, {
       now: now(),

package/src/chooser.js

@@ -1,11 +1,14 @@
 // 交互式模型选择器的纯渲染逻辑（便于测试）；键盘循环在 bin/mslxdff.js
 
-// items: [{ id, status?, ms?, fail?, current? }]；cursor 当前高亮行
+// items: [{ id, status?, ms?, fail?, current?, picked? }]；cursor 当前高亮行
+// multi=true 时多选勾选（picked 显示 [x]/[ ]），否则单选默认模型（当前显示 ✓）
 // 返回行数组（无 ANSI 颜色，纯文本标记，Windows 终端友好）
-export function renderChooser(items, cursor = 0) {
+export function renderChooser(items, cursor = 0, { multi = false } = {}) {
   return items.map((it, i) => {
     const arrow = i === cursor ? "❯" : " ";
-    const check = it.current ? " ✓ (current)" : "";
+    const check = multi
+      ? (it.picked ? " [✓]" : " [ ]")
+      : (it.current ? " ✓ (current)" : "");
     let state = "";
     if (it.fail) state = `  [fail: ${it.fail}]`;
     else if (it.ms != null) state = `  [${it.ms}ms]`;
@@ -14,16 +17,19 @@ export function renderChooser(items, cursor = 0) {
   });
 }
 
-export function renderChooserHelp() {
-  return ["", "↑/↓ move · Enter select as default · q/Esc cancel"];
+export function renderChooserHelp(multi = false) {
+  return multi
+    ? ["", "↑/↓ move · Space toggle pick · Enter save picks · q/Esc cancel"]
+    : ["", "↑/↓ move · Enter select as default · q/Esc cancel"];
 }
 
-// 解析按键：返回 "up" | "down" | "enter" | "cancel" | null(忽略)
+// 解析按键：返回 "up" | "down" | "enter" | "cancel" | "space" | null(忽略)
 export function parseKey(str) {
   if (!str) return null;
   if (str === "\x1b[A" || str === "k") return "up";
   if (str === "\x1b[B" || str === "j") return "down";
   if (str === "\r" || str === "\n") return "enter";
+  if (str === " " || str === "\x1b[32") return "space"; // 空格（32=0x20 的 ASC 表示）或某些终端 terminator
   if (str === "\x1b" || str === "q" || str === "\x03") return "cancel";
   return null;
 }

package/src/state.js

@@ -201,6 +201,19 @@ export function loadPreferredModel({ file = defaultStateFile() } = {}) {
   return typeof v === "string" && v.trim() ? v.trim() : null;
 }
 
+// 常用模型勾选集（auto 候选池白名单）：空数组 = 不启用筛选（全量 auto）
+export function loadModelPicks({ file = defaultStateFile() } = {}) {
+  const picks = readState(file).modelPicks;
+  if (!Array.isArray(picks)) return [];
+  return [...new Set(picks.filter((x) => typeof x === "string" && x.trim().length))];
+}
+
+export function saveModelPicks(picks, { file = defaultStateFile() } = {}) {
+  const list = [...new Set((Array.isArray(picks) ? picks : []).filter((x) => typeof x === "string" && x.trim().length))];
+  writeStateImmediate(file, { modelPicks: list });
+  return list;
+}
+
 export function savePreferredModel(id, { file = defaultStateFile() } = {}) {
   writeStateImmediate(file, { preferredModel: String(id || "").trim() });
   return String(id || "").trim();