mslxdff 0.1.155 → 0.1.158

package/src/cli/commands/model/list-tty.js

@@ -0,0 +1,76 @@
+// 交互式 `-models`（TTY 多选）主流程：从 list.js 拆出以守住 ≤10KB 体积门。
+// 候选合并（allowlist + live + picks 孤儿）→ 展示排序 → 勾选落盘。
+// Note: 排序规则单一来源在 list-sort.js；候选集合语义不变（只改展示顺序）。
+import { loadModelErrors, loadModelPicks, saveModelPicks } from "../../../state.js";
+import { getPreferredModel } from "../../../auto.js";
+import { pickInteractiveMulti } from "../../interactive.js";
+import { filterStalePicks } from "../../../providers/model-id.js";
+import { mergeLiveIds } from "./list-live.js";
+import { sortModelIds } from "./list-sort.js";
+
+/**
+ * 拼交互候选：opencode live ids + 已启用 provider 的 allowlist + live 补齐 + 可见 picks。
+ * 返回 { items, pickedIds }；items 已按 sortModelIds 排序。
+ */
+export async function buildPickerItems(liveIds, pickedIds) {
+  const statuses = loadModelErrors();
+  const current = getPreferredModel();
+  const combinedIds = [...liveIds];
+  const seen = new Set(combinedIds);
+  let staleFilter = null;
+  try {
+    const { loadProviderConfigs, loadProviderAllowedModels } = await import("../../../state.js");
+    const { buildProviderRows } = await import("../../provider-row.js");
+    // 已知 = 已启用（与 -provider list 同一 enabled 口径：有 baseUrl 且有 key；
+    // openrouter 有 key 即算，opencode 内置恒启用）。未启用 provider 的 picks
+    // 不进列表，启用后自动回来（数据未动）。
+    const knownProviders = buildProviderRows({}).filter((r) => r.enabled).map((r) => r.id);
+    loadProviderConfigs();
+    const allowedIds = [];
+    for (const pid of knownProviders.filter((k) => String(k).toLowerCase() !== "opencode")) {
+      for (const raw of loadProviderAllowedModels(pid)) {
+        const canonical = `${pid}/${raw}`;
+        allowedIds.push(canonical);
+        if (!seen.has(canonical)) {
+          seen.add(canonical);
+          combinedIds.push(canonical);
+        }
+      }
+    }
+    await mergeLiveIds({ combinedIds, seen, knownProviders, liveIds });
+    staleFilter = { knownProviders, liveIds, allowedIds };
+  } catch {}
+  // provider 已不存在的 picks 孤儿不进交互列表（数据不动，status --all 仍可审计）。
+  // configs 读失败时 staleFilter 为空 → 不过滤（默认放行）。
+  const visiblePicks = staleFilter ? filterStalePicks(pickedIds, staleFilter) : pickedIds;
+  for (const pid of visiblePicks) {
+    if (!seen.has(pid)) {
+      seen.add(pid);
+      combinedIds.push(pid);
+    }
+  }
+  // 展示排序：opencode free 最前 → opencode 其他 → 各供应商分组，组内字母序。
+  const items = sortModelIds(combinedIds).map((id) => {
+    const e = statuses[id];
+    return {
+      id,
+      status: typeof e === "number" ? "error" : e?.status || "normal",
+      current: id === current,
+      picked: pickedIds.includes(id),
+    };
+  });
+  return { items, pickedIds };
+}
+
+/** 跑一轮 TTY 勾选并落盘 picks（取消则不写）。调用方负责 exit。 */
+export async function runInteractivePick(liveIds) {
+  const pickedIds = loadModelPicks();
+  const { items } = await buildPickerItems(liveIds, pickedIds);
+  const result = await pickInteractiveMulti(items, new Set(pickedIds), Math.max(0, items.findIndex((x) => x.current)));
+  if (!result) {
+    console.log("cancelled — picks unchanged");
+    return;
+  }
+  saveModelPicks([...result]);
+  console.log(`saved ${result.size} picked model(s): ${[...result].join(", ") || "(none — auto uses full list)"}`);
+}

package/src/cli/commands/model/list.js

@@ -2,16 +2,12 @@ import { join } from "node:path";
 import { createModelsService } from "../../../models.js";
 import { createUpstreamClient } from "../../../upstream.js";
 import { logDir } from "../../../logs.js";
-import { loadModelErrors, loadModelPicks, saveModelPicks } from "../../../state.js";
-import { getPreferredModel } from "../../../auto.js";
+import { loadModelPicks } from "../../../state.js";
 import { fmtShanghaiYMDHM } from "../../../time.js";
 import { readModelsCache } from "../../util.js";
-import { pickInteractiveMulti } from "../../interactive.js";
 import { buildAliasMap, readFullAliases, renderProviderList, renderFreeList, groupByProvider } from "./list-render.js";
 import { renderOtherProviders } from "./list-providers.js";
-import { filterStalePicks } from "../../../providers/model-id.js";
-import { mergeLiveIds } from "./list-live.js";
-
+import { compareModelIds } from "./list-sort.js";
 /**
  * `-model list` 全流程：参数解析 → 刷新/回退 → provider 分支 → TTY 交互 → 分组渲染。
  * 渲染下沉 list-render / list-providers，本文件只留流程编排。
@@ -104,8 +100,7 @@ export async function handleModelList(args, idx, sub) {
           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}`;
+          for (const canonical of allowed.map((raw) => `${prov}/${raw}`).sort(compareModelIds)) {
             let alias = null;
             try { alias = getAliasForModel(canonical); } catch {}
             if (!alias && String(canonical).includes("/")) alias = String(canonical).replace(/\//g, "-");
@@ -134,60 +129,8 @@ export async function handleModelList(args, idx, sub) {
       process.exit(0);
     }
     if (sub === undefined && process.stdin.isTTY && process.stdout.isTTY) {
-      const statuses = loadModelErrors();
-      const current = getPreferredModel();
-      const pickedIds = loadModelPicks();
-      const combinedIds = [...ids];
-      const seen = new Set(combinedIds);
-      let staleFilter = null;
-      try {
-        const { loadProviderConfigs, loadProviderAllowedModels } = await import("../../../state.js");
-        const { buildProviderRows } = await import("../../provider-row.js");
-        // 已知 = 已启用（与 -provider list 同一 enabled 口径：有 baseUrl 且有 key；
-        // openrouter 有 key 即算，opencode 内置恒启用）。未启用 provider 的 picks
-        // 不进列表，启用后自动回来（数据未动）。
-        const knownProviders = buildProviderRows({}).filter((r) => r.enabled).map((r) => r.id);
-        const configs = loadProviderConfigs();
-        const allowedIds = [];
-        for (const pid of knownProviders.filter((k) => String(k).toLowerCase() !== "opencode")) {
-          const allowed = loadProviderAllowedModels(pid);
-          for (const raw of allowed) {
-            const canonical = `${pid}/${raw}`;
-            allowedIds.push(canonical);
-            if (!seen.has(canonical)) {
-              seen.add(canonical);
-              combinedIds.push(canonical);
-            }
-          }
-        }
-        await mergeLiveIds({ combinedIds, seen, knownProviders, liveIds: ids });
-        staleFilter = { knownProviders, liveIds: ids, allowedIds };
-      } catch {}
-      // provider 已不存在的 picks 孤儿不进交互列表（数据不动，status --all 仍可审计）。
-      // configs 读失败时 staleFilter 为空 → 不过滤（默认放行）。
-      const visiblePicks = staleFilter ? filterStalePicks(pickedIds, staleFilter) : pickedIds;
-      for (const pid of visiblePicks) {
-        if (!seen.has(pid)) {
-          seen.add(pid);
-          combinedIds.push(pid);
-        }
-      }
-      const items = combinedIds.map((id) => {
-        const e = statuses[id];
-        return {
-          id,
-          status: typeof e === "number" ? "error" : e?.status || "normal",
-          current: id === current,
-          picked: pickedIds.includes(id),
-        };
-      });
-      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);
-      }
-      saveModelPicks([...result]);
-      console.log(`saved ${result.size} picked model(s): ${[...result].join(", ") || "(none — auto uses full list)"}`);
+      const { runInteractivePick } = await import("./list-tty.js");
+      await runInteractivePick(ids);
       process.exit(0);
     }
     const at = cachedAt ? ` (cached ${fmtShanghaiYMDHM(cachedAt)})` : "";

package/src/cli/commands/model/picks.js

@@ -1,50 +1,50 @@
-import { savePreferredModel, loadModelPicks, saveModelPicks } from "../../../state.js";
-
-/**
- * 勾选集分支：set / pick / unpick / picks / pick clear。
- * 命中返回 true（分支内 process.exit，不会实际返回）；未命中返回 false。
- */
-export async function handlePicksCommand(args, idx, sub) {
-  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);
-  }
-  if (sub === "pick" && args[idx + 2] && args[idx + 2] !== "clear") {
-    // 多 id 勾选：`-model pick a b c`（空格分隔）与 `-model pick a,b`（逗号）均支持
-    const ids = args.slice(idx + 2).flatMap((x) => String(x).split(",")).map((x) => x.trim()).filter(Boolean);
-    const picks = [...new Set([...loadModelPicks(), ...ids])];
-    saveModelPicks(picks);
-    console.log(`picked ${ids.length} model(s): ${ids.join(", ")}`);
-    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 removeSet = new Set(args.slice(idx + 2).flatMap((x) => String(x).split(",")).map((x) => x.trim()).filter(Boolean));
-    const picks = loadModelPicks().filter((x) => !removeSet.has(x));
-    saveModelPicks(picks);
-    console.log(`unpicked ${removeSet.size}: ${[...removeSet].join(", ")}`);
-    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);
-  }
-  return false;
-}
+import { savePreferredModel, loadModelPicks, saveModelPicks } from "../../../state.js";
+
+/**
+ * 勾选集分支：set / pick / unpick / picks / pick clear。
+ * 命中返回 true（分支内 process.exit，不会实际返回）；未命中返回 false。
+ */
+export async function handlePicksCommand(args, idx, sub) {
+  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);
+  }
+  if (sub === "pick" && args[idx + 2] && args[idx + 2] !== "clear") {
+    // 多 id 勾选：`-model pick a b c`（空格分隔）与 `-model pick a,b`（逗号）均支持
+    const ids = args.slice(idx + 2).flatMap((x) => String(x).split(",")).map((x) => x.trim()).filter(Boolean);
+    const picks = [...new Set([...loadModelPicks(), ...ids])];
+    saveModelPicks(picks);
+    console.log(`picked ${ids.length} model(s): ${ids.join(", ")}`);
+    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 removeSet = new Set(args.slice(idx + 2).flatMap((x) => String(x).split(",")).map((x) => x.trim()).filter(Boolean));
+    const picks = loadModelPicks().filter((x) => !removeSet.has(x));
+    saveModelPicks(picks);
+    console.log(`unpicked ${removeSet.size}: ${[...removeSet].join(", ")}`);
+    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);
+  }
+  return false;
+}