mslxdff 0.1.116 → 0.1.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.116",
+  "version": "0.1.118",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {

package/src/providers/workbuddy/chat.js

@@ -4,6 +4,7 @@ import { appendRotationLog as defaultAppend } from "./rotation-log.js";
 import { createTransport } from "../../transport/index.js";
 import { reshapeWorkbuddySse } from "./reshape.js";
 import { attemptOnceSdk } from "./sdk-chat.js";
+import { sanitizeToolSequence } from "./sanitize-tools.js";
 import { resolveEngineMode } from "../../upstream-engine/mode.js";
 
 function buildAuthHeaders(key, auth) {
@@ -35,6 +36,19 @@ function withUidHeader(res, uid) {
   }
 }
 
+// 400 判型需读 body 文本；读过的 Response body 不可再读（下游转发报 "Body is unusable"），
+// 用文本重建一个等价响应（去掉 content-length 防长度不符）。
+function rewrapBody(res, txt) {
+  try { console.error(`[workbuddy] upstream ${res.status} body: ${String(txt).slice(0, 300)}`); } catch {}
+  try {
+    const h = new Headers(res.headers);
+    h.delete("content-length");
+    const r = new Response(txt, { status: res.status, statusText: res.statusText, headers: h });
+    try { r._t = res._t; } catch {}
+    return r;
+  } catch { return res; }
+}
+
 function nowMs(clock) { return typeof performance !== "undefined" && performance.now ? performance.now() : clock(); }
 
 function errRes(status, msg, reason, uid, t0, clock) {
@@ -109,7 +123,7 @@ export function createChatService({
     if (res.status < 400) return reshapeWorkbuddySse(res);
     let txt = "";
     try { txt = await res.text(); } catch {}
-    if (!isAuthError(res.status, txt)) return res;
+    if (!isAuthError(res.status, txt)) return rewrapBody(res, txt);
     const newKey = await authService?.refreshTokenFor?.(key, auth);
     if (!newKey) throw failErr(`workbuddy refresh failed for ${auth?.uid || ""}: ${txt.slice(0, 120)}`, _t0(), clock);
     const auth2 = authForKey(newKey);
@@ -118,6 +132,7 @@ export function createChatService({
     catch (e2) { throw e2; }
     let stillTxt = "";
     if (res2.status >= 400) { try { stillTxt = await res2.text(); } catch {} }
+    if (stillTxt) res2 = rewrapBody(res2, stillTxt);
     const stillAuth = isAuthError(res2.status, stillTxt);
     const uid2 = auth2.uid || auth.uid;
     res2 = withUidHeader(res2, uid2);
@@ -136,6 +151,11 @@ export function createChatService({
   async function runChat(body, activeRing, opts = {}) {
     const url = joinUrl(baseUrl, chatPath);
     const t0 = nowMs(clock);
+    const clean = sanitizeToolSequence(body?.messages);
+    if (clean.droppedCalls || clean.droppedResults) {
+      try { console.error(`[workbuddy] tool-sequence sanitized: dropped ${clean.droppedCalls} call(s), ${clean.droppedResults} result(s), model=${body?.model || ""}`); } catch {}
+      body = { ...body, messages: clean.messages };
+    }
     _t0Val = t0;
     _modelVal = body?.model || "";
     const preferredUid = opts?.workbuddyUid ? String(opts.workbuddyUid).trim() : "";
@@ -203,6 +223,7 @@ export function createChatService({
           lastErr = failErr(`workbuddy insufficient for ${uid}: ${txt.slice(0, 120)}`, t0, clock);
           continue;
         }
+        res = rewrapBody(res, txt);
       }
       if (res.status === 401 || res.status === 403 || res.status === 429 || res.status >= 500) try { activeRing.onError(key); } catch {}
       res = withUidHeader(res, uid);

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

@@ -0,0 +1,55 @@
+// workbuddy 上游对 tool 序列严格校验（400 code 11148 tool_call_sequence_broken）：
+// assistant.tool_calls 与后续 tool 结果必须按 id 一一配对，否则整单拒绝并提示开新会话。
+// 历史上下文经压缩/编辑/跨模型切换后可能断裂（有调用无结果、结果孤立、id 漂移），
+// AI SDK 转换层对缺失字段用占位（toolName "tool" / toolCallId ""）进一步错配。
+// 这里在 workbuddy 出口做防御性清洗：仅保留能成对出现的调用与结果，避免整单 400。
+// 其他上游（opencode 等）宽容，不受影响——只挂在 workbuddy 链路。
+export function sanitizeToolSequence(messages) {
+  const list = Array.isArray(messages) ? messages : [];
+
+  const callIds = new Set();
+  for (const m of list) {
+    if (m?.role === "assistant" && Array.isArray(m.tool_calls)) {
+      for (const tc of m.tool_calls) {
+        const id = String(tc?.id || "");
+        if (id) callIds.add(id);
+      }
+    }
+  }
+
+  const resultIds = new Set();
+  for (const m of list) {
+    if (m?.role === "tool") {
+      const id = String(m.tool_call_id || "");
+      if (id) resultIds.add(id);
+    }
+  }
+
+  const paired = new Set();
+  for (const id of callIds) if (resultIds.has(id)) paired.add(id);
+
+  let droppedCalls = 0;
+  let droppedResults = 0;
+  const out = [];
+  for (const m of list) {
+    if (m?.role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length) {
+      const kept = m.tool_calls.filter((tc) => paired.has(String(tc?.id || "")));
+      droppedCalls += m.tool_calls.length - kept.length;
+      if (kept.length) {
+        out.push({ ...m, tool_calls: kept });
+      } else if (typeof m.content === "string" && m.content) {
+        const { tool_calls: _dropped, ...rest } = m;
+        out.push(rest);
+      }
+      continue;
+    }
+    if (m?.role === "tool") {
+      if (paired.has(String(m.tool_call_id || ""))) out.push(m);
+      else droppedResults++;
+      continue;
+    }
+    out.push(m);
+  }
+
+  return { messages: out, droppedCalls, droppedResults };
+}