@mastra/core 1.0.0-beta.15 → 1.0.0-beta.17

package/dist/{chunk-NGWTSHNA.js → chunk-YORDI4E7.js}

@@ -1,18 +1,18 @@
-import { DefaultVoice } from './chunk-O7M7DR4E.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-6PMMP3FR.js';
-import { InMemoryStore } from './chunk-3HDRO3GG.js';
+import { DefaultVoice } from './chunk-O7M7DR4E.js';
+import { InMemoryStore } from './chunk-RC7RN5MY.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-BAZHNX5P.js';
-import { MastraLLMV1 } from './chunk-4J4M2Q5R.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-I55X7FYN.js';
+import { MastraLLMV1 } from './chunk-ABMWK6JU.js';
 import { PubSub } from './chunk-BVUMKER5.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, deepMerge, selectFields, delay } from './chunk-XJB7J4UT.js';
-import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-ZGIVAQRI.js';
+import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, deepMerge, selectFields, delay } from './chunk-JBEKXEX6.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-4HP7CS6L.js';
+import { Tool, createTool } from './chunk-5YYAQUEF.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;
     }
   }
@@ -2456,7 +2459,6 @@ var AISDKV5OutputStream = class {
   async getFullOutput() {
     await this.consumeStream({
       onError: (error) => {
-        console.error(error);
         throw error;
       }
     });
@@ -3873,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);
@@ -3885,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;
       }
     });
@@ -9253,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 };
   }
@@ -9302,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();
       }
@@ -9360,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();
       }
@@ -9452,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({
@@ -9573,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({
@@ -9625,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);
@@ -10017,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({
@@ -10462,7 +10473,8 @@ async function processOutputStream({
   options,
   controller,
   responseFromModel,
-  includeRawChunks
+  includeRawChunks,
+  logger
 }) {
   for await (const chunk of outputStream._getBaseStream()) {
     if (!chunk) {
@@ -10545,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)) {
@@ -10564,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)) {
@@ -10754,7 +10766,7 @@ async function processOutputStream({
     }
   }
 }
-function executeStreamWithFallbackModels(models) {
+function executeStreamWithFallbackModels(models, logger) {
   return async (callback) => {
     let index = 0;
     let finalResult;
@@ -10778,7 +10790,7 @@ function executeStreamWithFallbackModels(models) {
             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;
           }
@@ -10788,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;
@@ -10829,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) {
@@ -10919,7 +10935,7 @@ function createLLMExecutionStep({
                 stepTools: tools
               };
             }
-            console.error("Error in processInputStep processors:", error);
+            logger?.error("Error in processInputStep processors:", error);
             throw error;
           }
         }
@@ -11045,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 ?? []
@@ -11182,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;
           }
         }
@@ -11448,7 +11465,8 @@ function createToolCallStep({
   runId,
   streamState,
   modelSpanTracker,
-  _internal
+  _internal,
+  logger
 }) {
   return createStep({
     id: "toolCallStep",
@@ -11515,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);
             }
           }
         }
@@ -11539,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) {
@@ -11560,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) {
@@ -11583,7 +11601,7 @@ function createToolCallStep({
             const needsApprovalResult = await tool2.needsApprovalFn(args);
             toolRequiresApproval = needsApprovalResult;
           } catch (error) {
-            console.error(`Error evaluating needsApprovalFn for tool ${inputData.toolName}:`, error);
+            logger?.error(`Error evaluating needsApprovalFn for tool ${inputData.toolName}:`, error);
             toolRequiresApproval = true;
           }
         }
@@ -11688,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 };
@@ -14662,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({
@@ -21029,5 +21050,5 @@ 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, 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-NGWTSHNA.js.map
-//# sourceMappingURL=chunk-NGWTSHNA.js.map
+//# sourceMappingURL=chunk-YORDI4E7.js.map
+//# sourceMappingURL=chunk-YORDI4E7.js.map