@mastra/memory 1.25.1-alpha.0 → 1.26.1-alpha.0

package/dist/{src-Bz9Fg416.cjs → src-x5iu_K3X.cjs}

@@ -1,30 +1,30 @@
 //#region \0rolldown/runtime.js
 var __create$1 = Object.create;
-var __defProp$4 = Object.defineProperty;
+var __defProp$3 = Object.defineProperty;
 var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames$1 = Object.getOwnPropertyNames;
 var __getProtoOf$1 = Object.getPrototypeOf;
 var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
-	for (var name in all) __defProp$4(target, name, {
+	for (var name in all) __defProp$3(target, name, {
 		get: all[name],
 		enumerable: true
 	});
-	if (!no_symbols) __defProp$4(target, Symbol.toStringTag, { value: "Module" });
+	if (!no_symbols) __defProp$3(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
 var __copyProps$1 = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames$1(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
-		if (!__hasOwnProp$1.call(to, key) && key !== except) __defProp$4(to, key, {
+		if (!__hasOwnProp$1.call(to, key) && key !== except) __defProp$3(to, key, {
 			get: ((k) => from[k]).bind(null, key),
 			enumerable: !(desc = __getOwnPropDesc$1(from, key)) || desc.enumerable
 		});
 	}
 	return to;
 };
-var __toESM$1 = (mod, isNodeMode, target) => (target = mod != null ? __create$1(__getProtoOf$1(mod)) : {}, __copyProps$1(isNodeMode || !mod || !mod.__esModule ? __defProp$4(target, "default", {
+var __toESM$1 = (mod, isNodeMode, target) => (target = mod != null ? __create$1(__getProtoOf$1(mod)) : {}, __copyProps$1(isNodeMode || !mod || !mod.__esModule ? __defProp$3(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -201,9 +201,9 @@ Error message: ${getErrorMessage$4(cause)}`,
 _a13$5 = symbol13$5;
 var TypeValidationError$2 = _TypeValidationError;
 //#endregion
-//#region ../_vendored/ai_v4/dist/dist-e6zV1w-k.js
+//#region ../_vendored/ai_v4/dist/index.js
 var __create = Object.create;
-var __defProp$3 = Object.defineProperty;
+var __defProp$1$1 = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
@@ -212,14 +212,14 @@ var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).expor
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp$3(to, key, {
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp$1$1(to, key, {
 			get: ((k) => from[k]).bind(null, key),
 			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
 		});
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp$3(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp$1$1(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -433,8 +433,6 @@ function safeParseJSON$2({ text, schema }) {
 	}
 }
 var { btoa: btoa$2, atob: atob$2 } = globalThis;
-//#endregion
-//#region ../_vendored/ai_v4/dist/index.js
 const ignoreOverride$2 = Symbol("Let zodToJsonSchema decide on which parser to use");
 const defaultOptions$2 = {
 	name: void 0,
@@ -3736,7 +3734,7 @@ function trimStartOfStream() {
 	};
 }
 //#endregion
-//#region ../_vendored/ai_v5/dist/dist-Qv-F35RT.js
+//#region ../_vendored/ai_v5/dist/dist-BuEMdYEn.js
 var marker$1$4 = "vercel.ai.error";
 var symbol$1$3 = Symbol.for(marker$1$4);
 var _a$1$3;
@@ -4286,6 +4284,26 @@ async function cancelResponseBody$1(response) {
 		await ((_a2 = response.body) == null ? void 0 : _a2.cancel());
 	} catch (e) {}
 }
+var initialGlobalFetch$1 = globalThis.fetch;
+isNodeDefaultFetch$1(initialGlobalFetch$1);
+function isNodeDefaultFetch$1(fetch) {
+	const source = Function.prototype.toString.call(fetch);
+	return source.includes("internal/deps/undici") || source.includes("lazy loading of undici");
+}
+function getCurrentModulePath$1() {
+	const originalPrepareStackTrace = Error.prepareStackTrace;
+	try {
+		Error.prepareStackTrace = (_error, callSites) => callSites;
+		const error = /* @__PURE__ */ new Error("Capture current module path");
+		Error.captureStackTrace(error, getCurrentModulePath$1);
+		const [caller] = error.stack;
+		const fileName = caller == null ? void 0 : caller.getFileName();
+		if (fileName == null) throw new Error("Unable to determine the current module path");
+		return fileName;
+	} finally {
+		Error.prepareStackTrace = originalPrepareStackTrace;
+	}
+}
 var DEFAULT_MAX_DOWNLOAD_SIZE$1 = 2 * 1024 * 1024 * 1024;
 async function readResponseWithSizeLimit$1({ response, url, maxBytes = DEFAULT_MAX_DOWNLOAD_SIZE$1 }) {
 	const contentLength = response.headers.get("content-length");
@@ -4395,11 +4413,11 @@ function withUserAgentSuffix$1(headers, ...userAgentSuffixParts) {
 	normalizedHeaders.set("user-agent", [currentUserAgentHeader, ...userAgentSuffixParts].filter(Boolean).join(" "));
 	return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION$4 = "3.0.30";
+var VERSION$4 = "3.0.31";
 var getOriginalFetch$1 = () => globalThis.fetch;
-var getFromApi$1 = async ({ url, headers = {}, successfulResponseHandler, failedResponseHandler, abortSignal, fetch: fetch2 = getOriginalFetch$1() }) => {
+var getFromApi$1 = async ({ url, headers = {}, successfulResponseHandler, failedResponseHandler, abortSignal, fetch = getOriginalFetch$1() }) => {
 	try {
-		const response = await fetch2(url, {
+		const response = await fetch(url, {
 			method: "GET",
 			headers: withUserAgentSuffix$1(headers, `ai-sdk/provider-utils/${VERSION$4}`, getRuntimeEnvironmentUserAgent$1()),
 			signal: abortSignal
@@ -4625,7 +4643,7 @@ function parseJsonEventStream$1({ stream, schema }) {
 	} }));
 }
 var getOriginalFetch2$1 = () => globalThis.fetch;
-var postJsonToApi$1 = async ({ url, headers, body, failedResponseHandler, successfulResponseHandler, abortSignal, fetch: fetch2 }) => postToApi$1({
+var postJsonToApi$1 = async ({ url, headers, body, failedResponseHandler, successfulResponseHandler, abortSignal, fetch }) => postToApi$1({
 	url,
 	headers: {
 		"Content-Type": "application/json",
@@ -4638,11 +4656,11 @@ var postJsonToApi$1 = async ({ url, headers, body, failedResponseHandler, succes
 	failedResponseHandler,
 	successfulResponseHandler,
 	abortSignal,
-	fetch: fetch2
+	fetch
 });
-var postToApi$1 = async ({ url, headers = {}, body, successfulResponseHandler, failedResponseHandler, abortSignal, fetch: fetch2 = getOriginalFetch2$1() }) => {
+var postToApi$1 = async ({ url, headers = {}, body, successfulResponseHandler, failedResponseHandler, abortSignal, fetch = getOriginalFetch2$1() }) => {
 	try {
-		const response = await fetch2(url, {
+		const response = await fetch(url, {
 			method: "POST",
 			headers: withUserAgentSuffix$1(headers, `ai-sdk/provider-utils/${VERSION$4}`, getRuntimeEnvironmentUserAgent$1()),
 			body: body.content,
@@ -6704,7 +6722,7 @@ async function getVercelRequestId$1() {
 	var _a10;
 	return (_a10 = getContext$1().headers) == null ? void 0 : _a10["x-vercel-id"];
 }
-var VERSION$2$2 = "2.0.115";
+var VERSION$2$2 = "2.0.125";
 var AI_GATEWAY_PROTOCOL_VERSION$1 = "0.0.1";
 function createGatewayProvider$1(options = {}) {
 	var _a10, _b10;
@@ -7738,7 +7756,7 @@ function getGlobalProvider$1() {
 	var _a16;
 	return (_a16 = globalThis.AI_SDK_DEFAULT_PROVIDER) != null ? _a16 : gateway$1;
 }
-var VERSION$5 = "5.0.216";
+var VERSION$5 = "5.0.226";
 var dataContentSchema$1 = zod_v4.z.union([
 	zod_v4.z.string(),
 	zod_v4.z.instanceof(Uint8Array),
@@ -8604,7 +8622,7 @@ var object$1 = ({ schema: inputSchema }) => {
 	};
 };
 //#endregion
-//#region ../_vendored/ai_v6/dist/dist-BomuqvJJ.js
+//#region ../_vendored/ai_v6/dist/dist-BTWHzT8H.js
 var marker$1 = "vercel.ai.error";
 var symbol$1$1 = Symbol.for(marker$1);
 var _a$1$1;
@@ -9175,6 +9193,26 @@ var DownloadError = class extends (_b$2 = AISDKError, _a$2 = symbol$2, _b$2) {
 		return AISDKError.hasMarker(error, marker$2);
 	}
 };
+var initialGlobalFetch = globalThis.fetch;
+isNodeDefaultFetch(initialGlobalFetch);
+function isNodeDefaultFetch(fetch) {
+	const source = Function.prototype.toString.call(fetch);
+	return source.includes("internal/deps/undici") || source.includes("lazy loading of undici");
+}
+function getCurrentModulePath() {
+	const originalPrepareStackTrace = Error.prepareStackTrace;
+	try {
+		Error.prepareStackTrace = (_error, callSites) => callSites;
+		const error = /* @__PURE__ */ new Error("Capture current module path");
+		Error.captureStackTrace(error, getCurrentModulePath);
+		const [caller] = error.stack;
+		const fileName = caller == null ? void 0 : caller.getFileName();
+		if (fileName == null) throw new Error("Unable to determine the current module path");
+		return fileName;
+	} finally {
+		Error.prepareStackTrace = originalPrepareStackTrace;
+	}
+}
 var DEFAULT_MAX_DOWNLOAD_SIZE = 2 * 1024 * 1024 * 1024;
 async function readResponseWithSizeLimit({ response, url, maxBytes = DEFAULT_MAX_DOWNLOAD_SIZE }) {
 	const contentLength = response.headers.get("content-length");
@@ -9306,11 +9344,11 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
 	normalizedHeaders.set("user-agent", [currentUserAgentHeader, ...userAgentSuffixParts].filter(Boolean).join(" "));
 	return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION$3 = "4.0.40";
+var VERSION$3 = "4.0.41";
 var getOriginalFetch = () => globalThis.fetch;
-var getFromApi = async ({ url, headers = {}, successfulResponseHandler, failedResponseHandler, abortSignal, fetch: fetch2 = getOriginalFetch() }) => {
+var getFromApi = async ({ url, headers = {}, successfulResponseHandler, failedResponseHandler, abortSignal, fetch = getOriginalFetch() }) => {
 	try {
-		const response = await fetch2(url, {
+		const response = await fetch(url, {
 			method: "GET",
 			headers: withUserAgentSuffix(headers, `ai-sdk/provider-utils/${VERSION$3}`, getRuntimeEnvironmentUserAgent()),
 			signal: abortSignal
@@ -10497,7 +10535,7 @@ function parseJsonEventStream({ stream, schema }) {
 	} }));
 }
 var getOriginalFetch2 = () => globalThis.fetch;
-var postJsonToApi = async ({ url, headers, body, failedResponseHandler, successfulResponseHandler, abortSignal, fetch: fetch2 }) => postToApi({
+var postJsonToApi = async ({ url, headers, body, failedResponseHandler, successfulResponseHandler, abortSignal, fetch }) => postToApi({
 	url,
 	headers: {
 		"Content-Type": "application/json",
@@ -10510,11 +10548,11 @@ var postJsonToApi = async ({ url, headers, body, failedResponseHandler, successf
 	failedResponseHandler,
 	successfulResponseHandler,
 	abortSignal,
-	fetch: fetch2
+	fetch
 });
-var postToApi = async ({ url, headers = {}, body, successfulResponseHandler, failedResponseHandler, abortSignal, fetch: fetch2 = getOriginalFetch2() }) => {
+var postToApi = async ({ url, headers = {}, body, successfulResponseHandler, failedResponseHandler, abortSignal, fetch = getOriginalFetch2() }) => {
 	try {
-		const response = await fetch2(url, {
+		const response = await fetch(url, {
 			method: "POST",
 			headers: withUserAgentSuffix(headers, `ai-sdk/provider-utils/${VERSION$3}`, getRuntimeEnvironmentUserAgent()),
 			body: body.content,
@@ -10736,7 +10774,7 @@ function withoutTrailingSlash(url) {
 	return url == null ? void 0 : url.replace(/\/$/, "");
 }
 //#endregion
-//#region ../_vendored/ai_v6/dist/dist-iiYCn57Q.js
+//#region ../_vendored/ai_v6/dist/dist-3jq9sPhA.js
 function getContext() {
 	return { headers: {} };
 }
@@ -12295,7 +12333,7 @@ async function getVercelRequestId() {
 	var _a11;
 	return (_a11 = getContext().headers) == null ? void 0 : _a11["x-vercel-id"];
 }
-var VERSION$2 = "3.0.153";
+var VERSION$2 = "3.0.163";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
 	var _a11, _b11;
@@ -13454,7 +13492,7 @@ function getTotalTimeoutMs(timeout) {
 	if (typeof timeout === "number") return timeout;
 	return timeout.totalMs;
 }
-var VERSION = "6.0.230";
+var VERSION = "6.0.241";
 var dataContentSchema = zod_v4.z.union([
 	zod_v4.z.string(),
 	zod_v4.z.instanceof(Uint8Array),
@@ -14818,6 +14856,7 @@ var Extractor = class Extractor {
 	includePreviousExtraction;
 	metadataKeyPath;
 	onExtracted;
+	retryStructuredExtractionOnEmptyObject;
 	/** @internal */
 	internal;
 	instructionsConfig;
@@ -14840,6 +14879,7 @@ var Extractor = class Extractor {
 		this.includePreviousExtraction = config.includePreviousExtraction ?? true;
 		this.metadataKeyPath = config.metadataKeyPath ?? `extracted.${slug}`;
 		this.onExtracted = config.onExtracted;
+		this.retryStructuredExtractionOnEmptyObject = config.retryStructuredExtractionOnEmptyObject ?? false;
 		this.internal = internal;
 	}
 	async resolve(context) {
@@ -14852,7 +14892,8 @@ var Extractor = class Extractor {
 			...schema ? { schema } : {},
 			includePreviousExtraction: this.includePreviousExtraction,
 			metadataKeyPath: this.metadataKeyPath,
-			onExtracted: this.onExtracted
+			onExtracted: this.onExtracted,
+			retryStructuredExtractionOnEmptyObject: this.retryStructuredExtractionOnEmptyObject
 		}, this.internal);
 	}
 };
@@ -15177,6 +15218,9 @@ if (OM_DEBUG_LOG) {
 function isAbortError$1(error, abortSignal) {
 	return abortSignal?.aborted === true || error instanceof DOMException && error.name === "AbortError" || error instanceof Error && error.name === "AbortError";
 }
+function shouldRetryEmptyStructuredObject(object, extractors) {
+	return Object.keys(object).length === 0 && extractors.some((extractor) => extractor.retryStructuredExtractionOnEmptyObject);
+}
 async function extractStructuredValues(opts) {
 	const structuredExtractors = (opts.extractors ?? []).filter((extractor) => extractor.mode === "structured");
 	if (structuredExtractors.length === 0) return {
@@ -15213,8 +15257,10 @@ ${extractorInstructions}${priorLines.length > 0 ? `\n\n## Prior Extracted Values
 		return output.object;
 	};
 	let object;
+	let retryEmptyObject = false;
 	try {
 		object = await generateWithStructuredOutput();
+		retryEmptyObject = shouldRetryEmptyStructuredObject(object, structuredExtractors);
 	} catch (error) {
 		if (isAbortError$1(error, opts.abortSignal)) throw error;
 		try {
@@ -15231,6 +15277,19 @@ ${extractorInstructions}${priorLines.length > 0 ? `\n\n## Prior Extracted Values
 			};
 		}
 	}
+	if (retryEmptyObject) try {
+		object = await generateWithStructuredOutput(_mastra_core_features.coreFeatures.has("json-prompt-injection:inline") ? "inline" : true);
+	} catch (fallbackError) {
+		if (isAbortError$1(fallbackError, opts.abortSignal)) throw fallbackError;
+		const message = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
+		return {
+			values,
+			failures: structuredExtractors.map((extractor) => ({
+				slug: extractor.slug,
+				error: message
+			}))
+		};
+	}
 	for (const extractor of structuredExtractors) {
 		const value = object[extractor.slug];
 		if (value === void 0 || value === null || value === "") continue;
@@ -18536,6 +18595,17 @@ var TokenCounter = class TokenCounter {
 					toolResultDelta
 				};
 			}
+			if (invocation.state === "output-error") {
+				toolResultDelta++;
+				const errorText = invocation.errorText;
+				const errorMessage = typeof errorText === "string" ? errorText : "Tool execution failed";
+				tokens += this.readOrPersistPartEstimate(part, "tool-result-error", errorMessage);
+				return {
+					tokens,
+					overheadDelta,
+					toolResultDelta
+				};
+			}
 			throw new Error(`Unhandled tool-invocation state '${part.toolInvocation?.state}' in token counting for part type '${part.type}'`);
 		}
 		if (typeof part.type === "string" && part.type.startsWith("data-")) return {
@@ -18761,6 +18831,7 @@ var WorkingMemoryExtractor = class extends Extractor {
 			name: "Working Memory",
 			includePreviousExtraction: false,
 			metadataKeyPath: false,
+			retryStructuredExtractionOnEmptyObject: true,
 			instructions: async (context) => buildWorkingMemoryInstructions(await getWorkingMemoryDetails(context)),
 			schema: async (context) => {
 				return (await getWorkingMemoryDetails(context)).usesSchema ? zod.z.union([zod.z.record(zod.z.string(), zod.z.unknown()), zod.z.null()]) : void 0;
@@ -20460,6 +20531,68 @@ function isMessageAtOrBeforeCursor(msg, cursor) {
 	return false;
 }
 /**
+* Return the toolCallId of a tool-invocation part in the given state, or undefined.
+*/
+function getToolInvocationId(part, state) {
+	if (part?.type !== "tool-invocation") return void 0;
+	if (part.toolInvocation.state !== state) return void 0;
+	return part.toolInvocation.toolCallId || void 0;
+}
+function collectPendingToolResultIds(allMessages, observedIds) {
+	const pendingToolResultIds = /* @__PURE__ */ new Set();
+	for (const msg of allMessages) {
+		if (!msg?.id) continue;
+		if (observedIds?.has(msg.id)) continue;
+		const parts = msg.content?.parts;
+		if (!parts || !Array.isArray(parts)) continue;
+		for (const part of parts) {
+			const id = getToolInvocationId(part, "result");
+			if (id) pendingToolResultIds.add(id);
+		}
+	}
+	return pendingToolResultIds;
+}
+function hasPendingToolResultPair(message, pendingToolResultIds) {
+	if (pendingToolResultIds.size === 0) return false;
+	const parts = message.content?.parts;
+	if (!parts || !Array.isArray(parts)) return false;
+	return parts.some((part) => {
+		const id = getToolInvocationId(part, "call");
+		return id !== void 0 && pendingToolResultIds.has(id);
+	});
+}
+function collectPendingToolResultIdsAfterMarker(allMessages, markerMessageIndex, markerMessage) {
+	const pendingToolResultIds = /* @__PURE__ */ new Set();
+	const unobservedMarkerParts = getUnobservedParts(markerMessage);
+	if (unobservedMarkerParts.length > 0) collectPendingToolResultIds([{
+		...markerMessage,
+		content: {
+			...markerMessage.content,
+			parts: unobservedMarkerParts
+		}
+	}], void 0).forEach((id) => pendingToolResultIds.add(id));
+	collectPendingToolResultIds(allMessages.slice(markerMessageIndex + 1), void 0).forEach((id) => pendingToolResultIds.add(id));
+	return pendingToolResultIds;
+}
+function getUnobservedPartsPreservingToolCallPairs(message) {
+	const parts = message.content?.parts;
+	if (!parts || !Array.isArray(parts)) return [];
+	const endMarkerIndex = findLastCompletedObservationBoundary(message);
+	if (endMarkerIndex === -1) return getUnobservedParts(message);
+	const unobservedParts = getUnobservedParts(message);
+	const unobservedResultIds = /* @__PURE__ */ new Set();
+	for (const part of unobservedParts) {
+		const id = getToolInvocationId(part, "result");
+		if (id) unobservedResultIds.add(id);
+	}
+	if (unobservedResultIds.size === 0) return unobservedParts;
+	const preservedCalls = parts.slice(0, endMarkerIndex).filter((part) => {
+		const id = getToolInvocationId(part, "call");
+		return id !== void 0 && unobservedResultIds.has(id);
+	});
+	return preservedCalls.length > 0 ? [...preservedCalls, ...unobservedParts] : unobservedParts;
+}
+/**
 * Safely extract buffered observation chunks from a record.
 * Handles both array and JSON-string formats, returning empty array if malformed.
 */
@@ -20475,6 +20608,7 @@ function filterObservedMessages(opts) {
 	const allMessages = messageList.get.all.db();
 	const useMarkerBoundaryPruning = opts.useMarkerBoundaryPruning ?? true;
 	const preserveMessageIds = opts.preserveMessageIds ?? /* @__PURE__ */ new Set();
+	const observedIds = new Set(Array.isArray(record?.observedMessageIds) ? record.observedMessageIds : []);
 	let markerMessageIndex = -1;
 	let markerMessage = null;
 	for (let i = allMessages.length - 1; i >= 0; i--) {
@@ -20487,33 +20621,40 @@ function filterObservedMessages(opts) {
 		}
 	}
 	if (useMarkerBoundaryPruning && markerMessage && markerMessageIndex !== -1) {
+		const pendingToolResultIds = collectPendingToolResultIdsAfterMarker(allMessages, markerMessageIndex, markerMessage);
 		const messagesToRemove = [];
 		for (let i = 0; i < markerMessageIndex; i++) {
 			const msg = allMessages[i];
-			if (msg?.id && msg.id !== "om-continuation" && !preserveMessageIds.has(msg.id)) messagesToRemove.push(msg.id);
+			if (msg?.id && msg.id !== "om-continuation" && !preserveMessageIds.has(msg.id) && !hasPendingToolResultPair(msg, pendingToolResultIds)) messagesToRemove.push(msg.id);
 		}
 		if (messagesToRemove.length > 0) messageList.removeByIds(messagesToRemove);
-		const unobserved = getUnobservedParts(markerMessage);
+		const unobserved = getUnobservedPartsPreservingToolCallPairs(markerMessage);
 		if (unobserved.length === 0) {
 			if (markerMessage.id) messageList.removeByIds([markerMessage.id]);
 		} else if (unobserved.length < (markerMessage.content?.parts?.length ?? 0)) markerMessage.content.parts = unobserved;
 	} else if (record) {
-		const observedIds = new Set(Array.isArray(record.observedMessageIds) ? record.observedMessageIds : []);
+		const pendingToolResultIds = collectPendingToolResultIds(allMessages, observedIds);
 		const derivedCursor = opts.fallbackCursor ?? getLastObservedMessageCursor(allMessages.filter((msg) => !!msg?.id && observedIds.has(msg.id) && !!msg.createdAt));
 		const lastObservedAt = record.lastObservedAt;
 		const messagesToRemove = [];
 		for (const msg of allMessages) {
 			if (!msg?.id || msg.id === "om-continuation" || preserveMessageIds.has(msg.id)) continue;
+			const hasPendingPair = hasPendingToolResultPair(msg, pendingToolResultIds);
 			if (observedIds.has(msg.id)) {
+				if (hasPendingPair) continue;
 				messagesToRemove.push(msg.id);
 				continue;
 			}
 			if (derivedCursor && isMessageAtOrBeforeCursor(msg, derivedCursor)) {
+				if (hasPendingPair) continue;
 				messagesToRemove.push(msg.id);
 				continue;
 			}
 			if (lastObservedAt && msg.createdAt) {
-				if (new Date(msg.createdAt) <= lastObservedAt) messagesToRemove.push(msg.id);
+				if (new Date(msg.createdAt) <= lastObservedAt) {
+					if (hasPendingPair) continue;
+					messagesToRemove.push(msg.id);
+				}
 			}
 		}
 		if (messagesToRemove.length > 0) messageList.removeByIds(messagesToRemove);
@@ -20882,7 +21023,7 @@ var ObservationStrategy = class ObservationStrategy {
 			transient: true
 		}).catch(() => {});
 		const markerThreadId = marker.data?.threadId ?? this.opts.threadId;
-		await this.persistMarkerToStorage(marker, markerThreadId, this.opts.resourceId);
+		if (!await this.persistMarkerToMessage(marker, this.opts.messageList, markerThreadId, this.opts.resourceId)) await this.persistMarkerToStorage(marker, markerThreadId, this.opts.resourceId);
 	}
 	getObservationMarkerConfig() {
 		return {
@@ -21010,9 +21151,13 @@ var ObservationStrategy = class ObservationStrategy {
 	/**
 	* Persist a marker part on the last assistant message in a MessageList
 	* AND save the updated message to the DB.
+	*
+	* @returns true when a marker was placed on an assistant message, false when
+	*   no list was provided or the list contains no assistant message (caller
+	*   should fall back to `persistMarkerToStorage`).
 	*/
 	async persistMarkerToMessage(marker, messageList, threadId, resourceId) {
-		if (!messageList) return;
+		if (!messageList) return false;
 		const allMsgs = messageList.get.all.db();
 		for (let i = allMsgs.length - 1; i >= 0; i--) {
 			const msg = allMsgs[i];
@@ -21028,9 +21173,10 @@ var ObservationStrategy = class ObservationStrategy {
 				} catch (e) {
 					omDebug(`[OM:persistMarker] failed to save marker to DB: ${e}`);
 				}
-				return;
+				return true;
 			}
 		}
+		return false;
 	}
 };
 //#endregion
@@ -21839,6 +21985,12 @@ var ObservationStep = class {
 	stepNumber;
 	_prepared = false;
 	_context;
+	/**
+	* True when this step seeded an empty assistant response message for a step-0
+	* observation. While set, the response-id rotation hook must NOT run — rotating
+	* would orphan the seed (markers would sit on a message the agent never streams into).
+	*/
+	seededResponseMessage = false;
 	constructor(turn, stepNumber) {
 		this.turn = turn;
 		this.stepNumber = stepNumber;
@@ -21967,15 +22119,41 @@ var ObservationStep = class {
 			});
 			buffered = true;
 		}
-		if (this.stepNumber > 0) {
-			const newInput = messageList.clear.input.db();
-			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");
+		const willObserveNow = statusSnapshot.shouldObserve && !hasIncompleteToolCalls;
+		/** In-flight message ids the step-0 cleanup must never remove from live context. */
+		let step0PreserveIds;
+		if (this.stepNumber > 0 || willObserveNow) {
+			if (this.stepNumber > 0) {
+				const newInput = messageList.clear.input.db();
+				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");
+				}
+			} else {
+				const pending = [...messageList.get.input.db(), ...messageList.get.response.db()];
+				if (pending.length > 0) await om.persistMessages(pending, threadId, resourceId);
+				step0PreserveIds = pending.map((msg) => msg.id);
 			}
-			if (statusSnapshot.shouldObserve && !hasIncompleteToolCalls) {
+			if (this.stepNumber === 0 && willObserveNow && this.turn.responseMessageId) {
+				const seed = {
+					id: this.turn.responseMessageId,
+					role: "assistant",
+					content: {
+						format: 2,
+						parts: []
+					},
+					type: "text",
+					createdAt: /* @__PURE__ */ new Date(),
+					threadId,
+					resourceId
+				};
+				messageList.add(seed, "response");
+				this.seededResponseMessage = true;
+				omDebug(`[OM:step0] seeded response message ${seed.id} for step-0 observation markers`);
+			}
+			if (willObserveNow) {
 				const preObsGeneration = this.turn.record.generationCount;
 				const obsResult = await this.runThresholdObservation();
 				observerExchange = obsResult.observerExchange;
@@ -21989,7 +22167,8 @@ var ObservationStep = class {
 						resourceId,
 						messages: messageList,
 						observedMessageIds: observedIds,
-						retentionFloor: minRemaining
+						retentionFloor: minRemaining,
+						preserveMessageIds: step0PreserveIds
 					});
 					if (statusSnapshot.asyncObservationEnabled) await om.resetBufferingState({
 						threadId,
@@ -22053,10 +22232,11 @@ var ObservationStep = class {
 		const { threadId, resourceId, messageList } = this.turn;
 		const om = this.turn.om;
 		await om.waitForBuffering(threadId, resourceId);
+		const observableMessages = this.seededResponseMessage ? messageList.get.all.db().filter((msg) => msg.id !== this.turn.responseMessageId) : messageList.get.all.db();
 		const freshStatus = await om.getStatus({
 			threadId,
 			resourceId,
-			messages: messageList.get.all.db()
+			messages: observableMessages
 		});
 		if (!freshStatus.shouldObserve) return {
 			succeeded: false,
@@ -22066,7 +22246,7 @@ var ObservationStep = class {
 			const activation = await om.activate({
 				threadId,
 				resourceId,
-				messages: messageList.get.all.db(),
+				messages: observableMessages,
 				currentModel: this.turn.actorModelContext,
 				writer: this.turn.writer,
 				messageList
@@ -22099,7 +22279,8 @@ var ObservationStep = class {
 		const obsResult = await om.observe({
 			threadId,
 			resourceId,
-			messages: messageList.get.all.db(),
+			messages: observableMessages,
+			messageList,
 			trigger: "turn-sync",
 			requestContext: this.turn.requestContext,
 			writer: this.turn.writer,
@@ -22116,10 +22297,12 @@ var ObservationStep = class {
 					break;
 				}
 			}
-			const messageToSeal = latestObservedIndex >= 0 ? liveMessages[latestObservedIndex] : void 0;
+			let messageToSeal = latestObservedIndex >= 0 ? liveMessages[latestObservedIndex] : void 0;
+			if (this.stepNumber === 0 && messageToSeal?.role !== "assistant") messageToSeal = void 0;
 			const messagesToSeal = messageToSeal ? [messageToSeal] : [];
 			om.sealMessagesForBuffering(messagesToSeal);
-			try {
+			if (this.seededResponseMessage) omDebug("[OM:observe] skipping response-id rotation — step-0 seeded response message holds the active id");
+			else try {
 				await this.turn.hooks?.onSyncObservationComplete?.();
 			} catch (error) {
 				omDebug(`[OM:observe] onSyncObservationComplete hook failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -22180,6 +22363,8 @@ var ObservationTurn = class {
 	sendSignal;
 	/** Current actor model for this step. Updated by the processor before prepare(). */
 	actorModelContext;
+	/** The active assistant response message ID for this step. Updated by the processor before prepare(). */
+	responseMessageId;
 	/** Processor-provided hooks for turn/step lifecycle integration. */
 	hooks;
 	constructor(opts) {
@@ -23819,6 +24004,14 @@ var ObservationalMemory = class ObservationalMemory {
 	*/
 	locks = /* @__PURE__ */ new Map();
 	/**
+	* Initial record lookup/creation promises keyed by the effective storage scope.
+	* Concurrent callers share the full read-or-create operation so a stale read
+	* cannot create another generation-zero record after the first insert finishes.
+	* Entries are removed after both success and failure so later calls always
+	* re-read storage and transient failures can be retried.
+	*/
+	recordInitializations = /* @__PURE__ */ new Map();
+	/**
 	* Acquire a lock for the given key, execute the callback, then release.
 	* If a lock is already held, waits for it to be released before acquiring.
 	*/
@@ -24179,10 +24372,14 @@ var ObservationalMemory = class ObservationalMemory {
 	*/
 	async getOrCreateRecord(threadId, resourceId) {
 		const ids = this.getStorageIds(threadId, resourceId);
-		let record = await this.storage.getObservationalMemory(ids.threadId, ids.resourceId);
-		if (!record) {
+		const initializationKey = ids.threadId === null ? `resource:${ids.resourceId}` : `thread:${ids.threadId}`;
+		const pendingInitialization = this.recordInitializations.get(initializationKey);
+		if (pendingInitialization) return pendingInitialization;
+		const initialization = Promise.resolve().then(async () => {
+			const record = await this.storage.getObservationalMemory(ids.threadId, ids.resourceId);
+			if (record) return record;
 			const observedTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-			record = await this.storage.initializeObservationalMemory({
+			return this.storage.initializeObservationalMemory({
 				threadId: ids.threadId,
 				resourceId: ids.resourceId,
 				scope: this.scope,
@@ -24193,8 +24390,13 @@ var ObservationalMemory = class ObservationalMemory {
 				},
 				observedTimezone
 			});
+		});
+		this.recordInitializations.set(initializationKey, initialization);
+		try {
+			return await initialization;
+		} finally {
+			if (this.recordInitializations.get(initializationKey) === initialization) this.recordInitializations.delete(initializationKey);
 		}
-		return record;
 	}
 	/**
 	* Get current config snapshot for observation markers.
@@ -24831,6 +25033,7 @@ ${formattedMessages}
 	*/
 	async getObservedMessageIdsForCleanup(opts) {
 		const { threadId, resourceId, messages, observedMessageIds, retentionFloor } = opts;
+		const preserveSet = opts.preserveMessageIds?.length ? new Set(opts.preserveMessageIds) : null;
 		const record = await this.getOrCreateRecord(threadId, resourceId);
 		const effectiveObservedIds = observedMessageIds && observedMessageIds.length > 0 ? observedMessageIds : Array.isArray(record.observedMessageIds) ? record.observedMessageIds : [];
 		if (effectiveObservedIds.length === 0) return [];
@@ -24842,6 +25045,10 @@ ${formattedMessages}
 		const retentionCounter = typeof retentionFloor === "number" ? new TokenCounter() : null;
 		for (const msg of messages) {
 			if (!msg?.id || msg.id === "om-continuation" || !observedSet.has(msg.id)) continue;
+			if (preserveSet?.has(msg.id)) {
+				skipped += 1;
+				continue;
+			}
 			const unobservedParts = getUnobservedParts(msg);
 			const totalParts = msg.content?.parts?.length ?? 0;
 			if (unobservedParts.length > 0 && unobservedParts.length < totalParts) {
@@ -24886,7 +25093,7 @@ ${formattedMessages}
 	*/
 	/** @internal Used by ObservationStep. */
 	async cleanupMessages(opts) {
-		const { threadId, resourceId, observedMessageIds, retentionFloor } = opts;
+		const { threadId, resourceId, observedMessageIds, retentionFloor, preserveMessageIds } = opts;
 		const messageList = this.isMessageList(opts.messages) ? opts.messages : void 0;
 		const allMsgs = messageList ? messageList.get.all.db() : opts.messages;
 		let markerIdx = -1;
@@ -24907,7 +25114,8 @@ ${formattedMessages}
 				resourceId,
 				messages: allMsgs,
 				observedMessageIds,
-				retentionFloor
+				retentionFloor,
+				preserveMessageIds
 			});
 			if (messageList) {
 				if (idsToRemoveList.length > 0) messageList.removeByIds(idsToRemoveList);
@@ -24919,18 +25127,21 @@ ${formattedMessages}
 		if (markerMsg && markerIdx !== -1) {
 			const idsToRemove = [];
 			const messagesToSave = [];
+			const preserveSet = preserveMessageIds?.length ? new Set(preserveMessageIds) : null;
 			for (let i = 0; i < markerIdx; i++) {
 				const msg = allMsgs[i];
-				if (msg?.id && msg.id !== "om-continuation") {
+				if (msg?.id && msg.id !== "om-continuation" && !preserveSet?.has(msg.id)) {
 					idsToRemove.push(msg.id);
 					messagesToSave.push(msg);
 				}
 			}
 			messagesToSave.push(markerMsg);
-			const unobservedParts = getUnobservedParts(markerMsg);
-			if (unobservedParts.length === 0) {
-				if (markerMsg.id) idsToRemove.push(markerMsg.id);
-			} else if (unobservedParts.length < (markerMsg.content?.parts?.length ?? 0)) markerMsg.content.parts = unobservedParts;
+			if (!Boolean(markerMsg.id && preserveSet?.has(markerMsg.id))) {
+				const unobservedParts = getUnobservedParts(markerMsg);
+				if (unobservedParts.length === 0) {
+					if (markerMsg.id) idsToRemove.push(markerMsg.id);
+				} else if (unobservedParts.length < (markerMsg.content?.parts?.length ?? 0)) markerMsg.content.parts = unobservedParts;
+			}
 			if (messageList) {
 				if (idsToRemove.length > 0) messageList.removeByIds(idsToRemove);
 				if (messagesToSave.length > 0) await this.persistMessages(messagesToSave, threadId, resourceId);
@@ -25717,6 +25928,7 @@ ${formattedMessages}
 					threadId,
 					resourceId,
 					messages: unobservedMessages,
+					messageList: opts.messageList,
 					reflectionHooks,
 					agent: opts.agent,
 					requestContext,
@@ -26106,7 +26318,7 @@ var ObservationalMemoryProcessor = class {
 		this.temporalMarkers = options?.temporalMarkers ?? false;
 	}
 	async processInputStep(args) {
-		const { messageList, requestContext, stepNumber, state: _state, writer, model, abortSignal, abort, rotateResponseMessageId } = args;
+		const { messageList, requestContext, stepNumber, state: _state, writer, model, abortSignal, abort, messageId, rotateResponseMessageId } = args;
 		const state = _state ?? {};
 		omDebug(`[OM:processInputStep:ENTER] step=${stepNumber}, hasMastraMemory=${!!requestContext?.get("MastraMemory")}, hasMemoryInfo=${!!messageList?.serialize()?.memoryInfo?.threadId}`);
 		const context = this.engine.getThreadContext(requestContext, messageList);
@@ -26192,6 +26404,7 @@ var ObservationalMemoryProcessor = class {
 			state.__omObservabilityContext = observabilityContext;
 			this.turn.observabilityContext = observabilityContext;
 			this.turn.actorModelContext = actorModelContext;
+			this.turn.responseMessageId = messageId;
 			{
 				const step = this.turn.step(stepNumber);
 				let ctx;
@@ -26562,6 +26775,11 @@ function filterSystemReminderMessages(messages, includeSystemReminders) {
 	if (includeSystemReminders) return messages;
 	return messages.filter((message) => !isSystemReminderMessage(message));
 }
+function isTransientSignalMessage(message) {
+	if (message.role !== "signal" || !isRecord(message.content)) return false;
+	const metadata = message.content.metadata;
+	return isRecord(metadata) && isRecord(metadata.signal) && !Array.isArray(metadata.signal) && metadata.signal.transient === true;
+}
 function normalizeObservationalMemoryConfig(config) {
 	if (config === true) return { model: "google/gemini-2.5-flash" };
 	if (config === false || config === void 0) return void 0;
@@ -27095,7 +27313,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").map((m) => {
+			const updatedMessages = messages.filter((m) => m.role !== "system" && !isTransientSignalMessage(m)).map((m) => {
 				return this.updateMessageToHideWorkingMemoryV2(m);
 			}).filter((m) => Boolean(m));
 			const config = this.getMergedThreadConfig(memoryConfig);
@@ -27387,7 +27605,7 @@ ${workingMemory}`;
 	*/
 	async persistMessages(messages) {
 		if (messages.length === 0) return;
-		const persistableMessages = messages.filter((m) => m.role !== "system");
+		const persistableMessages = messages.filter((m) => m.role !== "system" && !isTransientSignalMessage(m));
 		if (persistableMessages.length === 0) return;
 		await (await this.getMemoryStore()).saveMessages({ messages: persistableMessages });
 	}
@@ -28567,4 +28785,4 @@ Object.defineProperty(exports, "wrapInObservationGroup", {
 	}
 });
 
-//# sourceMappingURL=src-Bz9Fg416.cjs.map
+//# sourceMappingURL=src-x5iu_K3X.cjs.map