@mastra/server 0.0.0-fix-memory-search-fetch-20251027160505 → 0.0.0-fix-persist-session-cache-option-mcp-server-20251030161352

package/dist/{chunk-ABCBHBR7.js → chunk-4YFT3JFJ.js}

@@ -1,8 +1,8 @@
-import { getWorkflowByIdHandler, getWorkflowRunByIdHandler, getWorkflowRunExecutionResultHandler, createWorkflowRunHandler, startAsyncWorkflowHandler, startWorkflowRunHandler, watchWorkflowHandler, streamLegacyWorkflowHandler, streamVNextWorkflowHandler, resumeAsyncWorkflowHandler, resumeWorkflowHandler, getWorkflowRunsHandler, cancelWorkflowRunHandler, sendWorkflowRunEventHandler } from './chunk-ZLBL4NQC.js';
 import { require_token_error } from './chunk-TOCYBDP2.js';
 import { openai } from './chunk-ZULZ2752.js';
 import { createIdGenerator, AISDKError, isAbortError, getErrorMessage, APICallError, delay, safeParseJSON, safeValidateTypes, convertAsyncIteratorToReadableStream, validatorSymbol } from './chunk-RQK4FQUD.js';
-import { WorkflowRegistry, getWorkflowInfo } from './chunk-KSFLUEWV.js';
+import { getWorkflowByIdHandler, getWorkflowRunByIdHandler, getWorkflowRunExecutionResultHandler, createWorkflowRunHandler, startAsyncWorkflowHandler, startWorkflowRunHandler, watchWorkflowHandler, streamWorkflowHandler, streamLegacyWorkflowHandler, streamVNextWorkflowHandler, observeStreamLegacyWorkflowHandler, observeStreamWorkflowHandler, observeStreamVNextWorkflowHandler, resumeAsyncWorkflowHandler, resumeWorkflowHandler, resumeStreamWorkflowHandler, listWorkflowRunsHandler, cancelWorkflowRunHandler, sendWorkflowRunEventHandler } from './chunk-S4IOWSI3.js';
+import { WorkflowRegistry, getWorkflowInfo } from './chunk-6562SOHJ.js';
 import { handleError } from './chunk-CY4TP3FK.js';
 import { HTTPException } from './chunk-MMROOK5J.js';
 import { __commonJS, __export, __toESM } from './chunk-PR4QN5HX.js';
@@ -723,12 +723,17 @@ __export(agent_builder_exports, {
   getAgentBuilderActionRunExecutionResultHandler: () => getAgentBuilderActionRunExecutionResultHandler,
   getAgentBuilderActionRunsHandler: () => getAgentBuilderActionRunsHandler,
   getAgentBuilderActionsHandler: () => getAgentBuilderActionsHandler,
+  observeStreamAgentBuilderActionHandler: () => observeStreamAgentBuilderActionHandler,
+  observeStreamLegacyAgentBuilderActionHandler: () => observeStreamLegacyAgentBuilderActionHandler,
+  observeStreamVNextAgentBuilderActionHandler: () => observeStreamVNextAgentBuilderActionHandler,
   resumeAgentBuilderActionHandler: () => resumeAgentBuilderActionHandler,
   resumeAsyncAgentBuilderActionHandler: () => resumeAsyncAgentBuilderActionHandler,
+  resumeStreamAgentBuilderActionHandler: () => resumeStreamAgentBuilderActionHandler,
   sendAgentBuilderActionRunEventHandler: () => sendAgentBuilderActionRunEventHandler,
   startAgentBuilderActionRunHandler: () => startAgentBuilderActionRunHandler,
   startAsyncAgentBuilderActionHandler: () => startAsyncAgentBuilderActionHandler,
   streamAgentBuilderActionHandler: () => streamAgentBuilderActionHandler,
+  streamLegacyAgentBuilderActionHandler: () => streamLegacyAgentBuilderActionHandler,
   streamVNextAgentBuilderActionHandler: () => streamVNextAgentBuilderActionHandler,
   watchAgentBuilderActionHandler: () => watchAgentBuilderActionHandler
 });
@@ -2005,15 +2010,64 @@ var zodToJsonSchema = (schema, options) => {
 // ../../node_modules/.pnpm/zod-to-json-schema@3.24.6_zod@3.25.76/node_modules/zod-to-json-schema/dist/esm/index.js
 var esm_default = zodToJsonSchema;
 
-// ../schema-compat/dist/chunk-GWTUXMDD.js
+// ../schema-compat/dist/chunk-U2HXWNAF.js
+var PATCHED = Symbol("__mastra_patched__");
+function patchRecordSchemas(schema) {
+  if (!schema || typeof schema !== "object") return schema;
+  if (schema[PATCHED]) return schema;
+  schema[PATCHED] = true;
+  const def = schema._zod?.def;
+  if (def?.type === "record" && def.keyType && !def.valueType) {
+    def.valueType = def.keyType;
+    def.keyType = z.string();
+  }
+  if (!def) return schema;
+  if (def.type === "object" && def.shape) {
+    const shape = typeof def.shape === "function" ? def.shape() : def.shape;
+    for (const key of Object.keys(shape)) {
+      patchRecordSchemas(shape[key]);
+    }
+  }
+  if (def.type === "array" && def.element) {
+    patchRecordSchemas(def.element);
+  }
+  if (def.type === "union" && def.options) {
+    def.options.forEach(patchRecordSchemas);
+  }
+  if (def.type === "record") {
+    if (def.keyType) patchRecordSchemas(def.keyType);
+    if (def.valueType) patchRecordSchemas(def.valueType);
+  }
+  if (def.type === "intersection") {
+    if (def.left) patchRecordSchemas(def.left);
+    if (def.right) patchRecordSchemas(def.right);
+  }
+  if (def.type === "lazy") {
+    if (def.getter && typeof def.getter === "function") {
+      const originalGetter = def.getter;
+      def.getter = function() {
+        const innerSchema = originalGetter();
+        if (innerSchema) {
+          patchRecordSchemas(innerSchema);
+        }
+        return innerSchema;
+      };
+    }
+  }
+  if (def.innerType) {
+    patchRecordSchemas(def.innerType);
+  }
+  return schema;
+}
 function zodToJsonSchema2(zodSchema4, target = "jsonSchema7", strategy = "relative") {
   const fn = "toJSONSchema";
   if (fn in z) {
+    patchRecordSchemas(zodSchema4);
     return z[fn](zodSchema4, {
       unrepresentable: "any",
       override: (ctx) => {
-        const def = ctx.zodSchema?._zod?.def;
-        if (def && def.type === "date") {
+        const def = ctx.zodSchema?._def || ctx.zodSchema?._zod?.def;
+        if (def && (def.typeName === "ZodDate" || def.type === "date")) {
           ctx.jsonSchema.type = "string";
           ctx.jsonSchema.format = "date-time";
         }
@@ -9850,6 +9904,16 @@ var ContainsHandler = class {
     );
   }
 };
+var DefaultHandler = class {
+  apply(zodSchema4, schema) {
+    const { default: v } = schema;
+    if (v === void 0) return zodSchema4;
+    if (!zodSchema4.safeParse(v).success) {
+      return zodSchema4;
+    }
+    return zodSchema4.default(v);
+  }
+};
 var primitiveHandlers = [
   // Type constraints - should run first
   new ConstHandler(),
@@ -9896,6 +9960,7 @@ var refinementHandlers = [
   // Other refinements
   new NotHandler(),
   new UniqueItemsHandler(),
+  new DefaultHandler(),
   // Metadata last
   new MetadataHandler()
 ];
@@ -10489,6 +10554,9 @@ var Memory = class extends MastraMemory {
       sortDirection
     });
   }
+  async listThreadsByResourceId(args) {
+    return this.storage.listThreadsByResourceId(args);
+  }
   async handleWorkingMemoryFromMetadata({
     workingMemory,
     resourceId,
@@ -11015,7 +11083,7 @@ ${template.content !== this.defaultWorkingMemoryTemplate ? `- Only store informa
     const isMDWorkingMemory = !(`schema` in config.workingMemory) && (typeof config.workingMemory.template === `string` || config.workingMemory.template) && config.workingMemory;
     return Boolean(isMDWorkingMemory && isMDWorkingMemory.version === `vnext`);
   }
-  getTools(config) {
+  listTools(config) {
     const mergedConfig = this.getMergedThreadConfig(config);
     if (mergedConfig.workingMemory?.enabled) {
       return {
@@ -12622,13 +12690,13 @@ function asSchema3(schema) {
 }
 var __defProp4 = Object.defineProperty;
 var __export4 = (target, all) => {
-  for (var name172 in all)
-    __defProp4(target, name172, { get: all[name172], enumerable: true });
+  for (var name163 in all)
+    __defProp4(target, name163, { get: all[name163], enumerable: true });
 };
-var name74 = "AI_NoObjectGeneratedError";
-var marker75 = `vercel.ai.error.${name74}`;
-var symbol75 = Symbol.for(marker75);
-var _a75;
+var name65 = "AI_NoObjectGeneratedError";
+var marker65 = `vercel.ai.error.${name65}`;
+var symbol65 = Symbol.for(marker65);
+var _a65;
 var NoObjectGeneratedError3 = class extends AISDKError2 {
   constructor({
     message = "No object generated.",
@@ -12638,18 +12706,18 @@ var NoObjectGeneratedError3 = class extends AISDKError2 {
     usage,
     finishReason
   }) {
-    super({ name: name74, message, cause });
-    this[_a75] = true;
+    super({ name: name65, message, cause });
+    this[_a65] = true;
     this.text = text22;
     this.response = response;
     this.usage = usage;
     this.finishReason = finishReason;
   }
   static isInstance(error) {
-    return AISDKError2.hasMarker(error, marker75);
+    return AISDKError2.hasMarker(error, marker65);
   }
 };
-_a75 = symbol75;
+_a65 = symbol65;
 var dataContentSchema3 = z$1.union([
   z$1.string(),
   z$1.instanceof(Uint8Array),
@@ -12657,8 +12725,8 @@ var dataContentSchema3 = z$1.union([
   z$1.custom(
     // Buffer might not be available in some environments such as CloudFlare:
     (value) => {
-      var _a172, _b8;
-      return (_b8 = (_a172 = globalThis.Buffer) == null ? void 0 : _a172.isBuffer(value)) != null ? _b8 : false;
+      var _a163, _b8;
+      return (_b8 = (_a163 = globalThis.Buffer) == null ? void 0 : _a163.isBuffer(value)) != null ? _b8 : false;
     },
     { message: "Must be a Buffer" }
   )
@@ -13207,130 +13275,6 @@ var object3 = ({
     }
   };
 };
-var ClientOrServerImplementationSchema3 = z$1.looseObject({
-  name: z$1.string(),
-  version: z$1.string()
-});
-var BaseParamsSchema3 = z$1.looseObject({
-  _meta: z$1.optional(z$1.object({}).loose())
-});
-var ResultSchema3 = BaseParamsSchema3;
-var RequestSchema3 = z$1.object({
-  method: z$1.string(),
-  params: z$1.optional(BaseParamsSchema3)
-});
-var ServerCapabilitiesSchema3 = z$1.looseObject({
-  experimental: z$1.optional(z$1.object({}).loose()),
-  logging: z$1.optional(z$1.object({}).loose()),
-  prompts: z$1.optional(
-    z$1.looseObject({
-      listChanged: z$1.optional(z$1.boolean())
-    })
-  ),
-  resources: z$1.optional(
-    z$1.looseObject({
-      subscribe: z$1.optional(z$1.boolean()),
-      listChanged: z$1.optional(z$1.boolean())
-    })
-  ),
-  tools: z$1.optional(
-    z$1.looseObject({
-      listChanged: z$1.optional(z$1.boolean())
-    })
-  )
-});
-ResultSchema3.extend({
-  protocolVersion: z$1.string(),
-  capabilities: ServerCapabilitiesSchema3,
-  serverInfo: ClientOrServerImplementationSchema3,
-  instructions: z$1.optional(z$1.string())
-});
-var PaginatedResultSchema3 = ResultSchema3.extend({
-  nextCursor: z$1.optional(z$1.string())
-});
-var ToolSchema3 = z$1.object({
-  name: z$1.string(),
-  description: z$1.optional(z$1.string()),
-  inputSchema: z$1.object({
-    type: z$1.literal("object"),
-    properties: z$1.optional(z$1.object({}).loose())
-  }).loose()
-}).loose();
-PaginatedResultSchema3.extend({
-  tools: z$1.array(ToolSchema3)
-});
-var TextContentSchema3 = z$1.object({
-  type: z$1.literal("text"),
-  text: z$1.string()
-}).loose();
-var ImageContentSchema3 = z$1.object({
-  type: z$1.literal("image"),
-  data: z$1.base64(),
-  mimeType: z$1.string()
-}).loose();
-var ResourceContentsSchema3 = z$1.object({
-  /**
-   * The URI of this resource.
-   */
-  uri: z$1.string(),
-  /**
-   * The MIME type of this resource, if known.
-   */
-  mimeType: z$1.optional(z$1.string())
-}).loose();
-var TextResourceContentsSchema3 = ResourceContentsSchema3.extend({
-  text: z$1.string()
-});
-var BlobResourceContentsSchema3 = ResourceContentsSchema3.extend({
-  blob: z$1.base64()
-});
-var EmbeddedResourceSchema3 = z$1.object({
-  type: z$1.literal("resource"),
-  resource: z$1.union([TextResourceContentsSchema3, BlobResourceContentsSchema3])
-}).loose();
-ResultSchema3.extend({
-  content: z$1.array(
-    z$1.union([TextContentSchema3, ImageContentSchema3, EmbeddedResourceSchema3])
-  ),
-  isError: z$1.boolean().default(false).optional()
-}).or(
-  ResultSchema3.extend({
-    toolResult: z$1.unknown()
-  })
-);
-var JSONRPC_VERSION3 = "2.0";
-var JSONRPCRequestSchema3 = z$1.object({
-  jsonrpc: z$1.literal(JSONRPC_VERSION3),
-  id: z$1.union([z$1.string(), z$1.number().int()])
-}).merge(RequestSchema3).strict();
-var JSONRPCResponseSchema3 = z$1.object({
-  jsonrpc: z$1.literal(JSONRPC_VERSION3),
-  id: z$1.union([z$1.string(), z$1.number().int()]),
-  result: ResultSchema3
-}).strict();
-var JSONRPCErrorSchema3 = z$1.object({
-  jsonrpc: z$1.literal(JSONRPC_VERSION3),
-  id: z$1.union([z$1.string(), z$1.number().int()]),
-  error: z$1.object({
-    code: z$1.number().int(),
-    message: z$1.string(),
-    data: z$1.optional(z$1.unknown())
-  })
-}).strict();
-var JSONRPCNotificationSchema3 = z$1.object({
-  jsonrpc: z$1.literal(JSONRPC_VERSION3)
-}).merge(
-  z$1.object({
-    method: z$1.string(),
-    params: z$1.optional(BaseParamsSchema3)
-  })
-).strict();
-z$1.union([
-  JSONRPCRequestSchema3,
-  JSONRPCNotificationSchema3,
-  JSONRPCResponseSchema3,
-  JSONRPCErrorSchema3
-]);
 
 // ../agent-builder/dist/index.js
 var UNIT_KINDS = ["mcp-server", "tool", "workflow", "agent", "integration", "network", "other"];
@@ -13797,11 +13741,11 @@ async function renameAndCopyFile(sourceFile, targetFile) {
 var isValidMastraLanguageModel = (model) => {
   return model && typeof model === "object" && typeof model.modelId === "string";
 };
-var resolveTargetPath = (inputData, runtimeContext) => {
+var resolveTargetPath = (inputData, requestContext) => {
   if (inputData.targetPath) {
     return inputData.targetPath;
   }
-  const contextPath = runtimeContext.get("targetPath");
+  const contextPath = requestContext.get("targetPath");
   if (contextPath) {
     return contextPath;
   }
@@ -13970,13 +13914,13 @@ var createModelInstance = async (provider, modelId, version = "v2") => {
   }
 };
 var resolveModel = async ({
-  runtimeContext,
+  requestContext,
   defaultModel = "openai/gpt-4.1",
   projectPath
 }) => {
-  const modelFromContext = runtimeContext.get("model");
+  const modelFromContext = requestContext.get("model");
   if (modelFromContext) {
-    console.info("Using model from runtime context");
+    console.info("Using model from request context");
     if (isValidMastraLanguageModel(modelFromContext)) {
       return modelFromContext;
     }
@@ -13984,13 +13928,13 @@ var resolveModel = async ({
       'Invalid model provided. Model must be a MastraLanguageModel instance (e.g., openai("gpt-4"), anthropic("claude-3-5-sonnet"), etc.)'
     );
   }
-  const selectedModel = runtimeContext.get("selectedModel");
+  const selectedModel = requestContext.get("selectedModel");
   if (selectedModel?.provider && selectedModel?.modelId && projectPath) {
     console.info(`Resolving selected model: ${selectedModel.provider}/${selectedModel.modelId}`);
     const version = await detectAISDKVersion(projectPath);
     const modelInstance = await createModelInstance(selectedModel.provider, selectedModel.modelId, version);
     if (modelInstance) {
-      runtimeContext.set("model", modelInstance);
+      requestContext.set("model", modelInstance);
       return modelInstance;
     }
   }
@@ -15001,7 +14945,7 @@ export const mastra = new Mastra({
   /**
    * Get tools for a specific mode
    */
-  static async getToolsForMode(projectPath, mode = "code-editor") {
+  static async listToolsForMode(projectPath, mode = "code-editor") {
     const allTools = await _AgentBuilderDefaults.DEFAULT_TOOLS(projectPath);
     if (mode === "template") {
       return _AgentBuilderDefaults.filterToolsForTemplateBuilder(allTools);
@@ -16482,7 +16426,7 @@ ${config.instructions}` : "";
       model: config.model,
       tools: async () => {
         return {
-          ...await AgentBuilderDefaults.getToolsForMode(config.projectPath, config.mode),
+          ...await AgentBuilderDefaults.listToolsForMode(config.projectPath, config.mode),
           ...config.tools || {}
         };
       },
@@ -16506,7 +16450,7 @@ ${config.instructions}` : "";
    */
   generateLegacy = async (messages, generateOptions = {}) => {
     const { maxSteps, ...baseOptions } = generateOptions;
-    const originalInstructions = await this.getInstructions({ runtimeContext: generateOptions?.runtimeContext });
+    const originalInstructions = await this.getInstructions({ requestContext: generateOptions?.requestContext });
     const additionalInstructions = baseOptions.instructions;
     let enhancedInstructions = originalInstructions;
     if (additionalInstructions) {
@@ -16535,7 +16479,7 @@ ${additionalInstructions}`;
    */
   streamLegacy = async (messages, streamOptions = {}) => {
     const { maxSteps, ...baseOptions } = streamOptions;
-    const originalInstructions = await this.getInstructions({ runtimeContext: streamOptions?.runtimeContext });
+    const originalInstructions = await this.getInstructions({ requestContext: streamOptions?.requestContext });
     const additionalInstructions = baseOptions.instructions;
     let enhancedInstructions = originalInstructions;
     if (additionalInstructions) {
@@ -16564,7 +16508,7 @@ ${additionalInstructions}`;
    */
   async stream(messages, streamOptions) {
     const { ...baseOptions } = streamOptions || {};
-    const originalInstructions = await this.getInstructions({ runtimeContext: streamOptions?.runtimeContext });
+    const originalInstructions = await this.getInstructions({ requestContext: streamOptions?.requestContext });
     const additionalInstructions = baseOptions.instructions;
     let enhancedInstructions = originalInstructions;
     if (additionalInstructions) {
@@ -16588,7 +16532,7 @@ ${additionalInstructions}`;
   }
   async generate(messages, options) {
     const { ...baseOptions } = options || {};
-    const originalInstructions = await this.getInstructions({ runtimeContext: options?.runtimeContext });
+    const originalInstructions = await this.getInstructions({ requestContext: options?.requestContext });
     const additionalInstructions = baseOptions.instructions;
     let enhancedInstructions = originalInstructions;
     if (additionalInstructions) {
@@ -16696,12 +16640,12 @@ var discoverUnitsStep = createStep({
   description: "Discover template units by analyzing the templates directory structure",
   inputSchema: CloneTemplateResultSchema,
   outputSchema: DiscoveryResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     const { templateDir } = inputData;
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+    const targetPath = resolveTargetPath(inputData, requestContext);
     const tools = await AgentBuilderDefaults.DEFAULT_TOOLS(templateDir);
     console.info("targetPath", targetPath);
-    const model = await resolveModel({ runtimeContext, projectPath: targetPath, defaultModel: openai("gpt-4.1") });
+    const model = await resolveModel({ requestContext, projectPath: targetPath, defaultModel: openai("gpt-4.1") });
     try {
       const agent = new Agent({
         model,
@@ -16840,8 +16784,8 @@ var prepareBranchStep = createStep({
   description: "Create or switch to integration branch before modifications",
   inputSchema: PrepareBranchInputSchema,
   outputSchema: PrepareBranchResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+  execute: async ({ inputData, requestContext }) => {
+    const targetPath = resolveTargetPath(inputData, requestContext);
     try {
       const branchName = `feat/install-template-${inputData.slug}`;
       await gitCheckoutBranch(branchName, targetPath);
@@ -16865,10 +16809,10 @@ var packageMergeStep = createStep({
   description: "Merge template package.json dependencies into target project",
   inputSchema: PackageMergeInputSchema,
   outputSchema: PackageMergeResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     console.info("Package merge step starting...");
     const { slug, packageInfo } = inputData;
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+    const targetPath = resolveTargetPath(inputData, requestContext);
     try {
       const targetPkgPath = join(targetPath, "package.json");
       let targetPkgRaw = "{}";
@@ -16942,9 +16886,9 @@ var installStep = createStep({
   description: "Install packages based on merged package.json",
   inputSchema: InstallInputSchema,
   outputSchema: InstallResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     console.info("Running install step...");
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+    const targetPath = resolveTargetPath(inputData, requestContext);
     try {
       await spawnSWPM(targetPath, "install", []);
       const lock = ["pnpm-lock.yaml", "package-lock.json", "yarn.lock"].map((f) => join(targetPath, f)).find((f) => existsSync(f));
@@ -16970,10 +16914,10 @@ var programmaticFileCopyStep = createStep({
   description: "Programmatically copy template files to target project based on ordered units",
   inputSchema: FileCopyInputSchema,
   outputSchema: FileCopyResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     console.info("Programmatic file copy step starting...");
     const { orderedUnits, templateDir, commitSha, slug } = inputData;
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+    const targetPath = resolveTargetPath(inputData, requestContext);
     try {
       const copiedFiles = [];
       const conflicts = [];
@@ -17322,12 +17266,12 @@ var intelligentMergeStep = createStep({
   description: "Use AgentBuilder to intelligently merge template files",
   inputSchema: IntelligentMergeInputSchema,
   outputSchema: IntelligentMergeResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     console.info("Intelligent merge step starting...");
     const { conflicts, copiedFiles, commitSha, slug, templateDir, branchName } = inputData;
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+    const targetPath = resolveTargetPath(inputData, requestContext);
     try {
-      const model = await resolveModel({ runtimeContext, projectPath: targetPath, defaultModel: openai("gpt-4.1") });
+      const model = await resolveModel({ requestContext, projectPath: targetPath, defaultModel: openai("gpt-4.1") });
       const copyFileTool = createTool({
         id: "copy-file",
         description: "Copy a file from template to target project (use only for edge cases - most files are already copied programmatically).",
@@ -17590,10 +17534,10 @@ var validationAndFixStep = createStep({
   description: "Validate the merged template code and fix any issues using a specialized agent",
   inputSchema: ValidationFixInputSchema,
   outputSchema: ValidationFixResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     console.info("Validation and fix step starting...");
     const { commitSha, slug, orderedUnits, templateDir, copiedFiles, conflictsResolved, maxIterations = 5 } = inputData;
-    const targetPath = resolveTargetPath(inputData, runtimeContext);
+    const targetPath = resolveTargetPath(inputData, requestContext);
     const hasChanges = copiedFiles.length > 0 || conflictsResolved && conflictsResolved.length > 0;
     if (!hasChanges) {
       console.info("\u23ED\uFE0F Skipping validation - no files copied or conflicts resolved");
@@ -17613,8 +17557,8 @@ var validationAndFixStep = createStep({
     );
     let currentIteration = 1;
     try {
-      const model = await resolveModel({ runtimeContext, projectPath: targetPath, defaultModel: openai("gpt-4.1") });
-      const allTools = await AgentBuilderDefaults.getToolsForMode(targetPath, "template");
+      const model = await resolveModel({ requestContext, projectPath: targetPath, defaultModel: openai("gpt-4.1") });
+      const allTools = await AgentBuilderDefaults.listToolsForMode(targetPath, "template");
       const validationAgent = new Agent({
         name: "code-validator-fixer",
         description: "Specialized agent for validating and fixing template integration issues",
@@ -18309,7 +18253,7 @@ var planningIterationStep = createStep({
   outputSchema: PlanningIterationResultSchema,
   suspendSchema: PlanningIterationSuspendSchema,
   resumeSchema: PlanningIterationResumeSchema,
-  execute: async ({ inputData, resumeData, suspend, runtimeContext }) => {
+  execute: async ({ inputData, resumeData, suspend, requestContext }) => {
     const {
       action,
       workflowName,
@@ -18322,7 +18266,7 @@ var planningIterationStep = createStep({
     } = inputData;
     console.info("Starting planning iteration...");
     const qaKey = "workflow-builder-qa";
-    let storedQAPairs = runtimeContext.get(qaKey) || [];
+    let storedQAPairs = requestContext.get(qaKey) || [];
     const newAnswers = { ...userAnswers || {}, ...resumeData?.answers || {} };
     if (Object.keys(newAnswers).length > 0) {
       storedQAPairs = storedQAPairs.map((pair) => {
@@ -18335,10 +18279,10 @@ var planningIterationStep = createStep({
         }
         return pair;
       });
-      runtimeContext.set(qaKey, storedQAPairs);
+      requestContext.set(qaKey, storedQAPairs);
     }
     try {
-      const model = await resolveModel({ runtimeContext });
+      const model = await resolveModel({ requestContext });
       const planningAgent = new Agent({
         model,
         instructions: taskPlanningPrompts.planningAgent.instructions({
@@ -18395,7 +18339,7 @@ var planningIterationStep = createStep({
           answeredAt: null
         }));
         storedQAPairs = [...storedQAPairs, ...newQAPairs];
-        runtimeContext.set(qaKey, storedQAPairs);
+        requestContext.set(qaKey, storedQAPairs);
         console.info(
           `Updated Q&A state: ${storedQAPairs.length} total question-answer pairs, ${storedQAPairs.filter((p) => p.answer).length} answered`
         );
@@ -18409,7 +18353,7 @@ var planningIterationStep = createStep({
         });
       }
       console.info(`Planning complete with ${planResult.tasks.length} tasks`);
-      runtimeContext.set(qaKey, storedQAPairs);
+      requestContext.set(qaKey, storedQAPairs);
       console.info(
         `Final Q&A state: ${storedQAPairs.length} total question-answer pairs, ${storedQAPairs.filter((p) => p.answer).length} answered`
       );
@@ -18552,7 +18496,7 @@ const myStep = createStep({
 - \`mastra\`: Access to Mastra instance (agents, tools, other workflows)
 - \`getStepResult(stepInstance)\`: Get results from previous steps
 - \`getInitData()\`: Access original workflow input data
-- \`runtimeContext\`: Runtime dependency injection context
+- \`requestContext\`: Runtime dependency injection context
 - \`runCount\`: Number of times this step has run (useful for retries)
 
 ### **\u{1F504} CONTROL FLOW METHODS**
@@ -18631,10 +18575,10 @@ const toolStep = createStep(myTool);
 
 // Method 2: Call tool in execute function
 const step = createStep({
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     const result = await myTool.execute({
       context: inputData,
-      runtimeContext
+      requestContext
     });
     return result;
   }
@@ -18750,7 +18694,7 @@ run.watch((event) => console.log(event));
 - Use workflows as steps: \`.then(otherWorkflow)\`
 - Enable complex workflow composition
 
-**Runtime Context:**
+**Request Context:**
 - Pass shared data across all steps
 - Enable dependency injection patterns
 
@@ -18940,7 +18884,7 @@ var workflowDiscoveryStep = createStep({
   description: "Discover existing workflows in the project",
   inputSchema: WorkflowBuilderInputSchema,
   outputSchema: WorkflowDiscoveryResultSchema,
-  execute: async ({ inputData, runtimeContext: _runtimeContext }) => {
+  execute: async ({ inputData, requestContext: _requestContext }) => {
     console.info("Starting workflow discovery...");
     const { projectPath = process.cwd() } = inputData;
     try {
@@ -18999,7 +18943,7 @@ var projectDiscoveryStep = createStep({
   description: "Analyze the project structure and setup",
   inputSchema: WorkflowDiscoveryResultSchema,
   outputSchema: ProjectDiscoveryResultSchema,
-  execute: async ({ inputData: _inputData, runtimeContext: _runtimeContext }) => {
+  execute: async ({ inputData: _inputData, requestContext: _requestContext }) => {
     console.info("Starting project discovery...");
     try {
       const projectPath = process.cwd();
@@ -19061,10 +19005,10 @@ var workflowResearchStep = createStep({
   description: "Research Mastra workflows and gather relevant documentation",
   inputSchema: ProjectDiscoveryResultSchema,
   outputSchema: WorkflowResearchResultSchema,
-  execute: async ({ inputData, runtimeContext }) => {
+  execute: async ({ inputData, requestContext }) => {
     console.info("Starting workflow research...");
     try {
-      const model = await resolveModel({ runtimeContext });
+      const model = await resolveModel({ requestContext });
       const researchAgent = new Agent({
         model,
         instructions: workflowBuilderPrompts.researchAgent.instructions,
@@ -19130,7 +19074,7 @@ var taskExecutionStep = createStep({
   outputSchema: TaskExecutionResultSchema,
   suspendSchema: TaskExecutionSuspendSchema,
   resumeSchema: TaskExecutionResumeSchema,
-  execute: async ({ inputData, resumeData, suspend, runtimeContext }) => {
+  execute: async ({ inputData, resumeData, suspend, requestContext }) => {
     const {
       action,
       workflowName,
@@ -19143,7 +19087,7 @@ var taskExecutionStep = createStep({
     console.info(`Starting task execution for ${action}ing workflow: ${workflowName}`);
     console.info(`Executing ${tasks.length} tasks using AgentBuilder stream...`);
     try {
-      const model = await resolveModel({ runtimeContext });
+      const model = await resolveModel({ requestContext });
       const currentProjectPath = projectPath || process.cwd();
       console.info("Pre-populating taskManager with planned tasks...");
       const taskManagerContext = {
@@ -19188,18 +19132,11 @@ ${workflowBuilderPrompts.validation.instructions}`
         tasks,
         resumeData
       });
-      const originalInstructions = await executionAgent.getInstructions({ runtimeContext });
-      const additionalInstructions = executionAgent.instructions;
-      let enhancedInstructions = originalInstructions;
-      if (additionalInstructions) {
-        enhancedInstructions = `${originalInstructions}
-
-${additionalInstructions}`;
-      }
+      const originalInstructions = await executionAgent.getInstructions({ requestContext });
       const enhancedOptions = {
         stopWhen: stepCountIs(100),
         temperature: 0.3,
-        instructions: enhancedInstructions
+        instructions: originalInstructions
       };
       let finalResult = null;
       let allTasksCompleted = false;
@@ -19473,13 +19410,29 @@ var watchAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
   "Watching agent builder action"
 );
 var streamAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
-  streamLegacyWorkflowHandler,
+  streamWorkflowHandler,
   "Streaming agent builder action"
 );
+var streamLegacyAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
+  streamLegacyWorkflowHandler,
+  "Streaming legacy agent builder action"
+);
 var streamVNextAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
   streamVNextWorkflowHandler,
   "Streaming VNext agent builder action"
 );
+var observeStreamLegacyAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
+  observeStreamLegacyWorkflowHandler,
+  "Observing legacy stream for agent builder action"
+);
+var observeStreamAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
+  observeStreamWorkflowHandler,
+  "Observing stream for agent builder action"
+);
+var observeStreamVNextAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
+  observeStreamVNextWorkflowHandler,
+  "Observing VNext stream for agent builder action"
+);
 var resumeAsyncAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
   resumeAsyncWorkflowHandler,
   "Resuming async agent builder action"
@@ -19488,8 +19441,12 @@ var resumeAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
   resumeWorkflowHandler,
   "Resuming agent builder action"
 );
+var resumeStreamAgentBuilderActionHandler = createAgentBuilderWorkflowHandler(
+  resumeStreamWorkflowHandler,
+  "Resuming stream for agent builder action"
+);
 var getAgentBuilderActionRunsHandler = createAgentBuilderWorkflowHandler(
-  getWorkflowRunsHandler,
+  listWorkflowRunsHandler,
   "Getting agent builder action runs"
 );
 var cancelAgentBuilderActionRunHandler = createAgentBuilderWorkflowHandler(
@@ -19501,6 +19458,6 @@ var sendAgentBuilderActionRunEventHandler = createAgentBuilderWorkflowHandler(
   "Sending agent builder action run event"
 );
 
-export { agent_builder_exports, cancelAgentBuilderActionRunHandler, createAgentBuilderActionRunHandler, getAgentBuilderActionByIdHandler, getAgentBuilderActionRunByIdHandler, getAgentBuilderActionRunExecutionResultHandler, getAgentBuilderActionRunsHandler, getAgentBuilderActionsHandler, resumeAgentBuilderActionHandler, resumeAsyncAgentBuilderActionHandler, sendAgentBuilderActionRunEventHandler, startAgentBuilderActionRunHandler, startAsyncAgentBuilderActionHandler, streamAgentBuilderActionHandler, streamVNextAgentBuilderActionHandler, watchAgentBuilderActionHandler };
-//# sourceMappingURL=chunk-ABCBHBR7.js.map
-//# sourceMappingURL=chunk-ABCBHBR7.js.map
+export { agent_builder_exports, cancelAgentBuilderActionRunHandler, createAgentBuilderActionRunHandler, getAgentBuilderActionByIdHandler, getAgentBuilderActionRunByIdHandler, getAgentBuilderActionRunExecutionResultHandler, getAgentBuilderActionRunsHandler, getAgentBuilderActionsHandler, observeStreamAgentBuilderActionHandler, observeStreamLegacyAgentBuilderActionHandler, observeStreamVNextAgentBuilderActionHandler, resumeAgentBuilderActionHandler, resumeAsyncAgentBuilderActionHandler, resumeStreamAgentBuilderActionHandler, sendAgentBuilderActionRunEventHandler, startAgentBuilderActionRunHandler, startAsyncAgentBuilderActionHandler, streamAgentBuilderActionHandler, streamLegacyAgentBuilderActionHandler, streamVNextAgentBuilderActionHandler, watchAgentBuilderActionHandler };
+//# sourceMappingURL=chunk-4YFT3JFJ.js.map
+//# sourceMappingURL=chunk-4YFT3JFJ.js.map