@growth-labs/cms 0.5.11 → 0.5.13

package/src/routes/content.ts

@@ -36,6 +36,7 @@ import {
 	evaluateContentBodyForPublish,
 	getContentItem,
 	getContentRelations,
+	getContentTagPairs,
 	publishContent,
 	scheduleContent,
 	unpublishContent,
@@ -50,6 +51,7 @@ import {
 } from '../engine/revisions.js'
 import { applySlugRenameRedirects } from '../engine/slug-redirects.js'
 import { softDeleteContent } from '../engine/soft-delete.js'
+import { TagInputError } from '../engine/taxonomy.js'
 import type { ContentStatus } from '../schema/types.js'
 import { type ContentAction, canPerformContentAction } from './authz-matrix.js'
 import type { CmsRouteConfig } from './config.js'
@@ -582,13 +584,7 @@ async function getContentPayload(ctx: RouteContext, type: string, id: string) {
 }
 
 async function getContentTags(ctx: RouteContext, id: string): Promise<string[]> {
-	const result = await ctx.db
-		.prepare(
-			'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.label ASC',
-		)
-		.bind(id)
-		.all<{ slug: string }>()
-	return (result.results || []).map((row) => row.slug)
+	return (await getContentTagPairs(ctx.db, id)).map((row) => row.slug)
 }
 
 async function getMediaAssetUrls(db: D1Database, ids: string[]): Promise<Record<string, string>> {
@@ -612,6 +608,19 @@ async function readJson(ctx: RouteContext): Promise<unknown> {
 	return ctx.request.json().catch(() => null)
 }
 
+function tagInputErrorResponse(error: TagInputError): Response {
+	return json(
+		{
+			error: 'Invalid tags',
+			code: error.code,
+			limit: error.limit,
+			actual: error.actual,
+			index: error.index,
+		},
+		400,
+	)
+}
+
 export interface ContentRouteHandlers {
 	/** GET /content — cursor-paginated list (q, author, status, types filters; excludes deleted). */
 	list(ctx: RouteContext): Promise<Response>
@@ -1034,6 +1043,7 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 			try {
 				created = await createContent(ctx.db, parsed.data)
 			} catch (error) {
+				if (error instanceof TagInputError) return tagInputErrorResponse(error)
 				const conflict = verifiedMediaDurationConflictResponse(error)
 				if (conflict) return conflict
 				throw error
@@ -1073,17 +1083,30 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 			const item = await getContentItem(ctx.db, id)
 			if (!item) return json({ error: 'Not found' }, 404)
 
-			const [content, tags, relations, author] = await Promise.all([
-				getContentPayload(ctx, item.type, id),
-				getContentTags(ctx, id),
-				getContentRelations(ctx.db, id),
-				item.author_id
-					? ctx.db
-							.prepare('SELECT name, slug FROM authors WHERE id = ? LIMIT 1')
-							.bind(item.author_id)
-							.first<{ name: string | null; slug: string | null }>()
-					: Promise.resolve(null),
-			])
+			let content: unknown
+			let tags: string[]
+			let relations: Awaited<ReturnType<typeof getContentRelations>>
+			let author: { name: string | null; slug: string | null } | null
+			try {
+				const resolvedContent = await Promise.all([
+					getContentPayload(ctx, item.type, id),
+					getContentTags(ctx, id),
+					getContentRelations(ctx.db, id),
+					item.author_id
+						? ctx.db
+								.prepare('SELECT name, slug FROM authors WHERE id = ? LIMIT 1')
+								.bind(item.author_id)
+								.first<{ name: string | null; slug: string | null }>()
+						: Promise.resolve(null),
+				])
+				content = resolvedContent[0]
+				tags = resolvedContent[1]
+				relations = resolvedContent[2]
+				author = resolvedContent[3]
+			} catch (error) {
+				if (error instanceof TagInputError) return tagInputErrorResponse(error)
+				throw error
+			}
 			const contentRecord = content as Record<string, unknown> | null
 			const thumbnailImageId =
 				typeof contentRecord?.thumbnail_image_id === 'string'
@@ -1193,6 +1216,7 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 			try {
 				updated = await updateContentItem(ctx.db, id, parsed.data)
 			} catch (error) {
+				if (error instanceof TagInputError) return tagInputErrorResponse(error)
 				const conflict = verifiedMediaDurationConflictResponse(error)
 				if (conflict) return conflict
 				throw error
@@ -1332,7 +1356,6 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 						422,
 					)
 				}
-
 				if (!existing.excerpt?.trim()) {
 					let failureReason: string | null = null
 					if (!resolved.hooks.llm) {
@@ -1370,8 +1393,19 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 						}
 					}
 				}
-				await publishContent(ctx.db, id, now)
-				await createRevision(ctx.db, id, ctx.userId || null)
+				try {
+					await getContentTagPairs(ctx.db, id)
+				} catch (error) {
+					if (error instanceof TagInputError) return tagInputErrorResponse(error)
+					throw error
+				}
+				try {
+					await publishContent(ctx.db, id, now)
+					await createRevision(ctx.db, id, ctx.userId || null)
+				} catch (error) {
+					if (error instanceof TagInputError) return tagInputErrorResponse(error)
+					throw error
+				}
 
 				// Write first-party activity log row (cms_activity_log, P5 Task 3).
 				// Wrapped so a logging failure never breaks the publish response.
@@ -1554,10 +1588,16 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 			}
 
 			if (action === 'snapshot') {
-				const revision = await createRevisionWithDelta(ctx.db, id, {
-					createdBy: ctx.userId ?? null,
-					tag: 'autosave',
-				})
+				let revision: Awaited<ReturnType<typeof createRevisionWithDelta>>
+				try {
+					revision = await createRevisionWithDelta(ctx.db, id, {
+						createdBy: ctx.userId ?? null,
+						tag: 'autosave',
+					})
+				} catch (error) {
+					if (error instanceof TagInputError) return tagInputErrorResponse(error)
+					throw error
+				}
 				if (!revision) return json({ error: 'Not found' }, 404)
 				return json({ status: 'snapshot', revisionId: revision.id })
 			}
@@ -1637,10 +1677,25 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 
 		async foundryCallback(ctx) {
 			// HMAC-guarded machine callback — NOT behind requirePublisher.
-			// The HMAC secret is read from ctx.env (Secrets Store binding on the
-			// Workers side; `env.FOUNDRY_HMAC_SECRET`). Never a value in code/D1.
-			const hmacSecret =
-				typeof ctx.env?.FOUNDRY_HMAC_SECRET === 'string' ? ctx.env.FOUNDRY_HMAC_SECRET : null
+			// The HMAC secret arrives from ctx.env as either a plain per-Worker
+			// secret string or a Secrets Store binding object (`{ get() }`) —
+			// consumers bind it both ways. Never a value in code/D1. The old
+			// string-only check silently nulled the binding shape and 500ed
+			// every callback on Store-bound consumers.
+			const rawHmac = ctx.env?.FOUNDRY_HMAC_SECRET as
+				| string
+				| { get(): Promise<string> }
+				| undefined
+			let hmacSecret: string | null = null
+			if (typeof rawHmac === 'string') {
+				hmacSecret = rawHmac
+			} else if (rawHmac && typeof rawHmac.get === 'function') {
+				try {
+					hmacSecret = (await rawHmac.get()) || null
+				} catch {
+					hmacSecret = null
+				}
+			}
 
 			if (!hmacSecret) {
 				// No secret configured — refuse with 500 (misconfiguration).
@@ -1885,7 +1940,13 @@ export function createContentRoutes(config: ContentRouteConfig): ContentRouteHan
 			const rev = ctx.params.rev
 			if (!rev) return json({ error: 'Missing rev' }, 400)
 
-			const ok = await restoreRevision(ctx.db, id, rev, { createdBy: ctx.userId ?? null })
+			let ok: Awaited<ReturnType<typeof restoreRevision>>
+			try {
+				ok = await restoreRevision(ctx.db, id, rev, { createdBy: ctx.userId ?? null })
+			} catch (error) {
+				if (error instanceof TagInputError) return tagInputErrorResponse(error)
+				throw error
+			}
 			if (!ok) return json({ error: 'Not found' }, 404)
 
 			return json({ restored: true })

package/src/routes/tags.ts

@@ -4,6 +4,7 @@
 
 import { z } from 'zod'
 import { createTag, deleteTag, getTag, listTags, renameTag, searchTags } from '../engine/tags.js'
+import { TagInputError } from '../engine/taxonomy.js'
 import type { CmsRouteConfig } from './config.js'
 import { resolveConfig } from './config.js'
 import { json, type RouteContext } from './context.js'
@@ -12,6 +13,25 @@ const TagWriteSchema = z.object({
 	label: z.string().min(1),
 })
 
+function parseLimit(value: string | null): number | undefined {
+	if (value === null) return undefined
+	const limit = Number(value)
+	return Number.isSafeInteger(limit) ? limit : undefined
+}
+
+function tagInputErrorResponse(error: TagInputError): Response {
+	return json(
+		{
+			error: 'Invalid tag',
+			code: error.code,
+			limit: error.limit,
+			actual: error.actual,
+			index: error.index,
+		},
+		400,
+	)
+}
+
 export interface TagRouteHandlers {
 	/**
 	 * GET /tags or GET /tags?q=<query>
@@ -42,8 +62,9 @@ export function createTagRoutes(config: CmsRouteConfig): TagRouteHandlers {
 
 			const url = new URL(ctx.request.url)
 			const q = url.searchParams.get('q')
+			const limit = parseLimit(url.searchParams.get('limit'))
 
-			const tags = q ? await searchTags(ctx.db, q) : await listTags(ctx.db)
+			const tags = q ? await searchTags(ctx.db, q, { limit }) : await listTags(ctx.db, { limit })
 			return json({ tags })
 		},
 
@@ -55,7 +76,13 @@ export function createTagRoutes(config: CmsRouteConfig): TagRouteHandlers {
 			if (!parsed.success) {
 				return json({ error: 'Invalid request', details: parsed.error.flatten() }, 400)
 			}
-			const tag = await createTag(ctx.db, parsed.data.label)
+			let tag: Awaited<ReturnType<typeof createTag>>
+			try {
+				tag = await createTag(ctx.db, parsed.data.label)
+			} catch (error) {
+				if (error instanceof TagInputError) return tagInputErrorResponse(error)
+				throw error
+			}
 			if (!tag) return json({ error: 'Tag already exists or label is invalid' }, 409)
 			return json({ tag }, 201)
 		},
@@ -73,7 +100,13 @@ export function createTagRoutes(config: CmsRouteConfig): TagRouteHandlers {
 			if (!parsed.success) {
 				return json({ error: 'Invalid request', details: parsed.error.flatten() }, 400)
 			}
-			const ok = await renameTag(ctx.db, id, parsed.data.label)
+			let ok: Awaited<ReturnType<typeof renameTag>>
+			try {
+				ok = await renameTag(ctx.db, id, parsed.data.label)
+			} catch (error) {
+				if (error instanceof TagInputError) return tagInputErrorResponse(error)
+				throw error
+			}
 			if (!ok) return json({ error: 'Tag slug already exists or label is invalid' }, 409)
 			const tag = await getTag(ctx.db, id)
 			return json({ tag })

package/src/schema/migrations.ts

@@ -811,7 +811,21 @@ ALTER TABLE content_insight_dismissals
   ADD COLUMN reason_code TEXT CHECK (reason_code IS NULL OR reason_code IN ('off_topic', 'already_covered', 'cant_win', 'wrong_format', 'not_now', 'other'));
 ALTER TABLE content_insight_dismissals
   ADD COLUMN note TEXT CHECK (note IS NULL OR length(note) <= 500);
-`,
+	`,
+	},
+	{
+		id: '0023_content_tag_link_labels',
+		sql: `
+ALTER TABLE content_tag_links
+  ADD COLUMN label TEXT;
+UPDATE content_tag_links
+SET label = (
+  SELECT label
+  FROM content_tags
+  WHERE content_tags.id = content_tag_links.tag_id
+ )
+ WHERE label IS NULL;
+	`,
 	},
 ]
 

package/src/schema/types.ts

@@ -167,6 +167,7 @@ export interface ContentTagRow {
 export interface ContentTagLinkRow {
 	content_id: string
 	tag_id: string
+	label: string | null
 }
 
 export interface ContentRelationRow {