ai-sdk-ollama 3.7.0 → 3.7.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.7.1
+
+### Patch Changes
+
+- 70def97: Support media/image content in tool result messages. When a tool returns `output.type === 'content'` with `image-data`, `image-url`, or `file-data` (image) parts, the provider now sends them in the tool message's `images` array to Ollama. Fixes #527.
+
 ## 3.7.0
 
 ### Minor Changes

package/dist/index.browser.cjs

@@ -375,6 +375,29 @@ ${finalInstruction}`;
 }
 
 // src/utils/convert-to-ollama-messages.ts
+function normalizeImageDataForOllama(imageData) {
+  if (imageData instanceof URL) {
+    if (imageData.protocol === "data:") {
+      const base64Match = imageData.href.match(/data:[^;]+;base64,(.+)/);
+      const extracted = base64Match?.[1];
+      if (typeof extracted === "string") return extracted;
+      return imageData.href;
+    }
+    return imageData.href;
+  }
+  if (typeof imageData === "string") {
+    if (imageData.startsWith("data:")) {
+      const base64Match = imageData.match(/data:[^;]+;base64,(.+)/);
+      const extracted = base64Match?.[1];
+      if (typeof extracted === "string") return extracted;
+    }
+    return imageData;
+  }
+  if (imageData instanceof Uint8Array) {
+    return Buffer.from(imageData).toString("base64");
+  }
+  return null;
+}
 function convertToOllamaChatMessages(prompt) {
   const messages = [];
   for (const message of prompt) {
@@ -396,35 +419,7 @@ function convertToOllamaChatMessages(prompt) {
           const textParts = message.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
           const imageParts = message.content.filter(
             (part) => part.type === "file"
-          ).filter((part) => {
-            return part.mediaType?.startsWith("image/") || false;
-          }).map((part) => {
-            const imageData = part.data;
-            if (imageData instanceof URL) {
-              if (imageData.protocol === "data:") {
-                const base64Match = imageData.href.match(
-                  /data:[^;]+;base64,(.+)/
-                );
-                if (base64Match) {
-                  return base64Match[1];
-                }
-                return imageData.href;
-              }
-              return imageData.href;
-            } else if (typeof imageData === "string") {
-              if (imageData.startsWith("data:")) {
-                const base64Match = imageData.match(/data:[^;]+;base64,(.+)/);
-                if (base64Match) {
-                  return base64Match[1];
-                }
-              }
-              return imageData;
-            } else if (imageData instanceof Uint8Array) {
-              return Buffer.from(imageData).toString("base64");
-            } else {
-              return null;
-            }
-          }).filter((img) => img !== null);
+          ).filter((part) => part.mediaType?.startsWith("image/") ?? false).map((part) => normalizeImageDataForOllama(part.data)).filter((img) => img !== null);
           messages.push({
             role: "user",
             content: textParts || "",
@@ -473,14 +468,48 @@ function convertToOllamaChatMessages(prompt) {
           });
         } else {
           for (const part of message.content) {
-            if (part.type === "tool-result") {
-              const contentValue = part.output.type === "text" || part.output.type === "error-text" ? part.output.value : part.output.type === "json" || part.output.type === "error-json" ? JSON.stringify(part.output.value) : JSON.stringify(part.output);
+            if (part.type !== "tool-result") continue;
+            if (part.output.type === "content") {
+              const textParts = [];
+              const imageParts = [];
+              for (const item of part.output.value) {
+                switch (item.type) {
+                  case "text": {
+                    textParts.push(item.text);
+                    break;
+                  }
+                  case "image-data": {
+                    const normalized = normalizeImageDataForOllama(item.data);
+                    if (normalized) imageParts.push(normalized);
+                    break;
+                  }
+                  case "image-url": {
+                    imageParts.push(item.url);
+                    break;
+                  }
+                  case "file-data": {
+                    if (item.mediaType?.startsWith("image/")) {
+                      const normalized = normalizeImageDataForOllama(item.data);
+                      if (normalized) imageParts.push(normalized);
+                    }
+                    break;
+                  }
+                }
+              }
               messages.push({
                 role: "tool",
-                content: contentValue,
-                tool_name: part.toolName
+                content: textParts.join("\n") || "",
+                tool_name: part.toolName,
+                images: imageParts.length > 0 ? imageParts : void 0
               });
+              continue;
             }
+            const contentValue = part.output.type === "text" || part.output.type === "error-text" ? part.output.value : part.output.type === "json" || part.output.type === "error-json" ? JSON.stringify(part.output.value) : part.output.type === "execution-denied" ? "" : JSON.stringify(part.output);
+            messages.push({
+              role: "tool",
+              content: contentValue,
+              tool_name: part.toolName
+            });
           }
         }
         break;