fix(ollama): fix duplicate tool response (#3707)

Author: MichaelDoyle

js/plugins/ollama/src/index.ts

@@ -430,21 +430,28 @@ function toOllamaRequest(
           toolResponses.push(c.toolResponse);
         }
       });
-      // Add tool responses, if any.
-      toolResponses.forEach((t) => {
+      if (toolResponses.length > 0) {
+        toolResponses.forEach((t) => {
+          messages.push({
+            role,
+            content:
+              typeof t.output === 'string'
+                ? t.output
+                : JSON.stringify(t.output),
+            tool_name: t.name,
+          });
+        });
+      } else {
         messages.push({
-          role,
-          content:
-            typeof t.output === 'string' ? t.output : JSON.stringify(t.output),
+          role: role,
+          content: toolRequests.length > 0 ? '' : messageText,
+          images: images.length > 0 ? images : undefined,
+          tool_calls:
+            toolRequests.length > 0
+              ? toOllamaToolCall(toolRequests)
+              : undefined,
         });
-      });
-      messages.push({
-        role: role,
-        content: toolRequests.length > 0 ? '' : messageText,
-        images: images.length > 0 ? images : undefined,
-        tool_calls:
-          toolRequests.length > 0 ? toOllamaToolCall(toolRequests) : undefined,
-      });
+      }
     });
     request.messages = messages;
   } else {

js/plugins/ollama/src/types.ts

@@ -152,8 +152,10 @@ export interface OllamaToolCall {
 export interface Message {
   role: string;
   content: string;
+  thinking?: string;
   images?: string[];
   tool_calls?: any[];
+  tool_name?: string;
 }
 
 // Ollama local model definition