@mastra/core 1.31.0-alpha.0 → 1.31.0-alpha.2

package/dist/{chunk-4IXBC75W.cjs → chunk-PMPEPPEM.cjs}

@@ -1,16 +1,16 @@
 'use strict';
 
-var chunk5C6M2M52_cjs = require('./chunk-5C6M2M52.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
 var chunkYQR772OH_cjs = require('./chunk-YQR772OH.cjs');
-var chunkATWCWU4A_cjs = require('./chunk-ATWCWU4A.cjs');
+var chunk5C6M2M52_cjs = require('./chunk-5C6M2M52.cjs');
+var chunkJGRV2X4U_cjs = require('./chunk-JGRV2X4U.cjs');
 var chunk6K4BQ2JS_cjs = require('./chunk-6K4BQ2JS.cjs');
 var chunk7KR4BWEU_cjs = require('./chunk-7KR4BWEU.cjs');
 var chunkQPFIMRQM_cjs = require('./chunk-QPFIMRQM.cjs');
 var chunkRD4AETXE_cjs = require('./chunk-RD4AETXE.cjs');
 var chunkHM6XXOV2_cjs = require('./chunk-HM6XXOV2.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkI2GDFWAT_cjs = require('./chunk-I2GDFWAT.cjs');
+var chunkDOKVBCA6_cjs = require('./chunk-DOKVBCA6.cjs');
 var chunkD6JOUJ6C_cjs = require('./chunk-D6JOUJ6C.cjs');
 var chunkYNE3ZCU5_cjs = require('./chunk-YNE3ZCU5.cjs');
 var chunkIBQB7RSW_cjs = require('./chunk-IBQB7RSW.cjs');
@@ -2549,7 +2549,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkI2GDFWAT_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkDOKVBCA6_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -10367,7 +10367,9 @@ function createStep(params, agentOrToolOptions) {
     return createStepFromParams(params);
   }
   if (isProcessor(params)) {
-    return createStepFromProcessor(params);
+    const step = createStepFromProcessor(params);
+    step.providesSkillDiscovery = params.providesSkillDiscovery;
+    return step;
   }
   throw new Error("Invalid input: expected StepParams, Agent, ToolStep, or Processor");
 }
@@ -13740,7 +13742,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkI2GDFWAT_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunkDOKVBCA6_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judgeModel = resolvedModel.modelId;
     const judge = new Agent({
       id: "judge",
@@ -15671,7 +15673,7 @@ ${bgPrompt}`;
           }
         });
         let transportResolver;
-        if (currentStep.model instanceof chunkI2GDFWAT_cjs.ModelRouterLanguageModel) {
+        if (currentStep.model instanceof chunkDOKVBCA6_cjs.ModelRouterLanguageModel) {
           const routerModel = currentStep.model;
           transportResolver = () => routerModel._getStreamTransport();
         }
@@ -20219,6 +20221,7 @@ var AgentLegacyHandler = class {
     writableStream,
     methodType,
     tracingOptions,
+    inputProcessors,
     ...rest
   }) {
     const observabilityContext = chunkIBQB7RSW_cjs.resolveObservabilityContext(rest);
@@ -20255,7 +20258,7 @@ var AgentLegacyHandler = class {
         const innerObservabilityContext = chunkIBQB7RSW_cjs.createObservabilityContext({ currentSpan: agentSpan });
         const memory = await this.capabilities.getMemory({ requestContext });
         const threadId = thread?.id;
-        const convertedTools = await this.capabilities.convertTools({
+        let convertedTools = await this.capabilities.convertTools({
           toolsets,
           clientTools,
           threadId,
@@ -20265,7 +20268,8 @@ var AgentLegacyHandler = class {
           ...innerObservabilityContext,
           writableStream,
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
-          memoryConfig
+          memoryConfig,
+          inputProcessors
         });
         let messageList = new chunk6K4BQ2JS_cjs.MessageList({
           threadId,
@@ -20279,15 +20283,24 @@ var AgentLegacyHandler = class {
           const { tripwire: tripwire2 } = await this.capabilities.__runInputProcessors({
             requestContext,
             ...innerObservabilityContext,
-            messageList
+            messageList,
+            inputProcessorOverrides: inputProcessors
           });
           if (!tripwire2) {
             const inputStepResult = await this.capabilities.__runProcessInputStep({
               requestContext,
               ...innerObservabilityContext,
               messageList,
-              stepNumber: 0
+              stepNumber: 0,
+              inputProcessorOverrides: inputProcessors,
+              tools: convertedTools,
+              runId,
+              threadId,
+              resourceId
             });
+            if (inputStepResult.tools) {
+              convertedTools = inputStepResult.tools;
+            }
             if (inputStepResult.tripwire) {
               return {
                 messageObjects: [],
@@ -20356,7 +20369,8 @@ var AgentLegacyHandler = class {
         const { messageList: processedMessageList, tripwire } = await this.capabilities.__runInputProcessors({
           requestContext,
           ...innerObservabilityContext,
-          messageList
+          messageList,
+          inputProcessorOverrides: inputProcessors
         });
         messageList = processedMessageList;
         if (!tripwire) {
@@ -20364,8 +20378,16 @@ var AgentLegacyHandler = class {
             requestContext,
             ...innerObservabilityContext,
             messageList,
-            stepNumber: 0
+            stepNumber: 0,
+            inputProcessorOverrides: inputProcessors,
+            tools: convertedTools,
+            runId,
+            threadId,
+            resourceId
           });
+          if (inputStepResult.tools) {
+            convertedTools = inputStepResult.tools;
+          }
           if (inputStepResult.tripwire) {
             return {
               convertedTools,
@@ -20595,6 +20617,7 @@ var AgentLegacyHandler = class {
       tracingOptions,
       savePerStep,
       writableStream,
+      inputProcessors,
       ...args
     } = options;
     const resourceIdFromContext = requestContext.get(chunkKF4FCWWL_cjs.MASTRA_RESOURCE_ID_KEY);
@@ -20638,6 +20661,7 @@ var AgentLegacyHandler = class {
       writableStream,
       methodType,
       tracingOptions,
+      inputProcessors,
       ...chunkIBQB7RSW_cjs.resolveObservabilityContext(args)
     });
     let messageList;
@@ -22027,7 +22051,8 @@ function createPrepareToolsStep({
         memoryConfig: options.memory?.options,
         autoResumeSuspendedTools: options.autoResumeSuspendedTools,
         delegation: options.delegation,
-        backgroundTaskEnabled
+        backgroundTaskEnabled,
+        inputProcessors: options.inputProcessors
       });
       const toolNames = Object.keys(convertedTools);
       if (toolNames.length > 0) {
@@ -22213,6 +22238,50 @@ function resolveMaybePromise(value, cb) {
   }
   return cb(value);
 }
+function hasConfiguredProcessor(processors, predicate) {
+  return processors.some((processor) => {
+    const maybeWorkflow = processor;
+    const isWorkflowLike = isProcessorWorkflow(processor);
+    const workflowSteps = [
+      ...Object.values(maybeWorkflow.steps ?? {}),
+      ...(maybeWorkflow.stepGraph ?? []).flatMap((entry) => {
+        if (entry.type === "step") {
+          return entry.step ? [entry.step] : [];
+        }
+        return entry.steps?.map((stepEntry) => stepEntry.step).filter(Boolean) ?? [];
+      })
+    ];
+    if (!isWorkflowLike || workflowSteps.length === 0) {
+      const processorId = typeof processor.id === "string" && processor.id.startsWith("processor:") ? processor.id.slice("processor:".length) : processor.id;
+      return predicate({
+        ...processor,
+        id: processorId,
+        providesSkillDiscovery: processor.providesSkillDiscovery
+      });
+    }
+    return workflowSteps.some((step) => {
+      if (isProcessorWorkflow(step)) {
+        return hasConfiguredProcessor([step], predicate);
+      }
+      const stepId = typeof step.id === "string" ? step.id : void 0;
+      if (!stepId?.startsWith("processor:")) {
+        return false;
+      }
+      const processorId = stepId.slice("processor:".length);
+      const workflowStep = step;
+      return predicate({
+        id: processorId,
+        providesSkillDiscovery: workflowStep.providesSkillDiscovery
+      });
+    });
+  });
+}
+function hasEagerSkillsProcessor(processors) {
+  return hasConfiguredProcessor(processors, (processor) => processor.id === "skills-processor");
+}
+function hasOnDemandSkillDiscoveryProcessor(processors) {
+  return hasConfiguredProcessor(processors, (processor) => processor.providesSkillDiscovery === "on-demand");
+}
 var Agent = class _Agent extends chunkFCQNDFEW_cjs.MastraBase {
   id;
   name;
@@ -22541,10 +22610,9 @@ var Agent = class _Agent extends chunkFCQNDFEW_cjs.MastraBase {
     if (!workspace?.skills) {
       return [];
     }
-    const hasSkillsProcessor = configuredProcessors.some(
-      (p) => !isProcessorWorkflow(p) && "id" in p && p.id === "skills-processor"
-    );
-    if (hasSkillsProcessor) {
+    const hasSkillsProcessor = hasEagerSkillsProcessor(configuredProcessors);
+    const hasOnDemandProcessor = hasOnDemandSkillDiscoveryProcessor(configuredProcessors);
+    if (hasSkillsProcessor || hasOnDemandProcessor) {
       return [];
     }
     return [new SkillsProcessor({ workspace, format: this.#skillsFormat })];
@@ -23469,7 +23537,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkI2GDFWAT_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkDOKVBCA6_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -24110,6 +24178,7 @@ ${errorMessages}`,
     mastraProxy,
     autoResumeSuspendedTools,
     backgroundTaskEnabled,
+    suppressEagerSkillTools,
     ...rest
   }) {
     const observabilityContext = chunkIBQB7RSW_cjs.resolveObservabilityContext(rest);
@@ -24125,6 +24194,9 @@ ${errorMessages}`,
     if (Object.keys(skillTools).length > 0) {
       this.logger.debug("Adding skill tools", { agent: this.name, tools: Object.keys(skillTools), runId });
       for (const [toolName, tool2] of Object.entries(skillTools)) {
+        if (suppressEagerSkillTools && (toolName === "skill" || toolName === "skill_search")) {
+          continue;
+        }
         const toolObj = tool2;
         const options = {
           name: toolName,
@@ -24271,18 +24343,34 @@ ${errorMessages}`,
    * @internal
    */
   async __runProcessInputStep(args) {
-    const { requestContext, messageList, stepNumber = 0, processorStates, ...rest } = args;
+    const {
+      requestContext,
+      messageList,
+      stepNumber = 0,
+      inputProcessorOverrides,
+      processorStates,
+      tools,
+      runId,
+      threadId,
+      resourceId,
+      outputWriter,
+      autoResumeSuspendedTools,
+      backgroundTaskEnabled,
+      ...rest
+    } = args;
     const observabilityContext = chunkIBQB7RSW_cjs.resolveObservabilityContext(rest);
     let tripwire;
-    if (this.#inputProcessors || this.#memory) {
+    let nextTools = tools;
+    if (inputProcessorOverrides?.length || this.#inputProcessors || this.#memory) {
       const runner = await this.getProcessorRunner({
         requestContext,
+        inputProcessorOverrides,
         processorStates
       });
       try {
         const llm = await this.getLLM({ requestContext });
         const model = llm.getModel();
-        await runner.runProcessInputStep({
+        const result = await runner.runProcessInputStep({
           messageList,
           stepNumber,
           steps: [],
@@ -24291,8 +24379,47 @@ ${errorMessages}`,
           // Cast needed: legacy v1 models return LanguageModelV1 which doesn't satisfy MastraLanguageModel.
           // OM's processInputStep doesn't use the model parameter, so this is safe.
           model,
+          tools,
           retryCount: 0
         });
+        if (result.tools) {
+          const workspace = await this.getWorkspace({ requestContext });
+          const memory = await this.getMemory({ requestContext });
+          const mastraProxy = this.#mastra ? chunkYNE3ZCU5_cjs.createMastraProxy({ mastra: this.#mastra, logger: this.logger }) : void 0;
+          const convertedTools = {};
+          for (const [name, tool2] of Object.entries(result.tools)) {
+            if (chunkM4KUR53T_cjs.isMastraTool(tool2) || chunkM4KUR53T_cjs.isProviderTool(tool2)) {
+              convertedTools[name] = chunkYNE3ZCU5_cjs.makeCoreTool(
+                tool2,
+                {
+                  name,
+                  runId,
+                  threadId,
+                  resourceId,
+                  logger: this.logger,
+                  mastra: mastraProxy,
+                  memory,
+                  agentName: this.name,
+                  agentId: this.id,
+                  requestContext,
+                  ...observabilityContext,
+                  model: await this.getModel({ requestContext }),
+                  outputWriter,
+                  tracingPolicy: this.#options?.tracingPolicy,
+                  requireApproval: tool2.requireApproval,
+                  backgroundConfig: tool2.background,
+                  workspace
+                },
+                void 0,
+                autoResumeSuspendedTools,
+                backgroundTaskEnabled
+              );
+            } else {
+              convertedTools[name] = tool2;
+            }
+          }
+          nextTools = convertedTools;
+        }
       } catch (error) {
         if (error instanceof TripWire) {
           tripwire = {
@@ -24322,6 +24449,7 @@ ${errorMessages}`,
     }
     return {
       messageList,
+      tools: nextTools,
       tripwire
     };
   }
@@ -25579,6 +25707,7 @@ ${effectiveInstructions}`;
     autoResumeSuspendedTools,
     delegation,
     backgroundTaskEnabled,
+    inputProcessors,
     ...rest
   }) {
     const observabilityContext = chunkIBQB7RSW_cjs.resolveObservabilityContext(rest);
@@ -25660,6 +25789,9 @@ ${effectiveInstructions}`;
       autoResumeSuspendedTools,
       backgroundTaskEnabled
     });
+    const configuredInputProcessors = inputProcessors ?? await this.listConfiguredInputProcessors(requestContext);
+    const hasOnDemandProcessor = hasOnDemandSkillDiscoveryProcessor(configuredInputProcessors);
+    const hasSkillsProcessor = hasEagerSkillsProcessor(configuredInputProcessors);
     const skillTools = await this.listSkillTools({
       runId,
       resourceId,
@@ -25668,7 +25800,8 @@ ${effectiveInstructions}`;
       ...observabilityContext,
       mastraProxy,
       autoResumeSuspendedTools,
-      backgroundTaskEnabled
+      backgroundTaskEnabled,
+      suppressEagerSkillTools: hasOnDemandProcessor && !hasSkillsProcessor
     });
     const channelTools = await this.listChannelTools({
       runId,
@@ -25833,7 +25966,7 @@ ${effectiveInstructions}`;
       const resolvedModel = await this.resolveModelConfig(selection, requestContext);
       this.assertSupportsPreparedModels(resolvedModel);
       let headers;
-      if (resolvedModel instanceof chunkI2GDFWAT_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunkDOKVBCA6_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -25865,7 +25998,7 @@ ${effectiveInstructions}`;
           throw mastraError;
         }
         let routerHeaders;
-        if (model instanceof chunkI2GDFWAT_cjs.ModelRouterLanguageModel) {
+        if (model instanceof chunkDOKVBCA6_cjs.ModelRouterLanguageModel) {
           routerHeaders = model.config?.headers;
         }
         const isEnabled = modelConfig.enabled ?? true;
@@ -28187,10 +28320,11 @@ var BatchPartsProcessor = class {
     const textChunks = state.batch.filter((part) => part.type === "text-delta");
     if (textChunks.length > 0) {
       const combinedText = textChunks.map((part) => part.type === "text-delta" ? part.payload.text : "").join("");
+      const firstChunk = textChunks[0];
       const combinedChunk = {
         type: "text-delta",
-        payload: { text: combinedText, id: "text-1" },
-        runId: "1",
+        payload: { text: combinedText, id: firstChunk.payload.id },
+        runId: firstChunk.runId,
         from: "AGENT" /* AGENT */
       };
       state.batch = [];
@@ -29544,6 +29678,7 @@ var SkillSearchProcessor = class {
   id = "skill-search";
   name = "Skill Search Processor";
   description = "Enables on-demand skill discovery and loading via search";
+  providesSkillDiscovery = "on-demand";
   workspace;
   searchConfig;
   ttl;
@@ -29685,7 +29820,7 @@ var SkillSearchProcessor = class {
       id: "search_skills",
       description: "Search for available skills by keyword. Returns a list of matching skills with their names and descriptions. After finding a useful skill, use load_skill to load its instructions.",
       inputSchema: v4.z.object({
-        query: v4.z.string().describe('Search keywords (e.g., "api design", "testing", "deployment")')
+        query: v4.z.string().trim().min(1, "Query is required").describe('Search keywords (e.g., "api design", "testing", "deployment")')
       }),
       outputSchema: v4.z.object({
         results: v4.z.array(
@@ -31091,7 +31226,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkI2GDFWAT_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkDOKVBCA6_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -31104,7 +31239,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
       }
       if (config.embedder) {
         if (typeof config.embedder === "string") {
-          this.embedder = new chunkI2GDFWAT_cjs.ModelRouterEmbeddingModel(config.embedder);
+          this.embedder = new chunkDOKVBCA6_cjs.ModelRouterEmbeddingModel(config.embedder);
         } else {
           this.embedder = config.embedder;
         }
@@ -31144,7 +31279,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkI2GDFWAT_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunkDOKVBCA6_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -31596,7 +31731,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkATWCWU4A_cjs.InMemoryStore(),
+      storage: storage || new chunkJGRV2X4U_cjs.InMemoryStore(),
       options: {
         ...options,
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : options?.workingMemory,
@@ -31941,5 +32076,5 @@ exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
 exports.withStreamCaching = withStreamCaching;
-//# sourceMappingURL=chunk-4IXBC75W.cjs.map
-//# sourceMappingURL=chunk-4IXBC75W.cjs.map
+//# sourceMappingURL=chunk-PMPEPPEM.cjs.map
+//# sourceMappingURL=chunk-PMPEPPEM.cjs.map