@mastra/server 1.62.0-alpha.2 → 1.62.0-alpha.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @mastra/server
 
+## 1.62.0-alpha.3
+
+### Patch Changes
+
+- Updated dependencies [[`2c85f42`](https://github.com/mastra-ai/mastra/commit/2c85f428e04ccd63ea31a7ec80b5b327afdad555), [`11bbeb9`](https://github.com/mastra-ai/mastra/commit/11bbeb9b108ef2264e05acefc6dafb9cbb342921), [`1a485f3`](https://github.com/mastra-ai/mastra/commit/1a485f3538f5ec64d58bd8b5e1e99de0c695c87b), [`0d37487`](https://github.com/mastra-ai/mastra/commit/0d37487d9f349388a3f1cef6a536cf9dcc4b6273), [`8661d7d`](https://github.com/mastra-ai/mastra/commit/8661d7d7179f0a024456aabdd8679bcecd09ac28), [`575e343`](https://github.com/mastra-ai/mastra/commit/575e343900451021d96110916497d334af7bc252), [`cacb839`](https://github.com/mastra-ai/mastra/commit/cacb8392d9e74189b56d857290b0615f98a2683d), [`b47b26e`](https://github.com/mastra-ai/mastra/commit/b47b26e6fe95cb8a3482be2c5e52de157fe59d0b), [`0d37487`](https://github.com/mastra-ai/mastra/commit/0d37487d9f349388a3f1cef6a536cf9dcc4b6273), [`c46eb09`](https://github.com/mastra-ai/mastra/commit/c46eb09ce4987509af57a0ac582c61241a6dd2f1), [`30ed33e`](https://github.com/mastra-ai/mastra/commit/30ed33ee14084a26019aba15fceadda6d6ddefaf), [`91ad69d`](https://github.com/mastra-ai/mastra/commit/91ad69d64994c89199b0c55399e64ed91c61df2f), [`8dc408d`](https://github.com/mastra-ai/mastra/commit/8dc408d34438f9e13297f792c11a5cfd6cf952e1), [`c92def1`](https://github.com/mastra-ai/mastra/commit/c92def10a13c822972c96f0a4ca6ffc1f4258aed), [`c5eaec5`](https://github.com/mastra-ai/mastra/commit/c5eaec5a860d80d0e3805e67db0414b87ac8cbed), [`e66b2ba`](https://github.com/mastra-ai/mastra/commit/e66b2ba100db63eaeab6e21e1ea34b113f2ec781)]:
+  - @mastra/core@1.62.0-alpha.3
+
 ## 1.62.0-alpha.2
 
 ### Patch Changes

package/dist/_types/@internal_core/dist/storage/index.d.ts

@@ -921,9 +921,17 @@ declare const createScoreBodySchema: z.ZodObject<{
     runId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     entityType: z.ZodOptional<z.ZodNullable<z.ZodEnum<typeof EntityType>>>;
     tags: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
+    scorerId: z.ZodString;
+    score: z.ZodNumber;
+    scoreId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     traceId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     spanId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    scorerName: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    scorerVersion: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    scoreSource: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     source: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    reason: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    scoreTraceId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     metadata: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;
     executionSource: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     entityId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -947,14 +955,6 @@ declare const createScoreBodySchema: z.ZodObject<{
     parentEntityVersionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     rootEntityVersionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     experimentId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    scorerId: z.ZodString;
-    score: z.ZodNumber;
-    scoreId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    scorerName: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    scorerVersion: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    scoreSource: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    reason: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    scoreTraceId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
   }, z.core.$strip>;
 }, z.core.$strip>;
 /** Body for creating a score in client/server */
@@ -1050,14 +1050,14 @@ declare const scoresFilterSchema: z.ZodObject<{
 type ScoresFilter = z.infer<typeof scoresFilterSchema>;
 /** Fields available for ordering score results */
 declare const scoresOrderByFieldSchema: z.ZodEnum<{
-  timestamp: "timestamp";
   score: "score";
+  timestamp: "timestamp";
 }>;
 /** Order by configuration for score queries */
 declare const scoresOrderBySchema: z.ZodObject<{
   field: z.ZodDefault<z.ZodEnum<{
-    timestamp: "timestamp";
     score: "score";
+    timestamp: "timestamp";
   }>>;
   direction: z.ZodDefault<z.ZodEnum<{
     ASC: "ASC";
@@ -1110,8 +1110,8 @@ declare const listScoresArgsSchema: z.ZodPipe<z.ZodObject<{
   }, z.core.$strip>>;
   orderBy: z.ZodOptional<z.ZodObject<{
     field: z.ZodDefault<z.ZodEnum<{
-      timestamp: "timestamp";
       score: "score";
+      timestamp: "timestamp";
     }>>;
     direction: z.ZodDefault<z.ZodEnum<{
       ASC: "ASC";
@@ -1162,7 +1162,7 @@ declare const listScoresArgsSchema: z.ZodPipe<z.ZodObject<{
     perPage: number;
   };
   orderBy: {
-    field: "timestamp" | "score";
+    field: "score" | "timestamp";
     direction: "ASC" | "DESC";
   };
   after: DeltaCursor | undefined;
@@ -1209,7 +1209,7 @@ declare const listScoresArgsSchema: z.ZodPipe<z.ZodObject<{
     perPage: number;
   } | undefined;
   orderBy?: {
-    field: "timestamp" | "score";
+    field: "score" | "timestamp";
     direction: "ASC" | "DESC";
   } | undefined;
   after?: string | undefined;

package/dist/{dist-Cw-T1gX6.js → dist-HzWDFjPH.js}

@@ -4693,7 +4693,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-aTfbkxBl.js
+//#region ../memory/dist/src-BlQjkJzk.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -23824,7 +23824,19 @@ async function withOmTracingSpan({ phase, model, inputTokens, requestContext, ob
 	});
 	const childObservabilityContext = createObservabilityContext({ currentSpan: span });
 	if (!span) return callback(childObservabilityContext);
-	return span.executeInContext(() => callback(childObservabilityContext));
+	return span.executeInContext(async () => {
+		try {
+			const result = await callback(childObservabilityContext);
+			span.end();
+			return result;
+		} catch (error) {
+			span.error({
+				error,
+				endSpan: true
+			});
+			throw error;
+		}
+	});
 }
 function filterObserverExtractors(extractors, skipContinuationHints) {
 	const configuredExtractors = extractors ?? [];
@@ -28917,10 +28929,11 @@ ObservationStrategy.create = ((om, opts) => {
 	if (deps.scope === "resource" && opts.resourceId) return new ResourceScopedObservationStrategy(deps, opts);
 	return new SyncObservationStrategy(deps, opts);
 });
-async function loadMemoryContextMessages({ memory, messageList, threadId, resourceId }) {
+async function loadMemoryContextMessages({ memory, messageList, threadId, resourceId, runState }) {
 	const ctx = await memory.getContext({
 		threadId,
-		resourceId
+		resourceId,
+		runState
 	});
 	for (const msg of ctx.messages) if (msg.role !== "system") messageList.add(msg, "memory");
 	return ctx;
@@ -29374,10 +29387,11 @@ var ObservationTurn = class {
 	* If a MemoryContextProvider is passed, loads historical messages and adds
 	* them to the MessageList. Without a provider, only fetches/caches the record.
 	*/
-	async start(memory) {
+	async start(memory, runState) {
 		if (this._started) throw new Error("Turn already started");
 		this._started = true;
 		this._record = await this.om.getOrCreateRecord(this.threadId, this.resourceId);
+		runState?.set(`observational-memory:record:${this.threadId}:${this.resourceId ?? ""}`, this._record);
 		this._generationCountAtStart = this._record.generationCount;
 		this.memory = memory;
 		if (memory) {
@@ -29385,7 +29399,8 @@ var ObservationTurn = class {
 				memory,
 				messageList: this.messageList,
 				threadId: this.threadId,
-				resourceId: this.resourceId
+				resourceId: this.resourceId,
+				runState
 			});
 			this._context = {
 				messages: ctx.messages,
@@ -33455,7 +33470,9 @@ var ObservationalMemoryProcessor = class {
 			return messageList;
 		}
 		const { threadId, resourceId } = context;
-		const readOnly = parseMemoryRequestContext(requestContext)?.memoryConfig?.readOnly;
+		const memoryContext = parseMemoryRequestContext(requestContext);
+		const runState = memoryContext?.runState?.();
+		const readOnly = memoryContext?.memoryConfig?.readOnly;
 		const actorModelContext = model?.modelId ? {
 			provider: model.provider,
 			modelId: model.modelId,
@@ -33472,7 +33489,8 @@ var ObservationalMemoryProcessor = class {
 					memory: this.memory,
 					messageList,
 					threadId,
-					resourceId
+					resourceId,
+					runState
 				});
 				const systemMessages = ctx.omRecord ? await this.engine.buildContextSystemMessages({
 					threadId,
@@ -33513,7 +33531,7 @@ var ObservationalMemoryProcessor = class {
 				this.turn.sendStateSignal = args.sendStateSignal;
 				this.turn.agent = args.agent;
 				this.turn.requestContext = requestContext;
-				await this.turn.start(this.memory);
+				await this.turn.start(this.memory, runState);
 				if (stepNumber === 0 && this.temporalMarkers) await insertTemporalGapMarkers({
 					messageList,
 					sendSignal: args.sendSignal
@@ -34660,14 +34678,18 @@ ${workingMemory}`;
 		if (!this.threadConfig.workingMemory?.enabled) return null;
 		return extractWorkingMemoryContent(text)?.trim() ?? null;
 	}
-	async getWorkingMemory({ threadId, resourceId, memoryConfig }) {
+	async getWorkingMemory({ threadId, resourceId, memoryConfig, runState }) {
 		const config = this.getMergedThreadConfig(memoryConfig || {});
 		if (!config.workingMemory?.enabled) return null;
 		const scope = config.workingMemory.scope || "resource";
 		let workingMemoryData = null;
 		if (scope === "resource" && !resourceId) throw new Error("Memory error: Resource-scoped working memory is enabled but no resourceId was provided. Either provide a resourceId or explicitly set workingMemory.scope to 'thread'.");
-		if (scope === "resource" && resourceId) workingMemoryData = (await (await this.getMemoryStore()).getResourceById({ resourceId }))?.workingMemory || null;
-		else workingMemoryData = (await this.getThreadById({ threadId }))?.metadata?.workingMemory;
+		if (scope === "resource" && resourceId) {
+			const loadWorkingMemory = async () => {
+				return (await (await this.getMemoryStore()).getResourceById({ resourceId }))?.workingMemory || null;
+			};
+			workingMemoryData = runState ? await runState.load(`working-memory:resource:${resourceId}`, loadWorkingMemory) : await loadWorkingMemory();
+		} else workingMemoryData = (runState?.threadLoaded ? runState.thread : await this.getThreadById({ threadId }))?.metadata?.workingMemory;
 		if (!workingMemoryData) return null;
 		return workingMemoryData;
 	}
@@ -34699,16 +34721,18 @@ ${workingMemory}`;
 			content: (config.workingMemory.template || this.defaultWorkingMemoryTemplate).trim()
 		};
 	}
-	async getSystemMessage({ threadId, resourceId, memoryConfig }) {
+	async getSystemMessage({ threadId, resourceId, memoryConfig, runState }) {
 		const config = this.getMergedThreadConfig(memoryConfig);
 		this.assertWorkingMemoryStateSignalsCompatibility(config);
 		if (!config.workingMemory?.enabled) return null;
 		if (config.workingMemory?.useStateSignals) return null;
-		const workingMemoryTemplate = await this.getWorkingMemoryTemplate({ memoryConfig });
+		const loadTemplate = () => this.getWorkingMemoryTemplate({ memoryConfig });
+		const workingMemoryTemplate = runState ? await runState.load("working-memory:template", loadTemplate) : await loadTemplate();
 		const workingMemoryData = await this.getWorkingMemory({
 			threadId,
 			resourceId,
-			memoryConfig: config
+			memoryConfig: config,
+			runState
 		});
 		if (!workingMemoryTemplate) return null;
 		const workingMemoryConfig = config.workingMemory;
@@ -34741,7 +34765,7 @@ ${workingMemory}`;
 	* ```
 	*/
 	async getContext(opts) {
-		const { threadId, resourceId, memoryConfig } = opts;
+		const { threadId, resourceId, memoryConfig, runState } = opts;
 		const config = this.getMergedThreadConfig(memoryConfig);
 		const memoryStore = await this.getMemoryStore();
 		const systemParts = [];
@@ -34751,10 +34775,14 @@ ${workingMemory}`;
 		let otherThreadsContext;
 		const omEngine = await this.omEngine;
 		if (omEngine) {
-			omRecord = await omEngine.getRecord(threadId, resourceId);
+			const loadOmRecord = () => omEngine.getRecord(threadId, resourceId);
+			omRecord = runState ? await runState.load(`observational-memory:record:${threadId}:${resourceId ?? ""}`, loadOmRecord) : await loadOmRecord();
 			if (omRecord?.activeObservations) {
 				hasObservations = true;
-				if (omEngine.scope === "resource" && resourceId) otherThreadsContext = await omEngine.getOtherThreadsContext(resourceId, threadId);
+				if (omEngine.scope === "resource" && resourceId) {
+					const loadOtherThreadsContext = () => omEngine.getOtherThreadsContext(resourceId, threadId);
+					otherThreadsContext = runState ? await runState.load(`observational-memory:other-threads:${resourceId}:${threadId}:${omRecord.lastObservedAt ?? ""}`, loadOtherThreadsContext) : await loadOtherThreadsContext();
+				}
 				const obsSystemMessage = await omEngine.buildContextSystemMessage({
 					threadId,
 					resourceId,
@@ -34782,30 +34810,41 @@ ${workingMemory}`;
 		const workingMemoryMessage = await this.getSystemMessage({
 			threadId,
 			resourceId,
-			memoryConfig: config
+			memoryConfig: config,
+			runState
 		});
 		if (workingMemoryMessage) systemParts.push(workingMemoryMessage);
 		let messages;
 		if (omEngine && omRecord) {
 			const dateFilter = omRecord.lastObservedAt ? { dateRange: { start: new Date(new Date(omRecord.lastObservedAt).getTime() + 1) } } : void 0;
-			if (omEngine.scope === "resource" && resourceId) messages = (await memoryStore.listMessagesByResourceId({
-				resourceId,
-				orderBy: {
-					field: "createdAt",
-					direction: "ASC"
-				},
-				perPage: false,
-				filter: dateFilter
-			})).messages;
-			else messages = (await memoryStore.listMessages({
-				threadId,
-				orderBy: {
-					field: "createdAt",
-					direction: "ASC"
-				},
-				perPage: false,
-				filter: dateFilter
-			})).messages;
+			const boundary = omRecord.lastObservedAt ? new Date(omRecord.lastObservedAt).toISOString() : "";
+			if (omEngine.scope === "resource" && resourceId) {
+				const loadMessages = async () => {
+					return (await memoryStore.listMessagesByResourceId({
+						resourceId,
+						orderBy: {
+							field: "createdAt",
+							direction: "ASC"
+						},
+						perPage: false,
+						filter: dateFilter
+					})).messages;
+				};
+				messages = runState ? await runState.load(`observational-memory:messages:resource:${resourceId}:${boundary}`, loadMessages) : await loadMessages();
+			} else {
+				const loadMessages = async () => {
+					return (await memoryStore.listMessages({
+						threadId,
+						orderBy: {
+							field: "createdAt",
+							direction: "ASC"
+						},
+						perPage: false,
+						filter: dateFilter
+					})).messages;
+				};
+				messages = runState ? await runState.load(`observational-memory:messages:thread:${threadId}:${boundary}`, loadMessages) : await loadMessages();
+			}
 		} else {
 			const lastMessages = config.lastMessages;
 			if (lastMessages === false) messages = [];
@@ -46196,4 +46235,4 @@ const agentBuilderWorkflows = {
 //#endregion
 export { agentBuilderWorkflows };
 
-//# sourceMappingURL=dist-Cw-T1gX6.js.map
+//# sourceMappingURL=dist-HzWDFjPH.js.map