@mastra/server 1.82.0-alpha.3 → 1.83.0-alpha.0

package/dist/{memory-ipOCmg0C.js → memory-JzgWJevA.js}

@@ -1,9 +1,9 @@
 import { r as __exportAll } from "./rolldown-runtime-CQI-hT2b.js";
+import { _ as MastraFGAPermissions, a as getEffectiveThreadId, i as getEffectiveResourceId, m as validateBody, n as enforceThreadAccess, o as getHandlerFGAProvider, r as getContextResourceId } from "./utils-CTYtskHa.js";
 import { t as HTTPException } from "./http-exception-CzaWkxMl.js";
-import { n as createRoute } from "./route-builder-BxPrwNog.js";
-import { handleError } from "./server/handlers/error.js";
-import { _ as MastraFGAPermissions, a as getEffectiveThreadId, i as getEffectiveResourceId, m as validateBody, n as enforceThreadAccess, o as getHandlerFGAProvider, r as getContextResourceId } from "./utils-B15w-1hm.js";
 import { A as listThreadsNetworkQuerySchema, B as searchMemoryQuerySchema, C as getThreadByIdResponseSchema, D as listMessagesNetworkQuerySchema, G as updateThreadBodySchema, H as threadIdPathParams, I as optionalAgentIdQuerySchema, J as updateWorkingMemoryResponseSchema, K as updateThreadNetworkQuerySchema, L as saveMessagesBodySchema, M as listThreadsResponseSchema, N as memoryConfigResponseSchema, O as listMessagesQuerySchema, P as memoryStatusResponseSchema, R as saveMessagesNetworkQuerySchema, S as getThreadByIdQuerySchema, T as getWorkingMemoryResponseSchema, U as transferThreadBodySchema, V as searchMemoryResponseSchema, W as transferThreadResponseSchema, _ as getMemoryStatusNetworkQuerySchema, a as cloneThreadResponseSchema, b as getObservationalMemoryResponseSchema, c as deleteMessagesBodySchema, d as deleteMessagesResponseSchema, f as deleteThreadNetworkQuerySchema, g as getMemoryConfigQuerySchema, i as cloneThreadBodySchema, j as listThreadsQuerySchema, k as listMessagesResponseSchema, l as deleteMessagesNetworkQuerySchema, m as deleteThreadResponseSchema, n as awaitBufferStatusBodySchema, o as createThreadBodySchema, p as deleteThreadQuerySchema, q as updateWorkingMemoryBodySchema, r as awaitBufferStatusResponseSchema, s as createThreadNetworkQuerySchema, t as agentIdQuerySchema, u as deleteMessagesQuerySchema, v as getMemoryStatusQuerySchema, w as getWorkingMemoryQuerySchema, x as getThreadByIdNetworkQuerySchema, y as getObservationalMemoryQuerySchema, z as saveMessagesResponseSchema } from "./memory-CCEjoCF6.js";
+import { n as createRoute } from "./route-builder-BKEzjw_M.js";
+import { handleError } from "./server/handlers/error.js";
 import { getGatewayClient, isGatewayAgentAsync, toLocalMessage, toLocalOMRecord, toLocalThread } from "./server/handlers/gateway-memory-client.js";
 import { Agent } from "@mastra/core/agent";
 import { ErrorCategory, MastraError } from "@mastra/core/error";
@@ -300,12 +300,29 @@ const GET_MEMORY_STATUS_ROUTE = createRoute({
 				let omStatus;
 				if (agent) {
 					const omConfig = await getOMConfigFromAgent(agent, requestContext);
-					if (omConfig?.enabled && resourceId) {
+					const effectiveResourceId = getEffectiveResourceId(requestContext, resourceId);
+					let threadMissing = false;
+					if (omConfig?.enabled && effectiveResourceId && threadId) {
+						const thread = await memory.getThreadById({ threadId });
+						await enforceThreadAccess({
+							mastra,
+							requestContext,
+							threadId,
+							thread,
+							effectiveResourceId
+						});
+						threadMissing = !thread && omConfig.scope !== "resource";
+					}
+					if (omConfig?.enabled && effectiveResourceId && threadMissing) omStatus = {
+						enabled: true,
+						hasRecord: false
+					};
+					else if (omConfig?.enabled && effectiveResourceId) {
 						const omThreadId = omConfig.scope === "resource" ? void 0 : threadId;
 						try {
 							const memoryStore = await memory.storage.getStore("memory");
 							if (memoryStore) {
-								const status = await getOMStatus(memoryStore, resourceId, omThreadId);
+								const status = await getOMStatus(memoryStore, effectiveResourceId, omThreadId);
 								if (status) omStatus = {
 									enabled: true,
 									...status,
@@ -404,9 +421,9 @@ const GET_OBSERVATIONAL_MEMORY_ROUTE = createRoute({
 				to,
 				offset
 			};
-			if (await isGatewayAgentAsync(agent)) {
-				const gwClient = getGatewayClient();
-				if (gwClient && resourceId && threadId) {
+			const gwClient = await isGatewayAgentAsync(agent) ? getGatewayClient() : null;
+			if (gwClient) {
+				if (resourceId && threadId) {
 					const [recordResult, historyResult] = await Promise.all([gwClient.getObservationRecord(threadId, resourceId), gwClient.getObservationHistory(threadId, {
 						resourceId,
 						limit: historyLimit,
@@ -439,8 +456,22 @@ const GET_OBSERVATIONAL_MEMORY_ROUTE = createRoute({
 				throw new HTTPException(400, { message: "Memory storage is not initialized" });
 			}
 			if (!memoryStore) throw new HTTPException(400, { message: "Memory storage is not initialized" });
-			const effectiveResourceId = resourceId;
+			const effectiveResourceId = getEffectiveResourceId(requestContext, resourceId);
 			if (!effectiveResourceId) throw new HTTPException(400, { message: "resourceId is required for observational memory lookup" });
+			if (threadId) {
+				const thread = await memory.getThreadById({ threadId });
+				await enforceThreadAccess({
+					mastra,
+					requestContext,
+					threadId,
+					thread,
+					effectiveResourceId
+				});
+				if (!thread && omConfig.scope !== "resource") return {
+					record: null,
+					history: void 0
+				};
+			}
 			const omThreadId = omConfig.scope === "resource" ? null : threadId ?? null;
 			const record = await memoryStore.getObservationalMemory(omThreadId, effectiveResourceId);
 			const history = await memoryStore.getObservationalMemoryHistory(omThreadId, effectiveResourceId, historyLimit, historyOptions);
@@ -471,9 +502,9 @@ const AWAIT_BUFFER_STATUS_ROUTE = createRoute({
 				requestContext
 			});
 			if (!agent) throw new HTTPException(404, { message: "Agent not found" });
-			if (await isGatewayAgentAsync(agent)) {
-				const gwClient = getGatewayClient();
-				if (gwClient && resourceId && threadId) {
+			const gwClient = await isGatewayAgentAsync(agent) ? getGatewayClient() : null;
+			if (gwClient) {
+				if (resourceId && threadId) {
 					const maxWaitMs = 3e4;
 					const pollIntervalMs = 1e3;
 					const deadline = Date.now() + maxWaitMs;
@@ -492,7 +523,6 @@ const AWAIT_BUFFER_STATUS_ROUTE = createRoute({
 			if (!omConfig?.enabled) throw new HTTPException(400, { message: "Observational Memory is not enabled for this agent" });
 			const omProcessor = await agent.resolveProcessorById("observational-memory", requestContext);
 			if (!omProcessor || typeof omProcessor.waitForBuffering !== "function") throw new HTTPException(400, { message: "Observational Memory processor not available" });
-			await omProcessor.waitForBuffering(threadId, resourceId);
 			const memory = await getMemoryFromContext({
 				mastra,
 				agentId,
@@ -506,8 +536,20 @@ const AWAIT_BUFFER_STATUS_ROUTE = createRoute({
 				throw new HTTPException(400, { message: "Memory storage is not initialized" });
 			}
 			if (!memoryStore) throw new HTTPException(400, { message: "Memory storage is not initialized" });
-			const effectiveResourceId = resourceId;
+			const effectiveResourceId = getEffectiveResourceId(requestContext, resourceId);
 			if (!effectiveResourceId) throw new HTTPException(400, { message: "resourceId is required" });
+			if (threadId) {
+				const thread = await memory.getThreadById({ threadId });
+				await enforceThreadAccess({
+					mastra,
+					requestContext,
+					threadId,
+					thread,
+					effectiveResourceId
+				});
+				if (!thread && omConfig.scope !== "resource") return { record: null };
+			}
+			await omProcessor.waitForBuffering(threadId, effectiveResourceId);
 			const omThreadId = omConfig.scope === "resource" ? null : threadId ?? null;
 			return { record: await memoryStore.getObservationalMemory(omThreadId, effectiveResourceId) ?? null };
 		} catch (error) {
@@ -1734,4 +1776,4 @@ const DELETE_MESSAGES_NETWORK_ROUTE = createRoute({
 });
 export { TRANSFER_THREAD_ROUTE as C, getTextContent as D, UPDATE_WORKING_MEMORY_ROUTE as E, memory_exports as O, SEARCH_MEMORY_ROUTE as S, UPDATE_THREAD_ROUTE as T, LIST_MESSAGES_ROUTE as _, DELETE_MESSAGES_NETWORK_ROUTE as a, SAVE_MESSAGES_NETWORK_ROUTE as b, DELETE_THREAD_ROUTE as c, GET_MEMORY_STATUS_ROUTE as d, GET_OBSERVATIONAL_MEMORY_ROUTE as f, LIST_MESSAGES_NETWORK_ROUTE as g, GET_WORKING_MEMORY_ROUTE as h, CREATE_THREAD_ROUTE as i, GET_MEMORY_CONFIG_ROUTE as l, GET_THREAD_BY_ID_ROUTE as m, CLONE_THREAD_ROUTE as n, DELETE_MESSAGES_ROUTE as o, GET_THREAD_BY_ID_NETWORK_ROUTE as p, CREATE_THREAD_NETWORK_ROUTE as r, DELETE_THREAD_NETWORK_ROUTE as s, AWAIT_BUFFER_STATUS_ROUTE as t, GET_MEMORY_STATUS_NETWORK_ROUTE as u, LIST_THREADS_NETWORK_ROUTE as v, UPDATE_THREAD_NETWORK_ROUTE as w, SAVE_MESSAGES_ROUTE as x, LIST_THREADS_ROUTE as y };
 
-//# sourceMappingURL=memory-ipOCmg0C.js.map
+//# sourceMappingURL=memory-JzgWJevA.js.map