@kenkaiiii/gg-ai 5.84.1 → 5.84.2

package/dist/index.cjs

@@ -990,6 +990,37 @@ function applyServerFallbackReplay(content, keepMarkers, droppedToolCallIds) {
   });
   return out.every(isServerFallbackBlock) ? [] : out;
 }
+function serverToolUseId(part) {
+  if (part.type === "server_tool_call") return part.id;
+  if (part.type === "raw" && part.data.type === "server_tool_use" && typeof part.data.id === "string")
+    return part.data.id;
+  return void 0;
+}
+function unresolvedServerToolUseIds(messages) {
+  const resultIds = /* @__PURE__ */ new Set();
+  let lastAssistantIdx = -1;
+  messages.forEach((msg, idx) => {
+    if (msg.role !== "assistant") return;
+    lastAssistantIdx = idx;
+    if (typeof msg.content === "string") return;
+    for (const part of msg.content) {
+      if (part.type === "server_tool_result") resultIds.add(part.toolUseId);
+      else if (part.type === "raw" && typeof part.data.tool_use_id === "string")
+        resultIds.add(part.data.tool_use_id);
+    }
+  });
+  const turnStillOpen = messages.slice(lastAssistantIdx + 1).every((m) => m.role === "tool");
+  const dropped = /* @__PURE__ */ new Set();
+  messages.forEach((msg, idx) => {
+    if (msg.role !== "assistant" || typeof msg.content === "string") return;
+    if (idx === lastAssistantIdx && turnStillOpen) return;
+    for (const part of msg.content) {
+      const id = serverToolUseId(part);
+      if (id !== void 0 && !resultIds.has(id)) dropped.add(id);
+    }
+  });
+  return dropped;
+}
 function toAnthropicAssistantPart(part, idMap) {
   if (part.type === "text") return { type: "text", text: part.text };
   if (part.type === "thinking") {
@@ -1352,6 +1383,7 @@ function toAnthropicMessages(messages, cacheControl, options) {
   const idMap = /* @__PURE__ */ new Map();
   const keepFallbackBlocks = options?.fallbackBlocks === true;
   const droppedToolCallIds = /* @__PURE__ */ new Set();
+  const unresolvedServerToolIds = unresolvedServerToolUseIds(messages);
   const trajectoryStartIdx = messages.reduce(
     (last, m, i) => opensTurn(m) ? i : last,
     -1
@@ -1398,8 +1430,12 @@ function toAnthropicMessages(messages, cacheControl, options) {
     }
     if (msg.role === "assistant") {
       if (typeof msg.content === "string" && msg.content === "") continue;
-      const content = typeof msg.content === "string" ? msg.content : toAnthropicAssistantContent(
-        applyServerFallbackReplay(msg.content, keepFallbackBlocks, droppedToolCallIds),
+      const replayable = typeof msg.content === "string" || unresolvedServerToolIds.size === 0 ? msg.content : msg.content.filter((part) => {
+        const id = serverToolUseId(part);
+        return id === void 0 || !unresolvedServerToolIds.has(id);
+      });
+      const content = typeof replayable === "string" ? replayable : toAnthropicAssistantContent(
+        applyServerFallbackReplay(replayable, keepFallbackBlocks, droppedToolCallIds),
         msgIdx > trajectoryStartIdx,
         idMap
       );