@mastra/core 1.20.0 → 1.21.0-alpha.1

package/dist/{chunk-HOAKFZ6P.js → chunk-JIA3SJK6.js}

@@ -1,21 +1,21 @@
 import { DefaultVoice } from './chunk-YXGTSH4J.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-2QXNHEDL.js';
 import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-5TG6LPAB.js';
-import { InMemoryStore } from './chunk-BCOOJFBB.js';
+import { InMemoryStore } from './chunk-GGJSRBFY.js';
 import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-NRA3BO5W.js';
 import { parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-2PHG443D.js';
 import { generateId, APICallError, tool, asSchema } from './chunk-6PALJNKG.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-UCCVELTP.js';
-import { MastraLLMV1 } from './chunk-FQCASJGT.js';
-import { noopLogger } from './chunk-3R4YK3VD.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-VJKW6RRY.js';
+import { MastraLLMV1 } from './chunk-D7NEB3NV.js';
+import { noopLogger } from './chunk-CJA2FWKT.js';
 import { EventEmitterPubSub } from './chunk-X2HAI3OX.js';
-import { removeUndefinedValues, safeStringify, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, ensureSerializable, delay } from './chunk-2H6WEHWI.js';
-import { resolveObservabilityContext, EntityType, createObservabilityContext, wrapMastra } from './chunk-2NISBCML.js';
+import { removeUndefinedValues, safeStringify, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, ensureSerializable, delay } from './chunk-JBLN5IVV.js';
+import { resolveObservabilityContext, createObservabilityContext, wrapMastra } from './chunk-FAULJTC5.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
 import { Tool, createTool, isMastraTool, isProviderTool, getProviderToolName, isProviderDefinedTool } from './chunk-EWPUWV33.js';
 import { toStandardSchema, standardSchemaToJSONSchema, isStandardSchemaWithJSON } from './chunk-6SRTDZ7S.js';
-import { getRootExportSpan, getOrCreateSpan, executeWithContext, executeWithContextSync } from './chunk-AC5GUOWY.js';
+import { EntityType, getRootExportSpan, getOrCreateSpan, executeWithContext, executeWithContextSync } from './chunk-WG7QIVL7.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-JGOH7RWL.js';
 import { MastraError, getErrorFromUnknown } from './chunk-FJEVLHJT.js';
 import { MastraBase } from './chunk-S36QLQEK.js';
@@ -11190,6 +11190,15 @@ var MastraScorer = class _MastraScorer {
   get hasGenerateScore() {
     return this.steps.some((step) => step.name === "generateScore");
   }
+  normalizeRunRequestContext(requestContext) {
+    if (!requestContext) {
+      return void 0;
+    }
+    if (requestContext instanceof RequestContext) {
+      return requestContext;
+    }
+    return new RequestContext(Object.entries(requestContext));
+  }
   async run(input) {
     if (!this.hasGenerateScore) {
       throw new MastraError({
@@ -11203,21 +11212,70 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const observabilityContext = resolveObservabilityContext(input);
     let runId = input.runId;
     if (!runId) {
       runId = randomUUID();
     }
-    const run = { ...input, runId };
-    const workflow = this.toMastraWorkflow();
-    const workflowRun = await workflow.createRun();
-    const workflowResult = await workflowRun.start({
-      inputData: {
-        run
+    const normalizedRequestContext = this.normalizeRunRequestContext(input.requestContext);
+    const evalSpan = getOrCreateSpan({
+      type: "scorer_run" /* SCORER_RUN */,
+      name: `scorer run: '${this.id}'`,
+      entityType: EntityType.SCORER,
+      entityId: this.id,
+      input: {
+        input: input.input,
+        output: input.output,
+        groundTruth: input.groundTruth,
+        expectedTrajectory: input.expectedTrajectory,
+        requestContext: normalizedRequestContext
       },
-      ...observabilityContext
+      attributes: {
+        scorerId: this.id,
+        scorerName: this.name,
+        ...input.scoreSource ? { scoreSource: input.scoreSource } : {},
+        ...input.targetScope ? { targetScope: input.targetScope } : {},
+        ...input.targetEntityType ? { targetEntityType: input.targetEntityType } : {},
+        ...this.source ? { scorerDefinition: this.source } : {}
+      },
+      metadata: {
+        ...input.targetTraceId ? { targetTraceId: input.targetTraceId } : {},
+        ...input.targetSpanId ? { targetSpanId: input.targetSpanId } : {}
+      },
+      mastra: this.#mastra
     });
+    const run = {
+      ...input,
+      runId,
+      ...evalSpan?.traceId ? { scoreTraceId: evalSpan.traceId } : {}
+    };
+    const scorerObservabilityContext = createObservabilityContext({ currentSpan: evalSpan });
+    let workflow;
+    let workflowRun;
+    try {
+      workflow = this.toMastraWorkflow();
+      workflowRun = await workflow.createRun();
+    } catch (error) {
+      evalSpan?.error({ error, endSpan: true });
+      throw error;
+    }
+    let workflowResult;
+    try {
+      workflowResult = await executeWithContext({
+        span: evalSpan,
+        fn: () => workflowRun.start({
+          inputData: {
+            run
+          },
+          ...scorerObservabilityContext
+        })
+      });
+    } catch (error) {
+      evalSpan?.error({ error, endSpan: true });
+      throw error;
+    }
     if (workflowResult.status === "failed") {
+      const workflowFailure = workflowResult.error instanceof Error ? workflowResult.error : new Error(typeof workflowResult.error === "string" ? workflowResult.error : "Scorer workflow failed");
+      evalSpan?.error({ error: workflowFailure, endSpan: true });
       throw new MastraError(
         {
           id: "MASTR_SCORER_FAILED_TO_RUN_WORKFLOW_FAILED",
@@ -11232,7 +11290,46 @@ var MastraScorer = class _MastraScorer {
         workflowResult.error instanceof Error ? workflowResult.error : void 0
       );
     }
-    return this.transformToScorerResult({ workflowResult, originalInput: run });
+    const scorerResult = this.transformToScorerResult({ workflowResult, originalInput: run });
+    evalSpan?.end({
+      output: {
+        success: true,
+        score: typeof scorerResult.score === "number" ? scorerResult.score : null,
+        reason: typeof scorerResult.reason === "string" ? scorerResult.reason : null
+      }
+    });
+    if (this.#mastra?.observability.addScore && typeof scorerResult.score === "number") {
+      try {
+        if (!input.targetTraceId) {
+          return scorerResult;
+        }
+        await this.#mastra.observability.addScore({
+          traceId: input.targetTraceId,
+          ...input.targetSpanId ? { spanId: input.targetSpanId } : {},
+          score: {
+            scorerId: this.id,
+            scorerName: this.name,
+            ...input.scoreSource ? { scoreSource: input.scoreSource } : {},
+            score: scorerResult.score,
+            ...typeof scorerResult.reason === "string" ? { reason: scorerResult.reason } : {},
+            ...typeof scorerResult.scoreTraceId === "string" ? { scoreTraceId: scorerResult.scoreTraceId } : {},
+            ...input.targetEntityType ? { targetEntityType: input.targetEntityType } : {},
+            metadata: {
+              hasGroundTruth: input.groundTruth !== void 0,
+              ...input.targetScope ? { targetScope: input.targetScope } : {},
+              ...this.source ? { scorerDefinition: this.source } : {}
+            }
+            // TODO: Add targetEntityId / targetEntityName once the score event/storage
+            // contract has first-class fields for unanchored score target identity.
+            // TODO: Add any remaining correlation context that is useful when a
+            // score is emitted without a target trace/span anchor.
+          }
+        });
+      } catch (error) {
+        this.#mastra.getLogger()?.warn?.(`Failed to emit score to observability for scorer ${this.id}:`, error);
+      }
+    }
+    return scorerResult;
   }
   isPromptObject(stepDef) {
     if (typeof stepDef === "object" && "description" in stepDef && "createPrompt" in stepDef && !("outputSchema" in stepDef)) {
@@ -11242,11 +11339,14 @@ var MastraScorer = class _MastraScorer {
     return isOtherPromptObject;
   }
   getSteps() {
-    return this.steps.map((step) => ({
-      name: step.name,
-      type: step.isPromptObject ? "prompt" : "function",
-      description: step.definition.description
-    }));
+    return this.steps.map((step) => {
+      const description = step.isPromptObject ? this.originalPromptObjects.get(step.name)?.description : step.definition?.description;
+      return {
+        name: step.name,
+        type: step.isPromptObject ? "prompt" : "function",
+        description
+      };
+    });
   }
   toMastraWorkflow() {
     const workflowSteps = this.steps.map((scorerStep) => {
@@ -11260,18 +11360,62 @@ var MastraScorer = class _MastraScorer {
           const { accumulatedResults = {}, generatedPrompts = {} } = inputData;
           const { run } = getInitData();
           const context = this.createScorerContext(scorerStep.name, run, accumulatedResults);
+          const currentSpan = observabilityContext.tracingContext.currentSpan;
+          const scorerRunSpan = currentSpan?.type === "scorer_run" /* SCORER_RUN */ ? currentSpan : currentSpan?.findParent("scorer_run" /* SCORER_RUN */);
+          const stepSpan = scorerRunSpan?.createChildSpan({
+            type: "scorer_step" /* SCORER_STEP */,
+            name: `scorer step: '${scorerStep.name}'`,
+            entityType: EntityType.SCORER,
+            entityId: this.config.id ?? this.config.name,
+            input: context,
+            attributes: {
+              step: scorerStep.name,
+              stepType: scorerStep.isPromptObject ? "prompt" : "function"
+            }
+          });
+          const stepObservabilityContext = createObservabilityContext({ currentSpan: stepSpan });
+          const executionContext = {
+            ...context,
+            ...stepObservabilityContext
+          };
           let stepResult;
-          let newGeneratedPrompts = generatedPrompts;
-          if (scorerStep.isPromptObject) {
-            const { result, prompt } = await this.executePromptStep(scorerStep, observabilityContext, context);
-            stepResult = result;
-            newGeneratedPrompts = {
-              ...generatedPrompts,
-              [`${scorerStep.name}Prompt`]: prompt
-            };
-          } else {
-            stepResult = await this.executeFunctionStep(scorerStep, context);
+          let prompt;
+          let judgeModel;
+          try {
+            await executeWithContext({
+              span: stepSpan,
+              fn: async () => {
+                if (scorerStep.isPromptObject) {
+                  const promptStepResult = await this.executePromptStep(
+                    scorerStep,
+                    stepObservabilityContext,
+                    executionContext
+                  );
+                  stepResult = promptStepResult.result;
+                  prompt = promptStepResult.prompt;
+                  judgeModel = promptStepResult.judgeModel;
+                } else {
+                  stepResult = await this.executeFunctionStep(scorerStep, executionContext);
+                }
+              }
+            });
+          } catch (error) {
+            stepSpan?.error({ error, endSpan: true });
+            throw error;
           }
+          if (prompt !== void 0 || judgeModel !== void 0) {
+            stepSpan?.update({
+              attributes: {
+                ...prompt !== void 0 ? { prompt } : {},
+                ...judgeModel !== void 0 ? { judgeModel } : {}
+              }
+            });
+          }
+          stepSpan?.end({ output: stepResult });
+          const newGeneratedPrompts = prompt !== void 0 ? {
+            ...generatedPrompts,
+            [`${scorerStep.name}Prompt`]: prompt
+          } : generatedPrompts;
           const newAccumulatedResults = {
             ...accumulatedResults,
             [`${scorerStep.name}StepResult`]: stepResult
@@ -11303,10 +11447,6 @@ var MastraScorer = class _MastraScorer {
         generateReasonPrompt: z.string().optional()
       }),
       options: {
-        // mark all spans generated as part of the scorer workflow internal
-        tracingPolicy: {
-          internal: 15 /* ALL */
-        },
         validateInputs: false
       }
     });
@@ -11348,12 +11488,12 @@ var MastraScorer = class _MastraScorer {
       });
     }
     const resolvedModel = await resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const judgeModel = resolvedModel.modelId;
     const judge = new Agent({
       id: "judge",
       name: "judge",
       model: resolvedModel,
-      instructions,
-      options: { tracingPolicy: { internal: 15 /* ALL */ } }
+      instructions
     });
     if (scorerStep.name === "generateScore") {
       let result;
@@ -11374,7 +11514,7 @@ var MastraScorer = class _MastraScorer {
           ...observabilityContext
         });
       }
-      return { result: result.object.score, prompt };
+      return { result: result.object.score, prompt, judgeModel };
     } else if (scorerStep.name === "generateReason") {
       let result;
       if (isSupportedLanguageModel(resolvedModel)) {
@@ -11382,7 +11522,7 @@ var MastraScorer = class _MastraScorer {
       } else {
         result = await judge.generateLegacy(prompt, { ...observabilityContext });
       }
-      return { result: result.text, prompt };
+      return { result: result.text, prompt, judgeModel };
     } else {
       const promptStep = originalStep;
       const standardSchema = toStandardSchema(promptStep.outputSchema);
@@ -11400,7 +11540,7 @@ var MastraScorer = class _MastraScorer {
           ...observabilityContext
         });
       }
-      return { result: result.object, prompt };
+      return { result: result.object, prompt, judgeModel };
     }
   }
   transformToScorerResult({
@@ -17564,7 +17704,10 @@ var AgentLegacyHandler = class {
       resourceId
     }) || randomUUID();
     const instructions = args.instructions || await this.capabilities.getInstructions({ requestContext });
-    const llm = await this.capabilities.getLLM({ requestContext });
+    const llm = await this.capabilities.getLLM({
+      requestContext,
+      model: args.model
+    });
     const memory = await this.capabilities.getMemory({ requestContext });
     const { before, after } = this.__primitive({
       messages,
@@ -22089,7 +22232,10 @@ ${effectiveInstructions}`;
     if (resourceId && threadFromArgs && !this.hasOwnMemory()) {
       this.logger.warn("No memory is configured but resourceId and threadId were passed in args", { agent: this.name });
     }
-    const llm = await this.getLLM({ requestContext, model: options.model });
+    const llm = await this.getLLM({
+      requestContext,
+      model: options.model
+    });
     if ("structuredOutput" in options && options.structuredOutput?.schema && !options.structuredOutput?.model) {
       const structuredOutputModel = llm.getModel();
       const targetProvider = structuredOutputModel.provider;
@@ -22502,7 +22648,8 @@ ${effectiveInstructions}`;
       options ?? {}
     );
     const llm = await this.getLLM({
-      requestContext: mergedOptions.requestContext
+      requestContext: mergedOptions.requestContext,
+      model: mergedOptions.model
     });
     const modelInfo = llm.getModel();
     if (!isSupportedLanguageModel(modelInfo)) {
@@ -22572,7 +22719,8 @@ ${effectiveInstructions}`;
       streamOptions ?? {}
     );
     const llm = await this.getLLM({
-      requestContext: mergedOptions.requestContext
+      requestContext: mergedOptions.requestContext,
+      model: mergedOptions.model
     });
     const modelInfo = llm.getModel();
     if (!isSupportedLanguageModel(modelInfo)) {
@@ -22636,7 +22784,8 @@ ${effectiveInstructions}`;
       streamOptions ?? {}
     );
     const llm = await this.getLLM({
-      requestContext: mergedStreamOptions.requestContext
+      requestContext: mergedStreamOptions.requestContext,
+      model: mergedStreamOptions.model
     });
     if (!isSupportedLanguageModel(llm.getModel())) {
       const modelInfo = llm.getModel();
@@ -22701,7 +22850,8 @@ ${effectiveInstructions}`;
       options ?? {}
     );
     const llm = await this.getLLM({
-      requestContext: mergedOptions.requestContext
+      requestContext: mergedOptions.requestContext,
+      model: mergedOptions.model
     });
     const modelInfo = llm.getModel();
     if (!isSupportedLanguageModel(modelInfo)) {
@@ -27354,5 +27504,5 @@ var MockMemory = class extends MastraMemory {
 };
 
 export { Agent, AgentsMDInjector, BaseProcessor, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MastraScorer, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SkillSearchProcessor, SkillsProcessor, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, ToolSearchProcessor, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, WorkspaceInstructionsProcessor, augmentWithInit, cleanStepResult, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createScorer, createStep, createTimeTravelExecutionParams, createWorkflow, extractWorkingMemoryContent, extractWorkingMemoryTags, formatCheckFeedback, formatCompletionFeedback, formatStreamCompletionFeedback, formatValidationFeedback, forwardAgentStreamChunk, generateFinalResult, generateStructuredFinalResult, getResumeLabelsByStepId, getStepIds, getStepResult, getThreadOMMetadata, globalEmbeddingCache, hydrateSerializedStepErrors, isObservationalMemoryEnabled, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeWorkingMemoryTags, resolveThreadIdFromArgs, runChecks, runCompletionScorers, runCountDeprecationMessage, runDefaultCompletionCheck, runStreamCompletionScorers, runValidation, setThreadOMMetadata, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepRequestContext, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-HOAKFZ6P.js.map
-//# sourceMappingURL=chunk-HOAKFZ6P.js.map
+//# sourceMappingURL=chunk-JIA3SJK6.js.map
+//# sourceMappingURL=chunk-JIA3SJK6.js.map