@mastra/libsql 1.25.1 → 1.25.2-alpha.0

package/dist/index.js

@@ -7861,6 +7861,14 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			initialBackoffMs: config.initialBackoffMs
 		});
 	}
+	/**
+	* Runs a write behind the per-client write lock and retries it on transient SQLite lock
+	* errors (`SQLITE_BUSY`), like the shared `LibSQLDB` writes. Each retry re-queues on the lock.
+	* `fn` must be safe to rerun: a single statement, a batch, or a transaction that rolls back.
+	*/
+	#write(operation, fn) {
+		return this.#db.executeWriteOperationWithRetry(() => withClientWriteLock(this.#client, fn), operation);
+	}
 	async init() {
 		await this.#db.createTable({
 			tableName: TABLE_THREADS,
@@ -8362,9 +8370,9 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			const threadUpdateStatement = batchStatements[batchStatements.length - 1];
 			for (let i = 0; i < messageStatements.length; i += BATCH_SIZE) {
 				const batch = messageStatements.slice(i, i + BATCH_SIZE);
-				if (batch.length > 0) await this.#client.batch(batch, "write");
+				if (batch.length > 0) await this.#write("saveMessages", () => this.#client.batch(batch, "write"));
 			}
-			if (threadUpdateStatement) await this.#client.execute(threadUpdateStatement);
+			if (threadUpdateStatement) await this.#write("saveMessages", () => this.#client.execute(threadUpdateStatement));
 			return { messages: new MessageList().add(messages, "memory").get.all.db() };
 		} catch (error) {
 			throw new MastraError({
@@ -8430,7 +8438,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			sql: `UPDATE ${TABLE_THREADS} SET updatedAt = ? WHERE id = ?`,
 			args: [now, threadId]
 		});
-		await this.#client.batch(batchStatements, "write");
+		await this.#write("updateMessages", () => this.#client.batch(batchStatements, "write"));
 		return (await this.#client.execute({
 			sql: selectSql,
 			args: messageIds
@@ -8440,35 +8448,37 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 		if (!messageIds || messageIds.length === 0) return;
 		try {
 			const BATCH_SIZE = 100;
-			const threadIds = /* @__PURE__ */ new Set();
-			const tx = await this.#client.transaction("write");
-			try {
-				for (let i = 0; i < messageIds.length; i += BATCH_SIZE) {
-					const batch = messageIds.slice(i, i + BATCH_SIZE);
-					const placeholders = batch.map(() => "?").join(",");
-					(await tx.execute({
-						sql: `SELECT DISTINCT thread_id FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
-						args: batch
-					})).rows?.forEach((row) => {
-						if (row.thread_id) threadIds.add(row.thread_id);
-					});
-					await tx.execute({
-						sql: `DELETE FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
-						args: batch
-					});
-				}
-				if (threadIds.size > 0) {
-					const now = (/* @__PURE__ */ new Date()).toISOString();
-					for (const threadId of threadIds) await tx.execute({
-						sql: `UPDATE "${TABLE_THREADS}" SET "updatedAt" = ? WHERE id = ?`,
-						args: [now, threadId]
-					});
+			await this.#write("deleteMessages", async () => {
+				const threadIds = /* @__PURE__ */ new Set();
+				const tx = await this.#client.transaction("write");
+				try {
+					for (let i = 0; i < messageIds.length; i += BATCH_SIZE) {
+						const batch = messageIds.slice(i, i + BATCH_SIZE);
+						const placeholders = batch.map(() => "?").join(",");
+						(await tx.execute({
+							sql: `SELECT DISTINCT thread_id FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
+							args: batch
+						})).rows?.forEach((row) => {
+							if (row.thread_id) threadIds.add(row.thread_id);
+						});
+						await tx.execute({
+							sql: `DELETE FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
+							args: batch
+						});
+					}
+					if (threadIds.size > 0) {
+						const now = (/* @__PURE__ */ new Date()).toISOString();
+						for (const threadId of threadIds) await tx.execute({
+							sql: `UPDATE "${TABLE_THREADS}" SET "updatedAt" = ? WHERE id = ?`,
+							args: [now, threadId]
+						});
+					}
+					await tx.commit();
+				} catch (error) {
+					await tx.rollback();
+					throw error;
 				}
-				await tx.commit();
-			} catch (error) {
-				await tx.rollback();
-				throw error;
-			}
+			});
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("LIBSQL", "DELETE_MESSAGES", "FAILED"),
@@ -8533,10 +8543,10 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 		updates.push("updatedAt = ?");
 		values.push(updatedResource.updatedAt.toISOString());
 		values.push(resourceId);
-		await this.#client.execute({
+		await this.#write("updateResource", () => this.#client.execute({
 			sql: `UPDATE ${TABLE_RESOURCES} SET ${updates.join(", ")} WHERE id = ?`,
 			args: values
-		});
+		}));
 		return updatedResource;
 	}
 	async getThreadById({ threadId, resourceId }) {
@@ -8573,49 +8583,51 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	*/
 	async updateThreadResourceId({ threadId, resourceId }) {
 		try {
-			const tx = await this.#client.transaction("write");
-			try {
-				const row = (await tx.execute({
-					sql: `SELECT * FROM "${TABLE_THREADS}" WHERE id = ?`,
-					args: [threadId]
-				})).rows?.[0];
-				if (!row) throw new Error(`Thread "${threadId}" not found`);
-				const currentResourceId = row.resourceId;
-				const normalized = {
-					id: row.id,
-					resourceId: currentResourceId,
-					title: row.title,
-					metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata) : row.metadata,
-					createdAt: new Date(row.createdAt),
-					updatedAt: new Date(row.updatedAt)
-				};
-				if (currentResourceId === resourceId) {
+			return await this.#write("updateThreadResourceId", async () => {
+				const tx = await this.#client.transaction("write");
+				try {
+					const row = (await tx.execute({
+						sql: `SELECT * FROM "${TABLE_THREADS}" WHERE id = ?`,
+						args: [threadId]
+					})).rows?.[0];
+					if (!row) throw new Error(`Thread "${threadId}" not found`);
+					const currentResourceId = row.resourceId;
+					const normalized = {
+						id: row.id,
+						resourceId: currentResourceId,
+						title: row.title,
+						metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata) : row.metadata,
+						createdAt: new Date(row.createdAt),
+						updatedAt: new Date(row.updatedAt)
+					};
+					if (currentResourceId === resourceId) {
+						await tx.commit();
+						return normalized;
+					}
+					const now = /* @__PURE__ */ new Date();
+					await tx.execute({
+						sql: `UPDATE "${TABLE_THREADS}" SET "resourceId" = ?, "updatedAt" = ? WHERE id = ?`,
+						args: [
+							resourceId,
+							now.toISOString(),
+							threadId
+						]
+					});
+					await tx.execute({
+						sql: `UPDATE "${TABLE_MESSAGES}" SET "resourceId" = ? WHERE thread_id = ?`,
+						args: [resourceId, threadId]
+					});
 					await tx.commit();
-					return normalized;
-				}
-				const now = /* @__PURE__ */ new Date();
-				await tx.execute({
-					sql: `UPDATE "${TABLE_THREADS}" SET "resourceId" = ?, "updatedAt" = ? WHERE id = ?`,
-					args: [
+					return {
+						...normalized,
 						resourceId,
-						now.toISOString(),
-						threadId
-					]
-				});
-				await tx.execute({
-					sql: `UPDATE "${TABLE_MESSAGES}" SET "resourceId" = ? WHERE thread_id = ?`,
-					args: [resourceId, threadId]
-				});
-				await tx.commit();
-				return {
-					...normalized,
-					resourceId,
-					updatedAt: now
-				};
-			} catch (error) {
-				await tx.rollback();
-				throw error;
-			}
+						updatedAt: now
+					};
+				} catch (error) {
+					await tx.rollback();
+					throw error;
+				}
+			});
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("LIBSQL", "UPDATE_THREAD_RESOURCE_ID", "FAILED"),
@@ -8777,7 +8789,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			updatedAt: now
 		};
 		try {
-			await this.#client.execute({
+			await this.#write("updateThread", () => this.#client.execute({
 				sql: `UPDATE ${TABLE_THREADS} SET title = COALESCE(?, title), metadata = jsonb(?), updatedAt = ? WHERE id = ?`,
 				args: [
 					title ?? null,
@@ -8785,7 +8797,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 					now.toISOString(),
 					id
 				]
-			});
+			}));
 			return updatedThread;
 		} catch (error) {
 			throw new MastraError({
@@ -8799,14 +8811,14 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async deleteThread({ threadId }) {
 		try {
-			await this.#client.execute({
+			await this.#write("deleteThread", () => this.#client.execute({
 				sql: `DELETE FROM ${TABLE_MESSAGES} WHERE thread_id = ?`,
 				args: [threadId]
-			});
-			await this.#client.execute({
+			}));
+			await this.#write("deleteThread", () => this.#client.execute({
 				sql: `DELETE FROM ${TABLE_THREADS} WHERE id = ?`,
 				args: [threadId]
-			});
+			}));
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("LIBSQL", "DELETE_THREAD", "FAILED"),
@@ -8879,48 +8891,50 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 				createdAt: now,
 				updatedAt: now
 			};
-			const tx = await this.#client.transaction("write");
-			try {
-				await tx.execute({
-					sql: `INSERT INTO "${TABLE_THREADS}" (id, "resourceId", title, metadata, "createdAt", "updatedAt")
-                VALUES (?, ?, ?, jsonb(?), ?, ?)`,
-					args: [
-						newThread.id,
-						newThread.resourceId,
-						newThread.title ?? "",
-						JSON.stringify(newThread.metadata),
-						nowStr,
-						nowStr
-					]
-				});
-				const messageIdMap = {};
-				const targetResourceId = resourceId || sourceThread.resourceId;
-				for (const sourceMsg of sourceMessages) {
-					const newMessageId = crypto.randomUUID();
-					const sourceMsgId = sourceMsg.id;
-					messageIdMap[sourceMsgId] = newMessageId;
-					const insertResult = await tx.execute({
-						sql: `INSERT INTO "${TABLE_MESSAGES}" (id, thread_id, content, role, type, "createdAt", "resourceId")
-                  SELECT ?, ?, content, role, type, "createdAt", ?
-                  FROM "${TABLE_MESSAGES}" WHERE id = ?`,
+			return await this.#write("copyThread", async () => {
+				const tx = await this.#client.transaction("write");
+				try {
+					await tx.execute({
+						sql: `INSERT INTO "${TABLE_THREADS}" (id, "resourceId", title, metadata, "createdAt", "updatedAt")
+                  VALUES (?, ?, ?, jsonb(?), ?, ?)`,
 						args: [
-							newMessageId,
-							newThreadId,
-							targetResourceId,
-							sourceMsgId
+							newThread.id,
+							newThread.resourceId,
+							newThread.title ?? "",
+							JSON.stringify(newThread.metadata),
+							nowStr,
+							nowStr
 						]
 					});
-					if (insertResult.rowsAffected !== 1) throw new Error(`Failed to copy message ${sourceMsgId}: expected 1 row copied but got ${insertResult.rowsAffected}`);
+					const messageIdMap = {};
+					const targetResourceId = resourceId || sourceThread.resourceId;
+					for (const sourceMsg of sourceMessages) {
+						const newMessageId = crypto.randomUUID();
+						const sourceMsgId = sourceMsg.id;
+						messageIdMap[sourceMsgId] = newMessageId;
+						const insertResult = await tx.execute({
+							sql: `INSERT INTO "${TABLE_MESSAGES}" (id, thread_id, content, role, type, "createdAt", "resourceId")
+                    SELECT ?, ?, content, role, type, "createdAt", ?
+                    FROM "${TABLE_MESSAGES}" WHERE id = ?`,
+							args: [
+								newMessageId,
+								newThreadId,
+								targetResourceId,
+								sourceMsgId
+							]
+						});
+						if (insertResult.rowsAffected !== 1) throw new Error(`Failed to copy message ${sourceMsgId}: expected 1 row copied but got ${insertResult.rowsAffected}`);
+					}
+					await tx.commit();
+					return {
+						thread: newThread,
+						messageIdMap
+					};
+				} catch (error) {
+					await tx.rollback();
+					throw error;
 				}
-				await tx.commit();
-				return {
-					thread: newThread,
-					messageIdMap
-				};
-			} catch (error) {
-				await tx.rollback();
-				throw error;
-			}
+			});
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({
@@ -9080,7 +9094,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 				config: input.config,
 				observedTimezone: input.observedTimezone
 			};
-			await withClientWriteLock(this.#client, () => this.#client.execute({
+			await this.#write("initializeObservationalMemory", () => this.#client.execute({
 				sql: `INSERT INTO "${OM_TABLE}" (
             id, "lookupKey", scope, "resourceId", "threadId",
             "activeObservations", "activeObservationsPendingUpdate",
@@ -9132,7 +9146,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	async insertObservationalMemoryRecord(record) {
 		try {
 			const lookupKey = this.getOMKey(record.threadId, record.resourceId);
-			await withClientWriteLock(this.#client, () => this.#client.execute({
+			await this.#write("insertObservationalMemoryRecord", () => this.#client.execute({
 				sql: `INSERT INTO "${OM_TABLE}" (
             id, "lookupKey", scope, "resourceId", "threadId",
             "activeObservations", "activeObservationsPendingUpdate",
@@ -9196,7 +9210,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 		try {
 			const now = /* @__PURE__ */ new Date();
 			const observedMessageIdsJson = input.observedMessageIds ? JSON.stringify(input.observedMessageIds) : null;
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("updateActiveObservations", () => this.#client.execute({
 				sql: `UPDATE "${OM_TABLE}" SET
             "activeObservations" = ?,
             "lastObservedAt" = ?,
@@ -9234,7 +9248,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async createReflectionGeneration(input) {
 		try {
-			return await withClientWriteLock(this.#client, async () => {
+			return await this.#write("createReflectionGeneration", async () => {
 				const tx = await this.#client.transaction("write");
 				try {
 					const record = await this.#insertReflectionGeneration(tx, input);
@@ -9330,7 +9344,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async setReflectingFlag(id, isReflecting) {
 		try {
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("setReflectingFlag", () => this.#client.execute({
 				sql: `UPDATE "${OM_TABLE}" SET "isReflecting" = ?, "updatedAt" = ? WHERE id = ?`,
 				args: [
 					isReflecting,
@@ -9362,7 +9376,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async setObservingFlag(id, isObserving) {
 		try {
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("setObservingFlag", () => this.#client.execute({
 				sql: `UPDATE "${OM_TABLE}" SET "isObserving" = ?, "updatedAt" = ? WHERE id = ?`,
 				args: [
 					isObserving,
@@ -9413,7 +9427,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 					id
 				];
 			}
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("setBufferingObservationFlag", () => this.#client.execute({
 				sql,
 				args
 			}))).rowsAffected === 0) throw new MastraError({
@@ -9443,7 +9457,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async setBufferingReflectionFlag(id, isBuffering) {
 		try {
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("setBufferingReflectionFlag", () => this.#client.execute({
 				sql: `UPDATE "${OM_TABLE}" SET "isBufferingReflection" = ?, "updatedAt" = ? WHERE id = ?`,
 				args: [
 					isBuffering,
@@ -9476,7 +9490,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	async clearObservationalMemory(threadId, resourceId) {
 		try {
 			const lookupKey = this.getOMKey(threadId, resourceId);
-			await withClientWriteLock(this.#client, () => this.#client.execute({
+			await this.#write("clearObservationalMemory", () => this.#client.execute({
 				sql: `DELETE FROM "${OM_TABLE}" WHERE "lookupKey" = ?`,
 				args: [lookupKey]
 			}));
@@ -9494,7 +9508,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async setPendingMessageTokens(id, tokenCount) {
 		try {
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("setPendingMessageTokens", () => this.#client.execute({
 				sql: `UPDATE "${OM_TABLE}" SET 
             "pendingMessageTokens" = ?, 
             "updatedAt" = ? 
@@ -9529,7 +9543,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async updateObservationalMemoryConfig(input) {
 		try {
-			await withClientWriteLock(this.#client, async () => {
+			await this.#write("updateObservationalMemoryConfig", async () => {
 				const tx = await this.#client.transaction("write");
 				try {
 					const selectResult = await tx.execute({
@@ -9573,7 +9587,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	async updateBufferedObservations(input) {
 		try {
 			const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-			await withClientWriteLock(this.#client, async () => {
+			await this.#write("updateBufferedObservations", async () => {
 				const tx = await this.#client.transaction("write");
 				try {
 					const current = await tx.execute({
@@ -9654,7 +9668,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	async swapBufferedToActive(input) {
 		try {
 			const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-			return await withClientWriteLock(this.#client, async () => {
+			return await this.#write("swapBufferedToActive", async () => {
 				const tx = await this.#client.transaction("write");
 				try {
 					const current = await tx.execute({
@@ -9803,7 +9817,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	async updateBufferedReflection(input) {
 		try {
 			const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-			if ((await withClientWriteLock(this.#client, () => this.#client.execute({
+			if ((await this.#write("updateBufferedReflection", () => this.#client.execute({
 				sql: `UPDATE "${OM_TABLE}" SET
             "bufferedReflection" = CASE
               WHEN "bufferedReflection" IS NOT NULL AND "bufferedReflection" != ''
@@ -9843,7 +9857,7 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 	}
 	async swapBufferedReflectionToActive(input) {
 		try {
-			return await withClientWriteLock(this.#client, async () => {
+			return await this.#write("swapBufferedReflectionToActive", async () => {
 				const tx = await this.#client.transaction("write");
 				try {
 					const current = await tx.execute({