emdash 0.32.0 → 0.33.0

package/dist/astro/middleware.mjs

@@ -1,89 +1,90 @@
-import { a as runMigrations, n as MIGRATION_RACE_WAIT_MS, t as ConcurrentMigrationTimeoutError } from "../runner-BsI18UgP.mjs";
-import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
-import { c as isSqlite, l as listTablesLike } from "../dialect-helpers-DFwyWjTM.mjs";
+import { a as runMigrations, n as MIGRATION_RACE_WAIT_MS, t as ConcurrentMigrationTimeoutError } from "../runner-BFTrkYhu.mjs";
+import { c as isSqlite, u as listTablesLike } from "../dialect-helpers-BSbfaO3F.mjs";
 import { a as setI18nConfig, n as getI18nConfig } from "../config-DyF3OKg_.mjs";
-import { E as AuditRepository, _ as createHookPipeline, h as EmailPipeline, m as buildRouteMeta, p as PluginRouteRegistry, t as getMenu, v as resolveExclusiveHooks, y as definePlugin } from "../menus-C6qhqP4X.mjs";
-import { t as after } from "../after-B1IIdH3Y.mjs";
+import { D as AuditRepository, b as definePlugin, g as EmailPipeline, h as parseRouteInput, m as buildRouteMeta, p as PluginRouteRegistry, t as getMenu, v as createHookPipeline, y as resolveExclusiveHooks } from "../menus-Y54RDPIN.mjs";
+import { n as createDeferredTaskTracker, t as after } from "../after-CBU2vkoO.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
-import "../object-cache-Bok5j2ae.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "../content-CpfKV9QE.mjs";
+import { o as getLastContentWriteAt } from "../object-cache-71tPfV4A.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "../content-CJ94NEx5.mjs";
 import { n as isMissingTableError } from "../db-errors-CcWLaRiR.mjs";
 import "../base64-B-PsqheR.mjs";
-import "../types-XrQQ-Aex.mjs";
-import { t as MediaRepository } from "../media-tQDZEdu7.mjs";
-import "../user-BAumEmpA.mjs";
-import "../taxonomy-DvwWAPvA.mjs";
-import "../comment-DnTxxVHv.mjs";
-import { t as OptionsRepository } from "../options-BlmBHTvX.mjs";
-import { r as createSiteInfo } from "../context-kO4YZB03.mjs";
-import "../menus-BxPLFfIc.mjs";
-import "../redirect-BJ6d1yHh.mjs";
+import { t as ContentMutationConflictError } from "../types-Cd8iuS1J.mjs";
+import { t as MediaRepository } from "../media-BP7S-nHT.mjs";
+import "../user-DBrq4UVq.mjs";
+import "../taxonomy-pOrB2kZe.mjs";
+import "../comment-BIkJ6Fil.mjs";
+import { t as OptionsRepository } from "../options-CBXIHUoT.mjs";
+import { r as createSiteInfo } from "../context-C_1nrqnW.mjs";
+import "../menus-BcQWxeXu.mjs";
+import "../redirect-DIJxXKOG.mjs";
 import { i as setRequestCacheEntry, r as requestCached } from "../request-cache-BSUptuJR.mjs";
-import "../byline-registry-BCuOp4UF.mjs";
+import "../byline-registry-ZkPKqEwC.mjs";
 import { n as initWithLock, t as createInitLock } from "../init-lock-DJkX6Hto.mjs";
-import "../field-defs-cache-QMVnzTH6.mjs";
-import "../byline-C5TAqs8N.mjs";
-import "../relation-DJ5DZh7B.mjs";
+import "../field-defs-cache-WD82dMQq.mjs";
+import "../byline-Cp6csL84.mjs";
+import "../relation-Cbe3Sd3m.mjs";
 import { n as normalizeMediaValue } from "../normalize-C-SHXmra.mjs";
 import "../enrich-CFJJgxs_.mjs";
-import "../seo-BAPKiED8.mjs";
-import { t as FTSManager } from "../fts-manager-vncsZIJm.mjs";
-import "../resolve-BUvFE0Lr.mjs";
+import "../seo-DTHRntNC.mjs";
+import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-DW3w11Pu.mjs";
+import "../cache-C9FptTFR.mjs";
+import { t as FTSManager } from "../fts-manager-BITakW_R.mjs";
+import "../resolve-DZzG4HqM.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { a as getDb } from "../loader-C1XOLV5b.mjs";
-import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-B61CRSha.mjs";
-import { $ as handleContentDiscardDraft, B as handleMediaGet, G as handleRevisionRestore, H as handleMediaUpdate, J as handleContentCompare, Q as handleContentDelete, R as handleMediaCreate, U as handleRevisionGet, V as handleMediaList, W as handleRevisionList, X as handleContentCountTrashed, Y as handleContentCountScheduled, Z as handleContentCreate, _ as loadBundleFromR2, at as handleContentPermanentDelete, ct as handleContentSchedule, dt as handleContentUnschedule, et as handleContentDuplicate, ft as handleContentUpdate, it as handleContentListTrashed, lt as handleContentTranslations, nt as handleContentGetIncludingTrashed, ot as handleContentPublish, pt as validateRev, q as handleContentAuthors, rt as handleContentList, s as normalizeRegistryConfig, st as handleContentRestore, tt as handleContentGet, ut as handleContentUnpublish, z as handleMediaDelete } from "../api-DgPbMlng.mjs";
-import "../dashboard-DoBwPnON.mjs";
-import { r as hashString } from "../hash-Cb7U1b5M.mjs";
-import { a as findNonTranslatableSiblingContentIds, c as refreshContentMediaUsageAfterWrite, o as markContentMediaUsageCollectionStale, r as deleteContentMediaUsage } from "../content-refresh-DgqUBeTv.mjs";
-import "../media-usage-DPJcNaAq.mjs";
-import { n as SchemaRegistry } from "../registry-BP1JK2xh.mjs";
-import "../query-1xOcEy18.mjs";
-import "../zod-generator-DMzfga3g.mjs";
-import "../schema-eqZhkR0S.mjs";
-import "../seo-C3GDfT0V.mjs";
-import { t as PluginStateRepository } from "../state-xxv6ZTMv.mjs";
-import "../sections-DSuEfirn.mjs";
-import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-C2exrGAi.mjs";
-import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-DgKouY2S.mjs";
-import "../settings-CREKyj8I.mjs";
-import "../taxonomies-Dbdki3Un.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-bCq54i7F.mjs";
-import "../types-CK0LxPUQ.mjs";
-import "../ssrf-CviKqWmq.mjs";
-import "../error-DmmN74gW.mjs";
-import "../parse-BL49yb9D.mjs";
-import "../media-DWIzoVFL.mjs";
-import "../redirects-BOn2DIUs.mjs";
-import "../relations-C4duJnwI.mjs";
-import "../status-COfycGIU.mjs";
-import { a as invalidateUrlPatternCache } from "../query-DCiXI7OZ.mjs";
-import "../import-PKhLeXvn.mjs";
-import { t as getTrustedProxyHeaders } from "../trusted-proxy-CwjQj0YG.mjs";
-import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-DzXYYI-n.mjs";
-import "../ssrf-BB__xfNM.mjs";
-import { n as CronExecutor } from "../cron-BlKIMD_e.mjs";
-import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-C-9Ng8DM.mjs";
-import "../utils-BbUgmeZG.mjs";
-import "../tokens-DVltpO2D.mjs";
-import "../preview-D4Jnbfx7.mjs";
-import "../hreflang-Bg-zMpkr.mjs";
-import "../comment-reaction-BUlUz2bh.mjs";
-import "../bylines-B8-WGdja.mjs";
-import { n as getWidgetAreas } from "../widgets-L-VndTKD.mjs";
-import "../validate-Bs_wT2ul.mjs";
-import "../apply-1_6ra7NP.mjs";
-import "../load-BwTdWE8B.mjs";
-import "../search-CeO678cp.mjs";
+import { o as getDb } from "../loader-CGugY7Zl.mjs";
+import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-CLN1N92E.mjs";
+import { $ as handleContentDelete, B as handleMediaDelete, G as handleRevisionList, H as handleMediaList, J as handleContentAuthors, K as handleRevisionRestore, Q as handleContentCreate, U as handleMediaUpdate, V as handleMediaGet, W as handleRevisionGet, X as handleContentCountScheduled, Y as handleContentCompare, Z as handleContentCountTrashed, _ as loadBundleFromR2, at as handleContentListTrashed, ct as handleContentRestore, dt as handleContentUnpublish, et as handleContentDiscardDraft, ft as handleContentUnschedule, it as handleContentList, lt as handleContentSchedule, mt as validateRev, nt as handleContentGet, ot as handleContentPermanentDelete, pt as handleContentUpdate, rt as handleContentGetIncludingTrashed, s as normalizeRegistryConfig, st as handleContentPublish, tt as handleContentDuplicate, ut as handleContentTranslations, v as syncDeclaredStorageIndexes, z as handleMediaCreate } from "../api-D2hunekQ.mjs";
+import "../dashboard-DINnNVVU.mjs";
+import { r as hashString } from "../hash-Cg0TXJPV.mjs";
+import { a as findNonTranslatableSiblingContentIds, c as refreshContentMediaUsageAfterWrite, g as MediaUsageRepository, o as markContentMediaUsageCollectionStale, r as deleteContentMediaUsage } from "../content-refresh-Xw7aKmou.mjs";
+import "../media-usage-BlxfTkN0.mjs";
+import { n as SchemaRegistry } from "../registry-Dbodb4Uo.mjs";
+import "../query-rC9HKv1N.mjs";
+import "../zod-generator-CG64Hnbh.mjs";
+import "../schema-CiQXr6_F.mjs";
+import "../seo-CobNfOvb.mjs";
+import { t as PluginStateRepository } from "../state-CQvoefYP.mjs";
+import "../sections-BrIrMUCn.mjs";
+import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-kJhGiQ4z.mjs";
+import "../settings-DPHau-WH.mjs";
+import "../taxonomies-CKuaZER5.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-Da7kj23y.mjs";
+import "../types-DKuWPYV5.mjs";
+import "../ssrf-CTa6v21i.mjs";
+import "../error-oh_9i6bR.mjs";
+import "../parse-CJKNuewM.mjs";
+import "../media-OhYL-7Io.mjs";
+import "../redirects-G8wAhWAf.mjs";
+import "../relations-Bw_E1TXo.mjs";
+import "../status-CIsmlC1E.mjs";
+import { a as invalidateUrlPatternCache } from "../query-C5w7PsRQ.mjs";
+import "../import-C-9uqyT3.mjs";
+import { t as getTrustedProxyHeaders } from "../trusted-proxy-D20_7fyX.mjs";
+import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-Df-jFbAd.mjs";
+import "../ssrf-Cj568Dgs.mjs";
+import { n as CronExecutor } from "../cron-DRV-UC4K.mjs";
+import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-C6WdcWbL.mjs";
+import "../utils-hLzi_2Fn.mjs";
+import "../tokens-DagaJGK8.mjs";
+import "../preview-BU6PaLpM.mjs";
+import "../hreflang-BdZuVBhL.mjs";
+import "../comment-reaction-D-laEceb.mjs";
+import "../bylines-CEj5CdT4.mjs";
+import { n as getWidgetAreas } from "../widgets-CJJtkiKh.mjs";
+import "../validate-mKo3RxBM.mjs";
+import "../apply-kwNEJW2l.mjs";
+import "../load-DV1DZuUJ.mjs";
+import "../search-FZhx5dDU.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-Bdfb34kk.mjs";
-import { t as getAuthMode } from "../mode-fiXRMfeA.mjs";
-import "../snapshot-BdpUJKD-.mjs";
-import { u as maybeRunScheduledBackup } from "../backup-LpQ1V_sR.mjs";
-import { t as cleanupExpiredChallenges } from "../challenge-store-BFzgFRog.mjs";
-import { t as removeUploadAttempt } from "../upload-attempts-C5yd6Gae.mjs";
-import { a as validateEncryptionKeyAtStartup } from "../secrets-870d-7yA.mjs";
-import { t as resolveSessionUser } from "../session-user-BrK2zz7S.mjs";
+import { n as VERSION, t as COMMIT } from "../version-C4PnpmoV.mjs";
+import { t as getAuthMode } from "../mode-BWyTBe3I.mjs";
+import "../snapshot-I_fjLDaD.mjs";
+import { u as maybeRunScheduledBackup } from "../backup-CtA6LDNw.mjs";
+import { t as cleanupExpiredChallenges } from "../challenge-store-D9VNKELo.mjs";
+import { t as removeUploadAttempt } from "../upload-attempts-D8QAFLUJ.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-DLd8RXee.mjs";
+import { isRecord } from "../plugin-utils.mjs";
+import { t as resolveSessionUser } from "../session-user-BvM9-zNl.mjs";
 import { Kysely, sql } from "kysely";
 import { z } from "zod";
 import { Permissions } from "@emdash-cms/auth";
@@ -153,6 +154,34 @@ function createSandboxRunnerOptions(options, siteInfo) {
 	};
 }
 
+//#endregion
+//#region src/media/usage/gc.ts
+/**
+* Only rows older than this are collected. Guarded writers insert occurrence
+* rows before winning the source CAS, so the window must exceed any plausible
+* in-flight write; mirrors the pending-upload abandonment window.
+*/
+const GC_MAX_AGE_MS = 3600 * 1e3;
+/**
+* Per-tick cap on rows considered by each GC method, so a large backlog is
+* amortized across ticks instead of one oversized batch (D1 bind limits).
+*/
+const GC_BATCH_LIMIT = 500;
+/**
+* Delete media-usage occurrence rows that can no longer be read: superseded
+* generations, generations abandoned by losing CAS writers, and occurrences
+* whose source row is gone.
+*/
+async function cleanupMediaUsageGenerations(db) {
+	const cutoff = new Date(Date.now() - GC_MAX_AGE_MS).toISOString();
+	const repo = new MediaUsageRepository(db);
+	return {
+		staleGenerations: await repo.deleteStaleGenerationsOlderThan(cutoff, GC_BATCH_LIMIT),
+		abandonedGenerations: await repo.deleteAbandonedGenerationsOlderThan(cutoff, GC_BATCH_LIMIT),
+		orphanOccurrences: await repo.deleteOrphanOccurrencesOlderThan(cutoff, GC_BATCH_LIMIT)
+	};
+}
+
 //#endregion
 //#region src/cleanup.ts
 /**
@@ -165,15 +194,13 @@ function createSandboxRunnerOptions(options, siteInfo) {
 * Each subsystem cleanup is independent and non-fatal -- if one fails, the
 * rest still run. Failures are logged but never surface to callers.
 */
-/** Max revisions to keep per entry during periodic pruning */
 const REVISION_KEEP_COUNT = 50;
-/** Only prune entries that exceed this threshold */
-const REVISION_PRUNE_THRESHOLD = REVISION_KEEP_COUNT;
+const REVISION_PRUNE_BATCH_SIZE = 10;
 /**
 * Run all system cleanup tasks.
 *
-* Safe to call frequently -- each task is a single DELETE with a WHERE clause,
-* so repeated calls with nothing to clean are cheap (no-op queries).
+* Safe to call frequently -- each subsystem tolerates repeated calls, and
+* repeated calls with nothing to clean are cheap.
 *
 * @param db - The database instance
 * @param storage - Optional storage backend for deleting orphaned files.
@@ -187,7 +214,10 @@ async function runSystemCleanup(db, storage) {
 		pendingUploads: -1,
 		pendingUploadFiles: -1,
 		uploadAttempts: -1,
-		revisionsPruned: -1
+		revisionsPruned: -1,
+		mediaUsageStaleGenerations: -1,
+		mediaUsageAbandonedGenerations: -1,
+		mediaUsageOrphanOccurrences: -1
 	};
 	try {
 		result.challenges = await cleanupExpiredChallenges(db);
@@ -230,29 +260,26 @@ async function runSystemCleanup(db, storage) {
 		console.error("[cleanup] Failed to clean media upload attempts:", error);
 	}
 	try {
-		result.revisionsPruned = await pruneExcessiveRevisions(db);
+		result.revisionsPruned = await pruneQueuedRevisions(db);
 	} catch (error) {
 		console.error("[cleanup] Failed to prune revisions:", error);
 	}
+	try {
+		const usage = await cleanupMediaUsageGenerations(db);
+		result.mediaUsageStaleGenerations = usage.staleGenerations;
+		result.mediaUsageAbandonedGenerations = usage.abandonedGenerations;
+		result.mediaUsageOrphanOccurrences = usage.orphanOccurrences;
+	} catch (error) {
+		console.error("[cleanup] Failed to clean media-usage generations:", error);
+	}
 	return result;
 }
-/**
-* Find entries with more than REVISION_PRUNE_THRESHOLD revisions and prune
-* them down to REVISION_KEEP_COUNT.
-*/
-async function pruneExcessiveRevisions(db) {
-	const entries = await sql`
-		SELECT collection, entry_id
-		FROM revisions
-		GROUP BY collection, entry_id
-		HAVING COUNT(*) > ${REVISION_PRUNE_THRESHOLD}
-	`.execute(db);
-	if (entries.rows.length === 0) return 0;
+async function pruneQueuedRevisions(db) {
+	const queued = await db.selectFrom("_emdash_revision_prune_queue").selectAll().orderBy("revision_id").limit(REVISION_PRUNE_BATCH_SIZE).execute();
 	const revisionRepo = new RevisionRepository(db);
 	let totalPruned = 0;
-	for (const row of entries.rows) try {
-		const pruned = await revisionRepo.pruneOldRevisions(row.collection, row.entry_id, REVISION_KEEP_COUNT);
-		totalPruned += pruned;
+	for (const row of queued) try {
+		totalPruned += await revisionRepo.pruneQueuedEntry(row.collection, row.entry_id, row.revision_id, REVISION_KEEP_COUNT);
 	} catch (error) {
 		console.error(`[cleanup] Failed to prune revisions for ${row.collection}/${row.entry_id}:`, error);
 	}
@@ -330,7 +357,8 @@ async function publishDueContent(db, options = {}) {
 			const publishedAt = item.publishedAt == null ? item.scheduledAt ?? void 0 : void 0;
 			const result = await doPublish(collection.slug, item.id, {
 				publishedAt,
-				requireScheduledDue: true
+				requireScheduledDue: true,
+				expectedScheduledAt: item.scheduledAt ?? void 0
 			});
 			if (result.success) batch.push({
 				collection: collection.slug,
@@ -440,6 +468,7 @@ const DRAFT_ONLY_UPDATE_KEYS = new Set([
 	"locale",
 	"skipRevision"
 ]);
+const MAX_DRAFT_STAGE_ATTEMPTS = 32;
 /**
 * Convert a ContentItem to Record<string, unknown> for hook consumption.
 * Hooks receive the full item as a flat record.
@@ -574,6 +603,8 @@ var EmDashRuntime = class EmDashRuntime {
 	/** All plugins eligible for the hook pipeline (includes built-in plugins).
 	*  Stored so we can rebuild the pipeline when plugins are enabled/disabled. */
 	allPipelinePlugins;
+	/** Guards the once-per-process plugin storage-index sync. */
+	storageIndexesSynced = false;
 	/** Factory options for the hook pipeline context factory */
 	pipelineFactoryOptions;
 	/** Dependencies needed for exclusive hook resolution */
@@ -675,10 +706,26 @@ var EmDashRuntime = class EmDashRuntime {
 		} catch (error) {
 			console.error("[cleanup] System cleanup failed:", error);
 		}
+		try {
+			await this.syncPluginStorageIndexesOnce();
+		} catch (error) {
+			console.error("[plugins] Storage index sync failed:", error);
+		}
 		await maybeRunScheduledBackup(this.db, this.storage ?? void 0);
 		return { published };
 	}
 	/**
+	* Materialize plugin-declared storage indexes, once per process.
+	*
+	* Called from the scheduler path, not from request handlers — configured
+	* plugins have no install handler, so the tick is their only sync moment.
+	*/
+	async syncPluginStorageIndexesOnce() {
+		if (this.storageIndexesSynced) return;
+		this.storageIndexesSynced = true;
+		await syncDeclaredStorageIndexes(this.db, [...this.allPipelinePlugins, ...marketplaceManifestCache.values()]);
+	}
+	/**
 	* Stop the cron scheduler gracefully.
 	* Call during worker shutdown or hot-reload.
 	*/
@@ -819,7 +866,8 @@ var EmDashRuntime = class EmDashRuntime {
 					id: bundle.manifest.id,
 					version: bundle.manifest.version,
 					admin: bundle.manifest.admin,
-					mcp: bundle.manifest.mcp
+					mcp: bundle.manifest.mcp,
+					storage: bundle.manifest.storage
 				});
 				if (bundle.manifest.routes.length > 0) {
 					const routeMetaMap = /* @__PURE__ */ new Map();
@@ -904,7 +952,8 @@ var EmDashRuntime = class EmDashRuntime {
 					id: bundle.manifest.id,
 					version: bundle.manifest.version,
 					admin: bundle.manifest.admin,
-					mcp: bundle.manifest.mcp
+					mcp: bundle.manifest.mcp,
+					storage: bundle.manifest.storage
 				});
 				if (bundle.manifest.routes.length > 0) {
 					const routeMetaMap = /* @__PURE__ */ new Map();
@@ -1047,9 +1096,9 @@ var EmDashRuntime = class EmDashRuntime {
 			const seedHolder = getSeedHolder();
 			try {
 				await initWithLock(seedHolder.lock, () => seedHolder.done.has(seedKey) ? true : void 0, async () => {
-					const { applySeed } = await import("../apply-1_6ra7NP.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-BwTdWE8B.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-Bs_wT2ul.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-kwNEJW2l.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-DV1DZuUJ.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-mKo3RxBM.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -1192,6 +1241,11 @@ var EmDashRuntime = class EmDashRuntime {
 						} catch (error) {
 							console.error("[cleanup] System cleanup failed:", error);
 						}
+						try {
+							await runtimeRef.current?.syncPluginStorageIndexesOnce();
+						} catch (error) {
+							console.error("[plugins] Storage index sync failed:", error);
+						}
 						await maybeRunScheduledBackup(db, storage ?? void 0);
 					});
 					scheduler.start();
@@ -1379,14 +1433,22 @@ var EmDashRuntime = class EmDashRuntime {
 					capabilities: entry.capabilities ?? [],
 					allowedHosts: entry.allowedHosts ?? [],
 					storage: entry.storage ?? {},
-					hooks: [],
-					routes: [],
+					hooks: entry.hooks ?? [],
+					routes: entry.routes ?? [],
 					admin: {},
 					mcp: entry.mcp
 				};
 				const plugin = await sandboxRunner.load(manifest, entry.code);
 				sandboxedPluginCache.set(pluginKey, plugin);
 				console.log(`EmDash: Loaded sandboxed plugin ${pluginKey} with capabilities: [${manifest.capabilities.join(", ")}]`);
+				if (manifest.routes.length > 0) {
+					const routeMetaMap = /* @__PURE__ */ new Map();
+					for (const routeEntry of manifest.routes) {
+						const normalized = normalizeManifestRoute(routeEntry);
+						routeMetaMap.set(normalized.name, buildRouteMeta(normalized));
+					}
+					sandboxedRouteMetaCache.set(entry.id, routeMetaMap);
+				} else sandboxedRouteMetaCache.delete(entry.id);
 			} catch (error) {
 				console.error(`EmDash: Failed to load sandboxed plugin ${entry.id}:`, error);
 			}
@@ -1443,7 +1505,8 @@ var EmDashRuntime = class EmDashRuntime {
 						id: bundle.manifest.id,
 						version: bundle.manifest.version,
 						admin: bundle.manifest.admin,
-						mcp: bundle.manifest.mcp
+						mcp: bundle.manifest.mcp,
+						storage: bundle.manifest.storage
 					});
 					if (bundle.manifest.routes.length > 0) {
 						const routeMeta = /* @__PURE__ */ new Map();
@@ -1493,7 +1556,8 @@ var EmDashRuntime = class EmDashRuntime {
 						id: bundle.manifest.id,
 						version: bundle.manifest.version,
 						admin: bundle.manifest.admin,
-						mcp: bundle.manifest.mcp
+						mcp: bundle.manifest.mcp,
+						storage: bundle.manifest.storage
 					});
 					if (bundle.manifest.routes.length > 0) {
 						const routeMeta = /* @__PURE__ */ new Map();
@@ -1615,6 +1679,7 @@ var EmDashRuntime = class EmDashRuntime {
 					supports: collection.supports || [],
 					hasSeo: collection.hasSeo,
 					urlPattern: collection.urlPattern,
+					...collection.hidden ? { hidden: true } : {},
 					fields
 				};
 			}
@@ -1809,7 +1874,7 @@ var EmDashRuntime = class EmDashRuntime {
 		if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(body.data, collection, true)).content;
 		processedData = await this.runSandboxedBeforeSave(processedData, collection, true);
 		processedData = await this.normalizeMediaFields(collection, processedData);
-		const { validateContentData } = await import("../validation-BngR0nit.mjs");
+		const { validateContentData } = await import("../validation-BgpucsvF.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1826,7 +1891,6 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-CpfKV9QE.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id, body.locale);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1853,7 +1917,7 @@ var EmDashRuntime = class EmDashRuntime {
 			if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(bodyWithoutRev.data, collection, false)).content;
 			processedData = await this.runSandboxedBeforeSave(processedData, collection, false);
 			processedData = await this.normalizeMediaFields(collection, processedData);
-			const { validateContentData } = await import("../validation-BngR0nit.mjs");
+			const { validateContentData } = await import("../validation-BgpucsvF.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -1862,12 +1926,12 @@ var EmDashRuntime = class EmDashRuntime {
 		}
 		let usesDraftRevisions = false;
 		let draftStorageChanged = false;
-		if (processedData) try {
+		if (processedData) {
 			if ((await this.schemaRegistry.getCollectionWithFields(collection))?.supports?.includes("revisions")) {
 				usesDraftRevisions = true;
 				const revisionRepo = new RevisionRepository(this.db);
-				const existing = await repo.findById(collection, resolvedId);
-				if (existing) {
+				let existing = await repo.findById(collection, resolvedId);
+				for (let attempt = 0; existing && attempt < MAX_DRAFT_STAGE_ATTEMPTS; attempt++) {
 					let baseData;
 					if (existing.draftRevisionId) baseData = (await revisionRepo.findById(existing.draftRevisionId))?.data ?? existing.data;
 					else baseData = existing.data;
@@ -1876,37 +1940,64 @@ var EmDashRuntime = class EmDashRuntime {
 						...processedData
 					};
 					if (bodyWithoutRev.slug !== void 0) mergedData._slug = bodyWithoutRev.slug;
-					if (bodyWithoutRev.skipRevision && existing.draftRevisionId) {
-						await revisionRepo.updateData(existing.draftRevisionId, mergedData);
-						draftStorageChanged = true;
-					} else {
-						const revision = await revisionRepo.create({
-							collection,
-							entryId: resolvedId,
-							data: mergedData,
-							authorId: bodyWithoutRev.authorId ?? void 0
-						});
-						validateIdentifier(collection, "collection");
-						const tableName = `ec_${collection}`;
-						await sql`
-								UPDATE ${sql.ref(tableName)}
-								SET draft_revision_id = ${revision.id}
-								WHERE id = ${resolvedId}
-							`.execute(this.db);
-						draftStorageChanged = true;
-						revisionRepo.pruneOldRevisions(collection, resolvedId, 50).catch(() => {});
+					const revision = await revisionRepo.create({
+						collection,
+						entryId: resolvedId,
+						data: mergedData,
+						authorId: bodyWithoutRev.authorId ?? void 0
+					});
+					let staged;
+					try {
+						staged = await repo.replaceDraftRevision(collection, resolvedId, revision.id, existing);
+					} catch (error) {
+						try {
+							await revisionRepo.deleteIfUnreferenced(collection, resolvedId, revision.id);
+						} catch (cleanupError) {
+							console.error(`[emdash] Failed to clean up unstaged revision ${revision.id}:`, cleanupError);
+						}
+						throw error;
+					}
+					if (!staged) {
+						try {
+							await revisionRepo.deleteIfUnreferenced(collection, resolvedId, revision.id);
+						} catch (cleanupError) {
+							console.error(`[emdash] Failed to clean up unstaged revision ${revision.id}:`, cleanupError);
+						}
+						if (body._rev || attempt === MAX_DRAFT_STAGE_ATTEMPTS - 1) return {
+							success: false,
+							error: {
+								code: "CONFLICT",
+								message: new ContentMutationConflictError().message
+							}
+						};
+						existing = await repo.findById(collection, resolvedId);
+						continue;
 					}
+					draftStorageChanged = true;
+					if (bodyWithoutRev.skipRevision && existing.draftRevisionId) try {
+						await revisionRepo.deleteIfUnreferenced(collection, resolvedId, existing.draftRevisionId);
+					} catch (error) {
+						console.error(`[emdash] Failed to clean up superseded revision ${existing.draftRevisionId}:`, error);
+					}
+					else after(async () => {
+						try {
+							await revisionRepo.pruneQueuedEntry(collection, resolvedId, revision.id, 50);
+						} catch (error) {
+							console.error(`[revisions] Failed to prune revisions for ${collection}/${resolvedId}:`, error);
+						}
+					});
+					break;
 				}
 			}
-		} catch {}
-		const result = await handleContentUpdate(this.db, collection, resolvedId, {
+		}
+		const liveMetaTouched = Object.entries(bodyWithoutRev).some(([key, value]) => value !== void 0 && !DRAFT_ONLY_UPDATE_KEYS.has(key));
+		const result = usesDraftRevisions && !liveMetaTouched ? await handleContentGet(this.db, collection, resolvedId) : await handleContentUpdate(this.db, collection, resolvedId, {
 			...bodyWithoutRev,
 			data: usesDraftRevisions ? void 0 : processedData,
 			slug: usesDraftRevisions ? void 0 : bodyWithoutRev.slug,
 			authorId: bodyWithoutRev.authorId,
 			bylines: bodyWithoutRev.bylines
 		});
-		const liveMetaTouched = Object.entries(bodyWithoutRev).some(([key, value]) => value !== void 0 && !DRAFT_ONLY_UPDATE_KEYS.has(key));
 		const liveContentChanged = usesDraftRevisions ? liveMetaTouched : Boolean(processedData || bodyWithoutRev.slug !== void 0 || liveMetaTouched);
 		const hydrated = await this.hydrateDraftData(result);
 		if (hydrated.success && hydrated.data) {
@@ -2086,25 +2177,50 @@ var EmDashRuntime = class EmDashRuntime {
 			return this.hydrateDraftData(result);
 		}
 		try {
+			const contentRepo = new ContentRepository(this.db);
+			const existing = await contentRepo.findById(revision.collection, revision.entryId);
+			if (!existing) return {
+				success: false,
+				error: {
+					code: "NOT_FOUND",
+					message: `Content item not found: ${revision.entryId}`
+				}
+			};
 			const newDraft = await revisionRepo.create({
 				collection: revision.collection,
 				entryId: revision.entryId,
 				data: revision.data,
 				authorId: callerUserId
 			});
-			validateIdentifier(revision.collection, "collection");
-			const tableName = `ec_${revision.collection}`;
-			await sql`
-				UPDATE ${sql.ref(tableName)}
-				SET draft_revision_id = ${newDraft.id}
-				WHERE id = ${revision.entryId}
-			`.execute(this.db);
-			revisionRepo.pruneOldRevisions(revision.collection, revision.entryId, 50).catch(() => {});
+			try {
+				if (!await contentRepo.replaceDraftRevision(revision.collection, revision.entryId, newDraft.id, existing)) throw new ContentMutationConflictError();
+			} catch (error) {
+				try {
+					await revisionRepo.deleteIfUnreferenced(revision.collection, revision.entryId, newDraft.id);
+				} catch (cleanupError) {
+					console.error(`[emdash] Failed to clean up unrestored revision ${newDraft.id}:`, cleanupError);
+				}
+				throw error;
+			}
+			after(async () => {
+				try {
+					await revisionRepo.pruneQueuedEntry(revision.collection, revision.entryId, newDraft.id, 50);
+				} catch (error) {
+					console.error(`[revisions] Failed to prune revisions for ${revision.collection}/${revision.entryId}:`, error);
+				}
+			});
 			const refetched = await handleContentGet(this.db, revision.collection, revision.entryId);
 			const hydrated = await this.hydrateDraftData(refetched);
 			if (hydrated.success) await this.refreshContentUsageAfterSuccessfulWrite(revision.collection, [revision.entryId]);
 			return hydrated;
 		} catch (error) {
+			if (error instanceof ContentMutationConflictError) return {
+				success: false,
+				error: {
+					code: "CONFLICT",
+					message: error.message
+				}
+			};
 			console.error("[emdash] revision restore failed:", error);
 			return {
 				success: false,
@@ -2187,10 +2303,7 @@ var EmDashRuntime = class EmDashRuntime {
 			});
 			routeRegistry.register(trustedPlugin);
 			const routeKey = path.replace(LEADING_SLASH_PATTERN, "");
-			let body = void 0;
-			try {
-				body = await request.json();
-			} catch {}
+			const body = await parseRouteInput(request);
 			return routeRegistry.invoke(pluginId, routeKey, {
 				request,
 				body
@@ -2332,7 +2445,8 @@ var EmDashRuntime = class EmDashRuntime {
 		}
 		if (!collectionInfo?.fields) return data;
 		const imageFields = collectionInfo.fields.filter((f) => f.type === "image" || f.type === "file");
-		if (imageFields.length === 0) return data;
+		const repeaterFields = collectionInfo.fields.filter((f) => f.type === "repeater" && Array.isArray(f.validation?.subFields));
+		if (imageFields.length === 0 && repeaterFields.length === 0) return data;
 		const getProvider = (id) => this.getMediaProvider(id);
 		const result = { ...data };
 		for (const field of imageFields) {
@@ -2343,6 +2457,26 @@ var EmDashRuntime = class EmDashRuntime {
 				if (normalized) result[field.slug] = normalized;
 			} catch {}
 		}
+		for (const field of repeaterFields) {
+			const value = result[field.slug];
+			if (!Array.isArray(value)) continue;
+			const mediaSubFieldSlugs = (field.validation?.subFields ?? []).filter((sub) => sub.type === "image").map((sub) => sub.slug);
+			if (mediaSubFieldSlugs.length === 0) continue;
+			const items = value;
+			result[field.slug] = await Promise.all(items.map(async (item) => {
+				if (!isRecord(item)) return item;
+				const normalizedItem = { ...item };
+				for (const slug of mediaSubFieldSlugs) {
+					const subValue = normalizedItem[slug];
+					if (subValue == null) continue;
+					try {
+						const normalized = await normalizeMediaValue(subValue, getProvider);
+						if (normalized) normalizedItem[slug] = normalized;
+					} catch {}
+				}
+				return normalizedItem;
+			}));
+		}
 		return result;
 	}
 	async runSandboxedBeforeSave(content, collection, isNew) {
@@ -2493,10 +2627,7 @@ var EmDashRuntime = class EmDashRuntime {
 	}
 	async handleSandboxedRoute(plugin, path, request) {
 		const routeName = path.replace(LEADING_SLASH_PATTERN, "");
-		let body = void 0;
-		try {
-			body = await request.json();
-		} catch {}
+		const body = await parseRouteInput(request);
 		try {
 			const headers = sanitizeHeadersForSandbox(request.headers);
 			const meta = extractRequestMeta(request, this.config);
@@ -2629,6 +2760,26 @@ function createPublicMediaUrlResolver(storage) {
 * middleware.ts.
 */
 const ASTRO_COOKIES_SYMBOL = Symbol.for("astro.cookies");
+/** Hold the real adapter close behind both response and deferred-task completion. */
+function coordinateScopedDbLifecycle(scoped) {
+	if (!scoped.close) return { lifecycle: scoped };
+	const close = scoped.close;
+	const deferredTasks = createDeferredTaskTracker(() => {
+		try {
+			close();
+		} catch (error) {
+			console.error("[emdash] request-scoped db close failed:", error);
+		}
+	});
+	return {
+		closed: deferredTasks.settled,
+		deferredTasks,
+		lifecycle: {
+			commit: scoped.commit,
+			close: deferredTasks.settle
+		}
+	};
+}
 /**
 * Run a request-scoped db's `close()` once the response body has finished
 * streaming. Astro streams HTML and components issue DB queries during that
@@ -2668,9 +2819,9 @@ function wrapResponseForScopedClose(response, close) {
 * Run the request body under a request-scoped db, then settle its lifecycle:
 * `commit()` runs before the response is returned (so per-request state like a
 * D1 bookmark cookie is persisted in the headers, even if render throws), while
-* `close()` (if any) is deferred to stream-end so a connection-backed adapter
-* isn't torn down mid-render. On error the connection is closed immediately
-* before rethrowing so it never leaks.
+* `close()` (if any) is deferred to lifecycle settlement so a
+* connection-backed adapter isn't torn down mid-render or mid-task. On error
+* the lifecycle is settled before rethrowing so it never leaks.
 *
 * On the error path both `commit()` and `close()` are defended: a throw from
 * either is logged and swallowed so it can't replace the propagating render
@@ -3079,32 +3230,37 @@ async function runOutsideRequest(config, fn) {
 		config: config.database?.config,
 		isAuthenticated: false,
 		isWrite: true,
+		canUseCachedBinding: false,
 		cookies: NOOP_COOKIE_JAR,
 		url: CRON_EVENT_URL
 	});
 	if (!scoped?.close) return fn(runtime);
+	const { closed, deferredTasks, lifecycle } = coordinateScopedDbLifecycle(scoped);
 	const parent = getRequestContext();
 	const ctx = parent ? {
 		...parent,
-		db: scoped.db
+		db: scoped.db,
+		deferredTasks
 	} : {
 		editMode: false,
 		db: scoped.db,
-		metrics: createRequestMetrics(performance.now())
+		metrics: createRequestMetrics(performance.now()),
+		deferredTasks
 	};
 	try {
 		return await runWithContext(ctx, () => fn(runtime));
 	} finally {
 		try {
-			scoped.commit();
+			lifecycle.commit();
 		} catch (error) {
 			console.error("[emdash] event-scoped db commit failed:", error);
 		}
 		try {
-			scoped.close();
+			lifecycle.close?.();
 		} catch (error) {
 			console.error("[emdash] event-scoped db close failed:", error);
 		}
+		await closed;
 	}
 }
 /**
@@ -3220,6 +3376,9 @@ const onRequest = defineMiddleware(async (context, next) => {
 		const hasSessionCookie = cookies.get("astro-session") !== void 0;
 		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await resolveSessionUser(context.session);
 		const hasBearerAuth = (request.headers.get("authorization") ?? "").toLowerCase().startsWith("bearer ");
+		const isWrite = request.method !== "GET" && request.method !== "HEAD";
+		const isAuthenticated = !!sessionUser || hasBearerAuth;
+		const canUseCachedBinding = !isAuthenticated && !isWrite && !playgroundDb && !isEmDashRoute && !hasEditCookie && !hasPreviewToken;
 		if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
 			if (!sessionUser && !playgroundDb) {
 				const timings = [];
@@ -3227,7 +3386,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!isSetupVerified() && !context.isPrerendered) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-C1XOLV5b.mjs").then((n) => n.o);
+						const { getDb } = await import("../loader-CGugY7Zl.mjs").then((n) => n.s);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {
@@ -3267,12 +3426,15 @@ const onRequest = defineMiddleware(async (context, next) => {
 					});
 					for (const sub of initSubTimings) timings.push(sub);
 				}
+				const lastContentWriteAt = canUseCachedBinding && config?.database?.needsLastContentWriteAt ? await getLastContentWriteAt() : void 0;
 				const anonScoped = createRequestScopedDb$1({
 					config: config?.database?.config,
-					isAuthenticated: false,
-					isWrite: request.method !== "GET" && request.method !== "HEAD",
+					isAuthenticated,
+					isWrite,
+					canUseCachedBinding,
 					cookies,
-					url
+					url,
+					lastContentWriteAt
 				});
 				const runAnon = async () => {
 					const t0 = performance.now();
@@ -3291,19 +3453,22 @@ const onRequest = defineMiddleware(async (context, next) => {
 					return wrapBodyForStreamMetrics(finalizeResponse(response, timings));
 				};
 				if (anonScoped) {
+					const { deferredTasks, lifecycle } = coordinateScopedDbLifecycle(anonScoped);
 					const parent = getRequestContext();
 					const ctx = parent ? {
 						...parent,
-						db: anonScoped.db
+						db: anonScoped.db,
+						deferredTasks
 					} : {
 						editMode: false,
 						db: anonScoped.db,
-						metrics
+						metrics,
+						deferredTasks
 					};
 					const acceptsHtml = (request.headers.get("accept") ?? "").split(",", 1)[0].trim().startsWith("text/html");
 					return runWithContext(ctx, async () => {
 						if (acceptsHtml) after(() => prefetchLayoutData());
-						return finishScoped(anonScoped, runAnon);
+						return finishScoped(lifecycle, runAnon);
 					});
 				}
 				return runAnon();
@@ -3391,12 +3556,15 @@ const onRequest = defineMiddleware(async (context, next) => {
 			} catch (error) {
 				console.error("EmDash middleware error:", error);
 			}
+			const lastContentWriteAt = canUseCachedBinding && config?.database?.needsLastContentWriteAt ? await getLastContentWriteAt() : void 0;
 			const scoped = createRequestScopedDb$1({
 				config: config?.database?.config,
-				isAuthenticated: !!sessionUser || hasBearerAuth,
-				isWrite: request.method !== "GET" && request.method !== "HEAD",
+				isAuthenticated,
+				isWrite,
+				canUseCachedBinding,
 				cookies: context.cookies,
-				url
+				url,
+				lastContentWriteAt
 			});
 			const renderAndFinalize = async () => {
 				const t0 = performance.now();
@@ -3415,15 +3583,18 @@ const onRequest = defineMiddleware(async (context, next) => {
 				return wrapBodyForStreamMetrics(finalizeResponse(response, timings));
 			};
 			if (scoped) {
+				const { deferredTasks, lifecycle } = coordinateScopedDbLifecycle(scoped);
 				const parent = getRequestContext();
 				return runWithContext(parent ? {
 					...parent,
-					db: scoped.db
+					db: scoped.db,
+					deferredTasks
 				} : {
 					editMode: false,
 					db: scoped.db,
-					metrics
-				}, () => finishScoped(scoped, renderAndFinalize));
+					metrics,
+					deferredTasks
+				}, () => finishScoped(lifecycle, renderAndFinalize));
 			}
 			return renderAndFinalize();
 		};