emdash 0.21.0 → 0.23.0

package/dist/astro/middleware.mjs

@@ -1,77 +1,82 @@
-import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner--4wMWwKM.mjs";
+import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner-DYYnW530.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { o as isSqlite } from "../dialect-helpers-DRI5pyY3.mjs";
 import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, v as definePlugin } from "../menus-Ryk9L7fT.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "../content-BIlVx-RX.mjs";
-import "../base64-CqR-7kqF.mjs";
-import "../types-BXSUSAjt.mjs";
-import { t as MediaRepository } from "../media-JOf3pNkw.mjs";
-import "../user-C0um7wrg.mjs";
-import "../taxonomy-CdllE4oq.mjs";
-import "../comment-sqQxNpN3.mjs";
-import { t as OptionsRepository } from "../options-BPCVnesz.mjs";
-import "../context-Cm4pt1Ws.mjs";
-import "../menus-DX4_E01q.mjs";
-import "../redirect-CRWIt8Zj.mjs";
-import { n as initWithLock, r as after, t as createInitLock } from "../init-lock-DlBHjf9-.mjs";
+import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, t as getMenu, v as definePlugin } from "../menus-DS8VTZgo.mjs";
+import { t as after } from "../after-B1IIdH3Y.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
-import { r as requestCached } from "../request-cache-UwmBAiUK.mjs";
-import "../byline-registry-DedidtqC.mjs";
-import "../byline-V_Qp1Ziw.mjs";
-import { n as normalizeMediaValue } from "../normalize-DKsg36ty.mjs";
-import "../placeholder-2xumZh4g.mjs";
-import "../seo-DpNgGQjF.mjs";
-import { n as isMissingTableError } from "../db-errors-BluWkwGI.mjs";
-import { $ as handleContentGet, B as handleMediaUpdate, G as handleContentAuthors, H as handleRevisionList, I as handleMediaCreate, J as handleContentCountTrashed, K as handleContentCompare, L as handleMediaDelete, Q as handleContentDuplicate, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDelete, Y as handleContentCreate, Z as handleContentDiscardDraft, _ as loadBundleFromR2, at as handleContentRestore, ct as handleContentUnpublish, dt as validateRev, et as handleContentGetIncludingTrashed, it as handleContentPublish, lt as handleContentUnschedule, nt as handleContentListTrashed, ot as handleContentSchedule, q as handleContentCountScheduled, rt as handleContentPermanentDelete, s as normalizeRegistryConfig, st as handleContentTranslations, tt as handleContentList, ut as handleContentUpdate, z as handleMediaList } from "../api-DxjIV2o8.mjs";
-import "../dashboard-C-UYpps0.mjs";
-import { n as hashString } from "../hash-DlvIFn0b.mjs";
-import { t as FTSManager } from "../fts-manager-Cx5z8jdA.mjs";
-import { n as SchemaRegistry } from "../registry-diMzD1Wf.mjs";
+import "../object-cache-SEb2IM4Z.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "../content-2PTDNnoh.mjs";
+import "../base64-CmWvODNW.mjs";
+import "../types-DXOIbece.mjs";
+import { t as MediaRepository } from "../media-Bw0sA6rb.mjs";
+import "../user-Db-Rti_z.mjs";
+import "../taxonomy-B2HQuVf5.mjs";
+import "../comment-80UyJJUR.mjs";
+import { t as OptionsRepository } from "../options-DTTML-Tx.mjs";
+import "../context-B1W8soLv.mjs";
+import "../menus-CYs0WZoL.mjs";
+import "../redirect-Bifv_yHv.mjs";
+import { i as setRequestCacheEntry, r as requestCached } from "../request-cache-KCNHp_RJ.mjs";
+import "../byline-registry-BOjqDOim.mjs";
+import { n as initWithLock, t as createInitLock } from "../init-lock-6b309ZrF.mjs";
+import "../field-defs-cache-ztrdzUGb.mjs";
+import "../byline-DVo-liaP.mjs";
+import { n as normalizeMediaValue } from "../normalize-ClbNIenm.mjs";
+import "../placeholder-B0s2mWu5.mjs";
+import "../seo-4FovMwNS.mjs";
+import { n as isMissingTableError } from "../db-errors-UXB1CK42.mjs";
+import { $ as handleContentGet, B as handleMediaUpdate, G as handleContentAuthors, H as handleRevisionList, I as handleMediaCreate, J as handleContentCountTrashed, K as handleContentCompare, L as handleMediaDelete, Q as handleContentDuplicate, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDelete, Y as handleContentCreate, Z as handleContentDiscardDraft, _ as loadBundleFromR2, at as handleContentRestore, ct as handleContentUnpublish, dt as validateRev, et as handleContentGetIncludingTrashed, it as handleContentPublish, lt as handleContentUnschedule, nt as handleContentListTrashed, ot as handleContentSchedule, q as handleContentCountScheduled, rt as handleContentPermanentDelete, s as normalizeRegistryConfig, st as handleContentTranslations, tt as handleContentList, ut as handleContentUpdate, z as handleMediaList } from "../api-BQ_yKRdG.mjs";
+import "../dashboard-CYjpQZ6-.mjs";
+import { n as hashString } from "../hash-DrvzIXcz.mjs";
+import { t as FTSManager } from "../fts-manager-CQuHt-vS.mjs";
+import { n as SchemaRegistry } from "../registry-CK1SS6pi.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { r as getDb } from "../loader-BqWjcH3h.mjs";
-import "../schema-BDOkd3OU.mjs";
-import "../zod-generator-CarzgPAu.mjs";
-import "../seo-CLhm-Fmb.mjs";
-import "../sections-P0zuBlyz.mjs";
-import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-C0UV1Npg.mjs";
-import { o as invalidateSiteSettingsCache } from "../settings-BjBsmVAo.mjs";
-import "../settings-sO0Fif4p.mjs";
-import "../resolve-B3NUUtVY.mjs";
-import "../taxonomies-BBxYA38v.mjs";
-import "../taxonomies-DuESHWKI.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-DFPeqMAn.mjs";
-import "../types-BoRm8-pp.mjs";
-import "../ssrf-XO05Voq6.mjs";
-import "../error-CNn_w7jf.mjs";
-import "../parse-DzSrk1t8.mjs";
-import "../redirects-6Zg2SoYo.mjs";
-import "../byline-fields-B0NO1yUB.mjs";
-import "../status-2gZklYuj.mjs";
-import { a as invalidateUrlPatternCache } from "../query-Crm038Mc.mjs";
-import "../import-KyxT1Mbs.mjs";
-import { t as getTrustedProxyHeaders } from "../trusted-proxy-CHp41Fjj.mjs";
-import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-DPechd0W.mjs";
-import "../ssrf-CRZGzjdL.mjs";
-import { n as CronExecutor } from "../cron-DdEVrQ2Y.mjs";
-import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-BbU3RbWv.mjs";
-import "../utils-C4M981Br.mjs";
-import "../tokens-DMkVjxrx.mjs";
-import "../preview-Dqv2hwXr.mjs";
-import "../bylines-DfGDnred.mjs";
-import "../widgets-Ci6hLwfO.mjs";
-import "../apply-CLjxheyb.mjs";
-import "../load-Dq91b_DK.mjs";
-import "../search-Bs_J_EW-.mjs";
+import { a as getDb } from "../loader-Dn74CG1b.mjs";
+import "../schema-CbFRFoM7.mjs";
+import "../zod-generator-ElVQOav7.mjs";
+import "../seo-DCEF-AVr.mjs";
+import "../sections-osX9U-YJ.mjs";
+import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-Cdfkic3t.mjs";
+import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-t-H2jPuJ.mjs";
+import "../settings-4bRT2NIf.mjs";
+import "../resolve-C7I0qiR0.mjs";
+import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-Dxrc_szG.mjs";
+import "../taxonomies-BBB8O-CU.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-BWKnQYQF.mjs";
+import "../types-BvbeGEtr.mjs";
+import "../ssrf-BRKb343l.mjs";
+import "../error-Bl6kZgtt.mjs";
+import "../parse-C9hpjUyY.mjs";
+import "../redirects-x9eFPeyi.mjs";
+import "../byline-fields-B-KXkg5R.mjs";
+import "../status-vUK0SA17.mjs";
+import { a as invalidateUrlPatternCache } from "../query-DgUHZLWB.mjs";
+import "../import-Bb1T9WJS.mjs";
+import { t as getTrustedProxyHeaders } from "../trusted-proxy-DZY5WCn2.mjs";
+import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-CmS1tDFf.mjs";
+import "../ssrf-CcX9zvMK.mjs";
+import { n as CronExecutor } from "../cron-C5LVoNmP.mjs";
+import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-DJP32ucW.mjs";
+import "../utils-B7A57fm9.mjs";
+import "../tokens-LeuXF9gG.mjs";
+import "../preview-DKGCt2_p.mjs";
+import "../comment-reaction-Dyb-AutY.mjs";
+import "../bylines-f5ppBpD5.mjs";
+import { n as getWidgetAreas } from "../widgets-BSTzPUYa.mjs";
+import "../apply-CWRyxIoO.mjs";
+import "../load-BNo-ER8C.mjs";
+import "../search-C-waE_YW.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-BOjj_cfz.mjs";
-import { t as getAuthMode } from "../mode-CGXzIbD8.mjs";
-import { t as cleanupExpiredChallenges } from "../challenge-store-woE0bbCf.mjs";
-import { a as validateEncryptionKeyAtStartup } from "../secrets-C8xmE6mR.mjs";
+import { n as VERSION, t as COMMIT } from "../version-BgVM_1MU.mjs";
+import { t as getAuthMode } from "../mode-BB0F8xTC.mjs";
+import { t as cleanupExpiredChallenges } from "../challenge-store-LhiqMccz.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-BSf9pRRY.mjs";
+import { t as resolveSessionUser } from "../session-user-B8aLtKAH.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
-import { createDialect, createRequestScopedDb } from "virtual:emdash/dialect";
+import { createCoalescingDialect, createDialect, createRequestScopedDb } from "virtual:emdash/dialect";
 import { mediaProviders } from "virtual:emdash/media-providers";
 import { plugins } from "virtual:emdash/plugins";
 import * as virtualSandboxRunnerModule from "virtual:emdash/sandbox-runner";
@@ -369,6 +374,25 @@ function getDbHolder() {
 	}
 	return holder;
 }
+/**
+* Auto-seed runs at most once per isolate per database. Its lock + "done" set
+* live on globalThis (same bundler-duplication reasoning as the db cache) so a
+* reclaimed-and-rerun `create()` can't seed a second time concurrently. The
+* lock polls rather than sharing a promise, so it is safe to await across a
+* cancelled owner in workerd.
+*/
+const SEED_HOLDER_KEY = Symbol.for("emdash:seed-state");
+function getSeedHolder() {
+	let holder = globalSymbolStore[SEED_HOLDER_KEY];
+	if (!holder) {
+		holder = {
+			done: /* @__PURE__ */ new Set(),
+			lock: createInitLock()
+		};
+		globalSymbolStore[SEED_HOLDER_KEY] = holder;
+	}
+	return holder;
+}
 const storageCache = /* @__PURE__ */ new Map();
 const sandboxedPluginCache = /* @__PURE__ */ new Map();
 /**
@@ -402,7 +426,20 @@ var EmDashRuntime = class EmDashRuntime {
 	configuredPlugins;
 	sandboxedPlugins;
 	sandboxedPluginEntries;
-	schemaRegistry;
+	/**
+	* Schema registry bound to the current request/event-scoped connection.
+	* Built per access (SchemaRegistry just wraps a db) against `this.db`, the
+	* ALS-aware getter — never a captured snapshot of the singleton. On a
+	* connection-backed adapter (Postgres over Hyperdrive) a captured singleton
+	* would query a socket opened by an earlier event and trip workerd's
+	* cross-request I/O guard; the catch in handlers like handleContentUpdate
+	* would then silently treat a revision-enabled collection as non-revisioned
+	* and write draft edits to live columns. Same reasoning as the per-call
+	* registry in _buildManifest().
+	*/
+	get schemaRegistry() {
+		return new SchemaRegistry(this.db);
+	}
 	_hooks;
 	config;
 	mediaProviders;
@@ -450,7 +487,6 @@ var EmDashRuntime = class EmDashRuntime {
 		this.configuredPlugins = parts.configuredPlugins;
 		this.sandboxedPlugins = parts.sandboxedPlugins;
 		this.sandboxedPluginEntries = parts.sandboxedPluginEntries;
-		this.schemaRegistry = new SchemaRegistry(parts.db);
 		this._hooks = parts.hooks;
 		this.enabledPlugins = parts.enabledPlugins;
 		this.pluginStates = parts.pluginStates;
@@ -567,10 +603,7 @@ var EmDashRuntime = class EmDashRuntime {
 	async rebuildHookPipeline() {
 		const newPipeline = createHookPipeline(this.allPipelinePlugins.filter((p) => this.enabledPlugins.has(p.id)), this.pipelineFactoryOptions);
 		await EmDashRuntime.resolveExclusiveHooks(newPipeline, this.db, this.runtimeDeps);
-		if (this.email) newPipeline.setContextFactory({
-			db: this.db,
-			emailPipeline: this.email
-		});
+		if (this.email) newPipeline.setContextFactory({ emailPipeline: this.email });
 		if (this.cronScheduler) {
 			const scheduler = this.cronScheduler;
 			newPipeline.setContextFactory({ cronReschedule: () => scheduler.reschedule() });
@@ -820,29 +853,100 @@ var EmDashRuntime = class EmDashRuntime {
 			}
 		};
 		const db = await phase("rt.db", "DB init + migrations", () => EmDashRuntime.getDatabase(deps));
+		const resolveDb = () => {
+			return getRequestContext()?.db ?? db;
+		};
 		await phase("rt.secrets", "Validate encryption key", () => validateEncryptionKeyAtStartup());
 		const storage = EmDashRuntime.getStorage(deps);
 		let pluginStates = /* @__PURE__ */ new Map();
 		let siteInfo;
-		await Promise.all([phase("rt.plugins", "Plugin states", async () => {
+		let seedGate = {
+			collectionCount: 1,
+			setupDone: true
+		};
+		const reqCtx = getRequestContext();
+		const ownsConfiguredDb = !!deps.config.database && !(reqCtx?.dbIsIsolated && reqCtx.db);
+		let readDb = db;
+		let readDbDisposable;
+		if (ownsConfiguredDb && deps.createCoalescingDialect && deps.config.database) try {
+			const dialect = deps.createCoalescingDialect(deps.config.database.config);
+			if (dialect) {
+				readDb = new Kysely({
+					dialect,
+					log: kyselyLogOption()
+				});
+				readDbDisposable = readDb;
+			}
+		} catch {
+			readDb = db;
+		}
+		const optionsRepo = new OptionsRepository(readDb);
+		const readSiteInfo = async () => {
+			const siteOpts = await optionsRepo.getMany([
+				"emdash:site_title",
+				"emdash:site_url",
+				"emdash:locale"
+			]);
+			return {
+				siteName: siteOpts.get("emdash:site_title") ?? void 0,
+				siteUrl: siteOpts.get("emdash:site_url") ?? void 0,
+				locale: siteOpts.get("emdash:locale") ?? void 0
+			};
+		};
+		const coldStartReads = [phase("rt.plugins", "Plugin states", async () => {
 			try {
-				const states = await db.selectFrom("_plugin_state").select(["plugin_id", "status"]).execute();
+				const states = await readDb.selectFrom("_plugin_state").select(["plugin_id", "status"]).execute();
 				pluginStates = new Map(states.map((s) => [s.plugin_id, s.status]));
 			} catch {}
 		}), phase("rt.site", "Site info options", async () => {
 			try {
-				const siteOpts = await new OptionsRepository(db).getMany([
-					"emdash:site_title",
-					"emdash:site_url",
-					"emdash:locale"
-				]);
-				siteInfo = {
-					siteName: siteOpts.get("emdash:site_title") ?? void 0,
-					siteUrl: siteOpts.get("emdash:site_url") ?? void 0,
-					locale: siteOpts.get("emdash:locale") ?? void 0
+				siteInfo = await readSiteInfo();
+			} catch {}
+		})];
+		if (ownsConfiguredDb) coldStartReads.push(phase("rt.seedcheck", "Auto-seed gate", async () => {
+			try {
+				const [collectionCount, setupOption] = await Promise.all([readDb.selectFrom("_emdash_collections").select((eb) => eb.fn.countAll().as("count")).executeTakeFirstOrThrow(), readDb.selectFrom("options").select("value").where("name", "=", "emdash:setup_complete").executeTakeFirst()]);
+				const setupDone = (() => {
+					try {
+						return !!setupOption && JSON.parse(setupOption.value) === true;
+					} catch {
+						return false;
+					}
+				})();
+				seedGate = {
+					collectionCount: collectionCount.count,
+					setupDone
 				};
 			} catch {}
-		})]);
+		}));
+		await Promise.all(coldStartReads);
+		if (seedGate.collectionCount === 0 && !seedGate.setupDone) {
+			const seedKey = deps.config.database?.entrypoint ?? "default";
+			const seedHolder = getSeedHolder();
+			try {
+				await initWithLock(seedHolder.lock, () => seedHolder.done.has(seedKey) ? true : void 0, async () => {
+					const { applySeed } = await import("../apply-CWRyxIoO.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-BNo-ER8C.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-0Utjspbs.mjs").then((n) => n.n);
+					const seed = await loadSeed();
+					if (validateSeed(seed).valid) {
+						await applySeed(db, seed, { onConflict: "skip" });
+						console.log("Auto-seeded default collections");
+					}
+					seedHolder.done.add(seedKey);
+					return true;
+				}, {
+					deadlineMs: DB_INIT_DEADLINE_MS,
+					anchor: (promise) => after(() => promise)
+				});
+				try {
+					siteInfo = await readSiteInfo();
+				} catch {}
+			} catch {}
+		}
+		if (readDbDisposable) try {
+			await readDbDisposable.destroy();
+		} catch {}
 		const enabledPlugins = /* @__PURE__ */ new Set();
 		for (const plugin of deps.plugins) {
 			const status = pluginStates.get(plugin.id);
@@ -903,6 +1007,7 @@ var EmDashRuntime = class EmDashRuntime {
 		const enabledPluginList = allPipelinePlugins.filter((p) => enabledPlugins.has(p.id));
 		const pipelineFactoryOptions = {
 			db,
+			getDb: resolveDb,
 			storage: storage ?? void 0,
 			siteInfo
 		};
@@ -916,7 +1021,8 @@ var EmDashRuntime = class EmDashRuntime {
 		const mediaProviderEntries = deps.mediaProviderEntries ?? [];
 		const providerContext = {
 			db,
-			storage
+			storage,
+			getDb: resolveDb
 		};
 		for (const entry of mediaProviderEntries) try {
 			const provider = entry.createProvider(providerContext);
@@ -932,16 +1038,13 @@ var EmDashRuntime = class EmDashRuntime {
 			const result = await pipelineRef.current.invokeCronHook(pluginId, event);
 			if (!result.success && result.error) throw result.error;
 		};
-		pipeline.setContextFactory({
-			db,
-			emailPipeline
-		});
+		pipeline.setContextFactory({ emailPipeline });
 		let cronExecutor = null;
 		let cronScheduler = null;
 		const runtimeRef = { current: null };
 		await phase("rt.cron", "Cron init (recovery deferred post-response)", async () => {
 			try {
-				cronExecutor = new CronExecutor(db, invokeCronHook);
+				cronExecutor = new CronExecutor(resolveDb, invokeCronHook);
 				const executorForRecovery = cronExecutor;
 				after(async () => {
 					try {
@@ -1034,26 +1137,6 @@ var EmDashRuntime = class EmDashRuntime {
 				log: kyselyLogOption()
 			});
 			await runMigrations(db);
-			try {
-				const [collectionCount, setupOption] = await Promise.all([db.selectFrom("_emdash_collections").select((eb) => eb.fn.countAll().as("count")).executeTakeFirstOrThrow(), db.selectFrom("options").select("value").where("name", "=", "emdash:setup_complete").executeTakeFirst()]);
-				const setupDone = (() => {
-					try {
-						return setupOption && JSON.parse(setupOption.value) === true;
-					} catch {
-						return false;
-					}
-				})();
-				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-CLjxheyb.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-Dq91b_DK.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-DGhQPXzI.mjs").then((n) => n.n);
-					const seed = await loadSeed();
-					if (validateSeed(seed).valid) {
-						await applySeed(db, seed, { onConflict: "skip" });
-						console.log("Auto-seeded default collections");
-					}
-				}
-			} catch {}
 			if (isCurrentClaim()) holder.cache.set(cacheKey, db);
 			return db;
 		}, {
@@ -1109,7 +1192,9 @@ var EmDashRuntime = class EmDashRuntime {
 				allowedHosts: entry.allowedHosts,
 				storage: entry.storage,
 				adminPages,
-				adminWidgets
+				adminWidgets,
+				portableTextBlocks: entry.portableTextBlocks,
+				fieldWidgets: entry.fieldWidgets
 			});
 			plugins.push(resolved);
 			console.log(`EmDash: Loaded plugin ${entry.id}:${entry.version} in-process (sandbox bypassed)`);
@@ -1421,7 +1506,9 @@ var EmDashRuntime = class EmDashRuntime {
 				sandboxed: true,
 				adminMode: hasAdminPages || hasWidgets ? "blocks" : "none",
 				adminPages: entry.adminPages ?? [],
-				dashboardWidgets: entry.adminWidgets ?? []
+				dashboardWidgets: entry.adminWidgets ?? [],
+				portableTextBlocks: entry.portableTextBlocks,
+				fieldWidgets: entry.fieldWidgets
 			};
 		}
 		for (const [pluginId, meta] of marketplaceManifestCache) {
@@ -1576,7 +1663,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-DVHjPM1M.mjs");
+		const { validateContentData } = await import("../validation-D9EnzH1T.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1592,7 +1679,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-BIlVx-RX.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-2PTDNnoh.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;
@@ -1619,7 +1706,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-DVHjPM1M.mjs");
+			const { validateContentData } = await import("../validation-D9EnzH1T.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -1875,6 +1962,7 @@ var EmDashRuntime = class EmDashRuntime {
 		if (trustedPlugin && this.enabledPlugins.has(trustedPlugin.id)) {
 			const routeRegistry = new PluginRouteRegistry({
 				db: this.db,
+				storage: this.storage ?? void 0,
 				emailPipeline: this.email ?? void 0,
 				trustedProxyHeaders: getTrustedProxyHeaders(this.config)
 			});
@@ -2159,6 +2247,120 @@ function createPublicMediaUrlResolver(storage) {
 	return (key) => resolvePublicMediaUrl(storage, key);
 }
 
+//#endregion
+//#region src/astro/middleware/scoped-db.ts
+/**
+* Request-scoped database lifecycle helpers.
+*
+* Extracted from middleware.ts so they can be unit-tested without pulling in
+* the virtual:emdash/* module graph. The middleware imports these to settle a
+* request-scoped db adapter's lifecycle around the response.
+*/
+/**
+* Astro attaches AstroCookies to outgoing responses via a well-known global
+* symbol. Cloning a Response (`new Response(body, init)`) drops non-header
+* metadata, so any helper that wraps the response must explicitly forward this
+* symbol or `cookies.set()` calls will be silently dropped. `Symbol.for`
+* returns the same registry symbol everywhere, so this matches the copy in
+* middleware.ts.
+*/
+const ASTRO_COOKIES_SYMBOL = Symbol.for("astro.cookies");
+/**
+* Run a request-scoped db's `close()` once the response body has finished
+* streaming. Astro streams HTML and components issue DB queries during that
+* stream, so a connection-backed adapter (e.g. Postgres over Hyperdrive) must
+* not be torn down until the body is flushed. Bodyless responses (redirects,
+* 304s, errors) close immediately. A guard makes close idempotent and a stream
+* `cancel` (client disconnect) still triggers it so connections never leak.
+*
+* No-op for adapters without a `close` (D1): the response passes through.
+*/
+function wrapResponseForScopedClose(response, close) {
+	let closed = false;
+	const runClose = () => {
+		if (closed) return;
+		closed = true;
+		try {
+			close();
+		} catch (error) {
+			console.error("[emdash] request-scoped db close failed:", error);
+		}
+	};
+	if (!response.body) {
+		runClose();
+		return response;
+	}
+	const transform = new TransformStream({
+		flush: runClose,
+		cancel: runClose
+	});
+	const wrapped = new Response(response.body.pipeThrough(transform), response);
+	const astroCookies = Reflect.get(response, ASTRO_COOKIES_SYMBOL);
+	if (astroCookies !== void 0) Reflect.set(wrapped, ASTRO_COOKIES_SYMBOL, astroCookies);
+	wrapped.headers.delete("Content-Length");
+	return wrapped;
+}
+/**
+* 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.
+*
+* 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
+* error (which is the one the caller needs to see). On the success path
+* `commit()` is guarded too — if it throws, the connection is closed before the
+* failure is surfaced, so it never leaks. For the current adapters `commit()`
+* is a no-op (Hyperdrive) or a cookie write (D1, no `close`) and `close()` is
+* fire-and-forget, so these guards only matter for a future connection-backed
+* adapter with throwing teardown, but the helper is generic and must not leak
+* or mask.
+*/
+async function finishScoped(scoped, run) {
+	let response;
+	try {
+		response = await run();
+	} catch (error) {
+		commitSafely(scoped.commit);
+		closeSafely(scoped.close);
+		throw error;
+	}
+	try {
+		scoped.commit();
+	} catch (error) {
+		closeSafely(scoped.close);
+		throw error;
+	}
+	return scoped.close ? wrapResponseForScopedClose(response, scoped.close) : response;
+}
+/**
+* Run commit() swallowing any error. Used where an exception is already
+* propagating (or about to be thrown) and a commit failure must neither mask it
+* nor skip the subsequent close().
+*/
+function commitSafely(commit) {
+	try {
+		commit();
+	} catch (error) {
+		console.error("[emdash] request-scoped db commit failed during error handling:", error);
+	}
+}
+/**
+* Run close() swallowing any error. Used on the error/commit-failure paths
+* where another exception is the one the caller must see; a throwing teardown
+* must not replace it.
+*/
+function closeSafely(close) {
+	if (!close) return;
+	try {
+		close();
+	} catch (error) {
+		console.error("[emdash] request-scoped db close failed during error handling:", error);
+	}
+}
+
 //#endregion
 //#region src/astro/middleware/stream-end-metrics.ts
 /**
@@ -2182,13 +2384,6 @@ function createPublicMediaUrlResolver(storage) {
 */
 const STREAM_END_PREFIX = "[emdash-stream-end]";
 /**
-* Astro attaches AstroCookies to outgoing responses via a well-known global
-* symbol. Constructing a new Response drops non-header metadata, so the
-* symbol must be forwarded explicitly or `cookies.set()` calls are silently
-* dropped. Same pattern as finalizeResponse in ../middleware.ts.
-*/
-const ASTRO_COOKIES_SYMBOL$1 = Symbol.for("astro.cookies");
-/**
 * Wrap a response body so the FINAL request metrics are emitted when the
 * body finishes streaming. Returns the response unchanged when
 * instrumentation is disabled, the body is null, or no request metrics
@@ -2201,6 +2396,7 @@ function wrapBodyForStreamMetrics(response) {
 	const metrics = ctx?.metrics;
 	if (!metrics) return response;
 	const recorder = ctx?.queryRecorder;
+	if (recorder) recorder.deferredFlush = true;
 	const transform = new TransformStream({ flush() {
 		const snapshot = {
 			route: recorder?.route,
@@ -2215,14 +2411,75 @@ function wrapBodyForStreamMetrics(response) {
 			cacheMisses: metrics.cacheMisses
 		};
 		console.log(`${STREAM_END_PREFIX} ${JSON.stringify(snapshot)}`);
+		if (recorder) flushRecorder(recorder);
 	} });
 	const wrapped = new Response(response.body.pipeThrough(transform), response);
-	const astroCookies = Reflect.get(response, ASTRO_COOKIES_SYMBOL$1);
-	if (astroCookies !== void 0) Reflect.set(wrapped, ASTRO_COOKIES_SYMBOL$1, astroCookies);
+	const astroCookies = Reflect.get(response, ASTRO_COOKIES_SYMBOL);
+	if (astroCookies !== void 0) Reflect.set(wrapped, ASTRO_COOKIES_SYMBOL, astroCookies);
 	wrapped.headers.delete("Content-Length");
 	return wrapped;
 }
 
+//#endregion
+//#region src/astro/prefetch.ts
+/**
+* Eager, transparent prefetch of site-global "chrome" data.
+*
+* On a public page render, the shared layout pulls the same site-global data on
+* every request -- menus, widget areas, taxonomy term lists, site settings --
+* but each is awaited inside a separately-rendered Astro component, so they
+* execute as serial DB round trips. This fires them all CONCURRENTLY at the
+* very start of the request, before `next()`:
+*
+*   - On remote backends (D1, Durable Objects) the round trips overlap instead
+*     of serializing, collapsing ~N sequential RTTs into ~1 wall-clock RTT. On
+*     a coalescing backend they additionally batch into a single round trip.
+*   - The results land in the per-request `requestCached` store under the exact
+*     keys the layout helpers use, so when the components render they hit a warm
+*     (in-flight or resolved) cache entry instead of issuing their own query.
+*
+* Nothing here changes what templates call -- it warms the real helpers, so the
+* cache keys and value shapes are guaranteed identical. The caller gates this to
+* the public-page path on a request-scoped (remote) backend; it is a no-op-ish
+* waste on synchronous local SQLite, so don't call it there.
+*
+* Fire-and-forget: never awaited by middleware, never throws (a prefetch failure
+* must not affect the request -- the helpers will simply run on demand).
+*/
+/** Warm widget areas: one bulk load, primed under each per-area cache key. */
+async function prefetchWidgetAreas() {
+	const areas = await getWidgetAreas();
+	for (const area of areas) setRequestCacheEntry(`widget-area:${area.name}`, area);
+}
+/** Warm every taxonomy's term list via the real helper (primes per-name keys). */
+async function prefetchTaxonomyTerms() {
+	const defs = await getTaxonomyDefs();
+	await Promise.allSettled(defs.map((def) => getTaxonomyTerms(def.name)));
+}
+/** Warm every menu via the real helper (primes `menu:${name}:${locale}`). */
+async function prefetchMenus() {
+	const rows = await (await getDb()).selectFrom("_emdash_menus").select("name").distinct().execute();
+	const names = [...new Set(rows.map((r) => r.name))];
+	await Promise.allSettled(names.map((name) => getMenu(name)));
+}
+/**
+* Concurrently warm the site-global layout data for the current request.
+* Safe to call only inside the request ALS frame that owns the (remote)
+* request-scoped db. Never throws.
+*/
+async function prefetchLayoutData() {
+	try {
+		await Promise.allSettled([
+			getSiteSettings(),
+			prefetchMenus(),
+			prefetchWidgetAreas(),
+			prefetchTaxonomyTerms()
+		]);
+	} catch (error) {
+		console.error("[emdash] layout prefetch failed (non-fatal):", error);
+	}
+}
+
 //#endregion
 //#region src/astro/public-plugin-api-routes.ts
 function pluginRouteNotFound() {
@@ -2331,6 +2588,7 @@ function buildDependencies(config) {
 		config,
 		plugins: getPlugins(),
 		createDialect,
+		createCoalescingDialect,
 		createStorage,
 		createScheduler,
 		sandboxEnabled: sandboxModule.sandboxEnabled,
@@ -2380,15 +2638,56 @@ async function getRuntime(config, initTimings) {
 async function runScheduledTasks(options = {}) {
 	const config = getConfig();
 	if (!config) return { published: [] };
-	return (await getRuntime(config)).runScheduledTasks(options);
+	const runtime = await getRuntime(config);
+	const scoped = createRequestScopedDb$1({
+		config: config.database?.config,
+		isAuthenticated: false,
+		isWrite: true,
+		cookies: NOOP_COOKIE_JAR,
+		url: CRON_EVENT_URL
+	});
+	if (!scoped?.close) return runtime.runScheduledTasks(options);
+	const parent = getRequestContext();
+	const ctx = parent ? {
+		...parent,
+		db: scoped.db
+	} : {
+		editMode: false,
+		db: scoped.db,
+		metrics: createRequestMetrics(performance.now())
+	};
+	try {
+		return await runWithContext(ctx, () => runtime.runScheduledTasks(options));
+	} finally {
+		try {
+			scoped.commit();
+		} catch (error) {
+			console.error("[scheduled] request-scoped db commit failed:", error);
+		}
+		try {
+			scoped.close();
+		} catch (error) {
+			console.error("[scheduled] request-scoped db close failed:", error);
+		}
+	}
 }
 /**
-* Astro attaches AstroCookies to outgoing responses via a well-known global
-* symbol. Cloning a Response (`new Response(body, init)`) drops non-header
-* metadata, so any middleware that wraps the response must explicitly forward
-* this symbol or `cookies.set()` calls will be silently dropped.
+* A cookie jar that reads nothing and writes nothing, for request-scoped db
+* adapters invoked outside an HTTP request (the Cron Trigger sweep). Connection
+* adapters like Hyperdrive ignore cookies entirely; the D1 session adapter
+* reads/writes a bookmark cookie, but cron never reaches that path (it has no
+* `close()`), so the no-ops are never observed.
 */
-const ASTRO_COOKIES_SYMBOL = Symbol.for("astro.cookies");
+const NOOP_COOKIE_JAR = {
+	get: () => void 0,
+	set: () => {}
+};
+/**
+* Synthetic URL for the cron sweep's request-scoped db opts. Only the D1
+* session adapter inspects `url` (for cookie `secure`), and cron doesn't take
+* that path, so the value is never used — it exists to satisfy the contract.
+*/
+const CRON_EVENT_URL = new URL("https://cron.emdash.internal/");
 /**
 * Baseline security headers applied to all responses.
 * Admin routes get additional headers (strict CSP) from auth middleware.
@@ -2483,15 +2782,15 @@ const onRequest = defineMiddleware(async (context, next) => {
 		const hasPreviewToken = url.searchParams.has("_preview");
 		const playgroundDb = locals.__playgroundDb;
 		const hasSessionCookie = cookies.get("astro-session") !== void 0;
-		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await context.session?.get("user");
+		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await resolveSessionUser(context.session);
 		if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
 			if (!sessionUser && !playgroundDb) {
 				const timings = [];
 				const mwStart = performance.now();
-				if (!isSetupVerified()) {
+				if (!isSetupVerified() && !context.isPrerendered) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-BqWjcH3h.mjs").then((n) => n.i);
+						const { getDb } = await import("../loader-Dn74CG1b.mjs").then((n) => n.o);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {
@@ -2515,7 +2814,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 							handlePublicPluginApiRoute: createPublicPluginApiRouteHandler(runtime),
 							collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
 							collectPageFragments: runtime.collectPageFragments.bind(runtime),
-							getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage)
+							getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage),
+							storage: runtime.storage
 						};
 					} catch {}
 					timings.push({
@@ -2550,19 +2850,18 @@ const onRequest = defineMiddleware(async (context, next) => {
 				};
 				if (anonScoped) {
 					const parent = getRequestContext();
-					return runWithContext(parent ? {
+					const ctx = parent ? {
 						...parent,
 						db: anonScoped.db
 					} : {
 						editMode: false,
 						db: anonScoped.db,
 						metrics
-					}, async () => {
-						try {
-							return await runAnon();
-						} finally {
-							anonScoped.commit();
-						}
+					};
+					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 runAnon();
@@ -2624,7 +2923,9 @@ const onRequest = defineMiddleware(async (context, next) => {
 					collectPageFragments: runtime.collectPageFragments.bind(runtime),
 					ensureSearchHealthy: runtime.ensureSearchHealthy.bind(runtime),
 					storage: runtime.storage,
-					db: runtime.db,
+					get db() {
+						return runtime.db;
+					},
 					getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage),
 					hooks: runtime.hooks,
 					email: runtime.email,
@@ -2673,13 +2974,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 					editMode: false,
 					db: scoped.db,
 					metrics
-				}, async () => {
-					try {
-						return await renderAndFinalize();
-					} finally {
-						scoped.commit();
-					}
-				});
+				}, () => finishScoped(scoped, renderAndFinalize));
 			}
 			return renderAndFinalize();
 		};
@@ -2707,7 +3002,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 			metrics
 		}, run);
 	} finally {
-		if (queryRecorder) flushRecorder(queryRecorder);
+		if (queryRecorder && !queryRecorder.deferredFlush) flushRecorder(queryRecorder);
 	}
 });