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

package/dist/{chunk-SK5CHFJP.js → chunk-7P5OCUPS.js}

@@ -1,18 +1,18 @@
 import { isFirstUserRegistration, isRegistrationEnabled, authValidationService } from './chunk-VVYVFCML.js';
-import { renderDocumentFormPage, renderAlert } from './chunk-BHND5PEV.js';
+import { renderDocumentFormPage, renderAlert } from './chunk-E3TQG7AA.js';
 import { getCacheService, CACHE_CONFIGS, SettingsService, getLogger, getAppInstance, buildRouteList, CATEGORY_INFO } from './chunk-2XAQTPAE.js';
-import { DocumentTypeRegistry, requireAuth, requireRole, optionalAuth, isPluginActive, rateLimit, AuthManager, getJwtExpirySecondsFromDb, getJwtRefreshGraceSecondsFromDb, logActivity, generateCsrfToken } from './chunk-DIBCKCUE.js';
-import { DocumentsService, documentSecondsToMs, RbacService } from './chunk-3TMTYJAJ.js';
+import { DocumentTypeRegistry, requireAuth, requireRole, optionalAuth, isPluginActive, rateLimit, AuthManager, getJwtExpirySecondsFromDb, getJwtRefreshGraceSecondsFromDb, logActivity, generateCsrfToken } from './chunk-2OXFMMA3.js';
+import { DocumentsService, documentSecondsToMs, RbacService } from './chunk-BDQ55MWV.js';
 import { nanoid } from './chunk-UWUP2VMT.js';
-import { getCollectionRegistry, collectionRecordToRow, loadCollectionConfigs, getVisibleCollections, PluginService, PLUGIN_REGISTRY, findPluginByCodeName, isCodeCollectionInternal, isDbDocTypeInternal, invalidateTenantCache } from './chunk-KS24NPPL.js';
-import { MigrationService } from './chunk-A46IRC5A.js';
-import { renderCheckboxPage, renderAlert as renderAlert$1, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-BJROXF4N.js';
-import { init_admin_layout_catalyst_template, renderAdminLayoutCatalyst } from './chunk-THFZSDIU.js';
-import { createServiceSingleton, definePlugin, getPluginDefinition, applySchemaDefaults, renderSchemaFields, parseFormDataToSettings, getPluginMenu } from './chunk-2MIYYAO4.js';
+import { getCollectionRegistry, collectionRecordToRow, loadCollectionConfigs, getVisibleCollections, PluginService, PLUGIN_REGISTRY, findPluginByCodeName, isCodeCollectionInternal, isDbDocTypeInternal, invalidateTenantCache } from './chunk-2D3A4X52.js';
+import { MigrationService } from './chunk-D7RLBBHE.js';
+import { renderCheckboxPage, renderAlert as renderAlert$1, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-HSDJDWLV.js';
+import { init_admin_layout_catalyst_template, renderAdminLayoutCatalyst } from './chunk-SXC4HPK6.js';
+import { createServiceSingleton, definePlugin, getPluginDefinition, applySchemaDefaults, renderSchemaFields, parseFormDataToSettings, getPluginMenu } from './chunk-C54MH5UI.js';
 import { hasHookSystem, getTypedHooks } from './chunk-RNZFGN4R.js';
-import { QueryFilterBuilder, getBlocksFieldConfig, parseBlocksValue } from './chunk-QZGABF2M.js';
+import { QueryFilterBuilder, getBlocksFieldConfig, parseBlocksValue } from './chunk-FVAK4C6L.js';
 import { metricsTracker } from './chunk-FICTAGD4.js';
-import { getCoreVersion } from './chunk-DPLJYTHE.js';
+import { getCoreVersion } from './chunk-CWIGQYRR.js';
 import { escapeHtml, sanitizeRichText, sanitizeInput } from './chunk-TQABQWOP.js';
 import { Hono } from 'hono';
 import { z } from 'zod';
@@ -45,6 +45,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;
       }
@@ -149,6 +150,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 = {}) {
@@ -982,6 +995,32 @@ apiContentCrudRoutes.get("/:id", 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);
@@ -1045,8 +1084,8 @@ apiContentCrudRoutes.post("/", requireAuth(), requireRole(["admin", "editor", "a
         user?.userId
       );
       const cache = getCacheService(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",
@@ -1109,8 +1148,8 @@ apiContentCrudRoutes.put("/:id", requireAuth(), requireRole(["admin", "editor",
         await svc.unpublish(pub.id);
       }
       const cache = getCacheService(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}:*`);
       const coll = 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) : {};
@@ -1149,8 +1188,8 @@ apiContentCrudRoutes.delete("/:id", requireAuth(), requireRole(["admin", "editor
       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 = getCacheService(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 });
     }
@@ -1166,6 +1205,22 @@ apiContentCrudRoutes.delete("/:id", requireAuth(), requireRole(["admin", "editor
 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 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",
@@ -1249,6 +1304,33 @@ function mapDocRowToContent(row, collectionId) {
     updated_at: 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();
 apiRoutes.use("*", async (c, next) => {
   const startTime = Date.now();
@@ -1738,7 +1820,12 @@ apiRoutes.get("/content", optionalAuth(), async (c) => {
   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;
@@ -1784,7 +1871,7 @@ apiRoutes.get("/content", optionalAuth(), async (c) => {
         details: queryResult.errors
       }, 400);
     }
-    const cacheEnabled = c.get("cacheEnabled");
+    const cacheEnabled = c.get("cacheEnabled") && cAnon;
     const cache = getCacheService(CACHE_CONFIGS.api);
     const cacheKey = cache.generateKey("content-filtered", JSON.stringify({ filter: normalizedFilter, query: queryResult.sql }));
     if (cacheEnabled) {
@@ -1814,11 +1901,41 @@ apiRoutes.get("/content", 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 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.
@@ -1829,7 +1946,7 @@ apiRoutes.get("/content", optionalAuth(), async (c) => {
         }
       }, executionStart)
     };
-    if (cacheEnabled) {
+    if (cacheEnabled && projFields.length === 0) {
       await cache.set(cacheKey, responseData);
     }
     return c.json(responseData);
@@ -1854,6 +1971,16 @@ apiRoutes.get("/collections/:collection/content", optionalAuth(), async (c) => {
     const collIdByName = /* @__PURE__ */ new Map();
     collIdByName.set(collection, record.id);
     const role = c.get("user")?.role;
+    const { tenantId: ccTenantId, principalSet: ccPrincipalSet } = getDocumentRequestContext(c);
+    const ccAnon = isAnonPrincipal(ccPrincipalSet);
+    const ccNeedsAcl = !ccAnon && !canReadNonPublicContent(role);
+    let ccDocType;
+    if (ccNeedsAcl) {
+      ccDocType = await new DocumentTypeRegistry(db).findById(record.name);
+      if (!await typeReadAllowed(db, ccPrincipalSet, ccDocType, record.name)) {
+        return c.json({ error: "Forbidden" }, 403);
+      }
+    }
     const filter = QueryFilterBuilder.parseFromQuery(queryParams);
     const normalizedFilter = augmentFilterForDocuments(filter, { typeId: collection, role });
     if (!normalizedFilter.limit) {
@@ -1868,7 +1995,7 @@ apiRoutes.get("/collections/:collection/content", optionalAuth(), async (c) => {
         details: queryResult.errors
       }, 400);
     }
-    const cacheEnabled = c.get("cacheEnabled");
+    const cacheEnabled = c.get("cacheEnabled") && ccAnon;
     const cache = getCacheService(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 })}`);
@@ -1899,12 +2026,24 @@ apiRoutes.get("/collections/:collection/content", 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 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: collectionRecordToRow(record) } : {},
-        count: results.length,
+        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.
@@ -1934,6 +2073,8 @@ apiRoutes.get("/:collection", optionalAuth(), async (c) => {
     const collection = c.req.param("collection");
     const db = c.env.DB;
     const queryParams = c.req.query();
+    const projFields = parseFieldsParam(queryParams.fields);
+    if (queryParams.fields) delete queryParams.fields;
     const record = getCollectionRegistry().getBySlugOrName(collection);
     if (!record || record.isActive === false) {
       return c.json({ error: "Collection not found" }, 404);
@@ -1941,6 +2082,16 @@ apiRoutes.get("/:collection", optionalAuth(), async (c) => {
     const collIdByName = /* @__PURE__ */ new Map();
     collIdByName.set(record.name, record.id);
     const role = c.get("user")?.role;
+    const { tenantId, principalSet } = getDocumentRequestContext(c);
+    const anon = isAnonPrincipal(principalSet);
+    const needsAcl = !anon && !canReadNonPublicContent(role);
+    let docTypeForCheck;
+    if (needsAcl) {
+      docTypeForCheck = await new DocumentTypeRegistry(db).findById(record.name);
+      if (!await typeReadAllowed(db, principalSet, docTypeForCheck, record.name)) {
+        return c.json({ error: "Forbidden" }, 403);
+      }
+    }
     const filter = QueryFilterBuilder.parseFromQuery(queryParams);
     const normalizedFilter = augmentFilterForDocuments(filter, { typeId: record.name, role });
     if (!normalizedFilter.limit) normalizedFilter.limit = 50;
@@ -1952,7 +2103,7 @@ apiRoutes.get("/:collection", optionalAuth(), async (c) => {
     }
     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 = getCacheService(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 })}`);
@@ -1970,12 +2121,25 @@ apiRoutes.get("/:collection", 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: collectionRecordToRow(record) } : {},
-        count: results.length,
+        count: aclResults.length,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         filter: normalizePublicContentFilter(filter, role),
         cache: { hit: false, source: "database" }
@@ -2006,6 +2170,23 @@ apiRoutes.get("/:collection/:id", 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 colRole = c.get("user")?.role;
+    const { tenantId: colTenantId, principalSet: colPrincipalSet } = getDocumentRequestContext(c);
+    const colNeedsAcl = !isAnonPrincipal(colPrincipalSet) && !canReadNonPublicContent(colRole);
+    if (colNeedsAcl) {
+      const docType = await new 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 = getCollectionRegistry().getByName(docRow.type_id);
     const transformedContent = {
       id: docRow.root_id,
@@ -2018,7 +2199,7 @@ apiRoutes.get("/:collection/:id", optionalAuth(), async (c) => {
       updated_at: 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);
@@ -2048,8 +2229,8 @@ apiRoutes.post("/:collection", requireAuth(), requireRole(["admin", "editor", "a
     const svc = new 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 = getCacheService(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: documentSecondsToMs(doc.createdAt), updated_at: documentSecondsToMs(doc.updatedAt) } }, 201);
   } catch (error) {
@@ -2091,8 +2272,8 @@ apiRoutes.put("/:collection/:id", requireAuth(), requireRole(["admin", "editor",
       await svc.unpublish(pub.id);
     }
     const cache = getCacheService(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}:*`);
     const coll = 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) : {};
@@ -2124,8 +2305,8 @@ apiRoutes.delete("/:collection/:id", requireAuth(), requireRole(["admin", "edito
     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 = getCacheService(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) {
@@ -2687,9 +2868,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`
@@ -3399,7 +3584,7 @@ adminApiRoutes.patch("/collections/:id", collectionsReadOnly);
 adminApiRoutes.delete("/collections/:id", collectionsReadOnly);
 adminApiRoutes.get("/migrations/status", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-XQ6EX6HX.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-JAHMI5MK.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const status = await migrationService.getMigrationStatus();
@@ -3442,7 +3627,7 @@ adminApiRoutes.post("/migrations/run", async (c) => {
 });
 adminApiRoutes.get("/migrations/validate", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-XQ6EX6HX.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-JAHMI5MK.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const validation = await migrationService.validateSchema();
@@ -3601,6 +3786,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"
@@ -5116,9 +5303,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":
@@ -5134,6 +5323,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":
@@ -7090,6 +7280,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>
@@ -7281,8 +7486,8 @@ authRoutes.post(
       }
       const { email, password } = validation.data;
       const normalizedEmail = email.toLowerCase();
-      const { createAuth } = await import('./config-6FB2BXMP.js');
-      const auth = createAuth(c.env);
+      const { createAuth } = await import('./config-4TIHSNW6.js');
+      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 },
@@ -7292,12 +7497,14 @@ 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);
@@ -7317,6 +7524,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,
@@ -7335,8 +7545,8 @@ authRoutes.post(
 );
 authRoutes.post("/logout", async (c) => {
   try {
-    const { createAuth } = await import('./config-6FB2BXMP.js');
-    const auth = createAuth(c.env);
+    const { createAuth } = await import('./config-4TIHSNW6.js');
+    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") || "" },
@@ -7345,14 +7555,15 @@ authRoutes.post("/logout", async (c) => {
     await auth.handler(baReq);
   } catch {
   }
-  setCookie(c, "better-auth.session_token", "", { httpOnly: true, sameSite: "Lax", path: "/", maxAge: 0 });
+  const isSecure = new URL(c.req.url).protocol === "https:";
+  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-6FB2BXMP.js');
-    const auth = createAuth(c.env);
+    const { createAuth } = await import('./config-4TIHSNW6.js');
+    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") || "" },
@@ -7361,7 +7572,8 @@ authRoutes.get("/logout", async (c) => {
     await auth.handler(baReq);
   } catch {
   }
-  setCookie(c, "better-auth.session_token", "", { httpOnly: true, sameSite: "Lax", path: "/", maxAge: 0 });
+  const isSecure = new URL(c.req.url).protocol === "https:";
+  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");
 });
@@ -7558,8 +7770,8 @@ authRoutes.post(
         </div>
       `);
       }
-      const { createAuth } = await import('./config-6FB2BXMP.js');
-      const auth = createAuth(c.env);
+      const { createAuth } = await import('./config-4TIHSNW6.js');
+      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 },
@@ -7573,17 +7785,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`<div id="form-response"><p class="text-sm text-green-600">Login successful! Redirecting...</p></div>`);
+      }
       return c.html(html`
       <div id="form-response">
         <div class="rounded-lg bg-green-100 dark:bg-lime-500/10 p-4 ring-1 ring-green-400 dark:ring-lime-500/20">
@@ -9008,20 +9230,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">${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>
@@ -9095,33 +9317,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>
@@ -11623,6 +11856,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"
@@ -11639,7 +11880,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(),
@@ -11687,8 +11928,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();
@@ -12029,6 +12270,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,
@@ -12043,6 +12291,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
@@ -12202,6 +12451,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,
@@ -12212,7 +12462,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");
@@ -12246,6 +12497,9 @@ adminContentRoutes.post("/", async (c) => {
       }), user?.userId);
       const cache2 = getCacheService(CACHE_CONFIGS.content);
       await cache2.invalidate(`content:list:${collectionId}:*`);
+      const apiCacheCreate = getCacheService(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);
     }
@@ -12364,8 +12618,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 getCacheService(CACHE_CONFIGS.content).invalidate(`content:list:*`);
+        const apiCacheEdit = getCacheService(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`<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`
@@ -12393,6 +12667,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,
@@ -12405,7 +12680,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");
@@ -12757,8 +13033,8 @@ adminContentRoutes.post("/bulk-action", async (c) => {
     }
     await cache.invalidate("content:list:*");
     const apiCache = getCacheService(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);
@@ -12776,6 +13052,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 getCacheService(CACHE_CONFIGS.content).invalidate("content:list:*");
+      const apiCacheDel = getCacheService(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>
@@ -13071,12 +13350,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-55V2ZGWT.js');
+  const { renderVersionHistoryFragment } = await import('./admin-documents-form.template-JWV5GITD.js');
   const registry = new 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,
@@ -15326,12 +15605,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 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;
@@ -15780,8 +16057,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,
@@ -15809,9 +16087,9 @@ userRoutes.post("/users/new", async (c) => {
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
     const phone = sanitizeInput(formData.get("phone")?.toString()) || null;
     const bio = 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 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";
@@ -16033,9 +16311,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,
@@ -16067,9 +16346,9 @@ userRoutes.put("/users/:id", async (c) => {
     const lastName = sanitizeInput(formData.get("last_name")?.toString());
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
     const phone = 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 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() || "";
@@ -18656,15 +18935,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"
@@ -18828,8 +19098,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());
@@ -18847,8 +19115,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();
       }
 
@@ -18864,7 +19130,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'));
@@ -18888,30 +19153,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
         
@@ -19346,7 +19587,8 @@ function escapeHtmlAttr(value) {
 function renderPluginSettingsPage(data) {
   const { plugin, activity = [], user, settingsTabData } = data;
   const pluginDef = getPluginDefinition(plugin.id || plugin.name);
-  const hasUserSettings = pluginDef?.settingsTabContent != null || Object.keys(plugin.settings || {}).some((k) => !k.startsWith("_"));
+  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">
@@ -19511,9 +19753,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: {},
@@ -20001,7 +20262,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";
@@ -20724,6 +20986,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) {
@@ -27084,6 +27402,6 @@ var ROUTES_INFO = {
   reference: "https://github.com/sonicjs/sonicjs"
 };
 
-export { DocumentRepository, ROUTES_INFO, TenantService, VALID_MEMBER_ROLES, adminCheckboxRoutes, adminCollectionsRoutes, adminDocumentsRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_content_default, apiDocumentsRoutes, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, createDocumentSchema, createUserProfilesPlugin, defineUserProfile, denyIfNotAllowed, dispatchHookEvent, getConfirmationDialogScript2 as getConfirmationDialogScript, getCustomData, getEmailService, getUserProfileConfig, getVariablesCached, hasEmailService, invalidateVariablesCache, isValidMemberRole, lexicalEditorPlugin, reconcileMenuFromPlugins, renderConfirmationDialog2 as renderConfirmationDialog, renderTable2 as renderTable, resolveDocScope, resolveVariablesInObject, router, router2, setEmailService, setVariablesCache, test_cleanup_default, userProfilesPlugin, userRoutes };
-//# sourceMappingURL=chunk-SK5CHFJP.js.map
-//# sourceMappingURL=chunk-SK5CHFJP.js.map
+export { DocumentRepository, ROUTES_INFO, TenantService, VALID_MEMBER_ROLES, adminCheckboxRoutes, adminCollectionsRoutes, adminDocumentsRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_content_default, apiDocumentsRoutes, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, createDocumentSchema, createUserProfilesPlugin, defineUserProfile, denyIfNotAllowed, dispatchHookEvent, effectiveTenantForType, getConfirmationDialogScript2 as getConfirmationDialogScript, getCustomData, getDocumentRequestContext, getEmailService, getUserProfileConfig, getVariablesCached, hasEmailService, invalidateVariablesCache, isValidMemberRole, lexicalEditorPlugin, reconcileMenuFromPlugins, renderConfirmationDialog2 as renderConfirmationDialog, renderTable2 as renderTable, resolveDocScope, resolveVariablesInObject, router, router2, setEmailService, setVariablesCache, test_cleanup_default, updateDocumentSchema, userProfilesPlugin, userRoutes };
+//# sourceMappingURL=chunk-7P5OCUPS.js.map
+//# sourceMappingURL=chunk-7P5OCUPS.js.map