@mastra/core 1.3.0 → 1.4.0

package/dist/{chunk-YNXIGRQE.cjs → chunk-4IJ4UDZX.cjs}

@@ -1,21 +1,21 @@
 'use strict';
 
-var chunkCGPH7CMG_cjs = require('./chunk-CGPH7CMG.cjs');
+var chunk4KFEMXTV_cjs = require('./chunk-4KFEMXTV.cjs');
 var chunkRQ56ZSIR_cjs = require('./chunk-RQ56ZSIR.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
-var chunkTERSHTY5_cjs = require('./chunk-TERSHTY5.cjs');
-var chunkUE2G2LRP_cjs = require('./chunk-UE2G2LRP.cjs');
+var chunkBP7VYTOP_cjs = require('./chunk-BP7VYTOP.cjs');
+var chunkCZ4NQANZ_cjs = require('./chunk-CZ4NQANZ.cjs');
 var chunkZIEQA3YP_cjs = require('./chunk-ZIEQA3YP.cjs');
 var chunkPM3UIIBK_cjs = require('./chunk-PM3UIIBK.cjs');
-var chunkGCTAD6B7_cjs = require('./chunk-GCTAD6B7.cjs');
-var chunkON2KVIUJ_cjs = require('./chunk-ON2KVIUJ.cjs');
+var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
+var chunkVD5YA6RH_cjs = require('./chunk-VD5YA6RH.cjs');
+var chunkHYRYTTMT_cjs = require('./chunk-HYRYTTMT.cjs');
 var chunk6BJ7XHRH_cjs = require('./chunk-6BJ7XHRH.cjs');
 var chunk4D4KB75Y_cjs = require('./chunk-4D4KB75Y.cjs');
-var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkOOCEAC6U_cjs = require('./chunk-OOCEAC6U.cjs');
+var chunk65PHUUMF_cjs = require('./chunk-65PHUUMF.cjs');
+var chunkCYUP7QWT_cjs = require('./chunk-CYUP7QWT.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
 var chunk7UWHFWST_cjs = require('./chunk-7UWHFWST.cjs');
-var chunkCYUP7QWT_cjs = require('./chunk-CYUP7QWT.cjs');
 var chunkVDKWYUGC_cjs = require('./chunk-VDKWYUGC.cjs');
 var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
@@ -1018,6 +1018,45 @@ function resolveThreadIdFromArgs(args) {
   if (args?.threadId) return { id: args.threadId };
   return void 0;
 }
+var CLAUDE_46_PATTERN = /[^0-9]4[.-]6/;
+function isMaybeClaude46(model) {
+  if (typeof model === "function") return true;
+  if (Array.isArray(model)) {
+    return model.some((m) => isMaybeClaude46(m.model ?? m));
+  }
+  if (typeof model === "string") {
+    return model.startsWith("anthropic") && CLAUDE_46_PATTERN.test(model);
+  }
+  if (model && typeof model === "object" && "provider" in model && "modelId" in model) {
+    const { provider, modelId } = model;
+    return provider.startsWith("anthropic") && CLAUDE_46_PATTERN.test(modelId);
+  }
+  return true;
+}
+var TrailingAssistantGuard = class {
+  id = "trailing-assistant-guard";
+  name = "Trailing Assistant Guard";
+  processInputStep({ messages, structuredOutput }) {
+    const willUseResponseFormat = structuredOutput?.schema && !structuredOutput?.model && !structuredOutput?.jsonPromptInjection;
+    if (!willUseResponseFormat) return;
+    const lastMessage = messages[messages.length - 1];
+    if (!lastMessage || lastMessage.role !== "assistant") return;
+    return {
+      messages: [
+        ...messages,
+        {
+          id: crypto2.randomUUID(),
+          role: "user",
+          content: {
+            format: 2,
+            parts: [{ type: "text", text: "Generate the structured response." }]
+          },
+          createdAt: /* @__PURE__ */ new Date()
+        }
+      ]
+    };
+  }
+};
 
 // src/processors/runner.ts
 var ProcessorState = class {
@@ -1145,11 +1184,23 @@ var ProcessorRunner = class _ProcessorRunner {
       );
     }
     if (result.status !== "success") {
+      const details = [];
+      if (result.status === "failed") {
+        if (result.error) {
+          details.push(result.error.message || JSON.stringify(result.error));
+        }
+        for (const [stepId, step] of Object.entries(result.steps)) {
+          if (step.status === "failed" && step.error?.message) {
+            details.push(`step ${stepId}: ${step.error.message}`);
+          }
+        }
+      }
+      const detailStr = details.length > 0 ? ` \u2014 ${details.join("; ")}` : "";
       throw new chunk4U7ZLI36_cjs.MastraError({
         category: "USER",
         domain: "AGENT",
         id: "PROCESSOR_WORKFLOW_FAILED",
-        text: `Processor workflow ${workflow.id} failed with status: ${result.status}`
+        text: `Processor workflow ${workflow.id} failed with status: ${result.status}${detailStr}`
       });
     }
     const output = result.result;
@@ -1222,7 +1273,7 @@ var ProcessorRunner = class _ProcessorRunner {
         writer
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+      if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
@@ -1474,7 +1525,7 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       let mutations;
-      if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+      if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
@@ -1569,7 +1620,8 @@ var ProcessorRunner = class _ProcessorRunner {
       structuredOutput: args.structuredOutput,
       retryCount: args.retryCount ?? 0
     };
-    for (const [index, processorOrWorkflow] of this.inputProcessors.entries()) {
+    const processors = stepInput.model && isMaybeClaude46(stepInput.model) ? [...this.inputProcessors, new TrailingAssistantGuard()] : this.inputProcessors;
+    for (const [index, processorOrWorkflow] of processors.entries()) {
       const processableMessages = messageList.get.all.db();
       const idsBeforeProcessing = processableMessages.map((m) => m.id);
       const check = messageList.makeMessageSourceChecker();
@@ -1801,7 +1853,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+        if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1871,7 +1923,7 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+    if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
       if (result !== messageList) {
         throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
@@ -1906,7 +1958,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkGCTAD6B7_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkVD5YA6RH_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -2975,7 +3027,7 @@ var MastraModelOutput = class extends chunkRO47SMI7_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunkUE2G2LRP_cjs.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkCZ4NQANZ_cjs.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -4287,7 +4339,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkUE2G2LRP_cjs.DefaultGeneratedFile({
+          file: new chunkCZ4NQANZ_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -4295,7 +4347,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkUE2G2LRP_cjs.DefaultGeneratedFileWithType({
+        file: new chunkCZ4NQANZ_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -4909,7 +4961,7 @@ async function validateStepInput({
 }) {
   let inputData = prevOutput;
   let validationError;
-  if (validateInputs && chunkOOCEAC6U_cjs.isZodType(step.inputSchema)) {
+  if (validateInputs && chunk65PHUUMF_cjs.isZodType(step.inputSchema)) {
     const inputSchema = step.inputSchema;
     const validatedInput = await inputSchema.safeParseAsync(prevOutput);
     if (!validatedInput.success) {
@@ -4938,7 +4990,7 @@ async function validateStepResumeData({ resumeData, step }) {
   }
   let validationError;
   const resumeSchema = step.resumeSchema;
-  if (resumeSchema && chunkOOCEAC6U_cjs.isZodType(resumeSchema)) {
+  if (resumeSchema && chunk65PHUUMF_cjs.isZodType(resumeSchema)) {
     const validatedResumeData = await resumeSchema.safeParseAsync(resumeData);
     if (!validatedResumeData.success) {
       const errors = getZodErrors(validatedResumeData.error);
@@ -4969,7 +5021,7 @@ async function validateStepSuspendData({
   }
   let validationError;
   const suspendSchema = step.suspendSchema;
-  if (suspendSchema && validateInputs && chunkOOCEAC6U_cjs.isZodType(suspendSchema)) {
+  if (suspendSchema && validateInputs && chunk65PHUUMF_cjs.isZodType(suspendSchema)) {
     const validatedSuspendData = await suspendSchema.safeParseAsync(suspendData);
     if (!validatedSuspendData.success) {
       const errors = getZodErrors(validatedSuspendData.error);
@@ -5000,7 +5052,7 @@ async function validateStepStateData({
   }
   let validationError;
   const stateSchema = step.stateSchema;
-  if (stateSchema && validateInputs && chunkOOCEAC6U_cjs.isZodType(stateSchema)) {
+  if (stateSchema && validateInputs && chunk65PHUUMF_cjs.isZodType(stateSchema)) {
     const validatedStateData = await stateSchema.safeParseAsync(stateData);
     if (!validatedStateData.success) {
       const errors = getZodErrors(validatedStateData.error);
@@ -5019,7 +5071,7 @@ async function validateStepRequestContext({
 }) {
   let validationError;
   const requestContextSchema = step.requestContextSchema;
-  if (requestContextSchema && validateInputs && chunkOOCEAC6U_cjs.isZodType(requestContextSchema)) {
+  if (requestContextSchema && validateInputs && chunk65PHUUMF_cjs.isZodType(requestContextSchema)) {
     const contextValues = requestContext?.all ?? {};
     const validatedRequestContext = await requestContextSchema.safeParseAsync(contextValues);
     if (!validatedRequestContext.success) {
@@ -5155,7 +5207,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkOOCEAC6U_cjs.removeUndefinedValues(result);
+        const formattedResult = chunk65PHUUMF_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -5715,7 +5767,7 @@ async function executeLoop(engine, params) {
       options: {
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: '${entry.loopType}'`,
-        input: chunkOOCEAC6U_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunk65PHUUMF_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         },
@@ -5851,6 +5903,8 @@ async function executeForeach(engine, params) {
   const prevForeachOutput = prevPayload?.suspendPayload?.__workflow_meta?.foreachOutput || [];
   const prevResumeLabels = prevPayload?.suspendPayload?.__workflow_meta?.resumeLabels || {};
   const resumeLabels = getResumeLabelsByStepId(prevResumeLabels, step.id);
+  const totalCount = prevOutput.length;
+  let completedCount = 0;
   for (let i = 0; i < prevOutput.length; i += concurrency) {
     const items = prevOutput.slice(i, i + concurrency);
     const itemsResults = await Promise.all(
@@ -5901,7 +5955,36 @@ async function executeForeach(engine, params) {
         const execResults = { status, error, suspendPayload, suspendedAt, endedAt, output };
         if (execResults.status === "suspended") {
           foreachIndexObj[i + resultIndex] = execResults;
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: {
+              type: "workflow-step-progress",
+              payload: {
+                id: step.id,
+                completedCount,
+                totalCount,
+                currentIndex: i + resultIndex,
+                iterationStatus: "suspended"
+              }
+            }
+          });
         } else {
+          completedCount++;
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: {
+              type: "workflow-step-progress",
+              payload: {
+                id: step.id,
+                completedCount,
+                totalCount,
+                currentIndex: i + resultIndex,
+                iterationStatus: "failed"
+              }
+            }
+          });
           await pubsub.publish(`workflow.events.v2.${runId}`, {
             type: "watch",
             runId,
@@ -5927,6 +6010,22 @@ async function executeForeach(engine, params) {
           return result;
         }
       } else {
+        completedCount++;
+        await pubsub.publish(`workflow.events.v2.${runId}`, {
+          type: "watch",
+          runId,
+          data: {
+            type: "workflow-step-progress",
+            payload: {
+              id: step.id,
+              completedCount,
+              totalCount,
+              currentIndex: i + resultIndex,
+              iterationStatus: "success",
+              iterationOutput: result?.output
+            }
+          }
+        });
         const indexResumeLabel = Object.keys(resumeLabels).find(
           (key) => resumeLabels[key]?.foreachIndex === i + resultIndex
         );
@@ -8122,7 +8221,7 @@ function createStepFromProcessor(processor) {
         phase,
         // Auto-create MessageList from messages if not provided
         // This enables running processor workflows from the UI where messageList can't be serialized
-        messageList: messageList ?? (Array.isArray(messages) ? new chunkUE2G2LRP_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+        messageList: messageList ?? (Array.isArray(messages) ? new chunkCZ4NQANZ_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
         stepNumber,
         systemMessages,
         streamParts,
@@ -8176,7 +8275,7 @@ function createStepFromProcessor(processor) {
                 messageList: checkedMessageList,
                 systemMessages: systemMessages ?? []
               });
-              if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+              if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8340,7 +8439,7 @@ function createStepFromProcessor(processor) {
                 messages,
                 messageList: passThrough.messageList
               });
-              if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+              if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8407,7 +8506,7 @@ function createStepFromProcessor(processor) {
                 systemMessages: systemMessages ?? [],
                 steps: steps ?? []
               });
-              if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
+              if (result instanceof chunkCZ4NQANZ_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -9449,7 +9548,7 @@ var Run = class {
   }
   async _validateInput(inputData) {
     let inputDataToUse = inputData;
-    if (this.validateInputs && this.inputSchema && chunkOOCEAC6U_cjs.isZodType(this.inputSchema)) {
+    if (this.validateInputs && this.inputSchema && chunk65PHUUMF_cjs.isZodType(this.inputSchema)) {
       const validatedInputData = await this.inputSchema.safeParseAsync(inputData);
       if (!validatedInputData.success) {
         const errors = getZodErrors(validatedInputData.error);
@@ -9463,7 +9562,7 @@ var Run = class {
     let initialStateToUse = initialState;
     if (this.validateInputs) {
       let stateSchema = this.stateSchema;
-      if (stateSchema && chunkOOCEAC6U_cjs.isZodType(stateSchema)) {
+      if (stateSchema && chunk65PHUUMF_cjs.isZodType(stateSchema)) {
         const validatedInitialState = await stateSchema.safeParseAsync(initialState);
         if (!validatedInitialState.success) {
           const errors = getZodErrors(validatedInitialState.error);
@@ -9477,7 +9576,7 @@ var Run = class {
     return initialStateToUse;
   }
   async _validateRequestContext(requestContext) {
-    if (this.validateInputs && this.requestContextSchema && chunkOOCEAC6U_cjs.isZodType(this.requestContextSchema)) {
+    if (this.validateInputs && this.requestContextSchema && chunk65PHUUMF_cjs.isZodType(this.requestContextSchema)) {
       const contextValues = requestContext?.all ?? {};
       const validatedRequestContext = await this.requestContextSchema.safeParseAsync(contextValues);
       if (!validatedRequestContext.success) {
@@ -9491,7 +9590,7 @@ var Run = class {
   }
   async _validateResumeData(resumeData, suspendedStep) {
     let resumeDataToUse = resumeData;
-    if (suspendedStep && suspendedStep.resumeSchema && this.validateInputs && chunkOOCEAC6U_cjs.isZodType(suspendedStep.resumeSchema)) {
+    if (suspendedStep && suspendedStep.resumeSchema && this.validateInputs && chunk65PHUUMF_cjs.isZodType(suspendedStep.resumeSchema)) {
       const resumeSchema = suspendedStep.resumeSchema;
       const validatedResumeData = await resumeSchema.safeParseAsync(resumeData);
       if (!validatedResumeData.success) {
@@ -9504,7 +9603,7 @@ var Run = class {
   }
   async _validateTimetravelInputData(inputData, step) {
     let inputDataToUse = inputData;
-    if (step && step.inputSchema && this.validateInputs && chunkOOCEAC6U_cjs.isZodType(step.inputSchema)) {
+    if (step && step.inputSchema && this.validateInputs && chunk65PHUUMF_cjs.isZodType(step.inputSchema)) {
       const inputSchema = step.inputSchema;
       const validatedInputData = await inputSchema.safeParseAsync(inputData);
       if (!validatedInputData.success) {
@@ -11080,6 +11179,7 @@ function executeStreamWithFallbackModels(models, logger) {
     let index = 0;
     let finalResult;
     let done = false;
+    let lastError;
     for (const modelConfig of models) {
       index++;
       const maxRetries = modelConfig.maxRetries || 0;
@@ -11098,6 +11198,7 @@ function executeStreamWithFallbackModels(models, logger) {
           if (err instanceof TripWire) {
             throw err;
           }
+          lastError = err;
           attempt++;
           logger?.error(`Error executing model ${modelConfig.model.modelId}, attempt ${attempt}====`, err);
           if (attempt > maxRetries) {
@@ -11109,8 +11210,10 @@ function executeStreamWithFallbackModels(models, logger) {
       }
     }
     if (typeof finalResult === "undefined") {
-      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.");
+      const lastErrMsg = lastError instanceof Error ? lastError.message : String(lastError);
+      const errorMessage = `Exhausted all fallback models and reached the maximum number of retries. Last error: ${lastErrMsg}`;
+      logger?.error(errorMessage);
+      throw new Error(errorMessage, { cause: lastError });
     }
     return finalResult;
   };
@@ -11675,6 +11778,16 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
     }
   });
 }
+
+// src/loop/workflows/errors.ts
+var ToolNotFoundError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ToolNotFoundError";
+  }
+};
+
+// src/loop/workflows/agentic-execution/llm-mapping-step.ts
 function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep) {
   const processorRunner = rest.outputProcessors?.length && rest.logger ? new ProcessorRunner({
     inputProcessors: [],
@@ -11766,6 +11879,60 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
           };
           rest.messageList.add(msg, "response");
         }
+        const allErrorsAreToolNotFound = errorResults?.length > 0 && errorResults.every((tc) => tc.error instanceof ToolNotFoundError);
+        const hasPendingHITL = inputData.some((tc) => tc.result === void 0 && !tc.error);
+        if (allErrorsAreToolNotFound && !hasPendingHITL) {
+          const successfulResults = inputData.filter((tc) => tc.result !== void 0);
+          if (successfulResults.length) {
+            for (const toolCall of successfulResults) {
+              const chunk = {
+                type: "tool-result",
+                runId: rest.runId,
+                from: "AGENT" /* AGENT */,
+                payload: {
+                  args: toolCall.args,
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  result: toolCall.result,
+                  providerMetadata: toolCall.providerMetadata,
+                  providerExecuted: toolCall.providerExecuted
+                }
+              };
+              await processAndEnqueueChunk(chunk);
+            }
+            const successMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
+            const successMessage = {
+              id: successMessageId || "",
+              role: "assistant",
+              content: {
+                format: 2,
+                parts: successfulResults.map((toolCall) => ({
+                  type: "tool-invocation",
+                  toolInvocation: {
+                    state: "result",
+                    toolCallId: toolCall.toolCallId,
+                    toolName: toolCall.toolName,
+                    args: toolCall.args,
+                    result: toolCall.result
+                  },
+                  ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {}
+                }))
+              },
+              createdAt: /* @__PURE__ */ new Date()
+            };
+            rest.messageList.add(successMessage, "response");
+          }
+          initialResult.stepResult.isContinued = true;
+          initialResult.stepResult.reason = "tool-calls";
+          return {
+            ...initialResult,
+            messages: {
+              all: rest.messageList.get.all.aiV5.model(),
+              user: rest.messageList.get.input.aiV5.model(),
+              nonUser: rest.messageList.get.response.aiV5.model()
+            }
+          };
+        }
         if (initialResult.stepResult.reason !== "retry") {
           initialResult.stepResult.isContinued = false;
         }
@@ -11991,7 +12158,14 @@ function createToolCallStep({
         };
       }
       if (!tool2) {
-        throw new Error(`Tool ${inputData.toolName} not found`);
+        const availableToolNames = Object.keys(stepTools || {});
+        const availableToolsStr = availableToolNames.length > 0 ? ` Available tools: ${availableToolNames.join(", ")}` : "";
+        return {
+          error: new ToolNotFoundError(
+            `Tool "${inputData.toolName}" not found.${availableToolsStr}. Call tools by their exact name only \u2014 never add prefixes, namespaces, or colons.`
+          ),
+          ...inputData
+        };
       }
       if (tool2 && "onInputAvailable" in tool2) {
         try {
@@ -12995,7 +13169,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkGCTAD6B7_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunkVD5YA6RH_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judge = new Agent({
       id: "judge",
       name: "judge",
@@ -13647,7 +13821,7 @@ var MastraLLMVNext = class extends chunkRO47SMI7_cjs.MastraBase {
             const remainingTokens = parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"] ?? "", 10);
             if (!isNaN(remainingTokens) && remainingTokens > 0 && remainingTokens < 2e3) {
               this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunkOOCEAC6U_cjs.delay(10 * 1e3);
+              await chunk65PHUUMF_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -13910,7 +14084,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkUE2G2LRP_cjs.MessageList({
+    const messageList = new chunkCZ4NQANZ_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -13973,7 +14147,7 @@ async function saveMessagesWithProcessors(memory, messages, processorRunner, con
     await memory.saveMessages({ messages });
     return;
   }
-  const messageList = new chunkUE2G2LRP_cjs.MessageList();
+  const messageList = new chunkCZ4NQANZ_cjs.MessageList();
   for (const msg of messages) {
     messageList.add(msg, "response");
   }
@@ -15431,7 +15605,7 @@ async function networkLoop({
               "resumeData": "string"
             }
           `;
-              const messageList = new chunkUE2G2LRP_cjs.MessageList();
+              const messageList = new chunkCZ4NQANZ_cjs.MessageList();
               messageList.addSystem(systemInstructions);
               messageList.add(task, "user");
               const result = llm.stream({
@@ -16069,7 +16243,7 @@ ${skillInstructions}`;
             message: `Reference file "${referencePath}" not found in skill "${skillName}". Available references: ${availableRefs.join(", ") || "none"}`
           };
         }
-        const result = chunkCGPH7CMG_cjs.extractLines(fullContent, startLine, endLine);
+        const result = chunk4KFEMXTV_cjs.extractLines(fullContent, startLine, endLine);
         return {
           success: true,
           content: result.content,
@@ -16115,7 +16289,7 @@ ${skillInstructions}`;
             message: `Script file "${scriptPath}" not found in skill "${skillName}". Available scripts: ${availableScripts.join(", ") || "none"}`
           };
         }
-        const result = chunkCGPH7CMG_cjs.extractLines(fullContent, startLine, endLine);
+        const result = chunk4KFEMXTV_cjs.extractLines(fullContent, startLine, endLine);
         return {
           success: true,
           content: result.content,
@@ -16225,9 +16399,9 @@ ${skillInstructions}`;
   /**
    * Process input step - inject available skills and provide skill tools
    */
-  async processInputStep({ messageList, tools, stepNumber }) {
+  async processInputStep({ messageList, tools, stepNumber, requestContext }) {
     if (stepNumber === 0) {
-      await this.skills?.maybeRefresh();
+      await this.skills?.maybeRefresh({ requestContext });
     }
     const skillsList = await this.skills?.list();
     const hasSkills = skillsList && skillsList.length > 0;
@@ -16360,7 +16534,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunkUE2G2LRP_cjs.MessageList({
+        let messageList = new chunkCZ4NQANZ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -16491,7 +16665,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkUE2G2LRP_cjs.MessageList({
+        const messageListResponses = new chunkCZ4NQANZ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -17529,7 +17703,7 @@ var prepareToolsStepOutputSchema = z10.z.object({
 var prepareMemoryStepOutputSchema = z10.z.object({
   threadExists: z10.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z10.z.instanceof(chunkUE2G2LRP_cjs.MessageList),
+  messageList: z10.z.instanceof(chunkCZ4NQANZ_cjs.MessageList),
   /** Shared processor states map that persists across loop iterations for both input and output processors */
   processorStates: z10.z.instanceof(Map),
   /** Tripwire data when input processor triggered abort */
@@ -17569,7 +17743,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunkUE2G2LRP_cjs.MessageList({
+      const messageList = new chunkCZ4NQANZ_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -18043,7 +18217,7 @@ var Agent = class extends chunkRO47SMI7_cjs.MastraBase {
    * Throws an error if validation fails.
    */
   async #validateRequestContext(requestContext) {
-    if (this.#requestContextSchema && chunkOOCEAC6U_cjs.isZodType(this.#requestContextSchema)) {
+    if (this.#requestContextSchema && chunk65PHUUMF_cjs.isZodType(this.#requestContextSchema)) {
       const contextValues = requestContext?.all ?? {};
       const validatedRequestContext = await this.#requestContextSchema.safeParseAsync(contextValues);
       if (!validatedRequestContext.success) {
@@ -18769,7 +18943,7 @@ ${errorMessages}`,
    */
   listTools({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkOOCEAC6U_cjs.ensureToolProperties(this.#tools);
+      return chunk65PHUUMF_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       requestContext,
@@ -18790,7 +18964,7 @@ ${errorMessages}`,
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkOOCEAC6U_cjs.ensureToolProperties(tools);
+      return chunk65PHUUMF_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -18822,7 +18996,7 @@ ${errorMessages}`,
           });
         });
       } else {
-        llm = new chunkON2KVIUJ_cjs.MastraLLMV1({
+        llm = new chunkHYRYTTMT_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -18847,7 +19021,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkGCTAD6B7_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkVD5YA6RH_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -19058,7 +19232,7 @@ ${errorMessages}`,
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkUE2G2LRP_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkCZ4NQANZ_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -19081,7 +19255,7 @@ ${errorMessages}`,
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (isSupportedLanguageModel(llm.getModel())) {
-      const messageList = new chunkUE2G2LRP_cjs.MessageList().add(
+      const messageList = new chunkCZ4NQANZ_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -19134,7 +19308,7 @@ ${errorMessages}`,
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkUE2G2LRP_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkCZ4NQANZ_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -19203,7 +19377,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunk65PHUUMF_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -19231,7 +19405,7 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunkCGPH7CMG_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = chunk4KFEMXTV_cjs.createWorkspaceTools(workspace);
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug(`[Agent:${this.name}] - Adding workspace tools: ${Object.keys(workspaceTools).join(", ")}`, {
         runId
@@ -19252,7 +19426,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunk65PHUUMF_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedWorkspaceTools[toolName] = convertedToCoreTool;
       }
     }
@@ -19409,7 +19583,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunkOOCEAC6U_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunk65PHUUMF_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -19459,7 +19633,7 @@ ${errorMessages}`,
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunk65PHUUMF_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -19504,7 +19678,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunk65PHUUMF_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -19738,7 +19912,7 @@ ${errorMessages}`,
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkOOCEAC6U_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunk65PHUUMF_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -19923,7 +20097,7 @@ ${errorMessages}`,
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkOOCEAC6U_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunk65PHUUMF_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -19953,7 +20127,7 @@ ${errorMessages}`,
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkOOCEAC6U_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunk65PHUUMF_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -20203,7 +20377,7 @@ ${errorMessages}`,
         throw mastraError;
       }
       let headers;
-      if (resolvedModel instanceof chunkGCTAD6B7_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunkVD5YA6RH_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -20249,7 +20423,7 @@ ${errorMessages}`,
           throw mastraError;
         }
         let headers;
-        if (model2 instanceof chunkGCTAD6B7_cjs.ModelRouterLanguageModel) {
+        if (model2 instanceof chunkVD5YA6RH_cjs.ModelRouterLanguageModel) {
           headers = model2.config?.headers;
         }
         return {
@@ -20307,7 +20481,7 @@ ${errorMessages}`,
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkOOCEAC6U_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunk65PHUUMF_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -20714,7 +20888,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkOOCEAC6U_cjs.deepMerge(
+    const mergedOptions = chunk65PHUUMF_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -20778,7 +20952,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    const mergedOptions = chunkOOCEAC6U_cjs.deepMerge(
+    const mergedOptions = chunk65PHUUMF_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -20836,7 +21010,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    let mergedStreamOptions = chunkOOCEAC6U_cjs.deepMerge(
+    let mergedStreamOptions = chunk65PHUUMF_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -20910,7 +21084,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkOOCEAC6U_cjs.deepMerge(
+    const mergedOptions = chunk65PHUUMF_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -23115,7 +23289,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunkCGPH7CMG_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunk4KFEMXTV_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -23862,7 +24036,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunkUE2G2LRP_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkCZ4NQANZ_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -24200,6 +24374,14 @@ function augmentWithInit(storage) {
 }
 
 // src/memory/memory.ts
+function extractModelIdString(model) {
+  if (typeof model === "string") return model;
+  if (typeof model === "function") return void 0;
+  if (model && typeof model === "object" && "id" in model && typeof model.id === "string") {
+    return model.id;
+  }
+  return void 0;
+}
 var MemoryProcessor = class extends chunkRO47SMI7_cjs.MastraBase {
   /**
    * Process a list of messages and return a filtered or transformed list.
@@ -24296,7 +24478,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkGCTAD6B7_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkVD5YA6RH_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -24335,7 +24517,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkGCTAD6B7_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunkVD5YA6RH_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -24402,7 +24584,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkOOCEAC6U_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunk65PHUUMF_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -24646,7 +24828,7 @@ https://mastra.ai/en/docs/memory/overview`
    * @returns Serializable memory configuration
    */
   getConfig() {
-    const { generateTitle, workingMemory, threads, ...restConfig } = this.threadConfig;
+    const { generateTitle, workingMemory, threads, observationalMemory, ...restConfig } = this.threadConfig;
     const config = {
       vector: this.vector?.id,
       options: {
@@ -24683,8 +24865,62 @@ https://mastra.ai/en/docs/memory/overview`
       const { telemetry, ...rest } = this.embedderOptions;
       config.embedderOptions = rest;
     }
+    if (observationalMemory !== void 0) {
+      config.observationalMemory = this.serializeObservationalMemory(observationalMemory);
+    }
     return config;
   }
+  /**
+   * Serialize observational memory config to a JSON-safe representation.
+   * Model references that aren't string IDs are dropped (non-serializable).
+   */
+  serializeObservationalMemory(om) {
+    if (typeof om === "boolean") {
+      return om;
+    }
+    if (om.enabled === false) {
+      return false;
+    }
+    const result = {
+      scope: om.scope,
+      shareTokenBudget: om.shareTokenBudget
+    };
+    const topModelId = extractModelIdString(om.model);
+    if (topModelId) {
+      result.model = topModelId;
+    }
+    if (om.observation) {
+      const obs = om.observation;
+      result.observation = {
+        messageTokens: obs.messageTokens,
+        modelSettings: obs.modelSettings,
+        providerOptions: obs.providerOptions,
+        maxTokensPerBatch: obs.maxTokensPerBatch,
+        bufferTokens: obs.bufferTokens,
+        bufferActivation: obs.bufferActivation,
+        blockAfter: obs.blockAfter
+      };
+      const obsModelId = extractModelIdString(obs.model);
+      if (obsModelId) {
+        result.observation.model = obsModelId;
+      }
+    }
+    if (om.reflection) {
+      const ref = om.reflection;
+      result.reflection = {
+        observationTokens: ref.observationTokens,
+        modelSettings: ref.modelSettings,
+        providerOptions: ref.providerOptions,
+        blockAfter: ref.blockAfter,
+        bufferActivation: ref.bufferActivation
+      };
+      const refModelId = extractModelIdString(ref.model);
+      if (refModelId) {
+        result.reflection.model = refModelId;
+      }
+    }
+    return result;
+  }
 };
 var isZodObject = (v) => v instanceof z10.ZodObject;
 var MockMemory = class extends MastraMemory {
@@ -24696,7 +24932,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkTERSHTY5_cjs.InMemoryStore(),
+      storage: storage || new chunkBP7VYTOP_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -25004,5 +25240,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-YNXIGRQE.cjs.map
-//# sourceMappingURL=chunk-YNXIGRQE.cjs.map
+//# sourceMappingURL=chunk-4IJ4UDZX.cjs.map
+//# sourceMappingURL=chunk-4IJ4UDZX.cjs.map