@mastra/core 0.16.0 → 0.16.1-alpha.1

package/dist/{chunk-YILDTNQM.js → chunk-UM4XJM3Y.js}

@@ -1,14 +1,14 @@
 import { DefaultVoice } from './chunk-QQIBOVFQ.js';
 import { STREAM_FORMAT_SYMBOL, EMITTER_SYMBOL } from './chunk-NLNKQD2T.js';
 import { InstrumentClass, Telemetry } from './chunk-TLJPVRO5.js';
-import { MastraLLMV1 } from './chunk-HGYL2SSF.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-HF7HXOCC.js';
+import { MastraLLMV1 } from './chunk-BQ43NQXK.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-YI3AIJJL.js';
 import { executeHook } from './chunk-TTELJD4F.js';
-import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-WWQ3QRPF.js';
+import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-TDLB5JKT.js';
 import { RuntimeContext } from './chunk-HLRWYUFN.js';
 import { ToolStream } from './chunk-YW7UILPE.js';
 import { createTool, Tool } from './chunk-BJGHUKKM.js';
-import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-WEPWZHE4.js';
+import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-2NKNTPFR.js';
 import { MastraError } from './chunk-MCOVMKIS.js';
 import { MastraBase } from './chunk-6GF5M4GX.js';
 import { ConsoleLogger, RegisteredLogger } from './chunk-X3GXU6TZ.js';
@@ -22,7 +22,7 @@ import { OpenAIReasoningSchemaCompatLayer, OpenAISchemaCompatLayer, GoogleSchema
 import { createTextStreamResponse, createUIMessageStreamResponse, createUIMessageStream, consumeStream, generateId, asSchema, parsePartialJson, isDeepEqualData, tool, stepCountIs } from 'ai-v5';
 import { getErrorMessage, TypeValidationError } from '@ai-sdk/provider-v5';
 import { context, trace } from '@opentelemetry/api';
-import { isAbortError } from '@ai-sdk/provider-utils-v5';
+import { isAbortError, injectJsonInstructionIntoMessages } from '@ai-sdk/provider-utils-v5';
 import { isAbortError as isAbortError$1 } from '@ai-sdk/provider-utils';
 import { get } from 'radash';
 import sift from 'sift';
@@ -1615,22 +1615,32 @@ var ObjectFormatHandler = class extends BaseFormatHandler {
       shouldEmit: false
     };
   }
-  async validateAndTransformFinal(finalValue) {
-    if (!finalValue) {
+  async validateAndTransformFinal(finalRawValue) {
+    if (!finalRawValue) {
       return {
         success: false,
         error: new Error("No object generated: could not parse the response.")
       };
     }
+    let rawValue = finalRawValue;
+    if (typeof finalRawValue === "string" && finalRawValue?.includes?.("```json")) {
+      const match = finalRawValue.match(/```json\s*\n?([\s\S]*?)\n?\s*```/);
+      if (match && match[1]) {
+        rawValue = match[1].trim();
+      }
+    }
+    const {
+      value
+    } = await parsePartialJson(rawValue);
     if (!this.schema) {
       return {
         success: true,
-        value: finalValue
+        value
       };
     }
     try {
       const result = await safeValidateTypes({
-        value: finalValue,
+        value,
         schema: this.schema
       });
       if (result.success) {
@@ -1796,7 +1806,17 @@ var EnumFormatHandler = class extends BaseFormatHandler {
       shouldEmit: false
     };
   }
-  async validateAndTransformFinal(finalValue) {
+  async validateAndTransformFinal(rawFinalValue) {
+    const {
+      value
+    } = await parsePartialJson(rawFinalValue);
+    if (!(typeof value === "object" && value !== null && "result" in value)) {
+      return {
+        success: false,
+        error: new Error("Invalid enum format: expected object with result property")
+      };
+    }
+    const finalValue = value.result;
     if (!finalValue || typeof finalValue !== "object" || typeof finalValue.result !== "string") {
       return {
         success: false,
@@ -1902,7 +1922,7 @@ function createObjectStreamTransformer({
         onFinish(void 0);
         return;
       }
-      const finalResult = await handler.validateAndTransformFinal(previousObject);
+      const finalResult = await handler.validateAndTransformFinal(accumulatedText);
       if (!finalResult.success) {
         controller.enqueue({
           from: "AGENT" /* AGENT */,
@@ -2929,6 +2949,12 @@ var AISDKV5InputStream = class extends MastraModelInput {
   }
 };
 
+// src/stream/aisdk/v5/model-supports.ts
+function getModelSupport(modelId, provider) {
+  return modelSupports.find(m => m.modelId === modelId && m.provider === provider);
+}
+var modelSupports = [];
+
 // src/stream/aisdk/v5/execute.ts
 function execute({
   runId,
@@ -2960,6 +2986,16 @@ function execute({
       "stream.prompt.tools": toolsAndToolChoice?.tools?.map(tool => JSON.stringify(tool))
     });
   }
+  const modelSupports2 = getModelSupport(model.modelId, model.provider);
+  const modelSupportsResponseFormat = modelSupports2?.capabilities.responseFormat?.support === "full";
+  const responseFormat = output ? getResponseFormat(output) : void 0;
+  let prompt = inputMessages;
+  if (output && responseFormat?.type === "json" && !modelSupportsResponseFormat) {
+    prompt = injectJsonInstructionIntoMessages({
+      messages: inputMessages,
+      schema: responseFormat.schema
+    });
+  }
   const stream = v5.initialize({
     runId,
     onResult,
@@ -2967,11 +3003,11 @@ function execute({
       try {
         const stream2 = await model.doStream({
           ...toolsAndToolChoice,
-          prompt: inputMessages,
+          prompt,
           providerOptions,
           abortSignal: options?.abortSignal,
           includeRawChunks,
-          responseFormat: output ? getResponseFormat(output) : void 0,
+          responseFormat: modelSupportsResponseFormat ? responseFormat : void 0,
           ...(modelSettings ?? {}),
           headers
         });
@@ -3769,7 +3805,9 @@ function createOuterLLMWorkflow({
       })));
     }
     return inputData.output.toolCalls || [];
-  }).foreach(toolCallStep).then(llmMappingStep).commit();
+  }).foreach(toolCallStep, {
+    concurrency: 10
+  }).then(llmMappingStep).commit();
 }
 
 // src/loop/workflow/stream.ts
@@ -4124,9 +4162,6 @@ var MastraLLMVNext = class extends MastraBase {
       messages,
       tools: Object.keys(tools || {})
     });
-    if (output) {
-      output = this._applySchemaCompat(output);
-    }
     const llmAISpan = tracingContext?.currentSpan?.createChildSpan({
       name: `llm stream: '${model.modelId}'`,
       type: "llm_generation" /* LLM_GENERATION */,
@@ -4278,14 +4313,18 @@ var StructuredOutputProcessor = class {
   structuringAgent;
   errorStrategy;
   fallbackValue;
-  constructor(options) {
+  constructor(options, fallbackModel) {
     this.schema = options.schema;
     this.errorStrategy = options.errorStrategy ?? "strict";
     this.fallbackValue = options.fallbackValue;
+    const modelToUse = options.model || fallbackModel;
+    if (!modelToUse) {
+      throw new Error("StructuredOutputProcessor requires a model to be provided either in options or as fallback");
+    }
     this.structuringAgent = new Agent({
       name: "structured-output-structurer",
       instructions: options.instructions || this.generateInstructions(),
-      model: options.model
+      model: modelToUse
     });
   }
   async processOutputResult(args) {
@@ -9910,8 +9949,8 @@ var Agent = class extends (_a = MastraBase) {
     threadId,
     resourceId,
     runtimeContext,
-    methodType,
     tracingContext,
+    methodType,
     format
   }) {
     const convertedWorkflowTools = {};
@@ -9930,17 +9969,9 @@ var Agent = class extends (_a = MastraBase) {
           // current tool span onto the workflow to maintain continuity of the trace
           execute: async ({
             context,
-            writer
+            writer,
+            tracingContext: innerTracingContext
           }) => {
-            const toolAISpan = tracingContext.currentSpan?.createChildSpan({
-              type: "tool_call" /* TOOL_CALL */,
-              name: `tool: '${workflowName}'`,
-              input: context,
-              attributes: {
-                toolId: workflowName,
-                toolType: "workflow"
-              }
-            });
             try {
               this.logger.debug(`[Agent:${this.name}] - Executing workflow as tool ${workflowName}`, {
                 name: workflowName,
@@ -9956,16 +9987,13 @@ var Agent = class extends (_a = MastraBase) {
                 result = await run.start({
                   inputData: context,
                   runtimeContext,
-                  tracingContext: {
-                    currentSpan: toolAISpan
-                  }
+                  tracingContext: innerTracingContext
                 });
               } else if (methodType === "stream") {
-                const streamResult = await run.stream({
+                const streamResult = run.stream({
                   inputData: context,
-                  runtimeContext
-                  // TODO: is this forgottn?
-                  //currentSpan: toolAISpan,
+                  runtimeContext,
+                  tracingContext: innerTracingContext
                 });
                 if (writer) {
                   await streamResult.stream.pipeTo(writer);
@@ -9977,6 +10005,7 @@ var Agent = class extends (_a = MastraBase) {
                 const streamResult = run.streamVNext({
                   inputData: context,
                   runtimeContext,
+                  tracingContext: innerTracingContext,
                   format
                 });
                 if (writer) {
@@ -9984,9 +10013,6 @@ var Agent = class extends (_a = MastraBase) {
                 }
                 result = await streamResult.result;
               }
-              toolAISpan?.end({
-                output: result
-              });
               return {
                 result,
                 runId: run.runId
@@ -10006,9 +10032,6 @@ var Agent = class extends (_a = MastraBase) {
               }, err);
               this.logger.trackException(mastraError);
               this.logger.error(mastraError.toString());
-              toolAISpan?.error({
-                error: mastraError
-              });
               throw mastraError;
             }
           }
@@ -10324,7 +10347,9 @@ var Agent = class extends (_a = MastraBase) {
             saveThread: false
           });
         }
-        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread ? this.getMemoryMessages({
+        const config = memory.getMergedThreadConfig(memoryConfig || {});
+        const hasResourceScopeSemanticRecall = typeof config?.semanticRecall === "object" && config?.semanticRecall?.scope === "resource";
+        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread || hasResourceScopeSemanticRecall ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
           vectorMessageSearch: new MessageList().add(messages, `user`).getLatestUserContent() || "",
@@ -10993,12 +11018,12 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           resourceId,
           runId,
           runtimeContext,
-          writableStream: options.writableStream,
-          methodType,
-          format,
           tracingContext: {
             currentSpan: agentAISpan
-          }
+          },
+          writableStream: options.writableStream,
+          methodType,
+          format
         });
         return {
           convertedTools
@@ -11100,7 +11125,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             saveThread: false
           });
         }
-        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread ? this.getMemoryMessages({
+        const config = memory.getMergedThreadConfig(memoryConfig || {});
+        const hasResourceScopeSemanticRecall = typeof config?.semanticRecall === "object" && config?.semanticRecall?.scope === "resource";
+        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread || hasResourceScopeSemanticRecall ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
           vectorMessageSearch: new MessageList().add(options.messages, `user`).getLatestUserContent() || "",
@@ -11331,7 +11358,10 @@ the following messages are from ${ymd}
         runtimeContext: result2.runtimeContext
       }) : this.#outputProcessors : []);
       if (options.structuredOutput) {
-        const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
+        const agentModel = await this.getModel({
+          runtimeContext: result2.runtimeContext
+        });
+        const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput, agentModel);
         effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
       }
       const loopOptions = {
@@ -11388,7 +11418,9 @@ the following messages are from ${ymd}
             await options?.onFinish?.({
               ...result2,
               runId,
-              messages: messageList.get.response.aiV5.model()
+              messages: messageList.get.response.aiV5.model(),
+              usage: payload.usage,
+              totalUsage: payload.totalUsage
             });
           },
           onStepFinish: result2.onStepFinish
@@ -11699,7 +11731,10 @@ the following messages are from ${ymd}
     };
     let finalOutputProcessors = mergedGenerateOptions.outputProcessors;
     if (mergedGenerateOptions.structuredOutput) {
-      const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput);
+      const agentModel = await this.getModel({
+        runtimeContext: mergedGenerateOptions.runtimeContext
+      });
+      const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput, agentModel);
       finalOutputProcessors = finalOutputProcessors ? [...finalOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
     if (!output || experimental_output) {
@@ -12265,9 +12300,9 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
       deferredPromise.reject = reject;
     });
     const updateUsageCount = usage => {
-      this.#usageCount.promptTokens += parseInt(usage.promptTokens?.toString() ?? "0", 10);
-      this.#usageCount.completionTokens += parseInt(usage.completionTokens?.toString() ?? "0", 10);
-      this.#usageCount.totalTokens += parseInt(usage.totalTokens?.toString() ?? "0", 10);
+      this.#usageCount.promptTokens += parseInt(usage?.promptTokens?.toString() ?? "0", 10);
+      this.#usageCount.completionTokens += parseInt(usage?.completionTokens?.toString() ?? "0", 10);
+      this.#usageCount.totalTokens += parseInt(usage?.totalTokens?.toString() ?? "0", 10);
     };
     super({
       start: async controller => {
@@ -12275,7 +12310,9 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           write: chunk => {
             if (chunk.type === "step-output" && chunk.payload?.output?.from === "AGENT" && chunk.payload?.output?.type === "finish" || chunk.type === "step-output" && chunk.payload?.output?.from === "WORKFLOW" && chunk.payload?.output?.type === "finish") {
               const finishPayload = chunk.payload?.output.payload;
-              updateUsageCount(finishPayload.usage);
+              if (finishPayload) {
+                updateUsageCount(finishPayload.usage);
+              }
             }
             controller.enqueue(chunk);
           }
@@ -12287,9 +12324,14 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           payload: {}
         });
         const stream = await createStream(writer);
+        let workflowStatus = "success";
         for await (const chunk of stream) {
-          if (chunk.type === "step-finish") {
+          if (chunk.type === "step-finish" && chunk.payload.usage) {
             updateUsageCount(chunk.payload.usage);
+          } else if (chunk.type === "workflow-canceled") {
+            workflowStatus = "canceled";
+          } else if (chunk.type === "workflow-step-result" && chunk.payload.status === "failed") {
+            workflowStatus = "failed";
           }
           controller.enqueue(chunk);
         }
@@ -12298,9 +12340,7 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           runId: run.runId,
           from: "WORKFLOW" /* WORKFLOW */,
           payload: {
-            stepResult: {
-              reason: "stop"
-            },
+            workflowStatus,
             output: {
               usage: this.#usageCount
             },
@@ -14434,6 +14474,12 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       workflowStatus: execResults.status === "success" ? "running" : execResults.status,
       runtimeContext
     });
+    if (execResults.status === "canceled") {
+      await emitter.emit("watch-v2", {
+        type: "workflow-canceled",
+        payload: {}
+      });
+    }
     return {
       result: execResults,
       stepResults,
@@ -15138,6 +15184,8 @@ var Workflow = class extends MastraBase {
     }
     return scorers;
   }
+  // This method should only be called internally for nested workflow execution, as well as from mastra server handlers
+  // To run a workflow use `.createRunAsync` and then `.start` or `.resume`
   async execute({
     runId,
     inputData,
@@ -15475,7 +15523,8 @@ var Run = class {
    */
   stream({
     inputData,
-    runtimeContext
+    runtimeContext,
+    tracingContext
   } = {}) {
     const {
       readable,
@@ -15540,7 +15589,8 @@ var Run = class {
     this.executionResults = this._start({
       inputData,
       runtimeContext,
-      format: "aisdk"
+      format: "aisdk",
+      tracingContext
     }).then(result => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {});
@@ -15569,12 +15619,13 @@ var Run = class {
   streamVNext({
     inputData,
     runtimeContext,
+    tracingContext,
     format
   } = {}) {
     this.closeStreamAction = async () => {};
     return new MastraWorkflowStream({
       run: this,
-      createStream: writer => {
+      createStream: () => {
         const {
           readable,
           writable
@@ -15592,7 +15643,7 @@ var Run = class {
             return;
           }
           isWriting = true;
-          let watchWriter = writer.getWriter();
+          let watchWriter = writable.getWriter();
           try {
             for (const chunk of chunkToWrite) {
               await watchWriter.write(chunk);
@@ -15630,6 +15681,7 @@ var Run = class {
         const executionResults = this._start({
           inputData,
           runtimeContext,
+          tracingContext,
           writableStream: writable,
           format
         }).then(result => {
@@ -15869,5 +15921,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-YILDTNQM.js.map
-//# sourceMappingURL=chunk-YILDTNQM.js.map
+//# sourceMappingURL=chunk-UM4XJM3Y.js.map
+//# sourceMappingURL=chunk-UM4XJM3Y.js.map