@mastra/server 1.58.0-alpha.1 → 1.58.0-alpha.3

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

@@ -5959,7 +5959,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-Iw-V5CfD.js
+//#region ../memory/dist/src-CdqJP57F.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -24812,9 +24812,10 @@ async function listThreadsForResource({ memory, resourceId, currentThreadId, pag
 		hasMore
 	};
 }
+const SEARCH_NOT_CONFIGURED_MESSAGE = "Search is not configured. Enable it with `retrieval: { vector: true }` and configure a vector store and embedder on your Memory instance.";
 async function searchMessagesForResource({ memory, resourceId, currentThreadId, query, topK = 10, maxTokens = DEFAULT_MAX_RESULT_TOKENS, before, after, threadScope }) {
 	if (!memory.searchMessages) return {
-		results: "Search is not configured. Enable it with `retrieval: { vector: true }` and configure a vector store and embedder on your Memory instance.",
+		results: SEARCH_NOT_CONFIGURED_MESSAGE,
 		count: 0
 	};
 	const MAX_TOPK = 20;
@@ -25360,9 +25361,16 @@ async function recallThreadFromStart({ memory, threadId, resourceId, page = 1, l
 }
 const recallTool = (_memoryConfig, options) => {
 	const isResourceScope = (options?.retrievalScope ?? "thread") === "resource";
+	const searchEnabled = options?.searchEnabled ?? true;
+	const description = isResourceScope ? `Browse conversation history. Use mode="threads" to list all threads for the current user. Use mode="messages" (default) to browse messages in the current thread or pass threadId to browse another thread in the active resource. When mode="messages" has no cursor or threadId, it defaults to the current thread and says so at the top of the result. If you pass only a cursor, it must belong to the current thread.${searchEnabled ? " Use mode=\"search\" to find messages by content across all threads." : ""}` : `Browse conversation history in the current thread. Use mode="messages" (default) to page through messages near a cursor.${searchEnabled ? " Use mode=\"search\" to find messages by content in this thread." : ""} Use mode="threads" to get the current thread's ID and title.`;
+	const modeEnum = searchEnabled ? [
+		"messages",
+		"threads",
+		"search"
+	] : ["messages", "threads"];
 	return createTool({
 		id: "recall",
-		description: isResourceScope ? "Browse conversation history. Use mode=\"threads\" to list all threads for the current user. Use mode=\"messages\" (default) to browse messages in the current thread or pass threadId to browse another thread in the active resource. When mode=\"messages\" has no cursor or threadId, it defaults to the current thread and says so at the top of the result. If you pass only a cursor, it must belong to the current thread. Use mode=\"search\" to find messages by content across all threads." : "Browse conversation history in the current thread. Use mode=\"messages\" (default) to page through messages near a cursor. Use mode=\"search\" to find messages by content in this thread. Use mode=\"threads\" to get the current thread's ID and title.",
+		description,
 		inputSchema: {
 			$schema: "http://json-schema.org/draft-07/schema#",
 			type: "object",
@@ -25370,12 +25378,8 @@ const recallTool = (_memoryConfig, options) => {
 				...isResourceScope ? {
 					mode: {
 						type: "string",
-						enum: [
-							"messages",
-							"threads",
-							"search"
-						],
-						description: "What to retrieve. \"messages\" (default) pages through message history. \"threads\" lists all threads for the current user. \"search\" finds messages by semantic similarity across all threads."
+						enum: modeEnum,
+						description: `What to retrieve. "messages" (default) pages through message history. "threads" lists all threads for the current user.${searchEnabled ? " \"search\" finds messages by semantic similarity across all threads." : ""}`
 					},
 					threadId: {
 						type: "string",
@@ -25392,18 +25396,14 @@ const recallTool = (_memoryConfig, options) => {
 					}
 				} : { mode: {
 					type: "string",
-					enum: [
-						"messages",
-						"threads",
-						"search"
-					],
-					description: "What to retrieve. \"messages\" (default) pages through message history. \"threads\" returns info about the current thread. \"search\" finds messages by semantic similarity in this thread."
+					enum: modeEnum,
+					description: `What to retrieve. "messages" (default) pages through message history. "threads" returns info about the current thread.${searchEnabled ? " \"search\" finds messages by semantic similarity in this thread." : ""}`
 				} },
-				query: {
+				...searchEnabled ? { query: {
 					type: "string",
 					minLength: 1,
 					description: "Search query for mode=\"search\". Finds messages semantically similar to this text."
-				},
+				} } : {},
 				cursor: {
 					type: "string",
 					minLength: 1,
@@ -25464,6 +25464,10 @@ const recallTool = (_memoryConfig, options) => {
 			if (!memory) throw new Error("Memory instance is required for recall");
 			if (explicitThreadId === "current" && !currentThreadId) throw new Error("Could not resolve current thread.");
 			if (mode === "search") {
+				if (!searchEnabled) return {
+					results: SEARCH_NOT_CONFIGURED_MESSAGE,
+					count: 0
+				};
 				if (!query) throw new Error("query is required for mode=\"search\"");
 				if (!resourceId) throw new Error("Resource ID is required for recall");
 				return searchMessagesForResource({
@@ -26407,6 +26411,24 @@ function getUnobservedPartsPreservingToolCallPairs(message) {
 	return preservedCalls.length > 0 ? [...preservedCalls, ...unobservedParts] : unobservedParts;
 }
 /**
+* Get the messages Observational Memory is allowed to work with.
+*
+* Messages supplied through the `context` option are per-run ephemeral input. Core's
+* persistence contract already treats them as never-persist: `MessageStateManager` routes
+* them into `userContextMessages`, and `drainUnsavedMessages` only drains input/response.
+*
+* OM builds its windows from `get.all.db()`, which includes context messages, and then
+* seals and persists candidates directly — turning ephemeral context into durable user
+* messages. Excluding them here keeps OM's window, sealing, persistence and token
+* accounting consistent with that contract.
+*/
+function getObservableMessages(messageList) {
+	const allMessages = messageList.get.all.db();
+	const contextMessageIds = messageList.makeMessageSourceChecker().context;
+	if (contextMessageIds.size === 0) return allMessages;
+	return allMessages.filter((message) => !contextMessageIds.has(message.id));
+}
+/**
 * Safely extract buffered observation chunks from a record.
 * Handles both array and JSON-string formats, returning empty array if malformed.
 */
@@ -26419,7 +26441,7 @@ function getUnobservedPartsPreservingToolCallPairs(message) {
 */
 function filterObservedMessages(opts) {
 	const { messageList, record } = opts;
-	const allMessages = messageList.get.all.db();
+	const allMessages = getObservableMessages(messageList);
 	const useMarkerBoundaryPruning = opts.useMarkerBoundaryPruning ?? true;
 	const preserveMessageIds = opts.preserveMessageIds ?? /* @__PURE__ */ new Set();
 	const observedIds = new Set(Array.isArray(record?.observedMessageIds) ? record.observedMessageIds : []);
@@ -26966,7 +26988,7 @@ var ObservationStrategy = class ObservationStrategy {
 	*/
 	async persistMarkerToMessage(marker, messageList, threadId, resourceId) {
 		if (!messageList) return false;
-		const allMsgs = messageList.get.all.db();
+		const allMsgs = getObservableMessages(messageList);
 		for (let i = allMsgs.length - 1; i >= 0; i--) {
 			const msg = allMsgs[i];
 			if (msg?.role === "assistant" && msg.content?.parts && Array.isArray(msg.content.parts)) {
@@ -27833,7 +27855,7 @@ var ObservationStep = class {
 		let didThresholdCleanup = false;
 		let observerExchange;
 		if (this.stepNumber === 0) {
-			const step0Messages = messageList.get.all.db();
+			const step0Messages = getObservableMessages(messageList);
 			const activation = await om.activate({
 				threadId,
 				resourceId,
@@ -27865,7 +27887,7 @@ var ObservationStep = class {
 				currentModel: this.turn.actorModelContext,
 				requestContext: this.turn.requestContext,
 				observabilityContext: this.turn.observabilityContext,
-				lastActivityAt: getLastActivityFromMessages(messageList.get.all.db()),
+				lastActivityAt: getLastActivityFromMessages(getObservableMessages(messageList)),
 				reflectionHooks: om.composeHooks(void 0, {
 					threadId,
 					resourceId,
@@ -27875,7 +27897,7 @@ var ObservationStep = class {
 			await this.turn.refreshRecord();
 			if (this.turn.record.generationCount > preReflectGeneration) reflected = true;
 		}
-		const allMsgsForToolCheck = messageList.get.all.db();
+		const allMsgsForToolCheck = getObservableMessages(messageList);
 		const lastMessage = allMsgsForToolCheck[allMsgsForToolCheck.length - 1];
 		const pendingStepMessages = [...messageList.get.input.db(), ...messageList.get.response.db()];
 		const latestStepParts = [...getLatestStepParts(lastMessage?.content?.parts ?? []), ...pendingStepMessages.flatMap((msg) => getLatestStepParts(msg.content?.parts ?? []))];
@@ -27884,10 +27906,10 @@ var ObservationStep = class {
 		let statusSnapshot = await om.getStatus({
 			threadId,
 			resourceId,
-			messages: messageList.get.all.db()
+			messages: getObservableMessages(messageList)
 		});
 		if (statusSnapshot.shouldBuffer && !hasIncompleteToolCalls) {
-			const allMessages = messageList.get.all.db();
+			const allMessages = getObservableMessages(messageList);
 			const unobservedMessages = om.getUnobservedMessages(allMessages, statusSnapshot.record);
 			const candidates = om.getUnobservedMessages(unobservedMessages, statusSnapshot.record, { excludeBuffered: true });
 			if (candidates.length > 0) {
@@ -27979,7 +28001,7 @@ var ObservationStep = class {
 			statusSnapshot = await om.getStatus({
 				threadId,
 				resourceId,
-				messages: messageList.get.all.db()
+				messages: getObservableMessages(messageList)
 			});
 		}
 		const otherThreadsContext = await this.turn.refreshOtherThreadsContext();
@@ -28028,7 +28050,7 @@ 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 observableMessages = this.seededResponseMessage ? getObservableMessages(messageList).filter((msg) => msg.id !== this.turn.responseMessageId) : getObservableMessages(messageList);
 		const freshStatus = await om.getStatus({
 			threadId,
 			resourceId,
@@ -28058,7 +28080,7 @@ var ObservationStep = class {
 					currentModel: this.turn.actorModelContext,
 					requestContext: this.turn.requestContext,
 					observabilityContext: this.turn.observabilityContext,
-					lastActivityAt: getLastActivityFromMessages(messageList.get.all.db()),
+					lastActivityAt: getLastActivityFromMessages(getObservableMessages(messageList)),
 					reflectionHooks: om.composeHooks(void 0, {
 						threadId,
 						resourceId,
@@ -28084,7 +28106,7 @@ var ObservationStep = class {
 		});
 		if (obsResult.observed) {
 			const observedMessageIds = new Set(obsResult.record.observedMessageIds ?? []);
-			const liveMessages = messageList.get.all.db();
+			const liveMessages = getObservableMessages(messageList);
 			let latestObservedIndex = -1;
 			for (let i = liveMessages.length - 1; i >= 0; i--) {
 				const message = liveMessages[i];
@@ -28257,7 +28279,7 @@ var ObservationTurn = class {
 		const asyncObservationEnabled = this.om.buffering.isAsyncObservationEnabled();
 		const bufferOnIdle = this.om.getObservationConfig().bufferOnIdle;
 		if (asyncObservationEnabled && bufferOnIdle) {
-			const allMessages = this.messageList.get.all.db();
+			const allMessages = getObservableMessages(this.messageList);
 			const record = this._record;
 			const unobservedMessages = this.om.getUnobservedMessages(allMessages, record);
 			if (unobservedMessages.length > 0) this.om.buffer({
@@ -28623,7 +28645,7 @@ function getCurrentModel$1(model) {
 	return formatModelContext$1(model?.provider, model?.modelId);
 }
 function getLastModelFromMessageList(messageList) {
-	const messages = messageList?.get.all.db();
+	const messages = messageList ? getObservableMessages(messageList) : void 0;
 	if (!messages) return void 0;
 	for (let i = messages.length - 1; i >= 0; i--) {
 		const message = messages[i];
@@ -30203,7 +30225,7 @@ var ObservationalMemory = class ObservationalMemory {
 	*/
 	async persistMarkerToMessage(marker, messageList, threadId, resourceId) {
 		if (!messageList) return;
-		const allMsgs = messageList.get.all.db();
+		const allMsgs = getObservableMessages(messageList);
 		for (let i = allMsgs.length - 1; i >= 0; i--) {
 			const msg = allMsgs[i];
 			if (msg?.role === "assistant" && msg.content?.parts && Array.isArray(msg.content.parts)) {
@@ -30881,7 +30903,7 @@ ${formattedMessages}
 	async cleanupMessages(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;
+		const allMsgs = messageList ? getObservableMessages(messageList) : opts.messages;
 		let markerIdx = -1;
 		let markerMsg = null;
 		for (let i = allMsgs.length - 1; i >= 0; i--) {
@@ -31995,7 +32017,7 @@ function isTemporalGapMarkerForMessage(message, targetMessageId) {
 async function insertTemporalGapMarkers({ messageList, sendSignal }) {
 	const latestInputMessage = messageList.get.input.db().filter((message) => Boolean(message)).at(-1);
 	if (!latestInputMessage || isTemporalGapMarker(latestInputMessage)) return;
-	const allMessages = messageList.get.all.db().filter((message) => Boolean(message));
+	const allMessages = getObservableMessages(messageList).filter((message) => Boolean(message));
 	const latestInputIndex = allMessages.findIndex((message) => message.id === latestInputMessage.id);
 	if (latestInputIndex <= 0) return;
 	if (allMessages.some((message) => isTemporalGapMarkerForMessage(message, latestInputMessage.id))) return;
@@ -32217,7 +32239,7 @@ var ObservationalMemoryProcessor = class {
 					threadId,
 					resourceId
 				});
-				const allDbMsgs = messageList.get.all.db();
+				const allDbMsgs = getObservableMessages(messageList);
 				const tokenCounter = this.engine.getTokenCounter();
 				const contextTokens = await tokenCounter.countMessagesAsync(allDbMsgs);
 				const otherThreadsContext = this.turn.context.otherThreadsContext;
@@ -32564,6 +32586,18 @@ var Memory = class extends MastraMemory {
 	_omEngine;
 	_omEngineInstance;
 	_mastraInstance;
+	/**
+	* Every vector cleanup that deleteThread or deleteMessages started in the background.
+	* Callers do not wait for the cleanup, so this handle is the only join point.
+	*/
+	pendingVectorCleanup = Promise.resolve();
+	/**
+	* Adds a background vector cleanup to the join handle.
+	* The handle keeps the earlier cleanups, so it settles only after all of them end.
+	*/
+	trackVectorCleanup(cleanup) {
+		this.pendingVectorCleanup = Promise.allSettled([this.pendingVectorCleanup, cleanup]).then(() => void 0);
+	}
 	/** The shared ObservationalMemory engine. Lazily created on first access. */
 	get omEngine() {
 		if (!this._omEngine) this._omEngine = this._initOMEngine().then((engine) => {
@@ -32828,26 +32862,40 @@ var Memory = class extends MastraMemory {
 		const thread = await memoryStore.getThreadById({ threadId });
 		await memoryStore.deleteThread({ threadId });
 		if (thread?.resourceId && memoryStore.supportsObservationalMemory) await memoryStore.clearObservationalMemory(threadId, thread.resourceId);
-		if (this.vector) this.deleteThreadVectors(threadId);
+		if (this.vector) this.trackVectorCleanup(this.deleteThreadVectors(threadId));
 	}
 	/**
-	* Lists all vector indexes that match the memory messages prefix.
-	* Handles separator differences across vector store backends (e.g. '_' vs '-').
+	* Prefix shared by every message index. The index for the default embedding
+	* dimension is named with the bare prefix; other dimensions add a suffix.
 	*/
-	async getMemoryVectorIndexes() {
+	get messageIndexPrefix() {
+		return this.getEmbeddingIndexName();
+	}
+	/**
+	* Prefix shared by every observation index. Each observation index adds a dimension suffix.
+	*/
+	get observationIndexPrefix() {
+		return `memory${this.vector?.indexSeparator ?? "_"}observations`;
+	}
+	/**
+	* Lists the vector indexes whose name starts with one of the given prefixes.
+	* Index names can carry a dimension suffix, so discovery matches on the prefix.
+	*/
+	async getMemoryVectorIndexes(prefixes) {
 		if (!this.vector) return [];
-		const prefix = `memory${this.vector.indexSeparator ?? "_"}messages`;
-		return (await this.vector.listIndexes()).filter((name) => name.startsWith(prefix));
+		return (await this.vector.listIndexes()).filter((name) => prefixes.some((prefix) => name.startsWith(prefix)));
 	}
 	/**
 	* Deletes all vector embeddings associated with a thread.
 	* This is called internally by deleteThread to clean up orphaned vectors.
+	* Both message and observation vectors are removed, so no text of the deleted
+	* thread stays reachable through resource-scoped retrieval.
 	*
 	* @param threadId - The ID of the thread whose vectors should be deleted
 	*/
 	async deleteThreadVectors(threadId) {
 		try {
-			const memoryIndexes = await this.getMemoryVectorIndexes();
+			const memoryIndexes = await this.getMemoryVectorIndexes([this.messageIndexPrefix, this.observationIndexPrefix]);
 			await Promise.all(memoryIndexes.map(async (indexName) => {
 				try {
 					await this.vector.deleteVectors({
@@ -32855,14 +32903,14 @@ var Memory = class extends MastraMemory {
 						filter: { thread_id: threadId }
 					});
 				} catch {
-					this.logger.debug("Failed to delete vectors for thread, skipping", {
+					this.logger.warn("Failed to delete vectors of the deleted thread from index", {
 						threadId,
 						indexName
 					});
 				}
 			}));
 		} catch {
-			this.logger.debug("Failed to clean up vectors for thread", { threadId });
+			this.logger.warn("Failed to clean up vectors of the deleted thread", { threadId });
 		}
 	}
 	async updateWorkingMemory({ threadId, resourceId, workingMemory, memoryConfig, observabilityContext }) {
@@ -33535,7 +33583,7 @@ Notes:
 	getObservationEmbeddingIndexName(dimensions) {
 		const usedDimensions = dimensions ?? 384;
 		const separator = this.vector?.indexSeparator ?? "_";
-		return `memory${separator}observations${separator}${usedDimensions}`;
+		return `${this.observationIndexPrefix}${separator}${usedDimensions}`;
 	}
 	async createObservationEmbeddingIndex(dimensions) {
 		const usedDimensions = dimensions ?? 384;
@@ -33781,7 +33829,10 @@ Notes:
 			tools[name] = tool;
 		}
 		const omConfig = normalizeObservationalMemoryConfig(mergedConfig.observationalMemory);
-		if (omConfig?.retrieval) tools.recall = recallTool(mergedConfig, { retrievalScope: typeof omConfig.retrieval === "object" ? omConfig.retrieval.scope ?? "resource" : "resource" });
+		if (omConfig?.retrieval) tools.recall = recallTool(mergedConfig, {
+			retrievalScope: typeof omConfig.retrieval === "object" ? omConfig.retrieval.scope ?? "resource" : "resource",
+			searchEnabled: this.hasRetrievalSearch(omConfig.retrieval)
+		});
 		return tools;
 	}
 	/**
@@ -33837,7 +33888,7 @@ Notes:
 				}));
 				const messageIdsNeedingDeletion = /* @__PURE__ */ new Set([...messageIdsWithClearedContent, ...messageIdsWithNewEmbeddings]);
 				if (messageIdsNeedingDeletion.size > 0) try {
-					const memoryIndexes = await this.getMemoryVectorIndexes();
+					const memoryIndexes = await this.getMemoryVectorIndexes([this.messageIndexPrefix]);
 					const idsToDelete = [...messageIdsNeedingDeletion];
 					await Promise.all(memoryIndexes.map(async (indexName) => {
 						for (let i = 0; i < idsToDelete.length; i += VECTOR_DELETE_BATCH_SIZE) {
@@ -33896,7 +33947,7 @@ Notes:
 		const span = this.createMemorySpan("delete", observabilityContext, void 0, { messageCount: messageIds.length });
 		try {
 			await (await this.getMemoryStore()).deleteMessages(messageIds);
-			if (this.vector) this.deleteMessageVectors(messageIds);
+			if (this.vector) this.trackVectorCleanup(this.deleteMessageVectors(messageIds));
 			span?.end({
 				output: { success: true },
 				attributes: { messageCount: messageIds.length }
@@ -33912,12 +33963,14 @@ Notes:
 	/**
 	* Deletes vector embeddings for specific messages.
 	* This is called internally by deleteMessages to clean up orphaned vectors.
+	* Only the message indexes are touched, because observation vectors can hold
+	* text of other messages of the thread.
 	*
 	* @param messageIds - The IDs of the messages whose vectors should be deleted
 	*/
 	async deleteMessageVectors(messageIds) {
 		try {
-			const memoryIndexes = await this.getMemoryVectorIndexes();
+			const memoryIndexes = await this.getMemoryVectorIndexes([this.messageIndexPrefix]);
 			await Promise.all(memoryIndexes.map(async (indexName) => {
 				for (let i = 0; i < messageIds.length; i += VECTOR_DELETE_BATCH_SIZE) {
 					const batch = messageIds.slice(i, i + VECTOR_DELETE_BATCH_SIZE);
@@ -44690,4 +44743,4 @@ const agentBuilderWorkflows = {
 //#endregion
 export { agentBuilderWorkflows };
 
-//# sourceMappingURL=dist-IUXZtNBY.js.map
+//# sourceMappingURL=dist-BKRMiJcn.js.map