@zqagent/core 0.3.9 → 0.3.11

package/dist/tools/explore.cjs

@@ -1966,6 +1966,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);
@@ -2387,6 +2457,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,
@@ -3388,7 +3459,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",
@@ -3397,15 +3468,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() {