emdash 0.41.0 → 0.42.0

package/src/database/migrations/088_cron_oneshot_utc.ts

@@ -0,0 +1,39 @@
+import { sql, type Kysely } from "kysely";
+
+const BATCH_SIZE = 100;
+const ISO_TIMEZONE_PATTERN = /(?:Z|[+-]\d{2}:?\d{2})$/;
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+	let cursor = "";
+	for (;;) {
+		const rows = await sql<{ id: string; next_run_at: string }>`
+			SELECT id, next_run_at
+			FROM _emdash_cron_tasks
+			WHERE is_oneshot = 1 AND id > ${cursor}
+			ORDER BY id
+			LIMIT ${BATCH_SIZE}
+		`.execute(db);
+
+		if (rows.rows.length === 0) break;
+		for (const row of rows.rows) {
+			const normalized = row.next_run_at.replace(" ", "T");
+			const input = ISO_TIMEZONE_PATTERN.test(normalized) ? normalized : `${normalized}Z`;
+			const parsed = new Date(input);
+			if (Number.isNaN(parsed.getTime())) continue;
+			const canonical = parsed.toISOString();
+			if (canonical === row.next_run_at) continue;
+			await sql`
+				UPDATE _emdash_cron_tasks
+				SET next_run_at = ${canonical}
+				WHERE id = ${row.id} AND next_run_at = ${row.next_run_at}
+			`.execute(db);
+		}
+
+		cursor = rows.rows.at(-1)!.id;
+		if (rows.rows.length < BATCH_SIZE) break;
+	}
+}
+
+export async function down(_db: Kysely<unknown>): Promise<void> {
+	// UTC normalization preserves the instant but not the original offset notation.
+}

package/src/database/migrations/089_auto_seed_completion.ts

@@ -0,0 +1,13 @@
+import type { Kysely } from "kysely";
+import { sql } from "kysely";
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+	await sql`
+		INSERT INTO options (name, value)
+		SELECT 'emdash:seed_complete', 'true'
+		WHERE EXISTS (SELECT 1 FROM _emdash_collections)
+		ON CONFLICT (name) DO NOTHING
+	`.execute(db);
+}
+
+export async function down(_db: Kysely<unknown>): Promise<void> {}

package/src/database/migrations/runner.ts

@@ -95,6 +95,8 @@ import * as m084 from "./084_site_transfer.js";
 import * as m085 from "./085_taxonomy_def_groups.js";
 import * as m086 from "./086_relations_structural.js";
 import * as m087 from "./087_reference_field_relations.js";
+import * as m088 from "./088_cron_oneshot_utc.js";
+import * as m089 from "./089_auto_seed_completion.js";
 
 const MIGRATIONS: Readonly<Record<string, Migration>> = Object.freeze({
 	"001_initial": m001,
@@ -183,6 +185,8 @@ const MIGRATIONS: Readonly<Record<string, Migration>> = Object.freeze({
 	"085_taxonomy_def_groups": m085,
 	"086_relations_structural": m086,
 	"087_reference_field_relations": m087,
+	"088_cron_oneshot_utc": m088,
+	"089_auto_seed_completion": m089,
 });
 
 /** Ordered names from the statically registered migration set. */

package/src/database/repositories/comment.ts

@@ -147,7 +147,7 @@ export class CommentRepository {
 		contentId: string,
 		options: { status?: CommentStatus; limit?: number; cursor?: string } = {},
 	): Promise<FindManyResult<Comment>> {
-		const limit = Math.min(options.limit || 50, 100);
+		const limit = Math.max(1, Math.min(options.limit || 50, 100));
 
 		let query = this.db
 			.selectFrom("_emdash_comments")
@@ -195,7 +195,7 @@ export class CommentRepository {
 		status: CommentStatus,
 		options: { collection?: string; search?: string; limit?: number; cursor?: string } = {},
 	): Promise<FindManyResult<Comment>> {
-		const limit = Math.min(options.limit || 50, 100);
+		const limit = Math.max(1, Math.min(options.limit || 50, 100));
 
 		let query = this.db.selectFrom("_emdash_comments").selectAll().where("status", "=", status);
 

package/src/database/repositories/content.ts

@@ -350,7 +350,7 @@ export class ContentRepository {
 			publishedAt,
 			createdAt,
 		} = input;
-		const data = await this.datetimes.normalizeData(type, inputData);
+		const data = await this.datetimes.normalizeInput(type, inputData);
 		const normalizedCreatedAt = createdAt
 			? await this.datetimes.normalizeValue(type, createdAt)
 			: now;
@@ -578,14 +578,19 @@ export class ContentRepository {
 		return this.mapRow(type, row);
 	}
 
-	async findManyByIds(type: string, ids: string[]): Promise<Map<string, ContentItem>> {
+	async findManyByIds(
+		type: string,
+		ids: string[],
+		options: { includeTrashed?: boolean } = {},
+	): Promise<Map<string, ContentItem>> {
 		const items = new Map<string, ContentItem>();
 		if (ids.length === 0) return items;
 		const tableName = getTableName(type);
+		const deletedFilter = options.includeTrashed ? sql`` : sql`AND deleted_at IS NULL`;
 		for (const batch of chunks([...new Set(ids)], SQL_BATCH_SIZE)) {
 			const result = await sql<Record<string, unknown>>`
 				SELECT * FROM ${sql.ref(tableName)}
-				WHERE id IN (${sql.join(batch)}) AND deleted_at IS NULL
+				WHERE id IN (${sql.join(batch)}) ${deletedFilter}
 			`.execute(this.db);
 			for (const row of result.rows) {
 				const item = this.mapRow(type, row);
@@ -599,14 +604,16 @@ export class ContentRepository {
 		type: string,
 		slugs: string[],
 		locale: string,
+		options: { includeTrashed?: boolean } = {},
 	): Promise<Map<string, ContentItem>> {
 		const items = new Map<string, ContentItem>();
 		if (slugs.length === 0) return items;
 		const tableName = getTableName(type);
+		const deletedFilter = options.includeTrashed ? sql`` : sql`AND deleted_at IS NULL`;
 		for (const batch of chunks([...new Set(slugs)], SQL_BATCH_SIZE)) {
 			const result = await sql<Record<string, unknown>>`
 				SELECT * FROM ${sql.ref(tableName)}
-				WHERE slug IN (${sql.join(batch)}) AND locale = ${locale} AND deleted_at IS NULL
+				WHERE slug IN (${sql.join(batch)}) AND locale = ${locale} ${deletedFilter}
 			`.execute(this.db);
 			for (const row of result.rows) {
 				const item = this.mapRow(type, row);
@@ -788,7 +795,7 @@ export class ContentRepository {
 		options: FindManyOptions = {},
 	): Promise<FindManyResult<ContentItem>> {
 		const tableName = getTableName(type);
-		const limit = Math.min(options.limit || 50, 100);
+		const limit = Math.max(1, Math.min(options.limit || 50, 100));
 
 		// Determine ordering
 		const orderField = options.orderBy?.field || "createdAt";
@@ -989,7 +996,7 @@ export class ContentRepository {
 
 		// Update data fields (skip system columns to prevent injection via data)
 		if (input.data !== undefined && typeof input.data === "object") {
-			const data = await this.datetimes.normalizeData(type, writableContentData(input.data));
+			const data = await this.datetimes.normalizeInput(type, writableContentData(input.data));
 			for (const [key, value] of Object.entries(data)) {
 				updates[key] = serializeValue(value);
 			}
@@ -1206,7 +1213,7 @@ export class ContentRepository {
 		input: UpdateContentInput,
 	): Promise<ContentItem> {
 		const data = input.data
-			? await this.datetimes.normalizeData(type, writableContentData(input.data))
+			? await this.datetimes.normalizeInput(type, writableContentData(input.data))
 			: {};
 		const stagedSlug = typeof input.slug === "string" ? input.slug : undefined;
 		const hasDraftUpdate = Object.keys(data).length > 0 || stagedSlug !== undefined;
@@ -1634,7 +1641,7 @@ export class ContentRepository {
 		options: Omit<FindManyOptions, "where"> & { where?: { locale?: string } } = {},
 	): Promise<FindManyResult<ContentItem & { deletedAt: string }>> {
 		const tableName = getTableName(type);
-		const limit = Math.min(options.limit || 50, 100);
+		const limit = Math.max(1, Math.min(options.limit || 50, 100));
 
 		// Determine ordering - default to most recently deleted
 		const orderField = options.orderBy?.field || "deletedAt";

package/src/database/repositories/plugin-storage.ts

@@ -345,7 +345,7 @@ export class PluginStorageRepository<T = unknown> implements StorageCollection<T
 	 */
 	async query(options: QueryOptions = {}): Promise<PaginatedResult<{ id: string; data: T }>> {
 		const { where = {}, orderBy = {}, cursor } = options;
-		const limit = Math.min(options.limit ?? 50, 100);
+		const limit = Math.max(1, Math.min(options.limit ?? 50, 100));
 
 		// Validate that all queried fields are indexed
 		validateWhereClause(where, this.indexedFields, this.pluginId, this.collection);

package/src/database/repositories/redirect.ts

@@ -2,11 +2,13 @@ import { sql, type Kysely } from "kysely";
 import { ulid } from "ulidx";
 
 import { interpolateUrlPattern } from "../../i18n/resolve.js";
+import { isSiteRelativeDestination } from "../../redirects/destination.js";
 import {
 	compilePattern,
 	matchPattern,
 	interpolateDestination,
 	isPattern,
+	validatePattern,
 } from "../../redirects/patterns.js";
 import { currentTimestampValue, isPostgres } from "../dialect-helpers.js";
 import type { Database, RedirectTable } from "../types.js";
@@ -468,18 +470,21 @@ export class RedirectRepository {
 	async matchPath(path: string): Promise<RedirectMatch | null> {
 		// 1. Exact match (fast, indexed)
 		const exact = await this.findExactMatch(path);
-		if (exact) {
+		if (exact && isSiteRelativeDestination(exact.destination)) {
 			return { redirect: exact, resolvedDestination: exact.destination };
 		}
 
 		// 2. Pattern match
 		const patterns = await this.findEnabledPatternRules();
 		for (const redirect of patterns) {
+			if (validatePattern(redirect.source)) continue;
 			const compiled = compilePattern(redirect.source);
 			const params = matchPattern(compiled, path);
 			if (params) {
 				const resolved = interpolateDestination(redirect.destination, params);
-				return { redirect, resolvedDestination: resolved };
+				if (isSiteRelativeDestination(resolved)) {
+					return { redirect, resolvedDestination: resolved };
+				}
 			}
 		}
 

package/src/database/repositories/relation.ts

@@ -498,7 +498,7 @@ export class RelationRepository {
 		parentGroup: string,
 		options: { limit?: number; cursor?: string } = {},
 	): Promise<FindManyResult<ContentReference>> {
-		const limit = Math.min(options.limit || 50, 100);
+		const limit = Math.max(1, Math.min(options.limit || 50, 100));
 
 		let query = this.db
 			.selectFrom("_emdash_content_references")
@@ -853,7 +853,7 @@ export class RelationRepository {
 		childGroup: string,
 		options: { limit?: number; cursor?: string } = {},
 	): Promise<FindManyResult<ContentReference>> {
-		const limit = Math.min(options.limit || 50, 100);
+		const limit = Math.max(1, Math.min(options.limit || 50, 100));
 
 		let query = this.db
 			.selectFrom("_emdash_content_references")

package/src/database/types.ts

@@ -439,7 +439,7 @@ export interface CollectionTable {
 	label_singular: string | null;
 	description: string | null;
 	icon: string | null;
-	admin_config: Generated<string | null>; // JSON: { listColumns?: string[] }
+	admin_config: Generated<string | null>; // JSON: { listColumns?: string[]; quickCreate?: boolean }
 	supports: string | null; // JSON array
 	source: string | null;
 	search_config: string | null; // JSON: SearchConfig

package/src/db/node-sqlite-compat.ts

@@ -1,18 +1,21 @@
 import { DatabaseSync } from "node:sqlite";
 
-export interface NodeSqliteCompatDatabase {
-	close(): void;
-	prepare(sql: string): NodeSqliteCompatStatement;
-}
-
 export interface NodeSqliteCompatStatement {
 	readonly reader: boolean;
 	all(parameters: ReadonlyArray<unknown>): unknown[];
+	all(...parameters: unknown[]): unknown[];
+	get(parameters: ReadonlyArray<unknown>): unknown;
+	get(...parameters: unknown[]): unknown;
 	run(parameters: ReadonlyArray<unknown>): {
 		changes: number | bigint;
 		lastInsertRowid: number | bigint;
 	};
+	run(...parameters: unknown[]): {
+		changes: number | bigint;
+		lastInsertRowid: number | bigint;
+	};
 	iterate(parameters: ReadonlyArray<unknown>): IterableIterator<unknown>;
+	iterate(...parameters: unknown[]): IterableIterator<unknown>;
 }
 
 export interface NodeSqliteOpenOptions {
@@ -26,43 +29,66 @@ export function openNodeSqliteDatabase(
 	path: string,
 	options: NodeSqliteOpenOptions = {},
 ): NodeSqliteCompatDatabase {
-	const database = new DatabaseSync(path, { readOnly: options.readOnly });
+	return new NodeSqliteCompatDatabase(path, options);
+}
+
+export class NodeSqliteCompatDatabase {
+	readonly #database: DatabaseSync;
+
+	constructor(path: string, options: NodeSqliteOpenOptions = {}) {
+		const database = new DatabaseSync(path, { readOnly: options.readOnly });
+		this.#database = database;
 
-	try {
-		database.exec("PRAGMA busy_timeout = 5000");
-		database.exec("PRAGMA foreign_keys = ON");
-		// Negative cache_size values are kibibytes.
-		database.exec("PRAGMA cache_size = -16000");
-		if (options.journalMode === "wal" && !options.readOnly) {
-			database.exec("PRAGMA journal_mode = WAL");
-		}
-		const journalMode = database.prepare("PRAGMA journal_mode").get()?.["journal_mode"];
-		if (journalMode === "wal") {
-			database.exec("PRAGMA synchronous = NORMAL");
-		}
-	} catch (error) {
 		try {
-			database.close();
-		} catch {
-			throw new Error("SQLite setup failed and the connection could not be closed", {
-				cause: error,
-			});
+			database.exec("PRAGMA busy_timeout = 5000");
+			database.exec("PRAGMA foreign_keys = ON");
+			// Negative cache_size values are kibibytes.
+			database.exec("PRAGMA cache_size = -16000");
+			if (options.journalMode === "wal" && !options.readOnly) {
+				database.exec("PRAGMA journal_mode = WAL");
+			}
+			const journalMode = database.prepare("PRAGMA journal_mode").get()?.["journal_mode"];
+			if (journalMode === "wal") {
+				database.exec("PRAGMA synchronous = NORMAL");
+			}
+		} catch (error) {
+			try {
+				database.close();
+			} catch {
+				throw new Error("SQLite setup failed and the connection could not be closed", {
+					cause: error,
+				});
+			}
+			throw error;
 		}
-		throw error;
 	}
 
-	return {
-		close: () => database.close(),
-		prepare(sql) {
-			const statement = database.prepare(sql);
-			return {
-				reader: statement.columns().length > 0,
-				all: (parameters) => statement.all(...toBindings(parameters)),
-				run: (parameters) => statement.run(...toBindings(parameters)),
-				iterate: (parameters) => statement.iterate(...toBindings(parameters)),
-			};
-		},
-	};
+	get open(): boolean {
+		return this.#database.isOpen;
+	}
+
+	close(): void {
+		if (this.#database.isOpen) this.#database.close();
+	}
+
+	exec(sql: string): void {
+		this.#database.exec(sql);
+	}
+
+	prepare(sql: string): NodeSqliteCompatStatement {
+		const statement = this.#database.prepare(sql);
+		return {
+			reader: statement.columns().length > 0,
+			all: (...parameters) => statement.all(...toBindings(normalizeParameters(parameters))),
+			get: (...parameters) => statement.get(...toBindings(normalizeParameters(parameters))),
+			run: (...parameters) => statement.run(...toBindings(normalizeParameters(parameters))),
+			iterate: (...parameters) => statement.iterate(...toBindings(normalizeParameters(parameters))),
+		};
+	}
+}
+
+function normalizeParameters(parameters: unknown[]): ReadonlyArray<unknown> {
+	return parameters.length === 1 && Array.isArray(parameters[0]) ? parameters[0] : parameters;
 }
 
 function toBindings(parameters: ReadonlyArray<unknown>): SqliteBinding[] {

package/src/emdash-runtime.ts

@@ -30,8 +30,12 @@ import {
 } from "./api/handlers/media-upload.js";
 import { resolveReferenceSelection } from "./api/handlers/relations.js";
 import {
+	liveReferenceSelection,
+	mergeStagedReferenceBaselines,
 	mergeStagedReferences,
+	STAGED_REFERENCES_BASELINE_KEY,
 	STAGED_REFERENCES_KEY,
+	type StagedReferenceBaselines,
 	type StagedReferences,
 } from "./api/handlers/staged-references.js";
 import { validateRev } from "./api/rev.js";
@@ -134,6 +138,7 @@ import { recordSchedulerHeartbeatSafely } from "./scheduler-health.js";
 import { primeRegisteredCollections } from "./schema/collection-slugs-cache.js";
 import { isStoragelessField, isStoragelessFieldRow } from "./schema/types.js";
 import type { CollectionWithFields } from "./schema/types.js";
+import { AUTO_SEED_COMPLETE_OPTION } from "./seed/ownership.js";
 import { isMissingTableError } from "./utils/db-errors.js";
 import { hashString } from "./utils/hash.js";
 import { createInitLock, type InitLock, initWithLock } from "./utils/init-lock.js";
@@ -142,6 +147,7 @@ import { COMMIT, VERSION } from "./version.js";
 
 const LEADING_SLASH_PATTERN = /^\//;
 const LOCALE_CASING_REPAIR_OPTION = "emdash:repair_locale_casing";
+const SETUP_COMPLETE_OPTION = "emdash:setup_complete";
 
 const PLUGIN_COMMENT_STATUSES = new Set<string>(["approved", "pending", "spam"]);
 
@@ -1452,6 +1458,7 @@ export class EmDashRuntime {
 						settingsSchema: bundle.manifest.admin?.settingsSchema,
 						editorPanels: bundle.manifest.admin?.editorPanels,
 						editorActions: bundle.manifest.admin?.editorActions,
+						mcp: bundle.manifest.mcp,
 					});
 					newPlugins.push(adapted);
 					this.allPipelinePlugins.push(adapted);
@@ -1542,9 +1549,11 @@ export class EmDashRuntime {
 					trailingSlash?: "always" | "never" | "ignore";
 			  }
 			| undefined;
-		// "Already set up" by default so a read failure (e.g. tables absent on a
+		// "Already complete" by default so a read failure (e.g. tables absent on a
 		// pre-migration db) skips seeding rather than seeding a half-built db.
-		let seedGate = { collectionCount: 1, setupDone: true };
+		let seedComplete = true;
+		let setupDone = true;
+		let seedCollectionsReadable = false;
 
 		// Seeding must only touch the configured singleton, never a borrowed
 		// per-request db (playground / DO preview) or the loader-fallback db.
@@ -1591,17 +1600,26 @@ export class EmDashRuntime {
 		};
 
 		const readSiteInfo = async () => {
-			const siteOpts = await optionsRepo.getMany<string>([
+			const siteOpts = await optionsRepo.getMany([
 				"emdash:site_title",
 				"emdash:site_url",
 				"emdash:locale",
 				LOCALE_CASING_REPAIR_OPTION,
+				AUTO_SEED_COMPLETE_OPTION,
+				SETUP_COMPLETE_OPTION,
 			]);
-			storedLocaleCasingRepairVersion = siteOpts.get(LOCALE_CASING_REPAIR_OPTION);
+			const siteTitle = siteOpts.get("emdash:site_title");
+			const siteUrl = siteOpts.get("emdash:site_url");
+			const locale = siteOpts.get("emdash:locale");
+			const repairVersion = siteOpts.get(LOCALE_CASING_REPAIR_OPTION);
+			storedLocaleCasingRepairVersion =
+				typeof repairVersion === "string" ? repairVersion : undefined;
+			seedComplete = siteOpts.get(AUTO_SEED_COMPLETE_OPTION) === true;
+			setupDone = siteOpts.get(SETUP_COMPLETE_OPTION) === true;
 			return {
-				siteName: deps.siteInfo?.name ?? siteOpts.get("emdash:site_title") ?? undefined,
-				siteUrl: deps.siteInfo?.url ?? siteOpts.get("emdash:site_url") ?? undefined,
-				locale: deps.siteInfo?.locale ?? siteOpts.get("emdash:locale") ?? undefined,
+				siteName: deps.siteInfo?.name ?? (typeof siteTitle === "string" ? siteTitle : undefined),
+				siteUrl: deps.siteInfo?.url ?? (typeof siteUrl === "string" ? siteUrl : undefined),
+				locale: deps.siteInfo?.locale ?? (typeof locale === "string" ? locale : undefined),
 				// trailingSlash is a build-time Astro routing decision, not a
 				// user-editable setting, so it comes from the Astro config
 				// (virtual:emdash/config), not the options table.
@@ -1639,27 +1657,16 @@ export class EmDashRuntime {
 						// Selecting the slugs instead of COUNT(*) costs the same
 						// round trip and primes the registered-collections cache,
 						// so the first render on this isolate skips its own lookup.
-						const [collectionRows, setupOption] = await Promise.all([
-							readDb.selectFrom("_emdash_collections").select("slug").execute(),
-							readDb
-								.selectFrom("options")
-								.select("value")
-								.where("name", "=", "emdash:setup_complete")
-								.executeTakeFirst(),
-						]);
+						const collectionRows = await readDb
+							.selectFrom("_emdash_collections")
+							.select("slug")
+							.execute();
 						primeRegisteredCollections(collectionRows.map((row) => row.slug));
-						const setupDone = (() => {
-							try {
-								return !!setupOption && JSON.parse(setupOption.value) === true;
-							} catch {
-								return false;
-							}
-						})();
-						seedGate = { collectionCount: collectionRows.length, setupDone };
+						seedCollectionsReadable = true;
 					} catch (error) {
 						captureMissingManualSchema(error);
-						// Leave the "already set up" default so a read failure never
-						// triggers a seed onto a half-built db.
+						// Leave collections unreadable so a read failure never triggers
+						// a seed onto a half-built db.
 					}
 				}),
 			);
@@ -1689,7 +1696,7 @@ export class EmDashRuntime {
 		// wizard (the wizard and dev-bypass apply seeds explicitly). Run under a
 		// per-isolate lock keyed by the configured db so a reclaimed-and-rerun
 		// create() can't apply the seed a second time concurrently.
-		if (seedGate.collectionCount === 0 && !seedGate.setupDone) {
+		if (seedCollectionsReadable && !seedComplete && !setupDone) {
 			try {
 				const activation = await activateMediaUsageCapture(db, { writersDrained: true });
 				if (activation.outcome !== "active") {
@@ -1712,14 +1719,15 @@ export class EmDashRuntime {
 
 						const seed = await loadSeed();
 						const validation = validateSeed(seed);
-						if (validation.valid) {
-							const seedResult = await applySeed(db, seed, { onConflict: "skip" });
-							console.log("Auto-seeded default collections");
-							if (seedResult.taxonomies.skipped > 0) {
-								console.warn(
-									`[auto-seed] Kept ${seedResult.taxonomies.skipped} existing taxonomy definition(s) instead of the seed's. Edit them in the admin, or run \`emdash seed <file> --on-conflict update\` to replace them (this also overwrites other seeded records).`,
-								);
-							}
+						if (!validation.valid) return false;
+
+						const seedResult = await applySeed(db, seed, { onConflict: "skip" });
+						await new OptionsRepository(db).set(AUTO_SEED_COMPLETE_OPTION, true);
+						console.log("Auto-seeded default collections");
+						if (seedResult.taxonomies.skipped > 0) {
+							console.warn(
+								`[auto-seed] Kept ${seedResult.taxonomies.skipped} existing taxonomy definition(s) instead of the seed's. Edit them in the admin, or run \`emdash seed <file> --on-conflict update\` to replace them (this also overwrites other seeded records).`,
+							);
 						}
 						seedHolder.done.add(seedKey);
 						return true;
@@ -2445,6 +2453,7 @@ export class EmDashRuntime {
 					fieldWidgets: entry.fieldWidgets,
 					editorPanels: entry.editorPanels,
 					editorActions: entry.editorActions,
+					mcp: entry.mcp,
 				});
 				plugins.push(resolved);
 				console.log(
@@ -2822,6 +2831,7 @@ export class EmDashRuntime {
 						settingsSchema: bundle.manifest.admin?.settingsSchema,
 						editorPanels: bundle.manifest.admin?.editorPanels,
 						editorActions: bundle.manifest.admin?.editorActions,
+						mcp: bundle.manifest.mcp,
 					});
 					resolved.push(adapted);
 					console.log(
@@ -3699,8 +3709,10 @@ export class EmDashRuntime {
 				// way a direct link write would, and publication has nothing left to
 				// resolve.
 				let stagedReferences: StagedReferences | undefined;
+				let stagedReferenceBaselines: StagedReferenceBaselines | undefined;
 				if (bodyWithoutRev.references) {
 					stagedReferences = {};
+					let entryGroup: string | undefined;
 					for (const [fieldSlug, selectedIds] of Object.entries(bodyWithoutRev.references)) {
 						const resolved = await resolveReferenceSelection(
 							this.db,
@@ -3713,6 +3725,14 @@ export class EmDashRuntime {
 							return { success: false as const, error: resolved.error };
 						}
 						stagedReferences[fieldSlug] = resolved.data.groups;
+						entryGroup = resolved.data.entryGroup;
+					}
+					if (entryGroup) {
+						const liveSelection = await liveReferenceSelection(this.db, collection, entryGroup);
+						stagedReferenceBaselines = {};
+						for (const fieldSlug of Object.keys(stagedReferences)) {
+							stagedReferenceBaselines[fieldSlug] = liveSelection[fieldSlug] ?? [];
+						}
 					}
 				}
 
@@ -3773,6 +3793,12 @@ export class EmDashRuntime {
 					if (stagedReferences) {
 						mergedData[STAGED_REFERENCES_KEY] = mergeStagedReferences(baseData, stagedReferences);
 					}
+					if (stagedReferenceBaselines) {
+						mergedData[STAGED_REFERENCES_BASELINE_KEY] = mergeStagedReferenceBaselines(
+							baseData,
+							stagedReferenceBaselines,
+						);
+					}
 
 					const revision = await revisionRepo.create({
 						collection,
@@ -4987,10 +5013,12 @@ export class EmDashRuntime {
 		// live, matching the documented tool contract.
 		try {
 			const contentRepo = new ContentRepository(this.db);
+			const restoredData = { ...revision.data };
+			delete restoredData[STAGED_REFERENCES_BASELINE_KEY];
 			const newDraftId = await contentRepo.restoreDraftRevision(
 				revision.collection,
 				revision.entryId,
-				revision.data,
+				restoredData,
 				callerUserId,
 			);
 			if (!newDraftId) {