@zqagent/core 0.3.10 → 0.3.11

package/dist/index.cjs

@@ -125,6 +125,8 @@ __export(src_exports, {
   registerTerminalTools: () => registerTerminalTools,
   registerTodoTool: () => registerTodoTool,
   registerWebTools: () => registerWebTools,
+  repairToolCallHistory: () => repairToolCallHistory,
+  repairToolCallHistoryDetailed: () => repairToolCallHistoryDetailed,
   resetFfmpegCache: () => resetFfmpegCache,
   resetSandboxCache: () => resetSandboxCache,
   resolveMedia: () => resolveMedia,
@@ -345,10 +347,22 @@ function authErrorHints(message, code = "") {
     "\u51ED\u636E\u65E0\u6548\uFF1A\u82E5\u7528\u7684\u662F\u300C\u5FD7\u524D\u5927\u6A21\u578B\uFF08\u5185\u7F6E\uFF09\u300D\uFF0C\u5728\u8282\u70B9\u8BBE\u7F6E\u7684\u6A21\u578B\u9875\u70B9\u300C\u5237\u65B0\u5185\u7F6E\u6A21\u578B\u300D\u91CD\u65B0\u9886\u53D6 Key\uFF08\u5728\u63A7\u5236\u53F0\u91CD\u7F6E\u8FC7 Key \u540E\u9700\u8981\u8FD9\u4E00\u6B65\uFF09\uFF1B\u82E5\u662F\u81EA\u586B\u7684\u4F9B\u5E94\u5546\uFF0C\u8BF7\u68C0\u67E5 Key \u662F\u5426\u6B63\u786E\u6216\u5DF2\u8FC7\u671F"
   ];
 }
+function toolCallHistoryHints(message, code = "") {
+  const text = `${message} ${code}`;
+  if (!/tool_calls|tool[_ ]?call[_ ]?id/i.test(text) || !/must be followed by tool messages|insufficient tool messages|no tool output found|tool messages responding/i.test(
+    text
+  )) {
+    return [];
+  }
+  return [
+    "\u8FD9\u4E0D\u662F\u6A21\u578B\u6216\u4F59\u989D\u95EE\u9898\uFF1A\u4F1A\u8BDD\u5386\u53F2\u91CC\u6709\u4E00\u6761\u300C\u5DE5\u5177\u8C03\u7528\u6CA1\u6709\u62FF\u5230\u7ED3\u679C\u300D\u7684\u8BB0\u5F55\uFF08\u901A\u5E38\u662F\u4E0A\u6B21\u5728\u5DE5\u5177\u6267\u884C\u4E2D\u6309\u4E86 Ctrl+C\uFF0C\u6216\u8FDB\u7A0B\u88AB\u4E2D\u65AD\uFF09",
+    "\u5F15\u64CE\u5DF2\u81EA\u52A8\u6E05\u7406\u5E76\u91CD\u8BD5\uFF1B\u5982\u679C\u4ECD\u62A5\u540C\u6837\u7684\u9519\u8BEF\uFF0C\u7528 /new \u5F00\u4E00\u4E2A\u65B0\u4F1A\u8BDD\u5373\u53EF\uFF08\u65E7\u4F1A\u8BDD\u7684\u5386\u53F2\u91CC\u8FD8\u7559\u7740\u8FD9\u6761\u8BB0\u5F55\uFF09"
+  ];
+}
 function paramErrorHints(message, code = "") {
   const text = `${message} ${code}`;
   const hints = [];
-  if (/not[_\s]*(activated|enabled|purchased)|arrearage|quota|subscription|insufficient|未开通|欠费|额度|余额不足/i.test(
+  if (/not[_\s]*(activated|enabled|purchased)|arrearage|quota|subscription|billing|未开通|欠费|额度|余额不足|insufficient[_\s]*(quota|balance|credit|funds)/i.test(
     text
   )) {
     hints.push(
@@ -2220,6 +2234,76 @@ function applyToolResultBudget(tool, result, opts = {}) {
   return { content, truncated: true, savedPath };
 }
 
+// src/engine/history.ts
+function repairToolCallHistoryDetailed(messages) {
+  const out = [];
+  let droppedCalls = 0;
+  let droppedResults = 0;
+  let droppedMessages = 0;
+  let i = 0;
+  while (i < messages.length) {
+    const m = messages[i];
+    if (m.role === "tool") {
+      droppedResults += 1;
+      i += 1;
+      continue;
+    }
+    const calls = m.role === "assistant" ? m.tool_calls : void 0;
+    if (!calls?.length) {
+      if (m.role === "assistant" && m.tool_calls) {
+        const { tool_calls, ...rest } = m;
+        void tool_calls;
+        out.push(rest);
+      } else {
+        out.push(m);
+      }
+      i += 1;
+      continue;
+    }
+    const responders = /* @__PURE__ */ new Map();
+    const notices = [];
+    let j = i + 1;
+    while (j < messages.length) {
+      const t = messages[j];
+      if (t.role === "notice") {
+        notices.push(t);
+        j += 1;
+        continue;
+      }
+      if (t.role !== "tool") break;
+      if (t.tool_call_id && !responders.has(t.tool_call_id)) {
+        responders.set(t.tool_call_id, t);
+      }
+      j += 1;
+    }
+    const kept = calls.filter((tc) => tc.id && responders.has(tc.id));
+    droppedCalls += calls.length - kept.length;
+    droppedResults += responders.size - kept.length;
+    if (kept.length === 0) {
+      const { tool_calls, ...rest } = m;
+      void tool_calls;
+      if ((rest.content ?? "").trim() !== "") out.push(rest);
+      else droppedMessages += 1;
+      out.push(...notices);
+    } else {
+      out.push(kept.length === calls.length ? m : { ...m, tool_calls: kept });
+      for (const tc of kept) out.push(responders.get(tc.id));
+      out.push(...notices);
+    }
+    i = j;
+  }
+  const unchanged = out.length === messages.length && out.every((m, idx) => m === messages[idx]);
+  return {
+    messages: unchanged ? messages : out,
+    droppedCalls,
+    droppedResults,
+    droppedMessages
+  };
+}
+function repairToolCallHistory(messages) {
+  return repairToolCallHistoryDetailed(messages).messages;
+}
+
 // src/engine/TurnEngine.ts
 var crypto = __toESM(require("crypto"), 1);
 var fs3 = __toESM(require("fs"), 1);
@@ -2758,6 +2842,7 @@ ${notice}` : text,
     attachments = routed.attachments;
     this.taskId = taskId;
     this._turnStartTime = Date.now();
+    this.messages = repairToolCallHistory(this.messages);
     this.messages.push({
       role: "user",
       content: userInput,
@@ -3759,7 +3844,7 @@ ${notice}` : text,
   /** 过滤 notice + 剥离 display-only 字段，得到最终发送视图 */
   _finalizeOutbound(sourceMessages) {
     const _STRIP = /* @__PURE__ */ new Set(["source", "_display", "ts", "reasoning", "usage", "attachmentRefs"]);
-    return sourceMessages.filter((m) => m.role !== "notice").map((m) => {
+    const stripped = sourceMessages.filter((m) => m.role !== "notice").map((m) => {
       if (m.role === "tool") {
         return {
           role: "tool",
@@ -3768,15 +3853,16 @@ ${notice}` : text,
         };
       }
       const staleAttachments = Boolean(m.attachments?.length) && (m.ts ?? 0) < this._turnStartTime;
-      const stripped = {};
+      const plain = {};
       for (const [k, v] of Object.entries(m)) {
         if (staleAttachments && k === "attachments") continue;
         if (!_STRIP.has(k)) {
-          stripped[k] = v;
+          plain[k] = v;
         }
       }
-      return stripped;
+      return plain;
     });
+    return repairToolCallHistory(stripped);
   }
   /** 软阈值（token 数）：达到它只淘汰旧工具结果 */
   _softTriggerTokens() {
@@ -7296,6 +7382,9 @@ var ConsoleHook = class {
     for (const hint of authErrorHints(error, errorType)) {
       cliLog(`   \u{1F4A1} ${hint}`);
     }
+    for (const hint of toolCallHistoryHints(error, errorType)) {
+      cliLog(`   \u{1F4A1} ${hint}`);
+    }
     for (const hint of paramErrorHints(error)) {
       cliLog(`   \u{1F4A1} ${hint}`);
     }
@@ -13489,6 +13578,8 @@ function createDefaultEngine(opts) {
   registerTerminalTools,
   registerTodoTool,
   registerWebTools,
+  repairToolCallHistory,
+  repairToolCallHistoryDetailed,
   resetFfmpegCache,
   resetSandboxCache,
   resolveMedia,