emdash 0.36.0 → 0.38.0

package/src/fields/file.ts

@@ -21,7 +21,7 @@ export function file(options: FileOptions = {}): FieldDefinition<FileValue> {
 		meta: z.record(z.string(), z.unknown()).optional(),
 	});
 
-	const schema: z.ZodTypeAny = options.required ? fileObjSchema : fileObjSchema.optional();
+	const schema: z.ZodType = options.required ? fileObjSchema : fileObjSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "file",

package/src/fields/integer.ts

@@ -29,7 +29,7 @@ export function integer(options: IntegerOptions = {}): FieldDefinition<number> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? intSchema : intSchema.optional();
+	const schema: z.ZodType = options.required ? intSchema : intSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "number",

package/src/fields/json.ts

@@ -15,7 +15,7 @@ export function json<T = unknown>(options: JsonOptions<T> = {}): FieldDefinition
 	// When T = unknown (default), z.unknown() is already z.ZodType<unknown>.
 	// When a custom schema is provided, it carries the correct generic.
 	// The generic constraint ensures type safety for callers.
-	let schema: z.ZodTypeAny = options.schema ?? z.unknown();
+	let schema: z.ZodType = options.schema ?? z.unknown();
 
 	// Optional vs required
 	if (!options.required && !options.schema) {

package/src/fields/multiselect.ts

@@ -28,7 +28,7 @@ export function multiSelect<T extends readonly [string, ...string[]]>(
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = msOptions.required ? arraySchema : arraySchema.optional();
+	const schema: z.ZodType = msOptions.required ? arraySchema : arraySchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "multiSelect",

package/src/fields/number.ts

@@ -32,7 +32,7 @@ export function number(options: NumberOptions = {}): FieldDefinition<number> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? numberSchema : numberSchema.optional();
+	const schema: z.ZodType = options.required ? numberSchema : numberSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "number",

package/src/fields/portable-text.ts

@@ -10,7 +10,7 @@ const portableTextBlockSchema: z.ZodType<PortableTextBlock> = z
 		_type: z.string(),
 		_key: z.string(),
 	})
-	.passthrough();
+	.loose();
 
 /**
  * Portable Text field

package/src/fields/richtext.ts

@@ -14,7 +14,7 @@ export function richText(options: RichTextOptions = {}): FieldDefinition<string>
 	const stringSchema = z.string();
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "richText",

package/src/fields/select.ts

@@ -19,7 +19,7 @@ export function select<T extends readonly [string, ...string[]]>(
 	const enumSchema = z.enum(selectOptions.options);
 
 	// Apply default first, then optional
-	let schema: z.ZodTypeAny;
+	let schema: z.ZodType;
 	if (selectOptions.default !== undefined) {
 		schema = enumSchema.default(selectOptions.default);
 	} else if (!selectOptions.required) {

package/src/fields/slug.ts

@@ -20,7 +20,7 @@ export function slug(options: SlugOptions = {}): FieldDefinition<string> {
 	const stringSchema = z.string().regex(pattern, "Invalid slug format");
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "slug",

package/src/fields/text.ts

@@ -37,7 +37,7 @@ export function text(options: TextOptions = {}): FieldDefinition<string> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "text",

package/src/fields/textarea.ts

@@ -33,7 +33,7 @@ export function textarea(options: TextareaOptions = {}): FieldDefinition<string>
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "textarea",

package/src/fields/types.ts

@@ -10,7 +10,7 @@ export type ColumnType = "TEXT" | "REAL" | "INTEGER" | "JSON";
 /**
  * Base field definition
  *
- * Note: schema uses z.ZodTypeAny to accommodate optional/default wrappers
+ * Note: schema uses z.ZodType to accommodate optional/default wrappers
  */
 export interface FieldDefinition<_T = unknown> {
 	type: string;
@@ -18,7 +18,7 @@ export interface FieldDefinition<_T = unknown> {
 	 * The SQLite column type to use when storing this field
 	 */
 	columnType: ColumnType;
-	schema: z.ZodTypeAny;
+	schema: z.ZodType;
 	options?: unknown;
 	ui?: FieldUIHints;
 	validation?: FieldValidation;

package/src/i18n/resolve.ts

@@ -37,9 +37,46 @@ export function resolveLocaleChain(explicit?: string): string[] {
 }
 
 const REPEATED_SLASHES = /\/{2,}/g;
+const DATE_TOKEN = /\{(year|month|day|hour|minute|second)\}/g;
+// SQLite-style datetime without timezone info ("2023-05-08 10:00:00").
+// Stored values are UTC; without this, `new Date()` would parse them in the
+// server's local zone and the same row could yield different URLs per host.
+const OFFSETLESS_DATETIME = /^(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?)$/;
+const pad2 = (n: number) => String(n).padStart(2, "0");
+
+function parseUtcDate(date: string | Date): Date {
+	if (date instanceof Date) return date;
+	const offsetless = OFFSETLESS_DATETIME.exec(date);
+	return new Date(offsetless ? `${offsetless[1]}T${offsetless[2]}Z` : date);
+}
+
+/**
+ * Substitute WordPress-style date tokens (`{year}`, `{month}`, `{day}`,
+ * `{hour}`, `{minute}`, `{second}`) from a publish date. Month/day/time parts
+ * are zero-padded, mirroring WordPress (`%monthnum%`, `%day%`, ...). Tokens are
+ * left untouched when no valid date is available, so callers without a date
+ * (or unpublished entries) never produce a half-resolved URL.
+ */
+function applyDateTokens(path: string, date: string | Date | null | undefined): string {
+	const d = date == null ? null : parseUtcDate(date);
+	if (!d || Number.isNaN(d.getTime())) return path;
+	const parts: Record<string, string> = {
+		year: String(d.getUTCFullYear()),
+		month: pad2(d.getUTCMonth() + 1),
+		day: pad2(d.getUTCDate()),
+		hour: pad2(d.getUTCHours()),
+		minute: pad2(d.getUTCMinutes()),
+		second: pad2(d.getUTCSeconds()),
+	};
+	return path.replace(DATE_TOKEN, (match, key: string) => parts[key] ?? match);
+}
 
 /**
- * Interpolate a collection `url_pattern` with a row's slug and id.
+ * Interpolate a collection `url_pattern` with a row's slug, id and publish date.
+ *
+ * Supported tokens: `{slug}`, `{id}`, and the date tokens `{year}`,
+ * `{month}`, `{day}`, `{hour}`, `{minute}`, `{second}` (resolved from `date`,
+ * for WordPress-style permalinks like `/{year}/{month}/{day}/{slug}.html`).
  *
  * Falls back to `/{collection}/{slug}` when no pattern is configured.
  * Does NOT apply any locale prefix — pass the result through
@@ -51,12 +88,15 @@ export function interpolateUrlPattern(options: {
 	collection: string;
 	slug: string;
 	id: string;
+	/** Publish date used for date tokens; tokens stay literal when absent. */
+	date?: string | Date | null;
 }): string {
-	const { pattern, collection, slug, id } = options;
+	const { pattern, collection, slug, id, date } = options;
 	const basePattern = pattern ?? `/${encodeURIComponent(collection)}/{slug}`;
 	let path = basePattern
-		.replace("{slug}", encodeURIComponent(slug))
-		.replace("{id}", encodeURIComponent(id));
+		.replaceAll("{slug}", encodeURIComponent(slug))
+		.replaceAll("{id}", encodeURIComponent(id));
+	path = applyDateTokens(path, date);
 	path = path.replace(REPEATED_SLASHES, "/");
 	if (path.length > 1 && path.endsWith("/")) path = path.slice(0, -1);
 	if (!path.startsWith("/")) path = `/${path}`;

package/src/index.ts

@@ -13,6 +13,8 @@ export type {
 	UserTable,
 	MediaTable,
 } from "./database/index.js";
+export { EmDashConfigurationError } from "./config/errors.js";
+export type { EmDashConfigurationErrorCode } from "./config/errors.js";
 
 // Repositories
 export {
@@ -83,6 +85,7 @@ export {
 	handleMediaGet,
 	handleMediaCreate,
 	handleMediaUpdate,
+	handleMediaReplaceMetadata,
 	handleMediaDelete,
 	handleMediaUsageActivationAdvance,
 	handleMediaUsageProgress,
@@ -101,13 +104,21 @@ export type {
 	RevisionListResponse,
 	RevisionResponse,
 	ManifestResponse,
+	ManifestCollectionMap,
+	ManifestCollectionDescriptor,
+	ManifestFieldDescriptor,
 	FieldDescriptor,
 	ApiContext,
 } from "./api/index.js";
 
 // Content converters (Portable Text <-> ProseMirror)
-export { prosemirrorToPortableText, portableTextToProsemirror } from "./content/index.js";
+export {
+	portableTextIdentityExtensions,
+	prosemirrorToPortableText,
+	portableTextToProsemirror,
+} from "./content/index.js";
 export type {
+	PortableTextToProsemirrorOptions,
 	PortableTextSpan,
 	PortableTextMarkDef,
 	PortableTextLinkMark,
@@ -115,6 +126,10 @@ export type {
 	PortableTextImageBlock,
 	PortableTextCodeBlock,
 	PortableTextHtmlBlock,
+	PortableTextTableAlignment,
+	PortableTextTableBlock,
+	PortableTextTableCell,
+	PortableTextTableRow,
 	PortableTextUnknownBlock,
 	ProseMirrorMark,
 	ProseMirrorNode,
@@ -246,6 +261,7 @@ export {
 	PluginManager,
 	createPluginManager,
 	PluginRouteError,
+	StorageSerializationError,
 	ContentSaveRejectedError,
 	isContentSaveRejection,
 	// Scheduler (Node timer heartbeat — used by virtual:emdash/scheduler)
@@ -258,6 +274,9 @@ export {
 	createSandboxRouteErrorEnvelope,
 	getSandboxRouteErrorDetails,
 	getSandboxRouteErrorEnvelope,
+	MAX_SANDBOX_SAVE_REJECTION_REASON_LENGTH,
+	SANDBOX_HOOK_RESULT_VERSION,
+	inspectSandboxHookResult,
 	createNoopSandboxRunner,
 	// HTTP access for plugins (shared between in-process, Cloudflare, and workerd runners)
 	createHttpAccess,
@@ -270,6 +289,12 @@ export type {
 	PluginContext,
 	PluginStorageConfig,
 	StorageCollection,
+	NumericDelta,
+	UpdateIfArgs,
+	UpdateIfResult,
+	VersionedValue,
+	ConditionalWriteResult,
+	ConditionalDeleteResult,
 	KVAccess,
 	ContentAccess,
 	ContentCreateOptions,
@@ -285,6 +310,7 @@ export type {
 	HookName,
 	ResolvedHook,
 	ResolvedPluginHooks,
+	ActorInfo,
 	ContentHookEvent,
 	ContentDeleteEvent,
 	ContentPublishStateChangeEvent,
@@ -331,6 +357,9 @@ export type {
 	SandboxRouteErrorCode,
 	SandboxRouteErrorDetails,
 	SandboxRouteErrorEnvelope,
+	SandboxHookErrorEnvelope,
+	SandboxHookResultInspection,
+	SandboxSaveRejectedError,
 } from "./plugins/index.js";
 
 // Capability normalization (legacy → canonical alias layer)
@@ -430,6 +459,7 @@ export {
 	getPluginSettings,
 	getSiteSetting,
 	getSiteSettings,
+	getSiteSettingsWithCacheHint,
 	setSiteSettings,
 } from "./settings/index.js";
 export type {
@@ -461,7 +491,7 @@ export { getComments, getCommentCount } from "./comments/query.js";
 export type { GetCommentsOptions, GetCommentsResult } from "./comments/query.js";
 
 // Menus
-export { getMenu, getMenus } from "./menus/index.js";
+export { getMenu, getMenuWithCacheHint, getMenus } from "./menus/index.js";
 export type {
 	Menu,
 	MenuItem,
@@ -482,6 +512,7 @@ export {
 	getTaxonomyDefs,
 	getTaxonomyDef,
 	getTaxonomyTerms,
+	getTaxonomyTermsWithCacheHint,
 	getTerm,
 	getEntryTerms,
 	getTermsForEntries,
@@ -498,7 +529,12 @@ export type {
 } from "./taxonomies/types.js";
 
 // Widgets
-export { getWidgetArea, getWidgetAreas, getWidgetComponents } from "./widgets/index.js";
+export {
+	getWidgetArea,
+	getWidgetAreaWithCacheHint,
+	getWidgetAreas,
+	getWidgetComponents,
+} from "./widgets/index.js";
 export type {
 	Widget,
 	WidgetArea,

package/src/loader.ts

@@ -20,6 +20,7 @@ import { decodeCursor, encodeCursor } from "./database/repositories/types.js";
 import { validateIdentifier } from "./database/validate.js";
 import { getI18nConfig } from "./i18n/config.js";
 import type { Database } from "./index.js";
+import { primeSeoPanel } from "./page/seo-panel.js";
 import { getRequestContext } from "./request-context.js";
 import { isMissingColumnError, isMissingTableError } from "./utils/db-errors.js";
 
@@ -59,6 +60,9 @@ const SEO_ALIAS_COLUMNS = Object.values(SEO_COLUMN_ALIASES);
 /** Folded SEO JSON column name in the result set (expanded onto aliases in JS). */
 const SEO_FOLDED_COLUMN = "_emdash_seo";
 
+/** Folded boolean field slugs used to restore SQLite integer values. */
+const BOOLEAN_FIELDS_FOLDED_COLUMN = "_emdash_boolean_fields";
+
 /**
  * System columns excluded from entry.data
  * Note: slug is intentionally NOT excluded - it's useful as data.slug in templates
@@ -91,6 +95,7 @@ const SYSTEM_COLUMNS = new Set([
 	"_emdash_bylines",
 	"_emdash_bylines_exist",
 	SEO_FOLDED_COLUMN,
+	BOOLEAN_FIELDS_FOLDED_COLUMN,
 ]);
 
 /** Markers for byline/taxonomy hydration folded into the content query. */
@@ -185,6 +190,19 @@ function foldedSeoSelect(db: Kysely<any>, type: string, outer: string) {
 	return sql`(SELECT ${obj} FROM ${sql.ref("_emdash_seo")} AS s WHERE s.collection = ${type} AND s.content_id = ${o}.id LIMIT 1) AS ${sql.ref(SEO_FOLDED_COLUMN)}`;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- any Kysely instance
+function foldedBooleanFieldsSelect(db: Kysely<any>, type: string) {
+	const aggregate = isPostgres(db)
+		? sql`coalesce(json_agg(f.slug), '[]'::json)`
+		: sql`json_group_array(f.slug)`;
+	return sql`(
+		SELECT ${aggregate}
+		FROM ${sql.ref("_emdash_fields")} AS f
+		INNER JOIN ${sql.ref("_emdash_collections")} AS c ON c.id = f.collection_id
+		WHERE c.slug = ${type} AND f.type = ${"boolean"}
+	) AS ${sql.ref(BOOLEAN_FIELDS_FOLDED_COLUMN)}`;
+}
+
 /**
  * Expand the folded `_emdash_seo` JSON column onto the row using SEO_COLUMN_ALIASES,
  * so {@link extractSeo} reads it transparently. SQLite returns a JSON string
@@ -493,7 +511,10 @@ function normalizeLocalMediaValue(value: unknown): unknown {
  * Extracts content fields (non-system columns) and parses JSON where needed.
  * System columns needed for templates (id, status, dates) are included with camelCase names.
  */
-function mapRowToData(row: Record<string, unknown>): Record<string, unknown> {
+function mapRowToData(
+	row: Record<string, unknown>,
+	booleanFields: ReadonlySet<string>,
+): Record<string, unknown> {
 	const data: Record<string, unknown> = {};
 	const rawDateValues: Record<string, string> = {};
 
@@ -516,6 +537,11 @@ function mapRowToData(row: Record<string, unknown>): Record<string, unknown> {
 
 		if (SYSTEM_COLUMNS.has(key)) continue;
 
+		if (booleanFields.has(key) && (typeof value === "boolean" || value === 0 || value === 1)) {
+			data[key] = Boolean(value);
+			continue;
+		}
+
 		// Try to parse JSON strings (for portableText, json fields, etc.)
 		if (typeof value === "string") {
 			try {
@@ -543,14 +569,38 @@ function mapRowToData(row: Record<string, unknown>): Record<string, unknown> {
 	return data;
 }
 
+function parseFoldedBooleanFields(row: Record<string, unknown> | undefined): Set<string> {
+	const raw = row?.[BOOLEAN_FIELDS_FOLDED_COLUMN];
+	let values: unknown;
+	if (typeof raw === "string") {
+		try {
+			values = JSON.parse(raw);
+		} catch {
+			return new Set();
+		}
+	} else {
+		values = raw;
+	}
+
+	if (!Array.isArray(values)) return new Set();
+	return new Set(values.filter((value): value is string => typeof value === "string"));
+}
+
 /**
  * Map revision data (already-parsed JSON object) to entry data.
  * Strips _-prefixed metadata keys (e.g. _slug) used internally by revisions.
  */
-function mapRevisionData(data: Record<string, unknown>): Record<string, unknown> {
+function mapRevisionData(
+	data: Record<string, unknown>,
+	booleanFields: ReadonlySet<string>,
+): Record<string, unknown> {
 	const result: Record<string, unknown> = {};
 	for (const [key, value] of Object.entries(data)) {
 		if (key.startsWith("_")) continue; // revision metadata
+		if (booleanFields.has(key) && (typeof value === "boolean" || value === 0 || value === 1)) {
+			result[key] = Boolean(value);
+			continue;
+		}
 		result[key] = normalizeLocalMediaValue(value);
 	}
 	return result;
@@ -904,6 +954,7 @@ export function buildTaxonomyPivotQuery(
 		bylines: bylinesSelect,
 		bylinesExist: bylinesExistSelect,
 	} = foldedHydrationSelects(db, collection, "r");
+	const booleanFieldsSelect = foldedBooleanFieldsSelect(db, collection);
 
 	// Authoritative re-check on the joined `ec_*` row.
 	const deletedR = deletedIsNull ? sql`r.deleted_at IS NULL` : sql`r.deleted_at IS NOT NULL`;
@@ -945,7 +996,7 @@ export function buildTaxonomyPivotQuery(
 				ORDER BY sortval ${dir}, r.id ${dir}
 				${limitClause}
 			)
-			SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+			SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
 			FROM picked JOIN ${sql.ref(tableName)} AS r ON r.id = picked.entry_id
 			WHERE ${deletedR} ${statusR} ${localeR}
 			ORDER BY picked.sortval ${dir}, picked.entry_id ${dir}
@@ -969,7 +1020,7 @@ export function buildTaxonomyPivotQuery(
 				${residual}
 				${bylineCt}
 		)
-		SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+		SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
 		FROM picked JOIN ${sql.ref(tableName)} AS r ON r.id = picked.entry_id
 		WHERE ${deletedR} ${statusR} ${localeR}
 			${cursorCond}
@@ -1337,6 +1388,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 						bylines: bylinesSelect,
 						bylinesExist: bylinesExistSelect,
 					} = foldedHydrationSelects(db, type, tableName);
+					const booleanFieldsSelect = foldedBooleanFieldsSelect(db, type);
 
 					// LIMIT/OFFSET clause. SQLite only accepts OFFSET when a
 					// LIMIT is present, so a bare offset uses `LIMIT -1`
@@ -1352,7 +1404,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 							: sql`LIMIT -1 OFFSET ${offset}`;
 					}
 					result = await sql<Record<string, unknown>>`
-						SELECT *, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect} FROM ${sql.ref(tableName)}
+						SELECT *, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect} FROM ${sql.ref(tableName)}
 						WHERE deleted_at IS NULL
 						AND ${statusCondition}
 						${localeFilter}
@@ -1372,6 +1424,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 				// Map rows to entries
 				const i18nConfig = virtualConfig?.i18n;
 				const i18nEnabled = i18nConfig && i18nConfig.locales.length > 1;
+				const booleanFields = parseFoldedBooleanFields(rows[0]);
 				const entries = rows.map((row) => {
 					const slug = rowStr(row, "slug") || rowStr(row, "id");
 					const rowLocale = rowStr(row, "locale");
@@ -1380,7 +1433,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 						rowLocale !== "" &&
 						(rowLocale !== i18nConfig.defaultLocale || i18nConfig.prefixDefaultLocale);
 					const id = shouldPrefix ? `${rowLocale}/${slug}` : slug;
-					const data = mapRowToData(row);
+					const data = mapRowToData(row, booleanFields);
 					stashFolded(data, row);
 					return {
 						id,
@@ -1494,16 +1547,26 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 					bylinesExist: bylinesExistSelect,
 				} = foldedHydrationSelects(db, type, "c");
 				const seoSelect = foldedSeoSelect(db, type, "c");
+				const booleanFieldsSelect = foldedBooleanFieldsSelect(db, type);
+				// Keep collection-wide metadata in one result column for wide D1 collections.
+				const jsonObject = isPostgres(db) ? sql`json_build_object` : sql`json_object`;
+				const metadataSelect = sql`(
+					SELECT ${jsonObject}(
+						'bylinesExist', _emdash_bylines_exist,
+						'booleanFields', _emdash_boolean_fields
+					)
+					FROM (SELECT ${bylinesExistSelect}, ${booleanFieldsSelect}) AS metadata
+				) AS _emdash_entry_metadata`;
 				const result = locale
 					? await sql<Record<string, unknown>>`
-							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${metadataSelect}
 							FROM ${sql.ref(tableName)} AS c
 							WHERE c.deleted_at IS NULL
 							AND ((c.slug = ${id} AND c.locale = ${locale}) OR c.id = ${id})
 							LIMIT 1
 						`.execute(db)
 					: await sql<Record<string, unknown>>`
-							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${metadataSelect}
 							FROM ${sql.ref(tableName)} AS c
 							WHERE c.deleted_at IS NULL
 							AND (c.slug = ${id} OR c.id = ${id})
@@ -1515,6 +1578,15 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 					return undefined;
 				}
 
+				const rawMetadata = row._emdash_entry_metadata;
+				const metadata: unknown =
+					typeof rawMetadata === "string" ? JSON.parse(rawMetadata) : rawMetadata;
+				delete row._emdash_entry_metadata;
+				if (isPlainObject(metadata)) {
+					row._emdash_bylines_exist = metadata.bylinesExist;
+					row[BOOLEAN_FIELDS_FOLDED_COLUMN] = metadata.booleanFields;
+				}
+
 				// Expand the folded SEO JSON column onto SEO_COLUMN_ALIASES so
 				// extractSeo() reads it transparently. Missing/null SEO is a
 				// no-op: extractSeo() returns null when the aliases are absent.
@@ -1568,10 +1640,15 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 						const revEntryData: Record<string, unknown> = {
 							...systemData,
 							slug,
-							...mapRevisionData(parsed),
+							...mapRevisionData(parsed, parseFoldedBooleanFields(row)),
 						};
 						const revSeo = extractSeo(row);
-						if (revSeo) revEntryData.seo = revSeo;
+						if (revSeo) {
+							revEntryData.seo = revSeo;
+							// SEO comes from the content row, so the panel data is
+							// valid for the entry regardless of the revision shown.
+							primeSeoPanel(type, rowStr(row, "id"), revSeo);
+						}
 						stashFolded(revEntryData, row);
 						return {
 							id: revId,
@@ -1586,9 +1663,16 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 					}
 				}
 
-				const entryData = mapRowToData(row);
+				const entryData = mapRowToData(row, parseFoldedBooleanFields(row));
 				const entrySeo = extractSeo(row);
-				if (entrySeo) entryData.seo = entrySeo;
+				if (entrySeo) {
+					entryData.seo = entrySeo;
+					// Prime the request cache so <EmDashHead> can apply the panel
+					// values without its own _emdash_seo query. Keyed by the
+					// content-row id — the same value templates pass as
+					// page.content.id.
+					primeSeoPanel(type, rowStr(row, "id"), entrySeo);
+				}
 				stashFolded(entryData, row);
 				return {
 					id: entryId,