@mastra/memory 1.36.0-alpha.1 → 1.36.0-alpha.2

package/dist/{src-Ch_8ufgu.cjs → src-OOB19zXe.cjs}

@@ -3733,7 +3733,7 @@ function trimStartOfStream() {
 	};
 }
 //#endregion
-//#region ../_vendored/ai_v5/dist/dist-DqVGDtnX.js
+//#region ../_vendored/ai_v5/dist/dist-CwCWl16R.js
 var marker$2$4 = "vercel.ai.error";
 var symbol$2$4 = Symbol.for(marker$2$4);
 var _a$2$4;
@@ -9020,7 +9020,7 @@ var object$1 = ({ schema: inputSchema }) => {
 	};
 };
 //#endregion
-//#region ../_vendored/ai_v6/dist/dist-BcG-LFmj.js
+//#region ../_vendored/ai_v6/dist/dist-B5Rt0qDx.js
 var marker$2 = "vercel.ai.error";
 var symbol$2 = Symbol.for(marker$2);
 var _a$2;
@@ -11565,7 +11565,7 @@ var _b14;
 	}
 });
 //#endregion
-//#region ../_vendored/ai_v6/dist/dist-t-eoX9xC.js
+//#region ../_vendored/ai_v6/dist/dist-BgUIUei9.js
 function getContext() {
 	return { headers: {} };
 }
@@ -22201,6 +22201,7 @@ function serializeNonImageFilePartForTokenCounting(part) {
 function isValidCacheEntry(entry, expectedKey, expectedSource) {
 	return Boolean(entry && entry.v === TOKEN_ESTIMATE_CACHE_VERSION && entry.source === expectedSource && entry.key === expectedKey && Number.isFinite(entry.tokens));
 }
+const modelContextStorage = new async_hooks.AsyncLocalStorage();
 function parseModelContext(model) {
 	if (!model) return void 0;
 	if (typeof model === "object") return model.provider || model.modelId ? {
@@ -22822,7 +22823,6 @@ async function fetchGoogleAttachmentTokenEstimate(modelId, part) {
 var TokenCounter = class TokenCounter {
 	cacheSource;
 	defaultModelContext;
-	modelContextStorage = new async_hooks.AsyncLocalStorage();
 	inFlightAttachmentCounts = /* @__PURE__ */ new Map();
 	multimodalToolResultCounts = /* @__PURE__ */ new WeakMap();
 	static TOKENS_PER_MESSAGE = 3.8;
@@ -22832,10 +22832,12 @@ var TokenCounter = class TokenCounter {
 		this.defaultModelContext = parseModelContext(options?.model);
 	}
 	runWithModelContext(model, fn) {
-		return this.modelContextStorage.run(parseModelContext(model), fn);
+		const contexts = new Map(modelContextStorage.getStore());
+		contexts.set(this, parseModelContext(model));
+		return modelContextStorage.run(contexts, fn);
 	}
 	getModelContext() {
-		return this.modelContextStorage.getStore() ?? this.defaultModelContext;
+		return modelContextStorage.getStore()?.get(this) ?? this.defaultModelContext;
 	}
 	/**
 	* Count tokens in a plain string
@@ -28039,7 +28041,7 @@ var ObservationStep = class {
 				if (obsResult.succeeded) {
 					observed = true;
 					didThresholdCleanup = true;
-					const observedIds = obsResult.activatedMessageIds ?? obsResult.record.observedMessageIds ?? [];
+					const observedIds = obsResult.cleanupMessageIds;
 					const minRemaining = resolveRetentionFloor(om.getObservationConfig().bufferActivation ?? 1, statusSnapshot.threshold);
 					await om.cleanupMessages({
 						threadId,
@@ -28106,8 +28108,8 @@ var ObservationStep = class {
 	}
 	/**
 	* Run the full threshold observation pipeline:
-	* waitForBuffering → re-check → activate → reflect → observe (sync fallback when
-	* buffered activation did not happen)
+	* waitForBuffering → re-check → activate buffered chunks → reflect → observe
+	* (sync fallback when pending tokens are still at or above the threshold)
 	*/
 	async runThresholdObservation() {
 		const { threadId, resourceId, messageList } = this.turn;
@@ -28115,59 +28117,76 @@ var ObservationStep = class {
 		await om.waitForBuffering(threadId, resourceId);
 		await this.turn.refreshRecord();
 		const observableMessages = this.seededResponseMessage ? getObservableMessages(messageList).filter((msg) => msg.id !== this.turn.responseMessageId) : getObservableMessages(messageList);
-		const freshStatus = await om.getStatus({
+		let status = await om.getStatus({
 			threadId,
 			resourceId,
 			record: this.turn.record,
 			messages: observableMessages
 		});
-		if (!freshStatus.shouldObserve) return {
+		if (!status.shouldObserve) return {
 			succeeded: false,
-			record: freshStatus.record
+			record: status.record,
+			cleanupMessageIds: []
 		};
-		if (freshStatus.canActivate) {
+		let pendingMessages = observableMessages;
+		const activatedMessageIds = [];
+		let activated = false;
+		while (status.shouldObserve && status.canActivate) {
 			const activation = await om.activate({
 				threadId,
 				resourceId,
 				record: this.turn.record,
-				messages: observableMessages,
+				messages: pendingMessages,
+				pendingTokens: status.pendingTokens,
 				currentModel: this.turn.actorModelContext,
 				writer: this.turn.writer,
 				messageList
 			});
 			this.turn.setRecord(activation.record);
-			if (activation.activated) {
-				const postActivationRecord = activation.record;
-				await om.reflector.maybeReflect({
-					record: postActivationRecord,
-					observationTokens: postActivationRecord.observationTokenCount ?? 0,
+			if (!activation.activated) break;
+			activated = true;
+			const ids = new Set(activation.activatedMessageIds ?? []);
+			activatedMessageIds.push(...ids);
+			pendingMessages = pendingMessages.filter((msg) => !ids.has(msg.id));
+			status = await om.getStatus({
+				threadId,
+				resourceId,
+				record: this.turn.record,
+				messages: pendingMessages
+			});
+		}
+		if (activated) {
+			const postActivationRecord = this.turn.record;
+			await om.reflector.maybeReflect({
+				record: postActivationRecord,
+				observationTokens: postActivationRecord.observationTokenCount ?? 0,
+				threadId,
+				writer: this.turn.writer,
+				messageList,
+				currentModel: this.turn.actorModelContext,
+				requestContext: this.turn.requestContext,
+				observabilityContext: this.turn.observabilityContext,
+				lastActivityAt: getLastActivityFromMessages(getObservableMessages(messageList)),
+				reflectionHooks: om.composeHooks(void 0, {
 					threadId,
-					writer: this.turn.writer,
-					messageList,
-					currentModel: this.turn.actorModelContext,
-					requestContext: this.turn.requestContext,
-					observabilityContext: this.turn.observabilityContext,
-					lastActivityAt: getLastActivityFromMessages(getObservableMessages(messageList)),
-					reflectionHooks: om.composeHooks(void 0, {
-						threadId,
-						resourceId,
-						trigger: "turn-sync"
-					}),
+					resourceId,
 					trigger: "turn-sync"
-				});
-				return {
-					succeeded: true,
-					record: activation.record,
-					activatedMessageIds: activation.activatedMessageIds
-				};
-			}
+				}),
+				trigger: "turn-sync"
+			});
+			if (!status.shouldObserve) return {
+				succeeded: true,
+				record: postActivationRecord,
+				activatedMessageIds,
+				cleanupMessageIds: activatedMessageIds
+			};
 		}
 		let obsResult;
 		try {
 			obsResult = await om.observe({
 				threadId,
 				resourceId,
-				messages: observableMessages,
+				messages: pendingMessages,
 				messageList,
 				trigger: "turn-sync",
 				agent: this.turn.agent,
@@ -28180,8 +28199,10 @@ var ObservationStep = class {
 		} catch (error) {
 			if (om.config.observation.failurePolicy !== "continue" || !isOmModelExecutionError(error) || error.failureKind !== "observer-model") throw error;
 			return {
-				succeeded: false,
-				record: freshStatus.record
+				succeeded: activated,
+				record: this.turn.record,
+				activatedMessageIds: activated ? activatedMessageIds : void 0,
+				cleanupMessageIds: activatedMessageIds
 			};
 		}
 		if (obsResult.observed) {
@@ -28208,8 +28229,10 @@ var ObservationStep = class {
 			if (messagesToSeal.length > 0) await om.persistMessages(messagesToSeal, threadId, resourceId);
 		}
 		return {
-			succeeded: obsResult.observed,
+			succeeded: activated || obsResult.observed,
 			record: obsResult.record,
+			activatedMessageIds: activated ? activatedMessageIds : void 0,
+			cleanupMessageIds: [.../* @__PURE__ */ new Set([...activatedMessageIds, ...obsResult.observed ? obsResult.record.observedMessageIds ?? [] : []])],
 			observerExchange: om.observer.lastExchange
 		};
 	}
@@ -31897,6 +31920,7 @@ ${formattedMessages}
 		let activateAfterIdleExpiredMs;
 		let previousModel;
 		let currentModel;
+		let livePendingTokens = opts.pendingTokens;
 		if (opts.checkThreshold) {
 			const thresholdMessages = opts.messages ?? await this.loadMessagesFromStorage(threadId, resourceId, record.lastObservedAt ? new Date(record.lastObservedAt) : void 0);
 			const activateAfterIdle = resolveActivationTTL(this.observationConfig.activateAfterIdle, opts.currentModel);
@@ -31925,6 +31949,7 @@ ${formattedMessages}
 					activated: false,
 					record
 				};
+				livePendingTokens ??= status.pendingTokens;
 			}
 		}
 		if (record.isBufferingObservation) {
@@ -31948,8 +31973,9 @@ ${formattedMessages}
 		const messageTokensThreshold = getMaxThreshold(this.getEffectiveMessageTokens(freshRecord));
 		const activationRatio = resolveActivationRatio(this.observationConfig.bufferActivation ?? .7, messageTokensThreshold);
 		const totalChunkMessageTokens = freshChunks.reduce((sum, c) => sum + (c.messageTokens ?? 0), 0);
-		const currentPendingTokens = freshRecord.pendingMessageTokens || totalChunkMessageTokens;
+		const currentPendingTokens = livePendingTokens ?? (freshRecord.pendingMessageTokens || totalChunkMessageTokens);
 		const forceMaxActivation = !!(this.observationConfig.blockAfter && currentPendingTokens >= this.observationConfig.blockAfter);
+		if (freshRecord.pendingMessageTokens !== currentPendingTokens) await this.storage.setPendingMessageTokens(freshRecord.id, currentPendingTokens);
 		const activationResult = await this.storage.swapBufferedToActive({
 			id: freshRecord.id,
 			activationRatio,
@@ -35564,4 +35590,4 @@ Object.defineProperty(exports, "wrapInObservationGroup", {
 	}
 });
 
-//# sourceMappingURL=src-Ch_8ufgu.cjs.map
+//# sourceMappingURL=src-OOB19zXe.cjs.map