@sonicjs-cms/core 2.2.0 → 2.3.0

package/dist/{chunk-R57VFNP3.js → chunk-3ZLCMOCM.js}

@@ -1,9 +1,9 @@
-import { getCacheService, CACHE_CONFIGS, getLogger, SettingsService } from './chunk-L232U757.js';
-import { requireAuth, isPluginActive, requireRole, AuthManager, logActivity } from './chunk-OORGXYDA.js';
-import { PluginService } from './chunk-K4Z3IHOK.js';
-import { MigrationService } from './chunk-ZPMFT2JW.js';
+import { getCacheService, CACHE_CONFIGS, getLogger, SettingsService } from './chunk-Q52ZQFMB.js';
+import { requireAuth, isPluginActive, requireRole, AuthManager, logActivity } from './chunk-5TRX2JHU.js';
+import { PluginService } from './chunk-7CXL5K7N.js';
+import { MigrationService } from './chunk-CAMM3MJV.js';
 import { init_admin_layout_catalyst_template, renderDesignPage, renderCheckboxPage, renderTestimonialsList, renderCodeExamplesList, renderAlert, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayoutCatalyst, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-5RKQB2JG.js';
-import { QueryFilterBuilder, sanitizeInput, getCoreVersion, escapeHtml } from './chunk-ZUK55KZB.js';
+import { QueryFilterBuilder, sanitizeInput, getCoreVersion, escapeHtml } from './chunk-4C433FET.js';
 import { metricsTracker } from './chunk-FICTAGD4.js';
 import { Hono } from 'hono';
 import { cors } from 'hono/cors';
@@ -17,8 +17,8 @@ var apiContentCrudRoutes = new Hono();
 apiContentCrudRoutes.get("/:id", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const stmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const db = c.env.DB;
+    const stmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const content = await stmt.bind(id).first();
     if (!content) {
       return c.json({ error: "Content not found" }, 404);
@@ -44,7 +44,7 @@ apiContentCrudRoutes.get("/:id", async (c) => {
 });
 apiContentCrudRoutes.post("/", requireAuth(), async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const user = c.get("user");
     const body = await c.req.json();
     const { collectionId, title, slug, status, data } = body;
@@ -56,7 +56,7 @@ apiContentCrudRoutes.post("/", requireAuth(), async (c) => {
     }
     let finalSlug = slug || title;
     finalSlug = finalSlug.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").trim();
-    const duplicateCheck = db2.prepare(
+    const duplicateCheck = db.prepare(
       "SELECT id FROM content WHERE collection_id = ? AND slug = ?"
     );
     const existing = await duplicateCheck.bind(collectionId, finalSlug).first();
@@ -65,7 +65,7 @@ apiContentCrudRoutes.post("/", requireAuth(), async (c) => {
     }
     const contentId = crypto.randomUUID();
     const now = Date.now();
-    const insertStmt = db2.prepare(`
+    const insertStmt = db.prepare(`
       INSERT INTO content (
         id, collection_id, slug, title, data, status,
         author_id, created_at, updated_at
@@ -86,7 +86,7 @@ apiContentCrudRoutes.post("/", requireAuth(), async (c) => {
     const cache = getCacheService(CACHE_CONFIGS.api);
     await cache.invalidate(`content:list:${collectionId}:*`);
     await cache.invalidate("content-filtered:*");
-    const getStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const getStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const createdContent = await getStmt.bind(contentId).first();
     return c.json({
       data: {
@@ -111,9 +111,9 @@ apiContentCrudRoutes.post("/", requireAuth(), async (c) => {
 apiContentCrudRoutes.put("/:id", requireAuth(), async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const body = await c.req.json();
-    const existingStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const existingStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const existing = await existingStmt.bind(id).first();
     if (!existing) {
       return c.json({ error: "Content not found" }, 404);
@@ -141,7 +141,7 @@ apiContentCrudRoutes.put("/:id", requireAuth(), async (c) => {
     updates.push("updated_at = ?");
     params.push(now);
     params.push(id);
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE content SET ${updates.join(", ")}
       WHERE id = ?
     `);
@@ -150,7 +150,7 @@ apiContentCrudRoutes.put("/:id", requireAuth(), async (c) => {
     await cache.delete(cache.generateKey("content", id));
     await cache.invalidate(`content:list:${existing.collection_id}:*`);
     await cache.invalidate("content-filtered:*");
-    const getStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const getStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const updatedContent = await getStmt.bind(id).first();
     return c.json({
       data: {
@@ -175,13 +175,13 @@ apiContentCrudRoutes.put("/:id", requireAuth(), async (c) => {
 apiContentCrudRoutes.delete("/:id", requireAuth(), async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const existingStmt = db2.prepare("SELECT collection_id FROM content WHERE id = ?");
+    const db = c.env.DB;
+    const existingStmt = db.prepare("SELECT collection_id FROM content WHERE id = ?");
     const existing = await existingStmt.bind(id).first();
     if (!existing) {
       return c.json({ error: "Content not found" }, 404);
     }
-    const deleteStmt = db2.prepare("DELETE FROM content WHERE id = ?");
+    const deleteStmt = db.prepare("DELETE FROM content WHERE id = ?");
     await deleteStmt.bind(id).run();
     const cache = getCacheService(CACHE_CONFIGS.api);
     await cache.delete(cache.generateKey("content", id));
@@ -254,7 +254,7 @@ apiRoutes.get("/health", (c) => {
 apiRoutes.get("/collections", async (c) => {
   const executionStart = Date.now();
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const cacheEnabled = c.get("cacheEnabled");
     const cache = getCacheService(CACHE_CONFIGS.api);
     const cacheKey = cache.generateKey("collections", "all");
@@ -282,7 +282,7 @@ apiRoutes.get("/collections", async (c) => {
     }
     c.header("X-Cache-Status", "MISS");
     c.header("X-Cache-Source", "database");
-    const stmt = db2.prepare("SELECT * FROM collections WHERE is_active = 1");
+    const stmt = db.prepare("SELECT * FROM collections WHERE is_active = 1");
     const { results } = await stmt.all();
     const transformedResults = results.map((row) => ({
       ...row,
@@ -313,11 +313,11 @@ apiRoutes.get("/collections", async (c) => {
 apiRoutes.get("/content", async (c) => {
   const executionStart = Date.now();
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const queryParams = c.req.query();
     if (queryParams.collection) {
       const collectionName = queryParams.collection;
-      const collectionStmt = db2.prepare("SELECT id FROM collections WHERE name = ? AND is_active = 1");
+      const collectionStmt = db.prepare("SELECT id FROM collections WHERE name = ? AND is_active = 1");
       const collectionResult = await collectionStmt.bind(collectionName).first();
       if (collectionResult) {
         queryParams.collection_id = collectionResult.id;
@@ -373,7 +373,7 @@ apiRoutes.get("/content", async (c) => {
     }
     c.header("X-Cache-Status", "MISS");
     c.header("X-Cache-Source", "database");
-    const stmt = db2.prepare(queryResult.sql);
+    const stmt = db.prepare(queryResult.sql);
     const boundStmt = queryResult.params.length > 0 ? stmt.bind(...queryResult.params) : stmt;
     const { results } = await boundStmt.all();
     const transformedResults = results.map((row) => ({
@@ -418,9 +418,9 @@ apiRoutes.get("/collections/:collection/content", async (c) => {
   const executionStart = Date.now();
   try {
     const collection = c.req.param("collection");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const queryParams = c.req.query();
-    const collectionStmt = db2.prepare("SELECT * FROM collections WHERE name = ? AND is_active = 1");
+    const collectionStmt = db.prepare("SELECT * FROM collections WHERE name = ? AND is_active = 1");
     const collectionResult = await collectionStmt.bind(collection).first();
     if (!collectionResult) {
       return c.json({ error: "Collection not found" }, 404);
@@ -476,7 +476,7 @@ apiRoutes.get("/collections/:collection/content", async (c) => {
     }
     c.header("X-Cache-Status", "MISS");
     c.header("X-Cache-Source", "database");
-    const stmt = db2.prepare(queryResult.sql);
+    const stmt = db.prepare(queryResult.sql);
     const boundStmt = queryResult.params.length > 0 ? stmt.bind(...queryResult.params) : stmt;
     const { results } = await boundStmt.all();
     const transformedResults = results.map((row) => ({
@@ -1240,20 +1240,20 @@ apiSystemRoutes.get("/info", (c) => {
 });
 apiSystemRoutes.get("/stats", async (c) => {
   try {
-    const db2 = c.env.DB;
-    const contentStats = await db2.prepare(`
+    const db = c.env.DB;
+    const contentStats = await db.prepare(`
       SELECT COUNT(*) as total_content
       FROM content
       WHERE deleted_at IS NULL
     `).first();
-    const mediaStats = await db2.prepare(`
+    const mediaStats = await db.prepare(`
       SELECT
         COUNT(*) as total_files,
         SUM(size) as total_size
       FROM media
       WHERE deleted_at IS NULL
     `).first();
-    const userStats = await db2.prepare(`
+    const userStats = await db.prepare(`
       SELECT COUNT(*) as total_users
       FROM users
     `).first();
@@ -1314,10 +1314,10 @@ adminApiRoutes.use("*", requireAuth());
 adminApiRoutes.use("*", requireRole(["admin", "editor"]));
 adminApiRoutes.get("/stats", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let collectionsCount = 0;
     try {
-      const collectionsStmt = db2.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1");
+      const collectionsStmt = db.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1");
       const collectionsResult = await collectionsStmt.first();
       collectionsCount = collectionsResult?.count || 0;
     } catch (error) {
@@ -1325,7 +1325,7 @@ adminApiRoutes.get("/stats", async (c) => {
     }
     let contentCount = 0;
     try {
-      const contentStmt = db2.prepare("SELECT COUNT(*) as count FROM content WHERE deleted_at IS NULL");
+      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content WHERE deleted_at IS NULL");
       const contentResult = await contentStmt.first();
       contentCount = contentResult?.count || 0;
     } catch (error) {
@@ -1334,7 +1334,7 @@ adminApiRoutes.get("/stats", async (c) => {
     let mediaCount = 0;
     let mediaSize = 0;
     try {
-      const mediaStmt = db2.prepare("SELECT COUNT(*) as count, COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
+      const mediaStmt = db.prepare("SELECT COUNT(*) as count, COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
       const mediaResult = await mediaStmt.first();
       mediaCount = mediaResult?.count || 0;
       mediaSize = mediaResult?.total_size || 0;
@@ -1343,7 +1343,7 @@ adminApiRoutes.get("/stats", async (c) => {
     }
     let usersCount = 0;
     try {
-      const usersStmt = db2.prepare("SELECT COUNT(*) as count FROM users WHERE is_active = 1");
+      const usersStmt = db.prepare("SELECT COUNT(*) as count FROM users WHERE is_active = 1");
       const usersResult = await usersStmt.first();
       usersCount = usersResult?.count || 0;
     } catch (error) {
@@ -1364,17 +1364,17 @@ adminApiRoutes.get("/stats", async (c) => {
 });
 adminApiRoutes.get("/storage", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let databaseSize = 0;
     try {
-      const result = await db2.prepare("SELECT 1").run();
+      const result = await db.prepare("SELECT 1").run();
       databaseSize = result?.meta?.size_after || 0;
     } catch (error) {
       console.error("Error fetching database size:", error);
     }
     let mediaSize = 0;
     try {
-      const mediaStmt = db2.prepare("SELECT COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
+      const mediaStmt = db.prepare("SELECT COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
       const mediaResult = await mediaStmt.first();
       mediaSize = mediaResult?.total_size || 0;
     } catch (error) {
@@ -1393,9 +1393,9 @@ adminApiRoutes.get("/storage", async (c) => {
 });
 adminApiRoutes.get("/activity", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const limit = parseInt(c.req.query("limit") || "10");
-    const activityStmt = db2.prepare(`
+    const activityStmt = db.prepare(`
       SELECT
         a.id,
         a.action,
@@ -1457,13 +1457,13 @@ var updateCollectionSchema = z.object({
 });
 adminApiRoutes.get("/collections", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const search = c.req.query("search") || "";
     const includeInactive = c.req.query("includeInactive") === "true";
     let stmt;
     let results;
     if (search) {
-      stmt = db2.prepare(`
+      stmt = db.prepare(`
         SELECT id, name, display_name, description, created_at, updated_at, is_active, managed
         FROM collections
         WHERE ${includeInactive ? "1=1" : "is_active = 1"}
@@ -1474,7 +1474,7 @@ adminApiRoutes.get("/collections", async (c) => {
       const queryResults = await stmt.bind(searchParam, searchParam, searchParam).all();
       results = queryResults.results;
     } else {
-      stmt = db2.prepare(`
+      stmt = db.prepare(`
         SELECT id, name, display_name, description, created_at, updated_at, is_active, managed
         FROM collections
         ${includeInactive ? "" : "WHERE is_active = 1"}
@@ -1483,7 +1483,7 @@ adminApiRoutes.get("/collections", async (c) => {
       const queryResults = await stmt.all();
       results = queryResults.results;
     }
-    const fieldCountStmt = db2.prepare("SELECT collection_id, COUNT(*) as count FROM content_fields GROUP BY collection_id");
+    const fieldCountStmt = db.prepare("SELECT collection_id, COUNT(*) as count FROM content_fields GROUP BY collection_id");
     const { results: fieldCountResults } = await fieldCountStmt.all();
     const fieldCounts = new Map((fieldCountResults || []).map((row) => [String(row.collection_id), Number(row.count)]));
     const collections = (results || []).map((row) => ({
@@ -1510,13 +1510,13 @@ adminApiRoutes.get("/collections", async (c) => {
 adminApiRoutes.get("/collections/:id", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const stmt = db2.prepare("SELECT * FROM collections WHERE id = ?");
+    const db = c.env.DB;
+    const stmt = db.prepare("SELECT * FROM collections WHERE id = ?");
     const collection = await stmt.bind(id).first();
     if (!collection) {
       return c.json({ error: "Collection not found" }, 404);
     }
-    const fieldsStmt = db2.prepare(`
+    const fieldsStmt = db.prepare(`
       SELECT * FROM content_fields
       WHERE collection_id = ?
       ORDER BY field_order ASC
@@ -1565,13 +1565,13 @@ adminApiRoutes.post("/collections", async (c) => {
     }
     const validation = createCollectionSchema.safeParse(body);
     if (!validation.success) {
-      return c.json({ error: "Validation failed", details: validation.error.errors }, 400);
+      return c.json({ error: "Validation failed", details: validation.error.issues }, 400);
     }
     const validatedData = validation.data;
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const ____user = c.get("user");
     const displayName = validatedData.displayName || validatedData.display_name || "";
-    const existingStmt = db2.prepare("SELECT id FROM collections WHERE name = ?");
+    const existingStmt = db.prepare("SELECT id FROM collections WHERE name = ?");
     const existing = await existingStmt.bind(validatedData.name).first();
     if (existing) {
       return c.json({ error: "A collection with this name already exists" }, 400);
@@ -1600,7 +1600,7 @@ adminApiRoutes.post("/collections", async (c) => {
     };
     const collectionId = crypto.randomUUID();
     const now = Date.now();
-    const insertStmt = db2.prepare(`
+    const insertStmt = db.prepare(`
         INSERT INTO collections (id, name, display_name, description, schema, is_active, created_at, updated_at)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
       `);
@@ -1639,11 +1639,11 @@ adminApiRoutes.patch("/collections/:id", async (c) => {
     const body = await c.req.json();
     const validation = updateCollectionSchema.safeParse(body);
     if (!validation.success) {
-      return c.json({ error: "Validation failed", details: validation.error.errors }, 400);
+      return c.json({ error: "Validation failed", details: validation.error.issues }, 400);
     }
     const validatedData = validation.data;
-    const db2 = c.env.DB;
-    const checkStmt = db2.prepare("SELECT * FROM collections WHERE id = ?");
+    const db = c.env.DB;
+    const checkStmt = db.prepare("SELECT * FROM collections WHERE id = ?");
     const existing = await checkStmt.bind(id).first();
     if (!existing) {
       return c.json({ error: "Collection not found" }, 404);
@@ -1668,7 +1668,7 @@ adminApiRoutes.patch("/collections/:id", async (c) => {
     updateFields.push("updated_at = ?");
     updateParams.push(Date.now());
     updateParams.push(id);
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
         UPDATE collections
         SET ${updateFields.join(", ")}
         WHERE id = ?
@@ -1689,22 +1689,22 @@ adminApiRoutes.patch("/collections/:id", async (c) => {
 adminApiRoutes.delete("/collections/:id", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const collectionStmt = db2.prepare("SELECT name FROM collections WHERE id = ?");
+    const db = c.env.DB;
+    const collectionStmt = db.prepare("SELECT name FROM collections WHERE id = ?");
     const collection = await collectionStmt.bind(id).first();
     if (!collection) {
       return c.json({ error: "Collection not found" }, 404);
     }
-    const contentStmt = db2.prepare("SELECT COUNT(*) as count FROM content WHERE collection_id = ?");
+    const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content WHERE collection_id = ?");
     const contentResult = await contentStmt.bind(id).first();
     if (contentResult && contentResult.count > 0) {
       return c.json({
         error: `Cannot delete collection: it contains ${contentResult.count} content item(s). Delete all content first.`
       }, 400);
     }
-    const deleteFieldsStmt = db2.prepare("DELETE FROM content_fields WHERE collection_id = ?");
+    const deleteFieldsStmt = db.prepare("DELETE FROM content_fields WHERE collection_id = ?");
     await deleteFieldsStmt.bind(id).run();
-    const deleteStmt = db2.prepare("DELETE FROM collections WHERE id = ?");
+    const deleteStmt = db.prepare("DELETE FROM collections WHERE id = ?");
     await deleteStmt.bind(id).run();
     try {
       await c.env.CACHE_KV.delete("cache:collections:all");
@@ -1720,9 +1720,9 @@ adminApiRoutes.delete("/collections/:id", async (c) => {
 });
 adminApiRoutes.get("/migrations/status", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-IHERIQVD.js');
-    const db2 = c.env.DB;
-    const migrationService = new MigrationService2(db2);
+    const { MigrationService: MigrationService2 } = await import('./migrations-B2CDNN76.js');
+    const db = c.env.DB;
+    const migrationService = new MigrationService2(db);
     const status = await migrationService.getMigrationStatus();
     return c.json({
       success: true,
@@ -1745,9 +1745,9 @@ adminApiRoutes.post("/migrations/run", async (c) => {
         error: "Unauthorized. Admin access required."
       }, 403);
     }
-    const { MigrationService: MigrationService2 } = await import('./migrations-IHERIQVD.js');
-    const db2 = c.env.DB;
-    const migrationService = new MigrationService2(db2);
+    const { MigrationService: MigrationService2 } = await import('./migrations-B2CDNN76.js');
+    const db = c.env.DB;
+    const migrationService = new MigrationService2(db);
     const result = await migrationService.runPendingMigrations();
     return c.json({
       success: result.success,
@@ -1764,9 +1764,9 @@ adminApiRoutes.post("/migrations/run", async (c) => {
 });
 adminApiRoutes.get("/migrations/validate", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-IHERIQVD.js');
-    const db2 = c.env.DB;
-    const migrationService = new MigrationService2(db2);
+    const { MigrationService: MigrationService2 } = await import('./migrations-B2CDNN76.js');
+    const db = c.env.DB;
+    const migrationService = new MigrationService2(db);
     const validation = await migrationService.validateSchema();
     return c.json({
       success: true,
@@ -2117,19 +2117,20 @@ function renderRegisterPage(data) {
     </html>
   `;
 }
+var baseRegistrationSchema = z.object({
+  email: z.string().email("Valid email is required"),
+  password: z.string().min(8, "Password must be at least 8 characters"),
+  username: z.string().min(3, "Username must be at least 3 characters").optional(),
+  firstName: z.string().min(1, "First name is required").optional(),
+  lastName: z.string().min(1, "Last name is required").optional()
+});
 var authValidationService = {
   /**
    * Build registration schema dynamically based on auth settings
    * For now, returns a static schema with standard fields
    */
   async buildRegistrationSchema(_db) {
-    return z.object({
-      email: z.string().email("Valid email is required"),
-      password: z.string().min(8, "Password must be at least 8 characters"),
-      username: z.string().min(3, "Username must be at least 3 characters").optional(),
-      firstName: z.string().min(1, "First name is required").optional(),
-      lastName: z.string().min(1, "Last name is required").optional()
-    });
+    return baseRegistrationSchema;
   },
   /**
    * Generate default values for optional fields
@@ -2158,10 +2159,10 @@ authRoutes.get("/login", async (c) => {
     message: message || void 0,
     version: c.get("appVersion")
   };
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   let demoLoginActive = false;
   try {
-    const plugin = await db2.prepare("SELECT * FROM plugins WHERE id = ? AND status = ?").bind("demo-login-prefill", "active").first();
+    const plugin = await db.prepare("SELECT * FROM plugins WHERE id = ? AND status = ?").bind("demo-login-prefill", "active").first();
     demoLoginActive = !!plugin;
   } catch (error2) {
   }
@@ -2182,21 +2183,21 @@ authRoutes.post(
   "/register",
   async (c) => {
     try {
-      const db2 = c.env.DB;
+      const db = c.env.DB;
       let requestData;
       try {
         requestData = await c.req.json();
       } catch (parseError) {
         return c.json({ error: "Invalid JSON in request body" }, 400);
       }
-      const validationSchema = await authValidationService.buildRegistrationSchema(db2);
+      const validationSchema = await authValidationService.buildRegistrationSchema(db);
       let validatedData;
       try {
         validatedData = await validationSchema.parseAsync(requestData);
       } catch (validationError) {
         return c.json({
           error: "Validation failed",
-          details: validationError.errors?.map((e) => e.message) || [validationError.message || "Invalid request data"]
+          details: validationError.issues?.map((e) => e.message) || [validationError.message || "Invalid request data"]
         }, 400);
       }
       const email = validatedData.email;
@@ -2205,14 +2206,14 @@ authRoutes.post(
       const firstName = validatedData.firstName || authValidationService.generateDefaultValue("firstName", validatedData);
       const lastName = validatedData.lastName || authValidationService.generateDefaultValue("lastName", validatedData);
       const normalizedEmail = email.toLowerCase();
-      const existingUser = await db2.prepare("SELECT id FROM users WHERE email = ? OR username = ?").bind(normalizedEmail, username).first();
+      const existingUser = await db.prepare("SELECT id FROM users WHERE email = ? OR username = ?").bind(normalizedEmail, username).first();
       if (existingUser) {
         return c.json({ error: "User with this email or username already exists" }, 400);
       }
       const passwordHash = await AuthManager.hashPassword(password);
       const userId = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
-      await db2.prepare(`
+      await db.prepare(`
         INSERT INTO users (id, email, username, first_name, last_name, password_hash, role, is_active, created_at, updated_at)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       `).bind(
@@ -2265,15 +2266,15 @@ authRoutes.post("/login", async (c) => {
     const body = await c.req.json();
     const validation = loginSchema.safeParse(body);
     if (!validation.success) {
-      return c.json({ error: "Validation failed", details: validation.error.errors }, 400);
+      return c.json({ error: "Validation failed", details: validation.error.issues }, 400);
     }
     const { email, password } = validation.data;
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const normalizedEmail = email.toLowerCase();
     const cache = getCacheService(CACHE_CONFIGS.user);
     let user = await cache.get(cache.generateKey("user", `email:${normalizedEmail}`));
     if (!user) {
-      user = await db2.prepare("SELECT * FROM users WHERE email = ? AND is_active = 1").bind(normalizedEmail).first();
+      user = await db.prepare("SELECT * FROM users WHERE email = ? AND is_active = 1").bind(normalizedEmail).first();
       if (user) {
         await cache.set(cache.generateKey("user", `email:${normalizedEmail}`), user);
         await cache.set(cache.generateKey("user", user.id), user);
@@ -2294,7 +2295,7 @@ authRoutes.post("/login", async (c) => {
       maxAge: 60 * 60 * 24
       // 24 hours
     });
-    await db2.prepare("UPDATE users SET last_login_at = ? WHERE id = ?").bind((/* @__PURE__ */ new Date()).getTime(), user.id).run();
+    await db.prepare("UPDATE users SET last_login_at = ? WHERE id = ?").bind((/* @__PURE__ */ new Date()).getTime(), user.id).run();
     await cache.delete(cache.generateKey("user", user.id));
     await cache.delete(cache.generateKey("user", `email:${normalizedEmail}`));
     return c.json({
@@ -2341,8 +2342,8 @@ authRoutes.get("/me", requireAuth(), async (c) => {
     if (!user) {
       return c.json({ error: "Not authenticated" }, 401);
     }
-    const db2 = c.env.DB;
-    const userData = await db2.prepare("SELECT id, email, username, first_name, last_name, role, created_at FROM users WHERE id = ?").bind(user.userId).first();
+    const db = c.env.DB;
+    const userData = await db.prepare("SELECT id, email, username, first_name, last_name, role, created_at FROM users WHERE id = ?").bind(user.userId).first();
     if (!userData) {
       return c.json({ error: "User not found" }, 404);
     }
@@ -2374,7 +2375,7 @@ authRoutes.post("/refresh", requireAuth(), async (c) => {
 });
 authRoutes.post("/register/form", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const formData = await c.req.formData();
     const requestData = {
       email: formData.get("email"),
@@ -2385,12 +2386,12 @@ authRoutes.post("/register/form", async (c) => {
     };
     const normalizedEmail = requestData.email?.toLowerCase();
     requestData.email = normalizedEmail;
-    const validationSchema = await authValidationService.buildRegistrationSchema(db2);
+    const validationSchema = await authValidationService.buildRegistrationSchema(db);
     const validation = await validationSchema.safeParseAsync(requestData);
     if (!validation.success) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
-          ${validation.error.errors.map((err) => err.message).join(", ")}
+          ${validation.error.issues.map((err) => err.message).join(", ")}
         </div>
       `);
     }
@@ -2399,7 +2400,7 @@ authRoutes.post("/register/form", async (c) => {
     const username = validatedData.username || authValidationService.generateDefaultValue("username", validatedData);
     const firstName = validatedData.firstName || authValidationService.generateDefaultValue("firstName", validatedData);
     const lastName = validatedData.lastName || authValidationService.generateDefaultValue("lastName", validatedData);
-    const existingUser = await db2.prepare("SELECT id FROM users WHERE email = ? OR username = ?").bind(normalizedEmail, username).first();
+    const existingUser = await db.prepare("SELECT id FROM users WHERE email = ? OR username = ?").bind(normalizedEmail, username).first();
     if (existingUser) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
@@ -2410,7 +2411,7 @@ authRoutes.post("/register/form", async (c) => {
     const passwordHash = await AuthManager.hashPassword(password);
     const userId = crypto.randomUUID();
     const now = /* @__PURE__ */ new Date();
-    await db2.prepare(`
+    await db.prepare(`
       INSERT INTO users (id, email, username, first_name, last_name, password_hash, role, is_active, created_at, updated_at)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).bind(
@@ -2465,12 +2466,12 @@ authRoutes.post("/login/form", async (c) => {
     if (!validation.success) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
-          ${validation.error.errors.map((err) => err.message).join(", ")}
+          ${validation.error.issues.map((err) => err.message).join(", ")}
         </div>
       `);
     }
-    const db2 = c.env.DB;
-    const user = await db2.prepare("SELECT * FROM users WHERE email = ? AND is_active = 1").bind(normalizedEmail).first();
+    const db = c.env.DB;
+    const user = await db.prepare("SELECT * FROM users WHERE email = ? AND is_active = 1").bind(normalizedEmail).first();
     if (!user) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
@@ -2495,7 +2496,7 @@ authRoutes.post("/login/form", async (c) => {
       maxAge: 60 * 60 * 24
       // 24 hours
     });
-    await db2.prepare("UPDATE users SET last_login_at = ? WHERE id = ?").bind((/* @__PURE__ */ new Date()).getTime(), user.id).run();
+    await db.prepare("UPDATE users SET last_login_at = ? WHERE id = ?").bind((/* @__PURE__ */ new Date()).getTime(), user.id).run();
     return c.html(html`
       <div id="form-response">
         <div class="rounded-lg bg-green-100 dark:bg-lime-500/10 p-4 ring-1 ring-green-400 dark:ring-lime-500/20">
@@ -2526,8 +2527,8 @@ authRoutes.post("/login/form", async (c) => {
 });
 authRoutes.post("/seed-admin", async (c) => {
   try {
-    const db2 = c.env.DB;
-    await db2.prepare(`
+    const db = c.env.DB;
+    await db.prepare(`
       CREATE TABLE IF NOT EXISTS users (
         id TEXT PRIMARY KEY,
         email TEXT NOT NULL UNIQUE,
@@ -2543,10 +2544,10 @@ authRoutes.post("/seed-admin", async (c) => {
         updated_at INTEGER NOT NULL
       )
     `).run();
-    const existingAdmin = await db2.prepare("SELECT id FROM users WHERE email = ? OR username = ?").bind("admin@sonicjs.com", "admin").first();
+    const existingAdmin = await db.prepare("SELECT id FROM users WHERE email = ? OR username = ?").bind("admin@sonicjs.com", "admin").first();
     if (existingAdmin) {
       const passwordHash2 = await AuthManager.hashPassword("sonicjs!");
-      await db2.prepare("UPDATE users SET password_hash = ?, updated_at = ? WHERE id = ?").bind(passwordHash2, Date.now(), existingAdmin.id).run();
+      await db.prepare("UPDATE users SET password_hash = ?, updated_at = ? WHERE id = ?").bind(passwordHash2, Date.now(), existingAdmin.id).run();
       return c.json({
         message: "Admin user already exists (password updated)",
         user: {
@@ -2561,7 +2562,7 @@ authRoutes.post("/seed-admin", async (c) => {
     const userId = "admin-user-id";
     const now = Date.now();
     const adminEmail = "admin@sonicjs.com".toLowerCase();
-    await db2.prepare(`
+    await db.prepare(`
       INSERT INTO users (id, email, username, first_name, last_name, password_hash, role, is_active, created_at, updated_at)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).bind(
@@ -2608,8 +2609,8 @@ authRoutes.get("/accept-invitation", async (c) => {
         </html>
       `);
     }
-    const db2 = c.env.DB;
-    const userStmt = db2.prepare(`
+    const db = c.env.DB;
+    const userStmt = db.prepare(`
       SELECT id, email, first_name, last_name, role, invited_at
       FROM users 
       WHERE invitation_token = ? AND is_active = 0
@@ -2755,8 +2756,8 @@ authRoutes.post("/accept-invitation", async (c) => {
     if (password.length < 8) {
       return c.json({ error: "Password must be at least 8 characters long" }, 400);
     }
-    const db2 = c.env.DB;
-    const userStmt = db2.prepare(`
+    const db = c.env.DB;
+    const userStmt = db.prepare(`
       SELECT id, email, first_name, last_name, role, invited_at
       FROM users 
       WHERE invitation_token = ? AND is_active = 0
@@ -2770,7 +2771,7 @@ authRoutes.post("/accept-invitation", async (c) => {
     if (invitationAge > maxAge) {
       return c.json({ error: "Invitation has expired" }, 400);
     }
-    const existingUsernameStmt = db2.prepare(`
+    const existingUsernameStmt = db.prepare(`
       SELECT id FROM users WHERE username = ? AND id != ?
     `);
     const existingUsername = await existingUsernameStmt.bind(username, invitedUser.id).first();
@@ -2778,7 +2779,7 @@ authRoutes.post("/accept-invitation", async (c) => {
       return c.json({ error: "Username is already taken" }, 400);
     }
     const passwordHash = await AuthManager.hashPassword(password);
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET 
         username = ?,
         password_hash = ?,
@@ -2821,8 +2822,8 @@ authRoutes.post("/request-password-reset", async (c) => {
     if (!emailRegex.test(email)) {
       return c.json({ error: "Please enter a valid email address" }, 400);
     }
-    const db2 = c.env.DB;
-    const userStmt = db2.prepare(`
+    const db = c.env.DB;
+    const userStmt = db.prepare(`
       SELECT id, email, first_name, last_name FROM users 
       WHERE email = ? AND is_active = 1
     `);
@@ -2835,7 +2836,7 @@ authRoutes.post("/request-password-reset", async (c) => {
     }
     const resetToken = crypto.randomUUID();
     const resetExpires = Date.now() + 60 * 60 * 1e3;
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET 
         password_reset_token = ?,
         password_reset_expires = ?,
@@ -2875,8 +2876,8 @@ authRoutes.get("/reset-password", async (c) => {
         </html>
       `);
     }
-    const db2 = c.env.DB;
-    const userStmt = db2.prepare(`
+    const db = c.env.DB;
+    const userStmt = db.prepare(`
       SELECT id, email, first_name, last_name, password_reset_expires
       FROM users 
       WHERE password_reset_token = ? AND is_active = 1
@@ -3013,8 +3014,8 @@ authRoutes.post("/reset-password", async (c) => {
     if (password.length < 8) {
       return c.json({ error: "Password must be at least 8 characters long" }, 400);
     }
-    const db2 = c.env.DB;
-    const userStmt = db2.prepare(`
+    const db = c.env.DB;
+    const userStmt = db.prepare(`
       SELECT id, email, password_hash, password_reset_expires
       FROM users
       WHERE password_reset_token = ? AND is_active = 1
@@ -3028,7 +3029,7 @@ authRoutes.post("/reset-password", async (c) => {
     }
     const newPasswordHash = await AuthManager.hashPassword(password);
     try {
-      const historyStmt = db2.prepare(`
+      const historyStmt = db.prepare(`
         INSERT INTO password_history (id, user_id, password_hash, created_at)
         VALUES (?, ?, ?, ?)
       `);
@@ -3041,7 +3042,7 @@ authRoutes.post("/reset-password", async (c) => {
     } catch (historyError) {
       console.warn("Could not store password history:", historyError);
     }
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET
         password_hash = ?,
         password_reset_token = NULL,
@@ -3063,20 +3064,20 @@ authRoutes.post("/reset-password", async (c) => {
 var auth_default = authRoutes;
 var app = new Hono();
 app.post("/test-cleanup", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   if (c.env.ENVIRONMENT === "production") {
     return c.json({ error: "Cleanup endpoint not available in production" }, 403);
   }
   try {
     let deletedCount = 0;
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM content_versions
       WHERE content_id IN (
         SELECT id FROM content
         WHERE title LIKE 'Test %' OR title LIKE '%E2E%' OR title LIKE '%Playwright%' OR title LIKE '%Sample%'
       )
     `).run();
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM workflow_history
       WHERE content_id IN (
         SELECT id FROM content
@@ -3084,7 +3085,7 @@ app.post("/test-cleanup", async (c) => {
       )
     `).run();
     try {
-      await db2.prepare(`
+      await db.prepare(`
         DELETE FROM content_data
         WHERE content_id IN (
           SELECT id FROM content
@@ -3093,32 +3094,32 @@ app.post("/test-cleanup", async (c) => {
       `).run();
     } catch (e) {
     }
-    const contentResult = await db2.prepare(`
+    const contentResult = await db.prepare(`
       DELETE FROM content
       WHERE title LIKE 'Test %' OR title LIKE '%E2E%' OR title LIKE '%Playwright%' OR title LIKE '%Sample%'
     `).run();
     deletedCount += contentResult.meta?.changes || 0;
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM api_tokens
       WHERE user_id IN (
         SELECT id FROM users
         WHERE email != 'admin@sonicjs.com' AND (email LIKE '%test%' OR email LIKE '%example.com%')
       )
     `).run();
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM media
       WHERE uploaded_by IN (
         SELECT id FROM users
         WHERE email != 'admin@sonicjs.com' AND (email LIKE '%test%' OR email LIKE '%example.com%')
       )
     `).run();
-    const usersResult = await db2.prepare(`
+    const usersResult = await db.prepare(`
       DELETE FROM users
       WHERE email != 'admin@sonicjs.com' AND (email LIKE '%test%' OR email LIKE '%example.com%')
     `).run();
     deletedCount += usersResult.meta?.changes || 0;
     try {
-      await db2.prepare(`
+      await db.prepare(`
         DELETE FROM collection_fields
         WHERE collection_id IN (
           SELECT id FROM collections
@@ -3127,43 +3128,43 @@ app.post("/test-cleanup", async (c) => {
       `).run();
     } catch (e) {
     }
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM content
       WHERE collection_id IN (
         SELECT id FROM collections
         WHERE name LIKE 'test_%' OR name IN ('blog_posts', 'test_collection', 'products', 'articles')
       )
     `).run();
-    const collectionsResult = await db2.prepare(`
+    const collectionsResult = await db.prepare(`
       DELETE FROM collections
       WHERE name LIKE 'test_%' OR name IN ('blog_posts', 'test_collection', 'products', 'articles')
     `).run();
     deletedCount += collectionsResult.meta?.changes || 0;
     try {
-      await db2.prepare(`
+      await db.prepare(`
         DELETE FROM content_data WHERE content_id NOT IN (SELECT id FROM content)
       `).run();
     } catch (e) {
     }
     try {
-      await db2.prepare(`
+      await db.prepare(`
         DELETE FROM collection_fields WHERE collection_id NOT IN (SELECT id FROM collections)
       `).run();
     } catch (e) {
     }
     try {
-      await db2.prepare(`
+      await db.prepare(`
         DELETE FROM content_versions WHERE content_id NOT IN (SELECT id FROM content)
       `).run();
     } catch (e) {
     }
     try {
-      await db2.prepare(`
+      await db.prepare(`
         DELETE FROM workflow_history WHERE content_id NOT IN (SELECT id FROM content)
       `).run();
     } catch (e) {
     }
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM activity_logs
       WHERE id NOT IN (
         SELECT id FROM activity_logs
@@ -3185,12 +3186,12 @@ app.post("/test-cleanup", async (c) => {
   }
 });
 app.post("/test-cleanup/users", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   if (c.env.ENVIRONMENT === "production") {
     return c.json({ error: "Cleanup endpoint not available in production" }, 403);
   }
   try {
-    const result = await db2.prepare(`
+    const result = await db.prepare(`
       DELETE FROM users
       WHERE email != 'admin@sonicjs.com'
       AND (
@@ -3213,13 +3214,13 @@ app.post("/test-cleanup/users", async (c) => {
   }
 });
 app.post("/test-cleanup/collections", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   if (c.env.ENVIRONMENT === "production") {
     return c.json({ error: "Cleanup endpoint not available in production" }, 403);
   }
   try {
     let deletedCount = 0;
-    const collections = await db2.prepare(`
+    const collections = await db.prepare(`
       SELECT id FROM collections
       WHERE name LIKE 'test_%'
       OR name IN ('blog_posts', 'test_collection', 'products', 'articles')
@@ -3227,12 +3228,12 @@ app.post("/test-cleanup/collections", async (c) => {
     if (collections.results && collections.results.length > 0) {
       const collectionIds = collections.results.map((c2) => c2.id);
       for (const id of collectionIds) {
-        await db2.prepare("DELETE FROM collection_fields WHERE collection_id = ?").bind(id).run();
+        await db.prepare("DELETE FROM collection_fields WHERE collection_id = ?").bind(id).run();
       }
       for (const id of collectionIds) {
-        await db2.prepare("DELETE FROM content WHERE collection_id = ?").bind(id).run();
+        await db.prepare("DELETE FROM content WHERE collection_id = ?").bind(id).run();
       }
-      const result = await db2.prepare(`
+      const result = await db.prepare(`
         DELETE FROM collections
         WHERE id IN (${collectionIds.map(() => "?").join(",")})
       `).bind(...collectionIds).run();
@@ -3252,19 +3253,19 @@ app.post("/test-cleanup/collections", async (c) => {
   }
 });
 app.post("/test-cleanup/content", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   if (c.env.ENVIRONMENT === "production") {
     return c.json({ error: "Cleanup endpoint not available in production" }, 403);
   }
   try {
-    const result = await db2.prepare(`
+    const result = await db.prepare(`
       DELETE FROM content
       WHERE title LIKE 'Test %'
       OR title LIKE '%E2E%'
       OR title LIKE '%Playwright%'
       OR title LIKE '%Sample%'
     `).run();
-    await db2.prepare(`
+    await db.prepare(`
       DELETE FROM content_data
       WHERE content_id NOT IN (SELECT id FROM content)
     `).run();
@@ -4231,8 +4232,7 @@ function createQuillEditorPlugin() {
       email: "team@sonicjs.com"
     },
     license: "MIT",
-    compatibility: "^2.0.0",
-    tags: ["editor", "rich-text", "wysiwyg", "quill"]
+    compatibility: "^2.0.0"
   });
   builder3.lifecycle({
     activate: async () => {
@@ -5073,7 +5073,6 @@ function renderContentFormPage(data) {
   })}</script>` : ""}
 
       ${data.mdxeditorEnabled ? `<script>${getMDXEditorInitScript({
-    theme: data.mdxeditorSettings?.theme,
     defaultHeight: data.mdxeditorSettings?.defaultHeight,
     toolbar: data.mdxeditorSettings?.toolbar,
     placeholder: data.mdxeditorSettings?.placeholder
@@ -5107,9 +5106,9 @@ function renderContentListPage(data) {
         name: "model",
         label: "Model",
         options: [
-          { __value: "all", label: "All Models", selected: data.modelName === "all" },
+          { value: "all", label: "All Models", selected: data.modelName === "all" },
           ...data.models.map((model) => ({
-            __value: model.name,
+            value: model.name,
             label: model.displayName,
             selected: data.modelName === model.name
           }))
@@ -5119,13 +5118,13 @@ function renderContentListPage(data) {
         name: "status",
         label: "Status",
         options: [
-          { __value: "all", label: "All Status", selected: data.status === "all" },
-          { __value: "draft", label: "Draft", selected: data.status === "draft" },
-          { __value: "review", label: "Under Review", selected: data.status === "review" },
-          { __value: "scheduled", label: "Scheduled", selected: data.status === "scheduled" },
-          { __value: "published", label: "Published", selected: data.status === "published" },
-          { __value: "archived", label: "Archived", selected: data.status === "archived" },
-          { __value: "deleted", label: "Deleted", selected: data.status === "deleted" }
+          { value: "all", label: "All Status", selected: data.status === "all" },
+          { value: "draft", label: "Draft", selected: data.status === "draft" },
+          { value: "review", label: "Under Review", selected: data.status === "review" },
+          { value: "scheduled", label: "Scheduled", selected: data.status === "scheduled" },
+          { value: "published", label: "Published", selected: data.status === "published" },
+          { value: "archived", label: "Archived", selected: data.status === "archived" },
+          { value: "deleted", label: "Deleted", selected: data.status === "deleted" }
         ]
       }
     ],
@@ -5137,9 +5136,9 @@ function renderContentListPage(data) {
       }
     ],
     bulkActions: [
-      { label: "Publish", ___value: "publish", icon: "check-circle" },
-      { label: "Unpublish", ___value: "unpublish", icon: "x-circle" },
-      { label: "Delete", ___value: "delete", icon: "trash", className: "text-pink-600" }
+      { label: "Publish", value: "publish", icon: "check-circle" },
+      { label: "Unpublish", value: "unpublish", icon: "x-circle" },
+      { label: "Delete", value: "delete", icon: "trash", className: "text-pink-600" }
     ]
   };
   const tableColumns = [
@@ -5391,7 +5390,7 @@ function renderContentListPage(data) {
                         class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white/5 dark:bg-white/5 py-1.5 ${filter.name === "status" ? "pl-8" : "pl-3"} pr-8 text-base text-zinc-950 dark:text-white outline outline-1 -outline-offset-1 outline-cyan-500/30 dark:outline-cyan-400/30 *:bg-white dark:*:bg-zinc-800 focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-cyan-500 dark:focus-visible:outline-cyan-400 sm:text-sm/6 min-w-48"
                       >
                         ${filter.options.map((opt) => `
-                          <option value="${opt.__value}" ${opt.selected ? "selected" : ""}>${opt.label}</option>
+                          <option value="${opt.value}" ${opt.selected ? "selected" : ""}>${opt.label}</option>
                         `).join("")}
                       </select>
                       <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-cyan-600 dark:text-cyan-400 sm:size-4">
@@ -5911,9 +5910,9 @@ function escapeHtml3(text) {
 }
 
 // src/middleware/plugin-middleware.ts
-async function isPluginActive2(db2, pluginId) {
+async function isPluginActive2(db, pluginId) {
   try {
-    const result = await db2.prepare("SELECT status FROM plugins WHERE id = ?").bind(pluginId).first();
+    const result = await db.prepare("SELECT status FROM plugins WHERE id = ?").bind(pluginId).first();
     return result?.status === "active";
   } catch (error) {
     console.error(`[isPluginActive] Error checking plugin status for ${pluginId}:`, error);
@@ -5924,12 +5923,12 @@ async function isPluginActive2(db2, pluginId) {
 // src/routes/admin-content.ts
 var adminContentRoutes = new Hono();
 adminContentRoutes.use("*", requireAuth());
-async function getCollectionFields(db2, collectionId) {
+async function getCollectionFields(db, collectionId) {
   const cache = getCacheService(CACHE_CONFIGS.collection);
   return cache.getOrSet(
     cache.generateKey("fields", collectionId),
     async () => {
-      const collectionStmt = db2.prepare("SELECT schema FROM collections WHERE id = ?");
+      const collectionStmt = db.prepare("SELECT schema FROM collections WHERE id = ?");
       const collectionRow = await collectionStmt.bind(collectionId).first();
       if (collectionRow && collectionRow.schema) {
         try {
@@ -5960,7 +5959,7 @@ async function getCollectionFields(db2, collectionId) {
           console.error("Error parsing collection schema:", e);
         }
       }
-      const stmt = db2.prepare(`
+      const stmt = db.prepare(`
         SELECT * FROM content_fields
         WHERE collection_id = ?
         ORDER BY field_order ASC
@@ -5979,12 +5978,12 @@ async function getCollectionFields(db2, collectionId) {
     }
   );
 }
-async function getCollection(db2, collectionId) {
+async function getCollection(db, collectionId) {
   const cache = getCacheService(CACHE_CONFIGS.collection);
   return cache.getOrSet(
     cache.generateKey("collection", collectionId),
     async () => {
-      const stmt = db2.prepare("SELECT * FROM collections WHERE id = ? AND is_active = 1");
+      const stmt = db.prepare("SELECT * FROM collections WHERE id = ? AND is_active = 1");
       const collection = await stmt.bind(collectionId).first();
       if (!collection) return null;
       return {
@@ -6001,14 +6000,14 @@ adminContentRoutes.get("/", async (c) => {
   try {
     const user = c.get("user");
     const url = new URL(c.req.url);
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const page = parseInt(url.searchParams.get("page") || "1");
     const limit = parseInt(url.searchParams.get("limit") || "20");
     const modelName = url.searchParams.get("model") || "all";
     const status = url.searchParams.get("status") || "all";
     const search = url.searchParams.get("search") || "";
     const offset = (page - 1) * limit;
-    const collectionsStmt = db2.prepare("SELECT id, name, display_name FROM collections WHERE is_active = 1 ORDER BY display_name");
+    const collectionsStmt = db.prepare("SELECT id, name, display_name FROM collections WHERE is_active = 1 ORDER BY display_name");
     const { results: collectionsResults } = await collectionsStmt.all();
     const models = (collectionsResults || []).map((row) => ({
       name: row.name,
@@ -6034,7 +6033,7 @@ adminContentRoutes.get("/", async (c) => {
       conditions.push("c.status = 'deleted'");
     }
     const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-    const countStmt = db2.prepare(`
+    const countStmt = db.prepare(`
       SELECT COUNT(*) as count 
       FROM content c
       JOIN collections col ON c.collection_id = col.id
@@ -6042,7 +6041,7 @@ adminContentRoutes.get("/", async (c) => {
     `);
     const countResult = await countStmt.bind(...params).first();
     const totalItems = countResult?.count || 0;
-    const contentStmt = db2.prepare(`
+    const contentStmt = db.prepare(`
       SELECT c.id, c.title, c.slug, c.status, c.created_at, c.updated_at,
              col.name as collection_name, col.display_name as collection_display_name,
              u.first_name, u.last_name, u.email as author_email
@@ -6143,8 +6142,8 @@ adminContentRoutes.get("/new", async (c) => {
     const url = new URL(c.req.url);
     const collectionId = url.searchParams.get("collection");
     if (!collectionId) {
-      const db3 = c.env.DB;
-      const collectionsStmt = db3.prepare("SELECT id, name, display_name, description FROM collections WHERE is_active = 1 ORDER BY display_name");
+      const db2 = c.env.DB;
+      const collectionsStmt = db2.prepare("SELECT id, name, display_name, description FROM collections WHERE is_active = 1 ORDER BY display_name");
       const { results } = await collectionsStmt.all();
       const collections = (results || []).map((row) => ({
         id: row.id,
@@ -6185,8 +6184,8 @@ adminContentRoutes.get("/new", async (c) => {
       `;
       return c.html(selectionHTML);
     }
-    const db2 = c.env.DB;
-    const collection = await getCollection(db2, collectionId);
+    const db = c.env.DB;
+    const collection = await getCollection(db, collectionId);
     if (!collection) {
       const formData2 = {
         collection: { id: "", name: "", display_name: "Unknown", schema: {} },
@@ -6200,26 +6199,26 @@ adminContentRoutes.get("/new", async (c) => {
       };
       return c.html(renderContentFormPage(formData2));
     }
-    const fields = await getCollectionFields(db2, collectionId);
-    const workflowEnabled = await isPluginActive2(db2, "workflow");
-    const tinymceEnabled = await isPluginActive2(db2, "tinymce-plugin");
+    const fields = await getCollectionFields(db, collectionId);
+    const workflowEnabled = await isPluginActive2(db, "workflow");
+    const tinymceEnabled = await isPluginActive2(db, "tinymce-plugin");
     let tinymceSettings;
     if (tinymceEnabled) {
-      const pluginService = new PluginService(db2);
+      const pluginService = new PluginService(db);
       const tinymcePlugin2 = await pluginService.getPlugin("tinymce-plugin");
       tinymceSettings = tinymcePlugin2?.settings;
     }
-    const quillEnabled = await isPluginActive2(db2, "quill-editor");
+    const quillEnabled = await isPluginActive2(db, "quill-editor");
     let quillSettings;
     if (quillEnabled) {
-      const pluginService = new PluginService(db2);
+      const pluginService = new PluginService(db);
       const quillPlugin = await pluginService.getPlugin("quill-editor");
       quillSettings = quillPlugin?.settings;
     }
-    const mdxeditorEnabled = await isPluginActive2(db2, "easy-mdx");
+    const mdxeditorEnabled = await isPluginActive2(db, "easy-mdx");
     let mdxeditorSettings;
     if (mdxeditorEnabled) {
-      const pluginService = new PluginService(db2);
+      const pluginService = new PluginService(db);
       const mdxeditorPlugin = await pluginService.getPlugin("easy-mdx");
       mdxeditorSettings = mdxeditorPlugin?.settings;
     }
@@ -6266,14 +6265,14 @@ adminContentRoutes.get("/:id/edit", async (c) => {
   try {
     const id = c.req.param("id");
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const url = new URL(c.req.url);
     const referrerParams = url.searchParams.get("ref") || "";
     const cache = getCacheService(CACHE_CONFIGS.content);
     const content = await cache.getOrSet(
       cache.generateKey("content", id),
       async () => {
-        const contentStmt = db2.prepare(`
+        const contentStmt = db.prepare(`
           SELECT c.*, col.id as collection_id, col.name as collection_name,
                  col.display_name as collection_display_name, col.description as collection_description,
                  col.schema as collection_schema
@@ -6304,27 +6303,27 @@ adminContentRoutes.get("/:id/edit", async (c) => {
       description: content.collection_description,
       schema: content.collection_schema ? JSON.parse(content.collection_schema) : {}
     };
-    const fields = await getCollectionFields(db2, content.collection_id);
+    const fields = await getCollectionFields(db, content.collection_id);
     const contentData = content.data ? JSON.parse(content.data) : {};
-    const workflowEnabled = await isPluginActive2(db2, "workflow");
-    const tinymceEnabled = await isPluginActive2(db2, "tinymce-plugin");
+    const workflowEnabled = await isPluginActive2(db, "workflow");
+    const tinymceEnabled = await isPluginActive2(db, "tinymce-plugin");
     let tinymceSettings;
     if (tinymceEnabled) {
-      const pluginService = new PluginService(db2);
+      const pluginService = new PluginService(db);
       const tinymcePlugin2 = await pluginService.getPlugin("tinymce-plugin");
       tinymceSettings = tinymcePlugin2?.settings;
     }
-    const quillEnabled = await isPluginActive2(db2, "quill-editor");
+    const quillEnabled = await isPluginActive2(db, "quill-editor");
     let quillSettings;
     if (quillEnabled) {
-      const pluginService = new PluginService(db2);
+      const pluginService = new PluginService(db);
       const quillPlugin = await pluginService.getPlugin("quill-editor");
       quillSettings = quillPlugin?.settings;
     }
-    const mdxeditorEnabled = await isPluginActive2(db2, "easy-mdx");
+    const mdxeditorEnabled = await isPluginActive2(db, "easy-mdx");
     let mdxeditorSettings;
     if (mdxeditorEnabled) {
-      const pluginService = new PluginService(db2);
+      const pluginService = new PluginService(db);
       const mdxeditorPlugin = await pluginService.getPlugin("easy-mdx");
       mdxeditorSettings = mdxeditorPlugin?.settings;
     }
@@ -6386,8 +6385,8 @@ adminContentRoutes.post("/", async (c) => {
         </div>
       `);
     }
-    const db2 = c.env.DB;
-    const collection = await getCollection(db2, collectionId);
+    const db = c.env.DB;
+    const collection = await getCollection(db, collectionId);
     if (!collection) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
@@ -6395,7 +6394,7 @@ adminContentRoutes.post("/", async (c) => {
         </div>
       `);
     }
-    const fields = await getCollectionFields(db2, collectionId);
+    const fields = await getCollectionFields(db, collectionId);
     const data = {};
     const errors = {};
     for (const field of fields) {
@@ -6453,7 +6452,7 @@ adminContentRoutes.post("/", async (c) => {
     const scheduledUnpublishAt = formData.get("scheduled_unpublish_at");
     const contentId = crypto.randomUUID();
     const now = Date.now();
-    const insertStmt = db2.prepare(`
+    const insertStmt = db.prepare(`
       INSERT INTO content (
         id, collection_id, slug, title, data, status,
         scheduled_publish_at, scheduled_unpublish_at,
@@ -6479,7 +6478,7 @@ adminContentRoutes.post("/", async (c) => {
     ).run();
     const cache = getCacheService(CACHE_CONFIGS.content);
     await cache.invalidate(`content:list:${collectionId}:*`);
-    const versionStmt = db2.prepare(`
+    const versionStmt = db.prepare(`
       INSERT INTO content_versions (id, content_id, version, data, author_id, created_at)
       VALUES (?, ?, ?, ?, ?, ?)
     `);
@@ -6491,7 +6490,7 @@ adminContentRoutes.post("/", async (c) => {
       user?.userId || "unknown",
       now
     ).run();
-    const workflowStmt = db2.prepare(`
+    const workflowStmt = db.prepare(`
       INSERT INTO workflow_history (id, content_id, action, from_status, to_status, user_id, created_at)
       VALUES (?, ?, ?, ?, ?, ?, ?)
     `);
@@ -6529,8 +6528,8 @@ adminContentRoutes.put("/:id", async (c) => {
     const user = c.get("user");
     const formData = await c.req.formData();
     const action = formData.get("action");
-    const db2 = c.env.DB;
-    const contentStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const db = c.env.DB;
+    const contentStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const existingContent = await contentStmt.bind(id).first();
     if (!existingContent) {
       return c.html(html`
@@ -6539,7 +6538,7 @@ adminContentRoutes.put("/:id", async (c) => {
         </div>
       `);
     }
-    const collection = await getCollection(db2, existingContent.collection_id);
+    const collection = await getCollection(db, existingContent.collection_id);
     if (!collection) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
@@ -6547,7 +6546,7 @@ adminContentRoutes.put("/:id", async (c) => {
         </div>
       `);
     }
-    const fields = await getCollectionFields(db2, existingContent.collection_id);
+    const fields = await getCollectionFields(db, existingContent.collection_id);
     const data = {};
     const errors = {};
     for (const field of fields) {
@@ -6606,7 +6605,7 @@ adminContentRoutes.put("/:id", async (c) => {
     const scheduledPublishAt = formData.get("scheduled_publish_at");
     const scheduledUnpublishAt = formData.get("scheduled_unpublish_at");
     const now = Date.now();
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE content SET
         slug = ?, title = ?, data = ?, status = ?,
         scheduled_publish_at = ?, scheduled_unpublish_at = ?,
@@ -6630,10 +6629,10 @@ adminContentRoutes.put("/:id", async (c) => {
     await cache.invalidate(`content:list:${existingContent.collection_id}:*`);
     const existingData = JSON.parse(existingContent.data || "{}");
     if (JSON.stringify(existingData) !== JSON.stringify(data)) {
-      const versionCountStmt = db2.prepare("SELECT MAX(version) as max_version FROM content_versions WHERE content_id = ?");
+      const versionCountStmt = db.prepare("SELECT MAX(version) as max_version FROM content_versions WHERE content_id = ?");
       const versionResult = await versionCountStmt.bind(id).first();
       const nextVersion = (versionResult?.max_version || 0) + 1;
-      const versionStmt = db2.prepare(`
+      const versionStmt = db.prepare(`
         INSERT INTO content_versions (id, content_id, version, data, author_id, created_at)
         VALUES (?, ?, ?, ?, ?, ?)
       `);
@@ -6647,7 +6646,7 @@ adminContentRoutes.put("/:id", async (c) => {
       ).run();
     }
     if (status !== existingContent.status) {
-      const workflowStmt = db2.prepare(`
+      const workflowStmt = db.prepare(`
         INSERT INTO workflow_history (id, content_id, action, from_status, to_status, user_id, created_at)
         VALUES (?, ?, ?, ?, ?, ?, ?)
       `);
@@ -6684,12 +6683,12 @@ adminContentRoutes.post("/preview", async (c) => {
   try {
     const formData = await c.req.formData();
     const collectionId = formData.get("collection_id");
-    const db2 = c.env.DB;
-    const collection = await getCollection(db2, collectionId);
+    const db = c.env.DB;
+    const collection = await getCollection(db, collectionId);
     if (!collection) {
       return c.html("<p>Collection not found</p>");
     }
-    const fields = await getCollectionFields(db2, collectionId);
+    const fields = await getCollectionFields(db, collectionId);
     const data = {};
     for (const field of fields) {
       const value = formData.get(field.field_name);
@@ -6763,8 +6762,8 @@ adminContentRoutes.post("/duplicate", async (c) => {
     if (!originalId) {
       return c.json({ success: false, error: "Content ID required" });
     }
-    const db2 = c.env.DB;
-    const contentStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const db = c.env.DB;
+    const contentStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const original = await contentStmt.bind(originalId).first();
     if (!original) {
       return c.json({ success: false, error: "Content not found" });
@@ -6773,7 +6772,7 @@ adminContentRoutes.post("/duplicate", async (c) => {
     const now = Date.now();
     const originalData = JSON.parse(original.data || "{}");
     originalData.title = `${originalData.title || "Untitled"} (Copy)`;
-    const insertStmt = db2.prepare(`
+    const insertStmt = db.prepare(`
       INSERT INTO content (
         id, collection_id, slug, title, data, status,
         author_id, created_at, updated_at
@@ -6896,11 +6895,11 @@ adminContentRoutes.post("/bulk-action", async (c) => {
     if (!action || !ids || ids.length === 0) {
       return c.json({ success: false, error: "Action and IDs required" });
     }
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const now = Date.now();
     if (action === "delete") {
       const placeholders = ids.map(() => "?").join(",");
-      const stmt = db2.prepare(`
+      const stmt = db.prepare(`
         UPDATE content
         SET status = 'deleted', updated_at = ?
         WHERE id IN (${placeholders})
@@ -6909,7 +6908,7 @@ adminContentRoutes.post("/bulk-action", async (c) => {
     } else if (action === "publish" || action === "draft") {
       const placeholders = ids.map(() => "?").join(",");
       const publishedAt = action === "publish" ? now : null;
-      const stmt = db2.prepare(`
+      const stmt = db.prepare(`
         UPDATE content
         SET status = ?, published_at = ?, updated_at = ?
         WHERE id IN (${placeholders})
@@ -6932,15 +6931,15 @@ adminContentRoutes.post("/bulk-action", async (c) => {
 adminContentRoutes.delete("/:id", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const user = c.get("user");
-    const contentStmt = db2.prepare("SELECT id, title FROM content WHERE id = ?");
+    const contentStmt = db.prepare("SELECT id, title FROM content WHERE id = ?");
     const content = await contentStmt.bind(id).first();
     if (!content) {
       return c.json({ success: false, error: "Content not found" }, 404);
     }
     const now = Date.now();
-    const deleteStmt = db2.prepare(`
+    const deleteStmt = db.prepare(`
       UPDATE content
       SET status = 'deleted', updated_at = ?
       WHERE id = ?
@@ -6969,13 +6968,13 @@ adminContentRoutes.delete("/:id", async (c) => {
 adminContentRoutes.get("/:id/versions", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const contentStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const db = c.env.DB;
+    const contentStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const content = await contentStmt.bind(id).first();
     if (!content) {
       return c.html("<p>Content not found</p>");
     }
-    const versionsStmt = db2.prepare(`
+    const versionsStmt = db.prepare(`
       SELECT cv.*, u.first_name, u.last_name, u.email
       FROM content_versions cv
       LEFT JOIN users u ON cv.author_id = u.id
@@ -7012,8 +7011,8 @@ adminContentRoutes.post("/:id/restore/:version", async (c) => {
     const id = c.req.param("id");
     const version = parseInt(c.req.param("version"));
     const user = c.get("user");
-    const db2 = c.env.DB;
-    const versionStmt = db2.prepare(`
+    const db = c.env.DB;
+    const versionStmt = db.prepare(`
       SELECT * FROM content_versions 
       WHERE content_id = ? AND version = ?
     `);
@@ -7021,14 +7020,14 @@ adminContentRoutes.post("/:id/restore/:version", async (c) => {
     if (!versionData) {
       return c.json({ success: false, error: "Version not found" });
     }
-    const contentStmt = db2.prepare("SELECT * FROM content WHERE id = ?");
+    const contentStmt = db.prepare("SELECT * FROM content WHERE id = ?");
     const currentContent = await contentStmt.bind(id).first();
     if (!currentContent) {
       return c.json({ success: false, error: "Content not found" });
     }
     const restoredData = JSON.parse(versionData.data);
     const now = Date.now();
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE content SET
         title = ?, data = ?, updated_at = ?
       WHERE id = ?
@@ -7039,10 +7038,10 @@ adminContentRoutes.post("/:id/restore/:version", async (c) => {
       now,
       id
     ).run();
-    const nextVersionStmt = db2.prepare("SELECT MAX(version) as max_version FROM content_versions WHERE content_id = ?");
+    const nextVersionStmt = db.prepare("SELECT MAX(version) as max_version FROM content_versions WHERE content_id = ?");
     const nextVersionResult = await nextVersionStmt.bind(id).first();
     const nextVersion = (nextVersionResult?.max_version || 0) + 1;
-    const newVersionStmt = db2.prepare(`
+    const newVersionStmt = db.prepare(`
       INSERT INTO content_versions (id, content_id, version, data, author_id, created_at)
       VALUES (?, ?, ?, ?, ?, ?)
     `);
@@ -7054,7 +7053,7 @@ adminContentRoutes.post("/:id/restore/:version", async (c) => {
       user?.userId || "unknown",
       now
     ).run();
-    const workflowStmt = db2.prepare(`
+    const workflowStmt = db.prepare(`
       INSERT INTO workflow_history (id, content_id, action, from_status, to_status, user_id, comment, created_at)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?)
     `);
@@ -7078,8 +7077,8 @@ adminContentRoutes.get("/:id/version/:version/preview", async (c) => {
   try {
     const id = c.req.param("id");
     const version = parseInt(c.req.param("version"));
-    const db2 = c.env.DB;
-    const versionStmt = db2.prepare(`
+    const db = c.env.DB;
+    const versionStmt = db.prepare(`
       SELECT cv.*, c.collection_id, col.display_name as collection_name
       FROM content_versions cv
       JOIN content c ON cv.content_id = c.id
@@ -9000,9 +8999,9 @@ var ROLES = [
 ];
 userRoutes.get("/profile", async (c) => {
   const user = c.get("user");
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   try {
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email, username, first_name, last_name, phone, bio, avatar_url,
              timezone, language, theme, email_notifications, two_factor_enabled,
              role, created_at, last_login_at
@@ -9060,7 +9059,7 @@ userRoutes.get("/profile", async (c) => {
 });
 userRoutes.put("/profile", async (c) => {
   const user = c.get("user");
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   try {
     const formData = await c.req.formData();
     const firstName = sanitizeInput(formData.get("first_name")?.toString());
@@ -9087,7 +9086,7 @@ userRoutes.put("/profile", async (c) => {
         dismissible: true
       }));
     }
-    const checkStmt = db2.prepare(`
+    const checkStmt = db.prepare(`
       SELECT id FROM users 
       WHERE (username = ? OR email = ?) AND id != ? AND is_active = 1
     `);
@@ -9099,7 +9098,7 @@ userRoutes.put("/profile", async (c) => {
         dismissible: true
       }));
     }
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET 
         first_name = ?, last_name = ?, username = ?, email = ?,
         phone = ?, bio = ?, timezone = ?, language = ?,
@@ -9120,7 +9119,7 @@ userRoutes.put("/profile", async (c) => {
       user.userId
     ).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "profile.update",
       "users",
@@ -9145,7 +9144,7 @@ userRoutes.put("/profile", async (c) => {
 });
 userRoutes.post("/profile/avatar", async (c) => {
   const user = c.get("user");
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   try {
     const formData = await c.req.formData();
     const avatarFile = formData.get("avatar");
@@ -9173,17 +9172,17 @@ userRoutes.post("/profile/avatar", async (c) => {
       }));
     }
     const avatarUrl = `/uploads/avatars/${user.userId}-${Date.now()}.${avatarFile.type.split("/")[1]}`;
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET avatar_url = ?, updated_at = ?
       WHERE id = ?
     `);
     await updateStmt.bind(avatarUrl, Date.now(), user.userId).run();
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT first_name, last_name FROM users WHERE id = ?
     `);
     const userData = await userStmt.bind(user.userId).first();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "profile.avatar_update",
       "users",
@@ -9215,7 +9214,7 @@ userRoutes.post("/profile/avatar", async (c) => {
 });
 userRoutes.post("/profile/password", async (c) => {
   const user = c.get("user");
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   try {
     const formData = await c.req.formData();
     const currentPassword = formData.get("current_password")?.toString() || "";
@@ -9242,7 +9241,7 @@ userRoutes.post("/profile/password", async (c) => {
         dismissible: true
       }));
     }
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT password_hash FROM users WHERE id = ? AND is_active = 1
     `);
     const userData = await userStmt.bind(user.userId).first();
@@ -9262,7 +9261,7 @@ userRoutes.post("/profile/password", async (c) => {
       }));
     }
     const newPasswordHash = await AuthManager.hashPassword(newPassword);
-    const historyStmt = db2.prepare(`
+    const historyStmt = db.prepare(`
       INSERT INTO password_history (id, user_id, password_hash, created_at)
       VALUES (?, ?, ?, ?)
     `);
@@ -9272,13 +9271,13 @@ userRoutes.post("/profile/password", async (c) => {
       userData.password_hash,
       Date.now()
     ).run();
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET password_hash = ?, updated_at = ?
       WHERE id = ?
     `);
     await updateStmt.bind(newPasswordHash, Date.now(), user.userId).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "profile.password_change",
       "users",
@@ -9302,7 +9301,7 @@ userRoutes.post("/profile/password", async (c) => {
   }
 });
 userRoutes.get("/users", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   try {
     const page = parseInt(c.req.query("page") || "1");
@@ -9329,7 +9328,7 @@ userRoutes.get("/users", async (c) => {
       whereClause += " AND u.role = ?";
       params.push(roleFilter);
     }
-    const usersStmt = db2.prepare(`
+    const usersStmt = db.prepare(`
       SELECT u.id, u.email, u.username, u.first_name, u.last_name,
              u.role, u.avatar_url, u.created_at, u.last_login_at, u.updated_at,
              u.email_verified, u.two_factor_enabled, u.is_active
@@ -9339,13 +9338,13 @@ userRoutes.get("/users", async (c) => {
       LIMIT ? OFFSET ?
     `);
     const { results: usersData } = await usersStmt.bind(...params, limit, offset).all();
-    const countStmt = db2.prepare(`
+    const countStmt = db.prepare(`
       SELECT COUNT(*) as total FROM users u ${whereClause}
     `);
     const countResult = await countStmt.bind(...params).first();
     const totalUsers = countResult?.total || 0;
     await logActivity(
-      db2,
+      db,
       user.userId,
       "users.list_view",
       "users",
@@ -9442,7 +9441,7 @@ userRoutes.get("/users/new", async (c) => {
   }
 });
 userRoutes.post("/users/new", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   try {
     const formData = await c.req.formData();
@@ -9486,7 +9485,7 @@ userRoutes.post("/users/new", async (c) => {
         dismissible: true
       }));
     }
-    const checkStmt = db2.prepare(`
+    const checkStmt = db.prepare(`
       SELECT id FROM users
       WHERE username = ? OR email = ?
     `);
@@ -9500,7 +9499,7 @@ userRoutes.post("/users/new", async (c) => {
     }
     const passwordHash = await AuthManager.hashPassword(password);
     const userId = crypto.randomUUID();
-    const createStmt = db2.prepare(`
+    const createStmt = db.prepare(`
       INSERT INTO users (
         id, email, username, first_name, last_name, phone, bio,
         password_hash, role, is_active, email_verified, created_at, updated_at
@@ -9522,7 +9521,7 @@ userRoutes.post("/users/new", async (c) => {
       Date.now()
     ).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "user!.create",
       "users",
@@ -9545,11 +9544,11 @@ userRoutes.get("/users/:id", async (c) => {
   if (c.req.path.endsWith("/edit")) {
     return c.notFound();
   }
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email, username, first_name, last_name, phone, bio, avatar_url,
              role, is_active, email_verified, two_factor_enabled, created_at, last_login_at
       FROM users
@@ -9560,7 +9559,7 @@ userRoutes.get("/users/:id", async (c) => {
       return c.json({ error: "User not found" }, 404);
     }
     await logActivity(
-      db2,
+      db,
       user.userId,
       "user!.view",
       "users",
@@ -9593,11 +9592,11 @@ userRoutes.get("/users/:id", async (c) => {
   }
 });
 userRoutes.get("/users/:id/edit", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email, username, first_name, last_name, phone, bio, avatar_url,
              role, is_active, email_verified, two_factor_enabled, created_at, last_login_at
       FROM users
@@ -9647,7 +9646,7 @@ userRoutes.get("/users/:id/edit", async (c) => {
   }
 });
 userRoutes.put("/users/:id", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
@@ -9676,7 +9675,7 @@ userRoutes.put("/users/:id", async (c) => {
         dismissible: true
       }));
     }
-    const checkStmt = db2.prepare(`
+    const checkStmt = db.prepare(`
       SELECT id FROM users
       WHERE (username = ? OR email = ?) AND id != ?
     `);
@@ -9688,7 +9687,7 @@ userRoutes.put("/users/:id", async (c) => {
         dismissible: true
       }));
     }
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET
         first_name = ?, last_name = ?, username = ?, email = ?,
         phone = ?, bio = ?, role = ?, is_active = ?, email_verified = ?,
@@ -9709,7 +9708,7 @@ userRoutes.put("/users/:id", async (c) => {
       userId
     ).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "user!.update",
       "users",
@@ -9733,7 +9732,7 @@ userRoutes.put("/users/:id", async (c) => {
   }
 });
 userRoutes.post("/users/:id/toggle", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
@@ -9742,19 +9741,19 @@ userRoutes.post("/users/:id/toggle", async (c) => {
     if (userId === user.userId && !active) {
       return c.json({ error: "You cannot deactivate your own account" }, 400);
     }
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email FROM users WHERE id = ?
     `);
     const userToToggle = await userStmt.bind(userId).first();
     if (!userToToggle) {
       return c.json({ error: "User not found" }, 404);
     }
-    const toggleStmt = db2.prepare(`
+    const toggleStmt = db.prepare(`
       UPDATE users SET is_active = ?, updated_at = ? WHERE id = ?
     `);
     await toggleStmt.bind(active ? 1 : 0, Date.now(), userId).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       active ? "user.activate" : "user.deactivate",
       "users",
@@ -9773,7 +9772,7 @@ userRoutes.post("/users/:id/toggle", async (c) => {
   }
 });
 userRoutes.delete("/users/:id", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
@@ -9782,7 +9781,7 @@ userRoutes.delete("/users/:id", async (c) => {
     if (userId === user.userId) {
       return c.json({ error: "You cannot delete your own account" }, 400);
     }
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email FROM users WHERE id = ?
     `);
     const userToDelete = await userStmt.bind(userId).first();
@@ -9790,12 +9789,12 @@ userRoutes.delete("/users/:id", async (c) => {
       return c.json({ error: "User not found" }, 404);
     }
     if (hardDelete) {
-      const deleteStmt = db2.prepare(`
+      const deleteStmt = db.prepare(`
         DELETE FROM users WHERE id = ?
       `);
       await deleteStmt.bind(userId).run();
       await logActivity(
-        db2,
+        db,
         user.userId,
         "user!.hard_delete",
         "users",
@@ -9809,12 +9808,12 @@ userRoutes.delete("/users/:id", async (c) => {
         message: "User permanently deleted"
       });
     } else {
-      const deleteStmt = db2.prepare(`
+      const deleteStmt = db.prepare(`
         UPDATE users SET is_active = 0, updated_at = ? WHERE id = ?
       `);
       await deleteStmt.bind(Date.now(), userId).run();
       await logActivity(
-        db2,
+        db,
         user.userId,
         "user!.soft_delete",
         "users",
@@ -9834,7 +9833,7 @@ userRoutes.delete("/users/:id", async (c) => {
   }
 });
 userRoutes.post("/invite-user", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   try {
     const formData = await c.req.formData();
@@ -9849,7 +9848,7 @@ userRoutes.post("/invite-user", async (c) => {
     if (!emailRegex.test(email)) {
       return c.json({ error: "Please enter a valid email address" }, 400);
     }
-    const existingUserStmt = db2.prepare(`
+    const existingUserStmt = db.prepare(`
       SELECT id FROM users WHERE email = ?
     `);
     const existingUser = await existingUserStmt.bind(email).first();
@@ -9858,7 +9857,7 @@ userRoutes.post("/invite-user", async (c) => {
     }
     const invitationToken = crypto.randomUUID();
     const userId = crypto.randomUUID();
-    const createUserStmt = db2.prepare(`
+    const createUserStmt = db.prepare(`
       INSERT INTO users (
         id, email, first_name, last_name, role, 
         invitation_token, invited_by, invited_at,
@@ -9880,7 +9879,7 @@ userRoutes.post("/invite-user", async (c) => {
       Date.now()
     ).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "user!.invite_sent",
       "users",
@@ -9909,11 +9908,11 @@ userRoutes.post("/invite-user", async (c) => {
   }
 });
 userRoutes.post("/resend-invitation/:id", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email, first_name, last_name, role, invitation_token
       FROM users 
       WHERE id = ? AND is_active = 0 AND invitation_token IS NOT NULL
@@ -9923,7 +9922,7 @@ userRoutes.post("/resend-invitation/:id", async (c) => {
       return c.json({ error: "User not found or invitation not valid" }, 404);
     }
     const newInvitationToken = crypto.randomUUID();
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE users SET 
         invitation_token = ?, 
         invited_at = ?, 
@@ -9937,7 +9936,7 @@ userRoutes.post("/resend-invitation/:id", async (c) => {
       userId
     ).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "user!.invitation_resent",
       "users",
@@ -9958,11 +9957,11 @@ userRoutes.post("/resend-invitation/:id", async (c) => {
   }
 });
 userRoutes.delete("/cancel-invitation/:id", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   const userId = c.req.param("id");
   try {
-    const userStmt = db2.prepare(`
+    const userStmt = db.prepare(`
       SELECT id, email FROM users 
       WHERE id = ? AND is_active = 0 AND invitation_token IS NOT NULL
     `);
@@ -9970,10 +9969,10 @@ userRoutes.delete("/cancel-invitation/:id", async (c) => {
     if (!invitedUser) {
       return c.json({ error: "User not found or invitation not valid" }, 404);
     }
-    const deleteStmt = db2.prepare(`DELETE FROM users WHERE id = ?`);
+    const deleteStmt = db.prepare(`DELETE FROM users WHERE id = ?`);
     await deleteStmt.bind(userId).run();
     await logActivity(
-      db2,
+      db,
       user.userId,
       "user!.invitation_cancelled",
       "users",
@@ -9992,7 +9991,7 @@ userRoutes.delete("/cancel-invitation/:id", async (c) => {
   }
 });
 userRoutes.get("/activity-logs", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   try {
     const page = parseInt(c.req.query("page") || "1");
@@ -10030,7 +10029,7 @@ userRoutes.get("/activity-logs", async (c) => {
       params.push(toTimestamp);
     }
     const whereClause = whereConditions.length > 0 ? `WHERE ${whereConditions.join(" AND ")}` : "";
-    const logsStmt = db2.prepare(`
+    const logsStmt = db.prepare(`
       SELECT 
         al.id, al.user_id, al.action, al.resource_type, al.resource_id,
         al.details, al.ip_address, al.user_agent, al.created_at,
@@ -10043,7 +10042,7 @@ userRoutes.get("/activity-logs", async (c) => {
       LIMIT ? OFFSET ?
     `);
     const { results: logs } = await logsStmt.bind(...params, limit, offset).all();
-    const countStmt = db2.prepare(`
+    const countStmt = db.prepare(`
       SELECT COUNT(*) as total 
       FROM activity_logs al
       LEFT JOIN users u ON al.user_id = u.id
@@ -10056,7 +10055,7 @@ userRoutes.get("/activity-logs", async (c) => {
       details: log.details ? JSON.parse(log.details) : null
     }));
     await logActivity(
-      db2,
+      db,
       user.userId,
       "activity.logs_viewed",
       void 0,
@@ -10098,7 +10097,7 @@ userRoutes.get("/activity-logs", async (c) => {
   }
 });
 userRoutes.get("/activity-logs/export", async (c) => {
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const user = c.get("user");
   try {
     const filters = {
@@ -10133,7 +10132,7 @@ userRoutes.get("/activity-logs/export", async (c) => {
       params.push(toTimestamp);
     }
     const whereClause = whereConditions.length > 0 ? `WHERE ${whereConditions.join(" AND ")}` : "";
-    const logsStmt = db2.prepare(`
+    const logsStmt = db.prepare(`
       SELECT 
         al.id, al.user_id, al.action, al.resource_type, al.resource_id,
         al.details, al.ip_address, al.user_agent, al.created_at,
@@ -10163,7 +10162,7 @@ userRoutes.get("/activity-logs/export", async (c) => {
     }
     const csvContent = csvRows.join("\n");
     await logActivity(
-      db2,
+      db,
       user.userId,
       "activity.logs_exported",
       void 0,
@@ -11513,7 +11512,7 @@ adminMediaRoutes.get("/", async (c) => {
     const ____cacheBust = searchParams.get("t");
     const limit = 24;
     const offset = (page - 1) * limit;
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let query = "SELECT * FROM media";
     const params = [];
     const conditions = ["deleted_at IS NULL"];
@@ -11541,9 +11540,9 @@ adminMediaRoutes.get("/", async (c) => {
       query += ` WHERE ${conditions.join(" AND ")}`;
     }
     query += ` ORDER BY uploaded_at DESC LIMIT ${limit} OFFSET ${offset}`;
-    const stmt = db2.prepare(query);
+    const stmt = db.prepare(query);
     const { results } = await stmt.bind(...params).all();
-    const foldersStmt = db2.prepare(`
+    const foldersStmt = db.prepare(`
       SELECT folder, COUNT(*) as count, SUM(size) as totalSize
       FROM media
       WHERE deleted_at IS NULL
@@ -11551,7 +11550,7 @@ adminMediaRoutes.get("/", async (c) => {
       ORDER BY folder
     `);
     const { results: folders } = await foldersStmt.all();
-    const typesStmt = db2.prepare(`
+    const typesStmt = db.prepare(`
       SELECT
         CASE
           WHEN mime_type LIKE 'image/%' THEN 'images'
@@ -11617,7 +11616,7 @@ adminMediaRoutes.get("/selector", async (c) => {
   try {
     const { searchParams } = new URL(c.req.url);
     const search = searchParams.get("search") || "";
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let query = "SELECT * FROM media WHERE deleted_at IS NULL";
     const params = [];
     if (search.trim()) {
@@ -11626,7 +11625,7 @@ adminMediaRoutes.get("/selector", async (c) => {
       params.push(searchTerm, searchTerm, searchTerm);
     }
     query += " ORDER BY uploaded_at DESC LIMIT 24";
-    const stmt = db2.prepare(query);
+    const stmt = db.prepare(query);
     const { results } = await stmt.bind(...params).all();
     const mediaFiles = results.map((row) => ({
       id: row.id,
@@ -11733,7 +11732,7 @@ adminMediaRoutes.get("/search", async (c) => {
     const search = searchParams.get("search") || "";
     const folder = searchParams.get("folder") || "all";
     const type = searchParams.get("type") || "all";
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let query = "SELECT * FROM media";
     const params = [];
     const conditions = [];
@@ -11766,7 +11765,7 @@ adminMediaRoutes.get("/search", async (c) => {
       query += ` WHERE ${conditions.join(" AND ")}`;
     }
     query += ` ORDER BY uploaded_at DESC LIMIT 24`;
-    const stmt = db2.prepare(query);
+    const stmt = db.prepare(query);
     const { results } = await stmt.bind(...params).all();
     const mediaFiles = results.map((row) => ({
       ...row,
@@ -11789,8 +11788,8 @@ adminMediaRoutes.get("/search", async (c) => {
 adminMediaRoutes.get("/:id/details", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const stmt = db2.prepare("SELECT * FROM media WHERE id = ?");
+    const db = c.env.DB;
+    const stmt = db.prepare("SELECT * FROM media WHERE id = ?");
     const result = await stmt.bind(id).first();
     if (!result) {
       return c.html('<div class="text-red-500">File not found</div>');
@@ -11827,7 +11826,13 @@ adminMediaRoutes.post("/upload", async (c) => {
   try {
     const user = c.get("user");
     const formData = await c.req.formData();
-    const files = formData.getAll("files");
+    const fileEntries = formData.getAll("files");
+    const files = [];
+    for (const entry of fileEntries) {
+      if (entry instanceof File) {
+        files.push(entry);
+      }
+    }
     if (!files || files.length === 0) {
       return c.html(html`
         <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
@@ -11863,7 +11868,7 @@ adminMediaRoutes.post("/upload", async (c) => {
           });
           continue;
         }
-        const fileId = globalThis.crypto.randomUUID();
+        const fileId = crypto.randomUUID();
         const fileExtension = file.name.split(".").pop() || "";
         const filename = `${fileId}.${fileExtension}`;
         const folder = formData.get("folder") || "uploads";
@@ -11936,10 +11941,11 @@ adminMediaRoutes.post("/upload", async (c) => {
         });
       }
     }
-    let __mediaGridHTML = "";
+    let mediaGridHTML = "";
     if (uploadResults.length > 0) {
       try {
-        const folder = formData.get("folder") || "uploads";
+        const folderEntry = formData.get("folder");
+        const folder = typeof folderEntry === "string" ? folderEntry : "uploads";
         const query = "SELECT * FROM media WHERE deleted_at IS NULL ORDER BY uploaded_at DESC LIMIT 24";
         const stmt = c.env.DB.prepare(query);
         const { results } = await stmt.all();
@@ -12082,13 +12088,13 @@ adminMediaRoutes.put("/:id", async (c) => {
 });
 adminMediaRoutes.delete("/cleanup", requireRole("admin"), async (c) => {
   try {
-    const db2 = c.env.DB;
-    const allMediaStmt = db2.prepare("SELECT id, r2_key, filename FROM media WHERE deleted_at IS NULL");
+    const db = c.env.DB;
+    const allMediaStmt = db.prepare("SELECT id, r2_key, filename FROM media WHERE deleted_at IS NULL");
     const { results: allMedia } = await allMediaStmt.all();
-    const contentStmt = db2.prepare("SELECT data FROM content");
+    const contentStmt = db.prepare("SELECT data FROM content");
     const { results: contentRecords } = await contentStmt.all();
     const referencedUrls = /* @__PURE__ */ new Set();
-    for (const record of contentRecords) {
+    for (const record of contentRecords || []) {
       if (record.data) {
         const dataStr = typeof record.data === "string" ? record.data : JSON.stringify(record.data);
         const urlMatches = dataStr.matchAll(/\/files\/([^\s"',]+)/g);
@@ -12097,7 +12103,8 @@ adminMediaRoutes.delete("/cleanup", requireRole("admin"), async (c) => {
         }
       }
     }
-    const unusedFiles = allMedia.filter((file) => !referencedUrls.has(file.r2_key));
+    const mediaRows = allMedia || [];
+    const unusedFiles = mediaRows.filter((file) => !referencedUrls.has(file.r2_key));
     if (unusedFiles.length === 0) {
       return c.html(html`
         <div class="bg-blue-100 border border-blue-400 text-blue-700 px-4 py-3 rounded">
@@ -12115,7 +12122,7 @@ adminMediaRoutes.delete("/cleanup", requireRole("admin"), async (c) => {
     for (const file of unusedFiles) {
       try {
         await c.env.MEDIA_BUCKET.delete(file.r2_key);
-        const deleteStmt = db2.prepare("UPDATE media SET deleted_at = ? WHERE id = ?");
+        const deleteStmt = db.prepare("UPDATE media SET deleted_at = ? WHERE id = ?");
         await deleteStmt.bind(Math.floor(Date.now() / 1e3), file.id).run();
         deletedCount++;
       } catch (error) {
@@ -13781,11 +13788,11 @@ var AVAILABLE_PLUGINS = [
 adminPluginRoutes.get("/", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     if (user?.role !== "admin") {
       return c.text("Access denied", 403);
     }
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     let installedPlugins = [];
     let stats = { total: 0, active: 0, inactive: 0, errors: 0, uninstalled: 0 };
     try {
@@ -13852,12 +13859,12 @@ adminPluginRoutes.get("/", async (c) => {
 adminPluginRoutes.get("/:id", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") {
       return c.redirect("/admin/plugins");
     }
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     const plugin = await pluginService.getPlugin(pluginId);
     if (!plugin) {
       return c.text("Plugin not found", 404);
@@ -13906,12 +13913,12 @@ adminPluginRoutes.get("/:id", async (c) => {
 adminPluginRoutes.post("/:id/activate", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     await pluginService.activatePlugin(pluginId);
     return c.json({ success: true });
   } catch (error) {
@@ -13923,12 +13930,12 @@ adminPluginRoutes.post("/:id/activate", async (c) => {
 adminPluginRoutes.post("/:id/deactivate", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     await pluginService.deactivatePlugin(pluginId);
     return c.json({ success: true });
   } catch (error) {
@@ -13940,12 +13947,12 @@ adminPluginRoutes.post("/:id/deactivate", async (c) => {
 adminPluginRoutes.post("/install", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
     const body = await c.req.json();
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     if (body.name === "faq-plugin") {
       const faqPlugin = await pluginService.installPlugin({
         id: "third-party-faq",
@@ -14156,12 +14163,12 @@ adminPluginRoutes.post("/install", async (c) => {
 adminPluginRoutes.post("/:id/uninstall", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     await pluginService.uninstallPlugin(pluginId);
     return c.json({ success: true });
   } catch (error) {
@@ -14173,13 +14180,13 @@ adminPluginRoutes.post("/:id/uninstall", async (c) => {
 adminPluginRoutes.post("/:id/settings", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
     const settings = await c.req.json();
-    const pluginService = new PluginService(db2);
+    const pluginService = new PluginService(db);
     await pluginService.updatePluginSettings(pluginId, settings);
     return c.json({ success: true });
   } catch (error) {
@@ -15640,8 +15647,8 @@ adminTestimonialsRoutes.get("/", async (c) => {
     const currentPage = parseInt(page, 10) || 1;
     const limit = 20;
     const offset = (currentPage - 1) * limit;
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderTestimonialsList({
         testimonials: [],
         totalCount: 0,
@@ -15672,7 +15679,7 @@ adminTestimonialsRoutes.get("/", async (c) => {
       params.push(searchTerm, searchTerm, searchTerm);
     }
     const countQuery = `SELECT COUNT(*) as count FROM testimonials ${whereClause}`;
-    const { results: countResults } = await db2.prepare(countQuery).bind(...params).all();
+    const { results: countResults } = await db.prepare(countQuery).bind(...params).all();
     const totalCount = countResults?.[0]?.count || 0;
     const dataQuery = `
       SELECT * FROM testimonials
@@ -15680,7 +15687,7 @@ adminTestimonialsRoutes.get("/", async (c) => {
       ORDER BY sortOrder ASC, created_at DESC
       LIMIT ? OFFSET ?
     `;
-    const { results: testimonials } = await db2.prepare(dataQuery).bind(...params, limit, offset).all();
+    const { results: testimonials } = await db.prepare(dataQuery).bind(...params, limit, offset).all();
     const totalPages = Math.ceil(totalCount / limit);
     return c.html(renderTestimonialsList({
       testimonials: testimonials || [],
@@ -15728,8 +15735,8 @@ adminTestimonialsRoutes.post("/", async (c) => {
     const data = Object.fromEntries(formData.entries());
     const validatedData = testimonialSchema.parse(data);
     const user = c.get("user");
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderTestimonialsForm({
         isEdit: false,
         user: user ? {
@@ -15741,7 +15748,7 @@ adminTestimonialsRoutes.post("/", async (c) => {
         messageType: "error"
       }));
     }
-    const { results } = await db2.prepare(`
+    const { results } = await db.prepare(`
       INSERT INTO testimonials (author_name, author_title, author_company, testimonial_text, rating, isPublished, sortOrder)
       VALUES (?, ?, ?, ?, ?, ?, ?)
       RETURNING *
@@ -15773,7 +15780,7 @@ adminTestimonialsRoutes.post("/", async (c) => {
     const user = c.get("user");
     if (error instanceof z.ZodError) {
       const errors = {};
-      error.errors.forEach((err) => {
+      error.issues.forEach((err) => {
         const field = err.path[0];
         if (!errors[field]) errors[field] = [];
         errors[field].push(err.message);
@@ -15806,8 +15813,8 @@ adminTestimonialsRoutes.get("/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
     const user = c.get("user");
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderTestimonialsForm({
         isEdit: true,
         user: user ? {
@@ -15819,7 +15826,7 @@ adminTestimonialsRoutes.get("/:id", async (c) => {
         messageType: "error"
       }));
     }
-    const { results } = await db2.prepare("SELECT * FROM testimonials WHERE id = ?").bind(id).all();
+    const { results } = await db.prepare("SELECT * FROM testimonials WHERE id = ?").bind(id).all();
     if (!results || results.length === 0) {
       return c.redirect("/admin/testimonials?message=Testimonial not found&type=error");
     }
@@ -15864,8 +15871,8 @@ adminTestimonialsRoutes.put("/:id", async (c) => {
     const data = Object.fromEntries(formData.entries());
     const validatedData = testimonialSchema.parse(data);
     const user = c.get("user");
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderTestimonialsForm({
         isEdit: true,
         user: user ? {
@@ -15877,7 +15884,7 @@ adminTestimonialsRoutes.put("/:id", async (c) => {
         messageType: "error"
       }));
     }
-    const { results } = await db2.prepare(`
+    const { results } = await db.prepare(`
       UPDATE testimonials
       SET author_name = ?, author_title = ?, author_company = ?, testimonial_text = ?, rating = ?, isPublished = ?, sortOrder = ?
       WHERE id = ?
@@ -15922,7 +15929,7 @@ adminTestimonialsRoutes.put("/:id", async (c) => {
     const id = parseInt(c.req.param("id"));
     if (error instanceof z.ZodError) {
       const errors = {};
-      error.errors.forEach((err) => {
+      error.issues.forEach((err) => {
         const field = err.path[0];
         if (!errors[field]) errors[field] = [];
         errors[field].push(err.message);
@@ -15974,11 +15981,11 @@ adminTestimonialsRoutes.put("/:id", async (c) => {
 adminTestimonialsRoutes.delete("/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.json({ error: "Database not available" }, 500);
     }
-    const { changes } = await db2.prepare("DELETE FROM testimonials WHERE id = ?").bind(id).run();
+    const { changes } = await db.prepare("DELETE FROM testimonials WHERE id = ?").bind(id).run();
     if (changes === 0) {
       return c.json({ error: "Testimonial not found" }, 404);
     }
@@ -16310,8 +16317,8 @@ adminCodeExamplesRoutes.get("/", async (c) => {
     const currentPage = parseInt(page, 10) || 1;
     const limit = 20;
     const offset = (currentPage - 1) * limit;
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderCodeExamplesList({
         codeExamples: [],
         totalCount: 0,
@@ -16342,7 +16349,7 @@ adminCodeExamplesRoutes.get("/", async (c) => {
       params.push(searchTerm, searchTerm, searchTerm, searchTerm);
     }
     const countQuery = `SELECT COUNT(*) as count FROM code_examples ${whereClause}`;
-    const { results: countResults } = await db2.prepare(countQuery).bind(...params).all();
+    const { results: countResults } = await db.prepare(countQuery).bind(...params).all();
     const totalCount = countResults?.[0]?.count || 0;
     const dataQuery = `
       SELECT * FROM code_examples
@@ -16350,7 +16357,7 @@ adminCodeExamplesRoutes.get("/", async (c) => {
       ORDER BY sortOrder ASC, created_at DESC
       LIMIT ? OFFSET ?
     `;
-    const { results: codeExamples } = await db2.prepare(dataQuery).bind(...params, limit, offset).all();
+    const { results: codeExamples } = await db.prepare(dataQuery).bind(...params, limit, offset).all();
     const totalPages = Math.ceil(totalCount / limit);
     return c.html(renderCodeExamplesList({
       codeExamples: codeExamples || [],
@@ -16398,8 +16405,8 @@ adminCodeExamplesRoutes.post("/", async (c) => {
     const data = Object.fromEntries(formData.entries());
     const validatedData = codeExampleSchema.parse(data);
     const user = c.get("user");
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderCodeExamplesForm({
         isEdit: false,
         user: user ? {
@@ -16411,7 +16418,7 @@ adminCodeExamplesRoutes.post("/", async (c) => {
         messageType: "error"
       }));
     }
-    const { results } = await db2.prepare(`
+    const { results } = await db.prepare(`
       INSERT INTO code_examples (title, description, code, language, category, tags, isPublished, sortOrder)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?)
       RETURNING *
@@ -16444,7 +16451,7 @@ adminCodeExamplesRoutes.post("/", async (c) => {
     const user = c.get("user");
     if (error instanceof z.ZodError) {
       const errors = {};
-      error.errors.forEach((err) => {
+      error.issues.forEach((err) => {
         const field = err.path[0];
         if (!errors[field]) errors[field] = [];
         errors[field].push(err.message);
@@ -16477,8 +16484,8 @@ adminCodeExamplesRoutes.get("/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
     const user = c.get("user");
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderCodeExamplesForm({
         isEdit: true,
         user: user ? {
@@ -16490,7 +16497,7 @@ adminCodeExamplesRoutes.get("/:id", async (c) => {
         messageType: "error"
       }));
     }
-    const { results } = await db2.prepare("SELECT * FROM code_examples WHERE id = ?").bind(id).all();
+    const { results } = await db.prepare("SELECT * FROM code_examples WHERE id = ?").bind(id).all();
     if (!results || results.length === 0) {
       return c.redirect("/admin/code-examples?message=Code example not found&type=error");
     }
@@ -16536,8 +16543,8 @@ adminCodeExamplesRoutes.put("/:id", async (c) => {
     const data = Object.fromEntries(formData.entries());
     const validatedData = codeExampleSchema.parse(data);
     const user = c.get("user");
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.html(renderCodeExamplesForm({
         isEdit: true,
         user: user ? {
@@ -16549,7 +16556,7 @@ adminCodeExamplesRoutes.put("/:id", async (c) => {
         messageType: "error"
       }));
     }
-    const { results } = await db2.prepare(`
+    const { results } = await db.prepare(`
       UPDATE code_examples
       SET title = ?, description = ?, code = ?, language = ?, category = ?, tags = ?, isPublished = ?, sortOrder = ?
       WHERE id = ?
@@ -16596,7 +16603,7 @@ adminCodeExamplesRoutes.put("/:id", async (c) => {
     const id = parseInt(c.req.param("id"));
     if (error instanceof z.ZodError) {
       const errors = {};
-      error.errors.forEach((err) => {
+      error.issues.forEach((err) => {
         const field = err.path[0];
         if (!errors[field]) errors[field] = [];
         errors[field].push(err.message);
@@ -16650,11 +16657,11 @@ adminCodeExamplesRoutes.put("/:id", async (c) => {
 adminCodeExamplesRoutes.delete("/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
-    const db2 = c.env?.DB;
-    if (!db2) {
+    const db = c.env?.DB;
+    if (!db) {
       return c.json({ error: "Database not available" }, 500);
     }
-    const { changes } = await db2.prepare("DELETE FROM code_examples WHERE id = ?").bind(id).run();
+    const { changes } = await db.prepare("DELETE FROM code_examples WHERE id = ?").bind(id).run();
     if (changes === 0) {
       return c.json({ error: "Code example not found" }, 404);
     }
@@ -17333,10 +17340,10 @@ router.get("/", async (c) => {
 });
 router.get("/stats", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let collectionsCount = 0;
     try {
-      const collectionsStmt = db2.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1");
+      const collectionsStmt = db.prepare("SELECT COUNT(*) as count FROM collections WHERE is_active = 1");
       const collectionsResult = await collectionsStmt.first();
       collectionsCount = collectionsResult?.count || 0;
     } catch (error) {
@@ -17344,7 +17351,7 @@ router.get("/stats", async (c) => {
     }
     let contentCount = 0;
     try {
-      const contentStmt = db2.prepare("SELECT COUNT(*) as count FROM content");
+      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content");
       const contentResult = await contentStmt.first();
       contentCount = contentResult?.count || 0;
     } catch (error) {
@@ -17353,7 +17360,7 @@ router.get("/stats", async (c) => {
     let mediaCount = 0;
     let mediaSize = 0;
     try {
-      const mediaStmt = db2.prepare("SELECT COUNT(*) as count, COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
+      const mediaStmt = db.prepare("SELECT COUNT(*) as count, COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
       const mediaResult = await mediaStmt.first();
       mediaCount = mediaResult?.count || 0;
       mediaSize = mediaResult?.total_size || 0;
@@ -17362,7 +17369,7 @@ router.get("/stats", async (c) => {
     }
     let usersCount = 0;
     try {
-      const usersStmt = db2.prepare("SELECT COUNT(*) as count FROM users WHERE is_active = 1");
+      const usersStmt = db.prepare("SELECT COUNT(*) as count FROM users WHERE is_active = 1");
       const usersResult = await usersStmt.first();
       usersCount = usersResult?.count || 0;
     } catch (error) {
@@ -17383,17 +17390,17 @@ router.get("/stats", async (c) => {
 });
 router.get("/storage", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     let databaseSize = 0;
     try {
-      const result = await db2.prepare("SELECT 1").run();
+      const result = await db.prepare("SELECT 1").run();
       databaseSize = result?.meta?.size_after || 0;
     } catch (error) {
       console.error("Error fetching database size:", error);
     }
     let mediaSize = 0;
     try {
-      const mediaStmt = db2.prepare("SELECT COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
+      const mediaStmt = db.prepare("SELECT COALESCE(SUM(size), 0) as total_size FROM media WHERE deleted_at IS NULL");
       const mediaResult = await mediaStmt.first();
       mediaSize = mediaResult?.total_size || 0;
     } catch (error) {
@@ -17408,9 +17415,9 @@ router.get("/storage", async (c) => {
 });
 router.get("/recent-activity", async (c) => {
   try {
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const limit = parseInt(c.req.query("limit") || "5");
-    const activityStmt = db2.prepare(`
+    const activityStmt = db.prepare(`
       SELECT
         a.id,
         a.action,
@@ -19063,13 +19070,13 @@ adminCollectionsRoutes.use("*", requireAuth());
 adminCollectionsRoutes.get("/", async (c) => {
   try {
     const user = c.get("user");
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const url = new URL(c.req.url);
     const search = url.searchParams.get("search") || "";
     let stmt;
     let results;
     if (search) {
-      stmt = db2.prepare(`
+      stmt = db.prepare(`
         SELECT id, name, display_name, description, created_at, managed, schema
         FROM collections
         WHERE is_active = 1
@@ -19080,11 +19087,11 @@ adminCollectionsRoutes.get("/", async (c) => {
       const queryResults = await stmt.bind(searchParam, searchParam, searchParam).all();
       results = queryResults.results;
     } else {
-      stmt = db2.prepare("SELECT id, name, display_name, description, created_at, managed, schema FROM collections WHERE is_active = 1 ORDER BY created_at DESC");
+      stmt = db.prepare("SELECT id, name, display_name, description, created_at, managed, schema FROM collections WHERE is_active = 1 ORDER BY created_at DESC");
       const queryResults = await stmt.all();
       results = queryResults.results;
     }
-    const fieldCountStmt = db2.prepare("SELECT collection_id, COUNT(*) as count FROM content_fields GROUP BY collection_id");
+    const fieldCountStmt = db.prepare("SELECT collection_id, COUNT(*) as count FROM content_fields GROUP BY collection_id");
     const { results: fieldCountResults } = await fieldCountStmt.all();
     const fieldCounts = new Map((fieldCountResults || []).map((row) => [String(row.collection_id), Number(row.count)]));
     const collections = (results || []).filter((row) => row && row.id).map((row) => {
@@ -19125,16 +19132,17 @@ adminCollectionsRoutes.get("/", async (c) => {
     return c.html(renderCollectionsListPage(pageData));
   } catch (error) {
     console.error("Error fetching collections:", error);
-    return c.html(html`<p>Error loading collections</p>`);
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    return c.html(html`<p>Error loading collections: ${errorMessage}</p>`);
   }
 });
 adminCollectionsRoutes.get("/new", async (c) => {
   const user = c.get("user");
-  const db2 = c.env.DB;
+  const db = c.env.DB;
   const [tinymceActive, quillActive, mdxeditorActive] = await Promise.all([
-    isPluginActive2(db2, "tinymce-plugin"),
-    isPluginActive2(db2, "quill-editor"),
-    isPluginActive2(db2, "easy-mdx")
+    isPluginActive2(db, "tinymce-plugin"),
+    isPluginActive2(db, "quill-editor"),
+    isPluginActive2(db, "easy-mdx")
   ]);
   console.log("[Collections /new] Editor plugins status:", {
     tinymce: tinymceActive,
@@ -19188,8 +19196,8 @@ adminCollectionsRoutes.post("/", async (c) => {
         return c.redirect("/admin/collections/new");
       }
     }
-    const db2 = c.env.DB;
-    const existingStmt = db2.prepare("SELECT id FROM collections WHERE name = ?");
+    const db = c.env.DB;
+    const existingStmt = db.prepare("SELECT id FROM collections WHERE name = ?");
     const existing = await existingStmt.bind(name).first();
     if (existing) {
       const errorMsg = "A collection with this name already exists.";
@@ -19225,9 +19233,9 @@ adminCollectionsRoutes.post("/", async (c) => {
       },
       required: ["title"]
     };
-    const collectionId = globalThis.crypto.randomUUID();
+    const collectionId = crypto.randomUUID();
     const now = Date.now();
-    const insertStmt = db2.prepare(`
+    const insertStmt = db.prepare(`
       INSERT INTO collections (id, name, display_name, description, schema, is_active, created_at, updated_at)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?)
     `);
@@ -19279,17 +19287,17 @@ adminCollectionsRoutes.post("/", async (c) => {
   }
 });
 adminCollectionsRoutes.get("/:id", async (c) => {
+  const db = c.env.DB;
   try {
     const id = c.req.param("id");
     const user = c.get("user");
-    const db2 = c.env.DB;
-    const stmt = db2.prepare("SELECT * FROM collections WHERE id = ?");
+    const stmt = db.prepare("SELECT * FROM collections WHERE id = ?");
     const collection = await stmt.bind(id).first();
     if (!collection) {
       const [tinymceActive2, quillActive2, mdxeditorActive2] = await Promise.all([
-        isPluginActive2(db2, "tinymce-plugin"),
-        isPluginActive2(db2, "quill-editor"),
-        isPluginActive2(db2, "easy-mdx")
+        isPluginActive2(db, "tinymce-plugin"),
+        isPluginActive2(db, "quill-editor"),
+        isPluginActive2(db, "easy-mdx")
       ]);
       const formData2 = {
         isEdit: true,
@@ -19330,7 +19338,7 @@ adminCollectionsRoutes.get("/:id", async (c) => {
       }
     }
     if (fields.length === 0) {
-      const fieldsStmt = db2.prepare(`
+      const fieldsStmt = db.prepare(`
         SELECT * FROM content_fields
         WHERE collection_id = ?
         ORDER BY field_order ASC
@@ -19359,9 +19367,9 @@ adminCollectionsRoutes.get("/:id", async (c) => {
       });
     }
     const [tinymceActive, quillActive, mdxeditorActive] = await Promise.all([
-      isPluginActive2(db2, "tinymce-plugin"),
-      isPluginActive2(db2, "quill-editor"),
-      isPluginActive2(db2, "easy-mdx")
+      isPluginActive2(db, "tinymce-plugin"),
+      isPluginActive2(db, "quill-editor"),
+      isPluginActive2(db, "easy-mdx")
     ]);
     console.log("[Collections /:id] Editor plugins status:", {
       tinymce: tinymceActive,
@@ -19428,8 +19436,8 @@ adminCollectionsRoutes.put("/:id", async (c) => {
         </div>
       `);
     }
-    const db2 = c.env.DB;
-    const updateStmt = db2.prepare(`
+    const db = c.env.DB;
+    const updateStmt = db.prepare(`
       UPDATE collections
       SET display_name = ?, description = ?, updated_at = ?
       WHERE id = ?
@@ -19452,8 +19460,8 @@ adminCollectionsRoutes.put("/:id", async (c) => {
 adminCollectionsRoutes.delete("/:id", async (c) => {
   try {
     const id = c.req.param("id");
-    const db2 = c.env.DB;
-    const contentStmt = db2.prepare("SELECT COUNT(*) as count FROM content WHERE collection_id = ?");
+    const db = c.env.DB;
+    const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content WHERE collection_id = ?");
     const contentResult = await contentStmt.bind(id).first();
     if (contentResult && contentResult.count > 0) {
       return c.html(html`
@@ -19462,9 +19470,9 @@ adminCollectionsRoutes.delete("/:id", async (c) => {
         </div>
       `);
     }
-    const deleteFieldsStmt = db2.prepare("DELETE FROM content_fields WHERE collection_id = ?");
+    const deleteFieldsStmt = db.prepare("DELETE FROM content_fields WHERE collection_id = ?");
     await deleteFieldsStmt.bind(id).run();
-    const deleteStmt = db2.prepare("DELETE FROM collections WHERE id = ?");
+    const deleteStmt = db.prepare("DELETE FROM collections WHERE id = ?");
     await deleteStmt.bind(id).run();
     return c.html(html`
       <script>
@@ -19496,18 +19504,18 @@ adminCollectionsRoutes.post("/:id/fields", async (c) => {
     if (!/^[a-z0-9_]+$/.test(fieldName)) {
       return c.json({ success: false, error: "Field name must contain only lowercase letters, numbers, and underscores." });
     }
-    const db2 = c.env.DB;
-    const existingStmt = db2.prepare("SELECT id FROM content_fields WHERE collection_id = ? AND field_name = ?");
+    const db = c.env.DB;
+    const existingStmt = db.prepare("SELECT id FROM content_fields WHERE collection_id = ? AND field_name = ?");
     const existing = await existingStmt.bind(collectionId, fieldName).first();
     if (existing) {
       return c.json({ success: false, error: "A field with this name already exists." });
     }
-    const orderStmt = db2.prepare("SELECT MAX(field_order) as max_order FROM content_fields WHERE collection_id = ?");
+    const orderStmt = db.prepare("SELECT MAX(field_order) as max_order FROM content_fields WHERE collection_id = ?");
     const orderResult = await orderStmt.bind(collectionId).first();
     const nextOrder = (orderResult?.max_order || 0) + 1;
-    const fieldId = globalThis.crypto.randomUUID();
+    const fieldId = crypto.randomUUID();
     const now = Date.now();
-    const insertStmt = db2.prepare(`
+    const insertStmt = db.prepare(`
       INSERT INTO content_fields (
         id, collection_id, field_name, field_type, field_label,
         field_options, field_order, is_required, is_searchable,
@@ -19556,11 +19564,11 @@ adminCollectionsRoutes.put("/:collectionId/fields/:fieldId", async (c) => {
     if (!fieldLabel) {
       return c.json({ success: false, error: "Field label is required." });
     }
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     if (fieldId.startsWith("schema-")) {
       const fieldName = fieldId.replace("schema-", "");
       console.log("[Field Update] Updating schema field:", fieldName);
-      const getCollectionStmt = db2.prepare("SELECT * FROM collections WHERE id = ?");
+      const getCollectionStmt = db.prepare("SELECT * FROM collections WHERE id = ?");
       const collection = await getCollectionStmt.bind(collectionId).first();
       if (!collection) {
         return c.json({ success: false, error: "Collection not found." });
@@ -19605,7 +19613,7 @@ adminCollectionsRoutes.put("/:collectionId/fields/:fieldId", async (c) => {
         console.log("[Field Update] Final required array:", schema.required);
         console.log("[Field Update] Final field config:", schema.properties[fieldName]);
       }
-      const updateCollectionStmt = db2.prepare(`
+      const updateCollectionStmt = db.prepare(`
         UPDATE collections
         SET schema = ?, updated_at = ?
         WHERE id = ?
@@ -19617,7 +19625,7 @@ adminCollectionsRoutes.put("/:collectionId/fields/:fieldId", async (c) => {
       });
       return c.json({ success: true });
     }
-    const updateStmt = db2.prepare(`
+    const updateStmt = db.prepare(`
       UPDATE content_fields
       SET field_label = ?, field_type = ?, field_options = ?, is_required = ?, is_searchable = ?, updated_at = ?
       WHERE id = ?
@@ -19629,7 +19637,7 @@ adminCollectionsRoutes.put("/:collectionId/fields/:fieldId", async (c) => {
       changes: result.meta?.changes,
       last_row_id: result.meta?.last_row_id
     });
-    const verifyStmt = db2.prepare("SELECT * FROM content_fields WHERE id = ?");
+    const verifyStmt = db.prepare("SELECT * FROM content_fields WHERE id = ?");
     const verifyResult = await verifyStmt.bind(fieldId).first();
     console.log("[Field Update] Verification - field after update:", verifyResult);
     console.log("[Field Update] Successfully updated field with type:", fieldType);
@@ -19642,8 +19650,8 @@ adminCollectionsRoutes.put("/:collectionId/fields/:fieldId", async (c) => {
 adminCollectionsRoutes.delete("/:collectionId/fields/:fieldId", async (c) => {
   try {
     const fieldId = c.req.param("fieldId");
-    const db2 = c.env.DB;
-    const deleteStmt = db2.prepare("DELETE FROM content_fields WHERE id = ?");
+    const db = c.env.DB;
+    const deleteStmt = db.prepare("DELETE FROM content_fields WHERE id = ?");
     await deleteStmt.bind(fieldId).run();
     return c.json({ success: true });
   } catch (error) {
@@ -19658,9 +19666,9 @@ adminCollectionsRoutes.post("/:collectionId/fields/reorder", async (c) => {
     if (!Array.isArray(fieldIds)) {
       return c.json({ success: false, error: "Invalid field order data." });
     }
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     for (let i = 0; i < fieldIds.length; i++) {
-      const updateStmt = db2.prepare("UPDATE content_fields SET field_order = ?, updated_at = ? WHERE id = ?");
+      const updateStmt = db.prepare("UPDATE content_fields SET field_order = ?, updated_at = ? WHERE id = ?");
       await updateStmt.bind(i + 1, Date.now(), fieldIds[i]).run();
     }
     return c.json({ success: true });
@@ -21183,8 +21191,8 @@ adminSettingsRoutes.get("/", (c) => {
 });
 adminSettingsRoutes.get("/general", async (c) => {
   const user = c.get("user");
-  const db2 = c.env.DB;
-  const settingsService = new SettingsService(db2);
+  const db = c.env.DB;
+  const settingsService = new SettingsService(db);
   const generalSettings = await settingsService.getGeneralSettings(user?.email);
   const mockSettings = getMockSettings(user);
   mockSettings.general = generalSettings;
@@ -21286,8 +21294,8 @@ adminSettingsRoutes.get("/database-tools", (c) => {
 });
 adminSettingsRoutes.get("/api/migrations/status", async (c) => {
   try {
-    const db2 = c.env.DB;
-    const migrationService = new MigrationService(db2);
+    const db = c.env.DB;
+    const migrationService = new MigrationService(db);
     const status = await migrationService.getMigrationStatus();
     return c.json({
       success: true,
@@ -21310,8 +21318,8 @@ adminSettingsRoutes.post("/api/migrations/run", async (c) => {
         error: "Unauthorized. Admin access required."
       }, 403);
     }
-    const db2 = c.env.DB;
-    const migrationService = new MigrationService(db2);
+    const db = c.env.DB;
+    const migrationService = new MigrationService(db);
     const result = await migrationService.runPendingMigrations();
     return c.json({
       success: result.success,
@@ -21328,8 +21336,8 @@ adminSettingsRoutes.post("/api/migrations/run", async (c) => {
 });
 adminSettingsRoutes.get("/api/migrations/validate", async (c) => {
   try {
-    const db2 = c.env.DB;
-    const migrationService = new MigrationService(db2);
+    const db = c.env.DB;
+    const migrationService = new MigrationService(db);
     const validation = await migrationService.validateSchema();
     return c.json({
       success: true,
@@ -21345,8 +21353,8 @@ adminSettingsRoutes.get("/api/migrations/validate", async (c) => {
 });
 adminSettingsRoutes.get("/api/database-tools/stats", async (c) => {
   try {
-    const db2 = c.env.DB;
-    const tablesQuery = await db2.prepare(`
+    const db = c.env.DB;
+    const tablesQuery = await db.prepare(`
       SELECT name FROM sqlite_master
       WHERE type='table'
       AND name NOT LIKE 'sqlite_%'
@@ -21358,7 +21366,7 @@ adminSettingsRoutes.get("/api/database-tools/stats", async (c) => {
     const tableStats = await Promise.all(
       tables.map(async (table) => {
         try {
-          const countResult = await db2.prepare(`SELECT COUNT(*) as count FROM ${table.name}`).first();
+          const countResult = await db.prepare(`SELECT COUNT(*) as count FROM ${table.name}`).first();
           const rowCount = countResult?.count || 0;
           totalRows += rowCount;
           return {
@@ -21395,8 +21403,8 @@ adminSettingsRoutes.get("/api/database-tools/stats", async (c) => {
 });
 adminSettingsRoutes.get("/api/database-tools/validate", async (c) => {
   try {
-    const db2 = c.env.DB;
-    const integrityResult = await db2.prepare("PRAGMA integrity_check").first();
+    const db = c.env.DB;
+    const integrityResult = await db.prepare("PRAGMA integrity_check").first();
     const isValid = integrityResult?.integrity_check === "ok";
     return c.json({
       success: true,
@@ -21451,11 +21459,11 @@ adminSettingsRoutes.post("/api/database-tools/truncate", async (c) => {
         error: "No tables specified for truncation"
       }, 400);
     }
-    const db2 = c.env.DB;
+    const db = c.env.DB;
     const results = [];
     for (const tableName of tablesToTruncate) {
       try {
-        await db2.prepare(`DELETE FROM ${tableName}`).run();
+        await db.prepare(`DELETE FROM ${tableName}`).run();
         results.push({ table: tableName, success: true });
       } catch (error) {
         console.error(`Error truncating ${tableName}:`, error);
@@ -21485,8 +21493,8 @@ adminSettingsRoutes.post("/general", async (c) => {
       }, 403);
     }
     const formData = await c.req.formData();
-    const db2 = c.env.DB;
-    const settingsService = new SettingsService(db2);
+    const db = c.env.DB;
+    const settingsService = new SettingsService(db);
     const settings = {
       siteName: formData.get("siteName"),
       siteDescription: formData.get("siteDescription"),
@@ -21554,5 +21562,5 @@ var ROUTES_INFO = {
 };
 
 export { PluginBuilder, ROUTES_INFO, adminCheckboxRoutes, adminCollectionsRoutes, adminDesignRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_code_examples_default, admin_content_default, admin_testimonials_default, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, router, test_cleanup_default, userRoutes };
-//# sourceMappingURL=chunk-R57VFNP3.js.map
-//# sourceMappingURL=chunk-R57VFNP3.js.map
+//# sourceMappingURL=chunk-3ZLCMOCM.js.map
+//# sourceMappingURL=chunk-3ZLCMOCM.js.map