@jaypie/llm 1.2.7 → 1.2.8

package/dist/cjs/index.cjs

@@ -911,19 +911,51 @@ class AnthropicAdapter extends BaseProviderAdapter {
     //
     buildRequest(request) {
         // Convert messages to Anthropic format
-        // Filter out system messages - Anthropic only accepts system as a top-level field
-        const messages = request.messages
-            .filter((msg) => {
-            const role = msg.role;
-            return role !== "system";
-        })
-            .map((msg) => {
+        // Handle different message types: regular messages, function calls, and function outputs
+        const messages = [];
+        for (const msg of request.messages) {
             const typedMsg = msg;
-            return {
-                role: typedMsg.role,
-                content: convertContentToAnthropic(typedMsg.content),
-            };
-        });
+            // Skip system messages - Anthropic only accepts system as a top-level field
+            if (typedMsg.role === "system") {
+                continue;
+            }
+            // Handle FunctionCall messages - convert to assistant message with tool_use
+            if (typedMsg.type === exports.LlmMessageType.FunctionCall) {
+                messages.push({
+                    role: "assistant",
+                    content: [
+                        {
+                            type: "tool_use",
+                            id: typedMsg.call_id || "",
+                            name: typedMsg.name || "",
+                            input: JSON.parse(typedMsg.arguments || "{}"),
+                        },
+                    ],
+                });
+                continue;
+            }
+            // Handle FunctionCallOutput messages - convert to user message with tool_result
+            if (typedMsg.type === exports.LlmMessageType.FunctionCallOutput) {
+                messages.push({
+                    role: "user",
+                    content: [
+                        {
+                            type: "tool_result",
+                            tool_use_id: typedMsg.call_id || "",
+                            content: typedMsg.output || "",
+                        },
+                    ],
+                });
+                continue;
+            }
+            // Handle regular messages with role and content
+            if (typedMsg.role && typedMsg.content !== undefined) {
+                messages.push({
+                    role: typedMsg.role,
+                    content: convertContentToAnthropic(typedMsg.content),
+                });
+            }
+        }
         // Append instructions to last message if provided
         if (request.instructions && messages.length > 0) {
             const lastMsg = messages[messages.length - 1];
@@ -2911,6 +2943,31 @@ class OpenRouterAdapter extends BaseProviderAdapter {
                     });
                 }
             }
+            else if (message.type === exports.LlmMessageType.FunctionCall) {
+                // Handle FunctionCall messages from StreamLoop (issue #165)
+                openRouterMessages.push({
+                    role: "assistant",
+                    content: null,
+                    toolCalls: [
+                        {
+                            id: message.call_id,
+                            type: "function",
+                            function: {
+                                name: message.name,
+                                arguments: message.arguments || "{}",
+                            },
+                        },
+                    ],
+                });
+            }
+            else if (message.type === exports.LlmMessageType.FunctionCallOutput) {
+                // Handle FunctionCallOutput messages from StreamLoop (issue #165)
+                openRouterMessages.push({
+                    role: "tool",
+                    toolCallId: message.call_id,
+                    content: message.output || "",
+                });
+            }
         }
         return openRouterMessages;
     }