mslxdff 0.1.203 → 0.1.207

package/src/providers/workbuddy/rotation-log.js

@@ -1,83 +1,83 @@
-import { appendFileSync, mkdirSync, readFileSync, writeFileSync, statSync } from "node:fs";
-import { join } from "node:path";
-import { fmtShanghaiYMDHMS } from "../../time.js";
-
-function defaultDirs() {
-  const dirs = new Set();
-  try {
-    const sf = process.env.MSLXDFF_STATE_FILE;
-    if (sf) {
-      const cut = Math.max(sf.lastIndexOf("/"), sf.lastIndexOf("\\"));
-      if (cut > 0) dirs.add(sf.slice(0, cut));
-    }
-  } catch {}
-  const envDir = process.env.MSLXDFF_DAEMON_DIR || process.env.MSLXDFF_LOG_DIR;
-  if (envDir) dirs.add(envDir);
-  dirs.add(process.cwd());
-  dirs.add(join(process.cwd(), "logs"));
-  return [...dirs];
-}
-
-// 裁剪保留比例（按字节）。阈值 `st.size` 是**字节**，原先的回退 `content.slice(-512*1024)` 是**字符** ——
-// 量纲不匹配：中文（3 字节/字符）下保留后字节数浮动，且 slice 按字符切会**切在半行**上
-// （实测开头得到 `"el=workbuddy/deepseek totalMs="`，下一行接上去就把日志结构毁了）。
-// 与 logs.js / model-trace.js 同口径：按字节留 3/4，且不截半行。
-const KEEP_RATIO = 3 / 4;
-
-function keepTailByBytes(text, maxBytes) {
-  const limit = Math.max(1, Math.floor(maxBytes * KEEP_RATIO));
-  if (Buffer.byteLength(text) <= limit) return text;
-  const lines = text.split("\n");
-  let bytes = 0;
-  let i = lines.length - 1;
-  for (; i >= 0; i--) {
-    const b = Buffer.byteLength(lines[i]) + 1;
-    if (bytes + b > limit) break;
-    bytes += b;
-  }
-  // 至少保留最后一条：单行超 limit 时否则返回空串 = 清空整个轮转日志。
-  // 判据是「结果为空」——文件尾有换行时 split 的最后一个元素是空串，`i === lines.length-1` 判不到内容行。
-  const kept = lines.slice(i + 1).join("\n");
-  if (!kept) {
-    const nonEmpty = lines.filter((l) => l !== "");
-    if (nonEmpty.length) return nonEmpty[nonEmpty.length - 1];
-  }
-  return kept;
-}
-
-export function appendRotationLog({ uid, model, totalMs, balanceHit, error, clock = Date.now, fs: fsOverride, dirs: dirsOverride, maxBytes = 1024 * 1024 } = {}) {
-  // 兼容旧调用：appendRotationLog({uid,model,totalMs,balanceHit,error}) 形式，clock/fs 可选
-  const useFs = fsOverride || { appendFileSync, mkdirSync, readFileSync, writeFileSync, statSync, join };
-  const useDirs = dirsOverride || defaultDirs();
-  try {
-    const line = `${fmtShanghaiYMDHMS(new Date(clock()))} uid=${uid} model=${model || "-"} totalMs=${totalMs} balanceHit=${balanceHit ? 1 : 0}${error ? ` error=${String(error).slice(0, 120)}` : ""}\n`;
-    for (const dir of useDirs) {
-      try {
-        useFs.mkdirSync(dir, { recursive: true });
-        const file = useFs.join ? useFs.join(dir, "workbuddy-rotation.log") : join(dir, "workbuddy-rotation.log");
-        useFs.appendFileSync(file, line);
-        try {
-          const st = useFs.statSync(file);
-          if (st.size > maxBytes) {
-            // 按字节回退（不截半行），与 logs.js / model-trace.js 同口径。
-            const kept = keepTailByBytes(useFs.readFileSync(file, "utf8"), maxBytes);
-            useFs.writeFileSync(file, kept.endsWith("\n") || !kept ? kept : `${kept}\n`);
-          }
-        } catch {}
-      } catch {}
-    }
-  } catch {}
-}
-
-export function createRotationLogger({ fs, clock = Date.now, dirs, maxBytes } = {}) {
-  return {
-    append(opts) {
-      return appendRotationLog({ ...opts, clock, fs, dirs, maxBytes });
-    },
-  };
-}
-
-// 供旧代码直接调用的默认 logger
-export const defaultLogger = {
-  append: (opts) => appendRotationLog(opts),
-};
+import { appendFileSync, mkdirSync, readFileSync, writeFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { fmtShanghaiYMDHMS } from "../../time.js";
+
+function defaultDirs() {
+  const dirs = new Set();
+  try {
+    const sf = process.env.MSLXDFF_STATE_FILE;
+    if (sf) {
+      const cut = Math.max(sf.lastIndexOf("/"), sf.lastIndexOf("\\"));
+      if (cut > 0) dirs.add(sf.slice(0, cut));
+    }
+  } catch {}
+  const envDir = process.env.MSLXDFF_DAEMON_DIR || process.env.MSLXDFF_LOG_DIR;
+  if (envDir) dirs.add(envDir);
+  dirs.add(process.cwd());
+  dirs.add(join(process.cwd(), "logs"));
+  return [...dirs];
+}
+
+// 裁剪保留比例（按字节）。阈值 `st.size` 是**字节**，原先的回退 `content.slice(-512*1024)` 是**字符** ——
+// 量纲不匹配：中文（3 字节/字符）下保留后字节数浮动，且 slice 按字符切会**切在半行**上
+// （实测开头得到 `"el=workbuddy/deepseek totalMs="`，下一行接上去就把日志结构毁了）。
+// 与 logs.js / model-trace.js 同口径：按字节留 3/4，且不截半行。
+const KEEP_RATIO = 3 / 4;
+
+function keepTailByBytes(text, maxBytes) {
+  const limit = Math.max(1, Math.floor(maxBytes * KEEP_RATIO));
+  if (Buffer.byteLength(text) <= limit) return text;
+  const lines = text.split("\n");
+  let bytes = 0;
+  let i = lines.length - 1;
+  for (; i >= 0; i--) {
+    const b = Buffer.byteLength(lines[i]) + 1;
+    if (bytes + b > limit) break;
+    bytes += b;
+  }
+  // 至少保留最后一条：单行超 limit 时否则返回空串 = 清空整个轮转日志。
+  // 判据是「结果为空」——文件尾有换行时 split 的最后一个元素是空串，`i === lines.length-1` 判不到内容行。
+  const kept = lines.slice(i + 1).join("\n");
+  if (!kept) {
+    const nonEmpty = lines.filter((l) => l !== "");
+    if (nonEmpty.length) return nonEmpty[nonEmpty.length - 1];
+  }
+  return kept;
+}
+
+export function appendRotationLog({ uid, model, totalMs, balanceHit, error, clock = Date.now, fs: fsOverride, dirs: dirsOverride, maxBytes = 1024 * 1024 } = {}) {
+  // 兼容旧调用：appendRotationLog({uid,model,totalMs,balanceHit,error}) 形式，clock/fs 可选
+  const useFs = fsOverride || { appendFileSync, mkdirSync, readFileSync, writeFileSync, statSync, join };
+  const useDirs = dirsOverride || defaultDirs();
+  try {
+    const line = `${fmtShanghaiYMDHMS(new Date(clock()))} uid=${uid} model=${model || "-"} totalMs=${totalMs} balanceHit=${balanceHit ? 1 : 0}${error ? ` error=${String(error).slice(0, 120)}` : ""}\n`;
+    for (const dir of useDirs) {
+      try {
+        useFs.mkdirSync(dir, { recursive: true });
+        const file = useFs.join ? useFs.join(dir, "workbuddy-rotation.log") : join(dir, "workbuddy-rotation.log");
+        useFs.appendFileSync(file, line);
+        try {
+          const st = useFs.statSync(file);
+          if (st.size > maxBytes) {
+            // 按字节回退（不截半行），与 logs.js / model-trace.js 同口径。
+            const kept = keepTailByBytes(useFs.readFileSync(file, "utf8"), maxBytes);
+            useFs.writeFileSync(file, kept.endsWith("\n") || !kept ? kept : `${kept}\n`);
+          }
+        } catch {}
+      } catch {}
+    }
+  } catch {}
+}
+
+export function createRotationLogger({ fs, clock = Date.now, dirs, maxBytes } = {}) {
+  return {
+    append(opts) {
+      return appendRotationLog({ ...opts, clock, fs, dirs, maxBytes });
+    },
+  };
+}
+
+// 供旧代码直接调用的默认 logger
+export const defaultLogger = {
+  append: (opts) => appendRotationLog(opts),
+};

package/src/providers/workbuddy/sanitize-tools.js

@@ -1,61 +1,61 @@
-// workbuddy 上游对 tool 序列严格校验（400 code 11148 tool_call_sequence_broken），实测三条规则：
-// ① assistant.tool_calls 与结果必须按 id 一一配对（孤立调用/结果均拒）；
-// ② 结果必须紧跟对应 assistant（配对不能被 user/assistant 消息打断）；
-// ③ 序列不能以"带 tool_calls 的 assistant"开头（tool call 无前置上下文即拒；compaction 裁剪点
-//    落在工具链中间时最易触发）。
-// 这里在 workbuddy 出口做防御性清洗：结果前移到对应调用之后（组内按 calls 顺序）、剔无法配对的
-// 调用/结果、首条为 assistant/tool 时注入占位 user（"continue"）。其他上游宽容不受影响——只挂 workbuddy。
-export function sanitizeToolSequence(messages) {
-  const list = Array.isArray(messages) ? messages : [];
-
-  const resultById = new Map();
-  list.forEach((m, idx) => {
-    if (m?.role !== "tool") return;
-    const id = String(m.tool_call_id || "");
-    if (id && !resultById.has(id)) resultById.set(id, { msg: m, idx, used: false });
-  });
-
-  let droppedCalls = 0;
-  let droppedResults = 0;
-  let movedResults = 0;
-  const out = [];
-  list.forEach((m, idx) => {
-    if (m?.role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length) {
-      const kept = [];
-      for (const tc of m.tool_calls) {
-        const r = resultById.get(String(tc?.id || ""));
-        if (r && !r.used) kept.push(tc);
-        else droppedCalls++;
-      }
-      if (kept.length) {
-        out.push({ ...m, tool_calls: kept });
-        for (const tc of kept) {
-          const r = resultById.get(String(tc.id));
-          r.used = true;
-          if (!(r.idx >= idx + 1 && r.idx <= idx + kept.length)) movedResults++;
-          out.push(r.msg);
-        }
-      } else if (typeof m.content === "string" && m.content) {
-        const { tool_calls: _dropped, ...rest } = m;
-        out.push(rest);
-      }
-      return;
-    }
-    if (m?.role === "tool") {
-      const id = String(m.tool_call_id || "");
-      const r = resultById.get(id);
-      if (r && r.idx === idx && r.used) return; // 已前移消费，跳过原位置
-      droppedResults++; // 孤儿或重复
-      return;
-    }
-    out.push(m);
-  });
-
-  let injectedHead = 0;
-  if (out.length && out[0]?.role !== "user" && out[0]?.role !== "system" && out[0]?.role !== "developer") {
-    out.unshift({ role: "user", content: "continue" });
-    injectedHead = 1;
-  }
-
-  return { messages: out, droppedCalls, droppedResults, movedResults, injectedHead };
-}
+// workbuddy 上游对 tool 序列严格校验（400 code 11148 tool_call_sequence_broken），实测三条规则：
+// ① assistant.tool_calls 与结果必须按 id 一一配对（孤立调用/结果均拒）；
+// ② 结果必须紧跟对应 assistant（配对不能被 user/assistant 消息打断）；
+// ③ 序列不能以"带 tool_calls 的 assistant"开头（tool call 无前置上下文即拒；compaction 裁剪点
+//    落在工具链中间时最易触发）。
+// 这里在 workbuddy 出口做防御性清洗：结果前移到对应调用之后（组内按 calls 顺序）、剔无法配对的
+// 调用/结果、首条为 assistant/tool 时注入占位 user（"continue"）。其他上游宽容不受影响——只挂 workbuddy。
+export function sanitizeToolSequence(messages) {
+  const list = Array.isArray(messages) ? messages : [];
+
+  const resultById = new Map();
+  list.forEach((m, idx) => {
+    if (m?.role !== "tool") return;
+    const id = String(m.tool_call_id || "");
+    if (id && !resultById.has(id)) resultById.set(id, { msg: m, idx, used: false });
+  });
+
+  let droppedCalls = 0;
+  let droppedResults = 0;
+  let movedResults = 0;
+  const out = [];
+  list.forEach((m, idx) => {
+    if (m?.role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length) {
+      const kept = [];
+      for (const tc of m.tool_calls) {
+        const r = resultById.get(String(tc?.id || ""));
+        if (r && !r.used) kept.push(tc);
+        else droppedCalls++;
+      }
+      if (kept.length) {
+        out.push({ ...m, tool_calls: kept });
+        for (const tc of kept) {
+          const r = resultById.get(String(tc.id));
+          r.used = true;
+          if (!(r.idx >= idx + 1 && r.idx <= idx + kept.length)) movedResults++;
+          out.push(r.msg);
+        }
+      } else if (typeof m.content === "string" && m.content) {
+        const { tool_calls: _dropped, ...rest } = m;
+        out.push(rest);
+      }
+      return;
+    }
+    if (m?.role === "tool") {
+      const id = String(m.tool_call_id || "");
+      const r = resultById.get(id);
+      if (r && r.idx === idx && r.used) return; // 已前移消费，跳过原位置
+      droppedResults++; // 孤儿或重复
+      return;
+    }
+    out.push(m);
+  });
+
+  let injectedHead = 0;
+  if (out.length && out[0]?.role !== "user" && out[0]?.role !== "system" && out[0]?.role !== "developer") {
+    out.unshift({ role: "user", content: "continue" });
+    injectedHead = 1;
+  }
+
+  return { messages: out, droppedCalls, droppedResults, movedResults, injectedHead };
+}

package/src/providers/workbuddy/sdk-chat.js

@@ -1,26 +1,26 @@
-// workbuddy SDK 实验通道（薄壳）：转调共用执行器 upstream-engine/sdk/attempt.js。
-// 契约保持：attemptOnceSdk({url, body, key, auth, buildHeaders}) → Response（SSE）。
-// HTTP 错误映射与 _sdkLoadFailed 语义在共用层；本壳只注入 workbuddy 特有参数。
-// 见 .scratch/workbuddy-sdk-channel/SPEC.md。
-import { attemptOnceSdk as attemptGeneric, sdkBaseFromUrl } from "../../upstream-engine/sdk/attempt.js";
-
-export { sdkBaseFromUrl };
-
-let channelLogged = false;
-
-export async function attemptOnceSdk({ url, body, key, auth, buildHeaders, clock = Date.now, fetchImpl } = {}) {
-  const out = await attemptGeneric({
-    url,
-    body,
-    headers: buildHeaders ? buildHeaders(key, auth) : {},
-    providerName: "workbuddy",
-    marker: { name: "x-mslxdff-workbuddy-channel", value: "sdk" },
-    clock,
-    ...(fetchImpl ? { fetchImpl } : {}),
-  });
-  if (!channelLogged) {
-    channelLogged = true;
-    try { console.error(`[workbuddy-sdk-channel] active via @ai-sdk/openai-compatible (model=${body?.model || ""} uid=${auth?.uid || ""})`); } catch {}
-  }
-  return out;
-}
+// workbuddy SDK 实验通道（薄壳）：转调共用执行器 upstream-engine/sdk/attempt.js。
+// 契约保持：attemptOnceSdk({url, body, key, auth, buildHeaders}) → Response（SSE）。
+// HTTP 错误映射与 _sdkLoadFailed 语义在共用层；本壳只注入 workbuddy 特有参数。
+// 见 .scratch/workbuddy-sdk-channel/SPEC.md。
+import { attemptOnceSdk as attemptGeneric, sdkBaseFromUrl } from "../../upstream-engine/sdk/attempt.js";
+
+export { sdkBaseFromUrl };
+
+let channelLogged = false;
+
+export async function attemptOnceSdk({ url, body, key, auth, buildHeaders, clock = Date.now, fetchImpl } = {}) {
+  const out = await attemptGeneric({
+    url,
+    body,
+    headers: buildHeaders ? buildHeaders(key, auth) : {},
+    providerName: "workbuddy",
+    marker: { name: "x-mslxdff-workbuddy-channel", value: "sdk" },
+    clock,
+    ...(fetchImpl ? { fetchImpl } : {}),
+  });
+  if (!channelLogged) {
+    channelLogged = true;
+    try { console.error(`[workbuddy-sdk-channel] active via @ai-sdk/openai-compatible (model=${body?.model || ""} uid=${auth?.uid || ""})`); } catch {}
+  }
+  return out;
+}

package/src/providers/workbuddy-balance.js

@@ -1,78 +1,78 @@
-import { compatFetch } from "../compat.js";
-
-const BALANCE_TTL_MS = 5 * 60 * 1000;
-
-const balanceCache = new Map(); // uid -> { total, dailyPacks, activeCount, nextExpire, fetchedAt }
-
-export function getBalanceCache() { return balanceCache; }
-export function clearBalanceCache() { balanceCache.clear(); }
-
-export function getCachedBalance(uid) {
-  const v = balanceCache.get(String(uid));
-  if (!v) return null;
-  if (Date.now() - v.fetchedAt > BALANCE_TTL_MS) {
-    balanceCache.delete(String(uid));
-    return null;
-  }
-  return v;
-}
-
-export function setCachedBalance(uid, data) {
-  const v = { ...data, fetchedAt: Date.now() };
-  balanceCache.set(String(uid), v);
-  return v;
-}
-
-export async function fetchBalance({ uid, key, auth, domain, baseUrl = "https://www.codebuddy.cn", fetchImpl } = {}) {
-  const at = key || auth?.accessToken || "";
-  const u = uid || auth?.uid || "";
-  const d = domain || auth?.domain || "www.codebuddy.cn";
-  if (!u || !at) return null;
-  const fetcher = fetchImpl || compatFetch;
-  const body = JSON.stringify({
-    PageNumber: 1, PageSize: 100, ProductCode: "p_tcaca", Status: [0, 3],
-    PackageEndTimeRangeBegin: "2026-08-01 00:00:00",
-    PackageEndTimeRangeEnd: "2030-01-01 00:00:00",
-  });
-  try {
-    const res = await fetcher(`${baseUrl.replace(/\/+$/, "")}/v2/billing/meter/get-user-resource`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${at}`,
-        "Content-Type": "application/json",
-        "X-User-Id": u,
-        "X-Domain": d,
-      },
-      body,
-    });
-    if (!res.ok) return null;
-    const j = await res.json().catch(() => null);
-    const accs = j?.data?.Response?.Data?.Accounts || j?.data?.Response?.data?.Accounts || [];
-    // fallback for stub shape
-    const accounts = Array.isArray(accs) ? accs : [];
-    const active = accounts.filter(a => a.Status === 0);
-    const total = active.reduce((s, a) => s + Number(a.CycleCapacityRemainPrecise || a.CycleCapacityRemain || 0), 0);
-    const dailyPacks = active.filter(a => a.PackageName?.includes("裂变包") && String(a.CycleCapacitySizePrecise) === "100");
-    const sorted = [...active].sort((a,b)=> new Date(a.CycleEndTime) - new Date(b.CycleEndTime));
-    const nextExpire = sorted[0]?.CycleEndTime || null;
-    const data = {
-      total: Number(total.toFixed(2)),
-      dailyPacks: dailyPacks.length,
-      activeCount: active.length,
-      nextExpire,
-      fetchedAt: Date.now(),
-    };
-    // string total for CLI compatibility
-    data.totalStr = total.toFixed(2);
-    setCachedBalance(u, data);
-    return data;
-  } catch {
-    return null;
-  }
-}
-
-export async function getBalanceWithCache({ uid, key, auth, domain, baseUrl, fetchImpl } = {}) {
-  const cached = getCachedBalance(uid || auth?.uid);
-  if (cached) return cached;
-  return fetchBalance({ uid, key, auth, domain, baseUrl, fetchImpl });
-}
+import { compatFetch } from "../compat.js";
+
+const BALANCE_TTL_MS = 5 * 60 * 1000;
+
+const balanceCache = new Map(); // uid -> { total, dailyPacks, activeCount, nextExpire, fetchedAt }
+
+export function getBalanceCache() { return balanceCache; }
+export function clearBalanceCache() { balanceCache.clear(); }
+
+export function getCachedBalance(uid) {
+  const v = balanceCache.get(String(uid));
+  if (!v) return null;
+  if (Date.now() - v.fetchedAt > BALANCE_TTL_MS) {
+    balanceCache.delete(String(uid));
+    return null;
+  }
+  return v;
+}
+
+export function setCachedBalance(uid, data) {
+  const v = { ...data, fetchedAt: Date.now() };
+  balanceCache.set(String(uid), v);
+  return v;
+}
+
+export async function fetchBalance({ uid, key, auth, domain, baseUrl = "https://www.codebuddy.cn", fetchImpl } = {}) {
+  const at = key || auth?.accessToken || "";
+  const u = uid || auth?.uid || "";
+  const d = domain || auth?.domain || "www.codebuddy.cn";
+  if (!u || !at) return null;
+  const fetcher = fetchImpl || compatFetch;
+  const body = JSON.stringify({
+    PageNumber: 1, PageSize: 100, ProductCode: "p_tcaca", Status: [0, 3],
+    PackageEndTimeRangeBegin: "2026-08-01 00:00:00",
+    PackageEndTimeRangeEnd: "2030-01-01 00:00:00",
+  });
+  try {
+    const res = await fetcher(`${baseUrl.replace(/\/+$/, "")}/v2/billing/meter/get-user-resource`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${at}`,
+        "Content-Type": "application/json",
+        "X-User-Id": u,
+        "X-Domain": d,
+      },
+      body,
+    });
+    if (!res.ok) return null;
+    const j = await res.json().catch(() => null);
+    const accs = j?.data?.Response?.Data?.Accounts || j?.data?.Response?.data?.Accounts || [];
+    // fallback for stub shape
+    const accounts = Array.isArray(accs) ? accs : [];
+    const active = accounts.filter(a => a.Status === 0);
+    const total = active.reduce((s, a) => s + Number(a.CycleCapacityRemainPrecise || a.CycleCapacityRemain || 0), 0);
+    const dailyPacks = active.filter(a => a.PackageName?.includes("裂变包") && String(a.CycleCapacitySizePrecise) === "100");
+    const sorted = [...active].sort((a,b)=> new Date(a.CycleEndTime) - new Date(b.CycleEndTime));
+    const nextExpire = sorted[0]?.CycleEndTime || null;
+    const data = {
+      total: Number(total.toFixed(2)),
+      dailyPacks: dailyPacks.length,
+      activeCount: active.length,
+      nextExpire,
+      fetchedAt: Date.now(),
+    };
+    // string total for CLI compatibility
+    data.totalStr = total.toFixed(2);
+    setCachedBalance(u, data);
+    return data;
+  } catch {
+    return null;
+  }
+}
+
+export async function getBalanceWithCache({ uid, key, auth, domain, baseUrl, fetchImpl } = {}) {
+  const cached = getCachedBalance(uid || auth?.uid);
+  if (cached) return cached;
+  return fetchBalance({ uid, key, auth, domain, baseUrl, fetchImpl });
+}