@mastra/core 0.15.2 → 0.15.3-alpha.1

package/dist/{chunk-SNYSVGIU.cjs → chunk-6Z7D7CA3.cjs}

@@ -3,14 +3,14 @@
 var chunkFBBP67MQ_cjs = require('./chunk-FBBP67MQ.cjs');
 var chunkNFXTYMWZ_cjs = require('./chunk-NFXTYMWZ.cjs');
 var chunkZOU4K5MI_cjs = require('./chunk-ZOU4K5MI.cjs');
-var chunkG6WYC4SF_cjs = require('./chunk-G6WYC4SF.cjs');
+var chunkVBAWR62U_cjs = require('./chunk-VBAWR62U.cjs');
 var chunkQA2TWVUS_cjs = require('./chunk-QA2TWVUS.cjs');
 var chunkTSNDVBUU_cjs = require('./chunk-TSNDVBUU.cjs');
-var chunkRMEG4MOG_cjs = require('./chunk-RMEG4MOG.cjs');
+var chunk6VROHRAR_cjs = require('./chunk-6VROHRAR.cjs');
 var chunkGPWMM745_cjs = require('./chunk-GPWMM745.cjs');
 var chunkS6MAHT7F_cjs = require('./chunk-S6MAHT7F.cjs');
 var chunkE4XQMNEI_cjs = require('./chunk-E4XQMNEI.cjs');
-var chunkEQLCC3M7_cjs = require('./chunk-EQLCC3M7.cjs');
+var chunk4DKPMUAC_cjs = require('./chunk-4DKPMUAC.cjs');
 var chunkC73WLCY3_cjs = require('./chunk-C73WLCY3.cjs');
 var chunkKXCUCBEI_cjs = require('./chunk-KXCUCBEI.cjs');
 var chunkV5WKCX3G_cjs = require('./chunk-V5WKCX3G.cjs');
@@ -4052,6 +4052,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
   stream({
     messages,
     stopWhen = aiV5.stepCountIs(5),
+    maxSteps,
     tools = {},
     runId,
     modelSettings,
@@ -4064,6 +4065,12 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     outputProcessors
     // ...rest
   }) {
+    let stopWhenToUse;
+    if (maxSteps && typeof maxSteps === "number") {
+      stopWhenToUse = aiV5.stepCountIs(maxSteps);
+    } else {
+      stopWhenToUse = stopWhen;
+    }
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
@@ -4085,7 +4092,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
         messageList,
         model: this.#model,
         tools,
-        stopWhen,
+        stopWhen: stopWhenToUse,
         toolChoice,
         modelSettings,
         telemetry_settings: {
@@ -4134,7 +4141,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
               this.logger.warn("Rate limit approaching, waiting 10 seconds", {
                 runId
               });
-              await chunkRMEG4MOG_cjs.delay(10 * 1e3);
+              await chunk6VROHRAR_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async props => {
@@ -5020,7 +5027,7 @@ var Machine = class extends EventEmitter__default.default {
         const logger = this.logger;
         let mastraProxy = void 0;
         if (this.#mastra) {
-          mastraProxy = chunkRMEG4MOG_cjs.createMastraProxy({
+          mastraProxy = chunk6VROHRAR_cjs.createMastraProxy({
             mastra: this.#mastra,
             logger
           });
@@ -9178,13 +9185,13 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       this.logger.error(mastraError.toString());
       throw mastraError;
     }
-    return chunkRMEG4MOG_cjs.ensureToolProperties(this.#tools);
+    return chunk6VROHRAR_cjs.ensureToolProperties(this.#tools);
   }
   getTools({
     runtimeContext = new chunkGPWMM745_cjs.RuntimeContext()
   } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkRMEG4MOG_cjs.ensureToolProperties(this.#tools);
+      return chunk6VROHRAR_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       runtimeContext,
@@ -9205,7 +9212,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkRMEG4MOG_cjs.ensureToolProperties(tools);
+      return chunk6VROHRAR_cjs.ensureToolProperties(tools);
     });
   }
   get llm() {
@@ -9249,7 +9256,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           mastra: this.#mastra
         });
       } else {
-        llm = new chunkG6WYC4SF_cjs.MastraLLMV1({
+        llm = new chunkVBAWR62U_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra
         });
@@ -9546,7 +9553,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           }) : this.model,
           agentAISpan
         };
-        const convertedToCoreTool = chunkRMEG4MOG_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunk6VROHRAR_cjs.makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -9715,7 +9722,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         writableStream,
         agentAISpan
       };
-      return [k, chunkRMEG4MOG_cjs.makeCoreTool(tool, options)];
+      return [k, chunk6VROHRAR_cjs.makeCoreTool(tool, options)];
     }));
     const assignedToolEntriesConverted = Object.fromEntries(assignedCoreToolEntries.filter(entry => Boolean(entry)));
     toolsForRequest = {
@@ -9759,7 +9766,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             }) : this.model,
             agentAISpan
           };
-          const convertedToCoreTool = chunkRMEG4MOG_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunk6VROHRAR_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -9804,7 +9811,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           }) : this.model,
           agentAISpan
         };
-        const convertedToCoreTool = chunkRMEG4MOG_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunk6VROHRAR_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -9887,42 +9894,6 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     }
     return convertedWorkflowTools;
   }
-  _wrapToolWithAITracing(tool, toolType, aiSpan) {
-    if (!aiSpan || !tool.execute) {
-      return tool;
-    }
-    const wrappedExecute = async (params, options) => {
-      const toolSpan = aiSpan.createChildSpan({
-        type: "tool_call" /* TOOL_CALL */,
-        name: `tool: ${tool.id}`,
-        input: params,
-        attributes: {
-          toolId: tool.id,
-          toolDescription: tool.description,
-          toolType
-        }
-      });
-      try {
-        const result = await tool.execute?.(params, options);
-        toolSpan.end({
-          output: result
-        });
-        return result;
-      } catch (error) {
-        toolSpan.error({
-          error
-        });
-        throw error;
-      }
-    };
-    return {
-      ...tool,
-      execute: wrappedExecute
-    };
-  }
-  _wrapToolsWithAITracing(tools, toolType, agentAISpan) {
-    return Object.fromEntries(Object.entries(tools).map(([key, tool]) => [key, this._wrapToolWithAITracing(tool, toolType, agentAISpan)]));
-  }
   async convertTools({
     toolsets,
     clientTools,
@@ -9936,7 +9907,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkRMEG4MOG_cjs.createMastraProxy({
+      mastraProxy = chunk6VROHRAR_cjs.createMastraProxy({
         mastra: this.#mastra,
         logger
       });
@@ -9984,12 +9955,11 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       agentAISpan
     });
     return this.formatTools({
-      ...this._wrapToolsWithAITracing(assignedTools, "assigned", agentAISpan),
-      ...this._wrapToolsWithAITracing(memoryTools, "memory", agentAISpan),
-      ...this._wrapToolsWithAITracing(toolsetTools, "toolset", agentAISpan),
-      ...this._wrapToolsWithAITracing(clientSideTools, "client", agentAISpan),
+      ...assignedTools,
+      ...memoryTools,
+      ...toolsetTools,
+      ...clientSideTools,
       ...workflowTools
-      //workflow tools are already wrapped with AI tracing
     });
   }
   formatTools(tools) {
@@ -10096,7 +10066,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             ...spanArgs
           });
         } else {
-          const aiTracing = chunkEQLCC3M7_cjs.getSelectedAITracing({
+          const aiTracing = chunk4DKPMUAC_cjs.getSelectedAITracing({
             runtimeContext
           });
           if (aiTracing) {
@@ -11125,6 +11095,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         threadId: result.threadId,
         structuredOutput: result.structuredOutput,
         stopWhen: result.stopWhen,
+        maxSteps: result.maxSteps,
         options: {
           onFinish: async payload => {
             if (payload.finishReason === "error") {
@@ -12180,7 +12151,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       resume,
       retryConfig,
       runtimeContext,
-      currentSpan
+      currentSpan,
+      disableScorers
     } = params;
     const {
       attempts = 0,
@@ -12202,7 +12174,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         ...spanArgs
       });
     } else {
-      const aiTracing = chunkEQLCC3M7_cjs.getSelectedAITracing({
+      const aiTracing = chunk4DKPMUAC_cjs.getSelectedAITracing({
         runtimeContext
       });
       if (aiTracing) {
@@ -12270,7 +12242,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           abortController: params.abortController,
           emitter: params.emitter,
           runtimeContext: params.runtimeContext,
-          writableStream: params.writableStream
+          writableStream: params.writableStream,
+          disableScorers
         });
         if (lastOutput.result.status !== "success") {
           if (lastOutput.result.status === "bailed") {
@@ -12605,6 +12578,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     runtimeContext,
     skipEmits = false,
     writableStream,
+    disableScorers,
     serializedStepGraph,
     tracingContext
   }) {
@@ -12709,7 +12683,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         const result = await runStep({
           runId,
           workflowId,
-          mastra: this.mastra ? chunkEQLCC3M7_cjs.wrapMastra(this.mastra, {
+          mastra: this.mastra ? chunk4DKPMUAC_cjs.wrapMastra(this.mastra, {
             currentSpan: stepAISpan
           }) : void 0,
           runtimeContext,
@@ -12760,8 +12734,22 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             callId: stepCallId,
             name: step.id,
             runId
-          }, writableStream)
+          }, writableStream),
+          // Disable scorers must be explicitly set to false they are on by default
+          scorers: disableScorers === false ? void 0 : step.scorers
         });
+        if (step.scorers) {
+          await this.runScorers({
+            scorers: step.scorers,
+            runId,
+            input: prevOutput,
+            output: result,
+            workflowId,
+            stepId: step.id,
+            runtimeContext,
+            disableScorers
+          });
+        }
         if (suspended) {
           execResults = {
             status: "suspended",
@@ -12873,6 +12861,57 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       ...execResults
     };
   }
+  async runScorers({
+    scorers,
+    runId,
+    input,
+    output,
+    workflowId,
+    stepId,
+    runtimeContext,
+    disableScorers
+  }) {
+    let scorersToUse = scorers;
+    if (typeof scorersToUse === "function") {
+      try {
+        scorersToUse = await scorersToUse({
+          runtimeContext
+        });
+      } catch (error) {
+        const mastraError = new chunkC73WLCY3_cjs.MastraError({
+          id: "WORKFLOW_FAILED_TO_FETCH_SCORERS",
+          domain: "MASTRA_WORKFLOW",
+          category: "USER" /* USER */,
+          details: {
+            runId,
+            workflowId,
+            stepId
+          }
+        }, error);
+        this.logger.trackException(mastraError);
+        this.logger.error(mastraError.toString(), error);
+      }
+    }
+    if (!disableScorers && scorersToUse && Object.keys(scorersToUse || {}).length > 0) {
+      for (const [id, scorerObject] of Object.entries(scorersToUse || {})) {
+        runScorer({
+          scorerId: id,
+          scorerObject,
+          runId,
+          input: [input],
+          output,
+          runtimeContext,
+          entity: {
+            id: workflowId,
+            stepId
+          },
+          structuredOutput: true,
+          source: "LIVE",
+          entityType: "WORKFLOW"
+        });
+      }
+    }
+  }
   async executeParallel({
     workflowId,
     runId,
@@ -12886,7 +12925,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers
   }) {
     const parallelSpan = tracingContext.currentSpan?.createChildSpan({
       type: "workflow_parallel" /* WORKFLOW_PARALLEL */,
@@ -12920,7 +12960,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       emitter,
       abortController,
       runtimeContext,
-      writableStream
+      writableStream,
+      disableScorers
     })));
     const hasFailed = results.find(result => result.result.status === "failed");
     const hasSuspended = results.find(result => result.result.status === "suspended");
@@ -12974,7 +13015,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers
   }) {
     const conditionalSpan = tracingContext.currentSpan?.createChildSpan({
       type: "workflow_conditional" /* WORKFLOW_CONDITIONAL */,
@@ -13096,7 +13138,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       emitter,
       abortController,
       runtimeContext,
-      writableStream
+      writableStream,
+      disableScorers
     })));
     const mergedStepResults = {
       ...stepResults
@@ -13173,6 +13216,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     abortController,
     runtimeContext,
     writableStream,
+    disableScorers,
     serializedStepGraph
   }) {
     const {
@@ -13211,6 +13255,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
       if (currentResume && result.status !== "suspended") {
@@ -13291,6 +13336,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     abortController,
     runtimeContext,
     writableStream,
+    disableScorers,
     serializedStepGraph
   }) {
     const {
@@ -13372,6 +13418,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           runtimeContext,
           skipEmits: true,
           writableStream,
+          disableScorers,
           serializedStepGraph
         });
       }));
@@ -13556,7 +13603,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers
   }) {
     const prevOutput = this.getStepOutput(stepResults, prevStep);
     let execResults;
@@ -13577,6 +13625,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
     } else if (resume?.resumePath?.length && entry.type === "parallel") {
@@ -13601,7 +13650,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         emitter,
         abortController,
         runtimeContext,
-        writableStream
+        writableStream,
+        disableScorers
       });
       if (resumedStepResult.stepResults) {
         Object.assign(stepResults, resumedStepResult.stepResults);
@@ -13676,7 +13726,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         emitter,
         abortController,
         runtimeContext,
-        writableStream
+        writableStream,
+        disableScorers
       });
     } else if (entry.type === "conditional") {
       execResults = await this.executeConditional({
@@ -13693,7 +13744,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         emitter,
         abortController,
         runtimeContext,
-        writableStream
+        writableStream,
+        disableScorers
       });
     } else if (entry.type === "loop") {
       execResults = await this.executeLoop({
@@ -13710,6 +13762,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
     } else if (entry.type === "foreach") {
@@ -13727,6 +13780,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
     } else if (entry.type === "sleep") {
@@ -14047,6 +14101,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           abortController,
           runtimeContext,
           writableStream,
+          disableScorers,
           serializedStepGraph
         });
       } catch (error) {
@@ -14097,40 +14152,6 @@ function mapVariable(config) {
   return config;
 }
 function createStep(params) {
-  const wrapExecute = execute2 => {
-    return async executeParams => {
-      const executeResult = await execute2(executeParams);
-      if (params instanceof exports.Agent || params instanceof chunkE4XQMNEI_cjs.Tool) {
-        return executeResult;
-      }
-      let scorersToUse = params.scorers;
-      if (typeof scorersToUse === "function") {
-        scorersToUse = await scorersToUse({
-          runtimeContext: executeParams.runtimeContext
-        });
-      }
-      if (scorersToUse && Object.keys(scorersToUse || {}).length > 0) {
-        for (const [id, scorerObject] of Object.entries(scorersToUse || {})) {
-          runScorer({
-            scorerId: id,
-            scorerObject,
-            runId: executeParams.runId,
-            input: [executeParams.inputData],
-            output: executeResult,
-            runtimeContext: executeParams.runtimeContext,
-            entity: {
-              id: executeParams.workflowId,
-              stepId: params.id
-            },
-            structuredOutput: true,
-            source: "LIVE",
-            entityType: "WORKFLOW"
-          });
-        }
-      }
-      return executeResult;
-    };
-  };
   if (params instanceof exports.Agent) {
     return {
       id: params.name,
@@ -14144,7 +14165,7 @@ function createStep(params) {
       outputSchema: z.z.object({
         text: z.z.string()
       }),
-      execute: wrapExecute(async ({
+      execute: async ({
         inputData,
         [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
         runtimeContext,
@@ -14205,7 +14226,7 @@ function createStep(params) {
         return {
           text: await streamPromise.promise
         };
-      })
+      }
     };
   }
   if (params instanceof chunkE4XQMNEI_cjs.Tool) {
@@ -14218,17 +14239,19 @@ function createStep(params) {
       id: params.id,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: wrapExecute(async ({
+      execute: async ({
         inputData,
         mastra,
-        runtimeContext
+        runtimeContext,
+        tracingContext
       }) => {
         return params.execute({
           context: inputData,
           mastra,
-          runtimeContext
+          runtimeContext,
+          tracingContext
         });
-      })
+      }
     };
   }
   return {
@@ -14240,7 +14263,7 @@ function createStep(params) {
     suspendSchema: params.suspendSchema,
     scorers: params.scorers,
     retries: params.retries,
-    execute: wrapExecute(params.execute)
+    execute: params.execute
   };
 }
 function cloneStep(step, opts) {
@@ -14743,6 +14766,7 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
       mastra: this.#mastra,
       retryConfig: this.retryConfig,
       serializedStepGraph: this.serializedStepGraph,
+      disableScorers: options?.disableScorers,
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
@@ -14770,6 +14794,7 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
       mastra: this.#mastra,
       retryConfig: this.retryConfig,
       serializedStepGraph: this.serializedStepGraph,
+      disableScorers: options?.disableScorers,
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
@@ -14969,6 +14994,10 @@ var Run = class {
    * Unique identifier for this run
    */
   runId;
+  /**
+   * Whether to disable scorers for this run
+   */
+  disableScorers;
   /**
    * Internal state of the workflow run
    */
@@ -15006,6 +15035,7 @@ var Run = class {
     this.emitter = new EventEmitter__default.default();
     this.retryConfig = params.retryConfig;
     this.cleanup = params.cleanup;
+    this.disableScorers = params.disableScorers;
   }
   get abortController() {
     if (!this.#abortController) {
@@ -15036,6 +15066,7 @@ var Run = class {
     const result = await this.executionEngine.execute({
       workflowId: this.workflowId,
       runId: this.runId,
+      disableScorers: this.disableScorers,
       graph: this.executionGraph,
       serializedStepGraph: this.serializedStepGraph,
       input: inputData,
@@ -15499,5 +15530,5 @@ exports.recursivelyCheckForFinalState = recursivelyCheckForFinalState;
 exports.resolveVariables = resolveVariables;
 exports.updateStepInHierarchy = updateStepInHierarchy;
 exports.workflowToStep = workflowToStep;
-//# sourceMappingURL=chunk-SNYSVGIU.cjs.map
-//# sourceMappingURL=chunk-SNYSVGIU.cjs.map
+//# sourceMappingURL=chunk-6Z7D7CA3.cjs.map
+//# sourceMappingURL=chunk-6Z7D7CA3.cjs.map