mslxdff 0.1.231 → 0.1.232

package/src/routes/models-route.js

@@ -1,167 +1,167 @@
-import { json, errMsg } from "./helpers.js";
-import { runHook } from "../plugins.js";
-import { isModelAllowed } from "../state.js";
-import { mergeModelsList } from "../model-capabilities/merge.js";
-import { globalCapabilities } from "../model-capabilities/index.js";
-
-// Codex 自定义 provider 拉目录要顶层 `models` 数组（codex-rs endpoint/models.rs 解 ModelsResponse{models}），
-// 给它 OpenAI 标准 {object,data} 会报 missing field `models`。学 OmniRoute：仅 codex 调用者追加空数组
-// （填真目录反而会覆盖 codex 内置 agent prompt，必须空），其他客户端保持字节一致。
-export function isCodexModelsCaller(req) {
-  const h = req?.headers || {};
-  if (/^codex_/i.test(String(h["user-agent"] || ""))) return true;
-  if (/^codex_/i.test(String(h.originator || ""))) return true;
-  const q = String(req?.url || "").split("?")[1] || "";
-  return /(^|&)client_version=/.test(q);
-}
-
-// 勾选即对外目录：modelPicks 非空时 /v1/models 只暴露勾选的模型（与 -models 交互勾选语义闭环）；
-// 空勾选 = 不过滤（保留旧默认全量目录，防呆：新装/清空勾选不至于对外空目录）。?all=1 逃生门。
-// Note: 空勾选不裁剪 + ?all=1 逃生门是硬边界（缺一即成单向棘轮/下游零模型）— 见 .agents/notes/implemented/architecture/2026-09-21-models-list-scoped-by-picks.md
-export function filterByPicks(data, picks) {
-  if (!picks?.length) return data;
-  const set = new Set(picks.map(String));
-  const list = (Array.isArray(data?.data) ? data.data : []).filter((m) => set.has(String(m?.id || "")));
-  return { ...(data || { object: "list" }), data: list };
-}
-
-export async function modelsHandler({ req, res, models, plugins, capabilities, wbSource, loadPicks } = {}) {
-  if (!models) return json(res, 501, { error: "Models service not configured" });
-  const codex = isCodexModelsCaller(req);
-  const withCodex = (out) => (codex && out && typeof out === "object" ? { ...out, models: [] } : out);
-  try {
-    let data = await models.get();
-    // ADR-0022：默认把能力富化进每条条目（capabilities 子对象）；?raw=1 逃生门回原始形状，
-    // codex 调用者保持原始 + 顶层空 models:[]（富化白做）。best-effort，失败原样返回。
-    const qs = String(req?.url || "").split("?")[1] || "";
-    const rawMode = /(^|&)raw=1(&|$)/.test(qs);
-    if (!codex && !rawMode) {
-      try {
-        data = await mergeModelsList(data, { capsSvc: capabilities, wbSource });
-      } catch { /* 富化失败不阻塞 /models */ }
-    }
-    // 勾选即对外目录（?all=1 逃生门）：picks 非空只暴露勾选项；空 picks 不过滤
-    if (!/(^|&)all=1(&|$)/.test(qs)) {
-      let picks = [];
-      try {
-        picks = (loadPicks ? await loadPicks() : (await import("../state.js")).loadModelPicks()) || [];
-      } catch { picks = []; }
-      data = filterByPicks(data, picks);
-    }
-    // 插件 hook：models:list — 返回数组可替换对外模型列表（{object:"list",data:[...]} 或纯 id 数组）
-    if (plugins?.length) {
-      const ml = await runHook(plugins, "models:list", { data });
-      for (const e of ml.errors) console.log(`plugin models:list error (${e.plugin}): ${e.error}`);
-      if (ml.changed && Array.isArray(ml.value)) {
-        const idsOnly = ml.value.every((x) => typeof x === "string");
-        const out = idsOnly
-          ? { object: "list", data: ml.value.map((id) => ({ id, object: "model", owned_by: "plugin" })) }
-          : { object: "list", data: ml.value };
-        return json(res, 200, withCodex(out));
-      }
-    }
-    json(res, 200, withCodex(data));
-  } catch (err) {
-    json(res, 502, { error: errMsg(err) });
-  }
-}
-
-export async function modelsStatusHandler({ res, models, auto }) {
-  const statuses = auto?.statuses?.() || {};
-  let ids = [];
-  try {
-    ids = (await models?.get?.())?.data?.map((m) => m.id) || [];
-  } catch {}
-  const seen = new Set();
-  const data = [];
-  for (const id of [...ids, ...Object.keys(statuses)]) {
-    if (seen.has(id)) continue;
-    seen.add(id);
-    const e = statuses[id];
-    const entry = typeof e === "number"
-      ? { id, status: "error", at: e }
-      : { id, status: e?.status || "normal", at: e?.at ?? null, code: e?.code ?? null };
-    data.push(entry);
-  }
-  json(res, 200, { object: "list", data });
-}
-
-export async function providerModelsHandler({ req, res, models }) {
-  if (!models) return json(res, 501, { error: "Models service not configured" });
-  const url = req.url || "";
-  const path = url.split("?")[0] || "";
-  const m = path.match(/^\/v1\/providers\/([^/]+)\/models\/?$/);
-  const pid = m ? decodeURIComponent(m[1]).toLowerCase() : "";
-  if (!pid) return json(res, 400, { error: "missing provider id" });
-  try {
-    const data = await models.get();
-    const all = Array.isArray(data?.data) ? data.data : [];
-    const filtered = all.filter((entry) => {
-      const id = String(entry?.id || "");
-      const slash = id.indexOf("/");
-      const prov = slash > 0 ? id.slice(0, slash).toLowerCase() : "opencode";
-      if (prov !== pid) return false;
-      const raw = slash > 0 ? id.slice(slash + 1) : id;
-      // allowlist check: opencode always allowed via allowAny, others respect config
-      try {
-        return isModelAllowed(pid, raw);
-      } catch { return true; }
-    });
-    json(res, 200, { object: "list", data: filtered });
-  } catch (err) {
-    json(res, 502, { error: errMsg(err) });
-  }
-}
-
-// workbuddy 能力目录源：共享 provider 单例（src/model-capabilities/index.js，
-// 与 -setto opencode 能力注入共用），拉上游原生字段全量 + 10min 缓存
-// 不走聚合 models.get()——聚合会按 allowlist 过滤，blocked 模型查能力 404 会误导（能力目录≠可调用目录，与 CLI 全量展示保持一致）
-async function workbuddyAllModels() {
-  const { workbuddyAllModels: wb } = await import("../model-capabilities/index.js");
-  return wb();
-}
-
-// GET /v1/models/capabilities[?provider=opencode|workbuddy][&id=big-pickle]
-// 模型能力元数据（reasoning 档位/图片输入/tool_call/上下文/价格）
-// - provider=opencode（默认）：源 = opencode 官方 models.dev 目录
-// - provider=workbuddy：源 = workbuddy 上游原生字段（maxInputTokens/supportsImages/... first-party 最准），
-//   id 用裸 id（如 glm-5.3-flash）；wbSource 注入仅测试接缝，生产用独立 provider 单例（全量+10min 缓存）
-// jsonFn 注入仅为测试接缝（S3）；生产路径用 helpers.json
-export async function capabilitiesHandler({ req, res, capabilities, wbSource, jsonFn = json }) {
-  // 仅未注入（生产）时用全局单例；显式 null 视作服务不可用（测试可复现 502 空状态）
-  const svc = capabilities === undefined ? globalCapabilities() : capabilities;
-  if (!svc && !wbSource) return jsonFn(res, 502, { error: "capabilities service unavailable" });
-  const q = String(req?.url || "").split("?")[1] || "";
-  const params = new URLSearchParams(q);
-  const provider = (params.get("provider") || "opencode").toLowerCase();
-  const id = params.get("id") || "";
-  // workbuddy 动态源分支：上游原生字段映射，不查 models.dev
-  if (provider === "workbuddy") {
-    try {
-      const { workbuddyCapsFromModels } = await import("../model-capabilities/index.js");
-      const map = await workbuddyCapsFromModels(wbSource || workbuddyAllModels)();
-      const rawId = id.replace(/^workbuddy\//i, "");
-      if (id) {
-        const caps = map[rawId];
-        if (!caps) return jsonFn(res, 404, { error: `model '${id}' not found in capabilities catalog (provider=workbuddy)` });
-        return jsonFn(res, 200, { object: "model.capabilities", id: rawId, provider, capabilities: caps });
-      }
-      const data = Object.entries(map).map(([mid, capabilities]) => ({ id: mid, capabilities }));
-      return jsonFn(res, 200, { object: "list", provider, data });
-    } catch (err) {
-      return jsonFn(res, 502, { error: `capabilities source unavailable: ${errMsg(err)}` });
-    }
-  }
-  try {
-    await svc.ready();
-  } catch (err) {
-    return jsonFn(res, 502, { error: `capabilities source unavailable: ${errMsg(err)}` });
-  }
-  if (id) {
-    const caps = svc.get(provider, id);
-    if (!caps) return jsonFn(res, 404, { error: `model '${id}' not found in capabilities catalog (provider=${provider})` });
-    return jsonFn(res, 200, { object: "model.capabilities", id, provider, capabilities: caps });
-  }
-  const data = svc.list(provider);
-  return jsonFn(res, 200, { object: "list", provider, data });
-}
+import { json, errMsg } from "./helpers.js";
+import { runHook } from "../plugins.js";
+import { isModelAllowed } from "../state.js";
+import { mergeModelsList } from "../model-capabilities/merge.js";
+import { globalCapabilities } from "../model-capabilities/index.js";
+
+// Codex 自定义 provider 拉目录要顶层 `models` 数组（codex-rs endpoint/models.rs 解 ModelsResponse{models}），
+// 给它 OpenAI 标准 {object,data} 会报 missing field `models`。学 OmniRoute：仅 codex 调用者追加空数组
+// （填真目录反而会覆盖 codex 内置 agent prompt，必须空），其他客户端保持字节一致。
+export function isCodexModelsCaller(req) {
+  const h = req?.headers || {};
+  if (/^codex_/i.test(String(h["user-agent"] || ""))) return true;
+  if (/^codex_/i.test(String(h.originator || ""))) return true;
+  const q = String(req?.url || "").split("?")[1] || "";
+  return /(^|&)client_version=/.test(q);
+}
+
+// 勾选即对外目录：modelPicks 非空时 /v1/models 只暴露勾选的模型（与 -models 交互勾选语义闭环）；
+// 空勾选 = 不过滤（保留旧默认全量目录，防呆：新装/清空勾选不至于对外空目录）。?all=1 逃生门。
+// Note: 空勾选不裁剪 + ?all=1 逃生门是硬边界（缺一即成单向棘轮/下游零模型）— 见 .agents/notes/implemented/architecture/2026-09-21-models-list-scoped-by-picks.md
+export function filterByPicks(data, picks) {
+  if (!picks?.length) return data;
+  const set = new Set(picks.map(String));
+  const list = (Array.isArray(data?.data) ? data.data : []).filter((m) => set.has(String(m?.id || "")));
+  return { ...(data || { object: "list" }), data: list };
+}
+
+export async function modelsHandler({ req, res, models, plugins, capabilities, wbSource, loadPicks } = {}) {
+  if (!models) return json(res, 501, { error: "Models service not configured" });
+  const codex = isCodexModelsCaller(req);
+  const withCodex = (out) => (codex && out && typeof out === "object" ? { ...out, models: [] } : out);
+  try {
+    let data = await models.get();
+    // ADR-0022：默认把能力富化进每条条目（capabilities 子对象）；?raw=1 逃生门回原始形状，
+    // codex 调用者保持原始 + 顶层空 models:[]（富化白做）。best-effort，失败原样返回。
+    const qs = String(req?.url || "").split("?")[1] || "";
+    const rawMode = /(^|&)raw=1(&|$)/.test(qs);
+    if (!codex && !rawMode) {
+      try {
+        data = await mergeModelsList(data, { capsSvc: capabilities, wbSource });
+      } catch { /* 富化失败不阻塞 /models */ }
+    }
+    // 勾选即对外目录（?all=1 逃生门）：picks 非空只暴露勾选项；空 picks 不过滤
+    if (!/(^|&)all=1(&|$)/.test(qs)) {
+      let picks = [];
+      try {
+        picks = (loadPicks ? await loadPicks() : (await import("../state.js")).loadModelPicks()) || [];
+      } catch { picks = []; }
+      data = filterByPicks(data, picks);
+    }
+    // 插件 hook：models:list — 返回数组可替换对外模型列表（{object:"list",data:[...]} 或纯 id 数组）
+    if (plugins?.length) {
+      const ml = await runHook(plugins, "models:list", { data });
+      for (const e of ml.errors) console.log(`plugin models:list error (${e.plugin}): ${e.error}`);
+      if (ml.changed && Array.isArray(ml.value)) {
+        const idsOnly = ml.value.every((x) => typeof x === "string");
+        const out = idsOnly
+          ? { object: "list", data: ml.value.map((id) => ({ id, object: "model", owned_by: "plugin" })) }
+          : { object: "list", data: ml.value };
+        return json(res, 200, withCodex(out));
+      }
+    }
+    json(res, 200, withCodex(data));
+  } catch (err) {
+    json(res, 502, { error: errMsg(err) });
+  }
+}
+
+export async function modelsStatusHandler({ res, models, auto }) {
+  const statuses = auto?.statuses?.() || {};
+  let ids = [];
+  try {
+    ids = (await models?.get?.())?.data?.map((m) => m.id) || [];
+  } catch {}
+  const seen = new Set();
+  const data = [];
+  for (const id of [...ids, ...Object.keys(statuses)]) {
+    if (seen.has(id)) continue;
+    seen.add(id);
+    const e = statuses[id];
+    const entry = typeof e === "number"
+      ? { id, status: "error", at: e }
+      : { id, status: e?.status || "normal", at: e?.at ?? null, code: e?.code ?? null };
+    data.push(entry);
+  }
+  json(res, 200, { object: "list", data });
+}
+
+export async function providerModelsHandler({ req, res, models }) {
+  if (!models) return json(res, 501, { error: "Models service not configured" });
+  const url = req.url || "";
+  const path = url.split("?")[0] || "";
+  const m = path.match(/^\/v1\/providers\/([^/]+)\/models\/?$/);
+  const pid = m ? decodeURIComponent(m[1]).toLowerCase() : "";
+  if (!pid) return json(res, 400, { error: "missing provider id" });
+  try {
+    const data = await models.get();
+    const all = Array.isArray(data?.data) ? data.data : [];
+    const filtered = all.filter((entry) => {
+      const id = String(entry?.id || "");
+      const slash = id.indexOf("/");
+      const prov = slash > 0 ? id.slice(0, slash).toLowerCase() : "opencode";
+      if (prov !== pid) return false;
+      const raw = slash > 0 ? id.slice(slash + 1) : id;
+      // allowlist check: opencode always allowed via allowAny, others respect config
+      try {
+        return isModelAllowed(pid, raw);
+      } catch { return true; }
+    });
+    json(res, 200, { object: "list", data: filtered });
+  } catch (err) {
+    json(res, 502, { error: errMsg(err) });
+  }
+}
+
+// workbuddy 能力目录源：共享 provider 单例（src/model-capabilities/index.js，
+// 与 -setto opencode 能力注入共用），拉上游原生字段全量 + 10min 缓存
+// 不走聚合 models.get()——聚合会按 allowlist 过滤，blocked 模型查能力 404 会误导（能力目录≠可调用目录，与 CLI 全量展示保持一致）
+async function workbuddyAllModels() {
+  const { workbuddyAllModels: wb } = await import("../model-capabilities/index.js");
+  return wb();
+}
+
+// GET /v1/models/capabilities[?provider=opencode|workbuddy][&id=big-pickle]
+// 模型能力元数据（reasoning 档位/图片输入/tool_call/上下文/价格）
+// - provider=opencode（默认）：源 = opencode 官方 models.dev 目录
+// - provider=workbuddy：源 = workbuddy 上游原生字段（maxInputTokens/supportsImages/... first-party 最准），
+//   id 用裸 id（如 glm-5.3-flash）；wbSource 注入仅测试接缝，生产用独立 provider 单例（全量+10min 缓存）
+// jsonFn 注入仅为测试接缝（S3）；生产路径用 helpers.json
+export async function capabilitiesHandler({ req, res, capabilities, wbSource, jsonFn = json }) {
+  // 仅未注入（生产）时用全局单例；显式 null 视作服务不可用（测试可复现 502 空状态）
+  const svc = capabilities === undefined ? globalCapabilities() : capabilities;
+  if (!svc && !wbSource) return jsonFn(res, 502, { error: "capabilities service unavailable" });
+  const q = String(req?.url || "").split("?")[1] || "";
+  const params = new URLSearchParams(q);
+  const provider = (params.get("provider") || "opencode").toLowerCase();
+  const id = params.get("id") || "";
+  // workbuddy 动态源分支：上游原生字段映射，不查 models.dev
+  if (provider === "workbuddy") {
+    try {
+      const { workbuddyCapsFromModels } = await import("../model-capabilities/index.js");
+      const map = await workbuddyCapsFromModels(wbSource || workbuddyAllModels)();
+      const rawId = id.replace(/^workbuddy\//i, "");
+      if (id) {
+        const caps = map[rawId];
+        if (!caps) return jsonFn(res, 404, { error: `model '${id}' not found in capabilities catalog (provider=workbuddy)` });
+        return jsonFn(res, 200, { object: "model.capabilities", id: rawId, provider, capabilities: caps });
+      }
+      const data = Object.entries(map).map(([mid, capabilities]) => ({ id: mid, capabilities }));
+      return jsonFn(res, 200, { object: "list", provider, data });
+    } catch (err) {
+      return jsonFn(res, 502, { error: `capabilities source unavailable: ${errMsg(err)}` });
+    }
+  }
+  try {
+    await svc.ready();
+  } catch (err) {
+    return jsonFn(res, 502, { error: `capabilities source unavailable: ${errMsg(err)}` });
+  }
+  if (id) {
+    const caps = svc.get(provider, id);
+    if (!caps) return jsonFn(res, 404, { error: `model '${id}' not found in capabilities catalog (provider=${provider})` });
+    return jsonFn(res, 200, { object: "model.capabilities", id, provider, capabilities: caps });
+  }
+  const data = svc.list(provider);
+  return jsonFn(res, 200, { object: "list", provider, data });
+}