emdash 0.36.0 → 0.38.0

package/src/astro/integration/index.ts

@@ -27,8 +27,11 @@ import {
 import { buildMigrationManifest } from "../../migrations/manifest-builder.js";
 import { writeMigrationManifest } from "../../migrations/manifest-writer.js";
 import type { ResolvedPlugin } from "../../plugins/types.js";
+import { normalizeRegistryConfig } from "../../registry/config.js";
 import { VERSION } from "../../version.js";
+import { setDevTypegenRefresh } from "../dev-typegen.js";
 import { local } from "../storage/adapters.js";
+import { createDebouncedTypegenRefresh } from "./dev-typegen.js";
 import { notoSans } from "./font-provider.js";
 import {
 	injectCoreRoutes,
@@ -326,6 +329,11 @@ export function emdash(config: EmDashConfig = {}): AstroIntegration {
 		migrations: normalizeMigrationConfig(config.migrations),
 	};
 
+	// Validate environment-independent registry settings while Astro is still
+	// evaluating its config. The command-aware check in astro:config:setup
+	// applies the stricter production localhost policy.
+	normalizeRegistryConfig(resolvedConfig.experimental?.registry, { allowLocalhost: true });
+
 	// Validate marketplace URL
 	if (resolvedConfig.marketplace) {
 		const url = resolvedConfig.marketplace;
@@ -344,12 +352,6 @@ export function emdash(config: EmDashConfig = {}): AstroIntegration {
 			}
 			throw e;
 		}
-		if (!resolvedConfig.sandboxRunner) {
-			throw new Error(
-				"Marketplace requires `sandboxRunner` to be configured. " +
-					"Marketplace plugins run in sandboxed V8 isolates.",
-			);
-		}
 	}
 
 	// Validate siteUrl if provided in astro.config.mjs.
@@ -467,6 +469,9 @@ export function emdash(config: EmDashConfig = {}): AstroIntegration {
 				command,
 			}) => {
 				astroCommand = command;
+				normalizeRegistryConfig(resolvedConfig.experimental?.registry, {
+					allowLocalhost: command === "dev" || command === "sync",
+				});
 				printBanner(logger);
 				// Capture the host's Astro version so the runtime can expose it
 				// to the admin and the registry install gate for `env:astro`
@@ -651,57 +656,20 @@ export function emdash(config: EmDashConfig = {}): AstroIntegration {
 					});
 				}
 
-				// Generate types once the server is listening.
+				// Generate types once the server is listening, and register the
+				// refresh hook so schema mutations in dev update the file too.
 				// The endpoint returns the types content; we write the file here
 				// (in Node) because workerd has no real filesystem access.
-				server.httpServer?.once("listening", async () => {
-					const { writeFile, readFile } = await import("node:fs/promises");
-					const { resolve } = await import("node:path");
-
+				server.httpServer?.once("listening", () => {
 					const address = server.httpServer?.address();
 					if (!address || typeof address === "string") return;
 
 					const port = address.port;
-					const typegenUrl = `http://localhost:${port}/_emdash/api/typegen`;
-					const outputPath = resolve(process.cwd(), "emdash-env.d.ts");
-
-					try {
-						const response = await fetch(typegenUrl, {
-							method: "POST",
-							headers: { "Content-Type": "application/json" },
-						});
-
-						if (!response.ok) {
-							const body = await response.text().catch(() => "");
-							logger.warn(`Typegen failed: ${response.status} ${body.slice(0, 200)}`);
-							return;
-						}
+					const refreshDevTypes = createDebouncedTypegenRefresh(port, logger);
+					setDevTypegenRefresh(refreshDevTypes);
 
-						const { data: result } = (await response.json()) as {
-							data: {
-								types: string;
-								hash: string;
-								collections: number;
-							};
-						};
-
-						// Only write if content changed
-						let needsWrite = true;
-						try {
-							const existing = await readFile(outputPath, "utf-8");
-							if (existing === result.types) needsWrite = false;
-						} catch {
-							// File doesn't exist yet
-						}
-
-						if (needsWrite) {
-							await writeFile(outputPath, result.types, "utf-8");
-							logger.info(`Generated emdash-env.d.ts (${result.collections} collections)`);
-						}
-					} catch (error) {
-						const msg = error instanceof Error ? error.message : String(error);
-						logger.warn(`Typegen failed: ${msg}`);
-					}
+					// Initial generation now that the server is up.
+					refreshDevTypes();
 				});
 			},
 			"astro:build:done": ({ logger }) => {

package/src/astro/integration/routes.ts

@@ -169,6 +169,11 @@ export function injectCoreRoutes(
 		entrypoint: resolveRoute("api/content/[collection]/[id]/compare.ts"),
 	});
 
+	injectRoute({
+		pattern: "/_emdash/api/content/[collection]/[id]/lock",
+		entrypoint: resolveRoute("api/content/[collection]/[id]/lock.ts"),
+	});
+
 	// i18n translation routes
 	injectRoute({
 		pattern: "/_emdash/api/content/[collection]/[id]/translations",
@@ -238,6 +243,11 @@ export function injectCoreRoutes(
 		entrypoint: resolveRoute("api/media/[id]/upload.ts"),
 	});
 
+	injectRoute({
+		pattern: "/_emdash/api/media/[id]/replace",
+		entrypoint: resolveRoute("api/media/[id]/replace.ts"),
+	});
+
 	// Media provider routes
 	injectRoute({
 		pattern: "/_emdash/api/media/providers",

package/src/astro/integration/runtime.ts

@@ -259,12 +259,13 @@ export interface EmDashConfig {
 	 *
 	 * @example
 	 * ```ts
+	 * import { sandbox } from "@emdash-cms/cloudflare";
 	 * import { untrustedPlugin } from "some-third-party-plugin";
 	 *
 	 * emdash({
 	 *   plugins: [trustedPlugin()],     // runs in host
 	 *   sandboxed: [untrustedPlugin()], // runs in isolate
-	 *   sandboxRunner: "@emdash-cms/sandbox-cloudflare",
+	 *   sandboxRunner: sandbox(),
 	 * })
 	 * ```
 	 */
@@ -275,8 +276,10 @@ export interface EmDashConfig {
 	 *
 	 * @example
 	 * ```ts
+	 * import { sandbox } from "@emdash-cms/cloudflare";
+	 *
 	 * emdash({
-	 *   sandboxRunner: "@emdash-cms/sandbox-cloudflare",
+	 *   sandboxRunner: sandbox(),
 	 * })
 	 * ```
 	 */
@@ -359,7 +362,8 @@ export interface EmDashConfig {
 	 * and uninstall plugins from a remote marketplace.
 	 *
 	 * Must be an HTTPS URL in production, or localhost/127.0.0.1 in dev.
-	 * Requires `sandboxRunner` to be configured (marketplace plugins run sandboxed).
+	 * Installing or updating plugins requires an available `sandboxRunner`.
+	 * Browsing remains available when no runner is configured.
 	 *
 	 * When `registry` is also configured, the registry replaces the marketplace
 	 * for the admin UI's browse and install flows. Existing marketplace-installed
@@ -367,9 +371,11 @@ export interface EmDashConfig {
 	 *
 	 * @example
 	 * ```ts
+	 * import { sandbox } from "@emdash-cms/cloudflare";
+	 *
 	 * emdash({
 	 *   marketplace: "https://marketplace.emdashcms.com",
-	 *   sandboxRunner: "@emdash-cms/sandbox-cloudflare",
+	 *   sandboxRunner: sandbox(),
 	 * })
 	 * ```
 	 */
@@ -385,13 +391,15 @@ export interface EmDashConfig {
 	 *
 	 * @example
 	 * ```ts
+	 * import { sandbox } from "@emdash-cms/cloudflare";
+	 *
 	 * emdash({
 	 *   experimental: {
 	 *     registry: {
 	 *       aggregatorUrl: "https://registry.emdashcms.com",
 	 *     },
 	 *   },
-	 *   sandboxRunner: "@emdash-cms/sandbox-cloudflare",
+	 *   sandboxRunner: sandbox(),
 	 * })
 	 * ```
 	 */

package/src/astro/integration/vite-config.ts

@@ -372,6 +372,15 @@ function isCloudflareAdapter(astroConfig: AstroConfig): boolean {
 	return astroConfig.adapter?.name === "@astrojs/cloudflare";
 }
 
+function canResolveProjectDependency(projectRoot: string, specifier: string): boolean {
+	try {
+		createRequire(resolve(projectRoot, "package.json")).resolve(specifier);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
 /**
  * Creates the Vite config update for EmDash.
  */
@@ -383,6 +392,7 @@ export function createViteConfig(
 	const cloudflare = isCloudflareAdapter(options.astroConfig);
 	const isDev = command === "dev";
 	const projectRoot = fileURLToPath(options.astroConfig.root);
+	const hasAstroConsoleLogger = canResolveProjectDependency(projectRoot, "astro/logger/console");
 
 	const adminSourcePath = isDev ? resolveAdminSource(projectRoot) : undefined;
 	const useSource = adminSourcePath !== undefined;
@@ -390,6 +400,12 @@ export function createViteConfig(
 	const useSyncExternalStoreWithSelectorShimPath = resolveIntegrationShim(
 		"use-sync-external-store-with-selector.js",
 	);
+	const configuredWatchIgnored = options.astroConfig.vite?.server?.watch?.ignored;
+	const watchIgnored = Array.isArray(configuredWatchIgnored)
+		? configuredWatchIgnored
+		: configuredWatchIgnored
+			? [configuredWatchIgnored]
+			: [];
 
 	return {
 		// Astro SSR routes resolve version.ts from source (not tsdown dist),
@@ -453,6 +469,11 @@ export function createViteConfig(
 			// In production, macros are pre-compiled by tsdown in the admin package.
 			...(useSource ? [linguiMacroPlugin(adminSourcePath, adminDistPath)] : []),
 		] as NonNullable<AstroConfig["vite"]>["plugins"],
+		server: {
+			watch: {
+				ignored: [...watchIgnored, "**/.wrangler/**"],
+			},
+		},
 		// Handle native modules for SSR.
 		// On Node: external keeps native addons out of the SSR bundle.
 		// On Cloudflare: skip — the adapter handles externalization, and setting
@@ -486,6 +507,9 @@ export function createViteConfig(
 							// EmDash direct deps
 							"emdash > @portabletext/toolkit",
 							"emdash > @unpic/placeholder",
+							"emdash > @atcute/client",
+							"emdash > @atcute/lexicons/syntax",
+							"emdash > @atcute/lexicons/validations",
 							"emdash > blurhash",
 							"emdash > croner",
 							"emdash > jose",
@@ -497,6 +521,7 @@ export function createViteConfig(
 							"emdash > mime/lite",
 							"emdash > modern-tar",
 							"emdash > sanitize-html",
+							"emdash > @tiptap/core",
 							"emdash > ulidx",
 							"emdash > upng-js",
 							"emdash > astro-portabletext",
@@ -507,6 +532,21 @@ export function createViteConfig(
 							"emdash > @emdash-cms/auth > @oslojs/crypto/ecdsa",
 							"emdash > @emdash-cms/auth > @oslojs/crypto/sha2",
 							"emdash > @emdash-cms/auth > @oslojs/webauthn",
+							// Registry routes are lazy, so their AT Protocol graph is not
+							// present during Vite's initial dependency scan.
+							"emdash > @emdash-cms/registry-lexicons > @atcute/atproto/types/label/defs",
+							"emdash > @emdash-cms/registry-client > @atcute/client",
+							"emdash > @emdash-cms/registry-client > @atcute/crypto",
+							"emdash > @emdash-cms/registry-client > @atcute/identity",
+							"emdash > @emdash-cms/registry-client > @atcute/identity-resolver",
+							"emdash > @emdash-cms/registry-client > @atcute/lexicons/syntax",
+							"emdash > @emdash-cms/registry-client > @atcute/lexicons/validations",
+							"emdash > @emdash-cms/registry-client > @atcute/multibase",
+							"emdash > @emdash-cms/registry-client > @atcute/repo",
+							"emdash > @emdash-cms/registry-client > @emdash-cms/registry-moderation > @atcute/cbor",
+							"emdash > @emdash-cms/registry-client > @emdash-cms/registry-moderation > @atcute/cid",
+							"emdash > @emdash-cms/registry-client > @emdash-cms/registry-moderation > @atcute/crypto",
+							"emdash > @emdash-cms/registry-client > @emdash-cms/registry-moderation > @atcute/multibase",
 							// Auth deps imported only on auth/login/callback routes, so
 							// the initial page scan misses them. Pre-bundle to avoid a
 							// re-optimize + reload cascade on first authenticated request.
@@ -541,6 +581,7 @@ export function createViteConfig(
 							"@emdash-cms/cloudflare > kysely-d1",
 							// Astro internal deps not covered by @astrojs/cloudflare adapter
 							"astro/app/manifest",
+							...(hasAstroConsoleLogger ? ["astro/logger/console"] : []),
 							"astro/virtual-modules/middleware.js",
 							"astro/virtual-modules/live-config",
 							"astro/content/runtime",
@@ -561,9 +602,17 @@ export function createViteConfig(
 		optimizeDeps: {
 			// When using source, don't pre-bundle JS — let Vite transform on the fly for HMR.
 			// When using dist, pre-bundle to avoid re-optimization on first hydration.
+			// lowlight pulls in a CommonJS highlight.js entry, so the inline Portable
+			// Text editor requires these to be pre-bundled with ESM interop in dev.
 			include: useSource
-				? ["@astrojs/react/client.js"]
-				: ["@emdash-cms/admin", "@astrojs/react/client.js"],
+				? ["@astrojs/react/client.js", "lowlight", "highlight.js", "highlight.js/lib/core"]
+				: [
+						"@emdash-cms/admin",
+						"@astrojs/react/client.js",
+						"lowlight",
+						"highlight.js",
+						"highlight.js/lib/core",
+					],
 			exclude: cloudflare ? ["virtual:emdash"] : [...NODE_NATIVE_EXTERNALS, "virtual:emdash"],
 		},
 	};

package/src/astro/middleware.ts

@@ -34,6 +34,8 @@ import { createScheduler as virtualCreateScheduler } from "virtual:emdash/schedu
 import { createStorage as virtualCreateStorage } from "virtual:emdash/storage";
 
 import { after } from "../after.js";
+import { apiError } from "../api/error.js";
+import { EmDashConfigurationError } from "../config/errors.js";
 import {
 	createRecorder,
 	flushRecorder,
@@ -67,6 +69,7 @@ import {
 	runWithContext,
 } from "../request-context.js";
 import type { PublishedRef } from "../scheduled-publish.js";
+import { EmDashStorageError } from "../storage/types.js";
 import { isMissingTableError } from "../utils/db-errors.js";
 import { createInitLock, type InitLock, initWithLock } from "../utils/init-lock.js";
 import type { EmDashConfig } from "./integration/runtime.js";
@@ -482,6 +485,17 @@ function migrationRequiredResponse(): Response {
 	);
 }
 
+function runtimeConfigurationErrorResponse(error: unknown, pathname: string): Response | null {
+	if (!pathname.startsWith("/_emdash/api/")) return null;
+	if (error instanceof EmDashConfigurationError) {
+		return apiError(error.code, error.message, 500);
+	}
+	if (error instanceof EmDashStorageError && error.code === "BINDING_NOT_FOUND") {
+		return apiError(error.code, error.message, 500);
+	}
+	return null;
+}
+
 /**
  * Baseline security headers applied to all responses.
  * Admin routes get additional headers (strict CSP) from auth middleware.
@@ -909,6 +923,11 @@ export const onRequest = defineMiddleware(async (context, next) => {
 					handleMediaGet: runtime.handleMediaGet.bind(runtime),
 					handleMediaCreate: runtime.handleMediaCreate.bind(runtime),
 					handleMediaUpdate: runtime.handleMediaUpdate.bind(runtime),
+					...(runtime.handleMediaReplaceMetadata
+						? {
+								handleMediaReplaceMetadata: runtime.handleMediaReplaceMetadata.bind(runtime),
+							}
+						: {}),
 					handleMediaDelete: runtime.handleMediaDelete.bind(runtime),
 
 					// Revision handlers
@@ -992,6 +1011,8 @@ export const onRequest = defineMiddleware(async (context, next) => {
 					return migrationRequiredResponse();
 				}
 				console.error("EmDash middleware error:", error);
+				const configurationError = runtimeConfigurationErrorResponse(error, url.pathname);
+				if (configurationError) return configurationError;
 			}
 
 			// Ask the adapter for a request-scoped db. When it returns one, we stash

package/src/astro/routes/api/admin/api-tokens/index.ts

@@ -19,7 +19,10 @@ export const prerender = false;
 const createTokenSchema = z.object({
 	name: z.string().min(1).max(100),
 	scopes: z.array(z.string().refine(isValidScope)).min(1),
-	expiresAt: z.string().datetime().optional(),
+	expiresAt: z.iso
+		.datetime()
+		.or(z.iso.datetime({ precision: -1 }))
+		.optional(),
 });
 
 /**

package/src/astro/routes/api/admin/oauth-clients/[id].ts

@@ -23,7 +23,7 @@ export const prerender = false;
 const updateClientSchema = z.object({
 	name: z.string().min(1).max(255).optional(),
 	redirectUris: z
-		.array(z.string().url("Each redirect URI must be a valid URL"))
+		.array(z.url("Each redirect URI must be a valid URL"))
 		.min(1, "At least one redirect URI is required")
 		.optional(),
 	scopes: z.array(z.string()).nullable().optional(),

package/src/astro/routes/api/admin/oauth-clients/index.ts

@@ -22,7 +22,7 @@ const createClientSchema = z.object({
 		.max(255, "Client ID must be at most 255 characters"),
 	name: z.string().min(1, "Name is required").max(255, "Name must be at most 255 characters"),
 	redirectUris: z
-		.array(z.string().url("Each redirect URI must be a valid URL"))
+		.array(z.url("Each redirect URI must be a valid URL"))
 		.min(1, "At least one redirect URI is required"),
 	scopes: z.array(z.string()).optional(),
 });

package/src/astro/routes/api/admin/plugins/registry/[id]/update.ts

@@ -38,6 +38,8 @@ const updateBodySchema = z.object({
 	 */
 	confirmRouteVisibilityChanges: z.boolean().optional(),
 	confirmMcpTools: z.boolean().optional(),
+	acknowledgedProfileCid: z.string().min(1).max(256).optional(),
+	acknowledgedReleaseCid: z.string().min(1).max(256).optional(),
 });
 
 export const POST: APIRoute = async ({ params, request, locals }) => {
@@ -73,6 +75,8 @@ export const POST: APIRoute = async ({ params, request, locals }) => {
 				confirmCapabilityChanges: body.confirmCapabilityChanges,
 				confirmRouteVisibilityChanges: body.confirmRouteVisibilityChanges,
 				confirmMcpTools: body.confirmMcpTools,
+				acknowledgedProfileCid: body.acknowledgedProfileCid,
+				acknowledgedReleaseCid: body.acknowledgedReleaseCid,
 				hostEnv: hostEnvFromVersions(VERSION, emdash.config.astroVersion),
 			},
 		);

package/src/astro/routes/api/admin/plugins/registry/artifact.ts

@@ -35,8 +35,8 @@ import type { APIRoute } from "astro";
 
 import { requirePerm } from "#api/authorize.js";
 import { apiError } from "#api/error.js";
-import { verifyChecksum } from "#api/handlers/registry.js";
 
+import { verifyRegistryArtifactChecksum } from "../../../../../../registry/artifact-checksum.js";
 import { fetchRegistryArtifactUrl } from "../../../../../../registry/artifact-fetch.js";
 import { coerceRegistryConfig, validateAggregatorUrl } from "../../../../../../registry/config.js";
 import { resolveAndValidateExternalUrlTarget } from "../../../../../../security/ssrf.js";
@@ -453,11 +453,7 @@ function recordScopedCacheEndpoint(value: unknown): string | null {
 	return typeof endpoint === "string" ? endpoint : null;
 }
 
-/**
- * Read a response body into memory, aborting once it exceeds `limit`. Returns
- * `null` when the cap is breached (the streamed body lied about / omitted
- * Content-Length). The cap is the real defence against an unbounded body.
- */
+/** Build bounded, SSRF-validated fetch options for cache, PDS, and URL sources. */
 function proxyFetchOptions(signal: AbortSignal) {
 	return {
 		fetch: async (url: URL, init: RequestInit) =>
@@ -504,7 +500,7 @@ async function fetchRawArtifact(
 			lastCode = fetched.error.code;
 			continue;
 		}
-		if (!(await verifyChecksum(fetched.value.bytes, resolved.artifact.checksum))) {
+		if (!(await verifyRegistryArtifactChecksum(fetched.value.bytes, resolved.artifact.checksum))) {
 			lastCode = "CHECKSUM_MISMATCH";
 			checksumMismatch = { bytes: fetched.value.bytes, headers: fetched.value.headers };
 			continue;

package/src/astro/routes/api/admin/plugins/registry/install.ts

@@ -59,6 +59,8 @@ const installBodySchema = z.object({
 	 */
 	acknowledgedDeclaredAccess: z.unknown().optional(),
 	acknowledgedMcpTools: z.unknown().optional(),
+	acknowledgedProfileCid: z.string().min(1).max(256).optional(),
+	acknowledgedReleaseCid: z.string().min(1).max(256).optional(),
 });
 
 export const POST: APIRoute = async ({ request, locals }) => {
@@ -99,6 +101,8 @@ export const POST: APIRoute = async ({ request, locals }) => {
 				version: body.version,
 				acknowledgedDeclaredAccess: body.acknowledgedDeclaredAccess,
 				acknowledgedMcpTools: body.acknowledgedMcpTools,
+				acknowledgedProfileCid: body.acknowledgedProfileCid,
+				acknowledgedReleaseCid: body.acknowledgedReleaseCid,
 			},
 			{
 				configuredPluginIds: reservedPluginIds,

package/src/astro/routes/api/admin/plugins/registry/verify.ts

@@ -0,0 +1,60 @@
+import { hostEnvFromVersions } from "@emdash-cms/registry-client/env";
+import type { APIRoute } from "astro";
+import { z } from "zod";
+
+import { requirePerm } from "#api/authorize.js";
+import { apiError, handleError, unwrapResult } from "#api/error.js";
+import { handleRegistryInstall } from "#api/index.js";
+import { isParseError, parseBody } from "#api/parse.js";
+
+import { VERSION } from "../../../../../../version.js";
+
+export const prerender = false;
+
+const verifyBodySchema = z.object({
+	did: z
+		.string()
+		.min(1)
+		.max(2048)
+		.regex(/^did:[a-z]+:/, "Invalid DID"),
+	slug: z
+		.string()
+		.min(1)
+		.max(64)
+		.regex(/^[a-zA-Z][a-zA-Z0-9_-]*$/, "Invalid slug"),
+	version: z.string().min(1).max(64).optional(),
+});
+
+export const POST: APIRoute = async ({ request, locals }) => {
+	try {
+		const { emdash, user } = locals;
+		if (!emdash?.db) {
+			return apiError("NOT_CONFIGURED", "EmDash is not initialized", 500);
+		}
+		const denied = requirePerm(user, "plugins:manage");
+		if (denied) return denied;
+		const body = await parseBody(request, verifyBodySchema);
+		if (isParseError(body)) return body;
+
+		const reservedPluginIds = new Set<string>([
+			...emdash.configuredPlugins.map((plugin: { id: string }) => plugin.id),
+			...(emdash.config.sandboxed ?? []).map((plugin: { id: string }) => plugin.id),
+		]);
+		const result = await handleRegistryInstall(
+			emdash.db,
+			emdash.storage,
+			emdash.getSandboxRunner(),
+			emdash.config.experimental?.registry,
+			body,
+			{
+				configuredPluginIds: reservedPluginIds,
+				hostEnv: hostEnvFromVersions(VERSION, emdash.config.astroVersion),
+				verifyOnly: true,
+			},
+		);
+		return unwrapResult(result);
+	} catch (error) {
+		console.error("[registry-verify] Unhandled error:", error);
+		return handleError(error, "Failed to verify registry plugin", "VERIFICATION_FAILED");
+	}
+};

package/src/astro/routes/api/content/[collection]/[id]/discard-draft.ts

@@ -8,10 +8,13 @@ import type { APIRoute } from "astro";
 
 import { requireOwnerPerm } from "#api/authorize.js";
 import { apiError, mapErrorStatus, unwrapResult } from "#api/error.js";
+import { claimEntryLockForWrite } from "#api/handlers/entry-lock.js";
+import { isParseError, parseOptionalBody } from "#api/parse.js";
+import { contentRevisionConditionBody } from "#api/schemas.js";
 
 export const prerender = false;
 
-export const POST: APIRoute = async ({ params, locals, url, cache }) => {
+export const POST: APIRoute = async ({ params, request, locals, url, cache }) => {
 	const { emdash, user } = locals;
 	const collection = params.collection!;
 	const id = params.id!;
@@ -19,6 +22,8 @@ export const POST: APIRoute = async ({ params, locals, url, cache }) => {
 	if (!emdash?.handleContentDiscardDraft || !emdash?.handleContentGet) {
 		return apiError("NOT_CONFIGURED", "EmDash is not initialized", 500);
 	}
+	const body = await parseOptionalBody(request, contentRevisionConditionBody, {});
+	if (isParseError(body)) return body;
 
 	const locale = url.searchParams.get("locale") || undefined;
 
@@ -48,7 +53,18 @@ export const POST: APIRoute = async ({ params, locals, url, cache }) => {
 
 	const resolvedId = typeof existingItem?.id === "string" ? existingItem.id : id;
 
-	const result = await emdash.handleContentDiscardDraft(collection, resolvedId);
+	const refusal = await claimEntryLockForWrite(emdash.db, collection, resolvedId, user!.id, {
+		override: body?.overrideLock,
+	});
+	if (refusal) {
+		return apiError(refusal.code, refusal.message, mapErrorStatus(refusal.code), {
+			...refusal.details,
+		});
+	}
+
+	const result = await emdash.handleContentDiscardDraft(collection, resolvedId, {
+		_rev: body?._rev,
+	});
 
 	if (!result.success) return unwrapResult(result);