@elizaos/plugin-sql 1.7.1-alpha.9 → 1.7.1

package/dist/browser/index.browser.js

@@ -20029,11 +20029,8 @@ class RuntimeMigrator {
       } else {
         logger5.debug({ src: "plugin:sql" }, "Development database detected, skipping advisory locks");
       }
-      await this.extensionManager.installRequiredExtensions([
-        "vector",
-        "fuzzystrmatch",
-        "pgcrypto"
-      ]);
+      const extensions = isRealPostgres ? ["vector", "fuzzystrmatch", "pgcrypto"] : ["vector", "fuzzystrmatch"];
+      await this.extensionManager.installRequiredExtensions(extensions);
       const currentSnapshot = await generateSnapshot(schema);
       await this.ensureSchemasExist(currentSnapshot);
       this.validateSchemaUsage(pluginName, currentSnapshot);
@@ -20744,14 +20741,16 @@ async function installRLSFunctions(adapter) {
   await db.execute(sql24`
     CREATE OR REPLACE FUNCTION current_server_id() RETURNS UUID AS $$
     DECLARE
-      app_name TEXT;
+      server_id_text TEXT;
     BEGIN
-      app_name := NULLIF(current_setting('application_name', TRUE), '');
+      server_id_text := NULLIF(current_setting('app.server_id', TRUE), '');
+
+      IF server_id_text IS NULL OR server_id_text = '' THEN
+        RETURN NULL;
+      END IF;
 
-      -- Return NULL if application_name is not set or not a valid UUID
-      -- This allows admin queries to work without RLS restrictions
       BEGIN
-        RETURN app_name::UUID;
+        RETURN server_id_text::UUID;
       EXCEPTION WHEN OTHERS THEN
         RETURN NULL;
       END;
@@ -22028,7 +22027,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             names: this.normalizeEntityNames(entity.names),
             metadata: entity.metadata || {}
           }));
-          await tx.insert(entityTable).values(normalizedEntities);
+          await tx.insert(entityTable).values(normalizedEntities).onConflictDoNothing();
           return true;
         });
       } catch (error) {
@@ -22225,7 +22224,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     if (offset !== undefined && offset < 0) {
       throw new Error("offset must be a non-negative number");
     }
-    return this.withEntityContext(entityId ?? null, async (tx) => {
+    return this.withIsolationContext(entityId ?? null, async (tx) => {
       const conditions = [eq2(memoryTable.type, tableName)];
       if (start) {
         conditions.push(gte(memoryTable.createdAt, new Date(start)));
@@ -22258,7 +22257,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           metadata: memoryTable.metadata
         },
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq2(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions)).orderBy(desc(memoryTable.createdAt));
+      }).from(memoryTable).leftJoin(embeddingTable, eq2(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions)).orderBy(desc(memoryTable.createdAt), desc(memoryTable.id));
       const rows = await (async () => {
         if (params.count && offset !== undefined && offset > 0) {
           return baseQuery.limit(params.count).offset(offset);
@@ -22303,7 +22302,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         roomId: memoryTable.roomId,
         unique: memoryTable.unique,
         metadata: memoryTable.metadata
-      }).from(memoryTable).where(and(...conditions)).orderBy(desc(memoryTable.createdAt));
+      }).from(memoryTable).where(and(...conditions)).orderBy(desc(memoryTable.createdAt), desc(memoryTable.id));
       const rows = params.limit ? await query.limit(params.limit) : await query;
       return rows.map((row) => ({
         id: row.id,
@@ -22350,7 +22349,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const rows = await this.db.select({
         memory: memoryTable,
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq2(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions)).orderBy(desc(memoryTable.createdAt));
+      }).from(memoryTable).leftJoin(embeddingTable, eq2(embeddingTable.memoryId, memoryTable.id)).where(and(...conditions)).orderBy(desc(memoryTable.createdAt), desc(memoryTable.id));
       return rows.map((row) => ({
         id: row.memory.id,
         createdAt: row.memory.createdAt.getTime(),
@@ -22425,7 +22424,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       try {
         const sanitizedBody = this.sanitizeJsonObject(params.body);
         const jsonString = JSON.stringify(sanitizedBody);
-        await this.withEntityContext(params.entityId, async (tx) => {
+        await this.withIsolationContext(params.entityId, async (tx) => {
           await tx.insert(logTable).values({
             body: sql25`${jsonString}::jsonb`,
             entityId: params.entityId,
@@ -22473,7 +22472,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getLogs(params) {
     const { entityId, roomId, type, count: count2, offset } = params;
-    return this.withEntityContext(entityId ?? null, async (tx) => {
+    return this.withIsolationContext(entityId ?? null, async (tx) => {
       const result = await tx.select().from(logTable).where(and(roomId ? eq2(logTable.roomId, roomId) : undefined, type ? eq2(logTable.type, type) : undefined)).orderBy(desc(logTable.createdAt)).limit(count2 ?? 10).offset(offset ?? 0);
       const logs = result.map((log2) => ({
         ...log2,
@@ -22493,7 +22492,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     const limit = Math.min(Math.max(params.limit ?? 20, 1), 100);
     const fromDate = typeof params.from === "number" ? new Date(params.from) : undefined;
     const toDate = typeof params.to === "number" ? new Date(params.to) : undefined;
-    return this.withEntityContext(params.entityId ?? null, async (tx) => {
+    return this.withIsolationContext(params.entityId ?? null, async (tx) => {
       const runMap = new Map;
       const conditions = [
         eq2(logTable.type, "run_event"),
@@ -22719,10 +22718,6 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async createMemory(memory, tableName) {
     const memoryId = memory.id ?? v4_default();
-    const existing = await this.getMemoryById(memoryId);
-    if (existing) {
-      return memoryId;
-    }
     if (memory.unique === undefined) {
       memory.unique = true;
       if (memory.embedding && Array.isArray(memory.embedding)) {
@@ -22739,8 +22734,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     }
     const contentToInsert = typeof memory.content === "string" ? memory.content : JSON.stringify(memory.content ?? {});
     const metadataToInsert = typeof memory.metadata === "string" ? memory.metadata : JSON.stringify(memory.metadata ?? {});
-    await this.withEntityContext(memory.entityId, async (tx) => {
-      await tx.insert(memoryTable).values([
+    await this.withIsolationContext(memory.entityId, async (tx) => {
+      const inserted = await tx.insert(memoryTable).values([
         {
           id: memoryId,
           type: tableName,
@@ -22753,20 +22748,29 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           unique: memory.unique,
           createdAt: memory.createdAt ? new Date(memory.createdAt) : new Date
         }
-      ]);
-      if (memory.embedding && Array.isArray(memory.embedding)) {
-        const embeddingValues = {
-          id: v4_default(),
-          memoryId,
-          createdAt: memory.createdAt ? new Date(memory.createdAt) : new Date
-        };
-        const cleanVector = memory.embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
-        embeddingValues[this.embeddingDimension] = cleanVector;
-        await tx.insert(embeddingTable).values([embeddingValues]);
+      ]).onConflictDoNothing().returning();
+      if (inserted.length > 0 && memory.embedding && Array.isArray(memory.embedding)) {
+        await this.upsertEmbedding(tx, memoryId, memory.embedding);
       }
     });
     return memoryId;
   }
+  async upsertEmbedding(tx, memoryId, embedding) {
+    const cleanVector = embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
+    const existingEmbedding = await tx.select({ id: embeddingTable.id }).from(embeddingTable).where(eq2(embeddingTable.memoryId, memoryId)).limit(1);
+    if (existingEmbedding.length > 0) {
+      const updateValues = {};
+      updateValues[this.embeddingDimension] = cleanVector;
+      await tx.update(embeddingTable).set(updateValues).where(eq2(embeddingTable.memoryId, memoryId));
+    } else {
+      const embeddingValues = {
+        id: v4_default(),
+        memoryId
+      };
+      embeddingValues[this.embeddingDimension] = cleanVector;
+      await tx.insert(embeddingTable).values([embeddingValues]);
+    }
+  }
   async updateMemory(memory) {
     return this.withDatabase(async () => {
       try {
@@ -22785,20 +22789,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             }).where(eq2(memoryTable.id, memory.id));
           }
           if (memory.embedding && Array.isArray(memory.embedding)) {
-            const cleanVector = memory.embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
-            const existingEmbedding = await tx.select({ id: embeddingTable.id }).from(embeddingTable).where(eq2(embeddingTable.memoryId, memory.id)).limit(1);
-            if (existingEmbedding.length > 0) {
-              const updateValues = {};
-              updateValues[this.embeddingDimension] = cleanVector;
-              await tx.update(embeddingTable).set(updateValues).where(eq2(embeddingTable.memoryId, memory.id));
-            } else {
-              const embeddingValues = {
-                id: v4_default(),
-                memoryId: memory.id
-              };
-              embeddingValues[this.embeddingDimension] = cleanVector;
-              await tx.insert(embeddingTable).values([embeddingValues]);
-            }
+            await this.upsertEmbedding(tx, memory.id, memory.embedding);
           }
         });
         return true;
@@ -22938,9 +22929,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         agentId: this.agentId,
         id: room.id || v4_default()
       }));
-      const insertedRooms = await this.db.insert(roomTable).values(roomsWithIds).onConflictDoNothing().returning();
-      const insertedIds = insertedRooms.map((r) => r.id);
-      return insertedIds;
+      await this.db.insert(roomTable).values(roomsWithIds).onConflictDoNothing();
+      return roomsWithIds.map((r) => r.id);
     });
   }
   async deleteRoom(roomId) {
@@ -23238,7 +23228,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         ...world,
         id: newWorldId,
         name: world.name || ""
-      });
+      }).onConflictDoNothing();
       return newWorldId;
     });
   }
@@ -23510,16 +23500,14 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         createdAt: now,
         updatedAt: now
       };
-      await this.db.transaction(async (tx) => {
-        await tx.insert(channelTable).values(channelToInsert);
-        if (participantIds && participantIds.length > 0) {
-          const participantValues = participantIds.map((entityId) => ({
-            channelId: newId,
-            entityId
-          }));
-          await tx.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
-        }
-      });
+      await this.db.insert(channelTable).values(channelToInsert).onConflictDoNothing();
+      if (participantIds && participantIds.length > 0) {
+        const participantValues = participantIds.map((entityId) => ({
+          channelId: newId,
+          entityId
+        }));
+        await this.db.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
+      }
       return channelToInsert;
     });
   }
@@ -23751,8 +23739,8 @@ class PgliteDatabaseAdapter extends BaseDrizzleAdapter {
     this.manager = manager;
     this.db = drizzle(this.manager.getConnection());
   }
-  async withEntityContext(_entityId, callback) {
-    return this.db.transaction(callback);
+  async withIsolationContext(_entityId, callback) {
+    return callback(this.db);
   }
   async getEntityByIds(entityIds) {
     return this.getEntitiesByIds(entityIds);
@@ -23880,5 +23868,5 @@ export {
   DatabaseMigrationService
 };
 
-//# debugId=03BBEE81FC5927D264756E2164756E21
+//# debugId=B552FB2AF0F169C564756E2164756E21
 //# sourceMappingURL=index.browser.js.map