@mastra/core 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/{chunk-45NA5ZD3.js → chunk-EDNHZZUP.js}

@@ -1,14 +1,14 @@
 import { DefaultVoice } from './chunk-F2GAJSBI.js';
 import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-NLNKQD2T.js';
-import { InMemoryStore } from './chunk-OPALPWAM.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-APMPOYPI.js';
-import { ModelRouterEmbeddingModel, resolveModelConfig } from './chunk-TARWUQG6.js';
-import { MastraLLMV1 } from './chunk-WDRA4WKG.js';
+import { InMemoryStore } from './chunk-HDMH5IDV.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-DMPHPHMU.js';
+import { ModelRouterEmbeddingModel, resolveModelConfig } from './chunk-QHJ7YVNX.js';
+import { MastraLLMV1 } from './chunk-4GTU7MB2.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { removeUndefinedValues, deepMerge, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, selectFields, delay } from './chunk-KZLP6TPJ.js';
-import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-FYP3AT6W.js';
+import { removeUndefinedValues, deepMerge, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, selectFields, delay } from './chunk-URBPEE67.js';
+import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-FNSFXWDN.js';
 import { MastraError, getErrorFromUnknown } from './chunk-JJ5O45LH.js';
-import { ToolStream } from './chunk-LEZIKVRQ.js';
+import { ToolStream } from './chunk-F54IK3GJ.js';
 import { Tool, createTool } from './chunk-4F6RAJFU.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-6TBWJV35.js';
 import { zodToJsonSchema as zodToJsonSchema$1 } from './chunk-PJKCPRYF.js';
@@ -977,14 +977,15 @@ async function validateStepResumeData({ resumeData, step }) {
 }
 async function validateStepSuspendData({
   suspendData,
-  step
+  step,
+  validateInputs
 }) {
   if (!suspendData) {
     return { suspendData: void 0, validationError: void 0 };
   }
   let validationError;
   const suspendSchema = step.suspendSchema;
-  if (suspendSchema) {
+  if (suspendSchema && validateInputs) {
     const validatedSuspendData = await suspendSchema.safeParseAsync(suspendData);
     if (!validatedSuspendData.success) {
       const errors = getZodErrors(validatedSuspendData.error);
@@ -996,6 +997,28 @@ async function validateStepSuspendData({
   }
   return { suspendData, validationError };
 }
+async function validateStepStateData({
+  stateData,
+  step,
+  validateInputs
+}) {
+  if (!stateData) {
+    return { stateData: void 0, validationError: void 0 };
+  }
+  let validationError;
+  const stateSchema = step.stateSchema;
+  if (stateSchema && validateInputs) {
+    const validatedStateData = await stateSchema.safeParseAsync(stateData);
+    if (!validatedStateData.success) {
+      const errors = getZodErrors(validatedStateData.error);
+      const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
+      validationError = new Error("Step state data validation failed: \n" + errorMessages);
+    } else {
+      stateData = validatedStateData.data;
+    }
+  }
+  return { stateData, validationError };
+}
 function getResumeLabelsByStepId(resumeLabels, stepId) {
   return Object.entries(resumeLabels).filter(([_, value]) => value.stepId === stepId).reduce(
     (acc, [key, value]) => {
@@ -1315,18 +1338,12 @@ async function executeConditional(engine, params) {
           requestContext,
           inputData: prevOutput,
           state: executionContext.state,
-          setState: (state) => {
-            executionContext.state = state;
-          },
           retryCount: -1,
           tracingContext: {
             currentSpan: evalSpan
           },
           getInitData: () => stepResults?.input,
           getStepResult: getStepResult.bind(null, stepResults),
-          // TODO: this function shouldn't have suspend probably?
-          suspend: async (_suspendPayload) => {
-          },
           bail: () => {
           },
           abort: () => {
@@ -1566,9 +1583,6 @@ async function executeLoop(engine, params) {
           requestContext,
           inputData: result.output,
           state: executionContext.state,
-          setState: (state) => {
-            executionContext.state = state;
-          },
           retryCount: -1,
           tracingContext: {
             currentSpan: evalSpan
@@ -1576,8 +1590,6 @@ async function executeLoop(engine, params) {
           iterationCount: iteration + 1,
           getInitData: () => stepResults?.input,
           getStepResult: getStepResult.bind(null, stepResults),
-          suspend: async (_suspendPayload) => {
-          },
           bail: () => {
           },
           abort: () => {
@@ -2291,7 +2303,7 @@ async function executeSleep(engine, params) {
         requestContext,
         inputData: prevOutput,
         state: executionContext.state,
-        setState: (state) => {
+        setState: async (state) => {
           executionContext.state = state;
         },
         retryCount: -1,
@@ -2372,7 +2384,7 @@ async function executeSleepUntil(engine, params) {
         requestContext,
         inputData: prevOutput,
         state: executionContext.state,
-        setState: (state) => {
+        setState: async (state) => {
           executionContext.state = state;
         },
         retryCount: -1,
@@ -2581,9 +2593,16 @@ async function executeStep(engine, params) {
         requestContext,
         inputData,
         state: executionContext.state,
-        setState: (state) => {
-          executionContext.state = state;
-          contextMutations.stateUpdate = state;
+        setState: async (state) => {
+          const { stateData, validationError: stateValidationError } = await validateStepStateData({
+            stateData: state,
+            step,
+            validateInputs: engine.options?.validateInputs ?? true
+          });
+          if (stateValidationError) {
+            throw stateValidationError;
+          }
+          contextMutations.stateUpdate = stateData;
         },
         retryCount,
         resumeData: resumeDataToUse,
@@ -2594,7 +2613,8 @@ async function executeStep(engine, params) {
         suspend: async (suspendPayload, suspendOptions) => {
           const { suspendData, validationError: suspendValidationError } = await validateStepSuspendData({
             suspendData: suspendPayload,
-            step
+            step,
+            validateInputs: engine.options?.validateInputs ?? true
           });
           if (suspendValidationError) {
             throw suspendValidationError;
@@ -2669,9 +2689,6 @@ async function executeStep(engine, params) {
     const { result: durableResult } = stepRetryResult;
     Object.assign(executionContext.suspendedPaths, durableResult.contextMutations.suspendedPaths);
     Object.assign(executionContext.resumeLabels, durableResult.contextMutations.resumeLabels);
-    if (durableResult.contextMutations.stateUpdate !== null) {
-      executionContext.state = durableResult.contextMutations.stateUpdate;
-    }
     if (engine.requiresDurableContextSerialization() && durableResult.contextMutations.requestContextUpdate) {
       requestContext.clear();
       for (const [key, value] of Object.entries(durableResult.contextMutations.requestContextUpdate)) {
@@ -2729,7 +2746,10 @@ async function executeStep(engine, params) {
   return {
     result: stepResult,
     stepResults: { [step.id]: stepResult },
-    mutableContext: engine.buildMutableContext(executionContext),
+    mutableContext: engine.buildMutableContext({
+      ...executionContext,
+      state: stepRetryResult.ok ? stepRetryResult.result.contextMutations.stateUpdate ?? executionContext.state : executionContext.state
+    }),
     requestContext: engine.serializeRequestContext(requestContext)
   };
 }
@@ -3077,7 +3097,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
    * Apply mutable context changes back to the execution context.
    */
   applyMutableContext(executionContext, mutableContext) {
-    executionContext.state = mutableContext.state;
+    Object.assign(executionContext.state, mutableContext.state);
     Object.assign(executionContext.suspendedPaths, mutableContext.suspendedPaths);
     Object.assign(executionContext.resumeLabels, mutableContext.resumeLabels);
   }
@@ -3203,10 +3223,11 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             }
           });
         }
-        if (lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels) {
-          return { ...result2, resumeLabels: lastOutput.mutableContext.resumeLabels };
-        }
-        return result2;
+        return {
+          ...result2,
+          ...lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels ? { resumeLabels: lastOutput.mutableContext.resumeLabels } : {},
+          ...params.outputOptions?.includeState ? { state: lastState } : {}
+        };
       }
     }
     const result = await this.fmtReturnValue(params.emitter, stepResults, lastOutput.result);
@@ -4040,7 +4061,7 @@ var Workflow = class extends MastraBase {
       return stepRes?.status === "suspended";
     });
     if (res.state) {
-      setState(res.state);
+      await setState(res.state);
     }
     if (suspendedSteps?.length) {
       for (const [stepName, stepResult] of suspendedSteps) {
@@ -6250,18 +6271,39 @@ function convertMastraChunkToAISDKv5({
 }
 
 // src/stream/aisdk/v5/input.ts
+function isNumericId(id) {
+  return /^\d+$/.test(id);
+}
 var AISDKV5InputStream = class extends MastraModelInput {
-  constructor({ component, name }) {
+  #generateId;
+  constructor({
+    component,
+    name,
+    generateId: generateId3
+  }) {
     super({ component, name });
+    this.#generateId = generateId3 ?? generateId;
   }
   async transform({
     runId,
     stream,
     controller
   }) {
+    const idMap = /* @__PURE__ */ new Map();
     for await (const chunk of stream) {
-      const transformedChunk = convertFullStreamChunkToMastra(chunk, { runId });
+      const rawChunk = chunk;
+      if (rawChunk.type === "stream-start") {
+        idMap.clear();
+      }
+      const transformedChunk = convertFullStreamChunkToMastra(rawChunk, { runId });
       if (transformedChunk) {
+        if ((transformedChunk.type === "text-start" || transformedChunk.type === "text-delta" || transformedChunk.type === "text-end") && transformedChunk.payload?.id && isNumericId(transformedChunk.payload.id)) {
+          const originalId = transformedChunk.payload.id;
+          if (!idMap.has(originalId)) {
+            idMap.set(originalId, this.#generateId());
+          }
+          transformedChunk.payload.id = idMap.get(originalId);
+        }
         controller.enqueue(transformedChunk);
       }
     }
@@ -6290,11 +6332,13 @@ function execute({
   structuredOutput,
   headers,
   shouldThrowError,
-  methodType
+  methodType,
+  generateId: generateId3
 }) {
   const v5 = new AISDKV5InputStream({
     component: "LLM",
-    name: model.modelId
+    name: model.modelId,
+    generateId: generateId3
   });
   const toolsAndToolChoice = prepareToolsAndToolChoice({
     tools,
@@ -6952,6 +6996,7 @@ function createLLMExecutionStep({
                 structuredOutput,
                 headers,
                 methodType,
+                generateId: _internal?.generateId,
                 onResult: ({
                   warnings: warningsFromStream,
                   request: requestFromStream,
@@ -7767,6 +7812,31 @@ function workflowLoopStream({
         requestContext
       });
       if (executionResult.status !== "success") {
+        if (executionResult.status === "failed") {
+          let executionResultError = executionResult.error;
+          if (typeof executionResult.error === "string") {
+            const prependedErrorString = "Error: ";
+            if (executionResult.error.startsWith(`${prependedErrorString}${prependedErrorString}`)) {
+              executionResultError = executionResult.error.substring(
+                `${prependedErrorString}${prependedErrorString}`.length
+              );
+            } else if (executionResult.error.startsWith(prependedErrorString)) {
+              executionResultError = executionResult.error.substring(prependedErrorString.length);
+            }
+          }
+          const error = getErrorFromUnknown(executionResultError, {
+            fallbackMessage: "Unknown error in agent workflow stream"
+          });
+          controller.enqueue({
+            type: "error",
+            runId,
+            from: "AGENT" /* AGENT */,
+            payload: { error }
+          });
+          if (rest.options?.onError) {
+            await rest.options?.onError?.({ error });
+          }
+        }
         controller.close();
         return;
       }
@@ -8015,6 +8085,7 @@ var MastraLLMVNext = class extends MastraBase {
     resourceId,
     structuredOutput,
     options,
+    inputProcessors,
     outputProcessors,
     returnScorerData,
     providerOptions,
@@ -8078,6 +8149,7 @@ var MastraLLMVNext = class extends MastraBase {
         providerOptions,
         _internal,
         structuredOutput,
+        inputProcessors,
         outputProcessors,
         returnScorerData,
         modelSpanTracker,
@@ -8148,7 +8220,9 @@ var MastraLLMVNext = class extends MastraBase {
                   totalTokens: props?.totalUsage?.totalTokens,
                   reasoningTokens: props?.totalUsage?.reasoningTokens,
                   cachedInputTokens: props?.totalUsage?.cachedInputTokens
-                }
+                },
+                responseId: props?.response.id,
+                responseModel: props?.response.modelId
               }
             });
             try {
@@ -9506,6 +9580,7 @@ var AgentLegacyHandler = class {
           },
           attributes: {
             agentId: this.capabilities.id,
+            agentName: this.capabilities.name,
             instructions: this.capabilities.convertInstructionsToString(instructions),
             availableTools: [
               ...toolsets ? Object.keys(toolsets) : [],
@@ -12073,7 +12148,7 @@ var BatchPartsProcessor = class {
       const combinedText = textChunks.map((part) => part.type === "text-delta" ? part.payload.text : "").join("");
       const combinedChunk = {
         type: "text-delta",
-        payload: { text: combinedText, id: "1" },
+        payload: { text: combinedText, id: "text-1" },
         runId: "1",
         from: "AGENT" /* AGENT */
       };
@@ -12760,6 +12835,9 @@ var isAugmentedSymbol = Symbol("isAugmented");
 function augmentWithInit(storage) {
   let hasInitialized = null;
   const ensureInit = async () => {
+    if (storage.disableInit) {
+      return;
+    }
     if (!hasInitialized) {
       hasInitialized = storage.init();
     }
@@ -14063,6 +14141,9 @@ function createMapResultsStep({
       const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
       effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
+    const effectiveInputProcessors = options.inputProcessors || (capabilities.inputProcessors ? typeof capabilities.inputProcessors === "function" ? await capabilities.inputProcessors({
+      requestContext: result.requestContext
+    }) : capabilities.inputProcessors : []);
     const messageList = memoryData.messageList;
     const modelMethodType = getModelMethodFromAgentMethod(methodType);
     const loopOptions = {
@@ -14129,6 +14210,7 @@ function createMapResultsStep({
         abortSignal: options.abortSignal
       },
       structuredOutput: options.structuredOutput,
+      inputProcessors: effectiveInputProcessors,
       outputProcessors: effectiveOutputProcessors,
       modelSettings: {
         temperature: 0,
@@ -14275,7 +14357,7 @@ function createPrepareMemoryStep({
           title: thread.title,
           memoryConfig,
           resourceId,
-          saveThread: false
+          saveThread: true
         });
       }
       requestContext.set("MastraMemory", {
@@ -15774,10 +15856,10 @@ var Agent = class extends MastraBase {
           subAgentThreadId: z.string().describe("The thread ID of the agent").optional(),
           subAgentResourceId: z.string().describe("The resource ID of the agent").optional()
         });
-        const modelVersion = (await agent.getModel()).specificationVersion;
+        const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
         const toolObj = createTool({
           id: `agent-${agentName}`,
-          description: `Agent: ${agentName}`,
+          description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
           outputSchema: agentOutputSchema,
           mastra: this.#mastra,
@@ -15959,16 +16041,25 @@ var Agent = class extends MastraBase {
                 threadId,
                 resourceId
               });
-              const run = await workflow.createRun();
+              const run = await workflow.createRun({ runId });
               const { initialState, inputData: workflowInputData } = inputData;
+              const { resumeData, suspend } = context?.agent ?? {};
               let result = void 0;
               if (methodType === "generate" || methodType === "generateLegacy") {
-                result = await run.start({
-                  inputData: workflowInputData,
-                  requestContext,
-                  tracingContext: context?.tracingContext,
-                  ...initialState && { initialState }
-                });
+                if (resumeData) {
+                  result = await run.resume({
+                    resumeData,
+                    requestContext,
+                    tracingContext: context?.tracingContext
+                  });
+                } else {
+                  result = await run.start({
+                    inputData: workflowInputData,
+                    requestContext,
+                    tracingContext: context?.tracingContext,
+                    ...initialState && { initialState }
+                  });
+                }
               } else if (methodType === "streamLegacy") {
                 const streamResult = run.streamLegacy({
                   inputData: workflowInputData,
@@ -15983,7 +16074,11 @@ var Agent = class extends MastraBase {
                 }
                 result = await streamResult.getWorkflowState();
               } else if (methodType === "stream") {
-                const streamResult = run.stream({
+                const streamResult = resumeData ? run.resumeStream({
+                  resumeData,
+                  requestContext,
+                  tracingContext: context?.tracingContext
+                }) : run.stream({
                   inputData: workflowInputData,
                   requestContext,
                   tracingContext: context?.tracingContext,
@@ -16004,10 +16099,12 @@ var Agent = class extends MastraBase {
                   runId: run.runId
                 };
               } else if (result?.status === "suspended") {
-                return {
-                  error: `Workflow ended with status: "suspended". This is not currently handled in the basic agent workflow tool transformation. To achieve this you'll need to write your own tool that uses a workflow internally.`,
-                  runId: run.runId
-                };
+                const suspendedStep = result?.suspended?.[0]?.[0];
+                const suspendPayload = result?.steps?.[suspendedStep]?.suspendPayload;
+                if (suspendPayload?.__workflow_meta) {
+                  delete suspendPayload.__workflow_meta;
+                }
+                return suspend?.(suspendPayload);
               } else {
                 return {
                   error: `Workflow should never reach this path, workflow returned no status`,
@@ -16423,6 +16520,8 @@ var Agent = class extends MastraBase {
       input: options.messages,
       attributes: {
         agentId: this.id,
+        agentName: this.name,
+        conversationId: threadFromArgs?.id,
         instructions: this.#convertInstructionsToString(instructions)
       },
       metadata: {
@@ -16456,6 +16555,7 @@ var Agent = class extends MastraBase {
       getMemoryMessages: this.getMemoryMessages.bind(this),
       runInputProcessors: this.__runInputProcessors.bind(this),
       executeOnFinish: this.#executeOnFinish.bind(this),
+      inputProcessors: async ({ requestContext: requestContext2 }) => this.listResolvedInputProcessors(requestContext2),
       outputProcessors: async ({ requestContext: requestContext2 }) => this.listResolvedOutputProcessors(requestContext2),
       llm
     };
@@ -18730,6 +18830,6 @@ var MastraModelOutput = class extends MastraBase {
   }
 };
 
-export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageHistory, MockMemory, ModerationProcessor, PIIDetector, ProcessorRunner, ProcessorState, PromptInjectionDetector, Run, SemanticRecall, StructuredOutputProcessor, SystemPromptScrubber, TokenLimiterProcessor, ToolCallFilter, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, loop, mapVariable, memoryDefaultOptions, parseMemoryRuntimeContext, resolveThreadIdFromArgs, runCountDeprecationMessage, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepSuspendData };
-//# sourceMappingURL=chunk-45NA5ZD3.js.map
-//# sourceMappingURL=chunk-45NA5ZD3.js.map
+export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageHistory, MockMemory, ModerationProcessor, PIIDetector, ProcessorRunner, ProcessorState, PromptInjectionDetector, Run, SemanticRecall, StructuredOutputProcessor, SystemPromptScrubber, TokenLimiterProcessor, ToolCallFilter, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, loop, mapVariable, memoryDefaultOptions, parseMemoryRuntimeContext, resolveThreadIdFromArgs, runCountDeprecationMessage, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepStateData, validateStepSuspendData };
+//# sourceMappingURL=chunk-EDNHZZUP.js.map
+//# sourceMappingURL=chunk-EDNHZZUP.js.map