mslxdff 0.1.203 → 0.1.208

package/src/providers/codearts/sts.js

@@ -1,124 +1,124 @@
-// STS /v1/oauth2/tokens：授权码换凭证 + refresh_token 续期（DPoP 必带）。
-// 终态失效（refresh_token 过期/已用/DPoP 或 client_id 不匹配）→ relogin=true，
-// 与网络/5xx 瞬时失败分开，避免好号被误杀或死号无限刷。
-import { STS_HOST, EP_OAUTH_TOKENS, CLIENT_ID } from "./const.js";
-import { signDpopProof } from "./dpop.js";
-import { compatFetch } from "../../compat.js";
-
-function tokenErr(rawText) {
-  try { return JSON.parse(rawText) || {}; } catch { return {}; }
-}
-
-// 对齐 codearts2api：invalid_grant / ExpiredRefreshToken / InvalidDPoPHeader /
-// invalid client id / has been used → 终态，必须重新登录。
-export function isReLoginRejected(status, rawText) {
-  const t = tokenErr(rawText);
-  const code = String(t.error_code || "");
-  const msg = String(t.error_msg || "");
-  const low = (t.error || msg).toLowerCase();
-  return t.error === "invalid_grant"
-    || code.includes("ExpiredRefreshToken")
-    || code.includes("InvalidDPoPHeader")
-    || low.includes("invalid client id")
-    || low.includes("has been used");
-}
-
-/** 归一化 STS 响应（新 credentials / 旧 credential 双形状）。 */
-export function normalizeTokenResponse(json) {
-  const c = json?.credentials || {};
-  const legacy = json?.credential || {};
-  const securityToken = c.security_token || legacy.securitytoken || "";
-  const accessKeyId = c.access_key_id || legacy.access || "";
-  const secretAccessKey = c.secret_access_key || legacy.secret || "";
-  const expiration = c.expiration || legacy.expires_at || "";
-  if (!securityToken || !accessKeyId || !secretAccessKey) return null;
-  const expiresAtMs = expiration ? Date.parse(expiration) : NaN;
-  return {
-    userId: String(json.user_id || ""),
-    userName: String(json.user_name || ""),
-    domainId: String(json.domain_id || ""),
-    refreshToken: String(json.refresh_token || ""),
-    accessKeyId,
-    secretAccessKey,
-    securityToken,
-    expiration,
-    expiresAtMs: Number.isFinite(expiresAtMs) ? expiresAtMs : 0,
-  };
-}
-
-async function postToken({ url, form, dpopJwk, fetchImpl }) {
-  const doFetch = fetchImpl || compatFetch;
-  const proof = signDpopProof(dpopJwk, url);
-  const res = await doFetch(url, {
-    method: "POST",
-    headers: { "content-type": "application/x-www-form-urlencoded", dpop: proof },
-    body: form.toString(),
-  });
-  const raw = await res.text().catch(() => "");
-  return { res, raw };
-}
-
-/**
- * 授权码换凭证（登录用）。
- * @param {object} p { code, verifier, redirectUri, clientId?, dpopJwk, fetchImpl?, stsHost? }
- */
-export async function exchangeAuthorizationCode({ code, verifier, redirectUri, clientId = CLIENT_ID, dpopJwk, fetchImpl, stsHost } = {}) {
-  const url = (stsHost || STS_HOST) + EP_OAUTH_TOKENS;
-  const form = new URLSearchParams({
-    client_id: clientId,
-    code: String(code || ""),
-    code_verifier: String(verifier || ""),
-    grant_type: "authorization_code",
-    redirect_uri: String(redirectUri || ""),
-  });
-  const { res, raw } = await postToken({ url, form, dpopJwk, fetchImpl });
-  if (res.status >= 400) throw new Error(`codearts sts exchange http ${res.status}: ${String(raw).slice(0, 200)}`);
-  const json = JSON.parse(raw);
-  const account = normalizeTokenResponse(json);
-  if (!account) throw new Error("codearts sts exchange: response missing credentials");
-  account.clientId = clientId;
-  return account;
-}
-
-/**
- * 用 refresh_token 换新 STS 凭证（refresh_token 单次轮换，响应里取新值写回）。
- * @param {object} blob 账号凭证 blob（refreshToken/codeVerifier/dpopJwk/clientId）
- * @param {object} [opts] { fetchImpl, stsHost }
- * @returns {{account, refreshToken?, relogin?, error?}}
- */
-export async function refreshStsCredential(blob, { fetchImpl, stsHost } = {}) {
-  const refreshToken = String(blob?.refreshToken || "");
-  const verifier = String(blob?.codeVerifier || "");
-  const jwk = blob?.dpopJwk;
-  const clientId = String(blob?.clientId || CLIENT_ID);
-  if (!refreshToken) return { account: null, relogin: true, error: "missing refresh_token" };
-  if (!verifier) return { account: null, relogin: true, error: "missing code_verifier" };
-  if (!jwk || !jwk.d) return { account: null, relogin: true, error: "missing DPoP private key — re-login required" };
-
-  const url = (stsHost || STS_HOST) + EP_OAUTH_TOKENS;
-  const form = new URLSearchParams({
-    client_id: clientId,
-    code_verifier: verifier,
-    grant_type: "refresh_token",
-    refresh_token: refreshToken,
-  });
-  let res, raw;
-  try {
-    ({ res, raw } = await postToken({ url, form, dpopJwk: jwk, fetchImpl }));
-  } catch (err) {
-    return { account: null, error: `network: ${err?.message || err}` };
-  }
-  if (res.status >= 400) {
-    if (isReLoginRejected(res.status, raw)) {
-      const t = tokenErr(raw);
-      return { account: null, relogin: true, status: res.status, code: t.error_code, error: `refresh rejected: ${String(raw).slice(0, 200)}` };
-    }
-    return { account: null, status: res.status, error: `sts http ${res.status}: ${String(raw).slice(0, 200)}` };
-  }
-  let json;
-  try { json = JSON.parse(raw); } catch { return { account: null, error: "sts returned non-JSON body" }; }
-  const account = normalizeTokenResponse(json);
-  if (!account) return { account: null, error: "sts response missing credentials" };
-  account.clientId = clientId;
-  return { account, refreshToken: account.refreshToken || null };
-}
+// STS /v1/oauth2/tokens：授权码换凭证 + refresh_token 续期（DPoP 必带）。
+// 终态失效（refresh_token 过期/已用/DPoP 或 client_id 不匹配）→ relogin=true，
+// 与网络/5xx 瞬时失败分开，避免好号被误杀或死号无限刷。
+import { STS_HOST, EP_OAUTH_TOKENS, CLIENT_ID } from "./const.js";
+import { signDpopProof } from "./dpop.js";
+import { compatFetch } from "../../compat.js";
+
+function tokenErr(rawText) {
+  try { return JSON.parse(rawText) || {}; } catch { return {}; }
+}
+
+// 对齐 codearts2api：invalid_grant / ExpiredRefreshToken / InvalidDPoPHeader /
+// invalid client id / has been used → 终态，必须重新登录。
+export function isReLoginRejected(status, rawText) {
+  const t = tokenErr(rawText);
+  const code = String(t.error_code || "");
+  const msg = String(t.error_msg || "");
+  const low = (t.error || msg).toLowerCase();
+  return t.error === "invalid_grant"
+    || code.includes("ExpiredRefreshToken")
+    || code.includes("InvalidDPoPHeader")
+    || low.includes("invalid client id")
+    || low.includes("has been used");
+}
+
+/** 归一化 STS 响应（新 credentials / 旧 credential 双形状）。 */
+export function normalizeTokenResponse(json) {
+  const c = json?.credentials || {};
+  const legacy = json?.credential || {};
+  const securityToken = c.security_token || legacy.securitytoken || "";
+  const accessKeyId = c.access_key_id || legacy.access || "";
+  const secretAccessKey = c.secret_access_key || legacy.secret || "";
+  const expiration = c.expiration || legacy.expires_at || "";
+  if (!securityToken || !accessKeyId || !secretAccessKey) return null;
+  const expiresAtMs = expiration ? Date.parse(expiration) : NaN;
+  return {
+    userId: String(json.user_id || ""),
+    userName: String(json.user_name || ""),
+    domainId: String(json.domain_id || ""),
+    refreshToken: String(json.refresh_token || ""),
+    accessKeyId,
+    secretAccessKey,
+    securityToken,
+    expiration,
+    expiresAtMs: Number.isFinite(expiresAtMs) ? expiresAtMs : 0,
+  };
+}
+
+async function postToken({ url, form, dpopJwk, fetchImpl }) {
+  const doFetch = fetchImpl || compatFetch;
+  const proof = signDpopProof(dpopJwk, url);
+  const res = await doFetch(url, {
+    method: "POST",
+    headers: { "content-type": "application/x-www-form-urlencoded", dpop: proof },
+    body: form.toString(),
+  });
+  const raw = await res.text().catch(() => "");
+  return { res, raw };
+}
+
+/**
+ * 授权码换凭证（登录用）。
+ * @param {object} p { code, verifier, redirectUri, clientId?, dpopJwk, fetchImpl?, stsHost? }
+ */
+export async function exchangeAuthorizationCode({ code, verifier, redirectUri, clientId = CLIENT_ID, dpopJwk, fetchImpl, stsHost } = {}) {
+  const url = (stsHost || STS_HOST) + EP_OAUTH_TOKENS;
+  const form = new URLSearchParams({
+    client_id: clientId,
+    code: String(code || ""),
+    code_verifier: String(verifier || ""),
+    grant_type: "authorization_code",
+    redirect_uri: String(redirectUri || ""),
+  });
+  const { res, raw } = await postToken({ url, form, dpopJwk, fetchImpl });
+  if (res.status >= 400) throw new Error(`codearts sts exchange http ${res.status}: ${String(raw).slice(0, 200)}`);
+  const json = JSON.parse(raw);
+  const account = normalizeTokenResponse(json);
+  if (!account) throw new Error("codearts sts exchange: response missing credentials");
+  account.clientId = clientId;
+  return account;
+}
+
+/**
+ * 用 refresh_token 换新 STS 凭证（refresh_token 单次轮换，响应里取新值写回）。
+ * @param {object} blob 账号凭证 blob（refreshToken/codeVerifier/dpopJwk/clientId）
+ * @param {object} [opts] { fetchImpl, stsHost }
+ * @returns {{account, refreshToken?, relogin?, error?}}
+ */
+export async function refreshStsCredential(blob, { fetchImpl, stsHost } = {}) {
+  const refreshToken = String(blob?.refreshToken || "");
+  const verifier = String(blob?.codeVerifier || "");
+  const jwk = blob?.dpopJwk;
+  const clientId = String(blob?.clientId || CLIENT_ID);
+  if (!refreshToken) return { account: null, relogin: true, error: "missing refresh_token" };
+  if (!verifier) return { account: null, relogin: true, error: "missing code_verifier" };
+  if (!jwk || !jwk.d) return { account: null, relogin: true, error: "missing DPoP private key — re-login required" };
+
+  const url = (stsHost || STS_HOST) + EP_OAUTH_TOKENS;
+  const form = new URLSearchParams({
+    client_id: clientId,
+    code_verifier: verifier,
+    grant_type: "refresh_token",
+    refresh_token: refreshToken,
+  });
+  let res, raw;
+  try {
+    ({ res, raw } = await postToken({ url, form, dpopJwk: jwk, fetchImpl }));
+  } catch (err) {
+    return { account: null, error: `network: ${err?.message || err}` };
+  }
+  if (res.status >= 400) {
+    if (isReLoginRejected(res.status, raw)) {
+      const t = tokenErr(raw);
+      return { account: null, relogin: true, status: res.status, code: t.error_code, error: `refresh rejected: ${String(raw).slice(0, 200)}` };
+    }
+    return { account: null, status: res.status, error: `sts http ${res.status}: ${String(raw).slice(0, 200)}` };
+  }
+  let json;
+  try { json = JSON.parse(raw); } catch { return { account: null, error: "sts returned non-JSON body" }; }
+  const account = normalizeTokenResponse(json);
+  if (!account) return { account: null, error: "sts response missing credentials" };
+  account.clientId = clientId;
+  return { account, refreshToken: account.refreshToken || null };
+}

package/src/providers/codearts.js

@@ -1 +1 @@
-export * from "./codearts/index.js";
+export * from "./codearts/index.js";

package/src/providers/dispatcher.js

@@ -1,147 +1,147 @@
- import { appendEvent } from "../logs.js";
- import { splitModelId, DEFAULT_PROVIDER, joinModelId } from "./model-id.js";
- import { isModelAllowed as stateIsAllowed, loadProviderAllowedModels as stateLoadAllowed, loadProviderAllowAnyModels as stateLoadAllowAny } from "../state.js";
-// 定制预热名单：registry customProviders 9 家 + 默认 opencode；openrouter/自配 generic 不预热（按需自拉）
-const CUSTOM_PREHEAT_IDS = new Set(["opencode", "workbuddy", "traework", "cline", "codearts", "qoder", "globalqwenwork", "qwenwork", "zcode", "raccoon"]);
- function isPreheatDisabled() {
-   const raw = process.env.MSLXDFF_PREHEAT;
-   if (raw === undefined || raw === null || raw === "") return false;
-   const s = String(raw).trim().toLowerCase();
-   return s === "0" || s === "off" || s === "false" || s === "no" || s === "disable" || s === "disabled";
- }
-
-// 多供应商 dispatcher：把多个 Provider 聚合成一个 `upstream` 形状（chat/preheat/close），
-// 按 body.model 的前缀路由到对应供应商，转发上游前剥掉前缀只发原始 id。
-// 纯化：第二参可注入纯函数 isAllowed/getAllowed/getAllowAny，便于单测不读盘
-export function createProviderDispatcher(providers = [], opts = {}) {
-  const byId = new Map(providers.map((p) => [p.id, p]));
-  // 纯化注入：第二参可为 {isAllowed, getAllowedModels, getAllowAny} 或直接函数 isAllowed
-  let isAllowedFn, getAllowedFn, getAllowAnyFn;
-  if (typeof opts === "function") {
-    isAllowedFn = opts;
-    getAllowedFn = stateLoadAllowed;
-    getAllowAnyFn = stateLoadAllowAny;
-  } else {
-    isAllowedFn = opts.isAllowed || stateIsAllowed;
-    getAllowedFn = opts.getAllowedModels || stateLoadAllowed;
-    getAllowAnyFn = opts.getAllowAny || stateLoadAllowAny;
-  }
-
-  function resolve(model) {
-    const split = splitModelId(model, providers.map((p) => p.id));
-    return {
-      provider: byId.get(split.provider) ?? byId.get(DEFAULT_PROVIDER) ?? providers[0],
-      raw: split.raw,
-      prefixed: split.prefixed,
-    };
-  }
-
-  async function chat(body, opts = {}) {
-    let { provider, raw } = resolve(body?.model);
-    if (!provider) throw new Error(`no provider for model ${body?.model ?? "(empty)"}`);
-    let workbuddyUid = opts?.workbuddyUid ? String(opts.workbuddyUid).trim() : "";
-    // model 前缀钉死：workbuddy/<uid>:<rawId>  -> 剥 uid，rawId 为真实模型
-    if (provider.id === "workbuddy" && typeof raw === "string" && raw.includes(":")) {
-      const idx = raw.indexOf(":");
-      const uidPart = raw.slice(0, idx).trim();
-      const modelPart = raw.slice(idx + 1).trim();
-      if (uidPart && modelPart) {
-        if (!workbuddyUid) workbuddyUid = uidPart;
-        raw = modelPart;
-      }
-    }
-    if (!isAllowedFn(provider.id, raw)) {
-      const allowed = getAllowedFn(provider.id) || [];
-      const msg = `model not allowed for provider "${provider.id}": "${raw}" — allowed: ${allowed.join(", ") || "(none)"} (use: mslxdff -provider ${provider.id} allowlist add <model>)`;
-      appendEvent({ type: "provider-model-state", provider: provider.id, model: body?.model, rawModel: raw, state: "blocked", reason: "allowlist", status: 403 });
-      return new Response(JSON.stringify({ error: msg }), { status: 403, headers: { "Content-Type": "application/json", "x-mslxdff-allowlist": "1" } });
-    }
-    const forwarded = raw === body?.model ? body : { ...body, model: raw };
-    // ADR-0008：本请求携带瞬时共享 key（shareKeys 由组员侧按 header 解析后传入）。
-    const sharedKeys = opts?.shareKeys?.[provider.id];
-    const startedAt = Date.now();
-    let res;
-    try {
-      if (sharedKeys && sharedKeys.length && typeof provider.chatWithKeys === "function") {
-        res = await provider.chatWithKeys(forwarded, sharedKeys, opts);
-      } else if (provider.id === "workbuddy" && workbuddyUid) {
-        res = await provider.chat(forwarded, { ...opts, workbuddyUid });
-      } else {
-        res = await provider.chat(forwarded, opts);
-      }
-    } catch (err) {
-      appendEvent({ type: "provider-model-state", provider: provider.id, model: body?.model, rawModel: raw, state: "upstream-error", error: String(err?.message || err), durationMs: Date.now() - startedAt });
-      throw err;
-    }
-    appendEvent({
-      type: "provider-model-state",
-      provider: provider.id,
-      model: body?.model,
-      rawModel: raw,
-      status: res?.status,
-      state: res?.status === 429 ? "limited" : res?.ok ? "ok" : "upstream-error",
-      durationMs: Date.now() - startedAt,
-    });
-    return res;
-  }
-
-  // 聚合所有供应商的模型列表；默认供应商（opencode）裸 id，其它带前缀
-  // 若某供应商设置了 allowlist（非空），则仅暴露白名单内的模型（按 raw id 匹配）
-  async function listModels() {
-    const out = [];
-    const seen = new Set();
-    for (const p of providers) {
-      let list;
-      try {
-        list = (await p.listModels?.()) ?? [];
-      } catch {
-        list = [];
-      }
-      const allowed = getAllowedFn(p.id) || [];
-      const allowAny = getAllowAnyFn(p.id);
-      const allowedSet = allowed.length ? new Set(allowed) : null;
-      // 空名单且不允许任意模型 => 该供应商不暴露任何模型（安全默认）
-      if (!allowedSet && !allowAny) continue;
-      for (const m of list) {
-        if (!m || !m.id) continue;
-        if (seen.has(m.id)) continue;
-        if (allowedSet) {
-          // m.id 已是带前缀的对外 id，需剥回 raw 再比对
-          const { raw } = splitModelId(m.id, providers.map((x) => x.id));
-          const rawNorm = String(raw || "").trim();
-          if (!allowedSet.has(rawNorm)) continue;
-          // 对于 opencode 裸 id，rawNorm 即 m.id 本身
-        }
-        seen.add(m.id);
-        out.push(m);
-      }
-    }
-    return out;
-  }
-
-  // 预热定制供应商 + 默认供应商（opencode）：registry 名单 8 家 + opencode 共 9 家并发各打一次；
-  // openrouter/用户自配 generic 不在此列（按需首次请求自拉）。单家失败静默，不拖累启动。
-  async function preheat() {
-    if (isPreheatDisabled()) return { ok: true, skipped: true };
-    const targets = providers.filter((p) => p && typeof p.preheat === "function" && CUSTOM_PREHEAT_IDS.has(p.id));
-    if (!targets.length) return { ok: false, skipped: true };
-    const settled = await Promise.all(targets.map(async (p) => {
-      try {
-        const r = await p.preheat();
-        return { id: p.id, ...(r && typeof r === "object" ? r : { ok: false }) };
-      } catch {
-        return { id: p.id, ok: false, error: "preheat failed" };
-      }
-    }));
-    const okCount = settled.filter((r) => r && r.ok).length;
-    return { ok: okCount > 0, results: settled, okCount, total: settled.length };
-  }
-
-  async function close() {
-    for (const p of providers) {
-      try { await p.close?.(); } catch {}
-    }
-  }
-
-  return { providers, byId, resolve, listModels, chat, preheat, close, joinModelId };
+ import { appendEvent } from "../logs.js";
+ import { splitModelId, DEFAULT_PROVIDER, joinModelId } from "./model-id.js";
+ import { isModelAllowed as stateIsAllowed, loadProviderAllowedModels as stateLoadAllowed, loadProviderAllowAnyModels as stateLoadAllowAny } from "../state.js";
+// 定制预热名单：registry customProviders 9 家 + 默认 opencode；openrouter/自配 generic 不预热（按需自拉）
+const CUSTOM_PREHEAT_IDS = new Set(["opencode", "workbuddy", "traework", "cline", "codearts", "qoder", "globalqwenwork", "qwenwork", "zcode", "raccoon"]);
+ function isPreheatDisabled() {
+   const raw = process.env.MSLXDFF_PREHEAT;
+   if (raw === undefined || raw === null || raw === "") return false;
+   const s = String(raw).trim().toLowerCase();
+   return s === "0" || s === "off" || s === "false" || s === "no" || s === "disable" || s === "disabled";
+ }
+
+// 多供应商 dispatcher：把多个 Provider 聚合成一个 `upstream` 形状（chat/preheat/close），
+// 按 body.model 的前缀路由到对应供应商，转发上游前剥掉前缀只发原始 id。
+// 纯化：第二参可注入纯函数 isAllowed/getAllowed/getAllowAny，便于单测不读盘
+export function createProviderDispatcher(providers = [], opts = {}) {
+  const byId = new Map(providers.map((p) => [p.id, p]));
+  // 纯化注入：第二参可为 {isAllowed, getAllowedModels, getAllowAny} 或直接函数 isAllowed
+  let isAllowedFn, getAllowedFn, getAllowAnyFn;
+  if (typeof opts === "function") {
+    isAllowedFn = opts;
+    getAllowedFn = stateLoadAllowed;
+    getAllowAnyFn = stateLoadAllowAny;
+  } else {
+    isAllowedFn = opts.isAllowed || stateIsAllowed;
+    getAllowedFn = opts.getAllowedModels || stateLoadAllowed;
+    getAllowAnyFn = opts.getAllowAny || stateLoadAllowAny;
+  }
+
+  function resolve(model) {
+    const split = splitModelId(model, providers.map((p) => p.id));
+    return {
+      provider: byId.get(split.provider) ?? byId.get(DEFAULT_PROVIDER) ?? providers[0],
+      raw: split.raw,
+      prefixed: split.prefixed,
+    };
+  }
+
+  async function chat(body, opts = {}) {
+    let { provider, raw } = resolve(body?.model);
+    if (!provider) throw new Error(`no provider for model ${body?.model ?? "(empty)"}`);
+    let workbuddyUid = opts?.workbuddyUid ? String(opts.workbuddyUid).trim() : "";
+    // model 前缀钉死：workbuddy/<uid>:<rawId>  -> 剥 uid，rawId 为真实模型
+    if (provider.id === "workbuddy" && typeof raw === "string" && raw.includes(":")) {
+      const idx = raw.indexOf(":");
+      const uidPart = raw.slice(0, idx).trim();
+      const modelPart = raw.slice(idx + 1).trim();
+      if (uidPart && modelPart) {
+        if (!workbuddyUid) workbuddyUid = uidPart;
+        raw = modelPart;
+      }
+    }
+    if (!isAllowedFn(provider.id, raw)) {
+      const allowed = getAllowedFn(provider.id) || [];
+      const msg = `model not allowed for provider "${provider.id}": "${raw}" — allowed: ${allowed.join(", ") || "(none)"} (use: mslxdff -provider ${provider.id} allowlist add <model>)`;
+      appendEvent({ type: "provider-model-state", provider: provider.id, model: body?.model, rawModel: raw, state: "blocked", reason: "allowlist", status: 403 });
+      return new Response(JSON.stringify({ error: msg }), { status: 403, headers: { "Content-Type": "application/json", "x-mslxdff-allowlist": "1" } });
+    }
+    const forwarded = raw === body?.model ? body : { ...body, model: raw };
+    // ADR-0008：本请求携带瞬时共享 key（shareKeys 由组员侧按 header 解析后传入）。
+    const sharedKeys = opts?.shareKeys?.[provider.id];
+    const startedAt = Date.now();
+    let res;
+    try {
+      if (sharedKeys && sharedKeys.length && typeof provider.chatWithKeys === "function") {
+        res = await provider.chatWithKeys(forwarded, sharedKeys, opts);
+      } else if (provider.id === "workbuddy" && workbuddyUid) {
+        res = await provider.chat(forwarded, { ...opts, workbuddyUid });
+      } else {
+        res = await provider.chat(forwarded, opts);
+      }
+    } catch (err) {
+      appendEvent({ type: "provider-model-state", provider: provider.id, model: body?.model, rawModel: raw, state: "upstream-error", error: String(err?.message || err), durationMs: Date.now() - startedAt });
+      throw err;
+    }
+    appendEvent({
+      type: "provider-model-state",
+      provider: provider.id,
+      model: body?.model,
+      rawModel: raw,
+      status: res?.status,
+      state: res?.status === 429 ? "limited" : res?.ok ? "ok" : "upstream-error",
+      durationMs: Date.now() - startedAt,
+    });
+    return res;
+  }
+
+  // 聚合所有供应商的模型列表；默认供应商（opencode）裸 id，其它带前缀
+  // 若某供应商设置了 allowlist（非空），则仅暴露白名单内的模型（按 raw id 匹配）
+  async function listModels() {
+    const out = [];
+    const seen = new Set();
+    for (const p of providers) {
+      let list;
+      try {
+        list = (await p.listModels?.()) ?? [];
+      } catch {
+        list = [];
+      }
+      const allowed = getAllowedFn(p.id) || [];
+      const allowAny = getAllowAnyFn(p.id);
+      const allowedSet = allowed.length ? new Set(allowed) : null;
+      // 空名单且不允许任意模型 => 该供应商不暴露任何模型（安全默认）
+      if (!allowedSet && !allowAny) continue;
+      for (const m of list) {
+        if (!m || !m.id) continue;
+        if (seen.has(m.id)) continue;
+        if (allowedSet) {
+          // m.id 已是带前缀的对外 id，需剥回 raw 再比对
+          const { raw } = splitModelId(m.id, providers.map((x) => x.id));
+          const rawNorm = String(raw || "").trim();
+          if (!allowedSet.has(rawNorm)) continue;
+          // 对于 opencode 裸 id，rawNorm 即 m.id 本身
+        }
+        seen.add(m.id);
+        out.push(m);
+      }
+    }
+    return out;
+  }
+
+  // 预热定制供应商 + 默认供应商（opencode）：registry 名单 8 家 + opencode 共 9 家并发各打一次；
+  // openrouter/用户自配 generic 不在此列（按需首次请求自拉）。单家失败静默，不拖累启动。
+  async function preheat() {
+    if (isPreheatDisabled()) return { ok: true, skipped: true };
+    const targets = providers.filter((p) => p && typeof p.preheat === "function" && CUSTOM_PREHEAT_IDS.has(p.id));
+    if (!targets.length) return { ok: false, skipped: true };
+    const settled = await Promise.all(targets.map(async (p) => {
+      try {
+        const r = await p.preheat();
+        return { id: p.id, ...(r && typeof r === "object" ? r : { ok: false }) };
+      } catch {
+        return { id: p.id, ok: false, error: "preheat failed" };
+      }
+    }));
+    const okCount = settled.filter((r) => r && r.ok).length;
+    return { ok: okCount > 0, results: settled, okCount, total: settled.length };
+  }
+
+  async function close() {
+    for (const p of providers) {
+      try { await p.close?.(); } catch {}
+    }
+  }
+
+  return { providers, byId, resolve, listModels, chat, preheat, close, joinModelId };
 }