@mastra/memory 1.36.0 → 1.37.0-alpha.1

package/dist/{src-yhShj4JX.js → src-BaiJf9y9.js}

@@ -3,6 +3,7 @@ import { z } from "zod";
 import * as z4 from "zod/v4";
 import { z as z$1 } from "zod/v4";
 import { Agent, MessageList } from "@mastra/core/agent";
+import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
 import { coreFeatures } from "@mastra/core/features";
 import { MastraMemory, getMemoryTokenBoundary, getThreadOMMetadata, isAfterMemoryTokenBoundary, isThreadTitlePinned, loadMessageHistory, normalizeMessageHistoryConfig, parseMemoryRequestContext, setThreadOMMetadata } from "@mastra/core/memory";
 import { EntityType, SpanType, createObservabilityContext, getOrCreateSpan } from "@mastra/core/observability";
@@ -22,7 +23,6 @@ import { AsyncLocalStorage } from "async_hooks";
 import { createHash } from "crypto";
 import probeImageSizeSync from "probe-image-size/sync.js";
 import { isStandardSchemaWithJSON as isStandardSchemaWithJSON$1, toStandardSchema as toStandardSchema$1 } from "@mastra/core/schema";
-import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
 import { structuredPatch } from "diff";
 import { inspect } from "util";
 //#region \0rolldown/runtime.js
@@ -23598,6 +23598,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 : {} };
@@ -23704,17 +23716,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,
@@ -23728,7 +23729,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;
@@ -28093,8 +28107,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()];
@@ -28321,6 +28341,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 });
+}
 //#endregion
 //#region src/processors/observational-memory/observation-turn/turn.ts
 /**
@@ -28479,17 +28511,17 @@ var ObservationTurn = class {
 	* proactively while the agent is idle, rather than waiting for the next turn.
 	* The returned record does not wait for that background buffering pass to finish.
 	*/
-	async end() {
+	async end(messageList = this.messageList) {
 		if (this._ended) throw new Error("Turn already ended");
 		this._ended = true;
-		const unsavedInput = this.messageList.get.input.db();
-		const unsavedOutput = this.messageList.get.response.db();
+		const unsavedInput = messageList.get.input.db();
+		const unsavedOutput = messageList.get.response.db();
 		const unsavedMessages = [...unsavedInput, ...unsavedOutput];
 		if (unsavedMessages.length > 0) await this.om.persistMessages(unsavedMessages, this.threadId, this.resourceId);
 		const asyncObservationEnabled = this.om.buffering.isAsyncObservationEnabled();
 		const bufferOnIdle = this.om.getObservationConfig().bufferOnIdle;
 		if (asyncObservationEnabled && bufferOnIdle) {
-			const allMessages = getObservableMessages(this.messageList);
+			const allMessages = getObservableMessages(messageList);
 			const record = this._record;
 			const idleMessages = selectSafeBufferPrefix(this.om.getUnobservedMessages(allMessages, record));
 			if (idleMessages.length > 0) this.om.trackBackgroundWork(this.om.buffer({
@@ -32825,6 +32857,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;
 				}
@@ -32884,7 +32920,7 @@ var ObservationalMemoryProcessor = class {
 			if (parseMemoryRequestContext(requestContext)?.memoryConfig?.readOnly) return messageList;
 			const turn = asLiveTurn(state.__omTurn) ?? this.turn;
 			const liveTurn = turn && !turn.ended ? turn : void 0;
-			if (liveTurn) await liveTurn.end();
+			if (liveTurn) await liveTurn.end(messageList);
 			this.turn = void 0;
 			state.__omTurn = void 0;
 			if (!liveTurn) {
@@ -33156,6 +33192,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();
@@ -33685,6 +33727,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
@@ -35386,4 +35476,4 @@ Notes:
 //#endregion
 export { formatMessagesForObserver as A, OBSERVATION_CONTEXT_PROMPT_THREAD as B, SUMMARIZE_THREAD_DEFAULTS as C, buildObserverPrompt as D, OBSERVER_SYSTEM_PROMPT as E, parseAnchorId as F, StaleKnowledgeSemanticIndexError as G, getObservationContextPrompt as H, stripEphemeralAnchorIds as I, SUBCONSCIOUS_ACTIVITY_STATE_ID as J, SubconsciousRemindExtractor as K, OBSERVATIONAL_MEMORY_DEFAULTS as L, optimizeObservationsForContext as M, parseObserverOutput as N, buildObserverSystemPrompt as O, injectAnchorIds as P, Extractor as Q, OBSERVATION_CONTEXT_INSTRUCTIONS as R, deepMergeWorkingMemory as S, TokenCounter as T, Subconscious as U, OBSERVATION_CONTINUATION_HINT as V, KnowledgeSemanticIndexCoordinator as W, publishSubconsciousActivity as X, buildSubconsciousActivitySnapshot as Y, renderSubconsciousActivity as Z, reconcileObservationGroupsFromReflection as _, extractWorkingMemoryContent as a, wrapInObservationGroup as b, getObservationsAsOf as c, WORKING_MEMORY_STATE_ID as d, WORKING_MEMORY_STATE_PROCESSOR_ID as f, parseObservationGroups as g, deriveObservationGroupProvenance as h, WorkingMemory as i, hasCurrentTaskSection as j, extractCurrentTask as k, ObservationalMemoryProcessor as l, combineObservationGroupRanges as m, MessageHistory$1 as n, extractWorkingMemoryTags as o, WorkingMemoryStateProcessor as p, ModelByInputTokens as q, SemanticRecall as r, removeWorkingMemoryTags as s, Memory as t, ObservationalMemory as u, renderObservationGroupsForReflection as v, summarizeConversation as w, WorkingMemoryExtractor as x, stripObservationGroups as y, OBSERVATION_CONTEXT_PROMPT as z };
 
-//# sourceMappingURL=src-yhShj4JX.js.map
+//# sourceMappingURL=src-BaiJf9y9.js.map