@janga/norna 0.7.16 → 0.7.18

package/scripts/test-content-model-v2.mjs

@@ -50,7 +50,7 @@ const createTempSite = async ({ underRepoCache = false } = {}) => {
 	await mkdir(tempParent, { recursive: true });
 	const root = await mkdtemp(path.join(tempParent, 'norna-content-model-v2-'));
 	const siteDir = path.join(root, 'site');
-	await mkdir(siteDir, { recursive: true });
+	await mkdir(path.join(siteDir, 'pages', '000-home'), { recursive: true });
 	await writeFile(path.join(siteDir, 'config.yaml'), 'url: https://example.com/\n');
 	await writeFile(path.join(siteDir, 'theme.yaml'), `typography:
   profile: reading
@@ -109,89 +109,255 @@ test('content model v2 fixture checks and builds', async () => {
 		await runNorna(['--site-dir', siteDir, 'build']);
 
 		const manifest = JSON.parse(await readFile(path.join(siteDir, '.norna', 'generated-images.json'), 'utf8'));
-		assert.ok(manifest['images/intro/duplicate.jpg']);
-		assert.ok(manifest['routes/010-guide/images/intro/duplicate.jpg']);
+		assert.ok(manifest['pages/000-home/images/duplicate.jpg']);
+		assert.ok(manifest['pages/010-guide/images/duplicate.jpg']);
+
+		const homepageHtml = await readFile(path.join(path.dirname(siteDir), 'dist', 'index.html'), 'utf8');
+		assert.match(homepageHtml, /site-section-page-title/);
+		assert.match(homepageHtml, /site-section-page-title-empty/);
+		assert.match(homepageHtml, /fetchpriority="high"/);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('route theme replaces visual theme while site identity stays at the root', async () => {
-	const { root, siteDir } = await createTempSite({ underRepoCache: true });
+test('the removed root page structure is rejected with a migration hint', async () => {
+	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'theme.yaml'), `typography:
-  profile: reading
+		await writeFile(path.join(siteDir, 'content.md'), `# Home
+Home content.
 `);
-		await writeFile(path.join(siteDir, 'sitewide-content.yaml'), `navigation:
-  label: Root Brand
+
+		await assert.rejects(
+			runNorna(['--site-dir', siteDir, 'content:check']),
+			(error) => {
+				assert.match(error.output, /The old root-page structure is no longer supported: site\/content\.md\./);
+				assert.match(error.output, /Move the homepage content to site\/pages\/000-home\/content\.md/);
+				return true;
+			},
+		);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test('the removed routes directory is rejected with a page migration hint', async () => {
+	const { root, siteDir } = await createTempSite();
+	try {
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `# Home
+Home content.
 `);
 		await mkdir(path.join(siteDir, 'routes', '010-guide'), { recursive: true });
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Root
-description: Root page
+		await writeFile(path.join(siteDir, 'routes', '010-guide', 'content.md'), 'Old page content.\n');
+
+		await assert.rejects(
+			runNorna(['--site-dir', siteDir, 'content:check']),
+			(error) => {
+				assert.match(error.output, /site\/routes is no longer supported\. Rename it to site\/pages and use NNN-page-id directory names\./);
+				return true;
+			},
+		);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test('the required home page cannot own child pages', async () => {
+	const { root, siteDir } = await createTempSite();
+	try {
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `# Home
+
+## Welcome {#welcome}
+
+Home content.
+`);
+		const homeChildDir = path.join(siteDir, 'pages', '000-home', 'pages', '010-news');
+		await mkdir(homeChildDir, { recursive: true });
+		await writeFile(path.join(homeChildDir, 'content.md'), '# News\n\nNews content.\n');
+
+		await assert.rejects(
+			runNorna(['--site-dir', siteDir, 'content:check']),
+			(error) => {
+				assert.match(error.output, /site\/pages\/000-home is the homepage and cannot contain child pages\./);
+				assert.match(error.output, /Move these page directories beside 000-home under site\/pages\//);
+				assert.match(error.output, /site\/pages\/000-home\/pages\/010-news/);
+				return true;
+			},
+		);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test('page theme changes page presentation while preserving site visual identity', async () => {
+	const { root, siteDir } = await createTempSite({ underRepoCache: true });
+	try {
+		await writeFile(path.join(siteDir, 'theme.yaml'), `preset: documentation
+palette: dark
+`);
+		await mkdir(path.join(siteDir, 'pages', '010-guide'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Root page
 ---
 
+# Root
+
 ## Home {#home}
 
 Root content.
 `);
-		await writeFile(path.join(siteDir, 'routes', '010-guide', 'content.md'), `---
-title: Guide
-description: Guide page
-navigation:
-  label: Guide
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'content.md'), `---
+page:
+  description: Guide page
 ---
 
-## Guide {#guide}
+# Guide
+Page content.
+`);
+		await mkdir(path.join(siteDir, 'pages', '010-guide', 'pages', '010-detail'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'pages', '010-detail', 'content.md'), `# Detail
 
-Route content.
+Inherited page content.
+`);
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'theme.yaml'), `layout:
+  contentSpacing: spacious
+  textWidth: wide
+sections:
+  backgroundPattern: cycling
 `);
-		await writeFile(path.join(siteDir, 'routes', '010-guide', 'theme.yaml'), `typography:
-  profile: statement
-palette: light
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'pages', '010-detail', 'theme.yaml'), `layout:
+  textWidth: narrow
 `);
 
 		await runNorna(['--site-dir', siteDir, 'build']);
 		const rootHtml = await readFile(path.join(path.dirname(siteDir), 'dist', 'index.html'), 'utf8');
-		const routeHtml = await readFile(path.join(path.dirname(siteDir), 'dist', 'guide', 'index.html'), 'utf8');
+		const pageHtml = await readFile(path.join(path.dirname(siteDir), 'dist', 'guide', 'index.html'), 'utf8');
+		const detailHtml = await readFile(path.join(path.dirname(siteDir), 'dist', 'guide', 'detail', 'index.html'), 'utf8');
 		assert.match(rootHtml, /--color-page: #000000/);
-		assert.match(routeHtml, /--color-page: #ffffff/);
-		assert.match(routeHtml, /<a class="site-brand" href="\/">Root Brand<\/a>/);
+		assert.match(pageHtml, /--color-page: #000000/);
+		assert.match(rootHtml, /--font-sans: Georgia, 'Times New Roman', serif/);
+		assert.match(pageHtml, /--font-sans: Georgia, 'Times New Roman', serif/);
+		assert.match(pageHtml, /--space-section-to-section-desktop: clamp\(2\.25rem, 5vw, 4\.5rem\)/);
+		assert.match(pageHtml, /--section-body-width-desktop: min\(72ch,/);
+		assert.match(detailHtml, /--space-section-to-section-desktop: clamp\(2\.25rem, 5vw, 4\.5rem\)/);
+		assert.match(detailHtml, /--section-body-width-desktop: min\(60ch,/);
+		assert.match(pageHtml, /<a href="\/">\s*Root\s*<\/a>/);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('route theme cannot define site identity', async () => {
+test('page metadata, navigation logo, and page listing have separate roles', async () => {
 	const { root, siteDir } = await createTempSite({ underRepoCache: true });
 	try {
-		await mkdir(path.join(siteDir, 'routes', '010-guide'), { recursive: true });
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Root
-description: Root page
+		await mkdir(path.join(siteDir, 'public'), { recursive: true });
+		await writeFile(path.join(siteDir, 'public', 'logo.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"/>');
+		await writeFile(path.join(siteDir, 'sitewide-content.yaml'), `logo:
+  height: 2rem
+`);
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `# Welcome
+
+## Intro {#intro}
+
+Homepage content.
+`);
+		await mkdir(path.join(siteDir, 'pages', '010-guide'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'content.md'), `---
+page:
+  description: The visible guide page.
+---
+
+# Guide
+Guide content.
+`);
+		await mkdir(path.join(siteDir, 'pages', '020-private'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '020-private', 'content.md'), `---
+navigation:
+  listed: false
+---
+
+# Unlisted
+Public but unlisted content.
+`);
+
+		await runNorna(['--site-dir', siteDir, 'build']);
+		const distDir = path.join(path.dirname(siteDir), 'dist');
+		const homeHtml = await readFile(path.join(distDir, 'index.html'), 'utf8');
+		const guideHtml = await readFile(path.join(distDir, 'guide', 'index.html'), 'utf8');
+		const unlistedHtml = await readFile(path.join(distDir, 'private', 'index.html'), 'utf8');
+
+		assert.match(homeHtml, /<title>Welcome<\/title>/);
+		assert.doesNotMatch(homeHtml, /<meta name="description"/);
+		assert.match(homeHtml, /<img class="site-brand-logo"[^>]+alt="Welcome"/);
+		assert.match(homeHtml, /<a href="\/" aria-current="page">\s*Welcome\s*<\/a>/);
+		assert.match(homeHtml, /<a href="\/guide\/">\s*Guide\s*<\/a>/);
+		assert.doesNotMatch(homeHtml, />\s*Unlisted\s*<\/a>/);
+		assert.match(guideHtml, /<meta name="description" content="The visible guide page\."/);
+		assert.match(unlistedHtml, /Public but unlisted content/);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test('footer build information uses the site language and fixed formatting', async () => {
+	const { root, siteDir } = await createTempSite({ underRepoCache: true });
+	try {
+		await writeFile(path.join(siteDir, 'config.yaml'), 'url: https://example.com/\nlanguage: sv-SE\n');
+		await writeFile(path.join(siteDir, 'sitewide-content.yaml'), `footer:
+  buildInfo: true
+`);
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Footer build information.
 ---
 
+# Footer
+
 ## Home {#home}
 
-Root content.
+Content.
 `);
-		await writeFile(path.join(siteDir, 'routes', '010-guide', 'content.md'), `---
-title: Guide
-description: Guide page
+
+		await runNorna(['--site-dir', siteDir, 'build']);
+		const html = await readFile(path.join(path.dirname(siteDir), 'dist', 'index.html'), 'utf8');
+		assert.match(html, /<span>Byggd [^<]+<\/span>/);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test('page theme cannot define navigation logo settings', async () => {
+	const { root, siteDir } = await createTempSite({ underRepoCache: true });
+	try {
+		await mkdir(path.join(siteDir, 'pages', '010-guide'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Root page
 ---
 
-## Guide {#guide}
+# Root
+
+## Home {#home}
 
-Route content.
+Root content.
 `);
-		await writeFile(path.join(siteDir, 'routes', '010-guide', 'theme.yaml'), `navigation:
-  label: Route Brand
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'content.md'), `---
+page:
+  description: Guide page
+---
+
+# Guide
+Page content.
+`);
+		await writeFile(path.join(siteDir, 'pages', '010-guide', 'theme.yaml'), `logo:
+  height: 3rem
 `);
 
 		await assert.rejects(
 			runNorna(['--site-dir', siteDir, 'config:check']),
 			(error) => {
-				assert.match(error.output, /may not define navigation\. The site label and logo settings belong in site\/sitewide-content\.yaml/);
+				assert.match(error.output, /may not define navigation logo settings\. Optional logo display settings belong under "logo:" in site\/sitewide-content\.yaml/);
 				return true;
 			},
 		);
@@ -203,16 +369,14 @@ Route content.
 test('navigation logo settings require one conventional logo file', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'sitewide-content.yaml'), `navigation:
-  label: Missing logo
-  logo:
-    height: 2rem
+		await writeFile(path.join(siteDir, 'sitewide-content.yaml'), `logo:
+  height: 2rem
 `);
 
 		await assert.rejects(
 			runNorna(['--site-dir', siteDir, 'config:check']),
 			(error) => {
-				assert.match(error.output, /navigation\.logo is configured, but no logo file was found/);
+				assert.match(error.output, /Site-wide logo is configured, but no logo file was found/);
 				assert.match(error.output, /site\/public\/logo\.svg/);
 				return true;
 			},
@@ -225,9 +389,6 @@ test('navigation logo settings require one conventional logo file', async () =>
 test('multiple conventional navigation logo files stop config validation', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'sitewide-content.yaml'), `navigation:
-  label: Conflicting logos
-`);
 		await mkdir(path.join(siteDir, 'public'), { recursive: true });
 		await writeFile(path.join(siteDir, 'public', 'logo.svg'), '<svg/>');
 		await writeFile(path.join(siteDir, 'public', 'logo.png'), 'png');
@@ -249,11 +410,13 @@ test('multiple conventional navigation logo files stop config validation', async
 test('content:check warns for local Markdown images but not external Markdown images', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Markdown Image Warning
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Markdown Image Warning
+
 ## Intro {#intro}
 
 ![Local](portrait.jpg)
@@ -275,11 +438,13 @@ description: Fixture
 test('managed SVG images are copied as static image output', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: SVG Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# SVG Fixture
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -287,18 +452,18 @@ description: Fixture
   alt: Diagram
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'intro'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'intro', 'diagram.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 620"><rect width="900" height="620"/></svg>\n');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'diagram.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 620"><rect width="900" height="620"/></svg>\n');
 
 		await runContentScript(siteDir, ['--check']);
 		await runNorna(['--site-dir', siteDir, 'images']);
 
 		const manifest = JSON.parse(await readFile(path.join(siteDir, '.norna', 'generated-images.json'), 'utf8'));
-		const entry = manifest['images/intro/diagram.svg'];
+		const entry = manifest['pages/000-home/images/diagram.svg'];
 		assert.equal(entry.kind, 'static');
 		assert.equal(entry.width, 900);
 		assert.equal(entry.height, 620);
-		assert.match(entry.src, /^\/images\/original\/images\/intro\/diagram-[a-f0-9]{8}\.svg$/);
+		assert.match(entry.src, /^\/images\/original\/pages\/000-home\/images\/diagram-[a-f0-9]{8}\.svg$/);
 		assert.equal(entry.variants, undefined);
 		assert.equal(await fileExists(path.join(siteDir, '.norna', 'public', entry.src.replace(/^\//, ''))), true);
 	} finally {
@@ -309,11 +474,13 @@ description: Fixture
 test('inline notes render as linked numbered margin notes', async () => {
 	const { root, siteDir } = await createTempSite({ underRepoCache: true });
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Inline notes
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Inline notes
+
 ## Intro {#intro}
 
 The first paragraph points to an explanation.{note-ref}
@@ -347,11 +514,13 @@ The second paragraph has its own explanation.{note-ref}
 test('updated managed SVG images get updated static output', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: SVG Update Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# SVG Update Fixture
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -359,22 +528,22 @@ description: Fixture
   alt: Diagram
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'intro'), { recursive: true });
-		const sourcePath = path.join(siteDir, 'images', 'intro', 'diagram.svg');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images'), { recursive: true });
+		const sourcePath = path.join(siteDir, 'pages', '000-home', 'images', 'diagram.svg');
 		await writeFile(sourcePath, '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 620"><rect width="900" height="620" fill="red"/></svg>\n');
 
 		await runContentScript(siteDir, ['--check']);
 		await runNorna(['--site-dir', siteDir, 'images']);
 
 		const firstManifest = JSON.parse(await readFile(path.join(siteDir, '.norna', 'generated-images.json'), 'utf8'));
-		const firstEntry = firstManifest['images/intro/diagram.svg'];
+		const firstEntry = firstManifest['pages/000-home/images/diagram.svg'];
 		const firstOutputPath = path.join(siteDir, '.norna', 'public', firstEntry.src.replace(/^\//, ''));
 
 		await writeFile(sourcePath, '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 620"><rect width="900" height="620" fill="blue"/></svg>\n');
 		await runNorna(['--site-dir', siteDir, 'images']);
 
 		const secondManifest = JSON.parse(await readFile(path.join(siteDir, '.norna', 'generated-images.json'), 'utf8'));
-		const secondEntry = secondManifest['images/intro/diagram.svg'];
+		const secondEntry = secondManifest['pages/000-home/images/diagram.svg'];
 		const secondOutputPath = path.join(siteDir, '.norna', 'public', secondEntry.src.replace(/^\//, ''));
 
 		assert.notEqual(secondEntry.sourceHash, firstEntry.sourceHash);
@@ -389,11 +558,13 @@ description: Fixture
 test('content:check warns when carousel SVG images have no intrinsic aspect ratio', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: SVG Carousel Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# SVG Carousel Fixture
+
 ## Intro {#intro}
 
 \`\`\`norna-image-carousel
@@ -403,9 +574,9 @@ description: Fixture
   alt: Second
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'intro'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'intro', 'first.svg'), '<svg xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100"/></svg>\n');
-		await writeFile(path.join(siteDir, 'images', 'intro', 'second.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect width="100" height="100"/></svg>\n');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'first.svg'), '<svg xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100"/></svg>\n');
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'second.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect width="100" height="100"/></svg>\n');
 
 		const { stdout } = await runContentScript(siteDir, ['--check']);
 		assert.match(stdout, /Content check completed with warnings\./);
@@ -418,11 +589,13 @@ description: Fixture
 test('norna-card-list images are managed image references', async () => {
 	const { root, siteDir } = await createTempSite({ underRepoCache: true });
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Card List Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Card List Fixture
+
 ## Help {#help}
 
 \`\`\`norna-card-list
@@ -440,15 +613,15 @@ width: narrow
   text: Support the shelter.
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'help'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'help', 'adopt.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 100"><rect width="160" height="100"/></svg>\n');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'adopt.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 100"><rect width="160" height="100"/></svg>\n');
 
 		const { stdout } = await runContentScript(siteDir, ['--check']);
 		assert.match(stdout, /Content check passed\./);
 
 		await runNorna(['--site-dir', siteDir, 'images']);
 		const manifest = JSON.parse(await readFile(path.join(siteDir, '.norna', 'generated-images.json'), 'utf8'));
-		assert.equal(manifest['images/help/adopt.svg'].kind, 'static');
+		assert.equal(manifest['pages/000-home/images/adopt.svg'].kind, 'static');
 
 		await runNorna(['--site-dir', siteDir, 'build']);
 		const html = await readFile(path.join(root, 'dist', 'index.html'), 'utf8');
@@ -460,7 +633,7 @@ width: narrow
 		assert.match(html, /class="card-list-badge">Recommended<\/p>/);
 		assert.match(html, /Give a dog a new home\./);
 		assert.match(html, /href="\/adopt\/"/);
-		assert.match(html, /src="\/images\/original\/images\/help\/adopt-[a-f0-9]{8}\.svg"/);
+		assert.match(html, /src="\/images\/original\/pages\/000-home\/images\/adopt-[a-f0-9]{8}\.svg"/);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
@@ -469,11 +642,13 @@ width: narrow
 test('content:check fails when a norna-card-list image file is missing', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Missing Card Image
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Missing Card Image
+
 ## Help {#help}
 
 \`\`\`norna-card-list
@@ -485,7 +660,7 @@ description: Fixture
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
-				assert.match(error.output, /Image "missing\.svg" does not exist at .*site\/images\/help\/missing\.svg or anywhere under any page or route image root\./);
+				assert.match(error.output, /Image "missing\.svg" does not exist at .*site\/pages\/000-home\/images\/missing\.svg or anywhere under any page image root\./);
 				return true;
 			},
 		);
@@ -497,11 +672,13 @@ description: Fixture
 test('content:check fails for malformed norna-card-list blocks', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Malformed Card List
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Malformed Card List
+
 ## Help {#help}
 
 \`\`\`norna-card-list
@@ -524,11 +701,13 @@ description: Fixture
 test('content:check fails for invalid norna-card-list options', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Invalid Card List Options
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Invalid Card List Options
+
 ## Help {#help}
 
 \`\`\`norna-card-list
@@ -557,11 +736,13 @@ width: full
 test('content:check fails for invalid norna-card-list width', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Invalid Card List Width
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Invalid Card List Width
+
 ## Help {#help}
 
 \`\`\`norna-card-list
@@ -587,11 +768,13 @@ width: full
 test('content:check fails for invalid norna-card-list size', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Invalid Card List Size
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Invalid Card List Size
+
 ## Help {#help}
 
 \`\`\`norna-card-list
@@ -617,11 +800,13 @@ size: huge
 test('content:sync moves Norna-managed images inside the same page image root', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Sync Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Sync Fixture
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
@@ -629,12 +814,12 @@ description: Fixture
   alt: Moved image
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'old'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'old', 'moved.jpg'), 'fixture image');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'old'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'old', 'moved.jpg'), 'fixture image');
 
 		await runContentScript(siteDir, ['--write', '--yes']);
 
-		const moved = await readFile(path.join(siteDir, 'images', 'work', 'moved.jpg'), 'utf8');
+		const moved = await readFile(path.join(siteDir, 'pages', '000-home', 'images', 'moved.jpg'), 'utf8');
 		assert.equal(moved, 'fixture image');
 	} finally {
 		await rm(root, { recursive: true, force: true });
@@ -644,11 +829,13 @@ description: Fixture
 test('content:sync moves managed SVG images inside the same page image root', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: SVG Sync Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# SVG Sync Fixture
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
@@ -656,166 +843,184 @@ description: Fixture
   alt: Moved diagram
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'old'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'old', 'moved.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"></svg>\n');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'old'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'old', 'moved.svg'), '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"></svg>\n');
 
 		await runContentScript(siteDir, ['--write', '--yes']);
 
-		const moved = await readFile(path.join(siteDir, 'images', 'work', 'moved.svg'), 'utf8');
+		const moved = await readFile(path.join(siteDir, 'pages', '000-home', 'images', 'moved.svg'), 'utf8');
 		assert.match(moved, /viewBox="0 0 10 10"/);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('content:sync moves Norna-managed images across route image roots when git is clean', async () => {
+test('content:sync moves Norna-managed images across page image roots when git is clean', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		const sourceRouteDir = path.join(siteDir, 'routes', '010-source');
-		const targetRouteDir = path.join(siteDir, 'routes', '020-target');
-		await mkdir(path.join(sourceRouteDir, 'images', 'old'), { recursive: true });
-		await mkdir(targetRouteDir, { recursive: true });
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Cross Route Sync
-description: Fixture
+		const sourcePageDir = path.join(siteDir, 'pages', '010-source');
+		const targetPageDir = path.join(siteDir, 'pages', '020-target');
+		await mkdir(path.join(sourcePageDir, 'images'), { recursive: true });
+		await mkdir(targetPageDir, { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Cross Page Sync
+
 ## Home {#home}
 
 Text.
 `);
-		await writeFile(path.join(sourceRouteDir, 'content.md'), `---
-title: Source
-description: Fixture
+		await writeFile(path.join(sourcePageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Source
+
 ## Old {#old}
 
 Text.
 `);
-		await writeFile(path.join(targetRouteDir, 'content.md'), `---
-title: Target
-description: Fixture
+		await writeFile(path.join(targetPageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Target
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
 - image: moved.jpg
 \`\`\`
 `);
-		await writeFile(path.join(sourceRouteDir, 'images', 'old', 'moved.jpg'), 'route image');
+		await writeFile(path.join(sourcePageDir, 'images', 'moved.jpg'), 'page image');
 		await initCleanGitWorktree(root);
 
 		await runContentScript(siteDir, ['--write', '--yes']);
 
-		assert.equal(await fileExists(path.join(targetRouteDir, 'images', 'work', 'moved.jpg')), true);
-		assert.equal(await fileExists(path.join(sourceRouteDir, 'images', 'old', 'moved.jpg')), false);
+		assert.equal(await fileExists(path.join(targetPageDir, 'images', 'moved.jpg')), true);
+		assert.equal(await fileExists(path.join(sourcePageDir, 'images', 'moved.jpg')), false);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('content:sync refuses cross-route image moves when git status is dirty', async () => {
+test('content:sync refuses cross-page image moves when git status is dirty', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		const sourceRouteDir = path.join(siteDir, 'routes', '010-source');
-		const targetRouteDir = path.join(siteDir, 'routes', '020-target');
-		await mkdir(path.join(sourceRouteDir, 'images', 'old'), { recursive: true });
-		await mkdir(targetRouteDir, { recursive: true });
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Dirty Cross Route Sync
-description: Fixture
+		const sourcePageDir = path.join(siteDir, 'pages', '010-source');
+		const targetPageDir = path.join(siteDir, 'pages', '020-target');
+		await mkdir(path.join(sourcePageDir, 'images'), { recursive: true });
+		await mkdir(targetPageDir, { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Dirty Cross Page Sync
+
 ## Home {#home}
 
 Text.
 `);
-		await writeFile(path.join(sourceRouteDir, 'content.md'), `---
-title: Source
-description: Fixture
+		await writeFile(path.join(sourcePageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Source
+
 ## Old {#old}
 
 Text.
 `);
-		await writeFile(path.join(targetRouteDir, 'content.md'), `---
-title: Target
-description: Fixture
+		await writeFile(path.join(targetPageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Target
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
 - image: moved.jpg
 \`\`\`
 `);
-		await writeFile(path.join(sourceRouteDir, 'images', 'old', 'moved.jpg'), 'route image');
+		await writeFile(path.join(sourcePageDir, 'images', 'moved.jpg'), 'page image');
 		await initCleanGitWorktree(root);
 		await writeFile(path.join(root, 'dirty.txt'), 'dirty');
 
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--write', '--yes']),
 			(error) => {
-				assert.match(error.output, /Cross-route content sync requires a clean git working tree before moving files between page or route image roots\./);
+				assert.match(error.output, /Cross-page content sync requires a clean git working tree before moving files between page image roots\./);
 				assert.match(error.output, /dirty\.txt/);
 				return true;
 			},
 		);
 
-		assert.equal(await fileExists(path.join(targetRouteDir, 'images', 'work', 'moved.jpg')), false);
-		assert.equal(await fileExists(path.join(sourceRouteDir, 'images', 'old', 'moved.jpg')), true);
+		assert.equal(await fileExists(path.join(targetPageDir, 'images', 'moved.jpg')), false);
+		assert.equal(await fileExists(path.join(sourcePageDir, 'images', 'moved.jpg')), true);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('content:check reports cross-route image moves without requiring clean git status', async () => {
+test('content:check reports cross-page image moves without requiring clean git status', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		const sourceRouteDir = path.join(siteDir, 'routes', '010-source');
-		const targetRouteDir = path.join(siteDir, 'routes', '020-target');
-		await mkdir(path.join(sourceRouteDir, 'images', 'old'), { recursive: true });
-		await mkdir(targetRouteDir, { recursive: true });
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Cross Route Check
-description: Fixture
+		const sourcePageDir = path.join(siteDir, 'pages', '010-source');
+		const targetPageDir = path.join(siteDir, 'pages', '020-target');
+		await mkdir(path.join(sourcePageDir, 'images'), { recursive: true });
+		await mkdir(targetPageDir, { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Cross Page Check
+
 ## Home {#home}
 
 Text.
 `);
-		await writeFile(path.join(sourceRouteDir, 'content.md'), `---
-title: Source
-description: Fixture
+		await writeFile(path.join(sourcePageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Source
+
 ## Old {#old}
 
 Text.
 `);
-		await writeFile(path.join(targetRouteDir, 'content.md'), `---
-title: Target
-description: Fixture
+		await writeFile(path.join(targetPageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Target
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
 - image: moved.jpg
 \`\`\`
 `);
-		await writeFile(path.join(sourceRouteDir, 'images', 'old', 'moved.jpg'), 'route image');
+		await writeFile(path.join(sourcePageDir, 'images', 'moved.jpg'), 'page image');
 		await writeFile(path.join(root, 'dirty.txt'), 'dirty');
 
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
-				assert.match(error.output, /Image "moved\.jpg" is used here but is located in .*site\/routes\/010-source\/images\/old\/moved\.jpg\./);
-				assert.match(error.output, /Run norna content:sync to move it from .*site\/routes\/010-source to .*site\/routes\/020-target\./);
+				assert.match(error.output, /Image "moved\.jpg" is used here but is located in .*site\/pages\/010-source\/images\/moved\.jpg\./);
+				assert.match(error.output, /Run norna content:sync to move it from .*site\/pages\/010-source to .*site\/pages\/020-target\./);
 				assert.doesNotMatch(error.output, /requires a clean git working tree before moving files/);
 				return true;
 			},
@@ -825,56 +1030,63 @@ description: Fixture
 	}
 });
 
-test('content:sync refuses to move a cross-route image still referenced by its current section', async () => {
+test('content:sync refuses to move a cross-page image still referenced by its current section', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		const sourceRouteDir = path.join(siteDir, 'routes', '010-source');
-		const targetRouteDir = path.join(siteDir, 'routes', '020-target');
-		await mkdir(path.join(sourceRouteDir, 'images', 'old'), { recursive: true });
-		await mkdir(targetRouteDir, { recursive: true });
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Cross Route Copy
-description: Fixture
+		const sourcePageDir = path.join(siteDir, 'pages', '010-source');
+		const targetPageDir = path.join(siteDir, 'pages', '020-target');
+		await mkdir(path.join(sourcePageDir, 'images'), { recursive: true });
+		await mkdir(targetPageDir, { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Cross Page Copy
+
 ## Home {#home}
 
 Text.
 `);
-		await writeFile(path.join(sourceRouteDir, 'content.md'), `---
-title: Source
-description: Fixture
+		await writeFile(path.join(sourcePageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Source
+
 ## Old {#old}
 
 \`\`\`norna-image-stack
 - image: shared.jpg
 \`\`\`
 `);
-		await writeFile(path.join(targetRouteDir, 'content.md'), `---
-title: Target
-description: Fixture
+		await writeFile(path.join(targetPageDir, 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Target
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
 - image: shared.jpg
 \`\`\`
 `);
-		await writeFile(path.join(sourceRouteDir, 'images', 'old', 'shared.jpg'), 'route image');
+		await writeFile(path.join(sourcePageDir, 'images', 'shared.jpg'), 'page image');
+		await initCleanGitWorktree(root);
 
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--write', '--yes']),
 			(error) => {
-				assert.match(error.output, /Cannot relocate "shared\.jpg" from .*site\/routes\/010-source\/images\/old\/shared\.jpg because it is still referenced from .*site\/routes\/010-source\/content\.md \[old\]\./);
+				assert.match(error.output, /Cannot relocate "shared\.jpg" from .*site\/pages\/010-source\/images\/shared\.jpg because it is still referenced from .*site\/pages\/010-source\/content\.md \[old\]\./);
 				return true;
 			},
 		);
 
-		assert.equal(await fileExists(path.join(targetRouteDir, 'images', 'work', 'shared.jpg')), false);
-		assert.equal(await fileExists(path.join(sourceRouteDir, 'images', 'old', 'shared.jpg')), true);
+		assert.equal(await fileExists(path.join(targetPageDir, 'images', 'shared.jpg')), false);
+		assert.equal(await fileExists(path.join(sourcePageDir, 'images', 'shared.jpg')), true);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
@@ -883,11 +1095,13 @@ description: Fixture
 test('CLI content:sync refreshes generated images after moving a carousel image', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Sync Fixture
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Sync Fixture
+
 ## Work {#work}
 
 \`\`\`norna-image-carousel
@@ -897,42 +1111,49 @@ description: Fixture
   alt: Slide two
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'old'), { recursive: true });
-		await mkdir(path.join(siteDir, 'images', 'work'), { recursive: true });
-		await cp(path.join(fixtureSiteDir, 'images', 'intro', 'hero.jpg'), path.join(siteDir, 'images', 'old', 'slide-one.jpg'));
-		await cp(path.join(fixtureSiteDir, 'images', 'intro', 'detail.jpg'), path.join(siteDir, 'images', 'work', 'slide-two.jpg'), { force: true });
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'old'), { recursive: true });
+		await cp(path.join(fixtureSiteDir, 'pages', '000-home', 'images', 'hero.jpg'), path.join(siteDir, 'pages', '000-home', 'images', 'old', 'slide-one.jpg'));
+		await cp(path.join(fixtureSiteDir, 'pages', '000-home', 'images', 'detail.jpg'), path.join(siteDir, 'pages', '000-home', 'images', 'slide-two.jpg'), { force: true });
 
 		await runNorna(['--site-dir', siteDir, 'content:sync', '--yes']);
 
 		const manifest = JSON.parse(await readFile(path.join(siteDir, '.norna', 'generated-images.json'), 'utf8'));
-		assert.equal(await fileExists(path.join(siteDir, 'images', 'work', 'slide-one.jpg')), true);
-		assert.ok(manifest['images/work/slide-one.jpg']);
-		assert.ok(manifest['images/work/slide-two.jpg']);
+		assert.equal(await fileExists(path.join(siteDir, 'pages', '000-home', 'images', 'slide-one.jpg')), true);
+		assert.ok(manifest['pages/000-home/images/slide-one.jpg']);
+		assert.ok(manifest['pages/000-home/images/slide-two.jpg']);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('content:check fails when a level 2 section is missing an explicit id', async () => {
-	const { root, siteDir } = await createTempSite();
+test('automatic H2 and H3 ids render while explicit ids remain stable', async () => {
+	const { root, siteDir } = await createTempSite({ underRepoCache: true });
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Missing Id
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
-## Intro
+# Heading IDs
+
+## Café and **code**
+
+### More details
+
+Automatic identifiers.
 
-This section has no explicit id.
+## Renamed heading {#stable-id}
+
+Explicit identifier.
 `);
 
-		await assert.rejects(
-			() => runContentScript(siteDir, ['--check']),
-			(error) => {
-				assert.match(error.output, /Section heading "Intro" is missing an explicit id\./);
-				return true;
-			},
-		);
+		await runContentScript(siteDir, ['--check']);
+		await runNorna(['--site-dir', siteDir, 'build']);
+
+		const html = await readFile(path.join(root, 'dist', 'index.html'), 'utf8');
+		assert.match(html, /<h2 id="cafe-and-code">Café and <strong>code<\/strong><\/h2>/);
+		assert.match(html, /<h3 id="more-details">More details<\/h3>/);
+		assert.match(html, /<h2 id="stable-id">Renamed heading<\/h2>/);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
@@ -941,11 +1162,13 @@ This section has no explicit id.
 test('content:check fails for malformed Norna image blocks', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Malformed Block
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Malformed Block
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -969,13 +1192,15 @@ image hero.jpg
 test('content:check fails for unknown Norna block names', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await mkdir(path.join(siteDir, 'images', 'plain'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'plain', 'image.jpg'), 'fixture image');
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Unknown Block
-description: Fixture
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'plain'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'plain', 'image.jpg'), 'fixture image');
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Unknown Block
+
 ## Plain {#plain}
 
 \`\`\`norna-gallery-stack
@@ -1000,11 +1225,13 @@ description: Fixture
 test('content:check rejects the removed norna-note block', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Removed note block
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Removed note block
+
 ## Intro {#intro}
 
 \`\`\`norna-note
@@ -1027,13 +1254,15 @@ This block is no longer supported.
 test('content:check supports tilde fenced Norna blocks', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await mkdir(path.join(siteDir, 'images', 'intro'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'intro', 'hero.jpg'), 'fixture image');
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Tilde Fence
-description: Fixture
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'hero.jpg'), 'fixture image');
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Tilde Fence
+
 ## Intro {#intro}
 
 ~~~norna-image-stack
@@ -1051,11 +1280,13 @@ description: Fixture
 test('content:check ignores Norna blocks shown inside longer code fences', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Code Example
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Code Example
+
 ## Intro {#intro}
 
 \`\`\`\`md
@@ -1075,11 +1306,13 @@ description: Fixture
 test('content:check fails for likely Norna block names outside fences', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Missing Fence
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Missing Fence
+
 ## Intro {#intro}
 
 norna-image-stack
@@ -1102,11 +1335,13 @@ norna-image-stack
 test('content:check fails for short Norna block fences', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Short Fence
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Short Fence
+
 ## Intro {#intro}
 
 \`\`norna-image-stack
@@ -1130,11 +1365,13 @@ description: Fixture
 test('content:check fails for unclosed Norna blocks', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Unclosed Fence
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Unclosed Fence
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -1158,11 +1395,13 @@ description: Fixture
 test('content:check continues after malformed Norna blocks', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Multiple Issues
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Multiple Issues
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -1187,8 +1426,8 @@ image broken.jpg
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
 				assert.match(error.output, /Invalid norna-image-stack entry "image broken\.jpg"\. Start each image with "- image: filename\.jpg"\./);
-				assert.match(error.output, /Image "missing-intro\.jpg" does not exist at .*site\/images\/intro\/missing-intro\.jpg or anywhere under any page or route image root\./);
-				assert.match(error.output, /Image "missing-more\.jpg" does not exist at .*site\/images\/more\/missing-more\.jpg or anywhere under any page or route image root\./);
+				assert.match(error.output, /Image "missing-intro\.jpg" does not exist at .*site\/pages\/000-home\/images\/missing-intro\.jpg or anywhere under any page image root\./);
+				assert.match(error.output, /Image "missing-more\.jpg" does not exist at .*site\/pages\/000-home\/images\/missing-more\.jpg or anywhere under any page image root\./);
 				return true;
 			},
 		);
@@ -1200,13 +1439,15 @@ image broken.jpg
 test('content:check allows Norna images without alt text', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await mkdir(path.join(siteDir, 'images', 'intro'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'intro', 'hero.jpg'), 'fixture image');
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Missing Alt
-description: Fixture
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'hero.jpg'), 'fixture image');
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Missing Alt
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -1224,11 +1465,13 @@ description: Fixture
 test('content:check reports single-image carousel and missing file together', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Beginner Errors
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Beginner Errors
+
 ## Plain {#plain}
 
 \`\`\`norna-image-carousel
@@ -1240,7 +1483,7 @@ description: Fixture
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
 				assert.match(error.output, /norna-image-carousel on line \d+ contains 1 image\. A carousel needs at least two images\./);
-				assert.match(error.output, /Image "foo\.jpg" does not exist at .*site\/images\/plain\/foo\.jpg or anywhere under any page or route image root\./);
+				assert.match(error.output, /Image "foo\.jpg" does not exist at .*site\/pages\/000-home\/images\/foo\.jpg or anywhere under any page image root\./);
 				return true;
 			},
 		);
@@ -1252,11 +1495,13 @@ description: Fixture
 test('content:check fails when a Norna-managed image file is missing', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Missing Image
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Missing Image
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -1268,7 +1513,7 @@ description: Fixture
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
-				assert.match(error.output, /Image "missing\.jpg" does not exist at .*site\/images\/intro\/missing\.jpg or anywhere under any page or route image root\./);
+				assert.match(error.output, /Image "missing\.jpg" does not exist at .*site\/pages\/000-home\/images\/missing\.jpg or anywhere under any page image root\./);
 				return true;
 			},
 		);
@@ -1280,11 +1525,13 @@ description: Fixture
 test('content:check fails when a page repeats a section id', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Duplicate Section
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Duplicate Section
+
 ## Intro {#intro}
 
 First.
@@ -1297,7 +1544,7 @@ Second.
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
-				assert.match(error.output, /Duplicate Markdown section heading id "intro"\./);
+				assert.match(error.output, /Two headings resolve to id "intro"\./);
 				return true;
 			},
 		);
@@ -1306,16 +1553,51 @@ Second.
 	}
 });
 
-test('content:check fails when section metadata has no Markdown section', async () => {
+test('content:check reports collisions between automatic H2 and H3 ids', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Orphaned Metadata
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
+---
+
+# Automatic collision
+
+## Förstå
+
+Section text.
+
+### Forsta
+
+Topic text.
+`);
+
+		await assert.rejects(
+			() => runContentScript(siteDir, ['--check']),
+			(error) => {
+				assert.match(error.output, /Two headings resolve to id "forsta"\./);
+				assert.match(error.output, /The other heading is on line \d+\./);
+				assert.match(error.output, /Add a unique explicit id to at least one heading/);
+				return true;
+			},
+		);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test('content:check rejects removed sections frontmatter', async () => {
+	const { root, siteDir } = await createTempSite();
+	try {
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 sections:
-  missing: {}
+  intro: {}
 ---
 
+# Removed Section Metadata
+
 ## Intro {#intro}
 
 Text.
@@ -1324,7 +1606,7 @@ Text.
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--check']),
 			(error) => {
-				assert.match(error.output, /Section metadata "missing" does not match any Markdown section\./);
+				assert.match(error.output, /defines "sections" at the top level, but it is not a valid top-level content field\./);
 				return true;
 			},
 		);
@@ -1336,11 +1618,13 @@ Text.
 test('content:sync refuses ambiguous image relocation', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Ambiguous Move
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Ambiguous Move
+
 ## Work {#work}
 
 \`\`\`norna-image-stack
@@ -1348,37 +1632,39 @@ description: Fixture
   alt: Shared
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'old-a'), { recursive: true });
-		await mkdir(path.join(siteDir, 'images', 'old-b'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'old-a', 'shared.jpg'), 'a');
-		await writeFile(path.join(siteDir, 'images', 'old-b', 'shared.jpg'), 'b');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'old-a'), { recursive: true });
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'old-b'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'old-a', 'shared.jpg'), 'a');
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'old-b', 'shared.jpg'), 'b');
 
 		await assert.rejects(
 			() => runContentScript(siteDir, ['--write', '--yes']),
 			(error) => {
 				assert.match(error.output, /Cannot relocate "shared\.jpg"\. Multiple files with this filename were found:/);
-				assert.match(error.output, /site\/images\/old-a\/shared\.jpg/);
-				assert.match(error.output, /site\/images\/old-b\/shared\.jpg/);
+				assert.match(error.output, /site\/pages\/000-home\/images\/old-a\/shared\.jpg/);
+				assert.match(error.output, /site\/pages\/000-home\/images\/old-b\/shared\.jpg/);
 				return true;
 			},
 		);
 
-		assert.equal(await fileExists(path.join(siteDir, 'images', 'work', 'shared.jpg')), false);
-		assert.equal(await fileExists(path.join(siteDir, 'images', 'old-a', 'shared.jpg')), true);
-		assert.equal(await fileExists(path.join(siteDir, 'images', 'old-b', 'shared.jpg')), true);
+		assert.equal(await fileExists(path.join(siteDir, 'pages', '000-home', 'images', 'shared.jpg')), false);
+		assert.equal(await fileExists(path.join(siteDir, 'pages', '000-home', 'images', 'old-a', 'shared.jpg')), true);
+		assert.equal(await fileExists(path.join(siteDir, 'pages', '000-home', 'images', 'old-b', 'shared.jpg')), true);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}
 });
 
-test('content:sync refuses to move an image still referenced by its current section', async () => {
+test('content:sync moves one page-local image once when multiple sections reference it', async () => {
 	const { root, siteDir } = await createTempSite();
 	try {
-		await writeFile(path.join(siteDir, 'content.md'), `---
-title: Copied Image Reference
-description: Fixture
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'content.md'), `---
+page:
+  description: Fixture
 ---
 
+# Copied Image Reference
+
 ## Intro {#intro}
 
 \`\`\`norna-image-stack
@@ -1393,19 +1679,14 @@ description: Fixture
   alt: Shared copy
 \`\`\`
 `);
-		await mkdir(path.join(siteDir, 'images', 'intro'), { recursive: true });
-		await writeFile(path.join(siteDir, 'images', 'intro', 'shared.jpg'), 'shared image');
+		await mkdir(path.join(siteDir, 'pages', '000-home', 'images', 'intro'), { recursive: true });
+		await writeFile(path.join(siteDir, 'pages', '000-home', 'images', 'intro', 'shared.jpg'), 'shared image');
 
-		await assert.rejects(
-			() => runContentScript(siteDir, ['--write', '--yes']),
-			(error) => {
-				assert.match(error.output, /Cannot relocate "shared\.jpg" from .*site\/images\/intro\/shared\.jpg because it is still referenced from .*site\/content\.md \[intro\]\./);
-				return true;
-			},
-		);
+		await runContentScript(siteDir, ['--write', '--yes']);
 
-		assert.equal(await fileExists(path.join(siteDir, 'images', 'intro', 'shared.jpg')), true);
-		assert.equal(await fileExists(path.join(siteDir, 'images', 'plain', 'shared.jpg')), false);
+		assert.equal(await fileExists(path.join(siteDir, 'pages', '000-home', 'images', 'intro', 'shared.jpg')), false);
+		assert.equal(await fileExists(path.join(siteDir, 'pages', '000-home', 'images', 'shared.jpg')), true);
+		await runContentScript(siteDir, ['--check']);
 	} finally {
 		await rm(root, { recursive: true, force: true });
 	}