@mastra/libsql 1.22.5 → 1.22.6-alpha.0

package/dist/index.js

@@ -4140,94 +4140,122 @@ var DatasetsLibSQL = class extends DatasetsStorage {
 	}
 	async _doUpdateItem(args) {
 		try {
-			const existing = await this.getItemById({ id: args.id });
-			if (!existing) throw new MastraError({
-				id: createStorageErrorId("LIBSQL", "UPDATE_ITEM", "NOT_FOUND"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: { itemId: args.id }
-			});
-			if (existing.datasetId !== args.datasetId) throw new MastraError({
-				id: createStorageErrorId("LIBSQL", "UPDATE_ITEM", "DATASET_MISMATCH"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: {
-					itemId: args.id,
-					expectedDatasetId: args.datasetId,
-					actualDatasetId: existing.datasetId
+			return await withClientWriteLock(this.#client, async () => {
+				const tx = await this.#client.transaction("write");
+				try {
+					const itemResult = await tx.execute({
+						sql: `SELECT ${buildSelectColumns(TABLE_DATASET_ITEMS)} FROM ${TABLE_DATASET_ITEMS} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
+						args: [args.id]
+					});
+					const existing = itemResult.rows[0] ? this.transformItemRow(itemResult.rows[0]) : null;
+					if (!existing) throw new MastraError({
+						id: createStorageErrorId("LIBSQL", "UPDATE_ITEM", "NOT_FOUND"),
+						domain: ErrorDomain.STORAGE,
+						category: ErrorCategory.USER,
+						details: { itemId: args.id }
+					});
+					if (existing.datasetId !== args.datasetId) throw new MastraError({
+						id: createStorageErrorId("LIBSQL", "UPDATE_ITEM", "DATASET_MISMATCH"),
+						domain: ErrorDomain.STORAGE,
+						category: ErrorCategory.USER,
+						details: {
+							itemId: args.id,
+							expectedDatasetId: args.datasetId,
+							actualDatasetId: existing.datasetId
+						}
+					});
+					if (existing.metadata?.__purged === true) throw new MastraError({
+						id: "DATASET_ITEM_PURGED",
+						domain: ErrorDomain.STORAGE,
+						category: ErrorCategory.USER,
+						details: {
+							datasetId: args.datasetId,
+							itemId: args.id
+						},
+						text: `Purged dataset item cannot be updated: ${args.id}`
+					});
+					const dataset = (await tx.execute({
+						sql: `SELECT organizationId, projectId FROM ${TABLE_DATASETS} WHERE id = ?`,
+						args: [args.datasetId]
+					})).rows[0];
+					const organizationId = typeof dataset?.organizationId === "string" ? dataset.organizationId : null;
+					const projectId = typeof dataset?.projectId === "string" ? dataset.projectId : null;
+					const versionId = crypto.randomUUID();
+					const now = /* @__PURE__ */ new Date();
+					const nowIso = now.toISOString();
+					const mergedInput = args.input !== void 0 ? args.input : existing.input;
+					const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
+					const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
+					const mergedToolMocks = args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks;
+					const mergedUnmockedToolPolicy = args.unmockedToolPolicy !== void 0 ? args.unmockedToolPolicy : existing.unmockedToolPolicy;
+					const mergedScorerIds = args.scorerIds !== void 0 ? args.scorerIds ?? void 0 : existing.scorerIds;
+					const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
+					const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
+					const mergedSource = args.source !== void 0 ? args.source : existing.source;
+					const versionResult = await tx.execute({
+						sql: `UPDATE ${TABLE_DATASETS} SET version = version + 1 WHERE id = ? RETURNING version`,
+						args: [args.datasetId]
+					});
+					const newVersion = Number(versionResult.rows[0].version);
+					await tx.execute({
+						sql: `UPDATE ${TABLE_DATASET_ITEMS} SET validTo = ? WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
+						args: [newVersion, args.id]
+					});
+					await tx.execute({
+						sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id,datasetId,datasetVersion,externalId,organizationId,projectId,validTo,isDeleted,input,groundTruth,expectedTrajectory,toolMocks,unmockedToolPolicy,scorerIds,requestContext,metadata,source,createdAt,updatedAt) VALUES (?,?,?,?,?,?,NULL,0,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,?)`,
+						args: [
+							args.id,
+							args.datasetId,
+							newVersion,
+							existing.externalId ?? null,
+							organizationId,
+							projectId,
+							jsonbArg(mergedInput),
+							jsonbArg(mergedGroundTruth),
+							jsonbArg(mergedExpectedTrajectory),
+							jsonbArg(mergedToolMocks),
+							mergedUnmockedToolPolicy ?? null,
+							jsonbArg(mergedScorerIds),
+							jsonbArg(mergedRequestContext),
+							jsonbArg(mergedMetadata),
+							jsonbArg(mergedSource),
+							existing.createdAt.toISOString(),
+							nowIso
+						]
+					});
+					await tx.execute({
+						sql: `INSERT INTO ${TABLE_DATASET_VERSIONS} (id, datasetId, version, createdAt) VALUES (?, ?, ?, ?)`,
+						args: [
+							versionId,
+							args.datasetId,
+							newVersion,
+							nowIso
+						]
+					});
+					await tx.commit();
+					return {
+						...existing,
+						datasetVersion: newVersion,
+						organizationId,
+						projectId,
+						input: mergedInput,
+						groundTruth: mergedGroundTruth,
+						expectedTrajectory: mergedExpectedTrajectory,
+						toolMocks: mergedToolMocks,
+						unmockedToolPolicy: mergedUnmockedToolPolicy,
+						scorerIds: mergedScorerIds,
+						requestContext: mergedRequestContext,
+						metadata: mergedMetadata,
+						source: mergedSource,
+						updatedAt: now
+					};
+				} catch (error) {
+					if (!tx.closed) await tx.rollback().catch((rollbackError) => {
+						throw new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+					});
+					throw error;
 				}
 			});
-			const dataset = await this.getDatasetById({ id: args.datasetId });
-			const versionId = crypto.randomUUID();
-			const now = /* @__PURE__ */ new Date();
-			const nowIso = now.toISOString();
-			const mergedInput = args.input !== void 0 ? args.input : existing.input;
-			const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
-			const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
-			const mergedToolMocks = args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks;
-			const mergedUnmockedToolPolicy = args.unmockedToolPolicy !== void 0 ? args.unmockedToolPolicy : existing.unmockedToolPolicy;
-			const mergedScorerIds = args.scorerIds !== void 0 ? args.scorerIds ?? void 0 : existing.scorerIds;
-			const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
-			const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
-			const mergedSource = args.source !== void 0 ? args.source : existing.source;
-			const results = await this.#client.batch([
-				{
-					sql: `UPDATE ${TABLE_DATASETS} SET version = version + 1 WHERE id = ? RETURNING version`,
-					args: [args.datasetId]
-				},
-				{
-					sql: `UPDATE ${TABLE_DATASET_ITEMS} SET validTo = (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?) WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
-					args: [args.datasetId, args.id]
-				},
-				{
-					sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id,datasetId,datasetVersion,externalId,organizationId,projectId,validTo,isDeleted,input,groundTruth,expectedTrajectory,toolMocks,unmockedToolPolicy,scorerIds,requestContext,metadata,source,createdAt,updatedAt) VALUES (?,?,(SELECT version FROM ${TABLE_DATASETS} WHERE id = ?),?,(SELECT organizationId FROM ${TABLE_DATASETS} WHERE id = ?),(SELECT projectId FROM ${TABLE_DATASETS} WHERE id = ?),NULL,0,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,?)`,
-					args: [
-						args.id,
-						args.datasetId,
-						args.datasetId,
-						existing.externalId ?? null,
-						args.datasetId,
-						args.datasetId,
-						jsonbArg(mergedInput),
-						jsonbArg(mergedGroundTruth),
-						jsonbArg(mergedExpectedTrajectory),
-						jsonbArg(mergedToolMocks),
-						mergedUnmockedToolPolicy ?? null,
-						jsonbArg(mergedScorerIds),
-						jsonbArg(mergedRequestContext),
-						jsonbArg(mergedMetadata),
-						jsonbArg(mergedSource),
-						existing.createdAt.toISOString(),
-						nowIso
-					]
-				},
-				{
-					sql: `INSERT INTO ${TABLE_DATASET_VERSIONS} (id, datasetId, version, createdAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), ?)`,
-					args: [
-						versionId,
-						args.datasetId,
-						args.datasetId,
-						nowIso
-					]
-				}
-			], "write");
-			const newVersion = Number(results[0].rows[0].version);
-			return {
-				...existing,
-				datasetVersion: newVersion,
-				organizationId: dataset?.organizationId ?? null,
-				projectId: dataset?.projectId ?? null,
-				input: mergedInput,
-				groundTruth: mergedGroundTruth,
-				expectedTrajectory: mergedExpectedTrajectory,
-				toolMocks: mergedToolMocks,
-				unmockedToolPolicy: mergedUnmockedToolPolicy,
-				scorerIds: mergedScorerIds,
-				requestContext: mergedRequestContext,
-				metadata: mergedMetadata,
-				source: mergedSource,
-				updatedAt: now
-			};
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({
@@ -4239,61 +4267,78 @@ var DatasetsLibSQL = class extends DatasetsStorage {
 	}
 	async _doDeleteItem({ id, datasetId }) {
 		try {
-			const existing = await this.getItemById({ id });
-			if (!existing) return;
-			if (existing.datasetId !== datasetId) throw new MastraError({
-				id: createStorageErrorId("LIBSQL", "DELETE_ITEM", "DATASET_MISMATCH"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: {
-					itemId: id,
-					expectedDatasetId: datasetId,
-					actualDatasetId: existing.datasetId
+			await withClientWriteLock(this.#client, async () => {
+				const tx = await this.#client.transaction("write");
+				try {
+					const itemResult = await tx.execute({
+						sql: `SELECT ${buildSelectColumns(TABLE_DATASET_ITEMS)} FROM ${TABLE_DATASET_ITEMS} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
+						args: [id]
+					});
+					const existing = itemResult.rows[0] ? this.transformItemRow(itemResult.rows[0]) : null;
+					if (!existing) {
+						await tx.commit();
+						return;
+					}
+					if (existing.datasetId !== datasetId) throw new MastraError({
+						id: createStorageErrorId("LIBSQL", "DELETE_ITEM", "DATASET_MISMATCH"),
+						domain: ErrorDomain.STORAGE,
+						category: ErrorCategory.USER,
+						details: {
+							itemId: id,
+							expectedDatasetId: datasetId,
+							actualDatasetId: existing.datasetId
+						}
+					});
+					const versionId = crypto.randomUUID();
+					const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+					const dataset = (await tx.execute({
+						sql: `UPDATE ${TABLE_DATASETS} SET version = version + 1 WHERE id = ? RETURNING version, organizationId, projectId`,
+						args: [datasetId]
+					})).rows[0];
+					const newVersion = Number(dataset.version);
+					await tx.execute({
+						sql: `UPDATE ${TABLE_DATASET_ITEMS} SET validTo = ? WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
+						args: [newVersion, id]
+					});
+					await tx.execute({
+						sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id,datasetId,datasetVersion,externalId,organizationId,projectId,validTo,isDeleted,input,groundTruth,expectedTrajectory,toolMocks,unmockedToolPolicy,scorerIds,requestContext,metadata,source,createdAt,updatedAt) VALUES (?,?,?,?,?,?,NULL,1,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,?)`,
+						args: [
+							id,
+							datasetId,
+							newVersion,
+							existing.externalId ?? null,
+							dataset.organizationId ?? null,
+							dataset.projectId ?? null,
+							jsonbArg(existing.input),
+							jsonbArg(existing.groundTruth),
+							jsonbArg(existing.expectedTrajectory),
+							jsonbArg(existing.toolMocks),
+							existing.unmockedToolPolicy ?? null,
+							jsonbArg(existing.scorerIds),
+							jsonbArg(existing.requestContext),
+							jsonbArg(existing.metadata),
+							jsonbArg(existing.source),
+							existing.createdAt.toISOString(),
+							nowIso
+						]
+					});
+					await tx.execute({
+						sql: `INSERT INTO ${TABLE_DATASET_VERSIONS} (id, datasetId, version, createdAt) VALUES (?, ?, ?, ?)`,
+						args: [
+							versionId,
+							datasetId,
+							newVersion,
+							nowIso
+						]
+					});
+					await tx.commit();
+				} catch (error) {
+					if (!tx.closed) await tx.rollback().catch((rollbackError) => {
+						throw new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+					});
+					throw error;
 				}
 			});
-			const versionId = crypto.randomUUID();
-			const nowIso = (/* @__PURE__ */ new Date()).toISOString();
-			await this.#client.batch([
-				{
-					sql: `UPDATE ${TABLE_DATASETS} SET version = version + 1 WHERE id = ? RETURNING version`,
-					args: [datasetId]
-				},
-				{
-					sql: `UPDATE ${TABLE_DATASET_ITEMS} SET validTo = (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?) WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
-					args: [datasetId, id]
-				},
-				{
-					sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id,datasetId,datasetVersion,externalId,organizationId,projectId,validTo,isDeleted,input,groundTruth,expectedTrajectory,toolMocks,unmockedToolPolicy,scorerIds,requestContext,metadata,source,createdAt,updatedAt) VALUES (?,?,(SELECT version FROM ${TABLE_DATASETS} WHERE id = ?),?,(SELECT organizationId FROM ${TABLE_DATASETS} WHERE id = ?),(SELECT projectId FROM ${TABLE_DATASETS} WHERE id = ?),NULL,1,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,?)`,
-					args: [
-						id,
-						datasetId,
-						datasetId,
-						existing.externalId ?? null,
-						datasetId,
-						datasetId,
-						jsonbArg(existing.input),
-						jsonbArg(existing.groundTruth),
-						jsonbArg(existing.expectedTrajectory),
-						jsonbArg(existing.toolMocks),
-						existing.unmockedToolPolicy ?? null,
-						jsonbArg(existing.scorerIds),
-						jsonbArg(existing.requestContext),
-						jsonbArg(existing.metadata),
-						jsonbArg(existing.source),
-						existing.createdAt.toISOString(),
-						nowIso
-					]
-				},
-				{
-					sql: `INSERT INTO ${TABLE_DATASET_VERSIONS} (id, datasetId, version, createdAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), ?)`,
-					args: [
-						versionId,
-						datasetId,
-						datasetId,
-						nowIso
-					]
-				}
-			], "write");
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({
@@ -4711,63 +4756,84 @@ var DatasetsLibSQL = class extends DatasetsStorage {
 	}
 	async _doBatchDeleteItems(input) {
 		try {
-			const dataset = await this.getDatasetById({ id: input.datasetId });
-			if (!dataset) throw new MastraError({
-				id: createStorageErrorId("LIBSQL", "BULK_DELETE_ITEMS", "DATASET_NOT_FOUND"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: { datasetId: input.datasetId }
-			});
-			const currentItems = [];
-			for (const itemId of input.itemIds) {
-				const item = await this.getItemById({ id: itemId });
-				if (item && item.datasetId === input.datasetId) currentItems.push(item);
-			}
-			if (currentItems.length === 0) return;
-			const nowIso = (/* @__PURE__ */ new Date()).toISOString();
-			const versionId = crypto.randomUUID();
-			const statements = [{
-				sql: `UPDATE ${TABLE_DATASETS} SET version = version + 1 WHERE id = ? RETURNING version`,
-				args: [input.datasetId]
-			}];
-			for (const item of currentItems) {
-				statements.push({
-					sql: `UPDATE ${TABLE_DATASET_ITEMS} SET validTo = (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?) WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
-					args: [input.datasetId, item.id]
-				});
-				statements.push({
-					sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id,datasetId,datasetVersion,externalId,organizationId,projectId,validTo,isDeleted,input,groundTruth,expectedTrajectory,toolMocks,unmockedToolPolicy,scorerIds,requestContext,metadata,source,createdAt,updatedAt) VALUES (?,?,(SELECT version FROM ${TABLE_DATASETS} WHERE id = ?),?,?,?,NULL,1,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,?)`,
-					args: [
-						item.id,
-						input.datasetId,
-						input.datasetId,
-						item.externalId ?? null,
-						dataset.organizationId ?? null,
-						dataset.projectId ?? null,
-						jsonbArg(item.input),
-						jsonbArg(item.groundTruth),
-						jsonbArg(item.expectedTrajectory),
-						jsonbArg(item.toolMocks),
-						item.unmockedToolPolicy ?? null,
-						jsonbArg(item.scorerIds),
-						jsonbArg(item.requestContext),
-						jsonbArg(item.metadata),
-						jsonbArg(item.source),
-						item.createdAt.toISOString(),
-						nowIso
-					]
-				});
-			}
-			statements.push({
-				sql: `INSERT INTO ${TABLE_DATASET_VERSIONS} (id, datasetId, version, createdAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), ?)`,
-				args: [
-					versionId,
-					input.datasetId,
-					input.datasetId,
-					nowIso
-				]
+			await withClientWriteLock(this.#client, async () => {
+				const tx = await this.#client.transaction("write");
+				try {
+					const dataset = (await tx.execute({
+						sql: `SELECT organizationId, projectId FROM ${TABLE_DATASETS} WHERE id = ?`,
+						args: [input.datasetId]
+					})).rows[0];
+					if (!dataset) throw new MastraError({
+						id: createStorageErrorId("LIBSQL", "BULK_DELETE_ITEMS", "DATASET_NOT_FOUND"),
+						domain: ErrorDomain.STORAGE,
+						category: ErrorCategory.USER,
+						details: { datasetId: input.datasetId }
+					});
+					const currentItems = [];
+					for (const itemId of input.itemIds) {
+						const itemResult = await tx.execute({
+							sql: `SELECT ${buildSelectColumns(TABLE_DATASET_ITEMS)} FROM ${TABLE_DATASET_ITEMS} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
+							args: [itemId]
+						});
+						const item = itemResult.rows[0] ? this.transformItemRow(itemResult.rows[0]) : null;
+						if (item && item.datasetId === input.datasetId) currentItems.push(item);
+					}
+					if (currentItems.length === 0) {
+						await tx.commit();
+						return;
+					}
+					const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+					const versionId = crypto.randomUUID();
+					const statements = [{
+						sql: `UPDATE ${TABLE_DATASETS} SET version = version + 1 WHERE id = ? RETURNING version`,
+						args: [input.datasetId]
+					}];
+					for (const item of currentItems) {
+						statements.push({
+							sql: `UPDATE ${TABLE_DATASET_ITEMS} SET validTo = (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?) WHERE id = ? AND validTo IS NULL AND isDeleted = 0`,
+							args: [input.datasetId, item.id]
+						});
+						statements.push({
+							sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id,datasetId,datasetVersion,externalId,organizationId,projectId,validTo,isDeleted,input,groundTruth,expectedTrajectory,toolMocks,unmockedToolPolicy,scorerIds,requestContext,metadata,source,createdAt,updatedAt) VALUES (?,?,(SELECT version FROM ${TABLE_DATASETS} WHERE id = ?),?,?,?,NULL,1,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,jsonb(?),jsonb(?),jsonb(?),jsonb(?),?,?)`,
+							args: [
+								item.id,
+								input.datasetId,
+								input.datasetId,
+								item.externalId ?? null,
+								dataset.organizationId ?? null,
+								dataset.projectId ?? null,
+								jsonbArg(item.input),
+								jsonbArg(item.groundTruth),
+								jsonbArg(item.expectedTrajectory),
+								jsonbArg(item.toolMocks),
+								item.unmockedToolPolicy ?? null,
+								jsonbArg(item.scorerIds),
+								jsonbArg(item.requestContext),
+								jsonbArg(item.metadata),
+								jsonbArg(item.source),
+								item.createdAt.toISOString(),
+								nowIso
+							]
+						});
+					}
+					statements.push({
+						sql: `INSERT INTO ${TABLE_DATASET_VERSIONS} (id, datasetId, version, createdAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), ?)`,
+						args: [
+							versionId,
+							input.datasetId,
+							input.datasetId,
+							nowIso
+						]
+					});
+					for (const statement of statements) await tx.execute(statement);
+					await tx.commit();
+				} catch (error) {
+					if (!tx.closed) await tx.rollback().catch((rollbackError) => {
+						throw new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+					});
+					throw error;
+				}
 			});
-			await this.#client.batch(statements, "write");
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({
@@ -8746,8 +8812,9 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 			text: `Thread with id ${newThreadId} already exists`,
 			details: { newThreadId }
 		});
+		const hydrateMessages = options?.hydrateMessages ?? true;
 		try {
-			let messageQuery = `SELECT id, content, role, type, "createdAt", thread_id, "resourceId"
+			let messageQuery = `SELECT ${hydrateMessages ? `id, content, role, type, "createdAt", thread_id, "resourceId"` : `id, "createdAt"`}
                           FROM "${TABLE_MESSAGES}" WHERE thread_id = ?`;
 			const messageParams = [sourceThreadId];
 			if (options?.messageFilter?.startDate) {
@@ -8810,7 +8877,23 @@ var MemoryLibSQL = class MemoryLibSQL extends MemoryStorage {
 				const targetResourceId = resourceId || sourceThread.resourceId;
 				for (const sourceMsg of sourceMessages) {
 					const newMessageId = crypto.randomUUID();
-					messageIdMap[sourceMsg.id] = newMessageId;
+					const sourceMsgId = sourceMsg.id;
+					messageIdMap[sourceMsgId] = newMessageId;
+					if (!hydrateMessages) {
+						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 clone message ${sourceMsgId}: expected 1 row copied but got ${insertResult.rowsAffected}`);
+						continue;
+					}
 					const contentStr = sourceMsg.content;
 					let parsedContent;
 					try {