@growth-labs/cms 0.3.1 → 0.5.0

package/src/engine/publisher.ts

@@ -20,6 +20,7 @@
 // duplicate is NOT re-queued to Foundry. Any future `content_items` column
 // addition requires a matching edit here or the duplicate silently drops it.
 import type { ContentType } from '../schema/types.js'
+import { type ContentMetadata, serializeContentMetadata } from './content-metadata.js'
 import type { D1Database } from './d1.js'
 import { evaluateArticleBody, type PublishGuardOutcome } from './publish-guard.js'
 import { slugify } from './slug.js'
@@ -95,6 +96,8 @@ export interface BaseContentInput {
 	tags?: string[]
 	/** The SEO focus keyword for this content item (migration 0004 column). */
 	seoFocusKeyword?: string | null
+	/** Declared site-specific JSON values retained in every immutable revision. */
+	metadata?: ContentMetadata
 }
 
 export interface ArticleInput extends BaseContentInput {
@@ -154,12 +157,23 @@ export interface PageInput extends BaseContentInput {
 	}
 }
 
-export type CreateContentInput =
+export type CreateContentInput = (
 	| ArticleInput
 	| VideoInput
 	| PodcastInput
 	| NewsletterInput
 	| PageInput
+) & {
+	/** Optional namespaced archive key. New copies deliberately do not inherit it. */
+	sourceId?: string | null
+	/** Initial historical values for archive ingestion; normal creates omit this. */
+	initialTimestamps?: {
+		publishedAt?: number | null
+		createdAt?: number | null
+		updatedAt?: number | null
+		publishTz?: string | null
+	}
+}
 
 type BodyBackedContentInput = ArticleInput | NewsletterInput | PageInput
 
@@ -167,6 +181,118 @@ function isBodyBackedContentInput(input: CreateContentInput): input is BodyBacke
 	return isBodyBackedContentType(input.type)
 }
 
+function assertValidMediaDuration(value: unknown): asserts value is number | null | undefined {
+	if (value === null || value === undefined) return
+	if (
+		typeof value !== 'number' ||
+		!Number.isFinite(value) ||
+		!Number.isInteger(value) ||
+		value <= 0
+	) {
+		throw new Error('Media duration must be a positive integer when supplied')
+	}
+}
+
+export class VerifiedMediaDurationConflictError extends Error {
+	readonly code = 'verified_duration_conflict'
+
+	constructor() {
+		super('Media duration conflicts with verified upload duration')
+		this.name = 'VerifiedMediaDurationConflictError'
+	}
+}
+
+type VerifiedMediaKind = 'video' | 'podcast'
+
+function parseVerifiedMediaDuration(variantsJson: string | null): number | null {
+	if (!variantsJson) return null
+	try {
+		const parsed: unknown = JSON.parse(variantsJson)
+		if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null
+		const durationSeconds = (parsed as Record<string, unknown>).durationSeconds
+		return typeof durationSeconds === 'number' &&
+			Number.isFinite(durationSeconds) &&
+			Number.isInteger(durationSeconds) &&
+			durationSeconds > 0
+			? durationSeconds
+			: null
+	} catch {
+		return null
+	}
+}
+
+async function loadVerifiedMediaDuration(
+	db: D1Database,
+	kind: VerifiedMediaKind,
+	source: string | null | undefined,
+): Promise<number | null> {
+	if (!source) return null
+
+	const isHttpUrl = /^https?:\/\//i.test(source)
+	const statement =
+		kind === 'video'
+			? isHttpUrl
+				? db
+						.prepare(
+							`SELECT variants_json
+							 FROM media_assets
+							 WHERE asset_type = 'video'
+							   AND source_type = 'editor-video-source'
+							   AND (url = ? OR public_url = ?)`,
+						)
+						.bind(source, source)
+				: db
+						.prepare(
+							`SELECT variants_json
+							 FROM media_assets
+							 WHERE asset_type = 'video'
+							   AND source_type = 'editor-video-source'
+							   AND (id = ? OR object_key = ?)`,
+						)
+						.bind(source, source)
+			: db
+					.prepare(
+						`SELECT variants_json
+						 FROM media_assets
+						 WHERE asset_type = 'audio'
+						   AND source_type = 'editor-upload'
+						   AND (id = ? OR object_key = ?)`,
+					)
+					.bind(source, source)
+
+	const rows = await statement.all<{ variants_json: string | null }>()
+	const durations = new Set<number>()
+	for (const row of rows.results ?? []) {
+		const duration = parseVerifiedMediaDuration(row.variants_json)
+		if (duration !== null) durations.add(duration)
+	}
+
+	if (durations.size > 1) {
+		// Multiple exact package-owned identities disagreeing is unsafe to guess.
+		throw new VerifiedMediaDurationConflictError()
+	}
+	return durations.values().next().value ?? null
+}
+
+async function resolveMediaDuration(
+	db: D1Database,
+	kind: VerifiedMediaKind,
+	source: string | null | undefined,
+	suppliedDuration: unknown,
+): Promise<number | null> {
+	assertValidMediaDuration(suppliedDuration)
+	const verifiedDuration = await loadVerifiedMediaDuration(db, kind, source)
+	if (verifiedDuration === null) return suppliedDuration ?? null
+	if (
+		suppliedDuration !== null &&
+		suppliedDuration !== undefined &&
+		suppliedDuration !== verifiedDuration
+	) {
+		throw new VerifiedMediaDurationConflictError()
+	}
+	return verifiedDuration
+}
+
 export interface UpdateContentInput extends Partial<BaseContentInput> {
 	content?: Partial<
 		| ArticleInput['content']
@@ -183,6 +309,23 @@ export interface UpdateContentInput extends Partial<BaseContentInput> {
 	aiLockedFields?: string[]
 }
 
+interface VideoUpdatePlan {
+	script: string
+	videoId: string
+	durationSeconds: number | null
+	thumbnailImageId: string | null
+	sourceUrl: string | null
+	sourceKind: string | null
+	sourceChanged: boolean
+}
+
+interface PodcastUpdatePlan {
+	transcript: string
+	audioR2Key: string
+	durationSeconds: number | null
+	processingTriggerToken: string | null
+}
+
 /**
  * The shape `getContentItem` returns from `SELECT * FROM content_items`.
  * Note this is the engine's read-side row (nullable `featured`/timestamps as
@@ -215,10 +358,57 @@ export interface ContentItemRecord {
 	ai_locked_fields: string | null
 	published_revision_id: string | null
 	seo_focus_keyword: string | null
+	metadata_json: string
+	source_id: string | null
 	created_at: number | null
 	updated_at: number | null
 }
 
+function normalizeSourceId(value: unknown): string | null {
+	if (value === null || value === undefined) return null
+	if (typeof value !== 'string' || !value || value !== value.trim() || value.length > 256) {
+		throw new TypeError('sourceId must be a trimmed non-empty string of at most 256 characters')
+	}
+	return value
+}
+
+function normalizeInitialTimestamps(value: CreateContentInput['initialTimestamps']): {
+	publishedAt: number | null
+	createdAt: number | null
+	updatedAt: number | null
+	publishTz: string | null
+} {
+	const timestamps = value ?? {}
+	for (const [field, candidate] of [
+		['publishedAt', timestamps.publishedAt],
+		['createdAt', timestamps.createdAt],
+		['updatedAt', timestamps.updatedAt],
+	] as const) {
+		if (candidate !== null && candidate !== undefined) {
+			if (!Number.isSafeInteger(candidate) || candidate < 0) {
+				throw new TypeError(`${field} must be a non-negative epoch second`)
+			}
+		}
+	}
+	const publishTz = timestamps.publishTz
+	if (
+		publishTz !== null &&
+		publishTz !== undefined &&
+		(typeof publishTz !== 'string' ||
+			!publishTz.trim() ||
+			publishTz !== publishTz.trim() ||
+			publishTz.length > 64)
+	) {
+		throw new TypeError('publishTz must be a trimmed non-empty string of at most 64 characters')
+	}
+	return {
+		publishedAt: timestamps.publishedAt ?? null,
+		createdAt: timestamps.createdAt ?? null,
+		updatedAt: timestamps.updatedAt ?? null,
+		publishTz: publishTz ?? null,
+	}
+}
+
 export async function ensureUniqueSlug(
 	db: D1Database,
 	slug: string,
@@ -229,12 +419,28 @@ export async function ensureUniqueSlug(
 	let suffix = 2
 
 	while (true) {
-		const row = await db
+		const draftRow = await db
 			.prepare('SELECT id FROM content_items WHERE slug = ? LIMIT 1')
 			.bind(candidate)
 			.first<{ id: string }>()
+		const publishedRow = await db
+			.prepare(
+				`SELECT ci.id
+				 FROM content_items ci
+				 JOIN content_revisions cr
+				   ON cr.id = ci.published_revision_id AND cr.content_id = ci.id
+				 WHERE ci.status = 'published'
+				   AND ci.deleted_at IS NULL
+				   AND json_extract(cr.payload_json, '$.item.slug') = ?
+				 LIMIT 1`,
+			)
+			.bind(candidate)
+			.first<{ id: string }>()
 
-		if (!row || (excludeId && row.id === excludeId)) {
+		const draftAvailable = !draftRow || (excludeId !== undefined && draftRow.id === excludeId)
+		const publishedAvailable =
+			!publishedRow || (excludeId !== undefined && publishedRow.id === excludeId)
+		if (draftAvailable && publishedAvailable) {
 			return candidate
 		}
 
@@ -339,10 +545,29 @@ export async function createContent(
 	db: D1Database,
 	input: CreateContentInput,
 ): Promise<{ id: string; slug: string }> {
+	const resolvedMediaDuration =
+		input.type === 'video'
+			? await resolveMediaDuration(
+					db,
+					'video',
+					input.content.processingSourceUrl,
+					input.content.durationSeconds,
+				)
+			: input.type === 'podcast'
+				? await resolveMediaDuration(
+						db,
+						'podcast',
+						input.content.audioR2Key,
+						input.content.durationSeconds,
+					)
+				: null
 	const id = crypto.randomUUID()
 	const slug = await ensureUniqueSlug(db, input.slug)
 	const visibility = input.visibility || 'free'
 	const primaryCategory = input.primaryCategory || 'analysis'
+	const metadataJson = serializeContentMetadata(input.metadata)
+	const sourceId = normalizeSourceId(input.sourceId)
+	const initialTimestamps = normalizeInitialTimestamps(input.initialTimestamps)
 
 	await db
 		.prepare(
@@ -350,8 +575,10 @@ export async function createContent(
       INSERT INTO content_items (
         id, type, status, visibility, slug, title, seo_title, description, excerpt,
         byline, channel, primary_topic, featured, author_id, hero_image_id,
-        hero_image_alt, hero_image_caption, social_image_id, canonical_url
-      ) VALUES (?, ?, 'draft', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        hero_image_alt, hero_image_caption, social_image_id, canonical_url,
+        metadata_json, source_id, published_at, created_at, updated_at, publish_tz
+      ) VALUES (?, ?, 'draft', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+                COALESCE(?, unixepoch()), COALESCE(?, unixepoch()), COALESCE(?, 'Europe/Paris'))
       `,
 		)
 		.bind(
@@ -373,6 +600,12 @@ export async function createContent(
 			input.heroImageCaption || null,
 			input.socialImageId || null,
 			input.canonicalUrl || null,
+			metadataJson,
+			sourceId,
+			initialTimestamps.publishedAt,
+			initialTimestamps.createdAt,
+			initialTimestamps.updatedAt,
+			initialTimestamps.publishTz,
 		)
 		.run()
 
@@ -414,7 +647,7 @@ export async function createContent(
 				id,
 				input.content.script,
 				input.content.videoId,
-				input.content.durationSeconds || null,
+				resolvedMediaDuration,
 				input.content.thumbnailImageId || null,
 				initialVideoProcessingState,
 				input.content.processingSourceUrl || null,
@@ -429,12 +662,7 @@ export async function createContent(
 				`INSERT INTO podcast_content (content_id, transcript, audio_r2_key, duration_seconds)
          VALUES (?, ?, ?, ?)`,
 			)
-			.bind(
-				id,
-				input.content.transcript,
-				input.content.audioR2Key,
-				input.content.durationSeconds || null,
-			)
+			.bind(id, input.content.transcript, input.content.audioR2Key, resolvedMediaDuration)
 			.run()
 	}
 
@@ -464,6 +692,123 @@ export async function updateContentItem(
 	if (!existing) return null
 
 	const hasOwn = (source: object, key: string) => Object.hasOwn(source, key)
+	let videoUpdatePlan: VideoUpdatePlan | null | undefined
+	let podcastUpdatePlan: PodcastUpdatePlan | null | undefined
+
+	// Resolve all media identity/duration invariants before the base content row,
+	// tags, or relations can be mutated. D1 does not provide a transaction on the
+	// structural surface used here, so validation must be a strict preflight.
+	if (input.content && existing.type === 'video') {
+		const current = await db
+			.prepare(
+				`SELECT script, video_id, duration_seconds, thumbnail_image_id,
+					processing_source_url, processing_source_kind
+				 FROM video_content
+				 WHERE content_id = ?
+				 LIMIT 1`,
+			)
+			.bind(id)
+			.first<{
+				script: string
+				video_id: string
+				duration_seconds: number | null
+				thumbnail_image_id: string | null
+				processing_source_url: string | null
+				processing_source_kind: string | null
+			}>()
+
+		if (current) {
+			const videoContent = input.content as Partial<VideoInput['content']>
+			const sourceUrl = hasOwn(videoContent, 'processingSourceUrl')
+				? (videoContent.processingSourceUrl ?? null)
+				: current.processing_source_url
+			const sourceKind = hasOwn(videoContent, 'processingSourceKind')
+				? (videoContent.processingSourceKind ?? null)
+				: current.processing_source_kind
+			const sourceChanged =
+				sourceUrl !== current.processing_source_url || sourceKind !== current.processing_source_kind
+			const durationProvided = hasOwn(videoContent, 'durationSeconds')
+			const resolvedDuration = await resolveMediaDuration(
+				db,
+				'video',
+				sourceUrl,
+				durationProvided ? videoContent.durationSeconds : undefined,
+			)
+
+			videoUpdatePlan = {
+				script: hasOwn(videoContent, 'script')
+					? (videoContent.script ?? current.script)
+					: current.script,
+				videoId: hasOwn(videoContent, 'videoId')
+					? (videoContent.videoId ?? current.video_id)
+					: current.video_id,
+				durationSeconds:
+					durationProvided || sourceChanged
+						? resolvedDuration
+						: (resolvedDuration ?? current.duration_seconds),
+				thumbnailImageId: hasOwn(videoContent, 'thumbnailImageId')
+					? (videoContent.thumbnailImageId ?? null)
+					: current.thumbnail_image_id,
+				sourceUrl,
+				sourceKind,
+				sourceChanged,
+			}
+		} else {
+			videoUpdatePlan = null
+		}
+	}
+
+	if (input.content && existing.type === 'podcast') {
+		const current = await db
+			.prepare(
+				`SELECT transcript, audio_r2_key, duration_seconds, processing_trigger_token
+				 FROM podcast_content
+				 WHERE content_id = ?
+				 LIMIT 1`,
+			)
+			.bind(id)
+			.first<{
+				transcript: string
+				audio_r2_key: string
+				duration_seconds: number | null
+				processing_trigger_token: string | null
+			}>()
+
+		if (current) {
+			const podcastContent = input.content as Partial<PodcastInput['content']>
+			const audioR2Key = hasOwn(podcastContent, 'audioR2Key')
+				? (podcastContent.audioR2Key ?? current.audio_r2_key)
+				: current.audio_r2_key
+			const sourceChanged = audioR2Key !== current.audio_r2_key
+			const durationProvided = hasOwn(podcastContent, 'durationSeconds')
+			const resolvedDuration = await resolveMediaDuration(
+				db,
+				'podcast',
+				audioR2Key,
+				durationProvided ? podcastContent.durationSeconds : undefined,
+			)
+			const replacementTranscriptProvided =
+				hasOwn(podcastContent, 'transcript') && typeof podcastContent.transcript === 'string'
+
+			podcastUpdatePlan = {
+				transcript: sourceChanged
+					? replacementTranscriptProvided
+						? (podcastContent.transcript as string)
+						: ''
+					: replacementTranscriptProvided
+						? (podcastContent.transcript as string)
+						: current.transcript,
+				audioR2Key,
+				durationSeconds:
+					durationProvided || sourceChanged
+						? resolvedDuration
+						: (resolvedDuration ?? current.duration_seconds),
+				processingTriggerToken: sourceChanged ? null : current.processing_trigger_token,
+			}
+		} else {
+			podcastUpdatePlan = null
+		}
+	}
 
 	const slug = input.slug ? await ensureUniqueSlug(db, input.slug, id) : existing.slug
 	const visibility = input.visibility || existing.visibility
@@ -505,6 +850,9 @@ export async function updateContentItem(
 	const seoFocusKeyword = hasOwn(input, 'seoFocusKeyword')
 		? (input.seoFocusKeyword ?? null)
 		: (existing.seo_focus_keyword ?? null)
+	const metadataJson = hasOwn(input, 'metadata')
+		? serializeContentMetadata(input.metadata)
+		: existing.metadata_json
 
 	await db
 		.prepare(
@@ -528,6 +876,7 @@ export async function updateContentItem(
         canonical_url = ?,
         ai_locked_fields = ?,
         seo_focus_keyword = ?,
+		metadata_json = ?,
         updated_at = unixepoch()
       WHERE id = ?
       `,
@@ -551,6 +900,7 @@ export async function updateContentItem(
 			canonicalUrl,
 			aiLockedFields,
 			seoFocusKeyword,
+			metadataJson,
 			id,
 		)
 		.run()
@@ -642,37 +992,7 @@ export async function updateContentItem(
 		}
 
 		if (existing.type === 'video') {
-			const current = await db
-				.prepare(
-					`
-          SELECT script, video_id, duration_seconds, thumbnail_image_id,
-            processing_source_url, processing_source_kind
-          FROM video_content
-          WHERE content_id = ?
-          LIMIT 1
-          `,
-				)
-				.bind(id)
-				.first<{
-					script: string
-					video_id: string
-					duration_seconds: number | null
-					thumbnail_image_id: string | null
-					processing_source_url: string | null
-					processing_source_kind: string | null
-				}>()
-			if (!current) return { slug }
-
-			const videoContent = input.content as Partial<VideoInput['content']>
-			const nextSourceUrl = hasOwn(videoContent, 'processingSourceUrl')
-				? (videoContent.processingSourceUrl ?? null)
-				: current.processing_source_url
-			const nextSourceKind = hasOwn(videoContent, 'processingSourceKind')
-				? (videoContent.processingSourceKind ?? null)
-				: current.processing_source_kind
-			const sourceChanged =
-				nextSourceUrl !== current.processing_source_url ||
-				nextSourceKind !== current.processing_source_kind
+			if (!videoUpdatePlan) return { slug }
 			await db
 				.prepare(
 					`
@@ -697,78 +1017,51 @@ export async function updateContentItem(
             hls_manifest_url = CASE WHEN ? THEN NULL ELSE hls_manifest_url END,
             hls_poster_url = CASE WHEN ? THEN NULL ELSE hls_poster_url END
           WHERE content_id = ?
-          `,
+		  `,
 				)
 				.bind(
-					hasOwn(videoContent, 'script') ? (videoContent.script ?? current.script) : current.script,
-					hasOwn(videoContent, 'videoId')
-						? (videoContent.videoId ?? current.video_id)
-						: current.video_id,
-					hasOwn(videoContent, 'durationSeconds')
-						? (videoContent.durationSeconds ?? null)
-						: current.duration_seconds,
-					hasOwn(videoContent, 'thumbnailImageId')
-						? (videoContent.thumbnailImageId ?? null)
-						: current.thumbnail_image_id,
-					nextSourceUrl,
-					nextSourceKind,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
-					sourceChanged ? 1 : 0,
+					videoUpdatePlan.script,
+					videoUpdatePlan.videoId,
+					videoUpdatePlan.durationSeconds,
+					videoUpdatePlan.thumbnailImageId,
+					videoUpdatePlan.sourceUrl,
+					videoUpdatePlan.sourceKind,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
+					videoUpdatePlan.sourceChanged ? 1 : 0,
 					id,
 				)
 				.run()
 		}
 
 		if (existing.type === 'podcast') {
-			const current = await db
-				.prepare(
-					`
-          SELECT transcript, audio_r2_key, duration_seconds
-          FROM podcast_content
-          WHERE content_id = ?
-          LIMIT 1
-          `,
-				)
-				.bind(id)
-				.first<{
-					transcript: string
-					audio_r2_key: string
-					duration_seconds: number | null
-				}>()
-			if (!current) return { slug }
-
-			const podcastContent = input.content as Partial<PodcastInput['content']>
+			if (!podcastUpdatePlan) return { slug }
 			await db
 				.prepare(
 					`
-          UPDATE podcast_content SET
-            transcript = ?,
-            audio_r2_key = ?,
-            duration_seconds = ?
-          WHERE content_id = ?
-          `,
+		  UPDATE podcast_content SET
+		    transcript = ?,
+		    audio_r2_key = ?,
+		    duration_seconds = ?,
+		    processing_trigger_token = ?
+		  WHERE content_id = ?
+		  `,
 				)
 				.bind(
-					hasOwn(podcastContent, 'transcript')
-						? (podcastContent.transcript ?? current.transcript)
-						: current.transcript,
-					hasOwn(podcastContent, 'audioR2Key')
-						? (podcastContent.audioR2Key ?? current.audio_r2_key)
-						: current.audio_r2_key,
-					hasOwn(podcastContent, 'durationSeconds')
-						? (podcastContent.durationSeconds ?? null)
-						: current.duration_seconds,
+					podcastUpdatePlan.transcript,
+					podcastUpdatePlan.audioR2Key,
+					podcastUpdatePlan.durationSeconds,
+					podcastUpdatePlan.processingTriggerToken,
 					id,
 				)
 				.run()
@@ -915,7 +1208,8 @@ export async function duplicateContentItem(
 	// DEFAULT (unixepoch()) timestamps; status forced to 'draft', featured to
 	// 0, publish_at/published_at/published_revision_id to NULL. (inventory §6)
 	//
-	// SEO carries over (seo_title, seo_focus_keyword, seo_score, ai_og_image_id)
+	// SEO and declared metadata carry over (seo_title, seo_focus_keyword,
+	// seo_score, ai_og_image_id, metadata_json)
 	// — a duplicate should keep the SEO work already done on the source. But
 	// board_position is the source item's slot in the editorial board ordering;
 	// a fresh draft copy must NOT inherit it, so it is reset to NULL.
@@ -927,7 +1221,8 @@ export async function duplicateContentItem(
 				hero_image_id, hero_image_alt, hero_image_caption, social_image_id,
 				canonical_url, publish_at, published_at,
 				publish_tz, ai_locked_fields, published_revision_id,
-				seo_focus_keyword, seo_score, ai_og_image_id, board_position
+				seo_focus_keyword, seo_score, ai_og_image_id, board_position,
+				metadata_json
 			)
 			SELECT
 				?, type, 'draft', visibility, ?, title || ' (Copy)', seo_title, description, excerpt,
@@ -935,7 +1230,8 @@ export async function duplicateContentItem(
 				hero_image_id, hero_image_alt, hero_image_caption, social_image_id,
 				canonical_url, NULL, NULL,
 				publish_tz, ai_locked_fields, NULL,
-				seo_focus_keyword, seo_score, ai_og_image_id, NULL
+				seo_focus_keyword, seo_score, ai_og_image_id, NULL,
+				metadata_json
 			FROM content_items
 			WHERE id = ?`,
 		)
@@ -1047,14 +1343,14 @@ export async function getContentSnapshot(
 
 	const tags = await db
 		.prepare(
-			'SELECT t.slug FROM content_tag_links l JOIN content_tags t ON t.id = l.tag_id WHERE l.content_id = ?',
+			'SELECT t.slug FROM content_tag_links l JOIN content_tags t ON t.id = l.tag_id WHERE l.content_id = ? ORDER BY t.slug ASC',
 		)
 		.bind(contentId)
 		.all<{ slug: string }>()
 
 	const related = await db
 		.prepare(
-			'SELECT related_id, rank, reason FROM content_relations WHERE content_id = ? ORDER BY rank ASC',
+			'SELECT related_id, rank, reason FROM content_relations WHERE content_id = ? ORDER BY rank ASC, related_id ASC',
 		)
 		.bind(contentId)
 		.all<{ related_id: string; rank: number; reason: string | null }>()