emdash 0.40.0 → 0.40.1

package/dist/validate-CM79QXYE.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-CM79QXYE.d.mts","names":[],"sources":["../src/seed/types.ts","../src/seed/apply.ts","../src/seed/default.ts","../src/seed/load.ts","../src/seed/validate.ts"],"mappings":"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"}
+{"version":3,"file":"validate-CM79QXYE.d.mts","names":[],"sources":["../src/seed/types.ts","../src/seed/apply.ts","../src/seed/default.ts","../src/seed/load.ts","../src/seed/validate.ts"],"mappings":";;;;;;;;;;UAeiB,QAAA;EAiCH;EA/Bb,OAAA;EAqCY;EAlCZ,OAAA;EAwCW;;;;;;;EA/BX,aAAA;EAAA;EAGA,IAAA;IACC,IAAA;IACA,WAAA;IACA,MAAA;EAAA;EAIU;EAAX,QAAA,GAAW,OAAA,CAAQ,YAAA;EAGnB;EAAA,WAAA,GAAc,cAAA;EAGd;EAAA,UAAA,GAAa,aAAA;EAGb;EAAA,UAAA,GAAa,YAAA;EAGb;EAAA,KAAA,GAAQ,QAAA;EAGR;EAAA,SAAA,GAAY,YAAA;EAGZ;EAAA,WAAA,GAAc,cAAA;EAGd;EAAA,QAAA,GAAW,WAAA;EAGX;EAAA,OAAA,GAAU,UAAA;EAGV;EAAA,OAAA,GAAU,MAAA,SAAe,gBAAA;AAAA;AAAA,UAGT,aAAA;EAChB,IAAA;EACA,KAAA;EACA,WAAA;EACA,IAAA;EACA,QAAA;EACA,cAAA;EACA,QAAA,EAAU,KAAA;IACT,OAAA;IACA,MAAA,EAAQ,oBAAA;EAAA;AAAA;;;;UAOO,cAAA;EAChB,IAAA;EACA,KAAA;EACA,aAAA;EACA,WAAA;EACA,IAAA;EACA,KAAA,GAAQ,qBAAA;EACR,QAAA;EACA,UAAA;EANA;EAQA,QAAA;EANA;;;;;EAYA,MAAA;EANA;;;;EAWA,SAAA;EAMA;EAJA,KAAA;EAQA;EANA,eAAA;EAOQ;EALR,WAAA;EAKiB;EAHjB,UAAA;EASyB;EAPzB,SAAA;EACA,MAAA,EAAQ,SAAA;AAAA;;;;UAMQ,SAAA;EAChB,IAAA;EACA,KAAA;EACA,IAAA,EAAM,SAAA;EACN,QAAA;EACA,MAAA;EACA,UAAA;EACA,OAAA;EACA,YAAA;EACA,UAAA,GAAa,MAAA;EACb,MAAA;EACA,OAAA,GAAU,MAAA;AAAA;;;;AAOX;UAAiB,YAAA;;EAEhB,EAAA;EACA,IAAA;EACA,KAAA;EACA,aAAA;EAAA;EAEA,YAAA;EAEA;EAAA,WAAA;EACA,MAAA;EACA,aAAA;EACA,KAAA,GAAQ,gBAAA;AAAA;;AAMT;;UAAiB,gBAAA;EAAgB;EAEhC,EAAA;EACA,IAAA;EACA,KAAA;EACA,WAAA;EACA,MAAA;EACA,MAAA;EACA,aAAA;AAAA;;AAMD;;UAAiB,QAAA;EAOG;EALnB,EAAA;EACA,IAAA;EACA,KAAA;EACA,MAAA;EACA,aAAA;EACA,KAAA,EAAO,YAAA;AAAA;;;AAMR;UAAiB,YAAA;;EAEhB,EAAA;EACA,IAAA;EACA,KAAA;EACA,GAAA;EACA,GAAA;EACA,UAAA;EACA,MAAA;EACA,SAAA;EACA,UAAA;EACA,MAAA;EACA,aAAA;EACA,QAAA,GAAW,YAAA;AAAA;;;;UAMK,YAAA;EAChB,MAAA;EACA,WAAA;EACA,IAAA;EACA,OAAA;EACA,SAAA;AAAA;;;;UAMgB,cAAA;EAChB,IAAA;EACA,KAAA;EACA,WAAA;EACA,OAAA,EAAS,UAAA;AAAA;;;;UAMO,UAAA;EAChB,IAAA;EACA,KAAA;EAGA,OAAA,GAAU,KAAA;IAAQ,KAAA;IAAe,IAAA;IAAA,CAAgB,GAAA;EAAA;EAGjD,QAAA;EAGA,WAAA;EACA,KAAA,GAAQ,MAAA;AAAA;;;;UAMQ,WAAA;EAChB,IAAA;EACA,KAAA;EACA,WAAA;EATc;EAWd,QAAA;EAL2B;EAO3B,OAAA,EAAS,KAAA;IAAQ,KAAA;IAAe,IAAA;IAAA,CAAgB,GAAA;EAAA;EAFhD;EAIA,MAAA;AAAA;;;;UAMgB,UAAA;EANV;EAQN,EAAA;EACA,IAAA;EACA,WAAA;EACA,GAAA;EACA,UAAA;EACA,OAAA;EAJA;;;;;;;EAYA,MAAA,GAAS,gBAAA;AAAA;AAAA,UAGO,gBAAA;EAAgB;EAEhC,UAAA;EAFgC;EAIhC,GAAA;EAAA;EAEA,QAAA;EAEA;EAAA,QAAA;EACA,KAAA;EACA,MAAA;AAAA;AAMD;;;AAAA,UAAiB,gBAAA;EAcH;EAZb,EAAA;EAe0B;EAZ1B,IAAA;EAHA;EAMA,MAAA;EAAA;EAGA,IAAA,EAAM,MAAA;EAAA;EAGN,UAAA,GAAa,MAAA;EAAA;EAGb,OAAA,GAAU,gBAAA;EAAA;EAGV,MAAA;EAMA;;;AAGD;EAHC,aAAA;AAAA;AAAA,UAGgB,gBAAA;EAGP;EADT,MAAA;EACA,SAAA;AAAA;;;;UAMgB,gBAAA;EAwBhB;;;;;AAkBD;EAnCC,cAAA;;;;;;;EAQA,UAAA;EA6Be;EA1Bf,aAAA;EA0BiD;;;;EApBjD,OAAA,GAAU,OAAA;EAsBV;;;;;;;;;;EAVA,iBAAA;AAAA;;;;UAMgB,eAAA;EAChB,UAAA;IAAc,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EAChD,WAAA;IAAe,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EACjD,MAAA;IAAU,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EAC5C,UAAA;IAAc,OAAA;IAAiB,OAAA;IAAiB,KAAA;EAAA;EAChD,OAAA;IAAW,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EAC7C,KAAA;IAAS,OAAA;IAAiB,KAAA;EAAA;EAC1B,SAAA;IAAa,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EAC/C,WAAA;IAAe,OAAA;IAAiB,OAAA;EAAA;EAChC,QAAA;IAAY,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EAC9C,QAAA;IAAY,OAAA;EAAA;EACZ,OAAA;IAAW,OAAA;IAAiB,OAAA;IAAiB,OAAA;EAAA;EAC7C,KAAA;IAAS,OAAA;IAAiB,OAAA;EAAA;AAAA;;;;UAMV,gBAAA;EAChB,KAAA;EACA,MAAA;EACA,QAAA;AAAA;;;;;;;;;;;;;iBCpOqB,SAAA,CACrB,EAAA,EAAI,MAAA,CAAO,QAAA,GACX,IAAA,EAAM,QAAA,EACN,OAAA,GAAS,gBAAA,GACP,OAAA,CAAQ,eAAA;;;cCjKE,WAAA,EAAa,QAAA;;;;;;iBCcJ,QAAA,CAAA,GAAY,OAAA,CAAQ,QAAA;;;;iBAQpB,YAAA,CAAA,GAAgB,OAAA,CAAQ,QAAA;;;;;;;;;iBCgD9B,YAAA,CAAa,IAAA,YAAgB,gBAAA"}

package/dist/version-DXsxRrob.mjs

@@ -0,0 +1,7 @@
+//#region src/version.ts
+const VERSION = "0.40.1";
+const COMMIT = "b4d759f5a";
+
+//#endregion
+export { VERSION as n, COMMIT as t };
+//# sourceMappingURL=version-DXsxRrob.mjs.map

package/dist/{version-DUQDHgrf.mjs.map → version-DXsxRrob.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"version-DUQDHgrf.mjs","names":[],"sources":["../src/version.ts"],"sourcesContent":["/**\n * Build-time version constants, replaced by tsdown/Vite `define`.\n * Falls back to \"dev\" when running uncompiled (tests, dev).\n */\n\ndeclare const __EMDASH_VERSION__: string;\ndeclare const __EMDASH_COMMIT__: string;\n\nexport const VERSION: string =\n\ttypeof __EMDASH_VERSION__ !== \"undefined\" ? __EMDASH_VERSION__ : \"dev\";\n\nexport const COMMIT: string = typeof __EMDASH_COMMIT__ !== \"undefined\" ? __EMDASH_COMMIT__ : \"dev\";\n"],"mappings":";AAQA,MAAa;AAGb,MAAa"}
+{"version":3,"file":"version-DXsxRrob.mjs","names":[],"sources":["../src/version.ts"],"sourcesContent":["/**\n * Build-time version constants, replaced by tsdown/Vite `define`.\n * Falls back to \"dev\" when running uncompiled (tests, dev).\n */\n\ndeclare const __EMDASH_VERSION__: string;\ndeclare const __EMDASH_COMMIT__: string;\n\nexport const VERSION: string =\n\ttypeof __EMDASH_VERSION__ !== \"undefined\" ? __EMDASH_VERSION__ : \"dev\";\n\nexport const COMMIT: string = typeof __EMDASH_COMMIT__ !== \"undefined\" ? __EMDASH_COMMIT__ : \"dev\";\n"],"mappings":";AAQA,MAAa;AAGb,MAAa"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emdash",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "description": "Astro-native CMS with WordPress migration support",
   "type": "module",
   "main": "dist/index.mjs",
@@ -288,10 +288,10 @@
     "upng-js": "^2.1.0",
     "zod": "4.5.4",
     "@atcute/client": "^5.0.0",
-    "@emdash-cms/admin": "0.40.0",
-    "@emdash-cms/auth": "0.40.0",
-    "@emdash-cms/blocks": "0.40.0",
-    "@emdash-cms/gutenberg-to-portable-text": "0.40.0",
+    "@emdash-cms/admin": "0.40.1",
+    "@emdash-cms/auth": "0.40.1",
+    "@emdash-cms/blocks": "0.40.1",
+    "@emdash-cms/gutenberg-to-portable-text": "0.40.1",
     "@emdash-cms/plugin-types": "0.4.0",
     "@emdash-cms/registry-client": "0.6.1",
     "@emdash-cms/registry-lexicons": "0.6.0",

package/src/api/handlers/index.ts

@@ -56,6 +56,7 @@ export {
 	handleMediaList,
 	handleMediaGet,
 	handleMediaCreate,
+	handleMediaRegisterUpload,
 	handleMediaUpdate,
 	handleMediaReplaceMetadata,
 	handleMediaDelete,

package/src/api/handlers/media-upload.ts

@@ -1,9 +1,8 @@
 /**
  * Programmatic media upload handler (MCP `media_upload` tool).
  *
- * Accepts file bytes as base64 or fetches them from an external URL
- * (SSRF-guarded), then runs the same pipeline as the multipart REST
- * upload route: allowlist + size validation, content-hash deduplication,
+ * Accepts file bytes as base64, then runs the same pipeline as the multipart
+ * REST upload route: allowlist + size validation, content-hash deduplication,
  * storage upload, image metadata enrichment, and record creation.
  */
 
@@ -16,7 +15,6 @@ import { MediaRepository, type MediaItem } from "../../database/repositories/med
 import type { Database } from "../../database/types.js";
 import { enrichImageMetadata } from "../../media/enrich.js";
 import { matchesMimeAllowlist, normalizeMime } from "../../media/mime.js";
-import { SsrfError, ssrfSafeFetch } from "../../security/ssrf.js";
 import type { Storage } from "../../storage/types.js";
 import { decodeBase64Bytes } from "../../utils/base64.js";
 import { computeContentHash } from "../../utils/hash.js";
@@ -27,15 +25,10 @@ import { GLOBAL_UPLOAD_ALLOWLIST } from "./media-allowlist.js";
 export interface MediaUploadInput {
 	/** Original filename (e.g. 'logo.png'); the extension is kept on the storage key. */
 	filename: string;
-	/** Base64-encoded file contents. Exactly one of `base64` / `url` must be set. */
-	base64?: string;
-	/** External http(s) URL to fetch the file from. Exactly one of `base64` / `url` must be set. */
-	url?: string;
-	/**
-	 * MIME type. Required with `base64`; optional with `url` (falls back to
-	 * the response's Content-Type header).
-	 */
-	contentType?: string;
+	/** Base64-encoded file contents. */
+	base64: string;
+	/** MIME type of the decoded bytes. */
+	contentType: string;
 	/** Alt text stored on the media record. */
 	alt?: string;
 	authorId?: string;
@@ -65,75 +58,28 @@ function withUrl(item: MediaItem): MediaItem & { url: string } {
 	return { ...item, url: `/_emdash/api/media/file/${item.storageKey}` };
 }
 
-/** Strip parameters from a Content-Type header value (e.g. '; charset=...'). */
-function bareMime(headerValue: string): string {
-	return (headerValue.split(";")[0] ?? "").trim();
-}
-
-/**
- * Acquire the file bytes and MIME type from either the base64 payload or
- * the external URL. Returns an error result on any validation failure.
- */
+/** Decode the file bytes after rejecting an oversized encoded payload. */
 async function acquireBytes(
 	input: MediaUploadInput,
 	maxUploadSize: number,
 ): Promise<{ bytes: Uint8Array; mimeType: string } | MediaUploadResult> {
-	if (input.base64) {
-		if (!input.contentType) {
-			return fail("VALIDATION_ERROR", "contentType is required when uploading base64 data");
-		}
-		// Cheap size precheck on the encoded string (decoded size is ~3/4 of
-		// the base64 length) before allocating the decoded buffer.
-		if ((input.base64.length * 3) / 4 > maxUploadSize) {
-			return fail(
-				"PAYLOAD_TOO_LARGE",
-				`File exceeds maximum size of ${formatFileSize(maxUploadSize)}`,
-			);
-		}
-		try {
-			return { bytes: decodeBase64Bytes(input.base64), mimeType: input.contentType };
-		} catch {
-			return fail("VALIDATION_ERROR", "Invalid base64 data");
-		}
-	}
-
-	// url mode — the caller guarantees exactly one source, so url is set here
-	const url = input.url;
-	if (!url) {
-		return fail("VALIDATION_ERROR", "Provide exactly one of 'base64' or 'url'");
-	}
-	let response: Response;
-	try {
-		response = await ssrfSafeFetch(url, { headers: { accept: "*/*" } });
-	} catch (error) {
-		if (error instanceof SsrfError) {
-			return fail("VALIDATION_ERROR", `URL not allowed: ${error.message}`);
-		}
-		return fail("FETCH_ERROR", "Failed to fetch file from URL");
-	}
-	if (!response.ok) {
-		return fail("FETCH_ERROR", `Failed to fetch file from URL (HTTP ${response.status})`);
-	}
-
-	const contentLength = response.headers.get("Content-Length");
-	if (contentLength && parseInt(contentLength, 10) > maxUploadSize) {
+	// Cheap size precheck on the encoded string (decoded size is ~3/4 of
+	// the base64 length) before allocating the decoded buffer.
+	if ((input.base64.length * 3) / 4 > maxUploadSize) {
 		return fail(
 			"PAYLOAD_TOO_LARGE",
 			`File exceeds maximum size of ${formatFileSize(maxUploadSize)}`,
 		);
 	}
-
-	const mimeType = input.contentType ?? bareMime(response.headers.get("Content-Type") ?? "");
-	if (!mimeType) {
-		return fail("VALIDATION_ERROR", "Could not determine MIME type — pass contentType explicitly");
+	try {
+		return { bytes: decodeBase64Bytes(input.base64), mimeType: input.contentType };
+	} catch {
+		return fail("VALIDATION_ERROR", "Invalid base64 data");
 	}
-
-	const bytes = new Uint8Array(await response.arrayBuffer());
-	return { bytes, mimeType };
 }
 
 /**
- * Upload a media file from base64 data or an external URL.
+ * Upload a media file from base64 data.
  *
  * Mirrors the REST `POST /_emdash/api/media` route: global MIME allowlist,
  * size limit, content-hash dedupe (returns the existing item with
@@ -146,8 +92,8 @@ export async function handleMediaUpload(
 	input: MediaUploadInput,
 	hooks: MediaUploadHooks = {},
 ): Promise<MediaUploadResult> {
-	if (!input.base64 === !input.url) {
-		return fail("VALIDATION_ERROR", "Provide exactly one of 'base64' or 'url'");
+	if (!input.base64 || !input.contentType) {
+		return fail("VALIDATION_ERROR", "base64 and contentType are required");
 	}
 
 	const rawMax = input.maxUploadSize ?? DEFAULT_MAX_UPLOAD_SIZE;

package/src/api/handlers/media.ts

@@ -173,6 +173,91 @@ export async function handleMediaCreate(
 	}
 }
 
+/**
+ * Confirm an upload minted by the signed upload URL endpoint.
+ *
+ * The storage key must belong to a pending media row created for the same
+ * user; arbitrary keys never reach storage this way.
+ */
+export async function handleMediaRegisterUpload(
+	db: Kysely<Database>,
+	storage: Storage,
+	input: {
+		storageKey: string;
+		authorId?: string;
+	},
+): Promise<ApiResult<MediaResponse>> {
+	const invalidKey: ApiResult<never> = {
+		success: false,
+		error: {
+			code: "INVALID_STORAGE_KEY",
+			message:
+				"storageKey does not match a pending upload created for this user; request a signed upload URL first",
+		},
+	};
+	try {
+		const repo = new MediaRepository(db);
+		const pending = await repo.findPendingByStorageKey(input.storageKey);
+		if (!pending) return invalidKey;
+		if ((pending.authorId ?? null) !== (input.authorId ?? null)) return invalidKey;
+		if (pending.size === null) {
+			return {
+				success: false,
+				error: {
+					code: "INVALID_STATE",
+					message: "Pending upload has no expected size",
+				},
+			};
+		}
+		if (!(await storage.exists(input.storageKey))) {
+			return {
+				success: false,
+				error: { code: "FILE_NOT_FOUND", message: "File was not uploaded to storage" },
+			};
+		}
+
+		const storedFile = await storage.download(input.storageKey);
+		try {
+			if (storedFile.size !== pending.size) {
+				return {
+					success: false,
+					error: {
+						code: "UPLOAD_SIZE_MISMATCH",
+						message: "Stored file size does not match the pending upload",
+					},
+				};
+			}
+		} finally {
+			try {
+				await storedFile.body.cancel();
+			} catch (error) {
+				console.error("[media] upload confirmation cancellation failed:", error);
+			}
+		}
+
+		const item = await repo.confirmUpload(pending.id, undefined, input.storageKey);
+		if (!item) return invalidKey;
+		try {
+			await repo.deleteUploadAttempt(input.storageKey);
+		} catch (error) {
+			console.error("[media] upload attempt cleanup failed:", error);
+		}
+
+		return {
+			success: true,
+			data: { item },
+		};
+	} catch {
+		return {
+			success: false,
+			error: {
+				code: "MEDIA_REGISTER_ERROR",
+				message: "Failed to register the upload",
+			},
+		};
+	}
+}
+
 /**
  * Update media metadata
  */
@@ -291,9 +376,18 @@ export async function handleMediaDelete(
 		const storageKey = await repo.deleteWithStorageKey(id);
 		if (!storageKey) return notFound;
 
-		const storageDeleted = storage
-			? await removeUploadAttempt(storage, repo, storageKey, { allowUntracked: true })
-			: false;
+		let storageDeleted = false;
+		if (storage) {
+			if (await repo.isStorageKeyReferenced(storageKey)) {
+				// A legacy or concurrently-created row still owns this object. Remove
+				// the cleanup marker created above so scheduled cleanup cannot delete it.
+				await repo.deleteUploadAttempt(storageKey);
+			} else {
+				storageDeleted = await removeUploadAttempt(storage, repo, storageKey, {
+					allowUntracked: true,
+				});
+			}
+		}
 
 		return {
 			success: true,

package/src/api/handlers/snapshot.ts

@@ -80,6 +80,8 @@ export function parsePreviewSignatureHeader(
 // ── Media URL rewriting ─────────────────────────────────────────
 
 const MEDIA_FILE_PREFIX = "/_emdash/api/media/file/";
+const MEDIA_FILE_SUFFIX = /[?#]/;
+const EXTERNAL_OR_ROOT_URL = /^(?:[a-z][a-z0-9+.-]*:|\/)/i;
 
 /**
  * Parse a JSON string value and inject `src` for local media objects.
@@ -179,12 +181,59 @@ const SYSTEM_TABLES = [
 	"_emdash_widgets",
 	"_emdash_seo",
 	"_emdash_migrations",
-	"taxonomies",
 	"content_taxonomies",
-	"media",
+	"taxonomies",
 	"options",
+	"media",
 	"revisions",
-];
+] as const;
+
+type SystemTable = (typeof SYSTEM_TABLES)[number];
+type PublishedTablePolicy = "full" | "content-linked" | "omit";
+
+/**
+ * Published snapshots are available to preview-signature callers, so every
+ * system table must be classified explicitly. Adding a snapshot table without
+ * choosing a policy is a type error rather than an accidental data export.
+ */
+const PUBLISHED_TABLE_POLICIES: Record<SystemTable, PublishedTablePolicy> = {
+	_emdash_block_types: "full",
+	_emdash_block_type_versions: "full",
+	_emdash_collections: "full",
+	_emdash_fields: "full",
+	_emdash_taxonomy_defs: "full",
+	_emdash_taxonomy_def_groups: "full",
+	_emdash_menus: "full",
+	_emdash_menu_items: "content-linked",
+	_emdash_sections: "full",
+	_emdash_widget_areas: "full",
+	_emdash_widgets: "full",
+	_emdash_seo: "content-linked",
+	_emdash_migrations: "full",
+	content_taxonomies: "content-linked",
+	taxonomies: "content-linked",
+	options: "content-linked",
+	media: "content-linked",
+	revisions: "omit",
+};
+
+const SYSTEM_TABLE_SET: ReadonlySet<string> = new Set(SYSTEM_TABLES);
+
+function isSystemTable(tableName: string): tableName is SystemTable {
+	return SYSTEM_TABLE_SET.has(tableName);
+}
+
+interface PublishedContentReferences {
+	ids: Set<string>;
+	translationGroups: Set<string>;
+}
+
+interface PublishedProjection {
+	content: Map<string, PublishedContentReferences>;
+	taxonomyGroups: Set<string>;
+	mediaIds: Set<string>;
+	mediaStorageKeys: Set<string>;
+}
 
 /**
  * Table name prefixes excluded from snapshots (auth/security data).
@@ -256,6 +305,191 @@ function normalizeRows(
 	return rows;
 }
 
+function createPublishedProjection(): PublishedProjection {
+	return {
+		content: new Map(),
+		taxonomyGroups: new Set(),
+		mediaIds: new Set(),
+		mediaStorageKeys: new Set(),
+	};
+}
+
+function readString(value: unknown): string | null {
+	return typeof value === "string" && value.length > 0 ? value : null;
+}
+
+function recordPublishedContent(
+	projection: PublishedProjection,
+	tableName: string,
+	rows: Record<string, unknown>[],
+): void {
+	const references: PublishedContentReferences = {
+		ids: new Set(),
+		translationGroups: new Set(),
+	};
+	for (const row of rows) {
+		const id = readString(row.id);
+		const translationGroup = readString(row.translation_group);
+		if (id) references.ids.add(id);
+		if (translationGroup) references.translationGroups.add(translationGroup);
+	}
+	projection.content.set(tableName.slice("ec_".length), references);
+}
+
+function isPublishedContentReference(
+	projection: PublishedProjection,
+	collection: unknown,
+	reference: unknown,
+): boolean {
+	const collectionName = readString(collection);
+	const id = readString(reference);
+	if (!collectionName || !id) return false;
+	const references = projection.content.get(collectionName);
+	return references?.ids.has(id) === true || references?.translationGroups.has(id) === true;
+}
+
+function collectMediaReferences(value: unknown, projection: PublishedProjection): void {
+	if (typeof value === "string") {
+		if (value.startsWith(MEDIA_FILE_PREFIX)) {
+			const storageKey = value.slice(MEDIA_FILE_PREFIX.length).split(MEDIA_FILE_SUFFIX, 1)[0];
+			if (storageKey) projection.mediaStorageKeys.add(storageKey);
+			return;
+		}
+		const trimmed = value.trimStart();
+		if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+			try {
+				collectMediaReferences(JSON.parse(value), projection);
+			} catch {
+				// Not structured data.
+			}
+		}
+		return;
+	}
+	if (Array.isArray(value)) {
+		for (const item of value) collectMediaReferences(item, projection);
+		return;
+	}
+	if (!isRecord(value)) return;
+
+	const mediaId = readString(value.mediaId);
+	if (mediaId) projection.mediaIds.add(mediaId);
+
+	const provider = readString(value.provider);
+	const meta = isRecord(value.meta) ? value.meta : null;
+	const localMediaId = readString(value.id);
+	if ((provider === "local" || (!provider && meta)) && localMediaId) {
+		projection.mediaIds.add(localMediaId);
+	}
+	const storageKey = readString(value.storageKey) ?? readString(meta?.storageKey);
+	if (storageKey) projection.mediaStorageKeys.add(storageKey);
+
+	const asset = isRecord(value.asset) ? value.asset : null;
+	const assetRef = readString(asset?._ref);
+	if (assetRef) {
+		projection.mediaIds.add(assetRef);
+		projection.mediaStorageKeys.add(assetRef);
+	}
+
+	for (const child of Object.values(value)) collectMediaReferences(child, projection);
+}
+
+function projectTaxonomyRows(
+	rows: Record<string, unknown>[],
+	projection: PublishedProjection,
+): Record<string, unknown>[] {
+	const includedGroups = new Set(projection.taxonomyGroups);
+	const includedIds = new Set(projection.taxonomyGroups);
+	let changed = true;
+	while (changed) {
+		changed = false;
+		for (const row of rows) {
+			const id = readString(row.id);
+			const group = readString(row.translation_group);
+			if (!id) continue;
+			if (includedIds.has(id) || (group && includedGroups.has(group))) {
+				if (!includedIds.has(id)) {
+					includedIds.add(id);
+					changed = true;
+				}
+				if (group && !includedGroups.has(group)) {
+					includedGroups.add(group);
+					changed = true;
+				}
+				const parentId = readString(row.parent_id);
+				if (parentId && !includedIds.has(parentId)) {
+					includedIds.add(parentId);
+					changed = true;
+				}
+			}
+		}
+	}
+	return rows.filter((row) => {
+		const id = readString(row.id);
+		const group = readString(row.translation_group);
+		return (id && includedIds.has(id)) || (group && includedGroups.has(group));
+	});
+}
+
+function projectPublishedRows(
+	tableName: SystemTable,
+	rows: Record<string, unknown>[],
+	projection: PublishedProjection,
+): Record<string, unknown>[] {
+	switch (tableName) {
+		case "_emdash_seo":
+			return rows.filter((row) => {
+				const published = isPublishedContentReference(projection, row.collection, row.content_id);
+				if (!published) return false;
+				const image = readString(row.seo_image);
+				if (image) {
+					collectMediaReferences(image, projection);
+					if (!EXTERNAL_OR_ROOT_URL.test(image)) {
+						projection.mediaIds.add(image);
+						projection.mediaStorageKeys.add(image);
+					}
+				}
+				return true;
+			});
+		case "content_taxonomies":
+			return rows.filter((row) => {
+				const published = isPublishedContentReference(projection, row.collection, row.entry_id);
+				const taxonomyGroup = readString(row.taxonomy_id);
+				if (published && taxonomyGroup) projection.taxonomyGroups.add(taxonomyGroup);
+				return published;
+			});
+		case "taxonomies":
+			return projectTaxonomyRows(rows, projection);
+		case "_emdash_menu_items":
+			return rows.filter((row) => {
+				const type = readString(row.type);
+				const referenceId = readString(row.reference_id);
+				if (!referenceId || type === "custom") return true;
+				if (type === "taxonomy") {
+					projection.taxonomyGroups.add(referenceId);
+					return true;
+				}
+				if (type === "collection" && !row.reference_id) return true;
+				const collection =
+					readString(row.reference_collection) ??
+					(type === "post" || type === "page" ? `${type}s` : null);
+				return isPublishedContentReference(projection, collection, referenceId);
+			});
+		case "media":
+			return rows.filter((row) => {
+				const id = readString(row.id);
+				const storageKey = readString(row.storage_key);
+				return (
+					(id !== null && projection.mediaIds.has(id)) ||
+					(storageKey !== null && projection.mediaStorageKeys.has(storageKey))
+				);
+			});
+		case "options":
+			return rows;
+		default:
+			return [];
+	}
+}
+
 export interface GenerateSnapshotOptions {
 	/** Include draft and scheduled content (default: false) */
 	includeDrafts?: boolean;
@@ -288,6 +522,8 @@ export async function generateSnapshot(
 	const includeTrashed = options?.includeTrashed ?? false;
 	const optionPrefixes = options?.optionPrefixes ?? SAFE_OPTIONS_PREFIXES;
 	const optionKeys = new Set(options?.optionKeys);
+	const publishedOnly = !includeDrafts && !includeTrashed;
+	const publishedProjection = createPublishedProjection();
 
 	const contentTables = await listTablesLike(db, "ec_%");
 
@@ -340,6 +576,12 @@ export async function generateSnapshot(
 					`.execute(db)
 				).rows;
 			}
+		} else if (
+			publishedOnly &&
+			isSystemTable(tableName) &&
+			PUBLISHED_TABLE_POLICIES[tableName] === "omit"
+		) {
+			rows = [];
 		} else if (tableName === "options") {
 			rows = (
 				await sql<Record<string, unknown>>`
@@ -357,6 +599,18 @@ export async function generateSnapshot(
 			).rows;
 		}
 
+		if (publishedOnly) {
+			if (tableName.startsWith("ec_")) {
+				recordPublishedContent(publishedProjection, tableName, rows);
+			} else if (
+				isSystemTable(tableName) &&
+				PUBLISHED_TABLE_POLICIES[tableName] === "content-linked"
+			) {
+				rows = projectPublishedRows(tableName, rows, publishedProjection);
+			}
+			for (const row of rows) collectMediaReferences(row, publishedProjection);
+		}
+
 		if (rows.length > 0) {
 			tables[tableName] = normalizeRows(rows, types);
 		}

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

@@ -631,14 +631,20 @@ export function createViteConfig(
 			// 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.
+			// Bare ids would not resolve on pnpm sites, which have no top-level copy.
 			include: useSource
-				? ["@astrojs/react/client.js", "lowlight", "highlight.js", "highlight.js/lib/core"]
+				? [
+						"@astrojs/react/client.js",
+						"emdash > lowlight",
+						"emdash > highlight.js",
+						"emdash > highlight.js/lib/core",
+					]
 				: [
 						"@emdash-cms/admin",
 						"@astrojs/react/client.js",
-						"lowlight",
-						"highlight.js",
-						"highlight.js/lib/core",
+						"emdash > lowlight",
+						"emdash > highlight.js",
+						"emdash > highlight.js/lib/core",
 					],
 			exclude: cloudflare ? ["virtual:emdash"] : [...NODE_NATIVE_EXTERNALS, "virtual:emdash"],
 		},

package/src/astro/middleware.ts

@@ -947,6 +947,7 @@ export const onRequest = defineMiddleware(async (context, next) => {
 					handleMediaGet: runtime.handleMediaGet.bind(runtime),
 					handleMediaUpload: runtime.handleMediaUpload.bind(runtime),
 					handleMediaCreate: runtime.handleMediaCreate.bind(runtime),
+					handleMediaRegisterUpload: runtime.handleMediaRegisterUpload.bind(runtime),
 					handleMediaUpdate: runtime.handleMediaUpdate.bind(runtime),
 					...(runtime.handleMediaReplaceMetadata
 						? {