mslxdff 0.1.117 → 0.1.119

package/package.json

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

package/src/providers/workbuddy/chat.js

@@ -4,6 +4,8 @@ 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 { rewriteWorkbuddyPayload } from "./payload.js";
 import { resolveEngineMode } from "../../upstream-engine/mode.js";
 
 function buildAuthHeaders(key, auth) {
@@ -98,12 +100,17 @@ export function createChatService({
   // （局部 MSLXDFF_WORKBUDDY_SDK，未设则继承全局 MSLXDFF_UPSTREAM_ENGINE）回退原生 transport；
   // 不可用（Node16/未安装）自动回退并告警一次。上层轮换/刷新/reshape 全链复用。
   // Note: 为什么默认 SDK、翻译层代价与回退语义 — 见 .agents/notes/implemented/feature/2026-09-12-workbuddy-sdk-channel.md
-  const engineMode = resolveEngineMode(process.env, "MSLXDFF_WORKBUDDY_SDK");
+  // workbuddy 缺省 native transport（legacy）：上游对 DeepSeek 有非标字段要求
+  // （thinking 注入 / reasoning_content 回填，见 payload.js），AI SDK 序列化层 providerOptions
+  // 白名单无法承载这些字段——v0.1.111~118 的 SDK 缺省即 tool 校验 400 的温床。
+  // 显式 MSLXDFF_WORKBUDDY_SDK=sdk（或全局 MSLXDFF_UPSTREAM_ENGINE=sdk）仍可切回 SDK 通道。
+  const engineMode = resolveEngineMode(process.env, "MSLXDFF_WORKBUDDY_SDK", "legacy");
   let sdkFallbackLogged = false;
   async function fetchOnce(url, body, key, auth) {
+    const payload = rewriteWorkbuddyPayload(body);
     if (engineMode === "sdk") {
       try {
-        return await attemptOnceSdk({ url, body, key, auth, buildHeaders: buildAuthHeaders });
+        return await attemptOnceSdk({ url, body: payload, key, auth, buildHeaders: buildAuthHeaders });
       } catch (e) {
         if (!e || !e._sdkLoadFailed) throw e;
         if (!sdkFallbackLogged) {
@@ -112,7 +119,7 @@ export function createChatService({
         }
       }
     }
-    return transport.request({ url, headers: buildAuthHeaders(key, auth), body: { ...body, stream: true }, stream: true });
+    return transport.request({ url, headers: buildAuthHeaders(key, auth), body: { ...payload, stream: true }, stream: true });
   }
 
   async function withRefresh(url, body, key, auth) {
@@ -150,6 +157,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() : "";

package/src/providers/workbuddy/payload.js

@@ -0,0 +1,98 @@
+// workbuddy 出站 payload 改写（逆向官方客户端行为，参考 Sliverkiss/workbuddy2api 的 payload.go/thinking.go）：
+//  1. developer → system：上游 role 白名单不含 developer（命中 400 code=11128）
+//  2. tool_choice 归一：上游该字段是 string 类型，对象形式 400 code=11101（none 连带删 tools/functions）
+//  3. DeepSeek thinking 注入：必须显式 thinking.type=enabled + 有 effort 档位，否则上游按不思考应答；
+//     显式 disabled 尊重并删 effort；缺档补默认 "high"
+//  4. DeepSeek reasoning_content 回填：会话内任一 assistant 带 reasoning 痕迹时，
+//     所有 assistant 必须带 reasoning_content（string，可空串）——requiresReasoningContentOnAssistantMessages
+const DEEPSEEK_PREFIX = "deepseek";
+const DEFAULT_DEEPSEEK_EFFORT = "high";
+
+export function isDeepSeekModel(model) {
+  return String(model || "").trim().toLowerCase().startsWith(DEEPSEEK_PREFIX);
+}
+
+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;
+}
+
+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;
+}
+
+export function injectThinking(obj) {
+  if (!isDeepSeekModel(obj?.model)) return obj;
+  const th = obj.thinking && typeof obj.thinking === "object" ? obj.thinking : null;
+  const type = th ? String(th.type || "").trim() : "";
+  if (type && type.toLowerCase() === "disabled") {
+    delete obj.reasoning_effort;
+    delete obj.reasoningEffort;
+    return obj;
+  }
+  if (!type) {
+    if (th) th.type = "enabled";
+    else obj.thinking = { type: "enabled" };
+  }
+  if (!("reasoning_effort" in obj) && !("reasoningEffort" in obj)) obj.reasoning_effort = DEFAULT_DEEPSEEK_EFFORT;
+  return obj;
+}
+
+export function backfillReasoningContent(obj) {
+  if (!isDeepSeekModel(obj?.model)) return obj;
+  const msgs = obj.messages;
+  if (!Array.isArray(msgs) || !msgs.length) return obj;
+  let hasTrace = false;
+  for (const m of msgs) {
+    if (!m || typeof m !== "object") continue;
+    if (typeof m.reasoning === "string" && m.reasoning) { hasTrace = true; break; }
+    if ("reasoning_content" in m) { hasTrace = true; break; }
+  }
+  if (!hasTrace) return obj;
+  for (const m of msgs) {
+    if (!m || m.role !== "assistant") continue;
+    if ("reasoning_content" in m) continue;
+    m.reasoning_content = typeof m.reasoning === "string" ? m.reasoning : "";
+  }
+  return obj;
+}
+
+// 入口：输入 chat body（OpenAI 格式），返回改写后的新对象（messages 浅拷贝，避免污染调用方）。
+export function rewriteWorkbuddyPayload(body) {
+  if (!body || typeof body !== "object") return body;
+  const obj = { ...body };
+  obj.messages = Array.isArray(body.messages)
+    ? body.messages.map((m) => (m && typeof m === "object" ? { ...m } : m))
+    : body.messages;
+  normalizeRoles(obj);
+  normalizeToolChoice(obj);
+  if (isDeepSeekModel(obj.model)) {
+    injectThinking(obj);
+    backfillReasoningContent(obj);
+  }
+  return obj;
+}

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 };
+}

package/src/upstream-engine/mode.js

@@ -1,13 +1,16 @@
 // 引擎模式解析（纯函数，零依赖）：缺省 sdk，legacy/关闭词回退原实现。
 // 供应商级开关未设置时继承全局总闸，使 MSLXDFF_UPSTREAM_ENGINE=legacy 成为一键熔断。
+// defaultMode：调用方可自定缺省（workbuddy 因上游非标字段 thinking/reasoning_content
+// 无法经 AI SDK 序列化层注入，缺省 legacy）；显式 env（供应商级或全局）始终优先。
 // 供 upstream-engine/index.js（opencode 上游）与 providers/workbuddy/chat.js 共用。
 // 见 docs/adr/0017。
 const ENGINE_OFF_WORDS = new Set(["0", "off", "false", "no", "disable", "disabled"]);
 
-export function resolveEngineMode(env = process.env, varName = "MSLXDFF_UPSTREAM_ENGINE") {
+export function resolveEngineMode(env = process.env, varName = "MSLXDFF_UPSTREAM_ENGINE", defaultMode = "sdk") {
   const pick = (name) => String(env?.[name] ?? "").trim().toLowerCase();
   let raw = pick(varName);
   if (!raw && varName !== "MSLXDFF_UPSTREAM_ENGINE") raw = pick("MSLXDFF_UPSTREAM_ENGINE");
   if (raw === "legacy" || ENGINE_OFF_WORDS.has(raw)) return "legacy";
-  return "sdk";
+  if (raw) return "sdk";
+  return defaultMode === "legacy" ? "legacy" : "sdk";
 }