@mastra/server 1.73.0-alpha.0 → 1.73.0

package/dist/server/handlers/agent-controller.js

@@ -141,7 +141,7 @@ const toolApprovalBodySchema = z.object({
 	requestContext: bodyRequestContextSchema
 });
 const toolSuspensionBodySchema = z.object({
-	toolCallId: z.string(),
+	toolCallId: z.string().min(1),
 	resumeData: z.unknown(),
 	requestContext: bodyRequestContextSchema
 });
@@ -232,6 +232,15 @@ const createSessionResponseSchema = z.object({
 	threadId: z.string().optional()
 });
 const ackResponseSchema = z.object({ ok: z.boolean() });
+const toolCommandAckResponseSchema = z.object({
+	ok: z.boolean(),
+	reason: z.enum([
+		"not_pending",
+		"stale_tool_call",
+		"aborting",
+		"no_pending_suspension"
+	]).optional()
+});
 /**
 * Status-line relevant slice of the session's observational-memory progress.
 * Mirrors the TUI status line: `msg pending/threshold ↓removal` (the active
@@ -605,7 +614,7 @@ const AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = createRoute({
 	pathParamSchema: sessionPathParams,
 	queryParamSchema: sessionScopeQuerySchema,
 	bodySchema: toolApprovalBodySchema,
-	responseSchema: ackResponseSchema,
+	responseSchema: toolCommandAckResponseSchema,
 	summary: "Respond to a controller tool approval",
 	description: "Approves or declines a pending tool call surfaced by the session.",
 	tags: ["AgentController"],
@@ -614,21 +623,36 @@ const AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = createRoute({
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, toolCallId, approved, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
-			if ((toolCallId ? session.approval.isArmed({ toolCallId }) : session.approval.isArmed()) || !toolCallId) session.respondToToolApproval({
-				toolCallId,
-				decision: approved ? "approve" : "decline",
-				requestContext
-			});
-			else ackBackgroundSessionWork({
-				work: session.respondToPersistedToolApproval({
+			if ((toolCallId ? session.approval.isArmed({ toolCallId }) : session.approval.isArmed()) || !toolCallId) {
+				const result = session.respondToToolApproval({
 					toolCallId,
-					approved,
+					decision: approved ? "approve" : "decline",
 					requestContext
-				}),
-				session,
-				mastra,
-				operation: "respondToPersistedToolApproval"
-			});
+				});
+				if (!result.accepted) return {
+					ok: false,
+					reason: result.reason
+				};
+			} else {
+				if (!await session.hasPersistedToolApproval(toolCallId)) return {
+					ok: false,
+					reason: session.approval.isArmed() ? "stale_tool_call" : "not_pending"
+				};
+				if (!session.claimToolResponse(toolCallId)) return {
+					ok: false,
+					reason: "not_pending"
+				};
+				ackBackgroundSessionWork({
+					work: session.respondToPersistedToolApproval({
+						toolCallId,
+						approved,
+						requestContext
+					}).finally(() => session.releaseToolResponse(toolCallId)),
+					session,
+					mastra,
+					operation: "respondToPersistedToolApproval"
+				});
+			}
 			return { ok: true };
 		} catch (error) {
 			return handleError(error, "error responding to controller tool approval");
@@ -642,7 +666,7 @@ const AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = createRoute({
 	pathParamSchema: sessionPathParams,
 	queryParamSchema: sessionScopeQuerySchema,
 	bodySchema: toolSuspensionBodySchema,
-	responseSchema: ackResponseSchema,
+	responseSchema: toolCommandAckResponseSchema,
 	summary: "Respond to a suspended controller tool",
 	description: "Resumes a suspended interactive tool (ask_user, request_access, submit_plan) with the provided resume data.",
 	tags: ["AgentController"],
@@ -651,12 +675,18 @@ const AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = createRoute({
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, toolCallId, resumeData, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
+			const claim = session.claimToolSuspension(toolCallId);
+			if (!claim.accepted) return {
+				ok: false,
+				reason: claim.reason
+			};
+			const claimedToolCallId = claim.toolCallId;
 			ackBackgroundSessionWork({
 				work: session.respondToToolSuspension({
 					toolCallId,
 					resumeData,
 					requestContext
-				}),
+				}).finally(() => session.releaseToolResponse(claimedToolCallId)),
 				session,
 				mastra,
 				operation: "respondToToolSuspension"
@@ -762,7 +792,10 @@ const SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
-			if (session.thread.getId() !== threadId) await session.thread.switch({ threadId });
+			if (session.thread.getId() !== threadId) await session.thread.switch({
+				threadId,
+				requestContext
+			});
 			return { ok: true };
 		} catch (error) {
 			return handleError(error, "error switching controller thread");
@@ -972,7 +1005,7 @@ const SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = createRoute({
 				coalesceKey,
 				attributes,
 				metadata
-			});
+			}, { requestContext });
 			return {
 				accepted: result.accepted !== void 0,
 				notificationId: result.record?.id,
@@ -999,7 +1032,10 @@ const CREATE_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
 	requiresPermission: "agent-controller:execute",
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, title, requestContext }) => {
 		try {
-			const thread = await (await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext)).thread.create({ title });
+			const thread = await (await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext)).thread.create({
+				title,
+				requestContext
+			});
 			return {
 				id: thread.id,
 				title: thread.title,
@@ -1026,7 +1062,10 @@ const DELETE_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
 	requiresPermission: "agent-controller:execute",
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId, requestContext }) => {
 		try {
-			await (await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext)).thread.delete({ threadId });
+			await (await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext)).thread.delete({
+				threadId,
+				requestContext
+			});
 			return { ok: true };
 		} catch (error) {
 			return handleError(error, "error deleting controller thread");
@@ -1049,7 +1088,10 @@ const RENAME_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId, title, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
-			if (session.thread.getId() !== threadId) await session.thread.switch({ threadId });
+			if (session.thread.getId() !== threadId) await session.thread.switch({
+				threadId,
+				requestContext
+			});
 			await session.thread.rename({ title });
 			return { ok: true };
 		} catch (error) {
@@ -1074,7 +1116,8 @@ const CLONE_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
 		try {
 			const thread = await (await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext)).thread.clone({
 				sourceThreadId,
-				title
+				title,
+				requestContext
 			});
 			return {
 				id: thread.id,