@mastra/core 1.22.0-alpha.3 → 1.23.0-alpha.0

package/dist/{chunk-EEQKSBYC.cjs → chunk-CH4EKSQP.cjs}

@@ -1,16 +1,16 @@
 'use strict';
 
-var chunkA67TNS6N_cjs = require('./chunk-A67TNS6N.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
+var chunkHIC3WGQU_cjs = require('./chunk-HIC3WGQU.cjs');
 var chunkT26CFBWF_cjs = require('./chunk-T26CFBWF.cjs');
 var chunk4T5MI4MY_cjs = require('./chunk-4T5MI4MY.cjs');
 var chunkXB5NKHYR_cjs = require('./chunk-XB5NKHYR.cjs');
 var chunkY3APFUXZ_cjs = require('./chunk-Y3APFUXZ.cjs');
 var chunkCFMZZDO2_cjs = require('./chunk-CFMZZDO2.cjs');
-var chunkU552IBW4_cjs = require('./chunk-U552IBW4.cjs');
-var chunkINA5PMVU_cjs = require('./chunk-INA5PMVU.cjs');
 var chunkOQDRPRKM_cjs = require('./chunk-OQDRPRKM.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
+var chunkJLGX4VZB_cjs = require('./chunk-JLGX4VZB.cjs');
+var chunkINA5PMVU_cjs = require('./chunk-INA5PMVU.cjs');
 var chunk22FSGATE_cjs = require('./chunk-22FSGATE.cjs');
 var chunkW232X652_cjs = require('./chunk-W232X652.cjs');
 var chunkW6PDQCCN_cjs = require('./chunk-W6PDQCCN.cjs');
@@ -2078,7 +2078,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkU552IBW4_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkJLGX4VZB_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -12813,7 +12813,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkU552IBW4_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunkJLGX4VZB_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judgeModel = resolvedModel.modelId;
     const judge = new Agent({
       id: "judge",
@@ -14521,7 +14521,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }
         });
         let transportResolver;
-        if (currentStep.model instanceof chunkU552IBW4_cjs.ModelRouterLanguageModel) {
+        if (currentStep.model instanceof chunkJLGX4VZB_cjs.ModelRouterLanguageModel) {
           const routerModel = currentStep.model;
           transportResolver = () => routerModel._getStreamTransport();
         }
@@ -15206,7 +15206,10 @@ function createToolCallStep({
         let toolRequiresApproval = requireToolApproval || tool2.requireApproval;
         if (tool2.needsApprovalFn) {
           try {
-            const needsApprovalResult = await tool2.needsApprovalFn(args);
+            const needsApprovalResult = await tool2.needsApprovalFn(args, {
+              requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {},
+              workspace: _internal?.stepWorkspace
+            });
             toolRequiresApproval = needsApprovalResult;
           } catch (error) {
             logger?.error(`Error evaluating needsApprovalFn for tool ${inputData.toolName}:`, error);
@@ -21441,7 +21444,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkU552IBW4_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkJLGX4VZB_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -21942,7 +21945,10 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunkA67TNS6N_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = await chunkHIC3WGQU_cjs.createWorkspaceTools(workspace, {
+      requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {},
+      workspace
+    });
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug("Adding workspace tools", { agent: this.name, tools: Object.keys(workspaceTools), runId });
       for (const [toolName, tool2] of Object.entries(workspaceTools)) {
@@ -22039,7 +22045,7 @@ ${errorMessages}`,
     if (!workspace?.skills) {
       return convertedSkillTools;
     }
-    const skillTools = chunkA67TNS6N_cjs.createSkillTools(workspace.skills);
+    const skillTools = chunkHIC3WGQU_cjs.createSkillTools(workspace.skills);
     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)) {
@@ -22574,6 +22580,14 @@ ${errorMessages}`,
             const subAgentDefaultOptions = await agent.getDefaultOptions?.({ requestContext });
             const subAgentHasOwnMemoryConfig = subAgentDefaultOptions?.memory !== void 0;
             const savedMastraMemory = requestContext.get("MastraMemory");
+            const savedThreadIdKey = requestContext.get(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY);
+            const savedResourceIdKey = requestContext.get(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY);
+            if (savedThreadIdKey !== void 0) {
+              requestContext.delete(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY);
+            }
+            if (savedResourceIdKey !== void 0) {
+              requestContext.delete(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY);
+            }
             if ((methodType === "generate" || methodType === "generateLegacy" || methodType === "stream" || methodType === "streamLegacy") && supportedLanguageModelSpecifications.includes(modelVersion)) {
               if (!agent.hasOwnMemory() && this.#memory) {
                 agent.__setMemory(this.#memory);
@@ -22655,6 +22669,12 @@ ${errorMessages}`,
                         });
                       }
                     }
+                    if (savedThreadIdKey !== void 0) {
+                      requestContext.set(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+                    }
+                    if (savedResourceIdKey !== void 0) {
+                      requestContext.set(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+                    }
                     return {
                       text: `[Delegation Rejected] ${rejectionMessage}`,
                       subAgentThreadId,
@@ -22800,6 +22820,12 @@ ${effectiveInstructions}`;
                   }
                 }
                 if (generateResult.finishReason === "suspended") {
+                  if (savedThreadIdKey !== void 0) {
+                    requestContext.set(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+                  }
+                  if (savedResourceIdKey !== void 0) {
+                    requestContext.set(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+                  }
                   return suspend?.(generateResult.suspendPayload, {
                     resumeSchema: generateResult.resumeSchema,
                     runId: generateResult.runId,
@@ -22919,6 +22945,12 @@ ${effectiveInstructions}`;
                   }
                 }
                 if (requireToolApproval || suspendedPayload || resumeSchema) {
+                  if (savedThreadIdKey !== void 0) {
+                    requestContext.set(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+                  }
+                  if (savedResourceIdKey !== void 0) {
+                    requestContext.set(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+                  }
                   return suspend?.(suspendedPayload, {
                     resumeSchema,
                     requireToolApproval,
@@ -23017,6 +23049,12 @@ ${effectiveInstructions}`;
               if (savedMastraMemory !== void 0) {
                 requestContext.set("MastraMemory", savedMastraMemory);
               }
+              if (savedThreadIdKey !== void 0) {
+                requestContext.set(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+              }
+              if (savedResourceIdKey !== void 0) {
+                requestContext.set(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+              }
               return result;
             } catch (err) {
               let bailed = false;
@@ -23087,6 +23125,12 @@ ${effectiveInstructions}`;
               if (savedMastraMemory !== void 0) {
                 requestContext.set("MastraMemory", savedMastraMemory);
               }
+              if (savedThreadIdKey !== void 0) {
+                requestContext.set(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+              }
+              if (savedResourceIdKey !== void 0) {
+                requestContext.set(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+              }
               const mastraError = new chunk4U7ZLI36_cjs.MastraError(
                 {
                   id: "AGENT_AGENT_TOOL_EXECUTION_FAILED",
@@ -23647,7 +23691,7 @@ ${effectiveInstructions}`;
       const resolvedModel = await this.resolveModelConfig(selection, requestContext);
       this.assertSupportsPreparedModels(resolvedModel);
       let headers;
-      if (resolvedModel instanceof chunkU552IBW4_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunkJLGX4VZB_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -23679,7 +23723,7 @@ ${effectiveInstructions}`;
           throw mastraError;
         }
         let headers;
-        if (model instanceof chunkU552IBW4_cjs.ModelRouterLanguageModel) {
+        if (model instanceof chunkJLGX4VZB_cjs.ModelRouterLanguageModel) {
           headers = model.config?.headers;
         }
         return {
@@ -23740,7 +23784,7 @@ ${effectiveInstructions}`;
       model: options.model
     });
     const resolvedModel = llm.getModel();
-    const isGatewayModel = resolvedModel instanceof chunkU552IBW4_cjs.ModelRouterLanguageModel && resolvedModel.gatewayId === "mastra";
+    const isGatewayModel = resolvedModel instanceof chunkJLGX4VZB_cjs.ModelRouterLanguageModel && resolvedModel.gatewayId === "mastra";
     if (resourceId && threadFromArgs && !this.hasOwnMemory() && !isGatewayModel) {
       this.logger.warn("No memory is configured but resourceId and threadId were passed in args", { agent: this.name });
     }
@@ -25979,7 +26023,7 @@ var TokenLimiterProcessor = class _TokenLimiterProcessor {
           return new TiktokenClass(this.customEncoding);
         });
       } else {
-        this.encoderPromise = chunkA67TNS6N_cjs.getTiktoken();
+        this.encoderPromise = chunkHIC3WGQU_cjs.getTiktoken();
       }
     }
     return this.encoderPromise;
@@ -26886,7 +26930,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunkA67TNS6N_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunkHIC3WGQU_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -28341,7 +28385,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkU552IBW4_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkJLGX4VZB_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -28354,7 +28398,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
       }
       if (config.embedder) {
         if (typeof config.embedder === "string") {
-          this.embedder = new chunkU552IBW4_cjs.ModelRouterEmbeddingModel(config.embedder);
+          this.embedder = new chunkJLGX4VZB_cjs.ModelRouterEmbeddingModel(config.embedder);
         } else {
           this.embedder = config.embedder;
         }
@@ -28394,7 +28438,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkU552IBW4_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunkJLGX4VZB_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -29160,5 +29204,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-EEQKSBYC.cjs.map
-//# sourceMappingURL=chunk-EEQKSBYC.cjs.map
+//# sourceMappingURL=chunk-CH4EKSQP.cjs.map
+//# sourceMappingURL=chunk-CH4EKSQP.cjs.map