@mastra/core 1.22.0 → 1.23.0-alpha.0

package/dist/{chunk-TULT7C36.js → chunk-J5QMVI5J.js}

@@ -1,5 +1,5 @@
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-2QXNHEDL.js';
-import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-M7O57C2Y.js';
+import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-PGXL3YYH.js';
 import { DefaultVoice } from './chunk-G5WUD7SF.js';
 import { InMemoryStore } from './chunk-R2KKOX5U.js';
 import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-HGR2ESKV.js';
@@ -7,7 +7,7 @@ import { parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-2PHG443D
 import { generateId, APICallError, tool, asSchema } from './chunk-6PALJNKG.js';
 import { EventEmitterPubSub } from './chunk-X2HAI3OX.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-NLN4DDI6.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-TAEBGE3H.js';
 import { MastraLLMV1 } from './chunk-XJLVFBPN.js';
 import { noopLogger } from './chunk-C4VH5RKF.js';
 import { removeUndefinedValues, safeStringify, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, ensureSerializable, delay } from './chunk-CW4IJO7Y.js';
@@ -15181,7 +15181,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);
@@ -21917,7 +21920,10 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = createWorkspaceTools(workspace);
+    const workspaceTools = await 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)) {
@@ -22549,6 +22555,14 @@ ${errorMessages}`,
             const subAgentDefaultOptions = await agent.getDefaultOptions?.({ requestContext });
             const subAgentHasOwnMemoryConfig = subAgentDefaultOptions?.memory !== void 0;
             const savedMastraMemory = requestContext.get("MastraMemory");
+            const savedThreadIdKey = requestContext.get(MASTRA_THREAD_ID_KEY);
+            const savedResourceIdKey = requestContext.get(MASTRA_RESOURCE_ID_KEY);
+            if (savedThreadIdKey !== void 0) {
+              requestContext.delete(MASTRA_THREAD_ID_KEY);
+            }
+            if (savedResourceIdKey !== void 0) {
+              requestContext.delete(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);
@@ -22630,6 +22644,12 @@ ${errorMessages}`,
                         });
                       }
                     }
+                    if (savedThreadIdKey !== void 0) {
+                      requestContext.set(MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+                    }
+                    if (savedResourceIdKey !== void 0) {
+                      requestContext.set(MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+                    }
                     return {
                       text: `[Delegation Rejected] ${rejectionMessage}`,
                       subAgentThreadId,
@@ -22775,6 +22795,12 @@ ${effectiveInstructions}`;
                   }
                 }
                 if (generateResult.finishReason === "suspended") {
+                  if (savedThreadIdKey !== void 0) {
+                    requestContext.set(MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+                  }
+                  if (savedResourceIdKey !== void 0) {
+                    requestContext.set(MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+                  }
                   return suspend?.(generateResult.suspendPayload, {
                     resumeSchema: generateResult.resumeSchema,
                     runId: generateResult.runId,
@@ -22894,6 +22920,12 @@ ${effectiveInstructions}`;
                   }
                 }
                 if (requireToolApproval || suspendedPayload || resumeSchema) {
+                  if (savedThreadIdKey !== void 0) {
+                    requestContext.set(MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+                  }
+                  if (savedResourceIdKey !== void 0) {
+                    requestContext.set(MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+                  }
                   return suspend?.(suspendedPayload, {
                     resumeSchema,
                     requireToolApproval,
@@ -22992,6 +23024,12 @@ ${effectiveInstructions}`;
               if (savedMastraMemory !== void 0) {
                 requestContext.set("MastraMemory", savedMastraMemory);
               }
+              if (savedThreadIdKey !== void 0) {
+                requestContext.set(MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+              }
+              if (savedResourceIdKey !== void 0) {
+                requestContext.set(MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+              }
               return result;
             } catch (err) {
               let bailed = false;
@@ -23062,6 +23100,12 @@ ${effectiveInstructions}`;
               if (savedMastraMemory !== void 0) {
                 requestContext.set("MastraMemory", savedMastraMemory);
               }
+              if (savedThreadIdKey !== void 0) {
+                requestContext.set(MASTRA_THREAD_ID_KEY, savedThreadIdKey);
+              }
+              if (savedResourceIdKey !== void 0) {
+                requestContext.set(MASTRA_RESOURCE_ID_KEY, savedResourceIdKey);
+              }
               const mastraError = new MastraError(
                 {
                   id: "AGENT_AGENT_TOOL_EXECUTION_FAILED",
@@ -29022,5 +29066,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, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SYSTEM_REMINDER_END_TAG, SYSTEM_REMINDER_START_TAG, SemanticRecall, SkillSearchProcessor, SkillsProcessor, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, ToolSearchProcessor, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, WorkspaceInstructionsProcessor, augmentWithInit, cleanStepResult, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createScorer, createStep, createTimeTravelExecutionParams, createWorkflow, extractWorkingMemoryContent, extractWorkingMemoryTags, formatCheckFeedback, formatCompletionFeedback, formatStreamCompletionFeedback, formatValidationFeedback, forwardAgentStreamChunk, generateFinalResult, generateStructuredFinalResult, getResumeLabelsByStepId, getStepIds, getStepResult, getThreadOMMetadata, globalEmbeddingCache, hydrateSerializedStepErrors, isObservationalMemoryEnabled, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeSystemReminderTags, removeWorkingMemoryTags, resolveThreadIdFromArgs, runChecks, runCompletionScorers, runCountDeprecationMessage, runDefaultCompletionCheck, runStreamCompletionScorers, runValidation, setThreadOMMetadata, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepRequestContext, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-TULT7C36.js.map
-//# sourceMappingURL=chunk-TULT7C36.js.map
+//# sourceMappingURL=chunk-J5QMVI5J.js.map
+//# sourceMappingURL=chunk-J5QMVI5J.js.map