@mastra/factory 0.2.0-alpha.0 → 0.2.1-alpha.0

package/dist/factory.js

@@ -18882,46 +18882,49 @@ Note: This migration may take some time for large tables.
             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) {
           throw new MastraError(
@@ -18938,53 +18941,56 @@ Note: This migration may take some time for large tables.
       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) {
           throw new MastraError(
             {
@@ -19001,26 +19007,29 @@ Note: This migration may take some time for large tables.
         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 MastraError({
               id: createStorageErrorId("LIBSQL", "UPDATE_ACTIVE_OBSERVATIONS", "NOT_FOUND"),
@@ -19047,78 +19056,21 @@ Note: This migration may take some time for large tables.
       }
       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) {
+          if (error instanceof MastraError) {
+            throw error;
+          }
           throw new MastraError(
             {
               id: createStorageErrorId("LIBSQL", "CREATE_REFLECTION_GENERATION", "FAILED"),
@@ -19130,12 +19082,94 @@ Note: This migration may take some time for large tables.
           );
         }
       }
+      /**
+       * 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 MastraError({
               id: createStorageErrorId("LIBSQL", "SET_REFLECTING_FLAG", "NOT_FOUND"),
@@ -19162,10 +19196,13 @@ Note: This migration may take some time for large tables.
       }
       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 MastraError({
               id: createStorageErrorId("LIBSQL", "SET_OBSERVING_FLAG", "NOT_FOUND"),
@@ -19202,7 +19239,7 @@ Note: This migration may take some time for large tables.
             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 MastraError({
               id: createStorageErrorId("LIBSQL", "SET_BUFFERING_OBSERVATION_FLAG", "NOT_FOUND"),
@@ -19229,10 +19266,13 @@ Note: This migration may take some time for large tables.
       }
       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 MastraError({
               id: createStorageErrorId("LIBSQL", "SET_BUFFERING_REFLECTION_FLAG", "NOT_FOUND"),
@@ -19260,10 +19300,13 @@ Note: This migration may take some time for large tables.
       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) {
           throw new MastraError(
             {
@@ -19278,13 +19321,16 @@ Note: This migration may take some time for large tables.
       }
       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 MastraError({
               id: createStorageErrorId("LIBSQL", "SET_PENDING_MESSAGE_TOKENS", "NOT_FOUND"),
@@ -19311,25 +19357,34 @@ Note: This migration may take some time for large tables.
       }
       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 MastraError({
-              id: createStorageErrorId("LIBSQL", "UPDATE_OM_CONFIG", "NOT_FOUND"),
-              text: `Observational memory record not found: ${input.id}`,
-              domain: ErrorDomain.STORAGE,
-              category: 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 MastraError({
+                  id: createStorageErrorId("LIBSQL", "UPDATE_OM_CONFIG", "NOT_FOUND"),
+                  text: `Observational memory record not found: ${input.id}`,
+                  domain: ErrorDomain.STORAGE,
+                  category: 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) {
           if (error instanceof MastraError) {
@@ -19352,63 +19407,72 @@ Note: This migration may take some time for large tables.
       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 MastraError({
-              id: createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
-              text: `Observational memory record not found: ${input.id}`,
-              domain: ErrorDomain.STORAGE,
-              category: 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 MastraError({
+                  id: createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
+                  text: `Observational memory record not found: ${input.id}`,
+                  domain: ErrorDomain.STORAGE,
+                  category: 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-${randomUUID5()}`,
+                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 MastraError({
+                  id: createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
+                  text: `Observational memory record not found: ${input.id}`,
+                  domain: ErrorDomain.STORAGE,
+                  category: ErrorCategory.THIRD_PARTY,
+                  details: { id: input.id }
+                });
+              }
+              await tx.commit();
+            } catch (error) {
+              if (!tx.closed) await tx.rollback();
+              throw error;
             }
-          }
-          const newChunk = {
-            id: `ombuf-${randomUUID5()}`,
-            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 MastraError({
-              id: createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
-              text: `Observational memory record not found: ${input.id}`,
-              domain: ErrorDomain.STORAGE,
-              category: ErrorCategory.THIRD_PARTY,
-              details: { id: input.id }
-            });
-          }
         } catch (error) {
           if (error instanceof MastraError) {
             throw error;
@@ -19427,150 +19491,160 @@ Note: This migration may take some time for large tables.
       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 MastraError({
-              id: createStorageErrorId("LIBSQL", "SWAP_BUFFERED_TO_ACTIVE", "NOT_FOUND"),
-              text: `Observational memory record not found: ${input.id}`,
-              domain: ErrorDomain.STORAGE,
-              category: 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 MastraError({
+                  id: createStorageErrorId("LIBSQL", "SWAP_BUFFERED_TO_ACTIVE", "NOT_FOUND"),
+                  text: `Observational memory record not found: ${input.id}`,
+                  domain: ErrorDomain.STORAGE,
+                  category: 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) {
           if (error instanceof MastraError) {
             throw error;
@@ -19589,28 +19663,31 @@ Note: This migration may take some time for large tables.
       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 MastraError({
               id: createStorageErrorId("LIBSQL", "UPDATE_BUFFERED_REFLECTION", "NOT_FOUND"),
@@ -19637,55 +19714,64 @@ Note: This migration may take some time for large tables.
       }
       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 MastraError({
-              id: createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
-              text: `Observational memory record not found: ${input.currentRecord.id}`,
-              domain: ErrorDomain.STORAGE,
-              category: 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 MastraError({
-              id: createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
-              text: "No buffered reflection to swap",
-              domain: ErrorDomain.STORAGE,
-              category: 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 MastraError({
+                  id: createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
+                  text: `Observational memory record not found: ${input.currentRecord.id}`,
+                  domain: ErrorDomain.STORAGE,
+                  category: 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 MastraError({
+                  id: createStorageErrorId("LIBSQL", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
+                  text: "No buffered reflection to swap",
+                  domain: ErrorDomain.STORAGE,
+                  category: 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) {
           if (error instanceof MastraError) {
             throw error;
@@ -25423,6 +25509,34 @@ function getGithubFeatureDiagnostics(options) {
 // src/integrations/github/project-lock.ts
 import { createHash } from "crypto";
 var inProcessLocks = /* @__PURE__ */ new Map();
+var DEFAULT_PROJECT_LOCK_TIMEOUT_MS = 6e4;
+var ProjectLockTimeoutError = class extends Error {
+  key;
+  timeoutMs;
+  constructor(key, timeoutMs) {
+    super(`Project lock critical section for "${key}" exceeded ${timeoutMs}ms`);
+    this.name = "ProjectLockTimeoutError";
+    this.key = key;
+    this.timeoutMs = timeoutMs;
+  }
+};
+async function runWithTimeout(key, timeoutMs, fn) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const abortError = new Promise((_, reject) => {
+    controller.signal.addEventListener("abort", () => reject(new ProjectLockTimeoutError(key, timeoutMs)), {
+      once: true
+    });
+  });
+  const work = fn(controller.signal);
+  work.catch(() => {
+  });
+  try {
+    return await Promise.race([work, abortError]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
 function hashKey(key) {
   const digest = createHash("sha256").update(key).digest();
   const a = digest.readInt32BE(0);
@@ -25430,9 +25544,9 @@ function hashKey(key) {
   return [a, b];
 }
 function withProjectLock(options) {
-  const { key, storage, fn, pool } = options;
+  const { key, storage, fn, pool, timeoutMs = DEFAULT_PROJECT_LOCK_TIMEOUT_MS } = options;
   const prev = inProcessLocks.get(key) ?? Promise.resolve();
-  const run = () => withDbAdvisoryLock({ key, storage, fn, pool });
+  const run = () => withDbAdvisoryLock({ key, storage, fn, pool, timeoutMs });
   const next = prev.then(run, run);
   const tail = next.then(
     () => void 0,
@@ -25447,28 +25561,31 @@ function withProjectLock(options) {
   return next;
 }
 async function withDbAdvisoryLock(options) {
-  const { key, storage, fn, pool } = options;
+  const { key, storage, fn, pool, timeoutMs = DEFAULT_PROJECT_LOCK_TIMEOUT_MS } = options;
   if (process.env.MASTRACODE_DISTRIBUTED_LOCK === "0") {
-    return fn();
+    return runWithTimeout(key, timeoutMs, fn);
   }
-  if (pool) return advisoryLockOver(pool, key, fn);
+  if (pool) return advisoryLockOver(pool, key, timeoutMs, fn);
   if (typeof storage?.withDistributedLock !== "function") {
-    return fn();
+    return runWithTimeout(key, timeoutMs, fn);
   }
-  return storage.withDistributedLock(key, fn);
+  return storage.withDistributedLock(key, () => runWithTimeout(key, timeoutMs, fn));
 }
-async function advisoryLockOver(pool, key, fn) {
+async function advisoryLockOver(pool, key, timeoutMs, fn) {
   const [k1, k2] = hashKey(key);
   const client = await pool.connect();
   try {
     await client.query("BEGIN");
     await client.query("SELECT pg_advisory_xact_lock($1, $2)", [k1, k2]);
     try {
-      const result = await fn();
+      const result = await runWithTimeout(key, timeoutMs, fn);
       await client.query("COMMIT");
       return result;
     } catch (err) {
-      await client.query("ROLLBACK");
+      try {
+        await client.query("ROLLBACK");
+      } catch {
+      }
       throw err;
     }
   } finally {
@@ -26444,7 +26561,7 @@ function buildGithubRoutes(options) {
             list = await github.listInstallationRepos(Number(inst.externalId));
           } catch (err) {
             if (err.status !== 404) throw err;
-            console.error(`[MastraCode Web] pruning stale GitHub installation ${inst.externalId} (404 from GitHub)`);
+            console.error(`[Mastra Factory] pruning stale GitHub installation ${inst.externalId} (404 from GitHub)`);
             await github.sourceControlStorage.installations.delete({ orgId: resolved.tenant.orgId, id: inst.id });
             continue;
           }
@@ -27387,7 +27504,7 @@ function logPlatformError(message, fields) {
 }
 function writePlatformLog(level, message, fields) {
   const metadata = fields ? ` ${JSON.stringify(stripUndefined(fields))}` : "";
-  process.stderr.write(`[MastraCode Web] ${level.toUpperCase()} ${message}${metadata}
+  process.stderr.write(`[Mastra Factory] ${level.toUpperCase()} ${message}${metadata}
 `);
 }
 function stripUndefined(fields) {
@@ -27404,7 +27521,7 @@ import { randomUUID as randomUUID2 } from "crypto";
 import { isLeaseProvider, NoopLeaseProvider } from "@mastra/core/events";
 import { MastraWorker } from "@mastra/core/worker";
 var API_PREFIX = "/v1/server/github-app";
-var DEFAULT_POLL_INTERVAL_MS = 5e3;
+var DEFAULT_POLL_INTERVAL_MS = 2e4;
 var EVENT_PAGE_SIZE = 500;
 var MIN_LEASE_TTL_MS = 3e4;
 var CURSOR_ORG_ID = "__platform_github_event_worker__";
@@ -27594,10 +27711,16 @@ var PlatformGithubEventWorker = class extends MastraWorker {
       const query = new URLSearchParams({ limit: String(EVENT_PAGE_SIZE) });
       if ("afterEventId" in cursor) query.set("afterEventId", cursor.afterEventId);
       else query.set("afterTimestamp", String(cursor.afterTimestamp));
+      const pollStartedAt = performance.now();
       const page = await this.#client.request(
         "GET",
         `${API_PREFIX}/repositories/${repositoryId}/events?${query}`
       );
+      this.deps?.logger.info("Platform GitHub repository event poll completed", {
+        repositoryId,
+        eventCount: page.events.length,
+        latencyMs: Math.round(performance.now() - pollStartedAt)
+      });
       if (page.events.length === 0 || !page.nextCursor) return;
       for (const event of page.events) {
         if (!this.#running || !this.#hasLease) return;
@@ -27720,6 +27843,7 @@ var PlatformGithubIntegration = class {
   #storage;
   #integrationStorage;
   intake = {
+    resolveIntakeDispatch: (input) => this.#resolveIntakeDispatch(input),
     listSources: async ({ orgId, userId }) => {
       const installations = await this.#client.request("GET", `${API_PREFIX2}/github-app/installations`);
       const usable = installations.installations.filter(
@@ -27818,7 +27942,8 @@ var PlatformGithubIntegration = class {
       return this.#listIssues(input.connection, sourceId, parsePositiveCursor(input.cursor), input.labels);
     },
     getIssue: (input) => this.#getIssue(input.connection, input.sourceId, input.issueId),
-    createComment: (input) => this.#createIssueComment(input)
+    createComment: (input) => this.#createIssueComment(input),
+    updateIssue: (input) => this.#updateIntakeIssue(input)
   };
   versionControl = {
     initialize: ({ storage }) => {
@@ -27910,6 +28035,21 @@ var PlatformGithubIntegration = class {
     }
     return this.#integrationStorage;
   }
+  /** Resolve a stored GitHub locator without scanning installations or repositories. */
+  async #resolveIntakeDispatch({
+    orgId,
+    externalSource
+  }) {
+    const target = parseGithubExternalTarget(externalSource.externalId);
+    if (!target) return null;
+    const repository = target.repository.includes("/") ? target.repository : (await this.storage.repositories.findByExternalId({ orgId, externalId: target.repository }))?.slug;
+    if (!repository) return null;
+    return {
+      connection: { type: "app-installation", installationId: 1 },
+      sourceId: repository,
+      issueId: target.issueId
+    };
+  }
   initialize({ storage }) {
     this.#integrationStorage = storage;
     logPlatformInfo("Platform GitHub integration initialized", {
@@ -28208,6 +28348,39 @@ var PlatformGithubIntegration = class {
       throw error;
     }
   }
+  async #updateIntakeIssue(input) {
+    requireGithubConnection(input.connection);
+    const repository = requireSource(input.sourceId, "GitHub Intake requires a repository source.");
+    const issueNumber = requirePositiveId(input.issueId, "issue");
+    if (input.state.kind === "byName") {
+      logPlatformWarn(`Platform GitHub: updateIssue byName is not supported (name=${input.state.name}); ignoring.`);
+      return null;
+    }
+    const targetState = input.state.stateType === "unstarted" || input.state.stateType === "started" ? "open" : "closed";
+    const stateReason = targetState === "closed" ? input.state.stateType === "canceled" ? "not_planned" : "completed" : null;
+    try {
+      await this.#client.request("GET", repositoryPath(repository, `pulls/${issueNumber}`));
+      logPlatformWarn(`Platform GitHub: updateIssue rejected \u2014 target ${repository}#${issueNumber} is a pull request.`);
+      return null;
+    } catch (error) {
+      if (!isNotFound(error)) throw error;
+    }
+    try {
+      const issue = await this.#client.request(
+        "PATCH",
+        repositoryPath(repository, `issues/${issueNumber}`),
+        {
+          state: targetState,
+          ...stateReason ? { state_reason: stateReason } : {}
+        },
+        { actingUserId: input.actingUserId }
+      );
+      return parseIntakeIssue(repository, issue);
+    } catch (error) {
+      if (isNotFound(error)) return null;
+      throw error;
+    }
+  }
   async #createIssueComment(input) {
     requireGithubConnection(input.connection);
     const repository = requireSource(input.sourceId, "GitHub Intake requires a repository source.");
@@ -28592,6 +28765,11 @@ function parsePositiveInteger(value) {
   const parsed = Number(value);
   return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : null;
 }
+function parseGithubExternalTarget(externalId) {
+  const match = externalId.match(/^(.+\/.+):(\d+)$/) ?? externalId.match(/^github:(\d+):(?:issue|pull-request):(\d+)$/) ?? externalId.match(/^(\d+):(\d+)$/);
+  if (!match?.[1] || !match[2] || parsePositiveInteger(match[2]) === null) return null;
+  return { repository: match[1], issueId: match[2] };
+}
 function optionalPositiveIntegerEnv(name) {
   const value = process.env[name]?.trim();
   if (!value) return void 0;
@@ -28962,7 +29140,14 @@ var PlatformLinearIntegration = class {
   #endpointHost;
   #projects;
   #auth;
+  /**
+   * Per-instance workflow-state cache keyed by `${workspaceId}:${teamId}`. Scoped to the process
+   * lifetime; not shared across requests intentionally to keep failure modes simple (stale states
+   * clear on process restart). Populated lazily on first `updateIssue` per team.
+   */
+  #workflowStatesByTeam = /* @__PURE__ */ new Map();
   intake = {
+    resolveIntakeDispatch: (input) => this.#resolveIntakeDispatch(input),
     listSources: async () => {
       const sources = await this.#listProjectSources();
       return sources.map(({ workspace, project }) => ({
@@ -29033,6 +29218,59 @@ var PlatformLinearIntegration = class {
         if (isNotFound2(error)) return null;
         throw error;
       }
+    },
+    updateIssue: async (input) => {
+      requireLinearConnection(input.connection);
+      const located = await this.#findIssue(input.sourceId, input.issueId);
+      if (!located) return null;
+      const { workspaceId, issue } = located;
+      const target = input.state;
+      if (target.kind === "byType" && issue.state.type === target.stateType) {
+        return parseIssue(issue);
+      }
+      if (target.kind === "byName" && issue.state.name.toLowerCase() === target.name.toLowerCase()) {
+        return parseIssue(issue);
+      }
+      let states;
+      try {
+        states = await this.#listWorkflowStates(workspaceId, issue.team.id);
+      } catch (error) {
+        if (isNotFound2(error)) {
+          logPlatformWarn("Platform Linear: workflow-states endpoint not available; skipping updateIssue.", {
+            workspaceId,
+            teamId: issue.team.id
+          });
+          return null;
+        }
+        throw error;
+      }
+      let matched;
+      if (target.kind === "byType") {
+        matched = states.slice().sort((a, b) => a.position - b.position).find((s) => s.type === target.stateType);
+      } else {
+        const wanted = target.name.toLowerCase();
+        matched = states.find((s) => s.name.toLowerCase() === wanted);
+      }
+      if (!matched) {
+        logPlatformWarn("Platform Linear: no workflow state matched target; skipping updateIssue.", {
+          workspaceId,
+          teamId: issue.team.id,
+          target
+        });
+        return null;
+      }
+      try {
+        await this.#client.request(
+          "PATCH",
+          `${API_PREFIX3}/workspaces/${encodeURIComponent(workspaceId)}/issues/${encodeURIComponent(input.issueId)}`,
+          { stateId: matched.id }
+        );
+      } catch (error) {
+        if (isNotFound2(error)) return null;
+        throw error;
+      }
+      const refreshed = await this.#findIssue(input.sourceId, input.issueId);
+      return refreshed ? parseIssue(refreshed.issue) : null;
     }
   };
   constructor() {
@@ -29105,6 +29343,23 @@ var PlatformLinearIntegration = class {
   async getFreshAccessToken(_connection) {
     return PLATFORM_MANAGED_CONNECTION_TOKEN;
   }
+  /**
+   * Background-dispatch context: platform-managed connection token when the
+   * org has a connected workspace. Linear work items store the issue UUID
+   * directly as `externalId`.
+   */
+  async #resolveIntakeDispatch({
+    orgId,
+    externalSource
+  }) {
+    if (externalSource.type !== "issue") return null;
+    const connection = await this.loadConnection(orgId);
+    if (!connection) return null;
+    return {
+      connection: { type: "oauth", accessToken: PLATFORM_MANAGED_CONNECTION_TOKEN },
+      issueId: externalSource.externalId
+    };
+  }
   canPostComments(connection) {
     const scopes = (connection.scope ?? "").split(/[\s,]+/).filter(Boolean);
     return scopes.some((scope) => scope === "comments:create" || scope === "write" || scope === "admin");
@@ -29264,6 +29519,17 @@ var PlatformLinearIntegration = class {
     }
     return null;
   }
+  async #listWorkflowStates(workspaceId, teamId) {
+    const cacheKey = `${workspaceId}:${teamId}`;
+    const cached = this.#workflowStatesByTeam.get(cacheKey);
+    if (cached) return cached;
+    const result = await this.#client.request(
+      "GET",
+      `${API_PREFIX3}/workspaces/${encodeURIComponent(workspaceId)}/workflow-states?teamId=${encodeURIComponent(teamId)}&first=100`
+    );
+    this.#workflowStatesByTeam.set(cacheKey, result.workflowStates);
+    return result.workflowStates;
+  }
   async #candidateWorkspaceIds(sourceId) {
     if (sourceId) return [decodeSourceId(sourceId).workspaceId];
     return (await this.#listWorkspaces()).map((workspace) => workspace.linearWorkspaceId);
@@ -29769,6 +30035,7 @@ var ProjectRoutes = class extends Route {
                 orgId: tenant.orgId,
                 id: connection.installationId
               });
+              if (!installation) continue;
               const links = await handle.projectRepositories.list({ orgId: tenant.orgId, connectionId: connection.id });
               connections.push({
                 ...connection,
@@ -31851,12 +32118,16 @@ var ConfigRoutes = class extends Route {
 // src/routes/fs.ts
 import { lstat, open, readdir, realpath, stat } from "fs/promises";
 import { homedir } from "os";
-import { isAbsolute, join, resolve, sep } from "path";
+import { isAbsolute, join, posix as posixPath, resolve, sep } from "path";
+import { SandboxFilesystem } from "@mastra/code-sdk/agents/sandbox-filesystem";
 import { detectProject, getResourceIdOverride } from "@mastra/code-sdk/utils/project";
 import { registerApiRoute as registerApiRoute8 } from "@mastra/core/server";
 var MAX_TEXT_FILE_BYTES = 512 * 1024;
 var TEXT_DECODER = new TextDecoder("utf-8", { fatal: true });
 var APPROVED_RENDERED_ROOTS = /* @__PURE__ */ new Set([".artifacts"]);
+function loose7(c) {
+  return c;
+}
 function resolveFsRoot(root) {
   return resolve(root && root.trim() ? root : homedir());
 }
@@ -32037,6 +32308,91 @@ async function listArtifacts(root, workspacePath) {
     entries: listing.entries
   };
 }
+async function resolveAuthorizedSession(c, deps, workspacePath) {
+  if (!deps) return null;
+  const session = await deps.sessions.getBySessionId(workspacePath);
+  if (!session) return null;
+  if (deps.auth.enabled()) {
+    await deps.auth.ensureUser(c);
+    const tenant = deps.auth.tenant(c);
+    if (!tenant || tenant.orgId !== session.orgId || tenant.userId !== session.userId) {
+      throw new Error("Session is not available to the current user");
+    }
+  }
+  return session;
+}
+async function sessionSandbox(fleet, session) {
+  if (!fleet.enabled || !session.sandboxId || !session.sandboxWorkdir) return null;
+  let sandbox;
+  try {
+    sandbox = await fleet.reattachSandbox(session.sandboxId, { workingDirectory: session.sandboxWorkdir });
+  } catch {
+    return null;
+  }
+  return {
+    sandbox,
+    filesystem: new SandboxFilesystem({ sandbox, workdir: session.sandboxWorkdir }),
+    workdir: session.sandboxWorkdir
+  };
+}
+async function listSessionRenderedPath(fleet, session, renderedRoot) {
+  const safeRoot = assertApprovedRenderedRoot(renderedRoot);
+  const rootPath = posixPath.join(session.sandboxWorkdir ?? "", safeRoot);
+  const empty = { workspacePath: session.sessionId, root: safeRoot, rootPath, entries: [] };
+  const handle = await sessionSandbox(fleet, session);
+  if (!handle) return empty;
+  const quotedRoot = `'${rootPath.replace(/'/g, `'\\''`)}'`;
+  const result = await handle.sandbox.executeCommand(
+    "sh",
+    [
+      "-c",
+      `test -d ${quotedRoot} && find ${quotedRoot} -mindepth 1 -printf '%y\\t%s\\t%T@\\t%p\\n' 2>/dev/null || true`
+    ],
+    { timeout: 3e4 }
+  );
+  if (result.exitCode !== 0) return empty;
+  const entries = [];
+  for (const line of result.stdout.split("\n")) {
+    if (!line) continue;
+    const [type, sizeStr, mtimeStr, ...pathParts] = line.split("	");
+    const fullPath = pathParts.join("	");
+    if (!fullPath || !fullPath.startsWith(`${rootPath}/`)) continue;
+    const relativePath = fullPath.slice(rootPath.length + 1);
+    entries.push({
+      name: posixPath.basename(relativePath),
+      path: relativePath,
+      type: type === "d" ? "directory" : "file",
+      size: type === "d" ? 0 : Number(sizeStr) || 0,
+      updatedAt: new Date((Number(mtimeStr) || 0) * 1e3).toISOString()
+    });
+  }
+  entries.sort((a, b) => a.path.localeCompare(b.path));
+  return { workspacePath: session.sessionId, root: safeRoot, rootPath, entries };
+}
+async function readSessionWorkspaceFile(fleet, session, path3) {
+  const safePath = assertRelativePath(path3, "path");
+  assertApprovedRenderedRoot(safePath.split("/")[0] ?? "");
+  const handle = await sessionSandbox(fleet, session);
+  if (!handle) throw new Error("Session workspace is not available");
+  const { filesystem } = handle;
+  const info = await filesystem.stat(safePath);
+  if (info.type === "directory") throw new Error("Path is a directory");
+  const buffer = await filesystem.readFile(safePath);
+  const truncated = buffer.length > MAX_TEXT_FILE_BYTES;
+  const base = {
+    workspacePath: session.sessionId,
+    path: safePath,
+    name: posixPath.basename(safePath),
+    size: buffer.length,
+    updatedAt: info.modifiedAt.toISOString()
+  };
+  try {
+    const content = TEXT_DECODER.decode(truncated ? buffer.subarray(0, MAX_TEXT_FILE_BYTES) : buffer);
+    return { ...base, contentType: "text", content, truncated };
+  } catch {
+    return { ...base, contentType: "unsupported" };
+  }
+}
 function resolveCodebase(projectPath) {
   const info = detectProject(projectPath);
   const override = getResourceIdOverride(info.rootPath);
@@ -32050,6 +32406,7 @@ function resolveCodebase(projectPath) {
 }
 function buildFsRoutes(options = {}) {
   const root = resolveFsRoot(options.root);
+  const sessionFs = options.sessionFs;
   return [
     registerApiRoute8("/web/fs/list", {
       method: "GET",
@@ -32089,10 +32446,14 @@ function buildFsRoutes(options = {}) {
         if (!workspacePath) return c.json({ error: "Missing required query param: workspacePath" }, 400);
         if (!renderedRoot) return c.json({ error: "Missing required query param: root" }, 400);
         try {
+          const session = await resolveAuthorizedSession(loose7(c), sessionFs, workspacePath);
+          if (session && sessionFs) {
+            return c.json(await listSessionRenderedPath(sessionFs.fleet, session, renderedRoot));
+          }
           return c.json(await listWorkspaceRenderedPath(root, workspacePath, renderedRoot));
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
-          const status = message.includes("outside") || message.includes("relative") || message.includes("escapes") || message.includes("not approved") ? 403 : 500;
+          const status = message.includes("outside") || message.includes("relative") || message.includes("escapes") || message.includes("not approved") || message.includes("not available") ? 403 : 500;
           return c.json({ error: message }, status);
         }
       }
@@ -32106,10 +32467,14 @@ function buildFsRoutes(options = {}) {
         if (!workspacePath) return c.json({ error: "Missing required query param: workspacePath" }, 400);
         if (!path3) return c.json({ error: "Missing required query param: path" }, 400);
         try {
+          const session = await resolveAuthorizedSession(loose7(c), sessionFs, workspacePath);
+          if (session && sessionFs) {
+            return c.json(await readSessionWorkspaceFile(sessionFs.fleet, session, path3));
+          }
           return c.json(await readWorkspaceFile(root, workspacePath, path3));
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
-          const status = message.includes("outside") || message.includes("relative") || message.includes("escapes") || message.includes("not approved") ? 403 : message.includes("directory") ? 400 : 500;
+          const status = message.includes("outside") || message.includes("relative") || message.includes("escapes") || message.includes("not approved") || message.includes("not available") ? 403 : message.includes("directory") ? 400 : message.includes("not found") ? 404 : 500;
           return c.json({ error: message }, status);
         }
       }
@@ -32135,7 +32500,7 @@ function buildFsRoutes(options = {}) {
 
 // src/routes/intake.ts
 import { registerApiRoute as registerApiRoute9 } from "@mastra/core/server";
-function loose7(c) {
+function loose8(c) {
   return c;
 }
 function sanitizeIdList(value) {
@@ -32199,7 +32564,7 @@ var IntakeRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const tenant = await this.#resolveTenant(loose7(c));
+          const tenant = await this.#resolveTenant(loose8(c));
           if ("response" in tenant) return tenant.response;
           await intake.ensureReady();
           const config = await intake.getConfig({ ...tenant, integrationIds });
@@ -32210,7 +32575,7 @@ var IntakeRoutes = class extends Route {
         method: "PUT",
         requiresAuth: false,
         handler: async (c) => {
-          const tenant = await this.#resolveTenant(loose7(c));
+          const tenant = await this.#resolveTenant(loose8(c));
           if ("response" in tenant) return tenant.response;
           let body;
           try {
@@ -32225,7 +32590,7 @@ var IntakeRoutes = class extends Route {
           await intake.ensureReady();
           await intake.saveConfig({ ...tenant, config });
           await audit.emit({
-            context: loose7(c),
+            context: loose8(c),
             input: {
               action: "factory.intake.config_updated",
               targets: [{ type: "intake_config", id: tenant.orgId }],
@@ -32244,7 +32609,7 @@ var IntakeRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const tenant = await this.#resolveTenant(loose7(c));
+          const tenant = await this.#resolveTenant(loose8(c));
           if ("response" in tenant) return tenant.response;
           const pages = await Promise.all(
             integrations.map(async (integration) => ({
@@ -32263,7 +32628,7 @@ var IntakeRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const tenant = await this.#resolveTenant(loose7(c));
+          const tenant = await this.#resolveTenant(loose8(c));
           if ("response" in tenant) return tenant.response;
           const cursors = decodeCursor2(c.req.query("cursor"));
           if (!cursors) return c.json({ error: "invalid_cursor" }, 400);
@@ -32642,7 +33007,7 @@ var OAUTH_FLOWS = {
     }
   }
 };
-function loose8(c) {
+function loose9(c) {
   return c;
 }
 var localSessionsPromise;
@@ -32712,14 +33077,14 @@ var OAuthRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const ctx = await resolveCredentialContext({ c: loose8(c), auth, credentials: modelCredentials });
+          const ctx = await resolveCredentialContext({ c: loose9(c), auth, credentials: modelCredentials });
           if ("response" in ctx) return ctx.response;
           const provider = c.req.param("provider");
           const flow = OAUTH_FLOWS[provider];
           if (!flow) {
             return c.json({ error: "oauth_not_supported", message: `Provider does not support web sign-in` }, 404);
           }
-          const body = await readJsonBody(loose8(c));
+          const body = await readJsonBody(loose9(c));
           if (typeof body.mode === "string" && body.mode !== flow.kind) {
             return c.json({ error: "invalid_mode", message: `Unsupported mode for ${provider}: ${body.mode}` }, 400);
           }
@@ -32756,12 +33121,12 @@ var OAuthRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const ctx = await resolveCredentialContext({ c: loose8(c), auth, credentials: modelCredentials });
+          const ctx = await resolveCredentialContext({ c: loose9(c), auth, credentials: modelCredentials });
           if ("response" in ctx) return ctx.response;
           const provider = c.req.param("provider");
           const flow = OAUTH_FLOWS[provider];
           if (!flow?.complete) return c.json({ error: "oauth_not_supported" }, 404);
-          const body = await readJsonBody(loose8(c));
+          const body = await readJsonBody(loose9(c));
           const sessionId = typeof body.sessionId === "string" ? body.sessionId : "";
           const code = typeof body.code === "string" ? body.code.trim() : "";
           if (!sessionId || !code) return c.json({ error: "Missing required fields: sessionId, code" }, 400);
@@ -32791,12 +33156,12 @@ var OAuthRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const ctx = await resolveCredentialContext({ c: loose8(c), auth, credentials: modelCredentials });
+          const ctx = await resolveCredentialContext({ c: loose9(c), auth, credentials: modelCredentials });
           if ("response" in ctx) return ctx.response;
           const provider = c.req.param("provider");
           const flow = OAUTH_FLOWS[provider];
           if (!flow?.poll) return c.json({ error: "oauth_not_supported" }, 404);
-          const body = await readJsonBody(loose8(c));
+          const body = await readJsonBody(loose9(c));
           const sessionId = typeof body.sessionId === "string" ? body.sessionId : "";
           if (!sessionId) return c.json({ error: "Missing required field: sessionId" }, 400);
           const session = await loadOwnedSession({ ctx, provider, sessionId });
@@ -32847,7 +33212,7 @@ var OAuthRoutes = class extends Route {
         method: "DELETE",
         requiresAuth: false,
         handler: async (c) => {
-          const ctx = await resolveCredentialContext({ c: loose8(c), auth, credentials: modelCredentials });
+          const ctx = await resolveCredentialContext({ c: loose9(c), auth, credentials: modelCredentials });
           if ("response" in ctx) return ctx.response;
           const provider = c.req.param("provider");
           const sessionId = c.req.param("sessionId");
@@ -32860,7 +33225,7 @@ var OAuthRoutes = class extends Route {
         method: "DELETE",
         requiresAuth: false,
         handler: async (c) => {
-          const ctx = await resolveCredentialContext({ c: loose8(c), auth, credentials: modelCredentials });
+          const ctx = await resolveCredentialContext({ c: loose9(c), auth, credentials: modelCredentials });
           if ("response" in ctx) return ctx.response;
           const provider = c.req.param("provider");
           const authProviderId = getAuthProviderId(provider);
@@ -32926,7 +33291,7 @@ var MAX_SCOPE_LENGTH = 2048;
 var MAX_ARGUMENTS_LENGTH2 = 16384;
 var SKILL_NAME_RE2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var UUID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-function loose9(context) {
+function loose10(context) {
   return context;
 }
 function parseBody(value) {
@@ -33000,7 +33365,7 @@ var SkillRoutes = class extends Route {
     const { controllerId, controller, authorizeSessionAddress: customAuthorize } = this.deps;
     const authorize = customAuthorize ?? ((context, address) => this.#authorizeSessionAddress(context, address));
     const handleSkillRequest = async (context, dispatch) => {
-      const c = loose9(context);
+      const c = loose10(context);
       if (c.req.param("controllerId") !== controllerId) {
         return c.json({ error: "controller_not_found", message: "Agent controller not found." }, 404);
       }
@@ -34627,7 +34992,7 @@ function computeFactoryMetrics(items, opts) {
 }
 
 // src/routes/work-items.ts
-function loose10(c) {
+function loose11(c) {
   return c;
 }
 var UUID_RE4 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -34945,7 +35310,7 @@ var WorkItemRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const resolved = await this.#resolveProject(loose10(c));
+          const resolved = await this.#resolveProject(loose11(c));
           if ("response" in resolved) return resolved.response;
           await workItems.ensureReady();
           const items = await workItems.list({
@@ -34960,11 +35325,11 @@ var WorkItemRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const resolved = await this.#resolveProject(loose10(c));
+          const resolved = await this.#resolveProject(loose11(c));
           if ("response" in resolved) return resolved.response;
           const { windowStart, windowEnd } = parseMetricsRange(
-            loose10(c).req.query("from"),
-            loose10(c).req.query("to"),
+            loose11(c).req.query("from"),
+            loose11(c).req.query("to"),
             /* @__PURE__ */ new Date()
           );
           await workItems.ensureReady();
@@ -34980,7 +35345,7 @@ var WorkItemRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const resolved = await this.#resolveProject(loose10(c));
+          const resolved = await this.#resolveProject(loose11(c));
           if ("response" in resolved) return resolved.response;
           await queueHealth.ensureReady();
           const stored = await queueHealth.getConfig(resolved.orgId, resolved.factoryProjectId);
@@ -34992,7 +35357,7 @@ var WorkItemRoutes = class extends Route {
         method: "GET",
         requiresAuth: false,
         handler: async (c) => {
-          const context = loose10(c);
+          const context = loose11(c);
           const resolved = await this.#resolveProject(context);
           if ("response" in resolved) return resolved.response;
           const cursorRaw = context.req.query("before");
@@ -35017,7 +35382,7 @@ var WorkItemRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const context = loose10(c);
+          const context = loose11(c);
           const resolved = await this.#resolveProject(context);
           if ("response" in resolved) return resolved.response;
           const decisionId = context.req.param("decisionId");
@@ -35038,9 +35403,9 @@ var WorkItemRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const resolved = await this.#resolveProject(loose10(c));
+          const resolved = await this.#resolveProject(loose11(c));
           if ("response" in resolved) return resolved.response;
-          const body = await readJson2(loose10(c));
+          const body = await readJson2(loose11(c));
           if (body === void 0) return c.json({ error: "Invalid JSON body" }, 400);
           const input = parseCreateWorkItem(body);
           if (!input) return c.json({ error: "invalid_work_item" }, 400);
@@ -35083,7 +35448,7 @@ var WorkItemRoutes = class extends Route {
               }
               item = await workItems.getForProject(resolved.orgId, resolved.factoryProjectId, item.id) ?? item;
               await audit.emit({
-                context: loose10(c),
+                context: loose11(c),
                 input: {
                   action: "factory.work_item.created",
                   factoryProjectId: resolved.factoryProjectId,
@@ -35094,7 +35459,7 @@ var WorkItemRoutes = class extends Route {
             } else {
               const { stages: _stages, sessions: _sessions, ...boundedPatch } = input;
               await this.#auditWorkItemPatch({
-                context: loose10(c),
+                context: loose11(c),
                 item,
                 previous: result.previous,
                 patch: boundedPatch
@@ -35114,11 +35479,11 @@ var WorkItemRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const resolved = await this.#resolveProject(loose10(c));
+          const resolved = await this.#resolveProject(loose11(c));
           if ("response" in resolved) return resolved.response;
-          const workItemId = loose10(c).req.param("workItemId");
+          const workItemId = loose11(c).req.param("workItemId");
           if (!workItemId || !UUID_RE4.test(workItemId)) return c.json({ error: "Work item not found" }, 404);
-          const parsed = parseTransitionBody(await readJson2(loose10(c)));
+          const parsed = parseTransitionBody(await readJson2(loose11(c)));
           if (!parsed) return c.json({ error: "invalid_transition_request" }, 400);
           if (!transitionService) {
             return c.json({ error: "factory_transition_unavailable" }, 503);
@@ -35136,7 +35501,7 @@ var WorkItemRoutes = class extends Route {
             }
           });
           await audit.emit({
-            context: loose10(c),
+            context: loose11(c),
             input: {
               action: result.status === "accepted" ? "factory.work_item.stage_moved" : "factory.work_item.transition_rejected",
               factoryProjectId: resolved.factoryProjectId,
@@ -35158,14 +35523,14 @@ var WorkItemRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
-          const resolved = await this.#resolveProject(loose10(c));
+          const resolved = await this.#resolveProject(loose11(c));
           if ("response" in resolved) return resolved.response;
           if (!startCoordinator) {
             return c.json({ error: "factory_start_unavailable" }, 503);
           }
-          const input = parseStartBody(await readJson2(loose10(c)), resolved, resolved.factoryProjectId);
+          const input = parseStartBody(await readJson2(loose11(c)), resolved, resolved.factoryProjectId);
           if (!input) return c.json({ error: "invalid_factory_start" }, 400);
-          input.requestContext = loose10(c).get("requestContext");
+          input.requestContext = loose11(c).get("requestContext");
           input.defaultModelId = resolved.defaultModelId ?? void 0;
           if (!input.workItem.id && ((input.workItem.input.stages ?? ["intake"]).length !== 1 || (input.workItem.input.stages ?? ["intake"])[0] !== "intake")) {
             return c.json(
@@ -35184,7 +35549,7 @@ var WorkItemRoutes = class extends Route {
             throw error;
           }
           await audit.emit({
-            context: loose10(c),
+            context: loose11(c),
             input: {
               action: "factory.run.started",
               factoryProjectId: resolved.factoryProjectId,
@@ -35206,11 +35571,11 @@ var WorkItemRoutes = class extends Route {
         method: "PATCH",
         requiresAuth: false,
         handler: async (c) => {
-          const tenant = await this.#resolveTenant(loose10(c));
+          const tenant = await this.#resolveTenant(loose11(c));
           if ("response" in tenant) return tenant.response;
-          const id = loose10(c).req.param("id");
+          const id = loose11(c).req.param("id");
           if (!id || !UUID_RE4.test(id)) return c.json({ error: "Work item not found" }, 404);
-          const body = await readJson2(loose10(c));
+          const body = await readJson2(loose11(c));
           if (body === void 0) return c.json({ error: "Invalid JSON body" }, 400);
           const patch = parseUpdateWorkItem(body);
           if (!patch) return c.json({ error: "invalid_work_item_patch" }, 400);
@@ -35225,7 +35590,7 @@ var WorkItemRoutes = class extends Route {
             const updated = await workItems.update({ orgId: tenant.orgId, id, userId: tenant.userId, patch });
             if (!updated) return c.json({ error: "Work item not found" }, 404);
             await this.#auditWorkItemPatch({
-              context: loose10(c),
+              context: loose11(c),
               item: updated.item,
               previous: updated.previous,
               patch
@@ -35244,15 +35609,15 @@ var WorkItemRoutes = class extends Route {
         method: "DELETE",
         requiresAuth: false,
         handler: async (c) => {
-          const tenant = await this.#resolveTenant(loose10(c));
+          const tenant = await this.#resolveTenant(loose11(c));
           if ("response" in tenant) return tenant.response;
-          const id = loose10(c).req.param("id");
+          const id = loose11(c).req.param("id");
           if (!id || !UUID_RE4.test(id)) return c.json({ error: "Work item not found" }, 404);
           await workItems.ensureReady();
           const deleted = await workItems.delete({ orgId: tenant.orgId, id });
           if (!deleted) return c.json({ error: "Work item not found" }, 404);
           await audit.emit({
-            context: loose10(c),
+            context: loose11(c),
             input: {
               action: "factory.work_item.deleted",
               factoryProjectId: deleted.factoryProjectId,
@@ -35473,7 +35838,14 @@ function assembleFactoryApiRoutes(deps) {
     });
   }
   return [
-    ...buildFsRoutes({ root: deps.fsRoot }),
+    ...buildFsRoutes({
+      root: deps.fsRoot,
+      sessionFs: {
+        auth: deps.auth,
+        fleet: deps.fleet,
+        sessions: deps.sourceControlStorage.forIntegration("github").sessions
+      }
+    }),
     ...new ConfigRoutes({
       auth: deps.auth,
       controller: deps.controller,
@@ -36627,7 +36999,7 @@ function handleServerError(err, c) {
     return c.json({ error: err.message }, err.status);
   }
   const detail = err instanceof Error ? err.stack ?? err.message : String(err);
-  console.error(`[MastraCode Web] ${c.req.method} ${c.req.path} failed: ${detail}`);
+  console.error(`[Mastra Factory] ${c.req.method} ${c.req.path} failed: ${detail}`);
   return c.json(
     {
       error: "internal_error",
@@ -36939,7 +37311,7 @@ var AuditStorage = class extends FactoryStorageDomain4 {
 import { registerApiRoute as registerApiRoute14 } from "@mastra/core/server";
 var UUID_RE5 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 var MAX_ACTION_FILTERS = 16;
-function loose11(c) {
+function loose12(c) {
   return c;
 }
 function parseActionsParam(raw) {
@@ -37062,7 +37434,7 @@ var AuditDomain = class {
       registerApiRoute14("/web/factory/projects/:id/audit", {
         method: "GET",
         handler: async (cc) => {
-          const c = loose11(cc);
+          const c = loose12(cc);
           const tenant = await this.#resolveTenant(c);
           if ("response" in tenant) return tenant.response;
           const projectId = c.req.param("id");
@@ -38228,13 +38600,12 @@ var SourceControlStorage = class extends FactoryStorageDomain11 {
           );
         },
         get: getRepository,
-        findByExternalId: async ({ orgId, installationId, externalId }) => {
-          await requireInstallation({ orgId, id: installationId });
-          const row = await db().findOne(REPOSITORIES, {
-            installation_id: installationId,
-            external_id: externalId
-          });
-          return row ? toRepository(row) : null;
+        findByExternalId: async ({ orgId, externalId }) => {
+          const rows = await db().findMany(REPOSITORIES, { external_id: externalId });
+          for (const row of rows) {
+            if (await getInstallation({ orgId, id: row.installation_id })) return toRepository(row);
+          }
+          return null;
         },
         findBySlug: async ({ orgId, installationId, slug }) => {
           await requireInstallation({ orgId, id: installationId });
@@ -38560,7 +38931,7 @@ var SourceControlStorage = class extends FactoryStorageDomain11 {
 import { existsSync as existsSync2 } from "fs";
 import path2, { dirname as dirname2, join as join3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { SandboxFilesystem } from "@mastra/code-sdk/agents/sandbox-filesystem";
+import { SandboxFilesystem as SandboxFilesystem2 } from "@mastra/code-sdk/agents/sandbox-filesystem";
 import { MASTRACODE_WORKSPACE_TOOLS } from "@mastra/code-sdk/agents/tool-availability";
 import { getDynamicWorkspace } from "@mastra/code-sdk/agents/workspace";
 import { DEFAULT_CONFIG_DIR } from "@mastra/code-sdk/constants";
@@ -38746,7 +39117,7 @@ function createWorkspaceFactory(options = {}) {
     githubTokenInjectors.set(workspaceId, { inject: injectGithubToken2, patKind, ghToken: ghCliToken });
     registerGithubTokenInjector(requestContext, injectGithubToken2);
     registerGithubPatKind(requestContext, patKind);
-    const filesystem = new SandboxFilesystem({ sandbox, workdir });
+    const filesystem = new SandboxFilesystem2({ sandbox, workdir });
     const projectSkillPaths = [path2.join(configDir, "skills"), ".claude/skills", ".agents/skills"];
     const skillPaths = [...effectiveSkillExtension?.paths ?? [], ...projectSkillPaths];
     return new Workspace({