@elizaos/plugin-sql 1.6.5-alpha.2 → 1.6.5-alpha.21

package/dist/browser/index.browser.js

@@ -35,6 +35,44 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
+// src/schema/agent.ts
+import { sql } from "drizzle-orm";
+import { boolean, jsonb, pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
+var agentTable;
+var init_agent = __esm(() => {
+  agentTable = pgTable("agents", {
+    id: uuid("id").primaryKey().defaultRandom(),
+    enabled: boolean("enabled").default(true).notNull(),
+    server_id: uuid("server_id"),
+    createdAt: timestamp("created_at", { withTimezone: true }).default(sql`now()`).notNull(),
+    updatedAt: timestamp("updated_at", { withTimezone: true }).default(sql`now()`).notNull(),
+    name: text("name").notNull(),
+    username: text("username"),
+    system: text("system").default(""),
+    bio: jsonb("bio").$type().default(sql`'[]'::jsonb`),
+    messageExamples: jsonb("message_examples").$type().default(sql`'[]'::jsonb`).notNull(),
+    postExamples: jsonb("post_examples").$type().default(sql`'[]'::jsonb`).notNull(),
+    topics: jsonb("topics").$type().default(sql`'[]'::jsonb`).notNull(),
+    adjectives: jsonb("adjectives").$type().default(sql`'[]'::jsonb`).notNull(),
+    knowledge: jsonb("knowledge").$type().default(sql`'[]'::jsonb`).notNull(),
+    plugins: jsonb("plugins").$type().default(sql`'[]'::jsonb`).notNull(),
+    settings: jsonb("settings").$type().default(sql`'{}'::jsonb`).notNull(),
+    style: jsonb("style").$type().default(sql`'{}'::jsonb`).notNull()
+  });
+});
+
+// src/schema/server.ts
+import { sql as sql10 } from "drizzle-orm";
+import { pgTable as pgTable10, timestamp as timestamp10, uuid as uuid10 } from "drizzle-orm/pg-core";
+var serverTable;
+var init_server = __esm(() => {
+  serverTable = pgTable10("servers", {
+    id: uuid10("id").primaryKey(),
+    createdAt: timestamp10("created_at", { withTimezone: true }).default(sql10`now()`).notNull(),
+    updatedAt: timestamp10("updated_at", { withTimezone: true }).default(sql10`now()`).notNull()
+  });
+});
+
 // src/runtime-migrator/storage/migration-tracker.ts
 import { sql as sql17 } from "drizzle-orm";
 
@@ -213,14 +251,14 @@ class ExtensionManager {
     for (const extension of extensions) {
       try {
         if (!/^[a-zA-Z0-9_-]+$/.test(extension)) {
-          logger.warn(`[RuntimeMigrator] Invalid extension name "${extension}" - contains invalid characters`);
+          logger.warn({ src: "plugin:sql", extension }, "Invalid extension name - contains invalid characters");
           continue;
         }
         await this.db.execute(sql20`CREATE EXTENSION IF NOT EXISTS ${sql20.identifier(extension)}`);
-        logger.debug(`[RuntimeMigrator] Extension installed: ${extension}`);
+        logger.debug({ src: "plugin:sql", extension }, "Extension installed");
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        logger.warn(`[RuntimeMigrator] Could not install extension ${extension}: ${errorMessage}`);
+        logger.warn({ src: "plugin:sql", extension, error: errorMessage }, "Could not install extension");
       }
     }
   }
@@ -18340,10 +18378,7 @@ async function generateMigrationSQL(previousSnapshot, currentSnapshot, diff) {
   }
   const dataLossCheck = checkForDataLoss(diff);
   if (dataLossCheck.warnings.length > 0) {
-    logger2.warn("[RuntimeMigrator] Schema changes may cause data loss:");
-    for (const warning of dataLossCheck.warnings) {
-      logger2.warn(`  - ${warning}`);
-    }
+    logger2.warn({ src: "plugin:sql", warnings: dataLossCheck.warnings }, "Schema changes may cause data loss");
   }
   const schemasToCreate = new Set;
   for (const tableName of diff.tables.created) {
@@ -18768,7 +18803,7 @@ class DatabaseIntrospector {
     this.db = db;
   }
   async introspectSchema(schemaName = "public") {
-    logger4.info(`[DatabaseIntrospector] Starting introspection for schema: ${schemaName}`);
+    logger4.info({ src: "plugin:sql", schemaName }, "Starting database introspection");
     const tables = {};
     const schemas = {};
     const enums = {};
@@ -18776,7 +18811,7 @@ class DatabaseIntrospector {
     for (const tableInfo of allTables) {
       const tableName = tableInfo.table_name;
       const tableSchema = tableInfo.table_schema || "public";
-      logger4.debug(`[DatabaseIntrospector] Introspecting table: ${tableSchema}.${tableName}`);
+      logger4.debug({ src: "plugin:sql", tableSchema, tableName }, "Introspecting table");
       const columns = await this.getColumns(tableSchema, tableName);
       const columnsObject = {};
       const uniqueConstraintObject = {};
@@ -18793,15 +18828,17 @@ class DatabaseIntrospector {
       const indexesObject = {};
       for (const idx of indexes) {
         if (!idx.is_primary && !idx.is_unique_constraint) {
-          indexesObject[idx.name] = {
-            name: idx.name,
-            columns: idx.columns.map((col) => ({
-              expression: col,
-              isExpression: false
-            })),
-            isUnique: idx.is_unique,
-            method: idx.method || "btree"
-          };
+          if (idx.columns && Array.isArray(idx.columns) && idx.columns.length > 0) {
+            indexesObject[idx.name] = {
+              name: idx.name,
+              columns: idx.columns.map((col) => ({
+                expression: col,
+                isExpression: false
+              })),
+              isUnique: idx.is_unique,
+              method: idx.method || "btree"
+            };
+          }
         }
       }
       const foreignKeys = await this.getForeignKeys(tableSchema, tableName);
@@ -18869,7 +18906,7 @@ class DatabaseIntrospector {
       }
       enums[key].values.push(enumInfo.value);
     }
-    logger4.info(`[DatabaseIntrospector] Introspection complete. Found ${Object.keys(tables).length} tables`);
+    logger4.info({ src: "plugin:sql", tableCount: Object.keys(tables).length }, "Database introspection complete");
     return {
       version: "7",
       dialect: "postgresql",
@@ -19129,7 +19166,7 @@ class RuntimeMigrator {
       }
     }
     for (const schemaName of schemasToCreate) {
-      logger5.debug(`[RuntimeMigrator] Ensuring schema '${schemaName}' exists`);
+      logger5.debug({ src: "plugin:sql", schemaName }, "Ensuring schema exists");
       await this.db.execute(sql22.raw(`CREATE SCHEMA IF NOT EXISTS "${schemaName}"`));
     }
   }
@@ -19140,10 +19177,10 @@ class RuntimeMigrator {
       const tableData = table;
       const actualSchema = tableData.schema || "public";
       if (!isCorePLugin && actualSchema === "public") {
-        logger5.warn(`[RuntimeMigrator] WARNING: Plugin '${pluginName}' table '${tableData.name}' is using public schema. ` + `Consider using pgSchema('${expectedSchema}').table(...) for better isolation.`);
+        logger5.warn({ src: "plugin:sql", pluginName, tableName: tableData.name, expectedSchema }, "Plugin table is using public schema - consider using pgSchema for better isolation");
       }
       if (isCorePLugin && actualSchema !== "public") {
-        logger5.warn(`[RuntimeMigrator] WARNING: Core plugin '@elizaos/plugin-sql' table '${tableData.name}' is using schema '${actualSchema}'. ` + `Core tables should use public schema.`);
+        logger5.warn({ src: "plugin:sql", pluginName: "@elizaos/plugin-sql", tableName: tableData.name, actualSchema }, "Core plugin table should use public schema");
       }
     }
   }
@@ -19354,13 +19391,13 @@ class RuntimeMigrator {
         }
       }
     }
-    logger5.debug(`[RuntimeMigrator] Connection string did not match any PostgreSQL patterns: ${url.substring(0, 50)}...`);
+    logger5.debug({ src: "plugin:sql", urlPreview: url.substring(0, 50) }, "Connection string did not match any PostgreSQL patterns");
     return false;
   }
   async initialize() {
-    logger5.info("[RuntimeMigrator] Initializing migration system...");
+    logger5.info({ src: "plugin:sql" }, "Initializing migration system");
     await this.migrationTracker.ensureTables();
-    logger5.info("[RuntimeMigrator] Migration system initialized");
+    logger5.info({ src: "plugin:sql" }, "Migration system initialized");
   }
   async migrate(pluginName, schema, options = {}) {
     const lockId = this.getAdvisoryLockId(pluginName);
@@ -19369,46 +19406,46 @@ class RuntimeMigrator {
     }
     let lockAcquired = false;
     try {
-      logger5.info(`[RuntimeMigrator] Starting migration for plugin: ${pluginName}`);
+      logger5.info({ src: "plugin:sql", pluginName }, "Starting migration for plugin");
       await this.initialize();
       const postgresUrl = process.env.POSTGRES_URL || process.env.DATABASE_URL || "";
       const isRealPostgres = this.isRealPostgresDatabase(postgresUrl);
       if (isRealPostgres) {
         try {
-          logger5.debug(`[RuntimeMigrator] Using PostgreSQL advisory locks for ${pluginName}`);
+          logger5.debug({ src: "plugin:sql", pluginName }, "Using PostgreSQL advisory locks");
           const lockIdStr = lockId.toString();
           const lockResult = await this.db.execute(sql22`SELECT pg_try_advisory_lock(CAST(${lockIdStr} AS bigint)) as acquired`);
           lockAcquired = lockResult.rows[0]?.acquired === true;
           if (!lockAcquired) {
-            logger5.info(`[RuntimeMigrator] Migration already in progress for ${pluginName}, waiting for lock...`);
+            logger5.info({ src: "plugin:sql", pluginName }, "Migration already in progress, waiting for lock");
             await this.db.execute(sql22`SELECT pg_advisory_lock(CAST(${lockIdStr} AS bigint))`);
             lockAcquired = true;
-            logger5.info(`[RuntimeMigrator] Lock acquired for ${pluginName}`);
+            logger5.info({ src: "plugin:sql", pluginName }, "Lock acquired");
           } else {
-            logger5.debug(`[RuntimeMigrator] Advisory lock acquired for ${pluginName} (lock ID: ${lockIdStr})`);
+            logger5.debug({ src: "plugin:sql", pluginName, lockId: lockIdStr }, "Advisory lock acquired");
           }
         } catch (lockError) {
-          logger5.warn(`[RuntimeMigrator] Failed to acquire advisory lock, continuing without lock: ${lockError}`);
+          logger5.warn({ src: "plugin:sql", pluginName, error: lockError instanceof Error ? lockError.message : String(lockError) }, "Failed to acquire advisory lock, continuing without lock");
           lockAcquired = false;
         }
       } else {
-        logger5.debug(`[RuntimeMigrator] Development database detected (PGLite or non-PostgreSQL), skipping advisory locks`);
+        logger5.debug({ src: "plugin:sql" }, "Development database detected, skipping advisory locks");
       }
-      await this.extensionManager.installRequiredExtensions(["vector", "fuzzystrmatch"]);
+      await this.extensionManager.installRequiredExtensions(["vector", "fuzzystrmatch", "pgcrypto"]);
       const currentSnapshot = await generateSnapshot(schema);
       await this.ensureSchemasExist(currentSnapshot);
       this.validateSchemaUsage(pluginName, currentSnapshot);
       const currentHash = hashSnapshot(currentSnapshot);
       const lastMigration = await this.migrationTracker.getLastMigration(pluginName);
       if (lastMigration && lastMigration.hash === currentHash) {
-        logger5.info(`[RuntimeMigrator] No changes detected for ${pluginName}, skipping migration (hash: ${currentHash})`);
+        logger5.info({ src: "plugin:sql", pluginName, hash: currentHash }, "No changes detected, skipping migration");
         return;
       }
       let previousSnapshot = await this.snapshotStorage.getLatestSnapshot(pluginName);
       if (!previousSnapshot && Object.keys(currentSnapshot.tables).length > 0) {
         const hasExistingTables = await this.introspector.hasExistingTables(pluginName);
         if (hasExistingTables) {
-          logger5.info(`[RuntimeMigrator] No snapshot found for ${pluginName} but tables exist in database. Introspecting...`);
+          logger5.info({ src: "plugin:sql", pluginName }, "No snapshot found but tables exist in database, introspecting");
           const schemaName = this.getExpectedSchemaName(pluginName);
           const introspectedSnapshot = await this.introspector.introspectSchema(schemaName);
           if (Object.keys(introspectedSnapshot.tables).length > 0) {
@@ -19416,15 +19453,15 @@ class RuntimeMigrator {
             await this.journalStorage.updateJournal(pluginName, 0, `introspected_${Date.now()}`, true);
             const introspectedHash = hashSnapshot(introspectedSnapshot);
             await this.migrationTracker.recordMigration(pluginName, introspectedHash, Date.now());
-            logger5.info(`[RuntimeMigrator] Created initial snapshot from existing database for ${pluginName}`);
+            logger5.info({ src: "plugin:sql", pluginName }, "Created initial snapshot from existing database");
             previousSnapshot = introspectedSnapshot;
           }
         }
       }
       if (!hasChanges(previousSnapshot, currentSnapshot)) {
-        logger5.info(`[RuntimeMigrator] No schema changes for ${pluginName}`);
+        logger5.info({ src: "plugin:sql", pluginName }, "No schema changes");
         if (!previousSnapshot && Object.keys(currentSnapshot.tables).length === 0) {
-          logger5.info(`[RuntimeMigrator] Recording empty schema for ${pluginName}`);
+          logger5.info({ src: "plugin:sql", pluginName }, "Recording empty schema");
           await this.migrationTracker.recordMigration(pluginName, currentHash, Date.now());
           const idx = await this.journalStorage.getNextIdx(pluginName);
           const tag = this.generateMigrationTag(idx, pluginName);
@@ -19435,7 +19472,7 @@ class RuntimeMigrator {
       }
       const diff = await calculateDiff(previousSnapshot, currentSnapshot);
       if (!hasDiffChanges(diff)) {
-        logger5.info(`[RuntimeMigrator] No actionable changes for ${pluginName}`);
+        logger5.info({ src: "plugin:sql", pluginName }, "No actionable changes");
         return;
       }
       const dataLossCheck = checkForDataLoss(diff);
@@ -19443,55 +19480,34 @@ class RuntimeMigrator {
         const isProduction = false;
         const allowDestructive = options.force || options.allowDataLoss || process.env.ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS === "true";
         if (!allowDestructive) {
-          logger5.error("[RuntimeMigrator] Destructive migration blocked");
-          logger5.error(`[RuntimeMigrator] Plugin: ${pluginName}`);
-          logger5.error(`[RuntimeMigrator] Environment: ${isProduction ? "PRODUCTION" : "DEVELOPMENT"}`);
-          logger5.error("[RuntimeMigrator] Destructive operations detected:");
-          for (const warning of dataLossCheck.warnings) {
-            logger5.error(`[RuntimeMigrator]   - ${warning}`);
-          }
-          logger5.error("[RuntimeMigrator] To proceed with destructive migrations:");
-          logger5.error("[RuntimeMigrator]   1. Set environment variable: export ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true");
-          logger5.error("[RuntimeMigrator]   2. Or use option: migrate(plugin, schema, { force: true })");
-          if (isProduction) {
-            logger5.error("[RuntimeMigrator]   3. For production, consider using drizzle-kit for manual migration");
-          }
+          logger5.error({ src: "plugin:sql", pluginName, environment: isProduction ? "PRODUCTION" : "DEVELOPMENT", warnings: dataLossCheck.warnings }, "Destructive migration blocked - set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true or use force option");
           const errorMessage = isProduction ? `Destructive migration blocked in production for ${pluginName}. Set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true or use drizzle-kit.` : `Destructive migration blocked for ${pluginName}. Set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true to proceed.`;
           throw new Error(errorMessage);
         }
         if (dataLossCheck.requiresConfirmation) {
-          logger5.warn("[RuntimeMigrator] Proceeding with destructive migration");
-          logger5.warn(`[RuntimeMigrator] Plugin: ${pluginName}`);
-          logger5.warn("[RuntimeMigrator] The following operations will be performed:");
-          for (const warning of dataLossCheck.warnings) {
-            logger5.warn(`[RuntimeMigrator]   ⚠️ ${warning}`);
-          }
+          logger5.warn({ src: "plugin:sql", pluginName, warnings: dataLossCheck.warnings }, "Proceeding with destructive migration");
         }
       }
       const sqlStatements = await generateMigrationSQL(previousSnapshot, currentSnapshot, diff);
       if (sqlStatements.length === 0) {
-        logger5.info(`[RuntimeMigrator] No SQL statements to execute for ${pluginName}`);
+        logger5.info({ src: "plugin:sql", pluginName }, "No SQL statements to execute");
         return;
       }
-      logger5.info(`[RuntimeMigrator] Executing ${sqlStatements.length} SQL statements for ${pluginName}`);
+      logger5.info({ src: "plugin:sql", pluginName, statementCount: sqlStatements.length }, "Executing SQL statements");
       if (options.verbose) {
         sqlStatements.forEach((stmt, i2) => {
-          logger5.debug(`[RuntimeMigrator] Statement ${i2 + 1}: ${stmt}`);
+          logger5.debug({ src: "plugin:sql", statementIndex: i2 + 1, statement: stmt }, "SQL statement");
         });
       }
       if (options.dryRun) {
-        logger5.info("[RuntimeMigrator] DRY RUN mode - not executing statements");
-        logger5.info("[RuntimeMigrator] Would execute:");
-        sqlStatements.forEach((stmt, i2) => {
-          logger5.info(`  ${i2 + 1}. ${stmt}`);
-        });
+        logger5.info({ src: "plugin:sql", pluginName, statements: sqlStatements }, "DRY RUN mode - not executing statements");
         return;
       }
       await this.executeMigration(pluginName, currentSnapshot, currentHash, sqlStatements);
-      logger5.info(`[RuntimeMigrator] Migration completed successfully for ${pluginName}`);
+      logger5.info({ src: "plugin:sql", pluginName }, "Migration completed successfully");
       return;
     } catch (error) {
-      logger5.error(`[RuntimeMigrator] Migration failed for ${pluginName}:`, JSON.stringify(error));
+      logger5.error({ src: "plugin:sql", pluginName, error: error instanceof Error ? error.message : String(error) }, "Migration failed");
       throw error;
     } finally {
       const postgresUrl = process.env.POSTGRES_URL || process.env.DATABASE_URL || "";
@@ -19500,9 +19516,9 @@ class RuntimeMigrator {
         try {
           const lockIdStr = lockId.toString();
           await this.db.execute(sql22`SELECT pg_advisory_unlock(CAST(${lockIdStr} AS bigint))`);
-          logger5.debug(`[RuntimeMigrator] Advisory lock released for ${pluginName}`);
+          logger5.debug({ src: "plugin:sql", pluginName }, "Advisory lock released");
         } catch (unlockError) {
-          logger5.warn(`[RuntimeMigrator] Failed to release advisory lock for ${pluginName}:`, JSON.stringify(unlockError));
+          logger5.warn({ src: "plugin:sql", pluginName, error: unlockError instanceof Error ? unlockError.message : String(unlockError) }, "Failed to release advisory lock");
         }
       }
     }
@@ -19513,7 +19529,7 @@ class RuntimeMigrator {
       await this.db.execute(sql22`BEGIN`);
       transactionStarted = true;
       for (const stmt of sqlStatements) {
-        logger5.debug(`[RuntimeMigrator] Executing: ${stmt}`);
+        logger5.debug({ src: "plugin:sql", statement: stmt }, "Executing SQL statement");
         await this.db.execute(sql22.raw(stmt));
       }
       const idx = await this.journalStorage.getNextIdx(pluginName);
@@ -19522,14 +19538,14 @@ class RuntimeMigrator {
       await this.journalStorage.updateJournal(pluginName, idx, tag, true);
       await this.snapshotStorage.saveSnapshot(pluginName, idx, snapshot);
       await this.db.execute(sql22`COMMIT`);
-      logger5.info(`[RuntimeMigrator] Recorded migration ${tag} for ${pluginName}`);
+      logger5.info({ src: "plugin:sql", pluginName, tag }, "Recorded migration");
     } catch (error) {
       if (transactionStarted) {
         try {
           await this.db.execute(sql22`ROLLBACK`);
-          logger5.error("[RuntimeMigrator] Migration failed, rolled back:", JSON.stringify(error));
+          logger5.error({ src: "plugin:sql", error: error instanceof Error ? error.message : String(error) }, "Migration failed, rolled back");
         } catch (rollbackError) {
-          logger5.error("[RuntimeMigrator] Failed to rollback transaction:", JSON.stringify(rollbackError));
+          logger5.error({ src: "plugin:sql", error: rollbackError instanceof Error ? rollbackError.message : String(rollbackError) }, "Failed to rollback transaction");
         }
       }
       throw error;
@@ -19552,31 +19568,31 @@ class RuntimeMigrator {
     };
   }
   async reset(pluginName) {
-    logger5.warn(`[RuntimeMigrator] Resetting migrations for ${pluginName}`);
+    logger5.warn({ src: "plugin:sql", pluginName }, "Resetting migrations");
     await this.db.execute(sql22`DELETE FROM migrations._migrations WHERE plugin_name = ${pluginName}`);
     await this.db.execute(sql22`DELETE FROM migrations._journal WHERE plugin_name = ${pluginName}`);
     await this.db.execute(sql22`DELETE FROM migrations._snapshots WHERE plugin_name = ${pluginName}`);
-    logger5.warn(`[RuntimeMigrator] Reset complete for ${pluginName}`);
+    logger5.warn({ src: "plugin:sql", pluginName }, "Reset complete");
   }
   async checkMigration(pluginName, schema) {
     try {
-      logger5.info(`[RuntimeMigrator] Checking migration for ${pluginName}...`);
+      logger5.info({ src: "plugin:sql", pluginName }, "Checking migration");
       const currentSnapshot = await generateSnapshot(schema);
       const previousSnapshot = await this.snapshotStorage.getLatestSnapshot(pluginName);
       if (!hasChanges(previousSnapshot, currentSnapshot)) {
-        logger5.info(`[RuntimeMigrator] No changes detected for ${pluginName}`);
+        logger5.info({ src: "plugin:sql", pluginName }, "No changes detected");
         return null;
       }
       const diff = await calculateDiff(previousSnapshot, currentSnapshot);
       const dataLossCheck = checkForDataLoss(diff);
       if (dataLossCheck.hasDataLoss) {
-        logger5.warn(`[RuntimeMigrator] Migration for ${pluginName} would cause data loss`);
+        logger5.warn({ src: "plugin:sql", pluginName }, "Migration would cause data loss");
       } else {
-        logger5.info(`[RuntimeMigrator] Migration for ${pluginName} is safe (no data loss)`);
+        logger5.info({ src: "plugin:sql", pluginName }, "Migration is safe (no data loss)");
       }
       return dataLossCheck;
     } catch (error) {
-      logger5.error(`[RuntimeMigrator] Failed to check migration for ${pluginName}:`, JSON.stringify(error));
+      logger5.error({ src: "plugin:sql", pluginName, error: error instanceof Error ? error.message : String(error) }, "Failed to check migration");
       throw error;
     }
   }
@@ -19598,12 +19614,660 @@ var init_runtime_migrator2 = __esm(() => {
   init_runtime_migrator();
 });
 
+// src/migrations.ts
+import { logger as logger6 } from "@elizaos/core";
+import { sql as sql23 } from "drizzle-orm";
+async function migrateToEntityRLS(adapter) {
+  const db = adapter.db;
+  try {
+    await db.execute(sql23`SELECT 1 FROM pg_tables LIMIT 1`);
+  } catch {
+    logger6.debug("[Migration] ⊘ Not PostgreSQL, skipping PostgreSQL-specific migrations");
+    return;
+  }
+  logger6.info("[Migration] Starting develop → feat/entity-rls migration...");
+  try {
+    logger6.debug("[Migration] → Clearing RuntimeMigrator snapshot cache...");
+    try {
+      await db.execute(sql23`DELETE FROM migrations._snapshots WHERE plugin_name = '@elizaos/plugin-sql'`);
+      logger6.debug("[Migration] ✓ Snapshot cache cleared");
+    } catch (error) {
+      logger6.debug("[Migration] ⊘ No snapshot cache to clear (migrations schema not yet created)");
+    }
+    logger6.debug("[Migration] → Disabling Row Level Security on all tables...");
+    try {
+      const tablesResult = await db.execute(sql23`
+        SELECT tablename
+        FROM pg_tables
+        WHERE schemaname = 'public'
+        ORDER BY tablename
+      `);
+      for (const row of tablesResult.rows || []) {
+        const tableName = row.tablename;
+        try {
+          await db.execute(sql23.raw(`ALTER TABLE "${tableName}" DISABLE ROW LEVEL SECURITY`));
+          logger6.debug(`[Migration] ✓ Disabled RLS on ${tableName}`);
+        } catch (error) {
+          logger6.debug(`[Migration] ⊘ Could not disable RLS on ${tableName}`);
+        }
+      }
+    } catch (error) {
+      logger6.debug("[Migration] ⊘ Could not disable RLS (may not have permissions)");
+    }
+    logger6.debug("[Migration] → Handling server_id → message_server_id migrations...");
+    const tablesToMigrate = ["channels", "worlds", "rooms"];
+    for (const tableName of tablesToMigrate) {
+      try {
+        const columnsResult = await db.execute(sql23`
+          SELECT column_name, data_type, is_nullable
+          FROM information_schema.columns
+          WHERE table_schema = 'public'
+            AND table_name = ${tableName}
+            AND column_name IN ('server_id', 'message_server_id')
+          ORDER BY column_name
+        `);
+        const columns = columnsResult.rows || [];
+        const serverId = columns.find((c) => c.column_name === "server_id");
+        const messageServerId = columns.find((c) => c.column_name === "message_server_id");
+        if (serverId && !messageServerId) {
+          logger6.debug(`[Migration] → Renaming ${tableName}.server_id to message_server_id...`);
+          await db.execute(sql23.raw(`ALTER TABLE "${tableName}" RENAME COLUMN "server_id" TO "message_server_id"`));
+          logger6.debug(`[Migration] ✓ Renamed ${tableName}.server_id → message_server_id`);
+          if (serverId.data_type === "text") {
+            try {
+              logger6.debug(`[Migration] → Dropping DEFAULT constraint on ${tableName}.message_server_id...`);
+              await db.execute(sql23.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "message_server_id" DROP DEFAULT`));
+              logger6.debug(`[Migration] ✓ Dropped DEFAULT constraint`);
+              logger6.debug(`[Migration] → Converting ${tableName}.message_server_id from text to uuid...`);
+              await db.execute(sql23.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "message_server_id" TYPE uuid USING "message_server_id"::uuid`));
+              logger6.debug(`[Migration] ✓ Converted ${tableName}.message_server_id to uuid`);
+            } catch (convertError) {
+              logger6.warn(`[Migration] ⚠️ Could not convert ${tableName}.message_server_id to uuid - data may not be valid UUIDs`);
+              logger6.debug(`[Migration] → Setting invalid UUIDs to NULL in ${tableName}.message_server_id...`);
+              await db.execute(sql23.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "message_server_id" TYPE uuid USING CASE WHEN "message_server_id" ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$' THEN "message_server_id"::uuid ELSE NULL END`));
+            }
+          }
+          if (tableName === "channels") {
+            const nullCountResult = await db.execute(sql23.raw(`SELECT COUNT(*) as count FROM "${tableName}" WHERE "message_server_id" IS NULL`));
+            const nullCount = nullCountResult.rows?.[0]?.count;
+            if (nullCount && parseInt(nullCount) > 0) {
+              logger6.warn(`[Migration] ⚠️ ${tableName} has ${nullCount} rows with NULL message_server_id - these will be deleted`);
+              await db.execute(sql23.raw(`DELETE FROM "${tableName}" WHERE "message_server_id" IS NULL`));
+              logger6.debug(`[Migration] ✓ Deleted ${nullCount} rows with NULL message_server_id from ${tableName}`);
+            }
+            logger6.debug(`[Migration] → Making ${tableName}.message_server_id NOT NULL...`);
+            await db.execute(sql23.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "message_server_id" SET NOT NULL`));
+            logger6.debug(`[Migration] ✓ Set ${tableName}.message_server_id NOT NULL`);
+          }
+        } else if (serverId && messageServerId) {
+          logger6.debug(`[Migration] → ${tableName} has both columns, dropping server_id...`);
+          await db.execute(sql23.raw(`ALTER TABLE "${tableName}" DROP COLUMN "server_id" CASCADE`));
+          logger6.debug(`[Migration] ✓ Dropped ${tableName}.server_id (will be re-added by RuntimeMigrator for RLS)`);
+        } else if (!serverId && messageServerId) {
+          if (messageServerId.data_type === "text") {
+            logger6.debug(`[Migration] → ${tableName}.message_server_id exists but is TEXT, needs UUID conversion...`);
+            logger6.debug(`[Migration] → Dropping DEFAULT constraint on ${tableName}.message_server_id...`);
+            await db.execute(sql23.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "message_server_id" DROP DEFAULT`));
+            logger6.debug(`[Migration] ✓ Dropped DEFAULT constraint`);
+            logger6.debug(`[Migration] → Converting ${tableName}.message_server_id from text to uuid (generating UUIDs from text)...`);
+            await db.execute(sql23.raw(`
+              ALTER TABLE "${tableName}"
+              ALTER COLUMN "message_server_id" TYPE uuid
+              USING CASE
+                WHEN "message_server_id" ~ '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+                THEN "message_server_id"::uuid
+                ELSE md5("message_server_id")::uuid
+              END
+            `));
+            logger6.debug(`[Migration] ✓ Converted ${tableName}.message_server_id to uuid`);
+          } else {
+            logger6.debug(`[Migration] ⊘ ${tableName}.message_server_id already UUID, skipping`);
+          }
+        } else {
+          logger6.debug(`[Migration] ⊘ ${tableName} already migrated, skipping`);
+        }
+      } catch (error) {
+        logger6.warn(`[Migration] ⚠️ Error migrating ${tableName}.server_id: ${error}`);
+      }
+    }
+    logger6.debug("[Migration] → Dropping all remaining RLS-managed server_id columns...");
+    try {
+      const serverIdColumnsResult = await db.execute(sql23`
+        SELECT table_name
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND column_name = 'server_id'
+          AND table_name NOT IN (
+            'servers',              -- server_id is the primary key
+            'agents',               -- server_id is in the schema (for RLS)
+            'channels',             -- already handled above
+            'worlds',               -- already handled above
+            'rooms',                -- already handled above
+            'server_agents',        -- server_id is part of composite key
+            'drizzle_migrations',
+            '__drizzle_migrations'
+          )
+        ORDER BY table_name
+      `);
+      const tablesToClean = serverIdColumnsResult.rows || [];
+      logger6.debug(`[Migration] → Found ${tablesToClean.length} tables with server_id columns`);
+      for (const row of tablesToClean) {
+        const tableName = row.table_name;
+        try {
+          await db.execute(sql23.raw(`ALTER TABLE "${tableName}" DROP COLUMN IF EXISTS server_id CASCADE`));
+          logger6.debug(`[Migration] ✓ Dropped server_id from ${tableName}`);
+        } catch (error) {
+          logger6.debug(`[Migration] ⊘ Could not drop server_id from ${tableName}`);
+        }
+      }
+    } catch (error) {
+      logger6.debug("[Migration] ⊘ Could not drop server_id columns (may not have permissions)");
+    }
+    logger6.debug("[Migration] → Checking server_agents table rename...");
+    try {
+      const tablesResult = await db.execute(sql23`
+        SELECT table_name
+        FROM information_schema.tables
+        WHERE table_schema = 'public'
+          AND table_name IN ('server_agents', 'message_server_agents')
+        ORDER BY table_name
+      `);
+      const tables = tablesResult.rows || [];
+      const hasServerAgents = tables.some((t) => t.table_name === "server_agents");
+      const hasMessageServerAgents = tables.some((t) => t.table_name === "message_server_agents");
+      if (hasServerAgents && !hasMessageServerAgents) {
+        logger6.debug("[Migration] → Renaming server_agents to message_server_agents...");
+        await db.execute(sql23.raw(`ALTER TABLE "server_agents" RENAME TO "message_server_agents"`));
+        logger6.debug("[Migration] ✓ Renamed server_agents → message_server_agents");
+        logger6.debug("[Migration] → Renaming message_server_agents.server_id to message_server_id...");
+        await db.execute(sql23.raw(`ALTER TABLE "message_server_agents" RENAME COLUMN "server_id" TO "message_server_id"`));
+        logger6.debug("[Migration] ✓ Renamed message_server_agents.server_id → message_server_id");
+      } else if (!hasServerAgents && !hasMessageServerAgents) {
+        logger6.debug("[Migration] ⊘ No server_agents table to migrate");
+      } else if (hasMessageServerAgents) {
+        logger6.debug("[Migration] → Checking message_server_agents columns...");
+        const columnsResult = await db.execute(sql23`
+          SELECT column_name
+          FROM information_schema.columns
+          WHERE table_schema = 'public'
+            AND table_name = 'message_server_agents'
+            AND column_name IN ('server_id', 'message_server_id')
+          ORDER BY column_name
+        `);
+        const columns = columnsResult.rows || [];
+        const hasServerId = columns.some((c) => c.column_name === "server_id");
+        const hasMessageServerId = columns.some((c) => c.column_name === "message_server_id");
+        if (hasServerId && !hasMessageServerId) {
+          logger6.debug("[Migration] → Renaming message_server_agents.server_id to message_server_id...");
+          await db.execute(sql23.raw(`ALTER TABLE "message_server_agents" RENAME COLUMN "server_id" TO "message_server_id"`));
+          logger6.debug("[Migration] ✓ Renamed message_server_agents.server_id → message_server_id");
+        } else if (!hasServerId && !hasMessageServerId) {
+          logger6.debug("[Migration] → message_server_agents exists without required columns, truncating...");
+          await db.execute(sql23`TRUNCATE TABLE message_server_agents CASCADE`);
+          logger6.debug("[Migration] ✓ Truncated message_server_agents");
+        } else {
+          logger6.debug("[Migration] ⊘ message_server_agents already has correct schema");
+        }
+      }
+    } catch (error) {
+      logger6.debug("[Migration] ⊘ Could not check/migrate server_agents table");
+    }
+    logger6.debug("[Migration] → Checking channel_participants table...");
+    try {
+      const columnsResult = await db.execute(sql23`
+        SELECT column_name
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'channel_participants'
+          AND column_name IN ('user_id', 'entity_id')
+        ORDER BY column_name
+      `);
+      const columns = columnsResult.rows || [];
+      const hasUserId = columns.some((c) => c.column_name === "user_id");
+      const hasEntityId = columns.some((c) => c.column_name === "entity_id");
+      if (hasUserId && !hasEntityId) {
+        logger6.debug("[Migration] → Renaming channel_participants.user_id to entity_id...");
+        await db.execute(sql23.raw(`ALTER TABLE "channel_participants" RENAME COLUMN "user_id" TO "entity_id"`));
+        logger6.debug("[Migration] ✓ Renamed channel_participants.user_id → entity_id");
+      } else if (!hasUserId && !hasEntityId) {
+        logger6.debug("[Migration] → channel_participants exists without entity_id or user_id, truncating...");
+        await db.execute(sql23`TRUNCATE TABLE channel_participants CASCADE`);
+        logger6.debug("[Migration] ✓ Truncated channel_participants");
+      } else {
+        logger6.debug("[Migration] ⊘ channel_participants already has entity_id column");
+      }
+    } catch (error) {
+      logger6.debug("[Migration] ⊘ Could not check/migrate channel_participants");
+    }
+    logger6.debug("[Migration] → Discovering and dropping all regular indexes...");
+    try {
+      const indexesResult = await db.execute(sql23`
+        SELECT i.relname AS index_name
+        FROM pg_index idx
+        JOIN pg_class i ON i.oid = idx.indexrelid
+        JOIN pg_class c ON c.oid = idx.indrelid
+        JOIN pg_namespace n ON n.oid = c.relnamespace
+        LEFT JOIN pg_constraint con ON con.conindid = idx.indexrelid
+        WHERE n.nspname = 'public'
+          AND NOT idx.indisprimary  -- Not a primary key
+          AND con.contype IS NULL   -- Not a constraint (unique, etc)
+        ORDER BY i.relname
+      `);
+      const indexesToDrop = indexesResult.rows || [];
+      logger6.debug(`[Migration] → Found ${indexesToDrop.length} indexes to drop`);
+      for (const row of indexesToDrop) {
+        const indexName = row.index_name;
+        try {
+          await db.execute(sql23.raw(`DROP INDEX IF EXISTS "${indexName}"`));
+          logger6.debug(`[Migration] ✓ Dropped index ${indexName}`);
+        } catch (error) {
+          logger6.debug(`[Migration] ⊘ Could not drop index ${indexName}`);
+        }
+      }
+    } catch (error) {
+      logger6.debug("[Migration] ⊘ Could not drop indexes (may not have permissions)");
+    }
+    logger6.info("[Migration] ✓ Migration complete - develop to feat/entity-rls migration finished");
+  } catch (error) {
+    logger6.error("[Migration] Migration failed:", String(error));
+    throw error;
+  }
+}
+var init_migrations = () => {};
+
+// src/rls.ts
+import { logger as logger7, validateUuid } from "@elizaos/core";
+import { sql as sql24, eq } from "drizzle-orm";
+async function installRLSFunctions(adapter) {
+  const db = adapter.db;
+  await db.execute(sql24`
+    CREATE TABLE IF NOT EXISTS servers (
+      id UUID PRIMARY KEY,
+      created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL,
+      updated_at TIMESTAMPTZ DEFAULT NOW() NOT NULL
+    )
+  `);
+  await db.execute(sql24`
+    CREATE OR REPLACE FUNCTION current_server_id() RETURNS UUID AS $$
+    DECLARE
+      app_name TEXT;
+    BEGIN
+      app_name := NULLIF(current_setting('application_name', TRUE), '');
+
+      -- 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;
+      EXCEPTION WHEN OTHERS THEN
+        RETURN NULL;
+      END;
+    END;
+    $$ LANGUAGE plpgsql STABLE;
+  `);
+  await db.execute(sql24`
+    CREATE OR REPLACE FUNCTION add_server_isolation(
+      schema_name text,
+      table_name text
+    ) RETURNS void AS $$
+    DECLARE
+      full_table_name text;
+      column_exists boolean;
+      orphaned_count bigint;
+    BEGIN
+      full_table_name := schema_name || '.' || table_name;
+
+      -- Check if server_id column already exists
+      SELECT EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE information_schema.columns.table_schema = schema_name
+          AND information_schema.columns.table_name = add_server_isolation.table_name
+          AND information_schema.columns.column_name = 'server_id'
+      ) INTO column_exists;
+
+      -- Add server_id column if missing (DEFAULT populates it automatically for new rows)
+      IF NOT column_exists THEN
+        EXECUTE format('ALTER TABLE %I.%I ADD COLUMN server_id UUID DEFAULT current_server_id()', schema_name, table_name);
+
+        -- Backfill existing rows with current server_id
+        -- This ensures all existing data belongs to the server instance that is enabling RLS
+        EXECUTE format('UPDATE %I.%I SET server_id = current_server_id() WHERE server_id IS NULL', schema_name, table_name);
+      ELSE
+        -- Column already exists (RLS was previously enabled then disabled)
+        -- Restore the DEFAULT clause (may have been removed during uninstallRLS)
+        EXECUTE format('ALTER TABLE %I.%I ALTER COLUMN server_id SET DEFAULT current_server_id()', schema_name, table_name);
+
+        -- Only backfill NULL server_id rows, do NOT steal data from other servers
+        EXECUTE format('SELECT COUNT(*) FROM %I.%I WHERE server_id IS NULL', schema_name, table_name) INTO orphaned_count;
+
+        IF orphaned_count > 0 THEN
+          RAISE NOTICE 'Backfilling % rows with NULL server_id in %.%', orphaned_count, schema_name, table_name;
+          EXECUTE format('UPDATE %I.%I SET server_id = current_server_id() WHERE server_id IS NULL', schema_name, table_name);
+        END IF;
+      END IF;
+
+      -- Create index for efficient server_id filtering
+      EXECUTE format('CREATE INDEX IF NOT EXISTS idx_%I_server_id ON %I.%I(server_id)', table_name, schema_name, table_name);
+
+      -- Enable RLS on the table
+      EXECUTE format('ALTER TABLE %I.%I ENABLE ROW LEVEL SECURITY', schema_name, table_name);
+
+      -- FORCE RLS even for table owners (critical for security)
+      EXECUTE format('ALTER TABLE %I.%I FORCE ROW LEVEL SECURITY', schema_name, table_name);
+
+      -- Drop existing policy if present
+      EXECUTE format('DROP POLICY IF EXISTS server_isolation_policy ON %I.%I', schema_name, table_name);
+
+      -- Create isolation policy: users can only see/modify rows where server_id matches current server instance
+      -- No NULL clause - all rows must have a valid server_id (backfilled during column addition)
+      EXECUTE format('
+        CREATE POLICY server_isolation_policy ON %I.%I
+        USING (server_id = current_server_id())
+        WITH CHECK (server_id = current_server_id())
+      ', schema_name, table_name);
+    END;
+    $$ LANGUAGE plpgsql;
+  `);
+  await db.execute(sql24`
+    CREATE OR REPLACE FUNCTION apply_rls_to_all_tables() RETURNS void AS $$
+    DECLARE
+      tbl record;
+    BEGIN
+      FOR tbl IN
+        SELECT schemaname, tablename
+        FROM pg_tables
+        WHERE schemaname = 'public'
+          AND tablename NOT IN (
+            'servers',
+            'drizzle_migrations',
+            '__drizzle_migrations'
+          )
+      LOOP
+        BEGIN
+          PERFORM add_server_isolation(tbl.schemaname, tbl.tablename);
+        EXCEPTION WHEN OTHERS THEN
+          RAISE WARNING 'Failed to apply RLS to %.%: %', tbl.schemaname, tbl.tablename, SQLERRM;
+        END;
+      END LOOP;
+    END;
+    $$ LANGUAGE plpgsql;
+  `);
+  logger7.info({ src: "plugin:sql" }, "RLS PostgreSQL functions installed");
+  await installEntityRLS(adapter);
+}
+async function applyRLSToNewTables(adapter) {
+  const db = adapter.db;
+  try {
+    await db.execute(sql24`SELECT apply_rls_to_all_tables()`);
+    logger7.info({ src: "plugin:sql" }, "RLS applied to all tables");
+  } catch (error) {
+    logger7.warn({ src: "plugin:sql", error: String(error) }, "Failed to apply RLS to some tables");
+  }
+}
+async function installEntityRLS(adapter) {
+  const db = adapter.db;
+  logger7.info("[Entity RLS] Installing entity RLS functions and policies...");
+  await db.execute(sql24`
+    CREATE OR REPLACE FUNCTION current_entity_id()
+    RETURNS UUID AS $$
+    DECLARE
+      entity_id_text TEXT;
+    BEGIN
+      -- Read from transaction-local variable
+      entity_id_text := NULLIF(current_setting('app.entity_id', TRUE), '');
+
+      IF entity_id_text IS NULL OR entity_id_text = '' THEN
+        RETURN NULL;
+      END IF;
+
+      BEGIN
+        RETURN entity_id_text::UUID;
+      EXCEPTION WHEN OTHERS THEN
+        RETURN NULL;
+      END;
+    END;
+    $$ LANGUAGE plpgsql STABLE;
+  `);
+  logger7.info("[Entity RLS] Created current_entity_id() function");
+  await db.execute(sql24`
+    CREATE OR REPLACE FUNCTION add_entity_isolation(
+      schema_name text,
+      table_name text,
+      require_entity boolean DEFAULT false
+    ) RETURNS void AS $$
+    DECLARE
+      full_table_name text;
+      has_entity_id boolean;
+      has_author_id boolean;
+      has_channel_id boolean;
+      has_room_id boolean;
+      entity_column_name text;
+      room_column_name text;
+    BEGIN
+      full_table_name := schema_name || '.' || table_name;
+
+      -- Check which columns exist (using camelCase as per schema definition)
+      SELECT EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE information_schema.columns.table_schema = schema_name
+          AND information_schema.columns.table_name = add_entity_isolation.table_name
+          AND information_schema.columns.column_name = 'entityId'
+      ) INTO has_entity_id;
+
+      SELECT EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE information_schema.columns.table_schema = schema_name
+          AND information_schema.columns.table_name = add_entity_isolation.table_name
+          AND information_schema.columns.column_name = 'authorId'
+      ) INTO has_author_id;
+
+      SELECT EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE information_schema.columns.table_schema = schema_name
+          AND information_schema.columns.table_name = add_entity_isolation.table_name
+          AND information_schema.columns.column_name = 'roomId'
+      ) INTO has_room_id;
+
+      -- Skip if no entity-related columns
+      IF NOT (has_entity_id OR has_author_id OR has_room_id) THEN
+        RAISE NOTICE '[Entity RLS] Skipping %.%: no entity columns found', schema_name, table_name;
+        RETURN;
+      END IF;
+
+      -- Determine which column to use for entity filtering
+      -- Priority: roomId (shared access via participants) > entityId/authorId (direct access)
+      --
+      -- SPECIAL CASE: participants table must use direct entityId to avoid infinite recursion
+      IF table_name = 'participants' AND has_entity_id THEN
+        entity_column_name := 'entityId';
+        room_column_name := NULL;
+      ELSIF has_room_id THEN
+        room_column_name := 'roomId';
+        entity_column_name := NULL;
+      ELSIF has_entity_id THEN
+        entity_column_name := 'entityId';
+        room_column_name := NULL;
+      ELSIF has_author_id THEN
+        entity_column_name := 'authorId';
+        room_column_name := NULL;
+      ELSE
+        entity_column_name := NULL;
+        room_column_name := NULL;
+      END IF;
+
+      -- Enable RLS on the table
+      EXECUTE format('ALTER TABLE %I.%I ENABLE ROW LEVEL SECURITY', schema_name, table_name);
+      EXECUTE format('ALTER TABLE %I.%I FORCE ROW LEVEL SECURITY', schema_name, table_name);
+
+      -- Drop existing entity policies if present
+      EXECUTE format('DROP POLICY IF EXISTS entity_isolation_policy ON %I.%I', schema_name, table_name);
+
+      -- CASE 1: Table has roomId or channelId (shared access via participants)
+      IF room_column_name IS NOT NULL THEN
+        -- Determine the corresponding column name in participants table
+        -- If the table has roomId, look for roomId in participants.roomId
+        -- participants table uses: entityId (for participant), roomId (for room)
+        -- RESTRICTIVE: Must pass BOTH server RLS AND entity RLS (combined with AND)
+
+        -- Build policy with or without NULL check based on require_entity parameter
+        IF require_entity THEN
+          -- STRICT MODE: Entity context is REQUIRED (blocks NULL entity_id)
+          EXECUTE format('
+            CREATE POLICY entity_isolation_policy ON %I.%I
+            AS RESTRICTIVE
+            USING (
+              current_entity_id() IS NOT NULL
+              AND %I IN (
+                SELECT "roomId"
+                FROM participants
+                WHERE "entityId" = current_entity_id()
+              )
+            )
+            WITH CHECK (
+              current_entity_id() IS NOT NULL
+              AND %I IN (
+                SELECT "roomId"
+                FROM participants
+                WHERE "entityId" = current_entity_id()
+              )
+            )
+          ', schema_name, table_name, room_column_name, room_column_name);
+          RAISE NOTICE '[Entity RLS] Applied STRICT RESTRICTIVE to %.% (via % → participants.roomId, entity REQUIRED)', schema_name, table_name, room_column_name;
+        ELSE
+          -- PERMISSIVE MODE: NULL entity_id allows system/admin access
+          EXECUTE format('
+            CREATE POLICY entity_isolation_policy ON %I.%I
+            AS RESTRICTIVE
+            USING (
+              current_entity_id() IS NULL
+              OR %I IN (
+                SELECT "roomId"
+                FROM participants
+                WHERE "entityId" = current_entity_id()
+              )
+            )
+            WITH CHECK (
+              current_entity_id() IS NULL
+              OR %I IN (
+                SELECT "roomId"
+                FROM participants
+                WHERE "entityId" = current_entity_id()
+              )
+            )
+          ', schema_name, table_name, room_column_name, room_column_name);
+          RAISE NOTICE '[Entity RLS] Applied PERMISSIVE RESTRICTIVE to %.% (via % → participants.roomId, NULL allowed)', schema_name, table_name, room_column_name;
+        END IF;
+
+      -- CASE 2: Table has direct entity_id or author_id column
+      ELSIF entity_column_name IS NOT NULL THEN
+        -- RESTRICTIVE: Must pass BOTH server RLS AND entity RLS (combined with AND)
+
+        IF require_entity THEN
+          -- STRICT MODE: Entity context is REQUIRED
+          EXECUTE format('
+            CREATE POLICY entity_isolation_policy ON %I.%I
+            AS RESTRICTIVE
+            USING (
+              current_entity_id() IS NOT NULL
+              AND %I = current_entity_id()
+            )
+            WITH CHECK (
+              current_entity_id() IS NOT NULL
+              AND %I = current_entity_id()
+            )
+          ', schema_name, table_name, entity_column_name, entity_column_name);
+          RAISE NOTICE '[Entity RLS] Applied STRICT RESTRICTIVE to %.% (direct column: %, entity REQUIRED)', schema_name, table_name, entity_column_name;
+        ELSE
+          -- PERMISSIVE MODE: NULL entity_id allows system/admin access
+          EXECUTE format('
+            CREATE POLICY entity_isolation_policy ON %I.%I
+            AS RESTRICTIVE
+            USING (
+              current_entity_id() IS NULL
+              OR %I = current_entity_id()
+            )
+            WITH CHECK (
+              current_entity_id() IS NULL
+              OR %I = current_entity_id()
+            )
+          ', schema_name, table_name, entity_column_name, entity_column_name);
+          RAISE NOTICE '[Entity RLS] Applied PERMISSIVE RESTRICTIVE to %.% (direct column: %, NULL allowed)', schema_name, table_name, entity_column_name;
+        END IF;
+      END IF;
+
+      -- Create indexes for efficient entity filtering
+      IF room_column_name IS NOT NULL THEN
+        EXECUTE format('CREATE INDEX IF NOT EXISTS idx_%I_room ON %I.%I(%I)',
+          table_name, schema_name, table_name, room_column_name);
+      END IF;
+
+      IF entity_column_name IS NOT NULL THEN
+        EXECUTE format('CREATE INDEX IF NOT EXISTS idx_%I_entity ON %I.%I(%I)',
+          table_name, schema_name, table_name, entity_column_name);
+      END IF;
+    END;
+    $$ LANGUAGE plpgsql;
+  `);
+  logger7.info("[Entity RLS] Created add_entity_isolation() function");
+  await db.execute(sql24`
+    CREATE OR REPLACE FUNCTION apply_entity_rls_to_all_tables() RETURNS void AS $$
+    DECLARE
+      tbl record;
+      require_entity_for_table boolean;
+    BEGIN
+      FOR tbl IN
+        SELECT schemaname, tablename
+        FROM pg_tables
+        WHERE schemaname = 'public'
+          AND tablename NOT IN (
+            'servers',              -- Server RLS table
+            'users',                -- Authentication table (no entity isolation needed)
+            'entity_mappings',      -- Mapping table (no entity isolation needed)
+            'drizzle_migrations',   -- Migration tracking
+            '__drizzle_migrations'  -- Migration tracking
+          )
+      LOOP
+        BEGIN
+          -- Apply STRICT mode (require_entity=true) to sensitive user-facing tables
+          -- These tables MUST have entity context set to access data
+          -- STRICT tables: memories, logs, components, tasks (user data requiring isolation)
+          -- NOTE: Excluded tables:
+          --   - 'participants': Adding participants is a privileged operation during initialization
+          IF tbl.tablename IN ('memories', 'logs', 'components', 'tasks') THEN
+            require_entity_for_table := true;
+          ELSE
+            -- PERMISSIVE mode (require_entity=false) for system/privileged tables
+            -- This includes: participants, rooms, channels, entities, etc.
+            require_entity_for_table := false;
+          END IF;
+
+          PERFORM add_entity_isolation(tbl.schemaname, tbl.tablename, require_entity_for_table);
+        EXCEPTION WHEN OTHERS THEN
+          RAISE WARNING '[Entity RLS] Failed to apply to %.%: %', tbl.schemaname, tbl.tablename, SQLERRM;
+        END;
+      END LOOP;
+    END;
+    $$ LANGUAGE plpgsql;
+  `);
+  logger7.info("[Entity RLS] Created apply_entity_rls_to_all_tables() function");
+  logger7.info("[Entity RLS] Entity RLS functions installed successfully");
+}
+async function applyEntityRLSToAllTables(adapter) {
+  const db = adapter.db;
+  try {
+    await db.execute(sql24`SELECT apply_entity_rls_to_all_tables()`);
+    logger7.info("[Entity RLS] Applied entity RLS to all eligible tables");
+  } catch (error) {
+    logger7.warn("[Entity RLS] Failed to apply entity RLS to some tables:", String(error));
+  }
+}
+var init_rls = () => {};
+
 // src/migration-service.ts
 var exports_migration_service = {};
 __export(exports_migration_service, {
   DatabaseMigrationService: () => DatabaseMigrationService
 });
-import { logger as logger6 } from "@elizaos/core";
+import { logger as logger8 } from "@elizaos/core";
 
 class DatabaseMigrationService {
   db = null;
@@ -19612,22 +20276,22 @@ class DatabaseMigrationService {
   constructor() {}
   async initializeWithDatabase(db) {
     this.db = db;
+    await migrateToEntityRLS({ db });
     this.migrator = new RuntimeMigrator(db);
     await this.migrator.initialize();
-    logger6.info("DatabaseMigrationService initialized with database and runtime migrator");
+    logger8.info({ src: "plugin:sql" }, "DatabaseMigrationService initialized");
   }
   discoverAndRegisterPluginSchemas(plugins) {
     for (const plugin of plugins) {
       if (plugin.schema) {
         this.registeredSchemas.set(plugin.name, plugin.schema);
-        logger6.info(`Registered schema for plugin: ${plugin.name}`);
       }
     }
-    logger6.info(`Discovered ${this.registeredSchemas.size} plugin schemas out of ${plugins.length} plugins`);
+    logger8.info({ src: "plugin:sql", schemasDiscovered: this.registeredSchemas.size, totalPlugins: plugins.length }, "Plugin schemas discovered");
   }
   registerSchema(pluginName, schema) {
     this.registeredSchemas.set(pluginName, schema);
-    logger6.info(`Registered schema for plugin: ${pluginName}`);
+    logger8.debug({ src: "plugin:sql", pluginName }, "Schema registered");
   }
   async runAllPluginMigrations(options) {
     if (!this.db || !this.migrator) {
@@ -19639,12 +20303,7 @@ class DatabaseMigrationService {
       force: options?.force ?? false,
       dryRun: options?.dryRun ?? false
     };
-    logger6.info("[DatabaseMigrationService] Starting migrations");
-    logger6.info(`[DatabaseMigrationService] Environment: ${isProduction ? "PRODUCTION" : "DEVELOPMENT"}`);
-    logger6.info(`[DatabaseMigrationService] Plugins to migrate: ${this.registeredSchemas.size}`);
-    if (migrationOptions.dryRun) {
-      logger6.info("[DatabaseMigrationService] DRY RUN mode - no changes will be applied");
-    }
+    logger8.info({ src: "plugin:sql", environment: isProduction ? "PRODUCTION" : "DEVELOPMENT", pluginCount: this.registeredSchemas.size, dryRun: migrationOptions.dryRun }, "Starting migrations");
     let successCount = 0;
     let failureCount = 0;
     const errors = [];
@@ -19652,27 +20311,37 @@ class DatabaseMigrationService {
       try {
         await this.migrator.migrate(pluginName, schema, migrationOptions);
         successCount++;
-        logger6.info(`[DatabaseMigrationService] ✅ Completed: ${pluginName}`);
+        logger8.info({ src: "plugin:sql", pluginName }, "Migration completed");
       } catch (error) {
         failureCount++;
         const errorMessage = error.message;
         errors.push({ pluginName, error });
         if (errorMessage.includes("Destructive migration blocked")) {
-          logger6.error(`[DatabaseMigrationService] ❌ Blocked: ${pluginName} (destructive changes detected)`);
-          if (!migrationOptions.force && process.env.ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS !== "true") {
-            logger6.error("[DatabaseMigrationService] To allow destructive migrations:");
-            logger6.error("[DatabaseMigrationService]   - Set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true");
-            logger6.error("[DatabaseMigrationService]   - Or pass { force: true } to this method");
-          }
+          logger8.error({ src: "plugin:sql", pluginName }, "Migration blocked - destructive changes detected. Set ELIZA_ALLOW_DESTRUCTIVE_MIGRATIONS=true or use force option");
         } else {
-          logger6.error(`[DatabaseMigrationService] ❌ Failed: ${pluginName}`, JSON.stringify(error));
+          logger8.error({ src: "plugin:sql", pluginName, error: errorMessage }, "Migration failed");
         }
       }
     }
     if (failureCount === 0) {
-      logger6.info(`[DatabaseMigrationService] All ${successCount} migrations completed successfully`);
+      logger8.info({ src: "plugin:sql", successCount }, "All migrations completed successfully");
+      const dataIsolationEnabled = process.env.ENABLE_DATA_ISOLATION === "true";
+      if (dataIsolationEnabled) {
+        try {
+          logger8.info({ src: "plugin:sql" }, "Re-applying Row Level Security...");
+          await installRLSFunctions({ db: this.db });
+          await applyRLSToNewTables({ db: this.db });
+          await applyEntityRLSToAllTables({ db: this.db });
+          logger8.info({ src: "plugin:sql" }, "RLS re-applied successfully");
+        } catch (rlsError) {
+          const errorMsg = rlsError instanceof Error ? rlsError.message : String(rlsError);
+          logger8.warn({ src: "plugin:sql", error: errorMsg }, "Failed to re-apply RLS (this is OK if server_id columns are not yet in schemas)");
+        }
+      } else {
+        logger8.info({ src: "plugin:sql" }, "Skipping RLS re-application (ENABLE_DATA_ISOLATION is not true)");
+      }
     } else {
-      logger6.error(`[DatabaseMigrationService] Migrations failed: ${failureCount} failed, ${successCount} succeeded`);
+      logger8.error({ src: "plugin:sql", failureCount, successCount }, "Some migrations failed");
       const errorSummary = errors.map((e) => `${e.pluginName}: ${e.error.message}`).join(`
   `);
       throw new Error(`${failureCount} migration(s) failed:
@@ -19685,35 +20354,37 @@ class DatabaseMigrationService {
 }
 var init_migration_service = __esm(() => {
   init_runtime_migrator2();
+  init_migrations();
+  init_rls();
 });
 
 // src/index.browser.ts
 import {
-  logger as logger9
+  logger as logger11
 } from "@elizaos/core/browser";
 
 // src/pglite/adapter.ts
-import { logger as logger8 } from "@elizaos/core";
+import { logger as logger10 } from "@elizaos/core";
 import { drizzle } from "drizzle-orm/pglite";
 
 // src/base.ts
 import {
   ChannelType,
   DatabaseAdapter,
-  logger as logger7
+  logger as logger9
 } from "@elizaos/core";
 import {
   and,
   cosineDistance,
   count,
   desc,
-  eq,
+  eq as eq2,
   gte,
   inArray,
   lt,
   lte,
   or,
-  sql as sql23
+  sql as sql25
 } from "drizzle-orm";
 
 // node_modules/uuid/dist/esm-browser/stringify.js
@@ -19773,6 +20444,7 @@ import { check as check2, foreignKey as foreignKey2, index as index2, pgTable as
 import { VECTOR_DIMS } from "@elizaos/core";
 
 // src/schema/memory.ts
+init_agent();
 import { relations, sql as sql4 } from "drizzle-orm";
 import {
   boolean as boolean2,
@@ -19786,30 +20458,8 @@ import {
   uuid as uuid4
 } from "drizzle-orm/pg-core";
 
-// src/schema/agent.ts
-import { sql } from "drizzle-orm";
-import { boolean, jsonb, pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
-var agentTable = pgTable("agents", {
-  id: uuid("id").primaryKey().defaultRandom(),
-  enabled: boolean("enabled").default(true).notNull(),
-  owner_id: uuid("owner_id"),
-  createdAt: timestamp("created_at", { withTimezone: true }).default(sql`now()`).notNull(),
-  updatedAt: timestamp("updated_at", { withTimezone: true }).default(sql`now()`).notNull(),
-  name: text("name").notNull(),
-  username: text("username"),
-  system: text("system").default(""),
-  bio: jsonb("bio").$type().default(sql`'[]'::jsonb`),
-  messageExamples: jsonb("message_examples").$type().default(sql`'[]'::jsonb`).notNull(),
-  postExamples: jsonb("post_examples").$type().default(sql`'[]'::jsonb`).notNull(),
-  topics: jsonb("topics").$type().default(sql`'[]'::jsonb`).notNull(),
-  adjectives: jsonb("adjectives").$type().default(sql`'[]'::jsonb`).notNull(),
-  knowledge: jsonb("knowledge").$type().default(sql`'[]'::jsonb`).notNull(),
-  plugins: jsonb("plugins").$type().default(sql`'[]'::jsonb`).notNull(),
-  settings: jsonb("settings").$type().default(sql`'{}'::jsonb`).notNull(),
-  style: jsonb("style").$type().default(sql`'{}'::jsonb`).notNull()
-});
-
 // src/schema/entity.ts
+init_agent();
 import { sql as sql2 } from "drizzle-orm";
 import { jsonb as jsonb2, pgTable as pgTable2, text as text2, timestamp as timestamp2, unique, uuid as uuid2 } from "drizzle-orm/pg-core";
 var entityTable = pgTable2("entities", {
@@ -19827,6 +20477,7 @@ var entityTable = pgTable2("entities", {
 });
 
 // src/schema/room.ts
+init_agent();
 import { sql as sql3 } from "drizzle-orm";
 import { jsonb as jsonb3, pgTable as pgTable3, text as text3, timestamp as timestamp3, uuid as uuid3 } from "drizzle-orm/pg-core";
 var roomTable = pgTable3("rooms", {
@@ -19836,12 +20487,12 @@ var roomTable = pgTable3("rooms", {
   }),
   source: text3("source").notNull(),
   type: text3("type").notNull(),
-  serverId: text3("serverId"),
+  messageServerId: uuid3("message_server_id"),
   worldId: uuid3("worldId"),
   name: text3("name"),
   metadata: jsonb3("metadata"),
-  channelId: text3("channelId"),
-  createdAt: timestamp3("createdAt").default(sql3`now()`).notNull()
+  channelId: text3("channel_id"),
+  createdAt: timestamp3("created_at").default(sql3`now()`).notNull()
 });
 
 // src/schema/memory.ts
@@ -19933,17 +20584,18 @@ var embeddingTable = pgTable5("embeddings", {
 ]);
 
 // src/schema/index.ts
+init_agent();
 var exports_schema = {};
 __export(exports_schema, {
   worldTable: () => worldTable,
   taskTable: () => taskTable,
-  serverAgentsTable: () => serverAgentsTable,
+  serverTable: () => serverTable,
   roomTable: () => roomTable,
   relationshipTable: () => relationshipTable,
   participantTable: () => participantTable,
-  ownersTable: () => ownersTable,
   messageTable: () => messageTable,
   messageServerTable: () => messageServerTable,
+  messageServerAgentsTable: () => messageServerAgentsTable,
   memoryTable: () => memoryTable,
   logTable: () => logTable,
   entityTable: () => entityTable,
@@ -19956,6 +20608,7 @@ __export(exports_schema, {
 });
 
 // src/schema/cache.ts
+init_agent();
 import { sql as sql6 } from "drizzle-orm";
 import { jsonb as jsonb5, pgTable as pgTable6, text as text5, primaryKey, timestamp as timestamp6, uuid as uuid6 } from "drizzle-orm/pg-core";
 var cacheTable = pgTable6("cache", {
@@ -19964,14 +20617,16 @@ var cacheTable = pgTable6("cache", {
   value: jsonb5("value").notNull(),
   createdAt: timestamp6("created_at", { withTimezone: true }).default(sql6`now()`).notNull(),
   expiresAt: timestamp6("expires_at", { withTimezone: true })
-}, (table) => ({
-  pk: primaryKey({ columns: [table.key, table.agentId] })
-}));
+}, (table) => [
+  primaryKey({ columns: [table.key, table.agentId] })
+]);
 // src/schema/component.ts
+init_agent();
 import { sql as sql8 } from "drizzle-orm";
 import { jsonb as jsonb7, pgTable as pgTable8, text as text7, timestamp as timestamp8, uuid as uuid8 } from "drizzle-orm/pg-core";
 
 // src/schema/world.ts
+init_agent();
 import { sql as sql7 } from "drizzle-orm";
 import { jsonb as jsonb6, pgTable as pgTable7, text as text6, timestamp as timestamp7, uuid as uuid7 } from "drizzle-orm/pg-core";
 var worldTable = pgTable7("worlds", {
@@ -19979,8 +20634,8 @@ var worldTable = pgTable7("worlds", {
   agentId: uuid7("agentId").notNull().references(() => agentTable.id, { onDelete: "cascade" }),
   name: text6("name").notNull(),
   metadata: jsonb6("metadata"),
-  serverId: text6("serverId").notNull().default("local"),
-  createdAt: timestamp7("createdAt").default(sql7`now()`).notNull()
+  messageServerId: uuid7("message_server_id"),
+  createdAt: timestamp7("created_at").default(sql7`now()`).notNull()
 });
 
 // src/schema/component.ts
@@ -20017,15 +20672,12 @@ var logTable = pgTable9("logs", {
     foreignColumns: [entityTable.id]
   }).onDelete("cascade")
 ]);
-// src/schema/owners.ts
-import { sql as sql10 } from "drizzle-orm";
-import { pgTable as pgTable10, timestamp as timestamp10, uuid as uuid10 } from "drizzle-orm/pg-core";
-var ownersTable = pgTable10("owners", {
-  id: uuid10("id").primaryKey(),
-  createdAt: timestamp10("created_at", { withTimezone: true }).default(sql10`now()`).notNull(),
-  updatedAt: timestamp10("updated_at", { withTimezone: true }).default(sql10`now()`).notNull()
-});
+
+// src/schema/index.ts
+init_server();
+
 // src/schema/participant.ts
+init_agent();
 import { sql as sql11 } from "drizzle-orm";
 import { foreignKey as foreignKey4, index as index3, pgTable as pgTable11, text as text9, timestamp as timestamp11, uuid as uuid11 } from "drizzle-orm/pg-core";
 var participantTable = pgTable11("participants", {
@@ -20056,6 +20708,7 @@ var participantTable = pgTable11("participants", {
   }).onDelete("cascade")
 ]);
 // src/schema/relationship.ts
+init_agent();
 import { sql as sql12 } from "drizzle-orm";
 import {
   foreignKey as foreignKey5,
@@ -20090,6 +20743,7 @@ var relationshipTable = pgTable12("relationships", {
   }).onDelete("cascade")
 ]);
 // src/schema/tasks.ts
+init_agent();
 import { jsonb as jsonb10, pgTable as pgTable13, text as text11, timestamp as timestamp13, uuid as uuid13 } from "drizzle-orm/pg-core";
 import { sql as sql13 } from "drizzle-orm";
 var taskTable = pgTable13("tasks", {
@@ -20099,7 +20753,7 @@ var taskTable = pgTable13("tasks", {
   roomId: uuid13("roomId"),
   worldId: uuid13("worldId"),
   entityId: uuid13("entityId"),
-  agentId: uuid13("agent_id").notNull().references(() => agentTable.id, { onDelete: "cascade" }),
+  agentId: uuid13("agentId").notNull().references(() => agentTable.id, { onDelete: "cascade" }),
   tags: text11("tags").array().default(sql13`'{}'::text[]`),
   metadata: jsonb10("metadata").default(sql13`'{}'::jsonb`),
   createdAt: timestamp13("created_at", { withTimezone: true }).defaultNow(),
@@ -20122,7 +20776,7 @@ import { pgTable as pgTable15, text as text13, jsonb as jsonb12, timestamp as ti
 import { sql as sql15 } from "drizzle-orm";
 var channelTable = pgTable15("channels", {
   id: text13("id").primaryKey(),
-  messageServerId: uuid15("server_id").notNull().references(() => messageServerTable.id, { onDelete: "cascade" }),
+  messageServerId: uuid15("message_server_id").notNull().references(() => messageServerTable.id, { onDelete: "cascade" }),
   name: text13("name").notNull(),
   type: text13("type").notNull(),
   sourceType: text13("source_type"),
@@ -20154,18 +20808,19 @@ var messageTable = pgTable16("central_messages", {
 import { pgTable as pgTable17, text as text15, primaryKey as primaryKey2 } from "drizzle-orm/pg-core";
 var channelParticipantsTable = pgTable17("channel_participants", {
   channelId: text15("channel_id").notNull().references(() => channelTable.id, { onDelete: "cascade" }),
-  userId: text15("user_id").notNull()
-}, (table) => ({
-  pk: primaryKey2({ columns: [table.channelId, table.userId] })
-}));
-// src/schema/serverAgent.ts
+  entityId: text15("entity_id").notNull()
+}, (table) => [
+  primaryKey2({ columns: [table.channelId, table.entityId] })
+]);
+// src/schema/messageServerAgent.ts
 import { pgTable as pgTable18, uuid as uuid16, primaryKey as primaryKey3 } from "drizzle-orm/pg-core";
-var serverAgentsTable = pgTable18("server_agents", {
-  serverId: uuid16("server_id").notNull().references(() => messageServerTable.id, { onDelete: "cascade" }),
+init_agent();
+var messageServerAgentsTable = pgTable18("message_server_agents", {
+  messageServerId: uuid16("message_server_id").notNull().references(() => messageServerTable.id, { onDelete: "cascade" }),
   agentId: uuid16("agent_id").notNull().references(() => agentTable.id, { onDelete: "cascade" })
-}, (table) => ({
-  pk: primaryKey3({ columns: [table.serverId, table.agentId] })
-}));
+}, (table) => [
+  primaryKey3({ columns: [table.messageServerId, table.agentId] })
+]);
 // src/base.ts
 class BaseDrizzleAdapter extends DatabaseAdapter {
   maxRetries = 3;
@@ -20227,10 +20882,10 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           const backoffDelay = Math.min(this.baseDelay * 2 ** (attempt - 1), this.maxDelay);
           const jitter = Math.random() * this.jitterMax;
           const delay = backoffDelay + jitter;
-          logger7.warn(`Database operation failed (attempt ${attempt}/${this.maxRetries}): ${error instanceof Error ? error.message : String(error)}, nextRetryIn: ${(delay / 1000).toFixed(1)}s`);
+          logger9.warn({ src: "plugin:sql", attempt, maxRetries: this.maxRetries, error: error instanceof Error ? error.message : String(error) }, "Database operation failed, retrying");
           await new Promise((resolve) => setTimeout(resolve, delay));
         } else {
-          logger7.error(`Max retry attempts reached: ${error instanceof Error ? error.message : String(error)}, totalAttempts: ${attempt}`);
+          logger9.error({ src: "plugin:sql", totalAttempts: attempt, error: error instanceof Error ? error.message : String(error) }, "Max retry attempts reached");
           throw error instanceof Error ? error : new Error(String(error));
         }
       }
@@ -20239,7 +20894,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async ensureEmbeddingDimension(dimension) {
     return this.withDatabase(async () => {
-      const existingMemory = await this.db.select().from(memoryTable).innerJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(eq(memoryTable.agentId, this.agentId)).limit(1);
+      const existingMemory = await this.db.select().from(memoryTable).innerJoin(embeddingTable, eq2(embeddingTable.memoryId, memoryTable.id)).where(eq2(memoryTable.agentId, this.agentId)).limit(1);
       if (existingMemory.length > 0) {
         Object.entries(DIMENSION_MAP).find(([_, colName]) => existingMemory[0].embeddings[colName] !== null);
       }
@@ -20248,7 +20903,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getAgent(agentId) {
     return this.withDatabase(async () => {
-      const rows = await this.db.select().from(agentTable).where(eq(agentTable.id, agentId)).limit(1);
+      const rows = await this.db.select().from(agentTable).where(eq2(agentTable.id, agentId)).limit(1);
       if (rows.length === 0)
         return null;
       const row = rows[0];
@@ -20282,9 +20937,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       try {
         if (agent.id) {
-          const existing = await this.db.select({ id: agentTable.id }).from(agentTable).where(eq(agentTable.id, agent.id)).limit(1);
+          const existing = await this.db.select({ id: agentTable.id }).from(agentTable).where(eq2(agentTable.id, agent.id)).limit(1);
           if (existing.length > 0) {
-            logger7.warn(`Attempted to create an agent with a duplicate ID. ID: ${agent.id}`);
+            logger9.warn({ src: "plugin:sql", agentId: agent.id }, "Attempted to create agent with duplicate ID");
             return false;
           }
         }
@@ -20295,10 +20950,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             updatedAt: new Date(agent.updatedAt || Date.now())
           });
         });
-        logger7.debug(`Agent created successfully: ${agent.id}`);
         return true;
       } catch (error) {
-        logger7.error(`Error creating agent: ${error instanceof Error ? error.message : String(error)}, agentId: ${agent.id}`);
+        logger9.error({ src: "plugin:sql", agentId: agent.id, error: error instanceof Error ? error.message : String(error) }, "Failed to create agent");
         return false;
       }
     });
@@ -20330,18 +20984,17 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           } else {
             updateData.updatedAt = new Date;
           }
-          await tx.update(agentTable).set(updateData).where(eq(agentTable.id, agentId));
+          await tx.update(agentTable).set(updateData).where(eq2(agentTable.id, agentId));
         });
-        logger7.debug(`Agent updated successfully: ${agentId}`);
         return true;
       } catch (error) {
-        logger7.error(`Error updating agent: ${error instanceof Error ? error.message : String(error)}, agentId: ${agentId}`);
+        logger9.error({ src: "plugin:sql", agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to update agent");
         return false;
       }
     });
   }
   async mergeAgentSettings(tx, agentId, updatedSettings) {
-    const currentAgent = await tx.select({ settings: agentTable.settings }).from(agentTable).where(eq(agentTable.id, agentId)).limit(1);
+    const currentAgent = await tx.select({ settings: agentTable.settings }).from(agentTable).where(eq2(agentTable.id, agentId)).limit(1);
     const currentSettings = currentAgent.length > 0 && currentAgent[0].settings ? currentAgent[0].settings : {};
     const deepMerge = (target, source) => {
       if (source === null) {
@@ -20377,22 +21030,16 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return finalSettings === undefined ? {} : finalSettings;
   }
   async deleteAgent(agentId) {
-    logger7.debug(`[DB] Deleting agent with ID: ${agentId}`);
     return this.withDatabase(async () => {
       try {
-        const result = await this.db.delete(agentTable).where(eq(agentTable.id, agentId)).returning();
+        const result = await this.db.delete(agentTable).where(eq2(agentTable.id, agentId)).returning();
         if (result.length === 0) {
-          logger7.warn(`[DB] Agent ${agentId} not found`);
+          logger9.warn({ src: "plugin:sql", agentId }, "Agent not found for deletion");
           return false;
         }
-        logger7.success(`[DB] Agent ${agentId} and all related data successfully deleted via cascade`);
         return true;
       } catch (error) {
-        logger7.error(`[DB] Failed to delete agent ${agentId}: ${error instanceof Error ? error.message : String(error)}`);
-        if (error instanceof Error) {
-          logger7.error(`[DB] Error details: ${error.name} - ${error.message}`);
-          logger7.error(`[DB] Stack trace: ${error.stack}`);
-        }
+        logger9.error({ src: "plugin:sql", agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to delete agent");
         throw error;
       }
     });
@@ -20403,7 +21050,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         const result = await this.db.select({ count: count() }).from(agentTable);
         return result[0]?.count || 0;
       } catch (error) {
-        logger7.error(`Error counting agents: ${error instanceof Error ? error.message : String(error)}`);
+        logger9.error({ src: "plugin:sql", error: error instanceof Error ? error.message : String(error) }, "Failed to count agents");
         return 0;
       }
     });
@@ -20412,9 +21059,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       try {
         await this.db.delete(agentTable);
-        logger7.success("Successfully cleaned up agent table");
       } catch (error) {
-        logger7.error(`Error cleaning up agent table: ${error instanceof Error ? error.message : String(error)}`);
+        logger9.error({ src: "plugin:sql", error: error instanceof Error ? error.message : String(error) }, "Failed to clean up agent table");
         throw error;
       }
     });
@@ -20424,7 +21070,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const result = await this.db.select({
         entity: entityTable,
         components: componentTable
-      }).from(entityTable).leftJoin(componentTable, eq(componentTable.entityId, entityTable.id)).where(inArray(entityTable.id, entityIds));
+      }).from(entityTable).leftJoin(componentTable, eq2(componentTable.entityId, entityTable.id)).where(inArray(entityTable.id, entityIds));
       if (result.length === 0)
         return [];
       const entities = {};
@@ -20450,11 +21096,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const query = this.db.select({
         entity: entityTable,
         ...includeComponents && { components: componentTable }
-      }).from(participantTable).leftJoin(entityTable, and(eq(participantTable.entityId, entityTable.id), eq(entityTable.agentId, this.agentId)));
+      }).from(participantTable).leftJoin(entityTable, and(eq2(participantTable.entityId, entityTable.id), eq2(entityTable.agentId, this.agentId)));
       if (includeComponents) {
-        query.leftJoin(componentTable, eq(componentTable.entityId, entityTable.id));
+        query.leftJoin(componentTable, eq2(componentTable.entityId, entityTable.id));
       }
-      const result = await query.where(eq(participantTable.roomId, roomId));
+      const result = await query.where(eq2(participantTable.roomId, roomId));
       const entitiesByIdMap = new Map;
       for (const row of result) {
         if (!row.entity)
@@ -20493,21 +21139,17 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             metadata: entity.metadata || {}
           }));
           await tx.insert(entityTable).values(normalizedEntities);
-          logger7.debug(`${entities.length} Entities created successfully`);
           return true;
         });
       } catch (error) {
-        logger7.error(`Error creating entities, entityId: ${entities[0].id}, (metadata?.)name: ${entities[0].metadata?.name}`, error instanceof Error ? error.message : String(error));
-        if (error instanceof Error && error.stack) {
-          logger7.trace("Stack trace:", error.stack);
-        }
+        logger9.error({ src: "plugin:sql", entityId: entities[0]?.id, error: error instanceof Error ? error.message : String(error) }, "Failed to create entities");
         return false;
       }
     });
   }
   async ensureEntityExists(entity) {
     if (!entity.id) {
-      logger7.error("Entity ID is required for ensureEntityExists");
+      logger9.error({ src: "plugin:sql" }, "Entity ID is required for ensureEntityExists");
       return false;
     }
     try {
@@ -20517,7 +21159,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       }
       return true;
     } catch (error) {
-      logger7.error(`Error ensuring entity exists: ${error instanceof Error ? error.message : String(error)}, entityId: ${entity.id}`);
+      logger9.error({ src: "plugin:sql", entityId: entity.id, error: error instanceof Error ? error.message : String(error) }, "Failed to ensure entity exists");
       return false;
     }
   }
@@ -20531,25 +21173,25 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         names: this.normalizeEntityNames(entity.names),
         metadata: entity.metadata || {}
       };
-      await this.db.update(entityTable).set(normalizedEntity).where(eq(entityTable.id, entity.id));
+      await this.db.update(entityTable).set(normalizedEntity).where(eq2(entityTable.id, entity.id));
     });
   }
   async deleteEntity(entityId) {
     return this.withDatabase(async () => {
       await this.db.transaction(async (tx) => {
-        await tx.delete(componentTable).where(or(eq(componentTable.entityId, entityId), eq(componentTable.sourceEntityId, entityId)));
-        await tx.delete(entityTable).where(eq(entityTable.id, entityId));
+        await tx.delete(componentTable).where(or(eq2(componentTable.entityId, entityId), eq2(componentTable.sourceEntityId, entityId)));
+        await tx.delete(entityTable).where(eq2(entityTable.id, entityId));
       });
     });
   }
   async getEntitiesByNames(params) {
     return this.withDatabase(async () => {
       const { names, agentId } = params;
-      const nameConditions = names.map((name) => sql23`${name} = ANY(${entityTable.names})`);
-      const query = sql23`
+      const nameConditions = names.map((name) => sql25`${name} = ANY(${entityTable.names})`);
+      const query = sql25`
         SELECT * FROM ${entityTable}
         WHERE ${entityTable.agentId} = ${agentId}
-        AND (${sql23.join(nameConditions, sql23` OR `)})
+        AND (${sql25.join(nameConditions, sql25` OR `)})
       `;
       const result = await this.db.execute(query);
       return result.rows.map((row) => ({
@@ -20564,7 +21206,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       const { query, agentId, limit = 10 } = params;
       if (!query || query.trim() === "") {
-        const result2 = await this.db.select().from(entityTable).where(eq(entityTable.agentId, agentId)).limit(limit);
+        const result2 = await this.db.select().from(entityTable).where(eq2(entityTable.agentId, agentId)).limit(limit);
         return result2.map((row) => ({
           id: row.id,
           agentId: row.agentId,
@@ -20572,7 +21214,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           metadata: row.metadata || {}
         }));
       }
-      const searchQuery = sql23`
+      const searchQuery = sql25`
         SELECT * FROM ${entityTable}
         WHERE ${entityTable.agentId} = ${agentId}
         AND EXISTS (
@@ -20592,12 +21234,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getComponent(entityId, type, worldId, sourceEntityId) {
     return this.withDatabase(async () => {
-      const conditions = [eq(componentTable.entityId, entityId), eq(componentTable.type, type)];
+      const conditions = [eq2(componentTable.entityId, entityId), eq2(componentTable.type, type)];
       if (worldId) {
-        conditions.push(eq(componentTable.worldId, worldId));
+        conditions.push(eq2(componentTable.worldId, worldId));
       }
       if (sourceEntityId) {
-        conditions.push(eq(componentTable.sourceEntityId, sourceEntityId));
+        conditions.push(eq2(componentTable.sourceEntityId, sourceEntityId));
       }
       const result = await this.db.select().from(componentTable).where(and(...conditions));
       if (result.length === 0)
@@ -20618,12 +21260,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getComponents(entityId, worldId, sourceEntityId) {
     return this.withDatabase(async () => {
-      const conditions = [eq(componentTable.entityId, entityId)];
+      const conditions = [eq2(componentTable.entityId, entityId)];
       if (worldId) {
-        conditions.push(eq(componentTable.worldId, worldId));
+        conditions.push(eq2(componentTable.worldId, worldId));
       }
       if (sourceEntityId) {
-        conditions.push(eq(componentTable.sourceEntityId, sourceEntityId));
+        conditions.push(eq2(componentTable.sourceEntityId, sourceEntityId));
       }
       const result = await this.db.select({
         id: componentTable.id,
@@ -20667,7 +21309,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         await this.db.update(componentTable).set({
           ...component,
           updatedAt: new Date
-        }).where(eq(componentTable.id, component.id));
+        }).where(eq2(componentTable.id, component.id));
       } catch (e) {
         console.error("updateComponent error", e);
       }
@@ -20675,7 +21317,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async deleteComponent(componentId) {
     return this.withDatabase(async () => {
-      await this.db.delete(componentTable).where(eq(componentTable.id, componentId));
+      await this.db.delete(componentTable).where(eq2(componentTable.id, componentId));
     });
   }
   async getMemories(params) {
@@ -20685,30 +21327,27 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     if (offset !== undefined && offset < 0) {
       throw new Error("offset must be a non-negative number");
     }
-    return this.withDatabase(async () => {
-      const conditions = [eq(memoryTable.type, tableName)];
+    return this.withEntityContext(entityId ?? null, async (tx) => {
+      const conditions = [eq2(memoryTable.type, tableName)];
       if (start) {
         conditions.push(gte(memoryTable.createdAt, new Date(start)));
       }
-      if (entityId) {
-        conditions.push(eq(memoryTable.entityId, entityId));
-      }
       if (roomId) {
-        conditions.push(eq(memoryTable.roomId, roomId));
+        conditions.push(eq2(memoryTable.roomId, roomId));
       }
       if (worldId) {
-        conditions.push(eq(memoryTable.worldId, worldId));
+        conditions.push(eq2(memoryTable.worldId, worldId));
       }
       if (end) {
         conditions.push(lte(memoryTable.createdAt, new Date(end)));
       }
       if (unique3) {
-        conditions.push(eq(memoryTable.unique, true));
+        conditions.push(eq2(memoryTable.unique, true));
       }
       if (agentId) {
-        conditions.push(eq(memoryTable.agentId, agentId));
+        conditions.push(eq2(memoryTable.agentId, agentId));
       }
-      const baseQuery = this.db.select({
+      const baseQuery = tx.select({
         memory: {
           id: memoryTable.id,
           type: memoryTable.type,
@@ -20721,7 +21360,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           metadata: memoryTable.metadata
         },
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq(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));
       const rows = await (async () => {
         if (params.count && offset !== undefined && offset > 0) {
           return baseQuery.limit(params.count).offset(offset);
@@ -20752,10 +21391,10 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       if (params.roomIds.length === 0)
         return [];
       const conditions = [
-        eq(memoryTable.type, params.tableName),
+        eq2(memoryTable.type, params.tableName),
         inArray(memoryTable.roomId, params.roomIds)
       ];
-      conditions.push(eq(memoryTable.agentId, this.agentId));
+      conditions.push(eq2(memoryTable.agentId, this.agentId));
       const query = this.db.select({
         id: memoryTable.id,
         type: memoryTable.type,
@@ -20785,7 +21424,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const result = await this.db.select({
         memory: memoryTable,
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq(memoryTable.id, embeddingTable.memoryId)).where(eq(memoryTable.id, id)).limit(1);
+      }).from(memoryTable).leftJoin(embeddingTable, eq2(memoryTable.id, embeddingTable.memoryId)).where(eq2(memoryTable.id, id)).limit(1);
       if (result.length === 0)
         return null;
       const row = result[0];
@@ -20808,12 +21447,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         return [];
       const conditions = [inArray(memoryTable.id, memoryIds)];
       if (tableName) {
-        conditions.push(eq(memoryTable.type, tableName));
+        conditions.push(eq2(memoryTable.type, tableName));
       }
       const rows = await this.db.select({
         memory: memoryTable,
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(memoryTable).leftJoin(embeddingTable, eq(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));
       return rows.map((row) => ({
         id: row.memory.id,
         createdAt: row.memory.createdAt.getTime(),
@@ -20830,7 +21469,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async getCachedEmbeddings(opts) {
     return this.withDatabase(async () => {
       try {
-        const results = await this.db.execute(sql23`
+        const results = await this.db.execute(sql25`
                     WITH content_text AS (
                         SELECT
                             m.id,
@@ -20870,7 +21509,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           levenshtein_score: Number(row.levenshtein_score)
         })).filter((row) => Array.isArray(row.embedding));
       } catch (error) {
-        logger7.error(`Error in getCachedEmbeddings: ${error instanceof Error ? error.message : String(error)}, tableName: ${opts.query_table_name}, fieldName: ${opts.query_field_name}`);
+        logger9.error({ src: "plugin:sql", tableName: opts.query_table_name, fieldName: opts.query_field_name, error: error instanceof Error ? error.message : String(error) }, "Failed to get cached embeddings");
         if (error instanceof Error && error.message === "levenshtein argument exceeds maximum length of 255 characters") {
           return [];
         }
@@ -20883,16 +21522,16 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       try {
         const sanitizedBody = this.sanitizeJsonObject(params.body);
         const jsonString = JSON.stringify(sanitizedBody);
-        await this.db.transaction(async (tx) => {
+        await this.withEntityContext(params.entityId, async (tx) => {
           await tx.insert(logTable).values({
-            body: sql23`${jsonString}::jsonb`,
+            body: sql25`${jsonString}::jsonb`,
             entityId: params.entityId,
             roomId: params.roomId,
             type: params.type
           });
         });
       } catch (error) {
-        logger7.error(`Failed to create log entry: ${error instanceof Error ? error.message : String(error)}, type: ${params.type}, roomId: ${params.roomId}, entityId: ${params.entityId}`);
+        logger9.error({ src: "plugin:sql", type: params.type, roomId: params.roomId, entityId: params.entityId, error: error instanceof Error ? error.message : String(error) }, "Failed to create log entry");
         throw error;
       }
     });
@@ -20925,8 +21564,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getLogs(params) {
     const { entityId, roomId, type, count: count2, offset } = params;
-    return this.withDatabase(async () => {
-      const result = await this.db.select().from(logTable).where(and(eq(logTable.entityId, entityId), roomId ? eq(logTable.roomId, roomId) : undefined, type ? eq(logTable.type, type) : undefined)).orderBy(desc(logTable.createdAt)).limit(count2 ?? 10).offset(offset ?? 0);
+    return this.withEntityContext(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,
         id: log2.id,
@@ -20944,15 +21583,15 @@ 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.withDatabase(async () => {
+    return this.withEntityContext(params.entityId ?? null, async (tx) => {
       const runMap = new Map;
       const conditions = [
-        eq(logTable.type, "run_event"),
-        sql23`${logTable.body} ? 'runId'`,
-        eq(roomTable.agentId, this.agentId)
+        eq2(logTable.type, "run_event"),
+        sql25`${logTable.body} ? 'runId'`,
+        eq2(roomTable.agentId, this.agentId)
       ];
       if (params.roomId) {
-        conditions.push(eq(logTable.roomId, params.roomId));
+        conditions.push(eq2(logTable.roomId, params.roomId));
       }
       if (fromDate) {
         conditions.push(gte(logTable.createdAt, fromDate));
@@ -20962,15 +21601,15 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       }
       const whereClause = and(...conditions);
       const eventLimit = Math.max(limit * 20, 200);
-      const runEventRows = await this.db.select({
-        runId: sql23`(${logTable.body} ->> 'runId')`,
-        status: sql23`(${logTable.body} ->> 'status')`,
-        messageId: sql23`(${logTable.body} ->> 'messageId')`,
+      const runEventRows = await tx.select({
+        runId: sql25`(${logTable.body} ->> 'runId')`,
+        status: sql25`(${logTable.body} ->> 'status')`,
+        messageId: sql25`(${logTable.body} ->> 'messageId')`,
         rawBody: logTable.body,
         createdAt: logTable.createdAt,
         roomId: logTable.roomId,
         entityId: logTable.entityId
-      }).from(logTable).innerJoin(roomTable, eq(roomTable.id, logTable.roomId)).where(whereClause).orderBy(desc(logTable.createdAt)).limit(eventLimit);
+      }).from(logTable).innerJoin(roomTable, eq2(roomTable.id, logTable.roomId)).where(whereClause).orderBy(desc(logTable.createdAt)).limit(eventLimit);
       for (const row of runEventRows) {
         const runId = row.runId;
         if (!runId)
@@ -21039,8 +21678,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       }
       const runIds = limitedRuns.map((run) => run.runId).filter(Boolean);
       if (runIds.length > 0) {
-        const runIdArray = sql23`array[${sql23.join(runIds.map((id) => sql23`${id}`), sql23`, `)}]::text[]`;
-        const actionSummary = await this.db.execute(sql23`
+        const runIdArray = sql25`array[${sql25.join(runIds.map((id) => sql25`${id}`), sql25`, `)}]::text[]`;
+        const actionSummary = await this.db.execute(sql25`
           SELECT
             body->>'runId' as "runId",
             COUNT(*)::int as "actions",
@@ -21060,7 +21699,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           counts.errors += Number(row.errors ?? 0);
           counts.modelCalls += Number(row.modelCalls ?? 0);
         }
-        const evaluatorSummary = await this.db.execute(sql23`
+        const evaluatorSummary = await this.db.execute(sql25`
           SELECT
             body->>'runId' as "runId",
             COUNT(*)::int as "evaluators"
@@ -21076,7 +21715,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             continue;
           counts.evaluators += Number(row.evaluators ?? 0);
         }
-        const genericSummary = await this.db.execute(sql23`
+        const genericSummary = await this.db.execute(sql25`
           SELECT
             body->>'runId' as "runId",
             COUNT(*) FILTER (WHERE type LIKE 'useModel:%')::int as "modelLogs",
@@ -21112,7 +21751,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async deleteLog(logId) {
     return this.withDatabase(async () => {
-      await this.db.delete(logTable).where(eq(logTable.id, logId));
+      await this.db.delete(logTable).where(eq2(logTable.id, logId));
     });
   }
   async searchMemories(params) {
@@ -21129,20 +21768,20 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async searchMemoriesByEmbedding(embedding, params) {
     return this.withDatabase(async () => {
       const cleanVector = embedding.map((n) => Number.isFinite(n) ? Number(n.toFixed(6)) : 0);
-      const similarity = sql23`1 - (${cosineDistance(embeddingTable[this.embeddingDimension], cleanVector)})`;
-      const conditions = [eq(memoryTable.type, params.tableName)];
+      const similarity = sql25`1 - (${cosineDistance(embeddingTable[this.embeddingDimension], cleanVector)})`;
+      const conditions = [eq2(memoryTable.type, params.tableName)];
       if (params.unique) {
-        conditions.push(eq(memoryTable.unique, true));
+        conditions.push(eq2(memoryTable.unique, true));
       }
-      conditions.push(eq(memoryTable.agentId, this.agentId));
+      conditions.push(eq2(memoryTable.agentId, this.agentId));
       if (params.roomId) {
-        conditions.push(eq(memoryTable.roomId, params.roomId));
+        conditions.push(eq2(memoryTable.roomId, params.roomId));
       }
       if (params.worldId) {
-        conditions.push(eq(memoryTable.worldId, params.worldId));
+        conditions.push(eq2(memoryTable.worldId, params.worldId));
       }
       if (params.entityId) {
-        conditions.push(eq(memoryTable.entityId, params.entityId));
+        conditions.push(eq2(memoryTable.entityId, params.entityId));
       }
       if (params.match_threshold) {
         conditions.push(gte(similarity, params.match_threshold));
@@ -21151,7 +21790,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         memory: memoryTable,
         similarity,
         embedding: embeddingTable[this.embeddingDimension]
-      }).from(embeddingTable).innerJoin(memoryTable, eq(memoryTable.id, embeddingTable.memoryId)).where(and(...conditions)).orderBy(desc(similarity)).limit(params.count ?? 10);
+      }).from(embeddingTable).innerJoin(memoryTable, eq2(memoryTable.id, embeddingTable.memoryId)).where(and(...conditions)).orderBy(desc(similarity)).limit(params.count ?? 10);
       return results.map((row) => ({
         id: row.memory.id,
         type: row.memory.type,
@@ -21169,11 +21808,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     });
   }
   async createMemory(memory, tableName) {
-    logger7.debug(`DrizzleAdapter createMemory: memoryId: ${memory.id}, embeddingLength: ${memory.embedding?.length}, contentLength: ${memory.content?.text?.length}`);
     const memoryId = memory.id ?? v4_default();
     const existing = await this.getMemoryById(memoryId);
     if (existing) {
-      logger7.debug(`Memory already exists, skipping creation: ${memoryId}`);
       return memoryId;
     }
     if (memory.unique === undefined) {
@@ -21192,13 +21829,13 @@ 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.db.transaction(async (tx) => {
+    await this.withEntityContext(memory.entityId, async (tx) => {
       await tx.insert(memoryTable).values([
         {
           id: memoryId,
           type: tableName,
-          content: sql23`${contentToInsert}::jsonb`,
-          metadata: sql23`${metadataToInsert}::jsonb`,
+          content: sql25`${contentToInsert}::jsonb`,
+          metadata: sql25`${metadataToInsert}::jsonb`,
           entityId: memory.entityId,
           roomId: memory.roomId,
           worldId: memory.worldId,
@@ -21223,28 +21860,27 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async updateMemory(memory) {
     return this.withDatabase(async () => {
       try {
-        logger7.debug(`Updating memory: memoryId: ${memory.id}, hasEmbedding: ${!!memory.embedding}`);
         await this.db.transaction(async (tx) => {
           if (memory.content) {
             const contentToUpdate = typeof memory.content === "string" ? memory.content : JSON.stringify(memory.content ?? {});
             const metadataToUpdate = typeof memory.metadata === "string" ? memory.metadata : JSON.stringify(memory.metadata ?? {});
             await tx.update(memoryTable).set({
-              content: sql23`${contentToUpdate}::jsonb`,
-              ...memory.metadata && { metadata: sql23`${metadataToUpdate}::jsonb` }
-            }).where(eq(memoryTable.id, memory.id));
+              content: sql25`${contentToUpdate}::jsonb`,
+              ...memory.metadata && { metadata: sql25`${metadataToUpdate}::jsonb` }
+            }).where(eq2(memoryTable.id, memory.id));
           } else if (memory.metadata) {
             const metadataToUpdate = typeof memory.metadata === "string" ? memory.metadata : JSON.stringify(memory.metadata ?? {});
             await tx.update(memoryTable).set({
-              metadata: sql23`${metadataToUpdate}::jsonb`
-            }).where(eq(memoryTable.id, memory.id));
+              metadata: sql25`${metadataToUpdate}::jsonb`
+            }).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(eq(embeddingTable.memoryId, memory.id)).limit(1);
+            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(eq(embeddingTable.memoryId, memory.id));
+              await tx.update(embeddingTable).set(updateValues).where(eq2(embeddingTable.memoryId, memory.id));
             } else {
               const embeddingValues = {
                 id: v4_default(),
@@ -21255,10 +21891,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
             }
           }
         });
-        logger7.debug(`Memory updated successfully: ${memory.id}`);
         return true;
       } catch (error) {
-        logger7.error(`Error updating memory: ${error instanceof Error ? error.message : String(error)}, memoryId: ${memory.id}`);
+        logger9.error({ src: "plugin:sql", memoryId: memory.id, error: error instanceof Error ? error.message : String(error) }, "Failed to update memory");
         return false;
       }
     });
@@ -21267,10 +21902,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       await this.db.transaction(async (tx) => {
         await this.deleteMemoryFragments(tx, memoryId);
-        await tx.delete(embeddingTable).where(eq(embeddingTable.memoryId, memoryId));
-        await tx.delete(memoryTable).where(eq(memoryTable.id, memoryId));
+        await tx.delete(embeddingTable).where(eq2(embeddingTable.memoryId, memoryId));
+        await tx.delete(memoryTable).where(eq2(memoryTable.id, memoryId));
       });
-      logger7.debug(`Memory and related fragments removed successfully: ${memoryId}`);
     });
   }
   async deleteManyMemories(memoryIds) {
@@ -21289,7 +21923,6 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           await tx.delete(memoryTable).where(inArray(memoryTable.id, batch));
         }
       });
-      logger7.debug(`Batch memory deletion completed successfully: ${memoryIds.length}`);
     });
   }
   async deleteMemoryFragments(tx, documentId) {
@@ -21298,40 +21931,38 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const fragmentIds = fragmentsToDelete.map((f) => f.id);
       await tx.delete(embeddingTable).where(inArray(embeddingTable.memoryId, fragmentIds));
       await tx.delete(memoryTable).where(inArray(memoryTable.id, fragmentIds));
-      logger7.debug(`Deleted related fragments: documentId: ${documentId}, fragmentCount: ${fragmentsToDelete.length}`);
     }
   }
   async getMemoryFragments(tx, documentId) {
-    const fragments = await tx.select({ id: memoryTable.id }).from(memoryTable).where(and(eq(memoryTable.agentId, this.agentId), sql23`${memoryTable.metadata}->>'documentId' = ${documentId}`));
+    const fragments = await tx.select({ id: memoryTable.id }).from(memoryTable).where(and(eq2(memoryTable.agentId, this.agentId), sql25`${memoryTable.metadata}->>'documentId' = ${documentId}`));
     return fragments.map((f) => ({ id: f.id }));
   }
   async deleteAllMemories(roomId, tableName) {
     return this.withDatabase(async () => {
       await this.db.transaction(async (tx) => {
-        const rows = await tx.select({ id: memoryTable.id }).from(memoryTable).where(and(eq(memoryTable.roomId, roomId), eq(memoryTable.type, tableName)));
+        const rows = await tx.select({ id: memoryTable.id }).from(memoryTable).where(and(eq2(memoryTable.roomId, roomId), eq2(memoryTable.type, tableName)));
         const ids = rows.map((r) => r.id);
-        logger7.debug(`[deleteAllMemories] memory IDs to delete: roomId: ${roomId}, tableName: ${tableName}, ids: ${JSON.stringify(ids)}`);
+        logger9.debug({ src: "plugin:sql", roomId, tableName, memoryCount: ids.length }, "Deleting all memories");
         if (ids.length === 0) {
           return;
         }
         await Promise.all(ids.map(async (memoryId) => {
           await this.deleteMemoryFragments(tx, memoryId);
-          await tx.delete(embeddingTable).where(eq(embeddingTable.memoryId, memoryId));
+          await tx.delete(embeddingTable).where(eq2(embeddingTable.memoryId, memoryId));
         }));
-        await tx.delete(memoryTable).where(and(eq(memoryTable.roomId, roomId), eq(memoryTable.type, tableName)));
+        await tx.delete(memoryTable).where(and(eq2(memoryTable.roomId, roomId), eq2(memoryTable.type, tableName)));
       });
-      logger7.debug(`All memories removed successfully: roomId: ${roomId}, tableName: ${tableName}`);
     });
   }
   async countMemories(roomId, unique3 = true, tableName = "") {
     if (!tableName)
       throw new Error("tableName is required");
     return this.withDatabase(async () => {
-      const conditions = [eq(memoryTable.roomId, roomId), eq(memoryTable.type, tableName)];
+      const conditions = [eq2(memoryTable.roomId, roomId), eq2(memoryTable.type, tableName)];
       if (unique3) {
-        conditions.push(eq(memoryTable.unique, true));
+        conditions.push(eq2(memoryTable.unique, true));
       }
-      const result = await this.db.select({ count: sql23`count(*)` }).from(memoryTable).where(and(...conditions));
+      const result = await this.db.select({ count: sql25`count(*)` }).from(memoryTable).where(and(...conditions));
       return Number(result[0]?.count ?? 0);
     });
   }
@@ -21342,18 +21973,19 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         name: roomTable.name,
         channelId: roomTable.channelId,
         agentId: roomTable.agentId,
-        serverId: roomTable.serverId,
+        messageServerId: roomTable.messageServerId,
         worldId: roomTable.worldId,
         type: roomTable.type,
         source: roomTable.source,
         metadata: roomTable.metadata
-      }).from(roomTable).where(and(inArray(roomTable.id, roomIds), eq(roomTable.agentId, this.agentId)));
+      }).from(roomTable).where(and(inArray(roomTable.id, roomIds), eq2(roomTable.agentId, this.agentId)));
       const rooms = result.map((room) => ({
         ...room,
         id: room.id,
         name: room.name ?? undefined,
         agentId: room.agentId,
-        serverId: room.serverId,
+        messageServerId: room.messageServerId,
+        serverId: room.messageServerId,
         worldId: room.worldId,
         channelId: room.channelId,
         type: room.type,
@@ -21364,13 +21996,14 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getRoomsByWorld(worldId) {
     return this.withDatabase(async () => {
-      const result = await this.db.select().from(roomTable).where(eq(roomTable.worldId, worldId));
+      const result = await this.db.select().from(roomTable).where(eq2(roomTable.worldId, worldId));
       const rooms = result.map((room) => ({
         ...room,
         id: room.id,
         name: room.name ?? undefined,
         agentId: room.agentId,
-        serverId: room.serverId,
+        messageServerId: room.messageServerId,
+        serverId: room.messageServerId,
         worldId: room.worldId,
         channelId: room.channelId,
         type: room.type,
@@ -21381,7 +22014,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async updateRoom(room) {
     return this.withDatabase(async () => {
-      await this.db.update(roomTable).set({ ...room, agentId: this.agentId }).where(eq(roomTable.id, room.id));
+      await this.db.update(roomTable).set({ ...room, agentId: this.agentId }).where(eq2(roomTable.id, room.id));
     });
   }
   async createRooms(rooms) {
@@ -21401,19 +22034,19 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       throw new Error("Room ID is required");
     return this.withDatabase(async () => {
       await this.db.transaction(async (tx) => {
-        await tx.delete(roomTable).where(eq(roomTable.id, roomId));
+        await tx.delete(roomTable).where(eq2(roomTable.id, roomId));
       });
     });
   }
   async getRoomsForParticipant(entityId) {
     return this.withDatabase(async () => {
-      const result = await this.db.select({ roomId: participantTable.roomId }).from(participantTable).innerJoin(roomTable, eq(participantTable.roomId, roomTable.id)).where(and(eq(participantTable.entityId, entityId), eq(roomTable.agentId, this.agentId)));
+      const result = await this.db.select({ roomId: participantTable.roomId }).from(participantTable).innerJoin(roomTable, eq2(participantTable.roomId, roomTable.id)).where(and(eq2(participantTable.entityId, entityId), eq2(roomTable.agentId, this.agentId)));
       return result.map((row) => row.roomId);
     });
   }
   async getRoomsForParticipants(entityIds) {
     return this.withDatabase(async () => {
-      const result = await this.db.selectDistinct({ roomId: participantTable.roomId }).from(participantTable).innerJoin(roomTable, eq(participantTable.roomId, roomTable.id)).where(and(inArray(participantTable.entityId, entityIds), eq(roomTable.agentId, this.agentId)));
+      const result = await this.db.selectDistinct({ roomId: participantTable.roomId }).from(participantTable).innerJoin(roomTable, eq2(participantTable.roomId, roomTable.id)).where(and(inArray(participantTable.entityId, entityIds), eq2(roomTable.agentId, this.agentId)));
       return result.map((row) => row.roomId);
     });
   }
@@ -21427,7 +22060,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         }).onConflictDoNothing();
         return true;
       } catch (error) {
-        logger7.error(`Error adding participant to room: ${error instanceof Error ? error.message : String(error)}, entityId: ${entityId}, roomId: ${roomId}, agentId: ${this.agentId}`);
+        logger9.error({ src: "plugin:sql", entityId, roomId, agentId: this.agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to add participant to room");
         return false;
       }
     });
@@ -21441,10 +22074,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           agentId: this.agentId
         }));
         await this.db.insert(participantTable).values(values).onConflictDoNothing().execute();
-        logger7.debug(`${entityIds.length} Entities linked successfully`);
         return true;
       } catch (error) {
-        logger7.error(`Error adding participants to room: ${error instanceof Error ? error.message : String(error)}, entityIdSample: ${entityIds[0]}, roomId: ${roomId}, agentId: ${this.agentId}`);
+        logger9.error({ src: "plugin:sql", roomId, agentId: this.agentId, error: error instanceof Error ? error.message : String(error) }, "Failed to add participants to room");
         return false;
       }
     });
@@ -21453,13 +22085,12 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       try {
         const result = await this.db.transaction(async (tx) => {
-          return await tx.delete(participantTable).where(and(eq(participantTable.entityId, entityId), eq(participantTable.roomId, roomId))).returning();
+          return await tx.delete(participantTable).where(and(eq2(participantTable.entityId, entityId), eq2(participantTable.roomId, roomId))).returning();
         });
         const removed = result.length > 0;
-        logger7.debug(`Participant ${removed ? "removed" : "not found"}: entityId: ${entityId}, roomId: ${roomId}, removed: ${removed}`);
         return removed;
       } catch (error) {
-        logger7.error(`Error removing participant from room: ${error instanceof Error ? error.message : String(error)}, entityId: ${entityId}, roomId: ${roomId}`);
+        logger9.error({ src: "plugin:sql", entityId, roomId, error: error instanceof Error ? error.message : String(error) }, "Failed to remove participant from room");
         return false;
       }
     });
@@ -21470,7 +22101,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         id: participantTable.id,
         entityId: participantTable.entityId,
         roomId: participantTable.roomId
-      }).from(participantTable).where(eq(participantTable.entityId, entityId));
+      }).from(participantTable).where(eq2(participantTable.entityId, entityId));
       const entities = await this.getEntitiesByIds([entityId]);
       if (!entities || !entities.length) {
         return [];
@@ -21483,13 +22114,19 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getParticipantsForRoom(roomId) {
     return this.withDatabase(async () => {
-      const result = await this.db.select({ entityId: participantTable.entityId }).from(participantTable).where(eq(participantTable.roomId, roomId));
+      const result = await this.db.select({ entityId: participantTable.entityId }).from(participantTable).where(eq2(participantTable.roomId, roomId));
       return result.map((row) => row.entityId);
     });
   }
+  async isRoomParticipant(roomId, entityId) {
+    return this.withDatabase(async () => {
+      const result = await this.db.select().from(participantTable).where(and(eq2(participantTable.roomId, roomId), eq2(participantTable.entityId, entityId))).limit(1);
+      return result.length > 0;
+    });
+  }
   async getParticipantUserState(roomId, entityId) {
     return this.withDatabase(async () => {
-      const result = await this.db.select({ roomState: participantTable.roomState }).from(participantTable).where(and(eq(participantTable.roomId, roomId), eq(participantTable.entityId, entityId), eq(participantTable.agentId, this.agentId))).limit(1);
+      const result = await this.db.select({ roomState: participantTable.roomState }).from(participantTable).where(and(eq2(participantTable.roomId, roomId), eq2(participantTable.entityId, entityId), eq2(participantTable.agentId, this.agentId))).limit(1);
       return result[0]?.roomState ?? null;
     });
   }
@@ -21497,10 +22134,10 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       try {
         await this.db.transaction(async (tx) => {
-          await tx.update(participantTable).set({ roomState: state }).where(and(eq(participantTable.roomId, roomId), eq(participantTable.entityId, entityId), eq(participantTable.agentId, this.agentId)));
+          await tx.update(participantTable).set({ roomState: state }).where(and(eq2(participantTable.roomId, roomId), eq2(participantTable.entityId, entityId), eq2(participantTable.agentId, this.agentId)));
         });
       } catch (error) {
-        logger7.error(`Error setting participant follow state: roomId: ${roomId}, entityId: ${entityId}, state: ${state}, error: ${error instanceof Error ? error.message : String(error)}`);
+        logger9.error({ src: "plugin:sql", roomId, entityId, state, error: error instanceof Error ? error.message : String(error) }, "Failed to set participant follow state");
         throw error;
       }
     });
@@ -21520,7 +22157,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         await this.db.insert(relationshipTable).values(saveParams);
         return true;
       } catch (error) {
-        logger7.error(`Error creating relationship: ${error instanceof Error ? error.message : String(error)}, saveParams: ${JSON.stringify(saveParams)}`);
+        logger9.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), saveParams }, "Error creating relationship");
         return false;
       }
     });
@@ -21531,9 +22168,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         await this.db.update(relationshipTable).set({
           tags: relationship.tags || [],
           metadata: relationship.metadata || {}
-        }).where(eq(relationshipTable.id, relationship.id));
+        }).where(eq2(relationshipTable.id, relationship.id));
       } catch (error) {
-        logger7.error(`Error updating relationship: ${error instanceof Error ? error.message : String(error)}, relationship: ${JSON.stringify(relationship)}`);
+        logger9.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), relationshipId: relationship.id }, "Error updating relationship");
         throw error;
       }
     });
@@ -21541,7 +22178,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async getRelationship(params) {
     return this.withDatabase(async () => {
       const { sourceEntityId, targetEntityId } = params;
-      const result = await this.db.select().from(relationshipTable).where(and(eq(relationshipTable.sourceEntityId, sourceEntityId), eq(relationshipTable.targetEntityId, targetEntityId)));
+      const result = await this.db.select().from(relationshipTable).where(and(eq2(relationshipTable.sourceEntityId, sourceEntityId), eq2(relationshipTable.targetEntityId, targetEntityId)));
       if (result.length === 0)
         return null;
       const relationship = result[0];
@@ -21562,13 +22199,13 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       const { entityId, tags } = params;
       let query;
       if (tags && tags.length > 0) {
-        query = sql23`
+        query = sql25`
           SELECT * FROM ${relationshipTable}
           WHERE (${relationshipTable.sourceEntityId} = ${entityId} OR ${relationshipTable.targetEntityId} = ${entityId})
-          AND ${relationshipTable.tags} && CAST(ARRAY[${sql23.join(tags, sql23`, `)}] AS text[])
+          AND ${relationshipTable.tags} && CAST(ARRAY[${sql25.join(tags, sql25`, `)}] AS text[])
         `;
       } else {
-        query = sql23`
+        query = sql25`
           SELECT * FROM ${relationshipTable}
           WHERE ${relationshipTable.sourceEntityId} = ${entityId} OR ${relationshipTable.targetEntityId} = ${entityId}
         `;
@@ -21577,25 +22214,25 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       return result.rows.map((relationship) => ({
         ...relationship,
         id: relationship.id,
-        sourceEntityId: relationship.sourceEntityId,
-        targetEntityId: relationship.targetEntityId,
-        agentId: relationship.agentId,
+        sourceEntityId: relationship.source_entity_id || relationship.sourceEntityId,
+        targetEntityId: relationship.target_entity_id || relationship.targetEntityId,
+        agentId: relationship.agent_id || relationship.agentId,
         tags: relationship.tags ?? [],
         metadata: relationship.metadata ?? {},
-        createdAt: relationship.createdAt ? relationship.createdAt instanceof Date ? relationship.createdAt.toISOString() : new Date(relationship.createdAt).toISOString() : new Date().toISOString()
+        createdAt: relationship.created_at || relationship.createdAt ? (relationship.created_at || relationship.createdAt) instanceof Date ? (relationship.created_at || relationship.createdAt).toISOString() : new Date(relationship.created_at || relationship.createdAt).toISOString() : new Date().toISOString()
       }));
     });
   }
   async getCache(key) {
     return this.withDatabase(async () => {
       try {
-        const result = await this.db.select({ value: cacheTable.value }).from(cacheTable).where(and(eq(cacheTable.agentId, this.agentId), eq(cacheTable.key, key))).limit(1);
+        const result = await this.db.select({ value: cacheTable.value }).from(cacheTable).where(and(eq2(cacheTable.agentId, this.agentId), eq2(cacheTable.key, key))).limit(1);
         if (result && result.length > 0 && result[0]) {
           return result[0].value;
         }
         return;
       } catch (error) {
-        logger7.error(`Error fetching cache: ${error instanceof Error ? error.message : String(error)}, key: ${key}, agentId: ${this.agentId}`);
+        logger9.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), key }, "Error fetching cache");
         return;
       }
     });
@@ -21615,7 +22252,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         });
         return true;
       } catch (error) {
-        logger7.error(`Error setting cache: ${error instanceof Error ? error.message : String(error)}, key: ${key}, agentId: ${this.agentId}`);
+        logger9.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), key }, "Error setting cache");
         return false;
       }
     });
@@ -21624,11 +22261,11 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
     return this.withDatabase(async () => {
       try {
         await this.db.transaction(async (tx) => {
-          await tx.delete(cacheTable).where(and(eq(cacheTable.agentId, this.agentId), eq(cacheTable.key, key)));
+          await tx.delete(cacheTable).where(and(eq2(cacheTable.agentId, this.agentId), eq2(cacheTable.key, key)));
         });
         return true;
       } catch (error) {
-        logger7.error(`Error deleting cache: ${error instanceof Error ? error.message : String(error)}, key: ${key}, agentId: ${this.agentId}`);
+        logger9.error({ src: "plugin:sql", agentId: this.agentId, error: error instanceof Error ? error.message : String(error), key }, "Error deleting cache");
         return false;
       }
     });
@@ -21646,24 +22283,24 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getWorld(id) {
     return this.withDatabase(async () => {
-      const result = await this.db.select().from(worldTable).where(eq(worldTable.id, id));
+      const result = await this.db.select().from(worldTable).where(eq2(worldTable.id, id));
       return result.length > 0 ? result[0] : null;
     });
   }
   async getAllWorlds() {
     return this.withDatabase(async () => {
-      const result = await this.db.select().from(worldTable).where(eq(worldTable.agentId, this.agentId));
+      const result = await this.db.select().from(worldTable).where(eq2(worldTable.agentId, this.agentId));
       return result;
     });
   }
   async updateWorld(world) {
     return this.withDatabase(async () => {
-      await this.db.update(worldTable).set(world).where(eq(worldTable.id, world.id));
+      await this.db.update(worldTable).set(world).where(eq2(worldTable.id, world.id));
     });
   }
   async removeWorld(id) {
     return this.withDatabase(async () => {
-      await this.db.delete(worldTable).where(eq(worldTable.id, id));
+      await this.db.delete(worldTable).where(eq2(worldTable.id, id));
     });
   }
   async createTask(task) {
@@ -21694,8 +22331,8 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async getTasks(params) {
     return this.withRetry(async () => {
       return this.withDatabase(async () => {
-        const result = await this.db.select().from(taskTable).where(and(eq(taskTable.agentId, this.agentId), ...params.roomId ? [eq(taskTable.roomId, params.roomId)] : [], ...params.tags && params.tags.length > 0 ? [
-          sql23`${taskTable.tags} @> ARRAY[${sql23.raw(params.tags.map((t) => `'${t.replace(/'/g, "''")}'`).join(", "))}]::text[]`
+        const result = await this.db.select().from(taskTable).where(and(eq2(taskTable.agentId, this.agentId), ...params.roomId ? [eq2(taskTable.roomId, params.roomId)] : [], ...params.tags && params.tags.length > 0 ? [
+          sql25`${taskTable.tags} @> ARRAY[${sql25.raw(params.tags.map((t) => `'${t.replace(/'/g, "''")}'`).join(", "))}]::text[]`
         ] : []));
         return result.map((row) => ({
           id: row.id,
@@ -21712,7 +22349,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async getTasksByName(name) {
     return this.withRetry(async () => {
       return this.withDatabase(async () => {
-        const result = await this.db.select().from(taskTable).where(and(eq(taskTable.name, name), eq(taskTable.agentId, this.agentId)));
+        const result = await this.db.select().from(taskTable).where(and(eq2(taskTable.name, name), eq2(taskTable.agentId, this.agentId)));
         return result.map((row) => ({
           id: row.id,
           name: row.name,
@@ -21728,7 +22365,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async getTask(id) {
     return this.withRetry(async () => {
       return this.withDatabase(async () => {
-        const result = await this.db.select().from(taskTable).where(and(eq(taskTable.id, id), eq(taskTable.agentId, this.agentId))).limit(1);
+        const result = await this.db.select().from(taskTable).where(and(eq2(taskTable.id, id), eq2(taskTable.agentId, this.agentId))).limit(1);
         if (result.length === 0) {
           return null;
         }
@@ -21763,18 +22400,18 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         if (task.metadata !== undefined) {
           updateValues.metadata = task.metadata;
         }
-        await this.db.update(taskTable).set(updateValues).where(and(eq(taskTable.id, id), eq(taskTable.agentId, this.agentId)));
+        await this.db.update(taskTable).set(updateValues).where(and(eq2(taskTable.id, id), eq2(taskTable.agentId, this.agentId)));
       });
     });
   }
   async deleteTask(id) {
     return this.withDatabase(async () => {
-      await this.db.delete(taskTable).where(eq(taskTable.id, id));
+      await this.db.delete(taskTable).where(eq2(taskTable.id, id));
     });
   }
   async getMemoriesByWorldId(params) {
     return this.withDatabase(async () => {
-      const rooms = await this.db.select({ id: roomTable.id }).from(roomTable).where(and(eq(roomTable.worldId, params.worldId), eq(roomTable.agentId, this.agentId)));
+      const rooms = await this.db.select({ id: roomTable.id }).from(roomTable).where(and(eq2(roomTable.worldId, params.worldId), eq2(roomTable.agentId, this.agentId)));
       if (rooms.length === 0) {
         return [];
       }
@@ -21789,27 +22426,22 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async deleteRoomsByWorldId(worldId) {
     return this.withDatabase(async () => {
-      const rooms = await this.db.select({ id: roomTable.id }).from(roomTable).where(and(eq(roomTable.worldId, worldId), eq(roomTable.agentId, this.agentId)));
+      const rooms = await this.db.select({ id: roomTable.id }).from(roomTable).where(and(eq2(roomTable.worldId, worldId), eq2(roomTable.agentId, this.agentId)));
       if (rooms.length === 0) {
-        logger7.debug(`No rooms found for worldId ${worldId} and agentId ${this.agentId} to delete.`);
         return;
       }
       const roomIds = rooms.map((room) => room.id);
       if (roomIds.length > 0) {
         await this.db.delete(logTable).where(inArray(logTable.roomId, roomIds));
-        logger7.debug(`Deleted logs for ${roomIds.length} rooms in world ${worldId}.`);
         await this.db.delete(participantTable).where(inArray(participantTable.roomId, roomIds));
-        logger7.debug(`Deleted participants for ${roomIds.length} rooms in world ${worldId}.`);
         const memoriesInRooms = await this.db.select({ id: memoryTable.id }).from(memoryTable).where(inArray(memoryTable.roomId, roomIds));
         const memoryIdsInRooms = memoriesInRooms.map((m) => m.id);
         if (memoryIdsInRooms.length > 0) {
           await this.db.delete(embeddingTable).where(inArray(embeddingTable.memoryId, memoryIdsInRooms));
-          logger7.debug(`Deleted embeddings for ${memoryIdsInRooms.length} memories in world ${worldId}.`);
           await this.db.delete(memoryTable).where(inArray(memoryTable.id, memoryIdsInRooms));
-          logger7.debug(`Deleted ${memoryIdsInRooms.length} memories in world ${worldId}.`);
         }
         await this.db.delete(roomTable).where(inArray(roomTable.id, roomIds));
-        logger7.debug(`Deleted ${roomIds.length} rooms for worldId ${worldId}.`);
+        logger9.debug({ src: "plugin:sql", worldId, roomsDeleted: roomIds.length, memoriesDeleted: memoryIdsInRooms.length }, "World cleanup completed");
       }
     });
   }
@@ -21828,7 +22460,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       };
       await this.db.insert(messageServerTable).values(serverToInsert).onConflictDoNothing();
       if (data.id) {
-        const existing = await this.db.select().from(messageServerTable).where(eq(messageServerTable.id, data.id)).limit(1);
+        const existing = await this.db.select().from(messageServerTable).where(eq2(messageServerTable.id, data.id)).limit(1);
         if (existing.length > 0) {
           return {
             id: existing[0].id,
@@ -21861,7 +22493,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getMessageServerById(serverId) {
     return this.withDatabase(async () => {
-      const results = await this.db.select().from(messageServerTable).where(eq(messageServerTable.id, serverId)).limit(1);
+      const results = await this.db.select().from(messageServerTable).where(eq2(messageServerTable.id, serverId)).limit(1);
       return results.length > 0 ? {
         id: results[0].id,
         name: results[0].name,
@@ -21873,6 +22505,26 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       } : null;
     });
   }
+  async getMessageServerByRlsServerId(rlsServerId) {
+    return this.withDatabase(async () => {
+      const results = await this.db.execute(sql25`
+        SELECT id, name, source_type, source_id, metadata, created_at, updated_at
+        FROM message_servers
+        WHERE server_id = ${rlsServerId}
+        LIMIT 1
+      `);
+      const rows = results.rows || results;
+      return rows.length > 0 ? {
+        id: rows[0].id,
+        name: rows[0].name,
+        sourceType: rows[0].source_type,
+        sourceId: rows[0].source_id || undefined,
+        metadata: rows[0].metadata || undefined,
+        createdAt: new Date(rows[0].created_at),
+        updatedAt: new Date(rows[0].updated_at)
+      } : null;
+    });
+  }
   async createChannel(data, participantIds) {
     return this.withDatabase(async () => {
       const newId = data.id || v4_default();
@@ -21892,9 +22544,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       await this.db.transaction(async (tx) => {
         await tx.insert(channelTable).values(channelToInsert);
         if (participantIds && participantIds.length > 0) {
-          const participantValues = participantIds.map((userId) => ({
+          const participantValues = participantIds.map((entityId) => ({
             channelId: newId,
-            userId
+            entityId
           }));
           await tx.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
         }
@@ -21902,9 +22554,9 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
       return channelToInsert;
     });
   }
-  async getChannelsForServer(serverId) {
+  async getChannelsForMessageServer(messageServerId) {
     return this.withDatabase(async () => {
-      const results = await this.db.select().from(channelTable).where(eq(channelTable.messageServerId, serverId));
+      const results = await this.db.select().from(channelTable).where(eq2(channelTable.messageServerId, messageServerId));
       return results.map((r) => ({
         id: r.id,
         messageServerId: r.messageServerId,
@@ -21921,7 +22573,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getChannelDetails(channelId) {
     return this.withDatabase(async () => {
-      const results = await this.db.select().from(channelTable).where(eq(channelTable.id, channelId)).limit(1);
+      const results = await this.db.select().from(channelTable).where(eq2(channelTable.id, channelId)).limit(1);
       return results.length > 0 ? {
         id: results[0].id,
         messageServerId: results[0].messageServerId,
@@ -21959,7 +22611,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getMessageById(id) {
     return this.withDatabase(async () => {
-      const rows = await this.db.select().from(messageTable).where(eq(messageTable.id, id)).limit(1);
+      const rows = await this.db.select().from(messageTable).where(eq2(messageTable.id, id)).limit(1);
       return rows?.[0] ?? null;
     });
   }
@@ -21978,7 +22630,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
         inReplyToRootMessageId: patch.inReplyToRootMessageId ?? existing.inReplyToRootMessageId,
         updatedAt
       };
-      await this.db.update(messageTable).set(next).where(eq(messageTable.id, id));
+      await this.db.update(messageTable).set(next).where(eq2(messageTable.id, id));
       return {
         ...existing,
         ...next
@@ -21987,7 +22639,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async getMessagesForChannel(channelId, limit = 50, beforeTimestamp) {
     return this.withDatabase(async () => {
-      const conditions = [eq(messageTable.channelId, channelId)];
+      const conditions = [eq2(messageTable.channelId, channelId)];
       if (beforeTimestamp) {
         conditions.push(lt(messageTable.createdAt, beforeTimestamp));
       }
@@ -22010,7 +22662,7 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   }
   async deleteMessage(messageId) {
     return this.withDatabase(async () => {
-      await this.db.delete(messageTable).where(eq(messageTable.id, messageId));
+      await this.db.delete(messageTable).where(eq2(messageTable.id, messageId));
     });
   }
   async updateChannel(channelId, updates) {
@@ -22022,13 +22674,13 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
           updateData.name = updates.name;
         if (updates.metadata !== undefined)
           updateData.metadata = updates.metadata;
-        await tx.update(channelTable).set(updateData).where(eq(channelTable.id, channelId));
+        await tx.update(channelTable).set(updateData).where(eq2(channelTable.id, channelId));
         if (updates.participantCentralUserIds !== undefined) {
-          await tx.delete(channelParticipantsTable).where(eq(channelParticipantsTable.channelId, channelId));
+          await tx.delete(channelParticipantsTable).where(eq2(channelParticipantsTable.channelId, channelId));
           if (updates.participantCentralUserIds.length > 0) {
-            const participantValues = updates.participantCentralUserIds.map((userId) => ({
+            const participantValues = updates.participantCentralUserIds.map((entityId) => ({
               channelId,
-              userId
+              entityId
             }));
             await tx.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
           }
@@ -22044,53 +22696,59 @@ class BaseDrizzleAdapter extends DatabaseAdapter {
   async deleteChannel(channelId) {
     return this.withDatabase(async () => {
       await this.db.transaction(async (tx) => {
-        await tx.delete(messageTable).where(eq(messageTable.channelId, channelId));
-        await tx.delete(channelParticipantsTable).where(eq(channelParticipantsTable.channelId, channelId));
-        await tx.delete(channelTable).where(eq(channelTable.id, channelId));
+        await tx.delete(messageTable).where(eq2(messageTable.channelId, channelId));
+        await tx.delete(channelParticipantsTable).where(eq2(channelParticipantsTable.channelId, channelId));
+        await tx.delete(channelTable).where(eq2(channelTable.id, channelId));
       });
     });
   }
-  async addChannelParticipants(channelId, userIds) {
+  async addChannelParticipants(channelId, entityIds) {
     return this.withDatabase(async () => {
-      if (!userIds || userIds.length === 0)
+      if (!entityIds || entityIds.length === 0)
         return;
-      const participantValues = userIds.map((userId) => ({
+      const participantValues = entityIds.map((entityId) => ({
         channelId,
-        userId
+        entityId
       }));
       await this.db.insert(channelParticipantsTable).values(participantValues).onConflictDoNothing();
     });
   }
   async getChannelParticipants(channelId) {
     return this.withDatabase(async () => {
-      const results = await this.db.select({ userId: channelParticipantsTable.userId }).from(channelParticipantsTable).where(eq(channelParticipantsTable.channelId, channelId));
-      return results.map((r) => r.userId);
+      const results = await this.db.select({ entityId: channelParticipantsTable.entityId }).from(channelParticipantsTable).where(eq2(channelParticipantsTable.channelId, channelId));
+      return results.map((r) => r.entityId);
     });
   }
-  async addAgentToServer(serverId, agentId) {
+  async isChannelParticipant(channelId, entityId) {
     return this.withDatabase(async () => {
-      await this.db.insert(serverAgentsTable).values({
-        serverId,
+      const result = await this.db.select().from(channelParticipantsTable).where(and(eq2(channelParticipantsTable.channelId, channelId), eq2(channelParticipantsTable.entityId, entityId))).limit(1);
+      return result.length > 0;
+    });
+  }
+  async addAgentToMessageServer(messageServerId, agentId) {
+    return this.withDatabase(async () => {
+      await this.db.insert(messageServerAgentsTable).values({
+        messageServerId,
         agentId
       }).onConflictDoNothing();
     });
   }
-  async getAgentsForServer(serverId) {
+  async getAgentsForMessageServer(messageServerId) {
     return this.withDatabase(async () => {
-      const results = await this.db.select({ agentId: serverAgentsTable.agentId }).from(serverAgentsTable).where(eq(serverAgentsTable.serverId, serverId));
+      const results = await this.db.select({ agentId: messageServerAgentsTable.agentId }).from(messageServerAgentsTable).where(eq2(messageServerAgentsTable.messageServerId, messageServerId));
       return results.map((r) => r.agentId);
     });
   }
-  async removeAgentFromServer(serverId, agentId) {
+  async removeAgentFromMessageServer(messageServerId, agentId) {
     return this.withDatabase(async () => {
-      await this.db.delete(serverAgentsTable).where(and(eq(serverAgentsTable.serverId, serverId), eq(serverAgentsTable.agentId, agentId)));
+      await this.db.delete(messageServerAgentsTable).where(and(eq2(messageServerAgentsTable.messageServerId, messageServerId), eq2(messageServerAgentsTable.agentId, agentId)));
     });
   }
   async findOrCreateDmChannel(user1Id, user2Id, messageServerId) {
     return this.withDatabase(async () => {
       const ids = [user1Id, user2Id].sort();
       const dmChannelName = `DM-${ids[0]}-${ids[1]}`;
-      const existingChannels = await this.db.select().from(channelTable).where(and(eq(channelTable.type, ChannelType.DM), eq(channelTable.name, dmChannelName), eq(channelTable.messageServerId, messageServerId))).limit(1);
+      const existingChannels = await this.db.select().from(channelTable).where(and(eq2(channelTable.type, ChannelType.DM), eq2(channelTable.name, dmChannelName), eq2(channelTable.messageServerId, messageServerId))).limit(1);
       if (existingChannels.length > 0) {
         return {
           id: existingChannels[0].id,
@@ -22124,11 +22782,14 @@ class PgliteDatabaseAdapter extends BaseDrizzleAdapter {
     this.manager = manager;
     this.db = drizzle(this.manager.getConnection());
   }
+  async withEntityContext(_entityId, callback) {
+    return this.db.transaction(callback);
+  }
   async getEntityByIds(entityIds) {
     return this.getEntitiesByIds(entityIds);
   }
   async getMemoriesByServerId(_params) {
-    logger8.warn("getMemoriesByServerId called but not implemented - returning empty array");
+    logger10.warn({ src: "plugin:sql" }, "getMemoriesByServerId called but not implemented");
     return [];
   }
   async ensureAgentExists(agent) {
@@ -22153,13 +22814,13 @@ class PgliteDatabaseAdapter extends BaseDrizzleAdapter {
   }
   async withDatabase(operation) {
     if (this.manager.isShuttingDown()) {
-      logger8.warn("Database is shutting down");
+      logger10.warn({ src: "plugin:sql" }, "Database is shutting down");
       return null;
     }
     return operation();
   }
   async init() {
-    logger8.debug("PGliteDatabaseAdapter initialized, skipping automatic migrations.");
+    logger10.debug({ src: "plugin:sql" }, "PGliteDatabaseAdapter initialized");
   }
   async isReady() {
     return !this.manager.isShuttingDown();
@@ -22223,17 +22884,17 @@ var plugin = {
   priority: 0,
   schema: exports_schema,
   init: async (_config, runtime) => {
-    logger9.info("plugin-sql (browser) init starting...");
+    logger11.info({ src: "plugin:sql" }, "plugin-sql (browser) init starting");
     try {
       const isReady = await runtime.isReady();
       if (isReady) {
-        logger9.info("Database adapter already registered, skipping creation");
+        logger11.info({ src: "plugin:sql" }, "Database adapter already registered, skipping creation");
         return;
       }
     } catch (error) {}
     const dbAdapter = createDatabaseAdapter({}, runtime.agentId);
     runtime.registerDatabaseAdapter(dbAdapter);
-    logger9.info("Browser database adapter (PGlite) created and registered");
+    logger11.info({ src: "plugin:sql" }, "Browser database adapter (PGlite) created and registered");
   }
 };
 var index_browser_default = plugin;
@@ -22244,5 +22905,5 @@ export {
   DatabaseMigrationService
 };
 
-//# debugId=5D30F97F3F7F064964756E2164756E21
+//# debugId=7F64AB0B1EC2677C64756E2164756E21
 //# sourceMappingURL=index.browser.js.map