@mastra/libsql 1.17.0-alpha.4 → 1.17.1-alpha.0

package/dist/index.cjs

@@ -8306,46 +8306,49 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
         config: input.config,
         observedTimezone: input.observedTimezone
       };
-      await this.#client.execute({
-        sql: `INSERT INTO "${OM_TABLE}" (
-          id, "lookupKey", scope, "resourceId", "threadId",
-          "activeObservations", "activeObservationsPendingUpdate",
-          "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
-          "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
-          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
-          "observedTimezone", "createdAt", "updatedAt"
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-        args: [
-          id,
-          lookupKey,
-          input.scope,
-          input.resourceId,
-          input.threadId || null,
-          "",
-          null,
-          "initial",
-          JSON.stringify(input.config),
-          0,
-          null,
-          null,
-          0,
-          0,
-          0,
-          false,
-          false,
-          false,
-          // isBufferingObservation
-          false,
-          // isBufferingReflection
-          0,
-          // lastBufferedAtTokens
-          null,
-          // lastBufferedAtTime
-          input.observedTimezone || null,
-          now.toISOString(),
-          now.toISOString()
-        ]
-      });
+      await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `INSERT INTO "${OM_TABLE}" (
+            id, "lookupKey", scope, "resourceId", "threadId",
+            "activeObservations", "activeObservationsPendingUpdate",
+            "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
+            "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
+            "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
+            "observedTimezone", "createdAt", "updatedAt"
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          args: [
+            id,
+            lookupKey,
+            input.scope,
+            input.resourceId,
+            input.threadId || null,
+            "",
+            null,
+            "initial",
+            JSON.stringify(input.config),
+            0,
+            null,
+            null,
+            0,
+            0,
+            0,
+            false,
+            false,
+            false,
+            // isBufferingObservation
+            false,
+            // isBufferingReflection
+            0,
+            // lastBufferedAtTokens
+            null,
+            // lastBufferedAtTime
+            input.observedTimezone || null,
+            now.toISOString(),
+            now.toISOString()
+          ]
+        })
+      );
       return record;
     } catch (error$1) {
       throw new error.MastraError(
@@ -8362,53 +8365,56 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   async insertObservationalMemoryRecord(record) {
     try {
       const lookupKey = this.getOMKey(record.threadId, record.resourceId);
-      await this.#client.execute({
-        sql: `INSERT INTO "${OM_TABLE}" (
-          id, "lookupKey", scope, "resourceId", "threadId",
-          "activeObservations", "activeObservationsPendingUpdate",
-          "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
-          "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
-          "observedMessageIds", "bufferedObservationChunks",
-          "bufferedReflection", "bufferedReflectionTokens", "bufferedReflectionInputTokens",
-          "reflectedObservationLineCount",
-          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection",
-          "lastBufferedAtTokens", "lastBufferedAtTime",
-          "observedTimezone", metadata, "createdAt", "updatedAt"
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-        args: [
-          record.id,
-          lookupKey,
-          record.scope,
-          record.resourceId,
-          record.threadId || null,
-          record.activeObservations || "",
-          null,
-          record.originType || "initial",
-          record.config ? JSON.stringify(record.config) : null,
-          record.generationCount || 0,
-          record.lastObservedAt ? record.lastObservedAt.toISOString() : null,
-          null,
-          record.pendingMessageTokens || 0,
-          record.totalTokensObserved || 0,
-          record.observationTokenCount || 0,
-          record.observedMessageIds ? JSON.stringify(record.observedMessageIds) : null,
-          record.bufferedObservationChunks ? JSON.stringify(record.bufferedObservationChunks) : null,
-          record.bufferedReflection || null,
-          record.bufferedReflectionTokens ?? null,
-          record.bufferedReflectionInputTokens ?? null,
-          record.reflectedObservationLineCount ?? null,
-          record.isObserving || false,
-          record.isReflecting || false,
-          record.isBufferingObservation || false,
-          record.isBufferingReflection || false,
-          record.lastBufferedAtTokens || 0,
-          record.lastBufferedAtTime ? record.lastBufferedAtTime.toISOString() : null,
-          record.observedTimezone || null,
-          record.metadata ? JSON.stringify(record.metadata) : null,
-          record.createdAt.toISOString(),
-          record.updatedAt.toISOString()
-        ]
-      });
+      await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `INSERT INTO "${OM_TABLE}" (
+            id, "lookupKey", scope, "resourceId", "threadId",
+            "activeObservations", "activeObservationsPendingUpdate",
+            "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
+            "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
+            "observedMessageIds", "bufferedObservationChunks",
+            "bufferedReflection", "bufferedReflectionTokens", "bufferedReflectionInputTokens",
+            "reflectedObservationLineCount",
+            "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection",
+            "lastBufferedAtTokens", "lastBufferedAtTime",
+            "observedTimezone", metadata, "createdAt", "updatedAt"
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          args: [
+            record.id,
+            lookupKey,
+            record.scope,
+            record.resourceId,
+            record.threadId || null,
+            record.activeObservations || "",
+            null,
+            record.originType || "initial",
+            record.config ? JSON.stringify(record.config) : null,
+            record.generationCount || 0,
+            record.lastObservedAt ? record.lastObservedAt.toISOString() : null,
+            null,
+            record.pendingMessageTokens || 0,
+            record.totalTokensObserved || 0,
+            record.observationTokenCount || 0,
+            record.observedMessageIds ? JSON.stringify(record.observedMessageIds) : null,
+            record.bufferedObservationChunks ? JSON.stringify(record.bufferedObservationChunks) : null,
+            record.bufferedReflection || null,
+            record.bufferedReflectionTokens ?? null,
+            record.bufferedReflectionInputTokens ?? null,
+            record.reflectedObservationLineCount ?? null,
+            record.isObserving || false,
+            record.isReflecting || false,
+            record.isBufferingObservation || false,
+            record.isBufferingReflection || false,
+            record.lastBufferedAtTokens || 0,
+            record.lastBufferedAtTime ? record.lastBufferedAtTime.toISOString() : null,
+            record.observedTimezone || null,
+            record.metadata ? JSON.stringify(record.metadata) : null,
+            record.createdAt.toISOString(),
+            record.updatedAt.toISOString()
+          ]
+        })
+      );
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -8425,26 +8431,29 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
     try {
       const now = /* @__PURE__ */ new Date();
       const observedMessageIdsJson = input.observedMessageIds ? JSON.stringify(input.observedMessageIds) : null;
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET
-          "activeObservations" = ?,
-          "lastObservedAt" = ?,
-          "pendingMessageTokens" = 0,
-          "observationTokenCount" = ?,
-          "totalTokensObserved" = "totalTokensObserved" + ?,
-          "observedMessageIds" = ?,
-          "updatedAt" = ?
-        WHERE id = ?`,
-        args: [
-          input.observations,
-          input.lastObservedAt.toISOString(),
-          input.tokenCount,
-          input.tokenCount,
-          observedMessageIdsJson,
-          now.toISOString(),
-          input.id
-        ]
-      });
+      const result = await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `UPDATE "${OM_TABLE}" SET
+            "activeObservations" = ?,
+            "lastObservedAt" = ?,
+            "pendingMessageTokens" = 0,
+            "observationTokenCount" = ?,
+            "totalTokensObserved" = "totalTokensObserved" + ?,
+            "observedMessageIds" = ?,
+            "updatedAt" = ?
+          WHERE id = ?`,
+          args: [
+            input.observations,
+            input.lastObservedAt.toISOString(),
+            input.tokenCount,
+            input.tokenCount,
+            observedMessageIdsJson,
+            now.toISOString(),
+            input.id
+          ]
+        })
+      );
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "UPDATE_ACTIVE_OBSERVATIONS", "NOT_FOUND"),
@@ -8471,78 +8480,21 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   }
   async createReflectionGeneration(input) {
     try {
-      const id = crypto.randomUUID();
-      const now = /* @__PURE__ */ new Date();
-      const lookupKey = this.getOMKey(input.currentRecord.threadId, input.currentRecord.resourceId);
-      const record = {
-        id,
-        scope: input.currentRecord.scope,
-        threadId: input.currentRecord.threadId,
-        resourceId: input.currentRecord.resourceId,
-        createdAt: now,
-        updatedAt: now,
-        lastObservedAt: input.currentRecord.lastObservedAt,
-        originType: "reflection",
-        generationCount: input.currentRecord.generationCount + 1,
-        activeObservations: input.reflection,
-        totalTokensObserved: input.currentRecord.totalTokensObserved,
-        observationTokenCount: input.tokenCount,
-        pendingMessageTokens: 0,
-        isReflecting: false,
-        isObserving: false,
-        isBufferingObservation: false,
-        isBufferingReflection: false,
-        lastBufferedAtTokens: 0,
-        lastBufferedAtTime: null,
-        config: input.currentRecord.config,
-        metadata: input.currentRecord.metadata,
-        observedTimezone: input.currentRecord.observedTimezone
-      };
-      await this.#client.execute({
-        sql: `INSERT INTO "${OM_TABLE}" (
-          id, "lookupKey", scope, "resourceId", "threadId",
-          "activeObservations", "activeObservationsPendingUpdate",
-          "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
-          "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
-          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
-          "observedTimezone", metadata, "createdAt", "updatedAt"
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-        args: [
-          id,
-          lookupKey,
-          record.scope,
-          record.resourceId,
-          record.threadId || null,
-          input.reflection,
-          null,
-          "reflection",
-          JSON.stringify(record.config),
-          input.currentRecord.generationCount + 1,
-          record.lastObservedAt?.toISOString() || null,
-          now.toISOString(),
-          record.pendingMessageTokens,
-          record.totalTokensObserved,
-          record.observationTokenCount,
-          false,
-          // isObserving
-          false,
-          // isReflecting
-          false,
-          // isBufferingObservation
-          false,
-          // isBufferingReflection
-          0,
-          // lastBufferedAtTokens
-          null,
-          // lastBufferedAtTime
-          record.observedTimezone || null,
-          record.metadata ? JSON.stringify(record.metadata) : null,
-          now.toISOString(),
-          now.toISOString()
-        ]
+      return await withClientWriteLock(this.#client, async () => {
+        const tx = await this.#client.transaction("write");
+        try {
+          const record = await this.#insertReflectionGeneration(tx, input);
+          await tx.commit();
+          return record;
+        } catch (error) {
+          if (!tx.closed) await tx.rollback();
+          throw error;
+        }
       });
-      return record;
     } catch (error$1) {
+      if (error$1 instanceof error.MastraError) {
+        throw error$1;
+      }
       throw new error.MastraError(
         {
           id: storage.createStorageErrorId("LIBSQL", "CREATE_REFLECTION_GENERATION", "FAILED"),
@@ -8554,12 +8506,94 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
       );
     }
   }
+  /**
+   * Inserts a new reflection-generation row. Called inside a locked write
+   * transaction — either from {@link createReflectionGeneration} (standalone)
+   * or from {@link swapBufferedReflectionToActive} (as part of a compound
+   * swap). Must not acquire the write lock itself; the caller owns it.
+   */
+  async #insertReflectionGeneration(tx, input) {
+    const id = crypto.randomUUID();
+    const now = /* @__PURE__ */ new Date();
+    const lookupKey = this.getOMKey(input.currentRecord.threadId, input.currentRecord.resourceId);
+    const record = {
+      id,
+      scope: input.currentRecord.scope,
+      threadId: input.currentRecord.threadId,
+      resourceId: input.currentRecord.resourceId,
+      createdAt: now,
+      updatedAt: now,
+      lastObservedAt: input.currentRecord.lastObservedAt,
+      originType: "reflection",
+      generationCount: input.currentRecord.generationCount + 1,
+      activeObservations: input.reflection,
+      totalTokensObserved: input.currentRecord.totalTokensObserved,
+      observationTokenCount: input.tokenCount,
+      pendingMessageTokens: 0,
+      isReflecting: false,
+      isObserving: false,
+      isBufferingObservation: false,
+      isBufferingReflection: false,
+      lastBufferedAtTokens: 0,
+      lastBufferedAtTime: null,
+      config: input.currentRecord.config,
+      metadata: input.currentRecord.metadata,
+      observedTimezone: input.currentRecord.observedTimezone
+    };
+    await tx.execute({
+      sql: `INSERT INTO "${OM_TABLE}" (
+        id, "lookupKey", scope, "resourceId", "threadId",
+        "activeObservations", "activeObservationsPendingUpdate",
+        "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
+        "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
+        "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
+        "observedTimezone", metadata, "createdAt", "updatedAt"
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      args: [
+        id,
+        lookupKey,
+        record.scope,
+        record.resourceId,
+        record.threadId || null,
+        input.reflection,
+        null,
+        "reflection",
+        JSON.stringify(record.config),
+        input.currentRecord.generationCount + 1,
+        record.lastObservedAt?.toISOString() || null,
+        now.toISOString(),
+        record.pendingMessageTokens,
+        record.totalTokensObserved,
+        record.observationTokenCount,
+        false,
+        // isObserving
+        false,
+        // isReflecting
+        false,
+        // isBufferingObservation
+        false,
+        // isBufferingReflection
+        0,
+        // lastBufferedAtTokens
+        null,
+        // lastBufferedAtTime
+        record.observedTimezone || null,
+        record.metadata ? JSON.stringify(record.metadata) : null,
+        now.toISOString(),
+        now.toISOString()
+      ]
+    });
+    return record;
+  }
   async setReflectingFlag(id, isReflecting) {
     try {
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET "isReflecting" = ?, "updatedAt" = ? WHERE id = ?`,
-        args: [isReflecting, (/* @__PURE__ */ new Date()).toISOString(), id]
-      });
+      const result = await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `UPDATE "${OM_TABLE}" SET "isReflecting" = ?, "updatedAt" = ? WHERE id = ?`,
+          args: [isReflecting, (/* @__PURE__ */ new Date()).toISOString(), id]
+        })
+      );
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "SET_REFLECTING_FLAG", "NOT_FOUND"),
@@ -8586,10 +8620,13 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   }
   async setObservingFlag(id, isObserving) {
     try {
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET "isObserving" = ?, "updatedAt" = ? WHERE id = ?`,
-        args: [isObserving, (/* @__PURE__ */ new Date()).toISOString(), id]
-      });
+      const result = await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `UPDATE "${OM_TABLE}" SET "isObserving" = ?, "updatedAt" = ? WHERE id = ?`,
+          args: [isObserving, (/* @__PURE__ */ new Date()).toISOString(), id]
+        })
+      );
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "SET_OBSERVING_FLAG", "NOT_FOUND"),
@@ -8626,7 +8663,7 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
         sql = `UPDATE "${OM_TABLE}" SET "isBufferingObservation" = ?, "updatedAt" = ? WHERE id = ?`;
         args = [isBuffering, nowStr, id];
       }
-      const result = await this.#client.execute({ sql, args });
+      const result = await withClientWriteLock(this.#client, () => this.#client.execute({ sql, args }));
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "SET_BUFFERING_OBSERVATION_FLAG", "NOT_FOUND"),
@@ -8653,10 +8690,13 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   }
   async setBufferingReflectionFlag(id, isBuffering) {
     try {
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET "isBufferingReflection" = ?, "updatedAt" = ? WHERE id = ?`,
-        args: [isBuffering, (/* @__PURE__ */ new Date()).toISOString(), id]
-      });
+      const result = await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `UPDATE "${OM_TABLE}" SET "isBufferingReflection" = ?, "updatedAt" = ? WHERE id = ?`,
+          args: [isBuffering, (/* @__PURE__ */ new Date()).toISOString(), id]
+        })
+      );
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "SET_BUFFERING_REFLECTION_FLAG", "NOT_FOUND"),
@@ -8684,10 +8724,13 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   async clearObservationalMemory(threadId, resourceId) {
     try {
       const lookupKey = this.getOMKey(threadId, resourceId);
-      await this.#client.execute({
-        sql: `DELETE FROM "${OM_TABLE}" WHERE "lookupKey" = ?`,
-        args: [lookupKey]
-      });
+      await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `DELETE FROM "${OM_TABLE}" WHERE "lookupKey" = ?`,
+          args: [lookupKey]
+        })
+      );
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -8702,13 +8745,16 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   }
   async setPendingMessageTokens(id, tokenCount) {
     try {
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET 
-          "pendingMessageTokens" = ?, 
-          "updatedAt" = ? 
-        WHERE id = ?`,
-        args: [tokenCount, (/* @__PURE__ */ new Date()).toISOString(), id]
-      });
+      const result = await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `UPDATE "${OM_TABLE}" SET 
+            "pendingMessageTokens" = ?, 
+            "updatedAt" = ? 
+          WHERE id = ?`,
+          args: [tokenCount, (/* @__PURE__ */ new Date()).toISOString(), id]
+        })
+      );
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "SET_PENDING_MESSAGE_TOKENS", "NOT_FOUND"),
@@ -8735,25 +8781,34 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   }
   async updateObservationalMemoryConfig(input) {
     try {
-      const selectResult = await this.#client.execute({
-        sql: `SELECT config FROM "${OM_TABLE}" WHERE id = ?`,
-        args: [input.id]
-      });
-      if (selectResult.rows.length === 0) {
-        throw new error.MastraError({
-          id: storage.createStorageErrorId("LIBSQL", "UPDATE_OM_CONFIG", "NOT_FOUND"),
-          text: `Observational memory record not found: ${input.id}`,
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { id: input.id }
-        });
-      }
-      const row = selectResult.rows[0];
-      const existing = row.config ? JSON.parse(row.config) : {};
-      const merged = this.deepMergeConfig(existing, input.config);
-      await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET config = ?, "updatedAt" = ? WHERE id = ?`,
-        args: [JSON.stringify(merged), (/* @__PURE__ */ new Date()).toISOString(), input.id]
+      await withClientWriteLock(this.#client, async () => {
+        const tx = await this.#client.transaction("write");
+        try {
+          const selectResult = await tx.execute({
+            sql: `SELECT config FROM "${OM_TABLE}" WHERE id = ?`,
+            args: [input.id]
+          });
+          if (selectResult.rows.length === 0) {
+            throw new error.MastraError({
+              id: storage.createStorageErrorId("LIBSQL", "UPDATE_OM_CONFIG", "NOT_FOUND"),
+              text: `Observational memory record not found: ${input.id}`,
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.THIRD_PARTY,
+              details: { id: input.id }
+            });
+          }
+          const row = selectResult.rows[0];
+          const existing = row.config ? JSON.parse(row.config) : {};
+          const merged = this.deepMergeConfig(existing, input.config);
+          await tx.execute({
+            sql: `UPDATE "${OM_TABLE}" SET config = ?, "updatedAt" = ? WHERE id = ?`,
+            args: [JSON.stringify(merged), (/* @__PURE__ */ new Date()).toISOString(), input.id]
+          });
+          await tx.commit();
+        } catch (error) {
+          if (!tx.closed) await tx.rollback();
+          throw error;
+        }
       });
     } catch (error$1) {
       if (error$1 instanceof error.MastraError) {
@@ -8776,63 +8831,72 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   async updateBufferedObservations(input) {
     try {
       const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-      const current = await this.#client.execute({
-        sql: `SELECT "bufferedObservationChunks" FROM "${OM_TABLE}" WHERE id = ?`,
-        args: [input.id]
-      });
-      if (!current.rows || current.rows.length === 0) {
-        throw new error.MastraError({
-          id: storage.createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
-          text: `Observational memory record not found: ${input.id}`,
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { id: input.id }
-        });
-      }
-      const row = current.rows[0];
-      let existingChunks = [];
-      if (row.bufferedObservationChunks) {
+      await withClientWriteLock(this.#client, async () => {
+        const tx = await this.#client.transaction("write");
         try {
-          const parsed = typeof row.bufferedObservationChunks === "string" ? JSON.parse(row.bufferedObservationChunks) : row.bufferedObservationChunks;
-          existingChunks = Array.isArray(parsed) ? parsed : [];
-        } catch {
-          existingChunks = [];
+          const current = await tx.execute({
+            sql: `SELECT "bufferedObservationChunks" FROM "${OM_TABLE}" WHERE id = ?`,
+            args: [input.id]
+          });
+          if (!current.rows || current.rows.length === 0) {
+            throw new error.MastraError({
+              id: storage.createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
+              text: `Observational memory record not found: ${input.id}`,
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.THIRD_PARTY,
+              details: { id: input.id }
+            });
+          }
+          const row = current.rows[0];
+          let existingChunks = [];
+          if (row.bufferedObservationChunks) {
+            try {
+              const parsed = typeof row.bufferedObservationChunks === "string" ? JSON.parse(row.bufferedObservationChunks) : row.bufferedObservationChunks;
+              existingChunks = Array.isArray(parsed) ? parsed : [];
+            } catch {
+              existingChunks = [];
+            }
+          }
+          const newChunk = {
+            id: `ombuf-${crypto$1.randomUUID()}`,
+            cycleId: input.chunk.cycleId,
+            observations: input.chunk.observations,
+            tokenCount: input.chunk.tokenCount,
+            messageIds: input.chunk.messageIds,
+            messageTokens: input.chunk.messageTokens,
+            lastObservedAt: input.chunk.lastObservedAt,
+            createdAt: /* @__PURE__ */ new Date(),
+            suggestedContinuation: input.chunk.suggestedContinuation,
+            currentTask: input.chunk.currentTask,
+            threadTitle: input.chunk.threadTitle,
+            extractedValues: input.chunk.extractedValues,
+            extractionFailures: input.chunk.extractionFailures
+          };
+          const newChunks = [...existingChunks, newChunk];
+          const lastBufferedAtTime = input.lastBufferedAtTime ? input.lastBufferedAtTime.toISOString() : null;
+          const result = await tx.execute({
+            sql: `UPDATE "${OM_TABLE}" SET
+              "bufferedObservationChunks" = ?,
+              "lastBufferedAtTime" = COALESCE(?, "lastBufferedAtTime"),
+              "updatedAt" = ?
+            WHERE id = ?`,
+            args: [JSON.stringify(newChunks), lastBufferedAtTime, nowStr, input.id]
+          });
+          if (result.rowsAffected === 0) {
+            throw new error.MastraError({
+              id: storage.createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
+              text: `Observational memory record not found: ${input.id}`,
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.THIRD_PARTY,
+              details: { id: input.id }
+            });
+          }
+          await tx.commit();
+        } catch (error) {
+          if (!tx.closed) await tx.rollback();
+          throw error;
         }
-      }
-      const newChunk = {
-        id: `ombuf-${crypto$1.randomUUID()}`,
-        cycleId: input.chunk.cycleId,
-        observations: input.chunk.observations,
-        tokenCount: input.chunk.tokenCount,
-        messageIds: input.chunk.messageIds,
-        messageTokens: input.chunk.messageTokens,
-        lastObservedAt: input.chunk.lastObservedAt,
-        createdAt: /* @__PURE__ */ new Date(),
-        suggestedContinuation: input.chunk.suggestedContinuation,
-        currentTask: input.chunk.currentTask,
-        threadTitle: input.chunk.threadTitle,
-        extractedValues: input.chunk.extractedValues,
-        extractionFailures: input.chunk.extractionFailures
-      };
-      const newChunks = [...existingChunks, newChunk];
-      const lastBufferedAtTime = input.lastBufferedAtTime ? input.lastBufferedAtTime.toISOString() : null;
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET
-          "bufferedObservationChunks" = ?,
-          "lastBufferedAtTime" = COALESCE(?, "lastBufferedAtTime"),
-          "updatedAt" = ?
-        WHERE id = ?`,
-        args: [JSON.stringify(newChunks), lastBufferedAtTime, nowStr, input.id]
       });
-      if (result.rowsAffected === 0) {
-        throw new error.MastraError({
-          id: storage.createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
-          text: `Observational memory record not found: ${input.id}`,
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { id: input.id }
-        });
-      }
     } catch (error$1) {
       if (error$1 instanceof error.MastraError) {
         throw error$1;
@@ -8851,150 +8915,160 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   async swapBufferedToActive(input) {
     try {
       const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-      const current = await this.#client.execute({
-        sql: `SELECT * FROM "${OM_TABLE}" WHERE id = ?`,
-        args: [input.id]
-      });
-      if (!current.rows || current.rows.length === 0) {
-        throw new error.MastraError({
-          id: storage.createStorageErrorId("LIBSQL", "SWAP_BUFFERED_TO_ACTIVE", "NOT_FOUND"),
-          text: `Observational memory record not found: ${input.id}`,
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { id: input.id }
-        });
-      }
-      const row = current.rows[0];
-      let chunks = [];
-      if (row.bufferedObservationChunks) {
+      return await withClientWriteLock(this.#client, async () => {
+        const tx = await this.#client.transaction("write");
         try {
-          const parsed = typeof row.bufferedObservationChunks === "string" ? JSON.parse(row.bufferedObservationChunks) : row.bufferedObservationChunks;
-          chunks = Array.isArray(parsed) ? parsed : [];
-        } catch {
-          chunks = [];
-        }
-      }
-      if (chunks.length === 0) {
-        return {
-          chunksActivated: 0,
-          messageTokensActivated: 0,
-          observationTokensActivated: 0,
-          messagesActivated: 0,
-          activatedCycleIds: [],
-          activatedMessageIds: []
-        };
-      }
-      const retentionFloor = input.messageTokensThreshold * (1 - input.activationRatio);
-      const targetMessageTokens = Math.max(0, input.currentPendingTokens - retentionFloor);
-      let cumulativeMessageTokens = 0;
-      let bestOverBoundary = 0;
-      let bestOverTokens = 0;
-      let bestUnderBoundary = 0;
-      let bestUnderTokens = 0;
-      for (let i = 0; i < chunks.length; i++) {
-        cumulativeMessageTokens += chunks[i].messageTokens ?? 0;
-        const boundary2 = i + 1;
-        if (cumulativeMessageTokens >= targetMessageTokens) {
-          if (bestOverBoundary === 0 || cumulativeMessageTokens < bestOverTokens) {
-            bestOverBoundary = boundary2;
-            bestOverTokens = cumulativeMessageTokens;
+          const current = await tx.execute({
+            sql: `SELECT * FROM "${OM_TABLE}" WHERE id = ?`,
+            args: [input.id]
+          });
+          if (!current.rows || current.rows.length === 0) {
+            throw new error.MastraError({
+              id: storage.createStorageErrorId("LIBSQL", "SWAP_BUFFERED_TO_ACTIVE", "NOT_FOUND"),
+              text: `Observational memory record not found: ${input.id}`,
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.THIRD_PARTY,
+              details: { id: input.id }
+            });
           }
-        } else {
-          if (cumulativeMessageTokens > bestUnderTokens) {
-            bestUnderBoundary = boundary2;
-            bestUnderTokens = cumulativeMessageTokens;
+          const row = current.rows[0];
+          let chunks = [];
+          if (row.bufferedObservationChunks) {
+            try {
+              const parsed = typeof row.bufferedObservationChunks === "string" ? JSON.parse(row.bufferedObservationChunks) : row.bufferedObservationChunks;
+              chunks = Array.isArray(parsed) ? parsed : [];
+            } catch {
+              chunks = [];
+            }
           }
-        }
-      }
-      const maxOvershoot = retentionFloor * 0.95;
-      const overshoot = bestOverTokens - targetMessageTokens;
-      const remainingAfterOver = input.currentPendingTokens - bestOverTokens;
-      const remainingAfterUnder = input.currentPendingTokens - bestUnderTokens;
-      const minRemaining = Math.min(1e3, retentionFloor);
-      let chunksToActivate;
-      if (input.forceMaxActivation && bestOverBoundary > 0 && remainingAfterOver >= minRemaining) {
-        chunksToActivate = bestOverBoundary;
-      } else if (bestOverBoundary > 0 && overshoot <= maxOvershoot && remainingAfterOver >= minRemaining) {
-        chunksToActivate = bestOverBoundary;
-      } else if (bestUnderBoundary > 0 && remainingAfterUnder >= minRemaining) {
-        chunksToActivate = bestUnderBoundary;
-      } else if (bestOverBoundary > 0) {
-        chunksToActivate = bestOverBoundary;
-      } else {
-        chunksToActivate = 1;
-      }
-      const activatedChunks = chunks.slice(0, chunksToActivate);
-      const remainingChunks = chunks.slice(chunksToActivate);
-      const activatedContent = activatedChunks.map((c) => c.observations).join("\n\n");
-      const activatedTokens = activatedChunks.reduce((sum, c) => sum + c.tokenCount, 0);
-      const activatedMessageTokens = activatedChunks.reduce((sum, c) => sum + (c.messageTokens ?? 0), 0);
-      const activatedMessageCount = activatedChunks.reduce((sum, c) => sum + c.messageIds.length, 0);
-      const activatedCycleIds = activatedChunks.map((c) => c.cycleId).filter((id) => !!id);
-      const activatedMessageIds = activatedChunks.flatMap((c) => c.messageIds ?? []);
-      const latestChunk = activatedChunks[activatedChunks.length - 1];
-      const lastObservedAt = input.lastObservedAt ?? (latestChunk?.lastObservedAt ? new Date(latestChunk.lastObservedAt) : /* @__PURE__ */ new Date());
-      const lastObservedAtStr = lastObservedAt.toISOString();
-      const existingActive = row.activeObservations || "";
-      const existingTokenCount = Number(row.observationTokenCount || 0);
-      const boundary = `
+          if (chunks.length === 0) {
+            await tx.commit();
+            return {
+              chunksActivated: 0,
+              messageTokensActivated: 0,
+              observationTokensActivated: 0,
+              messagesActivated: 0,
+              activatedCycleIds: [],
+              activatedMessageIds: []
+            };
+          }
+          const retentionFloor = input.messageTokensThreshold * (1 - input.activationRatio);
+          const targetMessageTokens = Math.max(0, input.currentPendingTokens - retentionFloor);
+          let cumulativeMessageTokens = 0;
+          let bestOverBoundary = 0;
+          let bestOverTokens = 0;
+          let bestUnderBoundary = 0;
+          let bestUnderTokens = 0;
+          for (let i = 0; i < chunks.length; i++) {
+            cumulativeMessageTokens += chunks[i].messageTokens ?? 0;
+            const boundary2 = i + 1;
+            if (cumulativeMessageTokens >= targetMessageTokens) {
+              if (bestOverBoundary === 0 || cumulativeMessageTokens < bestOverTokens) {
+                bestOverBoundary = boundary2;
+                bestOverTokens = cumulativeMessageTokens;
+              }
+            } else {
+              if (cumulativeMessageTokens > bestUnderTokens) {
+                bestUnderBoundary = boundary2;
+                bestUnderTokens = cumulativeMessageTokens;
+              }
+            }
+          }
+          const maxOvershoot = retentionFloor * 0.95;
+          const overshoot = bestOverTokens - targetMessageTokens;
+          const remainingAfterOver = input.currentPendingTokens - bestOverTokens;
+          const remainingAfterUnder = input.currentPendingTokens - bestUnderTokens;
+          const minRemaining = Math.min(1e3, retentionFloor);
+          let chunksToActivate;
+          if (input.forceMaxActivation && bestOverBoundary > 0 && remainingAfterOver >= minRemaining) {
+            chunksToActivate = bestOverBoundary;
+          } else if (bestOverBoundary > 0 && overshoot <= maxOvershoot && remainingAfterOver >= minRemaining) {
+            chunksToActivate = bestOverBoundary;
+          } else if (bestUnderBoundary > 0 && remainingAfterUnder >= minRemaining) {
+            chunksToActivate = bestUnderBoundary;
+          } else if (bestOverBoundary > 0) {
+            chunksToActivate = bestOverBoundary;
+          } else {
+            chunksToActivate = 1;
+          }
+          const activatedChunks = chunks.slice(0, chunksToActivate);
+          const remainingChunks = chunks.slice(chunksToActivate);
+          const activatedContent = activatedChunks.map((c) => c.observations).join("\n\n");
+          const activatedTokens = activatedChunks.reduce((sum, c) => sum + c.tokenCount, 0);
+          const activatedMessageTokens = activatedChunks.reduce((sum, c) => sum + (c.messageTokens ?? 0), 0);
+          const activatedMessageCount = activatedChunks.reduce((sum, c) => sum + c.messageIds.length, 0);
+          const activatedCycleIds = activatedChunks.map((c) => c.cycleId).filter((id) => !!id);
+          const activatedMessageIds = activatedChunks.flatMap((c) => c.messageIds ?? []);
+          const latestChunk = activatedChunks[activatedChunks.length - 1];
+          const lastObservedAt = input.lastObservedAt ?? (latestChunk?.lastObservedAt ? new Date(latestChunk.lastObservedAt) : /* @__PURE__ */ new Date());
+          const lastObservedAtStr = lastObservedAt.toISOString();
+          const existingActive = row.activeObservations || "";
+          const existingTokenCount = Number(row.observationTokenCount || 0);
+          const boundary = `
 
 --- message boundary (${lastObservedAt.toISOString()}) ---
 
 `;
-      const newActive = existingActive ? `${existingActive}${boundary}${activatedContent}` : activatedContent;
-      const newTokenCount = existingTokenCount + activatedTokens;
-      const existingPending = Number(row.pendingMessageTokens || 0);
-      const newPending = Math.max(0, existingPending - activatedMessageTokens);
-      const updateResult = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET
-          "activeObservations" = ?,
-          "observationTokenCount" = ?,
-          "pendingMessageTokens" = ?,
-          "bufferedObservationChunks" = ?,
-          "lastObservedAt" = ?,
-          "updatedAt" = ?
-        WHERE id = ?
-          AND "bufferedObservationChunks" IS NOT NULL
-          AND "bufferedObservationChunks" != '[]'`,
-        args: [
-          newActive,
-          newTokenCount,
-          newPending,
-          remainingChunks.length > 0 ? JSON.stringify(remainingChunks) : null,
-          lastObservedAtStr,
-          nowStr,
-          input.id
-        ]
+          const newActive = existingActive ? `${existingActive}${boundary}${activatedContent}` : activatedContent;
+          const newTokenCount = existingTokenCount + activatedTokens;
+          const existingPending = Number(row.pendingMessageTokens || 0);
+          const newPending = Math.max(0, existingPending - activatedMessageTokens);
+          const updateResult = await tx.execute({
+            sql: `UPDATE "${OM_TABLE}" SET
+              "activeObservations" = ?,
+              "observationTokenCount" = ?,
+              "pendingMessageTokens" = ?,
+              "bufferedObservationChunks" = ?,
+              "lastObservedAt" = ?,
+              "updatedAt" = ?
+            WHERE id = ?
+              AND "bufferedObservationChunks" IS NOT NULL
+              AND "bufferedObservationChunks" != '[]'`,
+            args: [
+              newActive,
+              newTokenCount,
+              newPending,
+              remainingChunks.length > 0 ? JSON.stringify(remainingChunks) : null,
+              lastObservedAtStr,
+              nowStr,
+              input.id
+            ]
+          });
+          await tx.commit();
+          if (updateResult.rowsAffected === 0) {
+            return {
+              chunksActivated: 0,
+              messageTokensActivated: 0,
+              observationTokensActivated: 0,
+              messagesActivated: 0,
+              activatedCycleIds: [],
+              activatedMessageIds: []
+            };
+          }
+          const latestChunkHints = activatedChunks[activatedChunks.length - 1];
+          return {
+            chunksActivated: activatedChunks.length,
+            messageTokensActivated: activatedMessageTokens,
+            observationTokensActivated: activatedTokens,
+            messagesActivated: activatedMessageCount,
+            activatedCycleIds,
+            activatedMessageIds,
+            observations: activatedContent,
+            perChunk: activatedChunks.map((c) => ({
+              cycleId: c.cycleId ?? "",
+              messageTokens: c.messageTokens ?? 0,
+              observationTokens: c.tokenCount,
+              messageCount: c.messageIds.length,
+              observations: c.observations
+            })),
+            suggestedContinuation: latestChunkHints?.suggestedContinuation ?? void 0,
+            currentTask: latestChunkHints?.currentTask ?? void 0
+          };
+        } catch (error) {
+          if (!tx.closed) await tx.rollback();
+          throw error;
+        }
       });
-      if (updateResult.rowsAffected === 0) {
-        return {
-          chunksActivated: 0,
-          messageTokensActivated: 0,
-          observationTokensActivated: 0,
-          messagesActivated: 0,
-          activatedCycleIds: [],
-          activatedMessageIds: []
-        };
-      }
-      const latestChunkHints = activatedChunks[activatedChunks.length - 1];
-      return {
-        chunksActivated: activatedChunks.length,
-        messageTokensActivated: activatedMessageTokens,
-        observationTokensActivated: activatedTokens,
-        messagesActivated: activatedMessageCount,
-        activatedCycleIds,
-        activatedMessageIds,
-        observations: activatedContent,
-        perChunk: activatedChunks.map((c) => ({
-          cycleId: c.cycleId ?? "",
-          messageTokens: c.messageTokens ?? 0,
-          observationTokens: c.tokenCount,
-          messageCount: c.messageIds.length,
-          observations: c.observations
-        })),
-        suggestedContinuation: latestChunkHints?.suggestedContinuation ?? void 0,
-        currentTask: latestChunkHints?.currentTask ?? void 0
-      };
     } catch (error$1) {
       if (error$1 instanceof error.MastraError) {
         throw error$1;
@@ -9013,28 +9087,31 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   async updateBufferedReflection(input) {
     try {
       const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-      const result = await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET
-          "bufferedReflection" = CASE
-            WHEN "bufferedReflection" IS NOT NULL AND "bufferedReflection" != ''
-            THEN "bufferedReflection" || char(10) || char(10) || ?
-            ELSE ?
-          END,
-          "bufferedReflectionTokens" = COALESCE("bufferedReflectionTokens", 0) + ?,
-          "bufferedReflectionInputTokens" = COALESCE("bufferedReflectionInputTokens", 0) + ?,
-          "reflectedObservationLineCount" = ?,
-          "updatedAt" = ?
-        WHERE id = ?`,
-        args: [
-          input.reflection,
-          input.reflection,
-          input.tokenCount,
-          input.inputTokenCount,
-          input.reflectedObservationLineCount,
-          nowStr,
-          input.id
-        ]
-      });
+      const result = await withClientWriteLock(
+        this.#client,
+        () => this.#client.execute({
+          sql: `UPDATE "${OM_TABLE}" SET
+            "bufferedReflection" = CASE
+              WHEN "bufferedReflection" IS NOT NULL AND "bufferedReflection" != ''
+              THEN "bufferedReflection" || char(10) || char(10) || ?
+              ELSE ?
+            END,
+            "bufferedReflectionTokens" = COALESCE("bufferedReflectionTokens", 0) + ?,
+            "bufferedReflectionInputTokens" = COALESCE("bufferedReflectionInputTokens", 0) + ?,
+            "reflectedObservationLineCount" = ?,
+            "updatedAt" = ?
+          WHERE id = ?`,
+          args: [
+            input.reflection,
+            input.reflection,
+            input.tokenCount,
+            input.inputTokenCount,
+            input.reflectedObservationLineCount,
+            nowStr,
+            input.id
+          ]
+        })
+      );
       if (result.rowsAffected === 0) {
         throw new error.MastraError({
           id: storage.createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_REFLECTION", "NOT_FOUND"),
@@ -9061,55 +9138,64 @@ var MemoryLibSQL = class _MemoryLibSQL extends storage.MemoryStorage {
   }
   async swapBufferedReflectionToActive(input) {
     try {
-      const current = await this.#client.execute({
-        sql: `SELECT * FROM "${OM_TABLE}" WHERE id = ?`,
-        args: [input.currentRecord.id]
-      });
-      if (!current.rows || current.rows.length === 0) {
-        throw new error.MastraError({
-          id: storage.createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
-          text: `Observational memory record not found: ${input.currentRecord.id}`,
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { id: input.currentRecord.id }
-        });
-      }
-      const row = current.rows[0];
-      const bufferedReflection = row.bufferedReflection || "";
-      const reflectedLineCount = Number(row.reflectedObservationLineCount || 0);
-      if (!bufferedReflection) {
-        throw new error.MastraError({
-          id: storage.createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
-          text: "No buffered reflection to swap",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.USER,
-          details: { id: input.currentRecord.id }
-        });
-      }
-      const currentObservations = row.activeObservations || "";
-      const allLines = currentObservations.split("\n");
-      const unreflectedLines = allLines.slice(reflectedLineCount);
-      const unreflectedContent = unreflectedLines.join("\n").trim();
-      const newObservations = unreflectedContent ? `${bufferedReflection}
+      return await withClientWriteLock(this.#client, async () => {
+        const tx = await this.#client.transaction("write");
+        try {
+          const current = await tx.execute({
+            sql: `SELECT * FROM "${OM_TABLE}" WHERE id = ?`,
+            args: [input.currentRecord.id]
+          });
+          if (!current.rows || current.rows.length === 0) {
+            throw new error.MastraError({
+              id: storage.createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
+              text: `Observational memory record not found: ${input.currentRecord.id}`,
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.THIRD_PARTY,
+              details: { id: input.currentRecord.id }
+            });
+          }
+          const row = current.rows[0];
+          const bufferedReflection = row.bufferedReflection || "";
+          const reflectedLineCount = Number(row.reflectedObservationLineCount || 0);
+          if (!bufferedReflection) {
+            throw new error.MastraError({
+              id: storage.createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
+              text: "No buffered reflection to swap",
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.USER,
+              details: { id: input.currentRecord.id }
+            });
+          }
+          const currentObservations = row.activeObservations || "";
+          const allLines = currentObservations.split("\n");
+          const unreflectedLines = allLines.slice(reflectedLineCount);
+          const unreflectedContent = unreflectedLines.join("\n").trim();
+          const newObservations = unreflectedContent ? `${bufferedReflection}
 
 ${unreflectedContent}` : bufferedReflection;
-      const newRecord = await this.createReflectionGeneration({
-        currentRecord: input.currentRecord,
-        reflection: newObservations,
-        tokenCount: input.tokenCount
+          const newRecord = await this.#insertReflectionGeneration(tx, {
+            currentRecord: input.currentRecord,
+            reflection: newObservations,
+            tokenCount: input.tokenCount
+          });
+          const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+          await tx.execute({
+            sql: `UPDATE "${OM_TABLE}" SET
+              "bufferedReflection" = NULL,
+              "bufferedReflectionTokens" = NULL,
+              "bufferedReflectionInputTokens" = NULL,
+              "reflectedObservationLineCount" = NULL,
+              "updatedAt" = ?
+            WHERE id = ?`,
+            args: [nowStr, input.currentRecord.id]
+          });
+          await tx.commit();
+          return newRecord;
+        } catch (error) {
+          if (!tx.closed) await tx.rollback();
+          throw error;
+        }
       });
-      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-      await this.#client.execute({
-        sql: `UPDATE "${OM_TABLE}" SET
-          "bufferedReflection" = NULL,
-          "bufferedReflectionTokens" = NULL,
-          "bufferedReflectionInputTokens" = NULL,
-          "reflectedObservationLineCount" = NULL,
-          "updatedAt" = ?
-        WHERE id = ?`,
-        args: [nowStr, input.currentRecord.id]
-      });
-      return newRecord;
     } catch (error$1) {
       if (error$1 instanceof error.MastraError) {
         throw error$1;