@mastra/core 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/{chunk-G36A2JRR.cjs → chunk-VSM3NLUX.cjs}

@@ -1880,6 +1880,12 @@ var MessageList = class _MessageList {
         return ti;
       });
     }
+    if (!message.threadId && this.memoryInfo?.threadId) {
+      message.threadId = this.memoryInfo.threadId;
+      if (!message.resourceId && this.memoryInfo?.resourceId) {
+        message.resourceId = this.memoryInfo.resourceId;
+      }
+    }
     return message;
   }
   aiV4UIMessageToMastraDBMessage(message, messageSource) {
@@ -1917,137 +1923,180 @@ var MessageList = class _MessageList {
     if (typeof coreMessage.content === "string") {
       parts.push({
         type: "text",
-        text: coreMessage.content,
-        // Preserve providerOptions from CoreMessage (e.g., for system messages with cacheControl)
-        ..."providerOptions" in coreMessage && coreMessage.providerOptions ? { providerMetadata: coreMessage.providerOptions } : {}
+        text: coreMessage.content
       });
     } else if (Array.isArray(coreMessage.content)) {
-      for (const part of coreMessage.content) {
-        switch (part.type) {
-          case "text":
+      for (const aiV4Part of coreMessage.content) {
+        switch (aiV4Part.type) {
+          case "text": {
             const prevPart = parts.at(-1);
             if (coreMessage.role === "assistant" && prevPart && prevPart.type === "tool-invocation") {
               parts.push({ type: "step-start" });
             }
-            const mergedProviderMetadata = {
-              ..."providerOptions" in coreMessage && coreMessage.providerOptions ? coreMessage.providerOptions : {},
-              ..."providerOptions" in part && part.providerOptions ? part.providerOptions : {}
-            };
-            parts.push({
+            const part = {
               type: "text",
-              text: part.text,
-              ...Object.keys(mergedProviderMetadata).length > 0 ? { providerMetadata: mergedProviderMetadata } : {}
-            });
+              text: aiV4Part.text
+            };
+            if (aiV4Part.providerOptions) {
+              part.providerMetadata = aiV4Part.providerOptions;
+            }
+            parts.push(part);
             break;
-          case "tool-call":
-            parts.push({
+          }
+          case "tool-call": {
+            const part = {
               type: "tool-invocation",
               toolInvocation: {
                 state: "call",
-                toolCallId: part.toolCallId,
-                toolName: part.toolName,
-                args: part.args
+                toolCallId: aiV4Part.toolCallId,
+                toolName: aiV4Part.toolName,
+                args: aiV4Part.args
               }
-            });
+            };
+            if (aiV4Part.providerOptions) {
+              part.providerMetadata = aiV4Part.providerOptions;
+            }
+            parts.push(part);
             break;
+          }
           case "tool-result":
-            let toolArgs = {};
-            const toolCallInSameMsg = coreMessage.content.find(
-              (p) => p.type === "tool-call" && p.toolCallId === part.toolCallId
-            );
-            if (toolCallInSameMsg && toolCallInSameMsg.type === "tool-call") {
-              toolArgs = toolCallInSameMsg.args;
-            }
-            if (Object.keys(toolArgs).length === 0) {
-              for (let i = this.messages.length - 1; i >= 0; i--) {
-                const msg = this.messages[i];
-                if (msg && msg.role === "assistant" && msg.content.parts) {
-                  const toolCallPart = msg.content.parts.find(
-                    (p) => p.type === "tool-invocation" && p.toolInvocation.toolCallId === part.toolCallId && p.toolInvocation.state === "call"
-                  );
-                  if (toolCallPart && toolCallPart.type === "tool-invocation" && toolCallPart.toolInvocation.args) {
-                    toolArgs = toolCallPart.toolInvocation.args;
-                    break;
+            {
+              let toolArgs = {};
+              const toolCallInSameMsg = coreMessage.content.find(
+                (p) => p.type === "tool-call" && p.toolCallId === aiV4Part.toolCallId
+              );
+              if (toolCallInSameMsg && toolCallInSameMsg.type === "tool-call") {
+                toolArgs = toolCallInSameMsg.args;
+              }
+              if (Object.keys(toolArgs).length === 0) {
+                for (let i = this.messages.length - 1; i >= 0; i--) {
+                  const msg = this.messages[i];
+                  if (msg && msg.role === "assistant" && msg.content.parts) {
+                    const toolCallPart = msg.content.parts.find(
+                      (p) => p.type === "tool-invocation" && p.toolInvocation.toolCallId === aiV4Part.toolCallId && p.toolInvocation.state === "call"
+                    );
+                    if (toolCallPart && toolCallPart.type === "tool-invocation" && toolCallPart.toolInvocation.args) {
+                      toolArgs = toolCallPart.toolInvocation.args;
+                      break;
+                    }
                   }
                 }
               }
+              const invocation = {
+                state: "result",
+                toolCallId: aiV4Part.toolCallId,
+                toolName: aiV4Part.toolName,
+                result: aiV4Part.result ?? "",
+                // undefined will cause AI SDK to throw an error, but for client side tool calls this really could be undefined
+                args: toolArgs
+                // Use the args from the corresponding tool-call
+              };
+              const part = {
+                type: "tool-invocation",
+                toolInvocation: invocation
+              };
+              if (aiV4Part.providerOptions) {
+                part.providerMetadata = aiV4Part.providerOptions;
+              }
+              parts.push(part);
+              toolInvocations.push(invocation);
             }
-            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: toolArgs
-              // Use the args from the corresponding tool-call
-            };
-            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 }]
-            });
+            {
+              const part = {
+                type: "reasoning",
+                reasoning: "",
+                // leave this blank so we aren't double storing it in the db along with details
+                details: [{ type: "text", text: aiV4Part.text, signature: aiV4Part.signature }]
+              };
+              if (aiV4Part.providerOptions) {
+                part.providerMetadata = aiV4Part.providerOptions;
+              }
+              parts.push(part);
+            }
             break;
           case "redacted-reasoning":
-            parts.push({
-              type: "reasoning",
-              reasoning: "",
-              // No text reasoning for redacted parts
-              details: [{ type: "redacted", data: part.data }]
-            });
+            {
+              const part = {
+                type: "reasoning",
+                reasoning: "",
+                // No text reasoning for redacted parts
+                details: [{ type: "redacted", data: aiV4Part.data }]
+              };
+              if (aiV4Part.providerOptions) {
+                part.providerMetadata = aiV4Part.providerOptions;
+              }
+              parts.push(part);
+            }
             break;
-          case "image":
-            parts.push({
+          case "image": {
+            const part = {
               type: "file",
-              data: imageContentToString(part.image),
-              mimeType: part.mimeType
-            });
+              data: imageContentToString(aiV4Part.image),
+              mimeType: aiV4Part.mimeType
+            };
+            if (aiV4Part.providerOptions) {
+              part.providerMetadata = aiV4Part.providerOptions;
+            }
+            parts.push(part);
             break;
-          case "file":
-            if (part.data instanceof URL) {
-              parts.push({
+          }
+          case "file": {
+            if (aiV4Part.data instanceof URL) {
+              const part = {
                 type: "file",
-                data: part.data.toString(),
-                mimeType: part.mimeType
-              });
-            } else if (typeof part.data === "string") {
-              const categorized = categorizeFileData(part.data, part.mimeType);
+                data: aiV4Part.data.toString(),
+                mimeType: aiV4Part.mimeType
+              };
+              if (aiV4Part.providerOptions) {
+                part.providerMetadata = aiV4Part.providerOptions;
+              }
+              parts.push(part);
+            } else if (typeof aiV4Part.data === "string") {
+              const categorized = categorizeFileData(aiV4Part.data, aiV4Part.mimeType);
               if (categorized.type === "url" || categorized.type === "dataUri") {
-                parts.push({
+                const part = {
                   type: "file",
-                  data: part.data,
+                  data: aiV4Part.data,
                   mimeType: categorized.mimeType || "image/png"
-                });
+                };
+                if (aiV4Part.providerOptions) {
+                  part.providerMetadata = aiV4Part.providerOptions;
+                }
+                parts.push(part);
               } else {
                 try {
-                  parts.push({
+                  const part = {
                     type: "file",
                     mimeType: categorized.mimeType || "image/png",
-                    data: convertDataContentToBase64String(part.data)
-                  });
+                    data: convertDataContentToBase64String(aiV4Part.data)
+                  };
+                  if (aiV4Part.providerOptions) {
+                    part.providerMetadata = aiV4Part.providerOptions;
+                  }
+                  parts.push(part);
                 } catch (error) {
                   console.error(`Failed to convert binary data to base64 in CoreMessage file part: ${error}`, error);
                 }
               }
             } else {
               try {
-                parts.push({
+                const part = {
                   type: "file",
-                  mimeType: part.mimeType,
-                  data: convertDataContentToBase64String(part.data)
-                });
+                  mimeType: aiV4Part.mimeType,
+                  data: convertDataContentToBase64String(aiV4Part.data)
+                };
+                if (aiV4Part.providerOptions) {
+                  part.providerMetadata = aiV4Part.providerOptions;
+                }
+                parts.push(part);
               } catch (error) {
                 console.error(`Failed to convert binary data to base64 in CoreMessage file part: ${error}`, error);
               }
             }
             break;
+          }
         }
       }
     }
@@ -2058,6 +2107,9 @@ var MessageList = class _MessageList {
     if (toolInvocations.length) content.toolInvocations = toolInvocations;
     if (typeof coreMessage.content === `string`) content.content = coreMessage.content;
     if (experimentalAttachments.length) content.experimental_attachments = experimentalAttachments;
+    if (coreMessage.providerOptions) {
+      content.providerMetadata = coreMessage.providerOptions;
+    }
     return {
       id,
       role: _MessageList.getRole(coreMessage),
@@ -2408,6 +2460,9 @@ var MessageList = class _MessageList {
     if (dbMsg.createdAt) metadata.createdAt = dbMsg.createdAt;
     if (dbMsg.threadId) metadata.threadId = dbMsg.threadId;
     if (dbMsg.resourceId) metadata.resourceId = dbMsg.resourceId;
+    if (dbMsg.content.providerMetadata) {
+      metadata.providerMetadata = dbMsg.content.providerMetadata;
+    }
     const hasToolInvocationParts = dbMsg.content.parts?.some((p) => p.type === "tool-invocation");
     if (dbMsg.content.toolInvocations && !hasToolInvocationParts) {
       for (const invocation of dbMsg.content.toolInvocations) {
@@ -2474,18 +2529,20 @@ var MessageList = class _MessageList {
           continue;
         }
         if (part.type === "reasoning") {
-          const reasoningPart = part;
-          const text = reasoningPart.text || reasoningPart.reasoning || (reasoningPart.details?.reduce((p, c) => {
+          const text = part.reasoning || (part.details?.reduce((p, c) => {
             if (c.type === `text` && c.text) return p + c.text;
             return p;
           }, "") ?? "");
-          if (text || reasoningPart.details?.length) {
-            parts.push({
+          if (text || part.details?.length) {
+            const v5UIPart = {
               type: "reasoning",
               text: text || "",
-              state: "done",
-              ...part.providerMetadata && { providerMetadata: part.providerMetadata }
-            });
+              state: "done"
+            };
+            if (part.providerMetadata) {
+              v5UIPart.providerMetadata = part.providerMetadata;
+            }
+            parts.push(v5UIPart);
           }
           continue;
         }
@@ -2498,12 +2555,15 @@ var MessageList = class _MessageList {
           }
           const categorized = typeof part.data === "string" ? categorizeFileData(part.data, part.mimeType) : { type: "raw", mimeType: part.mimeType};
           if (categorized.type === "url" && typeof part.data === "string") {
-            parts.push({
+            const v5UIPart = {
               type: "file",
               url: part.data,
-              mediaType: categorized.mimeType || "image/png",
-              providerMetadata: part.providerMetadata
-            });
+              mediaType: categorized.mimeType || "image/png"
+            };
+            if (part.providerMetadata) {
+              v5UIPart.providerMetadata = part.providerMetadata;
+            }
+            parts.push(v5UIPart);
           } else {
             let filePartData;
             let extractedMimeType = part.mimeType;
@@ -2527,27 +2587,37 @@ var MessageList = class _MessageList {
             } else {
               dataUri = createDataUri(filePartData, finalMimeType);
             }
-            parts.push({
+            const v5UIPart = {
               type: "file",
               url: dataUri,
               // Use url field with data URI
-              mediaType: finalMimeType,
-              providerMetadata: part.providerMetadata
-            });
+              mediaType: finalMimeType
+            };
+            if (part.providerMetadata) {
+              v5UIPart.providerMetadata = part.providerMetadata;
+            }
+            parts.push(v5UIPart);
           }
         } else if (part.type === "source") {
-          const sourcePart = part;
-          parts.push({
+          const v5UIPart = {
             type: "source-url",
-            url: sourcePart.source.url,
-            ...part.providerMetadata && { providerMetadata: part.providerMetadata }
-          });
+            url: part.source.url,
+            sourceId: part.source.id,
+            title: part.source.title
+          };
+          if (part.providerMetadata) {
+            v5UIPart.providerMetadata = part.providerMetadata;
+          }
+          parts.push(v5UIPart);
         } else if (part.type === "text") {
-          parts.push({
+          const v5UIPart = {
             type: "text",
-            text: part.text,
-            ...part.providerMetadata && { providerMetadata: part.providerMetadata }
-          });
+            text: part.text
+          };
+          if (part.providerMetadata) {
+            v5UIPart.providerMetadata = part.providerMetadata;
+          }
+          parts.push(v5UIPart);
           hasNonToolReasoningParts = true;
         } else {
           parts.push(part);
@@ -2711,32 +2781,69 @@ var MessageList = class _MessageList {
       }
     };
   }
+  /**
+   * Convert image or file to data URI or URL for V2 file part
+   */
+  static getDataStringFromAIV5DataPart = (part) => {
+    let mimeType;
+    let data;
+    if ("data" in part) {
+      mimeType = part.mediaType || "application/octet-stream";
+      data = part.data;
+    } else if ("image" in part) {
+      mimeType = part.mediaType || "image/jpeg";
+      data = part.image;
+    } else {
+      throw new chunkTWH4PTDG_cjs.MastraError({
+        id: "MASTRA_AIV5_DATA_PART_INVALID",
+        domain: "AGENT" /* AGENT */,
+        category: "USER" /* USER */,
+        text: "Invalid AIV5 data part in getDataStringFromAIV5DataPart",
+        details: {
+          part
+        }
+      });
+    }
+    if (data instanceof URL) {
+      return data.toString();
+    } else {
+      if (data instanceof Buffer) {
+        const base64 = data.toString("base64");
+        return `data:${mimeType};base64,${base64}`;
+      } else if (typeof data === "string") {
+        return data.startsWith("data:") || data.startsWith("http") ? data : `data:${mimeType};base64,${data}`;
+      } else if (data instanceof Uint8Array) {
+        const base64 = Buffer.from(data).toString("base64");
+        return `data:${mimeType};base64,${base64}`;
+      } else if (data instanceof ArrayBuffer) {
+        const base64 = Buffer.from(data).toString("base64");
+        return `data:${mimeType};base64,${base64}`;
+      } else {
+        return "";
+      }
+    }
+  };
   /**
    * Direct conversion from AIV5 ModelMessage to MastraDBMessage
    * Combines logic from aiV5ModelMessageToMastraMessageV3 + mastraMessageV3ToV2
    */
   static aiV5ModelMessageToMastraDBMessage(modelMsg, _messageSource) {
     const content = Array.isArray(modelMsg.content) ? modelMsg.content : [{ type: "text", text: modelMsg.content }];
-    const v2Parts = [];
+    const mastraDBParts = [];
     const toolInvocations = [];
     const reasoningParts = [];
     const experimental_attachments = [];
-    const textParts = [];
     let lastPartWasToolResult = false;
     for (const part of content) {
-      const providerMetadata = {
-        ...modelMsg.providerMetadata || {},
-        ...part.providerMetadata || {}
-      };
-      const hasProviderMetadata = Object.keys(providerMetadata).length > 0;
       if (part.type === "text") {
         const textPart = {
           type: "text",
-          text: part.text,
-          ...hasProviderMetadata && { experimental_providerMetadata: providerMetadata }
+          text: part.text
         };
-        v2Parts.push(textPart);
-        textParts.push({ text: part.text, providerMetadata: hasProviderMetadata ? providerMetadata : void 0 });
+        if (part.providerOptions) {
+          textPart.providerMetadata = part.providerOptions;
+        }
+        mastraDBParts.push(textPart);
         lastPartWasToolResult = false;
       } else if (part.type === "tool-call") {
         const toolCallPart = part;
@@ -2747,10 +2854,12 @@ var MessageList = class _MessageList {
             toolName: toolCallPart.toolName,
             args: toolCallPart.input,
             state: "call"
-          },
-          ...hasProviderMetadata && { providerMetadata }
+          }
         };
-        v2Parts.push(toolInvocationPart);
+        if (part.providerOptions) {
+          toolInvocationPart.providerMetadata = part.providerOptions;
+        }
+        mastraDBParts.push(toolInvocationPart);
         toolInvocations.push({
           toolCallId: toolCallPart.toolCallId,
           toolName: toolCallPart.toolName,
@@ -2761,78 +2870,67 @@ var MessageList = class _MessageList {
       } else if (part.type === "tool-result") {
         const toolResultPart = part;
         const matchingCall = toolInvocations.find((inv) => inv.toolCallId === toolResultPart.toolCallId);
-        const matchingV2Part = v2Parts.find(
+        const matchingV2Part = mastraDBParts.find(
           (p) => p.type === "tool-invocation" && "toolInvocation" in p && p.toolInvocation.toolCallId === toolResultPart.toolCallId
         );
+        const updateMatchingCallInvocationResult = (toolResultPart2, matchingCall2) => {
+          matchingCall2.state = "result";
+          matchingCall2.result = typeof toolResultPart2.output === "object" && toolResultPart2.output && "value" in toolResultPart2.output ? toolResultPart2.output.value : toolResultPart2.output;
+        };
         if (matchingCall) {
-          matchingCall.state = "result";
-          matchingCall.result = typeof toolResultPart.output === "object" && toolResultPart.output && "value" in toolResultPart.output ? toolResultPart.output.value : toolResultPart.output;
+          updateMatchingCallInvocationResult(toolResultPart, matchingCall);
         } else {
-          const resultPartWithName = toolResultPart;
-          toolInvocations.push({
+          const call = {
+            state: "call",
             toolCallId: toolResultPart.toolCallId,
-            toolName: resultPartWithName.toolName || "unknown",
-            args: {},
-            result: typeof toolResultPart.output === "object" && toolResultPart.output && "value" in toolResultPart.output ? toolResultPart.output.value : toolResultPart.output,
-            state: "result"
-          });
+            toolName: toolResultPart.toolName || "unknown",
+            args: {}
+          };
+          updateMatchingCallInvocationResult(toolResultPart, call);
+          toolInvocations.push(call);
         }
         if (matchingV2Part && matchingV2Part.type === "tool-invocation") {
-          matchingV2Part.toolInvocation.state = "result";
-          matchingV2Part.toolInvocation.result = typeof toolResultPart.output === "object" && toolResultPart.output && "value" in toolResultPart.output ? toolResultPart.output.value : toolResultPart.output;
-          if (hasProviderMetadata) {
-            matchingV2Part.providerMetadata = providerMetadata;
-          }
+          updateMatchingCallInvocationResult(toolResultPart, matchingV2Part.toolInvocation);
         } else {
-          const resultPartWithName = toolResultPart;
           const toolInvocationPart = {
             type: "tool-invocation",
             toolInvocation: {
               toolCallId: toolResultPart.toolCallId,
-              toolName: resultPartWithName.toolName || "unknown",
+              toolName: toolResultPart.toolName || "unknown",
               args: {},
-              result: typeof toolResultPart.output === "object" && toolResultPart.output && "value" in toolResultPart.output ? toolResultPart.output.value : toolResultPart.output,
-              state: "result"
-            },
-            ...hasProviderMetadata && { providerMetadata }
+              state: "call"
+            }
           };
-          v2Parts.push(toolInvocationPart);
+          updateMatchingCallInvocationResult(toolResultPart, toolInvocationPart.toolInvocation);
+          mastraDBParts.push(toolInvocationPart);
         }
         lastPartWasToolResult = true;
       } else if (part.type === "reasoning") {
-        const reasoningPart = part;
         const v2ReasoningPart = {
           type: "reasoning",
-          reasoning: reasoningPart.text,
-          details: [{ type: "text", text: reasoningPart.text }],
-          ...hasProviderMetadata && { providerMetadata }
+          reasoning: "",
+          // leave this blank so we aren't double storing it in the db along with details
+          details: [{ type: "text", text: part.text }]
         };
-        v2Parts.push(v2ReasoningPart);
-        reasoningParts.push(reasoningPart.text);
+        if (part.providerOptions) {
+          v2ReasoningPart.providerMetadata = part.providerOptions;
+        }
+        mastraDBParts.push(v2ReasoningPart);
+        reasoningParts.push(part.text);
         lastPartWasToolResult = false;
       } else if (part.type === "image") {
         const imagePart = part;
-        let imageData;
-        const mimeType = imagePart.mimeType || "image/jpeg";
-        if ("url" in imagePart && typeof imagePart.url === "string") {
-          imageData = imagePart.url;
-        } else if ("data" in imagePart) {
-          if (typeof imagePart.data === "string") {
-            imageData = imagePart.data.startsWith("data:") || imagePart.data.startsWith("http") ? imagePart.data : `data:${mimeType};base64,${imagePart.data}`;
-          } else {
-            const base64 = Buffer.from(imagePart.data).toString("base64");
-            imageData = `data:${mimeType};base64,${base64}`;
-          }
-        } else {
-          imageData = "";
-        }
+        const mimeType = imagePart.mediaType || "image/jpeg";
+        const imageData = this.getDataStringFromAIV5DataPart(imagePart);
         const imageFilePart = {
           type: "file",
           data: imageData,
-          mimeType,
-          ...hasProviderMetadata && { providerMetadata }
+          mimeType
         };
-        v2Parts.push(imageFilePart);
+        if (part.providerOptions) {
+          imageFilePart.providerMetadata = part.providerOptions;
+        }
+        mastraDBParts.push(imageFilePart);
         experimental_attachments.push({
           url: imageData,
           contentType: mimeType
@@ -2841,26 +2939,16 @@ var MessageList = class _MessageList {
       } else if (part.type === "file") {
         const filePart = part;
         const mimeType = filePart.mediaType || "application/octet-stream";
-        let fileData;
-        if ("url" in filePart && typeof filePart.url === "string") {
-          fileData = filePart.url;
-        } else if ("data" in filePart) {
-          if (typeof filePart.data === "string") {
-            fileData = filePart.data.startsWith("data:") || filePart.data.startsWith("http") ? filePart.data : `data:${mimeType};base64,${filePart.data}`;
-          } else {
-            const base64 = Buffer.from(filePart.data).toString("base64");
-            fileData = `data:${mimeType};base64,${base64}`;
-          }
-        } else {
-          fileData = "";
-        }
+        const fileData = this.getDataStringFromAIV5DataPart(filePart);
         const v2FilePart = {
           type: "file",
           data: fileData,
-          mimeType,
-          ...hasProviderMetadata && { providerMetadata }
+          mimeType
         };
-        v2Parts.push(v2FilePart);
+        if (part.providerOptions) {
+          v2FilePart.providerMetadata = part.providerOptions;
+        }
+        mastraDBParts.push(v2FilePart);
         experimental_attachments.push({
           url: fileData,
           contentType: mimeType
@@ -2868,34 +2956,34 @@ var MessageList = class _MessageList {
         lastPartWasToolResult = false;
       }
     }
-    if (modelMsg.role === "assistant" && lastPartWasToolResult && v2Parts.length > 0) {
-      const lastPart = v2Parts[v2Parts.length - 1];
+    if (modelMsg.role === "assistant" && lastPartWasToolResult && mastraDBParts.length > 0) {
+      const lastPart = mastraDBParts[mastraDBParts.length - 1];
       if (lastPart && lastPart.type !== "text") {
         const emptyTextPart = { type: "text", text: "" };
-        v2Parts.push(emptyTextPart);
-        textParts.push({ text: "" });
+        mastraDBParts.push(emptyTextPart);
       }
     }
-    let contentString = void 0;
-    if (textParts.length > 0) {
-      contentString = textParts.map((p) => p.text).join("\n");
-    }
+    const contentString = mastraDBParts.filter((p) => p.type === "text").map((p) => p.text).join("\n");
     const metadata = {};
     const id = `id` in modelMsg && typeof modelMsg.id === `string` ? modelMsg.id : `msg-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-    return {
+    const message = {
       id,
       role: _MessageList.getRole(modelMsg),
       createdAt: /* @__PURE__ */ new Date(),
       content: {
         format: 2,
-        parts: v2Parts,
+        parts: mastraDBParts,
         toolInvocations: toolInvocations.length > 0 ? toolInvocations : void 0,
         reasoning: reasoningParts.length > 0 ? reasoningParts.join("\n") : void 0,
         experimental_attachments: experimental_attachments.length > 0 ? experimental_attachments : void 0,
-        content: contentString,
+        content: contentString || void 0,
         metadata
       }
     };
+    if (modelMsg.providerOptions) {
+      message.content.providerMetadata = modelMsg.providerOptions;
+    }
+    return message;
   }
   aiV4CoreMessagesToAIV5ModelMessages(messages, source) {
     return this.aiV5UIMessagesToAIV5ModelMessages(
@@ -2906,7 +2994,16 @@ var MessageList = class _MessageList {
     const sanitized = this.sanitizeV5UIMessages(messages, filterIncompleteToolCalls);
     const preprocessed = this.addStartStepPartsForAIV5(sanitized);
     const result = AIV5__namespace.convertToModelMessages(preprocessed);
-    return result;
+    return result.map((modelMsg, index) => {
+      const uiMsg = preprocessed[index];
+      if (uiMsg?.metadata && typeof uiMsg.metadata === "object" && "providerMetadata" in uiMsg.metadata && uiMsg.metadata.providerMetadata) {
+        return {
+          ...modelMsg,
+          providerOptions: uiMsg.metadata.providerMetadata
+        };
+      }
+      return modelMsg;
+    });
   }
   addStartStepPartsForAIV5(messages) {
     for (const message of messages) {
@@ -3042,5 +3139,5 @@ exports.DefaultGeneratedFile = DefaultGeneratedFile;
 exports.DefaultGeneratedFileWithType = DefaultGeneratedFileWithType;
 exports.MessageList = MessageList;
 exports.convertMessages = convertMessages;
-//# sourceMappingURL=chunk-G36A2JRR.cjs.map
-//# sourceMappingURL=chunk-G36A2JRR.cjs.map
+//# sourceMappingURL=chunk-VSM3NLUX.cjs.map
+//# sourceMappingURL=chunk-VSM3NLUX.cjs.map