@mastra/core 1.21.0 → 1.22.0-alpha.1

package/dist/{chunk-F3T776ZA.js → chunk-SVS5U4HA.js}

@@ -1,12 +1,12 @@
-import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-LOA2BVRK.js';
+import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-HJBVUY76.js';
 import { DefaultVoice } from './chunk-I5IR6752.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-2QXNHEDL.js';
-import { InMemoryStore } from './chunk-WG4GNZZZ.js';
-import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-NRA3BO5W.js';
+import { InMemoryStore } from './chunk-FXONBE4Y.js';
+import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-MOVQYN2F.js';
 import { parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-2PHG443D.js';
 import { generateId, APICallError, tool, asSchema } from './chunk-6PALJNKG.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-Z5ABABPJ.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-YKBJTINY.js';
 import { MastraLLMV1 } from './chunk-KYIYBC6A.js';
 import { noopLogger } from './chunk-C4VH5RKF.js';
 import { EventEmitterPubSub } from './chunk-X2HAI3OX.js';
@@ -3112,7 +3112,7 @@ var MastraModelOutput = class extends MastraBase {
                   // complicated to do this in this PR, it will require a much bigger change.
                   uiMessages: messageList.get.response.aiV5.ui()
                 },
-                providerMetadata
+                providerMetadata: providerMetadata ?? chunk.payload.providerMetadata
               };
               await options?.onStepFinish?.({
                 ...self.#model.modelId && self.#model.provider && self.#model.version ? { model: self.#model } : {},
@@ -3191,6 +3191,7 @@ var MastraModelOutput = class extends MastraBase {
               if (chunk.payload.stepResult.reason) {
                 self.#finishReason = chunk.payload.stepResult.reason;
               }
+              const finalProviderMetadata = chunk.payload.metadata?.providerMetadata ?? chunk.payload.providerMetadata;
               if (chunk.payload.stepResult.reason === "tripwire") {
                 const outputSteps = chunk.payload.output?.steps;
                 const lastStep = outputSteps?.[outputSteps?.length - 1];
@@ -3308,10 +3309,14 @@ var MastraModelOutput = class extends MastraBase {
                 }
               }
               const reasoningText = self.#bufferedReasoning.length > 0 ? self.#bufferedReasoning.map((reasoningPart) => reasoningPart.payload.text).join("") : void 0;
+              const baseFinishStep = self.#bufferedSteps[self.#bufferedSteps.length - 1];
+              if (baseFinishStep && baseFinishStep.providerMetadata === void 0 && finalProviderMetadata !== void 0) {
+                baseFinishStep.providerMetadata = finalProviderMetadata;
+              }
               this.resolvePromises({
                 usage: self.#usageCount,
                 warnings: self.#warnings,
-                providerMetadata: chunk.payload.metadata?.providerMetadata,
+                providerMetadata: finalProviderMetadata,
                 response: { ...response, dbMessages: self.messageList.get.response.db() },
                 request: self.#request || {},
                 reasoningText,
@@ -3326,11 +3331,10 @@ var MastraModelOutput = class extends MastraBase {
                 suspendPayload: void 0,
                 resumeSchema: void 0
               });
-              const baseFinishStep = self.#bufferedSteps[self.#bufferedSteps.length - 1];
               if (baseFinishStep) {
                 const onFinishPayload = {
                   // StepResult properties from baseFinishStep
-                  providerMetadata: baseFinishStep.providerMetadata,
+                  providerMetadata: baseFinishStep.providerMetadata ?? finalProviderMetadata,
                   text: self.#bufferedText.join(""),
                   warnings: baseFinishStep.warnings ?? [],
                   finishReason: chunk.payload.stepResult.reason,
@@ -4522,6 +4526,7 @@ function convertFullStreamChunkToMastra(value, ctx) {
         runId: ctx.runId,
         from: "AGENT" /* AGENT */,
         payload: {
+          providerMetadata: value.providerMetadata,
           stepResult: {
             reason: normalizeFinishReason(value.finishReason)
           },
@@ -4532,7 +4537,11 @@ function convertFullStreamChunkToMastra(value, ctx) {
           metadata: {
             providerMetadata: value.providerMetadata
           },
-          messages,
+          messages: messages ?? {
+            all: [],
+            user: [],
+            nonUser: []
+          },
           ...rest
         }
       };
@@ -4676,7 +4685,7 @@ function convertMastraChunkToAISDKv5({
         providerMetadata: chunk.payload.providerMetadata
       };
     case "step-finish": {
-      const { request: _request, providerMetadata, ...rest2 } = chunk.payload.metadata;
+      const { request: _request, providerMetadata: metadataProviderMetadata, ...rest2 } = chunk.payload.metadata;
       return {
         type: "finish-step",
         response: {
@@ -4687,7 +4696,7 @@ function convertMastraChunkToAISDKv5({
         },
         usage: chunk.payload.output.usage,
         finishReason: chunk.payload.stepResult.reason,
-        providerMetadata
+        providerMetadata: metadataProviderMetadata ?? chunk.payload.providerMetadata
       };
     }
     case "text-delta":
@@ -12695,7 +12704,7 @@ async function processOutputStream({
         break;
       case "finish":
         runState.setState({
-          providerOptions: chunk.payload.metadata.providerMetadata,
+          providerOptions: chunk.payload.metadata?.providerMetadata ?? chunk.payload.providerMetadata,
           stepResult: {
             reason: chunk.payload.reason,
             logprobs: chunk.payload.logprobs,
@@ -13135,9 +13144,19 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
               modelSettings: { ...currentStep.modelSettings, maxRetries: modelConfig.maxRetries },
               includeRawChunks,
               structuredOutput: currentStep.structuredOutput,
-              // Merge headers: modelConfig headers first, then modelSettings overrides them
-              // Only create object if there are actual headers to avoid passing empty {}
-              headers: modelHeaders || currentStep.modelSettings?.headers ? { ...modelHeaders, ...currentStep.modelSettings?.headers } : void 0,
+              // Merge headers: memory context first, then modelConfig headers, then modelSettings overrides
+              // x-thread-id / x-resource-id enable server-side memory enrichment (e.g. Memory Gateway)
+              headers: (() => {
+                const memoryHeaders = {};
+                if (_internal?.threadId) memoryHeaders["x-thread-id"] = _internal.threadId;
+                if (_internal?.resourceId) memoryHeaders["x-resource-id"] = _internal.resourceId;
+                const merged = {
+                  ...memoryHeaders,
+                  ...modelHeaders,
+                  ...currentStep.modelSettings?.headers
+                };
+                return Object.keys(merged).length > 0 ? merged : void 0;
+              })(),
               methodType,
               generateId: _internal?.generateId,
               onResult: ({
@@ -18760,7 +18779,7 @@ function createPrepareMemoryStep({
         }
         return {
           threadExists: false,
-          thread: void 0,
+          thread,
           messageList,
           processorStates,
           tripwire: tripwire2
@@ -22234,13 +22253,15 @@ ${effectiveInstructions}`;
     });
     const resourceId = resourceIdFromContext || options.memory?.resource || snapshotMemoryInfo?.resourceId;
     const memoryConfig = options.memory?.options;
-    if (resourceId && threadFromArgs && !this.hasOwnMemory()) {
-      this.logger.warn("No memory is configured but resourceId and threadId were passed in args", { agent: this.name });
-    }
     const llm = await this.getLLM({
       requestContext,
       model: options.model
     });
+    const resolvedModel = llm.getModel();
+    const isGatewayModel = resolvedModel instanceof ModelRouterLanguageModel && resolvedModel.gatewayId === "mastra";
+    if (resourceId && threadFromArgs && !this.hasOwnMemory() && !isGatewayModel) {
+      this.logger.warn("No memory is configured but resourceId and threadId were passed in args", { agent: this.name });
+    }
     if ("structuredOutput" in options && options.structuredOutput?.schema && !options.structuredOutput?.model) {
       const structuredOutputModel = llm.getModel();
       const targetProvider = structuredOutputModel.provider;
@@ -27516,5 +27537,5 @@ var MockMemory = class extends MastraMemory {
 };
 
 export { Agent, AgentsMDInjector, BaseProcessor, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MastraScorer, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SkillSearchProcessor, SkillsProcessor, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, ToolSearchProcessor, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, WorkspaceInstructionsProcessor, augmentWithInit, cleanStepResult, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createScorer, createStep, createTimeTravelExecutionParams, createWorkflow, extractWorkingMemoryContent, extractWorkingMemoryTags, formatCheckFeedback, formatCompletionFeedback, formatStreamCompletionFeedback, formatValidationFeedback, forwardAgentStreamChunk, generateFinalResult, generateStructuredFinalResult, getResumeLabelsByStepId, getStepIds, getStepResult, getThreadOMMetadata, globalEmbeddingCache, hydrateSerializedStepErrors, isObservationalMemoryEnabled, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeWorkingMemoryTags, resolveThreadIdFromArgs, runChecks, runCompletionScorers, runCountDeprecationMessage, runDefaultCompletionCheck, runStreamCompletionScorers, runValidation, setThreadOMMetadata, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepRequestContext, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-F3T776ZA.js.map
-//# sourceMappingURL=chunk-F3T776ZA.js.map
+//# sourceMappingURL=chunk-SVS5U4HA.js.map
+//# sourceMappingURL=chunk-SVS5U4HA.js.map