mslxdff 0.1.203 → 0.1.207

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

@@ -1,76 +1,76 @@
-/**
- * 其他供应商 allowlist 段 + 遗留别名映射展示。
- * 输入均为已算好的数据；state/model-id 走动态 import（与原内联一致，避免循环依赖）。
- * allowlist 按 compareModelIds 排序展示（只改展示顺序，不改 allowlist 落盘内容）。
- */
-import { compareModelIds } from "./list-sort.js";
-export async function renderOtherProviders({ pickedIds, ids, fullAliases }) {
-  const { loadProviderConfigs, loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderBaseUrl } = await import("../../../state.js");
-  const { loadModelAliases: _la2, getAliasForModel: _gaf } = await import("../../../providers/model-id.js");
-  try { _la2(); } catch {}
-  const configs = loadProviderConfigs();
-  const otherIds = Object.keys(configs).filter((k) => String(k).toLowerCase() !== "opencode");
-  const order2 = ["workbuddy", "cline", "openrouter", "bai", "qoder", "qwenwork", "globalqwenwork", "traework", "zcode", "raccoon", "codearts"];
-  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 canonical of allowed.map((raw) => `${pid}/${raw}`).sort(compareModelIds)) {
-          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`);
-  }
-  const aliasEntries = Object.entries(fullAliases).filter(([alias, canonical]) => {
-    if (ids.includes(canonical)) return false;
-    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}`);
-    }
-  }
-}
+/**
+ * 其他供应商 allowlist 段 + 遗留别名映射展示。
+ * 输入均为已算好的数据；state/model-id 走动态 import（与原内联一致，避免循环依赖）。
+ * allowlist 按 compareModelIds 排序展示（只改展示顺序，不改 allowlist 落盘内容）。
+ */
+import { compareModelIds } from "./list-sort.js";
+export async function renderOtherProviders({ pickedIds, ids, fullAliases }) {
+  const { loadProviderConfigs, loadProviderAllowedModels, loadProviderAllowAnyModels, loadProviderBaseUrl } = await import("../../../state.js");
+  const { loadModelAliases: _la2, getAliasForModel: _gaf } = await import("../../../providers/model-id.js");
+  try { _la2(); } catch {}
+  const configs = loadProviderConfigs();
+  const otherIds = Object.keys(configs).filter((k) => String(k).toLowerCase() !== "opencode");
+  const order2 = ["workbuddy", "cline", "openrouter", "bai", "qoder", "qwenwork", "globalqwenwork", "traework", "zcode", "raccoon", "codearts"];
+  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 canonical of allowed.map((raw) => `${pid}/${raw}`).sort(compareModelIds)) {
+          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`);
+  }
+  const aliasEntries = Object.entries(fullAliases).filter(([alias, canonical]) => {
+    if (ids.includes(canonical)) return false;
+    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}`);
+    }
+  }
+}

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

@@ -1,77 +1,77 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-import { homedir } from "node:os";
-import { compareModelIds, providerOf, providerRank } from "./list-sort.js";
-
-/** 构建 id → 别名映射（原 list 两处重复逻辑收敛） */
-export function buildAliasMap(ids, getAliasForModel) {
-  const aliasMap = {};
-  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;
-    }
-  }
-  return aliasMap;
-}
-
-/** 读本地别名全表（遗留映射展示用） */
-export function readFullAliases() {
-  try {
-    const aliasesFile = join(homedir(), ".config", "mslxdff", "model-aliases.json");
-    const raw = JSON.parse(readFileSync(aliasesFile, "utf8"));
-    if (raw && typeof raw === "object") return raw;
-  } catch {}
-  return {};
-}
-
-/** `--provider <id>` 分支的分组渲染 */
-export function renderProviderList({ ids, at, pickedIds, modelListProvider, sortedProvs, groups, aliasMap }) {
-  console.log(`${ids.length} model(s) for ${modelListProvider}${at} (${pickedIds.length} picked, * = picked):`);
-  const mark = (id) => (pickedIds.includes(id) ? "*" : " ");
-  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`);
-}
-
-/** 全量 free 列表的分组渲染 */
-export function renderFreeList({ ids, at, pickedIds, sortedProvs, groups, aliasMap }) {
-  console.log(`${ids.length} free model(s)${at} (${pickedIds.length} picked, * = picked):`);
-  const mark = (id) => (pickedIds.includes(id) ? "*" : " ");
-  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}`);
-    }
-  }
-}
-
-/** 按供应商分组 + 排序（opencode 段最前，已知供应商优先，组内字母序） */
-export function groupByProvider(ids) {
-  const groups = {};
-  for (const id of ids) {
-    const prov = providerOf(id);
-    if (!groups[prov]) groups[prov] = [];
-    groups[prov].push(id);
-  }
-  for (const key of Object.keys(groups)) groups[key].sort(compareModelIds);
-  const sortedProvs = Object.keys(groups).sort((a, b) => {
-    const ra = providerRank(a);
-    const rb = providerRank(b);
-    if (ra !== rb) return ra - rb;
-    return a.localeCompare(b);
-  });
-  return { groups, sortedProvs };
-}
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { compareModelIds, providerOf, providerRank } from "./list-sort.js";
+
+/** 构建 id → 别名映射（原 list 两处重复逻辑收敛） */
+export function buildAliasMap(ids, getAliasForModel) {
+  const aliasMap = {};
+  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;
+    }
+  }
+  return aliasMap;
+}
+
+/** 读本地别名全表（遗留映射展示用） */
+export function readFullAliases() {
+  try {
+    const aliasesFile = join(homedir(), ".config", "mslxdff", "model-aliases.json");
+    const raw = JSON.parse(readFileSync(aliasesFile, "utf8"));
+    if (raw && typeof raw === "object") return raw;
+  } catch {}
+  return {};
+}
+
+/** `--provider <id>` 分支的分组渲染 */
+export function renderProviderList({ ids, at, pickedIds, modelListProvider, sortedProvs, groups, aliasMap }) {
+  console.log(`${ids.length} model(s) for ${modelListProvider}${at} (${pickedIds.length} picked, * = picked):`);
+  const mark = (id) => (pickedIds.includes(id) ? "*" : " ");
+  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`);
+}
+
+/** 全量 free 列表的分组渲染 */
+export function renderFreeList({ ids, at, pickedIds, sortedProvs, groups, aliasMap }) {
+  console.log(`${ids.length} free model(s)${at} (${pickedIds.length} picked, * = picked):`);
+  const mark = (id) => (pickedIds.includes(id) ? "*" : " ");
+  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}`);
+    }
+  }
+}
+
+/** 按供应商分组 + 排序（opencode 段最前，已知供应商优先，组内字母序） */
+export function groupByProvider(ids) {
+  const groups = {};
+  for (const id of ids) {
+    const prov = providerOf(id);
+    if (!groups[prov]) groups[prov] = [];
+    groups[prov].push(id);
+  }
+  for (const key of Object.keys(groups)) groups[key].sort(compareModelIds);
+  const sortedProvs = Object.keys(groups).sort((a, b) => {
+    const ra = providerRank(a);
+    const rb = providerRank(b);
+    if (ra !== rb) return ra - rb;
+    return a.localeCompare(b);
+  });
+  return { groups, sortedProvs };
+}

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

@@ -1,52 +1,52 @@
-// `-models` / `-model list` 展示排序：opencode free 优先 → 其余供应商分组 → 组内字母序。
-// 单一来源：本文件被 list.js（交互候选）与 list-render.js（分组渲染）共用。
-// Note: 排序只影响展示顺序，不改 picks/候选集合 — 见 .agents/notes/implemented/feature/2026-09-28-models-sort-opencode-free-first.md
-import { isFreeModel } from "../../../models.js";
-
-/** 供应商展示优先级（opencode 恒第一；未知供应商按字母序排其后） */
-export const PROVIDER_ORDER = ["opencode", "workbuddy", "cline", "openrouter", "qoder", "codearts", "traework", "bai"];
-
-/** 取模型 id 的供应商前缀；无斜杠的裸 id 归 opencode */
-export function providerOf(id) {
-  const s = String(id || "");
-  const i = s.indexOf("/");
-  return i > 0 ? s.slice(0, i).toLowerCase() : "opencode";
-}
-
-/** 供应商排序权重：opencode=0，已知供应商=其序号+1，未知=大数（按字母序兜底） */
-export function providerRank(prov) {
-  const i = PROVIDER_ORDER.indexOf(prov);
-  return i === -1 ? PROVIDER_ORDER.length : i;
-}
-
-/**
- * 模型 id 排序比较器：
- *  1) opencode free（isFreeModel）最前 —— 用户主诉求
- *  2) opencode 非 free 次之
- *  3) 其余供应商按 PROVIDER_ORDER，未知按字母序
- *  4) 同段内 localeCompare 字母序（大小写不敏感兜底）
- */
-export function compareModelIds(a, b) {
-  const pa = providerOf(a);
-  const pb = providerOf(b);
-  const fa = pa === "opencode" && isFreeModel(a);
-  const fb = pb === "opencode" && isFreeModel(b);
-  // 段位：0=opencode free，1=opencode 其他，2=其他供应商
-  const ga = fa ? 0 : pa === "opencode" ? 1 : 2;
-  const gb = fb ? 0 : pb === "opencode" ? 1 : 2;
-  if (ga !== gb) return ga - gb;
-  if (ga === 2) {
-    const ra = providerRank(pa);
-    const rb = providerRank(pb);
-    if (ra !== rb) return ra - rb;
-    if (pa !== pb) return pa.localeCompare(pb);
-  }
-  const la = String(a).toLowerCase();
-  const lb = String(b).toLowerCase();
-  return la === lb ? String(a).localeCompare(String(b)) : la.localeCompare(lb);
-}
-
-/** 返回排序后的新数组（不改原数组） */
-export function sortModelIds(ids) {
-  return [...(ids || [])].sort(compareModelIds);
-}
+// `-models` / `-model list` 展示排序：opencode free 优先 → 其余供应商分组 → 组内字母序。
+// 单一来源：本文件被 list.js（交互候选）与 list-render.js（分组渲染）共用。
+// Note: 排序只影响展示顺序，不改 picks/候选集合 — 见 .agents/notes/implemented/feature/2026-09-28-models-sort-opencode-free-first.md
+import { isFreeModel } from "../../../models.js";
+
+/** 供应商展示优先级（opencode 恒第一；未知供应商按字母序排其后） */
+export const PROVIDER_ORDER = ["opencode", "workbuddy", "cline", "openrouter", "qoder", "codearts", "traework", "bai"];
+
+/** 取模型 id 的供应商前缀；无斜杠的裸 id 归 opencode */
+export function providerOf(id) {
+  const s = String(id || "");
+  const i = s.indexOf("/");
+  return i > 0 ? s.slice(0, i).toLowerCase() : "opencode";
+}
+
+/** 供应商排序权重：opencode=0，已知供应商=其序号+1，未知=大数（按字母序兜底） */
+export function providerRank(prov) {
+  const i = PROVIDER_ORDER.indexOf(prov);
+  return i === -1 ? PROVIDER_ORDER.length : i;
+}
+
+/**
+ * 模型 id 排序比较器：
+ *  1) opencode free（isFreeModel）最前 —— 用户主诉求
+ *  2) opencode 非 free 次之
+ *  3) 其余供应商按 PROVIDER_ORDER，未知按字母序
+ *  4) 同段内 localeCompare 字母序（大小写不敏感兜底）
+ */
+export function compareModelIds(a, b) {
+  const pa = providerOf(a);
+  const pb = providerOf(b);
+  const fa = pa === "opencode" && isFreeModel(a);
+  const fb = pb === "opencode" && isFreeModel(b);
+  // 段位：0=opencode free，1=opencode 其他，2=其他供应商
+  const ga = fa ? 0 : pa === "opencode" ? 1 : 2;
+  const gb = fb ? 0 : pb === "opencode" ? 1 : 2;
+  if (ga !== gb) return ga - gb;
+  if (ga === 2) {
+    const ra = providerRank(pa);
+    const rb = providerRank(pb);
+    if (ra !== rb) return ra - rb;
+    if (pa !== pb) return pa.localeCompare(pb);
+  }
+  const la = String(a).toLowerCase();
+  const lb = String(b).toLowerCase();
+  return la === lb ? String(a).localeCompare(String(b)) : la.localeCompare(lb);
+}
+
+/** 返回排序后的新数组（不改原数组） */
+export function sortModelIds(ids) {
+  return [...(ids || [])].sort(compareModelIds);
+}

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

@@ -1,76 +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)"}`);
-}
+// 交互式 `-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)"}`);
+}