@mastra/mysql 0.7.0-alpha.0 → 0.7.0-alpha.2

package/dist/index.js

@@ -4921,9 +4921,17 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 		if (row.type && row.type !== "v2") message.type = row.type;
 		return message;
 	}
-	async fetchMessagesForThread(threadId, limit) {
-		let sql = `SELECT id, thread_id, content, role, type, createdAt, resourceId FROM ${formatTableName(TABLE_MESSAGES)} WHERE ${quoteIdentifier("thread_id", "column name")} = ? ORDER BY ${quoteIdentifier("createdAt", "column name")} ASC`;
-		const params = [threadId];
+	/**
+	* Loads a thread's messages in chronological order.
+	*
+	* @param threadId - Thread to read.
+	* @param limit - Optional cap on the number of rows.
+	* @param resourceId - When set, returns only the rows owned by that resource.
+	*/
+	async fetchMessagesForThread(threadId, limit, resourceId) {
+		const resourceCondition = resourceId ? ` AND ${quoteIdentifier("resourceId", "column name")} = ?` : "";
+		let sql = `SELECT id, thread_id, content, role, type, createdAt, resourceId FROM ${formatTableName(TABLE_MESSAGES)} WHERE ${quoteIdentifier("thread_id", "column name")} = ?${resourceCondition} ORDER BY ${quoteIdentifier("createdAt", "column name")} ASC`;
+		const params = resourceId ? [threadId, resourceId] : [threadId];
 		if (limit && limit > 0) {
 			sql += ` LIMIT ?`;
 			params.push(limit);
@@ -4934,15 +4942,20 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 	/**
 	* Fetches included messages by ID, discovering their thread automatically.
 	* This handles cross-thread includes where the include item doesn't specify a threadId.
+	*
+	* @param include - Message ids to pin, each with an optional before/after window.
+	* @param resourceId - When set, restricts both the pinned messages and their context
+	* to that resource so an id from another resource returns nothing.
 	*/
-	async _getIncludedMessages({ include }) {
+	async _getIncludedMessages({ include, resourceId }) {
 		if (!include || include.length === 0) return null;
 		const tableName = formatTableName(TABLE_MESSAGES);
 		const selectColumns = `id, thread_id, content, role, type, createdAt, resourceId`;
+		const resourceCondition = resourceId ? ` AND m.${quoteIdentifier("resourceId", "column name")} = ?` : "";
 		const targetIds = include.map((inc) => inc.id).filter(Boolean);
 		if (targetIds.length === 0) return null;
 		const idPlaceholders = targetIds.map(() => "?").join(", ");
-		const [targetRows] = await this.pool.execute(`SELECT id, thread_id, createdAt FROM ${tableName} WHERE id IN (${idPlaceholders})`, targetIds);
+		const [targetRows] = await this.pool.execute(`SELECT id, thread_id, createdAt FROM ${tableName} WHERE id IN (${idPlaceholders})${resourceId ? ` AND ${quoteIdentifier("resourceId", "column name")} = ?` : ""}`, resourceId ? [...targetIds, resourceId] : targetIds);
 		if (!targetRows || targetRows.length === 0) return null;
 		const targetMap = new Map(targetRows.map((r) => [r.id, {
 			threadId: r.thread_id,
@@ -4960,21 +4973,23 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
         SELECT ${selectColumns}
         FROM ${tableName} m
         WHERE m.thread_id = ?
-          AND m.createdAt <= ?
+          AND m.createdAt <= ?${resourceCondition}
         ORDER BY m.createdAt DESC, m.id DESC
         LIMIT ${prevLimit}
       )`);
 			params.push(target.threadId, target.createdAt);
+			if (resourceId) params.push(resourceId);
 			if (nextLimit > 0) {
 				unionQueries.push(`(
           SELECT ${selectColumns}
           FROM ${tableName} m
           WHERE m.thread_id = ?
-            AND m.createdAt > ?
+            AND m.createdAt > ?${resourceCondition}
           ORDER BY m.createdAt ASC, m.id ASC
           LIMIT ${nextLimit}
         )`);
 				params.push(target.threadId, target.createdAt);
+				if (resourceId) params.push(resourceId);
 			}
 		}
 		if (unionQueries.length === 0) return null;
@@ -4982,7 +4997,17 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 		const [rows] = await this.pool.execute(finalQuery, params);
 		return rows;
 	}
-	async collectIncludeMessages({ threadId, include, messagesByThread }) {
+	/**
+	* Resolves include items against loaded threads, adding each pinned message and its
+	* before/after window.
+	*
+	* @param threadId - Thread used when an include item names no thread of its own.
+	* @param include - Message ids to pin, each with an optional before/after window.
+	* @param messagesByThread - Cache of thread snapshots, reused and filled as threads load.
+	* @param resourceId - When set, restricts both the pinned messages and their context
+	* to that resource so an id from another resource returns nothing.
+	*/
+	async collectIncludeMessages({ threadId, include, messagesByThread, resourceId }) {
 		if (!include?.length) return [];
 		const includeMessages = [];
 		const seenIds = /* @__PURE__ */ new Set();
@@ -4990,18 +5015,18 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 		const resolvedThreadIds = /* @__PURE__ */ new Map();
 		if (unresolvedIds.length > 0) {
 			const placeholders = unresolvedIds.map(() => "?").join(", ");
-			const [rows] = await this.pool.execute(`SELECT id, thread_id FROM ${formatTableName(TABLE_MESSAGES)} WHERE id IN (${placeholders})`, unresolvedIds);
+			const [rows] = await this.pool.execute(`SELECT id, thread_id FROM ${formatTableName(TABLE_MESSAGES)} WHERE id IN (${placeholders})${resourceId ? ` AND ${quoteIdentifier("resourceId", "column name")} = ?` : ""}`, resourceId ? [...unresolvedIds, resourceId] : unresolvedIds);
 			for (const row of rows) resolvedThreadIds.set(row.id, row.thread_id);
 		}
 		for (const inc of include) {
 			const targetThreadId = inc.threadId ?? resolvedThreadIds.get(inc.id) ?? threadId;
 			let threadMessages = messagesByThread.get(targetThreadId);
 			if (!threadMessages) {
-				threadMessages = (await this.fetchMessagesForThread(targetThreadId)).map((row) => this.mapMessage(row));
+				threadMessages = (await this.fetchMessagesForThread(targetThreadId, void 0, resourceId)).map((row) => this.mapMessage(row));
 				messagesByThread.set(targetThreadId, threadMessages);
 			}
 			if (!threadMessages.some((message) => message.id === inc.id) || (inc.withPreviousMessages ?? 0) > 0 || (inc.withNextMessages ?? 0) > 0 || threadMessages.length < (inc.withNextMessages ?? 0) + (inc.withPreviousMessages ?? 0) + 1) {
-				threadMessages = (await this.fetchMessagesForThread(targetThreadId)).map((row) => this.mapMessage(row));
+				threadMessages = (await this.fetchMessagesForThread(targetThreadId, void 0, resourceId)).map((row) => this.mapMessage(row));
 				messagesByThread.set(targetThreadId, threadMessages);
 			}
 			const targetIndex = threadMessages.findIndex((msg) => msg.id === inc.id);
@@ -5185,14 +5210,14 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 				tableName: TABLE_THREADS,
 				keys: { id },
 				data: {
-					title,
+					title: title ?? existing.title,
 					metadata: JSON.stringify(mergedMetadata),
 					updatedAt
 				}
 			});
 			return {
 				...existing,
-				title,
+				title: title ?? existing.title,
 				metadata: mergedMetadata,
 				updatedAt
 			};
@@ -5595,7 +5620,10 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeRows = await this._getIncludedMessages({ include });
+				const includeRows = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (!includeRows || includeRows.length === 0) return {
 					messages: [],
 					total: 0,
@@ -5633,7 +5661,8 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 			const includeMessages = await this.collectIncludeMessages({
 				threadId: primaryThreadId,
 				include,
-				messagesByThread
+				messagesByThread,
+				resourceId
 			});
 			const combinedMap = /* @__PURE__ */ new Map();
 			for (const msg of paginatedMain) combinedMap.set(msg.id, msg);
@@ -5721,7 +5750,7 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 			if (include && include.length > 0) {
 				const validInclude = (await Promise.all(include.map(async (inc) => {
 					if (inc.threadId) return inc;
-					const [msgRows] = await this.pool.execute(`SELECT thread_id FROM ${tableName} WHERE id = ? LIMIT 1`, [inc.id]);
+					const [msgRows] = await this.pool.execute(`SELECT thread_id FROM ${tableName} WHERE id = ? AND ${quoteIdentifier("resourceId", "column name")} = ? LIMIT 1`, [inc.id, resourceId]);
 					const threadId = msgRows?.[0]?.thread_id;
 					return threadId ? {
 						...inc,
@@ -5733,7 +5762,8 @@ var MemoryMySQL = class MemoryMySQL extends MemoryStorage {
 					const includeMessages = await this.collectIncludeMessages({
 						threadId: validInclude[0].threadId,
 						include: validInclude,
-						messagesByThread
+						messagesByThread,
+						resourceId
 					});
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);