@mastra/server 1.57.0 → 1.58.0-alpha.1

package/dist/{dist-DGqlUp0b.js → dist-IUXZtNBY.js}

@@ -5959,7 +5959,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-Cwt9gefz.js
+//#region ../memory/dist/src-Iw-V5CfD.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -20722,6 +20722,7 @@ var Extractor = class Extractor {
 	includePreviousExtraction;
 	metadataKeyPath;
 	onExtracted;
+	retryStructuredExtractionOnEmptyObject;
 	/** @internal */
 	internal;
 	instructionsConfig;
@@ -20744,6 +20745,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) {
@@ -20756,7 +20758,8 @@ var Extractor = class Extractor {
 			...schema ? { schema } : {},
 			includePreviousExtraction: this.includePreviousExtraction,
 			metadataKeyPath: this.metadataKeyPath,
-			onExtracted: this.onExtracted
+			onExtracted: this.onExtracted,
+			retryStructuredExtractionOnEmptyObject: this.retryStructuredExtractionOnEmptyObject
 		}, this.internal);
 	}
 };
@@ -21075,6 +21078,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 {
@@ -21111,8 +21117,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 {
@@ -21129,6 +21137,19 @@ ${extractorInstructions}${priorLines.length > 0 ? `\n\n## Prior Extracted Values
 			};
 		}
 	}
+	if (retryEmptyObject) try {
+		object = await generateWithStructuredOutput(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;
@@ -24412,6 +24433,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 {
@@ -24633,6 +24665,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 ? z$2.union([z$2.record(z$2.string(), z$2.unknown()), z$2.null()]) : void 0;
@@ -26798,7 +26831,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 {
@@ -26926,9 +26959,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];
@@ -26944,9 +26981,10 @@ var ObservationStrategy = class ObservationStrategy {
 				} catch (e) {
 					omDebug(`[OM:persistMarker] failed to save marker to DB: ${e}`);
 				}
-				return;
+				return true;
 			}
 		}
+		return false;
 	}
 };
 var SyncObservationStrategy = class extends ObservationStrategy {
@@ -27743,6 +27781,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;
@@ -27871,15 +27915,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 (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 (statusSnapshot.shouldObserve && !hasIncompleteToolCalls) {
+			if (willObserveNow) {
 				const preObsGeneration = this.turn.record.generationCount;
 				const obsResult = await this.runThresholdObservation();
 				observerExchange = obsResult.observerExchange;
@@ -27893,7 +27963,8 @@ var ObservationStep = class {
 						resourceId,
 						messages: messageList,
 						observedMessageIds: observedIds,
-						retentionFloor: minRemaining
+						retentionFloor: minRemaining,
+						preserveMessageIds: step0PreserveIds
 					});
 					if (statusSnapshot.asyncObservationEnabled) await om.resetBufferingState({
 						threadId,
@@ -27957,10 +28028,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,
@@ -27970,7 +28042,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
@@ -28003,7 +28075,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,
@@ -28020,10 +28093,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)}`);
@@ -28082,6 +28157,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) {
@@ -30742,6 +30819,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 [];
@@ -30753,6 +30831,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) {
@@ -30797,7 +30879,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;
@@ -30818,7 +30900,8 @@ ${formattedMessages}
 				resourceId,
 				messages: allMsgs,
 				observedMessageIds,
-				retentionFloor
+				retentionFloor,
+				preserveMessageIds
 			});
 			if (messageList) {
 				if (idsToRemoveList.length > 0) messageList.removeByIds(idsToRemoveList);
@@ -30830,18 +30913,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);
@@ -31628,6 +31714,7 @@ ${formattedMessages}
 					threadId,
 					resourceId,
 					messages: unobservedMessages,
+					messageList: opts.messageList,
 					reflectionHooks,
 					agent: opts.agent,
 					requestContext,
@@ -32013,7 +32100,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);
@@ -32099,6 +32186,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;
@@ -44602,4 +44690,4 @@ const agentBuilderWorkflows = {
 //#endregion
 export { agentBuilderWorkflows };
 
-//# sourceMappingURL=dist-DGqlUp0b.js.map
+//# sourceMappingURL=dist-IUXZtNBY.js.map