@mastra/memory 1.37.1-alpha.0 → 1.37.1-alpha.2

package/dist/{src-BpxX0T2g.cjs → src-DTJFmjDz.cjs}

@@ -19251,8 +19251,12 @@ function formatOmError(error) {
 function isAbortError(error, abortSignal) {
 	return abortSignal?.aborted === true || hasAbortInChain(error);
 }
+function hasEmptyObjectValue(object, extractor) {
+	const value = object[extractor.slug];
+	return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 0;
+}
 function shouldRetryEmptyStructuredObject(object, extractors) {
-	return Object.keys(object).length === 0 && extractors.some((extractor) => extractor.retryStructuredExtractionOnEmptyObject);
+	return extractors.some((extractor) => extractor.retryStructuredExtractionOnEmptyObject && (Object.keys(object).length === 0 || hasEmptyObjectValue(object, extractor)));
 }
 async function extractStructuredValues(opts) {
 	const structuredExtractors = (opts.extractors ?? []).filter((extractor) => extractor.mode === "structured");
@@ -19326,17 +19330,28 @@ ${extractorInstructions}${priorLines.length > 0 ? `\n\n## Prior Extracted Values
 		}
 	}
 	if (retryEmptyObject) try {
-		object = await streamWithStructuredOutput(_mastra_core_features.coreFeatures.has("json-prompt-injection:inline") ? "inline" : true);
+		const fallbackJsonPromptInjection = _mastra_core_features.coreFeatures.has("json-prompt-injection:inline") ? "inline" : true;
+		object = {
+			...object,
+			...await streamWithStructuredOutput(fallbackJsonPromptInjection)
+		};
 	} catch (fallbackError) {
 		if (isAbortError(fallbackError, opts.abortSignal)) throw fallbackError;
 		const message = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
-		return {
+		if (Object.keys(object).length === 0) return {
 			values,
 			failures: structuredExtractors.map((extractor) => ({
 				slug: extractor.slug,
 				error: message
 			}))
 		};
+		for (const extractor of structuredExtractors) if (extractor.retryStructuredExtractionOnEmptyObject && hasEmptyObjectValue(object, extractor)) {
+			failures.push({
+				slug: extractor.slug,
+				error: message
+			});
+			delete object[extractor.slug];
+		}
 	}
 	for (const extractor of structuredExtractors) {
 		const value = object[extractor.slug];
@@ -24162,6 +24177,9 @@ async function validateAgainstConfiguredSchema(schema, value) {
 	}).join("; ");
 	throw new Error(`Working memory update does not match the configured schema, so it was not saved: ${details}`);
 }
+function isEmptyPlainObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 0;
+}
 async function getWorkingMemoryDetails(context) {
 	const memory = context.memory;
 	const memoryConfig = (0, _mastra_core_memory.parseMemoryRequestContext)(context.requestContext)?.memoryConfig;
@@ -24209,8 +24227,9 @@ var WorkingMemoryExtractor = class extends Extractor {
 				const configuredSchema = memory.getMergedThreadConfig(memoryConfig ?? {}).workingMemory?.schema;
 				let document = current;
 				if (configuredSchema) {
-					if (current === null) return;
+					if (current === null || isEmptyPlainObject(current)) return;
 					document = await validateAgainstConfiguredSchema(configuredSchema, current);
+					if (document === null || isEmptyPlainObject(document)) return;
 				}
 				const workingMemory = typeof document === "string" ? document : JSON.stringify(document) ?? "";
 				if (!workingMemory.trim()) return;
@@ -24397,10 +24416,10 @@ function filterObservedMessages(opts) {
 			const msg = allMessages[i];
 			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);
+		if (messagesToRemove.length > 0) messageList.removeByIds(messagesToRemove, { pruned: true });
 		const unobserved = getUnobservedPartsPreservingToolCallPairs(markerMessage);
 		if (unobserved.length === 0) {
-			if (markerMessage.id) messageList.removeByIds([markerMessage.id]);
+			if (markerMessage.id) messageList.removeByIds([markerMessage.id], { pruned: true });
 		} else if (unobserved.length < (markerMessage.content?.parts?.length ?? 0)) markerMessage.content.parts = unobserved;
 	} else if (record) {
 		const pendingToolResultIds = collectPendingToolResultIds(allMessages, observedIds);
@@ -24427,7 +24446,7 @@ function filterObservedMessages(opts) {
 				}
 			}
 		}
-		if (messagesToRemove.length > 0) messageList.removeByIds(messagesToRemove);
+		if (messagesToRemove.length > 0) messageList.removeByIds(messagesToRemove, { pruned: true });
 	}
 }
 function getBufferedChunks(record) {
@@ -28851,7 +28870,7 @@ var ObservationStep = class {
 			this.turn.setRecord(activation.record);
 			if (activation.activated) {
 				activated = true;
-				if (activation.activatedMessageIds?.length) messageList.removeByIds(activation.activatedMessageIds);
+				if (activation.activatedMessageIds?.length) messageList.removeByIds(activation.activatedMessageIds, { pruned: true });
 				await om.resetBufferingState({
 					threadId,
 					resourceId,
@@ -32446,7 +32465,7 @@ ${formattedMessages}
 				preserveMessageIds
 			});
 			if (messageList) {
-				if (idsToRemoveList.length > 0) messageList.removeByIds(idsToRemoveList);
+				if (idsToRemoveList.length > 0) messageList.removeByIds(idsToRemoveList, { pruned: true });
 				return messageList.get.all.db();
 			}
 			this.removeIdsFromArray(allMsgs, idsToRemoveList);
@@ -32471,7 +32490,7 @@ ${formattedMessages}
 				} else if (unobservedParts.length < (markerMsg.content?.parts?.length ?? 0)) markerMsg.content.parts = unobservedParts;
 			}
 			if (messageList) {
-				if (idsToRemove.length > 0) messageList.removeByIds(idsToRemove);
+				if (idsToRemove.length > 0) messageList.removeByIds(idsToRemove, { pruned: true });
 				if (messagesToSave.length > 0) await this.persistMessages(messagesToSave, threadId, resourceId);
 				omDebug(`[OM:cleanupMarker] removed ${idsToRemove.length} messages, saved ${messagesToSave.length}`);
 				return messageList.get.all.db();
@@ -36881,4 +36900,4 @@ Object.defineProperty(exports, "wrapInObservationGroup", {
 	}
 });
 
-//# sourceMappingURL=src-BpxX0T2g.cjs.map
+//# sourceMappingURL=src-DTJFmjDz.cjs.map