@mastra/server 1.77.0-alpha.1 → 1.77.0-alpha.3

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

@@ -1,5 +1,6 @@
 import { t as HTTPException } from "../../http-exception-CyfxZB6W.js";
 import { n as createRoute } from "../../route-builder-lBil8Cvo.js";
+import { l as MASTRA_USER_KEY } from "../../constants-1TDVXCCT.js";
 import { handleError } from "./error.js";
 import { t as enforceThreadAccess } from "../../utils-kaP2cyIO.js";
 import { E as includeSchema, F as messageOrderBySchema, h as filterSchema } from "../../memory-B58Q2LgU.js";
@@ -37,12 +38,20 @@ const RESERVED_THREAD_METADATA_KEYS = {
 	observationThreshold: true,
 	reflectionThreshold: true,
 	tokenUsage: true,
+	ownerId: true,
+	createdBy: true,
 	thinkingLevel: true,
 	notifications: true
 };
 function isReservedThreadMetadataKey(key) {
 	return Object.hasOwn(RESERVED_THREAD_METADATA_KEYS, key) || key.startsWith("modeModelId_");
 }
+function getRequestMessageAuthor(requestContext) {
+	const user = requestContext?.get(MASTRA_USER_KEY);
+	if (!user || typeof user !== "object" || Array.isArray(user)) return void 0;
+	const id = user.id;
+	return typeof id === "string" && id ? { id } : void 0;
+}
 /**
 * Resolves a controller by id via the canonical `mastra.getAgentController`
 * accessor, throwing a 404 if no controller is registered under that id.
@@ -152,6 +161,7 @@ const toolApprovalBodySchema = z.object({
 });
 const toolSuspensionBodySchema = z.object({
 	toolCallId: z.string().min(1),
+	runId: z.string().min(1).optional(),
 	resumeData: z.unknown(),
 	requestContext: bodyRequestContextSchema
 });
@@ -595,11 +605,13 @@ const SEND_AGENT_CONTROLLER_MESSAGE_ROUTE = createRoute({
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, message, files, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
+			const author = getRequestMessageAuthor(requestContext);
 			ackBackgroundSessionWork({
 				work: session.sendMessage({
 					content: message,
 					files,
-					requestContext
+					requestContext,
+					...author ? { author } : {}
 				}),
 				session,
 				mastra,
@@ -697,21 +709,20 @@ const AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = createRoute({
 	tags: ["AgentController"],
 	requiresAuth: true,
 	requiresPermission: "agent-controller:execute",
-	handler: async ({ mastra, controllerId, resourceId, sessionScope, toolCallId, resumeData, requestContext }) => {
+	handler: async ({ mastra, controllerId, resourceId, sessionScope, toolCallId, runId, resumeData, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
-			const claim = session.claimToolSuspension(toolCallId);
+			const claim = session.claimToolSuspension(toolCallId, runId);
 			if (!claim.accepted) return {
 				ok: false,
 				reason: claim.reason
 			};
-			const claimedToolCallId = claim.toolCallId;
 			ackBackgroundSessionWork({
 				work: session.respondToToolSuspension({
-					toolCallId,
+					address: claim.address,
 					resumeData,
 					requestContext
-				}).finally(() => session.releaseToolResponse(claimedToolCallId)),
+				}).finally(() => session.releaseToolResponse(claim.claimKey)),
 				session,
 				mastra,
 				operation: "respondToToolSuspension"
@@ -738,10 +749,12 @@ const STEER_AGENT_CONTROLLER_SESSION_ROUTE = createRoute({
 	handler: async ({ mastra, controllerId, resourceId, sessionScope, message, requestContext }) => {
 		try {
 			const session = await getSession(getAgentControllerOrThrow(mastra, controllerId), resourceId, { scope: sessionScope }, requestContext);
+			const author = getRequestMessageAuthor(requestContext);
 			ackBackgroundSessionWork({
 				work: session.steer({
 					content: message,
-					requestContext
+					requestContext,
+					...author ? { author } : {}
 				}),
 				session,
 				mastra,