@mastra/server 1.73.0-alpha.0 → 1.73.0

package/dist/server/handlers/agents.cjs

@@ -125,35 +125,48 @@ function hasSuspendedToolCall(snapshot, toolCallId) {
 	};
 	return visit(snapshot.context);
 }
+const DURABLE_SNAPSHOT_WAIT_TIMEOUT_MS = 1e4;
+const DURABLE_SNAPSHOT_WAIT_INTERVAL_MS = 25;
 function getDurableLoopWorkflowName(agent) {
 	return agent.durableLoopWorkflowName ?? _mastra_core_agent_durable.DurableStepIds.AGENTIC_LOOP;
 }
-async function validateDurableToolCallAccess({ mastra, agent, runId, toolCallId, requestContext, threadId }) {
+async function validateDurableToolCallAccess({ mastra, agent, runId, toolCallId, requestContext, threadId, abortSignal }) {
 	if (!(0, _mastra_core_agent.isDurableAgentLike)(agent)) return;
-	const workflowRun = await (await mastra.getStorage()?.getStore("workflows"))?.getWorkflowRunById({
-		workflowName: getDurableLoopWorkflowName(agent),
-		runId
-	});
-	if (!workflowRun) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different resource" });
-	let snapshot = workflowRun.snapshot;
-	if (typeof snapshot === "string") try {
-		snapshot = JSON.parse(snapshot);
-	} catch {
-		snapshot = void 0;
-	}
-	const input = snapshot?.context?.input;
-	const persistedResourceIds = new Set([
-		workflowRun.resourceId,
-		input?.state?.resourceId,
-		input?.messageListState?.memoryInfo?.resourceId,
-		input?.requestContextEntries?.[require_constants.MASTRA_RESOURCE_ID_KEY]
-	].filter((resourceId) => typeof resourceId === "string" && resourceId.length > 0));
+	const workflowsStore = await mastra.getStorage()?.getStore("workflows");
+	if (!workflowsStore) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different resource" });
+	const workflowName = getDurableLoopWorkflowName(agent);
 	const contextResourceId = require_utils$1.getContextResourceId(requestContext);
-	const [persistedResourceId] = persistedResourceIds;
-	if (persistedResourceIds.size > 1 || contextResourceId && persistedResourceId && persistedResourceId !== contextResourceId) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different resource" });
-	const persistedThreadId = input?.state?.threadId ?? input?.messageListState?.memoryInfo?.threadId;
-	if (threadId && persistedThreadId !== threadId) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different thread" });
-	if (!snapshot || snapshot.status !== "suspended" || input?.agentId !== agent.id || toolCallId !== void 0 && !hasSuspendedToolCall(snapshot, toolCallId)) throw new require_http_exception.HTTPException(403, { message: "Access denied: tool call is not suspended on this durable run" });
+	const deadline = Date.now() + DURABLE_SNAPSHOT_WAIT_TIMEOUT_MS;
+	while (true) {
+		const workflowRun = await workflowsStore.getWorkflowRunById({
+			workflowName,
+			runId
+		});
+		let snapshot = workflowRun?.snapshot;
+		if (typeof snapshot === "string") try {
+			snapshot = JSON.parse(snapshot);
+		} catch {
+			snapshot = void 0;
+		}
+		const input = snapshot?.context?.input;
+		const persistedResourceIds = new Set([
+			workflowRun?.resourceId,
+			input?.state?.resourceId,
+			input?.messageListState?.memoryInfo?.resourceId,
+			input?.requestContextEntries?.[require_constants.MASTRA_RESOURCE_ID_KEY]
+		].filter((resourceId) => typeof resourceId === "string" && resourceId.length > 0));
+		const [persistedResourceId] = persistedResourceIds;
+		if (persistedResourceIds.size > 1 || contextResourceId && persistedResourceId && persistedResourceId !== contextResourceId) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different resource" });
+		const ready = !!workflowRun && !!snapshot && snapshot.status === "suspended" && (toolCallId === void 0 || hasSuspendedToolCall(snapshot, toolCallId));
+		if (ready || Date.now() >= deadline || abortSignal?.aborted) {
+			if (!workflowRun) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different resource" });
+			const persistedThreadId = input?.state?.threadId ?? input?.messageListState?.memoryInfo?.threadId;
+			if (threadId && persistedThreadId !== threadId) throw new require_http_exception.HTTPException(403, { message: "Access denied: durable run belongs to a different thread" });
+			if (!ready || input?.agentId !== agent.id) throw new require_http_exception.HTTPException(403, { message: "Access denied: tool call is not suspended on this durable run" });
+			return;
+		}
+		await new Promise((resolve) => setTimeout(resolve, DURABLE_SNAPSHOT_WAIT_INTERVAL_MS));
+	}
 }
 /**
 * Providers whose apiKeyEnvVar entries are aliases for the same credential (any one
@@ -202,6 +215,24 @@ function schemaToJsonSchema(schema) {
 	if (!schema) return;
 	return require_schema_e0VHpMt0.standardSchemaToJSONSchema(require_schema_e0VHpMt0.toStandardSchema(schema), { target: "draft-2020-12" });
 }
+function getAgentModelRef(agentModel, llm) {
+	if (typeof agentModel === "string") {
+		const { provider, modelId } = (0, _mastra_core_llm.parseModelString)(agentModel);
+		return {
+			provider: provider ?? llm?.getProvider(),
+			modelId
+		};
+	}
+	const model = llm?.getModel();
+	if (model instanceof _mastra_core_llm.ModelRouterLanguageModel && model.gatewayId !== "models.dev" && model.gatewayId !== model.provider) return {
+		provider: model.gatewayId,
+		modelId: `${model.provider}/${model.modelId}`
+	};
+	return {
+		provider: llm?.getProvider(),
+		modelId: llm?.getModelId()
+	};
+}
 async function getSerializedAgentTools(tools, partial = false) {
 	return Object.entries(tools || {}).reduce((acc, [key, tool]) => {
 		const toolId = "id" in tool && typeof tool.id === "string" && tool.id.length > 0 ? tool.id : `tool-${key}`;
@@ -497,8 +528,7 @@ async function formatAgentList({ id, mastra, agent, requestContext, partial = fa
 		workspaceId,
 		inputProcessors: serializedInputProcessors,
 		outputProcessors: serializedOutputProcessors,
-		provider: typeof agent.model === "string" ? (0, _mastra_core_llm.parseModelString)(agent.model).provider ?? llm?.getProvider() : llm?.getProvider(),
-		modelId: typeof agent.model === "string" ? (0, _mastra_core_llm.parseModelString)(agent.model).modelId : llm?.getModelId(),
+		...getAgentModelRef(agent.model, llm),
 		modelVersion: model?.specificationVersion,
 		supportsMemory,
 		defaultOptions,
@@ -727,8 +757,7 @@ async function formatAgent({ mastra, agent, requestContext, isStudio }) {
 		workspaceId,
 		inputProcessors: serializedInputProcessors,
 		outputProcessors: serializedOutputProcessors,
-		provider: typeof agent.model === "string" ? (0, _mastra_core_llm.parseModelString)(agent.model).provider ?? llm?.getProvider() : llm?.getProvider(),
-		modelId: typeof agent.model === "string" ? (0, _mastra_core_llm.parseModelString)(agent.model).modelId : llm?.getModelId(),
+		...getAgentModelRef(agent.model, llm),
 		modelVersion: model?.specificationVersion,
 		supportsMemory,
 		modelList,
@@ -1824,7 +1853,8 @@ const APPROVE_TOOL_CALL_ROUTE = require_route_builder.createRoute({
 				agent,
 				runId: params.runId,
 				toolCallId: params.toolCallId,
-				requestContext
+				requestContext,
+				abortSignal
 			});
 			return (await agent.approveToolCall({
 				...params,
@@ -1966,7 +1996,8 @@ const DECLINE_TOOL_CALL_ROUTE = require_route_builder.createRoute({
 				agent,
 				runId: params.runId,
 				toolCallId: params.toolCallId,
-				requestContext
+				requestContext,
+				abortSignal
 			});
 			return (await agent.declineToolCall({
 				...params,
@@ -2035,7 +2066,8 @@ const RESUME_STREAM_ROUTE = require_route_builder.createRoute({
 				runId,
 				toolCallId,
 				requestContext: serverRequestContext,
-				threadId: effectiveThreadId
+				threadId: effectiveThreadId,
+				abortSignal
 			});
 			await require_utils$1.validateRunOwnership(await (await mastra.getStorage()?.getStore("workflows"))?.getWorkflowRunById({
 				workflowName: "agentic-loop",
@@ -2155,7 +2187,8 @@ const RESUME_STREAM_UNTIL_IDLE_ROUTE = require_route_builder.createRoute({
 				runId,
 				toolCallId,
 				requestContext: serverRequestContext,
-				threadId: effectiveThreadId
+				threadId: effectiveThreadId,
+				abortSignal
 			});
 			await require_utils$1.validateRunOwnership(await (await mastra.getStorage()?.getStore("workflows"))?.getWorkflowRunById({
 				workflowName: "agentic-loop",
@@ -2206,7 +2239,8 @@ const APPROVE_TOOL_CALL_GENERATE_ROUTE = require_route_builder.createRoute({
 				agent,
 				runId: params.runId,
 				toolCallId: params.toolCallId,
-				requestContext
+				requestContext,
+				abortSignal
 			});
 			return await agent.approveToolCallGenerate({
 				...params,
@@ -2244,7 +2278,8 @@ const DECLINE_TOOL_CALL_GENERATE_ROUTE = require_route_builder.createRoute({
 				agent,
 				runId: params.runId,
 				toolCallId: params.toolCallId,
-				requestContext
+				requestContext,
+				abortSignal
 			});
 			return await agent.declineToolCallGenerate({
 				...params,