@rebasepro/server-postgresql 0.2.3 → 0.2.5

package/dist/index.es.js

@@ -1,7 +1,7 @@
 import { Pool, Client } from "pg";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { sql, inArray, eq, and, or, ilike, asc, desc, gt, lt, getTableName as getTableName$1, count, relations, isTable } from "drizzle-orm";
-import { PgVarchar, PgText, PgChar, pgSchema, pgTable, timestamp, jsonb, varchar, boolean, uuid, primaryKey, unique, getTableConfig } from "drizzle-orm/pg-core";
+import { PgVarchar, PgText, PgChar, pgSchema, pgTable, timestamp, jsonb, text, boolean, varchar, uuid, unique, getTableConfig } from "drizzle-orm/pg-core";
 import { createHash, randomUUID } from "crypto";
 import * as fs from "fs";
 import { promises } from "fs";
@@ -11,7 +11,7 @@ import chokidar from "chokidar";
 import { WebSocket, WebSocketServer } from "ws";
 import { EventEmitter } from "events";
 import { inspect } from "util";
-import { extractUserFromToken, createEmailService } from "@rebasepro/server-core";
+import { extractUserFromToken, logger, createEmailService } from "@rebasepro/server-core";
 const DEFAULT_POOL = {
   max: 20,
   idleTimeoutMillis: 3e4,
@@ -51,6 +51,70 @@ function createPostgresDatabaseConnection(connectionString, schema, poolConfig)
     connectionString
   };
 }
+function createDirectDatabaseConnection(connectionString, schema, poolConfig) {
+  const opts = {
+    ...DEFAULT_POOL,
+    max: 5,
+    ...poolConfig
+  };
+  const pgPoolConfig = {
+    connectionString,
+    max: opts.max,
+    idleTimeoutMillis: opts.idleTimeoutMillis,
+    connectionTimeoutMillis: opts.connectionTimeoutMillis,
+    query_timeout: opts.queryTimeout,
+    statement_timeout: opts.statementTimeout,
+    keepAlive: opts.keepAlive,
+    keepAliveInitialDelayMillis: 0
+  };
+  const pool = new Pool(pgPoolConfig);
+  pool.on("error", (err) => {
+    console.error("[pg-direct-pool] Unexpected pool error:", err.message);
+  });
+  const db = schema ? drizzle(pool, {
+    schema
+  }) : drizzle(pool);
+  return {
+    db,
+    pool,
+    connectionString
+  };
+}
+function createReadReplicaConnection(connectionString, schema, poolConfig) {
+  const opts = {
+    ...DEFAULT_POOL,
+    max: 10,
+    ...poolConfig
+  };
+  const pgPoolConfig = {
+    connectionString,
+    max: opts.max,
+    idleTimeoutMillis: opts.idleTimeoutMillis,
+    connectionTimeoutMillis: opts.connectionTimeoutMillis,
+    query_timeout: opts.queryTimeout,
+    statement_timeout: opts.statementTimeout,
+    keepAlive: opts.keepAlive,
+    keepAliveInitialDelayMillis: 0
+  };
+  const pool = new Pool(pgPoolConfig);
+  pool.on("error", (err) => {
+    console.error("[pg-replica-pool] Unexpected pool error:", err.message);
+  });
+  const db = schema ? drizzle(pool, {
+    schema
+  }) : drizzle(pool);
+  return {
+    db,
+    pool,
+    connectionString
+  };
+}
+const connection = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  createDirectDatabaseConnection,
+  createPostgresDatabaseConnection,
+  createReadReplicaConnection
+}, Symbol.toStringTag, { value: "Module" }));
 class Vector {
   value;
   constructor(value) {
@@ -970,6 +1034,9 @@ function mergeDeep(target, source, ignoreUndefined = false) {
     return output;
   }
   for (const key in source) {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
+      continue;
+    }
     if (Object.prototype.hasOwnProperty.call(source, key)) {
       const sourceValue = source[key];
       const outputValue = output[key];
@@ -2644,6 +2711,142 @@ class CollectionRegistry {
     };
   }
 }
+const defaultUsersCollection = {
+  name: "Users",
+  singularName: "User",
+  slug: "users",
+  table: "users",
+  schema: "rebase",
+  icon: "Users",
+  group: "Settings",
+  openEntityMode: "dialog",
+  disableDefaultActions: ["copy"],
+  sort: ["createdAt", "desc"],
+  properties: {
+    id: {
+      name: "ID",
+      type: "string",
+      isId: "uuid",
+      ui: {
+        readOnly: true
+      }
+    },
+    email: {
+      name: "Email",
+      type: "string",
+      validation: {
+        required: true,
+        unique: true
+      }
+    },
+    displayName: {
+      name: "Name",
+      type: "string",
+      columnName: "display_name",
+      validation: {
+        required: true
+      }
+    },
+    photoURL: {
+      name: "Photo URL",
+      type: "string",
+      columnName: "photo_url",
+      url: "image"
+    },
+    roles: {
+      name: "Roles",
+      type: "array",
+      columnType: "text[]",
+      of: {
+        name: "Role",
+        type: "string",
+        enum: {
+          admin: "Admin",
+          editor: "Editor",
+          viewer: "Viewer"
+        }
+      }
+    },
+    passwordHash: {
+      name: "Password Hash",
+      type: "string",
+      columnName: "password_hash",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    emailVerified: {
+      name: "Email Verified",
+      type: "boolean",
+      columnName: "email_verified",
+      defaultValue: false,
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    emailVerificationToken: {
+      name: "Email Verification Token",
+      type: "string",
+      columnName: "email_verification_token",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    emailVerificationSentAt: {
+      name: "Email Verification Sent At",
+      type: "date",
+      columnName: "email_verification_sent_at",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    metadata: {
+      name: "Metadata",
+      type: "map",
+      defaultValue: {},
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    createdAt: {
+      name: "Created At",
+      type: "date",
+      columnName: "created_at",
+      ui: {
+        readOnly: true
+      }
+    },
+    updatedAt: {
+      name: "Updated At",
+      type: "date",
+      columnName: "updated_at",
+      autoValue: "on_update",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    }
+  },
+  listProperties: ["displayName", "email", "roles", "createdAt"],
+  propertiesOrder: ["id", "email", "displayName", "roles", "createdAt"]
+};
 function mapOperator(op) {
   switch (op) {
     case "==":
@@ -2890,6 +3093,9 @@ function createDriverAccessor(driver, slug) {
         }
       });
     },
+    deleteAll: driver.deleteAll ? async () => {
+      return driver.deleteAll(slug);
+    } : void 0,
     count: driver.countEntities ? async (params) => {
       return driver.countEntities({
         path: slug,
@@ -2984,7 +3190,13 @@ class DrizzleConditionBuilder {
     for (const [field, filterParam] of Object.entries(filter)) {
       if (!filterParam) continue;
       const [op, value] = filterParam;
-      const fieldColumn = table[field];
+      let fieldColumn = table[field];
+      if (!fieldColumn) {
+        const relationKey = `${field}_id`;
+        if (relationKey in table) {
+          fieldColumn = table[relationKey];
+        }
+      }
       if (!fieldColumn) {
         console.warn(`Filtering by field '${field}', but it does not exist in table for collection '${collectionPath}'`);
         continue;
@@ -3026,6 +3238,17 @@ class DrizzleConditionBuilder {
         return null;
       case "array-contains":
         return sql`${column} @> ${JSON.stringify([value])}`;
+      case "array-contains-any":
+        if (Array.isArray(value) && value.length > 0) {
+          const textValues = value.map((v) => String(v));
+          return sql`${column} ?| array[${sql.join(textValues.map((v) => sql`${v}`), sql`, `)}]`;
+        }
+        return sql`${column} @> ${JSON.stringify([value])}`;
+      case "not-in":
+        if (Array.isArray(value) && value.length > 0) {
+          return sql`${column} NOT IN (${sql.join(value.map((v) => sql`${v}`), sql`, `)})`;
+        }
+        return null;
       default:
         console.warn(`Unsupported filter operation: ${op}`);
         return null;
@@ -3541,6 +3764,40 @@ class DrizzleConditionBuilder {
       return null;
     }
   }
+  /**
+   * Build vector similarity search expressions for pgvector.
+   *
+   * Returns:
+   * - `orderBy`: SQL expression to ORDER BY distance (ascending = closest first)
+   * - `filter`: optional WHERE clause for distance threshold
+   * - `distanceSelect`: SQL expression for selecting the distance as `_distance`
+   */
+  static buildVectorSearchConditions(table, vectorSearch) {
+    const column = table[vectorSearch.property];
+    if (!column) {
+      throw new Error(`Vector column '${vectorSearch.property}' not found in table`);
+    }
+    const vectorLiteral = `'[${vectorSearch.vector.join(",")}]'::vector`;
+    const distanceFn = vectorSearch.distance || "cosine";
+    let operator;
+    switch (distanceFn) {
+      case "cosine":
+        operator = "<=>";
+        break;
+      case "l2":
+        operator = "<->";
+        break;
+      case "inner_product":
+        operator = "<#>";
+        break;
+    }
+    const distanceExpr = sql`${column} ${sql.raw(operator)} ${sql.raw(vectorLiteral)}`;
+    return {
+      orderBy: distanceExpr,
+      filter: vectorSearch.threshold != null ? sql`(${column} ${sql.raw(operator)} ${sql.raw(vectorLiteral)}) < ${vectorSearch.threshold}` : void 0,
+      distanceSelect: sql`(${column} ${sql.raw(operator)} ${sql.raw(vectorLiteral)})`
+    };
+  }
 }
 const PostgresConditionBuilder = DrizzleConditionBuilder;
 function getColumnMeta(col) {
@@ -5486,7 +5743,7 @@ class EntityFetchService {
     const qb = this.getQueryBuilder(tableName);
     const withConfig = this.buildWithConfig(collection);
     const hasRelations = withConfig && Object.keys(withConfig).length > 0;
-    if (qb && !options.searchString && !hasRelations) {
+    if (qb && !options.searchString && !hasRelations && !options.vectorSearch) {
       try {
         const queryOpts = this.buildDrizzleQueryOptions(table, idField, idInfo, options, collectionPath, void 0);
         const results2 = await qb.findMany(queryOpts);
@@ -5500,7 +5757,14 @@ class EntityFetchService {
         console.warn(`[EntityFetchService] db.query.findMany failed for ${collectionPath}, falling back to db.select:`, e);
       }
     }
-    let query = this.db.select().from(table).$dynamic();
+    let vectorMeta;
+    if (options.vectorSearch) {
+      vectorMeta = DrizzleConditionBuilder.buildVectorSearchConditions(table, options.vectorSearch);
+    }
+    let query = vectorMeta ? this.db.select({
+      table_row: table,
+      _distance: vectorMeta.distanceSelect
+    }).from(table).$dynamic() : this.db.select().from(table).$dynamic();
     const allConditions = [];
     if (options.searchString) {
       const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
@@ -5511,12 +5775,17 @@ class EntityFetchService {
       const filterConditions = this.buildFilterConditions(options.filter, table, collectionPath);
       if (filterConditions.length > 0) allConditions.push(...filterConditions);
     }
+    if (vectorMeta?.filter) {
+      allConditions.push(vectorMeta.filter);
+    }
     if (allConditions.length > 0) {
       const finalCondition = DrizzleConditionBuilder.combineConditionsWithAnd(allConditions);
       if (finalCondition) query = query.where(finalCondition);
     }
     const orderExpressions = [];
-    if (options.orderBy) {
+    if (vectorMeta) {
+      orderExpressions.push(asc(vectorMeta.orderBy));
+    } else if (options.orderBy) {
       const orderByField = this.resolveOrderByField(table, options.orderBy, collection);
       if (orderByField) {
         orderExpressions.push(options.order === "asc" ? asc(orderByField) : desc(orderByField));
@@ -5532,10 +5801,14 @@ class EntityFetchService {
         if (finalCondition) query = query.where(finalCondition);
       }
     }
-    const limitValue = options.searchString ? options.limit || 50 : options.limit;
+    const limitValue = options.vectorSearch ? options.limit || 10 : options.searchString ? options.limit || 50 : options.limit;
     if (limitValue) query = query.limit(limitValue);
     if (options.offset && options.offset > 0) query = query.offset(options.offset);
-    const results = await query;
+    const rawResults = await query;
+    const results = vectorMeta ? rawResults.map((r) => ({
+      ...r.table_row,
+      _distance: typeof r._distance === "number" ? r._distance : parseFloat(String(r._distance))
+    })) : rawResults;
     return this.processEntityResults(results, collection, collectionPath, idInfo, options.databaseId, false, idInfoArray);
   }
   /**
@@ -5757,7 +6030,7 @@ class EntityFetchService {
     const idField = table[idInfo.fieldName];
     const tableName = getTableName$1(table);
     const qb = this.getQueryBuilder(tableName);
-    if (qb && !options.searchString) {
+    if (qb && !options.searchString && !options.vectorSearch) {
       try {
         const withConfig = include && include.length > 0 ? this.buildWithConfig(collection, include) : void 0;
         const queryOpts = this.buildDrizzleQueryOptions(table, idField, idInfo, options, collectionPath, withConfig);
@@ -5903,7 +6176,14 @@ class EntityFetchService {
     const idInfoArray = getPrimaryKeys(collection, this.registry);
     const idInfo = idInfoArray[0];
     const idField = table[idInfo.fieldName];
-    let query = this.db.select().from(table).$dynamic();
+    let vectorMeta;
+    if (options.vectorSearch) {
+      vectorMeta = DrizzleConditionBuilder.buildVectorSearchConditions(table, options.vectorSearch);
+    }
+    let query = vectorMeta ? this.db.select({
+      table_row: table,
+      _distance: vectorMeta.distanceSelect
+    }).from(table).$dynamic() : this.db.select().from(table).$dynamic();
     const allConditions = [];
     if (options.searchString) {
       const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
@@ -5914,12 +6194,17 @@ class EntityFetchService {
       const filterConditions = this.buildFilterConditions(options.filter, table, collectionPath);
       if (filterConditions.length > 0) allConditions.push(...filterConditions);
     }
+    if (vectorMeta?.filter) {
+      allConditions.push(vectorMeta.filter);
+    }
     if (allConditions.length > 0) {
       const finalCondition = DrizzleConditionBuilder.combineConditionsWithAnd(allConditions);
       if (finalCondition) query = query.where(finalCondition);
     }
     const orderExpressions = [];
-    if (options.orderBy) {
+    if (vectorMeta) {
+      orderExpressions.push(asc(vectorMeta.orderBy));
+    } else if (options.orderBy) {
       const orderByField = this.resolveOrderByField(table, options.orderBy, collection);
       if (orderByField) {
         orderExpressions.push(options.order === "asc" ? asc(orderByField) : desc(orderByField));
@@ -5927,10 +6212,17 @@ class EntityFetchService {
     }
     orderExpressions.push(desc(idField));
     if (orderExpressions.length > 0) query = query.orderBy(...orderExpressions);
-    const limitValue = options.searchString ? options.limit || 50 : options.limit;
+    const limitValue = options.vectorSearch ? options.limit || 10 : options.searchString ? options.limit || 50 : options.limit;
     if (limitValue) query = query.limit(limitValue);
     if (options.offset && options.offset > 0) query = query.offset(options.offset);
-    return await query;
+    const rawResults = await query;
+    if (vectorMeta) {
+      return rawResults.map((r) => ({
+        ...r.table_row,
+        _distance: typeof r._distance === "number" ? r._distance : parseFloat(String(r._distance))
+      }));
+    }
+    return rawResults;
   }
   /**
    * Check if the Drizzle instance has the relational query API available
@@ -6068,6 +6360,14 @@ class EntityPersistService {
     const parsedId = parsedIdObj[idInfo.fieldName];
     await this.db.delete(table).where(eq(idField, parsedId));
   }
+  /**
+   * Delete all entities from a collection
+   */
+  async deleteAll(collectionPath, _databaseId) {
+    const collection = getCollectionByPath(collectionPath, this.registry);
+    const table = getTableForCollection(collection, this.registry);
+    await this.db.delete(table);
+  }
   /**
    * Save an entity (create or update)
    */
@@ -6399,6 +6699,12 @@ class EntityService {
   async deleteEntity(collectionPath, entityId, databaseId) {
     return this.persistService.deleteEntity(collectionPath, entityId, databaseId);
   }
+  /**
+   * Delete all entities from a collection
+   */
+  async deleteAll(collectionPath, databaseId) {
+    return this.persistService.deleteAll(collectionPath, databaseId);
+  }
   /**
    * Execute raw SQL
    */
@@ -6684,7 +6990,8 @@ class PostgresBackendDriver {
     startAfter,
     orderBy,
     searchString,
-    order
+    order,
+    vectorSearch
   }) {
     const entities = await this.entityService.fetchCollection(path2, {
       filter,
@@ -6694,7 +7001,8 @@ class PostgresBackendDriver {
       offset,
       startAfter,
       databaseId: collection?.databaseId,
-      searchString
+      searchString,
+      vectorSearch
     });
     const {
       collection: resolvedCollection,
@@ -7097,6 +7405,10 @@ class PostgresBackendDriver {
       await this.realtimeService.notifyEntityUpdate(entity.path, entity.id.toString(), null, entity.databaseId || resolvedCollection?.databaseId);
     }
   }
+  async deleteAll(path2) {
+    await this.entityService.deleteAll(path2);
+    await this.realtimeService.notifyEntityUpdate(path2, "*", null);
+  }
   async checkUniqueField(path2, name, value, entityId, collection) {
     return this.entityService.checkUniqueField(path2, name, value, entityId, collection?.databaseId);
   }
@@ -7366,11 +7678,11 @@ class AuthenticatedPostgresBackendDriver {
         console.warn("[DataDriver] User ID (uid) is missing for authenticated delegate. Using 'anonymous'. User object:", this.user);
         userId = "anonymous";
       }
-      const userRoles2 = this.user?.roles ?? [];
+      const userRoles = this.user?.roles ?? [];
       if (!this.user?.roles) {
         console.warn("[DataDriver] User roles are missing for authenticated delegate. Using empty array. User object:", this.user);
       }
-      const normalizedRoles = userRoles2.map((r) => typeof r === "string" ? r : r?.id ?? String(r));
+      const normalizedRoles = userRoles.map((r) => typeof r === "string" ? r : r?.id ?? String(r));
       const rolesString = normalizedRoles.join(",");
       await tx.execute(sql`
                 SELECT 
@@ -7378,7 +7690,7 @@ class AuthenticatedPostgresBackendDriver {
                     set_config('app.user_roles', ${rolesString}, true),
                     set_config('app.jwt', ${JSON.stringify({
         sub: userId,
-        roles: userRoles2
+        roles: userRoles
       })}, true)
             `);
       const txEntityService = new EntityService(tx, this.delegate.registry);
@@ -7433,6 +7745,9 @@ class AuthenticatedPostgresBackendDriver {
   async deleteEntity(props) {
     return this.withTransaction((delegate) => delegate.deleteEntity(props));
   }
+  async deleteAll(path2) {
+    return this.delegate.deleteAll(path2);
+  }
   async checkUniqueField(path2, name, value, entityId, collection) {
     return this.withTransaction((delegate) => delegate.checkUniqueField(path2, name, value, entityId, collection));
   }
@@ -7512,11 +7827,10 @@ class DatabasePoolManager {
     this.pools.clear();
   }
 }
-function createAuthSchema(rolesSchemaName = "rebase", usersSchemaName = "rebase") {
-  const rolesSchema = rolesSchemaName === "public" ? null : pgSchema(rolesSchemaName);
+function createAuthSchema(usersSchemaName = "rebase") {
   const usersSchema2 = usersSchemaName === "public" ? null : pgSchema(usersSchemaName);
-  const rolesTableCreator = rolesSchema ? rolesSchema.table.bind(rolesSchema) : pgTable;
-  const usersTableCreator = usersSchema2 ? usersSchema2.table.bind(usersSchema2) : pgTable;
+  const tableCreator = usersSchema2 ? usersSchema2.table.bind(usersSchema2) : pgTable;
+  const usersTableCreator = tableCreator;
   const users2 = usersTableCreator("users", {
     id: uuid("id").defaultRandom().primaryKey(),
     email: varchar("email", {
@@ -7537,38 +7851,13 @@ function createAuthSchema(rolesSchemaName = "rebase", usersSchemaName = "rebase"
       length: 255
     }),
     emailVerificationSentAt: timestamp("email_verification_sent_at"),
+    isAnonymous: boolean("is_anonymous").default(false).notNull(),
+    roles: text("roles").array().default([]).notNull(),
     metadata: jsonb("metadata").$type().default({}).notNull(),
     createdAt: timestamp("created_at").defaultNow().notNull(),
     updatedAt: timestamp("updated_at").defaultNow().notNull()
   });
-  const roles2 = rolesTableCreator("roles", {
-    id: varchar("id", {
-      length: 50
-    }).primaryKey(),
-    // 'admin', 'editor', 'viewer'
-    name: varchar("name", {
-      length: 100
-    }).notNull(),
-    isAdmin: boolean("is_admin").default(false).notNull(),
-    defaultPermissions: jsonb("default_permissions").$type(),
-    collectionPermissions: jsonb("collection_permissions").$type(),
-    config: jsonb("config").$type()
-  });
-  const userRoles2 = rolesTableCreator("user_roles", {
-    userId: uuid("user_id").notNull().references(() => users2.id, {
-      onDelete: "cascade"
-    }),
-    roleId: varchar("role_id", {
-      length: 50
-    }).notNull().references(() => roles2.id, {
-      onDelete: "cascade"
-    })
-  }, (table) => ({
-    pk: primaryKey({
-      columns: [table.userId, table.roleId]
-    })
-  }));
-  const refreshTokens2 = rolesTableCreator("refresh_tokens", {
+  const refreshTokens2 = tableCreator("refresh_tokens", {
     id: uuid("id").defaultRandom().primaryKey(),
     userId: uuid("user_id").notNull().references(() => users2.id, {
       onDelete: "cascade"
@@ -7587,7 +7876,7 @@ function createAuthSchema(rolesSchemaName = "rebase", usersSchemaName = "rebase"
   }, (table) => ({
     uniqueDeviceSession: unique("unique_device_session").on(table.userId, table.userAgent, table.ipAddress)
   }));
-  const passwordResetTokens2 = rolesTableCreator("password_reset_tokens", {
+  const passwordResetTokens2 = tableCreator("password_reset_tokens", {
     id: uuid("id").defaultRandom().primaryKey(),
     userId: uuid("user_id").notNull().references(() => users2.id, {
       onDelete: "cascade"
@@ -7599,14 +7888,14 @@ function createAuthSchema(rolesSchemaName = "rebase", usersSchemaName = "rebase"
     usedAt: timestamp("used_at"),
     createdAt: timestamp("created_at").defaultNow().notNull()
   });
-  const appConfig2 = rolesTableCreator("app_config", {
+  const appConfig2 = tableCreator("app_config", {
     key: varchar("key", {
       length: 100
     }).primaryKey(),
     value: jsonb("value").notNull(),
     updatedAt: timestamp("updated_at").defaultNow().notNull()
   });
-  const userIdentities2 = rolesTableCreator("user_identities", {
+  const userIdentities2 = tableCreator("user_identities", {
     id: uuid("id").defaultRandom().primaryKey(),
     userId: uuid("user_id").notNull().references(() => users2.id, {
       onDelete: "cascade"
@@ -7624,74 +7913,126 @@ function createAuthSchema(rolesSchemaName = "rebase", usersSchemaName = "rebase"
   }, (table) => ({
     uniqueProviderId: unique("unique_provider_id").on(table.provider, table.providerId)
   }));
+  const mfaFactors2 = tableCreator("mfa_factors", {
+    id: uuid("id").defaultRandom().primaryKey(),
+    userId: uuid("user_id").notNull().references(() => users2.id, {
+      onDelete: "cascade"
+    }),
+    factorType: varchar("factor_type", {
+      length: 20
+    }).notNull(),
+    // 'totp'
+    secretEncrypted: varchar("secret_encrypted", {
+      length: 500
+    }).notNull(),
+    friendlyName: varchar("friendly_name", {
+      length: 255
+    }),
+    verified: boolean("verified").default(false).notNull(),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    updatedAt: timestamp("updated_at").defaultNow().notNull()
+  });
+  const mfaChallenges2 = tableCreator("mfa_challenges", {
+    id: uuid("id").defaultRandom().primaryKey(),
+    factorId: uuid("factor_id").notNull().references(() => mfaFactors2.id, {
+      onDelete: "cascade"
+    }),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    verifiedAt: timestamp("verified_at"),
+    ipAddress: varchar("ip_address", {
+      length: 45
+    }),
+    expiresAt: timestamp("expires_at").notNull()
+  });
+  const recoveryCodes2 = tableCreator("recovery_codes", {
+    id: uuid("id").defaultRandom().primaryKey(),
+    userId: uuid("user_id").notNull().references(() => users2.id, {
+      onDelete: "cascade"
+    }),
+    codeHash: varchar("code_hash", {
+      length: 255
+    }).notNull(),
+    usedAt: timestamp("used_at"),
+    createdAt: timestamp("created_at").defaultNow().notNull()
+  });
   return {
-    rolesSchema,
     usersSchema: usersSchema2,
     users: users2,
-    roles: roles2,
-    userRoles: userRoles2,
     refreshTokens: refreshTokens2,
     passwordResetTokens: passwordResetTokens2,
     appConfig: appConfig2,
-    userIdentities: userIdentities2
+    userIdentities: userIdentities2,
+    mfaFactors: mfaFactors2,
+    mfaChallenges: mfaChallenges2,
+    recoveryCodes: recoveryCodes2
   };
 }
-const defaultAuthSchema = createAuthSchema("rebase", "rebase");
-const rebaseSchema = defaultAuthSchema.rolesSchema;
+const defaultAuthSchema = createAuthSchema("rebase");
 const usersSchema = defaultAuthSchema.usersSchema;
 const users = defaultAuthSchema.users;
-const roles = defaultAuthSchema.roles;
-const userRoles = defaultAuthSchema.userRoles;
 const refreshTokens = defaultAuthSchema.refreshTokens;
 const passwordResetTokens = defaultAuthSchema.passwordResetTokens;
 const appConfig = defaultAuthSchema.appConfig;
 const userIdentities = defaultAuthSchema.userIdentities;
+const mfaFactors = defaultAuthSchema.mfaFactors;
+const mfaChallenges = defaultAuthSchema.mfaChallenges;
+const recoveryCodes = defaultAuthSchema.recoveryCodes;
 const usersRelations = relations(users, ({
   many
 }) => ({
-  userRoles: many(userRoles),
   refreshTokens: many(refreshTokens),
   passwordResetTokens: many(passwordResetTokens),
-  userIdentities: many(userIdentities)
+  userIdentities: many(userIdentities),
+  mfaFactors: many(mfaFactors),
+  recoveryCodes: many(recoveryCodes)
 }));
-const rolesRelations = relations(roles, ({
-  many
+const refreshTokensRelations = relations(refreshTokens, ({
+  one
 }) => ({
-  userRoles: many(userRoles)
+  user: one(users, {
+    fields: [refreshTokens.userId],
+    references: [users.id]
+  })
 }));
-const userRolesRelations = relations(userRoles, ({
+const passwordResetTokensRelations = relations(passwordResetTokens, ({
   one
 }) => ({
   user: one(users, {
-    fields: [userRoles.userId],
+    fields: [passwordResetTokens.userId],
     references: [users.id]
-  }),
-  role: one(roles, {
-    fields: [userRoles.roleId],
-    references: [roles.id]
   })
 }));
-const refreshTokensRelations = relations(refreshTokens, ({
+const userIdentitiesRelations = relations(userIdentities, ({
   one
 }) => ({
   user: one(users, {
-    fields: [refreshTokens.userId],
+    fields: [userIdentities.userId],
     references: [users.id]
   })
 }));
-const passwordResetTokensRelations = relations(passwordResetTokens, ({
-  one
+const mfaFactorsRelations = relations(mfaFactors, ({
+  one,
+  many
 }) => ({
   user: one(users, {
-    fields: [passwordResetTokens.userId],
+    fields: [mfaFactors.userId],
     references: [users.id]
+  }),
+  challenges: many(mfaChallenges)
+}));
+const mfaChallengesRelations = relations(mfaChallenges, ({
+  one
+}) => ({
+  factor: one(mfaFactors, {
+    fields: [mfaChallenges.factorId],
+    references: [mfaFactors.id]
   })
 }));
-const userIdentitiesRelations = relations(userIdentities, ({
+const recoveryCodesRelations = relations(recoveryCodes, ({
   one
 }) => ({
   user: one(users, {
-    fields: [userIdentities.userId],
+    fields: [recoveryCodes.userId],
     references: [users.id]
   })
 }));
@@ -7751,6 +8092,8 @@ const getDrizzleColumn = (propName, prop, collection, collections) => {
         columnDefinition = `${enumName}("${colName}")`;
       } else if ("isId" in stringProp && stringProp.isId === "uuid") {
         columnDefinition = `uuid("${colName}")`;
+      } else if (stringProp.columnType === "uuid") {
+        columnDefinition = `uuid("${colName}")`;
       } else if (stringProp.columnType === "text") {
         columnDefinition = `text("${colName}")`;
       } else if (stringProp.columnType === "char") {
@@ -7818,11 +8161,38 @@ const getDrizzleColumn = (propName, prop, collection, collections) => {
       }
       break;
     }
-    case "map":
+    case "map": {
+      const mapProp = prop;
+      if (mapProp.columnType === "json") {
+        columnDefinition = `json("${colName}")`;
+      } else {
+        columnDefinition = `jsonb("${colName}")`;
+      }
+      break;
+    }
     case "array": {
-      const arrayOrMapProp = prop;
-      if (arrayOrMapProp.columnType === "json") {
+      const arrayProp = prop;
+      let colType = arrayProp.columnType;
+      if (!colType && arrayProp.of && !Array.isArray(arrayProp.of)) {
+        const ofProp = arrayProp.of;
+        if (ofProp.type === "string") {
+          colType = "text[]";
+        } else if (ofProp.type === "number") {
+          colType = ofProp.validation?.integer ? "integer[]" : "numeric[]";
+        } else if (ofProp.type === "boolean") {
+          colType = "boolean[]";
+        }
+      }
+      if (colType === "json") {
         columnDefinition = `json("${colName}")`;
+      } else if (colType === "text[]") {
+        columnDefinition = `text("${colName}").array()`;
+      } else if (colType === "integer[]") {
+        columnDefinition = `integer("${colName}").array()`;
+      } else if (colType === "boolean[]") {
+        columnDefinition = `boolean("${colName}").array()`;
+      } else if (colType === "numeric[]") {
+        columnDefinition = `numeric("${colName}").array()`;
       } else {
         columnDefinition = `jsonb("${colName}")`;
       }
@@ -7906,8 +8276,8 @@ const resolveRawSql = (expression) => {
   const resolved = expression.replace(/\{(\w+)\}/g, (_, col) => col);
   return `sql\`${resolved}\``;
 };
-const wrapWithRoleCheck = (clause, roles2) => {
-  const rolesArrayString = `ARRAY[${roles2.map((r) => `'${r}'`).join(",")}]`;
+const wrapWithRoleCheck = (clause, roles) => {
+  const rolesArrayString = `ARRAY[${roles.map((r) => `'${r}'`).join(",")}]`;
   const roleCondition = `string_to_array(auth.roles(), ',') @> ${rolesArrayString}`;
   return `sql\`(${unwrapSql(clause)}) AND (${roleCondition})\``;
 };
@@ -7960,22 +8330,22 @@ const generatePolicyCode = (collection, rule, index) => {
 };
 const generateSinglePolicyCode = (collection, rule, operation, policyName) => {
   const mode = rule.mode ?? "permissive";
-  const roles2 = rule.roles ? [...rule.roles].sort() : void 0;
+  const roles = rule.roles ? [...rule.roles].sort() : void 0;
   const needsUsing = operation !== "insert";
   const needsWithCheck = operation !== "select" && operation !== "delete";
   let usingClause = needsUsing ? buildUsingClause(rule, collection) : null;
   let withCheckClause = needsWithCheck ? buildWithCheckClause(rule, collection) : null;
-  if (roles2 && roles2.length > 0) {
+  if (roles && roles.length > 0) {
     if (usingClause) {
-      usingClause = wrapWithRoleCheck(usingClause, roles2);
+      usingClause = wrapWithRoleCheck(usingClause, roles);
     } else if (needsUsing) {
-      const rolesArrayString = `ARRAY[${roles2.map((r) => `'${r}'`).join(",")}]`;
+      const rolesArrayString = `ARRAY[${roles.map((r) => `'${r}'`).join(",")}]`;
       usingClause = `sql\`string_to_array(auth.roles(), ',') @> ${rolesArrayString}\``;
     }
     if (withCheckClause) {
-      withCheckClause = wrapWithRoleCheck(withCheckClause, roles2);
+      withCheckClause = wrapWithRoleCheck(withCheckClause, roles);
     } else if (needsWithCheck) {
-      const rolesArrayString = `ARRAY[${roles2.map((r) => `'${r}'`).join(",")}]`;
+      const rolesArrayString = `ARRAY[${roles.map((r) => `'${r}'`).join(",")}]`;
       withCheckClause = `sql\`string_to_array(auth.roles(), ',') @> ${rolesArrayString}\``;
     }
   }
@@ -8298,91 +8668,7 @@ ${tableRelations.join(",\n")}
   schemaContent += tablesExport + enumsExport + relationsExport;
   return schemaContent;
 };
-const defaultUsersCollection = {
-  name: "Users",
-  singularName: "User",
-  slug: "users",
-  table: "users",
-  schema: "rebase",
-  icon: "Users",
-  group: "Settings",
-  properties: {
-    id: {
-      name: "ID",
-      type: "string",
-      isId: "uuid"
-    },
-    email: {
-      name: "Email",
-      type: "string",
-      validation: {
-        required: true,
-        unique: true
-      }
-    },
-    password_hash: {
-      name: "Password Hash",
-      type: "string",
-      ui: {
-        hideFromCollection: true
-      }
-    },
-    display_name: {
-      name: "Display Name",
-      type: "string"
-    },
-    photo_url: {
-      name: "Photo URL",
-      type: "string"
-    },
-    email_verified: {
-      name: "Email Verified",
-      type: "boolean",
-      defaultValue: false
-    },
-    email_verification_token: {
-      name: "Email Verification Token",
-      type: "string",
-      ui: {
-        hideFromCollection: true
-      }
-    },
-    email_verification_sent_at: {
-      name: "Email Verification Sent At",
-      type: "date",
-      ui: {
-        hideFromCollection: true
-      }
-    },
-    metadata: {
-      name: "Metadata",
-      type: "map",
-      defaultValue: {},
-      ui: {
-        hideFromCollection: true
-      }
-    },
-    created_at: {
-      name: "Created At",
-      type: "date",
-      autoValue: "on_create",
-      ui: {
-        readOnly: true,
-        hideFromCollection: true
-      }
-    },
-    updated_at: {
-      name: "Updated At",
-      type: "date",
-      autoValue: "on_update",
-      ui: {
-        readOnly: true,
-        hideFromCollection: true
-      }
-    }
-  }
-};
-const formatTerminalText = (text, options = {}) => {
+const formatTerminalText = (text2, options = {}) => {
   let codes = "";
   if (options.bold) codes += "\x1B[1m";
   if (options.backgroundColor) {
@@ -8409,7 +8695,7 @@ const formatTerminalText = (text, options = {}) => {
     };
     codes += textColors[options.textColor];
   }
-  return `${codes}${text}\x1B[0m`;
+  return `${codes}${text2}\x1B[0m`;
 };
 const runGeneration = async (collectionsFilePath, outputPath) => {
   try {
@@ -8447,10 +8733,7 @@ const runGeneration = async (collectionsFilePath, outputPath) => {
     if (!collections || !Array.isArray(collections)) {
       collections = [];
     }
-    const hasUsersCollection = collections.some((c) => c.slug === "users");
-    if (!hasUsersCollection) {
-      collections.push(defaultUsersCollection);
-    }
+    collections = Array.from(new Map([defaultUsersCollection, ...collections].map((c) => [c.slug, c])).values());
     collections.sort((a, b) => a.slug.localeCompare(b.slug));
     const schemaContent = await generateSchema(collections);
     if (outputPath) {
@@ -8511,6 +8794,13 @@ class RealtimeService extends EventEmitter {
     this.entityService = new EntityService(db, registry);
   }
   clients = /* @__PURE__ */ new Map();
+  // Broadcast channels: channel name → set of client IDs
+  channels = /* @__PURE__ */ new Map();
+  // Presence: channel → Map<clientId, { state, lastSeen }>
+  presence = /* @__PURE__ */ new Map();
+  presenceInterval;
+  static PRESENCE_TIMEOUT_MS = 3e4;
+  // 30s
   entityService;
   // Enhanced subscriptions storage with full request parameters
   _subscriptions = /* @__PURE__ */ new Map();
@@ -8637,8 +8927,19 @@ class RealtimeService extends EventEmitter {
         }
       }
     }
+    for (const [channel, members] of this.channels.entries()) {
+      if (members.has(clientId)) {
+        members.delete(clientId);
+        this.removePresence(clientId, channel);
+        if (members.size === 0) this.channels.delete(channel);
+      }
+    }
+    for (const [channel] of this.presence) {
+      this.removePresence(clientId, channel);
+    }
   }
   async handleMessage(clientId, message, authContext) {
+    const payload = message.payload;
     switch (message.type) {
       case "subscribe_collection":
         await this.handleCollectionSubscription(clientId, message.payload, authContext);
@@ -8649,6 +8950,25 @@ class RealtimeService extends EventEmitter {
       case "unsubscribe":
         await this.handleUnsubscribe(clientId, message.subscriptionId);
         break;
+      case "join_channel":
+        this.joinChannel(clientId, payload?.channel);
+        break;
+      case "leave_channel":
+        this.leaveChannel(clientId, payload?.channel);
+        break;
+      case "broadcast":
+        this.broadcastToChannel(clientId, payload?.channel, payload?.event, payload?.payload);
+        break;
+      case "presence_track":
+        this.joinChannel(clientId, payload?.channel);
+        this.trackPresence(clientId, payload?.channel, payload?.state ?? {});
+        break;
+      case "presence_untrack":
+        this.removePresence(clientId, payload?.channel);
+        break;
+      case "presence_state":
+        this.sendPresenceState(clientId, payload?.channel);
+        break;
       default:
         this.sendError(clientId, "Unknown message type " + message.type, message.subscriptionId);
     }
@@ -9106,6 +9426,132 @@ class RealtimeService extends EventEmitter {
     return parentPaths;
   }
   // =============================================================================
+  // Broadcast Channels
+  // =============================================================================
+  /** Join a broadcast channel */
+  joinChannel(clientId, channel) {
+    if (!this.channels.has(channel)) {
+      this.channels.set(channel, /* @__PURE__ */ new Set());
+    }
+    this.channels.get(channel).add(clientId);
+    this.debugLog(`📡 [Broadcast] Client ${clientId} joined channel: ${channel}`);
+  }
+  /** Leave a broadcast channel */
+  leaveChannel(clientId, channel) {
+    const members = this.channels.get(channel);
+    if (members) {
+      members.delete(clientId);
+      if (members.size === 0) this.channels.delete(channel);
+    }
+    this.removePresence(clientId, channel);
+  }
+  /** Broadcast a message to all clients in a channel except sender */
+  broadcastToChannel(clientId, channel, event, payload) {
+    const members = this.channels.get(channel);
+    if (!members) return;
+    const message = JSON.stringify({
+      type: "broadcast",
+      channel,
+      event,
+      payload
+    });
+    for (const memberId of members) {
+      if (memberId === clientId) continue;
+      const ws = this.clients.get(memberId);
+      if (ws && ws.readyState === WebSocket.OPEN) {
+        ws.send(message);
+      }
+    }
+  }
+  // =============================================================================
+  // Presence
+  // =============================================================================
+  /** Track presence in a channel */
+  trackPresence(clientId, channel, state) {
+    if (!this.presence.has(channel)) {
+      this.presence.set(channel, /* @__PURE__ */ new Map());
+    }
+    const channelPresence = this.presence.get(channel);
+    channelPresence.set(clientId, {
+      state,
+      lastSeen: Date.now()
+    });
+    this.broadcastPresenceDiff(channel, {
+      [clientId]: state
+    }, {});
+    this.ensurePresenceCleanup();
+  }
+  /** Remove presence from a channel */
+  removePresence(clientId, channel) {
+    const channelPresence = this.presence.get(channel);
+    if (!channelPresence) return;
+    const entry = channelPresence.get(clientId);
+    if (entry) {
+      channelPresence.delete(clientId);
+      this.broadcastPresenceDiff(channel, {}, {
+        [clientId]: entry.state
+      });
+    }
+    if (channelPresence.size === 0) {
+      this.presence.delete(channel);
+    }
+  }
+  /** Send full presence state to a specific client */
+  sendPresenceState(clientId, channel) {
+    const channelPresence = this.presence.get(channel);
+    const presences = {};
+    if (channelPresence) {
+      for (const [id, {
+        state
+      }] of channelPresence) {
+        presences[id] = state;
+      }
+    }
+    const ws = this.clients.get(clientId);
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify({
+        type: "presence_state",
+        channel,
+        presences
+      }));
+    }
+  }
+  /** Broadcast presence diff (joins/leaves) to channel */
+  broadcastPresenceDiff(channel, joins, leaves) {
+    const members = this.channels.get(channel);
+    if (!members) return;
+    const message = JSON.stringify({
+      type: "presence_diff",
+      channel,
+      joins,
+      leaves
+    });
+    for (const memberId of members) {
+      const ws = this.clients.get(memberId);
+      if (ws && ws.readyState === WebSocket.OPEN) {
+        ws.send(message);
+      }
+    }
+  }
+  /** Periodic cleanup for stale presences */
+  ensurePresenceCleanup() {
+    if (this.presenceInterval) return;
+    this.presenceInterval = setInterval(() => {
+      const now = Date.now();
+      for (const [channel, channelPresence] of this.presence) {
+        for (const [clientId, entry] of channelPresence) {
+          if (now - entry.lastSeen > RealtimeService.PRESENCE_TIMEOUT_MS) {
+            this.removePresence(clientId, channel);
+          }
+        }
+      }
+      if (this.presence.size === 0 && this.presenceInterval) {
+        clearInterval(this.presenceInterval);
+        this.presenceInterval = void 0;
+      }
+    }, 1e4);
+  }
+  // =============================================================================
   // Lifecycle / Cleanup
   // =============================================================================
   /**
@@ -9126,6 +9572,12 @@ class RealtimeService extends EventEmitter {
     }
     this._subscriptions.clear();
     this.subscriptionCallbacks.clear();
+    this.channels.clear();
+    this.presence.clear();
+    if (this.presenceInterval) {
+      clearInterval(this.presenceInterval);
+      this.presenceInterval = void 0;
+    }
     await this.stopListening();
     this.clients.clear();
     this.debugLog("🧹 [RealtimeService] destroy() complete — all resources released.");
@@ -9627,15 +10079,15 @@ function createPostgresWebSocket(server, realtimeService, driver, authConfig, au
               wsDebug("👤 [WebSocket Server] Processing FETCH_ROLES request");
               const delegate = await getScopedDelegate();
               const admin = delegate.admin;
-              let roles2 = [];
+              let roles = [];
               if (isSQLAdmin(admin) && admin.fetchAvailableRoles) {
-                roles2 = await admin.fetchAvailableRoles();
+                roles = await admin.fetchAvailableRoles();
               }
-              wsDebug(`👤 [WebSocket Server] Fetched ${roles2.length} roles.`);
+              wsDebug(`👤 [WebSocket Server] Fetched ${roles.length} roles.`);
               const response = {
                 type: "FETCH_ROLES_SUCCESS",
                 payload: {
-                  roles: roles2
+                  roles
                 },
                 requestId
               };
@@ -9772,8 +10224,14 @@ function createPostgresWebSocket(server, realtimeService, driver, authConfig, au
             break;
           case "subscribe_collection":
           case "subscribe_entity":
-          case "unsubscribe": {
-            wsDebug("🔄 [WebSocket Server] Routing subscription message to RealtimeService:", type);
+          case "unsubscribe":
+          case "join_channel":
+          case "leave_channel":
+          case "broadcast":
+          case "presence_track":
+          case "presence_untrack":
+          case "presence_state": {
+            wsDebug("🔄 [WebSocket Server] Routing realtime message to RealtimeService:", type);
             const session = clientSessions.get(clientId);
             const authContext = session?.user ? {
               userId: session.user.userId,
@@ -9883,50 +10341,8 @@ class PostgresCollectionRegistry extends CollectionRegistry {
     return collection.relations.map((r) => r.relationName || r.localKey || "").filter(Boolean);
   }
 }
-const DEFAULT_ROLES = [{
-  id: "admin",
-  name: "Admin",
-  is_admin: true,
-  default_permissions: {
-    read: true,
-    create: true,
-    edit: true,
-    delete: true
-  },
-  config: {
-    createCollections: true,
-    editCollections: "all",
-    deleteCollections: "all"
-  }
-}, {
-  id: "editor",
-  name: "Editor",
-  is_admin: false,
-  default_permissions: {
-    read: true,
-    create: true,
-    edit: true,
-    delete: true
-  },
-  config: {
-    createCollections: true,
-    editCollections: "own",
-    deleteCollections: "own"
-  }
-}, {
-  id: "viewer",
-  name: "Viewer",
-  is_admin: false,
-  default_permissions: {
-    read: true,
-    create: false,
-    edit: false,
-    delete: false
-  },
-  config: null
-}];
 async function ensureAuthTablesExist(db, registry) {
-  console.log("🔍 Checking auth tables...");
+  logger.info("🔍 Checking auth tables...");
   try {
     let usersTableName = '"users"';
     let userIdType = "TEXT";
@@ -9953,26 +10369,15 @@ async function ensureAuthTablesExist(db, registry) {
         }
       }
     }
-    let rolesSchema = "rebase";
-    if (registry) {
-      const rolesTable = registry.getTable("roles");
-      if (rolesTable) {
-        rolesSchema = getTableConfig(rolesTable).schema || "public";
-      }
-    }
     if (usersSchema2 !== "public") {
       await db.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.raw(usersSchema2)}`);
     }
-    if (rolesSchema !== "public" && rolesSchema !== usersSchema2) {
-      await db.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.raw(rolesSchema)}`);
-    }
     await db.execute(sql`CREATE SCHEMA IF NOT EXISTS rebase`);
-    const userIdentitiesTable = `"${rolesSchema}"."user_identities"`;
-    const rolesTableName = `"${rolesSchema}"."roles"`;
-    const userRolesTableName = `"${rolesSchema}"."user_roles"`;
-    const refreshTokensTableName = `"${rolesSchema}"."refresh_tokens"`;
-    const passwordResetTokensTableName = `"${rolesSchema}"."password_reset_tokens"`;
-    const appConfigTableName = `"${rolesSchema}"."app_config"`;
+    const authSchema = usersSchema2 === "public" ? "rebase" : usersSchema2;
+    const userIdentitiesTable = `"${authSchema}"."user_identities"`;
+    const refreshTokensTableName = `"${authSchema}"."refresh_tokens"`;
+    const passwordResetTokensTableName = `"${authSchema}"."password_reset_tokens"`;
+    const appConfigTableName = `"${authSchema}"."app_config"`;
     await db.execute(sql`
             CREATE TABLE IF NOT EXISTS ${sql.raw(userIdentitiesTable)} (
                 id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
@@ -9989,28 +10394,6 @@ async function ensureAuthTablesExist(db, registry) {
             CREATE INDEX IF NOT EXISTS idx_user_identities_user 
             ON ${sql.raw(userIdentitiesTable)}(user_id)
         `);
-    await db.execute(sql`
-            CREATE TABLE IF NOT EXISTS ${sql.raw(rolesTableName)} (
-                id TEXT PRIMARY KEY,
-                name TEXT NOT NULL,
-                is_admin BOOLEAN DEFAULT FALSE,
-                default_permissions JSONB,
-                collection_permissions JSONB,
-                config JSONB,
-                created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
-            )
-        `);
-    await db.execute(sql`
-            CREATE TABLE IF NOT EXISTS ${sql.raw(userRolesTableName)} (
-                user_id ${sql.raw(userIdType)} NOT NULL REFERENCES ${sql.raw(usersTableName)}(id) ON DELETE CASCADE,
-                role_id TEXT NOT NULL REFERENCES ${sql.raw(rolesTableName)}(id) ON DELETE CASCADE,
-                PRIMARY KEY (user_id, role_id)
-            )
-        `);
-    await db.execute(sql`
-            CREATE INDEX IF NOT EXISTS idx_user_roles_user 
-            ON ${sql.raw(userRolesTableName)}(user_id)
-        `);
     await db.execute(sql`
             CREATE TABLE IF NOT EXISTS ${sql.raw(refreshTokensTableName)} (
                 id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
@@ -10078,35 +10461,93 @@ async function ensureAuthTablesExist(db, registry) {
                 $$ LANGUAGE sql STABLE
             `);
     });
-    await seedDefaultRoles(db, rolesTableName);
-    console.log("✅ Auth tables ready");
-  } catch (error) {
-    console.error("❌ Failed to create auth tables:", error);
-    console.warn("⚠️ Continuing without creating auth tables.");
-  }
-}
-async function seedDefaultRoles(db, rolesTableName) {
-  const result = await db.execute(sql`SELECT COUNT(*) as count FROM ${sql.raw(rolesTableName)}`);
-  const count2 = parseInt(result.rows[0]?.count || "0", 10);
-  if (count2 > 0) {
-    console.log(`📋 Found ${count2} existing roles`);
-    return;
-  }
-  console.log("🌱 Seeding default roles...");
-  for (const role of DEFAULT_ROLES) {
     await db.execute(sql`
-            INSERT INTO ${sql.raw(rolesTableName)} (id, name, is_admin, default_permissions, config)
-            VALUES (
-                ${role.id}, 
-                ${role.name}, 
-                ${role.is_admin}, 
-                ${JSON.stringify(role.default_permissions)}::jsonb, 
-                ${role.config ? JSON.stringify(role.config) : null}::jsonb
+            ALTER TABLE ${sql.raw(usersTableName)}
+            ADD COLUMN IF NOT EXISTS is_anonymous BOOLEAN DEFAULT FALSE
+        `);
+    await db.execute(sql`
+            ALTER TABLE ${sql.raw(usersTableName)}
+            ADD COLUMN IF NOT EXISTS roles TEXT[] DEFAULT '{}' NOT NULL
+        `);
+    try {
+      const legacyCheck = await db.execute(sql`
+                SELECT EXISTS (
+                    SELECT 1 FROM information_schema.tables
+                    WHERE table_schema = 'rebase' AND table_name = 'user_roles'
+                ) AS has_user_roles
+            `);
+      const hasLegacyTables = legacyCheck.rows[0].has_user_roles;
+      if (hasLegacyTables) {
+        logger.info("🔄 Migrating roles from legacy user_roles table...");
+        await db.execute(sql`
+                    UPDATE ${sql.raw(usersTableName)} u
+                    SET roles = COALESCE((
+                        SELECT array_agg(ur.role_id)
+                        FROM "rebase"."user_roles" ur
+                        WHERE ur.user_id = u.id
+                    ), '{}')
+                    WHERE u.roles = '{}' OR u.roles IS NULL
+                `);
+        await db.execute(sql`DROP TABLE IF EXISTS "rebase"."user_roles" CASCADE`);
+        await db.execute(sql`DROP TABLE IF EXISTS "rebase"."roles" CASCADE`);
+        logger.info("✅ Legacy roles tables migrated and dropped");
+      }
+    } catch (migrationError) {
+      logger.warn(`⚠️  Legacy roles migration skipped: ${migrationError instanceof Error ? migrationError.message : String(migrationError)}`);
+    }
+    const mfaFactorsTableName = `"${authSchema}"."mfa_factors"`;
+    const mfaChallengesTableName = `"${authSchema}"."mfa_challenges"`;
+    const recoveryCodesTableName = `"${authSchema}"."recovery_codes"`;
+    await db.execute(sql`
+            CREATE TABLE IF NOT EXISTS ${sql.raw(mfaFactorsTableName)} (
+                id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+                user_id ${sql.raw(userIdType)} NOT NULL REFERENCES ${sql.raw(usersTableName)}(id) ON DELETE CASCADE,
+                factor_type TEXT NOT NULL DEFAULT 'totp',
+                secret_encrypted TEXT NOT NULL,
+                friendly_name TEXT,
+                verified BOOLEAN DEFAULT FALSE,
+                created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+                updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+            )
+        `);
+    await db.execute(sql`
+            CREATE INDEX IF NOT EXISTS idx_mfa_factors_user
+            ON ${sql.raw(mfaFactorsTableName)}(user_id)
+        `);
+    await db.execute(sql`
+            CREATE TABLE IF NOT EXISTS ${sql.raw(mfaChallengesTableName)} (
+                id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+                factor_id TEXT NOT NULL REFERENCES ${sql.raw(mfaFactorsTableName)}(id) ON DELETE CASCADE,
+                created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+                verified_at TIMESTAMP WITH TIME ZONE,
+                ip_address TEXT,
+                expires_at TIMESTAMP WITH TIME ZONE NOT NULL
             )
-            ON CONFLICT (id) DO NOTHING
         `);
+    await db.execute(sql`
+            CREATE INDEX IF NOT EXISTS idx_mfa_challenges_factor
+            ON ${sql.raw(mfaChallengesTableName)}(factor_id)
+        `);
+    await db.execute(sql`
+            CREATE TABLE IF NOT EXISTS ${sql.raw(recoveryCodesTableName)} (
+                id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+                user_id ${sql.raw(userIdType)} NOT NULL REFERENCES ${sql.raw(usersTableName)}(id) ON DELETE CASCADE,
+                code_hash TEXT NOT NULL,
+                used_at TIMESTAMP WITH TIME ZONE,
+                created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+            )
+        `);
+    await db.execute(sql`
+            CREATE INDEX IF NOT EXISTS idx_recovery_codes_user
+            ON ${sql.raw(recoveryCodesTableName)}(user_id)
+        `);
+    logger.info("✅ Auth tables ready");
+  } catch (error) {
+    logger.error("❌ Failed to create auth tables", {
+      error
+    });
+    logger.warn("⚠️ Continuing without creating auth tables.");
   }
-  console.log("✅ Default roles created: admin, editor, viewer");
 }
 function getColumnKey(table, ...keys2) {
   if (!table) return void 0;
@@ -10127,24 +10568,18 @@ function getColumn(table, ...keys2) {
 class UserService {
   constructor(db, tableOrTables) {
     this.db = db;
-    if (tableOrTables && (tableOrTables.users || tableOrTables.roles)) {
+    if (tableOrTables && tableOrTables.users) {
       const tables = tableOrTables;
       this.usersTable = tables.users || users;
       this.userIdentitiesTable = tables.userIdentities || userIdentities;
-      this.userRolesTable = tables.userRoles || userRoles;
-      this.rolesTable = tables.roles || roles;
     } else {
       const table = tableOrTables;
       this.usersTable = table || users;
       this.userIdentitiesTable = userIdentities;
-      this.userRolesTable = userRoles;
-      this.rolesTable = roles;
     }
   }
   usersTable;
   userIdentitiesTable;
-  userRolesTable;
-  rolesTable;
   getQualifiedUsersTableName() {
     const name = getTableName$1(this.usersTable);
     const schema = getTableConfig(this.usersTable).schema || "public";
@@ -10160,12 +10595,13 @@ class UserService {
     const emailVerified = row.email_verified ?? row.emailVerified ?? false;
     const emailVerificationToken = row.email_verification_token ?? row.emailVerificationToken ?? null;
     const emailVerificationSentAt = row.email_verification_sent_at ?? row.emailVerificationSentAt ?? null;
+    const isAnonymous = row.is_anonymous ?? row.isAnonymous ?? false;
     const createdAt = row.created_at ?? row.createdAt;
     const updatedAt = row.updated_at ?? row.updatedAt;
     const metadata = {
       ...row.metadata || {}
     };
-    const knownKeys = /* @__PURE__ */ new Set(["id", "uid", "email", "password_hash", "passwordHash", "display_name", "displayName", "photo_url", "photoUrl", "photoURL", "email_verified", "emailVerified", "email_verification_token", "emailVerificationToken", "email_verification_sent_at", "emailVerificationSentAt", "created_at", "createdAt", "updated_at", "updatedAt", "metadata"]);
+    const knownKeys = /* @__PURE__ */ new Set(["id", "uid", "email", "password_hash", "passwordHash", "display_name", "displayName", "photo_url", "photoUrl", "photoURL", "email_verified", "emailVerified", "email_verification_token", "emailVerificationToken", "email_verification_sent_at", "emailVerificationSentAt", "is_anonymous", "isAnonymous", "roles", "created_at", "createdAt", "updated_at", "updatedAt", "metadata"]);
     for (const [key, val] of Object.entries(row)) {
       if (!knownKeys.has(key)) {
         const camelKey = camelCase(key);
@@ -10181,6 +10617,7 @@ class UserService {
       emailVerified,
       emailVerificationToken,
       emailVerificationSentAt: emailVerificationSentAt ? new Date(emailVerificationSentAt) : null,
+      isAnonymous,
       createdAt: createdAt ? new Date(createdAt) : /* @__PURE__ */ new Date(),
       updatedAt: updatedAt ? new Date(updatedAt) : /* @__PURE__ */ new Date(),
       metadata
@@ -10197,6 +10634,7 @@ class UserService {
     const emailVerifiedKey = getColumnKey(this.usersTable, "emailVerified", "email_verified") || "emailVerified";
     const emailVerificationTokenKey = getColumnKey(this.usersTable, "emailVerificationToken", "email_verification_token") || "emailVerificationToken";
     const emailVerificationSentAtKey = getColumnKey(this.usersTable, "emailVerificationSentAt", "email_verification_sent_at") || "emailVerificationSentAt";
+    const isAnonymousKey = getColumnKey(this.usersTable, "isAnonymous", "is_anonymous") || "isAnonymous";
     const createdAtKey = getColumnKey(this.usersTable, "createdAt", "created_at") || "createdAt";
     const updatedAtKey = getColumnKey(this.usersTable, "updatedAt", "updated_at") || "updatedAt";
     const metadataKey = getColumnKey(this.usersTable, "metadata") || "metadata";
@@ -10208,6 +10646,7 @@ class UserService {
     if ("emailVerified" in data) payload[emailVerifiedKey] = data.emailVerified;
     if ("emailVerificationToken" in data) payload[emailVerificationTokenKey] = data.emailVerificationToken;
     if ("emailVerificationSentAt" in data) payload[emailVerificationSentAtKey] = data.emailVerificationSentAt;
+    if ("isAnonymous" in data) payload[isAnonymousKey] = data.isAnonymous;
     if ("createdAt" in data) payload[createdAtKey] = data.createdAt;
     if ("updatedAt" in data) payload[updatedAtKey] = data.updatedAt;
     const metadata = {
@@ -10216,7 +10655,7 @@ class UserService {
     const remainingMetadata = {};
     for (const [key, val] of Object.entries(metadata)) {
       const tableColKey = getColumnKey(this.usersTable, key);
-      if (tableColKey && tableColKey !== idKey && tableColKey !== emailKey && tableColKey !== passwordHashKey && tableColKey !== displayNameKey && tableColKey !== photoUrlKey && tableColKey !== emailVerifiedKey && tableColKey !== emailVerificationTokenKey && tableColKey !== emailVerificationSentAtKey && tableColKey !== createdAtKey && tableColKey !== updatedAtKey && tableColKey !== metadataKey) {
+      if (tableColKey && tableColKey !== idKey && tableColKey !== emailKey && tableColKey !== passwordHashKey && tableColKey !== displayNameKey && tableColKey !== photoUrlKey && tableColKey !== emailVerifiedKey && tableColKey !== emailVerificationTokenKey && tableColKey !== emailVerificationSentAtKey && tableColKey !== isAnonymousKey && tableColKey !== createdAtKey && tableColKey !== updatedAtKey && tableColKey !== metadataKey) {
         payload[tableColKey] = val;
       } else {
         remainingMetadata[key] = val;
@@ -10313,19 +10752,18 @@ class UserService {
     const displayNameCol = getColumn(this.usersTable, "displayName", "display_name");
     const displayNameColumn = displayNameCol ? displayNameCol.name : "display_name";
     const idCol = getColumn(this.usersTable, "id");
-    const idColumn = idCol ? idCol.name : "id";
+    idCol ? idCol.name : "id";
     const usersTableName = this.getQualifiedUsersTableName();
-    const rolesSchema = getTableConfig(this.userRolesTable).schema || "public";
     const conditions = [];
     if (roleId) {
-      conditions.push(sql`EXISTS (SELECT 1 FROM ${sql.raw(`"${rolesSchema}"."user_roles"`)} ur WHERE ur.user_id = ${sql.raw(usersTableName)}.${sql.raw(idColumn)} AND ur.role_id = ${roleId})`);
+      conditions.push(sql`${roleId} = ANY(${sql.raw(usersTableName)}.roles)`);
     }
     if (search) {
       const pattern = `%${search}%`;
       conditions.push(sql`(${sql.raw(usersTableName)}.${sql.raw(emailColumn)} ILIKE ${pattern} OR ${sql.raw(usersTableName)}.${sql.raw(displayNameColumn)} ILIKE ${pattern})`);
     }
     const whereClause = conditions.length > 0 ? sql`WHERE ${sql.join(conditions, sql` AND `)}` : sql``;
-    const orderByClause = roleId ? sql`ORDER BY ${sql.raw(usersTableName)}.${sql.raw(orderColumn)} ${direction}` : sql`ORDER BY (SELECT count(*) FROM ${sql.raw(`"${rolesSchema}"."user_roles"`)} ur WHERE ur.user_id = ${sql.raw(usersTableName)}.${sql.raw(idColumn)}) DESC, ${sql.raw(usersTableName)}.${sql.raw(orderColumn)} ${direction}`;
+    const orderByClause = roleId ? sql`ORDER BY ${sql.raw(usersTableName)}.${sql.raw(orderColumn)} ${direction}` : sql`ORDER BY array_length(${sql.raw(usersTableName)}.roles, 1) DESC NULLS LAST, ${sql.raw(usersTableName)}.${sql.raw(orderColumn)} ${direction}`;
     const countResult = await this.db.execute(sql`
             SELECT count(*)::int as total FROM ${sql.raw(usersTableName)}
             ${whereClause}
@@ -10399,55 +10837,57 @@ class UserService {
     return row ? this.mapRowToUser(row) : null;
   }
   /**
-   * Get roles for a user from database
+   * Get roles for a user from database (inline TEXT[] column)
    */
   async getUserRoles(userId) {
-    const rolesSchema = getTableConfig(this.rolesTable).schema || "public";
+    const usersTableName = this.getQualifiedUsersTableName();
     const result = await this.db.execute(sql`
-            SELECT r.id, r.name, r.is_admin, r.default_permissions, r.collection_permissions, r.config
-            FROM ${sql.raw(`"${rolesSchema}"."roles"`)} r
-            INNER JOIN ${sql.raw(`"${rolesSchema}"."user_roles"`)} ur ON r.id = ur.role_id
-            WHERE ur.user_id = ${userId}
+            SELECT roles FROM ${sql.raw(usersTableName)} WHERE id = ${userId}
         `);
-    return result.rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      isAdmin: row.is_admin,
-      defaultPermissions: row.default_permissions,
-      collectionPermissions: row.collection_permissions,
-      config: row.config
+    if (result.rows.length === 0) return [];
+    const row = result.rows[0];
+    const roleIds = row.roles ?? [];
+    return roleIds.map((id) => ({
+      id,
+      name: id,
+      isAdmin: id === "admin",
+      defaultPermissions: null,
+      collectionPermissions: null
     }));
   }
   /**
    * Get role IDs for a user
    */
   async getUserRoleIds(userId) {
-    const roles2 = await this.getUserRoles(userId);
-    return roles2.map((r) => r.id);
+    const usersTableName = this.getQualifiedUsersTableName();
+    const result = await this.db.execute(sql`
+            SELECT roles FROM ${sql.raw(usersTableName)} WHERE id = ${userId}
+        `);
+    if (result.rows.length === 0) return [];
+    const row = result.rows[0];
+    return row.roles ?? [];
   }
   /**
-   * Set roles for a user
+   * Set roles for a user (replaces existing roles)
    */
   async setUserRoles(userId, roleIds) {
-    const rolesSchema = getTableConfig(this.userRolesTable).schema || "public";
-    await this.db.execute(sql`DELETE FROM ${sql.raw(`"${rolesSchema}"."user_roles"`)} WHERE user_id = ${userId}`);
-    for (const roleId of roleIds) {
-      await this.db.execute(sql`
-                INSERT INTO ${sql.raw(`"${rolesSchema}"."user_roles"`)} (user_id, role_id)
-                VALUES (${userId}, ${roleId})
-                ON CONFLICT DO NOTHING
-            `);
-    }
+    const usersTableName = this.getQualifiedUsersTableName();
+    const rolesArray = `{${roleIds.join(",")}}`;
+    await this.db.execute(sql`
+            UPDATE ${sql.raw(usersTableName)}
+            SET roles = ${rolesArray}::text[], updated_at = NOW()
+            WHERE id = ${userId}
+        `);
   }
   /**
-   * Assign a specific role to new user
+   * Assign a specific role to new user (appends if not present)
    */
   async assignDefaultRole(userId, roleId) {
-    const rolesSchema = getTableConfig(this.userRolesTable).schema || "public";
+    const usersTableName = this.getQualifiedUsersTableName();
     await this.db.execute(sql`
-            INSERT INTO ${sql.raw(`"${rolesSchema}"."user_roles"`)} (user_id, role_id)
-            VALUES (${userId}, ${roleId})
-            ON CONFLICT DO NOTHING
+            UPDATE ${sql.raw(usersTableName)}
+            SET roles = array_append(roles, ${roleId}), updated_at = NOW()
+            WHERE id = ${userId} AND NOT (${roleId} = ANY(roles))
         `);
   }
   /**
@@ -10456,107 +10896,13 @@ class UserService {
   async getUserWithRoles(userId) {
     const user = await this.getUserById(userId);
     if (!user) return null;
-    const roles2 = await this.getUserRoles(userId);
+    const roles = await this.getUserRoles(userId);
     return {
       user,
-      roles: roles2
+      roles
     };
   }
 }
-class RoleService {
-  constructor(db, tableOrTables) {
-    this.db = db;
-    if (tableOrTables && (tableOrTables.roles || tableOrTables.users)) {
-      this.rolesTable = tableOrTables.roles || roles;
-    } else {
-      this.rolesTable = tableOrTables || roles;
-    }
-  }
-  rolesTable;
-  getQualifiedRolesTableName() {
-    const name = getTableName$1(this.rolesTable);
-    const schema = getTableConfig(this.rolesTable).schema || "public";
-    return `"${schema}"."${name}"`;
-  }
-  async getRoleById(id) {
-    const tableName = this.getQualifiedRolesTableName();
-    const result = await this.db.execute(sql`
-            SELECT id, name, is_admin, default_permissions, collection_permissions, config
-            FROM ${sql.raw(tableName)}
-            WHERE id = ${id}
-        `);
-    if (result.rows.length === 0) return null;
-    const row = result.rows[0];
-    return {
-      id: row.id,
-      name: row.name,
-      isAdmin: row.is_admin,
-      defaultPermissions: row.default_permissions,
-      collectionPermissions: row.collection_permissions,
-      config: row.config
-    };
-  }
-  async listRoles() {
-    const tableName = this.getQualifiedRolesTableName();
-    const result = await this.db.execute(sql`
-            SELECT id, name, is_admin, default_permissions, collection_permissions, config
-            FROM ${sql.raw(tableName)}
-            ORDER BY name
-        `);
-    return result.rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      isAdmin: row.is_admin,
-      defaultPermissions: row.default_permissions,
-      collectionPermissions: row.collection_permissions,
-      config: row.config
-    }));
-  }
-  async createRole(data) {
-    const tableName = this.getQualifiedRolesTableName();
-    const result = await this.db.execute(sql`
-            INSERT INTO ${sql.raw(tableName)} (id, name, is_admin, default_permissions, collection_permissions, config)
-            VALUES (
-                ${data.id},
-                ${data.name},
-                ${data.isAdmin ?? false},
-                ${data.defaultPermissions ? JSON.stringify(data.defaultPermissions) : null}::jsonb,
-                ${data.collectionPermissions ? JSON.stringify(data.collectionPermissions) : null}::jsonb,
-                ${data.config ? JSON.stringify(data.config) : null}::jsonb
-            )
-            RETURNING id, name, is_admin, default_permissions, collection_permissions, config
-        `);
-    const row = result.rows[0];
-    return {
-      id: row.id,
-      name: row.name,
-      isAdmin: row.is_admin,
-      defaultPermissions: row.default_permissions,
-      collectionPermissions: row.collection_permissions,
-      config: row.config
-    };
-  }
-  async updateRole(id, data) {
-    const existing = await this.getRoleById(id);
-    if (!existing) return null;
-    const tableName = this.getQualifiedRolesTableName();
-    await this.db.execute(sql`
-            UPDATE ${sql.raw(tableName)}
-            SET 
-                name = ${data.name ?? existing.name},
-                is_admin = ${data.isAdmin ?? existing.isAdmin},
-                default_permissions = ${data.defaultPermissions ? JSON.stringify(data.defaultPermissions) : JSON.stringify(existing.defaultPermissions)}::jsonb,
-                collection_permissions = ${data.collectionPermissions !== void 0 ? data.collectionPermissions ? JSON.stringify(data.collectionPermissions) : null : existing.collectionPermissions ? JSON.stringify(existing.collectionPermissions) : null}::jsonb,
-                config = ${data.config ? JSON.stringify(data.config) : existing.config ? JSON.stringify(existing.config) : null}::jsonb
-            WHERE id = ${id}
-        `);
-    return this.getRoleById(id);
-  }
-  async deleteRole(id) {
-    const tableName = this.getQualifiedRolesTableName();
-    await this.db.execute(sql`DELETE FROM ${sql.raw(tableName)} WHERE id = ${id}`);
-  }
-}
 class RefreshTokenService {
   constructor(db, tableOrTables) {
     this.db = db;
@@ -10751,11 +11097,9 @@ class PostgresAuthRepository {
   constructor(db, tableOrTables) {
     this.db = db;
     this.userService = new UserService(db, tableOrTables);
-    this.roleService = new RoleService(db, tableOrTables);
     this.tokenRepository = new PostgresTokenRepository(db, tableOrTables);
   }
   userService;
-  roleService;
   tokenRepository;
   // User operations (delegate to UserService)
   async createUser(data) {
@@ -10815,26 +11159,56 @@ class PostgresAuthRepository {
   async getUserWithRoles(userId) {
     return this.userService.getUserWithRoles(userId);
   }
-  // Role operations (delegate to RoleService)
+  // Role operations (roles are inline on users, synthesized from string IDs)
   async getRoleById(id) {
-    return this.roleService.getRoleById(id);
+    return {
+      id,
+      name: id,
+      isAdmin: id === "admin",
+      defaultPermissions: null,
+      collectionPermissions: null
+    };
   }
   async listRoles() {
-    return this.roleService.listRoles();
-  }
-  async createRole(data) {
-    return this.roleService.createRole({
-      ...data,
-      defaultPermissions: data.defaultPermissions ?? null,
-      collectionPermissions: data.collectionPermissions ?? null,
-      config: data.config ?? null
-    });
+    return [{
+      id: "admin",
+      name: "Admin",
+      isAdmin: true,
+      defaultPermissions: null,
+      collectionPermissions: null
+    }, {
+      id: "editor",
+      name: "Editor",
+      isAdmin: false,
+      defaultPermissions: null,
+      collectionPermissions: null
+    }, {
+      id: "viewer",
+      name: "Viewer",
+      isAdmin: false,
+      defaultPermissions: null,
+      collectionPermissions: null
+    }];
+  }
+  async createRole(_data) {
+    return {
+      id: _data.id,
+      name: _data.name,
+      isAdmin: _data.isAdmin ?? false,
+      defaultPermissions: _data.defaultPermissions ?? null,
+      collectionPermissions: _data.collectionPermissions ?? null
+    };
   }
   async updateRole(id, data) {
-    return this.roleService.updateRole(id, data);
+    return {
+      id,
+      name: data.name ?? id,
+      isAdmin: data.isAdmin ?? id === "admin",
+      defaultPermissions: data.defaultPermissions ?? null,
+      collectionPermissions: data.collectionPermissions ?? null
+    };
   }
-  async deleteRole(id) {
-    await this.roleService.deleteRole(id);
+  async deleteRole(_id) {
   }
   // Token operations (delegate to PostgresTokenRepository)
   async createRefreshToken(userId, tokenHash, expiresAt, userAgent, ipAddress) {
@@ -10870,6 +11244,219 @@ class PostgresAuthRepository {
   async deleteExpiredTokens() {
     await this.tokenRepository.deleteExpiredTokens();
   }
+  // MFA operations (delegate to MfaService)
+  _mfaService = null;
+  getMfaService() {
+    if (!this._mfaService) {
+      this._mfaService = new MfaService(this.db);
+    }
+    return this._mfaService;
+  }
+  async createMfaFactor(userId, factorType, secretEncrypted, friendlyName) {
+    return this.getMfaService().createMfaFactor(userId, factorType, secretEncrypted, friendlyName);
+  }
+  async getMfaFactors(userId) {
+    return this.getMfaService().getMfaFactors(userId);
+  }
+  async getMfaFactorById(factorId) {
+    return this.getMfaService().getMfaFactorById(factorId);
+  }
+  async verifyMfaFactor(factorId) {
+    return this.getMfaService().verifyMfaFactor(factorId);
+  }
+  async deleteMfaFactor(factorId, userId) {
+    return this.getMfaService().deleteMfaFactor(factorId, userId);
+  }
+  async createMfaChallenge(factorId, ipAddress) {
+    return this.getMfaService().createMfaChallenge(factorId, ipAddress);
+  }
+  async getMfaChallengeById(challengeId) {
+    return this.getMfaService().getMfaChallengeById(challengeId);
+  }
+  async verifyMfaChallenge(challengeId) {
+    return this.getMfaService().verifyMfaChallenge(challengeId);
+  }
+  async createRecoveryCodes(userId, codeHashes) {
+    return this.getMfaService().createRecoveryCodes(userId, codeHashes);
+  }
+  async useRecoveryCode(userId, codeHash) {
+    return this.getMfaService().useRecoveryCode(userId, codeHash);
+  }
+  async getUnusedRecoveryCodeCount(userId) {
+    return this.getMfaService().getUnusedRecoveryCodeCount(userId);
+  }
+  async deleteAllRecoveryCodes(userId) {
+    return this.getMfaService().deleteAllRecoveryCodes(userId);
+  }
+  async hasVerifiedMfaFactors(userId) {
+    return this.getMfaService().hasVerifiedMfaFactors(userId);
+  }
+}
+class MfaService {
+  constructor(db, schemaName = "rebase") {
+    this.db = db;
+    this.schemaName = schemaName;
+  }
+  qualify(tableName) {
+    return `"${this.schemaName}"."${tableName}"`;
+  }
+  async createMfaFactor(userId, factorType, secretEncrypted, friendlyName) {
+    const tableName = this.qualify("mfa_factors");
+    const result = await this.db.execute(sql`
+            INSERT INTO ${sql.raw(tableName)} (user_id, factor_type, secret_encrypted, friendly_name)
+            VALUES (${userId}, ${factorType}, ${secretEncrypted}, ${friendlyName ?? null})
+            RETURNING id, user_id, factor_type, friendly_name, verified, created_at, updated_at
+        `);
+    const row = result.rows[0];
+    return {
+      id: row.id,
+      userId: row.user_id,
+      factorType: row.factor_type,
+      friendlyName: row.friendly_name ?? void 0,
+      verified: row.verified,
+      createdAt: new Date(row.created_at),
+      updatedAt: new Date(row.updated_at)
+    };
+  }
+  async getMfaFactors(userId) {
+    const tableName = this.qualify("mfa_factors");
+    const result = await this.db.execute(sql`
+            SELECT id, user_id, factor_type, friendly_name, verified, created_at, updated_at
+            FROM ${sql.raw(tableName)}
+            WHERE user_id = ${userId}
+            ORDER BY created_at
+        `);
+    return result.rows.map((row) => ({
+      id: row.id,
+      userId: row.user_id,
+      factorType: row.factor_type,
+      friendlyName: row.friendly_name ?? void 0,
+      verified: row.verified,
+      createdAt: new Date(row.created_at),
+      updatedAt: new Date(row.updated_at)
+    }));
+  }
+  async getMfaFactorById(factorId) {
+    const tableName = this.qualify("mfa_factors");
+    const result = await this.db.execute(sql`
+            SELECT id, user_id, factor_type, secret_encrypted, friendly_name, verified, created_at, updated_at
+            FROM ${sql.raw(tableName)}
+            WHERE id = ${factorId}
+        `);
+    if (result.rows.length === 0) return null;
+    const row = result.rows[0];
+    return {
+      id: row.id,
+      userId: row.user_id,
+      factorType: row.factor_type,
+      secretEncrypted: row.secret_encrypted,
+      friendlyName: row.friendly_name ?? void 0,
+      verified: row.verified,
+      createdAt: new Date(row.created_at),
+      updatedAt: new Date(row.updated_at)
+    };
+  }
+  async verifyMfaFactor(factorId) {
+    const tableName = this.qualify("mfa_factors");
+    await this.db.execute(sql`
+            UPDATE ${sql.raw(tableName)}
+            SET verified = TRUE, updated_at = NOW()
+            WHERE id = ${factorId}
+        `);
+  }
+  async deleteMfaFactor(factorId, userId) {
+    const tableName = this.qualify("mfa_factors");
+    await this.db.execute(sql`
+            DELETE FROM ${sql.raw(tableName)}
+            WHERE id = ${factorId} AND user_id = ${userId}
+        `);
+  }
+  async createMfaChallenge(factorId, ipAddress) {
+    const tableName = this.qualify("mfa_challenges");
+    const expiresAt = new Date(Date.now() + 5 * 60 * 1e3);
+    const result = await this.db.execute(sql`
+            INSERT INTO ${sql.raw(tableName)} (factor_id, ip_address, expires_at)
+            VALUES (${factorId}, ${ipAddress ?? null}, ${expiresAt})
+            RETURNING id, factor_id, created_at, verified_at, ip_address
+        `);
+    const row = result.rows[0];
+    return {
+      id: row.id,
+      factorId: row.factor_id,
+      createdAt: new Date(row.created_at),
+      verifiedAt: row.verified_at ? new Date(row.verified_at) : void 0,
+      ipAddress: row.ip_address ?? void 0
+    };
+  }
+  async getMfaChallengeById(challengeId) {
+    const tableName = this.qualify("mfa_challenges");
+    const result = await this.db.execute(sql`
+            SELECT id, factor_id, created_at, verified_at, ip_address, expires_at
+            FROM ${sql.raw(tableName)}
+            WHERE id = ${challengeId} AND expires_at > NOW() AND verified_at IS NULL
+        `);
+    if (result.rows.length === 0) return null;
+    const row = result.rows[0];
+    return {
+      id: row.id,
+      factorId: row.factor_id,
+      createdAt: new Date(row.created_at),
+      verifiedAt: row.verified_at ? new Date(row.verified_at) : void 0,
+      ipAddress: row.ip_address ?? void 0
+    };
+  }
+  async verifyMfaChallenge(challengeId) {
+    const tableName = this.qualify("mfa_challenges");
+    await this.db.execute(sql`
+            UPDATE ${sql.raw(tableName)}
+            SET verified_at = NOW()
+            WHERE id = ${challengeId}
+        `);
+  }
+  async createRecoveryCodes(userId, codeHashes) {
+    const tableName = this.qualify("recovery_codes");
+    await this.db.execute(sql`
+            DELETE FROM ${sql.raw(tableName)} WHERE user_id = ${userId}
+        `);
+    for (const hash of codeHashes) {
+      await this.db.execute(sql`
+                INSERT INTO ${sql.raw(tableName)} (user_id, code_hash)
+                VALUES (${userId}, ${hash})
+            `);
+    }
+  }
+  async useRecoveryCode(userId, codeHash) {
+    const tableName = this.qualify("recovery_codes");
+    const result = await this.db.execute(sql`
+            UPDATE ${sql.raw(tableName)}
+            SET used_at = NOW()
+            WHERE user_id = ${userId} AND code_hash = ${codeHash} AND used_at IS NULL
+            RETURNING id
+        `);
+    return result.rows.length > 0;
+  }
+  async getUnusedRecoveryCodeCount(userId) {
+    const tableName = this.qualify("recovery_codes");
+    const result = await this.db.execute(sql`
+            SELECT COUNT(*)::int as count FROM ${sql.raw(tableName)}
+            WHERE user_id = ${userId} AND used_at IS NULL
+        `);
+    return result.rows[0].count;
+  }
+  async deleteAllRecoveryCodes(userId) {
+    const tableName = this.qualify("recovery_codes");
+    await this.db.execute(sql`
+            DELETE FROM ${sql.raw(tableName)} WHERE user_id = ${userId}
+        `);
+  }
+  async hasVerifiedMfaFactors(userId) {
+    const tableName = this.qualify("mfa_factors");
+    const result = await this.db.execute(sql`
+            SELECT COUNT(*)::int as count FROM ${sql.raw(tableName)}
+            WHERE user_id = ${userId} AND verified = TRUE
+        `);
+    return result.rows[0].count > 0;
+  }
 }
 const DEFAULT_RETENTION = {
   maxEntries: 200,
@@ -11080,7 +11667,7 @@ function createPostgresBootstrapper(pgConfig) {
       const registry = new PostgresCollectionRegistry();
       if (collections) {
         registry.registerMultiple(collections);
-        console.log(`📋 [PostgresRegistry] Registered ${registry.getCollections().length} collections: [${registry.getCollections().map((c) => c.slug).join(", ")}]`);
+        logger.info(`📋 [PostgresRegistry] Registered ${registry.getCollections().length} collections: [${registry.getCollections().map((c) => c.slug).join(", ")}]`);
       }
       if (pgConfig.schema?.tables) {
         Object.values(pgConfig.schema.tables).forEach((table) => {
@@ -11106,10 +11693,28 @@ function createPostgresBootstrapper(pgConfig) {
       try {
         await schemaAwareDb.execute(sql`SELECT 1`);
       } catch (err) {
-        console.error("❌ Failed to connect to PostgreSQL:", err);
-        console.warn("⚠️ Continuing without initial database verification. Drizzle/PG will attempt to connect on subsequent queries.");
+        logger.error("❌ Failed to connect to PostgreSQL", {
+          error: err
+        });
+        logger.warn("⚠️ Continuing without initial database verification. Drizzle/PG will attempt to connect on subsequent queries.");
       }
       const realtimeService = new RealtimeService(schemaAwareDb, registry);
+      let readDb;
+      const readUrl = process.env.DATABASE_READ_URL;
+      if (readUrl && readUrl !== pgConfig.connectionString) {
+        try {
+          const {
+            createReadReplicaConnection: createReadReplicaConnection2
+          } = await Promise.resolve().then(() => connection);
+          const readResources = createReadReplicaConnection2(readUrl, mergedSchema);
+          readDb = readResources.db;
+          logger.info("📖 [PostgresBootstrapper] Read replica connection established");
+        } catch (err) {
+          logger.warn("⚠️ Could not connect to read replica, falling back to primary for all queries", {
+            error: err
+          });
+        }
+      }
       const poolManager = pgConfig.adminConnectionString ? new DatabasePoolManager(pgConfig.adminConnectionString) : void 0;
       const driver = new PostgresBackendDriver(schemaAwareDb, realtimeService, registry, void 0, poolManager);
       realtimeService.setDataDriver(driver);
@@ -11117,18 +11722,24 @@ function createPostgresBootstrapper(pgConfig) {
         try {
           await driver.branchService.ensureBranchMetadataTable();
         } catch (err) {
-          console.warn("⚠️ Could not initialize branch metadata table:", err);
+          logger.warn("⚠️ Could not initialize branch metadata table", {
+            error: err
+          });
         }
       }
-      if (pgConfig.connectionString) {
+      const directUrl = process.env.DATABASE_DIRECT_URL || pgConfig.connectionString;
+      if (directUrl) {
         try {
-          await realtimeService.startListening(pgConfig.connectionString);
+          await realtimeService.startListening(directUrl);
         } catch (err) {
-          console.warn("⚠️ Cross-instance realtime could not be started:", err);
+          logger.warn("⚠️ Cross-instance realtime could not be started", {
+            error: err
+          });
         }
       }
       const internals = {
         db: schemaAwareDb,
+        readDb,
         registry,
         realtimeService,
         driver,
@@ -11153,28 +11764,19 @@ function createPostgresBootstrapper(pgConfig) {
         emailService = createEmailService(authConfig.email);
       }
       const customUsersTable = registry?.getTable("users");
-      const customRolesTable = registry?.getTable("roles");
       let usersSchemaName = "rebase";
-      let rolesSchemaName = "rebase";
       if (customUsersTable) {
         usersSchemaName = getTableConfig(customUsersTable).schema || "public";
       }
-      if (customRolesTable) {
-        rolesSchemaName = getTableConfig(customRolesTable).schema || "public";
-      }
-      const authTables = createAuthSchema(rolesSchemaName, usersSchemaName);
+      const authTables = createAuthSchema(usersSchemaName);
       if (customUsersTable) {
         authTables.users = customUsersTable;
       }
-      if (customRolesTable) {
-        authTables.roles = customRolesTable;
-      }
       const userService = new UserService(db, authTables);
-      const roleService = new RoleService(db, authTables);
       const authRepository = new PostgresAuthRepository(db, authTables);
       return {
         userService,
-        roleService,
+        roleService: userService,
         emailService,
         authRepository
       };
@@ -11266,22 +11868,25 @@ export {
   RealtimeService,
   appConfig,
   createAuthSchema,
+  createDirectDatabaseConnection,
   createPostgresAdapter,
   createPostgresBootstrapper,
   createPostgresDatabaseConnection,
   createPostgresWebSocket,
+  createReadReplicaConnection,
   generateSchema,
+  mfaChallenges,
+  mfaChallengesRelations,
+  mfaFactors,
+  mfaFactorsRelations,
   passwordResetTokens,
   passwordResetTokensRelations,
-  rebaseSchema,
+  recoveryCodes,
+  recoveryCodesRelations,
   refreshTokens,
   refreshTokensRelations,
-  roles,
-  rolesRelations,
   userIdentities,
   userIdentitiesRelations,
-  userRoles,
-  userRolesRelations,
   users,
   usersRelations,
   usersSchema