@sonicjs-cms/core 3.0.0-beta.22 → 3.0.0-beta.24

package/dist/{chunk-6KNTZ67K.js → chunk-VC5XVPLM.js}

@@ -1,18 +1,18 @@
 import { isFirstUserRegistration, isRegistrationEnabled, authValidationService } from './chunk-VVYVFCML.js';
-import { renderDocumentFormPage, renderAlert } from './chunk-RMRJGMDE.js';
+import { renderDocumentFormPage, renderAlert } from './chunk-BHND5PEV.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-CHWT5KBK.js';
+import { DocumentTypeRegistry, requireAuth, requireRole, optionalAuth, isPluginActive, rateLimit, AuthManager, getJwtExpirySecondsFromDb, getJwtRefreshGraceSecondsFromDb, logActivity, generateCsrfToken } from './chunk-FHPEM77Y.js';
 import { DocumentsService, documentSecondsToMs, RbacService } from './chunk-3TMTYJAJ.js';
 import { nanoid } from './chunk-UWUP2VMT.js';
-import { getCollectionRegistry, collectionRecordToRow, loadCollectionConfigs, getVisibleCollections, PluginService, PLUGIN_REGISTRY, findPluginByCodeName, isCodeCollectionInternal, isDbDocTypeInternal, invalidateTenantCache } from './chunk-DOMXI5PM.js';
-import { MigrationService } from './chunk-2FCKKOA5.js';
-import { renderCheckboxPage, renderAlert as renderAlert$1, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-OBA2RYZN.js';
-import { init_admin_layout_catalyst_template, renderAdminLayoutCatalyst } from './chunk-5V62WT6M.js';
-import { createServiceSingleton, definePlugin, getPluginDefinition, applySchemaDefaults, renderSchemaFields, parseFormDataToSettings } from './chunk-I2DM27HP.js';
+import { getCollectionRegistry, collectionRecordToRow, loadCollectionConfigs, getVisibleCollections, PluginService, PLUGIN_REGISTRY, findPluginByCodeName, isCodeCollectionInternal, isDbDocTypeInternal, invalidateTenantCache } from './chunk-RJ2O5IIE.js';
+import { MigrationService } from './chunk-UIHIXTIS.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-VGEZNFWH.js';
 import { hasHookSystem, getTypedHooks } from './chunk-RNZFGN4R.js';
 import { QueryFilterBuilder, getBlocksFieldConfig, parseBlocksValue } from './chunk-QZGABF2M.js';
 import { metricsTracker } from './chunk-FICTAGD4.js';
-import { getCoreVersion } from './chunk-73O4GPJ6.js';
+import { getCoreVersion } from './chunk-LNI3FYSI.js';
 import { escapeHtml, sanitizeRichText, sanitizeInput } from './chunk-TQABQWOP.js';
 import { Hono } from 'hono';
 import { z } from 'zod';
@@ -149,6 +149,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 = {}) {
@@ -3399,7 +3411,7 @@ adminApiRoutes.patch("/collections/:id", collectionsReadOnly);
 adminApiRoutes.delete("/collections/:id", collectionsReadOnly);
 adminApiRoutes.get("/migrations/status", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-HLK2QF4T.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-Z6D27NAW.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const status = await migrationService.getMigrationStatus();
@@ -3442,7 +3454,7 @@ adminApiRoutes.post("/migrations/run", async (c) => {
 });
 adminApiRoutes.get("/migrations/validate", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-HLK2QF4T.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-Z6D27NAW.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const validation = await migrationService.validateSchema();
@@ -9008,20 +9020,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>
@@ -11623,6 +11635,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 +11659,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 +11707,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 +12049,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 +12070,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 +12230,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 +12241,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");
@@ -12393,6 +12423,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 +12436,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");
@@ -13071,12 +13103,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-DDSH6ROU.js');
+  const { renderVersionHistoryFragment } = await import('./admin-documents-form.template-55V2ZGWT.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,
@@ -19344,8 +19376,9 @@ function escapeHtmlAttr(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function renderPluginSettingsPage(data) {
-  const { plugin, activity = [], user } = data;
-  const hasUserSettings = plugin.id in pluginSettingsComponents || Object.keys(plugin.settings || {}).some((k) => !k.startsWith("_"));
+  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 defaultTab = hasUserSettings ? "settings" : "info";
   const pageContent = `
     <div class="w-full px-4 sm:px-6 lg:px-8 py-6">
@@ -19425,7 +19458,7 @@ function renderPluginSettingsPage(data) {
       <div id="tab-content">
         <!-- Settings Tab -->
         <div id="settings-content" class="tab-content hidden">
-          ${hasUserSettings ? renderSettingsTab(plugin) : ""}
+          ${hasUserSettings ? renderSettingsTab(plugin, settingsTabData) : ""}
         </div>
 
         <!-- Activity Tab -->
@@ -19646,10 +19679,14 @@ function renderToggleButton(plugin) {
   }
   return plugin.status === "active" ? `<button onclick="togglePlugin('${plugin.id}', 'deactivate')" class="bg-red-600 hover:bg-red-700 text-white px-4 py-2 rounded-lg text-sm font-medium transition-colors">Deactivate</button>` : `<button onclick="togglePlugin('${plugin.id}', 'activate')" class="bg-green-600 hover:bg-green-700 text-white px-4 py-2 rounded-lg text-sm font-medium transition-colors">Activate</button>`;
 }
-function renderSettingsTab(plugin) {
+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 = getPluginDefinition(pluginId);
+  if (pluginDef?.settingsTabContent) {
+    return pluginDef.settingsTabContent.render({ plugin, settings, data: settingsTabData });
+  }
   const customRenderer = pluginSettingsComponents[pluginId];
   if (customRenderer) {
     return `
@@ -19996,8 +20033,7 @@ function formatTimestamp(timestamp) {
 }
 var pluginSettingsComponents = {
   "otp-login": renderOTPLoginSettingsContent,
-  "email": renderEmailSettingsContent,
-  "oauth-providers": renderOAuthProvidersSettingsContent
+  "email": renderEmailSettingsContent
 };
 function renderOTPLoginSettingsContent(plugin, settings) {
   const siteName = settings.siteName || "SonicJS";
@@ -20720,99 +20756,157 @@ defineUserProfile({
     </div>
   `;
 }
-function renderOAuthProvidersSettingsContent(_plugin, settings) {
-  const providers = settings.providers || {};
-  const github = providers.github || {};
-  const google = providers.google || {};
-  const inputClass = "w-full px-3 py-2 rounded-lg bg-white/5 border border-white/10 focus:border-blue-500 focus:outline-none text-white";
-  function renderProviderCard(name, label, icon, data) {
-    const clientId = escapeHtmlAttr(data.clientId || "");
-    const clientSecret = escapeHtmlAttr(data.clientSecret || "");
-    const enabled = data.enabled === true;
-    return `
-      <div class="backdrop-blur-md bg-white/5 rounded-xl border border-white/10 p-6">
-        <div class="flex items-center justify-between mb-4">
-          <h3 class="text-lg font-semibold text-white flex items-center gap-2">
-            <span>${icon}</span> ${label}
-          </h3>
-          <label class="relative inline-flex items-center cursor-pointer">
-            <input type="checkbox" id="oauth_${name}_enabled" ${enabled ? "checked" : ""} class="sr-only peer">
-            <div class="w-11 h-6 bg-gray-600 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-800 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-blue-600"></div>
-            <span class="ml-2 text-sm text-gray-300">Enabled</span>
-          </label>
-        </div>
-        <div class="space-y-4">
-          <div>
-            <label for="oauth_${name}_clientId" class="block text-sm font-medium text-gray-300 mb-2">Client ID</label>
-            <input type="text" id="oauth_${name}_clientId" value="${clientId}" placeholder="${label} OAuth Client ID" class="${inputClass}">
-          </div>
-          <div>
-            <label for="oauth_${name}_clientSecret" class="block text-sm font-medium text-gray-300 mb-2">Client Secret</label>
-            <input type="password" id="oauth_${name}_clientSecret" value="${clientSecret}" placeholder="${label} OAuth Client Secret" class="${inputClass}">
-          </div>
-        </div>
-      </div>
-    `;
-  }
-  return `
-    <div class="space-y-6">
-      <div class="bg-blue-500/10 border border-blue-500/20 rounded-lg p-4">
-        <p class="text-blue-200 text-sm">
-          Configure OAuth provider credentials below. Credentials are stored securely and used server-side only.
-          Make sure to add the callback URL <code class="text-blue-300">/auth/oauth/[provider]/callback</code> to your OAuth app's allowed redirect URIs.
-        </p>
-      </div>
-
-      ${renderProviderCard("github", "GitHub", "\u{1F419}", github)}
-      ${renderProviderCard("google", "Google", "\u{1F535}", google)}
-    </div>
 
-    <script>
-      (function () {
-        const origSave = window.saveSettings;
-        window.saveSettings = async function () {
-          const settings = {
-            providers: {
-              github: {
-                clientId: document.getElementById('oauth_github_clientId').value,
-                clientSecret: document.getElementById('oauth_github_clientSecret').value,
-                enabled: document.getElementById('oauth_github_enabled').checked,
-              },
-              google: {
-                clientId: document.getElementById('oauth_google_clientId').value,
-                clientSecret: document.getElementById('oauth_google_clientSecret').value,
-                enabled: document.getElementById('oauth_google_enabled').checked,
-              },
-            }
-          };
-
-          const saveButton = document.getElementById('save-button');
-          saveButton.disabled = true;
-          saveButton.textContent = 'Saving...';
-
-          try {
-            const response = await fetch('/admin/plugins/oauth-providers/settings', {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify(settings),
-            });
-            const result = await response.json();
-            if (result.success) {
-              showNotification('Settings saved successfully', 'success');
-              setTimeout(() => location.reload(), 1000);
-            } else {
-              throw new Error(result.error || 'Failed to save settings');
-            }
-          } catch (error) {
-            showNotification(error.message, 'error');
-          } finally {
-            saveButton.disabled = false;
-            saveButton.textContent = 'Save Settings';
-          }
-        };
-      })();
-    </script>
-  `;
+// src/plugins/core-plugins/menu-plugin/services/menu-reconcile.ts
+async function upsertPluginRow(db, slug, entry, visible) {
+  const now = Math.floor(Date.now() / 1e3);
+  const existing = await db.prepare(
+    `SELECT id FROM documents
+       WHERE slug = ? AND type_id = 'menu_item' AND tenant_id = 'default'
+         AND is_current_draft = 1 AND deleted_at IS NULL`
+  ).bind(slug).first();
+  if (existing) {
+    await db.prepare(
+      `UPDATE documents
+         SET data = json_set(data, '$.url', ?, '$.pluginId', ?, '$.visible', ?),
+             visible = ?,
+             updated_at = ?
+         WHERE id = ? AND tenant_id = 'default'`
+    ).bind(entry.url, entry.pluginId, visible ? 1 : 0, visible ? 1 : 0, now, existing.id).run();
+    return;
+  }
+  const id = nanoid();
+  const data = JSON.stringify({
+    label: entry.label,
+    url: entry.url,
+    icon: entry.icon,
+    target: "_self",
+    isExternal: false,
+    visible,
+    parent: null,
+    source: "plugin",
+    pluginId: entry.pluginId,
+    permissions: [],
+    lockedFields: ["url"],
+    sortOrder: entry.sortOrder
+  });
+  await db.prepare(
+    `INSERT INTO documents (id, root_id, type_id, type_version, version_of_id, version_number,
+         is_current_draft, is_published, status, parent_root_id, slug, path, title, zone,
+         sort_order, visible, published_at, scheduled_at, expires_at, deleted_at,
+         tenant_id, locale, translation_group_id, data, metadata,
+         owner_id, created_by, updated_by, created_at, updated_at)
+       VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`
+  ).bind(
+    id,
+    id,
+    "menu_item",
+    1,
+    null,
+    1,
+    1,
+    0,
+    "draft",
+    "",
+    slug,
+    null,
+    entry.label,
+    null,
+    entry.sortOrder,
+    visible ? 1 : 0,
+    null,
+    null,
+    null,
+    null,
+    "default",
+    "default",
+    "",
+    data,
+    "{}",
+    null,
+    null,
+    null,
+    now,
+    now
+  ).run();
+}
+async function deactivateStalePluginRows(db, activePluginIds) {
+  const now = Math.floor(Date.now() / 1e3);
+  const rows = await db.prepare(
+    `SELECT id, data FROM documents
+       WHERE type_id = 'menu_item' AND tenant_id = 'default'
+         AND is_current_draft = 1 AND deleted_at IS NULL
+         AND json_extract(data, '$.source') = 'plugin'`
+  ).all();
+  const stale = (rows.results ?? []).filter((row) => {
+    let pluginId;
+    try {
+      pluginId = JSON.parse(row.data)?.pluginId;
+    } catch {
+      return false;
+    }
+    return pluginId !== void 0 && !activePluginIds.has(pluginId);
+  });
+  if (stale.length === 0) return;
+  await db.batch(
+    stale.map(
+      (row) => db.prepare(
+        `UPDATE documents
+           SET data = json_set(data, '$.visible', 0), visible = 0, updated_at = ?
+           WHERE id = ? AND tenant_id = 'default'`
+      ).bind(now, row.id)
+    )
+  );
+}
+async function fetchActivePluginIds(db) {
+  try {
+    const rows = await db.prepare(
+      `SELECT slug FROM documents
+         WHERE type_id = 'plugin' AND tenant_id = 'default'
+           AND is_current_draft = 1 AND deleted_at IS NULL
+           AND json_extract(data, '$.status') = 'active'`
+    ).all();
+    return new Set((rows.results ?? []).map((r) => r.slug));
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
+async function reconcileMenuFromPlugins(db) {
+  try {
+    const singletonEntries = getPluginMenu();
+    const manifestEntries = Object.values(PLUGIN_REGISTRY).filter(
+      (p) => p.adminMenu !== null
+    );
+    const byPluginId = /* @__PURE__ */ new Map();
+    manifestEntries.forEach((p, idx) => {
+      const menu = p.adminMenu;
+      byPluginId.set(p.id, {
+        pluginId: p.id,
+        label: menu.label,
+        url: menu.path,
+        icon: menu.icon,
+        sortOrder: 100 + idx * 10
+      });
+    });
+    singletonEntries.forEach((entry, idx) => {
+      const pathParts = entry.path.replace(/\/$/, "").split("/");
+      const pluginId = pathParts[pathParts.length - 1] || entry.label.toLowerCase().replace(/\s+/g, "-");
+      byPluginId.set(pluginId, {
+        pluginId,
+        label: entry.label,
+        url: entry.path,
+        icon: entry.icon ?? "puzzle-piece",
+        sortOrder: 100 + idx * 10
+      });
+    });
+    const activeIds = await fetchActivePluginIds(db);
+    for (const [pluginId, entry] of byPluginId) {
+      const slug = `menu:plugin:${pluginId}`;
+      await upsertPluginRow(db, slug, entry, activeIds.has(pluginId));
+    }
+    await deactivateStalePluginRows(db, activeIds);
+  } catch {
+  }
 }
 
 // src/routes/admin-plugins.ts
@@ -20847,9 +20941,11 @@ adminPluginRoutes.get("/", async (c) => {
     } catch (error) {
       console.error("Error loading plugins:", error);
     }
-    const installedPluginIds = new Set(installedPlugins.map((p) => p.id));
+    const registryIds = new Set(AVAILABLE_PLUGINS.map((p) => p.id));
+    const validInstalledPlugins = installedPlugins.filter((p) => registryIds.has(p.id));
+    const installedPluginIds = new Set(validInstalledPlugins.map((p) => p.id));
     const uninstalledPlugins = AVAILABLE_PLUGINS.filter((p) => !installedPluginIds.has(p.id));
-    const templatePlugins = installedPlugins.map((p) => ({
+    const templatePlugins = validInstalledPlugins.map((p) => ({
       id: p.id,
       name: p.name,
       displayName: p.display_name,
@@ -20885,7 +20981,7 @@ adminPluginRoutes.get("/", async (c) => {
     }));
     const allPlugins = [...templatePlugins, ...uninstalledTemplatePlugins];
     stats.uninstalled = uninstalledPlugins.length;
-    stats.total = installedPlugins.length + uninstalledPlugins.length;
+    stats.total = validInstalledPlugins.length + uninstalledPlugins.length;
     const pageData = {
       plugins: allPlugins,
       stats,
@@ -20984,6 +21080,15 @@ adminPluginRoutes.get("/:id", async (c) => {
       timestamp: item.timestamp,
       user: item.userId || null
     }));
+    const pluginDef = getPluginDefinition(pluginId);
+    let settingsTabData = void 0;
+    if (pluginDef?.settingsTabContent?.loadData) {
+      try {
+        settingsTabData = await pluginDef.settingsTabContent.loadData(db);
+      } catch (e) {
+        console.error(`settingsTabContent.loadData failed for plugin "${pluginId}":`, e);
+      }
+    }
     const pageData = {
       plugin: templatePlugin,
       activity: templateActivity,
@@ -20991,7 +21096,8 @@ adminPluginRoutes.get("/:id", async (c) => {
         name: user?.email || "User",
         email: user?.email || "",
         role: user?.role || "user"
-      }
+      },
+      settingsTabData
     };
     return c.html(renderPluginSettingsPage(pageData));
   } catch (error) {
@@ -21069,6 +21175,7 @@ adminPluginRoutes.post("/:id/activate", async (c) => {
     }
     const pluginService = new PluginService(db);
     await pluginService.activatePlugin(pluginId);
+    await reconcileMenuFromPlugins(db);
     return c.json({ success: true });
   } catch (error) {
     console.error("Error activating plugin:", error);
@@ -21086,6 +21193,7 @@ adminPluginRoutes.post("/:id/deactivate", async (c) => {
     }
     const pluginService = new PluginService(db);
     await pluginService.deactivatePlugin(pluginId);
+    await reconcileMenuFromPlugins(db);
     return c.json({ success: true });
   } catch (error) {
     console.error("Error deactivating plugin:", error);
@@ -27008,6 +27116,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, renderConfirmationDialog2 as renderConfirmationDialog, renderTable2 as renderTable, resolveDocScope, resolveVariablesInObject, router, router2, setEmailService, setVariablesCache, test_cleanup_default, userProfilesPlugin, userRoutes };
-//# sourceMappingURL=chunk-6KNTZ67K.js.map
-//# sourceMappingURL=chunk-6KNTZ67K.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-VC5XVPLM.js.map
+//# sourceMappingURL=chunk-VC5XVPLM.js.map