emdash 0.37.0 → 0.38.0

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

@@ -400,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),
@@ -463,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
@@ -496,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",
@@ -507,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",
@@ -517,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.

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.
@@ -997,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/content/[collection]/[id]/discard-draft.ts

@@ -8,6 +8,7 @@ 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";
 
@@ -52,6 +53,15 @@ export const POST: APIRoute = async ({ params, request, locals, url, cache }) =>
 
 	const resolvedId = typeof existingItem?.id === "string" ? existingItem.id : id;
 
+	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,
 	});

package/src/astro/routes/api/content/[collection]/[id]/lock.ts

@@ -0,0 +1,133 @@
+/**
+ * Entry edit lock
+ *
+ * GET    /_emdash/api/content/{collection}/{id}/lock - Read the current holder
+ * POST   /_emdash/api/content/{collection}/{id}/lock - Take or refresh the lock
+ * DELETE /_emdash/api/content/{collection}/{id}/lock - Release the caller's lock
+ */
+
+import type { APIRoute } from "astro";
+
+import { requireOwnerPerm } from "#api/authorize.js";
+import { apiError, mapErrorStatus, unwrapResult } from "#api/error.js";
+import {
+	handleEntryLockAcquire,
+	handleEntryLockRead,
+	handleEntryLockRelease,
+} from "#api/handlers/entry-lock.js";
+import { isParseError, parseOptionalBody } from "#api/parse.js";
+import { entryLockAcquireBody } from "#api/schemas.js";
+
+export const prerender = false;
+
+interface ResolvedEntry {
+	resolvedId: string;
+	userId: string;
+}
+
+/**
+ * Resolves the entry the way every other single-entry route does, and applies
+ * the same edit permission, since holding a lock is the prelude to a write.
+ */
+async function resolveEntry(
+	locals: App.Locals,
+	collection: string,
+	id: string,
+	locale: string | undefined,
+): Promise<ResolvedEntry | Response> {
+	const { emdash, user } = locals;
+	if (!emdash?.handleContentGet) {
+		return apiError("NOT_CONFIGURED", "EmDash is not initialized", 500);
+	}
+
+	const existing = await emdash.handleContentGet(collection, id, locale);
+	if (!existing.success) {
+		return apiError(
+			existing.error?.code ?? "UNKNOWN_ERROR",
+			existing.error?.message ?? "Unknown error",
+			mapErrorStatus(existing.error?.code),
+		);
+	}
+
+	const existingData =
+		existing.data && typeof existing.data === "object"
+			? // eslint-disable-next-line typescript/no-unsafe-type-assertion -- handler returns unknown data; narrowed by typeof check above
+				(existing.data as Record<string, unknown>)
+			: undefined;
+	const existingItem =
+		existingData?.item && typeof existingData.item === "object"
+			? // eslint-disable-next-line typescript/no-unsafe-type-assertion -- narrowed by typeof check above
+				(existingData.item as Record<string, unknown>)
+			: existingData;
+	const authorId = typeof existingItem?.authorId === "string" ? existingItem.authorId : "";
+	const denied = requireOwnerPerm(user, authorId, "content:edit_own", "content:edit_any");
+	if (denied) return denied;
+
+	return {
+		resolvedId: typeof existingItem?.id === "string" ? existingItem.id : id,
+		userId: user!.id,
+	};
+}
+
+export const GET: APIRoute = async ({ params, locals, url }) => {
+	const collection = params.collection!;
+	const id = params.id!;
+	const resolved = await resolveEntry(
+		locals,
+		collection,
+		id,
+		url.searchParams.get("locale") || undefined,
+	);
+	if (resolved instanceof Response) return resolved;
+
+	return unwrapResult(
+		await handleEntryLockRead(locals.emdash.db, collection, resolved.resolvedId, resolved.userId),
+	);
+};
+
+export const POST: APIRoute = async ({ params, request, locals, url }) => {
+	const collection = params.collection!;
+	const id = params.id!;
+	const body = await parseOptionalBody(request, entryLockAcquireBody, {});
+	if (isParseError(body)) return body;
+
+	const resolved = await resolveEntry(
+		locals,
+		collection,
+		id,
+		url.searchParams.get("locale") || undefined,
+	);
+	if (resolved instanceof Response) return resolved;
+
+	return unwrapResult(
+		await handleEntryLockAcquire(
+			locals.emdash.db,
+			collection,
+			resolved.resolvedId,
+			resolved.userId,
+			{ takeover: body?.takeover, token: body?.token },
+		),
+	);
+};
+
+export const DELETE: APIRoute = async ({ params, locals, url }) => {
+	const collection = params.collection!;
+	const id = params.id!;
+	const resolved = await resolveEntry(
+		locals,
+		collection,
+		id,
+		url.searchParams.get("locale") || undefined,
+	);
+	if (resolved instanceof Response) return resolved;
+
+	return unwrapResult(
+		await handleEntryLockRelease(
+			locals.emdash.db,
+			collection,
+			resolved.resolvedId,
+			resolved.userId,
+			{ token: url.searchParams.get("token") ?? undefined },
+		),
+	);
+};

package/src/astro/routes/api/content/[collection]/[id]/publish.ts

@@ -3,7 +3,7 @@
  *
  * POST /_emdash/api/content/{collection}/{id}/publish
  *
- * Optional JSON body: { publishedAt?: string, _rev?: string }
+ * Optional JSON body: { publishedAt?: string, _rev?: string, overrideLock?: boolean }
  *   publishedAt — ISO 8601 datetime to backdate the publish (e.g. when
  *   migrating content). Writing publishedAt requires content:publish_any.
  *   Without it, the existing published_at is preserved on re-publish and
@@ -15,6 +15,7 @@ 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 { contentPublishBody } from "#api/schemas.js";
 
@@ -76,6 +77,15 @@ export const POST: APIRoute = async ({ params, request, locals, url, cache }) =>
 
 	const resolvedId = typeof existingItem?.id === "string" ? existingItem.id : id;
 
+	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.handleContentPublish(collection, resolvedId, {
 		publishedAt,
 		_rev: body?._rev,

package/src/astro/routes/api/content/[collection]/[id]/schedule.ts

@@ -9,6 +9,7 @@ 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 { parseBody, isParseError } from "#api/parse.js";
 import { contentScheduleBody } from "#api/schemas.js";
 
@@ -61,6 +62,15 @@ export const POST: APIRoute = async ({ params, request, locals, url, cache }) =>
 	const denied = requireOwnerPerm(user, authorId, "content:publish_own", "content:publish_any");
 	if (denied) return denied;
 
+	const refusal = await claimEntryLockForWrite(emdash.db, collection, resolvedId ?? id, user!.id, {
+		override: body.overrideLock,
+	});
+	if (refusal) {
+		return apiError(refusal.code, refusal.message, mapErrorStatus(refusal.code), {
+			...refusal.details,
+		});
+	}
+
 	const result = await emdash.handleContentSchedule(collection, resolvedId ?? id, body.scheduledAt);
 
 	if (!result.success) return unwrapResult(result);
@@ -95,6 +105,16 @@ export const DELETE: APIRoute = async ({ params, locals, url, cache }) => {
 	const denied = requireOwnerPerm(user, authorId, "content:publish_own", "content:publish_any");
 	if (denied) return denied;
 
+	// DELETE carries no body, so the lock opt-out rides on the query string.
+	const refusal = await claimEntryLockForWrite(emdash.db, collection, resolvedId ?? id, user!.id, {
+		override: url.searchParams.get("overrideLock") === "true",
+	});
+	if (refusal) {
+		return apiError(refusal.code, refusal.message, mapErrorStatus(refusal.code), {
+			...refusal.details,
+		});
+	}
+
 	const result = await emdash.handleContentUnschedule(collection, resolvedId ?? id);
 
 	if (!result.success) return unwrapResult(result);

package/src/astro/routes/api/content/[collection]/[id]/unpublish.ts

@@ -8,6 +8,7 @@ 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";
 
@@ -52,6 +53,15 @@ export const POST: APIRoute = async ({ params, request, locals, url, cache }) =>
 
 	const resolvedId = typeof existingItem?.id === "string" ? existingItem.id : id;
 
+	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.handleContentUnpublish(collection, resolvedId, { _rev: body?._rev });
 
 	if (!result.success) return unwrapResult(result);

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

@@ -11,6 +11,7 @@ import type { APIRoute } from "astro";
 
 import { requirePerm, requireOwnerPerm } from "#api/authorize.js";
 import { apiError, mapErrorStatus, unwrapResult } from "#api/error.js";
+import { claimEntryLockForWrite } from "#api/handlers/entry-lock.js";
 import { parseBody, isParseError } from "#api/parse.js";
 import { contentUpdateBody } from "#api/schemas.js";
 
@@ -112,16 +113,30 @@ export const PUT: APIRoute = async ({ params, request, locals, cache }) => {
 	// Use the resolved ID (handles slug → ID resolution)
 	const resolvedId = typeof existingItem?.id === "string" ? existingItem.id : id;
 
+	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,
+		});
+	}
+
 	// Only allow authorId changes if user has content:edit_any permission (editor+)
 	const canChangeAuthor =
 		body.authorId !== undefined && user && hasPermission(user, "content:edit_any");
-	const updateBody = canChangeAuthor ? body : { ...body, authorId: undefined };
+	const { overrideLock: _overrideLock, ...writeBody } = canChangeAuthor
+		? body
+		: { ...body, authorId: undefined };
+
+	const actor = user ? { id: user.id, role: user.role } : undefined;
 
 	// Pass _rev through for optimistic concurrency validation
 	const result = await emdash.handleContentUpdate(collection, resolvedId, {
-		...updateBody,
+		...writeBody,
 		locale,
 		_rev: body._rev,
+		actor,
 	});
 
 	if (!result.success) return unwrapResult(result);
@@ -172,6 +187,16 @@ export const DELETE: APIRoute = async ({ params, locals, url, cache }) => {
 	// Use the resolved ID (handles slug → ID resolution)
 	const resolvedId = typeof deleteItem?.id === "string" ? deleteItem.id : id;
 
+	// DELETE carries no body, so the lock opt-out rides on the query string.
+	const refusal = await claimEntryLockForWrite(emdash.db, collection, resolvedId, user!.id, {
+		override: url.searchParams.get("overrideLock") === "true",
+	});
+	if (refusal) {
+		return apiError(refusal.code, refusal.message, mapErrorStatus(refusal.code), {
+			...refusal.details,
+		});
+	}
+
 	const result = await emdash.handleContentDelete(collection, resolvedId);
 
 	if (!result.success) return unwrapResult(result);

package/src/astro/routes/api/content/[collection]/index.ts

@@ -79,12 +79,15 @@ export const POST: APIRoute = async ({ params, request, locals, cache }) => {
 		);
 	}
 
+	const actor = user ? { id: user.id, role: user.role } : undefined;
+
 	// Auto-set authorId to current user when creating content
 	const result = await emdash.handleContentCreate(collection, {
 		...body,
 		authorId: user?.id,
 		locale: body.locale,
 		translationOf: body.translationOf,
+		actor,
 	});
 
 	if (!result.success) return unwrapResult(result);

package/src/astro/routes/sitemap-[collection].xml.ts

@@ -102,6 +102,10 @@ export const GET: APIRoute = async ({ params, locals, url }) => {
 				collection: col.collection,
 				slug: entry.slug || entry.id,
 				id: entry.id,
+				// Published date keeps date-token permalinks stable across edits;
+				// no updatedAt fallback — tokens stay literal without a publish
+				// date, consistent with the resolver's documented behavior.
+				date: entry.publishedAt,
 			});
 			const localized = await localizePath(path, entry.locale);
 			const absolute = localized === null ? null : `${siteUrl}${localized}`;

package/src/astro/types.ts

@@ -10,6 +10,7 @@ import type { Kysely } from "kysely";
 
 import type { ContentFieldFilters } from "../content-list-query.js";
 import type { RouteCallerInput, RouteMeta } from "../plugins/routes.js";
+import type { ManifestRegistryConfigurationError } from "../registry/config.js";
 
 // Re-export core types
 export type {
@@ -37,11 +38,16 @@ export interface ManifestCollection {
 	titleField?: string;
 	dateField?: string;
 	/**
-	 * Omit the auto-generated sidebar entry in the admin. The collection is
-	 * still listed in the manifest so its routes, editor, and API keep working
-	 * — only the navigation link is dropped.
+	 * Omit the auto-generated sidebar entry and dashboard quick action in the
+	 * admin. The collection is still listed in the manifest so its routes,
+	 * editor, and API keep working.
 	 */
 	hidden?: boolean;
+	/**
+	 * Sidebar folder. Collections sharing a group render under one collapsible
+	 * entry labelled with the group.
+	 */
+	group?: string;
 	/** Valid custom field slugs to render in the admin content list. */
 	listColumns?: string[];
 	fields: Record<
@@ -209,6 +215,8 @@ export interface EmDashManifest {
 			minimumReleaseAgeExclude?: string[];
 		};
 	};
+	/** Safe field-level diagnostic when the registry configuration cannot be normalized. */
+	registryConfigurationError?: ManifestRegistryConfigurationError;
 	/**
 	 * Admin branding overrides for white-labeling.
 	 * Set via the `admin` config in `astro.config.mjs`.
@@ -298,6 +306,7 @@ export interface EmDashHandlers {
 			taxonomies?: Record<string, string[]>;
 			createdAt?: string | null;
 			publishedAt?: string | null;
+			actor?: { id: string; role: number };
 		},
 	) => Promise<HandlerResponse>;
 
@@ -321,6 +330,7 @@ export interface EmDashHandlers {
 			taxonomies?: Record<string, string[]>;
 			publishedAt?: string | null;
 			_rev?: string;
+			actor?: { id: string; role: number };
 		},
 	) => Promise<HandlerResponse>;
 

package/src/cli/commands/content.ts

@@ -238,6 +238,10 @@ const updateCommand = defineCommand({
 			type: "boolean",
 			description: "Keep as draft instead of auto-publishing",
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
@@ -249,13 +253,16 @@ const updateCommand = defineCommand({
 				data,
 				_rev: args.rev,
 				locale: args.locale,
+				overrideLock: args["override-lock"],
 			});
 
 			// Auto-publish unless --draft is set.
 			// Only publish if the update created a draft revision (i.e. the
 			// collection supports revisions and data went to a draft).
 			if (!args.draft && updated.draftRevisionId) {
-				await client.publish(args.collection, updated.id);
+				await client.publish(args.collection, updated.id, {
+					overrideLock: args["override-lock"],
+				});
 			}
 
 			// Re-fetch to return the current state
@@ -281,13 +288,17 @@ const deleteCommand = defineCommand({
 			description: "Content item ID or slug",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.delete(args.collection, args.id);
+			await client.delete(args.collection, args.id, { overrideLock: args["override-lock"] });
 			output({ success: true }, args);
 			consola.success(`Deleted ${args.collection}/${args.id}`);
 		} catch (error) {
@@ -310,13 +321,17 @@ const publishCommand = defineCommand({
 			description: "Content item ID or slug",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.publish(args.collection, args.id);
+			await client.publish(args.collection, args.id, { overrideLock: args["override-lock"] });
 			output({ success: true }, args);
 			consola.success(`Published ${args.collection}/${args.id}`);
 		} catch (error) {
@@ -339,13 +354,17 @@ const unpublishCommand = defineCommand({
 			description: "Content item ID or slug",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.unpublish(args.collection, args.id);
+			await client.unpublish(args.collection, args.id, { overrideLock: args["override-lock"] });
 			output({ success: true }, args);
 			consola.success(`Unpublished ${args.collection}/${args.id}`);
 		} catch (error) {
@@ -373,13 +392,20 @@ const scheduleCommand = defineCommand({
 			description: "ISO 8601 datetime to publish at",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.schedule(args.collection, args.id, { at: args.at });
+			await client.schedule(args.collection, args.id, {
+				at: args.at,
+				overrideLock: args["override-lock"],
+			});
 			output({ success: true }, args);
 			consola.success(`Scheduled ${args.collection}/${args.id} for ${args.at}`);
 		} catch (error) {

package/src/cli/commands/export-seed.ts

@@ -318,8 +318,10 @@ async function exportCollections(db: Kysely<Database>): Promise<SeedCollection[]
 			supports: collection.supports.length > 0 ? collection.supports : undefined,
 			urlPattern: collection.urlPattern || undefined,
 			routable: collection.routable === false ? false : undefined,
+			editLocking: collection.editLocking === false ? false : undefined,
 			hidden: collection.hidden || undefined,
 			sortOrder: collection.sortOrder,
+			group: collection.group,
 			fields: fields.map(
 				(field): SeedField => ({
 					slug: field.slug,