mslxdff 0.1.155 → 0.1.158

package/src/model-capabilities/index.js

@@ -1,183 +1,183 @@
-// 模型能力目录服务（opencode 官方同源 models.dev）：fetch + 磁盘缓存 + TTL + staleness 降级
-// 源：https://models.opencode.ai/api.json（opencode core models-dev.ts:160 同款；备选 https://models.dev/api.json）
-// 形状：{ [providerId]: { models: { [modelId]: raw } } }；mslxdff 裸 id 归 opencode，`prov/id` 前缀路由到对应 provider
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { normalizeProviderModels, normalizeWorkbuddyCaps } from "./parse.js";
-import { compatFetch } from "../compat.js";
-
-export const DEFAULT_SOURCE_URL = "https://models.opencode.ai/api.json";
-
-export function sourceUrl() {
-  const raw = process.env.MSLXDFF_MODELS_DEV_URL;
-  return raw && String(raw).trim() ? String(raw).trim() : DEFAULT_SOURCE_URL;
-}
-
-export function ttlMs() {
-  const n = Number(process.env.MSLXDFF_MODELS_DEV_TTL_MS);
-  return Number.isInteger(n) && n >= 0 ? n : 86_400_000; // 默认 24h
-}
-
-export function createCapabilitiesService({
-  fetchImpl = compatFetch,
-  cacheFile = "",
-  ttlMs: ttl = ttlMs(),
-  url = sourceUrl(),
-  now = Date.now,
-} = {}) {
-  let raw = null;          // 原始目录（全 provider）
-  let capsIndex = new Map(); // providerId -> { modelId -> caps }
-  let npmIndex = new Map();  // opencode 裸 modelId -> provider.npm（responses 判定用；null = 继承默认）
-  let loadedAt = 0;
-  let inflight = null;
-
-  function buildIndex(data) {
-    const idx = new Map();
-    const npm = new Map();
-    for (const [pid, p] of Object.entries(data || {})) {
-      if (!p || typeof p !== "object") continue;
-      const caps = normalizeProviderModels(p.models || {});
-      idx.set(pid, caps);
-      if (String(pid).toLowerCase() === "opencode") {
-        for (const [mid, c] of Object.entries(caps)) npm.set(mid, c.npm ?? null);
-      }
-    }
-    npmIndex = npm;
-    return idx;
-  }
-
-  function readCache() {
-    if (!cacheFile) return null;
-    try { return JSON.parse(readFileSync(cacheFile, "utf8")); } catch { return null; }
-  }
-
-  function writeCache(data) {
-    if (!cacheFile || !data) return;
-    try {
-      mkdirSync(dirname(cacheFile), { recursive: true });
-      writeFileSync(cacheFile, JSON.stringify(data));
-    } catch { /* 缓存失败不致命 */ }
-  }
-
-  async function fetchFresh() {
-    const res = await fetchImpl(url, { headers: { Accept: "application/json" } });
-    if (!res?.ok) throw new Error(`models.dev fetch ${res?.status || "network"}`);
-    return res.json();
-  }
-
-  // ready：缓存新鲜直接用；否则拉新；失败回退旧缓存（含磁盘），完全无数据才抛
-  async function ready() {
-    const t = now();
-    if (raw && t - loadedAt < ttl) return;
-    if (inflight) return inflight;
-    inflight = (async () => {
-      try {
-        const data = await fetchFresh();
-        raw = data;
-        capsIndex = buildIndex(data);
-        loadedAt = t;
-        writeCache(data);
-      } catch (e) {
-        if (raw) return; // 内存还有旧的，继续用
-        const disk = readCache();
-        if (disk) {
-          raw = disk;
-          capsIndex = buildIndex(disk);
-          loadedAt = t; // 视作刚加载，避免每请求都重试打上游
-          return;
-        }
-        throw e;
-      } finally {
-        inflight = null;
-      }
-    })();
-    return inflight;
-  }
-
-  function capsFor(pid) {
-    return capsIndex.get(pid) || null;
-  }
-
-  function get(providerId, modelId) {
-    const pid = String(providerId || "opencode").toLowerCase();
-    const mid = String(modelId || "");
-    const map = capsFor(pid);
-    if (!map) return null;
-    return map[mid] || null;
-  }
-
-  function list(providerId) {
-    const pid = String(providerId || "opencode").toLowerCase();
-    const map = capsFor(pid);
-    if (!map) return [];
-    return Object.entries(map).map(([id, capabilities]) => ({ id, capabilities }));
-  }
-
-  function providers() {
-    return [...capsIndex.keys()].sort();
-  }
-  // readyWarm：仅用内存/磁盘缓存热身，绝不网络请求。/models 富化用它避免冷启动阻塞；
-  // 冷缓存时后台拉新（不 await），下次请求即富化。
-  async function readyWarm() {
-    const t = now();
-    if (raw && t - loadedAt < ttl) return true;
-    const disk = readCache();
-    if (disk) {
-      raw = disk;
-      capsIndex = buildIndex(disk);
-      loadedAt = t;
-      return true;
-    }
-    ready().catch(() => {}); // 后台拉新，失败静默（/models 原样降级）
-    return false;
-  }
-  return { ready, readyWarm, get, list, providers, npmIndex: () => new Map(npmIndex) };
-}
-
-// 模块级单例：HTTP handler 懒加载，测试 _reset 后注入
-let _global = null;
-export function globalCapabilities() {
-  if (!_global) _global = createCapabilitiesService({ cacheFile: defaultCacheFile() });
-  return _global;
-}
-export function _resetGlobalCapabilities() { _global = null; }
-// 缓存落盘位置：MSLXDFF_MODELS_DEV_CACHE 覆盖 > ~/.config/mslxdff/models-dev.json（与 state 同目录）
-function defaultCacheFile() {
-  const override = process.env.MSLXDFF_MODELS_DEV_CACHE;
-  if (override && String(override).trim()) return String(override).trim();
-  return join(homedir(), ".config", "mslxdff", "models-dev.json");
-}
-
-// workbuddy 动态源：从聚合模型服务（models.get()，带 10min 上游缓存）拉 workbuddy/ 前缀条目
-// → 统一 caps 形状 map（{ rawId -> caps }）。上游原生字段 first-party 最准，不走 models.dev。
-export function workbuddyCapsFromModels(getModels, normalizeFn) {
-  const normalize = normalizeFn || ((m) => normalizeWorkbuddyCaps(m.id, m));
-  return async () => {
-    const agg = await getModels();
-    const all = Array.isArray(agg?.data) ? agg.data : [];
-    const map = {};
-    for (const entry of all) {
-      const id = String(entry?.id || "");
-      if (!id.toLowerCase().startsWith("workbuddy/")) continue;
-      const raw = id.slice("workbuddy/".length);
-      if (!raw) continue;
-      map[raw] = normalize(entry);
-    }
-    return map;
-  };
-}
-
-// workbuddy provider 单例（直连上游 listModels 自带 10min 缓存）：HTTP handler 与
-// -setto opencode 能力注入共享同一个实例，避免双份连接池/缓存。
-let _wbProv = null;
-export function _resetWorkbuddyProv() { _wbProv = null; }
-export async function workbuddyAllModels() {
-  if (!_wbProv) {
-    const { createWorkbuddyProvider } = await import("../providers/workbuddy.js");
-    const { defaultStateFile } = await import("../state.js");
-    _wbProv = createWorkbuddyProvider({ file: defaultStateFile() });
-  }
-  const list = await _wbProv.listModels();
-  return { object: "list", data: Array.isArray(list) ? list : [] };
-}
+// 模型能力目录服务（opencode 官方同源 models.dev）：fetch + 磁盘缓存 + TTL + staleness 降级
+// 源：https://models.opencode.ai/api.json（opencode core models-dev.ts:160 同款；备选 https://models.dev/api.json）
+// 形状：{ [providerId]: { models: { [modelId]: raw } } }；mslxdff 裸 id 归 opencode，`prov/id` 前缀路由到对应 provider
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { normalizeProviderModels, normalizeWorkbuddyCaps } from "./parse.js";
+import { compatFetch } from "../compat.js";
+
+export const DEFAULT_SOURCE_URL = "https://models.opencode.ai/api.json";
+
+export function sourceUrl() {
+  const raw = process.env.MSLXDFF_MODELS_DEV_URL;
+  return raw && String(raw).trim() ? String(raw).trim() : DEFAULT_SOURCE_URL;
+}
+
+export function ttlMs() {
+  const n = Number(process.env.MSLXDFF_MODELS_DEV_TTL_MS);
+  return Number.isInteger(n) && n >= 0 ? n : 86_400_000; // 默认 24h
+}
+
+export function createCapabilitiesService({
+  fetchImpl = compatFetch,
+  cacheFile = "",
+  ttlMs: ttl = ttlMs(),
+  url = sourceUrl(),
+  now = Date.now,
+} = {}) {
+  let raw = null;          // 原始目录（全 provider）
+  let capsIndex = new Map(); // providerId -> { modelId -> caps }
+  let npmIndex = new Map();  // opencode 裸 modelId -> provider.npm（responses 判定用；null = 继承默认）
+  let loadedAt = 0;
+  let inflight = null;
+
+  function buildIndex(data) {
+    const idx = new Map();
+    const npm = new Map();
+    for (const [pid, p] of Object.entries(data || {})) {
+      if (!p || typeof p !== "object") continue;
+      const caps = normalizeProviderModels(p.models || {});
+      idx.set(pid, caps);
+      if (String(pid).toLowerCase() === "opencode") {
+        for (const [mid, c] of Object.entries(caps)) npm.set(mid, c.npm ?? null);
+      }
+    }
+    npmIndex = npm;
+    return idx;
+  }
+
+  function readCache() {
+    if (!cacheFile) return null;
+    try { return JSON.parse(readFileSync(cacheFile, "utf8")); } catch { return null; }
+  }
+
+  function writeCache(data) {
+    if (!cacheFile || !data) return;
+    try {
+      mkdirSync(dirname(cacheFile), { recursive: true });
+      writeFileSync(cacheFile, JSON.stringify(data));
+    } catch { /* 缓存失败不致命 */ }
+  }
+
+  async function fetchFresh() {
+    const res = await fetchImpl(url, { headers: { Accept: "application/json" } });
+    if (!res?.ok) throw new Error(`models.dev fetch ${res?.status || "network"}`);
+    return res.json();
+  }
+
+  // ready：缓存新鲜直接用；否则拉新；失败回退旧缓存（含磁盘），完全无数据才抛
+  async function ready() {
+    const t = now();
+    if (raw && t - loadedAt < ttl) return;
+    if (inflight) return inflight;
+    inflight = (async () => {
+      try {
+        const data = await fetchFresh();
+        raw = data;
+        capsIndex = buildIndex(data);
+        loadedAt = t;
+        writeCache(data);
+      } catch (e) {
+        if (raw) return; // 内存还有旧的，继续用
+        const disk = readCache();
+        if (disk) {
+          raw = disk;
+          capsIndex = buildIndex(disk);
+          loadedAt = t; // 视作刚加载，避免每请求都重试打上游
+          return;
+        }
+        throw e;
+      } finally {
+        inflight = null;
+      }
+    })();
+    return inflight;
+  }
+
+  function capsFor(pid) {
+    return capsIndex.get(pid) || null;
+  }
+
+  function get(providerId, modelId) {
+    const pid = String(providerId || "opencode").toLowerCase();
+    const mid = String(modelId || "");
+    const map = capsFor(pid);
+    if (!map) return null;
+    return map[mid] || null;
+  }
+
+  function list(providerId) {
+    const pid = String(providerId || "opencode").toLowerCase();
+    const map = capsFor(pid);
+    if (!map) return [];
+    return Object.entries(map).map(([id, capabilities]) => ({ id, capabilities }));
+  }
+
+  function providers() {
+    return [...capsIndex.keys()].sort();
+  }
+  // readyWarm：仅用内存/磁盘缓存热身，绝不网络请求。/models 富化用它避免冷启动阻塞；
+  // 冷缓存时后台拉新（不 await），下次请求即富化。
+  async function readyWarm() {
+    const t = now();
+    if (raw && t - loadedAt < ttl) return true;
+    const disk = readCache();
+    if (disk) {
+      raw = disk;
+      capsIndex = buildIndex(disk);
+      loadedAt = t;
+      return true;
+    }
+    ready().catch(() => {}); // 后台拉新，失败静默（/models 原样降级）
+    return false;
+  }
+  return { ready, readyWarm, get, list, providers, npmIndex: () => new Map(npmIndex) };
+}
+
+// 模块级单例：HTTP handler 懒加载，测试 _reset 后注入
+let _global = null;
+export function globalCapabilities() {
+  if (!_global) _global = createCapabilitiesService({ cacheFile: defaultCacheFile() });
+  return _global;
+}
+export function _resetGlobalCapabilities() { _global = null; }
+// 缓存落盘位置：MSLXDFF_MODELS_DEV_CACHE 覆盖 > ~/.config/mslxdff/models-dev.json（与 state 同目录）
+function defaultCacheFile() {
+  const override = process.env.MSLXDFF_MODELS_DEV_CACHE;
+  if (override && String(override).trim()) return String(override).trim();
+  return join(homedir(), ".config", "mslxdff", "models-dev.json");
+}
+
+// workbuddy 动态源：从聚合模型服务（models.get()，带 10min 上游缓存）拉 workbuddy/ 前缀条目
+// → 统一 caps 形状 map（{ rawId -> caps }）。上游原生字段 first-party 最准，不走 models.dev。
+export function workbuddyCapsFromModels(getModels, normalizeFn) {
+  const normalize = normalizeFn || ((m) => normalizeWorkbuddyCaps(m.id, m));
+  return async () => {
+    const agg = await getModels();
+    const all = Array.isArray(agg?.data) ? agg.data : [];
+    const map = {};
+    for (const entry of all) {
+      const id = String(entry?.id || "");
+      if (!id.toLowerCase().startsWith("workbuddy/")) continue;
+      const raw = id.slice("workbuddy/".length);
+      if (!raw) continue;
+      map[raw] = normalize(entry);
+    }
+    return map;
+  };
+}
+
+// workbuddy provider 单例（直连上游 listModels 自带 10min 缓存）：HTTP handler 与
+// -setto opencode 能力注入共享同一个实例，避免双份连接池/缓存。
+let _wbProv = null;
+export function _resetWorkbuddyProv() { _wbProv = null; }
+export async function workbuddyAllModels() {
+  if (!_wbProv) {
+    const { createWorkbuddyProvider } = await import("../providers/workbuddy.js");
+    const { defaultStateFile } = await import("../state.js");
+    _wbProv = createWorkbuddyProvider({ file: defaultStateFile() });
+  }
+  const list = await _wbProv.listModels();
+  return { object: "list", data: Array.isArray(list) ? list : [] };
+}

package/src/model-capabilities/parse.js

@@ -1,70 +1,70 @@
-// models.dev 能力目录 → mslxdff 能力形状的纯函数解析层（无 IO，测试接缝 S1）
-// 源数据形态（实测 models.opencode.ai/api.json 2026-09-11）：
-//   reasoning_options: [{type:"effort",values:["low","medium","high","max"]} | {type:"toggle"} | {type:"budget_tokens",min}]
-//   modalities.input 含 "image" 即可读图；limit.context/output；cost.input/output 为 $/M tokens
-export function normalizeModelCaps(_id, m) {
-  const opts = Array.isArray(m?.reasoning_options) ? m.reasoning_options : [];
-  const effort = opts.find((o) => o?.type === "effort");
-  const toggle = opts.some((o) => o?.type === "toggle");
-  const budget = opts.find((o) => o?.type === "budget_tokens");
-  const input = Array.isArray(m?.modalities?.input) ? m.modalities.input : [];
-  return {
-    reasoning: Boolean(m?.reasoning),
-    effortType: effort ? "effort" : toggle ? "toggle" : budget ? "budget_tokens" : null,
-    effortValues: effort && Array.isArray(effort.values) ? effort.values.map(String) : null,
-    imageInput: input.includes("image"),
-    toolCall: Boolean(m?.tool_call),
-    context: Number(m?.limit?.context) || null,
-    maxOutput: Number(m?.limit?.output) || null,
-    costIn: Number(m?.cost?.input) || null,
-    costOut: Number(m?.cost?.output) || null,
-    // opencode Model 形状补充字段（-setto opencode 条目注入用）
-    attachment: Boolean(m?.attachment),
-    temperature: Boolean(m?.temperature),
-    releaseDate: typeof m?.release_date === "string" && m.release_date ? m.release_date : null,
-    inputModalities: input.length ? input : ["text"],
-    outputModalities: Array.isArray(m?.modalities?.output) && m.modalities.output.length ? m.modalities.output : ["text"],
-    // 模型级 SDK 覆盖（models.dev provider.npm）：@ai-sdk/openai → responses 端点；null = 继承 provider 默认
-    npm: typeof m?.provider?.npm === "string" && m.provider.npm ? m.provider.npm : null,
-  };
-}
-
-// provider.models 对象（{ [modelId]: rawModel }）→ { [modelId]: caps }
-export function normalizeProviderModels(modelsObj) {
-  const out = {};
-  if (!modelsObj || typeof modelsObj !== "object") return out;
-  for (const [id, m] of Object.entries(modelsObj)) {
-    if (!m || typeof m !== "object") continue;
-    out[id] = normalizeModelCaps(id, m);
-  }
-  return out;
-}
-
-// workbuddy 上游原生字段（/console/enterprises/personal/models，first-party 最准）→ 统一 caps 形状
-// 实测字段（2026-09-11，29 模型全覆盖）：maxInputTokens/maxOutputTokens/supportsImages/
-// supportsReasoning/reasoning{effort,summary}/supportsToolCall/disabledMultimodal/credits/tags/name/vendor
-// reasoning 是"当前档位"非档位列表 → effortType=effort 但 effortValues=null、defaultEffort 记默认档
-export function normalizeWorkbuddyCaps(_id, m) {
-  const imageOk = Boolean(m?.supportsImages) && !m?.disabledMultimodal;
-  const reasoning = Boolean(m?.supportsReasoning);
-  const effort = reasoning && m?.reasoning && typeof m.reasoning === "object" ? String(m.reasoning.effort || "").trim() : "";
-  return {
-    reasoning,
-    effortType: reasoning ? "effort" : null,
-    // 上游只给当前档位不给档位列表；实测 hy3 reasoning_effort low/high 均生效（思考块 99 vs 210），
-    // 网关层按 OpenAI 兼容标准给通用三档（上游不识别时忽略，无害）
-    effortValues: reasoning ? ["low", "medium", "high"] : null,
-    defaultEffort: effort || null,
-    imageInput: imageOk,
-    toolCall: Boolean(m?.supportsToolCall),
-    context: Number(m?.maxInputTokens) || null,
-    maxOutput: Number(m?.maxOutputTokens) || null,
-    costIn: null,
-    costOut: null,
-    attachment: false,
-    temperature: m?.temperature != null,
-    releaseDate: null,
-    inputModalities: imageOk ? ["text", "image"] : ["text"],
-    outputModalities: ["text"],
-  };
-}
+// models.dev 能力目录 → mslxdff 能力形状的纯函数解析层（无 IO，测试接缝 S1）
+// 源数据形态（实测 models.opencode.ai/api.json 2026-09-11）：
+//   reasoning_options: [{type:"effort",values:["low","medium","high","max"]} | {type:"toggle"} | {type:"budget_tokens",min}]
+//   modalities.input 含 "image" 即可读图；limit.context/output；cost.input/output 为 $/M tokens
+export function normalizeModelCaps(_id, m) {
+  const opts = Array.isArray(m?.reasoning_options) ? m.reasoning_options : [];
+  const effort = opts.find((o) => o?.type === "effort");
+  const toggle = opts.some((o) => o?.type === "toggle");
+  const budget = opts.find((o) => o?.type === "budget_tokens");
+  const input = Array.isArray(m?.modalities?.input) ? m.modalities.input : [];
+  return {
+    reasoning: Boolean(m?.reasoning),
+    effortType: effort ? "effort" : toggle ? "toggle" : budget ? "budget_tokens" : null,
+    effortValues: effort && Array.isArray(effort.values) ? effort.values.map(String) : null,
+    imageInput: input.includes("image"),
+    toolCall: Boolean(m?.tool_call),
+    context: Number(m?.limit?.context) || null,
+    maxOutput: Number(m?.limit?.output) || null,
+    costIn: Number(m?.cost?.input) || null,
+    costOut: Number(m?.cost?.output) || null,
+    // opencode Model 形状补充字段（-setto opencode 条目注入用）
+    attachment: Boolean(m?.attachment),
+    temperature: Boolean(m?.temperature),
+    releaseDate: typeof m?.release_date === "string" && m.release_date ? m.release_date : null,
+    inputModalities: input.length ? input : ["text"],
+    outputModalities: Array.isArray(m?.modalities?.output) && m.modalities.output.length ? m.modalities.output : ["text"],
+    // 模型级 SDK 覆盖（models.dev provider.npm）：@ai-sdk/openai → responses 端点；null = 继承 provider 默认
+    npm: typeof m?.provider?.npm === "string" && m.provider.npm ? m.provider.npm : null,
+  };
+}
+
+// provider.models 对象（{ [modelId]: rawModel }）→ { [modelId]: caps }
+export function normalizeProviderModels(modelsObj) {
+  const out = {};
+  if (!modelsObj || typeof modelsObj !== "object") return out;
+  for (const [id, m] of Object.entries(modelsObj)) {
+    if (!m || typeof m !== "object") continue;
+    out[id] = normalizeModelCaps(id, m);
+  }
+  return out;
+}
+
+// workbuddy 上游原生字段（/console/enterprises/personal/models，first-party 最准）→ 统一 caps 形状
+// 实测字段（2026-09-11，29 模型全覆盖）：maxInputTokens/maxOutputTokens/supportsImages/
+// supportsReasoning/reasoning{effort,summary}/supportsToolCall/disabledMultimodal/credits/tags/name/vendor
+// reasoning 是"当前档位"非档位列表 → effortType=effort 但 effortValues=null、defaultEffort 记默认档
+export function normalizeWorkbuddyCaps(_id, m) {
+  const imageOk = Boolean(m?.supportsImages) && !m?.disabledMultimodal;
+  const reasoning = Boolean(m?.supportsReasoning);
+  const effort = reasoning && m?.reasoning && typeof m.reasoning === "object" ? String(m.reasoning.effort || "").trim() : "";
+  return {
+    reasoning,
+    effortType: reasoning ? "effort" : null,
+    // 上游只给当前档位不给档位列表；实测 hy3 reasoning_effort low/high 均生效（思考块 99 vs 210），
+    // 网关层按 OpenAI 兼容标准给通用三档（上游不识别时忽略，无害）
+    effortValues: reasoning ? ["low", "medium", "high"] : null,
+    defaultEffort: effort || null,
+    imageInput: imageOk,
+    toolCall: Boolean(m?.supportsToolCall),
+    context: Number(m?.maxInputTokens) || null,
+    maxOutput: Number(m?.maxOutputTokens) || null,
+    costIn: null,
+    costOut: null,
+    attachment: false,
+    temperature: m?.temperature != null,
+    releaseDate: null,
+    inputModalities: imageOk ? ["text", "image"] : ["text"],
+    outputModalities: ["text"],
+  };
+}

package/src/model-trace.js

@@ -1,5 +1,6 @@
 // Per-model request trace formatting. Never include prompt, response body, headers or credentials.
 // Note: 同步 appendFileSync（异步 append 会在并发下打乱同一请求的阶段行序）— 见 .agents/notes/implemented/feature/2026-09-25-model-trace-log.md
+// Note: 事件面用黑名单（默认全可见，只排除噪声/敏感面）+ 决定类事件只渲染登记过的标量字段——起因是 empty-turn-retry 曾被阶段白名单静默吞掉，"关键决定不许再被漏登记" — 见 .agents/notes/implemented/feature/2026-09-27-qoder-per-request-sticky-account.md
 import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { logDir } from "./logs.js";