@mastra/core 1.21.0 → 1.22.0-alpha.1

package/dist/{chunk-UWYGTSWV.cjs → chunk-DOPULILR.cjs}

@@ -1165,6 +1165,9 @@ var AIV5Adapter = class {
         }
         if (matchingV2Part && matchingV2Part.type === "tool-invocation") {
           updateMatchingCallInvocationResult(toolResultPart, matchingV2Part.toolInvocation);
+          if (toolResultPart.providerOptions) {
+            matchingV2Part.providerMetadata = toolResultPart.providerOptions;
+          }
         } else {
           const toolInvocationPart = {
             type: "tool-invocation",
@@ -1176,6 +1179,9 @@ var AIV5Adapter = class {
             }
           };
           updateMatchingCallInvocationResult(toolResultPart, toolInvocationPart.toolInvocation);
+          if (toolResultPart.providerOptions) {
+            toolInvocationPart.providerMetadata = toolResultPart.providerOptions;
+          }
           mastraDBParts.push(toolInvocationPart);
         }
       } else if (part.type === "reasoning") {
@@ -1924,34 +1930,6 @@ function aiV5UIMessagesToAIV5ModelMessages(messages, dbMessages, filterIncomplet
   const sanitized = sanitizeV5UIMessages(messages, filterIncompleteToolCalls);
   const preprocessed = addStartStepPartsForAIV5(sanitized);
   const result = chunkY3APFUXZ_cjs.convertToModelMessages(preprocessed);
-  const storedModelOutputs = /* @__PURE__ */ new Map();
-  for (const dbMsg of dbMessages) {
-    if (dbMsg.content?.format === 2 && dbMsg.content.parts) {
-      for (const part of dbMsg.content.parts) {
-        if (part.type === "tool-invocation" && part.toolInvocation?.state === "result" && part.providerMetadata?.mastra && typeof part.providerMetadata.mastra === "object" && "modelOutput" in part.providerMetadata.mastra) {
-          storedModelOutputs.set(
-            part.toolInvocation.toolCallId,
-            part.providerMetadata.mastra.modelOutput
-          );
-        }
-      }
-    }
-  }
-  if (storedModelOutputs.size > 0) {
-    for (const modelMsg of result) {
-      if (modelMsg.role === "tool" && Array.isArray(modelMsg.content)) {
-        for (let i = 0; i < modelMsg.content.length; i++) {
-          const part = modelMsg.content[i];
-          if (part.type === "tool-result" && storedModelOutputs.has(part.toolCallId)) {
-            modelMsg.content[i] = {
-              ...part,
-              output: storedModelOutputs.get(part.toolCallId)
-            };
-          }
-        }
-      }
-    }
-  }
   const withProviderOptions = result.map((modelMsg, index) => {
     const uiMsg = preprocessed[index];
     if (uiMsg?.metadata && typeof uiMsg.metadata === "object" && "providerMetadata" in uiMsg.metadata && uiMsg.metadata.providerMetadata) {
@@ -3544,6 +3522,32 @@ var MessageList = class {
         downloadRetries: 3
       }) => {
         const modelMessages = aiV5UIMessagesToAIV5ModelMessages(this.all.aiV5.ui(), this.messages, true);
+        const storedModelOutputs = /* @__PURE__ */ new Map();
+        for (const dbMsg of this.messages) {
+          if (dbMsg.content?.format !== 2 || !dbMsg.content.parts) continue;
+          for (const part of dbMsg.content.parts) {
+            if (part.type === "tool-invocation" && part.toolInvocation?.state === "result" && part.providerMetadata?.mastra && typeof part.providerMetadata.mastra === "object" && "modelOutput" in part.providerMetadata.mastra) {
+              storedModelOutputs.set(
+                part.toolInvocation.toolCallId,
+                part.providerMetadata.mastra.modelOutput
+              );
+            }
+          }
+        }
+        if (storedModelOutputs.size > 0) {
+          for (const modelMsg of modelMessages) {
+            if (modelMsg.role !== "tool" || !Array.isArray(modelMsg.content)) continue;
+            for (let i = 0; i < modelMsg.content.length; i++) {
+              const part = modelMsg.content[i];
+              if (part.type === "tool-result" && storedModelOutputs.has(part.toolCallId)) {
+                modelMsg.content[i] = {
+                  ...part,
+                  output: storedModelOutputs.get(part.toolCallId)
+                };
+              }
+            }
+          }
+        }
         const systemMessages = aiV4CoreMessagesToAIV5ModelMessages(
           [...this.systemMessages, ...Object.values(this.taggedSystemMessages).flat()],
           `system`,
@@ -4129,5 +4133,5 @@ exports.getOpenAIReasoningItemId = getOpenAIReasoningItemId;
 exports.hasOpenAIReasoningItemId = hasOpenAIReasoningItemId;
 exports.messagesAreEqual = messagesAreEqual;
 exports.sanitizeToolName = sanitizeToolName;
-//# sourceMappingURL=chunk-UWYGTSWV.cjs.map
-//# sourceMappingURL=chunk-UWYGTSWV.cjs.map
+//# sourceMappingURL=chunk-DOPULILR.cjs.map
+//# sourceMappingURL=chunk-DOPULILR.cjs.map