@dexto/core 1.7.0 → 1.7.1

package/dist/llm/formatters/vercel.cjs

@@ -33,6 +33,14 @@ function toUrlIfString(value) {
   }
   return value;
 }
+function normalizeToolMediaData(data) {
+  const dataUri = (0, import_utils.parseDataUri)(data);
+  if (dataUri) return dataUri.base64;
+  if (/^https?:\/\//i.test(data) || data.startsWith("blob:") || data.startsWith("@blob:")) {
+    return null;
+  }
+  return data;
+}
 class VercelMessageFormatter {
   logger;
   constructor(logger) {
@@ -252,51 +260,57 @@ class VercelMessageFormatter {
   formatToolMessage(msg) {
     let toolResultPart;
     if (Array.isArray(msg.content)) {
-      if (msg.content[0]?.type === "image") {
-        const imagePart = msg.content[0];
-        const imageDataBase64 = (0, import_utils.getImageData)(imagePart, this.logger);
-        toolResultPart = {
-          type: "tool-result",
-          toolCallId: msg.toolCallId,
-          toolName: msg.name,
-          output: {
-            type: "content",
-            value: [
-              {
-                type: "media",
-                data: imageDataBase64,
-                mediaType: imagePart.mimeType || "image/jpeg"
-              }
-            ]
+      const content = msg.content.map((part) => {
+        if (part.type === "text") {
+          return { type: "text", text: part.text };
+        }
+        if (part.type === "image") {
+          const data = (0, import_utils.getImageData)(part, this.logger);
+          const mediaData = normalizeToolMediaData(data);
+          if (!mediaData) {
+            return { type: "text", text: `Attached image: ${data}` };
           }
-        };
-      } else if (msg.content[0]?.type === "file") {
-        const filePart = msg.content[0];
-        const fileDataBase64 = (0, import_utils.getFileData)(filePart, this.logger);
+          return {
+            type: "media",
+            data: mediaData,
+            mediaType: part.mimeType || "image/jpeg"
+          };
+        }
+        if (part.type === "file") {
+          const data = (0, import_utils.getFileData)(part, this.logger);
+          const mediaData = normalizeToolMediaData(data);
+          if (!mediaData) {
+            return { type: "text", text: `Attached file: ${data}` };
+          }
+          return {
+            type: "media",
+            data: mediaData,
+            mediaType: part.mimeType
+          };
+        }
+        if (part.type === "resource") {
+          return { type: "text", text: `${part.name}: ${part.uri}` };
+        }
+        return null;
+      }).filter((part) => part !== null);
+      if (content.some((part) => part.type === "media")) {
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,
           toolName: msg.name,
           output: {
             type: "content",
-            value: [
-              {
-                type: "media",
-                data: fileDataBase64,
-                mediaType: filePart.mimeType
-              }
-            ]
+            value: content
           }
         };
       } else {
-        const textContent = Array.isArray(msg.content) ? msg.content.map((part) => part.type === "text" ? part.text : JSON.stringify(part)).join("\n") : String(msg.content);
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,
           toolName: msg.name,
           output: {
             type: "text",
-            value: textContent
+            value: content.filter((part) => part.type === "text").map((part) => part.text).join("\n") || "[empty result]"
           }
         };
       }

package/dist/llm/formatters/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/formatters/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAiD,MAAM,IAAI,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAiC,MAAM,wBAAwB,CAAC;AAE7F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAmBvD;;;;;;;;;;GAUG;AACH,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM;IAG1B;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,EAAE;IAkKjB;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,sBAAsB;IAmG9B,OAAO,CAAC,iBAAiB;CAoE5B"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/formatters/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAiD,MAAM,IAAI,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAiC,MAAM,wBAAwB,CAAC;AAO7F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AA8BvD;;;;;;;;;;GAUG;AACH,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM;IAG1B;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,EAAE;IAkKjB;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,sBAAsB;IAmG9B,OAAO,CAAC,iBAAiB;CA6E5B"}

package/dist/llm/formatters/vercel.js

@@ -1,5 +1,10 @@
 import "../../chunk-PTJYTZNU.js";
-import { getImageData, getFileData, filterMessagesByLLMCapabilities } from "../../context/utils.js";
+import {
+  getImageData,
+  getFileData,
+  filterMessagesByLLMCapabilities,
+  parseDataUri
+} from "../../context/utils.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
 function toUrlIfString(value) {
   if (typeof value === "string" && /^https?:\/\//i.test(value)) {
@@ -11,6 +16,14 @@ function toUrlIfString(value) {
   }
   return value;
 }
+function normalizeToolMediaData(data) {
+  const dataUri = parseDataUri(data);
+  if (dataUri) return dataUri.base64;
+  if (/^https?:\/\//i.test(data) || data.startsWith("blob:") || data.startsWith("@blob:")) {
+    return null;
+  }
+  return data;
+}
 class VercelMessageFormatter {
   logger;
   constructor(logger) {
@@ -230,51 +243,57 @@ class VercelMessageFormatter {
   formatToolMessage(msg) {
     let toolResultPart;
     if (Array.isArray(msg.content)) {
-      if (msg.content[0]?.type === "image") {
-        const imagePart = msg.content[0];
-        const imageDataBase64 = getImageData(imagePart, this.logger);
-        toolResultPart = {
-          type: "tool-result",
-          toolCallId: msg.toolCallId,
-          toolName: msg.name,
-          output: {
-            type: "content",
-            value: [
-              {
-                type: "media",
-                data: imageDataBase64,
-                mediaType: imagePart.mimeType || "image/jpeg"
-              }
-            ]
+      const content = msg.content.map((part) => {
+        if (part.type === "text") {
+          return { type: "text", text: part.text };
+        }
+        if (part.type === "image") {
+          const data = getImageData(part, this.logger);
+          const mediaData = normalizeToolMediaData(data);
+          if (!mediaData) {
+            return { type: "text", text: `Attached image: ${data}` };
           }
-        };
-      } else if (msg.content[0]?.type === "file") {
-        const filePart = msg.content[0];
-        const fileDataBase64 = getFileData(filePart, this.logger);
+          return {
+            type: "media",
+            data: mediaData,
+            mediaType: part.mimeType || "image/jpeg"
+          };
+        }
+        if (part.type === "file") {
+          const data = getFileData(part, this.logger);
+          const mediaData = normalizeToolMediaData(data);
+          if (!mediaData) {
+            return { type: "text", text: `Attached file: ${data}` };
+          }
+          return {
+            type: "media",
+            data: mediaData,
+            mediaType: part.mimeType
+          };
+        }
+        if (part.type === "resource") {
+          return { type: "text", text: `${part.name}: ${part.uri}` };
+        }
+        return null;
+      }).filter((part) => part !== null);
+      if (content.some((part) => part.type === "media")) {
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,
           toolName: msg.name,
           output: {
             type: "content",
-            value: [
-              {
-                type: "media",
-                data: fileDataBase64,
-                mediaType: filePart.mimeType
-              }
-            ]
+            value: content
           }
         };
       } else {
-        const textContent = Array.isArray(msg.content) ? msg.content.map((part) => part.type === "text" ? part.text : JSON.stringify(part)).join("\n") : String(msg.content);
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,
           toolName: msg.name,
           output: {
             type: "text",
-            value: textContent
+            value: content.filter((part) => part.type === "text").map((part) => part.text).join("\n") || "[empty result]"
           }
         };
       }