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

package/dist/{chunk-WE5LBH4J.js → chunk-4SXW4BMV.js}

@@ -8,7 +8,7 @@ import { APICallError, generateId, tool, asSchema } from './chunk-32WQTREY.js';
 import { noopLogger } from './chunk-XP24DYKA.js';
 import { EventEmitterPubSub } from './chunk-4E5FOY4E.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-DQUFXPSD.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-5D3IKSJ3.js';
 import { MastraLLMV1 } from './chunk-LRE7DKY3.js';
 import { removeUndefinedValues, safeStringify, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, ensureSerializable, delay } from './chunk-ARNDQ2SQ.js';
 import { resolveObservabilityContext, createObservabilityContext, wrapMastra } from './chunk-SR7NB44E.js';
@@ -16,7 +16,7 @@ import { getRootExportSpan, getOrCreateSpan, executeWithContext, executeWithCont
 import { EntityType } from './chunk-A6UBX7NY.js';
 import { MastraError, getErrorFromUnknown } from './chunk-FJEVLHJT.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
-import { createTool, Tool, isProviderTool, isProviderDefinedTool, isMastraTool, getProviderToolName } from './chunk-PXOIM2JE.js';
+import { createTool, Tool, isMastraTool, isProviderTool, isProviderDefinedTool, getProviderToolName } from './chunk-PXOIM2JE.js';
 import { toStandardSchema, standardSchemaToJSONSchema, isStandardSchemaWithJSON } from './chunk-6SRTDZ7S.js';
 import { MASTRA_THREAD_ID_KEY, MASTRA_RESOURCE_ID_KEY, RequestContext, MASTRA_VERSIONS_KEY, mergeVersionOverrides } from './chunk-4RQN7U3L.js';
 import { MastraBase } from './chunk-WENZPAHS.js';
@@ -10342,7 +10342,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");
 }
@@ -20194,6 +20196,7 @@ var AgentLegacyHandler = class {
     writableStream,
     methodType,
     tracingOptions,
+    inputProcessors,
     ...rest
   }) {
     const observabilityContext = resolveObservabilityContext(rest);
@@ -20230,7 +20233,7 @@ var AgentLegacyHandler = class {
         const innerObservabilityContext = 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,
@@ -20240,7 +20243,8 @@ var AgentLegacyHandler = class {
           ...innerObservabilityContext,
           writableStream,
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
-          memoryConfig
+          memoryConfig,
+          inputProcessors
         });
         let messageList = new MessageList({
           threadId,
@@ -20254,15 +20258,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: [],
@@ -20331,7 +20344,8 @@ var AgentLegacyHandler = class {
         const { messageList: processedMessageList, tripwire } = await this.capabilities.__runInputProcessors({
           requestContext,
           ...innerObservabilityContext,
-          messageList
+          messageList,
+          inputProcessorOverrides: inputProcessors
         });
         messageList = processedMessageList;
         if (!tripwire) {
@@ -20339,8 +20353,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,
@@ -20570,6 +20592,7 @@ var AgentLegacyHandler = class {
       tracingOptions,
       savePerStep,
       writableStream,
+      inputProcessors,
       ...args
     } = options;
     const resourceIdFromContext = requestContext.get(MASTRA_RESOURCE_ID_KEY);
@@ -20613,6 +20636,7 @@ var AgentLegacyHandler = class {
       writableStream,
       methodType,
       tracingOptions,
+      inputProcessors,
       ...resolveObservabilityContext(args)
     });
     let messageList;
@@ -22002,7 +22026,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) {
@@ -22188,6 +22213,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 MastraBase {
   id;
   name;
@@ -22516,10 +22585,9 @@ var Agent = class _Agent extends 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 })];
@@ -24085,6 +24153,7 @@ ${errorMessages}`,
     mastraProxy,
     autoResumeSuspendedTools,
     backgroundTaskEnabled,
+    suppressEagerSkillTools,
     ...rest
   }) {
     const observabilityContext = resolveObservabilityContext(rest);
@@ -24100,6 +24169,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,
@@ -24246,18 +24318,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 = 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: [],
@@ -24266,8 +24354,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 ? createMastraProxy({ mastra: this.#mastra, logger: this.logger }) : void 0;
+          const convertedTools = {};
+          for (const [name, tool2] of Object.entries(result.tools)) {
+            if (isMastraTool(tool2) || isProviderTool(tool2)) {
+              convertedTools[name] = 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 = {
@@ -24297,6 +24424,7 @@ ${errorMessages}`,
     }
     return {
       messageList,
+      tools: nextTools,
       tripwire
     };
   }
@@ -25554,6 +25682,7 @@ ${effectiveInstructions}`;
     autoResumeSuspendedTools,
     delegation,
     backgroundTaskEnabled,
+    inputProcessors,
     ...rest
   }) {
     const observabilityContext = resolveObservabilityContext(rest);
@@ -25635,6 +25764,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,
@@ -25643,7 +25775,8 @@ ${effectiveInstructions}`;
       ...observabilityContext,
       mastraProxy,
       autoResumeSuspendedTools,
-      backgroundTaskEnabled
+      backgroundTaskEnabled,
+      suppressEagerSkillTools: hasOnDemandProcessor && !hasSkillsProcessor
     });
     const channelTools = await this.listChannelTools({
       runId,
@@ -29519,6 +29652,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;
@@ -29660,7 +29794,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: z.object({
-        query: z.string().describe('Search keywords (e.g., "api design", "testing", "deployment")')
+        query: z.string().trim().min(1, "Query is required").describe('Search keywords (e.g., "api design", "testing", "deployment")')
       }),
       outputSchema: z.object({
         results: z.array(
@@ -31783,5 +31917,5 @@ var MockMemory = class extends MastraMemory {
 };
 
 export { Agent, AgentChannels, AgentsMDInjector, BaseProcessor, BatchPartsProcessor, ChatChannelProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MastraScorer, MastraStateAdapter, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, PrefillErrorHandler, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ProviderHistoryCompat, ReasoningPartSchema, Run, SYSTEM_REMINDER_END_TAG, SYSTEM_REMINDER_START_TAG, SaveQueueManager, SemanticRecall, SkillSearchProcessor, SkillsProcessor, SourcePartSchema, StepStartPartSchema, StreamErrorRetryProcessor, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, ToolSearchProcessor, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, WorkspaceInstructionsProcessor, anthropicToolIdFormat, augmentWithInit, cleanStepResult, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createCachingTransformStream, createDeprecationProxy, createReplayStream, createScorer, createStep, createTimeTravelExecutionParams, createWorkflow, execute, extractWorkingMemoryContent, extractWorkingMemoryTags, filterRun, filterSystemReminderMessages, formatCheckFeedback, formatCompletionFeedback, formatStreamCompletionFeedback, formatValidationFeedback, forwardAgentStreamChunk, generateFinalResult, generateStructuredFinalResult, getResumeLabelsByStepId, getStepIds, getStepResult, getThreadOMMetadata, globalEmbeddingCache, hydrateSerializedStepErrors, isDurableAgentLike, isObservationalMemoryEnabled, isProcessor, isProcessorWorkflow, isRetryableOpenAIResponsesStreamError, isSupportedLanguageModel, isSystemReminderMessage, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeSystemReminderTags, removeWorkingMemoryTags, resolveThreadIdFromArgs, runChecks, runCompletionScorers, runCountDeprecationMessage, runDefaultCompletionCheck, runScorer, runStreamCompletionScorers, runValidation, setThreadOMMetadata, summarizeActiveToolsForSpan, summarizeProcessorModelForSpan, summarizeProcessorResultForSpan, summarizeProcessorToolsForSpan, summarizeToolChoiceForSpan, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepRequestContext, validateStepResumeData, validateStepStateData, validateStepSuspendData, withStreamCaching };
-//# sourceMappingURL=chunk-WE5LBH4J.js.map
-//# sourceMappingURL=chunk-WE5LBH4J.js.map
+//# sourceMappingURL=chunk-4SXW4BMV.js.map
+//# sourceMappingURL=chunk-4SXW4BMV.js.map