@mastra/libsql 1.20.0-alpha.0 → 1.20.0-alpha.2

package/dist/index.js

@@ -6721,14 +6721,21 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
 		});
 	}
-	async _getIncludedMessages({ include }) {
+	/**
+	* Fetches included messages by ID, discovering their thread automatically.
+	* This handles cross-thread includes where the include item doesn't specify a threadId.
+	* When a resourceId is given, both the target lookup and the surrounding window stay
+	* inside that resource, so an include never leaks another resource's messages.
+	*/
+	async _getIncludedMessages({ include, resourceId }) {
 		if (!include || include.length === 0) return null;
 		const targetIds = include.map((inc) => inc.id).filter(Boolean);
 		if (targetIds.length === 0) return null;
+		const resourceCondition = resourceId ? ` AND "resourceId" = ?` : "";
 		const idPlaceholders = targetIds.map(() => "?").join(", ");
 		const targetResult = await this.#client.execute({
-			sql: `SELECT id, thread_id, "createdAt" FROM "${TABLE_MESSAGES}" WHERE id IN (${idPlaceholders})`,
-			args: targetIds
+			sql: `SELECT id, thread_id, "createdAt" FROM "${TABLE_MESSAGES}" WHERE id IN (${idPlaceholders})${resourceCondition}`,
+			args: resourceId ? [...targetIds, resourceId] : targetIds
 		});
 		if (!targetResult.rows || targetResult.rows.length === 0) return null;
 		const targetMap = new Map(targetResult.rows.map((r) => [r.id, {
@@ -6745,21 +6752,25 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
         SELECT id, content, role, type, "createdAt", thread_id, "resourceId"
         FROM "${TABLE_MESSAGES}"
         WHERE thread_id = ?
-          AND "createdAt" <= ?
+          AND "createdAt" <= ?${resourceCondition}
         ORDER BY "createdAt" DESC, id DESC
         LIMIT ?
       )`);
-			params.push(target.threadId, target.createdAt, withPreviousMessages + 1);
+			params.push(target.threadId, target.createdAt);
+			if (resourceId) params.push(resourceId);
+			params.push(withPreviousMessages + 1);
 			if (withNextMessages > 0) {
 				unionQueries.push(`SELECT * FROM (
           SELECT id, content, role, type, "createdAt", thread_id, "resourceId"
           FROM "${TABLE_MESSAGES}"
           WHERE thread_id = ?
-            AND "createdAt" > ?
+            AND "createdAt" > ?${resourceCondition}
           ORDER BY "createdAt" ASC, id ASC
           LIMIT ?
         )`);
-				params.push(target.threadId, target.createdAt, withNextMessages);
+				params.push(target.threadId, target.createdAt);
+				if (resourceId) params.push(resourceId);
+				params.push(withNextMessages);
 			}
 		}
 		if (unionQueries.length === 0) return null;
@@ -6855,7 +6866,10 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (!includeMessages || includeMessages.length === 0) return {
 					messages: [],
 					total: 0,
@@ -6896,7 +6910,10 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);
@@ -6975,7 +6992,10 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (!includeMessages || includeMessages.length === 0) return {
 					messages: [],
 					total: 0,
@@ -7015,7 +7035,10 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);
@@ -7426,7 +7449,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 		const now = /* @__PURE__ */ new Date();
 		const updatedThread = {
 			...thread,
-			title,
+			title: title ?? thread.title,
 			metadata: {
 				...thread.metadata,
 				...metadata
@@ -7435,9 +7458,9 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 		};
 		try {
 			await this.#client.execute({
-				sql: `UPDATE ${TABLE_THREADS} SET title = ?, metadata = jsonb(?), updatedAt = ? WHERE id = ?`,
+				sql: `UPDATE ${TABLE_THREADS} SET title = COALESCE(?, title), metadata = jsonb(?), updatedAt = ? WHERE id = ?`,
 				args: [
-					title,
+					title ?? null,
 					JSON.stringify(updatedThread.metadata),
 					now.toISOString(),
 					id