mslxdff 0.1.203 → 0.1.207

package/src/providers/globalworkbuddy/models.js

@@ -1,96 +1,96 @@
-// 目录服务：`GET /v3/config` → 带 `globalworkbuddy/` 前缀的模型表，10 分钟缓存。
-// 三条取证结论落在这里：① 国内版的 console 目录在国际版恒 500，**不留那条兜底路径**；
-// ② 目录不随 UA 变（结论 B），所以 UA 只是排障变量；③ 取数失败要**标来源**回落，
-//    让上层能分清「真目录」与「兜底表」—— 拿兜底表冒充上游目录去烧积分是最坏情况。
-import { compatFetch, timeoutSignal } from "../../compat.js";
-import { joinUrl } from "../base.js";
-import { joinModelId } from "../model-id.js";
-import { BASE, MODELS_PATH, MODELS_CACHE_MS, JSON_TIMEOUT_MS } from "./constants.js";
-import { catalogHeaders } from "./headers.js";
-import { unwrapConfigDocument, parseModelCatalog, fallbackCatalog } from "./catalog.js";
-import { classifyUpstreamError } from "./errors.js";
-
-export function createModelsService({
-  id = "globalworkbuddy",
-  baseUrl = BASE,
-  fetchImpl,
-  dispatcher,
-  getCred,              // async () => cred | null（第一个可用国际号）
-  authService,
-  clock = Date.now,
-} = {}) {
-  if (!fetchImpl) fetchImpl = compatFetch;
-  const resolvedBase = String(baseUrl || BASE).trim().replace(/\/+$/, "");
-  let cache = null;          // { rows, source, fetchedAt }
-  let refreshInFlight = null;
-
-  async function exec(cred) {
-    const opts = { headers: catalogHeaders(cred), signal: timeoutSignal(JSON_TIMEOUT_MS) };
-    if (dispatcher) opts.dispatcher = dispatcher;
-    return fetchImpl(joinUrl(resolvedBase, MODELS_PATH), opts);
-  }
-
-  async function readOnce(cred) {
-    const res = await exec(cred);
-    if (!res.ok) {
-      let text = "";
-      try { text = await res.clone().text(); } catch {}
-      return { ok: false, kind: classifyUpstreamError(res.status, text).kind, status: res.status };
-    }
-    const json = await res.json().catch(() => ({}));
-    const rows = parseModelCatalog(unwrapConfigDocument(json));
-    if (!rows.length) return { ok: false, kind: "empty", status: res.status };
-    return { ok: true, rows, status: res.status };
-  }
-
-  /** 真正打上游：401/会话失效时刷一次再来；失败回落兜底表（并保留上次成功结果优先）。 */
-  async function fetchLive() {
-    const cred = typeof getCred === "function" ? await getCred() : null;
-    if (!cred?.accessToken) return { rows: fallbackCatalog(), source: "fallback", reason: "no-credential" };
-    let r = await readOnce(cred);
-    if (!r.ok && r.kind === "session_dead" && authService && !refreshInFlight) {
-      refreshInFlight = (async () => {
-        const nk = await authService.refreshTokenFor?.(cred);
-        return nk ? { ...cred, accessToken: nk } : null;
-      })();
-      try {
-        const cred2 = await refreshInFlight;
-        if (cred2) r = await readOnce(cred2);
-      } finally { refreshInFlight = null; }
-    }
-    if (r.ok) return { rows: r.rows, source: "upstream", status: r.status };
-    // 上游失败：先吃旧缓存（哪怕过期），再退兜底表 —— 目录列表空掉比目录旧更伤体验
-    if (cache?.rows?.length) return { rows: cache.rows, source: cache.source, stale: true, reason: r.kind };
-    return { rows: fallbackCatalog(), source: "fallback", reason: r.kind };
-  }
-
-  async function listModels() {
-    const now = clock();
-    if (cache && cache.source === "upstream" && now - cache.fetchedAt < MODELS_CACHE_MS) {
-      return cache.rows.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
-    }
-    const out = await fetchLive();
-    cache = { rows: out.rows, source: out.source, fetchedAt: now, reason: out.reason || "" };
-    return cache.rows.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
-  }
-
-  /** 预热：只探连通与鉴权，不解析结果；失败也回结构，供启动日志一行诊断。 */
-  async function preheat() {
-    const t0 = clock();
-    try {
-      const cred = typeof getCred === "function" ? await getCred() : null;
-      if (!cred?.accessToken) return { ok: false, error: "no-credential", ms: 0 };
-      const res = await exec(cred);
-      try { if (res.body) await res.text().catch(() => {}); } catch {}
-      return { ok: res.ok, status: res.status, ms: Math.round(clock() - t0) };
-    } catch (err) {
-      return { ok: false, error: String(err?.message || err), ms: Math.round(clock() - t0) };
-    }
-  }
-
-  function clearCache() { cache = null; }
-  /** 给状态卡/诊断用：当前列表来自上游还是兜底。 */
-  function catalogSource() { return cache ? { source: cache.source, fetchedAt: cache.fetchedAt, reason: cache.reason } : null; }
-
-  return { listModels, preheat, clearCache, catalogSource, _getCache: () => cache };
-}
+// 目录服务：`GET /v3/config` → 带 `globalworkbuddy/` 前缀的模型表，10 分钟缓存。
+// 三条取证结论落在这里：① 国内版的 console 目录在国际版恒 500，**不留那条兜底路径**；
+// ② 目录不随 UA 变（结论 B），所以 UA 只是排障变量；③ 取数失败要**标来源**回落，
+//    让上层能分清「真目录」与「兜底表」—— 拿兜底表冒充上游目录去烧积分是最坏情况。
+import { compatFetch, timeoutSignal } from "../../compat.js";
+import { joinUrl } from "../base.js";
+import { joinModelId } from "../model-id.js";
+import { BASE, MODELS_PATH, MODELS_CACHE_MS, JSON_TIMEOUT_MS } from "./constants.js";
+import { catalogHeaders } from "./headers.js";
+import { unwrapConfigDocument, parseModelCatalog, fallbackCatalog } from "./catalog.js";
+import { classifyUpstreamError } from "./errors.js";
+
+export function createModelsService({
+  id = "globalworkbuddy",
+  baseUrl = BASE,
+  fetchImpl,
+  dispatcher,
+  getCred,              // async () => cred | null（第一个可用国际号）
+  authService,
+  clock = Date.now,
+} = {}) {
+  if (!fetchImpl) fetchImpl = compatFetch;
+  const resolvedBase = String(baseUrl || BASE).trim().replace(/\/+$/, "");
+  let cache = null;          // { rows, source, fetchedAt }
+  let refreshInFlight = null;
+
+  async function exec(cred) {
+    const opts = { headers: catalogHeaders(cred), signal: timeoutSignal(JSON_TIMEOUT_MS) };
+    if (dispatcher) opts.dispatcher = dispatcher;
+    return fetchImpl(joinUrl(resolvedBase, MODELS_PATH), opts);
+  }
+
+  async function readOnce(cred) {
+    const res = await exec(cred);
+    if (!res.ok) {
+      let text = "";
+      try { text = await res.clone().text(); } catch {}
+      return { ok: false, kind: classifyUpstreamError(res.status, text).kind, status: res.status };
+    }
+    const json = await res.json().catch(() => ({}));
+    const rows = parseModelCatalog(unwrapConfigDocument(json));
+    if (!rows.length) return { ok: false, kind: "empty", status: res.status };
+    return { ok: true, rows, status: res.status };
+  }
+
+  /** 真正打上游：401/会话失效时刷一次再来；失败回落兜底表（并保留上次成功结果优先）。 */
+  async function fetchLive() {
+    const cred = typeof getCred === "function" ? await getCred() : null;
+    if (!cred?.accessToken) return { rows: fallbackCatalog(), source: "fallback", reason: "no-credential" };
+    let r = await readOnce(cred);
+    if (!r.ok && r.kind === "session_dead" && authService && !refreshInFlight) {
+      refreshInFlight = (async () => {
+        const nk = await authService.refreshTokenFor?.(cred);
+        return nk ? { ...cred, accessToken: nk } : null;
+      })();
+      try {
+        const cred2 = await refreshInFlight;
+        if (cred2) r = await readOnce(cred2);
+      } finally { refreshInFlight = null; }
+    }
+    if (r.ok) return { rows: r.rows, source: "upstream", status: r.status };
+    // 上游失败：先吃旧缓存（哪怕过期），再退兜底表 —— 目录列表空掉比目录旧更伤体验
+    if (cache?.rows?.length) return { rows: cache.rows, source: cache.source, stale: true, reason: r.kind };
+    return { rows: fallbackCatalog(), source: "fallback", reason: r.kind };
+  }
+
+  async function listModels() {
+    const now = clock();
+    if (cache && cache.source === "upstream" && now - cache.fetchedAt < MODELS_CACHE_MS) {
+      return cache.rows.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+    }
+    const out = await fetchLive();
+    cache = { rows: out.rows, source: out.source, fetchedAt: now, reason: out.reason || "" };
+    return cache.rows.map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+  }
+
+  /** 预热：只探连通与鉴权，不解析结果；失败也回结构，供启动日志一行诊断。 */
+  async function preheat() {
+    const t0 = clock();
+    try {
+      const cred = typeof getCred === "function" ? await getCred() : null;
+      if (!cred?.accessToken) return { ok: false, error: "no-credential", ms: 0 };
+      const res = await exec(cred);
+      try { if (res.body) await res.text().catch(() => {}); } catch {}
+      return { ok: res.ok, status: res.status, ms: Math.round(clock() - t0) };
+    } catch (err) {
+      return { ok: false, error: String(err?.message || err), ms: Math.round(clock() - t0) };
+    }
+  }
+
+  function clearCache() { cache = null; }
+  /** 给状态卡/诊断用：当前列表来自上游还是兜底。 */
+  function catalogSource() { return cache ? { source: cache.source, fetchedAt: cache.fetchedAt, reason: cache.reason } : null; }
+
+  return { listModels, preheat, clearCache, catalogSource, _getCache: () => cache };
+}

package/src/providers/globalworkbuddy/payload.js

@@ -1,80 +1,80 @@
-// 国际版出站 chat body 改写。四条规则**全部是本 provider 现网实测**（2026-10-05，见 FINDINGS 结论 C/C 表），
-// 不是从国内版 `workbuddy/payload.js` 搬来的经验值。
-//
-//   规则                     实测响应
-//   缺首条 system       →    400/11128 "first message is not system prompt"
-//   role:"developer"    →    400/11128 "Illegal API invocation from an unapproved channel"
-//   tool_choice 传对象  →    400/11101 "cannot unmarshal object into ... Request.tool_choice of type string"
-//   reasoning_effort:"off" → 国际版 GPT 系 400/11133（参考仓库 issue #49/#50 同款；本区只删这一个字面量）
-//
-// ⚠ **刻意不做**的两件事（国内版 payload.js 里有，国际版未取证，凭经验加等于猜上游）：
-//   · DeepSeek `thinking.type=enabled` 注入 —— 国际版是否需要/是否接受该非标字段，未测；
-//   · assistant `reasoning_content` 回填 —— 同上。要加先跑探针（`.scratch/globalworkbuddy/probe*.mjs` 有现成骨架）。
-export const INTERNATIONAL_SYSTEM_PROMPT = "You are a helpful assistant.";
-
-/** role 归一：上游白名单不含 developer。就地改，返回改动计数供日志。 */
-export function normalizeRoles(obj) {
-  const msgs = obj?.messages;
-  if (!Array.isArray(msgs)) return obj;
-  for (const m of msgs) {
-    if (m && typeof m === "object" && typeof m.role === "string" && m.role.trim().toLowerCase() === "developer") {
-      m.role = "system";
-    }
-  }
-  return obj;
-}
-
-/** tool_choice 必须是 string；`none` 连带删掉 tools/functions（上游会拒「说不调工具又给工具」）。 */
-export function normalizeToolChoice(obj) {
-  const tc = obj?.tool_choice;
-  if (tc === undefined || tc === null) return obj;
-  const dropTools = () => { delete obj.tools; delete obj.functions; };
-  if (typeof tc === "string") {
-    if (tc.trim().toLowerCase() === "none") { delete obj.tool_choice; dropTools(); }
-    return obj;
-  }
-  if (typeof tc === "object") {
-    const type = String(tc.type || "").trim().toLowerCase();
-    if (type === "none") { delete obj.tool_choice; dropTools(); }
-    else if (type === "auto" || type === "required") obj.tool_choice = type;
-    else if (type === "function") {
-      const name = String(tc?.function?.name || tc?.name || "").trim();
-      obj.tool_choice = name || "auto";
-    } else delete obj.tool_choice;
-    return obj;
-  }
-  delete obj.tool_choice;
-  return obj;
-}
-
-/** 只删适配器自造的 `off`；`low/medium/high/xhigh/max` 与显式 `none` 原样透传。 */
-export function dropUnsupportedEffort(obj) {
-  if (obj?.reasoning_effort === "off") delete obj.reasoning_effort;
-  return obj;
-}
-
-/** 首条必须 system：缺了就**前插**一条中性提示，绝不合并/改写用户已有消息。 */
-export function ensureLeadingSystem(obj) {
-  if (!Array.isArray(obj?.messages)) return obj;
-  const first = obj.messages[0];
-  if (first && typeof first === "object" && first.role === "system") return obj;
-  obj.messages.unshift({ role: "system", content: INTERNATIONAL_SYSTEM_PROMPT });
-  return obj;
-}
-
-/**
- * 入口：吃 OpenAI 形状 body，返回**新对象**（messages 浅拷贝，不污染调用方）。
- * 上游拒绝非流式，故强制 `stream: true`。
- */
-export function rewriteGlobalworkbuddyPayload(body) {
-  if (!body || typeof body !== "object") return body;
-  const obj = { ...body, stream: true };
-  obj.messages = Array.isArray(body.messages)
-    ? body.messages.map((m) => (m && typeof m === "object" ? { ...m } : m))
-    : body.messages;
-  normalizeRoles(obj);
-  normalizeToolChoice(obj);
-  dropUnsupportedEffort(obj);
-  ensureLeadingSystem(obj);
-  return obj;
-}
+// 国际版出站 chat body 改写。四条规则**全部是本 provider 现网实测**（2026-10-05，见 FINDINGS 结论 C/C 表），
+// 不是从国内版 `workbuddy/payload.js` 搬来的经验值。
+//
+//   规则                     实测响应
+//   缺首条 system       →    400/11128 "first message is not system prompt"
+//   role:"developer"    →    400/11128 "Illegal API invocation from an unapproved channel"
+//   tool_choice 传对象  →    400/11101 "cannot unmarshal object into ... Request.tool_choice of type string"
+//   reasoning_effort:"off" → 国际版 GPT 系 400/11133（参考仓库 issue #49/#50 同款；本区只删这一个字面量）
+//
+// ⚠ **刻意不做**的两件事（国内版 payload.js 里有，国际版未取证，凭经验加等于猜上游）：
+//   · DeepSeek `thinking.type=enabled` 注入 —— 国际版是否需要/是否接受该非标字段，未测；
+//   · assistant `reasoning_content` 回填 —— 同上。要加先跑探针（`.scratch/globalworkbuddy/probe*.mjs` 有现成骨架）。
+export const INTERNATIONAL_SYSTEM_PROMPT = "You are a helpful assistant.";
+
+/** role 归一：上游白名单不含 developer。就地改，返回改动计数供日志。 */
+export function normalizeRoles(obj) {
+  const msgs = obj?.messages;
+  if (!Array.isArray(msgs)) return obj;
+  for (const m of msgs) {
+    if (m && typeof m === "object" && typeof m.role === "string" && m.role.trim().toLowerCase() === "developer") {
+      m.role = "system";
+    }
+  }
+  return obj;
+}
+
+/** tool_choice 必须是 string；`none` 连带删掉 tools/functions（上游会拒「说不调工具又给工具」）。 */
+export function normalizeToolChoice(obj) {
+  const tc = obj?.tool_choice;
+  if (tc === undefined || tc === null) return obj;
+  const dropTools = () => { delete obj.tools; delete obj.functions; };
+  if (typeof tc === "string") {
+    if (tc.trim().toLowerCase() === "none") { delete obj.tool_choice; dropTools(); }
+    return obj;
+  }
+  if (typeof tc === "object") {
+    const type = String(tc.type || "").trim().toLowerCase();
+    if (type === "none") { delete obj.tool_choice; dropTools(); }
+    else if (type === "auto" || type === "required") obj.tool_choice = type;
+    else if (type === "function") {
+      const name = String(tc?.function?.name || tc?.name || "").trim();
+      obj.tool_choice = name || "auto";
+    } else delete obj.tool_choice;
+    return obj;
+  }
+  delete obj.tool_choice;
+  return obj;
+}
+
+/** 只删适配器自造的 `off`；`low/medium/high/xhigh/max` 与显式 `none` 原样透传。 */
+export function dropUnsupportedEffort(obj) {
+  if (obj?.reasoning_effort === "off") delete obj.reasoning_effort;
+  return obj;
+}
+
+/** 首条必须 system：缺了就**前插**一条中性提示，绝不合并/改写用户已有消息。 */
+export function ensureLeadingSystem(obj) {
+  if (!Array.isArray(obj?.messages)) return obj;
+  const first = obj.messages[0];
+  if (first && typeof first === "object" && first.role === "system") return obj;
+  obj.messages.unshift({ role: "system", content: INTERNATIONAL_SYSTEM_PROMPT });
+  return obj;
+}
+
+/**
+ * 入口：吃 OpenAI 形状 body，返回**新对象**（messages 浅拷贝，不污染调用方）。
+ * 上游拒绝非流式，故强制 `stream: true`。
+ */
+export function rewriteGlobalworkbuddyPayload(body) {
+  if (!body || typeof body !== "object") return body;
+  const obj = { ...body, stream: true };
+  obj.messages = Array.isArray(body.messages)
+    ? body.messages.map((m) => (m && typeof m === "object" ? { ...m } : m))
+    : body.messages;
+  normalizeRoles(obj);
+  normalizeToolChoice(obj);
+  dropUnsupportedEffort(obj);
+  ensureLeadingSystem(obj);
+  return obj;
+}

package/src/providers/index.js

@@ -1,6 +1,6 @@
-export { createProviderDispatcher } from "./dispatcher.js";
-export { createOpenCodeProvider } from "./opencode.js";
-export { createOpenRouterProvider } from "./openrouter.js";
-export { createGenericProvider } from "./generic.js";
-export { createWorkbuddyProvider } from "./workbuddy.js";
+export { createProviderDispatcher } from "./dispatcher.js";
+export { createOpenCodeProvider } from "./opencode.js";
+export { createOpenRouterProvider } from "./openrouter.js";
+export { createGenericProvider } from "./generic.js";
+export { createWorkbuddyProvider } from "./workbuddy.js";
 export { splitModelId, joinModelId, normalizeProviderId, DEFAULT_PROVIDER } from "./model-id.js";