emdash 0.7.0 → 0.9.0

package/dist/astro/middleware.mjs

@@ -1,31 +1,36 @@
+import { r as runMigrations } from "../runner-C7ADox5q.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-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 { 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 { o as isSqlite } from "../dialect-helpers-BKCvISIQ.mjs";
+import { At as handleContentTranslations, Ct as handleContentGetIncludingTrashed, Dt as handleContentPublish, Et as handleContentPermanentDelete, G as sanitizeHeadersForSandbox, H as resolveExclusiveHooks, I as PluginRouteRegistry, K as getTrustedProxyHeaders, L as DEV_CONSOLE_EMAIL_PLUGIN_ID, Mt as handleContentUnschedule, Nt as handleContentUpdate, Ot as handleContentRestore, Pt as validateRev, R as devConsoleEmailDeliver, St as handleContentGet, Tt as handleContentListTrashed, U as CronExecutor, V as createHookPipeline, W as extractRequestMeta, X as after, _t as handleContentCountTrashed, bt as handleContentDiscardDraft, ct as handleMediaGet, dt as handleRevisionGet, ft as handleRevisionList, gt as handleContentCountScheduled, ht as handleContentCompare, it as PluginStateRepository, jt as handleContentUnpublish, kt as handleContentSchedule, lt as handleMediaList, ot as handleMediaCreate, pt as handleRevisionRestore, q as definePlugin, st as handleMediaDelete, tt as loadBundleFromR2, ut as handleMediaUpdate, vt as handleContentCreate, wt as handleContentList, xt as handleContentDuplicate, yt as handleContentDelete, z as EmailPipeline } from "../search-dOGEccMa.mjs";
+import { r as RevisionRepository } from "../content-8lOYF0pr.mjs";
+import "../base64-BRICGH2l.mjs";
+import "../types-CRxNbK-Z.mjs";
+import { t as MediaRepository } from "../media-BW32b4gi.mjs";
+import "../apply-BzltprvY.mjs";
+import { t as OptionsRepository } from "../options-BVp3UsTS.mjs";
+import "../redirect-BhUBKRc1.mjs";
+import "../byline-BSaNL1w7.mjs";
+import { n as normalizeMediaValue } from "../placeholder-CIJejMlK.mjs";
+import { i as setI18nConfig } from "../config-BI0V3ICQ.mjs";
+import { r as hashString } from "../zod-generator-CC0xNe_K.mjs";
+import { i as FTSManager, n as SchemaRegistry } from "../registry-Dw70ChxB.mjs";
+import { r as getDb } from "../loader-CKLbBnhK.mjs";
+import { n as requestCached } from "../request-cache-B-bmkipQ.mjs";
+import "../taxonomies-ZlRtD6AG.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-DqWNC3lM.mjs";
+import "../types-4fVtCIm0.mjs";
+import "../error-D_-tqP-I.mjs";
+import { a as invalidateUrlPatternCache } from "../query-Cg9ZKRQ0.mjs";
+import "../tokens-D7zMmWi2.mjs";
+import "../bylines-CvJ3PYz2.mjs";
+import "../load-DDqMMvZL.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-BnTKdfam.mjs";
-import { t as getAuthMode } from "../mode-CpNnGkPz.mjs";
+import { n as VERSION, t as COMMIT } from "../version-DoxrVdYf.mjs";
+import { t as getAuthMode } from "../mode-ier8jbBk.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-CW3reAnU.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
@@ -281,6 +286,19 @@ var PiggybackScheduler = class {
 //#endregion
 //#region src/emdash-runtime.ts
 const LEADING_SLASH_PATTERN = /^\//;
+/**
+* Parse a JSON column expected to contain an array of strings.
+*
+* Throws on malformed JSON rather than returning []; callers are responsible
+* for deciding how to handle/log the error. Empty string / null inputs return
+* [] (they represent "no value"). Non-string array entries are filtered out.
+*/
+function parseStringArray(raw) {
+	if (!raw) return [];
+	const parsed = JSON.parse(raw);
+	if (!Array.isArray(parsed)) return [];
+	return parsed.filter((v) => typeof v === "string");
+}
 const VALID_METADATA_KINDS = new Set([
 	"meta",
 	"property",
@@ -375,9 +393,6 @@ 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
@@ -410,27 +425,26 @@ 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, manifestCacheKey) {
-		this._db = db;
-		this.storage = storage;
-		this.configuredPlugins = configuredPlugins;
-		this.sandboxedPlugins = sandboxedPlugins;
-		this.sandboxedPluginEntries = sandboxedPluginEntries;
-		this.schemaRegistry = new SchemaRegistry(db);
-		this._hooks = hooks;
-		this.enabledPlugins = enabledPlugins;
-		this.pluginStates = pluginStates;
-		this.config = config;
-		this.mediaProviders = mediaProviders;
-		this.mediaProviderEntries = mediaProviderEntries;
-		this.cronExecutor = cronExecutor;
-		this.cronScheduler = cronScheduler;
-		this.email = emailPipeline;
-		this.allPipelinePlugins = allPipelinePlugins;
-		this.pipelineFactoryOptions = pipelineFactoryOptions;
-		this.runtimeDeps = runtimeDeps;
-		this.pipelineRef = pipelineRef;
-		this._manifestCacheKey = manifestCacheKey;
+	constructor(parts) {
+		this._db = parts.db;
+		this.storage = parts.storage;
+		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;
+		this.config = parts.config;
+		this.mediaProviders = parts.mediaProviders;
+		this.mediaProviderEntries = parts.mediaProviderEntries;
+		this.cronExecutor = parts.cronExecutor;
+		this.cronScheduler = parts.cronScheduler;
+		this.email = parts.emailPipeline;
+		this.allPipelinePlugins = parts.allPipelinePlugins;
+		this.pipelineFactoryOptions = parts.pipelineFactoryOptions;
+		this.runtimeDeps = parts.runtimeDeps;
+		this.pipelineRef = parts.pipelineRef;
 	}
 	/**
 	* Get the sandbox runner instance (for marketplace install/update)
@@ -471,7 +485,6 @@ var EmDashRuntime = class EmDashRuntime {
 			this.enabledPlugins.delete(pluginId);
 			await this.rebuildHookPipeline();
 		}
-		this.invalidateManifest();
 	}
 	/**
 	* Rebuild the hook pipeline from the current set of enabled plugins.
@@ -595,6 +608,7 @@ var EmDashRuntime = class EmDashRuntime {
 			}
 		};
 		const db = await phase("rt.db", "DB init + migrations", () => EmDashRuntime.getDatabase(deps));
+		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 () => {
@@ -628,7 +642,7 @@ var EmDashRuntime = class EmDashRuntime {
 			const devConsolePlugin = definePlugin({
 				id: DEV_CONSOLE_EMAIL_PLUGIN_ID,
 				version: "0.0.0",
-				capabilities: ["email:provide"],
+				capabilities: ["hooks.email-transport:register"],
 				hooks: { "email:deliver": {
 					exclusive: true,
 					handler: devConsoleEmailDeliver
@@ -643,7 +657,7 @@ var EmDashRuntime = class EmDashRuntime {
 			const defaultModeratorPlugin = definePlugin({
 				id: DEFAULT_COMMENT_MODERATOR_PLUGIN_ID,
 				version: "0.0.0",
-				capabilities: ["read:users"],
+				capabilities: ["users:read"],
 				hooks: { "comment:moderate": {
 					exclusive: true,
 					handler: defaultCommentModerate
@@ -716,14 +730,26 @@ var EmDashRuntime = class EmDashRuntime {
 				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);
+		return new EmDashRuntime({
+			db,
+			storage,
+			configuredPlugins: deps.plugins,
+			sandboxedPlugins,
+			sandboxedPluginEntries: deps.sandboxedPluginEntries,
+			hooks: pipeline,
+			enabledPlugins,
+			pluginStates,
+			config: deps.config,
+			mediaProviders,
+			mediaProviderEntries,
+			cronExecutor,
+			cronScheduler,
+			emailPipeline,
+			allPipelinePlugins,
+			pipelineFactoryOptions,
+			runtimeDeps: deps,
+			pipelineRef
+		});
 	}
 	/**
 	* Get a media provider by ID
@@ -763,10 +789,7 @@ var EmDashRuntime = class EmDashRuntime {
 				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 {}
+			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 = (() => {
@@ -777,9 +800,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					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 { applySeed } = await import("../apply-BzltprvY.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-DDqMMvZL.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-Baqf0slj.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -918,60 +941,42 @@ var EmDashRuntime = class EmDashRuntime {
 		});
 	}
 	/**
-	* 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.
+	* Build the admin manifest from the live database.
 	*
-	* Cache is invalidated by invalidateManifest(), called from schema
-	* API routes, MCP server, plugin toggle, and taxonomy def changes.
+	* Used by the admin UI (sidebar collections, content editor field
+	* dispatch, manifest endpoint) and by WordPress import — it's never
+	* read on a public request, so this isn't on any anonymous hot path.
+	*
+	* No cross-request cache. The previous worker-isolate cache produced
+	* a class of cross-isolate staleness bugs (#776, #873, #876, #877)
+	* because Cloudflare Workers keeps multiple warm isolates per region
+	* and there's no fan-out primitive to invalidate them in step. The
+	* cache existed to amortize an N+1 schema query pattern; now that
+	* `listCollectionsWithFields()` does the same work in two queries,
+	* the rebuild is fast enough to pay on every admin request.
+	*
+	* Within a single request, `requestCached` deduplicates concurrent
+	* callers (the manifest endpoint and an admin SSR template, say).
 	*/
-	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;
-		}
+	getManifest() {
+		return requestCached("emdash:manifest", () => this._buildManifest());
 	}
 	/**
-	* Build the manifest from database (N+1 collection queries).
+	* Build the manifest from the database.
+	*
+	* Constant query shapes via `listCollectionsWithFields()` — one query
+	* for collections, one batched query for fields (chunked at
+	* `SQL_BATCH_SIZE` collection IDs to stay under D1's bound-parameter
+	* limit). Typical sites stay well under the chunk threshold, so this
+	* is two queries in practice; never N+1.
 	*/
 	async _buildManifest() {
 		const manifestCollections = {};
 		try {
-			const registry = new SchemaRegistry(this.db);
-			const dbCollections = await registry.listCollections();
+			const dbCollections = await new SchemaRegistry(this.db).listCollectionsWithFields();
 			for (const collection of dbCollections) {
-				const collectionWithFields = await registry.getCollectionWithFields(collection.slug);
 				const fields = {};
-				if (collectionWithFields?.fields) for (const field of collectionWithFields.fields) {
+				for (const field of collection.fields) {
 					const entry = {
 						kind: FIELD_TYPE_TO_KIND[field.type] ?? "string",
 						label: field.label,
@@ -1055,7 +1060,7 @@ var EmDashRuntime = class EmDashRuntime {
 				label: row.label,
 				labelSingular: row.label_singular ?? void 0,
 				hierarchical: row.hierarchical === 1,
-				collections: row.collections ? JSON.parse(row.collections).toSorted() : []
+				collections: parseStringArray(row.collections).toSorted()
 			}));
 		} catch (error) {
 			console.debug("EmDash: Could not load taxonomy definitions:", error);
@@ -1081,22 +1086,6 @@ var EmDashRuntime = class EmDashRuntime {
 		};
 	}
 	/**
-	* Invalidate cached data derived from the manifest/schema.
-	* 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.
 	*
@@ -1143,16 +1132,67 @@ var EmDashRuntime = class EmDashRuntime {
 		return handleContentList(this.db, collection, params);
 	}
 	async handleContentGet(collection, id, locale) {
-		return handleContentGet(this.db, collection, id, locale);
+		const result = await handleContentGet(this.db, collection, id, locale);
+		return this.hydrateDraftData(result);
 	}
 	async handleContentGetIncludingTrashed(collection, id, locale) {
-		return handleContentGetIncludingTrashed(this.db, collection, id, locale);
+		const result = await handleContentGetIncludingTrashed(this.db, collection, id, locale);
+		return this.hydrateDraftData(result);
+	}
+	/**
+	* If the response item has a `draftRevisionId`, replace `item.data` with
+	* the draft revision's data and expose the original published values as
+	* `liveData`. This makes the content_get / content_update round-trip
+	* intuitive — read returns the latest content the caller has saved
+	* (their pending draft), with the previously-published values still
+	* accessible for compare-style flows.
+	*
+	* No-op when no draft exists or the response is an error.
+	*/
+	async hydrateDraftData(result) {
+		if (!result || typeof result !== "object") return result;
+		const r = result;
+		if (!r.success || !r.data?.item) return result;
+		const item = r.data.item;
+		const draftRevisionId = typeof item.draftRevisionId === "string" ? item.draftRevisionId : null;
+		if (!draftRevisionId) return result;
+		try {
+			const revision = await new RevisionRepository(this.db).findById(draftRevisionId);
+			if (!revision) return result;
+			const liveData = item.data && typeof item.data === "object" ? item.data : {};
+			const revisionData = {};
+			for (const [key, value] of Object.entries(revision.data)) if (!key.startsWith("_")) revisionData[key] = value;
+			const mergedData = {
+				...liveData,
+				...revisionData
+			};
+			return {
+				...result,
+				data: {
+					...r.data,
+					item: {
+						...item,
+						data: mergedData,
+						liveData
+					}
+				}
+			};
+		} catch (error) {
+			console.error("[emdash] draft hydration failed:", error);
+			return result;
+		}
 	}
 	async handleContentCreate(collection, body) {
 		let processedData = body.data;
 		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-BfEI7tNe.mjs");
+		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
+		if (!validation.ok) return {
+			success: false,
+			error: validation.error
+		};
 		const result = await handleContentCreate(this.db, collection, {
 			...body,
 			data: processedData,
@@ -1163,7 +1203,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-D7J5y73J.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-8lOYF0pr.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1190,6 +1230,12 @@ 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-BfEI7tNe.mjs");
+			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
+			if (!validation.ok) return {
+				success: false,
+				error: validation.error
+			};
 		}
 		let usesDraftRevisions = false;
 		if (processedData) try {
@@ -1234,8 +1280,9 @@ var EmDashRuntime = class EmDashRuntime {
 			authorId: bodyWithoutRev.authorId,
 			bylines: bodyWithoutRev.bylines
 		});
-		if (result.success && result.data) this.runAfterSaveHooks(contentItemToRecord(result.data.item), collection, false);
-		return result;
+		const hydrated = await this.hydrateDraftData(result);
+		if (hydrated.success && hydrated.data) this.runAfterSaveHooks(contentItemToRecord(hydrated.data.item), collection, false);
+		return hydrated;
 	}
 	async handleContentDelete(collection, id) {
 		if (this.hooks.hasHooks("content:beforeDelete")) {
@@ -1276,8 +1323,8 @@ var EmDashRuntime = class EmDashRuntime {
 	async handleContentDuplicate(collection, id, authorId) {
 		return handleContentDuplicate(this.db, collection, id, authorId);
 	}
-	async handleContentPublish(collection, id) {
-		const result = await handleContentPublish(this.db, collection, id);
+	async handleContentPublish(collection, id, options = {}) {
+		const result = await handleContentPublish(this.db, collection, id, options);
 		if (result.success && result.data) this.runAfterPublishHooks(contentItemToRecord(result.data.item), collection);
 		return result;
 	}
@@ -1353,7 +1400,47 @@ var EmDashRuntime = class EmDashRuntime {
 		return handleRevisionGet(this.db, revisionId);
 	}
 	async handleRevisionRestore(revisionId, callerUserId) {
-		return handleRevisionRestore(this.db, revisionId, callerUserId);
+		const revisionRepo = new RevisionRepository(this.db);
+		const revision = await revisionRepo.findById(revisionId);
+		if (!revision) return {
+			success: false,
+			error: {
+				code: "NOT_FOUND",
+				message: `Revision not found: ${revisionId}`
+			}
+		};
+		if (!((await this.schemaRegistry.getCollectionWithFields(revision.collection))?.supports?.includes("revisions") ?? false)) {
+			const result = await handleRevisionRestore(this.db, revisionId, callerUserId);
+			return this.hydrateDraftData(result);
+		}
+		try {
+			const newDraft = await revisionRepo.create({
+				collection: revision.collection,
+				entryId: revision.entryId,
+				data: revision.data,
+				authorId: callerUserId
+			});
+			validateIdentifier(revision.collection, "collection");
+			const tableName = `ec_${revision.collection}`;
+			await sql`
+				UPDATE ${sql.ref(tableName)}
+				SET draft_revision_id = ${newDraft.id},
+					updated_at = ${(/* @__PURE__ */ new Date()).toISOString()}
+				WHERE id = ${revision.entryId}
+			`.execute(this.db);
+			revisionRepo.pruneOldRevisions(revision.collection, revision.entryId, 50).catch(() => {});
+			const refetched = await handleContentGet(this.db, revision.collection, revision.entryId);
+			return this.hydrateDraftData(refetched);
+		} catch (error) {
+			console.error("[emdash] revision restore failed:", error);
+			return {
+				success: false,
+				error: {
+					code: "REVISION_RESTORE_ERROR",
+					message: "Failed to restore revision"
+				}
+			};
+		}
 	}
 	/**
 	* Get route metadata for a plugin route without invoking the handler.
@@ -1486,16 +1573,30 @@ var EmDashRuntime = class EmDashRuntime {
 		return true;
 	}
 	runAfterSaveHooks(content, collection, isNew) {
-		if (this.hooks.hasHooks("content:afterSave")) this.hooks.runContentAfterSave(content, collection, isNew).catch((err) => console.error("EmDash afterSave hook error:", err));
-		for (const [pluginKey, plugin] of this.sandboxedPlugins) {
-			const [id] = pluginKey.split(":");
-			if (!id || !this.isPluginEnabled(id)) continue;
-			plugin.invokeHook("content:afterSave", {
-				content,
-				collection,
-				isNew
-			}).catch((err) => console.error(`EmDash: Sandboxed plugin ${id} afterSave error:`, err));
-		}
+		after(async () => {
+			if (this.hooks.hasHooks("content:afterSave")) try {
+				await this.hooks.runContentAfterSave(content, collection, isNew);
+			} catch (err) {
+				console.error("EmDash afterSave hook error:", err);
+			}
+			const tasks = [];
+			for (const [pluginKey, plugin] of this.sandboxedPlugins) {
+				const [id] = pluginKey.split(":");
+				if (!id || !this.isPluginEnabled(id)) continue;
+				tasks.push((async () => {
+					try {
+						await plugin.invokeHook("content:afterSave", {
+							content,
+							collection,
+							isNew
+						});
+					} catch (err) {
+						console.error(`EmDash: Sandboxed plugin ${id} afterSave error:`, err);
+					}
+				})());
+			}
+			await Promise.allSettled(tasks);
+		});
 	}
 	runAfterDeleteHooks(id, collection, permanent) {
 		if (this.hooks.hasHooks("content:afterDelete")) this.hooks.runContentAfterDelete(id, collection, permanent).catch((err) => console.error("EmDash afterDelete hook error:", err));
@@ -1510,15 +1611,29 @@ var EmDashRuntime = class EmDashRuntime {
 		}
 	}
 	runAfterPublishHooks(content, collection) {
-		if (this.hooks.hasHooks("content:afterPublish")) this.hooks.runContentAfterPublish(content, collection).catch((err) => console.error("EmDash afterPublish hook error:", err));
-		for (const [pluginKey, plugin] of this.sandboxedPlugins) {
-			const [pluginId] = pluginKey.split(":");
-			if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
-			plugin.invokeHook("content:afterPublish", {
-				content,
-				collection
-			}).catch((err) => console.error(`EmDash: Sandboxed plugin ${pluginId} afterPublish error:`, err));
-		}
+		after(async () => {
+			if (this.hooks.hasHooks("content:afterPublish")) try {
+				await this.hooks.runContentAfterPublish(content, collection);
+			} catch (err) {
+				console.error("EmDash afterPublish hook error:", err);
+			}
+			const tasks = [];
+			for (const [pluginKey, plugin] of this.sandboxedPlugins) {
+				const [pluginId] = pluginKey.split(":");
+				if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
+				tasks.push((async () => {
+					try {
+						await plugin.invokeHook("content:afterPublish", {
+							content,
+							collection
+						});
+					} catch (err) {
+						console.error(`EmDash: Sandboxed plugin ${pluginId} afterPublish error:`, err);
+					}
+				})());
+			}
+			await Promise.allSettled(tasks);
+		});
 	}
 	runAfterUnpublishHooks(content, collection) {
 		if (this.hooks.hasHooks("content:afterUnpublish")) this.hooks.runContentAfterUnpublish(content, collection).catch((err) => console.error("EmDash afterUnpublish hook error:", err));
@@ -1629,6 +1744,28 @@ var EmDashRuntime = class EmDashRuntime {
 	}
 };
 
+//#endregion
+//#region src/media/url.ts
+/**
+* Resolve the public URL for a locally stored media key. Returns an empty
+* string when no key is given. When a storage adapter is supplied, defers to
+* `storage.getPublicUrl()`; otherwise returns the internal proxy route.
+*/
+function resolvePublicMediaUrl(storage, storageKey) {
+	if (!storageKey) return "";
+	if (storage) return storage.getPublicUrl(storageKey);
+	return `/_emdash/api/media/file/${storageKey}`;
+}
+/**
+* Build the `getPublicMediaUrl` closure attached to `Astro.locals.emdash`.
+* Shared by the anonymous fast path and the full-runtime path in middleware.
+*
+* @internal
+*/
+function createPublicMediaUrlResolver(storage) {
+	return (key) => resolvePublicMediaUrl(storage, key);
+}
+
 //#endregion
 //#region src/astro/middleware.ts
 /**
@@ -1751,6 +1888,9 @@ function createRequestScopedDb$1(opts) {
 const onRequest = defineMiddleware(async (context, next) => {
 	const { request, locals, cookies } = context;
 	const url = context.url;
+	if (!url.pathname.startsWith("/_emdash") && virtualConfig?.authProviders) {
+		if (virtualConfig.authProviders.some((p) => p.routes?.some((r) => r.pattern && url.pathname === r.pattern))) return finalizeResponse(await next());
+	}
 	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");
@@ -1758,7 +1898,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 		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");
+		const hasSessionCookie = cookies.get("astro-session") !== void 0;
+		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await context.session?.get("user");
 		if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
 			if (!sessionUser && !playgroundDb) {
 				const timings = [];
@@ -1766,7 +1907,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!setupVerified) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-DeiBJEMe.mjs").then((n) => n.r);
+						const { getDb } = await import("../loader-CKLbBnhK.mjs").then((n) => n.i);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						setupVerified = true;
 					} catch {
@@ -1787,7 +1928,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 						setupVerified = true;
 						locals.emdash = {
 							collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
-							collectPageFragments: runtime.collectPageFragments.bind(runtime)
+							collectPageFragments: runtime.collectPageFragments.bind(runtime),
+							getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage)
 						};
 					} catch {}
 					timings.push({
@@ -1855,14 +1997,6 @@ const onRequest = defineMiddleware(async (context, next) => {
 				});
 				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),
@@ -1900,11 +2034,13 @@ const onRequest = defineMiddleware(async (context, next) => {
 					ensureSearchHealthy: runtime.ensureSearchHealthy.bind(runtime),
 					storage: runtime.storage,
 					db: runtime.db,
+					getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage),
 					hooks: runtime.hooks,
 					email: runtime.email,
 					configuredPlugins: runtime.configuredPlugins,
 					config,
-					invalidateManifest: runtime.invalidateManifest.bind(runtime),
+					getManifest: runtime.getManifest.bind(runtime),
+					invalidateUrlPatternCache,
 					getSandboxRunner: runtime.getSandboxRunner.bind(runtime),
 					syncMarketplacePlugins: runtime.syncMarketplacePlugins.bind(runtime),
 					setPluginStatus: runtime.setPluginStatus.bind(runtime)