@sonicjs-cms/core 3.0.0-beta.23 → 3.0.0-beta.25

package/dist/{chunk-CTYLCWMO.cjs → chunk-6OA77UM7.cjs}

@@ -1,20 +1,20 @@
 'use strict';
 
 var chunkXWVDSM2L_cjs = require('./chunk-XWVDSM2L.cjs');
-var chunkJMJM7DMM_cjs = require('./chunk-JMJM7DMM.cjs');
+var chunkTT3TQSCZ_cjs = require('./chunk-TT3TQSCZ.cjs');
 var chunk36Z3AKX3_cjs = require('./chunk-36Z3AKX3.cjs');
-var chunkIS54FPB7_cjs = require('./chunk-IS54FPB7.cjs');
-var chunkLTZ5WYOK_cjs = require('./chunk-LTZ5WYOK.cjs');
+var chunkE7E3NL3Y_cjs = require('./chunk-E7E3NL3Y.cjs');
+var chunkJCBDXEY2_cjs = require('./chunk-JCBDXEY2.cjs');
 var chunkKIGVVO6N_cjs = require('./chunk-KIGVVO6N.cjs');
-var chunkAT4ZQGEZ_cjs = require('./chunk-AT4ZQGEZ.cjs');
-var chunkVGHEKIJL_cjs = require('./chunk-VGHEKIJL.cjs');
-var chunkE66UVONV_cjs = require('./chunk-E66UVONV.cjs');
-var chunkUYJQDDEE_cjs = require('./chunk-UYJQDDEE.cjs');
-var chunk4WMZGHIC_cjs = require('./chunk-4WMZGHIC.cjs');
+var chunkYAURVGUK_cjs = require('./chunk-YAURVGUK.cjs');
+var chunkMOGK3U4A_cjs = require('./chunk-MOGK3U4A.cjs');
+var chunkOUBUS74I_cjs = require('./chunk-OUBUS74I.cjs');
+var chunkMI2YXCK4_cjs = require('./chunk-MI2YXCK4.cjs');
+var chunkD6FWEYQE_cjs = require('./chunk-D6FWEYQE.cjs');
 var chunkJ6JTWD2A_cjs = require('./chunk-J6JTWD2A.cjs');
-var chunkIXUHXTHW_cjs = require('./chunk-IXUHXTHW.cjs');
+var chunkDLTT7QZU_cjs = require('./chunk-DLTT7QZU.cjs');
 var chunkRCQ2HIQD_cjs = require('./chunk-RCQ2HIQD.cjs');
-var chunkC3ZQP5NW_cjs = require('./chunk-C3ZQP5NW.cjs');
+var chunkBJ6NJL2E_cjs = require('./chunk-BJ6NJL2E.cjs');
 var chunkMNWKYY5E_cjs = require('./chunk-MNWKYY5E.cjs');
 var hono = require('hono');
 var zod = require('zod');
@@ -47,6 +47,7 @@ var DocumentPermissionsService = class {
         const publicGrants = baseGrants["public"] ?? [];
         if (publicGrants.includes(permission)) return true;
       } else if (principal.type === "role") {
+        if (principal.id === "public") continue;
         const roleGrants = baseGrants[principal.id] ?? [];
         if (roleGrants.includes(permission)) return true;
       }
@@ -151,6 +152,18 @@ var DocumentRepository = class {
     const row = await this.db.prepare("SELECT * FROM documents WHERE root_id = ? AND tenant_id = ? AND is_published = 1").bind(rootId, this.tenantId).first();
     return row ? rowToDocument(row) : null;
   }
+  // Slug lookup for a single doc. Prefer the published row; fall back to the current
+  // draft so a never-published doc is still reachable by slug (matches getById, which
+  // resolves drafts too). ORDER BY makes the preference deterministic when both exist.
+  async getBySlug(typeId, slug) {
+    const row = await this.db.prepare(
+      `SELECT * FROM documents
+         WHERE tenant_id = ? AND type_id = ? AND slug = ? AND deleted_at IS NULL
+           AND (is_published = 1 OR is_current_draft = 1)
+         ORDER BY is_published DESC LIMIT 1`
+    ).bind(this.tenantId, typeId, slug).first();
+    return row ? rowToDocument(row) : null;
+  }
   // Unified, tenant-scoped list with optional generated-column / facet filters and sort. This is the
   // single place document list SQL is built — route handlers must call this, never inline SQL (R4).
   async list(opts = {}) {
@@ -259,7 +272,7 @@ function getDocumentRequestContext(c) {
 
 // src/routes/api-documents.ts
 async function aclAllowsRead(db, tenantId, principalSet, row, preloadedType) {
-  const docType = preloadedType ?? await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(row.type_id);
+  const docType = preloadedType ?? await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(row.type_id);
   if (!docType) return false;
   return new DocumentRepository(db, tenantId).isAllowed(principalSet, row.root_id, "read", docType.settings);
 }
@@ -277,7 +290,7 @@ apiDocumentsRoutes.get("/", async (c) => {
     if (!typeId) {
       return c.json({ error: "type query parameter is required" }, 400);
     }
-    const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+    const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
     const docType = await registry.findById(typeId);
     if (!docType || !docType.isActive) {
       return c.json({ error: "Unknown document type" }, 400);
@@ -359,7 +372,7 @@ apiDocumentsRoutes.get("/root/:rootId", async (c) => {
          AND (expires_at IS NULL OR expires_at > ?) LIMIT 1`
     ).bind(rootId, now, now).first();
     if (!row) return c.json({ error: "Not found" }, 404);
-    const docType = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(row.type_id);
+    const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(row.type_id);
     const effTenant = effectiveTenantForType(tenantId, docType?.settings);
     if (row.tenant_id !== effTenant) return c.json({ error: "Not found" }, 404);
     if (!await aclAllowsRead(db, effTenant, principalSet, row, docType)) {
@@ -395,7 +408,7 @@ apiDocumentsRoutes.get("/:id", async (c) => {
          AND (expires_at IS NULL OR expires_at > ?) LIMIT 1`
     ).bind(id, now, now).first();
     if (!row) return c.json({ error: "Not found" }, 404);
-    const docType = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(row.type_id);
+    const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(row.type_id);
     const effTenant = effectiveTenantForType(tenantId, docType?.settings);
     if (row.tenant_id !== effTenant) return c.json({ error: "Not found" }, 404);
     if (!await aclAllowsRead(db, effTenant, principalSet, row, docType)) {
@@ -465,17 +478,17 @@ async function resolveDocScope(c, db, by, opts = {}) {
   const draft = opts.currentDraftOnly ? " AND is_current_draft = 1" : "";
   const row = await db.prepare(`SELECT type_id, root_id, tenant_id FROM documents WHERE ${col} = ?${draft} LIMIT 1`).bind(val).first();
   if (!row) return null;
-  const docType = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(row.type_id);
+  const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(row.type_id);
   const tenantId = effectiveTenantForType(getRequestTenant(c), docType?.settings);
   if (row.tenant_id !== tenantId) return null;
   return { typeId: row.type_id, rootId: row.root_id, tenantId, docType };
 }
 var adminDocumentsRoutes = new hono.Hono();
-adminDocumentsRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
-adminDocumentsRoutes.use("*", chunkIS54FPB7_cjs.requireRole(["admin", "editor"]));
+adminDocumentsRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
+adminDocumentsRoutes.use("*", chunkE7E3NL3Y_cjs.requireRole(["admin", "editor"]));
 adminDocumentsRoutes.get("/types", async (c) => {
   try {
-    const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(c.env.DB);
+    const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(c.env.DB);
     const types = await registry.findAll();
     return c.json({ data: types });
   } catch (error) {
@@ -503,7 +516,7 @@ adminDocumentsRoutes.get("/", async (c) => {
     if (!typeId) {
       return c.json({ error: "type query parameter is required" }, 400);
     }
-    const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+    const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
     const docType = await registry.findById(typeId);
     if (!docType || !docType.isActive) {
       return c.json({ error: "Unknown document type" }, 400);
@@ -614,7 +627,7 @@ adminDocumentsRoutes.post("/", async (c) => {
     const input = validation.data;
     const db = c.env.DB;
     const user = c.get("user");
-    const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+    const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
     const docType = await registry.findById(input.typeId);
     if (!docType || !docType.isActive) {
       return c.json({ error: "Unknown document type" }, 400);
@@ -622,7 +635,7 @@ adminDocumentsRoutes.post("/", async (c) => {
     const createDenied = await denyIfNotAllowed(c, db, "", "create", docType.settings);
     if (createDenied) return createDenied;
     const tenantId = effectiveTenantForType(getRequestTenant(c), docType.settings);
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
       queryableFields: docType.queryableFields,
       typeSchemaVersion: docType.schemaVersion,
       maxVersionsPerRoot: docType.settings.maxVersionsPerRoot,
@@ -660,7 +673,7 @@ adminDocumentsRoutes.put("/:rootId", async (c) => {
     const docType = scope.docType;
     const updateDenied = await denyIfNotAllowed(c, db, rootId, "update", docType?.settings, scope.tenantId);
     if (updateDenied) return updateDenied;
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
       queryableFields: docType?.queryableFields ?? [],
       typeSchemaVersion: docType?.schemaVersion,
       maxVersionsPerRoot: docType?.settings.maxVersionsPerRoot,
@@ -685,7 +698,7 @@ adminDocumentsRoutes.post("/:id/publish", async (c) => {
     const docType = scope.docType;
     const publishDenied = await denyIfNotAllowed(c, db, scope.rootId, "publish", docType?.settings, scope.tenantId);
     if (publishDenied) return publishDenied;
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
       queryableFields: docType?.queryableFields ?? [],
       typeSchemaVersion: docType?.schemaVersion,
       tenantId: scope.tenantId,
@@ -708,7 +721,7 @@ adminDocumentsRoutes.post("/:id/unpublish", async (c) => {
     const docType = scope.docType;
     const unpublishDenied = await denyIfNotAllowed(c, db, scope.rootId, "publish", docType?.settings, scope.tenantId);
     if (unpublishDenied) return unpublishDenied;
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
       queryableFields: docType?.queryableFields ?? [],
       tenantId: scope.tenantId
     });
@@ -730,7 +743,7 @@ adminDocumentsRoutes.delete("/:id", async (c) => {
     const docType = scope.docType;
     const deleteDenied = await denyIfNotAllowed(c, db, scope.rootId, "delete", docType?.settings, scope.tenantId);
     if (deleteDenied) return deleteDenied;
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, { queryableFields: docType?.queryableFields ?? [], tenantId: scope.tenantId });
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, { queryableFields: docType?.queryableFields ?? [], tenantId: scope.tenantId });
     if (docType?.settings.pii) {
       if (scope.rootId) await svc.erase(scope.rootId, scope.tenantId);
     } else {
@@ -746,7 +759,7 @@ adminDocumentsRoutes.post("/types/:typeId/reindex", async (c) => {
   try {
     const { typeId } = c.req.param();
     const db = c.env.DB;
-    const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+    const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
     const docType = await registry.findById(typeId);
     if (!docType) return c.json({ error: "Unknown document type" }, 400);
     const reindexTenant = effectiveTenantForType(getRequestTenant(c), docType.settings);
@@ -900,13 +913,13 @@ async function resolveContentVariables(contentData, db) {
 // src/routes/api-content-crud.ts
 var apiContentCrudRoutes = new hono.Hono();
 async function resolveDocBacking(db, collectionIdOrName) {
-  const registry = chunkAT4ZQGEZ_cjs.getCollectionRegistry();
+  const registry = chunkYAURVGUK_cjs.getCollectionRegistry();
   const record = registry.getBySlugOrName(collectionIdOrName) ?? registry.getById(collectionIdOrName);
   if (record) {
-    const docType2 = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(record.name);
+    const docType2 = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(record.name);
     return docType2 ? { coll: { id: record.id, name: record.name }, docType: docType2 } : null;
   }
-  const docType = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(collectionIdOrName);
+  const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(collectionIdOrName);
   if (docType) {
     return { coll: { id: collectionIdOrName, name: collectionIdOrName }, docType };
   }
@@ -949,7 +962,7 @@ apiContentCrudRoutes.get("/check-slug", async (c) => {
     }, 500);
   }
 });
-apiContentCrudRoutes.get("/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
+apiContentCrudRoutes.get("/:id", chunkE7E3NL3Y_cjs.optionalAuth(), async (c) => {
   try {
     const id = c.req.param("id");
     const db = c.env.DB;
@@ -959,7 +972,7 @@ apiContentCrudRoutes.get("/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) =>
     ).bind(id, getRequestTenant(c)).first();
     let transformedContent;
     if (docRow) {
-      const coll = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getByName(docRow.type_id);
+      const coll = chunkYAURVGUK_cjs.getCollectionRegistry().getByName(docRow.type_id);
       transformedContent = {
         id: docRow.root_id,
         title: docRow.title,
@@ -968,8 +981,8 @@ apiContentCrudRoutes.get("/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) =>
         collectionId: coll?.id ?? docRow.type_id,
         data: docRow.data ? JSON.parse(docRow.data) : {},
         // D29: document timestamps are SECONDS; legacy `content` API contract is MILLISECONDS.
-        created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(docRow.created_at),
-        updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(docRow.updated_at)
+        created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(docRow.created_at),
+        updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(docRow.updated_at)
       };
     } else {
       return c.json({ error: "Content not found" }, 404);
@@ -984,6 +997,32 @@ apiContentCrudRoutes.get("/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) =>
       { collection: docRow.type_id, id: docRow.root_id, data: transformedContent.data },
       "fire-and-forget"
     );
+    const fieldsParam = c.req.query("fields");
+    if (fieldsParam) {
+      const projFields = fieldsParam.split(",").map((s) => s.trim()).filter(Boolean);
+      if (projFields.length > 0) {
+        const result = {};
+        const dataSubFields = [];
+        for (const f of projFields) {
+          if (f === "data") {
+            result.data = transformedContent.data;
+          } else if (f.startsWith("data.")) {
+            dataSubFields.push(f.slice(5));
+          } else if (Object.prototype.hasOwnProperty.call(transformedContent, f)) {
+            result[f] = transformedContent[f];
+          }
+        }
+        if (dataSubFields.length > 0 && !result.data) {
+          result.data = {};
+          for (const sub of dataSubFields) {
+            if (transformedContent.data && Object.prototype.hasOwnProperty.call(transformedContent.data, sub)) {
+              result.data[sub] = transformedContent.data[sub];
+            }
+          }
+        }
+        return c.json({ data: result });
+      }
+    }
     return c.json({ data: transformedContent });
   } catch (error) {
     console.error("Error fetching content:", error);
@@ -993,7 +1032,7 @@ apiContentCrudRoutes.get("/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) =>
     }, 500);
   }
 });
-apiContentCrudRoutes.post("/", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+apiContentCrudRoutes.post("/", chunkE7E3NL3Y_cjs.requireAuth(), chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const db = c.env.DB;
     const user = c.get("user");
@@ -1027,7 +1066,7 @@ apiContentCrudRoutes.post("/", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cj
         return c.json({ error: "Write cancelled by plugin", details: String(err) }, 400);
       }
       const tenantId = getRequestTenant(c);
-      const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+      const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
         queryableFields: backing.docType.queryableFields ?? [],
         typeSchemaVersion: backing.docType.schemaVersion ?? 1,
         maxVersionsPerRoot: backing.docType.settings?.maxVersionsPerRoot ?? 50,
@@ -1047,8 +1086,8 @@ apiContentCrudRoutes.post("/", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cj
         user?.userId
       );
       const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-      await cache.invalidate("content-filtered:*");
-      await cache.invalidate("collection-content-filtered:*");
+      await cache.invalidate("api:content-filtered:*");
+      await cache.invalidate(`api:collection-content-filtered:${backing.coll.name}:*`);
       dispatchHookEvent(
         c,
         "content:after:create",
@@ -1056,7 +1095,7 @@ apiContentCrudRoutes.post("/", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cj
         "fire-and-forget"
       );
       return c.json({
-        data: { id: doc.rootId, title: doc.title, slug: doc.slug, status: doc.status, collectionId: backing.coll.id, data: doc.data, created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(doc.createdAt), updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(doc.updatedAt) }
+        data: { id: doc.rootId, title: doc.title, slug: doc.slug, status: doc.status, collectionId: backing.coll.id, data: doc.data, created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(doc.createdAt), updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(doc.updatedAt) }
       }, 201);
     }
     return c.json({ error: "Collection is not document-backed" }, 400);
@@ -1068,7 +1107,7 @@ apiContentCrudRoutes.post("/", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cj
     }, 500);
   }
 });
-apiContentCrudRoutes.put("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+apiContentCrudRoutes.put("/:id", chunkE7E3NL3Y_cjs.requireAuth(), chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const id = c.req.param("id");
     const db = c.env.DB;
@@ -1090,8 +1129,8 @@ apiContentCrudRoutes.put("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_
       } catch (err) {
         return c.json({ error: "Write cancelled by plugin", details: String(err) }, 400);
       }
-      const docType = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(docRow.type_id);
-      const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+      const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(docRow.type_id);
+      const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
         queryableFields: docType?.queryableFields ?? [],
         typeSchemaVersion: docType?.schemaVersion ?? 1,
         maxVersionsPerRoot: docType?.settings?.maxVersionsPerRoot ?? 50,
@@ -1111,9 +1150,9 @@ apiContentCrudRoutes.put("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_
         await svc.unpublish(pub.id);
       }
       const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-      await cache.invalidate("content-filtered:*");
-      await cache.invalidate("collection-content-filtered:*");
-      const coll = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getByName(docRow.type_id);
+      await cache.invalidate("api:content-filtered:*");
+      await cache.invalidate(`api:collection-content-filtered:${docRow.type_id}:*`);
+      const coll = chunkYAURVGUK_cjs.getCollectionRegistry().getByName(docRow.type_id);
       const saved = await db.prepare("SELECT * FROM documents WHERE id = ?").bind(newDraft.id).first();
       const savedData = saved?.data ? JSON.parse(saved.data) : {};
       dispatchHookEvent(c, "content:after:update", { collection: docRow.type_id, id, data: savedData, user: actor }, "fire-and-forget");
@@ -1122,7 +1161,7 @@ apiContentCrudRoutes.put("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_
         dispatchHookEvent(c, "content:after:publish", { collection: docRow.type_id, id, data: savedData, user: actor }, "fire-and-forget");
       }
       return c.json({
-        data: { id: saved.root_id, title: saved.title, slug: saved.slug, status: saved.status, collectionId: coll?.id ?? docRow.type_id, data: savedData, created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(saved.created_at), updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(saved.updated_at) }
+        data: { id: saved.root_id, title: saved.title, slug: saved.slug, status: saved.status, collectionId: coll?.id ?? docRow.type_id, data: savedData, created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(saved.created_at), updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(saved.updated_at) }
       });
     }
     return c.json({ error: "Content not found" }, 404);
@@ -1134,7 +1173,7 @@ apiContentCrudRoutes.put("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_
     }, 500);
   }
 });
-apiContentCrudRoutes.delete("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+apiContentCrudRoutes.delete("/:id", chunkE7E3NL3Y_cjs.requireAuth(), chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const id = c.req.param("id");
     const db = c.env.DB;
@@ -1151,8 +1190,8 @@ apiContentCrudRoutes.delete("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FP
       const now = Math.floor(Date.now() / 1e3);
       await db.prepare("UPDATE documents SET deleted_at = ?, updated_at = ? WHERE root_id = ? AND tenant_id = ?").bind(now, now, id, tenantId).run();
       const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-      await cache.invalidate("content-filtered:*");
-      await cache.invalidate("collection-content-filtered:*");
+      await cache.invalidate("api:content-filtered:*");
+      await cache.invalidate(`api:collection-content-filtered:${docRow.type_id}:*`);
       dispatchHookEvent(c, "content:after:delete", { collection: docRow.type_id, id, data: {}, user: actor }, "fire-and-forget");
       return c.json({ success: true });
     }
@@ -1168,6 +1207,22 @@ apiContentCrudRoutes.delete("/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FP
 var api_content_crud_default = apiContentCrudRoutes;
 
 // src/routes/api.ts
+function isAnonPrincipal(principalSet) {
+  return principalSet.length === 1 && principalSet[0]?.type === "public";
+}
+async function typeReadAllowed(db, principalSet, docType, typeName) {
+  const perms = new DocumentPermissionsService(db);
+  if (perms.isAllowedSync(principalSet, [], "read", docType?.settings ?? {})) return true;
+  const rbac = new chunkJCBDXEY2_cjs.RbacService(db);
+  let anyRbacRoleFound = false;
+  for (const p of principalSet) {
+    if (p.type !== "role") continue;
+    if (!await rbac.hasRbacRole(p.id)) continue;
+    anyRbacRoleFound = true;
+    if (await rbac.isGrantedForRole(p.id, `document_type:${typeName}`, "read")) return true;
+  }
+  return !anyRbacRoleFound;
+}
 var DOC_SORTABLE_COLUMNS = /* @__PURE__ */ new Set([
   "created_at",
   "updated_at",
@@ -1247,10 +1302,37 @@ function mapDocRowToContent(row, collectionId) {
     collectionId,
     data: row.data ? JSON.parse(row.data) : {},
     // D29: document timestamps are SECONDS; the legacy `content` API contract is MILLISECONDS.
-    created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(row.created_at),
-    updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(row.updated_at)
+    created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(row.created_at),
+    updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(row.updated_at)
   };
 }
+function projectFields(item, fields) {
+  if (fields.length === 0) return item;
+  const result = {};
+  const dataSubFields = [];
+  for (const f of fields) {
+    if (f === "data") {
+      result.data = item.data;
+    } else if (f.startsWith("data.")) {
+      dataSubFields.push(f.slice(5));
+    } else if (Object.prototype.hasOwnProperty.call(item, f)) {
+      result[f] = item[f];
+    }
+  }
+  if (dataSubFields.length > 0 && !result.data) {
+    result.data = {};
+    for (const sub of dataSubFields) {
+      if (item.data && Object.prototype.hasOwnProperty.call(item.data, sub)) {
+        result.data[sub] = item.data[sub];
+      }
+    }
+  }
+  return result;
+}
+function parseFieldsParam(raw2) {
+  if (!raw2) return [];
+  return raw2.split(",").map((s) => s.trim()).filter(Boolean);
+}
 var apiRoutes = new hono.Hono();
 apiRoutes.use("*", async (c, next) => {
   const startTime = Date.now();
@@ -1260,7 +1342,7 @@ apiRoutes.use("*", async (c, next) => {
   c.header("X-Response-Time", `${totalTime}ms`);
 });
 apiRoutes.use("*", async (c, next) => {
-  const cacheEnabled = await chunkIS54FPB7_cjs.isPluginActive(c.env.DB, "core-cache");
+  const cacheEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(c.env.DB, "core-cache");
   c.set("cacheEnabled", cacheEnabled);
   await next();
 });
@@ -1283,7 +1365,7 @@ apiRoutes.get("/", (c) => {
     openapi: "3.0.0",
     info: {
       title: "SonicJS AI API",
-      version: chunkC3ZQP5NW_cjs.getCoreVersion(),
+      version: chunkBJ6NJL2E_cjs.getCoreVersion(),
       description: "RESTful API for SonicJS headless CMS - a modern, AI-powered content management system built on Cloudflare Workers",
       contact: {
         name: "SonicJS Support",
@@ -1713,8 +1795,8 @@ apiRoutes.get("/collections", async (c) => {
     }
     c.header("X-Cache-Status", "MISS");
     c.header("X-Cache-Source", "registry");
-    const records = chunkAT4ZQGEZ_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal);
-    const transformedResults = records.map(chunkAT4ZQGEZ_cjs.collectionRecordToRow);
+    const records = chunkYAURVGUK_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal);
+    const transformedResults = records.map(chunkYAURVGUK_cjs.collectionRecordToRow);
     const responseData = {
       data: transformedResults,
       meta: addTimingMeta(c, {
@@ -1735,16 +1817,21 @@ apiRoutes.get("/collections", async (c) => {
     return c.json({ error: "Failed to fetch collections" }, 500);
   }
 });
-apiRoutes.get("/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
+apiRoutes.get("/content", chunkE7E3NL3Y_cjs.optionalAuth(), async (c) => {
   const executionStart = Date.now();
   try {
     const db = c.env.DB;
     const queryParams = c.req.query();
+    const projFields = parseFieldsParam(queryParams.fields);
+    if (queryParams.fields) delete queryParams.fields;
     const role = c.get("user")?.role;
+    const { tenantId: cTenantId, principalSet: cPrincipalSet } = getDocumentRequestContext(c);
+    const cAnon = isAnonPrincipal(cPrincipalSet);
+    const cNeedsAcl = !cAnon && !canReadNonPublicContent(role);
     const collIdByName = /* @__PURE__ */ new Map();
     let typeId;
     let typeIds;
-    const registry = chunkAT4ZQGEZ_cjs.getCollectionRegistry();
+    const registry = chunkYAURVGUK_cjs.getCollectionRegistry();
     if (queryParams.collection) {
       const collectionName = queryParams.collection;
       const record = registry.getByName(collectionName);
@@ -1774,11 +1861,11 @@ apiRoutes.get("/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
         return r.name;
       });
     }
-    const filter = chunkIXUHXTHW_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
+    const filter = chunkDLTT7QZU_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
     const normalizedFilter = augmentFilterForDocuments(filter, { typeId, typeIds, role });
     if (!normalizedFilter.limit) normalizedFilter.limit = 50;
     normalizedFilter.limit = Math.min(normalizedFilter.limit, 1e3);
-    const builder = new chunkIXUHXTHW_cjs.QueryFilterBuilder();
+    const builder = new chunkDLTT7QZU_cjs.QueryFilterBuilder();
     const queryResult = builder.build("documents", normalizedFilter);
     if (queryResult.errors.length > 0) {
       return c.json({
@@ -1786,7 +1873,7 @@ apiRoutes.get("/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
         details: queryResult.errors
       }, 400);
     }
-    const cacheEnabled = c.get("cacheEnabled");
+    const cacheEnabled = c.get("cacheEnabled") && cAnon;
     const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
     const cacheKey = cache.generateKey("content-filtered", JSON.stringify({ filter: normalizedFilter, query: queryResult.sql }));
     if (cacheEnabled) {
@@ -1816,11 +1903,41 @@ apiRoutes.get("/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
     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) => mapDocRowToContent(row, collIdByName.get(row.type_id) ?? null));
+    let aclResults = results;
+    if (cNeedsAcl) {
+      const typeReg = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
+      const repo = new DocumentRepository(db, cTenantId);
+      const uniqueTypeIds = [...new Set(results.map((r) => r.type_id))];
+      const typeSettingsMap = /* @__PURE__ */ new Map();
+      const typeRbacOnlyMap = /* @__PURE__ */ new Map();
+      const typeDeniedMap = /* @__PURE__ */ new Map();
+      await Promise.all(uniqueTypeIds.map(async (tid) => {
+        const dt = await typeReg.findById(tid);
+        const settings = dt?.settings ?? {};
+        typeSettingsMap.set(tid, settings);
+        const allowed2 = await typeReadAllowed(db, cPrincipalSet, dt, tid);
+        if (!allowed2) {
+          typeDeniedMap.set(tid, true);
+          return;
+        }
+        const perms = new DocumentPermissionsService(db);
+        typeRbacOnlyMap.set(tid, !perms.isAllowedSync(cPrincipalSet, [], "read", settings));
+      }));
+      const allowed = await Promise.all(
+        results.map((row) => {
+          const tid = row.type_id;
+          if (typeDeniedMap.get(tid)) return Promise.resolve(false);
+          if (typeRbacOnlyMap.get(tid)) return Promise.resolve(true);
+          return repo.isAllowed(cPrincipalSet, row.root_id, "read", typeSettingsMap.get(tid) ?? {});
+        })
+      );
+      aclResults = results.filter((_, i) => allowed[i]);
+    }
+    const transformedResults = aclResults.map((row) => mapDocRowToContent(row, collIdByName.get(row.type_id) ?? null));
     const responseData = {
-      data: transformedResults,
+      data: projFields.length ? transformedResults.map((item) => projectFields(item, projFields)) : transformedResults,
       meta: addTimingMeta(c, {
-        count: results.length,
+        count: aclResults.length,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         // D44: echo the caller's filter with the access policy applied (status=published forced for
         // anonymous callers — the visible enforcement proof), NOT the internal doc-augmented where-tree.
@@ -1831,7 +1948,7 @@ apiRoutes.get("/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
         }
       }, executionStart)
     };
-    if (cacheEnabled) {
+    if (cacheEnabled && projFields.length === 0) {
       await cache.set(cacheKey, responseData);
     }
     return c.json(responseData);
@@ -1843,26 +1960,36 @@ apiRoutes.get("/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
     }, 500);
   }
 });
-apiRoutes.get("/collections/:collection/content", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
+apiRoutes.get("/collections/:collection/content", chunkE7E3NL3Y_cjs.optionalAuth(), async (c) => {
   const executionStart = Date.now();
   try {
     const collection = c.req.param("collection");
     const db = c.env.DB;
     const queryParams = c.req.query();
-    const record = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getBySlugOrName(collection);
+    const record = chunkYAURVGUK_cjs.getCollectionRegistry().getBySlugOrName(collection);
     if (!record || record.isActive === false) {
       return c.json({ error: "Collection not found" }, 404);
     }
     const collIdByName = /* @__PURE__ */ new Map();
     collIdByName.set(collection, record.id);
     const role = c.get("user")?.role;
-    const filter = chunkIXUHXTHW_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
+    const { tenantId: ccTenantId, principalSet: ccPrincipalSet } = getDocumentRequestContext(c);
+    const ccAnon = isAnonPrincipal(ccPrincipalSet);
+    const ccNeedsAcl = !ccAnon && !canReadNonPublicContent(role);
+    let ccDocType;
+    if (ccNeedsAcl) {
+      ccDocType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(record.name);
+      if (!await typeReadAllowed(db, ccPrincipalSet, ccDocType, record.name)) {
+        return c.json({ error: "Forbidden" }, 403);
+      }
+    }
+    const filter = chunkDLTT7QZU_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
     const normalizedFilter = augmentFilterForDocuments(filter, { typeId: collection, role });
     if (!normalizedFilter.limit) {
       normalizedFilter.limit = 50;
     }
     normalizedFilter.limit = Math.min(normalizedFilter.limit, 1e3);
-    const builder = new chunkIXUHXTHW_cjs.QueryFilterBuilder();
+    const builder = new chunkDLTT7QZU_cjs.QueryFilterBuilder();
     const queryResult = builder.build("documents", normalizedFilter);
     if (queryResult.errors.length > 0) {
       return c.json({
@@ -1870,7 +1997,7 @@ apiRoutes.get("/collections/:collection/content", chunkIS54FPB7_cjs.optionalAuth
         details: queryResult.errors
       }, 400);
     }
-    const cacheEnabled = c.get("cacheEnabled");
+    const cacheEnabled = c.get("cacheEnabled") && ccAnon;
     const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
     const includeCollection = queryParams.include?.split(",").map((s) => s.trim()).includes("collection");
     const cacheKey = cache.generateKey("collection-content-filtered", `${collection}:${JSON.stringify({ filter: normalizedFilter, query: queryResult.sql, includeCollection })}`);
@@ -1901,12 +2028,24 @@ apiRoutes.get("/collections/:collection/content", chunkIS54FPB7_cjs.optionalAuth
     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) => mapDocRowToContent(row, collIdByName.get(row.type_id) ?? null));
+    let ccAclResults = results;
+    if (ccNeedsAcl) {
+      const ccPerms = new DocumentPermissionsService(db);
+      const ccBaseGrantsPass = ccPerms.isAllowedSync(ccPrincipalSet, [], "read", ccDocType?.settings ?? {});
+      if (ccBaseGrantsPass) {
+        const repo = new DocumentRepository(db, ccTenantId);
+        const allowed = await Promise.all(
+          results.map((row) => repo.isAllowed(ccPrincipalSet, row.root_id, "read", ccDocType?.settings ?? {}))
+        );
+        ccAclResults = results.filter((_, i) => allowed[i]);
+      }
+    }
+    const transformedResults = ccAclResults.map((row) => mapDocRowToContent(row, collIdByName.get(row.type_id) ?? null));
     const responseData = {
       data: transformedResults,
       meta: addTimingMeta(c, {
-        ...includeCollection ? { collection: chunkAT4ZQGEZ_cjs.collectionRecordToRow(record) } : {},
-        count: results.length,
+        ...includeCollection ? { collection: chunkYAURVGUK_cjs.collectionRecordToRow(record) } : {},
+        count: ccAclResults.length,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         // D44: echo the caller's filter with the access policy applied (status=published forced for
         // anonymous callers — the visible enforcement proof), NOT the internal doc-augmented where-tree.
@@ -1930,31 +2069,43 @@ apiRoutes.get("/collections/:collection/content", chunkIS54FPB7_cjs.optionalAuth
   }
 });
 apiRoutes.route("/content", api_content_crud_default);
-apiRoutes.get("/:collection", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
+apiRoutes.get("/:collection", chunkE7E3NL3Y_cjs.optionalAuth(), async (c) => {
   const executionStart = Date.now();
   try {
     const collection = c.req.param("collection");
     const db = c.env.DB;
     const queryParams = c.req.query();
-    const record = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getBySlugOrName(collection);
+    const projFields = parseFieldsParam(queryParams.fields);
+    if (queryParams.fields) delete queryParams.fields;
+    const record = chunkYAURVGUK_cjs.getCollectionRegistry().getBySlugOrName(collection);
     if (!record || record.isActive === false) {
       return c.json({ error: "Collection not found" }, 404);
     }
     const collIdByName = /* @__PURE__ */ new Map();
     collIdByName.set(record.name, record.id);
     const role = c.get("user")?.role;
-    const filter = chunkIXUHXTHW_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
+    const { tenantId, principalSet } = getDocumentRequestContext(c);
+    const anon = isAnonPrincipal(principalSet);
+    const needsAcl = !anon && !canReadNonPublicContent(role);
+    let docTypeForCheck;
+    if (needsAcl) {
+      docTypeForCheck = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(record.name);
+      if (!await typeReadAllowed(db, principalSet, docTypeForCheck, record.name)) {
+        return c.json({ error: "Forbidden" }, 403);
+      }
+    }
+    const filter = chunkDLTT7QZU_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
     const normalizedFilter = augmentFilterForDocuments(filter, { typeId: record.name, role });
     if (!normalizedFilter.limit) normalizedFilter.limit = 50;
     normalizedFilter.limit = Math.min(normalizedFilter.limit, 1e3);
-    const builder = new chunkIXUHXTHW_cjs.QueryFilterBuilder();
+    const builder = new chunkDLTT7QZU_cjs.QueryFilterBuilder();
     const queryResult = builder.build("documents", normalizedFilter);
     if (queryResult.errors.length > 0) {
       return c.json({ error: "Invalid filter parameters", details: queryResult.errors }, 400);
     }
     const collectionCache = record.cache;
     const collectionCacheDisabled = collectionCache?.enabled === false;
-    const cacheEnabled = c.get("cacheEnabled") && !collectionCacheDisabled;
+    const cacheEnabled = c.get("cacheEnabled") && !collectionCacheDisabled && projFields.length === 0 && anon;
     const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
     const includeCollection = queryParams.include?.split(",").map((s) => s.trim()).includes("collection");
     const cacheKey = cache.generateKey("collection-content-filtered", `${collection}:${JSON.stringify({ filter: normalizedFilter, query: queryResult.sql, includeCollection })}`);
@@ -1972,12 +2123,25 @@ apiRoutes.get("/:collection", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
     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) => mapDocRowToContent(row, collIdByName.get(row.type_id) ?? null));
+    let aclResults = results;
+    if (needsAcl) {
+      const perms = new DocumentPermissionsService(db);
+      const baseGrantsPass = perms.isAllowedSync(principalSet, [], "read", docTypeForCheck?.settings ?? {});
+      if (!baseGrantsPass) {
+      } else {
+        const repo = new DocumentRepository(db, tenantId);
+        const allowed = await Promise.all(
+          results.map((row) => repo.isAllowed(principalSet, row.root_id, "read", docTypeForCheck?.settings ?? {}))
+        );
+        aclResults = results.filter((_, i) => allowed[i]);
+      }
+    }
+    const transformedResults = aclResults.map((row) => mapDocRowToContent(row, collIdByName.get(row.type_id) ?? null));
     const responseData = {
-      data: transformedResults,
+      data: projFields.length ? transformedResults.map((item) => projectFields(item, projFields)) : transformedResults,
       meta: addTimingMeta(c, {
-        ...includeCollection ? { collection: chunkAT4ZQGEZ_cjs.collectionRecordToRow(record) } : {},
-        count: results.length,
+        ...includeCollection ? { collection: chunkYAURVGUK_cjs.collectionRecordToRow(record) } : {},
+        count: aclResults.length,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         filter: normalizePublicContentFilter(filter, role),
         cache: { hit: false, source: "database" }
@@ -1994,12 +2158,12 @@ apiRoutes.get("/:collection", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
     return c.json({ error: "Failed to fetch content", details: error instanceof Error ? error.message : String(error) }, 500);
   }
 });
-apiRoutes.get("/:collection/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) => {
+apiRoutes.get("/:collection/:id", chunkE7E3NL3Y_cjs.optionalAuth(), async (c) => {
   try {
     const collection = c.req.param("collection");
     const id = c.req.param("id");
     const db = c.env.DB;
-    const record = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getBySlugOrName(collection);
+    const record = chunkYAURVGUK_cjs.getCollectionRegistry().getBySlugOrName(collection);
     if (!record || record.isActive === false) {
       return c.json({ error: "Collection not found" }, 404);
     }
@@ -2008,7 +2172,24 @@ apiRoutes.get("/:collection/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) =>
       privileged ? "SELECT * FROM documents WHERE root_id = ? AND type_id = ? AND tenant_id = 'default' AND is_current_draft = 1 AND deleted_at IS NULL" : "SELECT * FROM documents WHERE root_id = ? AND type_id = ? AND tenant_id = 'default' AND is_published = 1 AND deleted_at IS NULL"
     ).bind(id, record.name).first();
     if (!docRow) return c.json({ error: "Content not found" }, 404);
-    const coll = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getByName(docRow.type_id);
+    const colRole = c.get("user")?.role;
+    const { tenantId: colTenantId, principalSet: colPrincipalSet } = getDocumentRequestContext(c);
+    const colNeedsAcl = !isAnonPrincipal(colPrincipalSet) && !canReadNonPublicContent(colRole);
+    if (colNeedsAcl) {
+      const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(record.name);
+      if (!await typeReadAllowed(db, colPrincipalSet, docType, record.name)) {
+        return c.json({ error: "Content not found" }, 404);
+      }
+      const perms = new DocumentPermissionsService(db);
+      if (perms.isAllowedSync(colPrincipalSet, [], "read", docType?.settings ?? {})) {
+        const repo = new DocumentRepository(db, colTenantId);
+        if (!await repo.isAllowed(colPrincipalSet, docRow.root_id, "read", docType?.settings ?? {})) {
+          return c.json({ error: "Content not found" }, 404);
+        }
+      }
+    }
+    const projFields = parseFieldsParam(c.req.query("fields"));
+    const coll = chunkYAURVGUK_cjs.getCollectionRegistry().getByName(docRow.type_id);
     const transformedContent = {
       id: docRow.root_id,
       title: docRow.title,
@@ -2016,17 +2197,17 @@ apiRoutes.get("/:collection/:id", chunkIS54FPB7_cjs.optionalAuth(), async (c) =>
       status: docRow.status,
       collectionId: coll?.id ?? docRow.type_id,
       data: docRow.data ? JSON.parse(docRow.data) : {},
-      created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(docRow.created_at),
-      updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(docRow.updated_at)
+      created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(docRow.created_at),
+      updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(docRow.updated_at)
     };
     dispatchHookEvent(c, "content:read", { collection: docRow.type_id, id: docRow.root_id, data: transformedContent.data }, "fire-and-forget");
-    return c.json({ data: transformedContent });
+    return c.json({ data: projFields.length ? projectFields(transformedContent, projFields) : transformedContent });
   } catch (error) {
     console.error("Error fetching content:", error);
     return c.json({ error: "Failed to fetch content", details: error instanceof Error ? error.message : String(error) }, 500);
   }
 });
-apiRoutes.post("/:collection", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+apiRoutes.post("/:collection", chunkE7E3NL3Y_cjs.requireAuth(), chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const collection = c.req.param("collection");
     const db = c.env.DB;
@@ -2047,26 +2228,26 @@ apiRoutes.post("/:collection", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cj
     } catch (err) {
       return c.json({ error: "Write cancelled by plugin", details: String(err) }, 400);
     }
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, { queryableFields: backing.docType.queryableFields ?? [], typeSchemaVersion: backing.docType.schemaVersion ?? 1, maxVersionsPerRoot: backing.docType.settings?.maxVersionsPerRoot ?? 50, tenantId: "default", versioning: backing.docType.settings?.versioning ?? false });
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, { queryableFields: backing.docType.queryableFields ?? [], typeSchemaVersion: backing.docType.schemaVersion ?? 1, maxVersionsPerRoot: backing.docType.settings?.maxVersionsPerRoot ?? 50, tenantId: "default", versioning: backing.docType.settings?.versioning ?? false });
     const doc = await svc.create(createDocumentSchema.parse({ typeId: backing.coll.name, tenantId: "default", locale: "default", title, slug: finalSlug, data: hookData, publishOnCreate: (status || "draft") === "published" }), user?.userId);
     const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-    await cache.invalidate("content-filtered:*");
-    await cache.invalidate("collection-content-filtered:*");
+    await cache.invalidate("api:content-filtered:*");
+    await cache.invalidate(`api:collection-content-filtered:${backing.coll.name}:*`);
     dispatchHookEvent(c, "content:after:create", { collection: backing.coll.name, id: doc.rootId, data: doc.data ?? {}, user: actor }, "fire-and-forget");
-    return c.json({ data: { id: doc.rootId, title: doc.title, slug: doc.slug, status: doc.status, collectionId: backing.coll.id, data: doc.data, created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(doc.createdAt), updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(doc.updatedAt) } }, 201);
+    return c.json({ data: { id: doc.rootId, title: doc.title, slug: doc.slug, status: doc.status, collectionId: backing.coll.id, data: doc.data, created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(doc.createdAt), updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(doc.updatedAt) } }, 201);
   } catch (error) {
     console.error("Error creating content:", error);
     return c.json({ error: "Failed to create content", details: error instanceof Error ? error.message : String(error) }, 500);
   }
 });
-apiRoutes.put("/:collection/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+apiRoutes.put("/:collection/:id", chunkE7E3NL3Y_cjs.requireAuth(), chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const collection = c.req.param("collection");
     const id = c.req.param("id");
     const db = c.env.DB;
     const user = c.get("user");
     const body = await c.req.json();
-    const collRecord = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getBySlugOrName(collection);
+    const collRecord = chunkYAURVGUK_cjs.getCollectionRegistry().getBySlugOrName(collection);
     const typeName = collRecord?.name ?? collection;
     const docRow = await db.prepare("SELECT root_id, type_id FROM documents WHERE root_id = ? AND type_id = ? AND tenant_id = 'default' AND is_current_draft = 1 AND deleted_at IS NULL").bind(id, typeName).first();
     if (!docRow) return c.json({ error: "Content not found" }, 404);
@@ -2078,8 +2259,8 @@ apiRoutes.put("/:collection/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7
     } catch (err) {
       return c.json({ error: "Write cancelled by plugin", details: String(err) }, 400);
     }
-    const docType = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(docRow.type_id);
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, { queryableFields: docType?.queryableFields ?? [], typeSchemaVersion: docType?.schemaVersion ?? 1, maxVersionsPerRoot: docType?.settings?.maxVersionsPerRoot ?? 50, tenantId: "default", versioning: docType?.settings?.versioning ?? false });
+    const docType = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(docRow.type_id);
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, { queryableFields: docType?.queryableFields ?? [], typeSchemaVersion: docType?.schemaVersion ?? 1, maxVersionsPerRoot: docType?.settings?.maxVersionsPerRoot ?? 50, tenantId: "default", versioning: docType?.settings?.versioning ?? false });
     const input = {};
     if (body.title !== void 0) input.title = body.title;
     if (body.slug !== void 0) input.slug = slugify(body.slug);
@@ -2093,27 +2274,27 @@ apiRoutes.put("/:collection/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7
       await svc.unpublish(pub.id);
     }
     const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-    await cache.invalidate("content-filtered:*");
-    await cache.invalidate("collection-content-filtered:*");
-    const coll = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getByName(docRow.type_id);
+    await cache.invalidate("api:content-filtered:*");
+    await cache.invalidate(`api:collection-content-filtered:${docRow.type_id}:*`);
+    const coll = chunkYAURVGUK_cjs.getCollectionRegistry().getByName(docRow.type_id);
     const saved = await db.prepare("SELECT * FROM documents WHERE id = ?").bind(newDraft.id).first();
     const savedData = saved?.data ? JSON.parse(saved.data) : {};
     dispatchHookEvent(c, "content:after:update", { collection: docRow.type_id, id, data: savedData, user: actor }, "fire-and-forget");
     const nowPublished = body.status === "published" || body.status === void 0 && wasPublished;
     if (nowPublished && !wasPublished) dispatchHookEvent(c, "content:after:publish", { collection: docRow.type_id, id, data: savedData, user: actor }, "fire-and-forget");
-    return c.json({ data: { id: saved.root_id, title: saved.title, slug: saved.slug, status: saved.status, collectionId: coll?.id ?? docRow.type_id, data: savedData, created_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(saved.created_at), updated_at: chunkLTZ5WYOK_cjs.documentSecondsToMs(saved.updated_at) } });
+    return c.json({ data: { id: saved.root_id, title: saved.title, slug: saved.slug, status: saved.status, collectionId: coll?.id ?? docRow.type_id, data: savedData, created_at: chunkJCBDXEY2_cjs.documentSecondsToMs(saved.created_at), updated_at: chunkJCBDXEY2_cjs.documentSecondsToMs(saved.updated_at) } });
   } catch (error) {
     console.error("Error updating content:", error);
     return c.json({ error: "Failed to update content", details: error instanceof Error ? error.message : String(error) }, 500);
   }
 });
-apiRoutes.delete("/:collection/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+apiRoutes.delete("/:collection/:id", chunkE7E3NL3Y_cjs.requireAuth(), chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const collection = c.req.param("collection");
     const id = c.req.param("id");
     const db = c.env.DB;
     const user = c.get("user");
-    const collRecord = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getBySlugOrName(collection);
+    const collRecord = chunkYAURVGUK_cjs.getCollectionRegistry().getBySlugOrName(collection);
     const typeName = collRecord?.name ?? collection;
     const docRow = await db.prepare("SELECT type_id FROM documents WHERE root_id = ? AND type_id = ? AND tenant_id = 'default' AND deleted_at IS NULL LIMIT 1").bind(id, typeName).first();
     if (!docRow) return c.json({ error: "Content not found" }, 404);
@@ -2126,8 +2307,8 @@ apiRoutes.delete("/:collection/:id", chunkIS54FPB7_cjs.requireAuth(), chunkIS54F
     const now = Math.floor(Date.now() / 1e3);
     await db.prepare("UPDATE documents SET deleted_at = ?, updated_at = ? WHERE root_id = ? AND tenant_id = 'default'").bind(now, now, id).run();
     const cache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-    await cache.invalidate("content-filtered:*");
-    await cache.invalidate("collection-content-filtered:*");
+    await cache.invalidate("api:content-filtered:*");
+    await cache.invalidate(`api:collection-content-filtered:${docRow.type_id}:*`);
     dispatchHookEvent(c, "content:after:delete", { collection: docRow.type_id, id, data: {}, user: actor }, "fire-and-forget");
     return c.json({ success: true });
   } catch (error) {
@@ -2200,7 +2381,7 @@ var MediaDocumentService = class {
   tenantId;
   /** Create a media_asset document from R2 upload metadata. Published-on-create (immediately usable). */
   async createFromUpload(meta, createdBy) {
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(this.db, { queryableFields: MEDIA_QUERYABLE, tenantId: this.tenantId, maxVersionsPerRoot: 5 });
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(this.db, { queryableFields: MEDIA_QUERYABLE, tenantId: this.tenantId, maxVersionsPerRoot: 5 });
     return svc.create(
       createDocumentSchema.parse({
         typeId: "media_asset",
@@ -2278,7 +2459,7 @@ var MediaDocumentService = class {
   }
   /** Update alt/caption/tags on a media_asset document (saveDraft + publish atomically). */
   async updateMetadata(rootId, meta, updatedBy) {
-    const svc = new chunkLTZ5WYOK_cjs.DocumentsService(this.db, { queryableFields: MEDIA_QUERYABLE, tenantId: this.tenantId, maxVersionsPerRoot: 5 });
+    const svc = new chunkJCBDXEY2_cjs.DocumentsService(this.db, { queryableFields: MEDIA_QUERYABLE, tenantId: this.tenantId, maxVersionsPerRoot: 5 });
     const newDraft = await svc.saveDraft(rootId, { data: meta }, updatedBy);
     return svc.publish(newDraft.id, updatedBy);
   }
@@ -2335,7 +2516,7 @@ var fileValidationSchema = zod.z.object({
   // 50MB max
 });
 var apiMediaRoutes = new hono.Hono();
-apiMediaRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
+apiMediaRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 apiMediaRoutes.post("/upload", async (c) => {
   try {
     const user = c.get("user");
@@ -2689,9 +2870,13 @@ apiMediaRoutes.post("/create-folder", async (c) => {
         error: "Folder name can only contain lowercase letters, numbers, hyphens, and underscores"
       }, 400);
     }
-    const checkStmt = c.env.DB.prepare("SELECT COUNT(*) as count FROM media WHERE folder = ? AND deleted_at IS NULL");
-    const existingFolder = await checkStmt.bind(folderName).first();
-    if (existingFolder && existingFolder.count > 0) {
+    let folderExists = false;
+    try {
+      const existing = await c.env.DB.prepare("SELECT COUNT(*) as count FROM documents WHERE type_id = 'media_asset' AND tenant_id = 'default' AND json_extract(data, '$.folder') = ? AND deleted_at IS NULL AND is_current_draft = 1").bind(folderName).first();
+      folderExists = (existing?.count ?? 0) > 0;
+    } catch {
+    }
+    if (folderExists) {
       return c.json({
         success: false,
         error: `Folder "${folderName}" already exists`
@@ -3033,7 +3218,7 @@ apiSystemRoutes.get("/info", (c) => {
 apiSystemRoutes.get("/stats", async (c) => {
   try {
     const db = c.env.DB;
-    const typeIds = chunkAT4ZQGEZ_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal).map((r) => r.name);
+    const typeIds = chunkYAURVGUK_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal).map((r) => r.name);
     let contentStats = null;
     if (typeIds.length > 0) {
       const placeholders = typeIds.map(() => "?").join(",");
@@ -3108,12 +3293,12 @@ apiSystemRoutes.get("/env", (c) => {
 });
 var api_system_default = apiSystemRoutes;
 var adminApiRoutes = new hono.Hono();
-adminApiRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
-adminApiRoutes.use("*", chunkIS54FPB7_cjs.requireRole(["admin", "editor"]));
+adminApiRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
+adminApiRoutes.use("*", chunkE7E3NL3Y_cjs.requireRole(["admin", "editor"]));
 adminApiRoutes.get("/stats", async (c) => {
   try {
     const db = c.env.DB;
-    const userCollections = chunkAT4ZQGEZ_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal);
+    const userCollections = chunkYAURVGUK_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal);
     const collectionsCount = userCollections.length;
     let contentCount = 0;
     if (userCollections.length > 0) {
@@ -3204,7 +3389,7 @@ adminApiRoutes.get("/collections", async (c) => {
   try {
     const search = c.req.query("search") || "";
     const includeInactive = c.req.query("includeInactive") === "true";
-    let records = chunkAT4ZQGEZ_cjs.getCollectionRegistry().list().filter((r) => !r.internal);
+    let records = chunkYAURVGUK_cjs.getCollectionRegistry().list().filter((r) => !r.internal);
     if (!includeInactive) records = records.filter((r) => r.isActive !== false);
     if (search) {
       const needle = search.toLowerCase();
@@ -3236,7 +3421,7 @@ adminApiRoutes.get("/collections", async (c) => {
 adminApiRoutes.get("/collections/:id", async (c) => {
   try {
     const id = c.req.param("id");
-    const registry = chunkAT4ZQGEZ_cjs.getCollectionRegistry();
+    const registry = chunkYAURVGUK_cjs.getCollectionRegistry();
     const record = registry.getById(id) ?? registry.getByName(id);
     if (!record) {
       return c.json({ error: "Collection not found" }, 404);
@@ -3286,7 +3471,7 @@ adminApiRoutes.get("/references", async (c) => {
     if (collectionParams.length === 0) {
       return c.json({ error: "Collection is required" }, 400);
     }
-    const registry = chunkAT4ZQGEZ_cjs.getCollectionRegistry();
+    const registry = chunkYAURVGUK_cjs.getCollectionRegistry();
     const matched = collectionParams.map((param) => registry.getById(param) ?? registry.getByName(param)).filter((r) => !!r);
     const seen = /* @__PURE__ */ new Set();
     const collections = matched.filter((r) => {
@@ -3401,7 +3586,7 @@ adminApiRoutes.patch("/collections/:id", collectionsReadOnly);
 adminApiRoutes.delete("/collections/:id", collectionsReadOnly);
 adminApiRoutes.get("/migrations/status", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-ZD7Y5NUC.cjs');
+    const { MigrationService: MigrationService2 } = await import('./migrations-KU4V6T73.cjs');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const status = await migrationService.getMigrationStatus();
@@ -3444,7 +3629,7 @@ adminApiRoutes.post("/migrations/run", async (c) => {
 });
 adminApiRoutes.get("/migrations/validate", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-ZD7Y5NUC.cjs');
+    const { MigrationService: MigrationService2 } = await import('./migrations-KU4V6T73.cjs');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const validation = await migrationService.validateSchema();
@@ -3594,8 +3779,8 @@ function renderLoginPage(data, demoLoginActive = false) {
         <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
           <div class="bg-zinc-900 shadow-sm ring-1 ring-white/10 rounded-xl px-6 py-8 sm:px-10">
             <!-- Alerts -->
-            ${data.error ? `<div class="mb-6">${chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error })}</div>` : ""}
-            ${data.message ? `<div class="mb-6">${chunkE66UVONV_cjs.renderAlert({ type: "success", message: data.message })}</div>` : ""}
+            ${data.error ? `<div class="mb-6">${chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error })}</div>` : ""}
+            ${data.message ? `<div class="mb-6">${chunkOUBUS74I_cjs.renderAlert({ type: "success", message: data.message })}</div>` : ""}
 
             <!-- Form Response (HTMX target) -->
             <div id="form-response" class="mb-6"></div>
@@ -3603,6 +3788,8 @@ function renderLoginPage(data, demoLoginActive = false) {
             <!-- Form -->
             <form
               id="login-form"
+              action="/auth/login/form${data.redirect ? `?redirect=${encodeURIComponent(data.redirect)}` : ""}"
+              method="post"
               hx-post="/auth/login/form${data.redirect ? `?redirect=${encodeURIComponent(data.redirect)}` : ""}"
               hx-target="#form-response"
               hx-swap="innerHTML"
@@ -3759,7 +3946,7 @@ function renderRegisterPage(data) {
         <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
           <div class="bg-zinc-900 shadow-sm ring-1 ring-white/10 rounded-xl px-6 py-8 sm:px-10">
             <!-- Alerts -->
-            ${data.error ? `<div class="mb-6">${chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error })}</div>` : ""}
+            ${data.error ? `<div class="mb-6">${chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error })}</div>` : ""}
 
             <!-- Form -->
             <form
@@ -3859,7 +4046,7 @@ function renderRegisterPage(data) {
 }
 
 // src/services/email/email-service-singleton.ts
-var singleton = chunk4WMZGHIC_cjs.createServiceSingleton("EmailService");
+var singleton = chunkD6FWEYQE_cjs.createServiceSingleton("EmailService");
 function setEmailService(service2) {
   singleton.set(service2);
 }
@@ -3903,7 +4090,7 @@ function emptyProfile() {
   return { custom: {} };
 }
 function service(db) {
-  return new chunkLTZ5WYOK_cjs.DocumentsService(db, { tenantId: "default", maxVersionsPerRoot: 1, queryableFields: [] });
+  return new chunkJCBDXEY2_cjs.DocumentsService(db, { tenantId: "default", maxVersionsPerRoot: 1, queryableFields: [] });
 }
 async function readProfileData(db, userId) {
   const row = await db.prepare(
@@ -4667,7 +4854,7 @@ function getLexicalInitScript(settings = {}) {
     </script>
   `;
 }
-var lexicalEditorPlugin = chunk4WMZGHIC_cjs.definePlugin({
+var lexicalEditorPlugin = chunkD6FWEYQE_cjs.definePlugin({
   id: "lexical-editor",
   version: "1.0.0",
   name: "Lexical Editor",
@@ -5118,9 +5305,11 @@ function renderDynamicField(field, options = {}) {
           min="${opts.min || ""}"
           max="${opts.max || ""}"
           class="${baseClasses} ${errorClasses} !w-auto dark:[color-scheme:dark]"
+          placeholder="YYYY-MM-DD"
           ${required}
           ${disabled ? "disabled" : ""}
         >
+        <p class="mt-1 text-xs text-zinc-500 dark:text-zinc-400">Format: YYYY-MM-DD</p>
       `;
       break;
     case "datetime":
@@ -5136,6 +5325,7 @@ function renderDynamicField(field, options = {}) {
           ${required}
           ${disabled ? "disabled" : ""}
         >
+        <p class="mt-1 text-xs text-zinc-500 dark:text-zinc-400">Format: YYYY-MM-DD HH:MM</p>
       `;
       break;
     case "slug":
@@ -7073,7 +7263,7 @@ api.put("/:userId", async (c) => {
   await saveCustomData(db, userId, sanitized);
   return c.json({ success: true });
 });
-var userProfilesPlugin = chunk4WMZGHIC_cjs.definePlugin({
+var userProfilesPlugin = chunkD6FWEYQE_cjs.definePlugin({
   id: "user-profiles",
   version: "1.0.0",
   name: "User Profiles",
@@ -7092,6 +7282,21 @@ function createUserProfilesPlugin() {
 
 // src/routes/auth.ts
 var JWT_SECRET_FALLBACK = "your-super-secret-jwt-key-change-in-production";
+var DEMO_EMAIL = "admin@sonicjs.com";
+var STATS_EVENTS_ENDPOINT = "https://stats.sonicjs.com/v1/events";
+async function trackDemoLogin(kv) {
+  try {
+    const installationId = await kv?.get("_sonicjs_installation_id") ?? "demo-unknown";
+    await fetch(STATS_EVENTS_ENDPOINT, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        data: { installation_id: installationId, event_type: "demo_login", properties: {}, timestamp: (/* @__PURE__ */ new Date()).toISOString() }
+      })
+    });
+  } catch {
+  }
+}
 function renderPasswordResetEmail(resetLink, firstName) {
   const greeting = firstName ? `Hi ${firstName},` : "Hello,";
   return `<!DOCTYPE html>
@@ -7111,8 +7316,8 @@ function renderPasswordResetEmail(resetLink, firstName) {
 async function setCsrfCookie(c, maxAge) {
   const secret = c.env?.JWT_SECRET || JWT_SECRET_FALLBACK;
   const isDev = c.env?.ENVIRONMENT === "development" || !c.env?.ENVIRONMENT;
-  const csrfToken = await chunkIS54FPB7_cjs.generateCsrfToken(secret);
-  const cookieMaxAge = await chunkIS54FPB7_cjs.getJwtExpirySecondsFromDb(c.env?.DB, c.env);
+  const csrfToken = await chunkE7E3NL3Y_cjs.generateCsrfToken(secret);
+  const cookieMaxAge = await chunkE7E3NL3Y_cjs.getJwtExpirySecondsFromDb(c.env?.DB, c.env);
   cookie.setCookie(c, "csrf_token", csrfToken, {
     httpOnly: false,
     secure: !isDev,
@@ -7171,7 +7376,7 @@ var loginSchema = zod.z.object({
 });
 authRoutes.post(
   "/register",
-  chunkIS54FPB7_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "register" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "register" }),
   async (c) => {
     try {
       const db = c.env.DB;
@@ -7207,7 +7412,7 @@ authRoutes.post(
       if (existingUser) {
         return c.json({ error: "User with this email already exists" }, 400);
       }
-      const passwordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(password);
+      const passwordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(password);
       const userId = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
       const nowSec = Math.floor(now.getTime() / 1e3);
@@ -7240,8 +7445,8 @@ authRoutes.post(
         { user: { id: userId, email: normalizedEmail, role: "viewer" } },
         "fire-and-forget"
       );
-      const tokenTtl = await chunkIS54FPB7_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
-      const token = await chunkIS54FPB7_cjs.AuthManager.generateToken(userId, normalizedEmail, "viewer", c.env.JWT_SECRET, tokenTtl);
+      const tokenTtl = await chunkE7E3NL3Y_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
+      const token = await chunkE7E3NL3Y_cjs.AuthManager.generateToken(userId, normalizedEmail, "viewer", c.env.JWT_SECRET, tokenTtl);
       cookie.setCookie(c, "auth_token", token, {
         httpOnly: true,
         secure: true,
@@ -7273,7 +7478,7 @@ authRoutes.post(
 );
 authRoutes.post(
   "/login",
-  chunkIS54FPB7_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "login" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "login" }),
   async (c) => {
     try {
       const body = await c.req.json();
@@ -7283,8 +7488,8 @@ authRoutes.post(
       }
       const { email, password } = validation.data;
       const normalizedEmail = email.toLowerCase();
-      const { createAuth } = await import('./config-OCH7S4WK.cjs');
-      const auth = createAuth(c.env);
+      const { createAuth } = await import('./config-XN2ETAJ3.cjs');
+      const auth = createAuth(c.env, void 0, new URL(c.req.url).origin);
       const baReq = new Request(new URL("/auth/sign-in/email", c.req.url).href, {
         method: "POST",
         headers: { "Content-Type": "application/json", "Origin": new URL(c.req.url).origin },
@@ -7294,19 +7499,21 @@ authRoutes.post(
       if (!baRes.ok) {
         return c.json({ error: "Invalid email or password" }, 401);
       }
-      const rawSetCookie = baRes.headers.get("set-cookie");
-      if (rawSetCookie) {
-        c.res.headers.append("Set-Cookie", rawSetCookie);
-      } else if (baRes.headers.getSetCookie) {
+      if (baRes.headers.getSetCookie) {
         for (const sc of baRes.headers.getSetCookie()) {
-          c.res.headers.append("Set-Cookie", sc);
+          c.header("Set-Cookie", sc, { append: true });
+        }
+      } else {
+        const rawSetCookie = baRes.headers.get("set-cookie");
+        if (rawSetCookie) {
+          c.header("Set-Cookie", rawSetCookie, { append: true });
         }
       }
       await setCsrfCookie(c);
       const baBody = await baRes.json();
       const user = baBody.user ?? {};
-      const tokenTtl = await chunkIS54FPB7_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
-      const token = await chunkIS54FPB7_cjs.AuthManager.generateToken(
+      const tokenTtl = await chunkE7E3NL3Y_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
+      const token = await chunkE7E3NL3Y_cjs.AuthManager.generateToken(
         user.id,
         user.email,
         user.role ?? "viewer",
@@ -7319,6 +7526,9 @@ authRoutes.post(
         sameSite: "Strict",
         maxAge: tokenTtl
       });
+      if (normalizedEmail === DEMO_EMAIL) {
+        c.executionCtx?.waitUntil(trackDemoLogin(c.env.CACHE_KV));
+      }
       return c.json({
         user: {
           id: user.id,
@@ -7337,8 +7547,8 @@ authRoutes.post(
 );
 authRoutes.post("/logout", async (c) => {
   try {
-    const { createAuth } = await import('./config-OCH7S4WK.cjs');
-    const auth = createAuth(c.env);
+    const { createAuth } = await import('./config-XN2ETAJ3.cjs');
+    const auth = createAuth(c.env, void 0, new URL(c.req.url).origin);
     const baReq = new Request(new URL("/auth/sign-out", c.req.url).href, {
       method: "POST",
       headers: { "Content-Type": "application/json", "Origin": new URL(c.req.url).origin, "Cookie": c.req.header("Cookie") || "" },
@@ -7347,14 +7557,15 @@ authRoutes.post("/logout", async (c) => {
     await auth.handler(baReq);
   } catch {
   }
-  cookie.setCookie(c, "better-auth.session_token", "", { httpOnly: true, sameSite: "Lax", path: "/", maxAge: 0 });
+  const isSecure = new URL(c.req.url).protocol === "https:";
+  cookie.setCookie(c, "better-auth.session_token", "", { httpOnly: true, sameSite: "Lax", path: "/", maxAge: 0, secure: isSecure });
   clearCsrfCookie(c);
   return c.json({ message: "Logged out successfully" });
 });
 authRoutes.get("/logout", async (c) => {
   try {
-    const { createAuth } = await import('./config-OCH7S4WK.cjs');
-    const auth = createAuth(c.env);
+    const { createAuth } = await import('./config-XN2ETAJ3.cjs');
+    const auth = createAuth(c.env, void 0, new URL(c.req.url).origin);
     const baReq = new Request(new URL("/auth/sign-out", c.req.url).href, {
       method: "POST",
       headers: { "Content-Type": "application/json", "Origin": new URL(c.req.url).origin, "Cookie": c.req.header("Cookie") || "" },
@@ -7363,11 +7574,12 @@ authRoutes.get("/logout", async (c) => {
     await auth.handler(baReq);
   } catch {
   }
-  cookie.setCookie(c, "better-auth.session_token", "", { httpOnly: true, sameSite: "Lax", path: "/", maxAge: 0 });
+  const isSecure = new URL(c.req.url).protocol === "https:";
+  cookie.setCookie(c, "better-auth.session_token", "", { httpOnly: true, sameSite: "Lax", path: "/", maxAge: 0, secure: isSecure });
   clearCsrfCookie(c);
   return c.redirect("/auth/login?message=You have been logged out successfully");
 });
-authRoutes.get("/me", chunkIS54FPB7_cjs.requireAuth(), async (c) => {
+authRoutes.get("/me", chunkE7E3NL3Y_cjs.requireAuth(), async (c) => {
   try {
     const user = c.get("user");
     if (!user) {
@@ -7387,7 +7599,7 @@ authRoutes.get("/me", chunkIS54FPB7_cjs.requireAuth(), async (c) => {
 });
 authRoutes.post(
   "/refresh",
-  chunkIS54FPB7_cjs.rateLimit({ max: 60, windowMs: 60 * 1e3, keyPrefix: "refresh" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 60, windowMs: 60 * 1e3, keyPrefix: "refresh" }),
   async (c) => {
     try {
       let token = c.req.header("Authorization")?.replace("Bearer ", "");
@@ -7396,8 +7608,8 @@ authRoutes.post(
         return c.json({ error: "Authentication required" }, 401);
       }
       const db = c.env.DB;
-      const grace = await chunkIS54FPB7_cjs.getJwtRefreshGraceSecondsFromDb(db, c.env);
-      const payload = await chunkIS54FPB7_cjs.AuthManager.verifyToken(token, c.env.JWT_SECRET, grace);
+      const grace = await chunkE7E3NL3Y_cjs.getJwtRefreshGraceSecondsFromDb(db, c.env);
+      const payload = await chunkE7E3NL3Y_cjs.AuthManager.verifyToken(token, c.env.JWT_SECRET, grace);
       if (!payload) {
         return c.json({ error: "Invalid or expired token" }, 401);
       }
@@ -7405,8 +7617,8 @@ authRoutes.post(
       if (!row || !row.is_active) {
         return c.json({ error: "User is not active" }, 401);
       }
-      const tokenTtl = await chunkIS54FPB7_cjs.getJwtExpirySecondsFromDb(db, c.env);
-      const newToken = await chunkIS54FPB7_cjs.AuthManager.generateToken(row.id, row.email, row.role, c.env.JWT_SECRET, tokenTtl);
+      const tokenTtl = await chunkE7E3NL3Y_cjs.getJwtExpirySecondsFromDb(db, c.env);
+      const newToken = await chunkE7E3NL3Y_cjs.AuthManager.generateToken(row.id, row.email, row.role, c.env.JWT_SECRET, tokenTtl);
       cookie.setCookie(c, "auth_token", newToken, {
         httpOnly: true,
         secure: true,
@@ -7426,7 +7638,7 @@ authRoutes.post(
 );
 authRoutes.post(
   "/register/form",
-  chunkIS54FPB7_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "register" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "register" }),
   async (c) => {
     try {
       const db = c.env.DB;
@@ -7471,7 +7683,7 @@ authRoutes.post(
         </div>
       `);
       }
-      const passwordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(password);
+      const passwordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(password);
       const role = isFirstUser ? "admin" : "viewer";
       const userId = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
@@ -7505,7 +7717,7 @@ authRoutes.post(
           await saveCustomData(db, userId, sanitized);
         }
       }
-      const rbacService = new chunkLTZ5WYOK_cjs.RbacService(db);
+      const rbacService = new chunkJCBDXEY2_cjs.RbacService(db);
       await rbacService.addUserRoleByName(userId, role);
       dispatchHookEvent(
         c,
@@ -7513,8 +7725,8 @@ authRoutes.post(
         { user: { id: userId, email: normalizedEmail, role } },
         "fire-and-forget"
       );
-      const tokenTtl = await chunkIS54FPB7_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
-      const token = await chunkIS54FPB7_cjs.AuthManager.generateToken(userId, normalizedEmail, role, c.env.JWT_SECRET, tokenTtl);
+      const tokenTtl = await chunkE7E3NL3Y_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
+      const token = await chunkE7E3NL3Y_cjs.AuthManager.generateToken(userId, normalizedEmail, role, c.env.JWT_SECRET, tokenTtl);
       cookie.setCookie(c, "auth_token", token, {
         httpOnly: true,
         secure: false,
@@ -7546,7 +7758,7 @@ authRoutes.post(
 );
 authRoutes.post(
   "/login/form",
-  chunkIS54FPB7_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "login" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 30, windowMs: 60 * 1e3, keyPrefix: "login" }),
   async (c) => {
     try {
       const formData = await c.req.formData();
@@ -7560,8 +7772,8 @@ authRoutes.post(
         </div>
       `);
       }
-      const { createAuth } = await import('./config-OCH7S4WK.cjs');
-      const auth = createAuth(c.env);
+      const { createAuth } = await import('./config-XN2ETAJ3.cjs');
+      const auth = createAuth(c.env, void 0, new URL(c.req.url).origin);
       const baReq = new Request(new URL("/auth/sign-in/email", c.req.url).href, {
         method: "POST",
         headers: { "Content-Type": "application/json", "Origin": new URL(c.req.url).origin },
@@ -7575,17 +7787,27 @@ authRoutes.post(
         </div>
       `);
       }
-      const rawSetCookie = baRes.headers.get("set-cookie");
-      if (rawSetCookie) {
-        c.res.headers.append("Set-Cookie", rawSetCookie);
-      } else if (baRes.headers.getSetCookie) {
+      if (baRes.headers.getSetCookie) {
         for (const sc of baRes.headers.getSetCookie()) {
-          c.res.headers.append("Set-Cookie", sc);
+          c.header("Set-Cookie", sc, { append: true });
+        }
+      } else {
+        const rawSetCookie = baRes.headers.get("set-cookie");
+        if (rawSetCookie) {
+          c.header("Set-Cookie", rawSetCookie, { append: true });
         }
       }
       await setCsrfCookie(c);
+      if (email === DEMO_EMAIL) {
+        c.executionCtx?.waitUntil(trackDemoLogin(c.env.CACHE_KV));
+      }
       const rawRedirect = c.req.query("redirect");
       const redirectUrl = rawRedirect && rawRedirect.startsWith("/") ? rawRedirect : "/admin/content";
+      const isHtmx = c.req.header("HX-Request") === "true";
+      if (isHtmx) {
+        c.header("HX-Redirect", redirectUrl);
+        return c.html(html.html`<div id="form-response"><p class="text-sm text-green-600">Login successful! Redirecting...</p></div>`);
+      }
       return c.html(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">
@@ -7615,14 +7837,14 @@ authRoutes.post(
 );
 authRoutes.post(
   "/seed-admin",
-  chunkIS54FPB7_cjs.rateLimit({ max: 10, windowMs: 60 * 1e3, keyPrefix: "seed-admin" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 10, windowMs: 60 * 1e3, keyPrefix: "seed-admin" }),
   async (c) => {
     try {
       const db = c.env.DB;
-      const rbac = new chunkLTZ5WYOK_cjs.RbacService(db);
+      const rbac = new chunkJCBDXEY2_cjs.RbacService(db);
       const results = [];
       const upsertSeedUser = async (opts) => {
-        const passwordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(opts.password);
+        const passwordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(opts.password);
         const nowMs = Date.now();
         const nowSec = Math.floor(nowMs / 1e3);
         const existing = await db.prepare("SELECT id FROM auth_user WHERE email = ?").bind(opts.email).first();
@@ -7847,7 +8069,7 @@ authRoutes.post("/accept-invitation", async (c) => {
     if (invitationAge > maxAge) {
       return c.json({ error: "Invitation has expired" }, 400);
     }
-    const passwordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(password);
+    const passwordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(password);
     const updateStmt = db.prepare(`
       UPDATE auth_user SET
         password_hash = ?,
@@ -7864,8 +8086,8 @@ authRoutes.post("/accept-invitation", async (c) => {
       Date.now(),
       invitedUser.id
     ).run();
-    const tokenTtl = await chunkIS54FPB7_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
-    const authToken = await chunkIS54FPB7_cjs.AuthManager.generateToken(invitedUser.id, invitedUser.email, invitedUser.role, c.env.JWT_SECRET, tokenTtl);
+    const tokenTtl = await chunkE7E3NL3Y_cjs.getJwtExpirySecondsFromDb(c.env.DB, c.env);
+    const authToken = await chunkE7E3NL3Y_cjs.AuthManager.generateToken(invitedUser.id, invitedUser.email, invitedUser.role, c.env.JWT_SECRET, tokenTtl);
     cookie.setCookie(c, "auth_token", authToken, {
       httpOnly: true,
       secure: true,
@@ -7881,7 +8103,7 @@ authRoutes.post("/accept-invitation", async (c) => {
 });
 authRoutes.post(
   "/request-password-reset",
-  chunkIS54FPB7_cjs.rateLimit({ max: 3, windowMs: 15 * 60 * 1e3, keyPrefix: "password-reset" }),
+  chunkE7E3NL3Y_cjs.rateLimit({ max: 3, windowMs: 15 * 60 * 1e3, keyPrefix: "password-reset" }),
   async (c) => {
     try {
       const formData = await c.req.formData();
@@ -8118,7 +8340,7 @@ authRoutes.post("/reset-password", async (c) => {
     if (Date.now() > user.password_reset_expires) {
       return c.json({ error: "Reset token has expired" }, 400);
     }
-    const newPasswordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(password);
+    const newPasswordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(password);
     try {
       const historyStmt = db.prepare(`
         INSERT INTO auth_password_history (id, user_id, password_hash, created_at)
@@ -8332,7 +8554,7 @@ app.post("/test-seed-defaults", async (c) => {
 var test_cleanup_default = app;
 
 // src/plugins/available/easy-mdx/index.ts
-chunk4WMZGHIC_cjs.definePlugin({
+chunkD6FWEYQE_cjs.definePlugin({
   id: "easy-mdx",
   version: "1.0.0",
   name: "EasyMDE Markdown Editor",
@@ -8532,7 +8754,7 @@ function getMDXEditorInitScript(config) {
 }
 
 // src/plugins/available/tinymce-plugin/index.ts
-chunk4WMZGHIC_cjs.definePlugin({
+chunkD6FWEYQE_cjs.definePlugin({
   id: "tinymce-plugin",
   version: "1.0.0",
   name: "TinyMCE",
@@ -8802,7 +9024,7 @@ function getQuillCDN(version = "2.0.2") {
     </style>
   `;
 }
-chunk4WMZGHIC_cjs.definePlugin({
+chunkD6FWEYQE_cjs.definePlugin({
   id: "quill-editor",
   version: "1.0.0",
   name: "Quill Editor",
@@ -8814,7 +9036,7 @@ chunk4WMZGHIC_cjs.definePlugin({
 });
 
 // src/templates/pages/admin-content-form.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderContentFormPage(data, opts) {
   const isEdit = data.isEdit || !!data.id;
   const title = isEdit ? `Edit: ${data.title || "Content"}` : `New ${data.collection.display_name}`;
@@ -8896,8 +9118,8 @@ function renderContentFormPage(data, opts) {
         <!-- Form Content -->
         <div class="px-6 py-6">
           <div id="form-messages">
-            ${data.error ? chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
-            ${data.success ? chunkE66UVONV_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
+            ${data.error ? chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
+            ${data.success ? chunkOUBUS74I_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
           </div>
 
           <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
@@ -9010,20 +9232,20 @@ function renderContentFormPage(data, opts) {
               <dl class="space-y-3 text-sm">
                 <div>
                   <dt class="text-zinc-500 dark:text-zinc-400">Created</dt>
-                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.created_at ? new Date(data.created_at).toLocaleDateString() : "Unknown"}</dd>
+                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.created_at ? new Date(data.created_at * 1e3).toLocaleDateString() : "Unknown"}</dd>
                 </div>
                 <div>
                   <dt class="text-zinc-500 dark:text-zinc-400">Last Modified</dt>
-                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.updated_at ? new Date(data.updated_at).toLocaleDateString() : "Unknown"}</dd>
+                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.updated_at ? new Date(data.updated_at * 1e3).toLocaleDateString() : "Unknown"}</dd>
                 </div>
                 <div>
                   <dt class="text-zinc-500 dark:text-zinc-400">Author</dt>
-                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.data?.author || "Unknown"}</dd>
+                  <dd class="mt-1 text-zinc-950 dark:text-white">${chunkMNWKYY5E_cjs.escapeHtml(String(data.data?.author || data.author_name || "Unknown"))}</dd>
                 </div>
                 ${data.published_at ? `
                   <div>
                     <dt class="text-zinc-500 dark:text-zinc-400">Published</dt>
-                    <dd class="mt-1 text-zinc-950 dark:text-white">${new Date(data.published_at).toLocaleDateString()}</dd>
+                    <dd class="mt-1 text-zinc-950 dark:text-white">${new Date(data.published_at * 1e3).toLocaleDateString()}</dd>
                   </div>
                 ` : ""}
               </dl>
@@ -9097,33 +9319,44 @@ function renderContentFormPage(data, opts) {
           </a>
 
           <div class="flex items-center gap-x-3">
-            ${data.versioningEnabled ? `
-              <button
-                type="submit"
-                form="content-form"
-                name="action"
-                value="save"
-                class="inline-flex items-center justify-center gap-x-1.5 rounded-lg bg-zinc-950 dark:bg-white px-3.5 py-2.5 text-sm font-semibold text-white dark:text-zinc-950 hover:bg-zinc-800 dark:hover:bg-zinc-100 transition-colors shadow-sm"
-              >
-                <svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="1.5">
-                  <path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7"/>
-                </svg>
-                ${isEdit ? "Update" : "Save"}
-              </button>
-            ` : ""}
+            <button
+              type="submit"
+              form="content-form"
+              name="action"
+              value="save"
+              class="inline-flex items-center justify-center gap-x-1.5 rounded-lg bg-zinc-950 dark:bg-white px-3.5 py-2.5 text-sm font-semibold text-white dark:text-zinc-950 hover:bg-zinc-800 dark:hover:bg-zinc-100 transition-colors shadow-sm"
+            >
+              <svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="1.5">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7"/>
+              </svg>
+              Save
+            </button>
+
+            <button
+              type="submit"
+              form="content-form"
+              name="action"
+              value="save_and_close"
+              class="inline-flex items-center justify-center gap-x-1.5 rounded-lg bg-white dark:bg-zinc-800 px-3.5 py-2.5 text-sm font-semibold text-zinc-950 dark:text-white ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 hover:bg-zinc-50 dark:hover:bg-zinc-700 transition-colors shadow-sm"
+            >
+              <svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="1.5">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"/>
+              </svg>
+              Save & close
+            </button>
 
-            ${data.user?.role !== "viewer" ? `
+            ${data.user?.role !== "viewer" && data.versioningEnabled ? `
               <button
                 type="submit"
                 form="content-form"
                 name="action"
                 value="save_and_publish"
-                class="inline-flex items-center justify-center gap-x-1.5 rounded-lg ${data.versioningEnabled ? "bg-lime-600 dark:bg-lime-500 hover:bg-lime-700 dark:hover:bg-lime-600" : "bg-zinc-950 dark:bg-white hover:bg-zinc-800 dark:hover:bg-zinc-100 text-white dark:text-zinc-950"} px-3.5 py-2.5 text-sm font-semibold text-white transition-colors shadow-sm"
+                class="inline-flex items-center justify-center gap-x-1.5 rounded-lg bg-lime-600 dark:bg-lime-500 hover:bg-lime-700 dark:hover:bg-lime-600 px-3.5 py-2.5 text-sm font-semibold text-white transition-colors shadow-sm"
               >
                 <svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="1.5">
                   <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/>
                 </svg>
-                ${data.versioningEnabled ? `${isEdit ? "Update" : "Save"} & Publish` : isEdit ? "Update" : "Save"}
+                Publish
               </button>
             ` : ""}
           </div>
@@ -9133,7 +9366,7 @@ function renderContentFormPage(data, opts) {
     </div>
 
     <!-- Confirmation Dialogs -->
-    ${chunkE66UVONV_cjs.renderConfirmationDialog({
+    ${chunkOUBUS74I_cjs.renderConfirmationDialog({
     id: "duplicate-content-confirm",
     title: "Duplicate Content",
     message: "Create a copy of this content?",
@@ -9144,7 +9377,7 @@ function renderContentFormPage(data, opts) {
     onConfirm: "performDuplicateContent()"
   })}
 
-    ${chunkE66UVONV_cjs.renderConfirmationDialog({
+    ${chunkOUBUS74I_cjs.renderConfirmationDialog({
     id: "delete-content-confirm",
     title: "Delete Content",
     message: "Are you sure you want to delete this content? This action cannot be undone.",
@@ -9155,7 +9388,7 @@ function renderContentFormPage(data, opts) {
     onConfirm: `performDeleteContent('${data.id}')`
   })}
 
-    ${chunkE66UVONV_cjs.renderConfirmationDialog({
+    ${chunkOUBUS74I_cjs.renderConfirmationDialog({
     id: "delete-repeater-item-confirm",
     title: "Delete Item",
     message: "Are you sure you want to delete this item? This action cannot be undone.",
@@ -9166,7 +9399,7 @@ function renderContentFormPage(data, opts) {
     onConfirm: "performRepeaterDelete()"
   })}
 
-    ${chunkE66UVONV_cjs.renderConfirmationDialog({
+    ${chunkOUBUS74I_cjs.renderConfirmationDialog({
     id: "delete-block-confirm",
     title: "Delete Block",
     message: "Are you sure you want to delete this block? This action cannot be undone.",
@@ -9177,7 +9410,7 @@ function renderContentFormPage(data, opts) {
     onConfirm: "performRepeaterDelete()"
   })}
 
-    ${chunkE66UVONV_cjs.getConfirmationDialogScript()}
+    ${chunkOUBUS74I_cjs.getConfirmationDialogScript()}
 
     ${data.lexicalEnabled ? getLexicalStyles() : "<!-- Lexical plugin not active -->"}
 
@@ -10263,11 +10496,11 @@ function renderContentFormPage(data, opts) {
     content: pageContent,
     version: data.version
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/templates/pages/admin-content-list.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderContentListPage(data) {
   const urlParams = new URLSearchParams();
   if (data.modelName && data.modelName !== "all") urlParams.set("model", data.modelName);
@@ -10701,8 +10934,8 @@ function renderContentListPage(data) {
       
       <!-- Content List -->
       <div id="content-list">
-        ${chunkE66UVONV_cjs.renderTable(tableData)}
-        ${chunkE66UVONV_cjs.renderPagination(paginationData)}
+        ${chunkOUBUS74I_cjs.renderTable(tableData)}
+        ${chunkOUBUS74I_cjs.renderPagination(paginationData)}
       </div>
       
     </div>
@@ -10912,7 +11145,7 @@ function renderContentListPage(data) {
     </script>
 
     <!-- Confirmation Dialog for Bulk Actions -->
-    ${chunkE66UVONV_cjs.renderConfirmationDialog({
+    ${chunkOUBUS74I_cjs.renderConfirmationDialog({
     id: "bulk-action-confirm",
     title: "Confirm Bulk Action",
     message: "Are you sure you want to perform this action? This operation will affect multiple items.",
@@ -10924,7 +11157,7 @@ function renderContentListPage(data) {
   })}
 
     <!-- Confirmation Dialog Script -->
-    ${chunkE66UVONV_cjs.getConfirmationDialogScript()}
+    ${chunkOUBUS74I_cjs.getConfirmationDialogScript()}
 
     <!-- Advanced Search Modal -->
     <div id="advancedSearchModal" class="hidden fixed inset-0 z-50 overflow-y-auto" aria-labelledby="modal-title" role="dialog" aria-modal="true">
@@ -11221,7 +11454,7 @@ function renderContentListPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/routes/admin-content-field-types.ts
@@ -11264,9 +11497,9 @@ function parseFieldValue(field, formData, options = {}) {
   const { skipValidation = false } = options;
   const value = formData.get(field.field_name);
   const errors = [];
-  const blocksConfig = chunkIXUHXTHW_cjs.getBlocksFieldConfig(field.field_options);
+  const blocksConfig = chunkDLTT7QZU_cjs.getBlocksFieldConfig(field.field_options);
   if (blocksConfig) {
-    const parsed = chunkIXUHXTHW_cjs.parseBlocksValue(value, blocksConfig);
+    const parsed = chunkDLTT7QZU_cjs.parseBlocksValue(value, blocksConfig);
     if (!skipValidation && field.is_required && parsed.value.length === 0) {
       parsed.errors.push(`${field.field_label} is required`);
     }
@@ -11376,7 +11609,7 @@ function extractFieldData(fields, formData, options = {}) {
   }
   return { data, errors };
 }
-adminContentRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
+adminContentRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 async function getCollectionFields(db, collectionId) {
   console.log(`[getCollectionFields] Loading fields for collection: ${collectionId}`);
   const collectionStmt = db.prepare("SELECT schema, queryable_fields FROM document_types WHERE id = ?");
@@ -11403,7 +11636,7 @@ async function getCollectionFields(db, collectionId) {
           };
         });
       }
-      const codeCollections2 = await chunkAT4ZQGEZ_cjs.loadCollectionConfigs();
+      const codeCollections2 = await chunkYAURVGUK_cjs.loadCollectionConfigs();
       const codeMatch = codeCollections2.find((c) => c.name === collectionId);
       if (codeMatch && codeMatch.schema?.properties) {
         console.log(`[getCollectionFields] DB doc type has no properties \u2014 using code collection schema`);
@@ -11435,7 +11668,7 @@ async function getCollectionFields(db, collectionId) {
     }
   }
   console.log(`[getCollectionFields] Not in database, checking code collections`);
-  const codeCollections = await chunkAT4ZQGEZ_cjs.loadCollectionConfigs();
+  const codeCollections = await chunkYAURVGUK_cjs.loadCollectionConfigs();
   console.log(`[getCollectionFields] Found ${codeCollections.length} code collections`);
   const codeCollection = codeCollections.find((c) => c.name === collectionId);
   if (codeCollection && codeCollection.schema) {
@@ -11489,7 +11722,7 @@ async function getCollection(db, collectionId) {
         };
       }
       console.log(`[getCollection] Not in database, checking code collections`);
-      const codeCollections = await chunkAT4ZQGEZ_cjs.loadCollectionConfigs();
+      const codeCollections = await chunkYAURVGUK_cjs.loadCollectionConfigs();
       const codeCollection = codeCollections.find((c) => c.name === collectionId);
       if (codeCollection) {
         console.log(`[getCollection] Found code collection: ${collectionId}`);
@@ -11508,7 +11741,7 @@ async function getCollection(db, collectionId) {
 }
 async function getDocBackingType(db, collectionName) {
   if (!collectionName) return null;
-  const dt = await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db).findById(collectionName);
+  const dt = await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db).findById(collectionName);
   return dt && dt.isActive ? dt : null;
 }
 async function getCollectionByName(db, name) {
@@ -11525,7 +11758,7 @@ async function getCollectionByName(db, name) {
     };
   }
   console.log(`[getCollectionByName] Not in database, checking code collections`);
-  const codeCollections = await chunkAT4ZQGEZ_cjs.loadCollectionConfigs();
+  const codeCollections = await chunkYAURVGUK_cjs.loadCollectionConfigs();
   const codeCollection = codeCollections.find((c) => c.name === name);
   if (codeCollection) {
     console.log(`[getCollectionByName] Found code collection: ${name}`);
@@ -11541,7 +11774,7 @@ async function getCollectionByName(db, name) {
   return null;
 }
 async function loadContentEditorFlags(db) {
-  const flags = { workflowEnabled: await chunkIS54FPB7_cjs.isPluginActive(db, "workflow") };
+  const flags = { workflowEnabled: await chunkE7E3NL3Y_cjs.isPluginActive(db, "workflow") };
   const editors = [
     ["tinymce-plugin", "tinymce"],
     ["quill-editor", "quill"],
@@ -11549,10 +11782,10 @@ async function loadContentEditorFlags(db) {
     ["lexical-editor", "lexical"]
   ];
   for (const [plugin, key] of editors) {
-    const enabled = await chunkIS54FPB7_cjs.isPluginActive(db, plugin);
+    const enabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, plugin);
     flags[`${key}Enabled`] = enabled;
     if (enabled) {
-      const ps = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const ps = new chunkYAURVGUK_cjs.PluginService(db);
       const p = await ps.getPlugin(plugin);
       flags[`${key}Settings`] = p?.settings;
     }
@@ -11560,7 +11793,7 @@ async function loadContentEditorFlags(db) {
   return flags;
 }
 function makeDocService(db, docType, tenantId) {
-  return new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+  return new chunkJCBDXEY2_cjs.DocumentsService(db, {
     queryableFields: docType.queryableFields ?? [],
     typeSchemaVersion: docType.schemaVersion ?? 1,
     maxVersionsPerRoot: docType.settings?.maxVersionsPerRoot ?? 50,
@@ -11588,9 +11821,9 @@ adminContentRoutes.get("/", async (c) => {
     const offset = (page - 1) * limit;
     const collectionsStmt = db.prepare("SELECT id, name, display_name FROM document_types WHERE is_active = 1 ORDER BY display_name");
     const { results: collectionsResults } = await collectionsStmt.all();
-    const codeCollections = await chunkAT4ZQGEZ_cjs.loadCollectionConfigs();
+    const codeCollections = await chunkYAURVGUK_cjs.loadCollectionConfigs();
     const codeCollectionMap = new Map(codeCollections.map((c2) => [c2.name, c2]));
-    const docTypeRegistry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+    const docTypeRegistry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
     const docTypes = (await docTypeRegistry.findAll()).filter((dt) => !dt.settings?.internal && !dt.isAuth);
     const visibleTypeIds = new Set(docTypes.map((dt) => dt.id));
     const allCollections = [
@@ -11602,7 +11835,7 @@ adminContentRoutes.get("/", async (c) => {
       ...allCollections.map((c2) => ({ name: c2.name, displayName: c2.displayName })),
       ...docTypes.filter((dt) => !collectionNames.has(dt.id)).map((dt) => ({ name: `doc:${dt.id}`, displayName: dt.displayName }))
     ];
-    const newContentCollections = await chunkAT4ZQGEZ_cjs.getVisibleCollections(db);
+    const newContentCollections = await chunkYAURVGUK_cjs.getVisibleCollections(db);
     const docBackedCollection = !modelName.startsWith("doc:") && modelName !== "all" ? docTypes.find((dt) => dt.id === modelName) : void 0;
     const isDocModel = modelName.startsWith("doc:") || !!docBackedCollection;
     if (isDocModel) {
@@ -11625,6 +11858,14 @@ adminContentRoutes.get("/", async (c) => {
       docSql += " ORDER BY updated_at DESC LIMIT ? OFFSET ?";
       docParams.push(limit, offset);
       const { results: docRows } = await db.prepare(docSql).bind(...docParams).all();
+      const docUserIds = [...new Set((docRows ?? []).map((r) => r.created_by).filter(Boolean))];
+      const docAuthorMap = {};
+      for (let i = 0; i < docUserIds.length; i += 99) {
+        const chunk = docUserIds.slice(i, i + 99);
+        const ph = chunk.map(() => "?").join(",");
+        const { results: uRows } = await db.prepare(`SELECT id, email FROM auth_user WHERE id IN (${ph})`).bind(...chunk).all();
+        for (const u of uRows ?? []) docAuthorMap[u.id] = u.email;
+      }
       const statusBadgeCss = {
         published: "bg-green-50 dark:bg-green-500/10 text-green-700 dark:text-green-400 ring-1 ring-inset ring-green-600/20 dark:ring-green-500/20",
         draft: "bg-zinc-50 dark:bg-zinc-500/10 text-zinc-700 dark:text-zinc-400 ring-1 ring-inset ring-zinc-600/20 dark:ring-zinc-500/20"
@@ -11641,7 +11882,7 @@ adminContentRoutes.get("/", async (c) => {
           slug: row.slug || "",
           modelName: docType?.displayName ?? typeId,
           statusBadge: `<span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ${css}">${label}</span>`,
-          authorName: row.created_by || "System",
+          authorName: (row.created_by ? docAuthorMap[row.created_by] ?? row.created_by : null) || "System",
           // Document timestamps are stored in SECONDS (documents.ts), unlike legacy content rows which
           // store MILLISECONDS — hence the *1000 here (D23).
           formattedDate: new Date((row.updated_at ?? 0) * 1e3).toLocaleDateString(),
@@ -11689,8 +11930,8 @@ adminContentRoutes.get("/", async (c) => {
         SELECT d.root_id AS id, d.title AS title, d.slug AS slug,
                CASE WHEN d.is_published = 1 THEN 'published' ELSE 'draft' END AS status,
                d.updated_at * 1000 AS updated_at,
-               dt.display_name AS cdisplay, COALESCE(d.created_by, 'System') AS author_label
-        FROM documents d JOIN document_types dt ON dt.id = d.type_id
+               dt.display_name AS cdisplay, COALESCE(u.email, d.created_by, 'System') AS author_label
+        FROM documents d JOIN document_types dt ON dt.id = d.type_id LEFT JOIN auth_user u ON u.id = d.created_by
         WHERE ${docConds.join(" AND ")}
         ORDER BY updated_at DESC LIMIT ? OFFSET ?`;
       const { results: unionRows } = await db.prepare(unionSql).bind(...docParams, limit, offset).all();
@@ -11879,9 +12120,9 @@ adminContentRoutes.get("/new", async (c) => {
       const collectionsStmt = db2.prepare("SELECT id, name, display_name, description FROM document_types WHERE is_active = 1 ORDER BY display_name");
       const { results } = await collectionsStmt.all();
       const visibleTypeIds = new Set(
-        (await new chunkIS54FPB7_cjs.DocumentTypeRegistry(db2).findAll()).filter((dt) => !dt.settings?.internal && !dt.isAuth).map((dt) => dt.id)
+        (await new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db2).findAll()).filter((dt) => !dt.settings?.internal && !dt.isAuth).map((dt) => dt.id)
       );
-      const codeCollections = await chunkAT4ZQGEZ_cjs.loadCollectionConfigs();
+      const codeCollections = await chunkYAURVGUK_cjs.loadCollectionConfigs();
       const dbCollectionNames = new Set((results || []).map((r) => r.name));
       const allCollections = [
         ...codeCollections.filter((c2) => !dbCollectionNames.has(c2.name)).map((c2) => ({
@@ -11947,32 +12188,32 @@ adminContentRoutes.get("/new", async (c) => {
       return c.html(renderContentFormPage(formData2));
     }
     const fields = await getCollectionFields(db, collection.id);
-    const workflowEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "workflow");
-    const tinymceEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "tinymce-plugin");
+    const workflowEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "workflow");
+    const tinymceEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "tinymce-plugin");
     let tinymceSettings;
     if (tinymceEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const tinymcePlugin2 = await pluginService.getPlugin("tinymce-plugin");
       tinymceSettings = tinymcePlugin2?.settings;
     }
-    const quillEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "quill-editor");
+    const quillEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "quill-editor");
     let quillSettings;
     if (quillEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const quillPlugin = await pluginService.getPlugin("quill-editor");
       quillSettings = quillPlugin?.settings;
     }
-    const mdxeditorEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "easy-mdx");
+    const mdxeditorEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "easy-mdx");
     let mdxeditorSettings;
     if (mdxeditorEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const mdxeditorPlugin = await pluginService.getPlugin("easy-mdx");
       mdxeditorSettings = mdxeditorPlugin?.settings;
     }
-    const lexicalEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "lexical-editor");
+    const lexicalEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "lexical-editor");
     let lexicalSettings;
     if (lexicalEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const lexicalPlugin = await pluginService.getPlugin("lexical-editor");
       lexicalSettings = lexicalPlugin?.settings;
     }
@@ -12031,6 +12272,13 @@ adminContentRoutes.get("/:id/edit", async (c) => {
       if (docType && dcoll) {
         const fields2 = await getCollectionFields(db, dcoll.id);
         const flags = await loadContentEditorFlags(db);
+        let authorName;
+        if (docRow.created_by) {
+          const authorRow = await db.prepare("SELECT name, first_name, last_name, email FROM auth_user WHERE id = ?").bind(docRow.created_by).first();
+          if (authorRow) {
+            authorName = authorRow.name || [authorRow.first_name, authorRow.last_name].filter(Boolean).join(" ") || authorRow.email;
+          }
+        }
         const formData2 = {
           id: docRow.root_id,
           title: docRow.title,
@@ -12045,6 +12293,7 @@ adminContentRoutes.get("/:id/edit", async (c) => {
           isEdit: true,
           referrerParams,
           versioningEnabled: docType?.settings?.versioning === true,
+          author_name: authorName,
           user: user ? { name: user.email, email: user.email, role: user.role } : void 0,
           version: c.get("appVersion"),
           ...flags
@@ -12100,32 +12349,32 @@ adminContentRoutes.get("/:id/edit", async (c) => {
     };
     const fields = await getCollectionFields(db, content.collection_id);
     const contentData = content.data ? JSON.parse(content.data) : {};
-    const workflowEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "workflow");
-    const tinymceEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "tinymce-plugin");
+    const workflowEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "workflow");
+    const tinymceEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "tinymce-plugin");
     let tinymceSettings;
     if (tinymceEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const tinymcePlugin2 = await pluginService.getPlugin("tinymce-plugin");
       tinymceSettings = tinymcePlugin2?.settings;
     }
-    const quillEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "quill-editor");
+    const quillEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "quill-editor");
     let quillSettings;
     if (quillEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const quillPlugin = await pluginService.getPlugin("quill-editor");
       quillSettings = quillPlugin?.settings;
     }
-    const mdxeditorEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "easy-mdx");
+    const mdxeditorEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "easy-mdx");
     let mdxeditorSettings;
     if (mdxeditorEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const mdxeditorPlugin = await pluginService.getPlugin("easy-mdx");
       mdxeditorSettings = mdxeditorPlugin?.settings;
     }
-    const lexicalEnabled = await chunkIS54FPB7_cjs.isPluginActive(db, "lexical-editor");
+    const lexicalEnabled = await chunkE7E3NL3Y_cjs.isPluginActive(db, "lexical-editor");
     let lexicalSettings;
     if (lexicalEnabled) {
-      const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+      const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
       const lexicalPlugin = await pluginService.getPlugin("lexical-editor");
       lexicalSettings = lexicalPlugin?.settings;
     }
@@ -12204,6 +12453,7 @@ adminContentRoutes.post("/", async (c) => {
     const fields = await getCollectionFields(db, collectionId);
     const { data, errors } = extractFieldData(fields, formData);
     if (Object.keys(errors).length > 0) {
+      const flags = await loadContentEditorFlags(db);
       const formDataWithErrors = {
         collection,
         fields,
@@ -12214,7 +12464,8 @@ adminContentRoutes.post("/", async (c) => {
           name: user.email,
           email: user.email,
           role: user.role
-        } : void 0
+        } : void 0,
+        ...flags
       };
       if (c.req.header("HX-Request") === "true") {
         c.header("HX-Retarget", "#content-form-page");
@@ -12248,6 +12499,9 @@ adminContentRoutes.post("/", async (c) => {
       }), user?.userId);
       const cache2 = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.content);
       await cache2.invalidate(`content:list:${collectionId}:*`);
+      const apiCacheCreate = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
+      await apiCacheCreate.invalidate("api:content-filtered:*");
+      await apiCacheCreate.invalidate(`api:collection-content-filtered:${createDocType.id}:*`);
       const redirectUrl2 = `/admin/content/${doc.rootId}/edit?success=Content created successfully!`;
       return c.req.header("HX-Request") === "true" ? c.text("", 200, { "HX-Redirect": redirectUrl2 }) : c.redirect(redirectUrl2);
     }
@@ -12366,8 +12620,28 @@ adminContentRoutes.put("/:id", async (c) => {
         if (status2 === "published") await svc.publish(newDraft.id, user?.userId);
         else if (pub) await svc.unpublish(pub.id);
         await chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.content).invalidate(`content:list:*`);
+        const apiCacheEdit = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
+        await apiCacheEdit.invalidate("api:content-filtered:*");
+        await apiCacheEdit.invalidate(`api:collection-content-filtered:${docRowU.type_id}:*`);
+        const isHTMX2 = c.req.header("HX-Request") === "true";
+        const referrerParams = formData.get("referrer_params");
+        const listUrl = referrerParams ? `/admin/content?${referrerParams}` : `/admin/content?collection=${dcoll.id}`;
+        if (action === "save_and_close") {
+          return isHTMX2 ? c.text("", 200, { "HX-Redirect": listUrl }) : c.redirect(listUrl);
+        }
+        if (isHTMX2) {
+          const label = status2 === "published" ? "Content published successfully!" : "Content saved successfully!";
+          return c.html(html.html`<div id="form-messages">
+            <div class="rounded-lg bg-green-50 dark:bg-green-900/20 p-4 mb-4 flex items-center gap-3 border border-green-200 dark:border-green-800">
+              <svg class="h-5 w-5 text-green-500 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="1.5">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/>
+              </svg>
+              <span class="text-sm font-medium text-green-800 dark:text-green-200">${label}</span>
+            </div>
+          </div>`);
+        }
         const redirectUrl2 = `/admin/content/${id}/edit?success=Content updated successfully!`;
-        return c.req.header("HX-Request") === "true" ? c.text("", 200, { "HX-Redirect": redirectUrl2 }) : c.redirect(redirectUrl2);
+        return c.redirect(redirectUrl2);
       }
     }
     return c.html(html.html`
@@ -12395,6 +12669,7 @@ adminContentRoutes.put("/:id", async (c) => {
     const fields = await getCollectionFields(db, existingContent.collection_id);
     const { data, errors } = extractFieldData(fields, formData);
     if (Object.keys(errors).length > 0) {
+      const flags = await loadContentEditorFlags(db);
       const formDataWithErrors = {
         id,
         collection,
@@ -12407,7 +12682,8 @@ adminContentRoutes.put("/:id", async (c) => {
           name: user.email,
           email: user.email,
           role: user.role
-        } : void 0
+        } : void 0,
+        ...flags
       };
       if (c.req.header("HX-Request") === "true") {
         c.header("HX-Retarget", "#content-form-page");
@@ -12498,7 +12774,7 @@ adminContentRoutes.put("/:id", async (c) => {
     `);
   }
 });
-adminContentRoutes.post("/preview", chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+adminContentRoutes.post("/preview", chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const formData = await c.req.formData();
     const collectionId = formData.get("collection_id");
@@ -12759,8 +13035,8 @@ adminContentRoutes.post("/bulk-action", async (c) => {
     }
     await cache.invalidate("content:list:*");
     const apiCache = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
-    await apiCache.invalidate("content-filtered:*");
-    await apiCache.invalidate("collection-content-filtered:*");
+    await apiCache.invalidate("api:content-filtered:*");
+    await apiCache.invalidate("api:collection-content-filtered:*");
     return c.json({ success: true, count: ids.length });
   } catch (error) {
     console.error("Bulk action error:", error);
@@ -12778,6 +13054,9 @@ adminContentRoutes.delete("/:id", async (c) => {
       const now2 = Math.floor(Date.now() / 1e3);
       await db.prepare("UPDATE documents SET deleted_at = ?, updated_at = ? WHERE root_id = ? AND tenant_id = ?").bind(now2, now2, id, tenantId).run();
       await chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.content).invalidate("content:list:*");
+      const apiCacheDel = chunk36Z3AKX3_cjs.getCacheService(chunk36Z3AKX3_cjs.CACHE_CONFIGS.api);
+      await apiCacheDel.invalidate("api:content-filtered:*");
+      await apiCacheDel.invalidate(`api:collection-content-filtered:${docDel.type_id}:*`);
       return c.html(`
         <div id="content-list" hx-get="/admin/content?model=${docDel.type_id}" hx-trigger="load" hx-swap="outerHTML">
           <div class="flex items-center justify-center p-8"><span class="text-zinc-500">Deleting\u2026</span></div>
@@ -12817,7 +13096,7 @@ adminContentRoutes.delete("/:id", async (c) => {
     return c.json({ success: false, error: "Failed to delete content" }, 500);
   }
 });
-adminContentRoutes.get("/:id/version/:version/preview", chunkIS54FPB7_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
+adminContentRoutes.get("/:id/version/:version/preview", chunkE7E3NL3Y_cjs.requireRole(["admin", "editor", "author"]), async (c) => {
   try {
     const id = c.req.param("id");
     const version = parseInt(c.req.param("version") || "0");
@@ -12913,9 +13192,9 @@ function parseDocFormData(formData, queryableFields = []) {
   return { title, slug, data };
 }
 async function getDocService(db, typeId, tenantId) {
-  const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+  const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
   const docType = await registry.findById(typeId);
-  const svc = new chunkLTZ5WYOK_cjs.DocumentsService(db, {
+  const svc = new chunkJCBDXEY2_cjs.DocumentsService(db, {
     queryableFields: docType?.queryableFields ?? [],
     typeSchemaVersion: docType?.schemaVersion ?? 1,
     maxVersionsPerRoot: docType?.settings?.maxVersionsPerRoot ?? 50,
@@ -12926,10 +13205,10 @@ async function getDocService(db, typeId, tenantId) {
 }
 adminContentRoutes.get("/documents/:typeId/new", async (c) => {
   const { typeId } = c.req.param();
-  const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(c.env.DB);
+  const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(c.env.DB);
   const docType = await registry.findById(typeId);
   if (!docType) return c.html("<p>Unknown document type.</p>", 404);
-  return c.html(chunkJMJM7DMM_cjs.renderDocumentFormPage({ docType, isEdit: false, user: userCtx(c) }));
+  return c.html(chunkTT3TQSCZ_cjs.renderDocumentFormPage({ docType, isEdit: false, user: userCtx(c) }));
 });
 adminContentRoutes.post("/documents/:typeId/new", async (c) => {
   const { typeId } = c.req.param();
@@ -12951,17 +13230,17 @@ adminContentRoutes.post("/documents/:typeId/new", async (c) => {
     }), user?.userId);
     return c.redirect(`/admin/content/documents/${typeId}/${doc.rootId}/edit?message=Created+successfully`);
   } catch (err) {
-    const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(c.env.DB);
+    const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(c.env.DB);
     const docType = await registry.findById(typeId);
     if (!docType) return c.html("<p>Unknown document type.</p>", 404);
-    return c.html(chunkJMJM7DMM_cjs.renderDocumentFormPage({ docType, isEdit: false, user: userCtx(c), message: err?.message ?? "Failed to create", messageType: "error" }));
+    return c.html(chunkTT3TQSCZ_cjs.renderDocumentFormPage({ docType, isEdit: false, user: userCtx(c), message: err?.message ?? "Failed to create", messageType: "error" }));
   }
 });
 adminContentRoutes.get("/documents/:typeId/:rootId/edit", async (c) => {
   const { typeId, rootId } = c.req.param();
   const db = c.env.DB;
   const message = c.req.query("message");
-  const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+  const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
   const docType = await registry.findById(typeId);
   if (!docType) return c.html("<p>Unknown document type.</p>", 404);
   const tenantId = reqTenant(c);
@@ -13008,7 +13287,7 @@ adminContentRoutes.get("/documents/:typeId/:rootId/edit", async (c) => {
     createdAt: draftRow.created_at,
     updatedAt: draftRow.updated_at
   };
-  return c.html(chunkJMJM7DMM_cjs.renderDocumentFormPage({ docType, doc, publishedDoc, isEdit: true, message, user: userCtx(c), versioningEnabled: docType?.settings?.versioning === true }));
+  return c.html(chunkTT3TQSCZ_cjs.renderDocumentFormPage({ docType, doc, publishedDoc, isEdit: true, message, user: userCtx(c), versioningEnabled: docType?.settings?.versioning === true }));
 });
 adminContentRoutes.post("/documents/:typeId/:rootId", async (c) => {
   const { typeId, rootId } = c.req.param();
@@ -13073,12 +13352,12 @@ adminContentRoutes.post("/documents/:typeId/:documentId/delete", async (c) => {
 adminContentRoutes.get("/documents/:typeId/:rootId/versions", async (c) => {
   const { typeId, rootId } = c.req.param();
   const db = c.env.DB;
-  const { renderVersionHistoryFragment } = await import('./admin-documents-form.template-YNAVMJCV.cjs');
-  const registry = new chunkIS54FPB7_cjs.DocumentTypeRegistry(db);
+  const { renderVersionHistoryFragment } = await import('./admin-documents-form.template-UWKGVAMW.cjs');
+  const registry = new chunkE7E3NL3Y_cjs.DocumentTypeRegistry(db);
   const docType = await registry.findById(typeId);
   if (!docType) return c.html("<div>Unknown type.</div>", 404);
   const result = await db.prepare(
-    "SELECT id, version_number, is_current_draft, is_published, status, updated_at, created_by FROM documents WHERE root_id = ? AND tenant_id = ? ORDER BY version_number DESC LIMIT 50"
+    "SELECT d.id, d.version_number, d.is_current_draft, d.is_published, d.status, d.updated_at, COALESCE(u.email, d.created_by) AS created_by FROM documents d LEFT JOIN auth_user u ON u.id = d.created_by WHERE d.root_id = ? AND d.tenant_id = ? ORDER BY d.version_number DESC LIMIT 50"
   ).bind(rootId, reqTenant(c)).all();
   const versions = (result.results ?? []).map((r) => ({
     id: r.id,
@@ -13094,7 +13373,7 @@ adminContentRoutes.get("/documents/:typeId/:rootId/versions", async (c) => {
 var admin_content_default = adminContentRoutes;
 
 // src/templates/pages/admin-profile.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderAvatarImage(avatarUrl, firstName, lastName) {
   return `<div id="avatar-image-container" class="w-24 h-24 rounded-full mx-auto mb-4 overflow-hidden bg-gradient-to-br from-cyan-400 to-purple-400 flex items-center justify-center ring-4 ring-zinc-950/5 dark:ring-white/10">
     ${avatarUrl ? `<img src="${avatarUrl}" alt="Profile picture" class="w-full h-full object-cover">` : `<span class="text-2xl font-bold text-white">${firstName.charAt(0)}${lastName.charAt(0)}</span>`}
@@ -13114,8 +13393,8 @@ function renderProfilePage(data) {
       </div>
 
       <!-- Alert Messages -->
-      ${data.error ? chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
-      ${data.success ? chunkE66UVONV_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
+      ${data.error ? chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
+      ${data.success ? chunkOUBUS74I_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
 
       <!-- Profile Form -->
       <div class="grid grid-cols-1 lg:grid-cols-3 gap-8">
@@ -13492,7 +13771,7 @@ function renderProfilePage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/templates/pages/admin-activity-logs.template.ts
@@ -13702,7 +13981,7 @@ function renderActivityLogsPage(data) {
     user: data.user,
     content: pageContent
   };
-  return chunkE66UVONV_cjs.renderAdminLayout(layoutData);
+  return chunkOUBUS74I_cjs.renderAdminLayout(layoutData);
 }
 function getActionBadgeClass(action) {
   if (action.includes("login") || action.includes("logout")) {
@@ -13722,7 +14001,7 @@ function formatAction(action) {
 }
 
 // src/templates/pages/admin-user-edit.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 
 // src/templates/components/confirmation-dialog.template.ts
 function renderConfirmationDialog2(options) {
@@ -13918,8 +14197,8 @@ function renderUserEditPage(data) {
 
       <!-- Alert Messages -->
       <div id="form-messages" class="mb-6 empty:mb-0">
-        ${data.error ? chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
-        ${data.success ? chunkE66UVONV_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
+        ${data.error ? chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
+        ${data.success ? chunkOUBUS74I_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
       </div>
 
       <!-- User Edit Form -->
@@ -14241,11 +14520,11 @@ function renderUserEditPage(data) {
     user: data.user,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/templates/pages/admin-user-new.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderUserNewPage(data) {
   const pageContent = `
     <div>
@@ -14284,8 +14563,8 @@ function renderUserNewPage(data) {
 
       <!-- Alert Messages -->
       <div id="form-messages">
-        ${data.error ? chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
-        ${data.success ? chunkE66UVONV_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
+        ${data.error ? chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
+        ${data.success ? chunkOUBUS74I_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
       </div>
 
       <!-- User New Form -->
@@ -14515,11 +14794,11 @@ function renderUserNewPage(data) {
     user: data.user,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/templates/pages/admin-users-list.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderUsersListPage(data) {
   const columns = [
     {
@@ -14675,8 +14954,8 @@ function renderUsersListPage(data) {
       </div>
 
       <!-- Alert Messages -->
-      ${data.error ? chunkE66UVONV_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
-      ${data.success ? chunkE66UVONV_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
+      ${data.error ? chunkOUBUS74I_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
+      ${data.success ? chunkOUBUS74I_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
 
       <!-- Stats -->
       <div class="mb-6">
@@ -14853,10 +15132,10 @@ function renderUsersListPage(data) {
       </div>
 
       <!-- Users Table -->
-      ${chunkE66UVONV_cjs.renderTable(tableData)}
+      ${chunkOUBUS74I_cjs.renderTable(tableData)}
 
       <!-- Pagination -->
-      ${data.pagination ? chunkE66UVONV_cjs.renderPagination(data.pagination) : ""}
+      ${data.pagination ? chunkOUBUS74I_cjs.renderPagination(data.pagination) : ""}
     </div>
 
     <script>
@@ -14927,7 +15206,7 @@ function renderUsersListPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/plugins/core-plugins/multi-tenant-plugin/services/tenant-service.ts
@@ -15007,7 +15286,7 @@ var TenantService = class {
       SET name = ?, domain = ?, status = ?, notes = ?, updated_at = ?
       WHERE slug = ?
     `).bind(name, domain, status, notes, now, slug).run();
-    chunkAT4ZQGEZ_cjs.invalidateTenantCache();
+    chunkYAURVGUK_cjs.invalidateTenantCache();
     const updated = await this.getTenantBySlug(slug);
     if (!updated) throw new Error("Tenant not found");
     return updated;
@@ -15025,7 +15304,7 @@ var TenantService = class {
       throw new Error(`Tenant '${slug}' still owns ${docCount} document(s). Delete or migrate its content first.`);
     }
     await this.db.prepare(`DELETE FROM auth_tenant WHERE slug = ?`).bind(slug).run();
-    chunkAT4ZQGEZ_cjs.invalidateTenantCache();
+    chunkYAURVGUK_cjs.invalidateTenantCache();
   }
   // ─── Membership (auth_tenant_member) ───────────────────────────────────────
   // Tenant resolution and the admin switcher are gated on membership: an authed user may only
@@ -15269,7 +15548,7 @@ var TenantService = class {
       INSERT INTO auth_tenant (id, name, slug, status, domain, notes, metadata, created_at, updated_at)
       VALUES (?, ?, ?, 'active', ?, ?, '{}', ?, ?)
     `).bind(id, input.name, input.slug, input.domain, input.notes, now, now).run();
-    chunkAT4ZQGEZ_cjs.invalidateTenantCache();
+    chunkYAURVGUK_cjs.invalidateTenantCache();
     const created = await this.getTenantBySlug(input.slug);
     if (!created) throw new Error("Failed to create tenant");
     return created;
@@ -15293,14 +15572,14 @@ function mapRowToTenant(row) {
 
 // src/routes/admin-users.ts
 var userRoutes = new hono.Hono();
-userRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
-userRoutes.use("/users/*", chunkIS54FPB7_cjs.requireRole(["admin"]));
-userRoutes.use("/users", chunkIS54FPB7_cjs.requireRole(["admin"]));
-userRoutes.use("/invite-user", chunkIS54FPB7_cjs.requireRole(["admin"]));
-userRoutes.use("/resend-invitation/*", chunkIS54FPB7_cjs.requireRole(["admin"]));
-userRoutes.use("/cancel-invitation/*", chunkIS54FPB7_cjs.requireRole(["admin"]));
-userRoutes.use("/activity-logs", chunkIS54FPB7_cjs.requireRole(["admin"]));
-userRoutes.use("/activity-logs/*", chunkIS54FPB7_cjs.requireRole(["admin"]));
+userRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
+userRoutes.use("/users/*", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
+userRoutes.use("/users", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
+userRoutes.use("/invite-user", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
+userRoutes.use("/resend-invitation/*", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
+userRoutes.use("/cancel-invitation/*", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
+userRoutes.use("/activity-logs", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
+userRoutes.use("/activity-logs/*", chunkE7E3NL3Y_cjs.requireRole(["admin"]));
 userRoutes.get("/", (c) => {
   return c.redirect("/admin/dashboard");
 });
@@ -15328,12 +15607,10 @@ var LANGUAGES = [
   { value: "ko", label: "Korean" },
   { value: "zh", label: "Chinese" }
 ];
-var ROLES = [
-  { value: "admin", label: "Administrator" },
-  { value: "editor", label: "Editor" },
-  { value: "author", label: "Author" },
-  { value: "viewer", label: "Viewer" }
-];
+async function fetchRoleOptions(db) {
+  const roles = await new chunkJCBDXEY2_cjs.RbacService(db).getRoles();
+  return roles.map((r) => ({ value: r.id, label: r.display_name }));
+}
 userRoutes.get("/profile", async (c) => {
   const user = c.get("user");
   const db = c.env.DB;
@@ -15411,7 +15688,7 @@ userRoutes.put("/profile", async (c) => {
     const language = formData.get("language")?.toString() || "en";
     const emailNotifications = formData.get("email_notifications") === "1";
     if (!firstName || !lastName || !email) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "First name, last name, and email are required.",
         dismissible: true
@@ -15419,7 +15696,7 @@ userRoutes.put("/profile", async (c) => {
     }
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     if (!emailRegex.test(email)) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Please enter a valid email address.",
         dismissible: true
@@ -15431,7 +15708,7 @@ userRoutes.put("/profile", async (c) => {
     `);
     const existingUser = await checkStmt.bind(email, user.userId).first();
     if (existingUser) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Email is already taken by another user.",
         dismissible: true
@@ -15463,11 +15740,11 @@ userRoutes.put("/profile", async (c) => {
       const validation = validateCustomData(sanitized, profileConfig);
       if (!validation.valid) {
         const errorMessages = Object.values(validation.errors).join(", ");
-        return c.html(chunkJMJM7DMM_cjs.renderAlert({ type: "error", message: errorMessages, dismissible: true }), 400);
+        return c.html(chunkTT3TQSCZ_cjs.renderAlert({ type: "error", message: errorMessages, dismissible: true }), 400);
       }
       await saveCustomData(db, user.userId, sanitized);
     }
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "profile.update",
@@ -15477,14 +15754,14 @@ userRoutes.put("/profile", async (c) => {
       c.req.header("x-forwarded-for") || c.req.header("cf-connecting-ip"),
       c.req.header("user-agent")
     );
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "success",
       message: "Profile updated successfully!",
       dismissible: true
     }));
   } catch (error) {
     console.error("Profile update error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to update profile. Please try again.",
       dismissible: true
@@ -15498,7 +15775,7 @@ userRoutes.post("/profile/avatar", async (c) => {
     const formData = await c.req.formData();
     const avatarFile = formData.get("avatar");
     if (!avatarFile || typeof avatarFile === "string" || !avatarFile.name) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Please select an image file.",
         dismissible: true
@@ -15506,7 +15783,7 @@ userRoutes.post("/profile/avatar", async (c) => {
     }
     const allowedTypes = ["image/jpeg", "image/png", "image/gif", "image/webp"];
     if (!allowedTypes.includes(avatarFile.type)) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Please upload a valid image file (JPEG, PNG, GIF, or WebP).",
         dismissible: true
@@ -15514,7 +15791,7 @@ userRoutes.post("/profile/avatar", async (c) => {
     }
     const maxSize = 5 * 1024 * 1024;
     if (avatarFile.size > maxSize) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Image file must be smaller than 5MB.",
         dismissible: true
@@ -15530,7 +15807,7 @@ userRoutes.post("/profile/avatar", async (c) => {
       SELECT first_name, last_name FROM auth_user WHERE id = ?
     `);
     const userData = await userStmt.bind(user.userId).first();
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "profile.avatar_update",
@@ -15540,7 +15817,7 @@ userRoutes.post("/profile/avatar", async (c) => {
       c.req.header("x-forwarded-for") || c.req.header("cf-connecting-ip"),
       c.req.header("user-agent")
     );
-    const alertHtml = chunkJMJM7DMM_cjs.renderAlert({
+    const alertHtml = chunkTT3TQSCZ_cjs.renderAlert({
       type: "success",
       message: "Profile picture updated successfully!",
       dismissible: true
@@ -15554,7 +15831,7 @@ userRoutes.post("/profile/avatar", async (c) => {
     return c.html(alertHtml + avatarImageWithOob);
   } catch (error) {
     console.error("Avatar upload error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to upload profile picture. Please try again.",
       dismissible: true
@@ -15570,21 +15847,21 @@ userRoutes.post("/profile/password", async (c) => {
     const newPassword = formData.get("new_password")?.toString() || "";
     const confirmPassword = formData.get("confirm_password")?.toString() || "";
     if (!currentPassword || !newPassword || !confirmPassword) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "All password fields are required.",
         dismissible: true
       }));
     }
     if (newPassword !== confirmPassword) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "New passwords do not match.",
         dismissible: true
       }));
     }
     if (newPassword.length < 8) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "New password must be at least 8 characters long.",
         dismissible: true
@@ -15595,21 +15872,21 @@ userRoutes.post("/profile/password", async (c) => {
     `);
     const userData = await userStmt.bind(user.userId).first();
     if (!userData) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "User not found.",
         dismissible: true
       }));
     }
-    const validPassword = await chunkIS54FPB7_cjs.AuthManager.verifyPassword(currentPassword, userData.password_hash);
+    const validPassword = await chunkE7E3NL3Y_cjs.AuthManager.verifyPassword(currentPassword, userData.password_hash);
     if (!validPassword) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Current password is incorrect.",
         dismissible: true
       }));
     }
-    const newPasswordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(newPassword);
+    const newPasswordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(newPassword);
     const historyStmt = db.prepare(`
       INSERT INTO auth_password_history (id, user_id, password_hash, created_at)
       VALUES (?, ?, ?, ?)
@@ -15625,7 +15902,7 @@ userRoutes.post("/profile/password", async (c) => {
       WHERE id = ?
     `);
     await updateStmt.bind(newPasswordHash, Date.now(), user.userId).run();
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "profile.password_change",
@@ -15635,14 +15912,14 @@ userRoutes.post("/profile/password", async (c) => {
       c.req.header("x-forwarded-for") || c.req.header("cf-connecting-ip"),
       c.req.header("user-agent")
     );
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "success",
       message: "Password updated successfully!",
       dismissible: true
     }));
   } catch (error) {
     console.error("Password change error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to update password. Please try again.",
       dismissible: true
@@ -15692,7 +15969,7 @@ userRoutes.get("/users", async (c) => {
     `);
     const countResult = await countStmt.bind(...params).first();
     const totalUsers = countResult?.total || 0;
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "users.list_view",
@@ -15763,7 +16040,7 @@ userRoutes.get("/users", async (c) => {
     if (isApiRequest) {
       return c.json({ error: "Failed to load users" }, 500);
     }
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to load users. Please try again.",
       dismissible: true
@@ -15782,8 +16059,9 @@ userRoutes.get("/users/new", async (c) => {
     const regFieldNames = profileConfig?.registrationFields ?? [];
     const regFields = profileConfig && upRow ? regFieldNames.length > 0 ? profileConfig.fields.filter((f) => regFieldNames.includes(f.name)) : profileConfig.fields : [];
     const registrationFieldsHtml = regFields.length > 0 ? renderCustomProfileSection({ fields: regFields }, {}) : void 0;
+    const roles = await fetchRoleOptions(db);
     const pageData = {
-      roles: ROLES,
+      roles,
       registrationFieldsHtml,
       user: {
         name: user.email.split("@")[0] || user.email,
@@ -15794,7 +16072,7 @@ userRoutes.get("/users/new", async (c) => {
     return c.html(renderUserNewPage(pageData));
   } catch (error) {
     console.error("User new page error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to load user creation page. Please try again.",
       dismissible: true
@@ -15811,9 +16089,9 @@ userRoutes.post("/users/new", async (c) => {
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
     const phone = chunkMNWKYY5E_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
     const bio = chunkMNWKYY5E_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
-    const roleInput = formData.get("role")?.toString() || "viewer";
-    const validRoles = ["admin", "editor", "author", "viewer"];
-    const role = validRoles.includes(roleInput) ? roleInput : "viewer";
+    const roleInput = formData.get("role")?.toString() || "";
+    const validRoles = (await new chunkJCBDXEY2_cjs.RbacService(db).getRoles()).map((r) => r.id);
+    const role = validRoles.includes(roleInput) ? roleInput : validRoles[0] ?? "admin";
     const password = formData.get("password")?.toString() || "";
     const confirmPassword = formData.get("confirm_password")?.toString() || "";
     const isActive = formData.get("is_active") === "1";
@@ -15828,12 +16106,12 @@ userRoutes.post("/users/new", async (c) => {
       const validation = validateCustomData(sanitized, profileConfig);
       if (!validation.valid) {
         const errorMessages = Object.values(validation.errors).join(", ");
-        return c.html(chunkJMJM7DMM_cjs.renderAlert({ type: "error", message: errorMessages, dismissible: true }), 400);
+        return c.html(chunkTT3TQSCZ_cjs.renderAlert({ type: "error", message: errorMessages, dismissible: true }), 400);
       }
       sanitizedRegistrationCustom = sanitized;
     }
     if (!firstName || !lastName || !email || !password) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "First name, last name, email, and password are required.",
         dismissible: true
@@ -15841,21 +16119,21 @@ userRoutes.post("/users/new", async (c) => {
     }
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     if (!emailRegex.test(email)) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Please enter a valid email address.",
         dismissible: true
       }));
     }
     if (password.length < 8) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Password must be at least 8 characters long.",
         dismissible: true
       }));
     }
     if (password !== confirmPassword) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Passwords do not match.",
         dismissible: true
@@ -15867,13 +16145,13 @@ userRoutes.post("/users/new", async (c) => {
     `);
     const existingUser = await checkStmt.bind(email).first();
     if (existingUser) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Email is already taken.",
         dismissible: true
       }));
     }
-    const passwordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(password);
+    const passwordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(password);
     const userId = crypto.randomUUID();
     const createStmt = db.prepare(`
       INSERT INTO auth_user (
@@ -15898,7 +16176,7 @@ userRoutes.post("/users/new", async (c) => {
     if (sanitizedRegistrationCustom !== null && Object.keys(sanitizedRegistrationCustom).length > 0) {
       await writeProfileData(db, userId, { custom: sanitizedRegistrationCustom }, user.userId);
     }
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "user!.create",
@@ -15912,7 +16190,7 @@ userRoutes.post("/users/new", async (c) => {
     return c.body(null, 200);
   } catch (error) {
     console.error("User creation error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to create user!. Please try again.",
       dismissible: true
@@ -15937,7 +16215,7 @@ userRoutes.get("/users/:id", async (c) => {
     if (!userRecord) {
       return c.json({ error: "User not found" }, 404);
     }
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "user!.view",
@@ -15982,7 +16260,7 @@ userRoutes.get("/users/:id/edit", async (c) => {
     `);
     const userToEdit = await userStmt.bind(userId).first();
     if (!userToEdit) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "User not found",
         dismissible: true
@@ -16035,9 +16313,10 @@ userRoutes.get("/users/:id/edit", async (c) => {
     }
     const queryMessage = c.req.query("message");
     const queryType = c.req.query("type") === "error" ? "error" : "success";
+    const roles = await fetchRoleOptions(db);
     const pageData = {
       userToEdit: editData,
-      roles: ROLES,
+      roles,
       hasProfilePlugin: profileConfig !== null && upRow !== null,
       customProfileFieldsHtml,
       tenantMemberships,
@@ -16052,7 +16331,7 @@ userRoutes.get("/users/:id/edit", async (c) => {
     return c.html(renderUserEditPage(pageData));
   } catch (error) {
     console.error("User edit page error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to load user. Please try again.",
       dismissible: true
@@ -16069,9 +16348,9 @@ userRoutes.put("/users/:id", async (c) => {
     const lastName = chunkMNWKYY5E_cjs.sanitizeInput(formData.get("last_name")?.toString());
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
     const phone = chunkMNWKYY5E_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
-    const roleInput = formData.get("role")?.toString() || "viewer";
-    const validRoles = ["admin", "editor", "author", "viewer"];
-    const role = validRoles.includes(roleInput) ? roleInput : "viewer";
+    const roleInput = formData.get("role")?.toString() || "";
+    const validRoles = (await new chunkJCBDXEY2_cjs.RbacService(db).getRoles()).map((r) => r.id);
+    const role = validRoles.includes(roleInput) ? roleInput : validRoles[0] ?? "admin";
     const isActive = formData.get("is_active") === "1";
     const emailVerified = formData.get("email_verified") === "1";
     const newPassword = formData.get("new_password")?.toString() || "";
@@ -16085,12 +16364,12 @@ userRoutes.put("/users/:id", async (c) => {
       const validation = validateCustomData(sanitized, profileConfig);
       if (!validation.valid) {
         const errorMessages = Object.values(validation.errors).join(", ");
-        return c.html(chunkJMJM7DMM_cjs.renderAlert({ type: "error", message: errorMessages, dismissible: true }), 400);
+        return c.html(chunkTT3TQSCZ_cjs.renderAlert({ type: "error", message: errorMessages, dismissible: true }), 400);
       }
       sanitizedCustom = sanitized;
     }
     if (!email) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Email is required.",
         dismissible: true
@@ -16098,7 +16377,7 @@ userRoutes.put("/users/:id", async (c) => {
     }
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     if (!emailRegex.test(email)) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Please enter a valid email address.",
         dismissible: true
@@ -16106,14 +16385,14 @@ userRoutes.put("/users/:id", async (c) => {
     }
     if (newPassword) {
       if (newPassword.length < 8) {
-        return c.html(chunkJMJM7DMM_cjs.renderAlert({
+        return c.html(chunkTT3TQSCZ_cjs.renderAlert({
           type: "error",
           message: "Password must be at least 8 characters long.",
           dismissible: true
         }));
       }
       if (newPassword !== confirmPassword) {
-        return c.html(chunkJMJM7DMM_cjs.renderAlert({
+        return c.html(chunkTT3TQSCZ_cjs.renderAlert({
           type: "error",
           message: "Passwords do not match.",
           dismissible: true
@@ -16126,7 +16405,7 @@ userRoutes.put("/users/:id", async (c) => {
     `);
     const existingUser = await checkStmt.bind(email, userId).first();
     if (existingUser) {
-      return c.html(chunkJMJM7DMM_cjs.renderAlert({
+      return c.html(chunkTT3TQSCZ_cjs.renderAlert({
         type: "error",
         message: "Email is already taken by another user.",
         dismissible: true
@@ -16151,7 +16430,7 @@ userRoutes.put("/users/:id", async (c) => {
       userId
     ).run();
     if (newPassword) {
-      const passwordHash = await chunkIS54FPB7_cjs.AuthManager.hashPassword(newPassword);
+      const passwordHash = await chunkE7E3NL3Y_cjs.AuthManager.hashPassword(newPassword);
       const updatePasswordStmt = db.prepare(`
         UPDATE auth_user SET password_hash = ?, updated_at = ? WHERE id = ?
       `);
@@ -16164,7 +16443,7 @@ userRoutes.put("/users/:id", async (c) => {
         ...sanitizedCustom !== null ? { custom: sanitizedCustom } : {}
       }, user.userId);
     }
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "user.update",
@@ -16174,7 +16453,7 @@ userRoutes.put("/users/:id", async (c) => {
       c.req.header("x-forwarded-for") || c.req.header("cf-connecting-ip"),
       c.req.header("user-agent")
     );
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "success",
       message: "User updated successfully!",
       dismissible: true,
@@ -16182,7 +16461,7 @@ userRoutes.put("/users/:id", async (c) => {
     }));
   } catch (error) {
     console.error("User update error:", error);
-    return c.html(chunkJMJM7DMM_cjs.renderAlert({
+    return c.html(chunkTT3TQSCZ_cjs.renderAlert({
       type: "error",
       message: "Failed to update user. Please try again.",
       dismissible: true
@@ -16210,7 +16489,7 @@ userRoutes.post("/users/:id/toggle", async (c) => {
       UPDATE auth_user SET is_active = ?, updated_at = ? WHERE id = ?
     `);
     await toggleStmt.bind(active ? 1 : 0, Date.now(), userId).run();
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       active ? "user.activate" : "user.deactivate",
@@ -16251,7 +16530,7 @@ userRoutes.delete("/users/:id", async (c) => {
         DELETE FROM auth_user WHERE id = ?
       `);
       await deleteStmt.bind(userId).run();
-      await chunkIS54FPB7_cjs.logActivity(
+      await chunkE7E3NL3Y_cjs.logActivity(
         db,
         user.userId,
         "user!.hard_delete",
@@ -16270,7 +16549,7 @@ userRoutes.delete("/users/:id", async (c) => {
         UPDATE auth_user SET is_active = 0, updated_at = ? WHERE id = ?
       `);
       await deleteStmt.bind(Date.now(), userId).run();
-      await chunkIS54FPB7_cjs.logActivity(
+      await chunkE7E3NL3Y_cjs.logActivity(
         db,
         user.userId,
         "user!.soft_delete",
@@ -16336,7 +16615,7 @@ userRoutes.post("/invite-user", async (c) => {
       Date.now(),
       Date.now()
     ).run();
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "user!.invite_sent",
@@ -16393,7 +16672,7 @@ userRoutes.post("/resend-invitation/:id", async (c) => {
       Date.now(),
       userId
     ).run();
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "user!.invitation_resent",
@@ -16429,7 +16708,7 @@ userRoutes.delete("/cancel-invitation/:id", async (c) => {
     }
     const deleteStmt = db.prepare(`DELETE FROM auth_user WHERE id = ?`);
     await deleteStmt.bind(userId).run();
-    await chunkIS54FPB7_cjs.logActivity(
+    await chunkE7E3NL3Y_cjs.logActivity(
       db,
       user.userId,
       "user!.invitation_cancelled",
@@ -16678,7 +16957,7 @@ function getFileIcon(mimeType) {
 }
 
 // src/templates/pages/admin-media-library.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderMediaLibraryPage(data) {
   const pageContent = `
     <div>
@@ -17613,7 +17892,7 @@ function renderMediaLibraryPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/templates/components/media-file-details.template.ts
@@ -17810,7 +18089,7 @@ var fileValidationSchema2 = zod.z.object({
   // 50MB max
 });
 var adminMediaRoutes = new hono.Hono();
-adminMediaRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
+adminMediaRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 adminMediaRoutes.get("/", async (c) => {
   try {
     const user = c.get("user");
@@ -17852,7 +18131,7 @@ adminMediaRoutes.get("/selector", async (c) => {
     const { searchParams } = new URL(c.req.url);
     const search = searchParams.get("search") || "";
     const db = c.env.DB;
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     const mediaPlugin = await pluginService.getPlugin("core-media");
     if (!mediaPlugin || mediaPlugin.status !== "active") {
       return c.html(html.html`
@@ -18228,7 +18507,7 @@ adminMediaRoutes.put("/:id", async (c) => {
     `);
   }
 });
-adminMediaRoutes.delete("/cleanup", chunkIS54FPB7_cjs.requireRole("admin"), async (c) => {
+adminMediaRoutes.delete("/cleanup", chunkE7E3NL3Y_cjs.requireRole("admin"), async (c) => {
   try {
     const db = c.env.DB;
     const allMediaStmt = db.prepare("SELECT id, r2_key, filename FROM media WHERE deleted_at IS NULL");
@@ -18486,7 +18765,7 @@ function generateMediaItemHTML(file) {
 }
 
 // src/templates/pages/admin-plugins-list.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderPluginsListPage(data) {
   const categories = [
     { value: "content", label: "Content Management" },
@@ -18658,15 +18937,6 @@ function renderPluginsListPage(data) {
             </div>
 
             <div class="flex items-center gap-3 w-full sm:w-auto">
-              <select id="sort-filter" onchange="filterAndSortPlugins()" class="block w-full sm:w-auto h-9 rounded-md border-0 py-1.5 pl-3 pr-8 text-zinc-900 ring-1 ring-inset ring-zinc-300 focus:ring-2 focus:ring-inset focus:ring-zinc-600 dark:bg-zinc-900 dark:text-white dark:ring-zinc-700 dark:focus:ring-zinc-500 sm:text-sm sm:leading-6">
-                <option value="name-asc">Name (A-Z)</option>
-                <option value="name-desc">Name (Z-A)</option>
-                <option value="newest">Newest Installed</option>
-                <option value="updated">Recently Updated</option>
-                <option value="popular">Popularity</option>
-                <option value="rating">Highest Rated</option>
-              </select>
-
               <button
                 onclick="location.reload()"
                 class="inline-flex items-center gap-x-1.5 rounded-md bg-white dark:bg-zinc-900 px-3 py-1.5 h-9 text-sm font-semibold text-zinc-900 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-700 hover:bg-zinc-50 dark:hover:bg-zinc-800"
@@ -18830,8 +19100,6 @@ function renderPluginsListPage(data) {
           .forEach(cb => params.append('status', cb.value));
         const search = document.getElementById('search-input').value;
         if (search) params.set('search', search);
-        const sort = document.getElementById('sort-filter').value;
-        if (sort && sort !== 'name-asc') params.set('sort', sort);
         const url = new URL(window.location.href);
         url.search = params.toString();
         history.replaceState(null, '', url.toString());
@@ -18849,8 +19117,6 @@ function renderPluginsListPage(data) {
         });
         const search = params.get('search');
         if (search) document.getElementById('search-input').value = search;
-        const sort = params.get('sort');
-        if (sort) document.getElementById('sort-filter').value = sort;
         if (params.toString()) filterAndSortPlugins();
       }
 
@@ -18866,7 +19132,6 @@ function renderPluginsListPage(data) {
           .map(cb => cb.value.toLowerCase());
 
         const searchInput = document.getElementById('search-input').value.toLowerCase();
-        const sortValue = document.getElementById('sort-filter').value;
 
         const pluginsGrid = document.getElementById('plugins-grid');
         const pluginCards = Array.from(pluginsGrid.querySelectorAll('.plugin-card'));
@@ -18890,30 +19155,6 @@ function renderPluginsListPage(data) {
           return true;
         });
 
-        // Sort
-        visibleCards.sort((a, b) => {
-          const aName = a.getAttribute('data-name') || '';
-          const bName = b.getAttribute('data-name') || '';
-          const aInstalled = parseInt(a.getAttribute('data-installed') || '0');
-          const bInstalled = parseInt(b.getAttribute('data-installed') || '0');
-          const aUpdated = parseInt(a.getAttribute('data-updated') || '0');
-          const bUpdated = parseInt(b.getAttribute('data-updated') || '0');
-          const aDownloads = parseInt(a.getAttribute('data-downloads') || '0');
-          const bDownloads = parseInt(b.getAttribute('data-downloads') || '0');
-          const aRating = parseFloat(a.getAttribute('data-rating') || '0');
-          const bRating = parseFloat(b.getAttribute('data-rating') || '0');
-
-          switch (sortValue) {
-            case 'name-desc': return bName.localeCompare(aName);
-            case 'newest': return bInstalled - aInstalled;
-            case 'updated': return bUpdated - aUpdated;
-            case 'popular': return bDownloads - aDownloads;
-            case 'rating': return bRating - aRating;
-            case 'name-asc':
-            default: return aName.localeCompare(bName);
-          }
-        });
-
         // Re-append
         pluginCards.forEach(card => card.style.display = 'none'); // Hide all first
         
@@ -18969,7 +19210,7 @@ function renderPluginsListPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 function renderPluginCard(plugin) {
   const statusColors = {
@@ -19347,8 +19588,9 @@ function escapeHtmlAttr(value) {
 }
 function renderPluginSettingsPage(data) {
   const { plugin, activity = [], user, settingsTabData } = data;
-  const pluginDef = chunk4WMZGHIC_cjs.getPluginDefinition(plugin.id || plugin.name);
-  const hasUserSettings = pluginDef?.settingsTabContent != null || Object.keys(plugin.settings || {}).some((k) => !k.startsWith("_"));
+  const pluginDef = chunkD6FWEYQE_cjs.getPluginDefinition(plugin.id || plugin.name);
+  const pluginId = plugin.id || plugin.name;
+  const hasUserSettings = pluginDef?.settingsTabContent != null || Object.keys(plugin.settings || {}).some((k) => !k.startsWith("_")) || hasCustomSettingsComponent(pluginId);
   const defaultTab = hasUserSettings ? "settings" : "info";
   const pageContent = `
     <div class="w-full px-4 sm:px-6 lg:px-8 py-6">
@@ -19513,9 +19755,28 @@ function renderPluginSettingsPage(data) {
         const form = document.getElementById('settings-form');
         const formData = new FormData(form);
         const isAuthPlugin = '${plugin.id}' === 'core-auth';
+        const isOAuthPlugin = '${plugin.id}' === 'oauth-providers';
         let settings = {};
 
-        if (isAuthPlugin) {
+        if (isOAuthPlugin) {
+          // Build nested provider settings structure
+          const getVal = id => (document.getElementById(id) || {}).value || '';
+          const getChecked = id => !!(document.getElementById(id) || {}).checked;
+          settings = {
+            providers: {
+              github: {
+                clientId: getVal('oauth_github_clientId'),
+                clientSecret: getVal('oauth_github_clientSecret'),
+                enabled: getChecked('oauth_github_enabled'),
+              },
+              google: {
+                clientId: getVal('oauth_google_clientId'),
+                clientSecret: getVal('oauth_google_clientSecret'),
+                enabled: getChecked('oauth_google_enabled'),
+              },
+            }
+          };
+        } else if (isAuthPlugin) {
           // Handle nested auth settings structure
           settings = {
             requiredFields: {},
@@ -19624,7 +19885,7 @@ function renderPluginSettingsPage(data) {
     user,
     content: pageContent
   };
-  return chunkE66UVONV_cjs.renderAdminLayout(layoutData);
+  return chunkOUBUS74I_cjs.renderAdminLayout(layoutData);
 }
 function renderStatusBadge(status) {
   const statusColors = {
@@ -19653,7 +19914,7 @@ function renderSettingsTab(plugin, settingsTabData) {
   const settings = plugin.settings || {};
   const pluginId = plugin.id || plugin.name;
   const hasUserKeys = Object.keys(settings).some((k) => !k.startsWith("_"));
-  const pluginDef = chunk4WMZGHIC_cjs.getPluginDefinition(pluginId);
+  const pluginDef = chunkD6FWEYQE_cjs.getPluginDefinition(pluginId);
   if (pluginDef?.settingsTabContent) {
     return pluginDef.settingsTabContent.render({ plugin, settings, data: settingsTabData });
   }
@@ -20003,7 +20264,8 @@ function formatTimestamp(timestamp) {
 }
 var pluginSettingsComponents = {
   "otp-login": renderOTPLoginSettingsContent,
-  "email": renderEmailSettingsContent
+  "email": renderEmailSettingsContent,
+  "oauth-providers": renderOAuthProvidersSettingsContent
 };
 function renderOTPLoginSettingsContent(plugin, settings) {
   const siteName = settings.siteName || "SonicJS";
@@ -20726,6 +20988,62 @@ defineUserProfile({
     </div>
   `;
 }
+function renderOAuthProvidersSettingsContent(plugin, settings) {
+  const providers = settings.providers || {};
+  const gh = providers.github || {};
+  const gg = providers.google || {};
+  const inputClass = "backdrop-blur-sm bg-white/10 border border-white/20 rounded-lg px-3 py-2 text-white placeholder-gray-300 focus:border-blue-400 focus:outline-none transition-colors w-full";
+  return `
+    <div class="space-y-6">
+      <form id="settings-form">
+        <div class="backdrop-blur-md bg-white/5 rounded-xl border border-white/10 p-6 space-y-6">
+          <h3 class="text-lg font-semibold text-white">GitHub OAuth</h3>
+          <div>
+            <label for="oauth_github_clientId" class="block text-sm font-medium text-gray-300 mb-2">Client ID</label>
+            <input type="text" id="oauth_github_clientId" name="oauth_github_clientId"
+              value="${escapeHtmlAttr(gh.clientId || "")}"
+              placeholder="GitHub OAuth App Client ID" class="${inputClass}" />
+          </div>
+          <div>
+            <label for="oauth_github_clientSecret" class="block text-sm font-medium text-gray-300 mb-2">Client Secret</label>
+            <input type="password" id="oauth_github_clientSecret" name="oauth_github_clientSecret"
+              value="${escapeHtmlAttr(gh.clientSecret || "")}"
+              placeholder="GitHub OAuth App Client Secret" class="${inputClass}" />
+          </div>
+          <div class="flex items-center gap-3">
+            <input type="checkbox" id="oauth_github_enabled" name="oauth_github_enabled"
+              ${gh.enabled ? "checked" : ""} class="w-4 h-4 rounded border-white/10" />
+            <label for="oauth_github_enabled" class="text-sm text-gray-300">Enable GitHub login</label>
+          </div>
+        </div>
+
+        <div class="backdrop-blur-md bg-white/5 rounded-xl border border-white/10 p-6 space-y-6 mt-6">
+          <h3 class="text-lg font-semibold text-white">Google OAuth</h3>
+          <div>
+            <label for="oauth_google_clientId" class="block text-sm font-medium text-gray-300 mb-2">Client ID</label>
+            <input type="text" id="oauth_google_clientId" name="oauth_google_clientId"
+              value="${escapeHtmlAttr(gg.clientId || "")}"
+              placeholder="Google OAuth Client ID" class="${inputClass}" />
+          </div>
+          <div>
+            <label for="oauth_google_clientSecret" class="block text-sm font-medium text-gray-300 mb-2">Client Secret</label>
+            <input type="password" id="oauth_google_clientSecret" name="oauth_google_clientSecret"
+              value="${escapeHtmlAttr(gg.clientSecret || "")}"
+              placeholder="Google OAuth Client Secret" class="${inputClass}" />
+          </div>
+          <div class="flex items-center gap-3">
+            <input type="checkbox" id="oauth_google_enabled" name="oauth_google_enabled"
+              ${gg.enabled ? "checked" : ""} class="w-4 h-4 rounded border-white/10" />
+            <label for="oauth_google_enabled" class="text-sm text-gray-300">Enable Google login</label>
+          </div>
+        </div>
+      </form>
+    </div>
+  `;
+}
+function hasCustomSettingsComponent(pluginId) {
+  return pluginId in pluginSettingsComponents;
+}
 
 // src/plugins/core-plugins/menu-plugin/services/menu-reconcile.ts
 async function upsertPluginRow(db, slug, entry, visible) {
@@ -20843,8 +21161,8 @@ async function fetchActivePluginIds(db) {
 }
 async function reconcileMenuFromPlugins(db) {
   try {
-    const singletonEntries = chunk4WMZGHIC_cjs.getPluginMenu();
-    const manifestEntries = Object.values(chunkAT4ZQGEZ_cjs.PLUGIN_REGISTRY).filter(
+    const singletonEntries = chunkD6FWEYQE_cjs.getPluginMenu();
+    const manifestEntries = Object.values(chunkYAURVGUK_cjs.PLUGIN_REGISTRY).filter(
       (p) => p.adminMenu !== null
     );
     const byPluginId = /* @__PURE__ */ new Map();
@@ -20881,8 +21199,8 @@ async function reconcileMenuFromPlugins(db) {
 
 // src/routes/admin-plugins.ts
 var adminPluginRoutes = new hono.Hono();
-adminPluginRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
-var AVAILABLE_PLUGINS = Object.values(chunkAT4ZQGEZ_cjs.PLUGIN_REGISTRY).map((p) => ({
+adminPluginRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
+var AVAILABLE_PLUGINS = Object.values(chunkYAURVGUK_cjs.PLUGIN_REGISTRY).map((p) => ({
   id: p.id,
   name: p.codeName,
   display_name: p.displayName,
@@ -20902,7 +21220,7 @@ adminPluginRoutes.get("/", async (c) => {
     if (user?.role !== "admin") {
       return c.text("Access denied", 403);
     }
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     let installedPlugins = [];
     let stats = { total: 0, active: 0, inactive: 0, errors: 0, uninstalled: 0 };
     try {
@@ -20976,10 +21294,10 @@ adminPluginRoutes.get("/:id", async (c) => {
     if (user?.role !== "admin") {
       return c.redirect("/admin/plugins");
     }
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     let plugin = await pluginService.getPlugin(pluginId);
     if (!plugin) {
-      const def = chunk4WMZGHIC_cjs.getPluginDefinition(pluginId);
+      const def = chunkD6FWEYQE_cjs.getPluginDefinition(pluginId);
       if (!def) return c.text("Plugin not found", 404);
       plugin = await pluginService.ensurePlugin(pluginId, {
         displayName: def.displayName ?? pluginId,
@@ -21050,7 +21368,7 @@ adminPluginRoutes.get("/:id", async (c) => {
       timestamp: item.timestamp,
       user: item.userId || null
     }));
-    const pluginDef = chunk4WMZGHIC_cjs.getPluginDefinition(pluginId);
+    const pluginDef = chunkD6FWEYQE_cjs.getPluginDefinition(pluginId);
     let settingsTabData = void 0;
     if (pluginDef?.settingsTabContent?.loadData) {
       try {
@@ -21080,14 +21398,14 @@ adminPluginRoutes.get("/:id/configure", async (c) => {
     const user = c.get("user");
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") return c.redirect("/admin/plugins");
-    const def = chunk4WMZGHIC_cjs.getPluginDefinition(pluginId);
+    const def = chunkD6FWEYQE_cjs.getPluginDefinition(pluginId);
     if (!def?.configSchema) return c.text("No schema-driven settings for this plugin", 404);
     const db = c.env.DB;
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     const plugin = await pluginService.getPlugin(pluginId);
     const stored = plugin?.settings ?? {};
-    const values = chunk4WMZGHIC_cjs.applySchemaDefaults(def.configSchema, stored);
-    const fieldsHtml = chunk4WMZGHIC_cjs.renderSchemaFields(def.configSchema, values);
+    const values = chunkD6FWEYQE_cjs.applySchemaDefaults(def.configSchema, stored);
+    const fieldsHtml = chunkD6FWEYQE_cjs.renderSchemaFields(def.configSchema, values);
     const displayName = plugin?.display_name ?? def.displayName ?? def.id;
     return c.html(`<!DOCTYPE html>
 <html lang="en"><head>
@@ -21114,12 +21432,12 @@ adminPluginRoutes.post("/:id/configure", async (c) => {
     const user = c.get("user");
     const pluginId = c.req.param("id");
     if (user?.role !== "admin") return c.json({ error: "Access denied" }, 403);
-    const def = chunk4WMZGHIC_cjs.getPluginDefinition(pluginId);
+    const def = chunkD6FWEYQE_cjs.getPluginDefinition(pluginId);
     if (!def?.configSchema) return c.text("No schema-driven settings for this plugin", 404);
     const form = await c.req.formData();
-    const parsed = chunk4WMZGHIC_cjs.parseFormDataToSettings(def.configSchema, form);
+    const parsed = chunkD6FWEYQE_cjs.parseFormDataToSettings(def.configSchema, form);
     const db = c.env.DB;
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     await pluginService.ensurePlugin(pluginId, {
       displayName: def.displayName ?? pluginId,
       version: def.version,
@@ -21143,7 +21461,7 @@ adminPluginRoutes.post("/:id/activate", async (c) => {
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     await pluginService.activatePlugin(pluginId);
     await reconcileMenuFromPlugins(db);
     return c.json({ success: true });
@@ -21161,7 +21479,7 @@ adminPluginRoutes.post("/:id/deactivate", async (c) => {
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     await pluginService.deactivatePlugin(pluginId);
     await reconcileMenuFromPlugins(db);
     return c.json({ success: true });
@@ -21179,8 +21497,8 @@ adminPluginRoutes.post("/install", async (c) => {
       return c.json({ error: "Access denied" }, 403);
     }
     const body = await c.req.json();
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
-    const registryEntry = chunkAT4ZQGEZ_cjs.findPluginByCodeName(body.name) || chunkAT4ZQGEZ_cjs.PLUGIN_REGISTRY[body.name] || chunkAT4ZQGEZ_cjs.PLUGIN_REGISTRY[body.id];
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
+    const registryEntry = chunkYAURVGUK_cjs.findPluginByCodeName(body.name) || chunkYAURVGUK_cjs.PLUGIN_REGISTRY[body.name] || chunkYAURVGUK_cjs.PLUGIN_REGISTRY[body.id];
     if (!registryEntry) {
       return c.json({ error: "Plugin not found in registry" }, 404);
     }
@@ -21213,7 +21531,7 @@ adminPluginRoutes.post("/:id/uninstall", async (c) => {
     if (user?.role !== "admin") {
       return c.json({ error: "Access denied" }, 403);
     }
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     await pluginService.uninstallPlugin(pluginId);
     return c.json({ success: true });
   } catch (error) {
@@ -21231,7 +21549,7 @@ adminPluginRoutes.post("/:id/settings", async (c) => {
       return c.json({ error: "Access denied" }, 403);
     }
     const settings = await c.req.json();
-    const pluginService = new chunkAT4ZQGEZ_cjs.PluginService(db);
+    const pluginService = new chunkYAURVGUK_cjs.PluginService(db);
     const existingPlugin = await pluginService.getPlugin(pluginId);
     const existingSettings = existingPlugin?.settings ?? {};
     await pluginService.updatePluginSettings(pluginId, { ...existingSettings, ...settings });
@@ -21266,7 +21584,7 @@ function formatLastUpdated(timestamp) {
 }
 
 // src/templates/pages/admin-logs-list.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderLogsListPage(data) {
   const { logs, pagination, filters, user } = data;
   const content = `
@@ -21577,7 +21895,7 @@ function renderLogsListPage(data) {
     user,
     content
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 function renderLogDetailsPage(data) {
   const { log, user } = data;
@@ -21789,7 +22107,7 @@ function renderLogDetailsPage(data) {
       </div>
     </div>
   `;
-  return chunkE66UVONV_cjs.adminLayoutV2({
+  return chunkOUBUS74I_cjs.adminLayoutV2({
     title: `Log Details - ${log.id}`,
     user,
     content
@@ -22032,7 +22350,7 @@ function renderLogConfigPage(data) {
 
     <script src="https://unpkg.com/htmx.org@1.9.6"></script>
   `;
-  return chunkE66UVONV_cjs.adminLayoutV2({
+  return chunkOUBUS74I_cjs.adminLayoutV2({
     title: "Log Configuration",
     user,
     content
@@ -22041,7 +22359,7 @@ function renderLogConfigPage(data) {
 
 // src/routes/admin-logs.ts
 var adminLogsRoutes = new hono.Hono();
-adminLogsRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
+adminLogsRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 adminLogsRoutes.get("/", async (c) => {
   try {
     const user = c.get("user");
@@ -22413,7 +22731,7 @@ adminCheckboxRoutes.get("/", (c) => {
       role: user.role
     } : void 0
   };
-  return c.html(chunkE66UVONV_cjs.renderCheckboxPage(pageData));
+  return c.html(chunkOUBUS74I_cjs.renderCheckboxPage(pageData));
 });
 
 // src/templates/pages/admin-dashboard.template.ts
@@ -22485,7 +22803,7 @@ function renderDashboardPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkE66UVONV_cjs.renderAdminLayout(layoutData);
+  return chunkOUBUS74I_cjs.renderAdminLayout(layoutData);
 }
 function renderStatsCards(stats) {
   const cards = [
@@ -23033,9 +23351,9 @@ function renderStorageUsage(databaseSizeBytes, mediaSizeBytes) {
 }
 
 // src/routes/admin-dashboard.ts
-var VERSION = chunkC3ZQP5NW_cjs.getCoreVersion();
+var VERSION = chunkBJ6NJL2E_cjs.getCoreVersion();
 var router = new hono.Hono();
-router.use("*", chunkIS54FPB7_cjs.requireAuth());
+router.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 router.get("/", async (c) => {
   const user = c.get("user");
   try {
@@ -23225,7 +23543,7 @@ router.get("/system-status", async (c) => {
 });
 
 // src/templates/pages/admin-collections-list.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 
 // src/templates/components/table.template.ts
 function renderTable2(data) {
@@ -23707,11 +24025,11 @@ function renderCollectionsListPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/templates/pages/admin-collections-form.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function getFieldTypeBadge(fieldType) {
   const typeLabels = {
     "text": "Text",
@@ -23884,8 +24202,8 @@ function renderCollectionFormPage(data) {
         <!-- Form Content -->
         <div class="px-6 py-6">
           <div id="form-messages"></div>
-          ${data.error ? chunkJMJM7DMM_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
-          ${data.success ? chunkJMJM7DMM_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
+          ${data.error ? chunkTT3TQSCZ_cjs.renderAlert({ type: "error", message: data.error, dismissible: true }) : ""}
+          ${data.success ? chunkTT3TQSCZ_cjs.renderAlert({ type: "success", message: data.success, dismissible: true }) : ""}
 
           <!-- Form Styling -->
           <style>
@@ -23996,7 +24314,7 @@ function renderCollectionFormPage(data) {
             }
           </style>
           
-          ${chunkE66UVONV_cjs.renderForm(formData)}
+          ${chunkOUBUS74I_cjs.renderForm(formData)}
 
           ${isEdit && data.managed ? `
             <!-- Read-Only Fields Display for Managed Collections -->
@@ -24994,13 +25312,13 @@ function renderCollectionFormPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/routes/admin-collections.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 var adminCollectionsRoutes = new hono.Hono();
-adminCollectionsRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
+adminCollectionsRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 adminCollectionsRoutes.get("/", async (c) => {
   try {
     const user = c.get("user");
@@ -25017,7 +25335,7 @@ adminCollectionsRoutes.get("/", async (c) => {
       results = queryResults.results ?? [];
     } catch (e) {
     }
-    const codeCollections = chunkAT4ZQGEZ_cjs.getCollectionRegistry().list();
+    const codeCollections = chunkYAURVGUK_cjs.getCollectionRegistry().list();
     const codeCollectionsMap = new Map(
       codeCollections.map((cfg) => {
         const fieldCount = cfg.schema?.properties ? Object.keys(cfg.schema.properties).length : 0;
@@ -25031,7 +25349,7 @@ adminCollectionsRoutes.get("/", async (c) => {
           field_count: fieldCount,
           managed: cfg.managed !== false,
           source_type: "code",
-          internal: chunkAT4ZQGEZ_cjs.isCodeCollectionInternal(cfg),
+          internal: chunkYAURVGUK_cjs.isCodeCollectionInternal(cfg),
           versioning: cfg.versioning === true
         }];
       })
@@ -25070,7 +25388,7 @@ adminCollectionsRoutes.get("/", async (c) => {
         field_count: fieldCount,
         managed: false,
         source_type: row.source === "code" || row.source === "system" || row.source === "plugin" ? "code" : "user",
-        internal: chunkAT4ZQGEZ_cjs.isDbDocTypeInternal(row.source),
+        internal: chunkYAURVGUK_cjs.isDbDocTypeInternal(row.source),
         versioning: dbVersioning
       };
     });
@@ -25227,11 +25545,11 @@ export const myPlugin = definePlugin({
   `;
   const u = user;
   return c.html(
-    chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst({
+    chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst({
       title: "Add a Collection",
       pageTitle: "Add a Collection",
       currentPath: "/admin/collections",
-      version: chunkC3ZQP5NW_cjs.getCoreVersion(),
+      version: chunkBJ6NJL2E_cjs.getCoreVersion(),
       user: u ? { name: u.email ?? "Admin", email: u.email ?? "", role: u.role ?? "admin" } : void 0,
       content
     })
@@ -25248,7 +25566,7 @@ adminCollectionsRoutes.get("/:id", async (c) => {
       collection = await stmt.bind(id).first();
     } catch {
     }
-    const registryRecord = chunkAT4ZQGEZ_cjs.getCollectionRegistry().getById(id) ?? chunkAT4ZQGEZ_cjs.getCollectionRegistry().getByName(id);
+    const registryRecord = chunkYAURVGUK_cjs.getCollectionRegistry().getById(id) ?? chunkYAURVGUK_cjs.getCollectionRegistry().getByName(id);
     if (!collection && !registryRecord) {
       const formData2 = {
         isEdit: true,
@@ -25295,9 +25613,9 @@ adminCollectionsRoutes.get("/:id", async (c) => {
       isCodeDriven = true;
     }
     const [tinymceActive, quillActive, mdxeditorActive] = await Promise.all([
-      chunkIS54FPB7_cjs.isPluginActive(db, "tinymce-plugin"),
-      chunkIS54FPB7_cjs.isPluginActive(db, "quill-editor"),
-      chunkIS54FPB7_cjs.isPluginActive(db, "easy-mdx")
+      chunkE7E3NL3Y_cjs.isPluginActive(db, "tinymce-plugin"),
+      chunkE7E3NL3Y_cjs.isPluginActive(db, "quill-editor"),
+      chunkE7E3NL3Y_cjs.isPluginActive(db, "easy-mdx")
     ]);
     const displayName = collection?.display_name ?? registryRecord?.displayName ?? id;
     const formData = {
@@ -25317,9 +25635,9 @@ adminCollectionsRoutes.get("/:id", async (c) => {
     console.error("Error fetching collection:", error);
     const user = c.get("user");
     const [tinymceActive, quillActive, mdxeditorActive] = await Promise.all([
-      chunkIS54FPB7_cjs.isPluginActive(db, "tinymce-plugin"),
-      chunkIS54FPB7_cjs.isPluginActive(db, "quill-editor"),
-      chunkIS54FPB7_cjs.isPluginActive(db, "easy-mdx")
+      chunkE7E3NL3Y_cjs.isPluginActive(db, "tinymce-plugin"),
+      chunkE7E3NL3Y_cjs.isPluginActive(db, "quill-editor"),
+      chunkE7E3NL3Y_cjs.isPluginActive(db, "easy-mdx")
     ]);
     const formData = {
       isEdit: true,
@@ -25333,7 +25651,7 @@ adminCollectionsRoutes.get("/:id", async (c) => {
 });
 
 // src/templates/pages/admin-settings.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderSettingsPage(data) {
   const activeTab = data.activeTab || "general";
   const pageContent = `
@@ -25723,7 +26041,7 @@ function renderSettingsPage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 function renderTabButton(tabId, label, iconPath, activeTab) {
   const isActive = activeTab === tabId;
@@ -26268,7 +26586,7 @@ function renderDatabaseToolsSettings(settings) {
 
 // src/routes/admin-settings.ts
 var adminSettingsRoutes = new hono.Hono();
-adminSettingsRoutes.use("*", chunkIS54FPB7_cjs.requireAuth());
+adminSettingsRoutes.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 function getMockSettings(user) {
   return {
     general: {
@@ -26371,7 +26689,7 @@ adminSettingsRoutes.get("/database-tools", (c) => {
 adminSettingsRoutes.get("/api/migrations/status", async (c) => {
   try {
     const db = c.env.DB;
-    const migrationService = new chunkVGHEKIJL_cjs.MigrationService(db);
+    const migrationService = new chunkMOGK3U4A_cjs.MigrationService(db);
     const status = await migrationService.getMigrationStatus();
     return c.json({
       success: true,
@@ -26411,7 +26729,7 @@ adminSettingsRoutes.post("/api/migrations/run", async (c) => {
 adminSettingsRoutes.get("/api/migrations/validate", async (c) => {
   try {
     const db = c.env.DB;
-    const migrationService = new chunkVGHEKIJL_cjs.MigrationService(db);
+    const migrationService = new chunkMOGK3U4A_cjs.MigrationService(db);
     const validation = await migrationService.validateSchema();
     return c.json({
       success: true,
@@ -26669,7 +26987,7 @@ adminSettingsRoutes.post("/", async (c) => {
 });
 
 // src/templates/pages/admin-api-reference.template.ts
-chunkUYJQDDEE_cjs.init_admin_layout_catalyst_template();
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
 function renderAuthBadge(auth) {
   if (auth === true) {
     return `
@@ -27000,20 +27318,20 @@ function renderAPIReferencePage(data) {
     version: data.version,
     content: pageContent
   };
-  return chunkUYJQDDEE_cjs.renderAdminLayoutCatalyst(layoutData);
+  return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst(layoutData);
 }
 
 // src/routes/admin-api-reference.ts
-var VERSION2 = chunkC3ZQP5NW_cjs.getCoreVersion();
+var VERSION2 = chunkBJ6NJL2E_cjs.getCoreVersion();
 var router2 = new hono.Hono();
-router2.use("*", chunkIS54FPB7_cjs.requireAuth());
+router2.use("*", chunkE7E3NL3Y_cjs.requireAuth());
 router2.get("/", async (c) => {
   const user = c.get("user");
   try {
     const app2 = chunk36Z3AKX3_cjs.getAppInstance();
     const baseEndpoints = chunk36Z3AKX3_cjs.buildRouteList(app2);
     const collectionRoutes = [];
-    const collections = chunkAT4ZQGEZ_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal);
+    const collections = chunkYAURVGUK_cjs.getCollectionRegistry().listActive().filter((r) => !r.internal);
     const methodOrder = { GET: 0, POST: 1, PUT: 2, PATCH: 3, DELETE: 4 };
     for (const col of collections) {
       const displayName = col.displayName || col.name;
@@ -27110,8 +27428,10 @@ exports.createUserProfilesPlugin = createUserProfilesPlugin;
 exports.defineUserProfile = defineUserProfile;
 exports.denyIfNotAllowed = denyIfNotAllowed;
 exports.dispatchHookEvent = dispatchHookEvent;
+exports.effectiveTenantForType = effectiveTenantForType;
 exports.getConfirmationDialogScript = getConfirmationDialogScript2;
 exports.getCustomData = getCustomData;
+exports.getDocumentRequestContext = getDocumentRequestContext;
 exports.getEmailService = getEmailService;
 exports.getUserProfileConfig = getUserProfileConfig;
 exports.getVariablesCached = getVariablesCached;
@@ -27129,7 +27449,8 @@ exports.router2 = router2;
 exports.setEmailService = setEmailService;
 exports.setVariablesCache = setVariablesCache;
 exports.test_cleanup_default = test_cleanup_default;
+exports.updateDocumentSchema = updateDocumentSchema;
 exports.userProfilesPlugin = userProfilesPlugin;
 exports.userRoutes = userRoutes;
-//# sourceMappingURL=chunk-CTYLCWMO.cjs.map
-//# sourceMappingURL=chunk-CTYLCWMO.cjs.map
+//# sourceMappingURL=chunk-6OA77UM7.cjs.map
+//# sourceMappingURL=chunk-6OA77UM7.cjs.map