mslxdff 0.1.155 → 0.1.158

package/src/cli/commands/group.js

@@ -1,249 +1,249 @@
-import { createGroupsService, createBansService, refreshGroupMembers, syncPeersFromMembers } from "../../groups.js";
-import { createPeersService } from "../../peers.js";
-import { loadToken, loadGroupsJoined, saveGroupsJoined } from "../../state.js";
-import { groupIs, markJoined, probeHealth, syncAllJoinedGroups } from "../group-helpers.js";
-import { joinGroupCore } from "../join-core.js";
-import { errMsg } from "../util.js";
-import { argValue } from "../policy.js";
-import { compatFetch, timeoutSignal } from "../../compat.js";
-
-export async function handleGroupCreate(args) {
-  const createGroupArg = argValue(args, "-creategroup", "--creategroup") || groupIs("create", args);
-  if (!createGroupArg) return false;
-  const groups = createGroupsService({});
-  const peers = createPeersService({});
-  const name = createGroupArg;
-  const { created } = groups.create(name);
-  markJoined({ name, leaderUrl: "", myUrl: "", memberName: "leader" });
-  const synced = await syncAllJoinedGroups({ peers, groups });
-  const s = synced.find((x) => x.name === name);
-  console.log(created ? `group created: ${name}` : `group already exists: ${name}`);
-  console.log(`members on this node: ${s ? `${s.total} (failover: ${s.added})` : "?"}`);
-  console.log(`others join with: mslxdff -addtogroup <this-node-host> ${name}`);
-  process.exit(0);
-}
-
-export async function handleGroupCommand(args) {
-  const groupCmd = argValue(args, "-group", "--group");
-  if (!groupCmd || groupCmd === "create") return false;
-  const groups = createGroupsService({});
-  const peers = createPeersService({});
-  const rest = args.slice(args.indexOf("-group") + 1);
-  const [action, a] = rest;
-  if (action === "sync") {
-    const synced = await syncAllJoinedGroups({ peers, groups });
-    if (!synced.length) {
-      console.log("not joined to any group (use -addtogroup or -creategroup)");
-    } else {
-      for (const s of synced) {
-        if (s.error) console.log(`${s.name}: sync failed — ${s.error}`);
-        else console.log(`${s.name}: ${s.total} member(s), ${s.added} failover target(s) configured`);
-      }
-    }
-  } else if (action === "leave" && a) {
-    const before = loadGroupsJoined().filter((g) => g.name === a).length;
-    saveGroupsJoined(loadGroupsJoined().filter((g) => g.name !== a));
-    const removed = peers.removeByGroup(a);
-    console.log(before ? `left group "${a}" (${removed} member(s) removed)` : `not a member of group "${a}"`);
-  } else if (action === "list") {
-    const joinedList = loadGroupsJoined();
-    if (!joinedList.length) {
-      console.log("no groups on this node");
-      process.exit(0);
-    }
-    const { token } = await loadToken();
-    const fetchImpl = (url, opts) => compatFetch(url, { ...opts, signal: timeoutSignal(1500) });
-    for (const g of joinedList) {
-      const isLeader = !g.leaderUrl;
-      let members;
-      if (isLeader) {
-        members = groups.list()[g.name]?.members || {};
-      } else {
-        try {
-          members = await refreshGroupMembers(g.name, {
-            leaderUrl: g.leaderUrl,
-            memberName: g.memberName,
-            url: g.myUrl,
-            token,
-            fetchImpl,
-          });
-        } catch (err) {
-          console.log(`${g.name}  (members unavailable — leader unreachable: ${errMsg(err)})`);
-          continue;
-        }
-      }
-      const entries = Object.entries(members).filter(([id]) => id !== "leader");
-      console.log(`${g.name}  (${entries.length} member${entries.length === 1 ? "" : "s"})`);
-      const probes = await Promise.all(
-        entries.map(([id, m]) => probeHealth({ id, url: m?.url || id, kind: m?.kind, lastSeen: m?.lastSeen, publicIp: m?.publicIp }))
-      );
-      const leaderEntry = members.leader ? Object.entries(members).find(([id]) => id === "leader") : null;
-      const leaderProbe = leaderEntry ? await probeHealth({ id: "leader", url: leaderEntry[1].url }) : null;
-      const display = leaderProbe ? [...probes, leaderProbe] : probes;
-      let seq = 0;
-      for (const r of display) {
-        const m = entries.find(([eid]) => eid === r.id)?.[1] || (r.id === "leader" ? leaderEntry?.[1] : null);
-        const isBb = r.kind === "broadband" || String(r.url || "").startsWith("relay://") || m?.kind === "broadband";
-        if (isBb) {
-          const ago = r.lastSeen ? `${Math.round((Date.now() - r.lastSeen) / 1000)}s ago` : "no heartbeat yet";
-          const ip = r.publicIp || m?.publicIp || "?";
-          const via = r.stale ? "stale" : `via leader ${ago}`;
-          const stateBb = `${via} ip=${ip}`;
-          if (r.id === "leader") {
-            console.log(`  leader  ${r.url}  ${stateBb}`);
-            continue;
-          }
-          seq += 1;
-          const label = r.id && r.id !== r.url ? `  [${r.id}]` : "";
-          console.log(`  ${seq}. ${r.url}${label}  [broadband] ${stateBb}`);
-          continue;
-        }
-        const state = r.fail ? `fail  ${r.fail}` : `ok    ${r.ms}ms`;
-        if (r.id === "leader") {
-          console.log(`  leader  ${r.url}  ${state}`);
-          continue;
-        }
-        seq += 1;
-        const label = r.id && r.id !== r.url ? `  [${r.id}]` : "";
-        console.log(`  ${seq}. ${r.url}${label}  ${state}`);
-      }
-    }
-    console.log(`\njoined groups (${joinedList.length}):`);
-    for (const g of joinedList) console.log(`  ${g.name}  ${g.leaderUrl || "(this node is the leader)"}`);
-  } else if (action === "remove" && a) {
-    const seq = Number(a);
-    if (!Number.isInteger(seq) || seq < 1) {
-      console.error(`usage: mslxdff -group remove <seq>`);
-      process.exit(1);
-    }
-    const joined = loadGroupsJoined().find((g) => !g.leaderUrl);
-    if (!joined) {
-      console.error("group remove requires being the leader — this node leads no group");
-      process.exit(1);
-    }
-    const members = groups.list()[joined.name]?.members || {};
-    const entries = Object.entries(members).filter(([id]) => id !== "leader");
-    const target = entries[seq - 1];
-    if (!target) {
-      console.error(`member #${seq} not found — group "${joined.name}" has ${entries.length} member(s)`);
-      process.exit(1);
-    }
-    const [id, m] = target;
-    try {
-      const removed = groups.removeMember(joined.name, { url: m.url });
-      if (removed) console.log(`removed ${m.url} from "${joined.name}"`);
-      else console.log(`member ${m.url} already gone from "${joined.name}"`);
-    } catch (err) {
-      console.error(`remove failed: ${errMsg(err)}`);
-      process.exit(1);
-    }
-  } else {
-    console.error("usage: mslxdff -group sync | -group leave <name> | -group list | -group remove <seq> | -creategroup <name>");
-  }
-  process.exit(0);
-}
-
-export async function handleAddToGroup(args) {
-  const addToGroupIdx = args.findIndex((x) => x === "-addtogroup" || x === "--addtogroup");
-  if (addToGroupIdx < 0) return false;
-  const rawArgs = args.slice(addToGroupIdx + 1);
-  const isBroadband = rawArgs.includes("--broadband");
-  const filtered = rawArgs.filter((a) => a !== "--broadband");
-  const [leaderHost, name] = filtered;
-  if (filtered.length > 2) {
-    console.error("usage: mslxdff -addtogroup <leader-host> <name> [--broadband]");
-    process.exit(1);
-  }
-  if (!leaderHost || !name) {
-    // 缺参数 → 手机宽带接入向导（默认 broadband：手机无公网入站，只出站）
-    const { runJoinWizard } = await import("../join-wizard.js");
-    const r = await runJoinWizard({ leaderInput: leaderHost || null, groupName: name || null });
-    process.exit(r.ok ? 0 : 1);
-  }
-  const r = await joinGroupCore({ leaderHost, name, isBroadband, args });
-  if (!r.ok) {
-    console.error(`join failed: ${r.error}`);
-    process.exit(1);
-  }
-  console.log(`joined group "${name}" at ${r.leaderUrl}${isBroadband ? " [broadband]" : ""}`);
-  if (r.syncError) console.log(`  local failover setup failed: ${r.syncError}`);
-  else console.log(`  ${r.added ?? 0} failover target(s) configured${isBroadband ? " (broadband via leader, local 127.0.0.1)" : ""}`);
-  process.exit(0);
-}
-
-export async function handleResetBan(args) {
-  const resetBanArg = argValue(args, "-resetban", "--resetban");
-  if (resetBanArg === null && !args.includes("-resetban") && !args.includes("--resetban")) return false;
-  const bans = createBansService({});
-  const ip = resetBanArg || null;
-  bans.clear(ip || undefined);
-  console.log(ip ? `ban cleared for ${ip}` : "all bans cleared");
-  process.exit(0);
-}
-
-export async function handleLeaveGroup(args) {
-  const leaveAll = args.includes("-leavegroup") || args.includes("--leavegroup") || args.includes("-leave-groups");
-  if (!leaveAll) return false;
-  const peers = createPeersService({});
-  const joined = loadGroupsJoined();
-  if (!joined.length) {
-    console.log("not joined to any group");
-    process.exit(0);
-  }
-  const myToken = (await loadToken()).token;
-  const leaders = [];
-  for (const g of joined) {
-    if (g.leaderUrl) {
-      const peersRemoved = peers.removeByGroup(g.name);
-      try {
-        const res = await compatFetch(`${g.leaderUrl}/v1/groups/leave`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            "Authorization": `Bearer ${myToken}`,
-          },
-          body: JSON.stringify({ name: g.name }),
-        });
-        if (res.ok) console.log(`${g.name}: left (deregistered from ${g.leaderUrl})`);
-        else console.log(`${g.name}: left locally (leader said: ${await res.text().catch(() => `HTTP ${res.status}`)})`);
-      } catch (err) {
-        console.log(`${g.name}: left locally (leader unreachable: ${errMsg(err)})`);
-      }
-    } else {
-      leaders.push(g.name);
-    }
-  }
-  const left = joined.filter((g) => g.leaderUrl).map((g) => g.name);
-  saveGroupsJoined(loadGroupsJoined().filter((g) => !left.includes(g.name)));
-  console.log(`left ${left.length} group(s)`);
-  if (leaders.length) {
-    console.log(`\nskipped ${leaders.length} group(s) where this node is the leader:`);
-    for (const n of leaders) console.log(`  ${n}  — leaders can't leave; disband it with: mslxdff -delgroup ${n}`);
-  }
-  process.exit(0);
-}
-
-export async function handleDelGroup(args) {
-  const delGroupName = argValue(args, "-delgroup", "--delgroup");
-  if (!delGroupName) return false;
-  const groups = createGroupsService({});
-  const peers = createPeersService({});
-  const local = groups.list()[delGroupName];
-  if (!local) {
-    const joined0 = loadGroupsJoined().find((g) => g.name === delGroupName);
-    if (joined0?.leaderUrl) {
-      console.log(`"${delGroupName}" is led by ${joined0.leaderUrl} — you are a member, use -leavegroup to leave it`);
-    } else if (joined0) {
-      console.log(`"${delGroupName}" exists in local state but has no group definition — nothing to delete`);
-    } else {
-      console.log(`group "${delGroupName}" not found on this node`);
-    }
-    process.exit(1);
-  }
-  const disbanded = groups.delete(delGroupName);
-  const members = Object.values(disbanded?.members || {});
-  peers.removeByGroup(delGroupName);
-  saveGroupsJoined(loadGroupsJoined().filter((g) => g.name !== delGroupName));
-  console.log(`group "${delGroupName}" disbanded (${members.length} member${members.length === 1 ? "" : "s"} removed)`);
-  process.exit(0);
-}
+import { createGroupsService, createBansService, refreshGroupMembers, syncPeersFromMembers } from "../../groups.js";
+import { createPeersService } from "../../peers.js";
+import { loadToken, loadGroupsJoined, saveGroupsJoined } from "../../state.js";
+import { groupIs, markJoined, probeHealth, syncAllJoinedGroups } from "../group-helpers.js";
+import { joinGroupCore } from "../join-core.js";
+import { errMsg } from "../util.js";
+import { argValue } from "../policy.js";
+import { compatFetch, timeoutSignal } from "../../compat.js";
+
+export async function handleGroupCreate(args) {
+  const createGroupArg = argValue(args, "-creategroup", "--creategroup") || groupIs("create", args);
+  if (!createGroupArg) return false;
+  const groups = createGroupsService({});
+  const peers = createPeersService({});
+  const name = createGroupArg;
+  const { created } = groups.create(name);
+  markJoined({ name, leaderUrl: "", myUrl: "", memberName: "leader" });
+  const synced = await syncAllJoinedGroups({ peers, groups });
+  const s = synced.find((x) => x.name === name);
+  console.log(created ? `group created: ${name}` : `group already exists: ${name}`);
+  console.log(`members on this node: ${s ? `${s.total} (failover: ${s.added})` : "?"}`);
+  console.log(`others join with: mslxdff -addtogroup <this-node-host> ${name}`);
+  process.exit(0);
+}
+
+export async function handleGroupCommand(args) {
+  const groupCmd = argValue(args, "-group", "--group");
+  if (!groupCmd || groupCmd === "create") return false;
+  const groups = createGroupsService({});
+  const peers = createPeersService({});
+  const rest = args.slice(args.indexOf("-group") + 1);
+  const [action, a] = rest;
+  if (action === "sync") {
+    const synced = await syncAllJoinedGroups({ peers, groups });
+    if (!synced.length) {
+      console.log("not joined to any group (use -addtogroup or -creategroup)");
+    } else {
+      for (const s of synced) {
+        if (s.error) console.log(`${s.name}: sync failed — ${s.error}`);
+        else console.log(`${s.name}: ${s.total} member(s), ${s.added} failover target(s) configured`);
+      }
+    }
+  } else if (action === "leave" && a) {
+    const before = loadGroupsJoined().filter((g) => g.name === a).length;
+    saveGroupsJoined(loadGroupsJoined().filter((g) => g.name !== a));
+    const removed = peers.removeByGroup(a);
+    console.log(before ? `left group "${a}" (${removed} member(s) removed)` : `not a member of group "${a}"`);
+  } else if (action === "list") {
+    const joinedList = loadGroupsJoined();
+    if (!joinedList.length) {
+      console.log("no groups on this node");
+      process.exit(0);
+    }
+    const { token } = await loadToken();
+    const fetchImpl = (url, opts) => compatFetch(url, { ...opts, signal: timeoutSignal(1500) });
+    for (const g of joinedList) {
+      const isLeader = !g.leaderUrl;
+      let members;
+      if (isLeader) {
+        members = groups.list()[g.name]?.members || {};
+      } else {
+        try {
+          members = await refreshGroupMembers(g.name, {
+            leaderUrl: g.leaderUrl,
+            memberName: g.memberName,
+            url: g.myUrl,
+            token,
+            fetchImpl,
+          });
+        } catch (err) {
+          console.log(`${g.name}  (members unavailable — leader unreachable: ${errMsg(err)})`);
+          continue;
+        }
+      }
+      const entries = Object.entries(members).filter(([id]) => id !== "leader");
+      console.log(`${g.name}  (${entries.length} member${entries.length === 1 ? "" : "s"})`);
+      const probes = await Promise.all(
+        entries.map(([id, m]) => probeHealth({ id, url: m?.url || id, kind: m?.kind, lastSeen: m?.lastSeen, publicIp: m?.publicIp }))
+      );
+      const leaderEntry = members.leader ? Object.entries(members).find(([id]) => id === "leader") : null;
+      const leaderProbe = leaderEntry ? await probeHealth({ id: "leader", url: leaderEntry[1].url }) : null;
+      const display = leaderProbe ? [...probes, leaderProbe] : probes;
+      let seq = 0;
+      for (const r of display) {
+        const m = entries.find(([eid]) => eid === r.id)?.[1] || (r.id === "leader" ? leaderEntry?.[1] : null);
+        const isBb = r.kind === "broadband" || String(r.url || "").startsWith("relay://") || m?.kind === "broadband";
+        if (isBb) {
+          const ago = r.lastSeen ? `${Math.round((Date.now() - r.lastSeen) / 1000)}s ago` : "no heartbeat yet";
+          const ip = r.publicIp || m?.publicIp || "?";
+          const via = r.stale ? "stale" : `via leader ${ago}`;
+          const stateBb = `${via} ip=${ip}`;
+          if (r.id === "leader") {
+            console.log(`  leader  ${r.url}  ${stateBb}`);
+            continue;
+          }
+          seq += 1;
+          const label = r.id && r.id !== r.url ? `  [${r.id}]` : "";
+          console.log(`  ${seq}. ${r.url}${label}  [broadband] ${stateBb}`);
+          continue;
+        }
+        const state = r.fail ? `fail  ${r.fail}` : `ok    ${r.ms}ms`;
+        if (r.id === "leader") {
+          console.log(`  leader  ${r.url}  ${state}`);
+          continue;
+        }
+        seq += 1;
+        const label = r.id && r.id !== r.url ? `  [${r.id}]` : "";
+        console.log(`  ${seq}. ${r.url}${label}  ${state}`);
+      }
+    }
+    console.log(`\njoined groups (${joinedList.length}):`);
+    for (const g of joinedList) console.log(`  ${g.name}  ${g.leaderUrl || "(this node is the leader)"}`);
+  } else if (action === "remove" && a) {
+    const seq = Number(a);
+    if (!Number.isInteger(seq) || seq < 1) {
+      console.error(`usage: mslxdff -group remove <seq>`);
+      process.exit(1);
+    }
+    const joined = loadGroupsJoined().find((g) => !g.leaderUrl);
+    if (!joined) {
+      console.error("group remove requires being the leader — this node leads no group");
+      process.exit(1);
+    }
+    const members = groups.list()[joined.name]?.members || {};
+    const entries = Object.entries(members).filter(([id]) => id !== "leader");
+    const target = entries[seq - 1];
+    if (!target) {
+      console.error(`member #${seq} not found — group "${joined.name}" has ${entries.length} member(s)`);
+      process.exit(1);
+    }
+    const [id, m] = target;
+    try {
+      const removed = groups.removeMember(joined.name, { url: m.url });
+      if (removed) console.log(`removed ${m.url} from "${joined.name}"`);
+      else console.log(`member ${m.url} already gone from "${joined.name}"`);
+    } catch (err) {
+      console.error(`remove failed: ${errMsg(err)}`);
+      process.exit(1);
+    }
+  } else {
+    console.error("usage: mslxdff -group sync | -group leave <name> | -group list | -group remove <seq> | -creategroup <name>");
+  }
+  process.exit(0);
+}
+
+export async function handleAddToGroup(args) {
+  const addToGroupIdx = args.findIndex((x) => x === "-addtogroup" || x === "--addtogroup");
+  if (addToGroupIdx < 0) return false;
+  const rawArgs = args.slice(addToGroupIdx + 1);
+  const isBroadband = rawArgs.includes("--broadband");
+  const filtered = rawArgs.filter((a) => a !== "--broadband");
+  const [leaderHost, name] = filtered;
+  if (filtered.length > 2) {
+    console.error("usage: mslxdff -addtogroup <leader-host> <name> [--broadband]");
+    process.exit(1);
+  }
+  if (!leaderHost || !name) {
+    // 缺参数 → 手机宽带接入向导（默认 broadband：手机无公网入站，只出站）
+    const { runJoinWizard } = await import("../join-wizard.js");
+    const r = await runJoinWizard({ leaderInput: leaderHost || null, groupName: name || null });
+    process.exit(r.ok ? 0 : 1);
+  }
+  const r = await joinGroupCore({ leaderHost, name, isBroadband, args });
+  if (!r.ok) {
+    console.error(`join failed: ${r.error}`);
+    process.exit(1);
+  }
+  console.log(`joined group "${name}" at ${r.leaderUrl}${isBroadband ? " [broadband]" : ""}`);
+  if (r.syncError) console.log(`  local failover setup failed: ${r.syncError}`);
+  else console.log(`  ${r.added ?? 0} failover target(s) configured${isBroadband ? " (broadband via leader, local 127.0.0.1)" : ""}`);
+  process.exit(0);
+}
+
+export async function handleResetBan(args) {
+  const resetBanArg = argValue(args, "-resetban", "--resetban");
+  if (resetBanArg === null && !args.includes("-resetban") && !args.includes("--resetban")) return false;
+  const bans = createBansService({});
+  const ip = resetBanArg || null;
+  bans.clear(ip || undefined);
+  console.log(ip ? `ban cleared for ${ip}` : "all bans cleared");
+  process.exit(0);
+}
+
+export async function handleLeaveGroup(args) {
+  const leaveAll = args.includes("-leavegroup") || args.includes("--leavegroup") || args.includes("-leave-groups");
+  if (!leaveAll) return false;
+  const peers = createPeersService({});
+  const joined = loadGroupsJoined();
+  if (!joined.length) {
+    console.log("not joined to any group");
+    process.exit(0);
+  }
+  const myToken = (await loadToken()).token;
+  const leaders = [];
+  for (const g of joined) {
+    if (g.leaderUrl) {
+      const peersRemoved = peers.removeByGroup(g.name);
+      try {
+        const res = await compatFetch(`${g.leaderUrl}/v1/groups/leave`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            "Authorization": `Bearer ${myToken}`,
+          },
+          body: JSON.stringify({ name: g.name }),
+        });
+        if (res.ok) console.log(`${g.name}: left (deregistered from ${g.leaderUrl})`);
+        else console.log(`${g.name}: left locally (leader said: ${await res.text().catch(() => `HTTP ${res.status}`)})`);
+      } catch (err) {
+        console.log(`${g.name}: left locally (leader unreachable: ${errMsg(err)})`);
+      }
+    } else {
+      leaders.push(g.name);
+    }
+  }
+  const left = joined.filter((g) => g.leaderUrl).map((g) => g.name);
+  saveGroupsJoined(loadGroupsJoined().filter((g) => !left.includes(g.name)));
+  console.log(`left ${left.length} group(s)`);
+  if (leaders.length) {
+    console.log(`\nskipped ${leaders.length} group(s) where this node is the leader:`);
+    for (const n of leaders) console.log(`  ${n}  — leaders can't leave; disband it with: mslxdff -delgroup ${n}`);
+  }
+  process.exit(0);
+}
+
+export async function handleDelGroup(args) {
+  const delGroupName = argValue(args, "-delgroup", "--delgroup");
+  if (!delGroupName) return false;
+  const groups = createGroupsService({});
+  const peers = createPeersService({});
+  const local = groups.list()[delGroupName];
+  if (!local) {
+    const joined0 = loadGroupsJoined().find((g) => g.name === delGroupName);
+    if (joined0?.leaderUrl) {
+      console.log(`"${delGroupName}" is led by ${joined0.leaderUrl} — you are a member, use -leavegroup to leave it`);
+    } else if (joined0) {
+      console.log(`"${delGroupName}" exists in local state but has no group definition — nothing to delete`);
+    } else {
+      console.log(`group "${delGroupName}" not found on this node`);
+    }
+    process.exit(1);
+  }
+  const disbanded = groups.delete(delGroupName);
+  const members = Object.values(disbanded?.members || {});
+  peers.removeByGroup(delGroupName);
+  saveGroupsJoined(loadGroupsJoined().filter((g) => g.name !== delGroupName));
+  console.log(`group "${delGroupName}" disbanded (${members.length} member${members.length === 1 ? "" : "s"} removed)`);
+  process.exit(0);
+}

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

@@ -1,14 +1,16 @@
 /**
  * 其他供应商 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"];
+  const order2 = ["workbuddy", "cline", "openrouter", "bai", "qoder", "qwenwork", "traework", "zcode", "codearts"];
   otherIds.sort((a, b) => {
     const ia = order2.indexOf(a), ib = order2.indexOf(b);
     if (ia !== -1 || ib !== -1) {
@@ -38,8 +40,7 @@ export async function renderOtherProviders({ pickedIds, ids, fullAliases }) {
           console.log(`     或放行全部: mslxdff -provider ${pid} allowAny on`);
         }
       } else {
-        for (const raw of allowed) {
-          const canonical = `${pid}/${raw}`;
+        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, "-");

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

@@ -1,6 +1,7 @@
 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) {
@@ -57,22 +58,19 @@ export function renderFreeList({ ids, at, pickedIds, sortedProvs, groups, aliasM
   }
 }
 
-/** 按供应商分组 + 排序（opencode/workbuddy/cline/openrouter 优先） */
+/** 按供应商分组 + 排序（opencode 段最前，已知供应商优先，组内字母序） */
 export function groupByProvider(ids) {
   const groups = {};
   for (const id of ids) {
-    const prov = String(id).includes("/") ? String(id).split("/")[0] : "opencode";
+    const prov = providerOf(id);
     if (!groups[prov]) groups[prov] = [];
     groups[prov].push(id);
   }
-  const order = ["opencode", "workbuddy", "cline", "openrouter"];
+  for (const key of Object.keys(groups)) groups[key].sort(compareModelIds);
   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;
-    }
+    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

@@ -0,0 +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);
+}