@mastra/core 1.18.0 → 1.18.1-alpha.1

package/dist/{chunk-ZRLAR66M.js → chunk-AJZQPWAV.js}

@@ -1,16 +1,16 @@
 import { DefaultVoice } from './chunk-YDLGEJ7W.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-2QXNHEDL.js';
-import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-HRT662B6.js';
-import { InMemoryStore } from './chunk-MJF7NZEF.js';
+import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-EAJDF6UV.js';
+import { InMemoryStore } from './chunk-OLHODPXN.js';
 import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-SLZ3WO42.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-EKFG6JWW.js';
-import { MastraLLMV1 } from './chunk-K7AE4BHR.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-PB3KXPNE.js';
+import { MastraLLMV1 } from './chunk-VMBWVH4B.js';
 import { noopLogger } from './chunk-PSCMWPLC.js';
 import { EventEmitterPubSub } from './chunk-X2HAI3OX.js';
-import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, delay } from './chunk-4FMKWOPC.js';
+import { removeUndefinedValues, safeStringify, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, ensureSerializable, delay } from './chunk-X4Q4KB6C.js';
 import { resolveObservabilityContext, EntityType, createObservabilityContext, getRootExportSpan, getOrCreateSpan, wrapMastra, executeWithContext, executeWithContextSync } from './chunk-KRFGPA2H.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
 import { Tool, createTool, isMastraTool, isProviderTool, getProviderToolName, isProviderDefinedTool } from './chunk-FA4PTEBK.js';
@@ -618,10 +618,16 @@ function prepareToolsAndToolChoice({
   activeTools,
   targetVersion = "v2"
 }) {
+  if (toolChoice === "none") {
+    return {
+      tools: void 0,
+      toolChoice: { type: "none" }
+    };
+  }
   if (Object.keys(tools || {}).length === 0) {
     return {
       tools: void 0,
-      toolChoice: toolChoice === "none" ? { type: "none" } : void 0
+      toolChoice: void 0
     };
   }
   const filteredTools = activeTools != null ? Object.entries(tools || {}).filter(([name]) => activeTools.includes(name)) : Object.entries(tools || {});
@@ -8307,6 +8313,16 @@ function isToolStep(input) {
 function isStepParams(input) {
   return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof Tool);
 }
+function findStepInGraph(graph, stepId) {
+  for (const entry of graph) {
+    if ("step" in entry && entry.step?.id === stepId) return entry;
+    if ((entry.type === "conditional" || entry.type === "parallel") && "steps" in entry) {
+      const found = findStepInGraph(entry.steps, stepId);
+      if (found) return found;
+    }
+  }
+  return void 0;
+}
 function createStep(params, agentOrToolOptions) {
   if (isAgent(params)) {
     return createStepFromAgent(params, agentOrToolOptions);
@@ -9787,7 +9803,7 @@ var Workflow = class extends MastraBase {
     const { input, ...steps } = context;
     let finalSteps = {};
     for (const step of Object.keys(steps)) {
-      const stepGraph = serializedStepGraph.find((stepGraph2) => stepGraph2?.step?.id === step);
+      const stepGraph = findStepInGraph(serializedStepGraph, step);
       finalSteps[step] = steps[step];
       if (stepGraph && stepGraph?.step?.component === "WORKFLOW") {
         const stepResult = steps[step];
@@ -11564,7 +11580,7 @@ async function runDefaultCompletionCheck(agent, context, streamContext, abortSig
 Primitives already executed: ${completedPrimitives.join(", ")}` : "";
   const completionPrompt = `
     The ${context.selectedPrimitive.type} ${context.selectedPrimitive.id} has contributed to the task.
-    This is the result: ${JSON.stringify(context.primitiveResult)}
+    This is the result: ${safeStringify(context.primitiveResult)}
     
     ${completedSection}
 
@@ -11660,7 +11676,7 @@ async function generateFinalResult(agent, context, streamContext, abortSignal, o
     Original task: ${context.originalTask}
 
     The ${context.selectedPrimitive.type} ${context.selectedPrimitive.id} produced this result:
-    ${JSON.stringify(context.primitiveResult)}
+    ${safeStringify(context.primitiveResult)}
 
     IMPORTANT: If the above result is from an AGENT PRIMITIVE and it is a suitable final result itself considering the original task, then finalResult should be an empty string or undefined.
     You should evaluate if the above result is comprehensive enough to accomplish the user's original task.
@@ -11718,7 +11734,7 @@ async function generateStructuredFinalResult(agent, context, structuredOutputOpt
     Original task: ${context.originalTask}
 
     The ${context.selectedPrimitive.type} ${context.selectedPrimitive.id} produced this result:
-    ${JSON.stringify(context.primitiveResult)}
+    ${safeStringify(context.primitiveResult)}
 
     Based on the task and result above, generate a structured response according to the provided schema.
     Use the conversation history and primitive results to craft the response.
@@ -13912,7 +13928,8 @@ function createToolCallStep({
             args.resourceId = _internal?.resourceId;
           }
         }
-        const result = await tool2.execute(args, toolOptions);
+        const rawResult = await tool2.execute(args, toolOptions);
+        const result = ensureSerializable(rawResult);
         if (tool2 && "onOutput" in tool2 && typeof tool2.onOutput === "function") {
           try {
             await tool2.onOutput({
@@ -18437,7 +18454,16 @@ function createMapResultsStep({
                 ...modelId && { modelId }
               });
             }
-            agentSpan?.error({ error: payload.error, endSpan: true });
+            const error = payload.error instanceof Error ? payload.error : new MastraError(
+              {
+                id: "AGENT_STREAM_ERROR",
+                domain: "AGENT" /* AGENT */,
+                category: "SYSTEM" /* SYSTEM */,
+                details: { runId }
+              },
+              payload.error
+            );
+            agentSpan?.error({ error, endSpan: true });
             return;
           }
           const aborted = options.abortSignal?.aborted;
@@ -18465,7 +18491,19 @@ function createMapResultsStep({
                 error: e,
                 runId
               });
+              const spanError = e instanceof Error ? e : new MastraError(
+                {
+                  id: "AGENT_ON_FINISH_ERROR",
+                  domain: "AGENT" /* AGENT */,
+                  category: "SYSTEM" /* SYSTEM */,
+                  details: { runId }
+                },
+                e
+              );
+              agentSpan?.error({ error: spanError, endSpan: true });
             }
+          } else {
+            agentSpan?.end();
           }
           await options?.onFinish?.({
             ...payload,
@@ -21114,10 +21152,7 @@ ${effectiveInstructions}`;
                   this.logger.error(`[Agent:${this.name}] - messageFilter error: ${filterError}`);
                 }
               }
-              const messagesForSubAgent = [
-                ...filteredContextMessages,
-                { role: "user", content: effectivePrompt }
-              ];
+              const messagesForSubAgent = [{ role: "user", content: effectivePrompt }];
               const subAgentPromptCreatedAt = /* @__PURE__ */ new Date();
               if ((methodType === "generate" || methodType === "generateLegacy") && supportedLanguageModelSpecifications.includes(modelVersion)) {
                 const generateResult = resumeData ? await agent.resumeGenerate(resumeData, {
@@ -21126,6 +21161,7 @@ ${effectiveInstructions}`;
                   ...resolveObservabilityContext(context ?? {}),
                   ...effectiveInstructions && { instructions: effectiveInstructions },
                   ...effectiveMaxSteps && { maxSteps: effectiveMaxSteps },
+                  context: filteredContextMessages,
                   ...resourceId && threadId && !subAgentHasOwnMemoryConfig ? {
                     memory: {
                       resource: subAgentResourceId,
@@ -21138,6 +21174,7 @@ ${effectiveInstructions}`;
                   ...resolveObservabilityContext(context ?? {}),
                   ...effectiveInstructions && { instructions: effectiveInstructions },
                   ...effectiveMaxSteps && { maxSteps: effectiveMaxSteps },
+                  context: filteredContextMessages,
                   ...resourceId && threadId && !subAgentHasOwnMemoryConfig ? {
                     memory: {
                       resource: subAgentResourceId,
@@ -21199,7 +21236,8 @@ ${effectiveInstructions}`;
               } else if (methodType === "generate" && modelVersion === "v1") {
                 const generateResult = await agent.generateLegacy(messagesForSubAgent, {
                   requestContext,
-                  ...resolveObservabilityContext(context ?? {})
+                  ...resolveObservabilityContext(context ?? {}),
+                  context: filteredContextMessages
                 });
                 result = { text: generateResult.text };
               } else if ((methodType === "stream" || methodType === "streamLegacy") && supportedLanguageModelSpecifications.includes(modelVersion)) {
@@ -21209,6 +21247,7 @@ ${effectiveInstructions}`;
                   ...resolveObservabilityContext(context ?? {}),
                   ...effectiveInstructions && { instructions: effectiveInstructions },
                   ...effectiveMaxSteps && { maxSteps: effectiveMaxSteps },
+                  context: filteredContextMessages,
                   ...resourceId && threadId && !subAgentHasOwnMemoryConfig ? {
                     memory: {
                       resource: subAgentResourceId,
@@ -21223,6 +21262,7 @@ ${effectiveInstructions}`;
                   ...resolveObservabilityContext(context ?? {}),
                   ...effectiveInstructions && { instructions: effectiveInstructions },
                   ...effectiveMaxSteps && { maxSteps: effectiveMaxSteps },
+                  context: filteredContextMessages,
                   ...resourceId && threadId && !subAgentHasOwnMemoryConfig ? {
                     memory: {
                       resource: subAgentResourceId,
@@ -27293,5 +27333,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-ZRLAR66M.js.map
-//# sourceMappingURL=chunk-ZRLAR66M.js.map
+//# sourceMappingURL=chunk-AJZQPWAV.js.map
+//# sourceMappingURL=chunk-AJZQPWAV.js.map