@mastra/server 1.82.0 → 1.83.0-alpha.1

package/dist/{memory-Dqod_AK9.cjs → memory-DIos0BE-.cjs}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-10nMEhjP.cjs");
+const require_utils = require("./utils-BXEJ6FZC.cjs");
 const require_http_exception = require("./http-exception-Co3MbFUf.cjs");
-const require_route_builder = require("./route-builder-CvARmqnA.cjs");
-const require_server_handlers_error = require("./server/handlers/error.cjs");
-const require_utils = require("./utils-9PRHHTGC.cjs");
 const require_memory = require("./memory--xJDrSwF.cjs");
+const require_route_builder = require("./route-builder-DHqDrSSy.cjs");
+const require_server_handlers_error = require("./server/handlers/error.cjs");
 const require_server_handlers_gateway_memory_client = require("./server/handlers/gateway-memory-client.cjs");
 let _mastra_core_agent = require("@mastra/core/agent");
 let _mastra_core_error = require("@mastra/core/error");
@@ -300,12 +300,29 @@ const GET_MEMORY_STATUS_ROUTE = require_route_builder.createRoute({
 				let omStatus;
 				if (agent) {
 					const omConfig = await getOMConfigFromAgent(agent, requestContext);
-					if (omConfig?.enabled && resourceId) {
+					const effectiveResourceId = require_utils.getEffectiveResourceId(requestContext, resourceId);
+					let threadMissing = false;
+					if (omConfig?.enabled && effectiveResourceId && threadId) {
+						const thread = await memory.getThreadById({ threadId });
+						await require_utils.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 = require_route_builder.createRoute({
 				to,
 				offset
 			};
-			if (await require_server_handlers_gateway_memory_client.isGatewayAgentAsync(agent)) {
-				const gwClient = require_server_handlers_gateway_memory_client.getGatewayClient();
-				if (gwClient && resourceId && threadId) {
+			const gwClient = await require_server_handlers_gateway_memory_client.isGatewayAgentAsync(agent) ? require_server_handlers_gateway_memory_client.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 = require_route_builder.createRoute({
 				throw new require_http_exception.HTTPException(400, { message: "Memory storage is not initialized" });
 			}
 			if (!memoryStore) throw new require_http_exception.HTTPException(400, { message: "Memory storage is not initialized" });
-			const effectiveResourceId = resourceId;
+			const effectiveResourceId = require_utils.getEffectiveResourceId(requestContext, resourceId);
 			if (!effectiveResourceId) throw new require_http_exception.HTTPException(400, { message: "resourceId is required for observational memory lookup" });
+			if (threadId) {
+				const thread = await memory.getThreadById({ threadId });
+				await require_utils.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 = require_route_builder.createRoute({
 				requestContext
 			});
 			if (!agent) throw new require_http_exception.HTTPException(404, { message: "Agent not found" });
-			if (await require_server_handlers_gateway_memory_client.isGatewayAgentAsync(agent)) {
-				const gwClient = require_server_handlers_gateway_memory_client.getGatewayClient();
-				if (gwClient && resourceId && threadId) {
+			const gwClient = await require_server_handlers_gateway_memory_client.isGatewayAgentAsync(agent) ? require_server_handlers_gateway_memory_client.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 = require_route_builder.createRoute({
 			if (!omConfig?.enabled) throw new require_http_exception.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 require_http_exception.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 = require_route_builder.createRoute({
 				throw new require_http_exception.HTTPException(400, { message: "Memory storage is not initialized" });
 			}
 			if (!memoryStore) throw new require_http_exception.HTTPException(400, { message: "Memory storage is not initialized" });
-			const effectiveResourceId = resourceId;
+			const effectiveResourceId = require_utils.getEffectiveResourceId(requestContext, resourceId);
 			if (!effectiveResourceId) throw new require_http_exception.HTTPException(400, { message: "resourceId is required" });
+			if (threadId) {
+				const thread = await memory.getThreadById({ threadId });
+				await require_utils.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) {
@@ -1901,4 +1943,4 @@ Object.defineProperty(exports, "memory_exports", {
 	}
 });
 
-//# sourceMappingURL=memory-Dqod_AK9.cjs.map
+//# sourceMappingURL=memory-DIos0BE-.cjs.map