@mastra/server 1.51.0-alpha.6 → 1.51.0-alpha.8

package/dist/{chunk-VTA32BYJ.cjs → chunk-YXCSR2S3.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkZ7LCIYK7_cjs = require('./chunk-Z7LCIYK7.cjs');
-var chunk7YBYLB2K_cjs = require('./chunk-7YBYLB2K.cjs');
+var chunkNWF6NTJ4_cjs = require('./chunk-NWF6NTJ4.cjs');
 var chunk64ITUOXI_cjs = require('./chunk-64ITUOXI.cjs');
 var v4 = require('zod/v4');
 
@@ -15,17 +15,35 @@ function getAgentControllerOrThrow(mastra, controllerId) {
   }
   return controller;
 }
-async function getSession(controller, resourceId, tags) {
+async function getSession(controller, resourceId, options) {
   await controller.init();
-  return controller.createSession({ resourceId, id: resourceId, ownerId: controller.id, tags });
+  const { tags, scope } = options ?? {};
+  const id = scope ? `${resourceId}::${scope}` : resourceId;
+  return controller.createSession({ resourceId, id, ownerId: controller.id, tags, scope });
 }
 var controllerIdPathParams = v4.z.object({ controllerId: v4.z.string() });
 var sessionPathParams = v4.z.object({ controllerId: v4.z.string(), resourceId: v4.z.string() });
+var sessionScopeQuerySchema = v4.z.object({ sessionScope: v4.z.string().optional() });
 var createSessionBodySchema = v4.z.object({
   resourceId: v4.z.string(),
-  tags: v4.z.record(v4.z.string(), v4.z.string()).optional()
+  tags: v4.z.record(v4.z.string(), v4.z.string()).optional(),
+  sessionScope: v4.z.string().optional()
+});
+var MAX_FILE_DATA_LENGTH = 14 * 1024 * 1024;
+var MAX_TOTAL_FILE_DATA_LENGTH = 28 * 1024 * 1024;
+var sendMessageBodySchema = v4.z.object({
+  message: v4.z.string(),
+  // Optional attachments (e.g. pasted images). `data` is base64-encoded.
+  files: v4.z.array(
+    v4.z.object({
+      data: v4.z.string().max(MAX_FILE_DATA_LENGTH),
+      mediaType: v4.z.string(),
+      filename: v4.z.string().optional()
+    })
+  ).max(20).refine((files) => files.reduce((total, file) => total + file.data.length, 0) <= MAX_TOTAL_FILE_DATA_LENGTH, {
+    message: "Total attachment size exceeds limit"
+  }).optional()
 });
-var sendMessageBodySchema = v4.z.object({ message: v4.z.string() });
 var steerBodySchema = v4.z.object({ message: v4.z.string() });
 var toolApprovalBodySchema = v4.z.object({
   toolCallId: v4.z.string(),
@@ -52,9 +70,10 @@ var cloneThreadBodySchema = v4.z.object({
   sourceThreadId: v4.z.string().optional(),
   title: v4.z.string().optional()
 });
-var listMessagesQuerySchema = v4.z.object({ limit: v4.z.coerce.number().optional() });
+var listMessagesQuerySchema = v4.z.object({ limit: v4.z.coerce.number().optional(), sessionScope: v4.z.string().optional() });
 var listThreadsQuerySchema = v4.z.object({
   limit: v4.z.coerce.number().optional(),
+  sessionScope: v4.z.string().optional(),
   tags: v4.z.preprocess((value) => {
     if (typeof value !== "string" || value.length === 0) return void 0;
     try {
@@ -111,6 +130,8 @@ var sessionStateResponseSchema = v4.z.object({
   threadId: v4.z.string().optional(),
   modeId: v4.z.string(),
   modelId: v4.z.string(),
+  /** Whether the agent is currently executing a run (for initial UI hydration). */
+  running: v4.z.boolean().optional(),
   omProgress: omProgressSummarySchema.optional(),
   tokenUsage: v4.z.record(v4.z.string(), v4.z.unknown()).optional(),
   settings: sessionSettingsSchema.optional()
@@ -125,7 +146,9 @@ var listThreadsResponseSchema = v4.z.object({
       title: v4.z.string().optional(),
       updatedAt: v4.z.string().optional(),
       /** The session scoping tags stamped on this thread (e.g. `{ projectPath }`). */
-      tags: v4.z.record(v4.z.string(), v4.z.string()).optional()
+      tags: v4.z.record(v4.z.string(), v4.z.string()).optional(),
+      /** Whether a run is currently executing on this thread ('active') or not ('idle'). */
+      state: v4.z.enum(["active", "idle"]).optional()
     })
   )
 });
@@ -181,7 +204,7 @@ var setToolPermissionBodySchema = v4.z.object({
   toolName: v4.z.string(),
   policy: permissionPolicyEnum
 });
-var LIST_AGENT_CONTROLLERS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var LIST_AGENT_CONTROLLERS_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller",
   responseType: "json",
@@ -203,7 +226,7 @@ var LIST_AGENT_CONTROLLERS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var CREATE_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var CREATE_AGENT_CONTROLLER_SESSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions",
   responseType: "json",
@@ -215,10 +238,10 @@ var CREATE_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, tags }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, tags }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId, tags);
+      const session = await getSession(controller, resourceId, { tags, scope: sessionScope });
       return {
         controllerId,
         resourceId,
@@ -236,22 +259,23 @@ function toWireEvent(event) {
   }
   return event;
 }
-var STREAM_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var STREAM_AGENT_CONTROLLER_SESSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/stream",
   responseType: "stream",
   streamFormat: "sse",
   sseFlushOnConnect: true,
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   summary: "Stream controller session events",
   description: "Subscribes to a session\u2019s event bus and streams events to the client over SSE.",
   tags: ["AgentController", "Streaming"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId, abortSignal }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, abortSignal }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       let cleanedUp = false;
       let heartbeat;
       let unsubscribe;
@@ -312,11 +336,12 @@ var STREAM_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SEND_AGENT_CONTROLLER_MESSAGE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SEND_AGENT_CONTROLLER_MESSAGE_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/messages",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: sendMessageBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Send a message to a controller session",
@@ -324,32 +349,33 @@ var SEND_AGENT_CONTROLLER_MESSAGE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Streaming"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, message, requestContext }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, message, files, requestContext }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
-      void session.sendMessage({ content: message, requestContext });
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
+      void session.sendMessage({ content: message, files, requestContext });
       return { ok: true };
     } catch (error) {
       return chunkZ7LCIYK7_cjs.handleError(error, "error sending controller message");
     }
   }
 });
-var ABORT_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var ABORT_AGENT_CONTROLLER_SESSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/abort",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: ackResponseSchema,
   summary: "Abort a controller session run",
   description: "Aborts the in-flight run for the session, if any.",
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       session.abort();
       return { ok: true };
     } catch (error) {
@@ -357,11 +383,12 @@ var ABORT_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/tool-approval",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: toolApprovalBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Respond to a controller tool approval",
@@ -369,10 +396,10 @@ var AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, toolCallId, approved, requestContext }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, toolCallId, approved, requestContext }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       session.respondToToolApproval({ toolCallId, decision: approved ? "approve" : "decline", requestContext });
       return { ok: true };
     } catch (error) {
@@ -380,11 +407,12 @@ var AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/tool-suspension",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: toolSuspensionBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Respond to a suspended controller tool",
@@ -392,10 +420,10 @@ var AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, toolCallId, resumeData, requestContext }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, toolCallId, resumeData, requestContext }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.respondToToolSuspension({ toolCallId, resumeData, requestContext });
       return { ok: true };
     } catch (error) {
@@ -403,11 +431,12 @@ var AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var STEER_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var STEER_AGENT_CONTROLLER_SESSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/steer",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: steerBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Steer the in-flight run",
@@ -415,10 +444,10 @@ var STEER_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, message, requestContext }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, message, requestContext }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       void session.steer({ content: message, requestContext });
       return { ok: true };
     } catch (error) {
@@ -426,11 +455,12 @@ var STEER_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SWITCH_AGENT_CONTROLLER_MODE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SWITCH_AGENT_CONTROLLER_MODE_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/mode",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: switchModeBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Switch the session mode",
@@ -438,10 +468,10 @@ var SWITCH_AGENT_CONTROLLER_MODE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, modeId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, modeId }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.mode.switch({ modeId });
       return { ok: true };
     } catch (error) {
@@ -449,11 +479,12 @@ var SWITCH_AGENT_CONTROLLER_MODE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/model",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: switchModelBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Switch the session model",
@@ -461,10 +492,10 @@ var SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, modelId, scope, modeId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, modelId, scope, modeId }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.model.switch({ modelId, scope, modeId });
       return { ok: true };
     } catch (error) {
@@ -472,11 +503,12 @@ var SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/thread",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: switchThreadBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Switch the session thread",
@@ -484,10 +516,10 @@ var SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, threadId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.thread.switch({ threadId });
       return { ok: true };
     } catch (error) {
@@ -495,21 +527,22 @@ var SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: sessionStateResponseSchema,
   summary: "Get session state",
   description: "Returns the current mode, model, and thread for the session (for initial UI hydration).",
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const ds = session.displayState.get();
       const om = ds.omProgress;
       const reflectionSavings = om.buffered.reflection.inputObservationTokens - om.buffered.reflection.observationTokens;
@@ -521,6 +554,7 @@ var GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
         threadId: session.thread.getId() ?? void 0,
         modeId: session.mode.get(),
         modelId: session.model.get(),
+        running: ds.isRunning === true,
         omProgress: {
           status: om.status,
           pendingTokens: om.pendingTokens,
@@ -545,7 +579,7 @@ var GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var LIST_AGENT_CONTROLLER_MODES_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var LIST_AGENT_CONTROLLER_MODES_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/modes",
   responseType: "json",
@@ -567,7 +601,7 @@ var LIST_AGENT_CONTROLLER_MODES_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var LIST_AGENT_CONTROLLER_THREADS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var LIST_AGENT_CONTROLLER_THREADS_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads",
   responseType: "json",
@@ -579,10 +613,10 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId, limit, tags }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, limit, tags }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const threads = await session.thread.list();
       const getTags = (t) => {
         const metadata = t.metadata ?? {};
@@ -601,6 +635,7 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
       const sorted = [...scoped].sort((a, b) => toTime(b) - toTime(a));
       const max = Number(limit);
       const limited = Number.isFinite(max) && max > 0 ? sorted.slice(0, max) : sorted;
+      const agent = controller.getCurrentAgent(session);
       return {
         threads: limited.map((t) => {
           const threadTags = getTags(t);
@@ -608,7 +643,8 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
             id: t.id,
             title: t.title,
             tags: Object.keys(threadTags).length > 0 ? threadTags : void 0,
-            updatedAt: t.updatedAt instanceof Date ? t.updatedAt.toISOString() : void 0
+            updatedAt: t.updatedAt instanceof Date ? t.updatedAt.toISOString() : void 0,
+            state: agent.getActiveThreadRunId({ resourceId, threadId: t.id }) ? "active" : "idle"
           };
         })
       };
@@ -617,11 +653,12 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/notifications",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: sendNotificationBodySchema,
   responseSchema: v4.z.object({
     accepted: v4.z.boolean(),
@@ -638,6 +675,7 @@ var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     mastra,
     controllerId,
     resourceId,
+    sessionScope,
     source,
     kind,
     summary,
@@ -651,7 +689,7 @@ var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const result = await session.sendNotificationSignal({
         source,
         kind,
@@ -675,11 +713,12 @@ var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var CREATE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var CREATE_AGENT_CONTROLLER_THREAD_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: createThreadBodySchema,
   responseSchema: threadResponseSchema,
   summary: "Create a new thread",
@@ -687,10 +726,10 @@ var CREATE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Threads"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, title }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, title }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const thread = await session.thread.create({ title });
       return {
         id: thread.id,
@@ -704,21 +743,22 @@ var CREATE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var DELETE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var DELETE_AGENT_CONTROLLER_THREAD_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "DELETE",
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads/:threadId",
   responseType: "json",
   pathParamSchema: threadPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: ackResponseSchema,
   summary: "Delete a thread",
   description: "Deletes a thread. If the deleted thread is the active one, the session is unbound.",
   tags: ["AgentController", "Threads"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, threadId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.thread.delete({ threadId });
       return { ok: true };
     } catch (error) {
@@ -726,11 +766,12 @@ var DELETE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var RENAME_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var RENAME_AGENT_CONTROLLER_THREAD_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "PUT",
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads/:threadId",
   responseType: "json",
   pathParamSchema: threadPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: renameThreadBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Rename a thread",
@@ -738,10 +779,10 @@ var RENAME_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Threads"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, threadId, title }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId, title }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       if (session.thread.getId() !== threadId) {
         await session.thread.switch({ threadId });
       }
@@ -752,11 +793,12 @@ var RENAME_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var CLONE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var CLONE_AGENT_CONTROLLER_THREAD_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads/clone",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: cloneThreadBodySchema,
   responseSchema: threadResponseSchema,
   summary: "Clone a thread",
@@ -764,10 +806,10 @@ var CLONE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Threads"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, sourceThreadId, title }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, sourceThreadId, title }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const thread = await session.thread.clone({ sourceThreadId, title });
       return {
         id: thread.id,
@@ -781,7 +823,7 @@ var CLONE_AGENT_CONTROLLER_THREAD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var LIST_AGENT_CONTROLLER_THREAD_MESSAGES_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var LIST_AGENT_CONTROLLER_THREAD_MESSAGES_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads/:threadId/messages",
   responseType: "json",
@@ -793,10 +835,10 @@ var LIST_AGENT_CONTROLLER_THREAD_MESSAGES_ROUTE = chunk7YBYLB2K_cjs.createRoute(
   tags: ["AgentController", "Threads"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId, threadId, limit }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, threadId, limit }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const messages = await session.thread.listMessages({ threadId, limit });
       return {
         messages: messages.map((m) => ({
@@ -811,11 +853,12 @@ var LIST_AGENT_CONTROLLER_THREAD_MESSAGES_ROUTE = chunk7YBYLB2K_cjs.createRoute(
     }
   }
 });
-var FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/follow-up",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: followUpBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Queue a follow-up message",
@@ -823,10 +866,10 @@ var FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, message, requestContext }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, message, requestContext }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       void session.followUp({ content: message, requestContext });
       return { ok: true };
     } catch (error) {
@@ -834,7 +877,7 @@ var FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var LIST_AGENT_CONTROLLER_MODELS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var LIST_AGENT_CONTROLLER_MODELS_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/models",
   responseType: "json",
@@ -864,7 +907,7 @@ var LIST_AGENT_CONTROLLER_MODELS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var GET_AGENT_CONTROLLER_WORKSPACE_STATUS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var GET_AGENT_CONTROLLER_WORKSPACE_STATUS_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/workspace",
   responseType: "json",
@@ -888,21 +931,22 @@ var GET_AGENT_CONTROLLER_WORKSPACE_STATUS_ROUTE = chunk7YBYLB2K_cjs.createRoute(
     }
   }
 });
-var GET_AGENT_CONTROLLER_OM_RECORD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var GET_AGENT_CONTROLLER_OM_RECORD_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/om",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: omRecordResponseSchema,
   summary: "Get observational memory record",
   description: "Returns the current observational memory record for the session\u2019s thread/resource.",
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const record = await controller.getObservationalMemoryRecord(session);
       return { record: record ?? void 0 };
     } catch (error) {
@@ -910,11 +954,12 @@ var GET_AGENT_CONTROLLER_OM_RECORD_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/resource",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: v4.z.object({ newResourceId: v4.z.string() }),
   responseSchema: ackResponseSchema,
   summary: "Change the session resource ID",
@@ -922,10 +967,10 @@ var SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, newResourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, newResourceId }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await controller.setResourceId(session, { resourceId: newResourceId });
       return { ok: true };
     } catch (error) {
@@ -933,21 +978,22 @@ var SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var GET_AGENT_CONTROLLER_RESOURCE_IDS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var GET_AGENT_CONTROLLER_RESOURCE_IDS_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/resources",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: v4.z.object({ resourceIds: v4.z.array(v4.z.string()) }),
   summary: "Get known resource IDs",
   description: "Lists the resource IDs known to this session (from threads).",
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const resourceIds = await controller.getKnownResourceIds(session);
       return { resourceIds };
     } catch (error) {
@@ -980,21 +1026,22 @@ var goalResponseSchema = v4.z.object({ goal: goalRecordSchema.optional() });
 function getAgentForSession(controller, session) {
   return controller.getCurrentAgent(session);
 }
-var GET_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var GET_AGENT_CONTROLLER_GOAL_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/goal",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: goalResponseSchema,
   summary: "Get the current goal",
   description: "Returns the active/paused/done goal objective for the session\u2019s thread, if any.",
   tags: ["AgentController", "Goals"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const threadId = session.thread.getId();
       if (!threadId) return { goal: void 0 };
       const agent = getAgentForSession(controller, session);
@@ -1005,11 +1052,12 @@ var GET_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SET_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SET_AGENT_CONTROLLER_GOAL_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "POST",
   path: "/agent-controller/:controllerId/sessions/:resourceId/goal",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: setGoalBodySchema,
   responseSchema: goalResponseSchema,
   summary: "Set a goal",
@@ -1017,10 +1065,10 @@ var SET_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Goals"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, objective, judgeModelId, maxRuns }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, objective, judgeModelId, maxRuns }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const threadId = session.thread.getId();
       if (!threadId) throw new chunk64ITUOXI_cjs.HTTPException(400, { message: "session has no active thread" });
       const agent = getAgentForSession(controller, session);
@@ -1036,11 +1084,12 @@ var SET_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "PUT",
   path: "/agent-controller/:controllerId/sessions/:resourceId/goal",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: updateGoalBodySchema,
   responseSchema: goalResponseSchema,
   summary: "Update goal options",
@@ -1048,10 +1097,10 @@ var UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Goals"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, judgeModelId, maxRuns, status }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, judgeModelId, maxRuns, status }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const threadId = session.thread.getId();
       if (!threadId) throw new chunk64ITUOXI_cjs.HTTPException(400, { message: "session has no active thread" });
       const agent = getAgentForSession(controller, session);
@@ -1067,21 +1116,22 @@ var UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var CLEAR_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var CLEAR_AGENT_CONTROLLER_GOAL_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "DELETE",
   path: "/agent-controller/:controllerId/sessions/:resourceId/goal",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: ackResponseSchema,
   summary: "Clear the goal",
   description: "Removes the active goal from the session\u2019s thread.",
   tags: ["AgentController", "Goals"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const threadId = session.thread.getId();
       if (!threadId) throw new chunk64ITUOXI_cjs.HTTPException(400, { message: "session has no active thread" });
       const agent = getAgentForSession(controller, session);
@@ -1092,21 +1142,22 @@ var CLEAR_AGENT_CONTROLLER_GOAL_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var GET_AGENT_CONTROLLER_PERMISSIONS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var GET_AGENT_CONTROLLER_PERMISSIONS_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "GET",
   path: "/agent-controller/:controllerId/sessions/:resourceId/permissions",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: permissionRulesResponseSchema,
   summary: "Get permission rules",
   description: "Returns the current permission rules (per-category and per-tool policies) for the session.",
   tags: ["AgentController", "Permissions"],
   requiresAuth: true,
   requiresPermission: "agent-controller:read",
-  handler: async ({ mastra, controllerId, resourceId }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       const rules = session.permissions.getRules();
       return {
         categories: rules.categories,
@@ -1117,11 +1168,12 @@ var GET_AGENT_CONTROLLER_PERMISSIONS_ROUTE = chunk7YBYLB2K_cjs.createRoute({
     }
   }
 });
-var SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "PUT",
   path: "/agent-controller/:controllerId/sessions/:resourceId/permissions/category",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: setCategoryPermissionBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Set permission for a tool category",
@@ -1129,10 +1181,10 @@ var SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE = chunk7YBYLB2K_cjs.createRou
   tags: ["AgentController", "Permissions"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, category, policy }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, category, policy }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.permissions.setForCategory({ category, policy });
       return { ok: true };
     } catch (error) {
@@ -1140,11 +1192,12 @@ var SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE = chunk7YBYLB2K_cjs.createRou
     }
   }
 });
-var SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "PUT",
   path: "/agent-controller/:controllerId/sessions/:resourceId/permissions/tool",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: setToolPermissionBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Set permission for a specific tool",
@@ -1152,10 +1205,10 @@ var SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController", "Permissions"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, toolName, policy }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, toolName, policy }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.permissions.setForTool({ toolName, policy });
       return { ok: true };
     } catch (error) {
@@ -1164,11 +1217,12 @@ var SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   }
 });
 var setSessionStateBodySchema = v4.z.object({ state: v4.z.record(v4.z.string(), v4.z.unknown()) });
-var SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
+var SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunkNWF6NTJ4_cjs.createRoute({
   method: "PUT",
   path: "/agent-controller/:controllerId/sessions/:resourceId/state",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: setSessionStateBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Set session state",
@@ -1176,10 +1230,10 @@ var SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = chunk7YBYLB2K_cjs.createRoute({
   tags: ["AgentController"],
   requiresAuth: true,
   requiresPermission: "agent-controller:execute",
-  handler: async ({ mastra, controllerId, resourceId, state }) => {
+  handler: async ({ mastra, controllerId, resourceId, sessionScope, state }) => {
     try {
       const controller = getAgentControllerOrThrow(mastra, controllerId);
-      const session = await getSession(controller, resourceId);
+      const session = await getSession(controller, resourceId, { scope: sessionScope });
       await session.state.set(state);
       return { ok: true };
     } catch (error) {
@@ -1222,5 +1276,5 @@ exports.SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = SWITCH_AGENT_CONTROLLER_MODEL_ROUT
 exports.SWITCH_AGENT_CONTROLLER_MODE_ROUTE = SWITCH_AGENT_CONTROLLER_MODE_ROUTE;
 exports.SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = SWITCH_AGENT_CONTROLLER_THREAD_ROUTE;
 exports.UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = UPDATE_AGENT_CONTROLLER_GOAL_ROUTE;
-//# sourceMappingURL=chunk-VTA32BYJ.cjs.map
-//# sourceMappingURL=chunk-VTA32BYJ.cjs.map
+//# sourceMappingURL=chunk-YXCSR2S3.cjs.map
+//# sourceMappingURL=chunk-YXCSR2S3.cjs.map