@mastra/core 1.2.1-alpha.0 → 1.3.0-alpha.2

package/dist/{chunk-WFUNLRQX.js → chunk-ZRUTE56J.js}

@@ -1,23 +1,23 @@
-import { extractLines, createWorkspaceTools, BM25Index } from './chunk-ENCTSDWC.js';
-import { DefaultVoice } from './chunk-MQB7XFXP.js';
+import { extractLines, createWorkspaceTools, BM25Index } from './chunk-2GWTJFVM.js';
+import { DefaultVoice } from './chunk-LHRHOPUC.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-2QXNHEDL.js';
-import { InMemoryStore } from './chunk-VX7UA3SO.js';
-import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-Z6NRYYOH.js';
+import { InMemoryStore } from './chunk-MOOJ3H3C.js';
+import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-ILQXPZCD.js';
 import { parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-UTLWS5LV.js';
 import { generateId, asSchema, jsonSchema, APICallError, tool } from './chunk-CPLRD2VP.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-E3VFKTIA.js';
-import { MastraLLMV1 } from './chunk-AUF6U2BL.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-BXLLXTT4.js';
+import { MastraLLMV1 } from './chunk-VM25PDSW.js';
 import { noopLogger } from './chunk-PSCMWPLC.js';
 import { PubSub } from './chunk-BVUMKER5.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { isZodType, removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, selectFields, delay } from './chunk-T6PRRKMW.js';
+import { isZodType, removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, selectFields, delay } from './chunk-ZHFM7HCQ.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
-import { Tool, createTool } from './chunk-IW3BNL7A.js';
+import { Tool, createTool } from './chunk-RS6CZXGA.js';
 import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-Y3TQ52UE.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-CCLV5CAA.js';
 import { MastraError, getErrorFromUnknown } from './chunk-FJEVLHJT.js';
 import { zodToJsonSchema } from './chunk-PJKCPRYF.js';
-import { MastraBase } from './chunk-JIT2OY3X.js';
+import { MastraBase } from './chunk-WCAFTXGK.js';
 import { RegisteredLogger, ConsoleLogger } from './chunk-X2WMFSPB.js';
 import { __commonJS, __toESM } from './chunk-7D4SUZUM.js';
 import z10, { z, ZodObject } from 'zod';
@@ -2515,6 +2515,7 @@ var MastraModelOutput = class extends MastraBase {
   #tripwire = void 0;
   #delayedPromises = {
     suspendPayload: new DelayedPromise(),
+    resumeSchema: new DelayedPromise(),
     object: new DelayedPromise(),
     finishReason: new DelayedPromise(),
     usage: new DelayedPromise(),
@@ -2664,6 +2665,7 @@ var MastraModelOutput = class extends MastraBase {
             case "tool-call-approval":
               self.#status = "suspended";
               self.#delayedPromises.suspendPayload.resolve(chunk.payload);
+              self.#delayedPromises.resumeSchema.resolve(chunk.payload.resumeSchema);
               break;
             case "raw":
               if (!self.#options.includeRawChunks) {
@@ -2878,8 +2880,9 @@ var MastraModelOutput = class extends MastraBase {
                 steps: self.#bufferedSteps,
                 totalUsage: self.#usageCount,
                 content: [],
-                suspendPayload: void 0
+                suspendPayload: void 0,
                 // Tripwire doesn't suspend, so resolve to undefined
+                resumeSchema: void 0
               });
               self.#emitChunk(chunk);
               controller.enqueue(chunk);
@@ -3008,7 +3011,8 @@ var MastraModelOutput = class extends MastraBase {
                 steps: self.#bufferedSteps,
                 totalUsage: self.#getTotalUsage(),
                 content: messageList.get.response.aiV5.stepContent(),
-                suspendPayload: void 0
+                suspendPayload: void 0,
+                resumeSchema: void 0
               });
               const baseFinishStep = self.#bufferedSteps[self.#bufferedSteps.length - 1];
               if (baseFinishStep) {
@@ -3166,6 +3170,9 @@ var MastraModelOutput = class extends MastraBase {
   get suspendPayload() {
     return this.#getDelayedPromise(this.#delayedPromises.suspendPayload);
   }
+  get resumeSchema() {
+    return this.#getDelayedPromise(this.#delayedPromises.resumeSchema);
+  }
   /**
    * Stream of all chunks. Provides complete control over stream processing.
    */
@@ -3328,6 +3335,7 @@ var MastraModelOutput = class extends MastraBase {
       traceId: this.traceId,
       runId: this.runId,
       suspendPayload: await this.suspendPayload,
+      resumeSchema: await this.resumeSchema,
       // All messages from this execution (input + memory history + response)
       messages: this.messageList.get.all.db(),
       // Only messages loaded from memory (conversation history)
@@ -4790,6 +4798,10 @@ var ExecutionEngine = class extends MastraBase {
   }
   __registerMastra(mastra) {
     this.mastra = mastra;
+    const logger = mastra?.getLogger();
+    if (logger) {
+      this.__setLogger(logger);
+    }
   }
   getLogger() {
     return this.logger;
@@ -7774,13 +7786,14 @@ function createStepFromParams(params) {
     requestContextSchema: params.requestContextSchema,
     scorers: params.scorers,
     retries: params.retries,
+    metadata: params.metadata,
     execute: params.execute.bind(params)
   };
 }
 function createStepFromAgent(params, agentOrToolOptions) {
   const options = agentOrToolOptions ?? {};
   const outputSchema = options?.structuredOutput?.schema ?? z.object({ text: z.string() });
-  const { retries, scorers, ...agentOptions } = options ?? {};
+  const { retries, scorers, metadata, ...agentOptions } = options ?? {};
   return {
     id: params.id,
     description: params.getDescription(),
@@ -7790,6 +7803,7 @@ function createStepFromAgent(params, agentOrToolOptions) {
     outputSchema,
     retries,
     scorers,
+    metadata,
     execute: async ({
       inputData,
       runId,
@@ -7915,6 +7929,7 @@ function createStepFromTool(params, toolOpts) {
     suspendSchema: params.suspendSchema,
     retries: toolOpts?.retries,
     scorers: toolOpts?.scorers,
+    metadata: toolOpts?.metadata,
     execute: async ({
       inputData,
       mastra,
@@ -8427,7 +8442,8 @@ function cloneStep(step, opts) {
     execute: step.execute,
     retries: step.retries,
     scorers: step.scorers,
-    component: step.component
+    component: step.component,
+    metadata: step.metadata
   };
 }
 function isProcessor(obj) {
@@ -8554,6 +8570,7 @@ var Workflow = class extends MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8723,6 +8740,7 @@ var Workflow = class extends MastraBase {
         step: {
           id: step.id,
           description: step.description,
+          metadata: step.metadata,
           component: step.component,
           serializedStepFlow: step.serializedStepFlow,
           canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8750,6 +8768,7 @@ var Workflow = class extends MastraBase {
         step: {
           id: step.id,
           description: step.description,
+          metadata: step.metadata,
           component: step.component,
           serializedStepFlow: step.serializedStepFlow,
           canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8775,6 +8794,7 @@ var Workflow = class extends MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8798,6 +8818,7 @@ var Workflow = class extends MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8816,6 +8837,7 @@ var Workflow = class extends MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(actualStep.suspendSchema || actualStep.resumeSchema)
@@ -11093,6 +11115,7 @@ function createLLMExecutionStep({
   modelSpanTracker,
   autoResumeSuspendedTools,
   maxProcessorRetries,
+  workspace,
   outputWriter
 }) {
   const initialSystemMessages = messageList.getAllSystemMessages();
@@ -11106,7 +11129,7 @@ function createLLMExecutionStep({
       let warnings;
       let request;
       let rawResponse;
-      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(
+      const { outputStream, callBail, runState, stepTools, stepWorkspace } = await executeStreamWithFallbackModels(
         models,
         logger
       )(async (modelConfig, isLastModel) => {
@@ -11125,7 +11148,8 @@ function createLLMExecutionStep({
           activeTools,
           providerOptions,
           modelSettings,
-          structuredOutput
+          structuredOutput,
+          workspace
         };
         const inputStepProcessors = [
           ...inputProcessors || [],
@@ -11411,10 +11435,17 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
             throw error;
           }
         }
-        return { outputStream: outputStream2, callBail: false, runState: runState2, stepTools: currentStep.tools };
+        return {
+          outputStream: outputStream2,
+          callBail: false,
+          runState: runState2,
+          stepTools: currentStep.tools,
+          stepWorkspace: currentStep.workspace
+        };
       });
       if (_internal) {
         _internal.stepTools = stepTools;
+        _internal.stepWorkspace = stepWorkspace ?? _internal.stepWorkspace;
       }
       if (callBail) {
         const usage2 = outputStream._getImmediateUsage();
@@ -11566,6 +11597,9 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           tripwire: stepTripwireData
         })
       );
+      if (shouldRetry) {
+        messageList.removeByIds([messageId]);
+      }
       const retryFeedbackText = shouldRetry && processOutputStepTripwire ? `[Processor Feedback] Your previous response was not accepted: ${processOutputStepTripwire.message}. Please try again with the feedback in mind.` : void 0;
       const messages = {
         all: messageList.get.all.aiV5.model(),
@@ -11801,7 +11835,8 @@ function createToolCallStep({
         args,
         suspendPayload,
         resumeSchema,
-        type
+        type,
+        suspendedToolRunId
       }) => {
         const metadataKey = type === "suspension" ? "suspendedTools" : "pendingToolApprovals";
         const responseMessages = messageList.get.response.db();
@@ -11816,7 +11851,7 @@ function createToolCallStep({
             toolName,
             args,
             type,
-            runId,
+            runId: suspendedToolRunId ?? runId,
             // Store the runId so we can resume after page refresh
             ...type === "suspension" ? { suspendPayload } : {},
             resumeSchema
@@ -12036,42 +12071,122 @@ function createToolCallStep({
           outputWriter,
           // Pass current step span as parent for tool call spans
           tracingContext: modelSpanTracker?.getTracingContext(),
+          // Pass workspace from _internal (set by llmExecutionStep via prepareStep/processInputStep)
+          workspace: _internal?.stepWorkspace,
           suspend: async (suspendPayload, options2) => {
-            controller.enqueue({
-              type: "tool-call-suspended",
-              runId,
-              from: "AGENT" /* AGENT */,
-              payload: {
+            if (options2?.requireToolApproval) {
+              controller.enqueue({
+                type: "tool-call-approval",
+                runId,
+                from: "AGENT" /* AGENT */,
+                payload: {
+                  toolCallId: inputData.toolCallId,
+                  toolName: inputData.toolName,
+                  args: inputData.args,
+                  resumeSchema: JSON.stringify(
+                    zodToJsonSchema$1(
+                      z10.object({
+                        approved: z10.boolean().describe(
+                          "Controls if the tool call is approved or not, should be true when approved and false when declined"
+                        )
+                      })
+                    )
+                  )
+                }
+              });
+              addToolMetadata({
                 toolCallId: inputData.toolCallId,
                 toolName: inputData.toolName,
-                suspendPayload,
                 args: inputData.args,
-                resumeSchema: options2?.resumeSchema
-              }
-            });
-            addToolMetadata({
-              toolCallId: inputData.toolCallId,
-              toolName: inputData.toolName,
-              args,
-              suspendPayload,
-              type: "suspension",
-              resumeSchema: options2?.resumeSchema
-            });
-            await flushMessagesBeforeSuspension();
-            return await suspend(
-              {
-                toolCallSuspended: suspendPayload,
-                __streamState: streamState.serialize(),
+                type: "approval",
+                suspendedToolRunId: options2.runId,
+                resumeSchema: JSON.stringify(
+                  zodToJsonSchema$1(
+                    z10.object({
+                      approved: z10.boolean().describe(
+                        "Controls if the tool call is approved or not, should be true when approved and false when declined"
+                      )
+                    })
+                  )
+                )
+              });
+              await flushMessagesBeforeSuspension();
+              return suspend(
+                {
+                  requireToolApproval: {
+                    toolCallId: inputData.toolCallId,
+                    toolName: inputData.toolName,
+                    args: inputData.args
+                  },
+                  __streamState: streamState.serialize()
+                },
+                {
+                  resumeLabel: inputData.toolCallId
+                }
+              );
+            } else {
+              controller.enqueue({
+                type: "tool-call-suspended",
+                runId,
+                from: "AGENT" /* AGENT */,
+                payload: {
+                  toolCallId: inputData.toolCallId,
+                  toolName: inputData.toolName,
+                  suspendPayload,
+                  args: inputData.args,
+                  resumeSchema: options2?.resumeSchema
+                }
+              });
+              addToolMetadata({
+                toolCallId: inputData.toolCallId,
                 toolName: inputData.toolName,
-                resumeLabel: options2?.resumeLabel
-              },
-              {
-                resumeLabel: inputData.toolCallId
-              }
-            );
+                args,
+                suspendPayload,
+                suspendedToolRunId: options2?.isAgentSuspend ? options2.runId : void 0,
+                type: "suspension",
+                resumeSchema: options2?.resumeSchema
+              });
+              await flushMessagesBeforeSuspension();
+              return await suspend(
+                {
+                  toolCallSuspended: suspendPayload,
+                  __streamState: streamState.serialize(),
+                  toolName: inputData.toolName,
+                  resumeLabel: options2?.resumeLabel
+                },
+                {
+                  resumeLabel: inputData.toolCallId
+                }
+              );
+            }
           },
           resumeData: resumeDataToPassToToolOptions
         };
+        if (resumeDataToPassToToolOptions && inputData.toolName?.startsWith("agent-") && !isResumeToolCall) {
+          let suspendedToolRunId = "";
+          const messages = messageList.get.all.db();
+          const assistantMessages = [...messages].reverse().filter((message) => message.role === "assistant");
+          for (const message of assistantMessages) {
+            const pendingOrSuspendedTools = message.content.metadata?.suspendedTools || message.content.metadata?.pendingToolApprovals;
+            if (pendingOrSuspendedTools && pendingOrSuspendedTools[inputData.toolName]) {
+              suspendedToolRunId = pendingOrSuspendedTools[inputData.toolName].runId;
+              break;
+            }
+            const dataToolSuspendedParts = message.content.parts?.filter(
+              (part) => (part.type === "data-tool-call-suspended" || part.type === "data-tool-call-approval") && !part.data.resumed
+            );
+            if (dataToolSuspendedParts && dataToolSuspendedParts.length > 0) {
+              const foundTool = dataToolSuspendedParts.find((part) => part.data.toolName === inputData.toolName);
+              if (foundTool) {
+                suspendedToolRunId = foundTool.data.runId;
+                break;
+              }
+            }
+          }
+          if (suspendedToolRunId) {
+            args.suspendedToolRunId = suspendedToolRunId;
+          }
+        }
         const result = await tool2.execute(args, toolOptions);
         if (tool2 && "onOutput" in tool2 && typeof tool2.onOutput === "function") {
           try {
@@ -12574,6 +12689,12 @@ var MastraScorer = class _MastraScorer {
     }
   }
   #mastra;
+  #rawConfig;
+  /**
+   * Tracks whether this scorer was defined in code or loaded from storage.
+   * Set by `Mastra.addScorer()` when the `source` option is provided.
+   */
+  source;
   /**
    * Registers the Mastra instance with the scorer.
    * This enables access to custom gateways for model resolution.
@@ -12582,6 +12703,20 @@ var MastraScorer = class _MastraScorer {
   __registerMastra(mastra) {
     this.#mastra = mastra;
   }
+  /**
+   * Returns the raw storage configuration this scorer was created from,
+   * or undefined if it was created from code.
+   */
+  toRawConfig() {
+    return this.#rawConfig;
+  }
+  /**
+   * Sets the raw storage configuration for this scorer.
+   * @internal
+   */
+  __setRawConfig(rawConfig) {
+    this.#rawConfig = rawConfig;
+  }
   get type() {
     return this.config.type;
   }
@@ -13375,7 +13510,8 @@ var MastraLLMVNext = class extends MastraBase {
     autoResumeSuspendedTools,
     maxProcessorRetries,
     processorStates,
-    activeTools
+    activeTools,
+    workspace
   }) {
     let stopWhenToUse;
     if (maxSteps && typeof maxSteps === "number") {
@@ -13442,6 +13578,7 @@ var MastraLLMVNext = class extends MastraBase {
         maxProcessorRetries,
         processorStates,
         activeTools,
+        workspace,
         options: {
           ...options,
           onStepFinish: async (props) => {
@@ -13614,6 +13751,7 @@ async function getRoutingAgent({
   const toolsToUse = await agent.listTools({ requestContext });
   const model = await agent.getModel({ requestContext });
   const memoryToUse = await agent.getMemory({ requestContext });
+  const clientToolsToUse = (await agent.getDefaultOptions({ requestContext }))?.clientTools;
   const configuredInputProcessors = await agent.listConfiguredInputProcessors(requestContext);
   const configuredOutputProcessors = await agent.listConfiguredOutputProcessors(requestContext);
   const agentList = Object.entries(agentsToUse).map(([name, agent2]) => {
@@ -13625,7 +13763,7 @@ async function getRoutingAgent({
     )}`;
   }).join("\n");
   const memoryTools = await memoryToUse?.listTools?.();
-  const toolList = Object.entries({ ...toolsToUse, ...memoryTools }).map(([name, tool2]) => {
+  const toolList = Object.entries({ ...toolsToUse, ...memoryTools, ...clientToolsToUse || {} }).map(([name, tool2]) => {
     const inputSchema = "inputSchema" in tool2 ? tool2.inputSchema ?? z10.object({}) : z10.object({});
     return ` - **${name}**: ${tool2.description}, input schema: ${JSON.stringify(zodToJsonSchema(inputSchema))}`;
   }).join("\n");
@@ -14012,20 +14150,6 @@ async function createNetworkLoop({
         });
       }
       const isComplete = object.primitiveId === "none" && object.primitiveType === "none";
-      if (isComplete && object.selectionReason) {
-        await writer.write({
-          type: "routing-agent-text-start",
-          payload: { runId: stepId },
-          from: "NETWORK" /* NETWORK */,
-          runId
-        });
-        await writer.write({
-          type: "routing-agent-text-delta",
-          payload: { runId: stepId, text: object.selectionReason },
-          from: "NETWORK" /* NETWORK */,
-          runId
-        });
-      }
       const conversationContext = filterMessagesForSubAgent(result.rememberedMessages ?? []);
       const endPayload = {
         task: inputData.task,
@@ -14678,7 +14802,8 @@ async function createNetworkLoop({
       const agentTools = await agent.listTools({ requestContext });
       const memory = await agent.getMemory({ requestContext });
       const memoryTools = await memory?.listTools?.();
-      const toolsMap = { ...agentTools, ...memoryTools };
+      const clientTools = (await agent.getDefaultOptions({ requestContext }))?.clientTools;
+      const toolsMap = { ...agentTools, ...memoryTools, ...clientTools || {} };
       let tool2 = toolsMap[inputData.primitiveId];
       if (!tool2) {
         const mastraError = new MastraError({
@@ -16274,7 +16399,7 @@ var AgentLegacyHandler = class {
             title: thread.title,
             memoryConfig,
             resourceId,
-            saveThread: false
+            saveThread: true
           });
         }
         requestContext.set("MastraMemory", {
@@ -16385,9 +16510,7 @@ var AgentLegacyHandler = class {
               model: titleModel,
               instructions: titleInstructions
             } = this.capabilities.resolveTitleGenerationConfig(config?.generateTitle);
-            const rememberedUserMessages = messageList.get.remembered.db().filter((m) => m.role === "user");
-            const isFirstUserMessage = rememberedUserMessages.length === 0;
-            if (shouldGenerate && isFirstUserMessage && userMessage) {
+            if (shouldGenerate && !threadExists && userMessage) {
               promises.push(
                 this.capabilities.genTitle(userMessage, requestContext, { currentSpan: agentSpan }, titleModel, titleInstructions).then((title) => {
                   if (title) {
@@ -16543,12 +16666,14 @@ var AgentLegacyHandler = class {
     let messageList;
     let thread;
     let threadExists;
+    let threadCreatedByStep = false;
     return {
       llm,
       before: async () => {
         const beforeResult = await before();
         const { messageObjects, convertedTools, agentSpan } = beforeResult;
         threadExists = beforeResult.threadExists || false;
+        threadCreatedByStep = false;
         messageList = beforeResult.messageList;
         thread = beforeResult.thread;
         const threadId = thread?.id;
@@ -16564,7 +16689,7 @@ var AgentLegacyHandler = class {
           requestContext,
           onStepFinish: async (props) => {
             if (savePerStep) {
-              if (!threadExists && memory && thread) {
+              if (!threadExists && !threadCreatedByStep && memory && thread) {
                 await memory.createThread({
                   threadId,
                   title: thread.title,
@@ -16572,7 +16697,7 @@ var AgentLegacyHandler = class {
                   resourceId: thread.resourceId,
                   memoryConfig
                 });
-                threadExists = true;
+                threadCreatedByStep = true;
               }
               await this.capabilities.saveStepMessages({
                 result: props,
@@ -16637,17 +16762,23 @@ var AgentLegacyHandler = class {
     };
     const { llm, before, after } = await this.prepareLLMOptions(messages, mergedGenerateOptions, "generate");
     if (llm.getModel().specificationVersion !== "v1") {
-      this.capabilities.logger.error("V2 models are not supported for generateLegacy. Please use generate instead.", {
-        modelId: llm.getModel().modelId
-      });
+      const specVersion = llm.getModel().specificationVersion;
+      this.capabilities.logger.error(
+        `Models with specificationVersion "${specVersion}" are not supported for generateLegacy. Please use generate() instead.`,
+        {
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
+        }
+      );
       throw new MastraError({
         id: "AGENT_GENERATE_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
         details: {
-          modelId: llm.getModel().modelId
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
         },
-        text: "V2 models are not supported for generateLegacy. Please use generate instead."
+        text: `Models with specificationVersion "${specVersion}" are not supported for generateLegacy(). Please use generate() instead.`
       });
     }
     const llmToUse = llm;
@@ -16857,17 +16988,23 @@ var AgentLegacyHandler = class {
     };
     const { llm, before, after } = await this.prepareLLMOptions(messages, mergedStreamOptions, "stream");
     if (llm.getModel().specificationVersion !== "v1") {
-      this.capabilities.logger.error("V2 models are not supported for streamLegacy. Please use stream instead.", {
-        modelId: llm.getModel().modelId
-      });
+      const specVersion = llm.getModel().specificationVersion;
+      this.capabilities.logger.error(
+        `Models with specificationVersion "${specVersion}" are not supported for streamLegacy. Please use stream() instead.`,
+        {
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
+        }
+      );
       throw new MastraError({
         id: "AGENT_STREAM_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
         details: {
-          modelId: llm.getModel().modelId
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
         },
-        text: "V2 models are not supported for streamLegacy. Please use stream instead."
+        text: `Models with specificationVersion "${specVersion}" are not supported for streamLegacy(). Please use stream() instead.`
       });
     }
     const beforeResult = await before();
@@ -17168,6 +17305,7 @@ function createMapResultsStep({
   return async ({ inputData, bail, tracingContext }) => {
     const toolsData = inputData["prepare-tools-step"];
     const memoryData = inputData["prepare-memory-step"];
+    let threadCreatedByStep = false;
     const result = {
       ...options,
       tools: toolsData.convertedTools,
@@ -17178,7 +17316,7 @@ function createMapResultsStep({
       requestContext,
       onStepFinish: async (props) => {
         if (options.savePerStep && !memoryConfig?.readOnly) {
-          if (!memoryData.threadExists && memory && memoryData.thread) {
+          if (!memoryData.threadExists && !threadCreatedByStep && memory && memoryData.thread) {
             await memory.createThread({
               threadId: memoryData.thread?.id,
               title: memoryData.thread?.title,
@@ -17186,7 +17324,7 @@ function createMapResultsStep({
               resourceId: memoryData.thread?.resourceId,
               memoryConfig
             });
-            memoryData.threadExists = true;
+            threadCreatedByStep = true;
           }
           await capabilities.saveStepMessages({
             result: props,
@@ -17561,7 +17699,8 @@ function createStreamStep({
   memoryConfig,
   memory,
   resourceId,
-  autoResumeSuspendedTools
+  autoResumeSuspendedTools,
+  workspace
 }) {
   return createStep({
     id: "stream-text-step",
@@ -17597,7 +17736,8 @@ function createStreamStep({
         agentName,
         toolCallId,
         methodType: modelMethodType,
-        autoResumeSuspendedTools
+        autoResumeSuspendedTools,
+        workspace
       });
       return streamResult;
     }
@@ -17624,7 +17764,8 @@ function createPrepareStreamWorkflow({
   resumeContext,
   agentId,
   agentName,
-  toolCallId
+  toolCallId,
+  workspace
 }) {
   const prepareToolsStep = createPrepareToolsStep({
     capabilities,
@@ -17663,7 +17804,8 @@ function createPrepareStreamWorkflow({
     memoryConfig,
     memory,
     resourceId,
-    autoResumeSuspendedTools: options.autoResumeSuspendedTools
+    autoResumeSuspendedTools: options.autoResumeSuspendedTools,
+    workspace
   });
   const mapResultsStep = createMapResultsStep({
     capabilities,
@@ -17748,7 +17890,7 @@ var Agent = class extends MastraBase {
    * ```
    */
   constructor(config) {
-    super({ component: RegisteredLogger.AGENT });
+    super({ component: RegisteredLogger.AGENT, rawConfig: config.rawConfig });
     this.name = config.name;
     this.id = config.id ?? config.name;
     this.source = "code";
@@ -18093,6 +18235,25 @@ ${errorMessages}`,
     const configuredProcessors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new RequestContext() }) : this.#outputProcessors;
     return this.combineProcessorsIntoWorkflow(configuredProcessors, `${this.id}-configured-output-processor`);
   }
+  /**
+   * Returns the IDs of the raw configured input and output processors,
+   * without combining them into workflows. Used by the editor to clone
+   * agent processor configuration to storage.
+   */
+  async getConfiguredProcessorIds(requestContext) {
+    const ctx = requestContext || new RequestContext();
+    let inputProcessorIds = [];
+    if (this.#inputProcessors) {
+      const processors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: ctx }) : this.#inputProcessors;
+      inputProcessorIds = processors.map((p) => p.id).filter(Boolean);
+    }
+    let outputProcessorIds = [];
+    if (this.#outputProcessors) {
+      const processors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: ctx }) : this.#outputProcessors;
+      outputProcessorIds = processors.map((p) => p.id).filter(Boolean);
+    }
+    return { inputProcessorIds, outputProcessorIds };
+  }
   /**
    * Returns configured processor workflows for registration with Mastra.
    * This excludes memory-derived processors to avoid triggering memory factory functions.
@@ -18211,26 +18372,17 @@ ${errorMessages}`,
     requestContext = new RequestContext()
   } = {}) {
     if (this.#workspace) {
-      let resolvedWorkspace;
       if (typeof this.#workspace !== "function") {
-        resolvedWorkspace = this.#workspace;
-      } else {
-        const result = this.#workspace({ requestContext, mastra: this.#mastra });
-        resolvedWorkspace = await Promise.resolve(result);
-        if (!resolvedWorkspace) {
-          const mastraError = new MastraError({
-            id: "AGENT_GET_WORKSPACE_FUNCTION_EMPTY_RETURN",
-            domain: "AGENT" /* AGENT */,
-            category: "USER" /* USER */,
-            details: {
-              agentName: this.name
-            },
-            text: `[Agent:${this.name}] - Function-based workspace returned empty value`
-          });
-          this.logger.trackException(mastraError);
-          this.logger.error(mastraError.toString());
-          throw mastraError;
-        }
+        return this.#workspace;
+      }
+      const result = this.#workspace({ requestContext, mastra: this.#mastra });
+      const resolvedWorkspace = await Promise.resolve(result);
+      if (!resolvedWorkspace) {
+        return void 0;
+      }
+      resolvedWorkspace.__setLogger(this.logger);
+      if (this.#mastra) {
+        this.#mastra.addWorkspace(resolvedWorkspace);
       }
       return resolvedWorkspace;
     }
@@ -18817,6 +18969,9 @@ ${errorMessages}`,
    */
   __registerMastra(mastra) {
     this.#mastra = mastra;
+    if (this.#workspace && typeof this.#workspace !== "function") {
+      this.#workspace.__setLogger(this.logger);
+    }
     if (this.#tools && typeof this.#tools === "object") {
       Object.entries(this.#tools).forEach(([key, tool2]) => {
         try {
@@ -18989,6 +19144,10 @@ ${errorMessages}`,
       return convertedMemoryTools;
     }
     const memory = await this.getMemory({ requestContext });
+    if (!threadId && !resourceId) {
+      this.logger.debug(`[Agent:${this.name}] - Skipping memory tools (no thread or resource context)`, { runId });
+      return convertedMemoryTools;
+    }
     const memoryTools = memory?.listTools?.(memoryConfig);
     if (memoryTools) {
       this.logger.debug(
@@ -19384,11 +19543,20 @@ ${errorMessages}`,
                 source: "agent",
                 entityId: agentName
               }) || `${slugify.default(this.id)}-${agentName}`;
+              const suspendedToolRunId = inputData.suspendedToolRunId;
+              const { resumeData, suspend } = context?.agent ?? {};
               if ((methodType === "generate" || methodType === "generateLegacy") && supportedLanguageModelSpecifications.includes(modelVersion)) {
                 if (!agent.hasOwnMemory() && this.#memory) {
                   agent.__setMemory(this.#memory);
                 }
-                const generateResult = await agent.generate(inputData.prompt, {
+                const generateResult = resumeData ? await agent.resumeGenerate(resumeData, {
+                  runId: suspendedToolRunId,
+                  requestContext,
+                  tracingContext: context?.tracingContext,
+                  ...inputData.instructions && { instructions: inputData.instructions },
+                  ...inputData.maxSteps && { maxSteps: inputData.maxSteps },
+                  ...resourceId && threadId ? { memory: { resource: subAgentResourceId, thread: subAgentThreadId } } : {}
+                }) : await agent.generate(inputData.prompt, {
                   requestContext,
                   tracingContext: context?.tracingContext,
                   ...inputData.instructions && { instructions: inputData.instructions },
@@ -19400,6 +19568,13 @@ ${errorMessages}`,
                     }
                   } : {}
                 });
+                if (generateResult.finishReason === "suspended") {
+                  return suspend?.(generateResult.suspendPayload, {
+                    resumeSchema: generateResult.resumeSchema,
+                    runId: generateResult.runId,
+                    isAgentSuspend: true
+                  });
+                }
                 result = { text: generateResult.text, subAgentThreadId, subAgentResourceId };
               } else if (methodType === "generate" && modelVersion === "v1") {
                 const generateResult = await agent.generateLegacy(inputData.prompt, {
@@ -19411,7 +19586,19 @@ ${errorMessages}`,
                 if (!agent.hasOwnMemory() && this.#memory) {
                   agent.__setMemory(this.#memory);
                 }
-                const streamResult = await agent.stream(inputData.prompt, {
+                const streamResult = resumeData ? await agent.resumeStream(resumeData, {
+                  runId: suspendedToolRunId,
+                  requestContext,
+                  tracingContext: context?.tracingContext,
+                  ...inputData.instructions && { instructions: inputData.instructions },
+                  ...inputData.maxSteps && { maxSteps: inputData.maxSteps },
+                  ...resourceId && threadId ? {
+                    memory: {
+                      resource: subAgentResourceId,
+                      thread: subAgentThreadId
+                    }
+                  } : {}
+                }) : await agent.stream(inputData.prompt, {
                   requestContext,
                   tracingContext: context?.tracingContext,
                   ...inputData.instructions && { instructions: inputData.instructions },
@@ -19428,8 +19615,34 @@ ${errorMessages}`,
                   if (context?.writer) {
                     if (chunk.type.startsWith("data-")) {
                       await context.writer.custom(chunk);
+                      if (chunk.type === "data-tool-call-approval") {
+                        return suspend?.(
+                          {},
+                          { requireToolApproval: true, runId: streamResult.runId, isAgentSuspend: true }
+                        );
+                      }
+                      if (chunk.type === "data-tool-call-suspended") {
+                        return suspend?.(chunk.data.suspendPayload, {
+                          resumeSchema: chunk.data.resumeSchema,
+                          runId: streamResult.runId,
+                          isAgentSuspend: true
+                        });
+                      }
                     } else {
                       await context.writer.write(chunk);
+                      if (chunk.type === "tool-call-approval") {
+                        return suspend?.(
+                          {},
+                          { requireToolApproval: true, runId: streamResult.runId, isAgentSuspend: true }
+                        );
+                      }
+                      if (chunk.type === "tool-call-suspended") {
+                        return suspend?.(chunk.payload.suspendPayload, {
+                          resumeSchema: chunk.payload.resumeSchema,
+                          runId: streamResult.runId,
+                          isAgentSuspend: true
+                        });
+                      }
                     }
                   }
                   if (chunk.type === "text-delta") {
@@ -19524,7 +19737,7 @@ ${errorMessages}`,
       for (const [workflowName, workflow] of Object.entries(workflows)) {
         const extendedInputSchema = z.object({
           // @ts-expect-error - zod types mismatch between v3 and v4
-          inputData: workflow.inputSchema,
+          inputData: workflow.inputSchema ?? z.object({}).passthrough(),
           ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
         });
         const toolObj = createTool({
@@ -20110,6 +20323,7 @@ ${errorMessages}`,
       mastra: this.#mastra
     });
     const memory = await this.getMemory({ requestContext });
+    const workspace = await this.getWorkspace({ requestContext });
     const saveQueueManager = new SaveQueueManager({
       logger: this.logger,
       memory
@@ -20158,7 +20372,8 @@ ${errorMessages}`,
       resumeContext,
       agentId: this.id,
       agentName: this.name,
-      toolCallId: options.toolCallId
+      toolCallId: options.toolCallId,
+      workspace
     });
     const run = await executionWorkflow.createRun();
     const result = await run.start({ tracingContext: { currentSpan: agentSpan } });
@@ -20248,9 +20463,7 @@ ${errorMessages}`,
           model: titleModel,
           instructions: titleInstructions
         } = this.resolveTitleGenerationConfig(config.generateTitle);
-        const rememberedUserMessages = messageList.get.remembered.db().filter((m) => m.role === "user");
-        const isFirstUserMessage = rememberedUserMessages.length === 0;
-        if (shouldGenerate && isFirstUserMessage) {
+        if (shouldGenerate && !threadExists) {
           const userMessage = this.getMostRecentUserMessage(messageList.get.all.ui());
           if (userMessage) {
             const title = await this.genTitle(
@@ -20482,16 +20695,17 @@ ${errorMessages}`,
     if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
+      const specVersion = modelInfo.specificationVersion;
       throw new MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: specVersion === "v1" ? `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.` : `Agent "${this.name}" has a model (${provider}:${modelId}) with unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
         details: {
           agentName: this.name,
           modelId,
           provider,
-          specificationVersion: modelInfo.specificationVersion
+          specificationVersion: specVersion
         }
       });
     }
@@ -20545,16 +20759,17 @@ ${errorMessages}`,
     if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
+      const specVersion = modelInfo.specificationVersion;
       throw new MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5+ models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: specVersion === "v1" ? `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5+ models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.` : `Agent "${this.name}" has a model (${provider}:${modelId}) with unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
         details: {
           agentName: this.name,
           modelId,
           provider,
-          specificationVersion: modelInfo.specificationVersion
+          specificationVersion: specVersion
         }
       });
     }
@@ -20599,11 +20814,18 @@ ${errorMessages}`,
       requestContext: mergedStreamOptions.requestContext
     });
     if (!isSupportedLanguageModel(llm.getModel())) {
+      const modelInfo = llm.getModel();
+      const specVersion = modelInfo.specificationVersion;
       throw new MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: "V1 models are not supported for stream. Please use streamLegacy instead."
+        text: specVersion === "v1" ? "V1 models are not supported for resumeStream. Please use streamLegacy instead." : `Model has unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
+        details: {
+          modelId: modelInfo.modelId,
+          provider: modelInfo.provider,
+          specificationVersion: specVersion
+        }
       });
     }
     const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
@@ -20669,16 +20891,17 @@ ${errorMessages}`,
     if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
+      const specVersion = modelInfo.specificationVersion;
       throw new MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: specVersion === "v1" ? `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.` : `Agent "${this.name}" has a model (${provider}:${modelId}) with unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
         details: {
           agentName: this.name,
           modelId,
           provider,
-          specificationVersion: modelInfo.specificationVersion
+          specificationVersion: specVersion
         }
       });
     }
@@ -24529,21 +24752,30 @@ var MockMemory = class extends MastraMemory {
           const threadId = context?.agent?.threadId;
           const resourceId = context?.agent?.resourceId;
           const memory = context?.memory;
-          if (!threadId || !memory || !resourceId) {
-            throw new Error("Thread ID, Memory instance, and resourceId are required for working memory updates");
+          if (!memory) {
+            throw new Error("Memory instance is required for working memory updates");
           }
-          let thread = await memory.getThreadById({ threadId });
-          if (!thread) {
-            thread = await memory.createThread({
-              threadId,
-              resourceId,
-              memoryConfig: _config
-            });
+          const scope = mergedConfig.workingMemory?.scope || "resource";
+          if (scope === "thread" && !threadId) {
+            throw new Error("Thread ID is required for thread-scoped working memory updates");
           }
-          if (thread.resourceId && thread.resourceId !== resourceId) {
-            throw new Error(
-              `Thread with id ${threadId} resourceId does not match the current resourceId ${resourceId}`
-            );
+          if (scope === "resource" && !resourceId) {
+            throw new Error("Resource ID is required for resource-scoped working memory updates");
+          }
+          if (threadId) {
+            let thread = await memory.getThreadById({ threadId });
+            if (!thread) {
+              thread = await memory.createThread({
+                threadId,
+                resourceId,
+                memoryConfig: _config
+              });
+            }
+            if (thread.resourceId && resourceId && thread.resourceId !== resourceId) {
+              throw new Error(
+                `Thread with id ${threadId} resourceId does not match the current resourceId ${resourceId}`
+              );
+            }
           }
           const workingMemory = typeof inputData.memory === "string" ? inputData.memory : JSON.stringify(inputData.memory);
           await memory.updateWorkingMemory({
@@ -24639,5 +24871,5 @@ var MockMemory = class extends MastraMemory {
 };
 
 export { Agent, BaseProcessor, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, EventEmitterPubSub, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MastraScorer, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SkillsProcessor, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, ToolSearchProcessor, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cleanStepResult, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createScorer, createStep, createTimeTravelExecutionParams, createWorkflow, extractWorkingMemoryContent, extractWorkingMemoryTags, formatCheckFeedback, formatCompletionFeedback, formatValidationFeedback, generateFinalResult, generateStructuredFinalResult, getResumeLabelsByStepId, getStepIds, getStepResult, getThreadOMMetadata, getZodErrors, globalEmbeddingCache, hydrateSerializedStepErrors, isObservationalMemoryEnabled, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeWorkingMemoryTags, resolveThreadIdFromArgs, runChecks, runCompletionScorers, runCountDeprecationMessage, runDefaultCompletionCheck, runValidation, setThreadOMMetadata, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepRequestContext, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-WFUNLRQX.js.map
-//# sourceMappingURL=chunk-WFUNLRQX.js.map
+//# sourceMappingURL=chunk-ZRUTE56J.js.map
+//# sourceMappingURL=chunk-ZRUTE56J.js.map