mslxdff 0.1.222 → 0.1.224

package/package.json

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

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

@@ -10,7 +10,7 @@ export async function renderOtherProviders({ pickedIds, ids, fullAliases }) {
   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"];
+  const order2 = ["workbuddy", "cline", "openrouter", "bai", "qoder", "qwenwork", "globalqwenwork", "traework", "zcode", "raccoon", "codearts", "railway"];
   otherIds.sort((a, b) => {
     const ia = order2.indexOf(a), ib = order2.indexOf(b);
     if (ia !== -1 || ib !== -1) {
@@ -31,10 +31,25 @@ export async function renderOtherProviders({ pickedIds, ids, fullAliases }) {
         ? (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}` : ""} ──`);
+      // allowAny ON 且没设 allowlist = 该供应商全部模型放行。此时**把 live 列表展开**：
+      // 只打「未设 allowlist」两行会让用户以为这家没有模型（2026-10-20 railway 就是这么"消失"的）。
+      const live = (ids || []).filter((id) => String(id).startsWith(`${pid}/`));
       if (!allowed.length) {
         if (allowAny) {
-          console.log(`     (未设 allowlist，全部模型放行)  查看 live 列表: mslxdff -provider ${pid} models`);
-          console.log(`     限制可用模型: mslxdff -provider ${pid} allowlist set <model1> <model2>`);
+          if (live.length) {
+            for (const canonical of live.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(`     (未设 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`);

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

@@ -30,7 +30,31 @@ export async function handleModelList(args, idx, sub) {
     }
   }
   const cacheFile = join(logDir(), "models.json");
+  // 模型来源：优先问**本机网关**（daemon 的多供应商聚合，含 railway/codearts/workbuddy 等），
+  // 拉不到才退回「直连 opencode 单家」——后者只有一个供应商，会让所有定制供应商的模型消失
+  // （2026-10-20 实测：-models 看不到 railway 正是这个原因）。
+  async function tryGatewayModels() {
+    try {
+      const port = process.env.PORT || process.env.MSLXDFF_PORT || 8989;
+      const { loadToken } = await import("../../../state.js");
+      const { token } = await loadToken();
+      if (!token) return null;
+      const res = await fetch(`http://127.0.0.1:${port}/v1/models?all=1`, {
+        headers: { Authorization: `Bearer ${token}` },
+        signal: AbortSignal.timeout(6000),
+      });
+      if (!res.ok) return null;
+      const j = await res.json();
+      return Array.isArray(j?.data) && j.data.length ? j : null;
+    } catch {
+      return null;
+    }
+  }
   async function tryRefreshModels() {
+    // ① 网关聚合（最全，含所有已装配供应商）
+    const viaGateway = await tryGatewayModels();
+    if (viaGateway) return viaGateway;
+    // ② 回退：直连 opencode（daemon 没起/无 token 时的单家兜底）
     try {
       const models = createModelsService({
         baseUrl: process.env.UPSTREAM_BASE_URL || "https://opencode.ai",

package/src/providers/railway.js

@@ -7,12 +7,13 @@
 //   ③ 带 opencode 身份头（UA + client/session/request/project），否则同样 403。
 //
 // 端点：<base>/zen/v1/models、<base>/zen/v1/chat/completions（base 缺省为 Railway 反代根）。
+import crypto from "node:crypto";
 import { createKeyRing } from "./keyring.js";
 import { collectApiKeysGeneric, envInt, createAgent, getUndici, joinUrl } from "./base.js";
 import { compatFetch } from "../compat.js";
 import { loadProviderBaseUrl, loadProviderKeys, saveProviderConfig } from "../state.js";
 import { ensureFreeLaneShape, aggregateChatSse } from "../free-lane.js";
-import { genId, opencodeUa } from "../opencode-identity.js";
+import { genId, opencodeUa, digestIdTail } from "../opencode-identity.js";
 import { joinModelId } from "./model-id.js";
 
 const { UndiciFetch } = getUndici();
@@ -72,17 +73,31 @@ export function createRailwayProvider({
   } catch {}
 
   // 身份头 + free-lane：railway 反代的是 zen，两样缺一不可（缺任一都是 403 FreeTierError）。
+  // 会话取值同 generic.js 的 resolveGoSession：已合规（ses_ 前缀）直接用；客户端透传的任意串
+  // 做 sha1 摘要派生（稳定 + 合规）；无则每请求 fresh。绝不可裸拼 `ses_` + 客户端串——上游会反解
+  // 低 12 位校验 counter，形状不符 403 FreeTierError（见 opencode-identity.js 头注）。
+  function resolveSession(id) {
+    const raw = String(id || "").trim();
+    if (/^ses_/.test(raw)) return raw;
+    if (raw) {
+      try {
+        return `ses_${digestIdTail(crypto.createHash("sha1").update(raw).digest())}`;
+      } catch {
+        return genId("ses_");
+      }
+    }
+    return genId("ses_");
+  }
+
   function buildHeaders(opts = {}) {
     return {
       "Content-Type": "application/json",
       "Accept": "text/event-stream",
       "User-Agent": opencodeUa(),
       "x-opencode-client": "desktop",
-      // session 复用调用方给的会话 id（同会话粘同一上游会话），没有才现生成
-      "x-opencode-session": opts.sessionId ? `ses_${String(opts.sessionId).slice(0, 24)}` : genId("ses_"),
+      "x-opencode-session": resolveSession(opts.sessionId),
       "x-opencode-request": genId("msg_"),
       "x-opencode-project": "global",
-      ...(ring.size ? {} : {}),
     };
   }