@mastra/upstash 0.10.2-alpha.2 → 0.10.2

package/dist/index.cjs

@@ -11511,11 +11511,12 @@ var require_chunk_TICDQWVJ = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-SWW4EBUZ.cjs
-var require_chunk_SWW4EBUZ = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-SWW4EBUZ.cjs"(exports2) {
+// ../../packages/core/dist/chunk-RFAN7FAT.cjs
+var require_chunk_RFAN7FAT = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-RFAN7FAT.cjs"(exports2) {
     var RegisteredLogger = {
       AGENT: "AGENT",
+      AUTH: "AUTH",
       NETWORK: "NETWORK",
       WORKFLOW: "WORKFLOW",
       LLM: "LLM",
@@ -11605,19 +11606,19 @@ var require_chunk_SWW4EBUZ = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-YEULQPUY.cjs
-var require_chunk_YEULQPUY = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-YEULQPUY.cjs"(exports2) {
-    var chunkSWW4EBUZ_cjs = require_chunk_SWW4EBUZ();
+// ../../packages/core/dist/chunk-VHZPWE5L.cjs
+var require_chunk_VHZPWE5L = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-VHZPWE5L.cjs"(exports2) {
+    var chunkRFAN7FAT_cjs = require_chunk_RFAN7FAT();
     var MastraBase = class {
-      component = chunkSWW4EBUZ_cjs.RegisteredLogger.LLM;
+      component = chunkRFAN7FAT_cjs.RegisteredLogger.LLM;
       logger;
       name;
       telemetry;
       constructor({ component, name }) {
-        this.component = component || chunkSWW4EBUZ_cjs.RegisteredLogger.LLM;
+        this.component = component || chunkRFAN7FAT_cjs.RegisteredLogger.LLM;
         this.name = name;
-        this.logger = new chunkSWW4EBUZ_cjs.ConsoleLogger({ name: `${this.component} - ${this.name}` });
+        this.logger = new chunkRFAN7FAT_cjs.ConsoleLogger({ name: `${this.component} - ${this.name}` });
       }
       /**
        * Set the logger for the agent
@@ -11625,7 +11626,7 @@ var require_chunk_YEULQPUY = chunkU74OJRHU_cjs.__commonJS({
        */
       __setLogger(logger) {
         this.logger = logger;
-        if (this.component !== chunkSWW4EBUZ_cjs.RegisteredLogger.LLM) {
+        if (this.component !== chunkRFAN7FAT_cjs.RegisteredLogger.LLM) {
           this.logger.debug(`Logger updated [component=${this.component}] [name=${this.name}]`);
         }
       }
@@ -11635,7 +11636,7 @@ var require_chunk_YEULQPUY = chunkU74OJRHU_cjs.__commonJS({
        */
       __setTelemetry(telemetry) {
         this.telemetry = telemetry;
-        if (this.component !== chunkSWW4EBUZ_cjs.RegisteredLogger.LLM) {
+        if (this.component !== chunkRFAN7FAT_cjs.RegisteredLogger.LLM) {
           this.logger.debug(`Telemetry updated [component=${this.component}] [name=${this.telemetry.name}]`);
         }
       }
@@ -11738,11 +11739,11 @@ var require_chunk_RWTSGWWL = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-E4PVJAEL.cjs
-var require_chunk_E4PVJAEL = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-E4PVJAEL.cjs"(exports2) {
+// ../../packages/core/dist/chunk-3JGO7S6X.cjs
+var require_chunk_3JGO7S6X = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-3JGO7S6X.cjs"(exports2) {
     var chunkTICDQWVJ_cjs = require_chunk_TICDQWVJ();
-    var chunkYEULQPUY_cjs = require_chunk_YEULQPUY();
+    var chunkVHZPWE5L_cjs = require_chunk_VHZPWE5L();
     var chunkRWTSGWWL_cjs = require_chunk_RWTSGWWL();
     var _MastraVoice_decorators;
     var _init;
@@ -11751,7 +11752,7 @@ var require_chunk_E4PVJAEL = chunkU74OJRHU_cjs.__commonJS({
       prefix: "voice",
       excludeMethods: ["__setTools", "__setLogger", "__setTelemetry", "#log"]
     })];
-    exports2.MastraVoice = class MastraVoice extends (_a = chunkYEULQPUY_cjs.MastraBase) {
+    exports2.MastraVoice = class MastraVoice extends (_a = chunkVHZPWE5L_cjs.MastraBase) {
       listeningModel;
       speechModel;
       speaker;
@@ -12029,90 +12030,34 @@ var require_chunk_E4PVJAEL = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-ST5RMVLG.cjs
-var require_chunk_ST5RMVLG = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-ST5RMVLG.cjs"(exports2) {
-    function mitt(all) {
-      all = all || /* @__PURE__ */ new Map();
-      return {
-        /**
-         * A Map of event names to registered handler functions.
-         */
-        all,
-        /**
-         * Register an event handler for the given type.
-         * @param {string|symbol} type Type of event to listen for, or `'*'` for all events
-         * @param {Function} handler Function to call in response to given event
-         * @memberOf mitt
-         */
-        on(type, handler) {
-          const handlers = all.get(type);
-          if (handlers) {
-            handlers.push(handler);
-          } else {
-            all.set(type, [handler]);
-          }
-        },
-        /**
-         * Remove an event handler for the given type.
-         * If `handler` is omitted, all handlers of the given type are removed.
-         * @param {string|symbol} type Type of event to unregister `handler` from (`'*'` to remove a wildcard handler)
-         * @param {Function} [handler] Handler function to remove
-         * @memberOf mitt
-         */
-        off(type, handler) {
-          const handlers = all.get(type);
-          if (handlers) {
-            if (handler) {
-              handlers.splice(handlers.indexOf(handler) >>> 0, 1);
-            } else {
-              all.set(type, []);
-            }
-          }
-        },
-        /**
-         * Invoke all handlers for the given type.
-         * If present, `'*'` handlers are invoked after type-matched handlers.
-         *
-         * Note: Manually firing '*' handlers is not supported.
-         *
-         * @param {string|symbol} type The event type to invoke
-         * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler
-         * @memberOf mitt
-         */
-        emit(type, evt) {
-          let handlers = all.get(type);
-          if (handlers) {
-            handlers.slice().map((handler) => {
-              handler(evt);
-            });
-          }
-          handlers = all.get("*");
-          if (handlers) {
-            handlers.slice().map((handler) => {
-              handler(type, evt);
-            });
-          }
-        }
-      };
-    }
-    var AvailableHooks = /* @__PURE__ */ ((AvailableHooks2) => {
-      AvailableHooks2["ON_EVALUATION"] = "onEvaluation";
-      AvailableHooks2["ON_GENERATION"] = "onGeneration";
-      return AvailableHooks2;
-    })(AvailableHooks || {});
-    var hooks = mitt();
-    function registerHook(hook, action) {
-      hooks.on(hook, action);
+// ../../packages/core/dist/chunk-4Z3OU5RY.cjs
+var require_chunk_4Z3OU5RY = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-4Z3OU5RY.cjs"(exports2) {
+    var Tool = class {
+      id;
+      description;
+      inputSchema;
+      outputSchema;
+      execute;
+      mastra;
+      constructor(opts) {
+        this.id = opts.id;
+        this.description = opts.description;
+        this.inputSchema = opts.inputSchema;
+        this.outputSchema = opts.outputSchema;
+        this.execute = opts.execute;
+        this.mastra = opts.mastra;
+      }
+    };
+    function createTool(opts) {
+      return new Tool(opts);
     }
-    function executeHook(hook, data) {
-      setImmediate(() => {
-        hooks.emit(hook, data);
-      });
+    function isVercelTool(tool) {
+      return !!(tool && !(tool instanceof Tool) && "parameters" in tool);
     }
-    exports2.AvailableHooks = AvailableHooks;
-    exports2.executeHook = executeHook;
-    exports2.registerHook = registerHook;
+    exports2.Tool = Tool;
+    exports2.createTool = createTool;
+    exports2.isVercelTool = isVercelTool;
   }
 });
 
@@ -21930,9 +21875,9 @@ var require_dist3 = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/ai@4.3.15_react@19.1.0_zod@3.24.4/node_modules/ai/dist/index.js
+// ../../node_modules/.pnpm/ai@4.3.16_react@19.1.0_zod@3.24.4/node_modules/ai/dist/index.js
 var require_dist4 = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/ai@4.3.15_react@19.1.0_zod@3.24.4/node_modules/ai/dist/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/ai@4.3.16_react@19.1.0_zod@3.24.4/node_modules/ai/dist/index.js"(exports2, module2) {
     var __defProp = Object.defineProperty;
     var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -24509,6 +24454,24 @@ var require_dist4 = chunkU74OJRHU_cjs.__commonJS({
         }
       }
     }
+    function stringifyForTelemetry(prompt) {
+      const processedPrompt = prompt.map((message) => {
+        return {
+          ...message,
+          content: typeof message.content === "string" ? message.content : message.content.map(processPart)
+        };
+      });
+      return JSON.stringify(processedPrompt);
+    }
+    function processPart(part) {
+      if (part.type === "image") {
+        return {
+          ...part,
+          image: part.image instanceof Uint8Array ? convertDataContentToBase64String(part.image) : part.image
+        };
+      }
+      return part;
+    }
     var originalGenerateId = (0, import_provider_utils7.createIdGenerator)({ prefix: "aiobj", size: 24 });
     async function generateObject({
       model,
@@ -24735,7 +24698,7 @@ var require_dist4 = chunkU74OJRHU_cjs.__commonJS({
                         input: () => inputFormat
                       },
                       "ai.prompt.messages": {
-                        input: () => JSON.stringify(promptMessages)
+                        input: () => stringifyForTelemetry(promptMessages)
                       },
                       "ai.settings.mode": mode,
                       // standardized gen-ai llm span attributes:
@@ -25322,7 +25285,7 @@ var require_dist4 = chunkU74OJRHU_cjs.__commonJS({
                       input: () => callOptions.inputFormat
                     },
                     "ai.prompt.messages": {
-                      input: () => JSON.stringify(callOptions.prompt)
+                      input: () => stringifyForTelemetry(callOptions.prompt)
                     },
                     "ai.settings.mode": mode,
                     // standardized gen-ai llm span attributes:
@@ -26080,7 +26043,7 @@ var require_dist4 = chunkU74OJRHU_cjs.__commonJS({
                     // prompt:
                     "ai.prompt.format": { input: () => promptFormat },
                     "ai.prompt.messages": {
-                      input: () => JSON.stringify(promptMessages)
+                      input: () => stringifyForTelemetry(promptMessages)
                     },
                     "ai.prompt.tools": {
                       // convert the language model level tools:
@@ -27401,7 +27364,7 @@ var require_dist4 = chunkU74OJRHU_cjs.__commonJS({
                         input: () => promptFormat
                       },
                       "ai.prompt.messages": {
-                        input: () => JSON.stringify(promptMessages)
+                        input: () => stringifyForTelemetry(promptMessages)
                       },
                       "ai.prompt.tools": {
                         // convert the language model level tools:
@@ -30059,10 +30022,11 @@ var require_dist5 = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-DXLVS7ML.cjs
-var require_chunk_DXLVS7ML = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-DXLVS7ML.cjs"(exports2) {
-    var chunkYEULQPUY_cjs = require_chunk_YEULQPUY();
+// ../../packages/core/dist/chunk-WWLMZIHW.cjs
+var require_chunk_WWLMZIHW = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-WWLMZIHW.cjs"(exports2) {
+    var chunk4Z3OU5RY_cjs = require_chunk_4Z3OU5RY();
+    var chunkVHZPWE5L_cjs = require_chunk_VHZPWE5L();
     var chunkLABUWBKX_cjs = require_chunk_LABUWBKX();
     var crypto2 = chunkU74OJRHU_cjs.__require("crypto");
     var jsonSchemaToZod = require_cjs();
@@ -30074,25 +30038,6 @@ var require_chunk_DXLVS7ML = chunkU74OJRHU_cjs.__commonJS({
       return e && e.__esModule ? e : { default: e };
     }
     var jsonSchemaToZod__default = /* @__PURE__ */ _interopDefault(jsonSchemaToZod);
-    var Tool = class {
-      id;
-      description;
-      inputSchema;
-      outputSchema;
-      execute;
-      mastra;
-      constructor(opts) {
-        this.id = opts.id;
-        this.description = opts.description;
-        this.inputSchema = opts.inputSchema;
-        this.outputSchema = opts.outputSchema;
-        this.execute = opts.execute;
-        this.mastra = opts.mastra;
-      }
-    };
-    function createTool(opts) {
-      return new Tool(opts);
-    }
     var ALL_STRING_CHECKS = ["regex", "emoji", "email", "url", "uuid", "cuid", "min", "max"];
     var ALL_NUMBER_CHECKS = [
       "min",
@@ -30113,7 +30058,7 @@ var require_chunk_DXLVS7ML = chunkU74OJRHU_cjs.__commonJS({
       "ZodAny",
       "ZodDefault"
     ];
-    var ToolCompatibility = class extends chunkYEULQPUY_cjs.MastraBase {
+    var ToolCompatibility = class extends chunkVHZPWE5L_cjs.MastraBase {
       model;
       constructor(model) {
         super({ name: "SchemaCompatibility" });
@@ -30354,7 +30299,7 @@ var require_chunk_DXLVS7ML = chunkU74OJRHU_cjs.__commonJS({
         }
       }
       process(tool) {
-        if (isVercelTool(tool)) {
+        if (chunk4Z3OU5RY_cjs.isVercelTool(tool)) {
           return {
             description: tool.description,
             // TODO: should we also process vercel tool params?
@@ -30677,7 +30622,7 @@ ${e.stack}` : "\nUnknown error object"));
         }
       }
     }
-    var CoreToolBuilder = class extends chunkYEULQPUY_cjs.MastraBase {
+    var CoreToolBuilder = class extends chunkVHZPWE5L_cjs.MastraBase {
       originalTool;
       options;
       logType;
@@ -30689,7 +30634,7 @@ ${e.stack}` : "\nUnknown error object"));
       }
       // Helper to get parameters based on tool type
       getParameters = () => {
-        if (isVercelTool(this.originalTool)) {
+        if (chunk4Z3OU5RY_cjs.isVercelTool(this.originalTool)) {
           return convertVercelToolParameters(this.originalTool);
         }
         return convertInputSchema(this.originalTool);
@@ -30734,7 +30679,7 @@ ${e.stack}` : "\nUnknown error object"));
           type: logType
         });
         const execFunction = async (args, execOptions) => {
-          if (isVercelTool(tool)) {
+          if (chunk4Z3OU5RY_cjs.isVercelTool(tool)) {
             return tool?.execute?.(args, execOptions) ?? void 0;
           }
           return tool?.execute?.(
@@ -30776,7 +30721,7 @@ ${e.stack}` : "\nUnknown error object"));
           ) : void 0
         };
         const parametersObject = {};
-        if (isVercelTool(this.originalTool)) {
+        if (chunk4Z3OU5RY_cjs.isVercelTool(this.originalTool)) {
           parametersObject.parameters = this.getParameters();
         } else {
           parametersObject.inputSchema = this.getParameters();
@@ -30896,9 +30841,6 @@ ${e.stack}` : "\nUnknown error object"));
     function resolveSerializedZodOutput(schema) {
       return Function("z", `"use strict";return (${schema});`)(zod.z);
     }
-    function isVercelTool(tool) {
-      return !!(tool && !(tool instanceof Tool) && "parameters" in tool);
-    }
     function isZodType(value) {
       return typeof value === "object" && value !== null && "_def" in value && "parse" in value && typeof value.parse === "function" && "safeParse" in value && typeof value.safeParse === "function";
     }
@@ -30918,7 +30860,7 @@ ${e.stack}` : "\nUnknown error object"));
       const toolsWithProperties = Object.keys(tools).reduce((acc, key) => {
         const tool = tools?.[key];
         if (tool) {
-          if (isVercelTool(tool)) {
+          if (chunk4Z3OU5RY_cjs.isVercelTool(tool)) {
             acc[key] = setVercelToolProperties(tool);
           } else {
             acc[key] = tool;
@@ -31047,16 +30989,13 @@ ${e.stack}` : "\nUnknown error object"));
       }
       return key;
     }
-    exports2.Tool = Tool;
     exports2.checkEvalStorageFields = checkEvalStorageFields;
     exports2.createMastraProxy = createMastraProxy;
-    exports2.createTool = createTool;
     exports2.deepMerge = deepMerge;
     exports2.delay = delay;
     exports2.ensureToolProperties = ensureToolProperties;
     exports2.isCoreMessage = isCoreMessage;
     exports2.isUiMessage = isUiMessage;
-    exports2.isVercelTool = isVercelTool;
     exports2.isZodType = isZodType;
     exports2.makeCoreTool = makeCoreTool;
     exports2.maskStreamTags = maskStreamTags;
@@ -31066,655 +31005,191 @@ ${e.stack}` : "\nUnknown error object"));
   }
 });
 
-// ../../packages/core/dist/chunk-I5OLBJ26.cjs
-var require_chunk_I5OLBJ26 = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-I5OLBJ26.cjs"(exports2) {
-    var chunkDXLVS7ML_cjs = require_chunk_DXLVS7ML();
-    var chunkYEULQPUY_cjs = require_chunk_YEULQPUY();
-    var chunkSWW4EBUZ_cjs = require_chunk_SWW4EBUZ();
+// ../../packages/core/dist/chunk-KUJQVCEL.cjs
+var require_chunk_KUJQVCEL = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-KUJQVCEL.cjs"(exports2) {
+    var chunkWWLMZIHW_cjs = require_chunk_WWLMZIHW();
+    var crypto2 = chunkU74OJRHU_cjs.__require("crypto");
     var ai = require_dist4();
+    var providerUtils = require_dist2();
     var zod = require_lib();
-    var MastraLLMBase = class extends chunkYEULQPUY_cjs.MastraBase {
-      // @ts-ignore
-      #mastra;
-      #model;
-      constructor({ name, model }) {
-        super({
-          component: chunkSWW4EBUZ_cjs.RegisteredLogger.LLM,
-          name
-        });
-        this.#model = model;
-      }
-      getProvider() {
-        return this.#model.provider;
+    zod.z.union([
+      zod.z.string(),
+      zod.z.instanceof(Uint8Array),
+      zod.z.instanceof(ArrayBuffer),
+      zod.z.custom(
+        // Buffer might not be available in some environments such as CloudFlare:
+        (value) => globalThis.Buffer?.isBuffer(value) ?? false,
+        { message: "Must be a Buffer" }
+      )
+    ]);
+    function convertDataContentToBase64String(content) {
+      if (typeof content === "string") {
+        return content;
       }
-      getModelId() {
-        return this.#model.modelId;
+      if (content instanceof ArrayBuffer) {
+        return providerUtils.convertUint8ArrayToBase64(new Uint8Array(content));
       }
-      getModel() {
-        return this.#model;
+      return providerUtils.convertUint8ArrayToBase64(content);
+    }
+    function convertDataContentToUint8Array(content) {
+      if (content instanceof Uint8Array) {
+        return content;
       }
-      convertToMessages(messages) {
-        if (Array.isArray(messages)) {
-          return messages.map((m) => {
-            if (typeof m === "string") {
-              return {
-                role: "user",
-                content: m
-              };
-            }
-            return m;
+      if (typeof content === "string") {
+        try {
+          return providerUtils.convertBase64ToUint8Array(content);
+        } catch (error) {
+          throw new Error("Invalid data content. Content string is not a base64-encoded media.", {
+            cause: error
           });
         }
-        return [
-          {
-            role: "user",
-            content: messages
-          }
-        ];
-      }
-      __registerPrimitives(p) {
-        if (p.telemetry) {
-          this.__setTelemetry(p.telemetry);
-        }
-        if (p.logger) {
-          this.__setLogger(p.logger);
-        }
-      }
-      __registerMastra(p) {
-        this.#mastra = p;
-      }
-      async __text(input) {
-        this.logger.debug(`[LLMs:${this.name}] Generating text.`, { input });
-        throw new Error("Method not implemented.");
-      }
-      async __textObject(input) {
-        this.logger.debug(`[LLMs:${this.name}] Generating object.`, { input });
-        throw new Error("Method not implemented.");
-      }
-      async generate(messages, options) {
-        this.logger.debug(`[LLMs:${this.name}] Generating text.`, { messages, options });
-        throw new Error("Method not implemented.");
-      }
-      async __stream(input) {
-        this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { input });
-        throw new Error("Method not implemented.");
-      }
-      async __streamObject(input) {
-        this.logger.debug(`[LLMs:${this.name}] Streaming object.`, { input });
-        throw new Error("Method not implemented.");
       }
-      async stream(messages, options) {
-        this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { messages, options });
-        throw new Error("Method not implemented.");
+      if (content instanceof ArrayBuffer) {
+        return new Uint8Array(content);
       }
-    };
-    var MastraLLM = class extends MastraLLMBase {
-      #model;
-      #mastra;
-      constructor({ model, mastra }) {
-        super({ name: "aisdk", model });
-        this.#model = model;
-        if (mastra) {
-          this.#mastra = mastra;
-          if (mastra.getLogger()) {
-            this.__setLogger(this.#mastra.getLogger());
-          }
-        }
+      throw new Error(content);
+    }
+    function convertUint8ArrayToText(uint8Array) {
+      try {
+        return new TextDecoder().decode(uint8Array);
+      } catch {
+        throw new Error("Error decoding Uint8Array to text");
       }
-      __registerPrimitives(p) {
-        if (p.telemetry) {
-          this.__setTelemetry(p.telemetry);
+    }
+    function attachmentsToParts(attachments) {
+      const parts = [];
+      for (const attachment of attachments) {
+        let url;
+        try {
+          url = new URL(attachment.url);
+        } catch {
+          throw new Error(`Invalid URL: ${attachment.url}`);
         }
-        if (p.logger) {
-          this.__setLogger(p.logger);
+        switch (url.protocol) {
+          case "http:":
+          case "https:": {
+            if (attachment.contentType?.startsWith("image/")) {
+              parts.push({ type: "image", image: url.toString(), mimeType: attachment.contentType });
+            } else {
+              if (!attachment.contentType) {
+                throw new Error("If the attachment is not an image, it must specify a content type");
+              }
+              parts.push({
+                type: "file",
+                data: url.toString(),
+                mimeType: attachment.contentType
+              });
+            }
+            break;
+          }
+          case "data:": {
+            let header;
+            let base64Content;
+            let mimeType;
+            try {
+              [header, base64Content] = attachment.url.split(",");
+              mimeType = header?.split?.(";")?.[0]?.split(":")[1];
+            } catch {
+              throw new Error(`Error processing data URL: ${attachment.url}`);
+            }
+            if (mimeType == null || base64Content == null) {
+              throw new Error(`Invalid data URL format: ${attachment.url}`);
+            }
+            if (attachment.contentType?.startsWith("image/")) {
+              parts.push({
+                type: "image",
+                image: attachment.url,
+                mimeType: attachment.contentType
+              });
+            } else if (attachment.contentType?.startsWith("text/")) {
+              parts.push({
+                type: "text",
+                text: convertUint8ArrayToText(convertDataContentToUint8Array(base64Content))
+              });
+            } else {
+              if (!attachment.contentType) {
+                throw new Error("If the attachment is not an image or text, it must specify a content type");
+              }
+              parts.push({
+                type: "file",
+                data: base64Content,
+                mimeType: attachment.contentType
+              });
+            }
+            break;
+          }
+          default: {
+            throw new Error(`Unsupported URL protocol: ${url.protocol}`);
+          }
         }
       }
-      __registerMastra(p) {
-        this.#mastra = p;
-      }
-      getProvider() {
-        return this.#model.provider;
-      }
-      getModelId() {
-        return this.#model.modelId;
-      }
-      getModel() {
-        return this.#model;
+      return parts;
+    }
+    var makePushOrCombine = (v1Messages) => (msg) => {
+      const previousMessage = v1Messages.at(-1);
+      if (msg.role === previousMessage?.role && Array.isArray(previousMessage.content) && Array.isArray(msg.content) && // we were creating new messages for tool calls before and not appending to the assistant message
+      // so don't append here so everything works as before
+      (msg.role !== `assistant` || msg.role === `assistant` && msg.content.at(-1)?.type !== `tool-call`)) {
+        for (const part of msg.content) {
+          previousMessage.content.push(part);
+        }
+      } else {
+        v1Messages.push(msg);
       }
-      async __text({
-        runId,
-        messages,
-        maxSteps = 5,
-        tools = {},
-        temperature,
-        toolChoice = "auto",
-        onStepFinish,
-        experimental_output,
-        telemetry,
-        threadId,
-        resourceId,
-        memory,
-        runtimeContext,
-        ...rest
-      }) {
-        const model = this.#model;
-        this.logger.debug(`[LLM] - Generating text`, {
-          runId,
-          messages,
-          maxSteps,
-          threadId,
-          resourceId,
-          tools: Object.keys(tools)
-        });
-        const argsForExecute = {
-          model,
-          temperature,
-          tools: {
-            ...tools
-          },
-          toolChoice,
-          maxSteps,
-          onStepFinish: async (props) => {
-            await onStepFinish?.(props);
-            this.logger.debug("[LLM] - Step Change:", {
-              text: props?.text,
-              toolCalls: props?.toolCalls,
-              toolResults: props?.toolResults,
-              finishReason: props?.finishReason,
-              usage: props?.usage,
-              runId
-            });
-            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
-              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunkDXLVS7ML_cjs.delay(10 * 1e3);
-            }
-          },
-          ...rest
+    };
+    function convertToV1Messages(messages) {
+      const v1Messages = [];
+      const pushOrCombine = makePushOrCombine(v1Messages);
+      for (let i = 0; i < messages.length; i++) {
+        const message = messages[i];
+        const isLastMessage = i === messages.length - 1;
+        if (!message?.content) continue;
+        const { content, experimental_attachments: inputAttachments = [], parts: inputParts } = message.content;
+        const { role } = message;
+        const fields = {
+          id: message.id,
+          createdAt: message.createdAt,
+          resourceId: message.resourceId,
+          threadId: message.threadId
         };
-        let schema;
-        if (experimental_output) {
-          this.logger.debug("[LLM] - Using experimental output", {
-            runId
-          });
-          if (typeof experimental_output.parse === "function") {
-            schema = experimental_output;
-            if (schema instanceof zod.z.ZodArray) {
-              schema = schema._def.type;
-            }
+        const experimental_attachments = [...inputAttachments];
+        const parts = [];
+        for (const part of inputParts) {
+          if (part.type === "file") {
+            experimental_attachments.push({
+              url: part.data,
+              contentType: part.mimeType
+            });
           } else {
-            schema = ai.jsonSchema(experimental_output);
+            parts.push(part);
           }
         }
-        return await ai.generateText({
-          messages,
-          ...argsForExecute,
-          experimental_telemetry: {
-            ...this.experimental_telemetry,
-            ...telemetry
-          },
-          experimental_output: schema ? ai.Output.object({
-            schema
-          }) : void 0
-        });
-      }
-      async __textObject({
-        messages,
-        onStepFinish,
-        maxSteps = 5,
-        tools = {},
-        structuredOutput,
-        runId,
-        temperature,
-        toolChoice = "auto",
-        telemetry,
-        threadId,
-        resourceId,
-        memory,
-        runtimeContext,
-        ...rest
-      }) {
-        const model = this.#model;
-        this.logger.debug(`[LLM] - Generating a text object`, { runId });
-        const argsForExecute = {
-          model,
-          temperature,
-          tools: {
-            ...tools
-          },
-          maxSteps,
-          toolChoice,
-          onStepFinish: async (props) => {
-            await onStepFinish?.(props);
-            this.logger.debug("[LLM] - Step Change:", {
-              text: props?.text,
-              toolCalls: props?.toolCalls,
-              toolResults: props?.toolResults,
-              finishReason: props?.finishReason,
-              usage: props?.usage,
-              runId
-            });
-            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
-              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunkDXLVS7ML_cjs.delay(10 * 1e3);
+        switch (role) {
+          case "user": {
+            if (parts == null) {
+              const userContent = experimental_attachments ? [{ type: "text", text: content || "" }, ...attachmentsToParts(experimental_attachments)] : { type: "text", text: content || "" };
+              pushOrCombine({
+                role: "user",
+                ...fields,
+                type: "text",
+                // @ts-ignore
+                content: userContent
+              });
+            } else {
+              const textParts = message.content.parts.filter((part) => part.type === "text").map((part) => ({
+                type: "text",
+                text: part.text
+              }));
+              const userContent = experimental_attachments ? [...textParts, ...attachmentsToParts(experimental_attachments)] : textParts;
+              pushOrCombine({
+                role: "user",
+                ...fields,
+                type: "text",
+                content: Array.isArray(userContent) && userContent.length === 1 && userContent[0]?.type === `text` && typeof content !== `undefined` ? content : userContent
+              });
             }
-          },
-          ...rest
-        };
-        let schema;
-        let output = "object";
-        if (typeof structuredOutput.parse === "function") {
-          schema = structuredOutput;
-          if (schema instanceof zod.z.ZodArray) {
-            output = "array";
-            schema = schema._def.type;
-          }
-        } else {
-          schema = ai.jsonSchema(structuredOutput);
-        }
-        return await ai.generateObject({
-          messages,
-          ...argsForExecute,
-          output,
-          schema,
-          experimental_telemetry: {
-            ...this.experimental_telemetry,
-            ...telemetry
-          }
-        });
-      }
-      async __stream({
-        messages,
-        onStepFinish,
-        onFinish,
-        maxSteps = 5,
-        tools = {},
-        runId,
-        temperature,
-        toolChoice = "auto",
-        experimental_output,
-        telemetry,
-        threadId,
-        resourceId,
-        memory,
-        runtimeContext,
-        ...rest
-      }) {
-        const model = this.#model;
-        this.logger.debug(`[LLM] - Streaming text`, {
-          runId,
-          threadId,
-          resourceId,
-          messages,
-          maxSteps,
-          tools: Object.keys(tools || {})
-        });
-        const argsForExecute = {
-          model,
-          temperature,
-          tools: {
-            ...tools
-          },
-          maxSteps,
-          toolChoice,
-          onStepFinish: async (props) => {
-            await onStepFinish?.(props);
-            this.logger.debug("[LLM] - Stream Step Change:", {
-              text: props?.text,
-              toolCalls: props?.toolCalls,
-              toolResults: props?.toolResults,
-              finishReason: props?.finishReason,
-              usage: props?.usage,
-              runId
-            });
-            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
-              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunkDXLVS7ML_cjs.delay(10 * 1e3);
-            }
-          },
-          onFinish: async (props) => {
-            await onFinish?.(props);
-            this.logger.debug("[LLM] - Stream Finished:", {
-              text: props?.text,
-              toolCalls: props?.toolCalls,
-              toolResults: props?.toolResults,
-              finishReason: props?.finishReason,
-              usage: props?.usage,
-              runId,
-              threadId,
-              resourceId
-            });
-          },
-          ...rest
-        };
-        let schema;
-        if (experimental_output) {
-          this.logger.debug("[LLM] - Using experimental output", {
-            runId
-          });
-          if (typeof experimental_output.parse === "function") {
-            schema = experimental_output;
-            if (schema instanceof zod.z.ZodArray) {
-              schema = schema._def.type;
-            }
-          } else {
-            schema = ai.jsonSchema(experimental_output);
-          }
-        }
-        return await ai.streamText({
-          messages,
-          ...argsForExecute,
-          experimental_telemetry: {
-            ...this.experimental_telemetry,
-            ...telemetry
-          },
-          experimental_output: schema ? ai.Output.object({
-            schema
-          }) : void 0
-        });
-      }
-      async __streamObject({
-        messages,
-        runId,
-        tools = {},
-        maxSteps = 5,
-        toolChoice = "auto",
-        runtimeContext,
-        threadId,
-        resourceId,
-        memory,
-        temperature,
-        onStepFinish,
-        onFinish,
-        structuredOutput,
-        telemetry,
-        ...rest
-      }) {
-        const model = this.#model;
-        this.logger.debug(`[LLM] - Streaming structured output`, {
-          runId,
-          messages,
-          maxSteps,
-          tools: Object.keys(tools || {})
-        });
-        const finalTools = tools;
-        const argsForExecute = {
-          model,
-          temperature,
-          tools: {
-            ...finalTools
-          },
-          maxSteps,
-          toolChoice,
-          onStepFinish: async (props) => {
-            await onStepFinish?.(props);
-            this.logger.debug("[LLM] - Stream Step Change:", {
-              text: props?.text,
-              toolCalls: props?.toolCalls,
-              toolResults: props?.toolResults,
-              finishReason: props?.finishReason,
-              usage: props?.usage,
-              runId,
-              threadId,
-              resourceId
-            });
-            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
-              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunkDXLVS7ML_cjs.delay(10 * 1e3);
-            }
-          },
-          onFinish: async (props) => {
-            await onFinish?.(props);
-            this.logger.debug("[LLM] - Stream Finished:", {
-              text: props?.text,
-              toolCalls: props?.toolCalls,
-              toolResults: props?.toolResults,
-              finishReason: props?.finishReason,
-              usage: props?.usage,
-              runId,
-              threadId,
-              resourceId
-            });
-          },
-          ...rest
-        };
-        let schema;
-        let output = "object";
-        if (typeof structuredOutput.parse === "function") {
-          schema = structuredOutput;
-          if (schema instanceof zod.z.ZodArray) {
-            output = "array";
-            schema = schema._def.type;
-          }
-        } else {
-          schema = ai.jsonSchema(structuredOutput);
-        }
-        return ai.streamObject({
-          messages,
-          ...argsForExecute,
-          output,
-          schema,
-          experimental_telemetry: {
-            ...this.experimental_telemetry,
-            ...telemetry
-          }
-        });
-      }
-      async generate(messages, { maxSteps = 5, output, ...rest }) {
-        const msgs = this.convertToMessages(messages);
-        if (!output) {
-          return await this.__text({
-            messages: msgs,
-            maxSteps,
-            ...rest
-          });
-        }
-        return await this.__textObject({
-          messages: msgs,
-          structuredOutput: output,
-          maxSteps,
-          ...rest
-        });
-      }
-      async stream(messages, { maxSteps = 5, output, ...rest }) {
-        const msgs = this.convertToMessages(messages);
-        if (!output) {
-          return await this.__stream({
-            messages: msgs,
-            maxSteps,
-            ...rest
-          });
-        }
-        return await this.__streamObject({
-          messages: msgs,
-          structuredOutput: output,
-          maxSteps,
-          ...rest
-        });
-      }
-    };
-    exports2.MastraLLM = MastraLLM;
-  }
-});
-
-// ../../packages/core/dist/chunk-OB2PB6SX.cjs
-var require_chunk_OB2PB6SX = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-OB2PB6SX.cjs"(exports2) {
-    var chunkDXLVS7ML_cjs = require_chunk_DXLVS7ML();
-    var crypto2 = chunkU74OJRHU_cjs.__require("crypto");
-    var ai = require_dist4();
-    var providerUtils = require_dist2();
-    var zod = require_lib();
-    zod.z.union([
-      zod.z.string(),
-      zod.z.instanceof(Uint8Array),
-      zod.z.instanceof(ArrayBuffer),
-      zod.z.custom(
-        // Buffer might not be available in some environments such as CloudFlare:
-        (value) => globalThis.Buffer?.isBuffer(value) ?? false,
-        { message: "Must be a Buffer" }
-      )
-    ]);
-    function convertDataContentToBase64String(content) {
-      if (typeof content === "string") {
-        return content;
-      }
-      if (content instanceof ArrayBuffer) {
-        return providerUtils.convertUint8ArrayToBase64(new Uint8Array(content));
-      }
-      return providerUtils.convertUint8ArrayToBase64(content);
-    }
-    function convertDataContentToUint8Array(content) {
-      if (content instanceof Uint8Array) {
-        return content;
-      }
-      if (typeof content === "string") {
-        try {
-          return providerUtils.convertBase64ToUint8Array(content);
-        } catch (error) {
-          throw new Error("Invalid data content. Content string is not a base64-encoded media.", {
-            cause: error
-          });
-        }
-      }
-      if (content instanceof ArrayBuffer) {
-        return new Uint8Array(content);
-      }
-      throw new Error(content);
-    }
-    function convertUint8ArrayToText(uint8Array) {
-      try {
-        return new TextDecoder().decode(uint8Array);
-      } catch {
-        throw new Error("Error decoding Uint8Array to text");
-      }
-    }
-    function attachmentsToParts(attachments) {
-      const parts = [];
-      for (const attachment of attachments) {
-        let url;
-        try {
-          url = new URL(attachment.url);
-        } catch {
-          throw new Error(`Invalid URL: ${attachment.url}`);
-        }
-        switch (url.protocol) {
-          case "http:":
-          case "https:": {
-            if (attachment.contentType?.startsWith("image/")) {
-              parts.push({ type: "image", image: url });
-            } else {
-              if (!attachment.contentType) {
-                throw new Error("If the attachment is not an image, it must specify a content type");
-              }
-              parts.push({
-                type: "file",
-                data: url,
-                mimeType: attachment.contentType
-              });
-            }
-            break;
-          }
-          case "data:": {
-            let header;
-            let base64Content;
-            let mimeType;
-            try {
-              [header, base64Content] = attachment.url.split(",");
-              mimeType = header?.split?.(";")?.[0]?.split(":")[1];
-            } catch {
-              throw new Error(`Error processing data URL: ${attachment.url}`);
-            }
-            if (mimeType == null || base64Content == null) {
-              throw new Error(`Invalid data URL format: ${attachment.url}`);
-            }
-            if (attachment.contentType?.startsWith("image/")) {
-              parts.push({
-                type: "image",
-                image: convertDataContentToUint8Array(base64Content)
-              });
-            } else if (attachment.contentType?.startsWith("text/")) {
-              parts.push({
-                type: "text",
-                text: convertUint8ArrayToText(convertDataContentToUint8Array(base64Content))
-              });
-            } else {
-              if (!attachment.contentType) {
-                throw new Error("If the attachment is not an image or text, it must specify a content type");
-              }
-              parts.push({
-                type: "file",
-                data: base64Content,
-                mimeType: attachment.contentType
-              });
-            }
-            break;
-          }
-          default: {
-            throw new Error(`Unsupported URL protocol: ${url.protocol}`);
-          }
-        }
-      }
-      return parts;
-    }
-    var makePushOrCombine = (v1Messages) => (msg) => {
-      const previousMessage = v1Messages.at(-1);
-      if (msg.role === previousMessage?.role && Array.isArray(previousMessage.content) && Array.isArray(msg.content) && // we were creating new messages for tool calls before and not appending to the assistant message
-      // so don't append here so everything works as before
-      (msg.role !== `assistant` || msg.role === `assistant` && msg.content.at(-1)?.type !== `tool-call`)) {
-        for (const part of msg.content) {
-          previousMessage.content.push(part);
-        }
-      } else {
-        v1Messages.push(msg);
-      }
-    };
-    function convertToV1Messages(messages) {
-      const v1Messages = [];
-      const pushOrCombine = makePushOrCombine(v1Messages);
-      for (let i = 0; i < messages.length; i++) {
-        const message = messages[i];
-        const isLastMessage = i === messages.length - 1;
-        if (!message?.content) continue;
-        const { content, experimental_attachments, parts } = message.content;
-        const { role } = message;
-        const fields = {
-          id: message.id,
-          createdAt: message.createdAt,
-          resourceId: message.resourceId,
-          threadId: message.threadId
-        };
-        switch (role) {
-          case "user": {
-            if (parts == null) {
-              const userContent = experimental_attachments ? [{ type: "text", text: content || "" }, ...attachmentsToParts(experimental_attachments)] : { type: "text", text: content || "" };
-              pushOrCombine({
-                role: "user",
-                ...fields,
-                type: "text",
-                // @ts-ignore
-                content: userContent
-                // Array.isArray(userContent) && userContent.length === 1 && userContent[0]?.type === `text`
-                //   ? userContent[0].text
-                //   : userContent,
-              });
-              throw new Error(`will we ever hit this code?`);
-            } else {
-              const textParts = message.content.parts.filter((part) => part.type === "text").map((part) => ({
-                type: "text",
-                text: part.text
-              }));
-              const userContent = experimental_attachments ? [...textParts, ...attachmentsToParts(experimental_attachments)] : textParts;
-              pushOrCombine({
-                role: "user",
-                ...fields,
-                type: "text",
-                // content: userContent,
-                // @ts-ignore
-                content: Array.isArray(userContent) && userContent.length === 1 && userContent[0]?.type === `text` && typeof content !== `undefined` ? content : userContent
-              });
-            }
-            break;
+            break;
           }
           case "assistant": {
             if (message.content.parts != null) {
@@ -31817,683 +31292,1249 @@ var require_chunk_OB2PB6SX = chunkU74OJRHU_cjs.__commonJS({
               processBlock2();
               break;
             }
-            const toolInvocations = message.content.toolInvocations;
-            if (toolInvocations == null || toolInvocations.length === 0) {
-              pushOrCombine({ role: "assistant", ...fields, content: content || "", type: "text" });
-              break;
+            const toolInvocations = message.content.toolInvocations;
+            if (toolInvocations == null || toolInvocations.length === 0) {
+              pushOrCombine({ role: "assistant", ...fields, content: content || "", type: "text" });
+              break;
+            }
+            const maxStep = toolInvocations.reduce((max, toolInvocation) => {
+              return Math.max(max, toolInvocation.step ?? 0);
+            }, 0);
+            for (let i2 = 0; i2 <= maxStep; i2++) {
+              const stepInvocations = toolInvocations.filter((toolInvocation) => (toolInvocation.step ?? 0) === i2);
+              if (stepInvocations.length === 0) {
+                continue;
+              }
+              pushOrCombine({
+                role: "assistant",
+                ...fields,
+                type: "tool-call",
+                content: [
+                  ...isLastMessage && content && i2 === 0 ? [{ type: "text", text: content }] : [],
+                  ...stepInvocations.map(({ toolCallId, toolName, args }) => ({
+                    type: "tool-call",
+                    toolCallId,
+                    toolName,
+                    args
+                  }))
+                ]
+              });
+              pushOrCombine({
+                role: "tool",
+                ...fields,
+                type: "tool-result",
+                content: stepInvocations.map((toolInvocation) => {
+                  if (!("result" in toolInvocation)) {
+                    return toolInvocation;
+                  }
+                  const { toolCallId, toolName, result } = toolInvocation;
+                  return {
+                    type: "tool-result",
+                    toolCallId,
+                    toolName,
+                    result
+                  };
+                })
+              });
+            }
+            if (content && !isLastMessage) {
+              pushOrCombine({ role: "assistant", ...fields, type: "text", content: content || "" });
+            }
+            break;
+          }
+        }
+      }
+      return v1Messages;
+    }
+    var MessageList2 = class _MessageList {
+      messages = [];
+      // passed in by dev in input or context
+      systemMessages = [];
+      // passed in by us for a specific purpose, eg memory system message
+      taggedSystemMessages = {};
+      memoryInfo = null;
+      // used to filter this.messages by how it was added: input/response/memory
+      memoryMessages = /* @__PURE__ */ new Set();
+      newUserMessages = /* @__PURE__ */ new Set();
+      newResponseMessages = /* @__PURE__ */ new Set();
+      generateMessageId;
+      constructor({
+        threadId,
+        resourceId,
+        generateMessageId
+      } = {}) {
+        if (threadId) {
+          this.memoryInfo = { threadId, resourceId };
+          this.generateMessageId = generateMessageId;
+        }
+      }
+      add(messages, messageSource) {
+        for (const message of Array.isArray(messages) ? messages : [messages]) {
+          this.addOne(
+            typeof message === `string` ? {
+              role: "user",
+              content: message
+            } : message,
+            messageSource
+          );
+        }
+        return this;
+      }
+      getLatestUserContent() {
+        const currentUserMessages = this.all.core().filter((m) => m.role === "user");
+        const content = currentUserMessages.at(-1)?.content;
+        if (!content) return null;
+        return _MessageList.coreContentToString(content);
+      }
+      get get() {
+        return {
+          all: this.all,
+          remembered: this.remembered,
+          input: this.input,
+          response: this.response
+        };
+      }
+      all = {
+        v2: () => this.messages,
+        v1: () => convertToV1Messages(this.messages),
+        ui: () => this.messages.map(_MessageList.toUIMessage),
+        core: () => this.convertToCoreMessages(this.all.ui()),
+        prompt: () => {
+          return [...this.systemMessages, ...Object.values(this.taggedSystemMessages).flat(), ...this.all.core()];
+        }
+      };
+      remembered = {
+        v2: () => this.messages.filter((m) => this.memoryMessages.has(m)),
+        v1: () => convertToV1Messages(this.remembered.v2()),
+        ui: () => this.remembered.v2().map(_MessageList.toUIMessage),
+        core: () => this.convertToCoreMessages(this.remembered.ui())
+      };
+      input = {
+        v2: () => this.messages.filter((m) => this.newUserMessages.has(m)),
+        v1: () => convertToV1Messages(this.input.v2()),
+        ui: () => this.input.v2().map(_MessageList.toUIMessage),
+        core: () => this.convertToCoreMessages(this.input.ui())
+      };
+      response = {
+        v2: () => this.messages.filter((m) => this.newResponseMessages.has(m))
+      };
+      drainUnsavedMessages() {
+        const messages = this.messages.filter((m) => this.newUserMessages.has(m) || this.newResponseMessages.has(m));
+        this.newUserMessages.clear();
+        this.newResponseMessages.clear();
+        return messages;
+      }
+      getSystemMessages(tag) {
+        if (tag) {
+          return this.taggedSystemMessages[tag] || [];
+        }
+        return this.systemMessages;
+      }
+      addSystem(messages, tag) {
+        if (!messages) return this;
+        for (const message of Array.isArray(messages) ? messages : [messages]) {
+          this.addOneSystem(message, tag);
+        }
+        return this;
+      }
+      convertToCoreMessages(messages) {
+        return ai.convertToCoreMessages(this.sanitizeUIMessages(messages));
+      }
+      sanitizeUIMessages(messages) {
+        const msgs = messages.map((m) => {
+          if (m.parts.length === 0) return false;
+          const safeParts = m.parts.filter(
+            (p) => p.type !== `tool-invocation` || // calls and partial-calls should be updated to be results at this point
+            // if they haven't we can't send them back to the llm and need to remove them.
+            p.toolInvocation.state !== `call` && p.toolInvocation.state !== `partial-call`
+          );
+          if (!safeParts.length) return false;
+          const sanitized = {
+            ...m,
+            parts: safeParts
+          };
+          if (`toolInvocations` in m && m.toolInvocations) {
+            sanitized.toolInvocations = m.toolInvocations.filter((t) => t.state === `result`);
+          }
+          return sanitized;
+        }).filter((m) => Boolean(m));
+        return msgs;
+      }
+      addOneSystem(message, tag) {
+        if (typeof message === `string`) message = { role: "system", content: message };
+        if (tag && !this.isDuplicateSystem(message, tag)) {
+          this.taggedSystemMessages[tag] ||= [];
+          this.taggedSystemMessages[tag].push(message);
+        } else if (!this.isDuplicateSystem(message)) {
+          this.systemMessages.push(message);
+        }
+      }
+      isDuplicateSystem(message, tag) {
+        if (tag) {
+          if (!this.taggedSystemMessages[tag]) return false;
+          return this.taggedSystemMessages[tag].some(
+            (m) => _MessageList.cacheKeyFromContent(m.content) === _MessageList.cacheKeyFromContent(message.content)
+          );
+        }
+        return this.systemMessages.some(
+          (m) => _MessageList.cacheKeyFromContent(m.content) === _MessageList.cacheKeyFromContent(message.content)
+        );
+      }
+      static toUIMessage(m) {
+        const experimentalAttachments = m.content.experimental_attachments ? [...m.content.experimental_attachments] : [];
+        const contentString = typeof m.content.content === `string` && m.content.content !== "" ? m.content.content : m.content.parts.reduce((prev, part) => {
+          if (part.type === `text`) {
+            return part.text;
+          }
+          return prev;
+        }, "");
+        const parts = [];
+        if (m.content.parts.length) {
+          for (const part of m.content.parts) {
+            if (part.type === `file`) {
+              experimentalAttachments.push({
+                contentType: part.mimeType,
+                url: part.data
+              });
+            } else {
+              parts.push(part);
+            }
+          }
+        }
+        if (parts.length === 0 && experimentalAttachments.length > 0) {
+          parts.push({ type: "text", text: "" });
+        }
+        if (m.role === `user`) {
+          return {
+            id: m.id,
+            role: m.role,
+            content: m.content.content || contentString,
+            createdAt: m.createdAt,
+            parts,
+            experimental_attachments: experimentalAttachments
+          };
+        } else if (m.role === `assistant`) {
+          return {
+            id: m.id,
+            role: m.role,
+            content: m.content.content || contentString,
+            createdAt: m.createdAt,
+            parts,
+            reasoning: void 0,
+            toolInvocations: `toolInvocations` in m.content ? m.content.toolInvocations : void 0
+          };
+        }
+        return {
+          id: m.id,
+          role: m.role,
+          content: m.content.content || contentString,
+          createdAt: m.createdAt,
+          parts,
+          experimental_attachments: experimentalAttachments
+        };
+      }
+      getMessageById(id) {
+        return this.messages.find((m) => m.id === id);
+      }
+      shouldReplaceMessage(message) {
+        if (!this.messages.length) return { exists: false };
+        if (!(`id` in message) || !message?.id) {
+          return { exists: false };
+        }
+        const existingMessage = this.getMessageById(message.id);
+        if (!existingMessage) return { exists: false };
+        return {
+          exists: true,
+          shouldReplace: !_MessageList.messagesAreEqual(existingMessage, message),
+          id: existingMessage.id
+        };
+      }
+      addOne(message, messageSource) {
+        if (message.role === `system` && _MessageList.isVercelCoreMessage(message)) return this.addSystem(message);
+        if (message.role === `system`) {
+          throw new Error(
+            `A non-CoreMessage system message was added - this is not supported as we didn't expect this could happen. Please open a Github issue and let us know what you did to get here. This is the non-CoreMessage system message we received:
+
+messageSource: ${messageSource}
+
+${JSON.stringify(message, null, 2)}`
+          );
+        }
+        const messageV2 = this.inputToMastraMessageV2(message, messageSource);
+        const { exists, shouldReplace, id } = this.shouldReplaceMessage(messageV2);
+        const latestMessage = this.messages.at(-1);
+        const singleToolResult = messageV2.role === `assistant` && messageV2.content.parts.length === 1 && messageV2.content.parts[0]?.type === `tool-invocation` && messageV2.content.parts[0].toolInvocation.state === `result` && messageV2.content.parts[0];
+        if (singleToolResult && (latestMessage?.role !== `assistant` || !latestMessage.content.parts.some(
+          (p) => p.type === `tool-invocation` && p.toolInvocation.toolCallId === singleToolResult.toolInvocation.toolCallId
+        ))) {
+          return;
+        }
+        if (messageSource === `memory`) {
+          for (const existingMessage of this.messages) {
+            if (_MessageList.messagesAreEqual(existingMessage, messageV2)) {
+              return;
             }
-            const maxStep = toolInvocations.reduce((max, toolInvocation) => {
-              return Math.max(max, toolInvocation.step ?? 0);
-            }, 0);
-            for (let i2 = 0; i2 <= maxStep; i2++) {
-              const stepInvocations = toolInvocations.filter((toolInvocation) => (toolInvocation.step ?? 0) === i2);
-              if (stepInvocations.length === 0) {
-                continue;
+          }
+        }
+        const latestMessagePartType = latestMessage?.content?.parts?.filter((p) => p.type !== `step-start`)?.at?.(-1)?.type;
+        const newMessageFirstPartType = messageV2.content.parts.filter((p) => p.type !== `step-start`).at(0)?.type;
+        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant";
+        const shouldAppendToLastAssistantMessageParts = shouldAppendToLastAssistantMessage && newMessageFirstPartType && (newMessageFirstPartType === `tool-invocation` && latestMessagePartType !== `text` || newMessageFirstPartType === latestMessagePartType);
+        if (
+          // backwards compat check!
+          // this condition can technically be removed and it will make it so all new assistant parts will be added to the last assistant message parts instead of creating new db entries.
+          // however, for any downstream code that isn't based around using message parts yet, this may cause tool invocations to show up in the wrong order in their UI, because they use the message.toolInvocations and message.content properties which do not indicate how each is ordered in relation to each other.
+          // this code check then causes any tool invocation to be created as a new message and not update the previous assistant message parts.
+          // without this condition we will see something like
+          // parts: [{type:"step-start"}, {type: "text", text: "let me check the weather"}, {type: "tool-invocation", toolInvocation: x}, {type: "text", text: "the weather in x is y"}]
+          // with this condition we will see
+          // message1.parts: [{type:"step-start"}, {type: "text", text: "let me check the weather"}]
+          // message2.parts: [{type: "tool-invocation", toolInvocation: x}]
+          // message3.parts: [{type: "text", text: "the weather in x is y"}]
+          shouldAppendToLastAssistantMessageParts
+        ) {
+          latestMessage.createdAt = messageV2.createdAt || latestMessage.createdAt;
+          for (const [index, part] of messageV2.content.parts.entries()) {
+            if (part.type === "tool-invocation" && part.toolInvocation.state === "result") {
+              const existingCallPart = [...latestMessage.content.parts].reverse().find((p) => p.type === "tool-invocation" && p.toolInvocation.toolCallId === part.toolInvocation.toolCallId);
+              if (existingCallPart && existingCallPart.type === "tool-invocation") {
+                existingCallPart.toolInvocation = {
+                  ...existingCallPart.toolInvocation,
+                  state: "result",
+                  result: part.toolInvocation.result
+                };
+                if (!latestMessage.content.toolInvocations) {
+                  latestMessage.content.toolInvocations = [];
+                }
+                if (!latestMessage.content.toolInvocations.some(
+                  (t) => t.toolCallId === existingCallPart.toolInvocation.toolCallId
+                )) {
+                  latestMessage.content.toolInvocations.push(existingCallPart.toolInvocation);
+                }
               }
-              pushOrCombine({
-                role: "assistant",
-                ...fields,
-                type: "tool-call",
-                content: [
-                  ...isLastMessage && content && i2 === 0 ? [{ type: "text", text: content }] : [],
-                  ...stepInvocations.map(({ toolCallId, toolName, args }) => ({
-                    type: "tool-call",
-                    toolCallId,
-                    toolName,
-                    args
-                  }))
-                ]
-              });
-              pushOrCombine({
-                role: "tool",
-                ...fields,
-                type: "tool-result",
-                content: stepInvocations.map((toolInvocation) => {
-                  if (!("result" in toolInvocation)) {
-                    return toolInvocation;
-                  }
-                  const { toolCallId, toolName, result } = toolInvocation;
-                  return {
-                    type: "tool-result",
-                    toolCallId,
-                    toolName,
-                    result
-                  };
-                })
-              });
-            }
-            if (content && !isLastMessage) {
-              pushOrCombine({ role: "assistant", ...fields, type: "text", content: content || "" });
+            } else if (
+              // if there's no part at this index yet in the existing message we're merging into
+              !latestMessage.content.parts[index] || // or there is and the parts are not identical
+              _MessageList.cacheKeyFromParts([latestMessage.content.parts[index]]) !== _MessageList.cacheKeyFromParts([part])
+            ) {
+              latestMessage.content.parts.push(part);
             }
-            break;
+          }
+          if (latestMessage.createdAt.getTime() < messageV2.createdAt.getTime()) {
+            latestMessage.createdAt = messageV2.createdAt;
+          }
+          if (!latestMessage.content.content && messageV2.content.content) {
+            latestMessage.content.content = messageV2.content.content;
+          }
+          if (latestMessage.content.content && messageV2.content.content && latestMessage.content.content !== messageV2.content.content) {
+            latestMessage.content.content = messageV2.content.content;
+          }
+        } else {
+          if (messageV2.role === "assistant" && messageV2.content.parts[0]?.type !== `step-start`) {
+            messageV2.content.parts.unshift({ type: "step-start" });
+          }
+          const existingIndex = shouldReplace && this.messages.findIndex((m) => m.id === id) || -1;
+          const existingMessage = existingIndex !== -1 && this.messages[existingIndex];
+          if (shouldReplace && existingMessage) {
+            this.messages[existingIndex] = messageV2;
+          } else if (!exists) {
+            this.messages.push(messageV2);
+          }
+          if (messageSource === `memory`) {
+            this.memoryMessages.add(messageV2);
+          } else if (messageSource === `response`) {
+            this.newResponseMessages.add(messageV2);
+          } else if (messageSource === `user`) {
+            this.newUserMessages.add(messageV2);
+          } else {
+            throw new Error(`Missing message source for message ${messageV2}`);
           }
         }
+        this.messages.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+        return this;
       }
-      return v1Messages;
-    }
-    var MessageList2 = class _MessageList {
-      messages = [];
-      // passed in by dev in input or context
-      systemMessages = [];
-      // passed in by us for a specific purpose, eg memory system message
-      taggedSystemMessages = {};
-      memoryInfo = null;
-      // used to filter this.messages by how it was added: input/response/memory
-      memoryMessages = /* @__PURE__ */ new Set();
-      newUserMessages = /* @__PURE__ */ new Set();
-      newResponseMessages = /* @__PURE__ */ new Set();
-      generateMessageId;
-      constructor({
-        threadId,
-        resourceId,
-        generateMessageId
-      } = {}) {
-        if (threadId) {
-          this.memoryInfo = { threadId, resourceId };
-          this.generateMessageId = generateMessageId;
+      inputToMastraMessageV2(message, messageSource) {
+        if (`threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId) {
+          throw new Error(
+            `Received input message with wrong threadId. Input ${message.threadId}, expected ${this.memoryInfo.threadId}`
+          );
+        }
+        if (`resourceId` in message && message.resourceId && this.memoryInfo?.resourceId && message.resourceId !== this.memoryInfo.resourceId) {
+          throw new Error(
+            `Received input message with wrong resourceId. Input ${message.resourceId}, expected ${this.memoryInfo.resourceId}`
+          );
+        }
+        if (_MessageList.isMastraMessageV1(message)) {
+          return this.mastraMessageV1ToMastraMessageV2(message, messageSource);
+        }
+        if (_MessageList.isMastraMessageV2(message)) {
+          return this.hydrateMastraMessageV2Fields(message);
+        }
+        if (_MessageList.isVercelCoreMessage(message)) {
+          return this.vercelCoreMessageToMastraMessageV2(message, messageSource);
+        }
+        if (_MessageList.isVercelUIMessage(message)) {
+          return this.vercelUIMessageToMastraMessageV2(message, messageSource);
+        }
+        throw new Error(`Found unhandled message ${JSON.stringify(message)}`);
+      }
+      lastCreatedAt;
+      // this makes sure messages added in order will always have a date atleast 1ms apart.
+      generateCreatedAt(messageSource, start) {
+        start = start instanceof Date ? start : start ? new Date(start) : void 0;
+        if (start && !this.lastCreatedAt) {
+          this.lastCreatedAt = start.getTime();
+          return start;
+        }
+        if (start && messageSource === `memory`) {
+          return start;
+        }
+        const now = /* @__PURE__ */ new Date();
+        const nowTime = start?.getTime() || now.getTime();
+        const lastTime = this.messages.reduce((p, m) => {
+          if (m.createdAt.getTime() > p) return m.createdAt.getTime();
+          return p;
+        }, this.lastCreatedAt || 0);
+        if (nowTime <= lastTime) {
+          const newDate = new Date(lastTime + 1);
+          this.lastCreatedAt = newDate.getTime();
+          return newDate;
         }
+        this.lastCreatedAt = nowTime;
+        return now;
       }
-      add(messages, messageSource) {
-        for (const message of Array.isArray(messages) ? messages : [messages]) {
-          this.addOne(
-            typeof message === `string` ? {
-              role: "user",
-              content: message
-            } : message,
-            messageSource
-          );
+      newMessageId() {
+        if (this.generateMessageId) {
+          return this.generateMessageId();
         }
-        return this;
-      }
-      getLatestUserContent() {
-        const currentUserMessages = this.all.core().filter((m) => m.role === "user");
-        const content = currentUserMessages.at(-1)?.content;
-        if (!content) return null;
-        return _MessageList.coreContentToString(content);
+        return crypto2.randomUUID();
       }
-      get get() {
+      mastraMessageV1ToMastraMessageV2(message, messageSource) {
+        const coreV2 = this.vercelCoreMessageToMastraMessageV2(
+          {
+            content: message.content,
+            role: message.role
+          },
+          messageSource
+        );
         return {
-          all: this.all,
-          remembered: this.remembered,
-          input: this.input,
-          response: this.response
+          id: message.id,
+          role: coreV2.role,
+          createdAt: this.generateCreatedAt(messageSource, message.createdAt),
+          threadId: message.threadId,
+          resourceId: message.resourceId,
+          content: coreV2.content
         };
       }
-      all = {
-        v2: () => this.messages,
-        v1: () => convertToV1Messages(this.messages),
-        ui: () => this.messages.map(_MessageList.toUIMessage),
-        core: () => this.convertToCoreMessages(this.all.ui()),
-        prompt: () => {
-          return [...this.systemMessages, ...Object.values(this.taggedSystemMessages).flat(), ...this.all.core()];
-        }
-      };
-      remembered = {
-        v2: () => this.messages.filter((m) => this.memoryMessages.has(m)),
-        v1: () => convertToV1Messages(this.remembered.v2()),
-        ui: () => this.remembered.v2().map(_MessageList.toUIMessage),
-        core: () => this.convertToCoreMessages(this.remembered.ui())
-      };
-      input = {
-        v2: () => this.messages.filter((m) => this.newUserMessages.has(m)),
-        v1: () => convertToV1Messages(this.input.v2()),
-        ui: () => this.input.v2().map(_MessageList.toUIMessage),
-        core: () => this.convertToCoreMessages(this.input.ui())
-      };
-      response = {
-        v2: () => this.messages.filter((m) => this.newResponseMessages.has(m))
-      };
-      drainUnsavedMessages() {
-        const messages = this.messages.filter((m) => this.newUserMessages.has(m) || this.newResponseMessages.has(m));
-        this.newUserMessages.clear();
-        this.newResponseMessages.clear();
-        return messages;
+      hydrateMastraMessageV2Fields(message) {
+        if (!(message.createdAt instanceof Date)) message.createdAt = new Date(message.createdAt);
+        return message;
       }
-      getSystemMessages(tag) {
-        if (tag) {
-          return this.taggedSystemMessages[tag] || [];
+      vercelUIMessageToMastraMessageV2(message, messageSource) {
+        const content = {
+          format: 2,
+          parts: message.parts
+        };
+        if (message.toolInvocations) content.toolInvocations = message.toolInvocations;
+        if (message.reasoning) content.reasoning = message.reasoning;
+        if (message.annotations) content.annotations = message.annotations;
+        if (message.experimental_attachments) {
+          content.experimental_attachments = message.experimental_attachments;
         }
-        return this.systemMessages;
+        return {
+          id: message.id || this.newMessageId(),
+          role: _MessageList.getRole(message),
+          createdAt: this.generateCreatedAt(messageSource, message.createdAt),
+          threadId: this.memoryInfo?.threadId,
+          resourceId: this.memoryInfo?.resourceId,
+          content
+        };
       }
-      addSystem(messages, tag) {
-        if (!messages) return this;
-        for (const message of Array.isArray(messages) ? messages : [messages]) {
-          this.addOneSystem(message, tag);
+      vercelCoreMessageToMastraMessageV2(coreMessage, messageSource) {
+        const id = `id` in coreMessage ? coreMessage.id : this.newMessageId();
+        const parts = [];
+        const experimentalAttachments = [];
+        const toolInvocations = [];
+        if (typeof coreMessage.content === "string") {
+          parts.push({ type: "step-start" });
+          parts.push({
+            type: "text",
+            text: coreMessage.content
+          });
+        } else if (Array.isArray(coreMessage.content)) {
+          for (const part of coreMessage.content) {
+            switch (part.type) {
+              case "text":
+                parts.push({
+                  type: "text",
+                  text: part.text
+                });
+                break;
+              case "tool-call":
+                parts.push({
+                  type: "tool-invocation",
+                  toolInvocation: {
+                    state: "call",
+                    toolCallId: part.toolCallId,
+                    toolName: part.toolName,
+                    args: part.args
+                  }
+                });
+                break;
+              case "tool-result":
+                const invocation = {
+                  state: "result",
+                  toolCallId: part.toolCallId,
+                  toolName: part.toolName,
+                  result: part.result ?? "",
+                  // undefined will cause AI SDK to throw an error, but for client side tool calls this really could be undefined
+                  args: {}
+                  // when we combine this invocation onto the existing tool-call part it will have args already
+                };
+                parts.push({
+                  type: "tool-invocation",
+                  toolInvocation: invocation
+                });
+                toolInvocations.push(invocation);
+                break;
+              case "reasoning":
+                parts.push({
+                  type: "reasoning",
+                  reasoning: "",
+                  // leave this blank so we aren't double storing it in the db along with details
+                  details: [{ type: "text", text: part.text, signature: part.signature }]
+                });
+                break;
+              case "redacted-reasoning":
+                parts.push({
+                  type: "reasoning",
+                  reasoning: "",
+                  // No text reasoning for redacted parts
+                  details: [{ type: "redacted", data: part.data }]
+                });
+                break;
+              case "image":
+                parts.push({ type: "file", data: part.image.toString(), mimeType: part.mimeType });
+                break;
+              case "file":
+                if (part.data instanceof URL) {
+                  parts.push({
+                    type: "file",
+                    data: part.data.toString(),
+                    mimeType: part.mimeType
+                  });
+                } else {
+                  try {
+                    parts.push({
+                      type: "file",
+                      mimeType: part.mimeType,
+                      data: convertDataContentToBase64String(part.data)
+                    });
+                  } catch (error) {
+                    console.error(`Failed to convert binary data to base64 in CoreMessage file part: ${error}`, error);
+                  }
+                }
+                break;
+            }
+          }
         }
-        return this;
+        const content = {
+          format: 2,
+          parts
+        };
+        if (toolInvocations.length) content.toolInvocations = toolInvocations;
+        if (typeof coreMessage.content === `string`) content.content = coreMessage.content;
+        if (experimentalAttachments.length) content.experimental_attachments = experimentalAttachments;
+        return {
+          id,
+          role: _MessageList.getRole(coreMessage),
+          createdAt: this.generateCreatedAt(messageSource),
+          threadId: this.memoryInfo?.threadId,
+          resourceId: this.memoryInfo?.resourceId,
+          content
+        };
       }
-      convertToCoreMessages(messages) {
-        return ai.convertToCoreMessages(this.sanitizeUIMessages(messages));
+      static isVercelUIMessage(msg) {
+        return !_MessageList.isMastraMessage(msg) && chunkWWLMZIHW_cjs.isUiMessage(msg);
       }
-      sanitizeUIMessages(messages) {
-        const msgs = messages.map((m) => {
-          if (m.parts.length === 0) return false;
-          const safeParts = m.parts.filter(
-            (p) => p.type !== `tool-invocation` || // calls and partial-calls should be updated to be results at this point
-            // if they haven't we can't send them back to the llm and need to remove them.
-            p.toolInvocation.state !== `call` && p.toolInvocation.state !== `partial-call`
-          );
-          if (!safeParts.length) return false;
-          const sanitized = {
-            ...m,
-            parts: safeParts
-          };
-          if (`toolInvocations` in m && m.toolInvocations) {
-            sanitized.toolInvocations = m.toolInvocations.filter((t) => t.state === `result`);
-          }
-          return sanitized;
-        }).filter((m) => Boolean(m));
-        return msgs;
+      static isVercelCoreMessage(msg) {
+        return !_MessageList.isMastraMessage(msg) && chunkWWLMZIHW_cjs.isCoreMessage(msg);
       }
-      addOneSystem(message, tag) {
-        if (typeof message === `string`) message = { role: "system", content: message };
-        if (tag && !this.isDuplicateSystem(message, tag)) {
-          this.taggedSystemMessages[tag] ||= [];
-          this.taggedSystemMessages[tag].push(message);
-        } else if (!this.isDuplicateSystem(message)) {
-          this.systemMessages.push(message);
-        }
+      static isMastraMessage(msg) {
+        return _MessageList.isMastraMessageV2(msg) || _MessageList.isMastraMessageV1(msg);
       }
-      isDuplicateSystem(message, tag) {
-        if (tag) {
-          if (!this.taggedSystemMessages[tag]) return false;
-          return this.taggedSystemMessages[tag].some(
-            (m) => _MessageList.cacheKeyFromContent(m.content) === _MessageList.cacheKeyFromContent(message.content)
-          );
-        }
-        return this.systemMessages.some(
-          (m) => _MessageList.cacheKeyFromContent(m.content) === _MessageList.cacheKeyFromContent(message.content)
+      static isMastraMessageV1(msg) {
+        return !_MessageList.isMastraMessageV2(msg) && (`threadId` in msg || `resourceId` in msg);
+      }
+      static isMastraMessageV2(msg) {
+        return Boolean(
+          msg.content && !Array.isArray(msg.content) && typeof msg.content !== `string` && // any newly saved Mastra message v2 shape will have content: { format: 2 }
+          `format` in msg.content && msg.content.format === 2
+        );
+      }
+      static getRole(message) {
+        if (message.role === `assistant` || message.role === `tool`) return `assistant`;
+        if (message.role === `user`) return `user`;
+        throw new Error(
+          `BUG: add handling for message role ${message.role} in message ${JSON.stringify(message, null, 2)}`
         );
       }
-      static toUIMessage(m) {
-        const contentString = typeof m.content.content === `string` && m.content.content !== "" ? m.content.content : m.content.parts.reduce((prev, part) => {
+      static cacheKeyFromParts(parts) {
+        let key = ``;
+        for (const part of parts) {
+          key += part.type;
           if (part.type === `text`) {
-            return part.text;
+            key += part.text.length;
+          }
+          if (part.type === `tool-invocation`) {
+            key += part.toolInvocation.toolCallId;
+            key += part.toolInvocation.state;
+          }
+          if (part.type === `reasoning`) {
+            key += part.reasoning.length;
+            key += part.details.reduce((prev, current) => {
+              if (current.type === `text`) {
+                return prev + current.text.length + (current.signature?.length || 0);
+              }
+              return prev;
+            }, 0);
+          }
+          if (part.type === `file`) {
+            key += part.data.length;
+            key += part.mimeType;
           }
-          return prev;
-        }, "");
-        if (m.role === `user`) {
-          return {
-            id: m.id,
-            role: m.role,
-            content: m.content.content || contentString,
-            createdAt: m.createdAt,
-            parts: m.content.parts,
-            experimental_attachments: m.content.experimental_attachments || []
-          };
-        } else if (m.role === `assistant`) {
-          return {
-            id: m.id,
-            role: m.role,
-            content: m.content.content || contentString,
-            createdAt: m.createdAt,
-            parts: m.content.parts,
-            reasoning: void 0,
-            toolInvocations: `toolInvocations` in m.content ? m.content.toolInvocations : void 0
-          };
         }
-        return {
-          id: m.id,
-          role: m.role,
-          content: m.content.content || contentString,
-          createdAt: m.createdAt,
-          parts: m.content.parts
-        };
+        return key;
       }
-      getMessageById(id) {
-        return this.messages.find((m) => m.id === id);
+      static coreContentToString(content) {
+        if (typeof content === `string`) return content;
+        return content.reduce((p, c) => {
+          if (c.type === `text`) {
+            p += c.text;
+          }
+          return p;
+        }, "");
       }
-      shouldReplaceMessage(message) {
-        if (!this.messages.length) return { exists: false };
-        if (!(`id` in message) || !message?.id) {
-          return { exists: false };
+      static cacheKeyFromContent(content) {
+        if (typeof content === `string`) return content;
+        let key = ``;
+        for (const part of content) {
+          key += part.type;
+          if (part.type === `text`) {
+            key += part.text.length;
+          }
+          if (part.type === `reasoning`) {
+            key += part.text.length;
+          }
+          if (part.type === `tool-call`) {
+            key += part.toolCallId;
+            key += part.toolName;
+          }
+          if (part.type === `tool-result`) {
+            key += part.toolCallId;
+            key += part.toolName;
+          }
+          if (part.type === `file`) {
+            key += part.filename;
+            key += part.mimeType;
+          }
+          if (part.type === `image`) {
+            key += part.image instanceof URL ? part.image.toString() : part.image.toString().length;
+            key += part.mimeType;
+          }
+          if (part.type === `redacted-reasoning`) {
+            key += part.data.length;
+          }
         }
-        const existingMessage = this.getMessageById(message.id);
-        if (!existingMessage) return { exists: false };
-        return {
-          exists: true,
-          shouldReplace: !_MessageList.messagesAreEqual(existingMessage, message),
-          id: existingMessage.id
-        };
+        return key;
       }
-      addOne(message, messageSource) {
-        if (message.role === `system` && _MessageList.isVercelCoreMessage(message)) return this.addSystem(message);
-        if (message.role === `system`) {
-          throw new Error(
-            `A non-CoreMessage system message was added - this is not supported as we didn't expect this could happen. Please open a Github issue and let us know what you did to get here. This is the non-CoreMessage system message we received:
-
-messageSource: ${messageSource}
-
-${JSON.stringify(message, null, 2)}`
-          );
+      static messagesAreEqual(one, two) {
+        const oneUI = _MessageList.isVercelUIMessage(one) && one;
+        const twoUI = _MessageList.isVercelUIMessage(two) && two;
+        if (oneUI && !twoUI) return false;
+        if (oneUI && twoUI) {
+          return _MessageList.cacheKeyFromParts(one.parts) === _MessageList.cacheKeyFromParts(two.parts);
         }
-        const messageV2 = this.inputToMastraMessageV2(message, messageSource);
-        const { exists, shouldReplace, id } = this.shouldReplaceMessage(messageV2);
-        const latestMessage = this.messages.at(-1);
-        const singleToolResult = messageV2.role === `assistant` && messageV2.content.parts.length === 1 && messageV2.content.parts[0]?.type === `tool-invocation` && messageV2.content.parts[0].toolInvocation.state === `result` && messageV2.content.parts[0];
-        if (singleToolResult && (latestMessage?.role !== `assistant` || !latestMessage.content.parts.some(
-          (p) => p.type === `tool-invocation` && p.toolInvocation.toolCallId === singleToolResult.toolInvocation.toolCallId
-        ))) {
-          return;
+        const oneCM = _MessageList.isVercelCoreMessage(one) && one;
+        const twoCM = _MessageList.isVercelCoreMessage(two) && two;
+        if (oneCM && !twoCM) return false;
+        if (oneCM && twoCM) {
+          return _MessageList.cacheKeyFromContent(oneCM.content) === _MessageList.cacheKeyFromContent(twoCM.content);
         }
-        if (messageSource === `memory`) {
-          for (const existingMessage of this.messages) {
-            if (_MessageList.messagesAreEqual(existingMessage, messageV2)) {
-              return;
-            }
-          }
+        const oneMM1 = _MessageList.isMastraMessageV1(one) && one;
+        const twoMM1 = _MessageList.isMastraMessageV1(two) && two;
+        if (oneMM1 && !twoMM1) return false;
+        if (oneMM1 && twoMM1) {
+          return oneMM1.id === twoMM1.id && _MessageList.cacheKeyFromContent(oneMM1.content) === _MessageList.cacheKeyFromContent(twoMM1.content);
         }
-        const latestMessagePartType = latestMessage?.content?.parts?.filter((p) => p.type !== `step-start`)?.at?.(-1)?.type;
-        const newMessageFirstPartType = messageV2.content.parts.filter((p) => p.type !== `step-start`).at(0)?.type;
-        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant";
-        const shouldAppendToLastAssistantMessageParts = shouldAppendToLastAssistantMessage && newMessageFirstPartType && (newMessageFirstPartType === `tool-invocation` && latestMessagePartType !== `text` || newMessageFirstPartType === latestMessagePartType);
-        if (
-          // backwards compat check!
-          // this condition can technically be removed and it will make it so all new assistant parts will be added to the last assistant message parts instead of creating new db entries.
-          // however, for any downstream code that isn't based around using message parts yet, this may cause tool invocations to show up in the wrong order in their UI, because they use the message.toolInvocations and message.content properties which do not indicate how each is ordered in relation to each other.
-          // this code check then causes any tool invocation to be created as a new message and not update the previous assistant message parts.
-          // without this condition we will see something like
-          // parts: [{type:"step-start"}, {type: "text", text: "let me check the weather"}, {type: "tool-invocation", toolInvocation: x}, {type: "text", text: "the weather in x is y"}]
-          // with this condition we will see
-          // message1.parts: [{type:"step-start"}, {type: "text", text: "let me check the weather"}]
-          // message2.parts: [{type: "tool-invocation", toolInvocation: x}]
-          // message3.parts: [{type: "text", text: "the weather in x is y"}]
-          shouldAppendToLastAssistantMessageParts
-        ) {
-          latestMessage.createdAt = messageV2.createdAt || latestMessage.createdAt;
-          for (const [index, part] of messageV2.content.parts.entries()) {
-            if (part.type === "tool-invocation" && part.toolInvocation.state === "result") {
-              const existingCallPart = [...latestMessage.content.parts].reverse().find((p) => p.type === "tool-invocation" && p.toolInvocation.toolCallId === part.toolInvocation.toolCallId);
-              if (existingCallPart && existingCallPart.type === "tool-invocation") {
-                existingCallPart.toolInvocation = {
-                  ...existingCallPart.toolInvocation,
-                  state: "result",
-                  result: part.toolInvocation.result
-                };
-                if (!latestMessage.content.toolInvocations) {
-                  latestMessage.content.toolInvocations = [];
-                }
-                if (!latestMessage.content.toolInvocations.some(
-                  (t) => t.toolCallId === existingCallPart.toolInvocation.toolCallId
-                )) {
-                  latestMessage.content.toolInvocations.push(existingCallPart.toolInvocation);
-                }
-              }
-            } else if (
-              // if there's no part at this index yet in the existing message we're merging into
-              !latestMessage.content.parts[index] || // or there is and the parts are not identical
-              _MessageList.cacheKeyFromParts([latestMessage.content.parts[index]]) !== _MessageList.cacheKeyFromParts([part])
-            ) {
-              latestMessage.content.parts.push(part);
-            }
-          }
-          if (latestMessage.createdAt.getTime() < messageV2.createdAt.getTime()) {
-            latestMessage.createdAt = messageV2.createdAt;
-          }
-          if (!latestMessage.content.content && messageV2.content.content) {
-            latestMessage.content.content = messageV2.content.content;
-          }
-          if (latestMessage.content.content && messageV2.content.content && latestMessage.content.content !== messageV2.content.content) {
-            latestMessage.content.content = messageV2.content.content;
+        const oneMM2 = _MessageList.isMastraMessageV2(one) && one;
+        const twoMM2 = _MessageList.isMastraMessageV2(two) && two;
+        if (oneMM2 && !twoMM2) return false;
+        if (oneMM2 && twoMM2) {
+          return oneMM2.id === twoMM2.id && _MessageList.cacheKeyFromParts(oneMM2.content.parts) === _MessageList.cacheKeyFromParts(twoMM2.content.parts);
+        }
+        return true;
+      }
+    };
+    exports2.MessageList = MessageList2;
+  }
+});
+
+// ../../packages/core/dist/chunk-ST5RMVLG.cjs
+var require_chunk_ST5RMVLG = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-ST5RMVLG.cjs"(exports2) {
+    function mitt(all) {
+      all = all || /* @__PURE__ */ new Map();
+      return {
+        /**
+         * A Map of event names to registered handler functions.
+         */
+        all,
+        /**
+         * Register an event handler for the given type.
+         * @param {string|symbol} type Type of event to listen for, or `'*'` for all events
+         * @param {Function} handler Function to call in response to given event
+         * @memberOf mitt
+         */
+        on(type, handler) {
+          const handlers = all.get(type);
+          if (handlers) {
+            handlers.push(handler);
+          } else {
+            all.set(type, [handler]);
           }
-        } else {
-          if (messageV2.role === "assistant" && messageV2.content.parts[0]?.type !== `step-start`) {
-            messageV2.content.parts.unshift({ type: "step-start" });
+        },
+        /**
+         * Remove an event handler for the given type.
+         * If `handler` is omitted, all handlers of the given type are removed.
+         * @param {string|symbol} type Type of event to unregister `handler` from (`'*'` to remove a wildcard handler)
+         * @param {Function} [handler] Handler function to remove
+         * @memberOf mitt
+         */
+        off(type, handler) {
+          const handlers = all.get(type);
+          if (handlers) {
+            if (handler) {
+              handlers.splice(handlers.indexOf(handler) >>> 0, 1);
+            } else {
+              all.set(type, []);
+            }
           }
-          const existingIndex = shouldReplace && this.messages.findIndex((m) => m.id === id) || -1;
-          const existingMessage = existingIndex !== -1 && this.messages[existingIndex];
-          if (shouldReplace && existingMessage) {
-            this.messages[existingIndex] = messageV2;
-          } else if (!exists) {
-            this.messages.push(messageV2);
+        },
+        /**
+         * Invoke all handlers for the given type.
+         * If present, `'*'` handlers are invoked after type-matched handlers.
+         *
+         * Note: Manually firing '*' handlers is not supported.
+         *
+         * @param {string|symbol} type The event type to invoke
+         * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler
+         * @memberOf mitt
+         */
+        emit(type, evt) {
+          let handlers = all.get(type);
+          if (handlers) {
+            handlers.slice().map((handler) => {
+              handler(evt);
+            });
           }
-          if (messageSource === `memory`) {
-            this.memoryMessages.add(messageV2);
-          } else if (messageSource === `response`) {
-            this.newResponseMessages.add(messageV2);
-          } else if (messageSource === `user`) {
-            this.newUserMessages.add(messageV2);
-          } else {
-            throw new Error(`Missing message source for message ${messageV2}`);
+          handlers = all.get("*");
+          if (handlers) {
+            handlers.slice().map((handler) => {
+              handler(type, evt);
+            });
           }
         }
-        this.messages.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
-        return this;
+      };
+    }
+    var AvailableHooks = /* @__PURE__ */ ((AvailableHooks2) => {
+      AvailableHooks2["ON_EVALUATION"] = "onEvaluation";
+      AvailableHooks2["ON_GENERATION"] = "onGeneration";
+      return AvailableHooks2;
+    })(AvailableHooks || {});
+    var hooks = mitt();
+    function registerHook(hook, action) {
+      hooks.on(hook, action);
+    }
+    function executeHook(hook, data) {
+      setImmediate(() => {
+        hooks.emit(hook, data);
+      });
+    }
+    exports2.AvailableHooks = AvailableHooks;
+    exports2.executeHook = executeHook;
+    exports2.registerHook = registerHook;
+  }
+});
+
+// ../../packages/core/dist/chunk-VBSKHNCY.cjs
+var require_chunk_VBSKHNCY = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-VBSKHNCY.cjs"(exports2) {
+    var chunkWWLMZIHW_cjs = require_chunk_WWLMZIHW();
+    var chunkVHZPWE5L_cjs = require_chunk_VHZPWE5L();
+    var chunkRFAN7FAT_cjs = require_chunk_RFAN7FAT();
+    var ai = require_dist4();
+    var zod = require_lib();
+    var MastraLLMBase = class extends chunkVHZPWE5L_cjs.MastraBase {
+      // @ts-ignore
+      #mastra;
+      #model;
+      constructor({ name, model }) {
+        super({
+          component: chunkRFAN7FAT_cjs.RegisteredLogger.LLM,
+          name
+        });
+        this.#model = model;
       }
-      inputToMastraMessageV2(message, messageSource) {
-        if (`threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId) {
-          throw new Error(
-            `Received input message with wrong threadId. Input ${message.threadId}, expected ${this.memoryInfo.threadId}`
-          );
-        }
-        if (`resourceId` in message && message.resourceId && this.memoryInfo?.resourceId && message.resourceId !== this.memoryInfo.resourceId) {
-          throw new Error(
-            `Received input message with wrong resourceId. Input ${message.resourceId}, expected ${this.memoryInfo.resourceId}`
-          );
-        }
-        if (_MessageList.isMastraMessageV1(message)) {
-          return this.mastraMessageV1ToMastraMessageV2(message, messageSource);
-        }
-        if (_MessageList.isMastraMessageV2(message)) {
-          return this.hydrateMastraMessageV2Fields(message);
+      getProvider() {
+        return this.#model.provider;
+      }
+      getModelId() {
+        return this.#model.modelId;
+      }
+      getModel() {
+        return this.#model;
+      }
+      convertToMessages(messages) {
+        if (Array.isArray(messages)) {
+          return messages.map((m) => {
+            if (typeof m === "string") {
+              return {
+                role: "user",
+                content: m
+              };
+            }
+            return m;
+          });
         }
-        if (_MessageList.isVercelCoreMessage(message)) {
-          return this.vercelCoreMessageToMastraMessageV2(message, messageSource);
+        return [
+          {
+            role: "user",
+            content: messages
+          }
+        ];
+      }
+      __registerPrimitives(p) {
+        if (p.telemetry) {
+          this.__setTelemetry(p.telemetry);
         }
-        if (_MessageList.isVercelUIMessage(message)) {
-          return this.vercelUIMessageToMastraMessageV2(message, messageSource);
+        if (p.logger) {
+          this.__setLogger(p.logger);
         }
-        throw new Error(`Found unhandled message ${JSON.stringify(message)}`);
       }
-      lastCreatedAt;
-      // this makes sure messages added in order will always have a date atleast 1ms apart.
-      generateCreatedAt(messageSource, start) {
-        start = start instanceof Date ? start : start ? new Date(start) : void 0;
-        if (start && !this.lastCreatedAt) {
-          this.lastCreatedAt = start.getTime();
-          return start;
+      __registerMastra(p) {
+        this.#mastra = p;
+      }
+      async __text(input) {
+        this.logger.debug(`[LLMs:${this.name}] Generating text.`, { input });
+        throw new Error("Method not implemented.");
+      }
+      async __textObject(input) {
+        this.logger.debug(`[LLMs:${this.name}] Generating object.`, { input });
+        throw new Error("Method not implemented.");
+      }
+      async generate(messages, options) {
+        this.logger.debug(`[LLMs:${this.name}] Generating text.`, { messages, options });
+        throw new Error("Method not implemented.");
+      }
+      async __stream(input) {
+        this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { input });
+        throw new Error("Method not implemented.");
+      }
+      async __streamObject(input) {
+        this.logger.debug(`[LLMs:${this.name}] Streaming object.`, { input });
+        throw new Error("Method not implemented.");
+      }
+      async stream(messages, options) {
+        this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { messages, options });
+        throw new Error("Method not implemented.");
+      }
+    };
+    var MastraLLM = class extends MastraLLMBase {
+      #model;
+      #mastra;
+      constructor({ model, mastra }) {
+        super({ name: "aisdk", model });
+        this.#model = model;
+        if (mastra) {
+          this.#mastra = mastra;
+          if (mastra.getLogger()) {
+            this.__setLogger(this.#mastra.getLogger());
+          }
         }
-        if (start && messageSource === `memory`) {
-          return start;
+      }
+      __registerPrimitives(p) {
+        if (p.telemetry) {
+          this.__setTelemetry(p.telemetry);
         }
-        const now = /* @__PURE__ */ new Date();
-        const nowTime = start?.getTime() || now.getTime();
-        const lastTime = this.messages.reduce((p, m) => {
-          if (m.createdAt.getTime() > p) return m.createdAt.getTime();
-          return p;
-        }, this.lastCreatedAt || 0);
-        if (nowTime <= lastTime) {
-          const newDate = new Date(lastTime + 1);
-          this.lastCreatedAt = newDate.getTime();
-          return newDate;
+        if (p.logger) {
+          this.__setLogger(p.logger);
         }
-        this.lastCreatedAt = nowTime;
-        return now;
       }
-      newMessageId() {
-        if (this.generateMessageId) {
-          return this.generateMessageId();
+      __registerMastra(p) {
+        this.#mastra = p;
+      }
+      getProvider() {
+        return this.#model.provider;
+      }
+      getModelId() {
+        return this.#model.modelId;
+      }
+      getModel() {
+        return this.#model;
+      }
+      async __text({
+        runId,
+        messages,
+        maxSteps = 5,
+        tools = {},
+        temperature,
+        toolChoice = "auto",
+        onStepFinish,
+        experimental_output,
+        telemetry,
+        threadId,
+        resourceId,
+        memory,
+        runtimeContext,
+        ...rest
+      }) {
+        const model = this.#model;
+        this.logger.debug(`[LLM] - Generating text`, {
+          runId,
+          messages,
+          maxSteps,
+          threadId,
+          resourceId,
+          tools: Object.keys(tools)
+        });
+        const argsForExecute = {
+          model,
+          temperature,
+          tools: {
+            ...tools
+          },
+          toolChoice,
+          maxSteps,
+          onStepFinish: async (props) => {
+            await onStepFinish?.(props);
+            this.logger.debug("[LLM] - Step Change:", {
+              text: props?.text,
+              toolCalls: props?.toolCalls,
+              toolResults: props?.toolResults,
+              finishReason: props?.finishReason,
+              usage: props?.usage,
+              runId
+            });
+            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
+              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
+              await chunkWWLMZIHW_cjs.delay(10 * 1e3);
+            }
+          },
+          ...rest
+        };
+        let schema;
+        if (experimental_output) {
+          this.logger.debug("[LLM] - Using experimental output", {
+            runId
+          });
+          if (typeof experimental_output.parse === "function") {
+            schema = experimental_output;
+            if (schema instanceof zod.z.ZodArray) {
+              schema = schema._def.type;
+            }
+          } else {
+            schema = ai.jsonSchema(experimental_output);
+          }
         }
-        return crypto2.randomUUID();
-      }
-      mastraMessageV1ToMastraMessageV2(message, messageSource) {
-        const coreV2 = this.vercelCoreMessageToMastraMessageV2(
-          {
-            content: message.content,
-            role: message.role
+        return await ai.generateText({
+          messages,
+          ...argsForExecute,
+          experimental_telemetry: {
+            ...this.experimental_telemetry,
+            ...telemetry
           },
-          messageSource
-        );
-        return {
-          id: message.id,
-          role: coreV2.role,
-          createdAt: this.generateCreatedAt(messageSource, message.createdAt),
-          threadId: message.threadId,
-          resourceId: message.resourceId,
-          content: coreV2.content
-        };
-      }
-      hydrateMastraMessageV2Fields(message) {
-        if (!(message.createdAt instanceof Date)) message.createdAt = new Date(message.createdAt);
-        return message;
+          experimental_output: schema ? ai.Output.object({
+            schema
+          }) : void 0
+        });
       }
-      vercelUIMessageToMastraMessageV2(message, messageSource) {
-        const content = {
-          format: 2,
-          parts: message.parts
+      async __textObject({
+        messages,
+        onStepFinish,
+        maxSteps = 5,
+        tools = {},
+        structuredOutput,
+        runId,
+        temperature,
+        toolChoice = "auto",
+        telemetry,
+        threadId,
+        resourceId,
+        memory,
+        runtimeContext,
+        ...rest
+      }) {
+        const model = this.#model;
+        this.logger.debug(`[LLM] - Generating a text object`, { runId });
+        const argsForExecute = {
+          model,
+          temperature,
+          tools: {
+            ...tools
+          },
+          maxSteps,
+          toolChoice,
+          onStepFinish: async (props) => {
+            await onStepFinish?.(props);
+            this.logger.debug("[LLM] - Step Change:", {
+              text: props?.text,
+              toolCalls: props?.toolCalls,
+              toolResults: props?.toolResults,
+              finishReason: props?.finishReason,
+              usage: props?.usage,
+              runId
+            });
+            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
+              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
+              await chunkWWLMZIHW_cjs.delay(10 * 1e3);
+            }
+          },
+          ...rest
         };
-        if (message.toolInvocations) content.toolInvocations = message.toolInvocations;
-        if (message.reasoning) content.reasoning = message.reasoning;
-        if (message.annotations) content.annotations = message.annotations;
-        if (message.experimental_attachments) {
-          content.experimental_attachments = message.experimental_attachments;
+        let schema;
+        let output = "object";
+        if (typeof structuredOutput.parse === "function") {
+          schema = structuredOutput;
+          if (schema instanceof zod.z.ZodArray) {
+            output = "array";
+            schema = schema._def.type;
+          }
+        } else {
+          schema = ai.jsonSchema(structuredOutput);
         }
-        return {
-          id: message.id || this.newMessageId(),
-          role: _MessageList.getRole(message),
-          createdAt: this.generateCreatedAt(messageSource, message.createdAt),
-          threadId: this.memoryInfo?.threadId,
-          resourceId: this.memoryInfo?.resourceId,
-          content
-        };
+        return await ai.generateObject({
+          messages,
+          ...argsForExecute,
+          output,
+          schema,
+          experimental_telemetry: {
+            ...this.experimental_telemetry,
+            ...telemetry
+          }
+        });
       }
-      vercelCoreMessageToMastraMessageV2(coreMessage, messageSource) {
-        const id = `id` in coreMessage ? coreMessage.id : this.newMessageId();
-        const parts = [];
-        const experimentalAttachments = [];
-        const toolInvocations = [];
-        if (typeof coreMessage.content === "string") {
-          parts.push({ type: "step-start" });
-          parts.push({
-            type: "text",
-            text: coreMessage.content
-          });
-        } else if (Array.isArray(coreMessage.content)) {
-          for (const part of coreMessage.content) {
-            switch (part.type) {
-              case "text":
-                parts.push({
-                  type: "text",
-                  text: part.text
-                });
-                break;
-              case "tool-call":
-                parts.push({
-                  type: "tool-invocation",
-                  toolInvocation: {
-                    state: "call",
-                    toolCallId: part.toolCallId,
-                    toolName: part.toolName,
-                    args: part.args
-                  }
-                });
-                break;
-              case "tool-result":
-                const invocation = {
-                  state: "result",
-                  toolCallId: part.toolCallId,
-                  toolName: part.toolName,
-                  result: part.result ?? "",
-                  // undefined will cause AI SDK to throw an error, but for client side tool calls this really could be undefined
-                  args: {}
-                  // when we combine this invocation onto the existing tool-call part it will have args already
-                };
-                parts.push({
-                  type: "tool-invocation",
-                  toolInvocation: invocation
-                });
-                toolInvocations.push(invocation);
-                break;
-              case "reasoning":
-                parts.push({
-                  type: "reasoning",
-                  reasoning: part.text,
-                  // Assuming text is the main reasoning content
-                  details: [{ type: "text", text: part.text, signature: part.signature }]
-                });
-                break;
-              case "redacted-reasoning":
-                parts.push({
-                  type: "reasoning",
-                  reasoning: "",
-                  // No text reasoning for redacted parts
-                  details: [{ type: "redacted", data: part.data }]
-                });
-                break;
-              case "file":
-                if (part.data instanceof URL) {
-                  if (part.data.protocol !== "data:") {
-                    experimentalAttachments.push({
-                      name: part.filename,
-                      url: part.data.toString(),
-                      contentType: part.mimeType
-                    });
-                  } else {
-                    try {
-                      const base64Match = part.data.toString().match(/^data:[^;]+;base64,(.+)$/);
-                      if (base64Match && base64Match[1]) {
-                        parts.push({
-                          type: "file",
-                          mimeType: part.mimeType,
-                          data: base64Match[1]
-                        });
-                      } else {
-                        console.error(`Invalid data URL format: ${part.data}`);
-                      }
-                    } catch (error) {
-                      console.error(`Failed to process data URL in CoreMessage file part: ${error}`, error);
-                    }
-                  }
-                } else {
-                  try {
-                    parts.push({
-                      type: "file",
-                      mimeType: part.mimeType,
-                      data: convertDataContentToBase64String(part.data)
-                    });
-                  } catch (error) {
-                    console.error(`Failed to convert binary data to base64 in CoreMessage file part: ${error}`, error);
-                  }
-                }
-                break;
-              default:
-                throw new Error(`Found unknown CoreMessage content part type: ${part.type}`);
+      async __stream({
+        messages,
+        onStepFinish,
+        onFinish,
+        maxSteps = 5,
+        tools = {},
+        runId,
+        temperature,
+        toolChoice = "auto",
+        experimental_output,
+        telemetry,
+        threadId,
+        resourceId,
+        memory,
+        runtimeContext,
+        ...rest
+      }) {
+        const model = this.#model;
+        this.logger.debug(`[LLM] - Streaming text`, {
+          runId,
+          threadId,
+          resourceId,
+          messages,
+          maxSteps,
+          tools: Object.keys(tools || {})
+        });
+        const argsForExecute = {
+          model,
+          temperature,
+          tools: {
+            ...tools
+          },
+          maxSteps,
+          toolChoice,
+          onStepFinish: async (props) => {
+            await onStepFinish?.(props);
+            this.logger.debug("[LLM] - Stream Step Change:", {
+              text: props?.text,
+              toolCalls: props?.toolCalls,
+              toolResults: props?.toolResults,
+              finishReason: props?.finishReason,
+              usage: props?.usage,
+              runId
+            });
+            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
+              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
+              await chunkWWLMZIHW_cjs.delay(10 * 1e3);
+            }
+          },
+          onFinish: async (props) => {
+            await onFinish?.(props);
+            this.logger.debug("[LLM] - Stream Finished:", {
+              text: props?.text,
+              toolCalls: props?.toolCalls,
+              toolResults: props?.toolResults,
+              finishReason: props?.finishReason,
+              usage: props?.usage,
+              runId,
+              threadId,
+              resourceId
+            });
+          },
+          ...rest
+        };
+        let schema;
+        if (experimental_output) {
+          this.logger.debug("[LLM] - Using experimental output", {
+            runId
+          });
+          if (typeof experimental_output.parse === "function") {
+            schema = experimental_output;
+            if (schema instanceof zod.z.ZodArray) {
+              schema = schema._def.type;
             }
+          } else {
+            schema = ai.jsonSchema(experimental_output);
           }
         }
-        const content = {
-          format: 2,
-          parts
-        };
-        if (toolInvocations.length) content.toolInvocations = toolInvocations;
-        if (typeof coreMessage.content === `string`) content.content = coreMessage.content;
-        if (experimentalAttachments.length) content.experimental_attachments = experimentalAttachments;
-        return {
-          id,
-          role: _MessageList.getRole(coreMessage),
-          createdAt: this.generateCreatedAt(messageSource),
-          threadId: this.memoryInfo?.threadId,
-          resourceId: this.memoryInfo?.resourceId,
-          content
-        };
-      }
-      static isVercelUIMessage(msg) {
-        return !_MessageList.isMastraMessage(msg) && chunkDXLVS7ML_cjs.isUiMessage(msg);
-      }
-      static isVercelCoreMessage(msg) {
-        return !_MessageList.isMastraMessage(msg) && chunkDXLVS7ML_cjs.isCoreMessage(msg);
-      }
-      static isMastraMessage(msg) {
-        return _MessageList.isMastraMessageV2(msg) || _MessageList.isMastraMessageV1(msg);
-      }
-      static isMastraMessageV1(msg) {
-        return !_MessageList.isMastraMessageV2(msg) && (`threadId` in msg || `resourceId` in msg);
-      }
-      static isMastraMessageV2(msg) {
-        return Boolean(
-          msg.content && !Array.isArray(msg.content) && typeof msg.content !== `string` && // any newly saved Mastra message v2 shape will have content: { format: 2 }
-          `format` in msg.content && msg.content.format === 2
-        );
-      }
-      static getRole(message) {
-        if (message.role === `assistant` || message.role === `tool`) return `assistant`;
-        if (message.role === `user`) return `user`;
-        throw new Error(
-          `BUG: add handling for message role ${message.role} in message ${JSON.stringify(message, null, 2)}`
-        );
+        return await ai.streamText({
+          messages,
+          ...argsForExecute,
+          experimental_telemetry: {
+            ...this.experimental_telemetry,
+            ...telemetry
+          },
+          experimental_output: schema ? ai.Output.object({
+            schema
+          }) : void 0
+        });
       }
-      static cacheKeyFromParts(parts) {
-        let key = ``;
-        for (const part of parts) {
-          key += part.type;
-          if (part.type === `text`) {
-            key += part.text.length;
-          }
-          if (part.type === `tool-invocation`) {
-            key += part.toolInvocation.toolCallId;
-            key += part.toolInvocation.state;
-          }
-          if (part.type === `reasoning`) {
-            key += part.reasoning.length;
-          }
-          if (part.type === `file`) {
-            key += part.data.length;
-            key += part.mimeType;
+      async __streamObject({
+        messages,
+        runId,
+        tools = {},
+        maxSteps = 5,
+        toolChoice = "auto",
+        runtimeContext,
+        threadId,
+        resourceId,
+        memory,
+        temperature,
+        onStepFinish,
+        onFinish,
+        structuredOutput,
+        telemetry,
+        ...rest
+      }) {
+        const model = this.#model;
+        this.logger.debug(`[LLM] - Streaming structured output`, {
+          runId,
+          messages,
+          maxSteps,
+          tools: Object.keys(tools || {})
+        });
+        const finalTools = tools;
+        const argsForExecute = {
+          model,
+          temperature,
+          tools: {
+            ...finalTools
+          },
+          maxSteps,
+          toolChoice,
+          onStepFinish: async (props) => {
+            await onStepFinish?.(props);
+            this.logger.debug("[LLM] - Stream Step Change:", {
+              text: props?.text,
+              toolCalls: props?.toolCalls,
+              toolResults: props?.toolResults,
+              finishReason: props?.finishReason,
+              usage: props?.usage,
+              runId,
+              threadId,
+              resourceId
+            });
+            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
+              this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
+              await chunkWWLMZIHW_cjs.delay(10 * 1e3);
+            }
+          },
+          onFinish: async (props) => {
+            await onFinish?.(props);
+            this.logger.debug("[LLM] - Stream Finished:", {
+              text: props?.text,
+              toolCalls: props?.toolCalls,
+              toolResults: props?.toolResults,
+              finishReason: props?.finishReason,
+              usage: props?.usage,
+              runId,
+              threadId,
+              resourceId
+            });
+          },
+          ...rest
+        };
+        let schema;
+        let output = "object";
+        if (typeof structuredOutput.parse === "function") {
+          schema = structuredOutput;
+          if (schema instanceof zod.z.ZodArray) {
+            output = "array";
+            schema = schema._def.type;
           }
+        } else {
+          schema = ai.jsonSchema(structuredOutput);
         }
-        return key;
-      }
-      static coreContentToString(content) {
-        if (typeof content === `string`) return content;
-        return content.reduce((p, c) => {
-          if (c.type === `text`) {
-            p += c.text;
+        return ai.streamObject({
+          messages,
+          ...argsForExecute,
+          output,
+          schema,
+          experimental_telemetry: {
+            ...this.experimental_telemetry,
+            ...telemetry
           }
-          return p;
-        }, "");
+        });
       }
-      static cacheKeyFromContent(content) {
-        if (typeof content === `string`) return content;
-        let key = ``;
-        for (const part of content) {
-          key += part.type;
-          if (part.type === `text`) {
-            key += part.text.length;
-          }
-          if (part.type === `reasoning`) {
-            key += part.text.length;
-          }
-          if (part.type === `tool-call`) {
-            key += part.toolCallId;
-            key += part.toolName;
-          }
-          if (part.type === `tool-result`) {
-            key += part.toolCallId;
-            key += part.toolName;
-          }
-          if (part.type === `file`) {
-            key += part.filename;
-            key += part.mimeType;
-          }
-          if (part.type === `image`) {
-            key += part.image instanceof URL ? part.image.toString() : part.image.toString().length;
-            key += part.mimeType;
-          }
-          if (part.type === `redacted-reasoning`) {
-            key += part.data.length;
-          }
+      async generate(messages, { maxSteps = 5, output, ...rest }) {
+        const msgs = this.convertToMessages(messages);
+        if (!output) {
+          return await this.__text({
+            messages: msgs,
+            maxSteps,
+            ...rest
+          });
         }
-        return key;
+        return await this.__textObject({
+          messages: msgs,
+          structuredOutput: output,
+          maxSteps,
+          ...rest
+        });
       }
-      static messagesAreEqual(one, two) {
-        const oneUI = _MessageList.isVercelUIMessage(one) && one;
-        const twoUI = _MessageList.isVercelUIMessage(two) && two;
-        if (oneUI && !twoUI) return false;
-        if (oneUI && twoUI) {
-          return _MessageList.cacheKeyFromParts(one.parts) === _MessageList.cacheKeyFromParts(two.parts);
-        }
-        const oneCM = _MessageList.isVercelCoreMessage(one) && one;
-        const twoCM = _MessageList.isVercelCoreMessage(two) && two;
-        if (oneCM && !twoCM) return false;
-        if (oneCM && twoCM) {
-          return _MessageList.cacheKeyFromContent(oneCM.content) === _MessageList.cacheKeyFromContent(twoCM.content);
-        }
-        const oneMM1 = _MessageList.isMastraMessageV1(one) && one;
-        const twoMM1 = _MessageList.isMastraMessageV1(two) && two;
-        if (oneMM1 && !twoMM1) return false;
-        if (oneMM1 && twoMM1) {
-          return oneMM1.id === twoMM1.id && _MessageList.cacheKeyFromContent(oneMM1.content) === _MessageList.cacheKeyFromContent(twoMM1.content);
-        }
-        const oneMM2 = _MessageList.isMastraMessageV2(one) && one;
-        const twoMM2 = _MessageList.isMastraMessageV2(two) && two;
-        if (oneMM2 && !twoMM2) return false;
-        if (oneMM2 && twoMM2) {
-          return oneMM2.id === twoMM2.id && _MessageList.cacheKeyFromParts(oneMM2.content.parts) === _MessageList.cacheKeyFromParts(twoMM2.content.parts);
+      async stream(messages, { maxSteps = 5, output, ...rest }) {
+        const msgs = this.convertToMessages(messages);
+        if (!output) {
+          return await this.__stream({
+            messages: msgs,
+            maxSteps,
+            ...rest
+          });
         }
-        return true;
+        return await this.__streamObject({
+          messages: msgs,
+          structuredOutput: output,
+          maxSteps,
+          ...rest
+        });
       }
     };
-    exports2.MessageList = MessageList2;
+    exports2.MastraLLM = MastraLLM;
   }
 });
 
@@ -38172,17 +38213,17 @@ ${err.message}`);
   }
 });
 
-// ../../packages/core/dist/chunk-EZDS6FFZ.cjs
-var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-EZDS6FFZ.cjs"(exports2) {
-    var chunkE4PVJAEL_cjs = require_chunk_E4PVJAEL();
+// ../../packages/core/dist/chunk-TO5645ZP.cjs
+var require_chunk_TO5645ZP = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-TO5645ZP.cjs"(exports2) {
+    var chunk3JGO7S6X_cjs = require_chunk_3JGO7S6X();
+    var chunkKUJQVCEL_cjs = require_chunk_KUJQVCEL();
     var chunkST5RMVLG_cjs = require_chunk_ST5RMVLG();
-    var chunkI5OLBJ26_cjs = require_chunk_I5OLBJ26();
+    var chunkVBSKHNCY_cjs = require_chunk_VBSKHNCY();
     var chunkTICDQWVJ_cjs = require_chunk_TICDQWVJ();
-    var chunkOB2PB6SX_cjs = require_chunk_OB2PB6SX();
-    var chunkDXLVS7ML_cjs = require_chunk_DXLVS7ML();
-    var chunkYEULQPUY_cjs = require_chunk_YEULQPUY();
-    var chunkSWW4EBUZ_cjs = require_chunk_SWW4EBUZ();
+    var chunkWWLMZIHW_cjs = require_chunk_WWLMZIHW();
+    var chunkVHZPWE5L_cjs = require_chunk_VHZPWE5L();
+    var chunkRFAN7FAT_cjs = require_chunk_RFAN7FAT();
     var chunkLABUWBKX_cjs = require_chunk_LABUWBKX();
     var chunkRWTSGWWL_cjs = require_chunk_RWTSGWWL();
     var api = (chunkU74OJRHU_cjs.init_esm(), chunkU74OJRHU_cjs.__toCommonJS(chunkU74OJRHU_cjs.esm_exports));
@@ -38244,7 +38285,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
       prefix: "agent",
       excludeMethods: ["hasOwnMemory", "getMemory", "__primitive", "__registerMastra", "__registerPrimitives", "__setTools", "__setLogger", "__setTelemetry", "log", "getModel", "getInstructions", "getTools", "getLLM", "getWorkflows", "getDefaultGenerateOptions", "getDefaultStreamOptions", "getDescription"]
     })];
-    exports2.Agent = class Agent extends (_a = chunkYEULQPUY_cjs.MastraBase) {
+    exports2.Agent = class Agent extends (_a = chunkVHZPWE5L_cjs.MastraBase) {
       id;
       name;
       #instructions;
@@ -38262,7 +38303,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
       #voice;
       constructor(config) {
         super({
-          component: chunkSWW4EBUZ_cjs.RegisteredLogger.AGENT
+          component: chunkRFAN7FAT_cjs.RegisteredLogger.AGENT
         });
         this.name = config.name;
         this.id = config.name;
@@ -38307,7 +38348,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
             this.#voice?.addInstructions(config.instructions);
           }
         } else {
-          this.#voice = new chunkE4PVJAEL_cjs.DefaultVoice();
+          this.#voice = new chunk3JGO7S6X_cjs.DefaultVoice();
         }
       }
       hasOwnMemory() {
@@ -38360,7 +38401,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
           }));
           return voice;
         } else {
-          return new chunkE4PVJAEL_cjs.DefaultVoice();
+          return new chunk3JGO7S6X_cjs.DefaultVoice();
         }
       }
       get instructions() {
@@ -38401,13 +38442,13 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
         if (typeof this.#tools === "function") {
           throw new Error("Tools are not compatible when tools are a function. Please use getTools() instead.");
         }
-        return chunkDXLVS7ML_cjs.ensureToolProperties(this.#tools);
+        return chunkWWLMZIHW_cjs.ensureToolProperties(this.#tools);
       }
       getTools({
         runtimeContext = new chunkLABUWBKX_cjs.RuntimeContext()
       } = {}) {
         if (typeof this.#tools !== "function") {
-          return chunkDXLVS7ML_cjs.ensureToolProperties(this.#tools);
+          return chunkWWLMZIHW_cjs.ensureToolProperties(this.#tools);
         }
         const result = this.#tools({
           runtimeContext
@@ -38417,7 +38458,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
             this.logger.error(`[Agent:${this.name}] - Function-based tools returned empty value`);
             throw new Error("Tools are required when using a function to provide them. The function returned an empty value.");
           }
-          return chunkDXLVS7ML_cjs.ensureToolProperties(tools);
+          return chunkWWLMZIHW_cjs.ensureToolProperties(tools);
         });
       }
       get llm() {
@@ -38439,7 +38480,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
           runtimeContext
         });
         return resolveMaybePromise(model, (model2) => {
-          const llm = new chunkI5OLBJ26_cjs.MastraLLM({
+          const llm = new chunkVBSKHNCY_cjs.MastraLLM({
             model: model2,
             mastra: this.#mastra
           });
@@ -38566,7 +38607,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
         memoryConfig,
         resourceId,
         runId,
-        messageList = new chunkOB2PB6SX_cjs.MessageList({
+        messageList = new chunkKUJQVCEL_cjs.MessageList({
           threadId,
           resourceId
         })
@@ -38698,7 +38739,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
               runtimeContext
             }) : this.model
           };
-          return [k, chunkDXLVS7ML_cjs.makeCoreTool(tool, options)];
+          return [k, chunkWWLMZIHW_cjs.makeCoreTool(tool, options)];
         }));
         const assignedToolEntriesConverted = Object.fromEntries(assignedCoreToolEntries.filter((entry) => Boolean(entry)));
         toolsForRequest = {
@@ -38738,7 +38779,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
                   runtimeContext
                 }) : this.model
               };
-              const convertedToCoreTool = chunkDXLVS7ML_cjs.makeCoreTool(toolObj, options, "toolset");
+              const convertedToCoreTool = chunkWWLMZIHW_cjs.makeCoreTool(toolObj, options, "toolset");
               toolsForRequest[toolName] = convertedToCoreTool;
             }
           }
@@ -38779,7 +38820,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
                 runtimeContext
               }) : this.model
             };
-            const convertedToCoreTool = chunkDXLVS7ML_cjs.makeCoreTool(rest, options, "client-tool");
+            const convertedToCoreTool = chunkWWLMZIHW_cjs.makeCoreTool(rest, options, "client-tool");
             toolsForRequest[toolName] = convertedToCoreTool;
           }
         }
@@ -38846,7 +38887,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
         let mastraProxy = void 0;
         const logger = this.logger;
         if (this.#mastra) {
-          mastraProxy = chunkDXLVS7ML_cjs.createMastraProxy({
+          mastraProxy = chunkWWLMZIHW_cjs.createMastraProxy({
             mastra: this.#mastra,
             logger
           });
@@ -38937,7 +38978,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
               runId,
               runtimeContext
             });
-            const messageList = new chunkOB2PB6SX_cjs.MessageList({
+            const messageList = new chunkKUJQVCEL_cjs.MessageList({
               threadId,
               resourceId,
               generateMessageId
@@ -38999,7 +39040,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
               systemMessage,
               memorySystemMessage: memorySystemMessage || void 0
             });
-            const processedList = new chunkOB2PB6SX_cjs.MessageList({
+            const processedList = new chunkKUJQVCEL_cjs.MessageList({
               threadId,
               resourceId
             }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(context2 || [], "user").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user").get.all.prompt();
@@ -39336,6 +39377,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
             runId,
             toolChoice,
             experimental_output,
+            telemetry,
             memory: this.getMemory(),
             runtimeContext,
             ...args
@@ -40082,7 +40124,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
             const logger = this.logger;
             let mastraProxy = void 0;
             if (this.#mastra) {
-              mastraProxy = chunkDXLVS7ML_cjs.createMastraProxy({
+              mastraProxy = chunkWWLMZIHW_cjs.createMastraProxy({
                 mastra: this.#mastra,
                 logger
               });
@@ -41463,7 +41505,7 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
         return key.includes("&&");
       }
     };
-    var LegacyWorkflow = class extends chunkYEULQPUY_cjs.MastraBase {
+    var LegacyWorkflow = class extends chunkVHZPWE5L_cjs.MastraBase {
       name;
       triggerSchema;
       resultSchema;
@@ -42473,18 +42515,18 @@ var require_chunk_EZDS6FFZ = chunkU74OJRHU_cjs.__commonJS({
 // ../../packages/core/dist/agent/index.cjs
 var require_agent = chunkU74OJRHU_cjs.__commonJS({
   "../../packages/core/dist/agent/index.cjs"(exports2) {
-    var chunkEZDS6FFZ_cjs = require_chunk_EZDS6FFZ();
-    var chunkOB2PB6SX_cjs = require_chunk_OB2PB6SX();
+    var chunkTO5645ZP_cjs = require_chunk_TO5645ZP();
+    var chunkKUJQVCEL_cjs = require_chunk_KUJQVCEL();
     Object.defineProperty(exports2, "Agent", {
       enumerable: true,
       get: function() {
-        return chunkEZDS6FFZ_cjs.Agent;
+        return chunkTO5645ZP_cjs.Agent;
       }
     });
     Object.defineProperty(exports2, "MessageList", {
       enumerable: true,
       get: function() {
-        return chunkOB2PB6SX_cjs.MessageList;
+        return chunkKUJQVCEL_cjs.MessageList;
       }
     });
   }