emdash 0.5.0 → 0.7.0

package/dist/astro/middleware.mjs

@@ -1,32 +1,35 @@
-import "../connection-B4zVnQIa.mjs";
+import { getRequestContext, runWithContext } from "../request-context.mjs";
+import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
+import "../connection-2igzM-AT.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { a as isSqlite } from "../dialect-helpers-DhTzaUxP.mjs";
-import { r as runMigrations } from "../runner-Cd-_WyDo.mjs";
-import { $ as sanitizeHeadersForSandbox, At as handleContentGet, Bt as handleContentUnschedule, Ct as handleContentCompare, Dt as handleContentDelete, Et as handleContentCreate, Ft as handleContentPublish, G as DEV_CONSOLE_EMAIL_PLUGIN_ID, Ht as validateRev, It as handleContentRestore, K as devConsoleEmailDeliver, Lt as handleContentSchedule, Mt as handleContentList, Nt as handleContentListTrashed, Ot as handleContentDiscardDraft, Pt as handleContentPermanentDelete, Q as extractRequestMeta, Rt as handleContentTranslations, St as hashString, Tt as handleContentCountTrashed, Vt as handleContentUpdate, W as PluginRouteRegistry, X as resolveExclusiveHooks, Y as createHookPipeline, Z as CronExecutor, _t as handleRevisionGet, et as definePlugin, ft as handleMediaCreate, gt as handleMediaUpdate, ht as handleMediaList, jt as handleContentGetIncludingTrashed, kt as handleContentDuplicate, mt as handleMediaGet, pt as handleMediaDelete, q as EmailPipeline, st as loadBundleFromR2, ut as PluginStateRepository, vt as handleRevisionList, wt as handleContentCountScheduled, yt as handleRevisionRestore, zt as handleContentUnpublish } from "../search-Cn1SYvYF.mjs";
-import { r as RevisionRepository } from "../content-BsBoyj8G.mjs";
+import { r as runMigrations } from "../runner-tQ7BJ4T7.mjs";
+import { At as handleContentPublish, B as EmailPipeline, Ct as handleContentDiscardDraft, Dt as handleContentList, Et as handleContentGetIncludingTrashed, Ft as handleContentUnschedule, G as extractRequestMeta, H as createHookPipeline, It as handleContentUpdate, J as definePlugin, K as sanitizeHeadersForSandbox, L as PluginRouteRegistry, Lt as validateRev, Mt as handleContentSchedule, Nt as handleContentTranslations, Ot as handleContentListTrashed, Pt as handleContentUnpublish, R as DEV_CONSOLE_EMAIL_PLUGIN_ID, St as handleContentDelete, Tt as handleContentGet, U as resolveExclusiveHooks, W as CronExecutor, Z as after, _t as hashString, at as PluginStateRepository, bt as handleContentCountTrashed, ct as handleMediaDelete, dt as handleMediaUpdate, ft as handleRevisionGet, jt as handleContentRestore, kt as handleContentPermanentDelete, lt as handleMediaGet, mt as handleRevisionRestore, nt as loadBundleFromR2, pt as handleRevisionList, q as getTrustedProxyHeaders, st as handleMediaCreate, ut as handleMediaList, vt as handleContentCompare, wt as handleContentDuplicate, xt as handleContentCreate, yt as handleContentCountScheduled, z as devConsoleEmailDeliver } from "../search-B0effn3j.mjs";
+import { r as RevisionRepository } from "../content-D7J5y73J.mjs";
 import "../base64-MBPo9ozB.mjs";
 import "../types-CMMN0pNg.mjs";
 import { t as MediaRepository } from "../media-DqHVh136.mjs";
-import { f as OptionsRepository } from "../apply-Cma_PiF6.mjs";
-import "../redirect-7lGhLBNZ.mjs";
-import "../byline-WuOq9MFJ.mjs";
-import { n as normalizeMediaValue } from "../placeholder-DntBEQo7.mjs";
-import { i as setI18nConfig } from "../config-DkxPrM9l.mjs";
-import { i as FTSManager, n as SchemaRegistry } from "../registry-BgnP3ysR.mjs";
-import { getRequestContext, runWithContext } from "../request-context.mjs";
-import { n as getDb } from "../loader-BYzwzORf.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-BsXINkQD.mjs";
-import { a as invalidateUrlPatternCache } from "../query-B6Vu0d2i.mjs";
-import "../tokens-DKHiCYCB.mjs";
-import "../bylines-C_Wsnz4L.mjs";
-import "../load-BhSSm-TS.mjs";
+import { p as OptionsRepository } from "../apply-5uslYdUu.mjs";
+import "../redirect-CN0Rt9Ob.mjs";
+import "../byline-C4OVd8b3.mjs";
+import { n as normalizeMediaValue } from "../placeholder-C-fk5hYI.mjs";
+import { i as setI18nConfig } from "../config-BXwuX8Bx.mjs";
+import { i as FTSManager, n as SchemaRegistry } from "../registry-Ci3WxVAr.mjs";
+import { n as getDb } from "../loader-DeiBJEMe.mjs";
+import "../request-cache-DiR961CV.mjs";
+import "../taxonomies-K2z0Uhnj.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-V30qsMft.mjs";
+import { a as invalidateUrlPatternCache } from "../query-g4Ug-9j9.mjs";
+import "../tokens-BFPFx3CA.mjs";
+import "../bylines-hPTW79hw.mjs";
+import "../load-CBcmDIot.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-CMMjTuqu.mjs";
-import { t as getAuthMode } from "../mode-CyPLdO3C.mjs";
+import { n as VERSION, t as COMMIT } from "../version-BnTKdfam.mjs";
+import { t as getAuthMode } from "../mode-CpNnGkPz.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
-import { createDialect, createSessionDialect, getBookmarkCookieName, getD1Binding, getDefaultConstraint, isSessionEnabled } from "virtual:emdash/dialect";
+import { createDialect, createRequestScopedDb } from "virtual:emdash/dialect";
 import { mediaProviders } from "virtual:emdash/media-providers";
 import { plugins } from "virtual:emdash/plugins";
 import { createSandboxRunner, sandboxEnabled } from "virtual:emdash/sandbox-runner";
@@ -316,6 +319,7 @@ function isValidMetadataContribution(c) {
 const FIELD_TYPE_TO_KIND = {
 	string: "string",
 	slug: "string",
+	url: "url",
 	text: "richText",
 	number: "number",
 	integer: "number",
@@ -371,6 +375,16 @@ var EmDashRuntime = class EmDashRuntime {
 	cronScheduler;
 	enabledPlugins;
 	pluginStates;
+	_cachedManifest = null;
+	_manifestPromise = null;
+	_manifestCacheKey;
+	/**
+	* Set to true after FTS indexes have been verified for this worker
+	* lifetime so we don't re-scan on every admin request. See
+	* ensureSearchHealthy().
+	*/
+	_searchHealthChecked = false;
+	_searchHealthPromise = null;
 	/** Current hook pipeline. Use the `hooks` getter for external access. */
 	get hooks() {
 		return this._hooks;
@@ -396,7 +410,7 @@ var EmDashRuntime = class EmDashRuntime {
 		if (ctx?.db) return ctx.db;
 		return this._db;
 	}
-	constructor(db, storage, configuredPlugins, sandboxedPlugins, sandboxedPluginEntries, hooks, enabledPlugins, pluginStates, config, mediaProviders, mediaProviderEntries, cronExecutor, cronScheduler, emailPipeline, allPipelinePlugins, pipelineFactoryOptions, runtimeDeps, pipelineRef) {
+	constructor(db, storage, configuredPlugins, sandboxedPlugins, sandboxedPluginEntries, hooks, enabledPlugins, pluginStates, config, mediaProviders, mediaProviderEntries, cronExecutor, cronScheduler, emailPipeline, allPipelinePlugins, pipelineFactoryOptions, runtimeDeps, pipelineRef, manifestCacheKey) {
 		this._db = db;
 		this.storage = storage;
 		this.configuredPlugins = configuredPlugins;
@@ -416,6 +430,7 @@ var EmDashRuntime = class EmDashRuntime {
 		this.pipelineFactoryOptions = pipelineFactoryOptions;
 		this.runtimeDeps = runtimeDeps;
 		this.pipelineRef = pipelineRef;
+		this._manifestCacheKey = manifestCacheKey;
 	}
 	/**
 	* Get the sandbox runner instance (for marketplace install/update)
@@ -456,6 +471,7 @@ var EmDashRuntime = class EmDashRuntime {
 			this.enabledPlugins.delete(pluginId);
 			await this.rebuildHookPipeline();
 		}
+		this.invalidateManifest();
 	}
 	/**
 	* Rebuild the hook pipeline from the current set of enabled plugins.
@@ -564,35 +580,49 @@ var EmDashRuntime = class EmDashRuntime {
 	/**
 	* Create and initialize the runtime
 	*/
-	static async create(deps) {
-		const db = await EmDashRuntime.getDatabase(deps);
-		if (isSqlite(db)) try {
-			const repaired = await new FTSManager(db).verifyAndRepairAll();
-			if (repaired > 0) console.log(`Repaired ${repaired} corrupted FTS index(es) at startup`);
-		} catch {}
+	static async create(deps, timings) {
+		const phase = async (name, desc, fn) => {
+			if (!timings) return fn();
+			const t0 = performance.now();
+			try {
+				return await fn();
+			} finally {
+				timings.push({
+					name,
+					dur: performance.now() - t0,
+					desc
+				});
+			}
+		};
+		const db = await phase("rt.db", "DB init + migrations", () => EmDashRuntime.getDatabase(deps));
 		const storage = EmDashRuntime.getStorage(deps);
 		let pluginStates = /* @__PURE__ */ new Map();
-		try {
-			const states = await db.selectFrom("_plugin_state").select(["plugin_id", "status"]).execute();
-			pluginStates = new Map(states.map((s) => [s.plugin_id, s.status]));
-		} catch {}
+		await phase("rt.plugins", "Plugin states", async () => {
+			try {
+				const states = await db.selectFrom("_plugin_state").select(["plugin_id", "status"]).execute();
+				pluginStates = new Map(states.map((s) => [s.plugin_id, s.status]));
+			} catch {}
+		});
 		const enabledPlugins = /* @__PURE__ */ new Set();
 		for (const plugin of deps.plugins) {
 			const status = pluginStates.get(plugin.id);
 			if (status === void 0 || status === "active") enabledPlugins.add(plugin.id);
 		}
 		let siteInfo;
-		try {
-			const optionsRepo = new OptionsRepository(db);
-			const siteName = await optionsRepo.get("emdash:site_title");
-			const siteUrl = await optionsRepo.get("emdash:site_url");
-			const locale = await optionsRepo.get("emdash:locale");
-			siteInfo = {
-				siteName: siteName ?? void 0,
-				siteUrl: siteUrl ?? void 0,
-				locale: locale ?? void 0
-			};
-		} catch {}
+		await 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
+				};
+			} catch {}
+		});
 		const allPipelinePlugins = [...deps.plugins];
 		if (import.meta.env.DEV) try {
 			const devConsolePlugin = definePlugin({
@@ -631,8 +661,8 @@ var EmDashRuntime = class EmDashRuntime {
 			siteInfo
 		};
 		const pipeline = createHookPipeline(enabledPluginList, pipelineFactoryOptions);
-		const sandboxedPlugins = await EmDashRuntime.loadSandboxedPlugins(deps, db);
-		if (deps.config.marketplace && storage) await EmDashRuntime.loadMarketplacePlugins(db, storage, deps, sandboxedPlugins);
+		const sandboxedPlugins = await phase("rt.sandbox", "Sandboxed plugins", () => EmDashRuntime.loadSandboxedPlugins(deps, db));
+		if (deps.config.marketplace && storage) await phase("rt.market", "Marketplace plugins", () => EmDashRuntime.loadMarketplacePlugins(db, storage, deps, sandboxedPlugins));
 		const mediaProviders = /* @__PURE__ */ new Map();
 		const mediaProviderEntries = deps.mediaProviderEntries ?? [];
 		const providerContext = {
@@ -645,7 +675,7 @@ var EmDashRuntime = class EmDashRuntime {
 		} catch (error) {
 			console.warn(`Failed to initialize media provider "${entry.id}":`, error);
 		}
-		await EmDashRuntime.resolveExclusiveHooks(pipeline, db, deps);
+		await phase("rt.hooks", "Exclusive hook resolution", () => EmDashRuntime.resolveExclusiveHooks(pipeline, db, deps));
 		const emailPipeline = new EmailPipeline(pipeline);
 		if (sandboxRunner) sandboxRunner.setEmailSend((message, pluginId) => emailPipeline.send(message, pluginId));
 		const pipelineRef = { current: pipeline };
@@ -659,25 +689,41 @@ var EmDashRuntime = class EmDashRuntime {
 		});
 		let cronExecutor = null;
 		let cronScheduler = null;
-		try {
-			cronExecutor = new CronExecutor(db, invokeCronHook);
-			const recovered = await cronExecutor.recoverStaleLocks();
-			if (recovered > 0) console.log(`[cron] Recovered ${recovered} stale task lock(s)`);
-			if (typeof globalThis.navigator !== "undefined" && globalThis.navigator.userAgent === "Cloudflare-Workers") cronScheduler = new PiggybackScheduler(cronExecutor);
-			else cronScheduler = new NodeCronScheduler(cronExecutor);
-			cronScheduler.setSystemCleanup(async () => {
-				try {
-					await runSystemCleanup(db, storage ?? void 0);
-				} catch (error) {
-					console.error("[cleanup] System cleanup failed:", error);
-				}
-			});
-			pipeline.setContextFactory({ cronReschedule: () => cronScheduler?.reschedule() });
-			await cronScheduler.start();
-		} catch (error) {
-			console.warn("[cron] Failed to initialize cron system:", error);
-		}
-		return new EmDashRuntime(db, storage, deps.plugins, sandboxedPlugins, deps.sandboxedPluginEntries, pipeline, enabledPlugins, pluginStates, deps.config, mediaProviders, mediaProviderEntries, cronExecutor, cronScheduler, emailPipeline, allPipelinePlugins, pipelineFactoryOptions, deps, pipelineRef);
+		await phase("rt.cron", "Cron init (recovery deferred post-response)", async () => {
+			try {
+				cronExecutor = new CronExecutor(db, invokeCronHook);
+				const executorForRecovery = cronExecutor;
+				after(async () => {
+					try {
+						const recovered = await executorForRecovery.recoverStaleLocks();
+						if (recovered > 0) console.log(`[cron] Recovered ${recovered} stale task lock(s)`);
+					} catch (error) {
+						console.error("[cron] Failed to recover stale task locks:", error);
+					}
+				});
+				if (typeof globalThis.navigator !== "undefined" && globalThis.navigator.userAgent === "Cloudflare-Workers") cronScheduler = new PiggybackScheduler(cronExecutor);
+				else cronScheduler = new NodeCronScheduler(cronExecutor);
+				cronScheduler.setSystemCleanup(async () => {
+					try {
+						await runSystemCleanup(db, storage ?? void 0);
+					} catch (error) {
+						console.error("[cleanup] System cleanup failed:", error);
+					}
+				});
+				pipeline.setContextFactory({ cronReschedule: () => cronScheduler?.reschedule() });
+				await cronScheduler.start();
+			} catch (error) {
+				console.warn("[cron] Failed to initialize cron system:", error);
+			}
+		});
+		const manifestCacheKey = await hashString([
+			COMMIT,
+			...deps.plugins.map((p) => `${p.id}@${p.version ?? ""}`).toSorted(),
+			...deps.sandboxedPluginEntries.map((e) => `${e.id}@${e.version}`).toSorted(),
+			virtualConfig?.i18n?.defaultLocale ?? "",
+			(virtualConfig?.i18n?.locales ?? []).toSorted().join(",")
+		].join("|"));
+		return new EmDashRuntime(db, storage, deps.plugins, sandboxedPlugins, deps.sandboxedPluginEntries, pipeline, enabledPlugins, pluginStates, deps.config, mediaProviders, mediaProviderEntries, cronExecutor, cronScheduler, emailPipeline, allPipelinePlugins, pipelineFactoryOptions, deps, pipelineRef, manifestCacheKey);
 	}
 	/**
 	* Get a media provider by ID
@@ -701,7 +747,7 @@ var EmDashRuntime = class EmDashRuntime {
 	*/
 	static async getDatabase(deps) {
 		const ctx = getRequestContext();
-		if (ctx?.db) return ctx.db;
+		if (ctx?.dbIsIsolated && ctx.db) return ctx.db;
 		const dbConfig = deps.config.database;
 		if (!dbConfig) try {
 			return await getDb();
@@ -713,8 +759,14 @@ var EmDashRuntime = class EmDashRuntime {
 		if (cached) return cached;
 		if (dbInitPromise) return dbInitPromise;
 		dbInitPromise = (async () => {
-			const db = new Kysely({ dialect: deps.createDialect(dbConfig.config) });
-			await runMigrations(db);
+			const db = new Kysely({
+				dialect: deps.createDialect(dbConfig.config),
+				log: kyselyLogOption()
+			});
+			const { applied } = await runMigrations(db);
+			if (applied.length > 0) try {
+				await new OptionsRepository(db).delete("emdash:manifest_cache");
+			} catch {}
 			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 = (() => {
@@ -725,9 +777,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-Cma_PiF6.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-BhSSm-TS.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-DuZDIxfy.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-5uslYdUu.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-CBcmDIot.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-CqsNItbt.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -866,9 +918,52 @@ var EmDashRuntime = class EmDashRuntime {
 		});
 	}
 	/**
-	* Build the manifest (rebuilt on each request for freshness)
+	* Get the manifest, using an in-memory cache with a DB-persisted
+	* fallback for cold starts. Avoids N+1 schema registry queries
+	* on every request.
+	*
+	* Cache is invalidated by invalidateManifest(), called from schema
+	* API routes, MCP server, plugin toggle, and taxonomy def changes.
 	*/
 	async getManifest() {
+		if (getRequestContext()?.dbIsIsolated) return this._buildManifest();
+		if (this._cachedManifest) return this._cachedManifest;
+		try {
+			const cached = await new OptionsRepository(this.db).get("emdash:manifest_cache");
+			if (cached && cached.key === this._manifestCacheKey && cached.manifest) {
+				this._cachedManifest = cached.manifest;
+				return cached.manifest;
+			}
+		} catch {}
+		if (!this._manifestPromise) {
+			let manifestPromise;
+			const isCurrentLoad = () => this._manifestPromise === manifestPromise;
+			manifestPromise = this._loadManifest(isCurrentLoad);
+			this._manifestPromise = manifestPromise;
+		}
+		return this._manifestPromise;
+	}
+	async _loadManifest(isCurrentLoad) {
+		try {
+			const manifest = await this._buildManifest();
+			if (isCurrentLoad()) {
+				this._cachedManifest = manifest;
+				try {
+					await new OptionsRepository(this.db).set("emdash:manifest_cache", {
+						key: this._manifestCacheKey,
+						manifest
+					});
+				} catch {}
+			}
+			return manifest;
+		} finally {
+			if (isCurrentLoad()) this._manifestPromise = null;
+		}
+	}
+	/**
+	* Build the manifest from database (N+1 collection queries).
+	*/
+	async _buildManifest() {
 		const manifestCollections = {};
 		try {
 			const registry = new SchemaRegistry(this.db);
@@ -987,10 +1082,62 @@ var EmDashRuntime = class EmDashRuntime {
 	}
 	/**
 	* Invalidate cached data derived from the manifest/schema.
-	* Called when collections are created, updated, or deleted.
+	* Called when collections, fields, plugins, or taxonomy defs change.
 	*/
 	invalidateManifest() {
+		this._cachedManifest = null;
+		this._manifestPromise = null;
 		invalidateUrlPatternCache();
+		try {
+			new OptionsRepository(this.db).delete("emdash:manifest_cache").catch((error) => {
+				console.error("Failed to delete persisted manifest cache", error);
+			});
+		} catch (error) {
+			console.error("Failed to initialize manifest cache invalidation", error);
+		}
+	}
+	/**
+	* Verify and repair FTS indexes on demand. Runs at most once per worker
+	* lifetime.
+	*
+	* Originally called from `EmDashRuntime.create()`, but on a busy D1 link
+	* (e.g. SIN replica ~80-150ms per query) it added ~1.5s to every cold
+	* start for a modest-sized site — more than every other init phase
+	* combined. Anonymous public reads never touch the search write path,
+	* so the cost isn't paid back for the vast majority of requests.
+	*
+	* Instead, search endpoints call this lazily: the first request that
+	* actually needs the index pays the verify cost (usually fast — no
+	* rebuild needed), everyone else runs cold-free.
+	*
+	* Uses the runtime's singleton database (`this._db`) rather than the
+	* request-scoped DB. Verify reads only, but `rebuildIndex` writes, and
+	* a GET search request on D1 carries a `first-unconstrained` session
+	* that's free to route at a read replica — unsafe for writes. The
+	* singleton always goes through the default binding, which the D1
+	* adapter will promote to `first-primary` for write statements.
+	*
+	* Safe to call concurrently: repeated callers share the same in-flight
+	* promise. Errors are swallowed internally so callers don't need to
+	* defend against FTS not existing yet (pre-setup).
+	*/
+	async ensureSearchHealthy() {
+		if (this._searchHealthChecked) return;
+		if (this._searchHealthPromise) return this._searchHealthPromise;
+		if (!isSqlite(this._db)) {
+			this._searchHealthChecked = true;
+			return;
+		}
+		this._searchHealthPromise = (async () => {
+			try {
+				const repaired = await new FTSManager(this._db).verifyAndRepairAll();
+				if (repaired > 0) console.log(`Repaired ${repaired} corrupted FTS index(es)`);
+			} catch {} finally {
+				this._searchHealthChecked = true;
+				this._searchHealthPromise = null;
+			}
+		})();
+		return this._searchHealthPromise;
 	}
 	async handleContentList(collection, params) {
 		return handleContentList(this.db, collection, params);
@@ -1016,7 +1163,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-BsBoyj8G.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-D7J5y73J.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1248,7 +1395,8 @@ var EmDashRuntime = class EmDashRuntime {
 		if (trustedPlugin && this.enabledPlugins.has(trustedPlugin.id)) {
 			const routeRegistry = new PluginRouteRegistry({
 				db: this.db,
-				emailPipeline: this.email ?? void 0
+				emailPipeline: this.email ?? void 0,
+				trustedProxyHeaders: getTrustedProxyHeaders(this.config)
 			});
 			routeRegistry.register(trustedPlugin);
 			const routeKey = path.replace(LEADING_SLASH_PATTERN, "");
@@ -1391,7 +1539,7 @@ var EmDashRuntime = class EmDashRuntime {
 		} catch {}
 		try {
 			const headers = sanitizeHeadersForSandbox(request.headers);
-			const meta = extractRequestMeta(request);
+			const meta = extractRequestMeta(request, this.config);
 			return {
 				success: true,
 				data: await plugin.invokeRoute(routeName, body, {
@@ -1539,18 +1687,23 @@ function buildDependencies(config) {
 	};
 }
 /**
-* Get or create the runtime instance
+* Get or create the runtime instance.
+*
+* When `initTimings` is provided, any timing samples recorded during a
+* genuine cold init are appended. Subsequent warm calls (hitting the
+* cached instance) push nothing — callers should treat an empty array
+* as "warm, nothing to report".
 */
-async function getRuntime(config) {
+async function getRuntime(config, initTimings) {
 	if (runtimeInstance) return runtimeInstance;
 	if (runtimeInitializing) {
 		await new Promise((resolve) => setTimeout(resolve, 50));
-		return getRuntime(config);
+		return getRuntime(config, initTimings);
 	}
 	runtimeInitializing = true;
 	try {
 		const deps = buildDependencies(config);
-		const runtime = await EmDashRuntime.create(deps);
+		const runtime = await EmDashRuntime.create(deps, initTimings);
 		runtimeInstance = runtime;
 		return runtime;
 	} finally {
@@ -1558,142 +1711,270 @@ async function getRuntime(config) {
 	}
 }
 /**
+* 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.
+*/
+const ASTRO_COOKIES_SYMBOL = Symbol.for("astro.cookies");
+/**
 * Baseline security headers applied to all responses.
 * Admin routes get additional headers (strict CSP) from auth middleware.
 */
-function setBaselineSecurityHeaders(response) {
+function finalizeResponse(response, serverTimings) {
 	const res = new Response(response.body, response);
+	const astroCookies = Reflect.get(response, ASTRO_COOKIES_SYMBOL);
+	if (astroCookies !== void 0) Reflect.set(res, ASTRO_COOKIES_SYMBOL, astroCookies);
 	res.headers.set("X-Content-Type-Options", "nosniff");
 	res.headers.set("Referrer-Policy", "strict-origin-when-cross-origin");
 	res.headers.set("Permissions-Policy", "camera=(), microphone=(), geolocation=(), payment=()");
 	if (!res.headers.has("Content-Security-Policy")) res.headers.set("X-Frame-Options", "SAMEORIGIN");
+	if (serverTimings && serverTimings.length > 0) res.headers.set("Server-Timing", serverTimings.map((t) => {
+		const dur = Math.round(t.dur);
+		return t.desc ? `${t.name};dur=${dur};desc="${t.desc}"` : `${t.name};dur=${dur}`;
+	}).join(", "));
 	return res;
 }
 /** Public routes that require the runtime (sitemap, robots.txt, etc.) */
 const PUBLIC_RUNTIME_ROUTES = new Set(["/sitemap.xml", "/robots.txt"]);
 const SITEMAP_COLLECTION_RE = /^\/sitemap-[a-z][a-z0-9_]*\.xml$/;
+/**
+* Ask the configured database adapter for a per-request scoped Kysely. The
+* adapter encapsulates any per-request semantics (D1 sessions, read-replica
+* routing, bookmark cookies, etc.); core just forwards the cookie jar and
+* request flags and wraps next() in ALS if a scope was returned.
+*/
+function createRequestScopedDb$1(opts) {
+	if (typeof createRequestScopedDb !== "function") return null;
+	return createRequestScopedDb(opts);
+}
 const onRequest = defineMiddleware(async (context, next) => {
 	const { request, locals, cookies } = context;
 	const url = context.url;
-	const isEmDashRoute = url.pathname.startsWith("/_emdash");
-	const isPublicRuntimeRoute = PUBLIC_RUNTIME_ROUTES.has(url.pathname) || SITEMAP_COLLECTION_RE.test(url.pathname);
-	const hasEditCookie = cookies.get("emdash-edit-mode")?.value === "true";
-	const hasPreviewToken = url.searchParams.has("_preview");
-	const playgroundDb = locals.__playgroundDb;
-	if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
-		if (!(context.isPrerendered ? null : await context.session?.get("user")) && !playgroundDb) {
-			if (!setupVerified) try {
-				const { getDb } = await import("../loader-BYzwzORf.mjs").then((n) => n.r);
-				await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
-				setupVerified = true;
-			} catch {
-				return context.redirect("/_emdash/admin/setup");
+	const queryRecorder = isInstrumentationEnabled() ? createRecorder(url.pathname, request.method, request.headers.get("x-perf-phase") ?? "default") : void 0;
+	const run = async () => {
+		const isEmDashRoute = url.pathname.startsWith("/_emdash");
+		const isPublicRuntimeRoute = PUBLIC_RUNTIME_ROUTES.has(url.pathname) || SITEMAP_COLLECTION_RE.test(url.pathname);
+		const hasEditCookie = cookies.get("emdash-edit-mode")?.value === "true";
+		const hasPreviewToken = url.searchParams.has("_preview");
+		const playgroundDb = locals.__playgroundDb;
+		const sessionUser = context.isPrerendered ? null : await context.session?.get("user");
+		if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
+			if (!sessionUser && !playgroundDb) {
+				const timings = [];
+				const mwStart = performance.now();
+				if (!setupVerified) {
+					const t0 = performance.now();
+					try {
+						const { getDb } = await import("../loader-DeiBJEMe.mjs").then((n) => n.r);
+						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
+						setupVerified = true;
+					} catch {
+						return context.redirect("/_emdash/admin/setup");
+					}
+					timings.push({
+						name: "setup",
+						dur: performance.now() - t0,
+						desc: "Setup probe"
+					});
+				}
+				const config = getConfig();
+				if (config) {
+					const initSubTimings = [];
+					const t0 = performance.now();
+					try {
+						const runtime = await getRuntime(config, initSubTimings);
+						setupVerified = true;
+						locals.emdash = {
+							collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
+							collectPageFragments: runtime.collectPageFragments.bind(runtime)
+						};
+					} catch {}
+					timings.push({
+						name: "rt",
+						dur: performance.now() - t0,
+						desc: "Runtime init"
+					});
+					for (const sub of initSubTimings) timings.push(sub);
+				}
+				const anonScoped = createRequestScopedDb$1({
+					config: config?.database?.config,
+					isAuthenticated: false,
+					isWrite: request.method !== "GET" && request.method !== "HEAD",
+					cookies,
+					url
+				});
+				const runAnon = async () => {
+					const t0 = performance.now();
+					const response = await next();
+					timings.push({
+						name: "render",
+						dur: performance.now() - t0,
+						desc: "Page render"
+					});
+					timings.push({
+						name: "mw",
+						dur: performance.now() - mwStart,
+						desc: "Total middleware"
+					});
+					return finalizeResponse(response, timings);
+				};
+				if (anonScoped) {
+					const parent = getRequestContext();
+					return runWithContext(parent ? {
+						...parent,
+						db: anonScoped.db
+					} : {
+						editMode: false,
+						db: anonScoped.db
+					}, async () => {
+						const response = await runAnon();
+						anonScoped.commit();
+						return response;
+					});
+				}
+				return runAnon();
 			}
-			const config = getConfig();
-			if (config) try {
-				const runtime = await getRuntime(config);
+		}
+		const config = getConfig();
+		if (!config) {
+			console.error("EmDash: No configuration found");
+			return finalizeResponse(await next());
+		}
+		const doInit = async () => {
+			const timings = [];
+			const mwStart = performance.now();
+			try {
+				const initSubTimings = [];
+				let t0 = performance.now();
+				const runtime = await getRuntime(config, initSubTimings);
+				timings.push({
+					name: "rt",
+					dur: performance.now() - t0,
+					desc: "Runtime init"
+				});
+				for (const sub of initSubTimings) timings.push(sub);
 				setupVerified = true;
+				t0 = performance.now();
+				const manifest = await runtime.getManifest();
+				timings.push({
+					name: "manifest",
+					dur: performance.now() - t0,
+					desc: "Manifest"
+				});
+				locals.emdashManifest = manifest;
 				locals.emdash = {
+					handleContentList: runtime.handleContentList.bind(runtime),
+					handleContentGet: runtime.handleContentGet.bind(runtime),
+					handleContentCreate: runtime.handleContentCreate.bind(runtime),
+					handleContentUpdate: runtime.handleContentUpdate.bind(runtime),
+					handleContentDelete: runtime.handleContentDelete.bind(runtime),
+					handleContentListTrashed: runtime.handleContentListTrashed.bind(runtime),
+					handleContentRestore: runtime.handleContentRestore.bind(runtime),
+					handleContentPermanentDelete: runtime.handleContentPermanentDelete.bind(runtime),
+					handleContentCountTrashed: runtime.handleContentCountTrashed.bind(runtime),
+					handleContentGetIncludingTrashed: runtime.handleContentGetIncludingTrashed.bind(runtime),
+					handleContentDuplicate: runtime.handleContentDuplicate.bind(runtime),
+					handleContentPublish: runtime.handleContentPublish.bind(runtime),
+					handleContentUnpublish: runtime.handleContentUnpublish.bind(runtime),
+					handleContentSchedule: runtime.handleContentSchedule.bind(runtime),
+					handleContentUnschedule: runtime.handleContentUnschedule.bind(runtime),
+					handleContentCountScheduled: runtime.handleContentCountScheduled.bind(runtime),
+					handleContentDiscardDraft: runtime.handleContentDiscardDraft.bind(runtime),
+					handleContentCompare: runtime.handleContentCompare.bind(runtime),
+					handleContentTranslations: runtime.handleContentTranslations.bind(runtime),
+					handleMediaList: runtime.handleMediaList.bind(runtime),
+					handleMediaGet: runtime.handleMediaGet.bind(runtime),
+					handleMediaCreate: runtime.handleMediaCreate.bind(runtime),
+					handleMediaUpdate: runtime.handleMediaUpdate.bind(runtime),
+					handleMediaDelete: runtime.handleMediaDelete.bind(runtime),
+					handleRevisionList: runtime.handleRevisionList.bind(runtime),
+					handleRevisionGet: runtime.handleRevisionGet.bind(runtime),
+					handleRevisionRestore: runtime.handleRevisionRestore.bind(runtime),
+					handlePluginApiRoute: runtime.handlePluginApiRoute.bind(runtime),
+					getPluginRouteMeta: runtime.getPluginRouteMeta.bind(runtime),
+					getMediaProvider: runtime.getMediaProvider.bind(runtime),
+					getMediaProviderList: runtime.getMediaProviderList.bind(runtime),
 					collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
-					collectPageFragments: runtime.collectPageFragments.bind(runtime)
+					collectPageFragments: runtime.collectPageFragments.bind(runtime),
+					ensureSearchHealthy: runtime.ensureSearchHealthy.bind(runtime),
+					storage: runtime.storage,
+					db: runtime.db,
+					hooks: runtime.hooks,
+					email: runtime.email,
+					configuredPlugins: runtime.configuredPlugins,
+					config,
+					invalidateManifest: runtime.invalidateManifest.bind(runtime),
+					getSandboxRunner: runtime.getSandboxRunner.bind(runtime),
+					syncMarketplacePlugins: runtime.syncMarketplacePlugins.bind(runtime),
+					setPluginStatus: runtime.setPluginStatus.bind(runtime)
 				};
-			} catch {}
-			return setBaselineSecurityHeaders(await next());
-		}
-	}
-	const config = getConfig();
-	if (!config) {
-		console.error("EmDash: No configuration found");
-		return next();
-	}
-	const doInit = async () => {
-		try {
-			const runtime = await getRuntime(config);
-			setupVerified = true;
-			locals.emdashManifest = await runtime.getManifest();
-			locals.emdash = {
-				handleContentList: runtime.handleContentList.bind(runtime),
-				handleContentGet: runtime.handleContentGet.bind(runtime),
-				handleContentCreate: runtime.handleContentCreate.bind(runtime),
-				handleContentUpdate: runtime.handleContentUpdate.bind(runtime),
-				handleContentDelete: runtime.handleContentDelete.bind(runtime),
-				handleContentListTrashed: runtime.handleContentListTrashed.bind(runtime),
-				handleContentRestore: runtime.handleContentRestore.bind(runtime),
-				handleContentPermanentDelete: runtime.handleContentPermanentDelete.bind(runtime),
-				handleContentCountTrashed: runtime.handleContentCountTrashed.bind(runtime),
-				handleContentGetIncludingTrashed: runtime.handleContentGetIncludingTrashed.bind(runtime),
-				handleContentDuplicate: runtime.handleContentDuplicate.bind(runtime),
-				handleContentPublish: runtime.handleContentPublish.bind(runtime),
-				handleContentUnpublish: runtime.handleContentUnpublish.bind(runtime),
-				handleContentSchedule: runtime.handleContentSchedule.bind(runtime),
-				handleContentUnschedule: runtime.handleContentUnschedule.bind(runtime),
-				handleContentCountScheduled: runtime.handleContentCountScheduled.bind(runtime),
-				handleContentDiscardDraft: runtime.handleContentDiscardDraft.bind(runtime),
-				handleContentCompare: runtime.handleContentCompare.bind(runtime),
-				handleContentTranslations: runtime.handleContentTranslations.bind(runtime),
-				handleMediaList: runtime.handleMediaList.bind(runtime),
-				handleMediaGet: runtime.handleMediaGet.bind(runtime),
-				handleMediaCreate: runtime.handleMediaCreate.bind(runtime),
-				handleMediaUpdate: runtime.handleMediaUpdate.bind(runtime),
-				handleMediaDelete: runtime.handleMediaDelete.bind(runtime),
-				handleRevisionList: runtime.handleRevisionList.bind(runtime),
-				handleRevisionGet: runtime.handleRevisionGet.bind(runtime),
-				handleRevisionRestore: runtime.handleRevisionRestore.bind(runtime),
-				handlePluginApiRoute: runtime.handlePluginApiRoute.bind(runtime),
-				getPluginRouteMeta: runtime.getPluginRouteMeta.bind(runtime),
-				getMediaProvider: runtime.getMediaProvider.bind(runtime),
-				getMediaProviderList: runtime.getMediaProviderList.bind(runtime),
-				collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
-				collectPageFragments: runtime.collectPageFragments.bind(runtime),
-				storage: runtime.storage,
-				db: runtime.db,
-				hooks: runtime.hooks,
-				email: runtime.email,
-				configuredPlugins: runtime.configuredPlugins,
-				config,
-				invalidateManifest: runtime.invalidateManifest.bind(runtime),
-				getSandboxRunner: runtime.getSandboxRunner.bind(runtime),
-				syncMarketplacePlugins: runtime.syncMarketplacePlugins.bind(runtime),
-				setPluginStatus: runtime.setPluginStatus.bind(runtime)
+			} catch (error) {
+				console.error("EmDash middleware error:", error);
+			}
+			const scoped = createRequestScopedDb$1({
+				config: config?.database?.config,
+				isAuthenticated: !!sessionUser,
+				isWrite: request.method !== "GET" && request.method !== "HEAD",
+				cookies: context.cookies,
+				url
+			});
+			const renderAndFinalize = async () => {
+				const t0 = performance.now();
+				const response = await next();
+				timings.push({
+					name: "render",
+					dur: performance.now() - t0,
+					desc: "Page render"
+				});
+				timings.push({
+					name: "mw",
+					dur: performance.now() - mwStart,
+					desc: "Total middleware"
+				});
+				return finalizeResponse(response, timings);
 			};
-		} catch (error) {
-			console.error("EmDash middleware error:", error);
-		}
-		const dbConfig = config?.database?.config;
-		if (dbConfig && typeof isSessionEnabled === "function" && isSessionEnabled(dbConfig) && typeof getD1Binding === "function" && createSessionDialect) {
-			const d1Binding = getD1Binding(dbConfig);
-			if (d1Binding && typeof d1Binding === "object" && "withSession" in d1Binding) {
-				const isAuthenticated = context.isPrerendered ? false : !!await context.session?.get("user");
-				const isWrite = request.method !== "GET" && request.method !== "HEAD";
-				const configConstraint = getDefaultConstraint(dbConfig);
-				const cookieName = getBookmarkCookieName(dbConfig);
-				let constraint = configConstraint;
-				if (isAuthenticated && isWrite) constraint = "first-primary";
-				else if (isAuthenticated) {
-					const bookmarkCookie = context.cookies.get(cookieName);
-					if (bookmarkCookie?.value) constraint = bookmarkCookie.value;
-				}
-				const session = d1Binding.withSession.call(d1Binding, constraint);
-				return runWithContext({
+			if (scoped) {
+				const parent = getRequestContext();
+				return runWithContext(parent ? {
+					...parent,
+					db: scoped.db
+				} : {
 					editMode: false,
-					db: new Kysely({ dialect: createSessionDialect(session) })
+					db: scoped.db
 				}, async () => {
-					const response = setBaselineSecurityHeaders(await next());
-					if (isAuthenticated && session && typeof session === "object" && "getBookmark" in session) {
-						const newBookmark = session.getBookmark.call(session);
-						if (newBookmark) response.headers.append("Set-Cookie", `${cookieName}=${newBookmark}; Path=/; HttpOnly; SameSite=Lax; Secure`);
-					}
+					const response = await renderAndFinalize();
+					scoped.commit();
 					return response;
 				});
 			}
+			return renderAndFinalize();
+		};
+		if (playgroundDb) {
+			const editMode = context.cookies.get("emdash-edit-mode")?.value === "true";
+			const parent = getRequestContext();
+			return runWithContext(parent ? {
+				...parent,
+				editMode,
+				db: playgroundDb,
+				dbIsIsolated: true
+			} : {
+				editMode,
+				db: playgroundDb,
+				dbIsIsolated: true
+			}, doInit);
 		}
-		return setBaselineSecurityHeaders(await next());
+		return doInit();
 	};
-	if (playgroundDb) return runWithContext({
-		editMode: context.cookies.get("emdash-edit-mode")?.value === "true",
-		db: playgroundDb
-	}, doInit);
-	return doInit();
+	if (queryRecorder) try {
+		return await runWithContext({
+			editMode: false,
+			queryRecorder
+		}, run);
+	} finally {
+		flushRecorder(queryRecorder);
+	}
+	return run();
 });
 
 //#endregion