@mastra/core 1.0.0-beta.14 → 1.0.0-beta.16

package/dist/{chunk-QF4MHFSU.js → chunk-F7PAZAGE.js}

@@ -1,18 +1,18 @@
-import { DefaultVoice } from './chunk-GELVUDUY.js';
+import { DefaultVoice } from './chunk-O7M7DR4E.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-6PMMP3FR.js';
-import { InMemoryStore } from './chunk-GBQXIVL6.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-4AT6YQKZ.js';
+import { InMemoryStore } from './chunk-GNUITL2N.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-QXL3F3T2.js';
 import { createTextStreamResponse, createUIMessageStreamResponse, createUIMessageStream, parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-2SQB3WBT.js';
 import { generateId, asSchema, jsonSchema, APICallError, tool } from './chunk-G6E6V2Z4.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-QDVYP2T7.js';
-import { MastraLLMV1 } from './chunk-4CMIJQF6.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-4N6WB4EZ.js';
+import { MastraLLMV1 } from './chunk-KKYAYRIO.js';
 import { PubSub } from './chunk-BVUMKER5.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, deepMerge, selectFields, delay } from './chunk-LDXKZYOV.js';
-import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-Y36Y5MTD.js';
-import { MastraError, getErrorFromUnknown } from './chunk-YPLZDWG7.js';
+import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, deepMerge, selectFields, delay } from './chunk-FB5QMTJJ.js';
+import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-JQM64OZF.js';
+import { MastraError, getErrorFromUnknown } from './chunk-FJEVLHJT.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
-import { Tool, createTool } from './chunk-373OC54J.js';
+import { Tool, createTool } from './chunk-QD776HMB.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-6TBWJV35.js';
 import { zodToJsonSchema as zodToJsonSchema$1 } from './chunk-PJKCPRYF.js';
 import { MastraBase } from './chunk-LSHPJWM5.js';
@@ -501,7 +501,8 @@ function prepareToolsAndToolChoice({
 // src/stream/aisdk/v5/compat/consume-stream.ts
 async function consumeStream({
   stream,
-  onError
+  onError,
+  logger
 }) {
   const reader = stream.getReader();
   try {
@@ -510,7 +511,7 @@ async function consumeStream({
       if (done) break;
     }
   } catch (error) {
-    console.error("consumeStream error", error);
+    logger?.error("consumeStream error", error);
     onError?.(error);
   } finally {
     reader.releaseLock();
@@ -529,6 +530,7 @@ var StructuredOutputProcessor = class {
   isStructuringAgentStreamStarted = false;
   jsonPromptInjection;
   providerOptions;
+  logger;
   constructor(options) {
     if (!options.schema) {
       throw new MastraError({
@@ -551,6 +553,7 @@ var StructuredOutputProcessor = class {
     this.fallbackValue = options.fallbackValue;
     this.jsonPromptInjection = options.jsonPromptInjection;
     this.providerOptions = options.providerOptions;
+    this.logger = options.logger;
     this.structuringAgent = new Agent({
       id: "structured-output-structurer",
       name: "structured-output-structurer",
@@ -716,14 +719,14 @@ The input text may be in any format (sentences, bullet points, paragraphs, etc.)
     const message = `[StructuredOutputProcessor] ${context}: ${error}`;
     switch (this.errorStrategy) {
       case "strict":
-        console.error(message);
+        this.logger?.error(message);
         abort(message);
         break;
       case "warn":
-        console.warn(message);
+        this.logger?.warn(message);
         break;
       case "fallback":
-        console.info(`${message} (using fallback)`);
+        this.logger?.info(`${message} (using fallback)`);
         break;
     }
   }
@@ -805,8 +808,9 @@ var ProcessorState = class {
     this.span = parentSpan?.createChildSpan({
       type: "processor_run" /* PROCESSOR_RUN */,
       name: `output processor: ${processorName}`,
+      entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+      entityName: processorName,
       attributes: {
-        processorName,
         processorType: "output",
         processorIndex: processorIndex ?? 0
       },
@@ -905,8 +909,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan2?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `output processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "output",
             processorIndex: index
           },
@@ -947,8 +953,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `output processor: ${processor.id}`,
+        entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "output",
           processorIndex: index
         },
@@ -1183,8 +1191,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan2?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `input processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "input_processor" /* INPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "input",
             processorIndex: index
           },
@@ -1227,8 +1237,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `input processor: ${processor.id}`,
+        entityType: "input_processor" /* INPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "input",
           processorIndex: index
         },
@@ -1351,8 +1363,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `input step processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "input_processor" /* INPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "input",
             processorIndex: index
           },
@@ -1411,8 +1425,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = currentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `input step processor: ${processor.id}`,
+        entityType: "input_processor" /* INPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "input",
           processorIndex: index
         },
@@ -1505,6 +1521,7 @@ var ProcessorRunner = class _ProcessorRunner {
    */
   async runProcessOutputStep(args) {
     const {
+      steps,
       messageList,
       stepNumber,
       finishReason,
@@ -1524,8 +1541,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan2?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `output step processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "output",
             processorIndex: index
           },
@@ -1544,6 +1563,7 @@ var ProcessorRunner = class _ProcessorRunner {
               toolCalls,
               text,
               systemMessages: currentSystemMessages2,
+              steps,
               retryCount
             },
             tracingContext,
@@ -1572,8 +1592,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `output step processor: ${processor.id}`,
+        entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "output",
           processorIndex: index
         },
@@ -1590,6 +1612,7 @@ var ProcessorRunner = class _ProcessorRunner {
           toolCalls,
           text,
           systemMessages: currentSystemMessages,
+          steps,
           abort,
           tracingContext: { currentSpan: processorSpan },
           requestContext,
@@ -1904,7 +1927,7 @@ function convertFullStreamChunkToMastra(value, ctx) {
         from: "AGENT" /* AGENT */,
         payload: {
           stepResult: {
-            reason: value.finishReason
+            reason: normalizeFinishReason(value.finishReason)
           },
           output: {
             // Normalize usage to handle both V2 (flat) and V3 (nested) formats
@@ -2172,6 +2195,21 @@ function normalizeUsage(usage) {
     raw: usage
   };
 }
+function isV3FinishReason(finishReason) {
+  return typeof finishReason === "object" && finishReason !== null && "unified" in finishReason;
+}
+function normalizeFinishReason(finishReason) {
+  if (!finishReason) {
+    return "other";
+  }
+  if (finishReason === "tripwire" || finishReason === "retry") {
+    return finishReason;
+  }
+  if (isV3FinishReason(finishReason)) {
+    return finishReason.unified;
+  }
+  return finishReason === "unknown" ? "other" : finishReason;
+}
 
 // src/stream/aisdk/v5/output.ts
 var AISDKV5OutputStream = class {
@@ -2421,7 +2459,6 @@ var AISDKV5OutputStream = class {
   async getFullOutput() {
     await this.consumeStream({
       onError: (error) => {
-        console.error(error);
         throw error;
       }
     });
@@ -3838,7 +3875,8 @@ var MastraModelOutput = class extends MastraBase {
     try {
       await consumeStream({
         stream: this.#baseStream,
-        onError: options?.onError
+        onError: options?.onError,
+        logger: this.logger
       });
     } catch (error) {
       options?.onError?.(error);
@@ -3850,7 +3888,7 @@ var MastraModelOutput = class extends MastraBase {
   async getFullOutput() {
     await this.consumeStream({
       onError: (error) => {
-        console.error(error);
+        this.logger.error("Error consuming stream", error);
         throw error;
       }
     });
@@ -4344,6 +4382,8 @@ var WorkflowRunOutput = class {
             } else {
               self.#status = "failed";
             }
+          } else if (chunk.type === "workflow-paused") {
+            self.#status = "paused";
           }
         },
         close() {
@@ -4479,6 +4519,8 @@ var WorkflowRunOutput = class {
             } else {
               self.#status = "failed";
             }
+          } else if (chunk.type === "workflow-paused") {
+            self.#status = "paused";
           }
         },
         close() {
@@ -5203,7 +5245,7 @@ var getStepIds = (entry) => {
   return [];
 };
 var createTimeTravelExecutionParams = (params) => {
-  const { steps, inputData, resumeData, context, nestedStepsContext, snapshot, initialState, graph } = params;
+  const { steps, inputData, resumeData, context, nestedStepsContext, snapshot, initialState, graph, perStep } = params;
   const firstStepId = steps[0];
   let executionPath = [];
   const stepResults = {};
@@ -5270,7 +5312,8 @@ var createTimeTravelExecutionParams = (params) => {
         suspendedAt: stepContext?.suspendedAt,
         resumedAt: stepContext?.resumedAt
       };
-      if (currentExecPathLength > 0 && (!snapshotContext[stepId] || snapshotContext[stepId] && snapshotContext[stepId].status !== "suspended")) {
+      const execPathLengthToUse = perStep ? executionPath.length : currentExecPathLength;
+      if (execPathLengthToUse > 0 && !steps?.includes(stepId) && !context?.[stepId] && (!snapshotContext[stepId] || snapshotContext[stepId] && snapshotContext[stepId].status !== "suspended")) {
         result = void 0;
       }
       if (result) {
@@ -5325,7 +5368,8 @@ async function executeParallel(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const parallelSpan = tracingContext.currentSpan?.createChildSpan({
     type: "workflow_parallel" /* WORKFLOW_PARALLEL */,
@@ -5347,7 +5391,7 @@ async function executeParallel(engine, params) {
       makeStepRunning = timeTravel.steps[0] === step.step.id;
     }
     if (!makeStepRunning) {
-      continue;
+      break;
     }
     const startTime = resume?.steps[0] === step.step.id ? void 0 : Date.now();
     const resumeTime = resume?.steps[0] === step.step.id ? Date.now() : void 0;
@@ -5359,6 +5403,9 @@ async function executeParallel(engine, params) {
       ...resumeTime ? { resumedAt: resumeTime } : {}
     };
     executionContext.activeStepsPath[step.step.id] = [...executionContext.executionPath, stepIndex];
+    if (perStep) {
+      break;
+    }
   }
   if (timeTravel && timeTravel.executionPath.length > 0) {
     timeTravel.executionPath.shift();
@@ -5370,6 +5417,9 @@ async function executeParallel(engine, params) {
       if (currStepResult && currStepResult.status !== "running") {
         return currStepResult;
       }
+      if (!currStepResult && (perStep || timeTravel)) {
+        return {};
+      }
       const stepExecResult = await engine.executeStep({
         workflowId,
         runId,
@@ -5398,7 +5448,8 @@ async function executeParallel(engine, params) {
         abortController,
         requestContext,
         outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
       Object.assign(stepResults, stepExecResult.stepResults);
@@ -5459,7 +5510,8 @@ async function executeConditional(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const conditionalSpan = tracingContext.currentSpan?.createChildSpan({
     type: "workflow_conditional" /* WORKFLOW_CONDITIONAL */,
@@ -5554,7 +5606,18 @@ async function executeConditional(engine, params) {
       }
     })
   )).filter((index) => index !== null);
-  const stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
+  let stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
+  if (perStep || timeTravel && timeTravel.executionPath.length > 0) {
+    const possibleStepsToRun = stepsToRun.filter((s) => {
+      const currStepResult = stepResults[s.step.id];
+      if (timeTravel && timeTravel.executionPath.length > 0) {
+        return timeTravel.steps[0] === s.step.id;
+      }
+      return !currStepResult;
+    });
+    const possibleStepToRun = possibleStepsToRun?.[0];
+    stepsToRun = possibleStepToRun ? [possibleStepToRun] : stepsToRun;
+  }
   conditionalSpan?.update({
     attributes: {
       truthyIndexes,
@@ -5601,7 +5664,8 @@ async function executeConditional(engine, params) {
         abortController,
         requestContext,
         outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
       Object.assign(stepResults, stepExecResult.stepResults);
@@ -5663,7 +5727,8 @@ async function executeLoop(engine, params) {
     requestContext,
     outputWriter,
     disableScorers,
-    serializedStepGraph
+    serializedStepGraph,
+    perStep
   } = params;
   const { step, condition } = entry;
   const loopSpan = tracingContext.currentSpan?.createChildSpan({
@@ -5704,7 +5769,8 @@ async function executeLoop(engine, params) {
       outputWriter,
       disableScorers,
       serializedStepGraph,
-      iterationCount: iteration + 1
+      iterationCount: iteration + 1,
+      perStep
     });
     engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
     Object.assign(stepResults, stepExecResult.stepResults);
@@ -5804,7 +5870,8 @@ async function executeForeach(engine, params) {
     requestContext,
     outputWriter,
     disableScorers,
-    serializedStepGraph
+    serializedStepGraph,
+    perStep
   } = params;
   const { step, opts } = entry;
   const results = [];
@@ -5881,7 +5948,8 @@ async function executeForeach(engine, params) {
           skipEmits: true,
           outputWriter,
           disableScorers,
-          serializedStepGraph
+          serializedStepGraph,
+          perStep
         });
         engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
         Object.assign(stepResults, stepExecResult.stepResults);
@@ -6023,7 +6091,8 @@ async function persistStepUpdate(engine, params) {
     requestContext.forEach((value, key) => {
       requestContextObj[key] = value;
     });
-    await engine.mastra?.getStorage()?.persistWorkflowSnapshot({
+    const workflowsStore = await engine.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: workflowId,
       runId,
       resourceId,
@@ -6065,7 +6134,8 @@ async function executeEntry(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const prevOutput = engine.getStepOutput(stepResults, prevStep);
   let execResults;
@@ -6089,7 +6159,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
     execResults = stepExecResult.result;
     engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
@@ -6121,7 +6192,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
     engine.applyMutableContext(executionContext, resumedStepResult.mutableContext);
     Object.assign(stepResults, resumedStepResult.stepResults);
@@ -6191,7 +6263,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
   } else if (entry.type === "conditional") {
     execResults = await engine.executeConditional({
@@ -6210,7 +6283,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
   } else if (entry.type === "loop") {
     execResults = await engine.executeLoop({
@@ -6230,7 +6304,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
   } else if (entry.type === "foreach") {
     execResults = await engine.executeForeach({
@@ -6250,7 +6325,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
   } else if (entry.type === "sleep") {
     const startedAt = Date.now();
@@ -6662,7 +6738,8 @@ async function executeStep(engine, params) {
     disableScorers,
     serializedStepGraph,
     tracingContext,
-    iterationCount
+    iterationCount,
+    perStep
   } = params;
   const stepCallId = randomUUID();
   const { inputData, validationError } = await validateStepInput({
@@ -6704,10 +6781,9 @@ async function executeStep(engine, params) {
   const stepSpan = tracingContext.currentSpan?.createChildSpan({
     name: `workflow step: '${step.id}'`,
     type: "workflow_step" /* WORKFLOW_STEP */,
+    entityType: "workflow_step" /* WORKFLOW_STEP */,
+    entityId: step.id,
     input: inputData,
-    attributes: {
-      stepId: step.id
-    },
     tracingPolicy: engine.options?.tracingPolicy
   });
   const operationId = `workflow.${workflowId}.run.${runId}.step.${step.id}.running_ev`;
@@ -6749,7 +6825,8 @@ async function executeStep(engine, params) {
       requestContext,
       tracingContext,
       outputWriter,
-      stepSpan
+      stepSpan,
+      perStep
     });
     if (workflowResult !== null) {
       const stepResult2 = { ...stepInfo, ...workflowResult };
@@ -6881,12 +6958,15 @@ async function executeStep(engine, params) {
         outputWriter,
         // Disable scorers must be explicitly set to false they are on by default
         scorers: disableScorers === false ? void 0 : step.scorers,
-        validateInputs: engine.options?.validateInputs
+        validateInputs: engine.options?.validateInputs,
+        perStep
       });
       if (engine.requiresDurableContextSerialization()) {
         contextMutations.requestContextUpdate = engine.serializeRequestContext(requestContext);
       }
-      return { output, suspended, bailed, contextMutations };
+      const isNestedWorkflowStep = step.component === "WORKFLOW";
+      const nestedWflowStepPaused = isNestedWorkflowStep && perStep;
+      return { output, suspended, bailed, contextMutations, nestedWflowStepPaused };
     },
     { retries, delay: delay2, stepSpan, workflowId, runId }
   );
@@ -6925,6 +7005,8 @@ async function executeStep(engine, params) {
       };
     } else if (durableResult.bailed) {
       execResults = { status: "bailed", output: durableResult.bailed.payload, endedAt: Date.now() };
+    } else if (durableResult.nestedWflowStepPaused) {
+      execResults = { status: "paused" };
     } else {
       execResults = { status: "success", output: durableResult.output, endedAt: Date.now() };
     }
@@ -7348,7 +7430,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       workflowSpan,
       disableScorers,
       restart,
-      timeTravel
+      timeTravel,
+      perStep
     } = params;
     const { attempts = 0, delay: delay2 = 0 } = retryConfig ?? {};
     const steps = graph.steps;
@@ -7412,7 +7495,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         pubsub: params.pubsub,
         requestContext: currentRequestContext,
         outputWriter: params.outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       this.applyMutableContext(executionContext, lastOutput.mutableContext);
       lastState = lastOutput.mutableContext.state;
@@ -7451,13 +7535,47 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             }
           });
         }
-        await this.invokeLifecycleCallbacks(result2);
+        if (lastOutput.result.status !== "paused") {
+          await this.invokeLifecycleCallbacks(result2);
+        }
+        if (lastOutput.result.status === "paused") {
+          await params.pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: { type: "workflow-paused", payload: {} }
+          });
+        }
         return {
           ...result2,
           ...lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels ? { resumeLabels: lastOutput.mutableContext.resumeLabels } : {},
           ...params.outputOptions?.includeState ? { state: lastState } : {}
         };
       }
+      if (perStep) {
+        const result2 = await this.fmtReturnValue(params.pubsub, stepResults, lastOutput.result);
+        await this.persistStepUpdate({
+          workflowId,
+          runId,
+          resourceId,
+          stepResults: lastOutput.stepResults,
+          serializedStepGraph: params.serializedStepGraph,
+          executionContext: lastExecutionContext,
+          workflowStatus: "paused",
+          requestContext: currentRequestContext
+        });
+        await params.pubsub.publish(`workflow.events.v2.${runId}`, {
+          type: "watch",
+          runId,
+          data: { type: "workflow-paused", payload: {} }
+        });
+        workflowSpan?.end({
+          attributes: {
+            status: "paused"
+          }
+        });
+        delete result2.result;
+        return { ...result2, status: "paused", ...params.outputOptions?.includeState ? { state: lastState } : {} };
+      }
     }
     const result = await this.fmtReturnValue(params.pubsub, stepResults, lastOutput.result);
     await this.persistStepUpdate({
@@ -7989,7 +8107,8 @@ function createStep(params, agentOptions) {
                 finishReason,
                 toolCalls,
                 text,
-                systemMessages: systemMessages ?? []
+                systemMessages: systemMessages ?? [],
+                steps: steps ?? []
               });
               const applyMessages = (msgs) => {
                 const deletedIds = idsBeforeProcessing.filter((i) => !msgs.some((m) => m.id === i));
@@ -8255,8 +8374,8 @@ var Workflow = class extends MastraBase {
     if (typeof mappingConfig === "function") {
       const mappingStep2 = createStep({
         id: stepOptions?.id || `mapping_${this.#mastra?.generateId() || randomUUID()}`,
-        inputSchema: z.object({}),
-        outputSchema: z.object({}),
+        inputSchema: z.any(),
+        outputSchema: z.any(),
         execute: mappingConfig
       });
       this.stepFlow.push({ type: "step", step: mappingStep2 });
@@ -8312,7 +8431,15 @@ var Workflow = class extends MastraBase {
             result[key] = requestContext.get(m.requestContextPath);
             continue;
           }
-          const stepResult = m.initData ? getInitData() : getStepResult2(Array.isArray(m.step) ? m.step.find((s) => getStepResult2(s)) : m.step);
+          const stepResult = m.initData ? getInitData() : getStepResult2(
+            Array.isArray(m.step) ? m.step.find((s) => {
+              const result2 = getStepResult2(s);
+              if (typeof result2 === "object" && result2 !== null) {
+                return Object.keys(result2).length > 0;
+              }
+              return result2;
+            }) : m.step
+          );
           if (m.path === ".") {
             result[key] = stepResult;
             continue;
@@ -8530,7 +8657,8 @@ var Workflow = class extends MastraBase {
       run.workflowRunStatus = workflowSnapshotInStorage.status;
     }
     if (!workflowSnapshotInStorage && shouldPersistSnapshot) {
-      await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+      const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+      await workflowsStore?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
         resourceId: options?.resourceId,
@@ -8595,7 +8723,8 @@ var Workflow = class extends MastraBase {
     retryCount,
     tracingContext,
     outputWriter,
-    validateInputs
+    validateInputs,
+    perStep
   }) {
     this.__registerMastra(mastra);
     const effectiveValidateInputs = validateInputs ?? this.#options.validateInputs ?? true;
@@ -8643,7 +8772,8 @@ var Workflow = class extends MastraBase {
         requestContext,
         tracingContext,
         outputWriter,
-        outputOptions: { includeState: true, includeResumeLabels: true }
+        outputOptions: { includeState: true, includeResumeLabels: true },
+        perStep
       });
     } else if (restart) {
       res = await run.restart({ requestContext, tracingContext, outputWriter });
@@ -8655,7 +8785,8 @@ var Workflow = class extends MastraBase {
         tracingContext,
         outputWriter,
         outputOptions: { includeState: true, includeResumeLabels: true },
-        label: resume.label
+        label: resume.label,
+        perStep
       });
     } else {
       res = await run.start({
@@ -8664,7 +8795,8 @@ var Workflow = class extends MastraBase {
         tracingContext,
         outputWriter,
         initialState: state,
-        outputOptions: { includeState: true, includeResumeLabels: true }
+        outputOptions: { includeState: true, includeResumeLabels: true },
+        perStep
       });
     }
     unwatch();
@@ -8700,7 +8832,12 @@ var Workflow = class extends MastraBase {
       this.logger.debug("Cannot get workflow runs. Mastra storage is not initialized");
       return { runs: [], total: 0 };
     }
-    return storage.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow runs. Workflows storage domain is not available");
+      return { runs: [], total: 0 };
+    }
+    return workflowsStore.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
   }
   async listActiveWorkflowRuns() {
     const runningRuns = await this.listWorkflowRuns({ status: "running" });
@@ -8737,7 +8874,12 @@ var Workflow = class extends MastraBase {
       this.logger.debug("Cannot get workflow runs from storage. Mastra storage is not initialized");
       return this.#runs.get(runId) ? { ...this.#runs.get(runId), workflowName: this.id } : null;
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow runs. Workflows storage domain is not available");
+      return this.#runs.get(runId) ? { ...this.#runs.get(runId), workflowName: this.id } : null;
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: this.id });
     return run ?? (this.#runs.get(runId) ? { ...this.#runs.get(runId), workflowName: this.id } : null);
   }
   async deleteWorkflowRunById(runId) {
@@ -8746,7 +8888,12 @@ var Workflow = class extends MastraBase {
       this.logger.debug("Cannot delete workflow run by ID. Mastra storage is not initialized");
       return;
     }
-    await storage.deleteWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot delete workflow run. Workflows storage domain is not available");
+      return;
+    }
+    await workflowsStore.deleteWorkflowRunById({ runId, workflowName: this.id });
     this.#runs.delete(runId);
   }
   async getWorkflowRunSteps({ runId, workflowId }) {
@@ -8755,7 +8902,12 @@ var Workflow = class extends MastraBase {
       this.logger.debug("Cannot get workflow run steps. Mastra storage is not initialized");
       return {};
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: workflowId });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow run steps. Workflows storage domain is not available");
+      return {};
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: workflowId });
     let snapshot = run?.snapshot;
     if (!snapshot) {
       return {};
@@ -8797,7 +8949,12 @@ var Workflow = class extends MastraBase {
       this.logger.debug("Cannot get workflow run execution result. Mastra storage is not initialized");
       return null;
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow run execution result. Workflows storage domain is not available");
+      return null;
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: this.id });
     let snapshot = run?.snapshot;
     if (!snapshot) {
       return null;
@@ -8956,7 +9113,8 @@ var Run = class {
     this.abortController.abort();
     this.workflowRunStatus = "canceled";
     try {
-      await this.mastra?.getStorage()?.updateWorkflowState({
+      const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+      await workflowsStore?.updateWorkflowState({
         workflowName: this.workflowId,
         runId: this.runId,
         opts: {
@@ -9034,15 +9192,15 @@ var Run = class {
     tracingContext,
     tracingOptions,
     format,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     const workflowSpan = getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       input: inputData,
-      attributes: {
-        workflowId: this.workflowId
-      },
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9072,7 +9230,8 @@ var Run = class {
       outputWriter,
       workflowSpan,
       format,
-      outputOptions
+      outputOptions,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -9097,7 +9256,7 @@ var Run = class {
    */
   async startAsync(args) {
     this._start(args).catch((err) => {
-      console.error(`[Workflow ${this.workflowId}] Background execution failed:`, err);
+      this.mastra?.getLogger()?.error(`[Workflow ${this.workflowId}] Background execution failed:`, err);
     });
     return { runId: this.runId };
   }
@@ -9146,7 +9305,7 @@ var Run = class {
       try {
         await writer.close();
       } catch (err) {
-        console.error("Error closing stream:", err);
+        this.mastra?.getLogger()?.error("Error closing stream:", err);
       } finally {
         writer.releaseLock();
       }
@@ -9204,7 +9363,7 @@ var Run = class {
       try {
         await writer.close();
       } catch (err) {
-        console.error("Error closing stream:", err);
+        this.mastra?.getLogger()?.error("Error closing stream:", err);
       } finally {
         writer.releaseLock();
       }
@@ -9239,9 +9398,10 @@ var Run = class {
   }
   async streamAsync({
     inputData,
-    requestContext
+    requestContext,
+    perStep
   } = {}) {
-    return this.stream({ inputData, requestContext });
+    return this.stream({ inputData, requestContext, perStep });
   }
   /**
    * Starts the workflow execution with the provided input as a stream
@@ -9255,7 +9415,8 @@ var Run = class {
     tracingOptions,
     closeOnSuspend = true,
     initialState,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     if (this.closeStreamAction && this.streamOutput) {
       return this.streamOutput;
@@ -9294,7 +9455,7 @@ var Run = class {
               controller.close();
             }
           } catch (err) {
-            console.error("Error closing stream:", err);
+            self.mastra?.getLogger()?.error("Error closing stream:", err);
           }
         };
         const executionResultsPromise = self._start({
@@ -9310,7 +9471,8 @@ var Run = class {
               runId: self.runId,
               data: chunk
             });
-          }
+          },
+          perStep
         });
         let executionResults;
         try {
@@ -9352,7 +9514,8 @@ var Run = class {
     requestContext,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     return this.resumeStreamVNext({
       resumeData,
@@ -9360,7 +9523,8 @@ var Run = class {
       requestContext,
       tracingContext,
       tracingOptions,
-      outputOptions
+      outputOptions,
+      perStep
     });
   }
   /**
@@ -9375,7 +9539,8 @@ var Run = class {
     tracingContext,
     tracingOptions,
     forEachIndex,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     this.closeStreamAction = async () => {
     };
@@ -9411,7 +9576,7 @@ var Run = class {
               controller.close();
             }
           } catch (err) {
-            console.error("Error closing stream:", err);
+            self.mastra?.getLogger()?.error("Error closing stream:", err);
           }
         };
         const executionResultsPromise = self._resume({
@@ -9425,7 +9590,8 @@ var Run = class {
           },
           isVNext: true,
           forEachIndex,
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -9462,14 +9628,22 @@ var Run = class {
     const nestedWatchCb = (event) => {
       if (event.runId === this.runId) {
         const { event: nestedEvent, workflowId } = event.data;
-        void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
-          type: "watch",
-          runId: this.runId,
-          data: {
-            ...nestedEvent,
-            ...nestedEvent.payload?.id ? { payload: { ...nestedEvent.payload, id: `${workflowId}.${nestedEvent.payload.id}` } } : {}
-          }
-        });
+        if (nestedEvent.type.startsWith("data-") && nestedEvent.data !== void 0) {
+          void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+            type: "watch",
+            runId: this.runId,
+            data: nestedEvent
+          });
+        } else {
+          void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+            type: "watch",
+            runId: this.runId,
+            data: {
+              ...nestedEvent,
+              ...nestedEvent.payload?.id ? { payload: { ...nestedEvent.payload, id: `${workflowId}.${nestedEvent.payload.id}` } } : {}
+            }
+          });
+        }
       }
     };
     void this.pubsub.subscribe(`workflow.events.v2.${this.runId}`, wrappedCb);
@@ -9496,7 +9670,8 @@ var Run = class {
     return this._restart(args);
   }
   async _resume(params) {
-    const snapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -9571,10 +9746,9 @@ var Run = class {
     const workflowSpan = getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       input: resumeDataToUse,
-      attributes: {
-        workflowId: this.workflowId
-      },
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9609,7 +9783,8 @@ var Run = class {
       abortController: this.abortController,
       workflowSpan,
       outputOptions: params.outputOptions,
-      outputWriter: params.outputWriter
+      outputWriter: params.outputWriter,
+      perStep: params.perStep
     }).then((result) => {
       if (!params.isVNext && result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
@@ -9633,7 +9808,8 @@ var Run = class {
     if (this.workflowEngineType !== "default") {
       throw new Error(`restart() is not supported on ${this.workflowEngineType} workflows`);
     }
-    const snapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -9682,9 +9858,8 @@ var Run = class {
     const workflowSpan = getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
-      attributes: {
-        workflowId: this.workflowId
-      },
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9728,12 +9903,14 @@ var Run = class {
     outputWriter,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     if (!stepParam || Array.isArray(stepParam) && stepParam.length === 0) {
       throw new Error("Step is required and must be a valid step or array of steps");
     }
-    const snapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -9763,7 +9940,8 @@ var Run = class {
       nestedStepsContext,
       snapshot,
       initialState,
-      graph: this.executionGraph
+      graph: this.executionGraph,
+      perStep
     });
     const requestContextToUse = requestContext ?? new RequestContext();
     for (const [key, value] of Object.entries(snapshot.requestContext ?? {})) {
@@ -9775,9 +9953,8 @@ var Run = class {
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
-      attributes: {
-        workflowId: this.workflowId
-      },
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9803,7 +9980,8 @@ var Run = class {
       abortController: this.abortController,
       outputWriter,
       workflowSpan,
-      outputOptions
+      outputOptions,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -9824,7 +10002,8 @@ var Run = class {
     requestContext,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     this.closeStreamAction = async () => {
     };
@@ -9849,7 +10028,7 @@ var Run = class {
               controller.close();
             }
           } catch (err) {
-            console.error("Error closing stream:", err);
+            self.mastra?.getLogger()?.error("Error closing stream:", err);
           }
         };
         const executionResultsPromise = self._timeTravel({
@@ -9865,7 +10044,8 @@ var Run = class {
           outputWriter: async (chunk) => {
             void controller.enqueue(chunk);
           },
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -10293,7 +10473,8 @@ async function processOutputStream({
   options,
   controller,
   responseFromModel,
-  includeRawChunks
+  includeRawChunks,
+  logger
 }) {
   for await (const chunk of outputStream._getBaseStream()) {
     if (!chunk) {
@@ -10376,7 +10557,7 @@ async function processOutputStream({
               abortSignal: options?.abortSignal
             });
           } catch (error2) {
-            console.error("Error calling onInputStart", error2);
+            logger?.error("Error calling onInputStart", error2);
           }
         }
         if (isControllerOpen(controller)) {
@@ -10395,7 +10576,7 @@ async function processOutputStream({
               abortSignal: options?.abortSignal
             });
           } catch (error2) {
-            console.error("Error calling onInputDelta", error2);
+            logger?.error("Error calling onInputDelta", error2);
           }
         }
         if (isControllerOpen(controller)) {
@@ -10470,7 +10651,8 @@ async function processOutputStream({
         messageList.add(message, "response");
         runState.setState({
           isReasoning: false,
-          reasoningDeltas: []
+          reasoningDeltas: [],
+          providerOptions: void 0
         });
         if (isControllerOpen(controller)) {
           controller.enqueue(chunk);
@@ -10584,7 +10766,7 @@ async function processOutputStream({
     }
   }
 }
-function executeStreamWithFallbackModels(models) {
+function executeStreamWithFallbackModels(models, logger) {
   return async (callback) => {
     let index = 0;
     let finalResult;
@@ -10604,8 +10786,11 @@ function executeStreamWithFallbackModels(models) {
           done = true;
           break;
         } catch (err) {
+          if (err instanceof TripWire) {
+            throw err;
+          }
           attempt++;
-          console.error(`Error executing model ${modelConfig.model.modelId}, attempt ${attempt}====`, err);
+          logger?.error(`Error executing model ${modelConfig.model.modelId}, attempt ${attempt}====`, err);
           if (attempt > maxRetries) {
             break;
           }
@@ -10615,7 +10800,7 @@ function executeStreamWithFallbackModels(models) {
       }
     }
     if (typeof finalResult === "undefined") {
-      console.error("Exhausted all fallback models and reached the maximum number of retries.");
+      logger?.error("Exhausted all fallback models and reached the maximum number of retries.");
       throw new Error("Exhausted all fallback models and reached the maximum number of retries.");
     }
     return finalResult;
@@ -10656,11 +10841,15 @@ function createLLMExecutionStep({
     inputSchema: llmIterationOutputSchema,
     outputSchema: llmIterationOutputSchema,
     execute: async ({ inputData, bail, tracingContext }) => {
+      modelSpanTracker?.startStep();
       let modelResult;
       let warnings;
       let request;
       let rawResponse;
-      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(models)(async (modelConfig, isLastModel) => {
+      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(
+        models,
+        logger
+      )(async (modelConfig, isLastModel) => {
         const model = modelConfig.model;
         const modelHeaders = modelConfig.headers;
         if (initialSystemMessages) {
@@ -10707,7 +10896,46 @@ function createLLMExecutionStep({
             });
             Object.assign(currentStep, processInputStepResult);
           } catch (error) {
-            console.error("Error in processInputStep processors:", error);
+            if (error instanceof TripWire) {
+              if (isControllerOpen(controller)) {
+                controller.enqueue({
+                  type: "tripwire",
+                  runId,
+                  from: "AGENT" /* AGENT */,
+                  payload: {
+                    reason: error.message,
+                    retry: error.options?.retry,
+                    metadata: error.options?.metadata,
+                    processorId: error.processorId
+                  }
+                });
+              }
+              const runState3 = new AgenticRunState({
+                _internal,
+                model
+              });
+              return {
+                callBail: true,
+                outputStream: new MastraModelOutput({
+                  model: {
+                    modelId: model.modelId,
+                    provider: model.provider,
+                    version: model.specificationVersion
+                  },
+                  stream: new ReadableStream$1({
+                    start(c) {
+                      c.close();
+                    }
+                  }),
+                  messageList,
+                  messageId,
+                  options: { runId }
+                }),
+                runState: runState3,
+                stepTools: tools
+              };
+            }
+            logger?.error("Error in processInputStep processors:", error);
             throw error;
           }
         }
@@ -10740,7 +10968,8 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
                       resumeData can not be an empty object nor null/undefined.
                       When you find that and call that tool, add the resumeData to the tool call arguments/input.
                       Also, add the runId of the suspended tool as suspendedToolRunId to the tool call arguments/input.
-                      If the suspendedTool.type is 'approval', resumeData will be an object that contains 'approved' which can either be true or false depending on the user's message.`;
+                      If the suspendedTool.type is 'approval', resumeData will be an object that contains 'approved' which can either be true or false depending on the user's message. If you can't construct resumeData from the message for approval type, set approved to true and add resumeData: { approved: true } to the tool call arguments/input.
+                      `;
                 }
                 return message;
               });
@@ -10832,10 +11061,11 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
               warnings,
               request,
               rawResponse
-            }
+            },
+            logger
           });
         } catch (error) {
-          console.error("Error in LLM Execution Step", error);
+          logger?.error("Error in LLM Execution Step", error);
           if (isAbortError(error) && options?.abortSignal?.aborted) {
             await options?.onAbort?.({
               steps: inputData?.output?.steps ?? []
@@ -10954,6 +11184,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }));
           const currentRetryCount = inputData.processorRetryCount || 0;
           await processorRunner.runProcessOutputStep({
+            steps: inputData.output?.steps ?? [],
             messages: messageList.get.all.db(),
             messageList,
             stepNumber,
@@ -10968,7 +11199,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           if (error instanceof TripWire) {
             processOutputStepTripwire = error;
           } else {
-            console.error("Error in processOutputStep processors:", error);
+            logger?.error("Error in processOutputStep processors:", error);
             throw error;
           }
         }
@@ -11234,7 +11465,8 @@ function createToolCallStep({
   runId,
   streamState,
   modelSpanTracker,
-  _internal
+  _internal,
+  logger
 }) {
   return createStep({
     id: "toolCallStep",
@@ -11301,7 +11533,7 @@ function createToolCallStep({
             try {
               await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
             } catch (error) {
-              console.error("Error removing tool suspension metadata:", error);
+              logger?.error("Error removing tool suspension metadata:", error);
             }
           }
         }
@@ -11325,7 +11557,7 @@ function createToolCallStep({
           }
           await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
         } catch (error) {
-          console.error("Error flushing messages before suspension:", error);
+          logger?.error("Error flushing messages before suspension:", error);
         }
       };
       if (inputData.providerExecuted) {
@@ -11346,7 +11578,7 @@ function createToolCallStep({
             abortSignal: options?.abortSignal
           });
         } catch (error) {
-          console.error("Error calling onInputAvailable", error);
+          logger?.error("Error calling onInputAvailable", error);
         }
       }
       if (!tool2.execute) {
@@ -11363,7 +11595,17 @@ function createToolCallStep({
         }
         const resumeData = resumeDataFromArgs ?? workflowResumeData;
         const isResumeToolCall = !!resumeDataFromArgs;
-        if (requireToolApproval || tool2.requireApproval) {
+        let toolRequiresApproval = requireToolApproval || tool2.requireApproval;
+        if (tool2.needsApprovalFn) {
+          try {
+            const needsApprovalResult = await tool2.needsApprovalFn(args);
+            toolRequiresApproval = needsApprovalResult;
+          } catch (error) {
+            logger?.error(`Error evaluating needsApprovalFn for tool ${inputData.toolName}:`, error);
+            toolRequiresApproval = true;
+          }
+        }
+        if (toolRequiresApproval) {
           if (!resumeData) {
             controller.enqueue({
               type: "tool-call-approval",
@@ -11464,7 +11706,7 @@ function createToolCallStep({
               abortSignal: options?.abortSignal
             });
           } catch (error) {
-            console.error("Error calling onOutput", error);
+            logger?.error("Error calling onOutput", error);
           }
         }
         return { result, ...inputData };
@@ -11626,11 +11868,10 @@ function createAgenticLoopWorkflow(params) {
     };
     accumulatedSteps.push(currentStep);
     if (rest.stopWhen && typedInputData.stepResult?.isContinued && accumulatedSteps.length > 0) {
+      const steps = accumulatedSteps;
       const conditions = await Promise.all(
         (Array.isArray(rest.stopWhen) ? rest.stopWhen : [rest.stopWhen]).map((condition) => {
-          return condition({
-            steps: accumulatedSteps
-          });
+          return condition({ steps });
         })
       );
       const hasStopped = conditions.some((condition) => condition);
@@ -12076,8 +12317,6 @@ var MastraLLMVNext = class extends MastraBase {
         messages: [...messageList.getSystemMessages(), ...messages]
       },
       attributes: {
-        agentId,
-        agentName,
         model: firstModel.modelId,
         provider: firstModel.provider,
         streaming: true,
@@ -13372,12 +13611,13 @@ var AgentLegacyHandler = class {
         const agentSpan = getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.capabilities.id}'`,
+          entityType: "agent" /* AGENT */,
+          entityId: this.capabilities.id,
+          entityName: this.capabilities.name,
           input: {
             messages
           },
           attributes: {
-            agentId: this.capabilities.id,
-            agentName: this.capabilities.name,
             instructions: this.capabilities.convertInstructionsToString(instructions),
             availableTools: [
               ...toolsets ? Object.keys(toolsets) : [],
@@ -14440,7 +14680,10 @@ function createMapResultsStep({
       requestContext: result.requestContext
     }) : capabilities.outputProcessors : []);
     if (options.structuredOutput?.model) {
-      const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
+      const structuredProcessor = new StructuredOutputProcessor({
+        ...options.structuredOutput,
+        logger: capabilities.logger
+      });
       effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
     const effectiveInputProcessors = options.inputProcessors || (capabilities.inputProcessors ? typeof capabilities.inputProcessors === "function" ? await capabilities.inputProcessors({
@@ -15123,7 +15366,7 @@ var Agent = class extends MastraBase {
   async listResolvedOutputProcessors(requestContext) {
     const configuredProcessors = this.#outputProcessors ? typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new RequestContext() }) : this.#outputProcessors : [];
     const memory = await this.getMemory({ requestContext: requestContext || new RequestContext() });
-    const memoryProcessors = memory ? memory.getOutputProcessors(configuredProcessors, requestContext) : [];
+    const memoryProcessors = memory ? await memory.getOutputProcessors(configuredProcessors, requestContext) : [];
     const allProcessors = [...configuredProcessors, ...memoryProcessors];
     return this.combineProcessorsIntoWorkflow(allProcessors, `${this.id}-output-processor`);
   }
@@ -15135,7 +15378,7 @@ var Agent = class extends MastraBase {
   async listResolvedInputProcessors(requestContext) {
     const configuredProcessors = this.#inputProcessors ? typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new RequestContext() }) : this.#inputProcessors : [];
     const memory = await this.getMemory({ requestContext: requestContext || new RequestContext() });
-    const memoryProcessors = memory ? memory.getInputProcessors(configuredProcessors, requestContext) : [];
+    const memoryProcessors = memory ? await memory.getInputProcessors(configuredProcessors, requestContext) : [];
     const allProcessors = [...memoryProcessors, ...configuredProcessors];
     return this.combineProcessorsIntoWorkflow(allProcessors, `${this.id}-input-processor`);
   }
@@ -16965,10 +17208,11 @@ var Agent = class extends MastraBase {
     const agentSpan = getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
+      entityType: "agent" /* AGENT */,
+      entityId: this.id,
+      entityName: this.name,
       input: options.messages,
       attributes: {
-        agentId: this.id,
-        agentName: this.name,
         conversationId: threadFromArgs?.id,
         instructions: this.#convertInstructionsToString(instructions)
       },
@@ -17391,7 +17635,8 @@ var Agent = class extends MastraBase {
         text: "V1 models are not supported for stream. Please use streamLegacy instead."
       });
     }
-    const existingSnapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const existingSnapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: "agentic-loop",
       runId: streamOptions?.runId ?? ""
     });
@@ -19459,6 +19704,50 @@ var ToolCallFilter = class {
   }
 };
 
+// src/memory/working-memory-utils.ts
+var WORKING_MEMORY_START_TAG = "<working_memory>";
+var WORKING_MEMORY_END_TAG = "</working_memory>";
+function extractWorkingMemoryTags(text) {
+  const results = [];
+  let pos = 0;
+  while (pos < text.length) {
+    const start = text.indexOf(WORKING_MEMORY_START_TAG, pos);
+    if (start === -1) break;
+    const end = text.indexOf(WORKING_MEMORY_END_TAG, start + WORKING_MEMORY_START_TAG.length);
+    if (end === -1) break;
+    results.push(text.substring(start, end + WORKING_MEMORY_END_TAG.length));
+    pos = end + WORKING_MEMORY_END_TAG.length;
+  }
+  return results.length > 0 ? results : null;
+}
+function removeWorkingMemoryTags(text) {
+  let result = "";
+  let pos = 0;
+  while (pos < text.length) {
+    const start = text.indexOf(WORKING_MEMORY_START_TAG, pos);
+    if (start === -1) {
+      result += text.substring(pos);
+      break;
+    }
+    result += text.substring(pos, start);
+    const end = text.indexOf(WORKING_MEMORY_END_TAG, start + WORKING_MEMORY_START_TAG.length);
+    if (end === -1) {
+      result += text.substring(start);
+      break;
+    }
+    pos = end + WORKING_MEMORY_END_TAG.length;
+  }
+  return result;
+}
+function extractWorkingMemoryContent(text) {
+  const start = text.indexOf(WORKING_MEMORY_START_TAG);
+  if (start === -1) return null;
+  const contentStart = start + WORKING_MEMORY_START_TAG.length;
+  const end = text.indexOf(WORKING_MEMORY_END_TAG, contentStart);
+  if (end === -1) return null;
+  return text.substring(contentStart, end);
+}
+
 // src/processors/memory/message-history.ts
 var MessageHistory = class {
   id = "message-history";
@@ -19501,25 +19790,43 @@ var MessageHistory = class {
     }
     return messageList;
   }
-  filterIncompleteToolCalls(messages) {
+  /**
+   * Filters messages before persisting to storage:
+   * 1. Removes incomplete tool calls (state === 'call' or 'partial-call')
+   * 2. Removes updateWorkingMemory tool invocations (hide args from message history)
+   * 3. Strips <working_memory> tags from text content
+   */
+  filterMessagesForPersistence(messages) {
     return messages.map((m) => {
-      if (m.role === `assistant`) {
-        const assistant = {
-          ...m,
-          content: {
-            ...m.content,
-            parts: m.content.parts.map((p) => {
-              if (p.type === `tool-invocation` && (p.toolInvocation.state === `call` || p.toolInvocation.state === `partial-call`)) {
-                return null;
-              }
-              return p;
-            }).filter((p) => Boolean(p))
+      const newMessage = { ...m };
+      if (m.content && typeof m.content === "object" && !Array.isArray(m.content)) {
+        newMessage.content = { ...m.content };
+      }
+      if (typeof newMessage.content?.content === "string" && newMessage.content.content.length > 0) {
+        newMessage.content.content = removeWorkingMemoryTags(newMessage.content.content).trim();
+      }
+      if (Array.isArray(newMessage.content?.parts)) {
+        newMessage.content.parts = newMessage.content.parts.map((p) => {
+          if (p.type === `tool-invocation` && (p.toolInvocation.state === `call` || p.toolInvocation.state === `partial-call`)) {
+            return null;
           }
-        };
-        if (assistant.content.parts.length === 0) return null;
-        return assistant;
+          if (p.type === `tool-invocation` && p.toolInvocation.toolName === `updateWorkingMemory`) {
+            return null;
+          }
+          if (p.type === `text`) {
+            const text = typeof p.text === "string" ? p.text : "";
+            return {
+              ...p,
+              text: removeWorkingMemoryTags(text).trim()
+            };
+          }
+          return p;
+        }).filter((p) => Boolean(p));
+        if (newMessage.content.parts.length === 0) {
+          return null;
+        }
       }
-      return m;
+      return newMessage;
     }).filter((m) => Boolean(m));
   }
   async processOutputResult(args) {
@@ -19536,7 +19843,7 @@ var MessageHistory = class {
     if (messagesToSave.length === 0) {
       return messageList;
     }
-    const filtered = this.filterIncompleteToolCalls(messagesToSave);
+    const filtered = this.filterMessagesForPersistence(messagesToSave);
     await this.storage.saveMessages({ messages: filtered });
     const thread = await this.storage.getThreadById({ threadId });
     if (thread) {
@@ -20150,6 +20457,7 @@ var MastraMemory = class extends MastraBase {
   _storage;
   vector;
   embedder;
+  embedderOptions;
   threadConfig = { ...memoryDefaultOptions };
   #mastra;
   constructor(config) {
@@ -20240,7 +20548,11 @@ https://mastra.ai/en/docs/memory/overview`
     this.vector = vector;
   }
   setEmbedder(embedder) {
-    this.embedder = embedder;
+    if (typeof embedder === "string") {
+      this.embedder = new ModelRouterEmbeddingModel(embedder);
+    } else {
+      this.embedder = embedder;
+    }
   }
   /**
    * Get a system message to inject into the conversation.
@@ -20362,14 +20674,15 @@ https://mastra.ai/en/docs/memory/overview`
    * @param configuredProcessors - Processors already configured by the user (for deduplication)
    * @returns Array of input processors configured for this memory instance
    */
-  getInputProcessors(configuredProcessors = [], context) {
+  async getInputProcessors(configuredProcessors = [], context) {
+    const memoryStore = await this.storage.getStore("memory");
     const processors = [];
     const memoryContext = context?.get("MastraMemory");
     const runtimeMemoryConfig = memoryContext?.memoryConfig;
     const effectiveConfig = runtimeMemoryConfig ? this.getMergedThreadConfig(runtimeMemoryConfig) : this.threadConfig;
     const isWorkingMemoryEnabled = typeof effectiveConfig.workingMemory === "object" && effectiveConfig.workingMemory.enabled !== false;
     if (isWorkingMemoryEnabled) {
-      if (!this.storage?.stores?.memory)
+      if (!memoryStore)
         throw new MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
@@ -20387,7 +20700,7 @@ https://mastra.ai/en/docs/memory/overview`
         }
         processors.push(
           new WorkingMemory({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             template,
             scope: typeof effectiveConfig.workingMemory === "object" ? effectiveConfig.workingMemory.scope : void 0,
             useVNext: typeof effectiveConfig.workingMemory === "object" && "version" in effectiveConfig.workingMemory && effectiveConfig.workingMemory.version === "vnext",
@@ -20398,7 +20711,7 @@ https://mastra.ai/en/docs/memory/overview`
     }
     const lastMessages = effectiveConfig.lastMessages;
     if (lastMessages) {
-      if (!this.storage?.stores?.memory)
+      if (!memoryStore)
         throw new MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
@@ -20409,14 +20722,14 @@ https://mastra.ai/en/docs/memory/overview`
       if (!hasMessageHistory) {
         processors.push(
           new MessageHistory({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             lastMessages: typeof lastMessages === "number" ? lastMessages : void 0
           })
         );
       }
     }
     if (effectiveConfig.semanticRecall) {
-      if (!this.storage?.stores?.memory)
+      if (!memoryStore)
         throw new MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
@@ -20443,7 +20756,7 @@ https://mastra.ai/en/docs/memory/overview`
         const indexName = this.getEmbeddingIndexName();
         processors.push(
           new SemanticRecall({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             vector: this.vector,
             embedder: this.embedder,
             indexName,
@@ -20460,7 +20773,8 @@ https://mastra.ai/en/docs/memory/overview`
    * @param configuredProcessors - Processors already configured by the user (for deduplication)
    * @returns Array of output processors configured for this memory instance
    */
-  getOutputProcessors(configuredProcessors = [], context) {
+  async getOutputProcessors(configuredProcessors = [], context) {
+    const memoryStore = await this.storage.getStore("memory");
     const processors = [];
     const memoryContext = context?.get("MastraMemory");
     const runtimeMemoryConfig = memoryContext?.memoryConfig;
@@ -20469,7 +20783,7 @@ https://mastra.ai/en/docs/memory/overview`
       return [];
     }
     if (effectiveConfig.semanticRecall) {
-      if (!this.storage?.stores?.memory)
+      if (!memoryStore)
         throw new MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
@@ -20496,7 +20810,7 @@ https://mastra.ai/en/docs/memory/overview`
         const indexName = this.getEmbeddingIndexName();
         processors.push(
           new SemanticRecall({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             vector: this.vector,
             embedder: this.embedder,
             indexName,
@@ -20507,7 +20821,7 @@ https://mastra.ai/en/docs/memory/overview`
     }
     const lastMessages = effectiveConfig.lastMessages;
     if (lastMessages) {
-      if (!this.storage?.stores?.memory)
+      if (!memoryStore)
         throw new MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
@@ -20518,7 +20832,7 @@ https://mastra.ai/en/docs/memory/overview`
       if (!hasMessageHistory) {
         processors.push(
           new MessageHistory({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             lastMessages: typeof lastMessages === "number" ? lastMessages : void 0
           })
         );
@@ -20545,22 +20859,39 @@ var MockMemory = class extends MastraMemory {
     });
     this._hasOwnStorage = true;
   }
+  async getMemoryStore() {
+    const store = await this.storage.getStore("memory");
+    if (!store) {
+      throw new MastraError({
+        id: "MASTRA_MEMORY_STORAGE_NOT_AVAILABLE",
+        domain: "MASTRA_MEMORY" /* MASTRA_MEMORY */,
+        category: "SYSTEM" /* SYSTEM */,
+        text: "Memory storage is not supported by this storage adapter"
+      });
+    }
+    return store;
+  }
   async getThreadById({ threadId }) {
-    return this.storage.getThreadById({ threadId });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.getThreadById({ threadId });
   }
   async saveThread({ thread }) {
-    return this.storage.saveThread({ thread });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.saveThread({ thread });
   }
   async saveMessages({
     messages
   }) {
-    return this.storage.saveMessages({ messages });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.saveMessages({ messages });
   }
   async listThreadsByResourceId(args) {
-    return this.storage.listThreadsByResourceId(args);
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.listThreadsByResourceId(args);
   }
   async recall(args) {
-    const result = await this.storage.listMessages({
+    const memoryStorage = await this.getMemoryStore();
+    const result = await memoryStorage.listMessages({
       threadId: args.threadId,
       resourceId: args.resourceId,
       perPage: args.perPage,
@@ -20572,11 +20903,13 @@ var MockMemory = class extends MastraMemory {
     return result;
   }
   async deleteThread(threadId) {
-    return this.storage.deleteThread({ threadId });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.deleteThread({ threadId });
   }
   async deleteMessages(messageIds) {
+    const memoryStorage = await this.getMemoryStore();
     const ids = Array.isArray(messageIds) ? messageIds?.map((item) => typeof item === "string" ? item : item.id) : [messageIds];
-    return this.storage.deleteMessages(ids);
+    return memoryStorage.deleteMessages(ids);
   }
   async getWorkingMemory({
     threadId,
@@ -20593,10 +20926,15 @@ var MockMemory = class extends MastraMemory {
     if (!id) {
       return null;
     }
-    const resource = await this.storage.getResourceById({ resourceId: id });
+    const memoryStorage = await this.getMemoryStore();
+    const resource = await memoryStorage.getResourceById({ resourceId: id });
     return resource?.workingMemory || null;
   }
   listTools(_config) {
+    const mergedConfig = this.getMergedThreadConfig(_config);
+    if (!mergedConfig.workingMemory?.enabled) {
+      return {};
+    }
     return {
       updateWorkingMemory: createTool({
         id: "update-working-memory",
@@ -20681,7 +21019,8 @@ var MockMemory = class extends MastraMemory {
     if (!id) {
       throw new Error(`Cannot update working memory: ${scope} ID is required`);
     }
-    await this.storage.updateResource({
+    const memoryStorage = await this.getMemoryStore();
+    await memoryStorage.updateResource({
       resourceId: id,
       workingMemory
     });
@@ -20710,6 +21049,6 @@ var MockMemory = class extends MastraMemory {
   }
 };
 
-export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, EventEmitterPubSub, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, hydrateSerializedStepErrors, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, resolveThreadIdFromArgs, runCountDeprecationMessage, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-QF4MHFSU.js.map
-//# sourceMappingURL=chunk-QF4MHFSU.js.map
+export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, EventEmitterPubSub, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, extractWorkingMemoryContent, extractWorkingMemoryTags, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, hydrateSerializedStepErrors, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeWorkingMemoryTags, resolveThreadIdFromArgs, runCountDeprecationMessage, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepStateData, validateStepSuspendData };
+//# sourceMappingURL=chunk-F7PAZAGE.js.map
+//# sourceMappingURL=chunk-F7PAZAGE.js.map