Merge pull request #983 from SonicJs-Org/lane711/v3-beta-issue-triage

fix: media count/search, create-folder, plugin sidebar/pruning, save-in-place, role sidebar, block IDs, wrangler config, field projection, docs types (#638 #639 #640 #642 #783 #831 #835 #888 #890 #928 #929 #931 #971 #970)

Author: lane711

my-sonicjs-app/package.json

@@ -13,7 +13,6 @@
     "deploy": "wrangler deploy",
     "db:migrate": "wrangler d1 migrations apply DB",
     "db:migrate:local": "wrangler d1 migrations apply DB --local",
-    "db:studio": "drizzle-kit studio",
     "type-check": "tsc --noEmit",
     "test": "vitest --run",
     "test:watch": "vitest",
@@ -36,8 +35,6 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250620.0",
     "@types/node": "^20.19.1",
-    "drizzle-kit": "^0.30.0",
-    "drizzle-orm": "^0.45.2",
     "hono": "^4.12.26",
     "typescript": "^5.8.3",
     "vitest": "^4.1.9",

my-sonicjs-app/scripts/generate-cron-triggers.ts

@@ -26,7 +26,18 @@ const allPlugins: Array<{ name?: string; crons?: Array<{ schedule: string }> }>
 
 const schedules = [...new Set(allPlugins.flatMap((p) => p.crons ?? []).map((c) => c.schedule))].sort()
 
-const wranglerPath = resolve(__dirname, '..', 'wrangler.toml')
+// Support wrangler.toml, wrangler.jsonc, or wrangler.json
+import { existsSync } from 'fs'
+const candidates = ['wrangler.toml', 'wrangler.jsonc', 'wrangler.json']
+const wranglerPath = candidates.map(f => resolve(__dirname, '..', f)).find(p => existsSync(p))
+if (!wranglerPath) {
+  console.error('[cron-triggers] No wrangler config found (wrangler.toml / wrangler.jsonc / wrangler.json)')
+  process.exit(1)
+}
+if (!wranglerPath.endsWith('.toml')) {
+  console.error('[cron-triggers] wrangler.jsonc/json detected — cron trigger codegen only supports wrangler.toml. Skipping.')
+  process.exit(0)
+}
 const current = readFileSync(wranglerPath, 'utf8')
 
 const isCheck = process.argv.includes('--check')

my-sonicjs-app/wrangler.toml

@@ -13,8 +13,8 @@ workers_dev = true
 # Note: database_name and database_id are automatically updated by GitHub Actions
 [[d1_databases]]
 binding = "DB"
-database_name = "sonicjs-worktree-lane711-menu-plugin-plan"
-database_id = "2bffa108-2c31-4710-9a04-8b4f97b16b72"
+database_name = "sonicjs-worktree-lane711-v3-beta-issue-triage"
+database_id = "02e853a0-e3cc-49fb-990e-2b679513f10a"
 migrations_dir = "./migrations"
 
 # R2 Bucket for media storage (using CI bucket)

packages/core/bin/db-reset.js

@@ -49,13 +49,16 @@ async function prompt(question) {
   });
 }
 
-function findWranglerToml() {
-  // Look for wrangler.toml in current directory or parent directories
+function findWranglerConfig() {
+  // Prefer wrangler.toml, then wrangler.jsonc, then wrangler.json
+  const candidates = ['wrangler.toml', 'wrangler.jsonc', 'wrangler.json'];
   let dir = process.cwd();
   for (let i = 0; i < 5; i++) {
-    const tomlPath = join(dir, 'wrangler.toml');
-    if (existsSync(tomlPath)) {
-      return { path: tomlPath, dir };
+    for (const filename of candidates) {
+      const configPath = join(dir, filename);
+      if (existsSync(configPath)) {
+        return { path: configPath, dir, format: filename.endsWith('.toml') ? 'toml' : 'json' };
+      }
     }
     dir = dirname(dir);
   }
@@ -66,16 +69,16 @@ async function main() {
   log('\n🔧 SonicJS Database Reset Tool', colors.cyan + colors.bold);
   log('================================\n', colors.cyan);
 
-  // Find wrangler.toml
-  const wranglerInfo = findWranglerToml();
+  // Find wrangler config (toml, jsonc, or json)
+  const wranglerInfo = findWranglerConfig();
   if (!wranglerInfo) {
-    log('Error: Could not find wrangler.toml in current or parent directories', colors.red);
+    log('Error: Could not find wrangler.toml / wrangler.jsonc / wrangler.json in current or parent directories', colors.red);
     log('Please run this command from your SonicJS project directory.', colors.yellow);
     process.exit(1);
   }
 
-  const { path: wranglerPath, dir: projectDir } = wranglerInfo;
-  log(`Found wrangler.toml at: ${wranglerPath}`, colors.green);
+  const { path: wranglerPath, dir: projectDir, format: wranglerFormat } = wranglerInfo;
+  log(`Found wrangler config at: ${wranglerPath}`, colors.green);
 
   // Change to project directory
   process.chdir(projectDir);
@@ -176,22 +179,36 @@ async function main() {
 
   log(`\nDatabase ID: ${dbId}`, colors.green);
 
-  // Update wrangler.toml with the new database ID
-  log('\nUpdating wrangler.toml...', colors.yellow);
+  // Update wrangler config with the new database ID
+  const configBasename = wranglerPath.split('/').pop();
+  log(`\nUpdating ${configBasename}...`, colors.yellow);
   try {
     let wranglerContent = readFileSync(wranglerPath, 'utf-8');
-    wranglerContent = wranglerContent.replace(
-      /database_id\s*=\s*"[^"]*"/,
-      `database_id = "${dbId}"`
-    );
-    wranglerContent = wranglerContent.replace(
-      /database_name\s*=\s*"[^"]*"/,
-      `database_name = "${dbName}"`
-    );
+    if (wranglerFormat === 'toml') {
+      // TOML syntax: database_id = "value"
+      wranglerContent = wranglerContent.replace(
+        /database_id\s*=\s*"[^"]*"/,
+        `database_id = "${dbId}"`
+      );
+      wranglerContent = wranglerContent.replace(
+        /database_name\s*=\s*"[^"]*"/,
+        `database_name = "${dbName}"`
+      );
+    } else {
+      // JSON/JSONC syntax: "database_id": "value"
+      wranglerContent = wranglerContent.replace(
+        /"database_id"\s*:\s*"[^"]*"/,
+        `"database_id": "${dbId}"`
+      );
+      wranglerContent = wranglerContent.replace(
+        /"database_name"\s*:\s*"[^"]*"/,
+        `"database_name": "${dbName}"`
+      );
+    }
     writeFileSync(wranglerPath, wranglerContent);
-    log('Updated wrangler.toml successfully', colors.green);
+    log(`Updated ${configBasename} successfully`, colors.green);
   } catch (error) {
-    log(`Error updating wrangler.toml: ${error.message}`, colors.red);
+    log(`Error updating ${configBasename}: ${error.message}`, colors.red);
     process.exit(1);
   }
 

packages/core/src/__tests__/utils/blocks.test.ts

@@ -25,7 +25,7 @@ describe('blocks utils', () => {
     })
   })
 
-  it('parses blocks JSON with discriminator key', () => {
+  it('parses blocks JSON with discriminator key and assigns stable blockId', () => {
     const config = {
       blocks: {
         text: { properties: { heading: { type: 'string' } } }
@@ -39,10 +39,31 @@ describe('blocks utils', () => {
     const parsed = parseBlocksValue(input, config)
 
     expect(parsed.errors).toEqual([])
-    expect(parsed.value).toEqual([{ blockType: 'text', heading: 'Hello' }])
+    expect(parsed.value).toHaveLength(1)
+    expect(parsed.value[0].blockType).toBe('text')
+    expect(parsed.value[0].heading).toBe('Hello')
+    expect(parsed.value[0].blockId).toMatch(/^blk_[0-9a-f]{12}$/)
   })
 
-  it('converts legacy blockType/data shape', () => {
+  it('preserves existing blockId on re-parse (reorder/edit)', () => {
+    const config = {
+      blocks: {
+        text: { properties: { heading: { type: 'string' } } }
+      },
+      discriminator: 'blockType'
+    }
+    const existingId = 'blk_aabbccddeeff'
+    const input = JSON.stringify([
+      { blockId: existingId, blockType: 'text', heading: 'Hello' }
+    ])
+
+    const parsed = parseBlocksValue(input, config)
+
+    expect(parsed.errors).toEqual([])
+    expect(parsed.value[0].blockId).toBe(existingId)
+  })
+
+  it('converts legacy blockType/data shape and assigns blockId', () => {
     const config = {
       blocks: {
         text: { properties: { heading: { type: 'string' } } }
@@ -56,7 +77,9 @@ describe('blocks utils', () => {
     const parsed = parseBlocksValue(input, config)
 
     expect(parsed.errors).toEqual([])
-    expect(parsed.value).toEqual([{ blockType: 'text', heading: 'Hello' }])
+    expect(parsed.value[0].blockType).toBe('text')
+    expect(parsed.value[0].heading).toBe('Hello')
+    expect(parsed.value[0].blockId).toMatch(/^blk_[0-9a-f]{12}$/)
   })
 
   it('reports errors for invalid JSON and missing discriminator', () => {
@@ -71,6 +94,6 @@ describe('blocks utils', () => {
     expect(invalidJson.errors).toEqual(['Blocks value must be valid JSON'])
 
     const missingDiscriminator = parseBlocksValue([{ heading: 'Hello' }], config)
-    expect(missingDiscriminator.errors).toEqual(['Block #1 is missing \"blockType\"'])
+    expect(missingDiscriminator.errors).toEqual(['Block #1 is missing "blockType"'])
   })
 })

packages/core/src/app.ts

@@ -678,7 +678,7 @@ export function createSonicJSApp(config: SonicJSConfig = {}): SonicJSApp {
     const userPlugins = (config.plugins?.register ?? []).filter(
       (p: any) => !PLUGIN_REGISTRY[p.id]
     )
-    setPluginMenu(userPlugins.flatMap((p: any) => (p.menu ?? [])))
+    setPluginMenu(userPlugins.flatMap((p: any) => (p.menu ?? []).map((m: any) => ({ ...m, pluginId: p.id }))))
     setPluginDefinitions(allMountedPlugins)
   }
 

packages/core/src/middleware/plugin-menu.ts

@@ -77,9 +77,9 @@ export function pluginMenuMiddleware() {
     }
 
     // Collect menu items from active plugins using the registry
+    const db = c.env.DB
     let activeMenuItems: Array<{ label: string; path: string; icon?: string; order: number }> = []
     try {
-      const db = c.env.DB
       const pluginIds = REGISTRY_MENU_PLUGINS.map(p => p.id)
       if (pluginIds.length > 0) {
         const placeholders = pluginIds.map(() => '?').join(',')
@@ -107,14 +107,34 @@ export function pluginMenuMiddleware() {
       // DB not ready or plugin table doesn't exist yet
     }
 
-    // Append user plugin menu items from the singleton.
-    // The singleton is populated with ONLY config.plugins.register entries (user plugins),
-    // so no DB active-check is needed — user plugins are always mounted when configured.
+    // Append user plugin menu items from the singleton (config.plugins.register entries).
+    // Must DB-check active status — a plugin disabled via the admin UI stays in config
+    // but its document record is set to inactive (issue #971).
     const user = c.get('user') as { role?: string } | undefined
     const singletonItems = resolvePluginMenuItems(user ? { role: user.role } : undefined)
+
+    // Collect unique pluginIds that have entries, query their active status in one shot.
+    const singletonPluginIds = [...new Set(
+      singletonItems.map(i => i.pluginId).filter((id): id is string => !!id)
+    )]
+    let activeSingletonIds = new Set<string>()
+    try {
+      if (singletonPluginIds.length > 0) {
+        const ph = singletonPluginIds.map(() => '?').join(',')
+        const result = await db.prepare(
+          `SELECT slug FROM documents WHERE type_id = 'plugin' AND tenant_id = 'default' AND slug IN (${ph}) AND q_plugin_status = 'active' AND is_current_draft = 1 AND deleted_at IS NULL`
+        ).bind(...singletonPluginIds).all()
+        activeSingletonIds = new Set((result.results || []).map((r: any) => r.slug))
+      }
+    } catch {
+      // DB not ready — fail open so singleton items without pluginId still render
+    }
+
     const existingPaths = new Set(activeMenuItems.map(i => i.path))
     for (const item of singletonItems) {
-      if (!existingPaths.has(item.path)) {
+      // If item has a pluginId, require it to be active; items without pluginId always show.
+      const isActive = !item.pluginId || activeSingletonIds.has(item.pluginId)
+      if (isActive && !existingPaths.has(item.path)) {
         activeMenuItems.push({ label: item.label, path: item.path, icon: item.icon, order: item.order })
       }
     }

packages/core/src/plugins/wire.ts

@@ -166,20 +166,79 @@ export async function wireRegisteredPlugins(
   // so the admin view stays in sync with what's actually running. Errors are
   // non-fatal — DB unavailable during cron-first boot should not break wiring.
   if (context.env?.DB) {
-    reflectWiredPlugins(valid, context.env.DB as D1DatabaseLike).catch((err) => {
+    const db = context.env.DB as D1DatabaseLike
+    reflectWiredPlugins(valid, db).catch((err) => {
       console.warn('[plugins] DB reflection failed (non-fatal):', err)
     })
+    // Phase D (best-effort): deactivate user plugins that were removed from config.
+    // Any non-core active plugin document not in the current wired list is stale.
+    pruneStaleUserPlugins(valid, db).catch((err) => {
+      console.warn('[plugins] Stale plugin pruning failed (non-fatal):', err)
+    })
   }
 
   return result
 }
 
 /** Minimal D1 interface needed for reflection (avoids a hard @cloudflare/workers-types dep). */
 interface D1DatabaseLike {
-  prepare(sql: string): { bind(...args: unknown[]): { run(): Promise<unknown> } }
+  prepare(sql: string): {
+    bind(...args: unknown[]): {
+      run(): Promise<unknown>
+      all(): Promise<{ results: Array<Record<string, unknown>> }>
+    }
+    all(): Promise<{ results: Array<Record<string, unknown>> }>
+  }
   batch(stmts: unknown[]): Promise<unknown>
 }
 
+/**
+ * Best-effort: deactivate non-core plugin documents whose plugin is no longer
+ * present in config.plugins.register. Runs after reflectWiredPlugins so the
+ * wired set is the authoritative "what's configured" list.
+ *
+ * Only touches documents where json_extract(data, '$.isCore') is falsy — core
+ * plugins bootstrapped by PluginBootstrapService are never pruned.
+ */
+async function pruneStaleUserPlugins(wired: WirablePlugin[], db: D1DatabaseLike): Promise<void> {
+  const wiredIds = new Set(wired.map(p => (p as any).id ?? p.name).filter(Boolean))
+  if (wiredIds.size === 0) return
+
+  const now = Math.floor(Date.now() / 1000)
+
+  // Find active non-core plugin documents whose slug is not in the wired set.
+  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 q_plugin_status = 'active'
+         AND (json_extract(data, '$.isCore') = 0 OR json_extract(data, '$.isCore') IS NULL)`
+    )
+    .all()
+
+  for (const row of rows.results ?? []) {
+    const slug = row.slug as string
+    if (!slug || wiredIds.has(slug)) continue
+    // Set status to inactive in the data JSON and update the generated column.
+    try {
+      await db
+        .prepare(
+          `UPDATE documents
+           SET data = json_set(data, '$.status', 'inactive'),
+               updated_at = ?
+           WHERE slug = ? AND type_id = 'plugin' AND tenant_id = 'default'
+             AND is_current_draft = 1 AND deleted_at IS NULL`
+        )
+        .bind(now, slug)
+        .run()
+      console.log(`[plugins] Deactivated stale plugin "${slug}" (removed from config)`)
+    } catch {
+      // Non-fatal per-row — continue with others
+    }
+  }
+}
+
 /**
  * Best-effort: register each wired plugin in the `plugins` table so the admin
  * can see and manage it. New plugins start as 'inactive' — an admin must

packages/core/src/routes/admin-content.ts

@@ -1412,10 +1412,33 @@ adminContentRoutes.put('/:id', async (c) => {
         else if (pub) await svc.unpublish(pub.id)
 
         await getCacheService(CACHE_CONFIGS.content!).invalidate(`content:list:*`)
+
+        const isHTMX = c.req.header('HX-Request') === 'true'
+        const referrerParams = formData.get('referrer_params') as string | null
+        const listUrl = referrerParams
+          ? `/admin/content?${referrerParams}`
+          : `/admin/content?collection=${dcoll.id}`
+
+        if (action === 'save_and_close') {
+          return isHTMX
+            ? c.text('', 200, { 'HX-Redirect': listUrl })
+            : c.redirect(listUrl)
+        }
+
+        // save / save_and_publish: stay on page, return inline success banner
+        if (isHTMX) {
+          const label = status === '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 redirectUrl = `/admin/content/${id}/edit?success=Content updated successfully!`
-        return c.req.header('HX-Request') === 'true'
-          ? c.text('', 200, { 'HX-Redirect': redirectUrl })
-          : c.redirect(redirectUrl)
+        return c.redirect(redirectUrl)
       }
     }