@mastra/memory 1.31.0-alpha.2 → 1.31.0

package/dist/{src-DquR-jTR.js → src-zTE4189S.js}

@@ -19,7 +19,6 @@ import { join } from "path";
 import { createTool } from "@mastra/core/tools";
 import { MASTRA_THREAD_ID_KEY, RequestContext } from "@mastra/core/request-context";
 import { modelSupportsAttachments, modelSupportsTemperature, resolveModelConfig } from "@mastra/core/llm";
-import { estimateTokenCount } from "tokenx";
 import { AsyncLocalStorage } from "async_hooks";
 import probeImageSizeSync from "probe-image-size/sync.js";
 import { isStandardSchemaWithJSON as isStandardSchemaWithJSON$1, toStandardSchema as toStandardSchema$1 } from "@mastra/core/schema";
@@ -3713,7 +3712,7 @@ function trimStartOfStream() {
 	};
 }
 //#endregion
-//#region ../_vendored/ai_v5/dist/dist-DCHMJHX3.js
+//#region ../_vendored/ai_v5/dist/dist-CQthBS6n.js
 var marker$1$4 = "vercel.ai.error";
 var symbol$1$3 = Symbol.for(marker$1$4);
 var _a$1$3;
@@ -8602,7 +8601,7 @@ var object$1 = ({ schema: inputSchema }) => {
 	};
 };
 //#endregion
-//#region ../_vendored/ai_v6/dist/dist-Cx98_f-i.js
+//#region ../_vendored/ai_v6/dist/dist-BJ8L5vTo.js
 var marker$1 = "vercel.ai.error";
 var symbol$1$1 = Symbol.for(marker$1);
 var _a$1$1;
@@ -10755,7 +10754,7 @@ function withoutTrailingSlash(url) {
 	return url == null ? void 0 : url.replace(/\/$/, "");
 }
 //#endregion
-//#region ../_vendored/ai_v6/dist/dist-pa8X6y1Z.js
+//#region ../_vendored/ai_v6/dist/dist-Smko-YXk.js
 function getContext() {
 	return { headers: {} };
 }
@@ -18304,6 +18303,62 @@ function safeSlice(str, end) {
 	return str.slice(0, safeEnd);
 }
 //#endregion
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/tokenx/1.3.0/09093cdaeebfe25c39ba9052d6277b45fc99abf5e14e859f60f338f5c5160afd/node_modules/tokenx/dist/index.mjs
+const PATTERNS = {
+	whitespace: /^\s+$/,
+	cjk: /[\u4E00-\u9FFF\u3400-\u4DBF\u3000-\u303F\uFF00-\uFFEF\u30A0-\u30FF\u2E80-\u2EFF\u31C0-\u31EF\u3200-\u32FF\u3300-\u33FF\uAC00-\uD7AF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uD7B0-\uD7FF]/,
+	numeric: /^\d+(?:[.,]\d+)*$/,
+	punctuation: /[.,!?;(){}[\]<>:/\\|@#$%^&*+=`~_-]/,
+	alphanumeric: /^[a-zA-Z0-9\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]+$/
+};
+const TOKEN_SPLIT_PATTERN = /* @__PURE__ */ new RegExp(`(\\s+|${PATTERNS.punctuation.source}+)`);
+const DEFAULT_CHARS_PER_TOKEN = 6;
+const SHORT_TOKEN_THRESHOLD = 3;
+const DEFAULT_LANGUAGE_CONFIGS = [
+	{
+		pattern: /[äöüßẞ]/i,
+		averageCharsPerToken: 3
+	},
+	{
+		pattern: /[éèêëàâîïôûùüÿçœæáíóúñ]/i,
+		averageCharsPerToken: 3
+	},
+	{
+		pattern: /[ąćęłńóśźżěščřžýůúďťň]/i,
+		averageCharsPerToken: 3.5
+	}
+];
+/**
+* Estimates the number of tokens in a text string using heuristic rules.
+*/
+function estimateTokenCount(text, options = {}) {
+	if (!text) return 0;
+	const { defaultCharsPerToken = DEFAULT_CHARS_PER_TOKEN, languageConfigs = DEFAULT_LANGUAGE_CONFIGS } = options;
+	const segments = text.split(TOKEN_SPLIT_PATTERN).filter(Boolean);
+	let tokenCount = 0;
+	for (const segment of segments) tokenCount += estimateSegmentTokens(segment, languageConfigs, defaultCharsPerToken);
+	return tokenCount;
+}
+function estimateSegmentTokens(segment, languageConfigs, defaultCharsPerToken) {
+	if (PATTERNS.whitespace.test(segment)) return 0;
+	if (PATTERNS.cjk.test(segment)) return getCharacterCount(segment);
+	if (PATTERNS.numeric.test(segment)) return 1;
+	if (segment.length <= SHORT_TOKEN_THRESHOLD) return 1;
+	if (PATTERNS.punctuation.test(segment)) return segment.length > 1 ? Math.ceil(segment.length / 2) : 1;
+	if (PATTERNS.alphanumeric.test(segment)) {
+		const charsPerToken$1 = getLanguageSpecificCharsPerToken(segment, languageConfigs) ?? defaultCharsPerToken;
+		return Math.ceil(segment.length / charsPerToken$1);
+	}
+	const charsPerToken = getLanguageSpecificCharsPerToken(segment, languageConfigs) ?? defaultCharsPerToken;
+	return Math.ceil(segment.length / charsPerToken);
+}
+function getLanguageSpecificCharsPerToken(segment, languageConfigs) {
+	for (const config of languageConfigs) if (config.pattern.test(segment)) return config.averageCharsPerToken;
+}
+function getCharacterCount(text) {
+	return Array.from(text).length;
+}
+//#endregion
 //#region src/processors/observational-memory/tool-argument-helpers.ts
 const DEFAULT_OBSERVER_TOOL_ARGUMENT_MAX_TOKENS = 2e3;
 const OBSERVER_TOOL_ARGUMENT_INLINE_STRING_MAX_CHARS = 160;
@@ -25160,6 +25215,10 @@ var SyncObservationStrategy = class extends ObservationStrategy {
 	async persist(processed) {
 		const { record, threadId, resourceId, messages } = this.opts;
 		const thread = await this.storage.getThreadById({ threadId });
+		if (!await this.storage.getObservationalMemory(record.threadId, record.resourceId)) {
+			omDebug(`[OM:sync-obs] skipping persist for thread ${threadId}: observational memory record is gone`);
+			return;
+		}
 		let threadUpdateMarker;
 		if (thread) {
 			const oldTitle = thread.title?.trim();
@@ -25341,6 +25400,10 @@ var AsyncBufferObservationStrategy = class extends ObservationStrategy {
 	async persist(processed) {
 		if (!processed.observations) return;
 		const { record, threadId, resourceId, messages } = this.opts;
+		if (!await this.storage.getObservationalMemory(record.threadId, record.resourceId)) {
+			omDebug(`[OM:asyncBuffer] skipping persist for thread ${threadId}: observational memory record is gone`);
+			return;
+		}
 		const messageTokens = await this.tokenCounter.countMessagesAsync(messages);
 		await withRetry(() => this.storage.updateBufferedObservations({
 			id: record.id,
@@ -26334,6 +26397,10 @@ var ObservationTurn = class {
 		if (!this._context) throw new Error("Turn not started — call start() first");
 		return this._context;
 	}
+	/** Whether the turn has been ended and can no longer accept steps. */
+	get ended() {
+		return this._ended;
+	}
 	/** The current step, if one exists. */
 	get currentStep() {
 		return this._currentStep;
@@ -30070,9 +30137,11 @@ ${formattedMessages}
 		let lifecycleError;
 		let observationStarted = false;
 		let generationBefore = -1;
+		let recordInsideLock;
 		try {
 			await this.withLock(lockKey, async () => {
 				const freshRecord = await this.getOrCreateRecord(threadId, resourceId);
+				recordInsideLock = freshRecord;
 				generationBefore = freshRecord.generationCount;
 				const unobservedMessages = messages ? this.getUnobservedMessages(messages, freshRecord) : await this.loadMessagesFromStorage(threadId, resourceId, freshRecord.lastObservedAt ? new Date(freshRecord.lastObservedAt) : void 0);
 				if (!this.meetsObservationThreshold({
@@ -30115,7 +30184,7 @@ ${formattedMessages}
 			omDebug(`[OM:hooks] onObservationEnd hook failed after cycle failure: ${endHookError instanceof Error ? endHookError.message : String(endHookError)}`);
 		}
 		if (lifecycleError !== void 0) throw lifecycleError;
-		const record = await this.getOrCreateRecord(threadId, resourceId);
+		const record = await this.getRecord(threadId, resourceId) ?? recordInsideLock;
 		const reflected = record.generationCount > generationBefore && generationBefore >= 0;
 		return {
 			observed,
@@ -30596,6 +30665,10 @@ var ObservationalMemoryProcessor = class {
 				if (this.turn === activeTurn) this.turn = void 0;
 				state.__omTurn = void 0;
 			}
+			if (activeTurn?.ended || this.turn?.ended) {
+				if (this.turn?.ended) this.turn = void 0;
+				state.__omTurn = void 0;
+			}
 			if (!this.turn || !state.__omTurn) {
 				if (this.turn && !state.__omTurn) await this.turn.end().catch(() => {});
 				this.turn = this.engine.beginTurn({
@@ -30696,11 +30769,11 @@ var ObservationalMemoryProcessor = class {
 		return this.engine.getTokenCounter().runWithModelContext(state.__omActorModelContext, async () => {
 			if (parseMemoryRequestContext(requestContext)?.memoryConfig?.readOnly) return messageList;
 			const turn = asLiveTurn(state.__omTurn) ?? this.turn;
-			if (turn) {
-				await turn.end();
-				this.turn = void 0;
-				state.__omTurn = void 0;
-			} else {
+			const liveTurn = turn && !turn.ended ? turn : void 0;
+			if (liveTurn) await liveTurn.end();
+			this.turn = void 0;
+			state.__omTurn = void 0;
+			if (!liveTurn) {
 				const newOutput = messageList.get.response.db();
 				const messagesToSave = [...messageList.get.input.db(), ...newOutput];
 				if (messagesToSave.length > 0 && context.threadId) await this.engine.persistMessages(messagesToSave, context.threadId, context.resourceId);
@@ -30910,6 +30983,7 @@ const DEFAULT_MESSAGE_RANGE = {
 };
 const DEFAULT_TOP_K = 4;
 const VECTOR_DELETE_BATCH_SIZE = 100;
+const OM_DELETE_DRAIN_TIMEOUT_MS = 1e4;
 const DEFAULT_EMBEDDING_CACHE_MAX_SIZE = 1e3;
 /**
 * Gives Mastra agents conversation history, with optional working memory,
@@ -31361,6 +31435,8 @@ var Memory = class Memory extends MastraMemory {
 		await this.deleteStoredThread(memoryStore, threadId, thread?.resourceId);
 	}
 	async deleteStoredThread(memoryStore, threadId, resourceId) {
+		const engine = this._omEngine ? await this._omEngine : this._omEngineInstance;
+		if (engine && resourceId) await engine.waitForBuffering(threadId, resourceId, OM_DELETE_DRAIN_TIMEOUT_MS);
 		await memoryStore.deleteThread({ threadId });
 		if (resourceId && memoryStore.supportsObservationalMemory) await memoryStore.clearObservationalMemory(threadId, resourceId);
 		if (this.vector) this.trackVectorCleanup(this.deleteThreadVectors(threadId));
@@ -33094,4 +33170,4 @@ Notes:
 //#endregion
 export { formatMessagesForObserver as A, OBSERVATION_CONTINUATION_HINT as B, SUMMARIZE_THREAD_DEFAULTS as C, buildObserverPrompt as D, OBSERVER_SYSTEM_PROMPT as E, parseAnchorId as F, ModelByInputTokens as G, KnowledgeSemanticIndexCoordinator as H, stripEphemeralAnchorIds as I, publishSubconsciousActivity as J, SUBCONSCIOUS_ACTIVITY_STATE_ID as K, OBSERVATIONAL_MEMORY_DEFAULTS as L, optimizeObservationsForContext as M, parseObserverOutput as N, buildObserverSystemPrompt as O, injectAnchorIds as P, OBSERVATION_CONTEXT_INSTRUCTIONS as R, WorkingMemoryExtractor as S, TokenCounter as T, StaleKnowledgeSemanticIndexError as U, Subconscious as V, SubconsciousRemindExtractor as W, Extractor as X, renderSubconsciousActivity as Y, wrapInObservationGroup as _, extractWorkingMemoryContent as a, WorkingMemoryStateProcessor as b, getObservationsAsOf as c, combineObservationGroupRanges as d, deriveObservationGroupProvenance as f, stripObservationGroups as g, renderObservationGroupsForReflection as h, WorkingMemory as i, hasCurrentTaskSection as j, extractCurrentTask as k, ObservationalMemoryProcessor as l, reconcileObservationGroupsFromReflection as m, MessageHistory$1 as n, extractWorkingMemoryTags as o, parseObservationGroups as p, buildSubconsciousActivitySnapshot as q, SemanticRecall as r, removeWorkingMemoryTags as s, Memory as t, ObservationalMemory as u, WORKING_MEMORY_STATE_ID as v, summarizeConversation as w, deepMergeWorkingMemory as x, WORKING_MEMORY_STATE_PROCESSOR_ID as y, OBSERVATION_CONTEXT_PROMPT as z };
 
-//# sourceMappingURL=src-DquR-jTR.js.map
+//# sourceMappingURL=src-zTE4189S.js.map