@yourgpt/llm-sdk 2.1.0 → 2.1.2

package/dist/providers/anthropic/index.mjs

@@ -255,34 +255,37 @@ function formatMessagesForAnthropic(messages) {
   let system = "";
   const formatted = [];
   const pendingToolResults = [];
-  for (const msg of messages) {
-    if (msg.role === "system") {
-      system += (system ? "\n" : "") + msg.content;
-      continue;
-    }
-    if (msg.role === "assistant" && pendingToolResults.length > 0) {
+  const flushToolResults = () => {
+    if (pendingToolResults.length === 0) return;
+    const validResults = pendingToolResults.filter((tr) => {
+      if (!tr.toolCallId) {
+        console.warn("[llm-sdk] Skipping tool result with missing toolCallId");
+        return false;
+      }
+      return true;
+    });
+    if (validResults.length > 0) {
       formatted.push({
         role: "user",
-        content: pendingToolResults.map((tr) => ({
+        content: validResults.map((tr) => ({
           type: "tool_result",
           tool_use_id: tr.toolCallId,
           content: tr.content
         }))
       });
-      pendingToolResults.length = 0;
+    }
+    pendingToolResults.length = 0;
+  };
+  for (const msg of messages) {
+    if (msg.role === "system") {
+      system += (system ? "\n" : "") + msg.content;
+      continue;
+    }
+    if (msg.role === "assistant" && pendingToolResults.length > 0) {
+      flushToolResults();
     }
     if (msg.role === "user") {
-      if (pendingToolResults.length > 0) {
-        formatted.push({
-          role: "user",
-          content: pendingToolResults.map((tr) => ({
-            type: "tool_result",
-            tool_use_id: tr.toolCallId,
-            content: tr.content
-          }))
-        });
-        pendingToolResults.length = 0;
-      }
+      flushToolResults();
       if (typeof msg.content === "string") {
         formatted.push({ role: "user", content: msg.content });
       } else {
@@ -331,22 +334,21 @@ function formatMessagesForAnthropic(messages) {
         formatted.push({ role: "assistant", content });
       }
     } else if (msg.role === "tool") {
+      const toolCallId = msg.toolCallId ?? msg.tool_call_id ?? msg.toolUseId;
+      if (!toolCallId) {
+        console.warn(
+          "[llm-sdk] Tool message missing toolCallId, skipping:",
+          msg
+        );
+        continue;
+      }
       pendingToolResults.push({
-        toolCallId: msg.toolCallId,
+        toolCallId,
         content: msg.content
       });
     }
   }
-  if (pendingToolResults.length > 0) {
-    formatted.push({
-      role: "user",
-      content: pendingToolResults.map((tr) => ({
-        type: "tool_result",
-        tool_use_id: tr.toolCallId,
-        content: tr.content
-      }))
-    });
-  }
+  flushToolResults();
   return { system, messages: formatted };
 }
 
@@ -538,6 +540,8 @@ var AnthropicAdapter = class {
   convertToAnthropicMessages(rawMessages) {
     const messages = [];
     const pendingToolResults = [];
+    let lastToolCallIds = [];
+    let toolResultIndex = 0;
     for (const msg of rawMessages) {
       if (msg.role === "system") continue;
       if (msg.role === "assistant") {
@@ -551,6 +555,8 @@ var AnthropicAdapter = class {
             }))
           });
           pendingToolResults.length = 0;
+          lastToolCallIds = [];
+          toolResultIndex = 0;
         }
         const content = [];
         if (msg.content && typeof msg.content === "string" && msg.content.trim()) {
@@ -558,6 +564,8 @@ var AnthropicAdapter = class {
         }
         const toolCalls = msg.tool_calls;
         if (toolCalls && toolCalls.length > 0) {
+          lastToolCallIds = toolCalls.map((tc) => tc.id);
+          toolResultIndex = 0;
           for (const tc of toolCalls) {
             let input = {};
             try {
@@ -576,8 +584,35 @@ var AnthropicAdapter = class {
           messages.push({ role: "assistant", content });
         }
       } else if (msg.role === "tool") {
+        let toolCallId = msg.tool_call_id;
+        if (!toolCallId && lastToolCallIds.length > 0) {
+          toolCallId = lastToolCallIds[toolResultIndex];
+          toolResultIndex++;
+          console.warn(
+            `[llm-sdk] Tool message missing tool_call_id, inferred: ${toolCallId}`
+          );
+        }
+        if (!toolCallId) {
+          console.warn(
+            "[llm-sdk] Skipping tool message with missing tool_call_id (no inference possible):",
+            msg
+          );
+          continue;
+        }
+        if (lastToolCallIds.length === 0) {
+          console.warn(
+            `[llm-sdk] Skipping orphaned tool result (no pending tool_use): ${toolCallId}`
+          );
+          continue;
+        }
+        if (!lastToolCallIds.includes(toolCallId)) {
+          console.warn(
+            `[llm-sdk] Skipping tool result with unexpected tool_call_id: ${toolCallId}`
+          );
+          continue;
+        }
         pendingToolResults.push({
-          tool_use_id: msg.tool_call_id,
+          tool_use_id: toolCallId,
           content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
         });
       } else if (msg.role === "user") {