@dexto/core 1.3.0 → 1.4.0

package/dist/llm/executor/types.d.ts

@@ -0,0 +1,27 @@
+import { TokenUsage } from '../types.js';
+import { LLMFinishReason } from '../../events/index.js';
+export interface ExecutorResult {
+    /**
+     * The accumulated text from assistant responses.
+     * TODO: Some LLMs are multimodal and can generate non-text content (images, audio, etc.).
+     * Consider extending this to support multimodal output in the future.
+     */
+    text: string;
+    /** Number of steps executed */
+    stepCount: number;
+    /** Token usage from the last step */
+    usage: TokenUsage | null;
+    /** Reason the execution finished */
+    finishReason: LLMFinishReason;
+}
+export interface StreamProcessorResult {
+    /**
+     * The accumulated text from text-delta events.
+     * TODO: Some LLMs are multimodal and can generate non-text content (images, audio, etc.).
+     * Consider extending this to support multimodal output in the future.
+     */
+    text: string;
+    finishReason: LLMFinishReason;
+    usage: TokenUsage;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/llm/executor/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,cAAc;IAC3B;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACzB,oCAAoC;IACpC,YAAY,EAAE,eAAe,CAAC;CACjC;AAED,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,EAAE,UAAU,CAAC;CACrB"}

package/dist/llm/formatters/vercel.cjs

@@ -22,11 +22,21 @@ __export(vercel_exports, {
 });
 module.exports = __toCommonJS(vercel_exports);
 var import_utils = require("../../context/utils.cjs");
-var import_types4 = require("../../logger/v2/types.cjs");
+var import_types2 = require("../../logger/v2/types.cjs");
+function toUrlIfString(value) {
+  if (typeof value === "string" && /^https?:\/\//i.test(value)) {
+    try {
+      return new URL(value);
+    } catch {
+      return value;
+    }
+  }
+  return value;
+}
 class VercelMessageFormatter {
   logger;
   constructor(logger) {
-    this.logger = logger.createChild(import_types4.DextoLogComponent.LLM);
+    this.logger = logger.createChild(import_types2.DextoLogComponent.LLM);
   }
   /**
    * Formats internal messages into Vercel AI SDK format
@@ -59,11 +69,11 @@ class VercelMessageFormatter {
       switch (msg.role) {
         case "user":
           if (msg.content !== null) {
-            const content = typeof msg.content === "string" ? msg.content : msg.content.map((part) => {
+            const content = typeof msg.content === "string" ? msg.content : msg.content.filter((part) => part.type !== "ui-resource").map((part) => {
               if (part.type === "file") {
                 return {
                   type: "file",
-                  data: part.data,
+                  data: toUrlIfString(part.data),
                   mediaType: part.mimeType,
                   // Convert mimeType -> mediaType
                   ...part.filename && { filename: part.filename }
@@ -71,8 +81,10 @@ class VercelMessageFormatter {
               } else if (part.type === "image") {
                 return {
                   type: "image",
-                  image: part.image,
-                  ...part.mimeType && { mediaType: part.mimeType }
+                  image: toUrlIfString(part.image),
+                  ...part.mimeType && {
+                    mediaType: part.mimeType
+                  }
                   // Convert mimeType -> mediaType
                 };
               }
@@ -146,189 +158,11 @@ class VercelMessageFormatter {
   formatSystemPrompt() {
     return null;
   }
-  /**
-   * Parses raw Vercel SDK stream response into internal message objects.
-   * This handles StreamTextResult which has different structure than GenerateTextResult
-   */
-  async parseStreamResponse(response) {
-    const resolvedResponse = await response.response;
-    const adaptedResponse = {
-      response: {
-        messages: resolvedResponse?.messages || []
-      }
-    };
-    const internal = this.parseResponse(
-      adaptedResponse
-    );
-    const lastAssistant = [...internal].reverse().find((m) => m.role === "assistant");
-    if (lastAssistant) {
-      const usage = await response.totalUsage;
-      const reasoningText = await response.reasoningText;
-      if (reasoningText) {
-        lastAssistant.reasoning = reasoningText;
-      }
-      if (usage) {
-        lastAssistant.tokenUsage = {
-          ...usage.inputTokens !== void 0 && { inputTokens: usage.inputTokens },
-          ...usage.outputTokens !== void 0 && { outputTokens: usage.outputTokens },
-          ...usage.reasoningTokens !== void 0 && {
-            reasoningTokens: usage.reasoningTokens
-          },
-          ...usage.totalTokens !== void 0 && { totalTokens: usage.totalTokens }
-        };
-      }
-    }
-    return internal;
-  }
-  /**
-   * Parses raw Vercel SDK response into internal message objects.
-   * TODO: Break this into smaller functions
-   */
-  parseResponse(response) {
-    const internal = [];
-    if (!response.response.messages) return internal;
-    for (const msg of response.response.messages) {
-      const role = msg.role;
-      switch (role) {
-        case "user":
-          if (typeof msg.content === "string") {
-            internal.push({
-              role: "user",
-              content: [{ type: "text", text: msg.content }]
-            });
-          } else if (Array.isArray(msg.content)) {
-            const srcParts = msg.content;
-            const parts = srcParts.map((p) => {
-              if (p.type === "text") return { type: "text", text: p.text };
-              if (p.type === "image")
-                return {
-                  type: "image",
-                  image: p.image,
-                  mimeType: p.mediaType ?? "image/jpeg"
-                };
-              if (p.type === "file")
-                return {
-                  type: "file",
-                  data: p.data,
-                  mimeType: p.mediaType,
-                  filename: p.filename
-                };
-              return { type: "text", text: JSON.stringify(p) };
-            });
-            internal.push({
-              role: "user",
-              content: parts
-            });
-          }
-          break;
-        case "assistant": {
-          let text = null;
-          const calls = [];
-          if (typeof msg.content === "string") {
-            text = msg.content;
-          } else if (Array.isArray(msg.content)) {
-            let combined = "";
-            for (const part of msg.content) {
-              if (part.type === "text") {
-                combined += part.text;
-              } else if (part.type === "tool-call") {
-                calls.push({
-                  id: part.toolCallId,
-                  type: "function",
-                  function: {
-                    name: part.toolName,
-                    arguments: typeof part.input === "string" ? part.input : JSON.stringify(part.input)
-                  }
-                });
-              }
-            }
-            text = combined || null;
-          }
-          const assistantMessage = {
-            role: "assistant",
-            content: text
-          };
-          if (calls.length > 0) {
-            assistantMessage.toolCalls = calls;
-          }
-          internal.push(assistantMessage);
-          break;
-        }
-        case "tool":
-          if (Array.isArray(msg.content)) {
-            for (const part of msg.content) {
-              if (part.type === "tool-result") {
-                let content;
-                const output = part.output;
-                if (output.type === "content") {
-                  content = output.value.map((item) => {
-                    if (item.type === "media") {
-                      return {
-                        type: "image",
-                        image: item.data,
-                        mimeType: item.mediaType
-                      };
-                    } else {
-                      return {
-                        type: "text",
-                        text: item.text
-                      };
-                    }
-                  });
-                } else if (output.type === "text" || output.type === "error-text") {
-                  content = output.value;
-                } else if (output.type === "json" || output.type === "error-json") {
-                  content = JSON.stringify(output.value);
-                } else {
-                  content = JSON.stringify(output);
-                }
-                internal.push({
-                  role: "tool",
-                  content,
-                  toolCallId: part.toolCallId,
-                  name: part.toolName
-                });
-              }
-            }
-          }
-          break;
-        default:
-          break;
-      }
-    }
-    const lastAssistant = [...internal].reverse().find((m) => m.role === "assistant");
-    const anyResp = response;
-    const usage = anyResp.totalUsage;
-    const reasoningText = anyResp.reasoningText;
-    const modelId = response.response?.modelId;
-    if (lastAssistant) {
-      if (typeof reasoningText === "string" && reasoningText.length > 0) {
-        lastAssistant.reasoning = reasoningText;
-      }
-      if (usage) {
-        lastAssistant.tokenUsage = {
-          ...usage.inputTokens !== void 0 && { inputTokens: usage.inputTokens },
-          ...usage.outputTokens !== void 0 && { outputTokens: usage.outputTokens },
-          ...usage.reasoningTokens !== void 0 && {
-            reasoningTokens: usage.reasoningTokens
-          },
-          ...usage.totalTokens !== void 0 && { totalTokens: usage.totalTokens }
-        };
-      }
-      if (modelId) {
-        lastAssistant.model = modelId;
-      }
-    }
-    return internal;
-  }
   // Helper to format Assistant messages (with optional tool calls)
-  // TODO: improve typing when InternalMessage type is updated
   formatAssistantMessage(msg) {
     if (msg.toolCalls && msg.toolCalls.length > 0) {
       const contentParts = [];
-      if (typeof msg.content === "string" && msg.content.length > 0) {
-        contentParts.push({ type: "text", text: msg.content });
-      } else if (Array.isArray(msg.content)) {
+      if (Array.isArray(msg.content)) {
         const combined = msg.content.map((part) => part.type === "text" ? part.text : "").filter(Boolean).join("\n");
         if (combined) {
           contentParts.push({ type: "text", text: combined });
@@ -377,7 +211,7 @@ class VercelMessageFormatter {
       }
     }
     return {
-      content: typeof msg.content === "string" ? [{ type: "text", text: msg.content }] : msg.content
+      content: typeof msg.content === "string" ? [{ type: "text", text: msg.content }] : msg.content === null ? [] : msg.content
     };
   }
   // Helper to format Tool result messages

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

@@ -1,8 +1,6 @@
 import type { ModelMessage } from 'ai';
-import { IMessageFormatter } from './types.js';
 import { LLMContext } from '../types.js';
-import { InternalMessage } from '../../context/types.js';
-import type { GenerateTextResult, StreamTextResult, ToolSet as VercelToolSet } from 'ai';
+import type { InternalMessage } from '../../context/types.js';
 import type { IDextoLogger } from '../../logger/v2/types.js';
 /**
  * Message formatter for Vercel AI SDK.
@@ -15,7 +13,7 @@ import type { IDextoLogger } from '../../logger/v2/types.js';
  * Note: Vercel's implementation is different from OpenAI's standard,
  * particularly in its handling of function calls and responses.
  */
-export declare class VercelMessageFormatter implements IMessageFormatter {
+export declare class VercelMessageFormatter {
     private logger;
     constructor(logger: IDextoLogger);
     /**
@@ -34,16 +32,6 @@ export declare class VercelMessageFormatter implements IMessageFormatter {
      * @returns null as Vercel doesn't need a separate system prompt
      */
     formatSystemPrompt(): null;
-    /**
-     * Parses raw Vercel SDK stream response into internal message objects.
-     * This handles StreamTextResult which has different structure than GenerateTextResult
-     */
-    parseStreamResponse(response: StreamTextResult<VercelToolSet, unknown>): Promise<InternalMessage[]>;
-    /**
-     * Parses raw Vercel SDK response into internal message objects.
-     * TODO: Break this into smaller functions
-     */
-    parseResponse(response: GenerateTextResult<VercelToolSet, unknown>): InternalMessage[];
     private formatAssistantMessage;
     private formatToolMessage;
 }

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,EACR,YAAY,EAOf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAEzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG7D;;;;;;;;;;GAUG;AACH,qBAAa,sBAAuB,YAAW,iBAAiB;IAC5D,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY;IAGhC;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,EAAE;IAmIjB;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;;OAGG;IACG,mBAAmB,CACrB,QAAQ,EAAE,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACnD,OAAO,CAAC,eAAe,EAAE,CAAC;IAwC7B;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,eAAe,EAAE;IAsJtF,OAAO,CAAC,sBAAsB;IAuE9B,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;AAE7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAmB7D;;;;;;;;;;GAUG;AACH,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY;IAGhC;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,EAAE;IAwIjB;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAK1B,OAAO,CAAC,sBAAsB;IAuE9B,OAAO,CAAC,iBAAiB;CAoE5B"}

package/dist/llm/formatters/vercel.js

@@ -1,6 +1,16 @@
-import "../../chunk-C6A6W6XS.js";
+import "../../chunk-PTJYTZNU.js";
 import { getImageData, getFileData, filterMessagesByLLMCapabilities } from "../../context/utils.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
+function toUrlIfString(value) {
+  if (typeof value === "string" && /^https?:\/\//i.test(value)) {
+    try {
+      return new URL(value);
+    } catch {
+      return value;
+    }
+  }
+  return value;
+}
 class VercelMessageFormatter {
   logger;
   constructor(logger) {
@@ -37,11 +47,11 @@ class VercelMessageFormatter {
       switch (msg.role) {
         case "user":
           if (msg.content !== null) {
-            const content = typeof msg.content === "string" ? msg.content : msg.content.map((part) => {
+            const content = typeof msg.content === "string" ? msg.content : msg.content.filter((part) => part.type !== "ui-resource").map((part) => {
               if (part.type === "file") {
                 return {
                   type: "file",
-                  data: part.data,
+                  data: toUrlIfString(part.data),
                   mediaType: part.mimeType,
                   // Convert mimeType -> mediaType
                   ...part.filename && { filename: part.filename }
@@ -49,8 +59,10 @@ class VercelMessageFormatter {
               } else if (part.type === "image") {
                 return {
                   type: "image",
-                  image: part.image,
-                  ...part.mimeType && { mediaType: part.mimeType }
+                  image: toUrlIfString(part.image),
+                  ...part.mimeType && {
+                    mediaType: part.mimeType
+                  }
                   // Convert mimeType -> mediaType
                 };
               }
@@ -124,189 +136,11 @@ class VercelMessageFormatter {
   formatSystemPrompt() {
     return null;
   }
-  /**
-   * Parses raw Vercel SDK stream response into internal message objects.
-   * This handles StreamTextResult which has different structure than GenerateTextResult
-   */
-  async parseStreamResponse(response) {
-    const resolvedResponse = await response.response;
-    const adaptedResponse = {
-      response: {
-        messages: resolvedResponse?.messages || []
-      }
-    };
-    const internal = this.parseResponse(
-      adaptedResponse
-    );
-    const lastAssistant = [...internal].reverse().find((m) => m.role === "assistant");
-    if (lastAssistant) {
-      const usage = await response.totalUsage;
-      const reasoningText = await response.reasoningText;
-      if (reasoningText) {
-        lastAssistant.reasoning = reasoningText;
-      }
-      if (usage) {
-        lastAssistant.tokenUsage = {
-          ...usage.inputTokens !== void 0 && { inputTokens: usage.inputTokens },
-          ...usage.outputTokens !== void 0 && { outputTokens: usage.outputTokens },
-          ...usage.reasoningTokens !== void 0 && {
-            reasoningTokens: usage.reasoningTokens
-          },
-          ...usage.totalTokens !== void 0 && { totalTokens: usage.totalTokens }
-        };
-      }
-    }
-    return internal;
-  }
-  /**
-   * Parses raw Vercel SDK response into internal message objects.
-   * TODO: Break this into smaller functions
-   */
-  parseResponse(response) {
-    const internal = [];
-    if (!response.response.messages) return internal;
-    for (const msg of response.response.messages) {
-      const role = msg.role;
-      switch (role) {
-        case "user":
-          if (typeof msg.content === "string") {
-            internal.push({
-              role: "user",
-              content: [{ type: "text", text: msg.content }]
-            });
-          } else if (Array.isArray(msg.content)) {
-            const srcParts = msg.content;
-            const parts = srcParts.map((p) => {
-              if (p.type === "text") return { type: "text", text: p.text };
-              if (p.type === "image")
-                return {
-                  type: "image",
-                  image: p.image,
-                  mimeType: p.mediaType ?? "image/jpeg"
-                };
-              if (p.type === "file")
-                return {
-                  type: "file",
-                  data: p.data,
-                  mimeType: p.mediaType,
-                  filename: p.filename
-                };
-              return { type: "text", text: JSON.stringify(p) };
-            });
-            internal.push({
-              role: "user",
-              content: parts
-            });
-          }
-          break;
-        case "assistant": {
-          let text = null;
-          const calls = [];
-          if (typeof msg.content === "string") {
-            text = msg.content;
-          } else if (Array.isArray(msg.content)) {
-            let combined = "";
-            for (const part of msg.content) {
-              if (part.type === "text") {
-                combined += part.text;
-              } else if (part.type === "tool-call") {
-                calls.push({
-                  id: part.toolCallId,
-                  type: "function",
-                  function: {
-                    name: part.toolName,
-                    arguments: typeof part.input === "string" ? part.input : JSON.stringify(part.input)
-                  }
-                });
-              }
-            }
-            text = combined || null;
-          }
-          const assistantMessage = {
-            role: "assistant",
-            content: text
-          };
-          if (calls.length > 0) {
-            assistantMessage.toolCalls = calls;
-          }
-          internal.push(assistantMessage);
-          break;
-        }
-        case "tool":
-          if (Array.isArray(msg.content)) {
-            for (const part of msg.content) {
-              if (part.type === "tool-result") {
-                let content;
-                const output = part.output;
-                if (output.type === "content") {
-                  content = output.value.map((item) => {
-                    if (item.type === "media") {
-                      return {
-                        type: "image",
-                        image: item.data,
-                        mimeType: item.mediaType
-                      };
-                    } else {
-                      return {
-                        type: "text",
-                        text: item.text
-                      };
-                    }
-                  });
-                } else if (output.type === "text" || output.type === "error-text") {
-                  content = output.value;
-                } else if (output.type === "json" || output.type === "error-json") {
-                  content = JSON.stringify(output.value);
-                } else {
-                  content = JSON.stringify(output);
-                }
-                internal.push({
-                  role: "tool",
-                  content,
-                  toolCallId: part.toolCallId,
-                  name: part.toolName
-                });
-              }
-            }
-          }
-          break;
-        default:
-          break;
-      }
-    }
-    const lastAssistant = [...internal].reverse().find((m) => m.role === "assistant");
-    const anyResp = response;
-    const usage = anyResp.totalUsage;
-    const reasoningText = anyResp.reasoningText;
-    const modelId = response.response?.modelId;
-    if (lastAssistant) {
-      if (typeof reasoningText === "string" && reasoningText.length > 0) {
-        lastAssistant.reasoning = reasoningText;
-      }
-      if (usage) {
-        lastAssistant.tokenUsage = {
-          ...usage.inputTokens !== void 0 && { inputTokens: usage.inputTokens },
-          ...usage.outputTokens !== void 0 && { outputTokens: usage.outputTokens },
-          ...usage.reasoningTokens !== void 0 && {
-            reasoningTokens: usage.reasoningTokens
-          },
-          ...usage.totalTokens !== void 0 && { totalTokens: usage.totalTokens }
-        };
-      }
-      if (modelId) {
-        lastAssistant.model = modelId;
-      }
-    }
-    return internal;
-  }
   // Helper to format Assistant messages (with optional tool calls)
-  // TODO: improve typing when InternalMessage type is updated
   formatAssistantMessage(msg) {
     if (msg.toolCalls && msg.toolCalls.length > 0) {
       const contentParts = [];
-      if (typeof msg.content === "string" && msg.content.length > 0) {
-        contentParts.push({ type: "text", text: msg.content });
-      } else if (Array.isArray(msg.content)) {
+      if (Array.isArray(msg.content)) {
         const combined = msg.content.map((part) => part.type === "text" ? part.text : "").filter(Boolean).join("\n");
         if (combined) {
           contentParts.push({ type: "text", text: combined });
@@ -355,7 +189,7 @@ class VercelMessageFormatter {
       }
     }
     return {
-      content: typeof msg.content === "string" ? [{ type: "text", text: msg.content }] : msg.content
+      content: typeof msg.content === "string" ? [{ type: "text", text: msg.content }] : msg.content === null ? [] : msg.content
     };
   }
   // Helper to format Tool result messages