@mastra/server 1.33.0-alpha.1 → 1.33.0-alpha.10

package/dist/{chunk-MI3PFFAR.js → chunk-GRPUO3NH.js}

@@ -1,15 +1,15 @@
 import { getAgentSkillResponseSchema, skillDisambiguationQuerySchema } from './chunk-ZHULRNJG.js';
-import { listAgentsResponseSchema, serializedAgentSchema, agentVersionQuerySchema, agentIdPathParams, generateResponseSchema, agentExecutionBodySchema, agentExecutionLegacyBodySchema, streamResponseSchema, providersResponseSchema, streamUntilIdleBodySchema, observeAgentResponseSchema, observeAgentBodySchema, toolCallResponseSchema, approveToolCallBodySchema, declineToolCallBodySchema, resumeStreamBodySchema, approveNetworkToolCallBodySchema, declineNetworkToolCallBodySchema, modelManagementResponseSchema, updateAgentModelBodySchema, reorderAgentModelListBodySchema, updateAgentModelInModelListBodySchema, modelConfigIdPathParams, enhanceInstructionsResponseSchema, enhanceInstructionsBodySchema, agentSkillPathParams } from './chunk-43CWQ4M3.js';
-import { stringify, toSlug } from './chunk-X2LYM3QK.js';
-import { sanitizeBody, validateBody, getEffectiveResourceId, getEffectiveThreadId, enforceThreadAccess, validateThreadOwnership, validateRunOwnership } from './chunk-UOC4K3RU.js';
+import { listAgentsResponseSchema, serializedAgentSchema, agentVersionQuerySchema, agentIdPathParams, generateResponseSchema, agentExecutionBodySchema, agentExecutionLegacyBodySchema, streamResponseSchema, providersResponseSchema, streamUntilIdleBodySchema, observeAgentResponseSchema, observeAgentBodySchema, toolCallResponseSchema, approveToolCallBodySchema, declineToolCallBodySchema, resumeStreamBodySchema, resumeStreamUntilIdleBodySchema, approveNetworkToolCallBodySchema, declineNetworkToolCallBodySchema, modelManagementResponseSchema, updateAgentModelBodySchema, reorderAgentModelListBodySchema, updateAgentModelInModelListBodySchema, modelConfigIdPathParams, enhanceInstructionsResponseSchema, enhanceInstructionsBodySchema, agentSkillPathParams } from './chunk-KCVOCZXG.js';
+import { stringify, toSlug } from './chunk-7RLQ6356.js';
+import { sanitizeBody, validateBody, getEffectiveResourceId, getEffectiveThreadId, enforceThreadAccess, validateThreadOwnership, validateRunOwnership } from './chunk-JOUPK2UV.js';
 import { MastraFGAPermissions } from './chunk-6KDKASVR.js';
-import { WORKSPACE_TOOLS, resolveToolConfig } from './chunk-OJRAH5VV.js';
+import { WORKSPACE_TOOLS, resolveToolConfig, MASTRA_IS_STUDIO_KEY, isReservedRequestContextKey } from './chunk-YARY4I5U.js';
 import { createStoredAgentResponseSchema } from './chunk-AIRSK4QU.js';
-import { createRoute, standardSchemaToJSONSchema, toStandardSchema5 } from './chunk-KDUX3YN3.js';
+import { createRoute, standardSchemaToJSONSchema, toStandardSchema5 } from './chunk-VMF4AV2C.js';
 import { handleError } from './chunk-P23KBWKB.js';
 import { HTTPException } from './chunk-6QWQZI4Q.js';
 import { __export } from './chunk-PR4QN5HX.js';
-import { isDurableAgentLike, Agent } from '@mastra/core/agent';
+import { Agent, isDurableAgentLike } from '@mastra/core/agent';
 import { AGENT_STREAM_TOPIC } from '@mastra/core/agent/durable';
 import { MASTRA_VERSIONS_KEY, mergeVersionOverrides } from '@mastra/core/di';
 import { MastraError, ErrorDomain, ErrorCategory } from '@mastra/core/error';
@@ -39,6 +39,7 @@ __export(agents_exports, {
   REORDER_AGENT_MODEL_LIST_ROUTE: () => REORDER_AGENT_MODEL_LIST_ROUTE,
   RESET_AGENT_MODEL_ROUTE: () => RESET_AGENT_MODEL_ROUTE,
   RESUME_STREAM_ROUTE: () => RESUME_STREAM_ROUTE,
+  RESUME_STREAM_UNTIL_IDLE_ROUTE: () => RESUME_STREAM_UNTIL_IDLE_ROUTE,
   STREAM_GENERATE_LEGACY_ROUTE: () => STREAM_GENERATE_LEGACY_ROUTE,
   STREAM_GENERATE_ROUTE: () => STREAM_GENERATE_ROUTE,
   STREAM_GENERATE_VNEXT_DEPRECATED_ROUTE: () => STREAM_GENERATE_VNEXT_DEPRECATED_ROUTE,
@@ -67,6 +68,20 @@ function stashVersionOverrides(ctx, versions) {
     ctx.set(MASTRA_VERSIONS_KEY, merged);
   }
 }
+function getIsStudioFromContext(requestContext) {
+  return requestContext.get(MASTRA_IS_STUDIO_KEY) === true;
+}
+function mergeBodyRequestContext(serverRequestContext, bodyRequestContext) {
+  if (!bodyRequestContext || typeof bodyRequestContext !== "object") {
+    return;
+  }
+  for (const [key, value] of Object.entries(bodyRequestContext)) {
+    if (isReservedRequestContextKey(key)) continue;
+    if (serverRequestContext.get(key) === void 0) {
+      serverRequestContext.set(key, value);
+    }
+  }
+}
 function isProviderConnected(providerId, customProviders) {
   const cleanId = providerId.includes(".") ? providerId.split(".")[0] : providerId;
   let provider = PROVIDER_REGISTRY[cleanId];
@@ -271,10 +286,8 @@ async function getSerializedAgentDefinition({
       const agents = await agent.listAgents({ requestContext });
       serializedAgentAgents = Object.entries(agents || {}).reduce(
         (acc, [key, agent2]) => {
-          return {
-            ...acc,
-            [key]: { id: agent2.id, name: agent2.name }
-          };
+          acc[key] = { id: agent2.id, name: agent2.name ?? key };
+          return acc;
         },
         {}
       );
@@ -452,8 +465,9 @@ async function getAgentFromSystem({
       for (const [_, ag] of Object.entries(agents)) {
         try {
           const subAgents = await ag.listAgents();
-          if (subAgents[agentId]) {
-            agent = subAgents[agentId];
+          const subAgent = subAgents[agentId];
+          if (subAgent instanceof Agent) {
+            agent = subAgent;
             break;
           }
         } catch (error) {
@@ -527,14 +541,24 @@ async function formatAgent({
       logger.error("Error getting workflows for agent", { agentName: agent.name, error });
     }
   }
-  let proxyRequestContext = requestContext;
-  const instructions = await agent.getInstructions({ requestContext: proxyRequestContext });
+  const instructionsRequestContext = isStudio ? new Proxy(requestContext, {
+    get(target, prop) {
+      if (prop === "get") {
+        return function(key) {
+          const value = target.get(key);
+          return value ?? `<${key}>`;
+        };
+      }
+      return Reflect.get(target, prop);
+    }
+  }) : requestContext;
+  const instructions = await agent.getInstructions({ requestContext: instructionsRequestContext });
   const llm = await agent.getLLM({ requestContext });
   const defaultGenerateOptionsLegacy = await agent.getDefaultGenerateOptionsLegacy({
-    requestContext: proxyRequestContext
+    requestContext
   });
-  const defaultStreamOptionsLegacy = await agent.getDefaultStreamOptionsLegacy({ requestContext: proxyRequestContext });
-  const defaultOptions = await agent.getDefaultOptions({ requestContext: proxyRequestContext });
+  const defaultStreamOptionsLegacy = await agent.getDefaultStreamOptionsLegacy({ requestContext });
+  const defaultOptions = await agent.getDefaultOptions({ requestContext });
   const model = llm?.getModel();
   const models = await agent.getModelList(requestContext);
   const modelList = models?.map((md) => ({
@@ -545,7 +569,7 @@ async function formatAgent({
       modelVersion: md.model.specificationVersion
     }
   }));
-  const serializedAgentAgents = await getSerializedAgentDefinition({ agent, requestContext: proxyRequestContext });
+  const serializedAgentAgents = await getSerializedAgentDefinition({ agent, requestContext });
   let serializedInputProcessors = [];
   let serializedOutputProcessors = [];
   try {
@@ -557,12 +581,12 @@ async function formatAgent({
   } catch (error) {
     mastra.getLogger().error("Error getting configured processors for agent", { agentName: agent.name, error });
   }
-  const serializedSkills = await getSerializedSkillsFromAgent(agent, proxyRequestContext);
-  const workspaceTools = await getWorkspaceToolsFromAgent(agent, proxyRequestContext);
+  const serializedSkills = await getSerializedSkillsFromAgent(agent, requestContext);
+  const workspaceTools = await getWorkspaceToolsFromAgent(agent, requestContext);
   const browserTools = getBrowserToolsFromAgent(agent, createBrowserToolsErrorLogger(mastra.getLogger(), agent.id));
   let workspaceId;
   try {
-    const workspace = await agent.getWorkspace({ requestContext: proxyRequestContext });
+    const workspace = await agent.getWorkspace({ requestContext });
     workspaceId = workspace?.id;
   } catch {
   }
@@ -715,7 +739,7 @@ var GET_AGENT_BY_ID_ROUTE = createRoute({
     try {
       const versionOptions = versionId ? { versionId } : status ? { status } : void 0;
       const agent = await getAgentFromSystem({ mastra, agentId, versionOptions, requestContext });
-      const isStudio = false;
+      const isStudio = getIsStudioFromContext(requestContext);
       const result = await formatAgent({
         mastra,
         agent,
@@ -795,13 +819,7 @@ var GENERATE_AGENT_ROUTE = createRoute({
         ),
         requestContext: serverRequestContext
       });
-      if (bodyRequestContext && typeof bodyRequestContext === "object") {
-        for (const [key, value] of Object.entries(bodyRequestContext)) {
-          if (serverRequestContext.get(key) === void 0) {
-            serverRequestContext.set(key, value);
-          }
-        }
-      }
+      mergeBodyRequestContext(serverRequestContext, bodyRequestContext);
       stashVersionOverrides(serverRequestContext, versions);
       let authorizedMemoryOption = memoryOption;
       if (memoryOption) {
@@ -1053,13 +1071,7 @@ var STREAM_GENERATE_ROUTE = createRoute({
         ),
         requestContext: serverRequestContext
       });
-      if (bodyRequestContext && typeof bodyRequestContext === "object") {
-        for (const [key, value] of Object.entries(bodyRequestContext)) {
-          if (serverRequestContext.get(key) === void 0) {
-            serverRequestContext.set(key, value);
-          }
-        }
-      }
+      mergeBodyRequestContext(serverRequestContext, bodyRequestContext);
       stashVersionOverrides(serverRequestContext, versions);
       let authorizedMemoryOption = memoryOption;
       if (memoryOption) {
@@ -1129,13 +1141,7 @@ var STREAM_UNTIL_IDLE_GENERATE_ROUTE = createRoute({
         ),
         requestContext: serverRequestContext
       });
-      if (bodyRequestContext && typeof bodyRequestContext === "object") {
-        for (const [key, value] of Object.entries(bodyRequestContext)) {
-          if (serverRequestContext.get(key) === void 0) {
-            serverRequestContext.set(key, value);
-          }
-        }
-      }
+      mergeBodyRequestContext(serverRequestContext, bodyRequestContext);
       let authorizedMemoryOption = memoryOption;
       if (memoryOption) {
         const clientThreadId = typeof memoryOption.thread === "string" ? memoryOption.thread : memoryOption.thread?.id;
@@ -1356,6 +1362,90 @@ var RESUME_STREAM_ROUTE = createRoute({
   tags: ["Agents"],
   requiresAuth: true,
   requiresPermission: MastraFGAPermissions.AGENTS_EXECUTE,
+  handler: async ({ mastra, agentId, abortSignal, requestContext: serverRequestContext, ...params }) => {
+    try {
+      if (!params.runId) {
+        throw new HTTPException(400, { message: "Run id is required" });
+      }
+      sanitizeBody(params, ["tools"]);
+      const {
+        resumeData,
+        runId,
+        toolCallId,
+        memory: memoryOption,
+        requestContext: bodyRequestContext,
+        versions,
+        ...rest
+      } = params;
+      const agent = await getAgentFromSystem({
+        mastra,
+        agentId,
+        versionOptions: extractVersionOptions(
+          serverRequestContext,
+          bodyRequestContext
+        )
+      });
+      mergeBodyRequestContext(serverRequestContext, bodyRequestContext);
+      stashVersionOverrides(serverRequestContext, versions);
+      let authorizedMemoryOption = memoryOption;
+      const clientThreadId = typeof memoryOption?.thread === "string" ? memoryOption.thread : memoryOption?.thread?.id;
+      const effectiveResourceId = getEffectiveResourceId(serverRequestContext, memoryOption?.resource);
+      const effectiveThreadId = getEffectiveThreadId(serverRequestContext, clientThreadId);
+      if (effectiveThreadId) {
+        const memoryInstance = await agent.getMemory({ requestContext: serverRequestContext });
+        if (memoryInstance) {
+          const thread = await memoryInstance.getThreadById({ threadId: effectiveThreadId });
+          if (thread) {
+            await enforceThreadAccess({
+              mastra,
+              requestContext: serverRequestContext,
+              threadId: effectiveThreadId,
+              thread,
+              effectiveResourceId,
+              permission: MastraFGAPermissions.MEMORY_WRITE
+            });
+          }
+        }
+      }
+      if (memoryOption || effectiveResourceId || effectiveThreadId) {
+        authorizedMemoryOption = {
+          ...memoryOption,
+          ...effectiveResourceId ? { resource: effectiveResourceId } : {},
+          ...effectiveThreadId ? { thread: effectiveThreadId } : {}
+        };
+      }
+      const workflowsStore = await mastra.getStorage()?.getStore("workflows");
+      const workflowRun = await workflowsStore?.getWorkflowRunById({ workflowName: "agentic-loop", runId });
+      await validateRunOwnership(workflowRun, getEffectiveResourceId(serverRequestContext, void 0));
+      const { structuredOutput, ...restOptions } = rest;
+      const options = {
+        runId,
+        toolCallId,
+        ...restOptions,
+        requestContext: serverRequestContext,
+        memory: authorizedMemoryOption,
+        abortSignal
+      };
+      const streamResult = structuredOutput ? await agent.resumeStream(resumeData, { ...options, structuredOutput }) : await agent.resumeStream(resumeData, options);
+      return streamResult.fullStream;
+    } catch (error) {
+      return handleError(error, "error resuming agent stream");
+    }
+  }
+});
+var RESUME_STREAM_UNTIL_IDLE_ROUTE = createRoute({
+  method: "POST",
+  path: "/agents/:agentId/resume-stream-until-idle",
+  responseType: "stream",
+  streamFormat: "sse",
+  pathParamSchema: agentIdPathParams,
+  bodySchema: resumeStreamUntilIdleBodySchema,
+  responseSchema: streamResponseSchema,
+  summary: "Resume agent stream until idle",
+  description: "Resumes a suspended agent stream until idle with custom resume data, also listens for background task completions and streams them in real-time",
+  tags: ["Agents"],
+  requiresAuth: true,
+  requiresPermission: "agents:execute",
   handler: async ({ mastra, agentId, abortSignal, requestContext: serverRequestContext, ...params }) => {
     try {
       if (!params.runId) {
@@ -1426,7 +1516,7 @@ var RESUME_STREAM_ROUTE = createRoute({
         memory: authorizedMemoryOption,
         abortSignal
       };
-      const streamResult = structuredOutput ? await agent.resumeStream(resumeData, { ...options, structuredOutput }) : await agent.resumeStream(resumeData, options);
+      const streamResult = structuredOutput ? await agent.resumeStreamUntilIdle(resumeData, { ...options, structuredOutput }) : await agent.resumeStreamUntilIdle(resumeData, options);
       return streamResult.fullStream;
     } catch (error) {
       return handleError(error, "error resuming agent stream");
@@ -1910,6 +2000,6 @@ var GET_AGENT_SKILL_ROUTE = createRoute({
   }
 });
 
-export { APPROVE_NETWORK_TOOL_CALL_ROUTE, APPROVE_TOOL_CALL_GENERATE_ROUTE, APPROVE_TOOL_CALL_ROUTE, CLONE_AGENT_ROUTE, DECLINE_NETWORK_TOOL_CALL_ROUTE, DECLINE_TOOL_CALL_GENERATE_ROUTE, DECLINE_TOOL_CALL_ROUTE, ENHANCE_INSTRUCTIONS_ROUTE, GENERATE_AGENT_ROUTE, GENERATE_AGENT_VNEXT_ROUTE, GENERATE_LEGACY_ROUTE, GET_AGENT_BY_ID_ROUTE, GET_AGENT_SKILL_ROUTE, GET_PROVIDERS_ROUTE, LIST_AGENTS_ROUTE, OBSERVE_AGENT_STREAM_ROUTE, REORDER_AGENT_MODEL_LIST_ROUTE, RESET_AGENT_MODEL_ROUTE, RESUME_STREAM_ROUTE, STREAM_GENERATE_LEGACY_ROUTE, STREAM_GENERATE_ROUTE, STREAM_GENERATE_VNEXT_DEPRECATED_ROUTE, STREAM_NETWORK_ROUTE, STREAM_UI_MESSAGE_DEPRECATED_ROUTE, STREAM_UI_MESSAGE_VNEXT_DEPRECATED_ROUTE, STREAM_UNTIL_IDLE_GENERATE_ROUTE, STREAM_VNEXT_DEPRECATED_ROUTE, UPDATE_AGENT_MODEL_IN_MODEL_LIST_ROUTE, UPDATE_AGENT_MODEL_ROUTE, agents_exports, extractVersionOptions, getAgentFromSystem, getBrowserToolsFromAgent, getSerializedAgentTools, getSerializedProcessors, getSerializedSkillsFromAgent, getWorkspaceToolsFromAgent, isProviderConnected };
-//# sourceMappingURL=chunk-MI3PFFAR.js.map
-//# sourceMappingURL=chunk-MI3PFFAR.js.map
+export { APPROVE_NETWORK_TOOL_CALL_ROUTE, APPROVE_TOOL_CALL_GENERATE_ROUTE, APPROVE_TOOL_CALL_ROUTE, CLONE_AGENT_ROUTE, DECLINE_NETWORK_TOOL_CALL_ROUTE, DECLINE_TOOL_CALL_GENERATE_ROUTE, DECLINE_TOOL_CALL_ROUTE, ENHANCE_INSTRUCTIONS_ROUTE, GENERATE_AGENT_ROUTE, GENERATE_AGENT_VNEXT_ROUTE, GENERATE_LEGACY_ROUTE, GET_AGENT_BY_ID_ROUTE, GET_AGENT_SKILL_ROUTE, GET_PROVIDERS_ROUTE, LIST_AGENTS_ROUTE, OBSERVE_AGENT_STREAM_ROUTE, REORDER_AGENT_MODEL_LIST_ROUTE, RESET_AGENT_MODEL_ROUTE, RESUME_STREAM_ROUTE, RESUME_STREAM_UNTIL_IDLE_ROUTE, STREAM_GENERATE_LEGACY_ROUTE, STREAM_GENERATE_ROUTE, STREAM_GENERATE_VNEXT_DEPRECATED_ROUTE, STREAM_NETWORK_ROUTE, STREAM_UI_MESSAGE_DEPRECATED_ROUTE, STREAM_UI_MESSAGE_VNEXT_DEPRECATED_ROUTE, STREAM_UNTIL_IDLE_GENERATE_ROUTE, STREAM_VNEXT_DEPRECATED_ROUTE, UPDATE_AGENT_MODEL_IN_MODEL_LIST_ROUTE, UPDATE_AGENT_MODEL_ROUTE, agents_exports, extractVersionOptions, getAgentFromSystem, getBrowserToolsFromAgent, getSerializedAgentTools, getSerializedProcessors, getSerializedSkillsFromAgent, getWorkspaceToolsFromAgent, isProviderConnected };
+//# sourceMappingURL=chunk-GRPUO3NH.js.map
+//# sourceMappingURL=chunk-GRPUO3NH.js.map