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

package/dist/{src-DhCg-LqR.cjs → src-Ch_8ufgu.cjs}

@@ -33294,22 +33294,32 @@ var Memory = class Memory extends _mastra_core_memory.MastraMemory {
 			if (resourceScope && !resourceId && config?.semanticRecall && vectorSearchString) throw new Error("Memory error: Resource-scoped semantic recall is enabled but no resourceId was provided. Either provide a resourceId or explicitly set semanticRecall.scope to 'thread'.");
 			let usage;
 			if (config?.semanticRecall && vectorSearchString && this.vector) {
-				const result = await this.embedMessageContent(vectorSearchString);
-				usage = result.usage;
-				const { embeddings, dimension } = result;
-				const { indexName } = await this.createEmbeddingIndex(dimension, config);
-				await Promise.all(embeddings.map(async (embedding) => {
-					if (typeof this.vector === `undefined`) throw new Error(`Tried to query vector index ${indexName} but this Memory instance doesn't have an attached vector db.`);
-					const scopeFilter = resourceScope ? { resource_id: resourceId } : { thread_id: threadId };
-					const userFilter = typeof config.semanticRecall === "object" ? config.semanticRecall.filter : void 0;
-					const combinedFilter = userFilter ? { $and: [scopeFilter, userFilter] } : scopeFilter;
+				const scopeFilter = resourceScope ? { resource_id: resourceId } : { thread_id: threadId };
+				const userFilter = typeof config.semanticRecall === "object" ? config.semanticRecall.filter : void 0;
+				const combinedFilter = userFilter ? { $and: [scopeFilter, userFilter] } : scopeFilter;
+				if (this.isSelfEmbedding) {
+					const { indexName } = await this.createEmbeddingIndex(void 0, config);
 					vectorResults.push(...await this.vector.query({
 						indexName,
-						queryVector: embedding,
+						queryText: vectorSearchString,
 						topK: vectorConfig.topK,
 						filter: combinedFilter
 					}));
-				}));
+				} else {
+					const result = await this.embedMessageContent(vectorSearchString);
+					usage = result.usage;
+					const { embeddings, dimension } = result;
+					const { indexName } = await this.createEmbeddingIndex(dimension, config);
+					await Promise.all(embeddings.map(async (embedding) => {
+						if (typeof this.vector === `undefined`) throw new Error(`Tried to query vector index ${indexName} but this Memory instance doesn't have an attached vector db.`);
+						vectorResults.push(...await this.vector.query({
+							indexName,
+							queryVector: embedding,
+							topK: vectorConfig.topK,
+							filter: combinedFilter
+						}));
+					}));
+				}
 			}
 			const threshold = (typeof config.semanticRecall === "object" ? config.semanticRecall : void 0)?.threshold;
 			const filteredVectorResults = threshold !== void 0 ? vectorResults.filter((r) => r.score >= threshold) : vectorResults;
@@ -33467,11 +33477,13 @@ var Memory = class Memory extends _mastra_core_memory.MastraMemory {
 		if (this.vector) this.trackVectorCleanup(this.deleteThreadVectors(threadId));
 	}
 	/**
-	* Prefix shared by every message index. The index for the default embedding
-	* dimension is named with the bare prefix; other dimensions add a suffix.
+	* Prefix shared by every message index. The index for the default embedding dimension is named
+	* with the bare prefix; other dimensions add a dimension suffix, and a store that embeds the
+	* text itself adds its own. Built here rather than read from `getEmbeddingIndexName()`, which
+	* answers for one configuration and so would not match indexes written under another.
 	*/
 	get messageIndexPrefix() {
-		return this.getEmbeddingIndexName();
+		return `memory${this.vector?.indexSeparator ?? "_"}messages`;
 	}
 	/**
 	* Prefix shared by every observation index. Each observation index adds a dimension suffix.
@@ -33756,13 +33768,24 @@ ${workingMemory}`;
 						if (joined) textForEmbedding = joined;
 					}
 					if (!textForEmbedding) return;
-					const result = await this.embedMessageContent(textForEmbedding);
-					dimension = result.dimension;
-					if (result.usage?.tokens) totalTokens += result.usage.tokens;
+					let embeddings = [];
+					let documents;
+					let chunks;
+					if (this.isSelfEmbedding) {
+						chunks = this.chunkText(textForEmbedding);
+						documents = chunks;
+					} else {
+						const result = await this.embedMessageContent(textForEmbedding);
+						dimension = result.dimension;
+						if (result.usage?.tokens) totalTokens += result.usage.tokens;
+						embeddings = result.embeddings;
+						chunks = result.chunks;
+					}
 					const threadMetadata = message.threadId ? threadMetadataMap.get(message.threadId) || {} : {};
 					embeddingData.push({
-						embeddings: result.embeddings,
-						metadata: result.chunks.map(() => ({
+						embeddings,
+						documents,
+						metadata: chunks.map(() => ({
 							...threadMetadata,
 							message_id: message.id,
 							thread_id: message.threadId,
@@ -33773,16 +33796,23 @@ ${workingMemory}`;
 						}))
 					});
 				}));
-				if (embeddingData.length > 0 && dimension !== void 0) {
+				if (embeddingData.length > 0 && (this.isSelfEmbedding || dimension !== void 0)) {
 					if (typeof this.vector === `undefined`) throw new Error(`Tried to upsert embeddings but this Memory instance doesn't have an attached vector db.`);
 					const { indexName } = await this.createEmbeddingIndex(dimension, config);
 					const allVectors = [];
 					const allMetadata = [];
+					const allDocuments = [];
 					for (const data of embeddingData) {
 						allVectors.push(...data.embeddings);
+						if (data.documents) allDocuments.push(...data.documents);
 						allMetadata.push(...data.metadata);
 					}
-					await this.vector.upsert({
+					if (this.isSelfEmbedding) await this.vector.upsert({
+						indexName,
+						documents: allDocuments,
+						metadata: allMetadata
+					});
+					else await this.vector.upsert({
 						indexName,
 						vectors: allVectors,
 						metadata: allMetadata
@@ -34567,11 +34597,22 @@ Notes:
 						}
 					}
 					if (textForEmbedding) {
-						const result = await this.embedMessageContent(textForEmbedding);
-						dimension = result.dimension;
+						let embeddings = [];
+						let documents;
+						let chunks;
+						if (this.isSelfEmbedding) {
+							chunks = this.chunkText(textForEmbedding);
+							documents = chunks;
+						} else {
+							const result = await this.embedMessageContent(textForEmbedding);
+							dimension = result.dimension;
+							embeddings = result.embeddings;
+							chunks = result.chunks;
+						}
 						embeddingData.push({
-							embeddings: result.embeddings,
-							metadata: result.chunks.map(() => ({
+							embeddings,
+							documents,
+							metadata: chunks.map(() => ({
 								message_id: message.id,
 								thread_id: existingMessage.threadId,
 								resource_id: existingMessage.resourceId,
@@ -34606,15 +34647,22 @@ Notes:
 				} catch {
 					this.logger.debug("Failed to clean up old vectors during message update");
 				}
-				if (embeddingData.length > 0 && dimension !== void 0) {
+				if (embeddingData.length > 0 && (this.isSelfEmbedding || dimension !== void 0)) {
 					const { indexName } = await this.createEmbeddingIndex(dimension, config);
 					const allVectors = [];
 					const allMetadata = [];
+					const allDocuments = [];
 					for (const data of embeddingData) {
 						allVectors.push(...data.embeddings);
+						if (data.documents) allDocuments.push(...data.documents);
 						allMetadata.push(...data.metadata);
 					}
-					await this.vector.upsert({
+					if (this.isSelfEmbedding) await this.vector.upsert({
+						indexName,
+						documents: allDocuments,
+						metadata: allMetadata
+					});
+					else await this.vector.upsert({
 						indexName,
 						vectors: allVectors,
 						metadata: allMetadata
@@ -34801,7 +34849,7 @@ Notes:
 			await this.rollbackCopiedThread(memoryStore, result.thread, "OM clone", false, priorDestinationResourceWm);
 			throw error;
 		}
-		if (this.vector && this.embedder && config.semanticRecall) try {
+		if (this.vector && (this.embedder || this.isSelfEmbedding) && config.semanticRecall) try {
 			await this.embedCopiedMessagesInBatches(memoryStore, result, config);
 		} catch (error) {
 			await this.rollbackCopiedThread(memoryStore, result.thread, "embedding", true, priorDestinationResourceWm);
@@ -34870,7 +34918,7 @@ Notes:
 	async updateThreadResourceId({ threadId, resourceId, memoryConfig }) {
 		const memoryStore = await this.getMemoryStore();
 		const config = this.getMergedThreadConfig(memoryConfig);
-		const migratesVectors = Boolean(this.vector && this.embedder && config.semanticRecall);
+		const migratesVectors = Boolean(this.vector && (this.embedder || this.isSelfEmbedding) && config.semanticRecall);
 		if (!migratesVectors) {
 			const existing = await memoryStore.getThreadById({ threadId });
 			if (existing && existing.resourceId === resourceId) return existing;
@@ -34976,7 +35024,7 @@ Notes:
 	* This is similar to the embedding logic in saveMessages but operates on already-saved messages.
 	*/
 	async embedClonedMessages(messages, config) {
-		if (!this.vector || !this.embedder) return;
+		if (!this.vector || !this.embedder && !this.isSelfEmbedding) return;
 		const embeddingData = [];
 		let dimension;
 		await Promise.all(messages.map(async (message) => {
@@ -34987,11 +35035,22 @@ Notes:
 				if (joined) textForEmbedding = joined;
 			}
 			if (!textForEmbedding) return;
-			const result = await this.embedMessageContent(textForEmbedding);
-			dimension = result.dimension;
+			let embeddings = [];
+			let documents;
+			let chunks;
+			if (this.isSelfEmbedding) {
+				chunks = this.chunkText(textForEmbedding);
+				documents = chunks;
+			} else {
+				const result = await this.embedMessageContent(textForEmbedding);
+				dimension = result.dimension;
+				embeddings = result.embeddings;
+				chunks = result.chunks;
+			}
 			embeddingData.push({
-				embeddings: result.embeddings,
-				metadata: result.chunks.map(() => ({
+				embeddings,
+				documents,
+				metadata: chunks.map(() => ({
 					message_id: message.id,
 					thread_id: message.threadId,
 					resource_id: message.resourceId,
@@ -35001,15 +35060,22 @@ Notes:
 				}))
 			});
 		}));
-		if (embeddingData.length > 0 && dimension !== void 0) {
+		if (embeddingData.length > 0 && (this.isSelfEmbedding || dimension !== void 0)) {
 			const { indexName } = await this.createEmbeddingIndex(dimension, config);
 			const allVectors = [];
 			const allMetadata = [];
+			const allDocuments = [];
 			for (const data of embeddingData) {
 				allVectors.push(...data.embeddings);
+				if (data.documents) allDocuments.push(...data.documents);
 				allMetadata.push(...data.metadata);
 			}
-			await this.vector.upsert({
+			if (this.isSelfEmbedding) await this.vector.upsert({
+				indexName,
+				documents: allDocuments,
+				metadata: allMetadata
+			});
+			else await this.vector.upsert({
 				indexName,
 				vectors: allVectors,
 				metadata: allMetadata
@@ -35498,4 +35564,4 @@ Object.defineProperty(exports, "wrapInObservationGroup", {
 	}
 });
 
-//# sourceMappingURL=src-DhCg-LqR.cjs.map
+//# sourceMappingURL=src-Ch_8ufgu.cjs.map