@mastra/core 0.15.2 → 0.15.3-alpha.0

package/dist/{chunk-FCFQE5BD.js → chunk-6JAIHLZY.js}

@@ -1,14 +1,14 @@
 import { DefaultVoice } from './chunk-XM2ASGWH.js';
 import { EMITTER_SYMBOL } from './chunk-GK5V7YTQ.js';
 import { InstrumentClass, Telemetry } from './chunk-76MWMAR7.js';
-import { MastraLLMV1 } from './chunk-HRPTZGDT.js';
+import { MastraLLMV1 } from './chunk-IAOFOXVA.js';
 import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-C5C4PN54.js';
 import { executeHook } from './chunk-TTELJD4F.js';
-import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-FFGJPMKP.js';
+import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-FLXWZUIG.js';
 import { RuntimeContext } from './chunk-HLRWYUFN.js';
 import { ToolStream } from './chunk-YW7UILPE.js';
 import { Tool } from './chunk-IVGAHFAJ.js';
-import { getSelectedAITracing, wrapMastra } from './chunk-7TH2KSEC.js';
+import { getSelectedAITracing, wrapMastra } from './chunk-WOTBMZCN.js';
 import { MastraError } from './chunk-MCOVMKIS.js';
 import { MastraBase } from './chunk-6GF5M4GX.js';
 import { ConsoleLogger, RegisteredLogger } from './chunk-X3GXU6TZ.js';
@@ -4026,6 +4026,7 @@ var MastraLLMVNext = class extends MastraBase {
   stream({
     messages,
     stopWhen = stepCountIs(5),
+    maxSteps,
     tools = {},
     runId,
     modelSettings,
@@ -4038,6 +4039,12 @@ var MastraLLMVNext = class extends MastraBase {
     outputProcessors
     // ...rest
   }) {
+    let stopWhenToUse;
+    if (maxSteps && typeof maxSteps === "number") {
+      stopWhenToUse = stepCountIs(maxSteps);
+    } else {
+      stopWhenToUse = stopWhen;
+    }
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
@@ -4059,7 +4066,7 @@ var MastraLLMVNext = class extends MastraBase {
         messageList,
         model: this.#model,
         tools,
-        stopWhen,
+        stopWhen: stopWhenToUse,
         toolChoice,
         modelSettings,
         telemetry_settings: {
@@ -9861,42 +9868,6 @@ var Agent = class extends (_a = 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,
@@ -9958,12 +9929,11 @@ var Agent = class extends (_a = 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) {
@@ -11099,6 +11069,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") {
@@ -12154,7 +12125,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       resume,
       retryConfig,
       runtimeContext,
-      currentSpan
+      currentSpan,
+      disableScorers
     } = params;
     const {
       attempts = 0,
@@ -12244,7 +12216,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") {
@@ -12579,6 +12552,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     runtimeContext,
     skipEmits = false,
     writableStream,
+    disableScorers,
     serializedStepGraph,
     tracingContext
   }) {
@@ -12734,8 +12708,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",
@@ -12847,6 +12835,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 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,
@@ -12860,7 +12899,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers
   }) {
     const parallelSpan = tracingContext.currentSpan?.createChildSpan({
       type: "workflow_parallel" /* WORKFLOW_PARALLEL */,
@@ -12894,7 +12934,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");
@@ -12948,7 +12989,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers
   }) {
     const conditionalSpan = tracingContext.currentSpan?.createChildSpan({
       type: "workflow_conditional" /* WORKFLOW_CONDITIONAL */,
@@ -13070,7 +13112,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       emitter,
       abortController,
       runtimeContext,
-      writableStream
+      writableStream,
+      disableScorers
     })));
     const mergedStepResults = {
       ...stepResults
@@ -13147,6 +13190,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     abortController,
     runtimeContext,
     writableStream,
+    disableScorers,
     serializedStepGraph
   }) {
     const {
@@ -13185,6 +13229,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
       if (currentResume && result.status !== "suspended") {
@@ -13265,6 +13310,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     abortController,
     runtimeContext,
     writableStream,
+    disableScorers,
     serializedStepGraph
   }) {
     const {
@@ -13346,6 +13392,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           runtimeContext,
           skipEmits: true,
           writableStream,
+          disableScorers,
           serializedStepGraph
         });
       }));
@@ -13530,7 +13577,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers
   }) {
     const prevOutput = this.getStepOutput(stepResults, prevStep);
     let execResults;
@@ -13551,6 +13599,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
     } else if (resume?.resumePath?.length && entry.type === "parallel") {
@@ -13575,7 +13624,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         emitter,
         abortController,
         runtimeContext,
-        writableStream
+        writableStream,
+        disableScorers
       });
       if (resumedStepResult.stepResults) {
         Object.assign(stepResults, resumedStepResult.stepResults);
@@ -13650,7 +13700,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         emitter,
         abortController,
         runtimeContext,
-        writableStream
+        writableStream,
+        disableScorers
       });
     } else if (entry.type === "conditional") {
       execResults = await this.executeConditional({
@@ -13667,7 +13718,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         emitter,
         abortController,
         runtimeContext,
-        writableStream
+        writableStream,
+        disableScorers
       });
     } else if (entry.type === "loop") {
       execResults = await this.executeLoop({
@@ -13684,6 +13736,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
     } else if (entry.type === "foreach") {
@@ -13701,6 +13754,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abortController,
         runtimeContext,
         writableStream,
+        disableScorers,
         serializedStepGraph
       });
     } else if (entry.type === "sleep") {
@@ -14021,6 +14075,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           abortController,
           runtimeContext,
           writableStream,
+          disableScorers,
           serializedStepGraph
         });
       } catch (error) {
@@ -14071,40 +14126,6 @@ function mapVariable(config) {
   return config;
 }
 function createStep(params) {
-  const wrapExecute = execute2 => {
-    return async executeParams => {
-      const executeResult = await execute2(executeParams);
-      if (params instanceof Agent || params instanceof 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 Agent) {
     return {
       id: params.name,
@@ -14118,7 +14139,7 @@ function createStep(params) {
       outputSchema: z$1.object({
         text: z$1.string()
       }),
-      execute: wrapExecute(async ({
+      execute: async ({
         inputData,
         [EMITTER_SYMBOL]: emitter,
         runtimeContext,
@@ -14179,7 +14200,7 @@ function createStep(params) {
         return {
           text: await streamPromise.promise
         };
-      })
+      }
     };
   }
   if (params instanceof Tool) {
@@ -14192,17 +14213,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 {
@@ -14214,7 +14237,7 @@ function createStep(params) {
     suspendSchema: params.suspendSchema,
     scorers: params.scorers,
     retries: params.retries,
-    execute: wrapExecute(params.execute)
+    execute: params.execute
   };
 }
 function cloneStep(step, opts) {
@@ -14717,6 +14740,7 @@ var Workflow = class extends MastraBase {
       mastra: this.#mastra,
       retryConfig: this.retryConfig,
       serializedStepGraph: this.serializedStepGraph,
+      disableScorers: options?.disableScorers,
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
@@ -14744,6 +14768,7 @@ var Workflow = class extends MastraBase {
       mastra: this.#mastra,
       retryConfig: this.retryConfig,
       serializedStepGraph: this.serializedStepGraph,
+      disableScorers: options?.disableScorers,
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
@@ -14943,6 +14968,10 @@ var Run = class {
    * Unique identifier for this run
    */
   runId;
+  /**
+   * Whether to disable scorers for this run
+   */
+  disableScorers;
   /**
    * Internal state of the workflow run
    */
@@ -14980,6 +15009,7 @@ var Run = class {
     this.emitter = new EventEmitter();
     this.retryConfig = params.retryConfig;
     this.cleanup = params.cleanup;
+    this.disableScorers = params.disableScorers;
   }
   get abortController() {
     if (!this.#abortController) {
@@ -15010,6 +15040,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,
@@ -15429,5 +15460,5 @@ function deepMergeWorkflowState(a, b) {
 }
 
 export { AISDKV5OutputStream, Agent, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, LanguageDetectorInputProcessor, LegacyStep, LegacyWorkflow, MastraModelOutput, ModerationInputProcessor, ModerationProcessor, PIIDetector, PIIDetectorInputProcessor, PromptInjectionDetector, PromptInjectionDetectorInputProcessor, Run, StructuredOutputProcessor, TripWire, UnicodeNormalizer, UnicodeNormalizerInputProcessor, WhenConditionReturnValue, Workflow, agentToStep, cloneStep, cloneWorkflow, createStep, createWorkflow, getActivePathsAndStatus, getResultActivePaths, getStepResult, getSuspendedPaths, isAgent, isConditionalKey, isErrorEvent, isFinalState, isLimboState, isTransitionEvent, isVariableReference, isWorkflow, loop, mapVariable, mergeChildValue, recursivelyCheckForFinalState, resolveVariables, updateStepInHierarchy, workflowToStep };
-//# sourceMappingURL=chunk-FCFQE5BD.js.map
-//# sourceMappingURL=chunk-FCFQE5BD.js.map
+//# sourceMappingURL=chunk-6JAIHLZY.js.map
+//# sourceMappingURL=chunk-6JAIHLZY.js.map