@mastra/memory 1.39.0 → 1.39.1-alpha.1

package/dist/{src-IWcrqO0n.cjs → src-BjH9gT88.cjs}

@@ -36668,7 +36668,6 @@ var ObservationStep = class {
 		let observerExchange;
 		const step0Messages = this.stepNumber === 0 ? getObservableMessages(messageList) : [];
 		if (this.stepNumber === 0) {
-			this.turn.inputMessageIds = messageList.get.input.db().map((msg) => msg.id);
 			const activation = await om.activate({
 				threadId,
 				resourceId,
@@ -36799,7 +36798,7 @@ var ObservationStep = class {
 					drainedKeys.set(msg.id, /* @__PURE__ */ new Set([...seen ?? [], ...keys]));
 					return !seen || keys.some((key) => !seen.has(key));
 				}).map((msg) => msg.id);
-				inFlightIds = [.../* @__PURE__ */ new Set([...this.turn.inputMessageIds, ...unreadIds])];
+				inFlightIds = [...new Set(unreadIds)];
 				if (messagesToSave.length > 0) {
 					for (const msg of messagesToSave) messageList.add(msg, "memory");
 					try {
@@ -36876,7 +36875,7 @@ var ObservationStep = class {
 		});
 		if (!didThresholdCleanup) {
 			const fallbackCursor = this.turn.record.threadId ? (0, _mastra_core_memory.getThreadOMMetadata)((await om.getStorage().getThreadById({ threadId: this.turn.record.threadId }))?.metadata)?.lastObservedMessageCursor : void 0;
-			const pendingMessageIds = new Set([...messageList.get.input.db(), ...messageList.get.response.db()].map((msg) => msg.id).concat(inFlightIds ?? [], this.turn.inputMessageIds, this.changedSinceDrain(messageList)).filter(Boolean));
+			const pendingMessageIds = new Set([...messageList.get.input.db(), ...messageList.get.response.db()].map((msg) => msg.id).concat(inFlightIds ?? [], this.changedSinceDrain(messageList)).filter(Boolean));
 			filterObservedMessages({
 				messageList,
 				record: this.turn.record,
@@ -37162,12 +37161,6 @@ var ObservationTurn = class {
 	/** Generation count at turn start — used to detect if reflection happened during the turn. */
 	_generationCountAtStart = -1;
 	/**
-	* Ids of the messages this turn was started with (the user's request). Mid-turn
-	* observation may record them, but they stay in the live prompt until the turn ends.
-	* @internal Set by step 0.
-	*/
-	inputMessageIds = [];
-	/**
 	* Fingerprints of the non-marker parts each message had when a step last drained it. A message
 	* is unread step output only if it gained a part the model has not seen — including a tool result
 	* merged in place into an existing tool-invocation part — not when it only gained OM markers.
@@ -41937,6 +41930,29 @@ var ObservationalMemoryProcessor = class {
 				this.turn.agent = args.agent;
 				this.turn.requestContext = requestContext;
 				await this.turn.start(this.memory, runState);
+				if (stepNumber > 0) {
+					if (this.memory?.getPersistedMessages) {
+						const responseIds = messageList.getPersisted.response.db().map((message) => message.id);
+						const snapshotMessages = new Map(messageList.get.all.db().map((message) => [message.id, message]));
+						const storedMessages = await this.memory.getPersistedMessages(threadId, responseIds);
+						for (const stored of storedMessages) {
+							const snapshot = snapshotMessages.get(stored.id);
+							if (!snapshot) continue;
+							const snapshotTools = snapshot.content.parts.filter((part) => part.type === "tool-invocation");
+							if (stored.content.parts.some((part) => {
+								if (part.type !== "tool-invocation" || part.toolInvocation.state !== "result") return false;
+								const previous = snapshotTools.find((candidate) => candidate.toolInvocation.toolCallId === part.toolInvocation.toolCallId);
+								if (!previous || previous.toolInvocation.state !== "result") return true;
+								const previousTask = previous.providerMetadata?.mastra?.backgroundTask;
+								const storedTask = part.providerMetadata?.mastra?.backgroundTask;
+								return previousTask?.status === "running" && (storedTask?.status === "completed" || storedTask?.status === "failed");
+							})) {
+								this.turn.drainedPartKeys.set(stored.id, new Set(getPartKeys(snapshot)));
+								messageList.add(stored, "memory");
+							}
+						}
+					}
+				}
 				const observedIds = this.turn.record.observedMessageIds;
 				const response = messageId ? messageList.get.all.db().find((message) => message.id === messageId) : void 0;
 				const responseSealed = (response?.content?.metadata)?.mastra?.sealed === true;
@@ -42081,6 +42097,7 @@ var ObservationalMemoryProcessor = class {
 			writer: args.writer,
 			observabilityContext: getOmObservabilityContext(args)
 		}));
+		if (observed) args.rotateResponseMessageId?.();
 		return { retry: activated || observed };
 	}
 	get config() {
@@ -43166,9 +43183,7 @@ ${workingMemory}`;
 	async saveMessages({ messages, memoryConfig, observabilityContext }) {
 		const span = this.createMemorySpan("save", observabilityContext, void 0, { messageCount: messages.length });
 		try {
-			const updatedMessages = messages.filter((m) => m.role !== "system" && !isTransientSignalMessage(m)).map((m) => {
-				return this.updateMessageToHideWorkingMemoryV2(m);
-			}).filter((m) => Boolean(m));
+			const updatedMessages = this.prepareMessagesForPersistence(messages);
 			const config = this.getMergedThreadConfig(memoryConfig);
 			const dbMessages = new _mastra_core_agent.MessageList({ generateMessageId: () => this.generateId() }).add(updatedMessages, "memory").get.all.db();
 			const memoryStore = await this.getMemoryStore();
@@ -43274,12 +43289,17 @@ ${workingMemory}`;
 			throw error;
 		}
 	}
+	prepareMessagesForPersistence(messages) {
+		return messages.filter((m) => m.role !== "system" && !isTransientSignalMessage(m)).map((m) => this.updateMessageToHideWorkingMemoryV2(m)).filter((m) => m !== null);
+	}
 	updateMessageToHideWorkingMemoryV2(message) {
 		const newMessage = { ...message };
 		if (message.content && typeof message.content === "object" && !Array.isArray(message.content)) newMessage.content = { ...message.content };
 		if (typeof newMessage.content?.content === "string" && newMessage.content.content.length > 0) newMessage.content.content = removeWorkingMemoryTags(newMessage.content.content).trim();
 		if (Array.isArray(newMessage.content?.parts)) {
 			if (Array.isArray(newMessage.content.toolInvocations)) newMessage.content.toolInvocations = removeWorkingMemoryToolInvocations(newMessage.content.toolInvocations);
+			const lastOriginalPart = newMessage.content.parts.at(-1);
+			const sealMetadata = lastOriginalPart && "metadata" in lastOriginalPart ? lastOriginalPart.metadata : void 0;
 			newMessage.content.parts = removeWorkingMemoryToolInvocationParts(newMessage.content.parts).map((part) => {
 				if (part?.type === "text") {
 					const text = typeof part.text === "string" ? part.text : "";
@@ -43290,6 +43310,26 @@ ${workingMemory}`;
 				}
 				return part;
 			});
+			const lastIndex = newMessage.content.parts.length - 1;
+			const lastPart = newMessage.content.parts[lastIndex];
+			if (lastPart && sealMetadata && typeof sealMetadata === "object" && "mastra" in sealMetadata) {
+				const mastra = sealMetadata.mastra;
+				if (mastra && typeof mastra === "object" && "sealedAt" in mastra && typeof mastra.sealedAt === "number") {
+					const existingMetadata = "metadata" in lastPart ? lastPart.metadata : void 0;
+					const metadata = existingMetadata && typeof existingMetadata === "object" ? existingMetadata : {};
+					const existingMastra = "mastra" in metadata && metadata.mastra && typeof metadata.mastra === "object" ? metadata.mastra : {};
+					newMessage.content.parts[lastIndex] = {
+						...lastPart,
+						metadata: {
+							...metadata,
+							mastra: {
+								...existingMastra,
+								sealedAt: mastra.sealedAt
+							}
+						}
+					};
+				}
+			}
 			if (newMessage.content.parts.length === 0) {
 				if (!(typeof newMessage.content.content === "string" && newMessage.content.content.trim().length > 0)) return null;
 			}
@@ -43370,6 +43410,16 @@ ${workingMemory}`;
 			data: workingMemoryData
 		});
 	}
+	/** Fetch current stored copies of messages in a resumed turn, bypassing run-state history caches. */
+	async getPersistedMessages(threadId, ids) {
+		if (!ids.length) return [];
+		return (await (await this.getMemoryStore()).listMessages({
+			threadId,
+			perPage: 0,
+			include: ids.map((id) => ({ id })),
+			includeTotal: false
+		})).messages.filter((message) => ids.includes(message.id));
+	}
 	/**
 	* Get everything needed for an LLM call in one shot.
 	*
@@ -43529,12 +43579,12 @@ ${workingMemory}`;
 		};
 	}
 	/**
-	* Raw message upsert — persist messages to storage without embedding or working memory processing.
+	* Raw message upsert — apply the persistence projection without embedding or extracting working memory.
 	* Used by the processor to save sealed messages before firing a background buffer operation.
 	*/
 	async persistMessages(messages) {
 		if (messages.length === 0) return;
-		const persistableMessages = messages.filter((m) => m.role !== "system" && !isTransientSignalMessage(m));
+		const persistableMessages = this.prepareMessagesForPersistence(messages);
 		if (persistableMessages.length === 0) return;
 		await (await this.getMemoryStore()).saveMessages({ messages: persistableMessages });
 	}
@@ -44016,27 +44066,75 @@ Notes:
 		if (messages.length === 0) return [];
 		const memoryStore = await this.getMemoryStore();
 		const config = this.getMergedThreadConfig(memoryConfig);
+		const existing = await memoryStore.listMessagesById({ messageIds: messages.map((m) => m.id) });
+		const existingById = new Map(existing.messages.map((m) => [m.id, m]));
+		const textForEmbeddingById = /* @__PURE__ */ new Map();
+		const textFields = ["content", "parts"];
+		const textOf = (content, fields) => {
+			for (const field of fields) {
+				const text = field === "content" ? content.content?.trim() ? content.content : null : (content.parts ?? []).filter((part) => part?.type === "text").map((part) => part.text).join(" ").trim();
+				if (text) return text;
+			}
+			return null;
+		};
+		messages = messages.flatMap((update) => {
+			const stored = existingById.get(update.id);
+			if (!stored) return [];
+			const effective = {
+				...stored,
+				...update,
+				content: update.content === void 0 ? stored.content : {
+					...stored.content,
+					...update.content,
+					metadata: {
+						...stored.content.metadata,
+						...update.content.metadata
+					}
+				}
+			};
+			const [projected] = this.prepareMessagesForPersistence([effective]);
+			if (!projected) return [];
+			if (update.content === void 0) {
+				existingById.set(update.id, effective);
+				return [update];
+			}
+			const content = {
+				...update.content,
+				...update.content.parts !== void 0 ? { parts: projected.content.parts } : {},
+				...update.content.content !== void 0 ? { content: projected.content.content } : {},
+				...update.content.toolInvocations !== void 0 ? { toolInvocations: projected.content.toolInvocations } : {}
+			};
+			existingById.set(update.id, {
+				...effective,
+				content: {
+					...effective.content,
+					...content
+				}
+			});
+			const patched = textFields.filter((field) => update.content?.[field] !== void 0);
+			if (patched.length > 0) {
+				const omitted = textFields.filter((field) => !patched.includes(field));
+				const text = textOf(projected.content, patched) ?? (textOf(update.content, patched) ? textOf(projected.content, omitted) : null);
+				textForEmbeddingById.set(update.id, text);
+			}
+			return [{
+				...update,
+				content
+			}];
+		});
+		if (messages.length === 0) return [];
 		if (this.vector && config.semanticRecall) {
-			const messagesWithContent = messages.filter((m) => m.content !== void 0);
-			if (messagesWithContent.length > 0) {
-				const existingMessagesResult = await memoryStore.listMessagesById({ messageIds: messagesWithContent.map((m) => m.id) });
-				const existingMessagesMap = new Map(existingMessagesResult.messages.map((m) => [m.id, m]));
+			const messagesWithTextUpdates = [...textForEmbeddingById.keys()].map((id) => ({ id }));
+			if (messagesWithTextUpdates.length > 0) {
+				const existingMessagesMap = new Map(existing.messages.map((m) => [m.id, m]));
 				const embeddingData = [];
 				let dimension;
 				const messageIdsWithNewEmbeddings = /* @__PURE__ */ new Set();
 				const messageIdsWithClearedContent = /* @__PURE__ */ new Set();
-				await Promise.all(messagesWithContent.map(async (message) => {
+				await Promise.all(messagesWithTextUpdates.map(async (message) => {
 					const existingMessage = existingMessagesMap.get(message.id);
 					if (!existingMessage) return;
-					let textForEmbedding = null;
-					const content = message.content;
-					if (content) {
-						if ("content" in content && content.content && typeof content.content === "string" && content.content.trim() !== "") textForEmbedding = content.content;
-						else if ("parts" in content && content.parts && Array.isArray(content.parts) && content.parts.length > 0) {
-							const joined = content.parts.filter((part) => part?.type === "text").map((part) => part.text).join(" ").trim();
-							if (joined) textForEmbedding = joined;
-						}
-					}
+					const textForEmbedding = textForEmbeddingById.get(message.id) ?? null;
 					if (textForEmbedding) {
 						let embeddings = [];
 						let documents;
@@ -44739,9 +44837,9 @@ Notes:
 		if (configuredProcessors.some((p) => !("workflow" in p) && p.id === "observational-memory")) return null;
 		const runtimeMemory = context?.get("MastraMemory");
 		const runtimeObservationalMemory = normalizeObservationalMemoryConfig(runtimeMemory?.memoryConfig?.observationalMemory);
-		const effectiveConfig = normalizeObservationalMemoryConfig((runtimeObservationalMemory ? this.getMergedThreadConfig({
+		const effectiveConfig = normalizeObservationalMemoryConfig((runtimeMemory?.memoryConfig?.observationalMemory !== void 0 ? this.getMergedThreadConfig({
 			...runtimeMemory?.memoryConfig,
-			observationalMemory: runtimeObservationalMemory
+			observationalMemory: runtimeObservationalMemory ?? false
 		}) : this.threadConfig).observationalMemory);
 		if (!effectiveConfig) return null;
 		const engine = await this.omEngine;
@@ -45088,4 +45186,4 @@ Object.defineProperty(exports, "wrapInObservationGroup", {
 	}
 });
 
-//# sourceMappingURL=src-IWcrqO0n.cjs.map
+//# sourceMappingURL=src-BjH9gT88.cjs.map