@mastra/server 1.51.0-alpha.5 → 1.51.0-alpha.7

package/dist/{chunk-SB3YYDCD.js → chunk-STNV4TYH.js}

@@ -13,15 +13,19 @@ 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 = z.object({ controllerId: z.string() });
 var sessionPathParams = z.object({ controllerId: z.string(), resourceId: z.string() });
+var sessionScopeQuerySchema = z.object({ sessionScope: z.string().optional() });
 var createSessionBodySchema = z.object({
   resourceId: z.string(),
-  tags: z.record(z.string(), z.string()).optional()
+  tags: z.record(z.string(), z.string()).optional(),
+  sessionScope: z.string().optional()
 });
 var sendMessageBodySchema = z.object({ message: z.string() });
 var steerBodySchema = z.object({ message: z.string() });
@@ -50,9 +54,10 @@ var cloneThreadBodySchema = z.object({
   sourceThreadId: z.string().optional(),
   title: z.string().optional()
 });
-var listMessagesQuerySchema = z.object({ limit: z.coerce.number().optional() });
+var listMessagesQuerySchema = z.object({ limit: z.coerce.number().optional(), sessionScope: z.string().optional() });
 var listThreadsQuerySchema = z.object({
   limit: z.coerce.number().optional(),
+  sessionScope: z.string().optional(),
   tags: z.preprocess((value) => {
     if (typeof value !== "string" || value.length === 0) return void 0;
     try {
@@ -109,6 +114,8 @@ var sessionStateResponseSchema = z.object({
   threadId: z.string().optional(),
   modeId: z.string(),
   modelId: z.string(),
+  /** Whether the agent is currently executing a run (for initial UI hydration). */
+  running: z.boolean().optional(),
   omProgress: omProgressSummarySchema.optional(),
   tokenUsage: z.record(z.string(), z.unknown()).optional(),
   settings: sessionSettingsSchema.optional()
@@ -123,7 +130,9 @@ var listThreadsResponseSchema = z.object({
       title: z.string().optional(),
       updatedAt: z.string().optional(),
       /** The session scoping tags stamped on this thread (e.g. `{ projectPath }`). */
-      tags: z.record(z.string(), z.string()).optional()
+      tags: z.record(z.string(), z.string()).optional(),
+      /** Whether a run is currently executing on this thread ('active') or not ('idle'). */
+      state: z.enum(["active", "idle"]).optional()
     })
   )
 });
@@ -213,10 +222,10 @@ var CREATE_AGENT_CONTROLLER_SESSION_ROUTE = 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,
@@ -241,15 +250,16 @@ var STREAM_AGENT_CONTROLLER_SESSION_ROUTE = createRoute({
   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;
@@ -315,6 +325,7 @@ var SEND_AGENT_CONTROLLER_MESSAGE_ROUTE = createRoute({
   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",
@@ -322,10 +333,10 @@ var SEND_AGENT_CONTROLLER_MESSAGE_ROUTE = createRoute({
   tags: ["AgentController", "Streaming"],
   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.sendMessage({ content: message, requestContext });
       return { ok: true };
     } catch (error) {
@@ -338,16 +349,17 @@ var ABORT_AGENT_CONTROLLER_SESSION_ROUTE = createRoute({
   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) {
@@ -360,6 +372,7 @@ var AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = createRoute({
   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",
@@ -367,10 +380,10 @@ var AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE = 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) {
@@ -383,6 +396,7 @@ var AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = createRoute({
   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",
@@ -390,10 +404,10 @@ var AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE = 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) {
@@ -406,6 +420,7 @@ var STEER_AGENT_CONTROLLER_SESSION_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/steer",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: steerBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Steer the in-flight run",
@@ -413,10 +428,10 @@ var STEER_AGENT_CONTROLLER_SESSION_ROUTE = 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) {
@@ -429,6 +444,7 @@ var SWITCH_AGENT_CONTROLLER_MODE_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/mode",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: switchModeBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Switch the session mode",
@@ -436,10 +452,10 @@ var SWITCH_AGENT_CONTROLLER_MODE_ROUTE = 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) {
@@ -452,6 +468,7 @@ var SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/model",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: switchModelBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Switch the session model",
@@ -459,10 +476,10 @@ var SWITCH_AGENT_CONTROLLER_MODEL_ROUTE = 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) {
@@ -475,6 +492,7 @@ var SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/thread",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: switchThreadBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Switch the session thread",
@@ -482,10 +500,10 @@ var SWITCH_AGENT_CONTROLLER_THREAD_ROUTE = 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) {
@@ -498,16 +516,17 @@ var GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = createRoute({
   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;
@@ -519,6 +538,7 @@ var GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = 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,
@@ -577,10 +597,10 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = 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 ?? {};
@@ -599,6 +619,7 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = 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);
@@ -606,7 +627,8 @@ var LIST_AGENT_CONTROLLER_THREADS_ROUTE = 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"
           };
         })
       };
@@ -620,6 +642,7 @@ var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/notifications",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: sendNotificationBodySchema,
   responseSchema: z.object({
     accepted: z.boolean(),
@@ -636,6 +659,7 @@ var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = createRoute({
     mastra,
     controllerId,
     resourceId,
+    sessionScope,
     source,
     kind,
     summary,
@@ -649,7 +673,7 @@ var SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE = 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,
@@ -678,6 +702,7 @@ var CREATE_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: createThreadBodySchema,
   responseSchema: threadResponseSchema,
   summary: "Create a new thread",
@@ -685,10 +710,10 @@ var CREATE_AGENT_CONTROLLER_THREAD_ROUTE = 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,
@@ -707,16 +732,17 @@ var DELETE_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
   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) {
@@ -729,6 +755,7 @@ var RENAME_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads/:threadId",
   responseType: "json",
   pathParamSchema: threadPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: renameThreadBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Rename a thread",
@@ -736,10 +763,10 @@ var RENAME_AGENT_CONTROLLER_THREAD_ROUTE = 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 });
       }
@@ -755,6 +782,7 @@ var CLONE_AGENT_CONTROLLER_THREAD_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/threads/clone",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: cloneThreadBodySchema,
   responseSchema: threadResponseSchema,
   summary: "Clone a thread",
@@ -762,10 +790,10 @@ var CLONE_AGENT_CONTROLLER_THREAD_ROUTE = 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,
@@ -791,10 +819,10 @@ var LIST_AGENT_CONTROLLER_THREAD_MESSAGES_ROUTE = 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) => ({
@@ -814,6 +842,7 @@ var FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/follow-up",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: followUpBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Queue a follow-up message",
@@ -821,10 +850,10 @@ var FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE = 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) {
@@ -891,16 +920,17 @@ var GET_AGENT_CONTROLLER_OM_RECORD_ROUTE = createRoute({
   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) {
@@ -913,6 +943,7 @@ var SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/resource",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: z.object({ newResourceId: z.string() }),
   responseSchema: ackResponseSchema,
   summary: "Change the session resource ID",
@@ -920,10 +951,10 @@ var SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE = 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) {
@@ -936,16 +967,17 @@ var GET_AGENT_CONTROLLER_RESOURCE_IDS_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/resources",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   responseSchema: z.object({ resourceIds: z.array(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) {
@@ -983,16 +1015,17 @@ var GET_AGENT_CONTROLLER_GOAL_ROUTE = createRoute({
   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);
@@ -1008,6 +1041,7 @@ var SET_AGENT_CONTROLLER_GOAL_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/goal",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: setGoalBodySchema,
   responseSchema: goalResponseSchema,
   summary: "Set a goal",
@@ -1015,10 +1049,10 @@ var SET_AGENT_CONTROLLER_GOAL_ROUTE = 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 HTTPException(400, { message: "session has no active thread" });
       const agent = getAgentForSession(controller, session);
@@ -1039,6 +1073,7 @@ var UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/goal",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: updateGoalBodySchema,
   responseSchema: goalResponseSchema,
   summary: "Update goal options",
@@ -1046,10 +1081,10 @@ var UPDATE_AGENT_CONTROLLER_GOAL_ROUTE = 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 HTTPException(400, { message: "session has no active thread" });
       const agent = getAgentForSession(controller, session);
@@ -1070,16 +1105,17 @@ var CLEAR_AGENT_CONTROLLER_GOAL_ROUTE = createRoute({
   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 HTTPException(400, { message: "session has no active thread" });
       const agent = getAgentForSession(controller, session);
@@ -1095,16 +1131,17 @@ var GET_AGENT_CONTROLLER_PERMISSIONS_ROUTE = createRoute({
   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,
@@ -1120,6 +1157,7 @@ var SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE = createRoute({
   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",
@@ -1127,10 +1165,10 @@ var SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE = createRoute({
   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) {
@@ -1143,6 +1181,7 @@ var SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE = createRoute({
   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",
@@ -1150,10 +1189,10 @@ var SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE = 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) {
@@ -1167,6 +1206,7 @@ var SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = createRoute({
   path: "/agent-controller/:controllerId/sessions/:resourceId/state",
   responseType: "json",
   pathParamSchema: sessionPathParams,
+  queryParamSchema: sessionScopeQuerySchema,
   bodySchema: setSessionStateBodySchema,
   responseSchema: ackResponseSchema,
   summary: "Set session state",
@@ -1174,10 +1214,10 @@ var SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = 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) {
@@ -1187,5 +1227,5 @@ var SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE = createRoute({
 });
 
 export { ABORT_AGENT_CONTROLLER_SESSION_ROUTE, AGENT_CONTROLLER_TOOL_APPROVAL_ROUTE, AGENT_CONTROLLER_TOOL_SUSPENSION_ROUTE, CLEAR_AGENT_CONTROLLER_GOAL_ROUTE, CLONE_AGENT_CONTROLLER_THREAD_ROUTE, CREATE_AGENT_CONTROLLER_SESSION_ROUTE, CREATE_AGENT_CONTROLLER_THREAD_ROUTE, DELETE_AGENT_CONTROLLER_THREAD_ROUTE, FOLLOW_UP_AGENT_CONTROLLER_SESSION_ROUTE, GET_AGENT_CONTROLLER_GOAL_ROUTE, GET_AGENT_CONTROLLER_OM_RECORD_ROUTE, GET_AGENT_CONTROLLER_PERMISSIONS_ROUTE, GET_AGENT_CONTROLLER_RESOURCE_IDS_ROUTE, GET_AGENT_CONTROLLER_SESSION_STATE_ROUTE, GET_AGENT_CONTROLLER_WORKSPACE_STATUS_ROUTE, LIST_AGENT_CONTROLLERS_ROUTE, LIST_AGENT_CONTROLLER_MODELS_ROUTE, LIST_AGENT_CONTROLLER_MODES_ROUTE, LIST_AGENT_CONTROLLER_THREADS_ROUTE, LIST_AGENT_CONTROLLER_THREAD_MESSAGES_ROUTE, RENAME_AGENT_CONTROLLER_THREAD_ROUTE, SEND_AGENT_CONTROLLER_MESSAGE_ROUTE, SEND_AGENT_CONTROLLER_NOTIFICATION_ROUTE, SET_AGENT_CONTROLLER_CATEGORY_PERMISSION_ROUTE, SET_AGENT_CONTROLLER_GOAL_ROUTE, SET_AGENT_CONTROLLER_RESOURCE_ID_ROUTE, SET_AGENT_CONTROLLER_SESSION_STATE_ROUTE, SET_AGENT_CONTROLLER_TOOL_PERMISSION_ROUTE, STEER_AGENT_CONTROLLER_SESSION_ROUTE, STREAM_AGENT_CONTROLLER_SESSION_ROUTE, SWITCH_AGENT_CONTROLLER_MODEL_ROUTE, SWITCH_AGENT_CONTROLLER_MODE_ROUTE, SWITCH_AGENT_CONTROLLER_THREAD_ROUTE, UPDATE_AGENT_CONTROLLER_GOAL_ROUTE };
-//# sourceMappingURL=chunk-SB3YYDCD.js.map
-//# sourceMappingURL=chunk-SB3YYDCD.js.map
+//# sourceMappingURL=chunk-STNV4TYH.js.map
+//# sourceMappingURL=chunk-STNV4TYH.js.map