@mastra/server 1.76.0-alpha.0 → 1.76.0-alpha.1

package/dist/{dist-DMtuYRLk.js → dist-CtNeEn6M.js}

@@ -4637,7 +4637,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-yhShj4JX.js
+//#region ../memory/dist/src-C_ZgETf8.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -28088,6 +28088,18 @@ const SET_WORKING_MEMORY_TOOL_NAME = "setWorkingMemory";
 * - Primitive values are overwritten
 * - The returned object is always newly constructed and never aliases `update`
 */
+/**
+* Parses stored JSON working memory. Invalid or empty data yields `null` (start fresh).
+*/
+function parseWorkingMemoryJson(raw) {
+	if (!raw) return null;
+	if (typeof raw !== "string") return raw;
+	try {
+		return JSON.parse(raw);
+	} catch {
+		return null;
+	}
+}
 function deepMergeWorkingMemory(existing, update) {
 	if (!update || typeof update !== "object" || Object.keys(update).length === 0) return existing && typeof existing === "object" ? { ...existing } : {};
 	const result = { ...existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {} };
@@ -28194,17 +28206,6 @@ const updateWorkingMemoryTool = (memoryConfig) => {
 			}
 			let workingMemory;
 			if (usesMergeSemantics) {
-				const existingRaw = await memory.getWorkingMemory({
-					threadId,
-					resourceId,
-					memoryConfig
-				});
-				let existingData = null;
-				if (existingRaw) try {
-					existingData = typeof existingRaw === "string" ? JSON.parse(existingRaw) : existingRaw;
-				} catch {
-					existingData = null;
-				}
 				const memoryInput = workingMemoryInput.memory;
 				if (memoryInput === void 0 || memoryInput === null) return {
 					success: true,
@@ -28218,7 +28219,20 @@ const updateWorkingMemoryTool = (memoryConfig) => {
 					throw new Error(`Failed to parse working memory input as JSON: ${errorMessage}. Raw input: ${memoryInput.length > 500 ? memoryInput.slice(0, 500) + "..." : memoryInput}`);
 				}
 				else newData = memoryInput;
-				const mergedData = deepMergeWorkingMemory(existingData, newData);
+				if (scope === "resource" && typeof memory.supportsAtomicWorkingMemoryMerge === "function" && await memory.supportsAtomicWorkingMemoryMerge()) {
+					await memory.mergeWorkingMemory({
+						threadId,
+						resourceId,
+						workingMemory: newData,
+						memoryConfig
+					});
+					return { success: true };
+				}
+				const mergedData = deepMergeWorkingMemory(parseWorkingMemoryJson(await memory.getWorkingMemory({
+					threadId,
+					resourceId,
+					memoryConfig
+				})), newData);
 				workingMemory = JSON.stringify(mergedData);
 			} else {
 				const memoryInput = workingMemoryInput.memory;
@@ -32537,8 +32551,14 @@ var ObservationStep = class {
 				const newOutput = messageList.clear.response.db();
 				const messagesToSave = [...newInput, ...newOutput];
 				if (messagesToSave.length > 0) {
-					await om.persistMessages(messagesToSave, threadId, resourceId);
 					for (const msg of messagesToSave) messageList.add(msg, "memory");
+					try {
+						await om.persistMessages(messagesToSave, threadId, resourceId);
+					} catch (error) {
+						restoreDrainedMessages(messageList, newInput, "input");
+						restoreDrainedMessages(messageList, newOutput, "response");
+						throw error;
+					}
 				}
 			} else {
 				const pending = [...messageList.get.input.db(), ...messageList.get.response.db()];
@@ -32766,6 +32786,18 @@ var ObservationStep = class {
 	}
 };
 /**
+* Move messages drained into the memory bucket back to `source` after a failed save. Messages that
+* have already left the memory bucket (a background tool result moves its message to `response`)
+* are left where they are. The list's current copy is re-added so changes made during the save
+* are kept.
+*/
+function restoreDrainedMessages(messageList, drained, source) {
+	if (drained.length === 0) return;
+	const stillQueued = new Set([...messageList.get.input.db(), ...messageList.get.response.db()].map((msg) => msg.id));
+	const ids = drained.map((msg) => msg.id).filter((id) => !stillQueued.has(id));
+	for (const msg of messageList.removeByIds(ids)) messageList.add(msg, source, { merge: false });
+}
+/**
 * Represents a single turn in the agent conversation — one user message → agent response cycle.
 *
 * The turn manages record caching, context loading, and step lifecycle.
@@ -37255,6 +37287,10 @@ var ObservationalMemoryProcessor = class {
 				} catch (error) {
 					const err = error instanceof Error ? error : new Error(String(error));
 					const abortMessage = abortSignal?.aborted ? "Agent execution was aborted" : `Encountered error during memory observation: ${err.message}`;
+					const failedTurn = this.turn;
+					await failedTurn.end().catch(() => {});
+					if (this.turn === failedTurn) this.turn = void 0;
+					state.__omTurn = void 0;
 					if (typeof abort === "function") abort(abortMessage);
 					throw err;
 				}
@@ -37565,6 +37601,12 @@ const DEFAULT_EMBEDDING_CACHE_MAX_SIZE = 1e3;
 * @see [Memory documentation](https://mastra.ai/docs/memory/overview)
 * if packaged docs are unavailable.
 */
+const invalidMerge = (text) => new MastraError({
+	id: "MEMORY_WORKING_MEMORY_MERGE_INVALID",
+	domain: ErrorDomain.MASTRA_MEMORY,
+	category: ErrorCategory.USER,
+	text
+});
 var Memory = class Memory extends MastraMemory {
 	createMemoryTokenCounter() {
 		return new TokenCounter();
@@ -38094,6 +38136,54 @@ var Memory = class Memory extends MastraMemory {
 			throw error;
 		}
 	}
+	/**
+	* Whether the configured storage can merge resource working memory atomically across processes.
+	*/
+	async supportsAtomicWorkingMemoryMerge() {
+		return (await this.getMemoryStore()).supportsAtomicWorkingMemoryMerge === true;
+	}
+	/**
+	* Deep-merges a partial JSON update into resource-scoped working memory as one
+	* atomic storage operation, so concurrent writers (even in other processes) never
+	* lose each other's fields. `null` values delete fields; arrays are replaced.
+	* Requires schema-based working memory, resource scope, and a storage adapter
+	* that supports atomic merges (e.g. PostgreSQL); otherwise throws.
+	*/
+	async mergeWorkingMemory({ threadId, resourceId, workingMemory, memoryConfig, observabilityContext }) {
+		const config = this.getMergedThreadConfig(memoryConfig || {});
+		if (!config.workingMemory?.enabled) throw invalidMerge("Working memory is not enabled for this memory instance");
+		if (!config.workingMemory.schema) throw invalidMerge("Working memory merge requires schema-based (JSON) working memory");
+		if ((config.workingMemory.scope || "resource") !== "resource" || !resourceId) throw invalidMerge("Working memory merge requires resource-scoped working memory and a resourceId");
+		let patch = workingMemory;
+		if (typeof workingMemory === "string") try {
+			patch = JSON.parse(workingMemory);
+		} catch {
+			throw invalidMerge("Working memory merge requires a JSON object");
+		}
+		if (!patch || typeof patch !== "object" || Array.isArray(patch)) throw invalidMerge("Working memory merge requires a JSON object");
+		const memoryStore = await this.getMemoryStore();
+		if (!memoryStore.supportsAtomicWorkingMemoryMerge) throw invalidMerge(`Atomic working memory merge is not supported by this storage adapter (${memoryStore.constructor.name}).`);
+		const span = this.createMemorySpan("update", observabilityContext, {
+			threadId,
+			resourceId
+		}, { workingMemoryEnabled: true });
+		try {
+			await memoryStore.mergeResourceWorkingMemory({
+				resourceId,
+				merge: (existing) => {
+					const parsed = parseWorkingMemoryJson(existing);
+					return JSON.stringify(deepMergeWorkingMemory(parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null, patch));
+				}
+			});
+			span?.end({ output: { success: true } });
+		} catch (error) {
+			span?.error({
+				error,
+				endSpan: true
+			});
+			throw error;
+		}
+	}
 	updateWorkingMemoryMutexes = /* @__PURE__ */ new Map();
 	/**
 	* @warning experimental! can be removed or changed at any time
@@ -50573,4 +50663,4 @@ const agentBuilderWorkflows = {
 //#endregion
 export { agentBuilderWorkflows };
 
-//# sourceMappingURL=dist-DMtuYRLk.js.map
+//# sourceMappingURL=dist-CtNeEn6M.js.map