emdash 0.17.1 → 0.18.0

package/dist/astro/middleware.mjs

@@ -1,50 +1,51 @@
-import { r as runMigrations } from "../runner-eAgyIkeg.mjs";
+import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner-pt6Wl-l-.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
-import { o as isSqlite } from "../dialect-helpers-BKCvISIQ.mjs";
+import { o as isSqlite } from "../dialect-helpers-DRI5pyY3.mjs";
 import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { _ as definePlugin, f as PluginRouteRegistry, g as resolveExclusiveHooks, h as createHookPipeline, p as EmailPipeline, v as after } from "../menus-CyMO6GBx.mjs";
-import { r as RevisionRepository } from "../content-BbqKo3Kc.mjs";
+import { _ as definePlugin, f as PluginRouteRegistry, g as resolveExclusiveHooks, h as createHookPipeline, p as EmailPipeline, v as after } from "../menus-BKkxXCmd.mjs";
+import { r as RevisionRepository } from "../content-CyqOmOzm.mjs";
 import "../base64-CqR-7kqF.mjs";
-import "../types-SF1DwGf2.mjs";
-import { t as MediaRepository } from "../media-jk_HzzOl.mjs";
-import "../user-X4rtyO4Y.mjs";
-import "../taxonomy-BBK-UAEo.mjs";
-import "../comment-Cd29aktf.mjs";
+import "../types-K3MDsxpy.mjs";
+import { t as MediaRepository } from "../media-C-oovGCG.mjs";
+import "../user-DzEUl5zA.mjs";
+import "../taxonomy-DTZrIQpi.mjs";
+import "../comment-C4jVbCM8.mjs";
 import { t as OptionsRepository } from "../options-BL4X94qY.mjs";
-import "../context-BsF1rhoI.mjs";
-import "../menus-B-5-3aon.mjs";
-import "../redirect-BZUJltlj.mjs";
+import "../context-DZ7bEh5-.mjs";
+import "../menus-DugoYwTX.mjs";
+import "../redirect-C6tJA7tk.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
 import { r as requestCached } from "../request-cache-BYMs-BGX.mjs";
 import "../byline-registry-CxK5g559.mjs";
-import "../byline-BrIVWLm-.mjs";
+import "../byline-CWQ9aSoz.mjs";
 import { t as normalizeMediaValue } from "../normalize-DVV8nbrL.mjs";
 import "../placeholder-BZxr8W1j.mjs";
-import "../seo-BTzb5ksq.mjs";
-import { $ as handleContentGetIncludingTrashed, B as handleMediaUpdate, G as handleContentCompare, H as handleRevisionList, I as handleMediaCreate, J as handleContentCreate, K as handleContentCountScheduled, L as handleMediaDelete, Q as handleContentGet, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDiscardDraft, Y as handleContentDelete, Z as handleContentDuplicate, _ as loadBundleFromR2, at as handleContentSchedule, ct as handleContentUnschedule, et as handleContentList, it as handleContentRestore, lt as handleContentUpdate, nt as handleContentPermanentDelete, ot as handleContentTranslations, q as handleContentCountTrashed, rt as handleContentPublish, s as normalizeRegistryConfig, st as handleContentUnpublish, tt as handleContentListTrashed, ut as validateRev, z as handleMediaList } from "../api-Dmz40c2V.mjs";
-import "../dashboard-BwIX9r-X.mjs";
+import "../seo-BR39kvTF.mjs";
+import { n as isMissingTableError } from "../db-errors-CtzxKBxe.mjs";
+import { $ as handleContentGetIncludingTrashed, B as handleMediaUpdate, G as handleContentCompare, H as handleRevisionList, I as handleMediaCreate, J as handleContentCreate, K as handleContentCountScheduled, L as handleMediaDelete, Q as handleContentGet, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDiscardDraft, Y as handleContentDelete, Z as handleContentDuplicate, _ as loadBundleFromR2, at as handleContentSchedule, ct as handleContentUnschedule, et as handleContentList, it as handleContentRestore, lt as handleContentUpdate, nt as handleContentPermanentDelete, ot as handleContentTranslations, q as handleContentCountTrashed, rt as handleContentPublish, s as normalizeRegistryConfig, st as handleContentUnpublish, tt as handleContentListTrashed, ut as validateRev, z as handleMediaList } from "../api-Cs7DAACP.mjs";
+import "../dashboard-B5WQpNTP.mjs";
 import { n as hashString } from "../hash-9w3pd3-m.mjs";
-import { t as FTSManager } from "../fts-manager-DmUAk-kQ.mjs";
-import { n as SchemaRegistry } from "../registry-Dn6gsx3L.mjs";
+import { t as FTSManager } from "../fts-manager-DR1ERA0c.mjs";
+import { n as SchemaRegistry } from "../registry-CIDxZbhh.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { r as getDb } from "../loader-CJ6lWO0d.mjs";
-import "../schema--mYZX4D7.mjs";
-import "../zod-generator-BNAObjSt.mjs";
+import { r as getDb } from "../loader-Dyx8dhFV.mjs";
+import "../schema-B4tk0HAG.mjs";
+import "../zod-generator-BSDpkqSH.mjs";
 import "../seo-DfjLvu8i.mjs";
-import "../sections-Ba-rJLKb.mjs";
-import { o as invalidateSiteSettingsCache } from "../settings-ChlQbwU0.mjs";
-import "../settings-C65OSm41.mjs";
+import "../sections-biElLfT9.mjs";
+import { o as invalidateSiteSettingsCache } from "../settings-b5zW1R1T.mjs";
+import "../settings-D_NJvjgN.mjs";
 import "../resolve-BqYMVG0D.mjs";
-import "../taxonomies-ByLlXrv5.mjs";
-import "../taxonomies-CbO6v7EE.mjs";
+import "../taxonomies-Crtzy4MT.mjs";
+import "../taxonomies-Mhn9rjTQ.mjs";
 import { r as normalizeManifestRoute } from "../manifest-schema-Cj-YrzrF.mjs";
 import "../types-Cj2S6FuC.mjs";
 import "../ssrf-BsVGIE0Z.mjs";
-import "../error-npZWBSb7.mjs";
-import "../parse-4zO5Y2DL.mjs";
+import "../error-DJOsMVSt.mjs";
+import "../parse-BBkFmLVr.mjs";
 import "../redirects-C0L9JUk4.mjs";
 import "../byline-fields-Dr-xcb6S.mjs";
-import { a as invalidateUrlPatternCache } from "../query-Bt52mHXp.mjs";
+import { a as invalidateUrlPatternCache } from "../query-Ctlq1aOk.mjs";
 import "../import-Dh8bWmyq.mjs";
 import { t as getTrustedProxyHeaders } from "../trusted-proxy-B4AfnoAp.mjs";
 import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-7ByVLxB-.mjs";
@@ -54,13 +55,13 @@ import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from ".
 import "../utils-C4Ih4DML.mjs";
 import "../tokens-Bx2afeT-.mjs";
 import "../preview-BfuRkVKW.mjs";
-import "../bylines-C_POWmGT.mjs";
-import "../widgets-DG-1jxnz.mjs";
-import "../apply-CuuZG6op.mjs";
-import "../load-DsoLq7ex.mjs";
-import "../search-C6U_NvZI.mjs";
+import "../bylines-BJSva1Un.mjs";
+import "../widgets-Bap1eS1X.mjs";
+import "../apply-BWMV4Zmw.mjs";
+import "../load-6ZrRhepW.mjs";
+import "../search-f-fNfwab.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-CWbvq9LG.mjs";
+import { n as VERSION, t as COMMIT } from "../version-CnS-Cr8A.mjs";
 import { t as getAuthMode } from "../mode-BjlXswIw.mjs";
 import { t as cleanupExpiredChallenges } from "../challenge-store-DGwuCc4R.mjs";
 import { a as validateEncryptionKeyAtStartup } from "../secrets-YYbTgB1w.mjs";
@@ -75,6 +76,60 @@ import { sandboxedPlugins } from "virtual:emdash/sandboxed-plugins";
 import { createStorage } from "virtual:emdash/storage";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 
+//#region src/utils/init-lock.ts
+function createInitLock() {
+	return {
+		ownerStartedAt: null,
+		generation: 0
+	};
+}
+const DEFAULT_DEADLINE_MS = 15e3;
+const DEFAULT_POLL_MS = 50;
+const MAX_WAIT_HEADROOM_MS = 15e3;
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+* Return the cached value if present, otherwise initialize it under the
+* lock. `init` is responsible for storing the value so that `getCached`
+* returns it on subsequent calls — waiters re-check `getCached` after the
+* owner finishes rather than sharing the owner's promise.
+*
+* `init` receives an `isCurrentClaim` predicate and must gate its cache
+* publication on it: a slow init that was reclaimed past the deadline
+* must not overwrite the value published by the reclaimer (for the
+* runtime singleton that would orphan the reclaimer's active cron
+* scheduler). A losing init should also tear down any side resources it
+* started, since its result will never be published.
+*/
+async function initWithLock(lock, getCached, init, options) {
+	const deadlineMs = options?.deadlineMs ?? DEFAULT_DEADLINE_MS;
+	const pollMs = options?.pollMs ?? DEFAULT_POLL_MS;
+	const maxWaitMs = options?.maxWaitMs ?? deadlineMs + MAX_WAIT_HEADROOM_MS;
+	const waitStart = Date.now();
+	for (;;) {
+		const cached = getCached();
+		if (cached !== null && cached !== void 0) return cached;
+		const ownerStartedAt = lock.ownerStartedAt;
+		if (ownerStartedAt === null || Date.now() - ownerStartedAt > deadlineMs) {
+			lock.generation += 1;
+			const claim = lock.generation;
+			lock.ownerStartedAt = Date.now();
+			try {
+				const isCurrentClaim = () => lock.generation === claim;
+				const initPromise = Promise.resolve().then(() => init(isCurrentClaim));
+				options?.anchor?.(initPromise.then(() => void 0, () => void 0));
+				return await initPromise;
+			} finally {
+				if (lock.generation === claim) lock.ownerStartedAt = null;
+			}
+		}
+		if (Date.now() - waitStart > maxWaitMs) throw new Error(`initWithLock: timed out after ${maxWaitMs}ms waiting for initialization`);
+		await sleep(pollMs);
+	}
+}
+
+//#endregion
 //#region src/cleanup.ts
 /**
 * System cleanup
@@ -380,8 +435,35 @@ const FIELD_TYPE_TO_KIND = {
 function contentItemToRecord(item) {
 	return { ...item };
 }
-const dbCache = /* @__PURE__ */ new Map();
-let dbInitPromise = null;
+/**
+* Db init lock reclaim deadline. Derived from the migration race wait so
+* they can't drift apart: a healthy init can legitimately block for the
+* full MIGRATION_RACE_WAIT_MS inside waitForConcurrentMigrator, plus cold
+* connect and migrator work, before it should be presumed dead. The outer
+* runtime init lock (middleware.ts) must use a strictly larger deadline —
+* it wraps create() → getDatabase() → this lock, and equal deadlines would
+* let the outer reclaim while the inner is legitimately still working.
+*/
+const DB_INIT_DEADLINE_MS = MIGRATION_RACE_WAIT_MS + 2e4;
+/**
+* Db cache + its init lock live on globalThis behind a Symbol: the bundler
+* can duplicate this module across SSR chunks (same reasoning as
+* request-cache.ts), and a duplicated cache/lock would mean concurrent
+* independent db inits — and duplicate migrators — per isolate.
+*/
+const DB_HOLDER_KEY = Symbol.for("emdash:db-cache");
+const globalSymbolStore = globalThis;
+function getDbHolder() {
+	let holder = globalSymbolStore[DB_HOLDER_KEY];
+	if (!holder) {
+		holder = {
+			cache: /* @__PURE__ */ new Map(),
+			lock: createInitLock()
+		};
+		globalSymbolStore[DB_HOLDER_KEY] = holder;
+	}
+	return holder;
+}
 const storageCache = /* @__PURE__ */ new Map();
 const sandboxedPluginCache = /* @__PURE__ */ new Map();
 /**
@@ -794,19 +876,13 @@ var EmDashRuntime = class EmDashRuntime {
 		await phase("rt.secrets", "Validate encryption key", () => validateEncryptionKeyAtStartup());
 		const storage = EmDashRuntime.getStorage(deps);
 		let pluginStates = /* @__PURE__ */ new Map();
-		await phase("rt.plugins", "Plugin states", async () => {
+		let siteInfo;
+		await Promise.all([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;
-		await phase("rt.site", "Site info options", async () => {
+		}), phase("rt.site", "Site info options", async () => {
 			try {
 				const siteOpts = await new OptionsRepository(db).getMany([
 					"emdash:site_title",
@@ -819,7 +895,12 @@ var EmDashRuntime = class EmDashRuntime {
 					locale: siteOpts.get("emdash:locale") ?? void 0
 				};
 			} 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);
+		}
 		const allPipelinePlugins = [...deps.plugins];
 		const bypassedPluginsList = [];
 		if (import.meta.env.DEV) try {
@@ -880,8 +961,10 @@ var EmDashRuntime = class EmDashRuntime {
 		};
 		const pipeline = createHookPipeline(enabledPluginList, pipelineFactoryOptions);
 		const sandboxedPlugins = await phase("rt.sandbox", "Sandboxed plugins", () => EmDashRuntime.loadSandboxedPlugins(deps, db, storage));
-		if (deps.config.marketplace && storage && !deps.sandboxBypassed) await phase("rt.market", "Marketplace plugins", () => EmDashRuntime.loadInstalledSandboxedPlugins("marketplace", db, storage, deps, sandboxedPlugins));
-		if (deps.config.experimental?.registry && storage) await phase("rt.registry", "Registry plugins", () => EmDashRuntime.loadInstalledSandboxedPlugins("registry", db, storage, deps, sandboxedPlugins));
+		const installedTierPhases = [];
+		if (deps.config.marketplace && storage && !deps.sandboxBypassed) installedTierPhases.push(phase("rt.market", "Marketplace plugins", () => EmDashRuntime.loadInstalledSandboxedPlugins("marketplace", db, storage, deps, sandboxedPlugins)));
+		if (deps.config.experimental?.registry && storage) installedTierPhases.push(phase("rt.registry", "Registry plugins", () => EmDashRuntime.loadInstalledSandboxedPlugins("registry", db, storage, deps, sandboxedPlugins)));
+		if (installedTierPhases.length > 0) await Promise.all(installedTierPhases);
 		const mediaProviders = /* @__PURE__ */ new Map();
 		const mediaProviderEntries = deps.mediaProviderEntries ?? [];
 		const providerContext = {
@@ -986,10 +1069,8 @@ var EmDashRuntime = class EmDashRuntime {
 			throw new Error("EmDash database not configured. Either configure database in astro.config.mjs or use emdashLoader in live.config.ts");
 		}
 		const cacheKey = dbConfig.entrypoint;
-		const cached = dbCache.get(cacheKey);
-		if (cached) return cached;
-		if (dbInitPromise) return dbInitPromise;
-		dbInitPromise = (async () => {
+		const holder = getDbHolder();
+		return initWithLock(holder.lock, () => holder.cache.get(cacheKey), async (isCurrentClaim) => {
 			const db = new Kysely({
 				dialect: deps.createDialect(dbConfig.config),
 				log: kyselyLogOption()
@@ -1005,9 +1086,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-CuuZG6op.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-DsoLq7ex.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-DactmcJG.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-BWMV4Zmw.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-6ZrRhepW.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-JCXcsqiY.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -1015,14 +1096,12 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				}
 			} catch {}
-			dbCache.set(cacheKey, db);
+			if (isCurrentClaim()) holder.cache.set(cacheKey, db);
 			return db;
-		})();
-		try {
-			return await dbInitPromise;
-		} finally {
-			dbInitPromise = null;
-		}
+		}, {
+			deadlineMs: DB_INIT_DEADLINE_MS,
+			anchor: (promise) => after(() => promise)
+		});
 	}
 	/**
 	* Get or create storage instance
@@ -1281,6 +1360,7 @@ var EmDashRuntime = class EmDashRuntime {
 			pipeline,
 			isActive: () => true,
 			getOption: (key) => optionsRepo.get(key),
+			getOptions: (keys) => optionsRepo.getMany(keys),
 			setOption: (key, value) => optionsRepo.set(key, value),
 			deleteOption: async (key) => {
 				await optionsRepo.delete(key);
@@ -1539,7 +1619,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-BYA4i85b.mjs");
+		const { validateContentData } = await import("../validation-Bq-VyKJg.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1555,7 +1635,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-BbqKo3Kc.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-CyqOmOzm.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;
@@ -1582,7 +1662,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-BYA4i85b.mjs");
+			const { validateContentData } = await import("../validation-Bq-VyKJg.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -2122,6 +2202,70 @@ function createPublicMediaUrlResolver(storage) {
 	return (key) => resolvePublicMediaUrl(storage, key);
 }
 
+//#endregion
+//#region src/astro/middleware/stream-end-metrics.ts
+/**
+* Stream-end metrics
+*
+* Server-Timing db.* counters are snapshotted when middleware's next()
+* returns — but at that point only the response *headers* are final.
+* Astro streams the body afterwards, and components rendered during
+* streaming issue further DB queries that the headers can never report.
+*
+* This module wraps the response body in an identity TransformStream and
+* snapshots the request metrics in flush(), i.e. when the body actually
+* finishes streaming. The metrics object lives on the request context
+* (AsyncLocalStorage) and is mutated in-place by the Kysely log hook, so
+* a reference captured before wrapping observes every post-header query.
+* The snapshot is emitted as prefixed NDJSON on stdout (same transport as
+* [emdash-query-log] — console.log works in both Node and workerd).
+*
+* Gated on isInstrumentationEnabled() (EMDASH_QUERY_LOG=1): zero overhead
+* in normal production traffic.
+*/
+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
+* are attached (e.g. outside the middleware's ALS context).
+*/
+function wrapBodyForStreamMetrics(response) {
+	if (!isInstrumentationEnabled()) return response;
+	if (!response.body) return response;
+	const ctx = getRequestContext();
+	const metrics = ctx?.metrics;
+	if (!metrics) return response;
+	const recorder = ctx?.queryRecorder;
+	const transform = new TransformStream({ flush() {
+		const snapshot = {
+			route: recorder?.route,
+			method: recorder?.method,
+			phase: recorder?.phase,
+			totalMs: performance.now() - metrics.start,
+			dbCount: metrics.dbCount,
+			dbTotalMs: metrics.dbTotalMs,
+			dbFirstOffset: metrics.dbFirstOffset,
+			dbLastOffset: metrics.dbLastOffset,
+			cacheHits: metrics.cacheHits,
+			cacheMisses: metrics.cacheMisses
+		};
+		console.log(`${STREAM_END_PREFIX} ${JSON.stringify(snapshot)}`);
+	} });
+	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);
+	wrapped.headers.delete("Content-Length");
+	return wrapped;
+}
+
 //#endregion
 //#region src/astro/public-plugin-api-routes.ts
 function pluginRouteNotFound() {
@@ -2148,10 +2292,14 @@ function createPublicPluginApiRouteHandler(runtime) {
 * Thin wrapper that initializes EmDashRuntime and attaches it to locals.
 * All heavy lifting happens in EmDashRuntime.
 */
-let runtimeInstance = null;
-let runtimeInitializing = false;
-/** Whether i18n config has been initialized from the virtual module */
-let i18nInitialized = false;
+/**
+* Runtime init lock reclaim deadline. Must be strictly larger than the db
+* init deadline: this lock wraps EmDashRuntime.create() → getDatabase() →
+* the db init lock, and equal deadlines would let this outer lock reclaim
+* (spawning a second cron scheduler and sandbox runner) while the inner db
+* init is legitimately still working through a contended migration.
+*/
+const RUNTIME_INIT_DEADLINE_MS = DB_INIT_DEADLINE_MS + 15e3;
 /**
 * Whether we've verified the database has been set up.
 * On a fresh deployment the first request may hit a public page, bypassing
@@ -2159,8 +2307,43 @@ let i18nInitialized = false;
 * would query an empty database and crash. Once verified (or once the runtime
 * has initialized via an admin/API request), this stays true for the worker's
 * lifetime.
+*
+* Stored on globalThis behind a Symbol key so the flag is a true singleton
+* even when the bundler duplicates this module across SSR chunks (same
+* pattern as request-cache.ts). A plain module-scoped `let` becomes multiple
+* independent variables, which would make the setup probe re-run far more
+* often than intended — and every re-run is another chance for a transient
+* DB error to be misread as "fresh install" and bounce visitors to setup.
 */
-let setupVerified = false;
+const SETUP_VERIFIED_KEY = Symbol.for("emdash:setup-verified");
+const setupFlagStore = globalThis;
+function isSetupVerified() {
+	return setupFlagStore[SETUP_VERIFIED_KEY] === true;
+}
+function markSetupVerified() {
+	setupFlagStore[SETUP_VERIFIED_KEY] = true;
+}
+/**
+* The runtime singleton and its init lock live on globalThis behind a
+* Symbol — same reasoning as SETUP_VERIFIED_KEY above: the bundler can
+* duplicate this module across SSR chunks, and a duplicated instance/lock
+* would mean multiple runtimes (each with its own cron scheduler) per
+* isolate, initializing and reclaiming independently.
+*/
+const RUNTIME_HOLDER_KEY = Symbol.for("emdash:runtime-holder");
+function getRuntimeHolder() {
+	let holder = setupFlagStore[RUNTIME_HOLDER_KEY];
+	if (!holder) {
+		holder = {
+			instance: null,
+			lock: createInitLock()
+		};
+		setupFlagStore[RUNTIME_HOLDER_KEY] = holder;
+	}
+	return holder;
+}
+/** Whether i18n config has been initialized from the virtual module */
+let i18nInitialized = false;
 /**
 * Get EmDash configuration from virtual module
 */
@@ -2208,20 +2391,19 @@ function buildDependencies(config) {
 * as "warm, nothing to report".
 */
 async function getRuntime(config, initTimings) {
-	if (runtimeInstance) return runtimeInstance;
-	if (runtimeInitializing) {
-		await new Promise((resolve) => setTimeout(resolve, 50));
-		return getRuntime(config, initTimings);
-	}
-	runtimeInitializing = true;
-	try {
+	const holder = getRuntimeHolder();
+	return initWithLock(holder.lock, () => holder.instance, async (isCurrentClaim) => {
 		const deps = buildDependencies(config);
 		const runtime = await EmDashRuntime.create(deps, initTimings);
-		runtimeInstance = runtime;
+		if (isCurrentClaim()) holder.instance = runtime;
+		else runtime.stopCron().catch((error) => {
+			console.error("[emdash] failed to stop superseded runtime's cron:", error);
+		});
 		return runtime;
-	} finally {
-		runtimeInitializing = false;
-	}
+	}, {
+		deadlineMs: RUNTIME_INIT_DEADLINE_MS,
+		anchor: (promise) => after(() => promise)
+	});
 }
 /**
 * Astro attaches AstroCookies to outgoing responses via a well-known global
@@ -2324,14 +2506,15 @@ const onRequest = defineMiddleware(async (context, next) => {
 			if (!sessionUser && !playgroundDb) {
 				const timings = [];
 				const mwStart = performance.now();
-				if (!setupVerified) {
+				if (!isSetupVerified()) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-CJ6lWO0d.mjs").then((n) => n.i);
+						const { getDb } = await import("../loader-Dyx8dhFV.mjs").then((n) => n.i);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
-						setupVerified = true;
-					} catch {
-						return context.redirect("/_emdash/admin/setup");
+						markSetupVerified();
+					} catch (error) {
+						if (isMissingTableError(error)) return context.redirect("/_emdash/admin/setup");
+						console.error("Setup probe failed (non-fatal):", error);
 					}
 					timings.push({
 						name: "setup",
@@ -2345,7 +2528,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 					const t0 = performance.now();
 					try {
 						const runtime = await getRuntime(config, initSubTimings);
-						setupVerified = true;
+						markSetupVerified();
 						locals.emdash = {
 							handlePublicPluginApiRoute: createPublicPluginApiRouteHandler(runtime),
 							collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
@@ -2381,7 +2564,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 						desc: "Total middleware"
 					});
 					pushMetricsTimings(timings, metrics);
-					return finalizeResponse(response, timings);
+					return wrapBodyForStreamMetrics(finalizeResponse(response, timings));
 				};
 				if (anonScoped) {
 					const parent = getRequestContext();
@@ -2419,7 +2602,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 					desc: "Runtime init"
 				});
 				for (const sub of initSubTimings) timings.push(sub);
-				setupVerified = true;
+				markSetupVerified();
 				locals.emdash = {
 					handleContentList: runtime.handleContentList.bind(runtime),
 					handleContentGet: runtime.handleContentGet.bind(runtime),
@@ -2495,7 +2678,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 					desc: "Total middleware"
 				});
 				pushMetricsTimings(timings, metrics);
-				return finalizeResponse(response, timings);
+				return wrapBodyForStreamMetrics(finalizeResponse(response, timings));
 			};
 			if (scoped) {
 				const parent = getRequestContext();