@growth-labs/cms 0.6.0 → 0.6.2

package/src/engine/publisher.ts

@@ -19,7 +19,7 @@
 // timestamps; the video copy hard-codes `processing_state = 'ready'` so a
 // 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, FrontsPublishStatus } from '../schema/types.js'
+import type { ContentStatus, ContentType, FrontsPublishStatus } from '../schema/types.js'
 import { type ContentMetadata, serializeContentMetadata } from './content-metadata.js'
 import type { D1Database } from './d1.js'
 import { armFrontsPublishTriggerToken } from './fronts-publish-intent.js'
@@ -340,6 +340,17 @@ export interface UpdateContentInput extends Partial<BaseContentInput> {
 	aiLockedFields?: string[]
 }
 
+export interface UpdateContentOptions {
+	/** Atomically apply the update only while the content row has this status. */
+	requiredStatus?: ContentStatus
+}
+
+export interface UpdateContentResult {
+	slug: string
+	/** Present when requiredStatus lost a race before the mutation transaction. */
+	statusConflict?: string
+}
+
 interface VideoUpdatePlan {
 	script: string
 	videoId: string
@@ -762,7 +773,8 @@ export async function updateContentItem(
 	db: D1Database,
 	id: string,
 	input: UpdateContentInput,
-): Promise<{ slug: string } | null> {
+	options: UpdateContentOptions = {},
+): Promise<UpdateContentResult | null> {
 	const tagPairs = input.tags === undefined ? null : validateDeclaredTagList(input.tags)
 	const existing = await getContentItem(db, id)
 	if (!existing) return null
@@ -949,6 +961,158 @@ export async function updateContentItem(
 		? serializeContentMetadata(input.metadata)
 		: existing.metadata_json
 
+	if (options.requiredStatus) {
+		if (input.tags !== undefined || input.relations !== undefined) {
+			throw new TypeError('Status-constrained updates do not support tags or relations')
+		}
+		if (!isBodyBackedContentType(existing.type)) {
+			throw new TypeError('Status-constrained updates require body-backed content')
+		}
+
+		// D1 batch is a transaction: the status predicate and every content-table
+		// write linearize together, so a native publish/schedule cannot interleave
+		// between the base row and its body row.
+		const statements = [
+			db
+				.prepare(
+					`UPDATE content_items SET
+					  slug = ?, title = ?, seo_title = ?, description = ?, excerpt = ?, byline = ?,
+					  channel = ?, primary_topic = ?, featured = ?, visibility = ?, author_id = ?,
+					  hero_image_id = ?, hero_image_alt = ?, hero_image_caption = ?, social_image_id = ?,
+					  canonical_url = ?, ai_locked_fields = ?, seo_focus_keyword = ?, metadata_json = ?,
+					  updated_at = unixepoch(), canonical_version = canonical_version + 1
+					 WHERE id = ? AND status = ? AND deleted_at IS NULL
+					 RETURNING slug`,
+				)
+				.bind(
+					slug,
+					title,
+					seoTitle,
+					description,
+					excerpt,
+					byline,
+					primaryCategory,
+					primaryTopic,
+					featured,
+					visibility,
+					authorId,
+					heroImageId,
+					heroImageAlt,
+					heroImageCaption,
+					socialImageId,
+					canonicalUrl,
+					aiLockedFields,
+					seoFocusKeyword,
+					metadataJson,
+					id,
+					options.requiredStatus,
+				),
+		]
+
+		if (input.content) {
+			const current = await db
+				.prepare(
+					`SELECT body_markdown, body_html, body_portable_text, layout_json,
+					        word_count, read_time_minutes, subtitle, editor_takeaways
+					 FROM article_content WHERE content_id = ? LIMIT 1`,
+				)
+				.bind(id)
+				.first<{
+					body_markdown: string
+					body_html: string | null
+					body_portable_text: string | null
+					layout_json: string | null
+					word_count: number | null
+					read_time_minutes: number | null
+					subtitle: string | null
+					editor_takeaways: string | null
+				}>()
+			if (!current) throw new Error('Body-backed content row is missing')
+
+			const articleContent = input.content as Partial<
+				ArticleInput['content'] | NewsletterInput['content'] | PageInput['content']
+			>
+			const bodyMarkdownProvided = hasOwn(articleContent, 'bodyMarkdown')
+			const wordCountProvided = hasOwn(articleContent, 'wordCount')
+			const readTimeProvided = hasOwn(articleContent, 'readTimeMinutes')
+			const nextBodyMarkdown = bodyMarkdownProvided
+				? (articleContent.bodyMarkdown ?? current.body_markdown)
+				: current.body_markdown
+			const nextWordCount = wordCountProvided
+				? (articleContent.wordCount ?? null)
+				: bodyMarkdownProvided
+					? nextBodyMarkdown
+						? countWords(nextBodyMarkdown)
+						: null
+					: current.word_count
+			const nextReadTime = readTimeProvided
+				? (articleContent.readTimeMinutes ?? null)
+				: bodyMarkdownProvided
+					? nextWordCount
+						? estimateReadTime(nextWordCount)
+						: null
+					: current.read_time_minutes
+
+			statements.push(
+				db
+					.prepare(
+						`UPDATE article_content SET
+						  body_markdown = ?, body_html = ?, body_portable_text = ?, layout_json = ?,
+						  word_count = ?, read_time_minutes = ?, subtitle = ?, editor_takeaways = ?
+						 WHERE content_id = ?
+						   AND EXISTS (
+						     SELECT 1 FROM content_items
+						     WHERE id = ? AND status = ? AND deleted_at IS NULL
+						   )
+						 RETURNING content_id`,
+					)
+					.bind(
+						nextBodyMarkdown,
+						hasOwn(articleContent, 'bodyHtml')
+							? (articleContent.bodyHtml ?? null)
+							: bodyMarkdownProvided
+								? null
+								: current.body_html,
+						hasOwn(articleContent, 'bodyPortableText')
+							? (articleContent.bodyPortableText ?? null)
+							: bodyMarkdownProvided
+								? null
+								: current.body_portable_text,
+						hasOwn(articleContent, 'layoutJson')
+							? (articleContent.layoutJson ?? null)
+							: current.layout_json,
+						nextWordCount,
+						nextReadTime,
+						hasOwn(articleContent, 'subtitle')
+							? (articleContent.subtitle ?? null)
+							: current.subtitle,
+						hasOwn(articleContent, 'editorTakeaways')
+							? serializeTakeaways(articleContent.editorTakeaways)
+							: current.editor_takeaways,
+						id,
+						id,
+						options.requiredStatus,
+					),
+			)
+		}
+
+		const statusResultIndex = statements.length
+		statements.push(
+			db
+				.prepare('SELECT status FROM content_items WHERE id = ? AND deleted_at IS NULL LIMIT 1')
+				.bind(id),
+		)
+		const results = await db.batch(statements)
+		const baseChanged =
+			(results[0]?.results?.length ?? 0) > 0 ||
+			(results[0]?.meta as { changes?: number } | undefined)?.changes === 1
+		if (!baseChanged) {
+			const status = results[statusResultIndex]?.results?.[0]?.status
+			return typeof status === 'string' ? { slug: existing.slug, statusConflict: status } : null
+		}
+		return { slug }
+	}
+
 	await db
 		.prepare(
 			`

package/src/routes/content.ts

@@ -140,6 +140,8 @@ export interface ContentRouteConfig extends CmsRouteConfig {
 	dispatchFaq?: DispatchFaqHook
 	/** Optional host-specific readiness guard. A not-ready result blocks publish. */
 	publishReadiness?: PublishReadinessHook
+	/** Internal machine-route constraint: atomically update only in this status. */
+	updateStatusConstraint?: ContentStatus
 	/**
 	 * Optional webhook dispatcher hook (P7 Task 9). Fired at each content
 	 * lifecycle transition (publish, unpublish, schedule, archive, create, etc.).
@@ -1238,6 +1240,9 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 				existing.author_id,
 			)
 			if (denied) return denied
+			if (config.updateStatusConstraint && existing.status !== config.updateStatusConstraint) {
+				return json({ error: 'update_status_conflict', state: existing.status }, 409)
+			}
 
 			const parsed = UpdateSchema.safeParse(await readJson(ctx))
 			if (!parsed.success) {
@@ -1320,7 +1325,9 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 			const priorSlug = existing.slug
 			let updated: Awaited<ReturnType<typeof updateContentItem>>
 			try {
-				updated = await updateContentItem(ctx.db, id, parsed.data)
+				updated = await updateContentItem(ctx.db, id, parsed.data, {
+					requiredStatus: config.updateStatusConstraint,
+				})
 			} catch (error) {
 				if (error instanceof TagInputError) return tagInputErrorResponse(error)
 				const conflict = verifiedMediaDurationConflictResponse(error)
@@ -1328,6 +1335,9 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 				throw error
 			}
 			if (!updated) return json({ error: 'Not found' }, 404)
+			if (updated.statusConflict) {
+				return json({ error: 'update_status_conflict', state: updated.statusConflict }, 409)
+			}
 			const podcastAttempt: PodcastFoundryAttempt =
 				existing.type === 'podcast'
 					? await dispatchPodcastAfterSave(ctx, id)

package/src/routes/foundry-publish.ts

@@ -123,6 +123,7 @@ function receipt(row: Pick<FoundryArticleRow, 'external_id' | 'receipt_id' | 'st
 function machineConfig(config: ContentRouteConfig): ContentRouteConfig {
 	return {
 		...config,
+		updateStatusConstraint: 'draft',
 		authz: {
 			requireAdmin: () => null,
 			requirePublisher: () => null,
@@ -170,12 +171,16 @@ async function upsertReceipt(
 		.run()
 }
 
-async function heroAssetId(
+async function heroAssetId(url: string): Promise<string> {
+	return `foundry-hero-${(await sha256(url)).slice(0, 24)}`
+}
+
+async function persistHeroAsset(
 	ctx: RouteContext,
 	config: ContentRouteConfig,
+	id: string,
 	url: string,
-): Promise<string> {
-	const id = `foundry-hero-${(await sha256(url)).slice(0, 24)}`
+): Promise<void> {
 	await insertMediaAsset(ctx.db, {
 		id,
 		siteId: config.mediaSiteId ?? 'fronts',
@@ -191,7 +196,23 @@ async function heroAssetId(
 		variantsJson: null,
 		r2Binding: config.mediaR2Binding ?? 'PUBLIC_MEDIA',
 	})
-	return id
+}
+
+function approvalConflict(id: string, state: string): Response {
+	return json({ error: 'published_requires_approval', external_id: id, state }, 409)
+}
+
+async function mapUpdateConflict(response: Response, id: string): Promise<Response> {
+	if (response.status !== 409) return response
+	try {
+		const payload = (await response.clone().json()) as { error?: unknown; state?: unknown }
+		if (payload.error === 'update_status_conflict' && typeof payload.state === 'string') {
+			return approvalConflict(id, payload.state)
+		}
+	} catch {
+		// Preserve an unrelated native 409 response byte-for-byte.
+	}
+	return response
 }
 
 export function createFoundryPublishRoutes(
@@ -224,15 +245,19 @@ export function createFoundryPublishRoutes(
 				})
 				return json(receipt(prior))
 			}
+			if (prior && prior.status !== 'draft') return approvalConflict(id, prior.status)
 
 			const sourceContent = prior ? null : await findContentBySource(ctx, id)
 			if (sourceContent && sourceContent.type !== 'article')
 				return json({ error: 'external_id_conflict' }, 409)
+			if (sourceContent && sourceContent.status !== 'draft') {
+				return approvalConflict(id, sourceContent.status)
+			}
 			const contentId = prior?.content_id ?? sourceContent?.id ?? null
 			const digestSlug = `article-${auth.bodyHash.slice(0, 12)}`
 			const slug = slugify(parsed.data.title) || digestSlug
 			const heroImageId = parsed.data.hero_image_url
-				? await heroAssetId(ctx, config, parsed.data.hero_image_url)
+				? await heroAssetId(parsed.data.hero_image_url)
 				: undefined
 			const body = {
 				title: parsed.data.title,
@@ -243,7 +268,10 @@ export function createFoundryPublishRoutes(
 
 			let nativeResponse: Response
 			if (contentId) {
-				nativeResponse = await content.update(nativeContext(ctx, 'PATCH', body, { id: contentId }))
+				nativeResponse = await mapUpdateConflict(
+					await content.update(nativeContext(ctx, 'PATCH', body, { id: contentId })),
+					id,
+				)
 			} else {
 				try {
 					nativeResponse = await content.create(
@@ -257,10 +285,16 @@ export function createFoundryPublishRoutes(
 				} catch (error) {
 					const raced = await findContentBySource(ctx, id)
 					if (!raced || raced.type !== 'article') throw error
-					nativeResponse = await content.update(nativeContext(ctx, 'PATCH', body, { id: raced.id }))
+					nativeResponse = await mapUpdateConflict(
+						await content.update(nativeContext(ctx, 'PATCH', body, { id: raced.id })),
+						id,
+					)
 				}
 			}
 			if (!nativeResponse.ok) return nativeResponse
+			if (heroImageId && parsed.data.hero_image_url) {
+				await persistHeroAsset(ctx, config, heroImageId, parsed.data.hero_image_url)
+			}
 			const native = (await nativeResponse.json()) as { id?: string; slug?: string }
 			const resolvedId = contentId ?? native.id
 			if (!resolvedId) return json({ error: 'write_failed' }, 500)