From 41d783abf0b4efbc71cbe7fa507569dc3659b9bc Mon Sep 17 00:00:00 2001
From: Madraka <8898640+Madraka@users.noreply.github.com>
Date: Thu, 12 Nov 2026 12:42:17 +0300
Subject: [PATCH 1/2] feat(astro-renderer,core-ts): resolve reference and
 repeater fields (RFC-0045 step 3a)

- entryFields: reference cards (ReferencedEntry) by pickMember among the members the
  view shows, depth 1 by default and 2 at most, breadth-first over a visited set of
  groups (one groupMembers call per level), within the request's 200-target budget
  (PlaceholderBudget.references, one console.warn); repeater items rendered like fields;
  unresolved targets leave no id, title or empty item
- GraphSource.groupMembers / referencedBy / conversionEntries on both sources: the
  snapshot answers from gate-independent indexes filtered per view (no store reads);
  the live source reads entry_refs by (site_id, target_id) expanded by the shared rule
  and resolves each candidate like the snapshot index
- core-ts: getGroupMembers and referrerCandidates (shared suite on SQLite, D1 and DO
  SQLite), the conversion-map builder, resolveFields' optional conversion context
- EntryFields.astro: links for references, a nested dl per repeater item
- site Worker features: { gates: 2, fields: 2 }
- tests: live vs snapshot cards and referencedBy (editions, translations' own localized
  values), gate instants, depth, cycles and budget, the route sweep extension, and the
  frozen theme-v0.8.0 copy in old-theme-compat

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Madraka <8898640+Madraka@users.noreply.github.com>
---
 .changeset/rfc45-step3a-renderer.md           |  16 +
 packages/astro-renderer/README.md             |  14 +
 .../astro-renderer/src/cloudflare-entry.ts    |   9 +-
 .../src/components/EntryFields.astro          |  24 +-
 packages/astro-renderer/src/fields.ts         | 263 ++++++++--
 packages/astro-renderer/src/live-source.ts    |  47 +-
 packages/astro-renderer/src/media.ts          |  17 +-
 .../src/reference-conversions.ts              |  71 +++
 packages/astro-renderer/src/references.ts     | 305 +++++++++++
 packages/astro-renderer/src/source.ts         |  64 ++-
 .../astro-renderer/test/references-fixture.ts | 219 ++++++++
 .../test/references-sweep.test.ts             | 165 ++++++
 .../astro-renderer/test/references.test.ts    | 278 ++++++++++
 packages/astro-renderer/test/sweep.ts         |  15 +-
 packages/cli/test/cloudflare-gates.test.ts    |   7 +-
 .../cli/test/fixtures/theme-v0.8.0/README.md  |   7 +
 .../test/fixtures/theme-v0.8.0/src/DESIGN.md  |  42 ++
 .../test/fixtures/theme-v0.8.0/src/blocks.ts  |  45 ++
 .../theme-v0.8.0/src/components/Archive.astro | 108 ++++
 .../theme-v0.8.0/src/components/Article.astro | 110 ++++
 .../src/components/Breadcrumbs.astro          |  25 +
 .../src/components/EntryList.astro            |  54 ++
 .../src/components/LatestPosts.astro          |  30 ++
 .../src/components/MenuPanel.astro            |  46 ++
 .../theme-v0.8.0/src/components/NavLink.astro |  27 +
 .../theme-v0.8.0/src/components/NavMenu.astro |  95 ++++
 .../src/components/NotFound.astro             |  27 +
 .../src/components/PostTerms.astro            |  33 ++
 .../src/components/RelatedPosts.astro         |  20 +
 .../theme-v0.8.0/src/components/Search.astro  |  57 +++
 .../src/components/SearchDialog.astro         |  46 ++
 .../src/components/blocks/Testimonial.astro   |  18 +
 .../test/fixtures/theme-v0.8.0/src/env.d.ts   |   5 +
 .../test/fixtures/theme-v0.8.0/src/fonts.ts   |  31 ++
 .../test/fixtures/theme-v0.8.0/src/icons.ts   |  12 +
 .../theme-v0.8.0/src/layouts/Base.astro       | 426 +++++++++++++++
 .../fixtures/theme-v0.8.0/src/middleware.ts   |   2 +
 .../theme-v0.8.0/src/pages/[...path].astro    | 484 ++++++++++++++++++
 .../src/pages/[...path]/llms.txt.ts           |  41 ++
 .../src/pages/[...path]/rss.xml.ts            |  96 ++++
 .../src/pages/[...path]/search.json.ts        |  23 +
 .../theme-v0.8.0/src/pages/llms.txt.ts        |  22 +
 .../theme-v0.8.0/src/pages/robots.txt.ts      |  13 +
 .../theme-v0.8.0/src/pages/rss.xml.ts         |  26 +
 .../theme-v0.8.0/src/pages/search.json.ts     |  21 +
 .../theme-v0.8.0/src/pages/sitemap.xml.ts     |  24 +
 .../fixtures/theme-v0.8.0/src/settings.ts     | 312 +++++++++++
 .../test/fixtures/theme-v0.8.0/src/strings.ts | 279 ++++++++++
 .../src/styles/features/ambient.css           | 185 +++++++
 .../src/styles/features/article.css           | 215 ++++++++
 .../src/styles/features/blocks.css            |  93 ++++
 .../src/styles/features/carousel.css          | 266 ++++++++++
 .../src/styles/features/chrome-menus.css      | 264 ++++++++++
 .../src/styles/features/chrome.css            | 193 +++++++
 .../src/styles/features/comments.css          |  75 +++
 .../src/styles/features/icons.css             |  70 +++
 .../src/styles/features/languages.css         |  34 ++
 .../src/styles/features/live-surfaces.css     | 238 +++++++++
 .../src/styles/features/motion-effects.css    | 217 ++++++++
 .../src/styles/features/motion-scroll.css     | 309 +++++++++++
 .../src/styles/features/motion.css            | 254 +++++++++
 .../src/styles/features/overlays.css          | 324 ++++++++++++
 .../src/styles/features/prose.css             | 140 +++++
 .../src/styles/features/search-dialog.css     | 144 ++++++
 .../src/styles/features/search.css            |  59 +++
 .../src/styles/features/surface-media.css     | 123 +++++
 .../src/styles/features/surfaces.css          | 310 +++++++++++
 .../src/styles/features/tokens.css            | 113 ++++
 .../src/styles/font-fallbacks.css             |  53 ++
 .../theme-v0.8.0/src/styles/fonts.css         | 113 ++++
 .../theme-v0.8.0/src/styles/global.css        |  31 ++
 .../test/fixtures/theme-v0.8.0/src/theme.ts   |  49 ++
 packages/cli/test/old-theme-compat.test.ts    |  79 ++-
 packages/core-ts/src/fields/conversions.ts    |   6 +
 packages/core-ts/src/fields/index.ts          |   7 +
 packages/core-ts/src/fields/resolve.ts        |  11 +-
 packages/core-ts/src/index.ts                 |   5 +
 .../core-ts/src/references/conversion-maps.ts |  86 ++++
 packages/core-ts/src/references/reads.ts      |  97 ++++
 .../core-ts/src/testing-reference-reads.ts    | 155 ++++++
 packages/core-ts/src/testing.ts               |   2 +
 81 files changed, 8354 insertions(+), 87 deletions(-)
 create mode 100644 .changeset/rfc45-step3a-renderer.md
 create mode 100644 packages/astro-renderer/src/reference-conversions.ts
 create mode 100644 packages/astro-renderer/src/references.ts
 create mode 100644 packages/astro-renderer/test/references-fixture.ts
 create mode 100644 packages/astro-renderer/test/references-sweep.test.ts
 create mode 100644 packages/astro-renderer/test/references.test.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/README.md
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/DESIGN.md
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/blocks.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/Archive.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/Article.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/Breadcrumbs.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/EntryList.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/LatestPosts.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/MenuPanel.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/NavLink.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/NavMenu.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/NotFound.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/PostTerms.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/RelatedPosts.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/Search.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/SearchDialog.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/components/blocks/Testimonial.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/env.d.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/fonts.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/icons.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/layouts/Base.astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/middleware.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path].astro
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/llms.txt.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/rss.xml.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/search.json.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/llms.txt.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/robots.txt.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/rss.xml.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/search.json.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/pages/sitemap.xml.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/settings.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/strings.ts
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/ambient.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/article.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/blocks.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/carousel.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome-menus.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/comments.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/icons.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/languages.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/live-surfaces.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-effects.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-scroll.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/overlays.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/prose.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search-dialog.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surface-media.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surfaces.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/tokens.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/font-fallbacks.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/fonts.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/styles/global.css
 create mode 100644 packages/cli/test/fixtures/theme-v0.8.0/src/theme.ts
 create mode 100644 packages/core-ts/src/references/conversion-maps.ts
 create mode 100644 packages/core-ts/src/references/reads.ts
 create mode 100644 packages/core-ts/src/testing-reference-reads.ts

diff --git a/.changeset/rfc45-step3a-renderer.md b/.changeset/rfc45-step3a-renderer.md
new file mode 100644
index 00000000..0fb2c28f
--- /dev/null
+++ b/.changeset/rfc45-step3a-renderer.md
@@ -0,0 +1,16 @@
+---
+"@cloudhal/astro-renderer": minor
+"@cloudhal/core-ts": patch
+---
+
+RFC-0045 rollout step 3a: the renderer resolves reference and repeater fields. Both types stay refused on every write path until rollout step 7, so nothing changes for existing sites.
+
+- **`@cloudhal/astro-renderer`.**
+  - `entryFields` resolves a reference to cards (`RenderedField.references`: `ReferencedEntry` with group id, id, collection, locale, slug, title, summary, URL, cover image and `fromFallbackLocale`), in stored order, by `pickMember`'s locale rule among the members the source's view shows, gates included. `depth: 2` adds each card's own fields, with their references as cards without fields. Resolution is breadth-first over a visited set of groups, one `groupMembers` call per level, and spends the request's 200 targets (`PlaceholderBudget.references`; `placeholderBudget()` includes it); past the budget the rest resolve to nothing, with one `console.warn` per request.
+  - A repeater renders its items' sub-fields (`RenderedField.items`), like fields; empty items are left out.
+  - An unresolved target leaves nothing behind: no id, no title, no empty item. `value` keeps only the resolved group ids.
+  - `GraphSource.groupMembers?` and `GraphSource.referencedBy?` on `SnapshotSource` (in memory: gate-independent indexes built once per snapshot, filtered per view) and `LiveSource` (one `entry_refs` read expanded by the `shared` rule, each candidate resolved like the snapshot's index). `referencedBy` lists entries whose resolved values name the group, newest first, at most 100.
+  - `GraphSource.conversionEntries?` builds the entry maps of a text ↔ reference conversion while one runs (rollout step 4 adds the conversions).
+  - `EntryFields.astro` draws references as links (`lang` on a fallback-locale card, a `ul.ch-references` for several) and repeaters as an `ol.ch-items` of nested `dl`s. Old theme copies get both with no change of their own.
+  - The site Worker's `GET /__cloudhal/features` answers `{ "gates": 2, "fields": 2 }`.
+- **`@cloudhal/core-ts`.** `getGroupMembers` and `referrerCandidates` (the live renderer's reads, by `site_id`); `conversionEntries`, `conversionTargets`, `conversionCollections` and `foldText` in `./fields`; `resolveFields` takes an optional fourth argument with the conversion maps (`ConvertContext.entries`).
diff --git a/packages/astro-renderer/README.md b/packages/astro-renderer/README.md
index bc22f5c7..d8b572d8 100644
--- a/packages/astro-renderer/README.md
+++ b/packages/astro-renderer/README.md
@@ -69,6 +69,20 @@ Guide: [`docs/guides/structured-data.md`](../../docs/guides/structured-data.md).
 
 Derived gates: `unlist` keeps an entry's page (200), comments and menu links but leaves `entries()`, `allEntries()`, `entriesByFilter`/`entriesByTerm` (archives, related), feeds, the sitemap and search; `hide` is a 404 like an expired `availability`. Both sources apply them, the gate index caps the edge cache at every derived instant and at every value instant of date/datetime list fields (for `now` conditions), and previews ignore them with an "Ended on …" notice. The site Worker's `GET /__cloudhal/features` answers `{ "gates": 2 }`; writers refuse `expiry` until it does.
 
+### References and repeaters (RFC-0045, rollout step 3)
+Additive, and dormant until rollout step 7 lets sites define the two types. `entryFields` (and `source.entryFields`) resolve a `reference` to cards of the targets the page's *view* shows (gates applied at its instant; draft, archived, embargoed and hidden targets resolve to nothing and leave no id, title or empty item) and a `repeater` to its items. `EntryFields.astro` draws both, so old theme copies show them with no change of their own (`theme-v0.8.0` in the compat test).
+
+| Export | Signature |
+|---|---|
+| `RenderedField.references?` | `ReferencedEntry[]`: `{ groupId, id, collection, locale, slug, title, summary?, url, image?, fromFallbackLocale, fields? }` in stored order; the member in the page's locale, else the default locale's under `localization.fallback: default-with-notice` (flagged: set `lang`) |
+| `RenderedField.items?` | `RenderedFields[]`: each repeater item's sub-fields, rendered like fields; empty items left out |
+| `EntryFieldsOptions.depth?` | `1` (default): cards; `2`: each card's own `fields`, with *their* references as cards without fields |
+| `GraphSource.groupMembers?` | `(groupIds) => Promise<Map<string, ContentEntry[]>>`: the members this view shows, by group (snapshot: in memory; live: one store read per call) |
+| `GraphSource.referencedBy?` | `(groupId, { collection?, field?, locale?, limit? }) => Promise<ContentEntry[]>`: entries this view lists whose resolved values name the group (a translation inheriting its original's value included), newest first, at most 100 |
+| `PlaceholderBudget.references?` | the request's resolved-target allowance (200, in `placeholderBudget()`); past it targets resolve to nothing, with one `console.warn` |
+
+Resolution is breadth-first over a visited set of groups, one `groupMembers` call per level, so cycles cost nothing. A "used by" list drawn from `referencedBy` is purged with the target's page when a referrer appears, goes or changes (the purge planner reads snapshot bodies, rollout step 3b); drawing *those* entries' fields is outside that guarantee. The site Worker's `GET /__cloudhal/features` answers `{ "gates": 2, "fields": 2 }`.
+
 ## Site analytics (RFC-0006)
 
 The renderer carries the site side of Cloudhal's cookie-less analytics (`@cloudhal/analytics`):
diff --git a/packages/astro-renderer/src/cloudflare-entry.ts b/packages/astro-renderer/src/cloudflare-entry.ts
index fb7a66bc..741c53fb 100644
--- a/packages/astro-renderer/src/cloudflare-entry.ts
+++ b/packages/astro-renderer/src/cloudflare-entry.ts
@@ -60,6 +60,7 @@ import {
 } from "@cloudhal/astro-renderer/runtime";
 import { SqlCommentStore } from "@cloudhal/comments/sql";
 import { GATES_FEATURE_VERSION } from "@cloudhal/core-ts/availability";
+import { FIELDS_FEATURE_VERSION } from "@cloudhal/core-ts/fields";
 import { D1Driver } from "@cloudhal/storage/d1";
 import {
   ANALYTICS_BEACON_PATH,
@@ -277,7 +278,8 @@ function fromAdmin(request: Request, env: Env): boolean {
 
 /**
  * What this site Worker enforces (RFC-0008 §7.6–§7.7): the admin Worker asks before it lets anyone
- * write time gates. Authenticated like the purge (it is not a public endpoint), never cached.
+ * write time gates, and (RFC-0045 §1, `fields: 2`) reference and repeater fields, which this
+ * renderer resolves. Authenticated like the purge (it is not a public endpoint), never cached.
  */
 function features(request: Request, env: Env): Response {
   const headers = { "cache-control": "no-store", "cloudflare-cdn-cache-control": "no-store" };
@@ -288,7 +290,10 @@ function features(request: Request, env: Env): Response {
     });
   if (!fromAdmin(request, env))
     return Response.json({ error: "unauthorized" }, { status: 401, headers });
-  return Response.json({ gates: GATES_FEATURE_VERSION }, { headers });
+  return Response.json(
+    { gates: GATES_FEATURE_VERSION, fields: FIELDS_FEATURE_VERSION },
+    { headers },
+  );
 }
 
 /**
diff --git a/packages/astro-renderer/src/components/EntryFields.astro b/packages/astro-renderer/src/components/EntryFields.astro
index fce66ffd..0535e932 100644
--- a/packages/astro-renderer/src/components/EntryFields.astro
+++ b/packages/astro-renderer/src/components/EntryFields.astro
@@ -5,10 +5,14 @@
  * `source.entryFields(entry, { locale, media })` (or `entryFields(source, entry, …)`) returns.
  *
  * Values are escaped text, except rich text (the body's markdown pipeline: raw HTML escaped, links
- * through `safeHref`) and images (`imageAttributes`, the asset's alt in the page's language). No
- * styles of its own: themes style `.ch-fields`, `.ch-field[data-type]` and `[data-field="<key>"]`.
+ * through `safeHref`) and images (`imageAttributes`, the asset's alt in the page's language).
+ * RFC-0045: a reference is a link to each target the page's view shows (`lang` on a card from the
+ * fallback locale; several in a list), a repeater a nested `dl` per item with something to show.
+ * Unresolved targets leave nothing: no id, no attribute, no empty link. No styles of its own:
+ * themes style `.ch-fields`, `.ch-field[data-type]`, `[data-field="<key>"]`, `.ch-references` and
+ * `.ch-items`.
  */
-import type { RenderedFields } from "../fields.ts";
+import type { RenderedField, RenderedFields } from "../fields.ts";
 
 interface Props {
   fields: RenderedFields;
@@ -19,14 +23,24 @@ interface Props {
 }
 const { fields, label, class: className } = Astro.props;
 const shown = Object.values(fields).filter((f) => !f.empty);
-const multiline = (f: (typeof shown)[number]) => f.def.type === "text" && f.def.multiline === true;
+const multiline = (f: RenderedField) => f.def.type === "text" && f.def.multiline === true;
+const langOf = (c: { fromFallbackLocale: boolean; locale: string }) =>
+  c.fromFallbackLocale ? c.locale : undefined;
 ---
 {shown.length > 0 && (
   <dl class:list={["ch-fields", className]} aria-label={label}>
     {shown.map((f) => (
       <div class="ch-field" data-field={f.key} data-type={f.def.type} data-multiline={multiline(f) ? "" : undefined} data-from-original={f.fromOriginal ? "" : undefined}>
         <dt>{f.label}</dt>
-        {f.html !== undefined ? (
+        {f.references !== undefined ? (
+          f.references.length === 1 && !Array.isArray(f.value) ? (
+            <dd><a href={f.references[0]?.url} lang={f.references[0] && langOf(f.references[0])}>{f.references[0]?.title}</a></dd>
+          ) : (
+            <dd><ul class="ch-references">{f.references.map((c) => <li><a href={c.url} lang={langOf(c)}>{c.title}</a></li>)}</ul></dd>
+          )
+        ) : f.items !== undefined ? (
+          <dd><ol class="ch-items">{f.items.map((item) => <li><Astro.self fields={item} /></li>)}</ol></dd>
+        ) : f.html !== undefined ? (
           <dd set:html={f.html} />
         ) : f.href !== undefined ? (
           <dd><a href={f.href}>{f.text}</a></dd>
diff --git a/packages/astro-renderer/src/fields.ts b/packages/astro-renderer/src/fields.ts
index 41d44dbb..477fdab9 100644
--- a/packages/astro-renderer/src/fields.ts
+++ b/packages/astro-renderer/src/fields.ts
@@ -8,12 +8,16 @@
  *   `asset:` references resolved), never stored HTML;
  * - URLs: through `safeHref`, dropped when unsafe;
  * - images: `<img>` attributes from `imageAttributes`, with the asset's alt in the page's language;
- * - everything else: `formatFieldValue` text, which themes print escaped.
+ * - everything else: `formatFieldValue` text, which themes print escaped;
+ * - RFC-0045: references as cards of the targets this view shows (`references`, depth 1 by
+ *   default, 2 at most, within a per-request budget), repeaters as their items' sub-fields
+ *   (`items`). An unresolved target leaves nothing behind: no id, no title, no empty item.
  *
  * Worker-safe; the same function serves live and snapshot sources.
  */
-import type { Asset, ContentEntry, Site } from "@cloudhal/core-contracts";
+import type { Asset, ContentEntry, FieldDefinition, Site } from "@cloudhal/core-contracts";
 import {
+  type ConversionEntries,
   type FormatFieldOptions,
   fieldHelp,
   fieldLabel,
@@ -21,10 +25,19 @@ import {
   hasFieldValue,
   type ResolvedField,
   type ResolvedFields,
+  referenceUses,
   resolveFields,
 } from "@cloudhal/core-ts/fields";
 import { renderMarkdown } from "./markdown.ts";
-import { type ImageAttributes, imageAttributes, type MediaContext } from "./media.ts";
+import {
+  type ImageAttributes,
+  imageAttributes,
+  type MediaContext,
+  type PlaceholderBudget,
+  REFERENCE_BUDGET,
+} from "./media.ts";
+import { conversionsFor } from "./reference-conversions.ts";
+import { type ReferencedEntry, referenceCards } from "./references.ts";
 import { safeHref } from "./safe-urls.ts";
 
 export {
@@ -37,6 +50,7 @@ export {
   type ResolvedFields,
   resolveFields,
 } from "@cloudhal/core-ts/fields";
+export type { ReferencedEntry } from "./references.ts";
 
 /** An image field's picture: `<img>` attributes plus the asset it shows. */
 export interface FieldImage extends ImageAttributes {
@@ -49,7 +63,7 @@ export interface RenderedField extends ResolvedField {
   /** The label in the page's language (then the site's default, then any, then the key). */
   label: string;
   help?: string;
-  /** Nothing to show: no value, an unreadable one, an unsafe URL or a missing image. */
+  /** Nothing to show: no value, an unreadable one, an unsafe URL, a missing image or target. */
   empty: boolean;
   /** The value as plain text in the page's language ("" when empty). Print it escaped. */
   text: string;
@@ -61,6 +75,10 @@ export interface RenderedField extends ResolvedField {
   image?: FieldImage;
   /** `date` (`YYYY-MM-DD`) and `datetime` (the UTC instant): for `<time datetime>`. */
   datetime?: string;
+  /** RFC-0045 `reference`: the targets this view shows, in stored order (unresolved ones left out). */
+  references?: ReferencedEntry[];
+  /** RFC-0045 `repeater`: each item's sub-fields, rendered like fields (empty items left out). */
+  items?: RenderedFields[];
 }
 
 /** Every defined field of an entry by key, in definition order (`{}` without definitions). */
@@ -77,6 +95,11 @@ export interface EntryFieldsOptions {
   words?: FormatFieldOptions["words"];
   /** `sizes` for image fields (default: the article column). */
   sizes?: string;
+  /**
+   * RFC-0045 §4: 1 (default) resolves references to cards; 2 adds each card's own fields, with
+   * *their* references as cards without fields.
+   */
+  depth?: 1 | 2;
 }
 
 /** What `entryFields` needs from a source: the site, the original by id, assets by id. */
@@ -84,6 +107,10 @@ export interface FieldsSource {
   site(): Promise<Site>;
   entryById?(id: string): Promise<ContentEntry | undefined>;
   asset?(id: string): Promise<Asset | undefined>;
+  /** RFC-0045 §4: the members of groups this view shows (absent: references resolve to nothing). */
+  groupMembers?(groupIds: readonly string[]): Promise<Map<string, ContentEntry[]>>;
+  /** RFC-0045 §7: the entry maps of a running text ↔ reference conversion in a collection. */
+  conversionEntries?(collection: string): Promise<ConversionEntries | undefined>;
 }
 
 export interface RenderFieldsOptions extends EntryFieldsOptions {
@@ -91,9 +118,12 @@ export interface RenderFieldsOptions extends EntryFieldsOptions {
   defaultLocale: string;
   /** Assets by id (image fields; rich text's `asset:` links when `media.assets` is absent). */
   assets?: ReadonlyMap<string, Asset> | undefined;
+  /** RFC-0045: resolved reference targets by value path (`fields/venue`, `fields/speakers/0/person`). */
+  cards?: ReadonlyMap<string, ReferencedEntry> | undefined;
 }
 
 const SIZES = "(min-width: 48rem) 48rem, 100vw";
+const CARD_SIZES = "(min-width: 48rem) 24rem, 50vw";
 
 /** A translation in this site reads its group's original (RFC-0041 §5). */
 function originalId(entry: ContentEntry): string | undefined {
@@ -101,14 +131,35 @@ function originalId(entry: ContentEntry): string | undefined {
   return t && t.group !== entry.id && t.source?.siteId === undefined ? t.group : undefined;
 }
 
-function shape(field: ResolvedField, o: RenderFieldsOptions): Partial<RenderedField> {
-  const { def, value } = field;
-  const ctx: MediaContext = {
+function mediaOf(o: RenderFieldsOptions): MediaContext {
+  return {
     ...o.media,
     locale: o.locale,
     defaultLocale: o.defaultLocale,
     assets: o.media?.assets ?? o.assets,
   };
+}
+
+function picture(
+  asset: Asset,
+  ref: ContentEntry["coverImage"],
+  o: RenderFieldsOptions & { sizes: string },
+): FieldImage {
+  const ctx = mediaOf(o);
+  const image = imageAttributes(asset, ref, {
+    locale: o.locale,
+    defaultLocale: o.defaultLocale,
+    transform: ctx.transform ?? "none",
+    sizes: o.sizes,
+    ...(ctx.preview ? { preview: true } : {}),
+    ...(ctx.budget ? { budget: ctx.budget } : {}),
+  });
+  return { ...image, assetId: asset.id };
+}
+
+function shape(field: ResolvedField, o: RenderFieldsOptions): Partial<RenderedField> {
+  const { def, value } = field;
+  const ctx = mediaOf(o);
   if (def.type === "richText" && typeof value === "string")
     return { html: renderMarkdown(value, ctx) };
   if (def.type === "url" && typeof value === "string") {
@@ -118,15 +169,8 @@ function shape(field: ResolvedField, o: RenderFieldsOptions): Partial<RenderedFi
   if (def.type === "image" && typeof value === "string") {
     const asset = ctx.assets?.get(value) ?? o.assets?.get(value);
     if (!asset?.mediaType.startsWith("image/")) return { empty: true };
-    const image = imageAttributes(asset, undefined, {
-      locale: o.locale,
-      defaultLocale: o.defaultLocale,
-      transform: ctx.transform ?? "none",
-      sizes: o.sizes ?? SIZES,
-      ...(ctx.preview ? { preview: true } : {}),
-      ...(ctx.budget ? { budget: ctx.budget } : {}),
-    });
-    return { image: { ...image, assetId: asset.id }, text: image.alt };
+    const image = picture(asset, undefined, { ...o, sizes: o.sizes ?? SIZES });
+    return { image, text: image.alt };
   }
   if (def.type === "date" && typeof value === "string") return { datetime: value };
   if (def.type === "datetime" && typeof value === "object" && value !== null)
@@ -134,40 +178,138 @@ function shape(field: ResolvedField, o: RenderFieldsOptions): Partial<RenderedFi
   return {};
 }
 
+/** A reference: the cards this view resolved, in stored order; nothing of the unresolved ones. */
+function referenceField(base: RenderedField, path: string, o: RenderFieldsOptions): RenderedField {
+  const uses = referenceUses(base.def, base.value, path);
+  const cards = uses.flatMap((u) => {
+    const card = o.cards?.get(u.path);
+    return card ? [card] : [];
+  });
+  if (cards.length === 0) return { ...base, value: undefined };
+  const ids = cards.map((c) => c.groupId);
+  return {
+    ...base,
+    value: Array.isArray(base.value) ? ids : ids[0],
+    empty: false,
+    text: cards.map((c) => c.title).join(", "),
+    references: cards,
+  };
+}
+
+/** A repeater sub-field read as a field (sub-fields take the repeater's localization). */
+const subField = (sub: { key: string }, parent: FieldDefinition): FieldDefinition =>
+  ({ ...sub, localized: parent.localized }) as FieldDefinition;
+
+/** A repeater: each item's sub-fields rendered like fields; items with nothing to show left out. */
+function repeaterField(base: RenderedField, path: string, o: RenderFieldsOptions): RenderedField {
+  const def = base.def;
+  if (def.type !== "repeater" || !Array.isArray(base.value)) return { ...base, value: undefined };
+  const items: RenderedFields[] = [];
+  const values: Record<string, unknown>[] = [];
+  base.value.forEach((item: unknown, i) => {
+    if (typeof item !== "object" || item === null || Array.isArray(item)) return;
+    const resolved: ResolvedFields = {};
+    for (const sub of def.fields) {
+      const value = Object.hasOwn(item, sub.key)
+        ? (item as Record<string, unknown>)[sub.key]
+        : undefined;
+      resolved[sub.key] = { def: subField(sub, def), value, fromOriginal: base.fromOriginal };
+    }
+    const rendered = renderAt(resolved, o, `${path}/${i}`);
+    if (!hasShownFields(rendered)) return;
+    items.push(rendered);
+    values.push(
+      Object.fromEntries(
+        Object.values(rendered).flatMap((f) => (f.empty ? [] : [[f.key, f.value]])),
+      ),
+    );
+  });
+  if (items.length === 0) return { ...base, value: undefined };
+  const line = (item: RenderedFields) =>
+    Object.values(item)
+      .filter((f) => !f.empty && f.text !== "")
+      .map((f) => f.text)
+      .join(", ");
+  return { ...base, value: values, empty: false, text: items.map(line).join("; "), items };
+}
+
+function renderOne(
+  key: string,
+  field: ResolvedField,
+  o: RenderFieldsOptions,
+  path: string,
+): RenderedField {
+  const help = fieldHelp(field.def, o.locale, o.defaultLocale);
+  const base: RenderedField = {
+    ...field,
+    key,
+    label: fieldLabel(field.def, o.locale, o.defaultLocale),
+    ...(help ? { help } : {}),
+    empty: true,
+    text: "",
+  };
+  if (!hasFieldValue(field.value)) return base;
+  if (field.def.type === "reference") return referenceField(base, path, o);
+  if (field.def.type === "repeater") return repeaterField(base, path, o);
+  const text = formatFieldValue(field.value, field.def, {
+    locale: o.locale,
+    defaultLocale: o.defaultLocale,
+    timeZone: o.timeZone,
+    words: o.words,
+  });
+  const shown: RenderedField = { ...base, empty: false, text, ...shape(field, o) };
+  return shown.empty ? { ...base, value: undefined } : shown;
+}
+
+function renderAt(resolved: ResolvedFields, o: RenderFieldsOptions, at: string): RenderedFields {
+  const out: RenderedFields = {};
+  for (const [key, field] of Object.entries(resolved))
+    out[key] = renderOne(key, field, o, `${at}/${key}`);
+  return out;
+}
+
 /** Resolved fields made ready to draw (pure; `entryFields` loads what it needs and calls this). */
 export function renderFields(resolved: ResolvedFields, o: RenderFieldsOptions): RenderedFields {
-  const out: RenderedFields = {};
-  for (const [key, field] of Object.entries(resolved)) {
-    const help = fieldHelp(field.def, o.locale, o.defaultLocale);
-    const base: RenderedField = {
-      ...field,
-      key,
-      label: fieldLabel(field.def, o.locale, o.defaultLocale),
-      ...(help ? { help } : {}),
-      empty: true,
-      text: "",
-    };
-    if (!hasFieldValue(field.value)) {
-      out[key] = base;
-      continue;
-    }
-    const text = formatFieldValue(field.value, field.def, {
-      locale: o.locale,
-      defaultLocale: o.defaultLocale,
-      timeZone: o.timeZone,
-      words: o.words,
-    });
-    const extra = shape(field, o);
-    const shown: RenderedField = { ...base, empty: false, text, ...extra };
-    out[key] = shown.empty ? { ...base, value: undefined } : shown;
+  return renderAt(resolved, o, "fields");
+}
+
+/** The assets image fields and repeater image sub-fields name, by id, that `media` lacks. */
+async function loadAssets(
+  source: FieldsSource,
+  resolved: ResolvedFields,
+  media: MediaContext | undefined,
+): Promise<Map<string, Asset>> {
+  const ids = new Set<string>();
+  for (const field of Object.values(resolved)) {
+    const { def, value } = field;
+    if (def.type === "image" && typeof value === "string") ids.add(value);
+    if (def.type !== "repeater" || !Array.isArray(value)) continue;
+    const images = def.fields.filter((s) => s.type === "image").map((s) => s.key);
+    for (const item of value as unknown[])
+      for (const k of images) {
+        const v = (item as Record<string, unknown> | null)?.[k];
+        if (typeof v === "string") ids.add(v);
+      }
+  }
+  const out = new Map<string, Asset>();
+  for (const id of ids) {
+    if (media?.assets?.has(id)) continue;
+    const asset = source.asset ? await source.asset(id) : undefined;
+    if (asset) out.set(id, asset);
   }
   return out;
 }
 
+/** The budget `entryFields` spends: the request's (`media.budget`), else one of its own. */
+function budgetOf(media: MediaContext | undefined): PlaceholderBudget {
+  return media?.budget ?? { left: 0, references: REFERENCE_BUDGET };
+}
+
 /**
  * An entry's typed fields as a theme draws them (RFC-0041 §9), from any source: loads the site,
  * the translation group's original when the entry is a translation in this site, and the assets
- * of image fields (from `media.assets` when given).
+ * of image fields (from `media.assets` when given). RFC-0045: references resolve through the
+ * source's `groupMembers` (one read per level), gated by the source's view.
  */
 export async function entryFields(
   source: FieldsSource,
@@ -178,21 +320,36 @@ export async function entryFields(
   if (!site.collections?.[entry.collection]?.fields) return {};
   const id = originalId(entry);
   const original = id && source.entryById ? await source.entryById(id) : undefined;
-  const resolved = resolveFields(site, entry, original);
-  const assets = new Map<string, Asset>();
-  for (const field of Object.values(resolved)) {
-    const v = field.value;
-    if (field.def.type !== "image" || typeof v !== "string" || options.media?.assets?.has(v))
-      continue;
-    const asset = source.asset ? await source.asset(v) : undefined;
-    if (asset) assets.set(v, asset);
-  }
-  return renderFields(resolved, {
+  const entries = await conversionsFor(source, site, entry.collection);
+  const resolved = resolveFields(site, entry, original, entries ? { entries } : undefined);
+  const base: RenderFieldsOptions = {
     ...options,
     locale: options.locale ?? entry.locale,
     defaultLocale: site.defaultLocale,
-    assets,
-  });
+  };
+  const render = async (r: ResolvedFields, cards: ReadonlyMap<string, ReferencedEntry>) =>
+    renderFields(r, { ...base, assets: await loadAssets(source, r, options.media), cards });
+  const cards = await referenceCards(
+    {
+      source,
+      site,
+      locale: base.locale,
+      depth: options.depth === 2 ? 2 : 1,
+      budget: budgetOf(options.media),
+      cover: async (member) => {
+        const ref = member.coverImage;
+        if (!ref?.assetId) return undefined;
+        const asset =
+          options.media?.assets?.get(ref.assetId) ??
+          (source.asset ? await source.asset(ref.assetId) : undefined);
+        if (!asset?.mediaType.startsWith("image/")) return undefined;
+        return picture(asset, ref, { ...base, sizes: CARD_SIZES });
+      },
+      render,
+    },
+    resolved,
+  );
+  return render(resolved, cards);
 }
 
 /** True when at least one field has something to show (themes skip the whole list otherwise). */
diff --git a/packages/astro-renderer/src/live-source.ts b/packages/astro-renderer/src/live-source.ts
index 7ffcb1ae..9025dbd6 100644
--- a/packages/astro-renderer/src/live-source.ts
+++ b/packages/astro-renderer/src/live-source.ts
@@ -9,9 +9,14 @@ import type {
   Term,
 } from "@cloudhal/core-contracts";
 import type { RedirectMatch, SearchResults, SiteGraphStore } from "@cloudhal/core-ts";
-import { searchDocuments, searchRows } from "@cloudhal/core-ts";
+import {
+  getGroupMembers,
+  referrerCandidates,
+  searchDocuments,
+  searchRows,
+} from "@cloudhal/core-ts";
 import { isAvailable, nextInstant } from "@cloudhal/core-ts/availability";
-import { derivedGates, hasExpiryRules } from "@cloudhal/core-ts/fields";
+import { type ConversionEntries, derivedGates, hasExpiryRules } from "@cloudhal/core-ts/fields";
 import { matches } from "@cloudhal/core-ts/filter";
 import {
   evaluateEntryQuery,
@@ -22,6 +27,8 @@ import {
 import { type EntrySplit, gateIndex, splitEntries } from "./entry-views.ts";
 import { type EntryFieldsOptions, entryFields, type RenderedFields } from "./fields.ts";
 import { type Navigation, type NavigationOptions, navigationFor } from "./navigation.ts";
+import { conversionMaps } from "./reference-conversions.ts";
+import { membersIn, type ReferencedByQuery, referrerRecords, referrersIn } from "./references.ts";
 import type { GraphSource, SourceSearchOptions } from "./source.ts";
 import { byNewest, byPosition, compile, shown, termFilter, visible } from "./source-helpers.ts";
 
@@ -206,6 +213,42 @@ export class LiveSource implements GraphSource {
     return entryFields(this, entry, options);
   }
 
+  /** RFC-0045 §4: one store read (`getGroupMembers`), then this view's gates. */
+  async groupMembers(groupIds: readonly string[]): Promise<Map<string, ContentEntry[]>> {
+    const read = await getGroupMembers(this.#store.sql, this.#siteId, groupIds);
+    const split = await this.#split([...read.values()].flat());
+    return membersIn(read, groupIds, { listed: split.listed, reachable: split.reachable });
+  }
+
+  /**
+   * RFC-0045 §4: the `entry_refs` rows naming the group, expanded by the `shared` rule, each
+   * candidate then resolved like the snapshot's index (its original from the same pool), so both
+   * sources answer alike on the same graph.
+   */
+  async referencedBy(groupId: string, q: ReferencedByQuery = {}): Promise<ContentEntry[]> {
+    const [site, read] = await Promise.all([
+      this.site(),
+      referrerCandidates(this.#store.sql, this.#siteId, groupId),
+    ]);
+    const pool = visible([...read.byId.values()], this.#includeDrafts);
+    const ids = new Map(pool.map((e) => [e.id, e]));
+    const originalOf = (e: ContentEntry) => {
+      const g = e.translation?.group;
+      return g && g !== e.id ? ids.get(g) : undefined;
+    };
+    const shownHere = read.candidates.filter((e) => ids.has(e.id));
+    const records = referrerRecords(site, shownHere, originalOf, groupId).get(groupId) ?? [];
+    const split = await this.#split(pool);
+    return referrersIn(records, q, { listed: split.listed, reachable: split.reachable });
+  }
+
+  /** RFC-0045 §7: built from the working copy, only while the collection runs a conversion. */
+  async conversionEntries(collection: string): Promise<ConversionEntries | undefined> {
+    return conversionMaps(await this.site(), collection, async () =>
+      visible(await this.#store.listContentEntries(this.#siteId), true),
+    );
+  }
+
   taxonomies(): Promise<Taxonomy[]> {
     return this.#store.listTaxonomies(this.#siteId);
   }
diff --git a/packages/astro-renderer/src/media.ts b/packages/astro-renderer/src/media.ts
index 266bf572..b940eb16 100644
--- a/packages/astro-renderer/src/media.ts
+++ b/packages/astro-renderer/src/media.ts
@@ -75,13 +75,26 @@ export const IMAGE_FITS: readonly ImageFit[] = [
   "natural",
 ];
 
-/** A page's placeholder allowance (RFC-0028 §4), shared by every image the page draws. */
+/**
+ * A page's allowances, shared by everything one request draws: placeholder bytes (RFC-0028 §4),
+ * spent by every image, and RFC-0045 §4's resolved reference targets, spent by every
+ * `entryFields` call (absent: a full allowance on first use).
+ */
 export interface PlaceholderBudget {
   left: number;
+  /** RFC-0045 §4: reference targets left to resolve; past it they resolve to nothing. */
+  references?: number;
+  /** Set once the reference allowance ran out and was logged (one warning per request). */
+  referencesWarned?: boolean;
 }
 /** About 24 KB of LQIPs per page; beyond it images get their colour only. */
 export const PLACEHOLDER_BUDGET = 24 * 1024;
-export const placeholderBudget = (): PlaceholderBudget => ({ left: PLACEHOLDER_BUDGET });
+/** RFC-0045 §4: at most 200 resolved reference targets per request. */
+export const REFERENCE_BUDGET = 200;
+export const placeholderBudget = (): PlaceholderBudget => ({
+  left: PLACEHOLDER_BUDGET,
+  references: REFERENCE_BUDGET,
+});
 
 /**
  * The placeholder painted behind an image while it loads (RFC-0028 §2): the dominant colour, and
diff --git a/packages/astro-renderer/src/reference-conversions.ts b/packages/astro-renderer/src/reference-conversions.ts
new file mode 100644
index 00000000..f6fa2734
--- /dev/null
+++ b/packages/astro-renderer/src/reference-conversions.ts
@@ -0,0 +1,71 @@
+/**
+ * RFC-0045 §7 in the renderer: the entry maps a running text ↔ reference conversion reads
+ * (`ConvertContext.entries`), so `resolveFields` converts an entry phase B has not rewritten yet
+ * exactly as the writers and the operation will.
+ *
+ * - The snapshot source builds them from the snapshot's own entries (every one not archived,
+ *   drafts included: the graph it renders), lazily, once per snapshot, isolate and collection,
+ *   and only while the collection carries such a marker.
+ * - The live source builds them from the working copy (the graph phase B reads) before resolving
+ *   an entry of a collection that carries one.
+ *
+ * Without such a marker neither reads anything. Worker-safe.
+ */
+import type { ContentEntry, Site } from "@cloudhal/core-contracts";
+import {
+  type ConversionEntries,
+  conversionCollections,
+  conversionEntries,
+  fieldDefinitions,
+} from "@cloudhal/core-ts/fields";
+
+/** The collections a collection's running conversions read, or `undefined` (nothing to build). */
+export function conversionNeeds(site: Site, collection: string): ReadonlySet<string> | undefined {
+  return conversionCollections(fieldDefinitions(site, collection));
+}
+
+/**
+ * The maps `source` builds for an entry of `collection`, asked only while the collection runs a
+ * conversion (`entryFields` and depth-2 cards call this, so no source reads anything otherwise).
+ */
+export function conversionsFor(
+  source: { conversionEntries?(collection: string): Promise<ConversionEntries | undefined> },
+  site: Site,
+  collection: string,
+): Promise<ConversionEntries | undefined> {
+  return conversionNeeds(site, collection) && source.conversionEntries
+    ? source.conversionEntries(collection)
+    : Promise.resolve(undefined);
+}
+
+/** True when some collection of the site runs a text ↔ reference conversion. */
+export function siteConverts(site: Site): boolean {
+  return Object.keys(site.collections ?? {}).some((c) => conversionNeeds(site, c) !== undefined);
+}
+
+/** The maps for `collection` over the entries `load` returns, or `undefined` without a conversion. */
+export async function conversionMaps(
+  site: Site,
+  collection: string,
+  load: () => Promise<Iterable<ContentEntry>> | Iterable<ContentEntry>,
+): Promise<ConversionEntries | undefined> {
+  const needs = conversionNeeds(site, collection);
+  if (!needs) return undefined;
+  return conversionEntries(await load(), site.defaultLocale, needs);
+}
+
+/** A per-snapshot cache of `conversionMaps` by collection (the snapshot is immutable). */
+export function cachedConversionMaps(
+  cache: Map<string, Promise<ConversionEntries | undefined>>,
+  site: Site,
+  collection: string,
+  entries: () => Iterable<ContentEntry>,
+): Promise<ConversionEntries | undefined> {
+  if (!conversionNeeds(site, collection)) return Promise.resolve(undefined);
+  let hit = cache.get(collection);
+  if (!hit) {
+    hit = conversionMaps(site, collection, entries);
+    cache.set(collection, hit);
+  }
+  return hit;
+}
diff --git a/packages/astro-renderer/src/references.ts b/packages/astro-renderer/src/references.ts
new file mode 100644
index 00000000..e4805096
--- /dev/null
+++ b/packages/astro-renderer/src/references.ts
@@ -0,0 +1,305 @@
+/**
+ * RFC-0045 §4 in the renderer: reference cards, and the indexes both sources answer
+ * `groupMembers` and `referencedBy` from.
+ *
+ * - **Cards** (`referenceCards`): breadth-first over the groups a page's values name, one
+ *   `groupMembers` call per level (the live source: one store read; the snapshot: none). The member
+ *   shown is `pickMember`'s, among the members the source's *view* shows (gates applied at its
+ *   instant). Depth 1 (default) yields cards; depth 2 adds each card's own fields, whose references
+ *   are cards without fields. Groups are fetched once (the visited set), so cycles cost nothing.
+ *   Every card spends one of the request's 200 targets (`PlaceholderBudget.references`); past it
+ *   the rest resolve to nothing, with one `console.warn` per request.
+ * - **Indexes** (`ReferenceIndex`, snapshot only): members by group and referrers by group over the
+ *   snapshot's published entries, gate-independent and built once per snapshot and isolate; every
+ *   lookup then filters through the asking view.
+ * - **`referencedBy`** equals the resolved values: a referrer is an entry whose `resolveFields`
+ *   (with its published same-site original) names the group. The live source finds candidates in
+ *   `entry_refs` and resolves them the same way (`referrerRecords`), so both answer alike.
+ */
+import type { ContentEntry, Site } from "@cloudhal/core-contracts";
+import {
+  isReferenceFieldType,
+  membersByGroup,
+  originalsOf,
+  pickMember,
+  type ReferenceUse,
+  type ResolvedFields,
+  referenceUses,
+  resolveFields,
+} from "@cloudhal/core-ts/fields";
+import { itemUrl } from "@cloudhal/core-ts/locale-paths";
+import type { FieldImage, FieldsSource, RenderedFields } from "./fields.ts";
+import { type PlaceholderBudget, REFERENCE_BUDGET } from "./media.ts";
+import { conversionsFor } from "./reference-conversions.ts";
+import { byNewest } from "./source-helpers.ts";
+
+/** A referenced entry as a theme draws it: a card of the member the page's view shows. */
+export interface ReferencedEntry {
+  /** The translation group the value names. */
+  groupId: string;
+  id: string;
+  collection: string;
+  locale: string;
+  slug: string;
+  title: string;
+  summary?: string;
+  /** The member's public URL (its locale's path, or its locale's own domain). */
+  url: string;
+  /** The member's cover image, when the view shows its asset. */
+  image?: FieldImage;
+  /** The member is the default locale's, shown under `default-with-notice`: set `lang` on it. */
+  fromFallbackLocale: boolean;
+  /** Present only at depth 2: the member's own fields, its references as cards without fields. */
+  fields?: RenderedFields;
+}
+
+/** `referencedBy`'s filters. */
+export interface ReferencedByQuery {
+  collection?: string;
+  /** The referrer's top-level field key (`venue`, `speakers`). */
+  field?: string;
+  locale?: string;
+  /** At most 100 (the default). */
+  limit?: number;
+}
+
+export const REFERENCED_BY_LIMIT = 100;
+
+/** What `referenceCards` needs from `entryFields`: the page, its budget and its media. */
+export interface CardInput {
+  readonly source: FieldsSource;
+  readonly site: Site;
+  /** The page's locale: the member shown is in it, else (with `default-with-notice`) the default. */
+  readonly locale: string;
+  readonly depth: 1 | 2;
+  readonly budget: PlaceholderBudget;
+  /** The member's cover through the view's assets, or none. */
+  readonly cover: (member: ContentEntry) => Promise<FieldImage | undefined>;
+  /** Renders a level-2 member's fields with its own references' cards. */
+  readonly render: (
+    resolved: ResolvedFields,
+    cards: ReadonlyMap<string, ReferencedEntry>,
+  ) => Promise<RenderedFields>;
+}
+
+/** The reference values under resolved fields, top-level and inside repeater items, in order. */
+export function usesOf(resolved: ResolvedFields): ReferenceUse[] {
+  return Object.entries(resolved).flatMap(([key, f]) =>
+    isReferenceFieldType(f.def.type) ? referenceUses(f.def, f.value, `fields/${key}`) : [],
+  );
+}
+
+/** One target spent; false (logged once per budget) when none are left. */
+function spend(budget: PlaceholderBudget): boolean {
+  budget.references ??= REFERENCE_BUDGET;
+  if (budget.references > 0) {
+    budget.references--;
+    return true;
+  }
+  if (!budget.referencesWarned) {
+    budget.referencesWarned = true;
+    console.warn(
+      `cloudhal: more than ${REFERENCE_BUDGET} reference targets on one page; the rest render nothing`,
+    );
+  }
+  return false;
+}
+
+interface Level {
+  readonly input: CardInput;
+  /** The members of every group fetched so far (the visited set). */
+  readonly members: Map<string, ContentEntry[]>;
+}
+
+/** Fetches the groups not fetched yet, in one `groupMembers` call. */
+async function visit(level: Level, uses: readonly ReferenceUse[]): Promise<void> {
+  const missing = [...new Set(uses.map((u) => u.groupId))].filter((g) => !level.members.has(g));
+  const groupMembers = level.input.source.groupMembers;
+  if (missing.length === 0 || !groupMembers) return;
+  const got = await groupMembers.call(level.input.source, missing);
+  for (const g of missing) level.members.set(g, got.get(g) ?? []);
+}
+
+type Picked = { use: ReferenceUse; member: ContentEntry; card: ReferencedEntry };
+
+/** The cards of `uses` (spending the budget in order); unresolved uses get none. */
+async function cardsOf(level: Level, uses: readonly ReferenceUse[]): Promise<Picked[]> {
+  const { site, locale, budget, cover } = level.input;
+  const out: Picked[] = [];
+  for (const use of uses) {
+    const picked = pickMember(use.groupId, level.members.get(use.groupId) ?? [], {
+      locale,
+      defaultLocale: site.defaultLocale,
+      fallback: site.localization?.fallback,
+      collections: use.collections,
+    });
+    if (!picked || !spend(budget)) continue;
+    const m = picked.member;
+    const image = await cover(m);
+    const card: ReferencedEntry = {
+      groupId: use.groupId,
+      id: m.id,
+      collection: m.collection,
+      locale: m.locale,
+      slug: m.slug,
+      title: m.title,
+      ...(m.summary ? { summary: m.summary } : {}),
+      url: itemUrl(site, undefined, m),
+      ...(image ? { image } : {}),
+      fromFallbackLocale: picked.fromFallbackLocale,
+    };
+    out.push({ use, member: m, card });
+  }
+  return out;
+}
+
+/** A member's same-site original among the members the view shows (RFC-0041 §5). */
+function originalIn(level: Level, member: ContentEntry): ContentEntry | undefined {
+  const g = member.translation?.group;
+  if (!g || g === member.id || member.translation?.source?.siteId !== undefined) return undefined;
+  return level.members.get(g)?.find((m) => m.id === g);
+}
+
+/**
+ * The cards of an entry's resolved values, by value path (`fields/venue`, `fields/speakers/0/
+ * person`). Without `groupMembers` (sources from before RFC-0045) nothing resolves.
+ */
+export async function referenceCards(
+  input: CardInput,
+  resolved: ResolvedFields,
+): Promise<Map<string, ReferencedEntry>> {
+  const out = new Map<string, ReferencedEntry>();
+  const uses = usesOf(resolved);
+  if (uses.length === 0 || !input.source.groupMembers) return out;
+  const level: Level = { input, members: new Map() };
+  await visit(level, uses);
+  const first = await cardsOf(level, uses);
+  for (const p of first) out.set(p.use.path, p.card);
+  if (input.depth !== 2 || first.length === 0) return out;
+  // Level 2: each shown member's own fields, its references as cards without fields.
+  const members = [...new Map(first.map((p) => [p.member.id, p.member])).values()];
+  const resolvedOf = new Map<string, ResolvedFields>();
+  for (const m of members) {
+    const entries = await conversionsFor(input.source, input.site, m.collection);
+    const r = resolveFields(input.site, m, originalIn(level, m), entries ? { entries } : undefined);
+    resolvedOf.set(m.id, r);
+  }
+  await visit(level, [...resolvedOf.values()].flatMap(usesOf));
+  const fieldsOf = new Map<string, RenderedFields>();
+  for (const m of members) {
+    const r = resolvedOf.get(m.id) ?? {};
+    const inner = await cardsOf(level, usesOf(r));
+    fieldsOf.set(m.id, await input.render(r, new Map(inner.map((p) => [p.use.path, p.card]))));
+  }
+  for (const p of first) {
+    const fields = fieldsOf.get(p.member.id);
+    if (fields) p.card.fields = fields;
+  }
+  return out;
+}
+
+/** One referrer of a group: the entry and the field whose resolved value names it. */
+export interface Referrer {
+  readonly entry: ContentEntry;
+  /** The top-level field key. */
+  readonly field: string;
+  /** Set when the value came from the entry's original (which the view must show too). */
+  readonly viaOriginal?: string;
+}
+
+/**
+ * Referrers by group from `entries`' resolved values (`resolveFields` with `originalOf`); with
+ * `only`, just that group's. The snapshot index and the live source share it.
+ */
+export function referrerRecords(
+  site: Site,
+  entries: readonly ContentEntry[],
+  originalOf: (e: ContentEntry) => ContentEntry | undefined,
+  only?: string,
+): Map<string, Referrer[]> {
+  const out = new Map<string, Referrer[]>();
+  for (const entry of entries)
+    for (const [key, f] of Object.entries(resolveFields(site, entry, originalOf(entry)))) {
+      if (!isReferenceFieldType(f.def.type)) continue;
+      const via = f.fromOriginal ? entry.translation?.group : undefined;
+      for (const g of new Set(referenceUses(f.def, f.value, "").map((u) => u.groupId))) {
+        if (only !== undefined && g !== only) continue;
+        const list = out.get(g) ?? [];
+        list.push({ entry, field: key, ...(via ? { viaOriginal: via } : {}) });
+        out.set(g, list);
+      }
+    }
+  return out;
+}
+
+const idSets = new WeakMap<readonly ContentEntry[], ReadonlySet<string>>();
+/** The ids of a view's entry list, built once per list. */
+function idsOf(list: readonly ContentEntry[]): ReadonlySet<string> {
+  let ids = idSets.get(list);
+  if (!ids) {
+    ids = new Set(list.map((e) => e.id));
+    idSets.set(list, ids);
+  }
+  return ids;
+}
+
+/** What a view shows: `listed` for "used by" lists, `reachable` for resolution and originals. */
+export interface ReferenceView {
+  readonly listed: readonly ContentEntry[];
+  readonly reachable: readonly ContentEntry[];
+}
+
+/** `referencedBy` over records: shown referrers, filtered, newest first, at most 100. */
+export function referrersIn(
+  records: readonly Referrer[],
+  q: ReferencedByQuery,
+  view: ReferenceView,
+): ContentEntry[] {
+  const listed = idsOf(view.listed);
+  const reachable = idsOf(view.reachable);
+  const out = new Map<string, ContentEntry>();
+  for (const r of records) {
+    const e = r.entry;
+    if (q.collection !== undefined && e.collection !== q.collection) continue;
+    if (q.field !== undefined && r.field !== q.field) continue;
+    if (q.locale !== undefined && e.locale !== q.locale) continue;
+    if (!listed.has(e.id) || (r.viaOriginal !== undefined && !reachable.has(r.viaOriginal)))
+      continue;
+    out.set(e.id, e);
+  }
+  const limit = Math.max(0, Math.min(q.limit ?? REFERENCED_BY_LIMIT, REFERENCED_BY_LIMIT));
+  return [...out.values()].sort(byNewest).slice(0, limit);
+}
+
+/** The members of `ids` among a view's reachable entries (every id gets a list). */
+export function membersIn(
+  all: ReadonlyMap<string, readonly ContentEntry[]>,
+  ids: readonly string[],
+  view: ReferenceView,
+): Map<string, ContentEntry[]> {
+  const reachable = idsOf(view.reachable);
+  return new Map(ids.map((g) => [g, (all.get(g) ?? []).filter((m) => reachable.has(m.id))]));
+}
+
+/** A snapshot's gate-independent indexes over its published entries, each built on first use. */
+export class ReferenceIndex {
+  readonly #site: Site;
+  readonly #published: readonly ContentEntry[];
+  #members: Map<string, ContentEntry[]> | undefined;
+  #referrers: Map<string, Referrer[]> | undefined;
+
+  constructor(site: Site, published: readonly ContentEntry[]) {
+    this.#site = site;
+    this.#published = published;
+  }
+
+  members(): ReadonlyMap<string, readonly ContentEntry[]> {
+    this.#members ??= membersByGroup(this.#published);
+    return this.#members;
+  }
+
+  referrers(group: string): readonly Referrer[] {
+    this.#referrers ??= referrerRecords(this.#site, this.#published, originalsOf(this.#published));
+    return this.#referrers.get(group) ?? [];
+  }
+}
diff --git a/packages/astro-renderer/src/source.ts b/packages/astro-renderer/src/source.ts
index a18d694f..86344a22 100644
--- a/packages/astro-renderer/src/source.ts
+++ b/packages/astro-renderer/src/source.ts
@@ -13,7 +13,12 @@ import type {
 import type { RedirectMatch, SearchKind, SearchResults, SiteGraphStore } from "@cloudhal/core-ts";
 import { matchRedirect, redirectLocale } from "@cloudhal/core-ts";
 import { hasGates, inheritedGate, isAvailable, nextInstant } from "@cloudhal/core-ts/availability";
-import { type DerivedGate, derivedGates, type ResolvedFields } from "@cloudhal/core-ts/fields";
+import {
+  type ConversionEntries,
+  type DerivedGate,
+  derivedGates,
+  type ResolvedFields,
+} from "@cloudhal/core-ts/fields";
 import { matches } from "@cloudhal/core-ts/filter";
 import { assetRefsOf } from "@cloudhal/core-ts/media";
 import {
@@ -25,9 +30,12 @@ import {
 import { gateIndex, splitEntries } from "./entry-views.ts";
 import { type EntryFieldsOptions, entryFields, type RenderedFields } from "./fields.ts";
 import { type Navigation, type NavigationOptions, navigationFor } from "./navigation.ts";
+import { cachedConversionMaps, siteConverts } from "./reference-conversions.ts";
+import { membersIn, type ReferencedByQuery, ReferenceIndex, referrersIn } from "./references.ts";
 import { byNewest, byPosition, compile, shown, termFilter, visible } from "./source-helpers.ts";
 
 export { LiveSource } from "./live-source.ts";
+export type { ReferencedByQuery } from "./references.ts";
 
 /**
  * What a renderer needs from a site, independent of whether it reads live nodes (dev) or a
@@ -132,6 +140,19 @@ export interface GraphSource {
    * with the standalone `entryFields(source, entry)`.
    */
   entryFields?(entry: ContentEntry, options?: EntryFieldsOptions): Promise<RenderedFields>;
+  /**
+   * RFC-0045 §4: the members of these translation groups that this view shows, in this site, by
+   * group (one call per resolution level; the live source reads the store once, a snapshot never).
+   * Optional for sources that predate references: their references resolve to nothing.
+   */
+  groupMembers?(groupIds: readonly string[]): Promise<Map<string, ContentEntry[]>>;
+  /**
+   * RFC-0045 §4 "who references me": entries this view lists whose resolved values name the
+   * group (a translation inheriting its original's value included), newest first, at most 100.
+   */
+  referencedBy?(groupId: string, q?: ReferencedByQuery): Promise<ContentEntry[]>;
+  /** RFC-0045 §7: the entry maps of a running text ↔ reference conversion in a collection. */
+  conversionEntries?(collection: string): Promise<ConversionEntries | undefined>;
 }
 
 export interface SourceSearchOptions {
@@ -153,6 +174,8 @@ interface Loaded {
   published: ContentEntry[];
   /** Published entries with a public URL (unlisted ones too); `entries` holds the listed. */
   reachable: ContentEntry[];
+  /** RFC-0045 §7: every entry not archived, drafts included; kept only while a conversion runs. */
+  current: ContentEntry[];
   /** Every published entry's derived gate (RFC-0042 §3), computed once per snapshot. */
   derived: ReadonlyMap<string, DerivedGate>;
   /** Resolved field values by entry id, filled as queries need them (the snapshot is immutable). */
@@ -200,6 +223,10 @@ interface Shared {
   bundle?: "present" | "missing" | "persisting";
   /** Bodies read node by node (no bundle), as stored JSON text, kept to write the bundle. */
   fetched?: Map<string, string> | undefined;
+  /** RFC-0045 §4: members and referrers by group over the published entries, gates aside. */
+  references?: ReferenceIndex;
+  /** RFC-0045 §7: conversion maps by collection, while a text ↔ reference conversion runs. */
+  conversions?: Map<string, Promise<ConversionEntries | undefined>>;
 }
 
 /** Who may see the nodes of a snapshot: the clock gates are checked against, or nobody (previews). */
@@ -358,6 +385,7 @@ export class SnapshotSource implements GraphSource {
         entries: shownEntries,
         published: shownEntries,
         reachable: shownEntries,
+        current: siteConverts(site as Site) ? visible(entries, true) : [],
         derived,
         resolved: new Map(),
         taxonomies,
@@ -516,6 +544,40 @@ export class SnapshotSource implements GraphSource {
     return entryFields(this, entry, options);
   }
 
+  async #references(): Promise<ReferenceIndex> {
+    const loaded = await this.#load();
+    this.#shared.references ??= new ReferenceIndex(loaded.site, loaded.published);
+    return this.#shared.references;
+  }
+
+  /** RFC-0045 §4: in memory, through this view's gates (`reachable`: unlisted targets resolve). */
+  async groupMembers(groupIds: readonly string[]): Promise<Map<string, ContentEntry[]>> {
+    const [index, view] = [await this.#references(), await this.#current()];
+    return membersIn(index.members(), groupIds, {
+      listed: view.entries,
+      reachable: view.reachable,
+    });
+  }
+
+  async referencedBy(groupId: string, q: ReferencedByQuery = {}): Promise<ContentEntry[]> {
+    const [index, view] = [await this.#references(), await this.#current()];
+    return referrersIn(index.referrers(groupId), q, {
+      listed: view.entries,
+      reachable: view.reachable,
+    });
+  }
+
+  async conversionEntries(collection: string): Promise<ConversionEntries | undefined> {
+    const loaded = await this.#load();
+    this.#shared.conversions ??= new Map();
+    return cachedConversionMaps(
+      this.#shared.conversions,
+      loaded.site,
+      collection,
+      () => loaded.current,
+    );
+  }
+
   async taxonomies(): Promise<Taxonomy[]> {
     return (await this.#current()).taxonomies;
   }
diff --git a/packages/astro-renderer/test/references-fixture.ts b/packages/astro-renderer/test/references-fixture.ts
new file mode 100644
index 00000000..42baaadf
--- /dev/null
+++ b/packages/astro-renderer/test/references-fixture.ts
@@ -0,0 +1,219 @@
+/**
+ * RFC-0045 step 3 renderer fixture: a site with references and repeaters, enabled on a store of
+ * its own (`SiteGraphStoreOptions.fieldTypes`, as the shared suites do; production refuses them).
+ * The store's clock is `T − 24h`; views are taken at `T`.
+ *
+ * - `places` (no fields): `hall` (en, with a published Turkish member `salon`), `stage` (en
+ *   only), `annex` (a draft), `vault` (archived after `night` chose it), `cellar` (embargoed until
+ *   `T + 1h`);
+ * - `people` (`bio`, `mentor` a reference to people): `ada`, `alan` (mentor: ada), `grace` (draft);
+ * - `events`: `venue` (to places, `localized: false`), `sponsor` (to people, `localized: true`),
+ *   `speakers` (a repeater of person and talk, `localized: false`), `related` (several events):
+ *   `launch` names hall, ada, alan, grace twice (one item holds only her) and meetup; its Turkish
+ *   translation `lansman` inherits venue, speakers and related and holds its own sponsor (alan);
+ *   `meetup` names `launch` back (a cycle); `gig` names cellar; `night` names vault; `party` is a
+ *   draft naming hall;
+ * - an edition site (`de`): `halle` (a member of hall's group), `start` (an edition member of
+ *   launch naming hall's group) and `baslangic`, a same-site translation of `start` (an edition
+ *   chain: it inherits nothing and holds its own venue).
+ */
+import type {
+  Actor,
+  ContentEntry,
+  FieldDefinition,
+  Site,
+  Translation,
+} from "@cloudhal/core-contracts";
+import { GATES_ENFORCED, nodeHash, SiteGraphStore } from "@cloudhal/core-ts";
+import { MemoryBlobStore } from "@cloudhal/storage";
+import { BetterSqlite3Driver } from "@cloudhal/storage/sqlite";
+
+export const person: Actor = { kind: "human", id: "user_01HZX8K3Q9CD", name: "Halil" };
+const L = (en: string) => ({ en: { label: en } });
+export const HOUR = 3_600_000;
+export const T = Date.UTC(2026, 10, 12, 9, 0, 0);
+
+const VENUE: FieldDefinition = {
+  key: "venue",
+  type: "reference",
+  labels: L("Venue"),
+  localized: false,
+  collections: ["places"],
+};
+const SPONSOR: FieldDefinition = {
+  key: "sponsor",
+  type: "reference",
+  labels: L("Sponsor"),
+  localized: true,
+  collections: ["people"],
+};
+const SPEAKERS: FieldDefinition = {
+  key: "speakers",
+  type: "repeater",
+  labels: L("Speakers"),
+  localized: false,
+  fields: [
+    { key: "person", type: "reference", labels: L("Person"), collections: ["people"] },
+    { key: "talk", type: "text", labels: L("Talk") },
+  ],
+};
+const RELATED: FieldDefinition = {
+  key: "related",
+  type: "reference",
+  labels: L("Related"),
+  localized: false,
+  multiple: true,
+  collections: ["events"],
+};
+const MENTOR: FieldDefinition = {
+  key: "mentor",
+  type: "reference",
+  labels: L("Mentor"),
+  localized: false,
+  collections: ["people"],
+};
+
+export const COLLECTIONS: NonNullable<Site["collections"]> = {
+  events: { fields: [VENUE, SPONSOR, SPEAKERS, RELATED] },
+  places: {},
+  people: { fields: [{ key: "bio", type: "text", labels: L("Bio"), localized: true }, MENTOR] },
+};
+
+export interface RefsWorld {
+  store: SiteGraphStore;
+  site: Site;
+  edition: Site;
+  e: Record<string, ContentEntry>;
+}
+
+export async function refsWorld(
+  options: { fallback?: "none" | "default-with-notice" } = {},
+): Promise<RefsWorld> {
+  let tick = 0;
+  const store = new SiteGraphStore({
+    sql: await BetterSqlite3Driver.open(":memory:"),
+    blobs: new MemoryBlobStore(),
+    now: () => new Date(T - 24 * HOUR + tick++ * 1000),
+    gates: GATES_ENFORCED,
+    fieldTypes: { supported: () => true },
+  });
+  await store.init();
+  const project = await store.createProject({
+    name: "Refs",
+    slug: "refs",
+    ownerId: person.id,
+    siteIds: [],
+  });
+  const site = await store.createSite({
+    projectId: project.id,
+    name: "Refs",
+    slug: "refs",
+    defaultLocale: "en",
+    locales: ["en", "tr"],
+    domains: [],
+    pageIds: [],
+    theme: { name: "blog" },
+    collections: COLLECTIONS,
+    ...(options.fallback ? { localization: { fallback: options.fallback } } : {}),
+  });
+  const edition = await store.createSite({
+    projectId: project.id,
+    name: "Refs DE",
+    slug: "refs-de",
+    defaultLocale: "de",
+    locales: ["de", "tr"],
+    domains: [],
+    pageIds: [],
+    theme: { name: "blog" },
+    collections: COLLECTIONS,
+  });
+  const make = (s: Site, collection: string, slug: string, over: Partial<ContentEntry> = {}) =>
+    store.createContentEntry({
+      siteId: s.id,
+      collection,
+      slug,
+      locale: s.defaultLocale,
+      status: "published",
+      title: `Title ${slug}`,
+      summary: `About ${slug}`,
+      body: { format: "markdown", value: "Body" },
+      fields: {},
+      tags: [],
+      author: person,
+      ...over,
+    } as never) as Promise<ContentEntry>;
+  const translate = async (
+    of: ContentEntry,
+    slug: string,
+    over: Partial<ContentEntry> = {},
+    into?: Site,
+  ) => {
+    const source = { id: of.id, locale: of.locale, rev: of.rev, hash: await nodeHash(of) };
+    const translation: Translation = into
+      ? { group: of.id, method: "human", source: { ...source, siteId: of.siteId } }
+      : { group: of.translation?.group ?? of.id, method: "human", source };
+    return make(into ?? site, of.collection, slug, {
+      locale: into ? into.defaultLocale : "tr",
+      translation,
+      ...over,
+    });
+  };
+  /** A translation inside the edition site (an edition chain): same-site, so no `siteId`. */
+  const translateIn = async (
+    of: ContentEntry,
+    s: Site,
+    slug: string,
+    over: Partial<ContentEntry>,
+  ) => {
+    const source = { id: of.id, locale: of.locale, rev: of.rev, hash: await nodeHash(of) };
+    return make(s, of.collection, slug, {
+      locale: "tr",
+      translation: { group: of.translation?.group ?? of.id, method: "human", source },
+      ...over,
+    });
+  };
+  const e: Record<string, ContentEntry> = {};
+  e.hall = await make(site, "places", "hall");
+  e.hallTr = await translate(e.hall, "salon");
+  e.stage = await make(site, "places", "stage");
+  e.annex = await make(site, "places", "annex", { status: "draft" });
+  e.vault = await make(site, "places", "vault");
+  e.cellar = await make(site, "places", "cellar", {
+    availability: { from: new Date(T + HOUR).toISOString() },
+  });
+  e.ada = await make(site, "people", "ada", { fields: { bio: "Counts" } });
+  e.alan = await make(site, "people", "alan", { fields: { bio: "Machines", mentor: e.ada.id } });
+  e.grace = await make(site, "people", "grace", { status: "draft" });
+  e.launch = await make(site, "events", "launch", {
+    fields: {
+      venue: e.hall.id,
+      sponsor: e.ada.id,
+      speakers: [
+        { person: e.alan.id, talk: "Keynote" },
+        { person: e.grace.id, talk: "Hidden" },
+        { person: e.grace.id },
+      ],
+    },
+  });
+  e.meetup = await make(site, "events", "meetup", {
+    fields: { venue: e.stage.id, related: [e.launch.id] },
+  });
+  e.launch = await store.updateContentEntry({
+    ...e.launch,
+    fields: { ...e.launch.fields, related: [e.meetup.id] },
+  });
+  e.launchTr = await translate(e.launch, "lansman", { fields: { sponsor: e.alan.id } });
+  e.party = await make(site, "events", "party", { status: "draft", fields: { venue: e.hall.id } });
+  e.gig = await make(site, "events", "gig", {
+    fields: { venue: e.cellar.id, related: [e.launch.id] },
+  });
+  // archive after the referrer chose it: an archived target stays in the referrer's values
+  e.night = await make(site, "events", "night", { fields: { venue: e.vault.id } });
+  e.vault = await store.updateContentEntry({ ...e.vault, status: "archived" });
+  e.hallDe = await translate(e.hall, "halle", {}, edition);
+  e.launchDe = await translate(e.launch, "start", { fields: { venue: e.hall.id } }, edition);
+  e.launchDeTr = await translateIn(e.launchDe, edition, "baslangic", {
+    fields: { venue: e.hall.id },
+  });
+  return { store, site, edition, e };
+}
diff --git a/packages/astro-renderer/test/references-sweep.test.ts b/packages/astro-renderer/test/references-sweep.test.ts
new file mode 100644
index 00000000..feeef945
--- /dev/null
+++ b/packages/astro-renderer/test/references-sweep.test.ts
@@ -0,0 +1,165 @@
+/**
+ * RFC-0008's route sweep (§7.2, S9), extended by RFC-0042 and now by RFC-0045 §8: a published
+ * referrer names a draft, an archived, an embargoed, an expiring (`availability.until`) and a
+ * `hide`-expired target, and one that is always shown. Swept through every route the blog starter
+ * serves at each instant −1 ms, exactly and +1 ms, entry routes drawing their fields with cards at
+ * depth 2 and their "used by" lists: a target the view does not show must not appear anywhere
+ * (id, path, title), and one it shows appears as a card on the referrer's page.
+ */
+import type { ContentEntry, Site } from "@cloudhal/core-contracts";
+import { entryPath, GATES_ENFORCED, SiteGraphStore, seedStarterSite } from "@cloudhal/core-ts";
+import { MemoryBlobStore } from "@cloudhal/storage";
+import { BetterSqlite3Driver } from "@cloudhal/storage/sqlite";
+import { beforeAll, describe, expect, it } from "vitest";
+import { staticPaths } from "../src/routing.ts";
+import { SnapshotSource } from "../src/source.ts";
+import { sweep } from "./sweep.ts";
+
+const T = Date.UTC(2026, 10, 12, 6, 0, 0);
+const HOUR = 3_600_000;
+const person = { kind: "human" as const, id: "user_refsweep0001", name: "Halil" };
+
+interface Target {
+  name: string;
+  entry: ContentEntry;
+  leaks: string[];
+}
+
+describe("route sweep: no hidden reference target in any public output (RFC-0045 §8)", () => {
+  let store: SiteGraphStore;
+  let site: Site;
+  let published: SnapshotSource;
+  let candidates: string[];
+  let targets: Target[];
+  let tourPath: string;
+
+  beforeAll(async () => {
+    store = new SiteGraphStore({
+      sql: await BetterSqlite3Driver.open(":memory:"),
+      blobs: new MemoryBlobStore(),
+      now: () => new Date(T - 24 * HOUR),
+      gates: GATES_ENFORCED,
+      fieldTypes: { supported: () => true },
+    });
+    await store.init();
+    site = await seedStarterSite(store, { name: "Refs", slug: "refs" });
+    const hello = (await store.listContentEntries(site.id)).find((e) => e.slug === "hello-world");
+    site = await store.updateSite({
+      ...site,
+      collections: {
+        ...site.collections,
+        places: { labels: { en: { singular: "Place", plural: "Places" } } },
+        deals: {
+          labels: { en: { singular: "Deal", plural: "Deals" } },
+          fields: [
+            {
+              key: "validUntil",
+              type: "datetime",
+              labels: { en: { label: "Until" } },
+              localized: false,
+            },
+          ],
+          expiry: { field: "validUntil", action: "hide" },
+        },
+        shows: {
+          labels: { en: { singular: "Show", plural: "Shows" } },
+          fields: [
+            {
+              key: "spots",
+              type: "reference",
+              labels: { en: { label: "Spots" } },
+              localized: false,
+              multiple: true,
+              collections: ["places", "deals"],
+            },
+          ],
+        },
+      },
+    });
+    const make = (collection: string, slug: string, title: string, over: object = {}) =>
+      store.createContentEntry({
+        siteId: site.id,
+        collection,
+        slug,
+        locale: site.defaultLocale,
+        status: "published",
+        title,
+        summary: `About ${title}`,
+        body: { format: "markdown", value: `All about ${title}.` },
+        fields: {},
+        tags: [],
+        ...(hello?.terms ? { terms: hello.terms } : {}),
+        author: person,
+        ...over,
+      } as never) as Promise<ContentEntry>;
+    const at = (ms: number) => ({ at: new Date(ms).toISOString(), timeZone: "UTC" });
+    const draft = await make("places", "draft-spot", "Spot ZQXUR1", { status: "draft" });
+    let archived = await make("places", "archived-spot", "Spot ZQXUR2");
+    const embargoed = await make("places", "embargoed-spot", "Spot ZQXUR3", {
+      availability: { from: new Date(T + HOUR).toISOString() },
+    });
+    const expiring = await make("places", "expiring-spot", "Spot ZQXUR4", {
+      availability: { until: new Date(T + HOUR).toISOString() },
+    });
+    const deal = await make("deals", "hidden-deal", "Deal ZQXUR6", {
+      fields: { validUntil: at(T + HOUR) },
+    });
+    const always = await make("places", "always-spot", "Spot ZQXUR5");
+    const tour = await make("shows", "tour", "Tour", {
+      fields: { spots: [draft.id, archived.id, embargoed.id, expiring.id, deal.id, always.id] },
+    });
+    archived = await store.updateContentEntry({ ...archived, status: "archived" });
+    tourPath = entryPath(site, tour);
+    const target = (name: string, entry: ContentEntry): Target => ({
+      name,
+      entry,
+      leaks: [entry.id, entryPath(site, entry), /ZQXU\w+/.exec(entry.title)?.[0] as string],
+    });
+    targets = [
+      target("draft", draft),
+      target("archived", archived),
+      target("embargoed until t+1h", embargoed),
+      target("available until t+1h", expiring),
+      target("hide-expired at t+1h", deal),
+      target("always shown", always),
+    ];
+    const snap = await store.createSnapshot(site.id, { actor: person, reason: "publish" });
+    site = await store.publish((await store.getSite(site.id)) as Site, snap.id);
+    published = await SnapshotSource.open(store, snap.id);
+    const everything = await staticPaths(published.ungated());
+    candidates = [
+      ...everything.pages,
+      ...everything.feeds,
+      ...targets.map((t) => entryPath(site, t.entry)),
+      tourPath,
+      "/nope",
+    ];
+  });
+
+  it("shows a target exactly while the view shows it, and leaks nothing of it otherwise", async () => {
+    let seenShown = 0;
+    for (const now of [T - 1, T + HOUR - 1, T + HOUR, T + HOUR + 1]) {
+      const label = new Date(now).toISOString();
+      const source = published.at(now);
+      const swept = await sweep(source, candidates, [], store);
+      expect(swept.routes.get(tourPath), label).toBe("entry");
+      const tourPage = swept.byPath.get(tourPath) ?? "";
+      for (const t of targets) {
+        const shown = (await source.entryById(t.entry.id)) !== undefined;
+        if (shown) {
+          expect(tourPage, `${label}: ${t.name} card`).toContain(t.entry.title);
+          // its own page lists the tour ("used by")
+          expect(swept.byPath.get(entryPath(site, t.entry)), `${label}: ${t.name}`).toContain(
+            tourPath,
+          );
+          seenShown++;
+          continue;
+        }
+        for (const leak of t.leaks)
+          expect(swept.text.includes(leak), `${label}: ${t.name} leaks "${leak}"`).toBe(false);
+      }
+    }
+    // always: 4; embargoed: 2; expiring and the deal: 2 each
+    expect(seenShown).toBe(10);
+  });
+});
diff --git a/packages/astro-renderer/test/references.test.ts b/packages/astro-renderer/test/references.test.ts
new file mode 100644
index 00000000..9e05c8b5
--- /dev/null
+++ b/packages/astro-renderer/test/references.test.ts
@@ -0,0 +1,278 @@
+/**
+ * RFC-0045 step 3 (§4): reference cards and repeater items in `entryFields`, gated per view;
+ * `groupMembers` and `referencedBy` on both sources, identical on a snapshot of the working copy
+ * (edition chains and localized values held by translations included, no field-operation marker
+ * active); gate instants; depth, cycles and the per-request budget.
+ */
+import type { ContentEntry, Site } from "@cloudhal/core-contracts";
+import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+import { entryFields, type FieldsSource, type RenderedFields } from "../src/fields.ts";
+import { placeholderBudget } from "../src/media.ts";
+import { conversionMaps } from "../src/reference-conversions.ts";
+import { LiveSource, SnapshotSource } from "../src/source.ts";
+import { HOUR, type RefsWorld, refsWorld, T } from "./references-fixture.ts";
+
+const system = { kind: "system" as const, id: "sys_test0001" };
+
+/** Card titles per field (and per item for repeaters), the shape a theme reads. */
+function shown(fields: RenderedFields): Record<string, unknown> {
+  const out: Record<string, unknown> = {};
+  for (const [k, f] of Object.entries(fields)) {
+    if (f.empty) continue;
+    if (f.references) out[k] = f.references.map((c) => c.title);
+    else if (f.items) out[k] = f.items.map(shown);
+    else out[k] = f.text;
+  }
+  return out;
+}
+
+async function snapshotOf(w: RefsWorld, site: Site): Promise<SnapshotSource> {
+  const snap = await w.store.createSnapshot(site.id, { actor: system, reason: "manual" });
+  return (await SnapshotSource.open(w.store, snap.id)).at(T);
+}
+
+describe("reference cards (RFC-0045 §4)", () => {
+  let w: RefsWorld;
+  let snap: SnapshotSource;
+  beforeAll(async () => {
+    w = await refsWorld();
+    snap = await snapshotOf(w, w.site);
+  });
+  afterEach(() => vi.restoreAllMocks());
+
+  it("resolves cards at depth 1 and leaves nothing of unresolved targets", async () => {
+    const { e } = w;
+    const fields = await snap.entryFields(e.launch as ContentEntry);
+    expect(shown(fields)).toEqual({
+      venue: ["Title hall"],
+      sponsor: ["Title ada"],
+      speakers: [{ person: ["Title alan"], talk: "Keynote" }, { talk: "Hidden" }],
+      related: ["Title meetup"],
+    });
+    expect(fields.venue?.references?.[0]).toEqual({
+      groupId: e.hall?.id,
+      id: e.hall?.id,
+      collection: "places",
+      locale: "en",
+      slug: "hall",
+      title: "Title hall",
+      summary: "About hall",
+      url: "/places/hall",
+      fromFallbackLocale: false,
+    });
+    expect(fields.venue?.text).toBe("Title hall");
+    expect(fields.venue?.references?.[0]?.fields).toBeUndefined();
+    // the draft speaker: no id, no title, no empty item, in anything a theme could print
+    const wire = JSON.stringify(fields);
+    for (const leak of [e.grace?.id, "Title grace", "grace"])
+      expect(wire.includes(leak as string), leak).toBe(false);
+    // archived and draft targets resolve to nothing
+    expect((await snap.entryFields(e.night as ContentEntry)).venue?.empty).toBe(true);
+    expect(JSON.stringify(await snap.entryFields(e.night as ContentEntry))).not.toContain(
+      e.vault?.id,
+    );
+  });
+
+  it("picks the page's locale, then the default locale only under default-with-notice", async () => {
+    const { e } = w;
+    const tr = await snap.entryFields(e.launchTr as ContentEntry);
+    // venue and speakers are inherited (localized: false), sponsor is the translation's own
+    expect(shown(tr)).toEqual({
+      venue: ["Title salon"],
+      speakers: [{ talk: "Keynote" }, { talk: "Hidden" }],
+    });
+    expect(tr.venue?.references?.[0]).toMatchObject({ url: "/tr/places/salon", locale: "tr" });
+    const fb = await refsWorld({ fallback: "default-with-notice" });
+    const fbSnap = await snapshotOf(fb, fb.site);
+    const withFallback = await fbSnap.entryFields(fb.e.launchTr as ContentEntry);
+    expect(shown(withFallback)).toEqual({
+      venue: ["Title salon"],
+      sponsor: ["Title alan"],
+      speakers: [{ person: ["Title alan"], talk: "Keynote" }, { talk: "Hidden" }],
+      related: ["Title meetup"],
+    });
+    expect(withFallback.sponsor?.references?.[0]).toMatchObject({
+      fromFallbackLocale: true,
+      locale: "en",
+      url: "/people/alan",
+    });
+  });
+
+  it("opens and closes targets at their gate instants", async () => {
+    const { e } = w;
+    const base = await SnapshotSource.open(w.store, snap.snapshot.id);
+    const at = async (now: number) =>
+      shown(await base.at(now).entryFields(e.gig as ContentEntry)).venue;
+    expect(await at(T + HOUR - 1)).toBeUndefined();
+    expect(await at(T + HOUR)).toEqual(["Title cellar"]);
+    expect(await at(T + HOUR + 1)).toEqual(["Title cellar"]);
+    // the referrer's page expires at the target's instant (the gate index already holds it)
+    expect(await base.at(T).nextGate()).toBe(T + HOUR);
+    // previews ignore gates
+    expect(shown(await base.ungated().entryFields(e.gig as ContentEntry)).venue).toEqual([
+      "Title cellar",
+    ]);
+    expect(await base.at(T).groupMembers([e.cellar?.id as string])).toEqual(
+      new Map([[e.cellar?.id, []]]),
+    );
+    expect(
+      (await base.at(T + HOUR).referencedBy(e.launch?.id as string)).map((x) => x.slug),
+    ).toEqual(["gig", "meetup"]);
+  });
+
+  it("depth 2 adds the members' own fields, one groupMembers call per level, cycles included", async () => {
+    const { e } = w;
+    const calls: string[][] = [];
+    const counted: FieldsSource = {
+      site: () => snap.site(),
+      entryById: (id) => snap.entryById(id),
+      asset: (id) => snap.asset(id),
+      groupMembers: (ids) => {
+        calls.push([...ids]);
+        return snap.groupMembers(ids);
+      },
+    };
+    const fields = await entryFields(counted, e.launch as ContentEntry, { depth: 2 });
+    expect(calls).toHaveLength(2);
+    const meetup = fields.related?.references?.[0];
+    // launch → meetup → launch: the cycle ends in a card without fields
+    expect(shown(meetup?.fields ?? {})).toEqual({
+      venue: ["Title stage"],
+      related: ["Title launch"],
+    });
+    expect(meetup?.fields?.related?.references?.[0]?.fields).toBeUndefined();
+    const alan = fields.speakers?.items?.[0]?.person?.references?.[0];
+    expect(shown(alan?.fields ?? {})).toEqual({ bio: "Machines", mentor: ["Title ada"] });
+    // depth 1 is one call
+    calls.length = 0;
+    await entryFields(counted, e.launch as ContentEntry);
+    expect(calls).toHaveLength(1);
+  });
+
+  it("spends one request budget across calls, then resolves nothing, with one warning", async () => {
+    const { e } = w;
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const budget = { ...placeholderBudget(), references: 3 };
+    const first = await snap.entryFields(e.launch as ContentEntry, { media: { budget } });
+    expect(shown(first)).toEqual({
+      venue: ["Title hall"],
+      sponsor: ["Title ada"],
+      speakers: [{ person: ["Title alan"], talk: "Keynote" }, { talk: "Hidden" }],
+    });
+    const second = await snap.entryFields(e.meetup as ContentEntry, { media: { budget } });
+    expect(shown(second)).toEqual({});
+    expect(warn).toHaveBeenCalledTimes(1);
+    expect(placeholderBudget().references).toBe(200);
+  });
+
+  it("resolves nothing through a source without groupMembers (older sources)", async () => {
+    const { e } = w;
+    const old: FieldsSource = { site: () => snap.site(), entryById: (id) => snap.entryById(id) };
+    const fields = await entryFields(old, e.launch as ContentEntry);
+    expect(shown(fields)).toEqual({ speakers: [{ talk: "Keynote" }, { talk: "Hidden" }] });
+  });
+
+  it("builds no conversion maps without a running conversion, and folds text when one runs", async () => {
+    expect(await snap.conversionEntries("events")).toBeUndefined();
+    const site = {
+      ...(await snap.site()),
+      collections: {
+        ...w.site.collections,
+        talks: {
+          fields: [
+            {
+              key: "room",
+              type: "reference",
+              labels: { en: { label: "Room" } },
+              localized: false,
+              collections: ["places"],
+              migration: { id: "fop_01HZX8K3Q9CD", fromType: "text" },
+            },
+          ],
+        },
+      },
+    } as Site;
+    const maps = await conversionMaps(site, "talks", () => [
+      w.e.hall as ContentEntry,
+      w.e.hallTr as ContentEntry,
+      w.e.vault as ContentEntry,
+      w.e.ada as ContentEntry,
+    ]);
+    expect(maps?.byText.get("title hall")).toEqual([w.e.hall?.id]);
+    expect(maps?.byText.get("salon")).toEqual([w.e.hall?.id]);
+    expect(maps?.byText.has("vault")).toBe(false);
+    expect(maps?.byText.has("ada")).toBe(false);
+    expect(maps?.titles.get(w.e.ada?.id as string)).toBe("Title ada");
+  });
+});
+
+describe("live and snapshot sources agree (RFC-0045 §4, test plan)", () => {
+  let w: RefsWorld;
+  beforeAll(async () => {
+    w = await refsWorld({ fallback: "default-with-notice" });
+  });
+
+  for (const which of ["site", "edition"] as const)
+    it(`gives identical cards and referencedBy on a snapshot of the working copy (${which})`, async () => {
+      const site = w[which];
+      const snap = await snapshotOf(w, site);
+      const live = new LiveSource(w.store, site.id, { includeDrafts: false, now: () => T });
+      // no field-operation marker is active: both convert nothing
+      const defs = Object.values(site.collections ?? {}).flatMap((c) => c?.fields ?? []);
+      expect(defs.filter((d) => d.migration !== undefined)).toEqual([]);
+      const entries = (await w.store.listContentEntries(site.id)).filter(
+        (x) => x.status === "published",
+      );
+      for (const entry of entries)
+        for (const locale of ["en", "tr", "de"])
+          for (const depth of [1, 2] as const) {
+            const a = await live.entryFields(entry, { locale, depth });
+            const b = await snap.entryFields(entry, { locale, depth });
+            expect(b, `${entry.slug} ${locale} depth ${depth}`).toEqual(a);
+          }
+      const groups = [...new Set(entries.map((x) => x.translation?.group ?? x.id))].concat(
+        Object.values(w.e).map((x) => x.id),
+      );
+      const queries = [
+        {},
+        { locale: "tr" },
+        { collection: "events" },
+        { field: "speakers" },
+        { field: "venue", limit: 1 },
+      ];
+      let nonEmpty = 0;
+      for (const g of groups)
+        for (const q of queries) {
+          const a = (await live.referencedBy(g, q)).map((x) => x.id);
+          const b = (await snap.referencedBy(g, q)).map((x) => x.id);
+          expect(b, `${g} ${JSON.stringify(q)}`).toEqual(a);
+          if (a.length > 0) nonEmpty++;
+        }
+      expect(nonEmpty).toBeGreaterThan(which === "site" ? 8 : 1);
+      // members of a group in any order (one per locale): compare by id
+      const ids = (m: Map<string, ContentEntry[]>) =>
+        [...m].map(([g, list]) => [g, list.map((x) => x.id).sort()]);
+      expect(ids(await snap.groupMembers(groups))).toEqual(ids(await live.groupMembers(groups)));
+    });
+
+  it("lists referrers by resolved values: inherited ones, own localized ones and edition chains", async () => {
+    const { e } = w;
+    const snap = await snapshotOf(w, w.site);
+    const slugs = async (g: string | undefined, q = {}) =>
+      (await snap.referencedBy(g as string, q)).map((x) => x.slug).sort();
+    // the Turkish launch inherits venue and speakers; the draft party is not shown
+    expect(await slugs(e.hall?.id)).toEqual(["lansman", "launch"]);
+    expect(await slugs(e.hall?.id, { locale: "tr" })).toEqual(["lansman"]);
+    // sponsor is localized: the translation's own value names alan, the original's ada
+    expect(await slugs(e.ada?.id)).toEqual(["alan", "launch"]);
+    expect(await slugs(e.alan?.id)).toEqual(["lansman", "launch"]);
+    expect(await slugs(e.alan?.id, { field: "sponsor" })).toEqual(["lansman"]);
+    // the edition: its member and the edition chain's translation each hold their own value
+    const de = await snapshotOf(w, w.edition);
+    expect((await de.referencedBy(e.hall?.id as string)).map((x) => x.slug).sort()).toEqual([
+      "baslangic",
+      "start",
+    ]);
+    expect(await de.referencedBy(e.ada?.id as string)).toEqual([]);
+  });
+});
diff --git a/packages/astro-renderer/test/sweep.ts b/packages/astro-renderer/test/sweep.ts
index 7ae5cfe5..f1b0288f 100644
--- a/packages/astro-renderer/test/sweep.ts
+++ b/packages/astro-renderer/test/sweep.ts
@@ -1,10 +1,12 @@
 /**
  * The route sweep's renderer (RFC-0008 §7.2): what the blog starter's routes put on the wire for
- * one source, path by path. Shared by the time-gate sweep (`gates-sweep.test.ts`) and the derived
- * gate sweep (`derived-gates-sweep.test.ts`, RFC-0042 §3).
+ * one source, path by path. Shared by the time-gate sweep (`gates-sweep.test.ts`), the derived
+ * gate sweep (`derived-gates-sweep.test.ts`, RFC-0042 §3) and the reference sweep
+ * (`references-sweep.test.ts`, RFC-0045 §8): entry routes draw their fields with reference cards
+ * at depth 2 and their "used by" list.
  */
 import type { Section } from "@cloudhal/core-contracts";
-import type { SiteGraphStore } from "@cloudhal/core-ts";
+import { entryPath, type SiteGraphStore } from "@cloudhal/core-ts";
 import { archiveSummaries } from "../src/archive.ts";
 import { collectionFeedXml } from "../src/collection-feed-route.ts";
 import { collectionForFeedPath } from "../src/collection-feeds.ts";
@@ -86,6 +88,13 @@ export async function sweep(
         renderEntryArticle(route.entry, locale, media),
         JSON.stringify(terms),
         JSON.stringify(relatedEntries(route.entry, all, index, 3).map((e) => [e.id, e.title])),
+        // RFC-0045: the entry's fields with reference cards at depth 2, and its "used by" list
+        JSON.stringify((await source.entryFields?.(route.entry, { media, depth: 2 })) ?? {}),
+        JSON.stringify(
+          (
+            (await source.referencedBy?.(route.entry.translation?.group ?? route.entry.id)) ?? []
+          ).map((e) => [e.id, e.title, entryPath(site, e)]),
+        ),
       );
     } else if (route.kind === "archive") {
       out.push(
diff --git a/packages/cli/test/cloudflare-gates.test.ts b/packages/cli/test/cloudflare-gates.test.ts
index 6a9c1a52..d7ce1c39 100644
--- a/packages/cli/test/cloudflare-gates.test.ts
+++ b/packages/cli/test/cloudflare-gates.test.ts
@@ -14,8 +14,9 @@
  *   feeds (served by the renderer's middleware) included.
  * - **Cache cap (S10).** Published responses carry `max-age` up to the next gate; a gate a few
  *   seconds ahead opens on its own, with no purge and no scheduler.
- * - **Features handshake (§7.7).** `GET /__cloudhal/features` answers `{ "gates": 2 }` to the admin
- *   only, and the admin Worker accepts `availability` over REST once it has asked.
+ * - **Features handshake (§7.7).** `GET /__cloudhal/features` answers `{ "gates": 2 }` (and
+ *   RFC-0045's `"fields": 2`) to the admin only, and the admin Worker accepts `availability` over
+ *   REST once it has asked.
  * - **Writer guard (S15).** Against an "old" site Worker (no features endpoint), the admin Worker
  *   refuses `availability` in REST writes and bundle pushes with `409 gates_unsupported`.
  *
@@ -380,7 +381,7 @@ describe("time gates on workerd: the starter's routes, the cache cap, the handsh
     const auth = { authorization: `Bearer ${secrets.CLOUDHAL_PURGE_TOKEN}` };
     const ok = await siteFetch("/__cloudhal/features", { headers: auth });
     expect(ok.status).toBe(200);
-    expect(await ok.json()).toEqual({ gates: 2 });
+    expect(await ok.json()).toEqual({ gates: 2, fields: 2 });
     expect(ok.headers.get("cloudflare-cdn-cache-control")).toBe("no-store");
     // Workers Cache caches responses without cache headers: every answer here says no-store
     const anonymous = await siteFetch("/__cloudhal/features");
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/README.md b/packages/cli/test/fixtures/theme-v0.8.0/README.md
new file mode 100644
index 00000000..d82fcb8f
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/README.md
@@ -0,0 +1,7 @@
+# Frozen theme: the blog starter as released in v0.8.0
+
+`src/` is `starters/blog/src` exactly as tagged `v0.8.0` (`git archive v0.8.0 starters/blog/src`). `test/old-theme-compat.test.ts` creates a project with today's `cloudhal init`, swaps its `src/` for this copy and builds it with today's packages.
+
+Why this copy: RFC-0045 step 3 taught the renderer reference and repeater fields — `entryFields` resolves references to cards of the targets the page's view shows and repeaters to their items, the sources gained `groupMembers` and `referencedBy`, and `EntryFields.astro` (which ships in the renderer) draws references as links and items as nested lists. Sites created with 0.8.0 keep this theme, which knows none of that: it must keep building, and its entry pages get the links and items from the renderer's component with no change of their own. See `../theme-v0.3.10/README.md` for the history of this test.
+
+**Never update this copy** to the current starter, and do not reformat it (Biome and the TypeScript check skip it): it stands for the themes that already exist in sites. Only `src/` is kept; `astro.config.mjs`, `tsconfig.json` and `public/` (fonts) come from the project `init` creates.
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/DESIGN.md b/packages/cli/test/fixtures/theme-v0.8.0/src/DESIGN.md
new file mode 100644
index 00000000..4492ef45
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/DESIGN.md
@@ -0,0 +1,42 @@
+## Brand
+The blog theme is an editorial theme: articles first, set in a calm reading column, with full-bleed bands for landing moments. It suits publications, newsrooms, journals and small company sites that publish.
+
+## Colors
+- Prefer the color tokens: `seed` (one color the palette is built from), `scheme` (tonal, vibrant, neutral, mono), `contrast` and `mode` (light, dark, or auto to follow the reader). The roles, light and dark, are derived and always meet WCAG contrast; get_design shows them.
+- Without a seed, four settings apply: `{color.brand}` (buttons, the brand band, accents), `{color.link}`, `{color.surface}` (the page) and `{color.text}`. Change colors with set_theme_settings, never by hand.
+- Bands and cards take a `surface`: `plain` (the page), `muted` (a soft step), `raised` (lifted, for cards), `inverse`, `brand` and `accent` (loud, their own text color), `gradient` and `mesh` (brand and accent light: one hero or call to action a page), and `dots`, `grid` or `noise` (quiet textures). Use loud surfaces at most twice a page. The older `tone` still works.
+- A band can have an `anchor` (e.g. `pricing`), so a menu or button can link to `#pricing`.
+
+## Typography
+- `typePairing` sets headings and text in fonts that go together: editorial (Fraunces and Inter) for publications, modern (Space Grotesk and Inter) for products, humanist (Source Sans) for friendly sites, technical (JetBrains Mono headings) for developer tools, classic (Source Serif) for literary or institutional sites. With `system`, the `font` setting chooses one family (system, serif, humanist or mono).
+- `typeScale` makes sizes fluid between phone and desktop: compact for dense, text-heavy sites; balanced for most; dramatic for landing pages with short, bold headlines.
+- Headings: one level-1 per page; level 2 for sections; level 3 inside cards. Keep headings under about 60 characters, in sentence case.
+
+## Layout
+- `radius` sets the corners: none for sober, institutional sites; small or medium for most; large for friendly ones; full for pill buttons (cards stay modest). `density` sets the room: compact for dense, text-heavy sites, cozy for most, airy for landing pages and portfolios.
+- The reading column is narrow (about 48rem). A `Band` with `width: wide` or `full` leaves it: use bands for heroes, feature grids, proof and calls to action, and keep long text in the column.
+- Good rhythm on a landing page: hero band (`gradient`, `mesh`, `inverse` or `brand`) → plain section → `muted` or `dots` band → plain section with `raised` cards → `brand` or `accent` band call to action. Use `spacing: xl` on hero bands and `l` elsewhere.
+- Grids: 2 or 3 columns for cards, 3 or 4 for stats. `Columns` with `ratio: 2-1` pairs text with an image or a quote.
+
+## Components
+- The theme styles every primitive. These look best: `Band`, `Columns`, `Grid`, `Card` (with an `Image` at `ratio: 16:9` first), `Stat`, `Quote`, `Tabs`, `Accordion`, and the blocks `testimonial`, `callout` and `faq`.
+- Buttons: one `variant: primary` per section; `secondary` or `ghost` for the rest.
+- A `Card` with `href` is a whole link: keep its text short (a heading and one sentence).
+- Tools (calculators): put the inputs (`NumberField`, `RadioGroup` with `variant: buttons`, `Checkbox`) in a `Card`, two or three to a `Grid` row, and the result as a `Stat` right below them.
+- Charts: a `Chart` sits in the reading column (or a `wide` band for dashboards), titled with what it shows ("Readers per month, 2026"), with a `caption` naming the source. Bar to compare, line over time, donut for parts of a whole.
+- Tables: a `Table` compares a few things across the same fields (plans, specs). The first column names the row; numbers align `end` with a `format`; `highlight` marks the recommended row. On phones rows become cards, so keep labels short.
+- Lists of articles come from the content list section or a surface entry source, not from copied titles.
+
+## Imagery
+- Carousels: a static hero band is the default. Use a `hero` `Carousel` only for two to five equal offers (same `aspect`, the strongest first); when the header is transparent over it, every slide opens with the same loud `Band`. Autoplay is off unless the site asks, and then `slow`. A `rail` carries logos, products or cards, a `gallery` photographs (with `thumbs`), `testimonials` quotes.
+- Photographs from the media library, landscape for heroes and cards (`16:9` or `4:3`), never the same image twice on a page. Alt text says what is in the picture, in the page's language.
+
+## Pages
+- Home (editorial): hero band with the publication's promise → content list of the newest articles → a `muted` band with two or three sections or categories as cards → newsletter or about call to action.
+- Landing: hero band → three to four features in a `Grid` → proof (`Stat` row or `testimonial`) → pricing (`Tabs` or `Toggle` with bound prices) → `faq` → call to action band.
+- About: one short paragraph of purpose → people or values as cards → contact call to action.
+
+## Don't
+- Don't stack three bands of the same surface, or three grids of cards, in a row.
+- Don't use placeholder text, `#` links or repeated images.
+- Don't put long articles in a surface: articles are entries with a markdown body.
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/blocks.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/blocks.ts
new file mode 100644
index 00000000..3c29dd24
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/blocks.ts
@@ -0,0 +1,45 @@
+/**
+ * This theme's block types (RFC-0015 §6): pure data, read by Studio, agents (`list_block_types`)
+ * and the store, and bundled by `cloudhal deploy`. Their components are in `theme.ts` (`blocks`).
+ *
+ * Names are plain English words shared by every theme (`testimonial`, `pricing-table`), never
+ * prefixed with the theme: content written under one theme renders under any other that defines
+ * the same name. The built-ins (`callout`, `button`, `embed`, `faq`) are reserved; restyle them
+ * through `blocks` in `theme.ts` instead.
+ *
+ * Keep this file data only, with type imports only: the CLI loads it on its own (Studio, agents,
+ * deploy) and checks every type, so it needs nothing from the project at run time.
+ */
+import type { BlockType } from "@cloudhal/core-ts/blocks";
+
+export const blockTypes: readonly BlockType[] = [
+  {
+    name: "testimonial",
+    title: { en: "Testimonial", tr: "Referans" },
+    description: {
+      en: "A quote from a reader or customer, with who said it.",
+      tr: "Bir okurdan ya da müşteriden alıntı ve kimin söylediği.",
+    },
+    icon: "Quotes",
+    category: "text",
+    where: ["section", "body"],
+    content: "markdown",
+    props: {
+      type: "object",
+      additionalProperties: false,
+      required: ["author"],
+      properties: {
+        author: { type: "string", minLength: 1, maxLength: 120, title: { en: "Name", tr: "Ad" } },
+        role: {
+          type: "string",
+          maxLength: 120,
+          title: { en: "Role or company", tr: "Unvan ya da şirket" },
+        },
+      },
+    },
+    example: {
+      props: { author: "Ada Lovelace", role: "Analyst" },
+      markdown: "This changed how we publish.",
+    },
+  },
+];
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/Archive.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Archive.astro
new file mode 100644
index 00000000..5a147890
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Archive.astro
@@ -0,0 +1,108 @@
+---
+/**
+ * A category or tag archive page (RFC-0002 §7): breadcrumb through the parent categories, the
+ * term's name, and on page 1 its image and intro (markdown through the safe renderer); then the
+ * page's posts and real `<a>` pagination links (every page is its own canonical URL).
+ */
+import { type ArchiveView, viewPagePath } from "@cloudhal/astro-renderer/archive";
+import { renderMarkdown, safeHref, safeSrc } from "@cloudhal/astro-renderer/markdown";
+import { imageAttributes, type MediaContext } from "@cloudhal/astro-renderer/media";
+import type { ThemeStrings } from "../theme.ts";
+import Breadcrumbs from "./Breadcrumbs.astro";
+import EntryList from "./EntryList.astro";
+
+interface Props {
+  archive: ArchiveView;
+  t: ThemeStrings;
+  /** Resolves the term image and `asset:` links in the intro (RFC-0004). */
+  media?: MediaContext;
+}
+const { archive, t, media } = Astro.props;
+const label = archive.term.labels[archive.locale];
+const kind =
+  archive.taxonomy.labels[archive.locale]?.singular ??
+  Object.values(archive.taxonomy.labels)[0]?.singular;
+const first = archive.page === 1;
+const intro = first && label?.description ? renderMarkdown(label.description, media) : undefined;
+const image = first && archive.term.image ? archive.term.image : undefined;
+const asset = image?.assetId ? media?.assets?.get(image.assetId) : undefined;
+const attrs =
+  asset && image
+    ? imageAttributes(asset, image, {
+        locale: archive.locale,
+        defaultLocale: media?.defaultLocale ?? archive.locale,
+        transform: media?.transform ?? "none",
+        ...(media?.budget ? { budget: media.budget } : {}),
+        sizes: "(min-width: 48rem) 48rem, 100vw",
+        priority: true,
+        ...(media?.preview ? { preview: true } : {}),
+      })
+    : undefined;
+const imageSrc = image && !attrs ? safeSrc(image.src) : undefined;
+// An author's page (RFC-0019 §1): their role and profile links (safe schemes only).
+const role = label?.role;
+const links = (archive.term.links ?? []).flatMap((l) => {
+  const href = safeHref(l.href);
+  return href ? [{ ...l, href }] : [];
+});
+const crumbs = [
+  { name: t.home, href: "/" },
+  ...archive.trail.map((s) => ({ name: s.name, href: s.href })),
+  { name: archive.shown.name },
+];
+---
+<section class="ch-archive" data-term-id={archive.term.id} data-taxonomy={archive.taxonomy.key}>
+  <Breadcrumbs label={t.breadcrumb} items={crumbs} />
+  <header class="ch-archive-header">
+    {kind && <p class="ch-archive-kind">{kind}</p>}
+    <h1>{archive.shown.name}</h1>
+    {role && <p class="ch-archive-role">{role}</p>}
+    {links.length > 0 && (
+      <ul class="ch-archive-links">
+        {links.map((l) => (
+          <li><a href={l.href} rel={l.external ? "me noopener noreferrer" : "me"}>{l.label}</a></li>
+        ))}
+      </ul>
+    )}
+    <p class="ch-archive-meta">
+      <span>{t.posts(archive.total)}</span>
+      {archive.feedPath && <a href={archive.feedPath}>{t.feed}</a>}
+    </p>
+    {attrs && (
+      <img
+        class="ch-archive-image"
+        src={attrs.src}
+        srcset={attrs.srcset}
+        sizes={attrs.sizes}
+        alt={attrs.alt}
+        width={attrs.width || undefined}
+        height={attrs.height || undefined}
+        decoding="async"
+        style={attrs.style}
+      />
+    )}
+    {image && imageSrc && (
+      <img
+        class="ch-archive-image"
+        src={imageSrc}
+        alt={image.alt}
+        width={image.width}
+        height={image.height}
+        decoding="async"
+      />
+    )}
+    {intro && <div class="ch-richtext" set:html={intro} />}
+  </header>
+  <EntryList entries={archive.entries} locale={archive.locale} media={media} />
+  {archive.pages > 1 && (
+    <nav aria-label={t.pagination} class="ch-pagination">
+      {archive.page > 1 ? (
+        <a href={viewPagePath(archive, archive.page - 1)} rel="prev">{t.newer}</a>
+      ) : <span />}
+      <span>{t.pageOf(archive.page, archive.pages)}</span>
+      {archive.page < archive.pages ? (
+        <a href={viewPagePath(archive, archive.page + 1)} rel="next">{t.older}</a>
+      ) : <span />}
+    </nav>
+  )}
+</section>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/Article.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Article.astro
new file mode 100644
index 00000000..3c0f1e68
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Article.astro
@@ -0,0 +1,110 @@
+---
+/**
+ * An article (RFC-0018 §3, the article view): kicker (the primary category), title, dek, byline
+ * (author, published, updated, reading time), cover, an "On this page" table of contents for
+ * longer pieces (headings carry ids; no JavaScript), then the body with the theme's own blocks and
+ * the corrections, newest first (RFC-0019 §2; the latest one is the "Updated" date). Collections
+ * with typed fields (RFC-0041 §9) show their values as a "Details" list under the cover.
+ */
+import { Body, EntryFields } from "@cloudhal/astro-renderer/components";
+import type { RenderedFields } from "@cloudhal/astro-renderer/fields";
+import { articleCorrections, articleOutline } from "@cloudhal/astro-renderer/kit";
+import { entryArticleParts } from "@cloudhal/astro-renderer/markdown";
+import type { MediaContext } from "@cloudhal/astro-renderer/media";
+import type { EntryTaxonomy } from "@cloudhal/astro-renderer/taxonomy";
+import type { ContentEntry } from "@cloudhal/core-contracts";
+import type { BlockType } from "@cloudhal/core-ts/blocks";
+import type { ThemeStrings } from "../theme.ts";
+
+interface Props {
+  entry: ContentEntry;
+  terms: EntryTaxonomy;
+  locale: string;
+  t: ThemeStrings;
+  media?: MediaContext;
+  blocks?: Record<string, unknown>;
+  blockTypes?: readonly BlockType[];
+  /** The entry's typed fields (`source.entryFields`); absent or empty draws nothing. */
+  fields?: RenderedFields;
+}
+const { entry, terms, locale, t, media, blocks, blockTypes, fields } = Astro.props;
+const parts = entryArticleParts(entry, locale, media);
+const outline = articleOutline(entry);
+const date = (iso: string) =>
+  new Date(iso).toLocaleDateString(locale, { year: "numeric", month: "long", day: "numeric" });
+const published = entry.publishedAt ?? undefined;
+const corrections = articleCorrections(entry);
+const newest = corrections.items[0];
+// "Updated": the latest correction; without one, only a real later edit, not the publish itself.
+const updated =
+  corrections.latest ??
+  (published && Date.parse(entry.updatedAt) - Date.parse(published) > 24 * 3600 * 1000
+    ? entry.updatedAt
+    : undefined);
+// RFC-0019 §1: the byline's authors link to their pages; without one, a person who wrote it.
+const authors = terms.authors;
+const author =
+  authors.length === 0 && entry.author.kind === "human" ? entry.author.name : undefined;
+---
+<article class="ch-article" data-entry-id={entry.id}>
+  <header class="ch-article-head">
+    {terms.section && (
+      terms.section.href ? (
+        <a class="ch-kicker" href={terms.section.href}>{terms.section.name}</a>
+      ) : (
+        <span class="ch-kicker">{terms.section.name}</span>
+      )
+    )}
+    <h1>{entry.title}</h1>
+    {entry.summary && <p class="ch-dek">{entry.summary}</p>}
+    <p class="ch-byline">
+      {authors.length > 0 && (
+        <span class="ch-byline__author">
+          {t.byPrefix}
+          {authors.map((a, i) => (
+            <Fragment>
+              {i > 0 && (i === authors.length - 1 ? t.and : ", ")}
+              {a.href ? <a href={a.href} rel="author">{a.name}</a> : a.name}
+            </Fragment>
+          ))}
+        </span>
+      )}
+      {author && <span class="ch-byline__author">{t.by(author)}</span>}
+      {published && <time datetime={published}>{date(published)}</time>}
+      {updated && <span>{t.updated(date(updated))}</span>}
+      {newest && <a href="#ch-corrections">{t.appended(t.correctionKind[newest.kind])}</a>}
+      <span>{t.minRead(outline.readingMinutes)}</span>
+    </p>
+  </header>
+  <Fragment set:html={parts.cover} />
+  {fields && <EntryFields fields={fields} label={t.details} />}
+  {outline.toc.length >= 3 && (
+    <details class="ch-toc" open>
+      <summary>{t.onThisPage}</summary>
+      <ol>
+        {outline.toc.map((item) => (
+          <li data-depth={item.depth}><a href={`#${item.id}`}>{item.text}</a></li>
+        ))}
+      </ol>
+    </details>
+  )}
+  <div class="ch-richtext">
+    <Body body={parts.body} media={parts.media} blocks={blocks} blockTypes={blockTypes} />
+  </div>
+  {newest && (
+    <section id="ch-corrections" class="ch-corrections" aria-labelledby="ch-corrections-title">
+      <h2 id="ch-corrections-title">{t.corrections}</h2>
+      <ol>
+        {corrections.items.map((c) => (
+          <li data-kind={c.kind}>
+            <p class="ch-correction__meta">
+              <strong>{t.correctionKind[c.kind]}</strong>
+              <time datetime={c.at}>{date(c.at)}</time>
+            </p>
+            <p class="ch-correction__note" set:html={c.html} />
+          </li>
+        ))}
+      </ol>
+    </section>
+  )}
+</article>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/Breadcrumbs.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Breadcrumbs.astro
new file mode 100644
index 00000000..1332f210
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Breadcrumbs.astro
@@ -0,0 +1,25 @@
+---
+/** `Home › … › current`: the visible twin of the `BreadcrumbList` JSON-LD in `<head>`. */
+interface Props {
+  label: string;
+  items: Array<{ name: string; href?: string | undefined }>;
+}
+const { label, items } = Astro.props;
+---
+{items.length > 1 && (
+  <nav aria-label={label} class="ch-breadcrumbs">
+    <ol>
+      {items.map((item, i) => (
+        <li>
+          {i === items.length - 1 ? (
+            <span aria-current="page">{item.name}</span>
+          ) : item.href ? (
+            <a href={item.href}>{item.name}</a>
+          ) : (
+            <span>{item.name}</span>
+          )}
+        </li>
+      ))}
+    </ol>
+  </nav>
+)}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/EntryList.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/EntryList.astro
new file mode 100644
index 00000000..702fa453
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/EntryList.astro
@@ -0,0 +1,54 @@
+---
+/**
+ * A list of articles as cards: cover thumbnail (when the article has one), title, summary,
+ * publication date and reading time.
+ */
+import { readingMinutes } from "@cloudhal/astro-renderer/kit";
+import { renderBody } from "@cloudhal/astro-renderer/markdown";
+import { imageAttributes, type MediaContext } from "@cloudhal/astro-renderer/media";
+import { entryPath } from "@cloudhal/astro-renderer/routing";
+import type { ContentEntry } from "@cloudhal/core-contracts";
+import { strings } from "../theme.ts";
+
+interface Props {
+  entries: ContentEntry[];
+  locale: string;
+  media?: MediaContext | undefined;
+}
+const { entries, locale, media } = Astro.props;
+const t = strings(locale);
+const date = (iso: string) =>
+  new Date(iso).toLocaleDateString(locale, { year: "numeric", month: "long", day: "numeric" });
+const cover = (e: ContentEntry) => {
+  const asset = e.coverImage?.assetId ? media?.assets?.get(e.coverImage.assetId) : undefined;
+  if (!asset || !e.coverImage) return undefined;
+  return imageAttributes(asset, e.coverImage, {
+    locale,
+    defaultLocale: media?.defaultLocale ?? locale,
+    transform: media?.transform ?? "none",
+    ...(media?.budget ? { budget: media.budget } : {}),
+    sizes: "12rem",
+    ...(media?.preview ? { preview: true } : {}),
+  });
+};
+---
+<ul class="ch-entrylist">
+  {entries.map((e) => {
+    const img = cover(e);
+    return (
+      <li class="ch-card-entry" data-has-cover={img ? "yes" : undefined}>
+        {img && (
+          <img class="ch-card-entry__cover" src={img.src} srcset={img.srcset} sizes={img.sizes} alt="" width={img.width || undefined} height={img.height || undefined} loading="lazy" decoding="async" />
+        )}
+        <div class="ch-card-entry__body">
+          <a href={entryPath(media?.permalinks, e)}>{e.title}</a>
+          {e.summary && <p>{e.summary}</p>}
+          <span class="ch-card-entry__meta">
+            {e.publishedAt && <time datetime={e.publishedAt}>{date(e.publishedAt)}</time>}
+            <span>{t.minRead(readingMinutes(renderBody(e.body)))}</span>
+          </span>
+        </div>
+      </li>
+    );
+  })}
+</ul>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/LatestPosts.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/LatestPosts.astro
new file mode 100644
index 00000000..0be2773d
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/LatestPosts.astro
@@ -0,0 +1,30 @@
+---
+/**
+ * The theme's content list section (`components.contentList` in theme.ts): the section's entries
+ * sorted and trimmed as it asks, drawn as cards.
+ */
+import type { MediaContext } from "@cloudhal/astro-renderer/media";
+import type { ContentEntry, ContentListSection } from "@cloudhal/core-contracts";
+import EntryList from "./EntryList.astro";
+
+interface Props {
+  section: ContentListSection;
+  entries: ContentEntry[];
+  media?: MediaContext;
+}
+const { section, entries, media } = Astro.props;
+const at = (e: ContentEntry) => e.publishedAt ?? e.createdAt;
+const sorted = [...entries]
+  .sort((a, b) =>
+    section.sort === "title"
+      ? a.title.localeCompare(b.title)
+      : section.sort === "oldest"
+        ? at(a).localeCompare(at(b))
+        : at(b).localeCompare(at(a)),
+  )
+  .slice(0, section.limit);
+const locale = media?.locale ?? sorted[0]?.locale ?? "en";
+---
+<section class="ch-contentlist" data-section-id={section.id} data-kind="contentList" data-collection={section.collection}>
+  <EntryList entries={sorted} locale={locale} media={media} />
+</section>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/MenuPanel.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/MenuPanel.astro
new file mode 100644
index 00000000..d4dc5aea
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/MenuPanel.astro
@@ -0,0 +1,46 @@
+---
+/**
+ * The phone menu's content (RFC-0025 §2), in the header's disclosure, its drawer or full-screen
+ * dialog, and the `/menu` page: the header's menu with its groups as disclosures, the second menu,
+ * and the search form where the deployment answers searches.
+ */
+import type { ActiveNavItem } from "@cloudhal/astro-renderer/navigation";
+import NavLink from "./NavLink.astro";
+import NavMenu from "./NavMenu.astro";
+
+interface Props {
+  nav: ActiveNavItem[];
+  utility: ActiveNavItem[];
+  search?: { label: string; placeholder: string; button: string; query?: string } | undefined;
+  words: { main: string; secondary: string };
+  /** Keeps ids unique when the panel shows twice on a page. */
+  idSuffix: string;
+  /** RFC-0026 26c: the site's icon weight. */
+  iconWeight?: string | undefined;
+}
+const { nav, utility, search, words, idSuffix, iconWeight } = Astro.props;
+const link = { on: "ch-menu__current", off: "" };
+---
+<div class="ch-menu__panel">
+  {search && (
+    <form class="ch-menu__search" method="get" action="/search" role="search">
+      <label for={`ch-q-${idSuffix}`} class="sr-only">{search.label}</label>
+      <input id={`ch-q-${idSuffix}`} type="search" name="q" value={search.query ?? ""} maxlength="200" placeholder={search.placeholder} />
+      <button type="submit" class="sr-only">{search.button}</button>
+    </form>
+  )}
+  {nav.length > 0 && (
+    <nav aria-label={words.main} class="ch-menu__nav">
+      <ul>
+        {nav.map((item) => <li>{item.children.length > 0 ? <NavMenu item={item} {...link} iconWeight={iconWeight} /> : <NavLink item={item} {...link} />}</li>)}
+      </ul>
+    </nav>
+  )}
+  {utility.length > 0 && (
+    <nav aria-label={words.secondary} class="ch-menu__nav ch-menu__nav--small">
+      <ul>
+        {utility.map((item) => <li><NavLink item={item} {...link} /></li>)}
+      </ul>
+    </nav>
+  )}
+</div>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/NavLink.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/NavLink.astro
new file mode 100644
index 00000000..ed3355bc
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/NavLink.astro
@@ -0,0 +1,27 @@
+---
+/**
+ * One navigation link (RFC-0003 §7.3). `aria-current` is `page` on the exact match and `true` on a
+ * prefix or context match. External links never pass referrer or opener; only `newTab` opens one.
+ * A group shown without its children (past the theme's depth) is plain text.
+ */
+import type { ActiveNavItem } from "@cloudhal/astro-renderer/navigation";
+
+interface Props {
+  item: ActiveNavItem;
+  /** Classes for the current (or in-trail) link and for the others. */
+  on: string;
+  off: string;
+}
+const { item, on, off } = Astro.props;
+---
+{item.href === undefined ? (
+  <span>{item.label}</span>
+) : (
+  <a
+    href={item.href}
+    aria-current={item.current}
+    class={(item.current || item.inTrail ? on : off) || undefined}
+    rel={item.external ? "noopener noreferrer" : undefined}
+    target={item.newTab ? "_blank" : undefined}
+  >{item.label}</a>
+)}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/NavMenu.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/NavMenu.astro
new file mode 100644
index 00000000..19408e0a
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/NavMenu.astro
@@ -0,0 +1,95 @@
+---
+/**
+ * An item with children as a disclosure (`<details>`, no JavaScript): the item's link (or a group's
+ * label) as the summary, its children below. Renders up to three levels; deeper items are left out
+ * (the menu's `maxDepth` is data, the theme decides what it shows). The active trail starts open.
+ * In the header's bar (`popover`, RFC-0025 §2) a group opens as a popover under its button instead,
+ * so it never pushes the bar: the browser opens and closes it (Escape, a click elsewhere) with no
+ * script, and a disclosure button never becomes `role=menu`. A top-level item with `display: mega`
+ * (RFC-0025 25d) opens one wide panel under the header instead: each child group is a column of its
+ * links (a child with no children of its own joins a first column of links).
+ */
+import type { ActiveNavItem } from "@cloudhal/astro-renderer/navigation";
+import { renderIcon } from "@cloudhal/core-ts/icons";
+import { iconSet } from "../icons.ts";
+import NavLink from "./NavLink.astro";
+
+interface Props {
+  item: ActiveNavItem;
+  on: string;
+  off: string;
+  /** 1 for a top-level item. */
+  level?: number;
+  /** A popover under a button (the header's bar), with this id. */
+  popover?: string | undefined;
+  /** RFC-0026 26c: the site's icon weight. */
+  iconWeight?: string | undefined;
+}
+const { item, on, off, level = 1, popover, iconWeight } = Astro.props;
+const icon = (name: string, className?: string) =>
+  renderIcon(name, { className, weight: iconWeight, set: iconSet });
+const MAX_LEVEL = 3;
+const mega = popover !== undefined && level === 1 && item.display === "mega";
+const columns = mega ? item.children.filter((c) => c.children.length > 0) : [];
+const loose = mega ? item.children.filter((c) => c.children.length === 0) : [];
+---
+{popover ? (
+  <div class="ch-nav-menu" data-popover="">
+    {item.href && <NavLink item={item} on={on} off={off} />}
+    <button
+      type="button"
+      class:list={["ch-nav-menu__btn", item.current || item.inTrail ? on : off]}
+      popovertarget={popover}
+      aria-label={item.href ? item.label : undefined}
+    >{!item.href && item.label}<Fragment set:html={icon("chevron-down")} /></button>
+    <div popover="auto" id={popover} class:list={["ch-nav-menu__pop", mega && "ch-nav-menu__pop--mega"]}>
+      {mega ? (
+        <div class="ch-mega">
+          {loose.length > 0 && (
+            <ul class="ch-mega__col">
+              {loose.map((c) => <li><NavLink item={c} on={on} off={off} /></li>)}
+            </ul>
+          )}
+          {columns.map((col) => (
+            <div class="ch-mega__col">
+              <p class="ch-mega__heading">{col.href ? <NavLink item={col} on={on} off={off} /> : col.label}</p>
+              <ul>
+                {col.children.map((c) => <li><NavLink item={c} on={on} off={off} /></li>)}
+              </ul>
+            </div>
+          ))}
+        </div>
+      ) : (
+      <ul>
+        {item.children.map((child) => (
+          <li>
+            {child.children.length > 0 && level + 1 < MAX_LEVEL ? (
+              <Astro.self item={child} on={on} off={off} level={level + 1} iconWeight={iconWeight} />
+            ) : (
+              <NavLink item={child} on={on} off={off} />
+            )}
+          </li>
+        ))}
+      </ul>
+      )}
+    </div>
+  </div>
+) : (
+<details class="ch-nav-menu" open={item.inTrail && level > 1 ? true : undefined}>
+  <summary class={(item.current || item.inTrail ? on : off) || undefined}>
+    {item.href ? <NavLink item={item} on={on} off={off} /> : <span>{item.label}</span>}
+    <Fragment set:html={icon("chevron-down", "ch-nav-menu__caret")} />
+  </summary>
+  <ul>
+    {item.children.map((child) => (
+      <li>
+        {child.children.length > 0 && level + 1 < MAX_LEVEL ? (
+          <Astro.self item={child} on={on} off={off} level={level + 1} iconWeight={iconWeight} />
+        ) : (
+          <NavLink item={child} on={on} off={off} />
+        )}
+      </li>
+    ))}
+  </ul>
+</details>
+)}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/NotFound.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/NotFound.astro
new file mode 100644
index 00000000..058c0d48
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/NotFound.astro
@@ -0,0 +1,27 @@
+---
+/**
+ * The built-in not-found page (404), in the reader's language: drawn when the site has no page at
+ * `/404` in that language (`@cloudhal/astro-renderer/not-found`). A link home, and the search form
+ * where the deployment answers searches; the middleware keeps both in the page's locale.
+ */
+import type { ThemeStrings } from "../theme.ts";
+
+interface Props {
+  t: ThemeStrings;
+  /** Show the search form (the deployment answers `/search`). */
+  search: boolean;
+}
+const { t, search } = Astro.props;
+---
+<section class="ch-not-found ch-search" aria-labelledby="ch-not-found-title">
+  <h1 id="ch-not-found-title">{t.notFoundTitle}</h1>
+  <p class="ch-not-found-text">{t.notFoundText}</p>
+  {search && (
+    <form class="ch-search-form" method="get" action="/search" role="search">
+      <label for="ch-not-found-q" class="ch-not-found-prompt">{t.notFoundSearch}</label>
+      <input id="ch-not-found-q" type="search" name="q" maxlength="200" placeholder={t.searchPlaceholder} autocomplete="off" />
+      <button type="submit">{t.search}</button>
+    </form>
+  )}
+  <p class="ch-not-found-home"><a href="/">{t.notFoundHome}</a></p>
+</section>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/PostTerms.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/PostTerms.astro
new file mode 100644
index 00000000..1605b048
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/PostTerms.astro
@@ -0,0 +1,33 @@
+---
+/** An article's public categories and tags as chips linking to their archives. */
+import type { EntryTaxonomy } from "@cloudhal/astro-renderer/taxonomy";
+
+interface Props {
+  taxonomy: EntryTaxonomy;
+  locale: string;
+}
+const { taxonomy, locale } = Astro.props;
+// Authors are the byline (RFC-0019 §1), not chips.
+const groups = taxonomy.groups.filter((g) => g.taxonomy.key !== "author");
+---
+{groups.length > 0 && (
+  <div class="ch-terms">
+    {groups.map((group) => (
+      <ul
+        class="ch-terms__group"
+        data-taxonomy={group.taxonomy.key}
+        aria-label={group.taxonomy.labels[locale]?.plural ?? group.taxonomy.key}
+      >
+        {group.terms.map((term) => (
+          <li>
+            {term.href ? (
+              <a class="ch-chip" href={term.href} rel="tag">{term.name}</a>
+            ) : (
+              <span class="ch-chip">{term.name}</span>
+            )}
+          </li>
+        ))}
+      </ul>
+    ))}
+  </div>
+)}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/RelatedPosts.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/RelatedPosts.astro
new file mode 100644
index 00000000..73905ce6
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/RelatedPosts.astro
@@ -0,0 +1,20 @@
+---
+/** "Related posts" under an article (`relatedEntries`: shared primary category or tags). */
+import type { MediaContext } from "@cloudhal/astro-renderer/media";
+import type { ContentEntry } from "@cloudhal/core-contracts";
+import EntryList from "./EntryList.astro";
+
+interface Props {
+  title: string;
+  entries: ContentEntry[];
+  locale: string;
+  media?: MediaContext | undefined;
+}
+const { title, entries, locale, media } = Astro.props;
+---
+{entries.length > 0 && (
+  <aside class="ch-related" aria-labelledby="ch-related-title">
+    <h2 id="ch-related-title">{title}</h2>
+    <EntryList entries={entries} locale={locale} media={media} />
+  </aside>
+)}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/Search.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Search.astro
new file mode 100644
index 00000000..59637bea
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/Search.astro
@@ -0,0 +1,57 @@
+---
+/**
+ * The search page (RFC-0019 §3, RFC-0029 §2): an ordinary `<form method="get">` (no JavaScript),
+ * the results with their snippets (escaped text, matches in `<mark>`), and real links between
+ * result pages.
+ * Pages, topics and authors are found too; a topic or author shows its taxonomy ("Category").
+ * Rendered only by deployments that answer searches; the page is never cached and never indexed.
+ */
+import { type SearchView, searchPageHref, snippetHtml } from "@cloudhal/astro-renderer/search";
+import type { ThemeStrings } from "../theme.ts";
+
+interface Props {
+  search: SearchView;
+  locale: string;
+  t: ThemeStrings;
+}
+const { search, locale, t } = Astro.props;
+const date = (iso: string) =>
+  new Date(iso).toLocaleDateString(locale, { year: "numeric", month: "long", day: "numeric" });
+---
+<section class="ch-search" aria-labelledby="ch-search-title">
+  <h1 id="ch-search-title">{t.search}</h1>
+  <form class="ch-search-form" method="get" action="/search" role="search">
+    <label for="ch-search-q" class="sr-only">{t.searchLabel}</label>
+    <input id="ch-search-q" type="search" name="q" value={search.query} maxlength="200" placeholder={t.searchPlaceholder} autocomplete="off" />
+    <button type="submit">{t.search}</button>
+  </form>
+  {search.stale && <p class="ch-search-note" role="status">{t.searchUpdating}</p>}
+  {search.query && (
+    <p class="ch-search-summary" role="status">
+      {search.total > 0 ? t.searchResults(search.total, search.query) : t.searchNone(search.query)}
+    </p>
+  )}
+  {search.hits.length > 0 && (
+    <ol class="ch-search-results">
+      {search.hits.map((hit) => (
+        <li data-entry-id={hit.nodeId} data-kind={hit.kind ?? "article"}>
+          {hit.context && <p class="ch-search-context">{hit.context}</p>}
+          <h2><a href={hit.href}>{hit.title}</a></h2>
+          {hit.snippet && <p class="ch-search-snippet" set:html={snippetHtml(hit.snippet)} />}
+          {hit.publishedAt && <time datetime={hit.publishedAt}>{date(hit.publishedAt)}</time>}
+        </li>
+      ))}
+    </ol>
+  )}
+  {search.pages > 1 && (
+    <nav aria-label={t.pagination} class="ch-pagination">
+      {search.page > 1 ? (
+        <a href={searchPageHref(search.query, search.page - 1)} rel="prev">{t.previous}</a>
+      ) : <span />}
+      <span>{t.pageOf(search.page, search.pages)}</span>
+      {search.page < search.pages ? (
+        <a href={searchPageHref(search.query, search.page + 1)} rel="next">{t.next}</a>
+      ) : <span />}
+    </nav>
+  )}
+</section>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/SearchDialog.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/SearchDialog.astro
new file mode 100644
index 00000000..3c565a40
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/SearchDialog.astro
@@ -0,0 +1,46 @@
+---
+/**
+ * The search modal (RFC-0029 §6): markup and words only; `/_cloudhal/search.1.js` wires it. Without
+ * the script the dialog never opens and the header form goes to `/search`. Inside, a form still
+ * goes to `/search` on Enter when no result is chosen.
+ */
+import { SEARCH_JSON_PATH, SEARCH_PATH } from "@cloudhal/astro-renderer/search";
+import type { ThemeStrings } from "../theme.ts";
+
+interface Props {
+  label: string;
+  placeholder: string;
+  words: ThemeStrings["searchModal"];
+}
+const { label, placeholder, words } = Astro.props;
+const data = {
+  kinds: words.kinds,
+  all: words.all,
+  none: words.none,
+  recent: words.recent,
+  clear: words.clear,
+  limited: words.limited,
+  error: words.error,
+  updating: words.updating,
+  count: words.count,
+};
+---
+<dialog id="ch-search" class="ch-search-dialog" aria-label={label} data-ch-search data-endpoint={SEARCH_JSON_PATH} data-page={SEARCH_PATH} data-words={JSON.stringify(data)}>
+  <div class="ch-search-dialog__panel">
+    <form class="ch-search-dialog__bar" method="get" action={SEARCH_PATH} role="search">
+      <label for="ch-search-dialog-q" class="sr-only">{label}</label>
+      <input id="ch-search-dialog-q" type="search" name="q" maxlength="200" autocomplete="off" spellcheck="false" placeholder={placeholder} data-ch-search-input />
+      <button type="button" class="ch-search-dialog__close" data-ch-search-close>{words.close}</button>
+    </form>
+    <div class="ch-search-dialog__body">
+      <div id="ch-search-list" class="ch-search-dialog__list" role="listbox" aria-label={label} data-ch-search-list></div>
+      <p class="ch-search-dialog__note" data-ch-search-note hidden></p>
+    </div>
+    <p class="ch-search-dialog__keys" aria-hidden="true">
+      <span><kbd>↑</kbd><kbd>↓</kbd> {words.keys.move}</span>
+      <span><kbd>↵</kbd> {words.keys.open}</span>
+      <span><kbd>esc</kbd> {words.keys.close}</span>
+    </p>
+    <p class="sr-only" role="status" aria-live="polite" data-ch-search-status></p>
+  </div>
+</dialog>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/components/blocks/Testimonial.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/components/blocks/Testimonial.astro
new file mode 100644
index 00000000..80d8c601
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/components/blocks/Testimonial.astro
@@ -0,0 +1,18 @@
+---
+/**
+ * The `testimonial` block (src/blocks.ts), in sections and inside bodies. `contentHtml` is the
+ * quote, already rendered by Cloudhal's safe markdown renderer; props were checked first.
+ */
+interface Props {
+  props: { author?: string; role?: string };
+  contentHtml?: string;
+}
+const { props, contentHtml = "" } = Astro.props;
+---
+<figure class="testimonial">
+  <blockquote set:html={contentHtml} />
+  <figcaption>
+    <span class="testimonial__author">{props.author}</span>
+    {props.role && <span class="testimonial__role">{props.role}</span>}
+  </figcaption>
+</figure>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/env.d.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/env.d.ts
new file mode 100644
index 00000000..61e0b265
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/env.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="astro/client" />
+declare module "virtual:cloudhal/config" {
+  const config: import("@cloudhal/astro-renderer").CloudhalRendererConfig;
+  export default config;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/fonts.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/fonts.ts
new file mode 100644
index 00000000..9d982122
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/fonts.ts
@@ -0,0 +1,31 @@
+/**
+ * The font files each pairing (RFC-0023 §2, `typePairing` in settings.ts) needs first: its latin
+ * subsets, preloaded by layouts/Base.astro so headings do not swap late. The latin-ext files
+ * (Turkish and other accented letters) load on demand through fonts.css's unicode ranges.
+ */
+export const PAIRING_PRELOADS: Readonly<Record<string, readonly string[]>> = {
+  editorial: [
+    "/fonts/v1/fraunces-latin-wght-normal.woff2",
+    "/fonts/v1/inter-latin-wght-normal.woff2",
+  ],
+  modern: [
+    "/fonts/v1/space-grotesk-latin-wght-normal.woff2",
+    "/fonts/v1/inter-latin-wght-normal.woff2",
+  ],
+  humanist: ["/fonts/v1/source-sans-3-latin-wght-normal.woff2"],
+  technical: [
+    "/fonts/v1/jetbrains-mono-latin-wght-normal.woff2",
+    "/fonts/v1/inter-latin-wght-normal.woff2",
+  ],
+  classic: ["/fonts/v1/source-serif-4-latin-wght-normal.woff2"],
+};
+
+/**
+ * The same preloads as a `Link` response header. On a Cloudflare zone with Early Hints on, the
+ * edge sends it as a 103 before the page, so the fonts load while the Worker is still rendering.
+ */
+export function fontLinkHeader(hrefs: readonly string[]): string {
+  return hrefs
+    .map((h) => `<${h}>; rel=preload; as=font; type="font/woff2"; crossorigin`)
+    .join(", ");
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/icons.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/icons.ts
new file mode 100644
index 00000000..dab0bad8
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/icons.ts
@@ -0,0 +1,12 @@
+/**
+ * The theme's own icon drawings (RFC-0026 26d): names of the curated set this theme draws itself.
+ * Empty: every icon is Phosphor's, in the site's weight. `defineIconSet` checks each drawing
+ * (shapes only, `currentColor`), so an icon can never carry markup, links or scripts into pages.
+ *
+ *   export const iconSet = defineIconSet({
+ *     star: { viewBox: "0 0 24 24", body: '<path d="M12 2l3 7h7l-6 4 2 7-6-4-6 4 2-7-6-4h7z"/>' },
+ *   });
+ */
+import { defineIconSet } from "@cloudhal/core-ts/icons";
+
+export const iconSet = defineIconSet({});
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/layouts/Base.astro b/packages/cli/test/fixtures/theme-v0.8.0/src/layouts/Base.astro
new file mode 100644
index 00000000..c456aca0
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/layouts/Base.astro
@@ -0,0 +1,426 @@
+---
+import { CHROME_SCRIPT } from "@cloudhal/astro-renderer/chrome";
+import { SeoHead } from "@cloudhal/astro-renderer/components";
+import type { ActiveNavItem } from "@cloudhal/astro-renderer/navigation";
+import { PREFS_SCRIPT } from "@cloudhal/astro-renderer/prefs";
+import { SEARCH_SCRIPT } from "@cloudhal/astro-renderer/search-client";
+import type { HeadMeta } from "@cloudhal/astro-renderer/seo";
+import { themeVariables } from "@cloudhal/astro-renderer/theme-settings";
+import type { Site } from "@cloudhal/core-contracts";
+import { copyrightText, type ResolvedChrome, resolveChrome } from "@cloudhal/core-ts/chrome";
+import { renderIcon } from "@cloudhal/core-ts/icons";
+import MenuPanel from "../components/MenuPanel.astro";
+import NavLink from "../components/NavLink.astro";
+import NavMenu from "../components/NavMenu.astro";
+import SearchDialog from "../components/SearchDialog.astro";
+import { PAIRING_PRELOADS } from "../fonts.ts";
+import { iconSet } from "../icons.ts";
+import { themeSettings } from "../settings.ts";
+import type { ThemeStrings } from "../theme.ts";
+import "../styles/global.css";
+
+interface Props {
+  site: Site;
+  meta: HeadMeta;
+  /** The `primary` menu, or the derived header when the site has none (RFC-0003 §7.3). */
+  nav: ActiveNavItem[];
+  /** The `footer` menu; undefined keeps the default footer links. */
+  footer?: ActiveNavItem[] | undefined;
+  /** A preview of an embargoed or expired page or entry says so above it (RFC-0008 §7.3). */
+  notice?: { state: string; at: string; text: string } | undefined;
+  /** RFC-0019 §3: the header's search form, where the deployment answers searches. */
+  search?:
+    | {
+        label: string;
+        placeholder: string;
+        button: string;
+        query?: string;
+        /** RFC-0029 §6: the search modal's words; the header field opens it. */
+        modal?: ThemeStrings["searchModal"];
+      }
+    | undefined;
+  /** RFC-0024 §1: the page's own motion level, over the site's. */
+  motion?: string | undefined;
+  /** RFC-0025: the page's header and footer (`resolveChrome`), and the menus they name by key. */
+  chrome?: ResolvedChrome | undefined;
+  menus?: Record<string, ActiveNavItem[] | undefined> | undefined;
+  /** The chrome's own words, in the page's language. */
+  words?:
+    | {
+        skip: string;
+        main: string;
+        secondary: string;
+        menu: string;
+        closeMenu: string;
+        footer: string;
+        legal: string;
+        social: string;
+        credit: string;
+      }
+    | undefined;
+  /** RFC-0025 25d: the bars' and toasts' words, in the page's language. */
+  barWords?: Record<(typeof BAR_WORDS)[number], string> | undefined;
+  /**
+   * RFC-0033 §4: the reader's notice on a machine translation or a page shown in its original
+   * language, with a link to the original.
+   */
+  translation?:
+    | { text: string; original?: { href: string; text: string; lang: string } }
+    | undefined;
+  /** RFC-0033 §4: the language switcher: each language's name in itself and its URL here. */
+  languages?:
+    | {
+        label: string;
+        items: Array<{ locale: string; name: string; href: string; current: boolean }>;
+      }
+    | undefined;
+}
+const BAR_WORDS = [
+  "announcement",
+  "dismiss",
+  "privacy",
+  "consentNotice",
+  "consentChoices",
+  "consentOk",
+  "consentAll",
+  "consentEssential",
+  "privacyPolicy",
+  "copied",
+  "linkCopied",
+] as const;
+const {
+  site,
+  meta,
+  nav,
+  footer,
+  notice,
+  search,
+  motion,
+  menus = {},
+  words,
+  barWords,
+  translation,
+  languages,
+} = Astro.props;
+const chrome = Astro.props.chrome ?? resolveChrome(site);
+const h = chrome.header;
+const f = chrome.footer;
+const w = words ?? {
+  skip: "Skip to content",
+  main: "Main",
+  secondary: "Secondary",
+  menu: "Menu",
+  closeMenu: "Close menu",
+  footer: "Footer",
+  legal: "Legal",
+  social: "Social links",
+  credit: "Built with Cloudhal",
+};
+// The header's menu: the primary menu (or the derived header without one), else the one it names.
+const headerNav = h.nav === "primary" ? nav : (menus[h.nav] ?? []);
+const utilityNav = h.utility ? (menus[h.utility] ?? []) : [];
+const legalNav = f.legal ? (f.legal === "footer" ? footer : menus[f.legal]) : undefined;
+const brand = site.brand;
+const SOCIAL: Record<string, string> = {
+  x: "X",
+  bluesky: "Bluesky",
+  mastodon: "Mastodon",
+  github: "GitHub",
+  linkedin: "LinkedIn",
+  instagram: "Instagram",
+  facebook: "Facebook",
+  youtube: "YouTube",
+  tiktok: "TikTok",
+  threads: "Threads",
+  rss: "RSS",
+  email: "Email",
+};
+const social = f.social ? (brand?.social ?? []) : [];
+const safe = (href: string) => (/^(https?:|mailto:|\/(?!\/)|#)/i.test(href) ? href : "#");
+// The actions this page can show (search only where the deployment answers searches).
+const actions = h.actions.filter((a) =>
+  a.kind === "button"
+    ? a.label && a.href
+    : a.kind === "locale"
+      ? languages
+      : a.kind === "search" && search,
+);
+// Without a header switcher, a multilingual site lists its languages in the footer (RFC-0033).
+const footerLanguages =
+  languages && !actions.some((a) => a.kind === "locale") ? languages : undefined;
+// The bar collapses into the phone menu below `collapseAt` (always for the minimal layout).
+const collapse = h.layout === "minimal" ? "always" : h.collapseAt;
+const dialog =
+  h.mobileStyle === "drawer-start" ||
+  h.mobileStyle === "drawer-end" ||
+  h.mobileStyle === "fullscreen";
+const searchAction = actions.some((a) => a.kind === "search") ? search : undefined;
+// The chrome module, only where the header needs it (RFC-0025 §2): without it everything works.
+// RFC-0025 25d: the bars, and the words they and the toasts speak.
+const bw = barWords ?? {
+  announcement: "Announcement",
+  dismiss: "Dismiss",
+  privacy: "Privacy",
+  consentNotice: "This site keeps only what it needs to work: no tracking cookies.",
+  consentChoices: "Some parts of this site can load content from other services (videos, maps).",
+  consentOk: "OK",
+  consentAll: "Allow all",
+  consentEssential: "Only essential",
+  privacyPolicy: "Privacy policy",
+  copied: "Copied",
+  linkCopied: "Link copied",
+};
+const announce = chrome.announcement;
+const consent = chrome.consent.mode !== "none" ? chrome.consent : undefined;
+// Read before the body paints, so a closed bar is never drawn (the edge cache ignores cookies).
+const needsPrefs = Boolean(announce?.dismissible || consent);
+const needsScript =
+  needsPrefs ||
+  (!h.hidden &&
+    (h.behavior !== "static" ||
+      h.shrink ||
+      h.transparent ||
+      dialog ||
+      headerNav.some((i) => i.children.length > 0)));
+const copyright = f.copyright
+  ? copyrightText(f.copyright, site.name, new Date().getFullYear())
+  : undefined;
+// RFC-0026: icons in the site's weight (26c), the theme's own drawings over the set's (26d).
+const iconWeight = String(site.theme.config?.iconWeight ?? "regular");
+const icon = (name: string, o: { label?: string; className?: string } = {}) =>
+  renderIcon(name, { ...o, weight: iconWeight, set: iconSet });
+// The site's design settings (RFC-0017 §1): typed values only, defaults where unset.
+const look = themeVariables(site, themeSettings);
+// A page's own motion level wins over the site's (RFC-0024 §1).
+if (
+  motion &&
+  ["none", "subtle", "standard", "expressive"].includes(motion) &&
+  look.attributes["data-ch-motion"]
+)
+  look.attributes["data-ch-motion"] = motion;
+const fonts = PAIRING_PRELOADS[look.attributes["data-ch-type-pairing"] ?? ""] ?? [];
+const header = { on: "text-zinc-900", off: "hover:text-zinc-900" };
+const below = { on: "text-zinc-700", off: "hover:text-zinc-700" };
+---
+<!doctype html>
+<html lang={meta.lang} dir={meta.dir ?? "ltr"} {...look.attributes} data-ch-announcement={announce?.dismissible ? announce.id : undefined}>
+  <head>
+    {/* is:inline keeps it a classic script where it is: it must run before the body paints. */}
+    {needsPrefs && <script is:inline src={PREFS_SCRIPT.path}></script>}
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <SeoHead meta={meta} />
+    {/* public/: static assets, answered before the Site Worker runs (no render, no analytics event) */}
+    <link rel="icon" href="/favicon.ico" sizes="32x32" />
+    <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
+    <meta name="generator" content="Cloudhal" />
+    {fonts.map((href) => <link rel="preload" href={href} as="font" type="font/woff2" crossorigin />)}
+    {look.style && <style set:html={look.style} />}
+  </head>
+  <body class="ch-body min-h-screen antialiased">
+    <a class="ch-skip" href="#main">{w.skip}</a>
+    {announce && (
+      <div class="ch-announcement" data-tone={announce.tone} role="region" aria-label={bw.announcement}>
+        <p class="ch-announcement__text">
+          {announce.text}
+          {announce.link && <a href={safe(announce.link.href)}>{announce.link.label}</a>}
+        </p>
+        {announce.dismissible && (
+          <button type="button" class="ch-announcement__close" data-ch-dismiss={announce.id} aria-label={bw.dismiss} hidden>
+            <Fragment set:html={icon("close")} />
+          </button>
+        )}
+      </div>
+    )}
+    {!h.hidden && (
+      <header
+        class="ch-header"
+        data-layout={h.layout}
+        data-behavior={h.behavior}
+        data-width={h.width}
+        data-surface={h.surface}
+        data-collapse={collapse}
+        data-shrink={h.shrink ? "" : undefined}
+        data-transparent={h.transparent ? "" : undefined}
+        data-over={h.transparent ? h.over : undefined}
+      >
+        <div class="ch-header__inner">
+          <a href="/" class="ch-header__brand">
+            {brand?.logo ? (
+              <Fragment>
+                <img class="ch-logo" data-size={brand.logoHeight ?? "m"} data-variant={brand.logoDark ? "light" : undefined} src={brand.logo.src} alt={brand.logo.alt || site.name} />
+                {brand.logoDark && <img class="ch-logo" data-size={brand.logoHeight ?? "m"} data-variant="dark" src={brand.logoDark.src} alt={brand.logoDark.alt || site.name} />}
+              </Fragment>
+            ) : (
+              site.name
+            )}
+          </a>
+          {utilityNav.length > 0 && (
+            <nav class="ch-header__utility" aria-label={w.secondary}>
+              {utilityNav.map((item) => <NavLink item={item} {...header} />)}
+            </nav>
+          )}
+          {headerNav.length > 0 && (
+            <nav class="ch-header__nav" aria-label={w.main}>
+              {headerNav.map((item, i) => item.children.length > 0 ? <NavMenu item={item} {...header} popover={`ch-sub-${i}`} iconWeight={iconWeight} /> : <NavLink item={item} {...header} />)}
+            </nav>
+          )}
+          {actions.length > 0 && (
+            <div class="ch-header__actions">
+              {actions.map((a) =>
+                a.kind === "button" && a.label && a.href ? (
+                  <a class={`ch-button ch-button--${a.variant ?? "primary"}`} href={safe(a.href)}>{a.label}</a>
+                ) : a.kind === "locale" && languages ? (
+                  <details class="ch-languages">
+                    <summary>{languages.label}</summary>
+                    <ul>
+                      {languages.items.map((l) => <li><a href={l.href} lang={l.locale} hreflang={l.locale} aria-current={l.current ? "true" : undefined}>{l.name}</a></li>)}
+                    </ul>
+                  </details>
+                ) : a.kind === "search" && search ? (
+                  <form class="ch-header-search" method="get" action="/search" role="search" data-ch-search-open={search.modal ? "" : undefined}>
+                    <label for="ch-header-q" class="sr-only">{search.label}</label>
+                    <input id="ch-header-q" type="search" name="q" value={search.query ?? ""} maxlength="200" placeholder={search.placeholder} />
+                    <button type="submit" class="sr-only">{search.button}</button>
+                  </form>
+                ) : null,
+              )}
+            </div>
+          )}
+          {(headerNav.length > 0 || utilityNav.length > 0 || searchAction) && (
+            <div class="ch-menu-slot">
+              {dialog ? (
+                <a class="ch-menu__open" href="/menu" data-ch-dialog="ch-menu">
+                  <Fragment set:html={icon("menu")} />
+                  {w.menu}
+                </a>
+              ) : (
+                <details class="ch-menu">
+                  <summary class="ch-menu__open">
+                    <Fragment set:html={icon("menu")} />
+                    {w.menu}
+                  </summary>
+                  <MenuPanel iconWeight={iconWeight} nav={headerNav} utility={utilityNav} search={searchAction} words={w} idSuffix="drop" />
+                </details>
+              )}
+            </div>
+          )}
+        </div>
+      </header>
+    )}
+    {!h.hidden && dialog && (
+      <dialog id="ch-menu" class="ch-menu__dialog" data-style={h.mobileStyle} aria-label={w.menu}>
+        <div class="ch-menu__bar">
+          <span class="ch-header__brand">{site.name}</span>
+          <form method="dialog"><button class="ch-menu__close" type="submit">{w.closeMenu}</button></form>
+        </div>
+        <MenuPanel iconWeight={iconWeight} nav={headerNav} utility={utilityNav} search={searchAction} words={w} idSuffix="dialog" />
+      </dialog>
+    )}
+    <main id="main" tabindex="-1" class="mx-auto max-w-3xl px-4 pb-16">
+      {notice && (
+        <p
+          class="ch-gate-notice mb-6 rounded-md border border-amber-300 bg-amber-50 px-4 py-3 text-sm text-amber-900"
+          role="status"
+          data-gate={notice.state}
+          data-gate-at={notice.at}
+        >{notice.text}</p>
+      )}
+      {translation && (
+        <p class="ch-translation-notice mb-6 rounded-md border border-sky-300 bg-sky-50 px-4 py-3 text-sm text-sky-900" role="note">
+          {translation.text}
+          {translation.original && <> <a href={translation.original.href} lang={translation.original.lang} hreflang={translation.original.lang}>{translation.original.text}</a></>}
+        </p>
+      )}
+      <slot />
+    </main>
+    {!f.hidden && (
+      <footer class="ch-footer" data-layout={f.layout} data-surface={f.surface}>
+        <div class="ch-footer__inner">
+          {f.region && (
+            <div class="ch-footer__region">
+              <slot name="footer-region" />
+            </div>
+          )}
+          {f.cta && (
+            <div class="ch-footer__cta">
+              <p class="ch-footer__cta-heading">{f.cta.heading}</p>
+              <a class="ch-button ch-button--primary" href={safe(f.cta.href)}>{f.cta.label}</a>
+            </div>
+          )}
+          {(f.columns.length > 0 || (f.layout !== "minimal" && f.layout !== "simple" && (f.tagline || social.length > 0))) && (
+            <div class="ch-footer__top">
+              <div class="ch-footer__about">
+                <a href="/" class="ch-footer__brand">{brand?.logo ? <img class="ch-logo" data-size="s" src={brand.logo.src} alt={brand.logo.alt || site.name} /> : site.name}</a>
+                {f.tagline && <p class="ch-footer__tagline">{f.tagline}</p>}
+                {social.length > 0 && (
+                  <ul class="ch-footer__social" aria-label={w.social}>
+                    {social.map((l) => <li><a href={safe(l.href)} rel="me noopener" aria-label={SOCIAL[l.network] ?? l.network} class="ch-social-link"><Fragment set:html={icon(l.network)} /></a></li>)}
+                  </ul>
+                )}
+              </div>
+              {f.columns.map((c) => (menus[c.menu] ?? []).length > 0 && (
+                <nav class="ch-footer__col" aria-label={c.heading}>
+                  <p class="ch-footer__heading">{c.heading}</p>
+                  <ul>
+                    {(menus[c.menu] ?? []).flatMap((item) => [item, ...item.children]).map((item) => <li><NavLink item={item} {...below} /></li>)}
+                  </ul>
+                </nav>
+              ))}
+            </div>
+          )}
+          {footerLanguages && (
+            <nav class="ch-footer__languages" aria-label={footerLanguages.label}>
+              <ul>
+                {footerLanguages.items.map((l) => <li><a href={l.href} lang={l.locale} hreflang={l.locale} aria-current={l.current ? "true" : undefined}>{l.name}</a></li>)}
+              </ul>
+            </nav>
+          )}
+          <div class="ch-footer__legal">
+            {copyright && <span>{copyright}</span>}
+            {f.layout === "simple" && f.tagline && <span>{f.tagline}</span>}
+            {f.layout === "simple" && social.length > 0 && (
+              <ul class="ch-footer__social" aria-label={w.social}>
+                {social.map((l) => <li><a href={safe(l.href)} rel="me noopener" aria-label={SOCIAL[l.network] ?? l.network} class="ch-social-link"><Fragment set:html={icon(l.network)} /></a></li>)}
+              </ul>
+            )}
+            {f.credit && <span>{w.credit}</span>}
+            {legalNav ? (
+              legalNav.length > 0 && (
+                <nav class="flex flex-wrap gap-4" aria-label={f.legal === "footer" ? w.footer : w.legal}>
+                  {legalNav.map((item) => item.children.length > 0 ? <NavMenu item={item} {...below} iconWeight={iconWeight} /> : <NavLink item={item} {...below} />)}
+                </nav>
+              )
+            ) : (
+              f.fallbackRss && <a href="/rss.xml" class="hover:text-zinc-700">RSS</a>
+            )}
+          </div>
+        </div>
+      </footer>
+    )}
+    {consent && (
+      <div class="ch-consent" data-ch-bar data-ch-consent-bar data-mode={consent.mode} role="region" aria-label={bw.privacy}>
+        <p class="ch-consent__text">
+          {consent.mode === "choices" ? bw.consentChoices : bw.consentNotice}
+          {consent.policy && <a href={safe(consent.policy)}>{bw.privacyPolicy}</a>}
+        </p>
+        <div class="ch-consent__actions">
+          {consent.mode === "choices" ? (
+            <Fragment>
+              <button type="button" class="ch-button ch-button--secondary" data-ch-consent-choice="essential" hidden>{bw.consentEssential}</button>
+              <button type="button" class="ch-button ch-button--primary" data-ch-consent-choice="all" hidden>{bw.consentAll}</button>
+            </Fragment>
+          ) : (
+            <button type="button" class="ch-button ch-button--primary" data-ch-consent-choice="ok" hidden>{bw.consentOk}</button>
+          )}
+        </div>
+      </div>
+    )}
+    {/* RFC-0025 25d: toasts land here (a live region already in the page, so they are announced). */}
+    <div class="ch-toasts" data-ch-toasts role="status" aria-live="polite" data-copied={bw.copied} data-link-copied={bw.linkCopied}></div>
+    {needsScript && <script type="module" src={CHROME_SCRIPT.path}></script>}
+    {/* RFC-0029 §6: the search modal, where the deployment answers searches. */}
+    {search?.modal && <SearchDialog label={search.label} placeholder={search.placeholder} words={search.modal} />}
+    {search?.modal && <script type="module" src={SEARCH_SCRIPT.path}></script>}
+  </body>
+</html>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/middleware.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/middleware.ts
new file mode 100644
index 00000000..96951f7c
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/middleware.ts
@@ -0,0 +1,2 @@
+// RFC-0033 §4: internal links of a localized page stay in its locale.
+export { onRequest } from "@cloudhal/astro-renderer/locale-middleware";
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path].astro b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path].astro
new file mode 100644
index 00000000..9a4a8249
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path].astro
@@ -0,0 +1,484 @@
+---
+import config from "virtual:cloudhal/config";
+import { archiveSummaries } from "@cloudhal/astro-renderer/archive";
+import {
+  addCacheTags,
+  listCacheTag,
+  nodeCacheTag,
+  termCacheTag,
+} from "@cloudhal/astro-renderer/cache-tags";
+import { commentsJsonLd, loadComments } from "@cloudhal/astro-renderer/comments";
+import { Comments, Sections } from "@cloudhal/astro-renderer/components";
+import { EMBED_HEADER, usesEmbeds } from "@cloudhal/astro-renderer/embeds";
+import type { RenderedFields } from "@cloudhal/astro-renderer/fields";
+import { gateNotice } from "@cloudhal/astro-renderer/gates";
+import {
+  alternatesFor,
+  linkLocalizer,
+  localeRequest,
+  localeUrl,
+  localizedPath,
+  localizeHead,
+} from "@cloudhal/astro-renderer/locales";
+import {
+  loadAssetIndex,
+  type MediaContext,
+  placeholderBudget,
+} from "@cloudhal/astro-renderer/media";
+import {
+  type ActiveNavItem,
+  type ActiveRoute,
+  activeItem,
+  derivedNavigation,
+  markActive,
+  markCurrent,
+  navigationCacheTags,
+} from "@cloudhal/astro-renderer/navigation";
+import { notFoundPage, notFoundPageIds } from "@cloudhal/astro-renderer/not-found";
+import { contentListEntries } from "@cloudhal/astro-renderer/queries";
+import { resolveRoute, staticPaths } from "@cloudhal/astro-renderer/routing";
+import { getSource, peerEditions } from "@cloudhal/astro-renderer/runtime";
+import { searchAvailable } from "@cloudhal/astro-renderer/search";
+import {
+  archiveHead,
+  collectionFeedLink,
+  entryHead,
+  pageHead,
+  searchHead,
+  siteOrigin,
+  withStructuredData,
+} from "@cloudhal/astro-renderer/seo";
+import { statusPage } from "@cloudhal/astro-renderer/status-page";
+import { loadSurfaceSources, surfaceSources } from "@cloudhal/astro-renderer/surfaces";
+import {
+  entryTaxonomy,
+  loadTaxonomyIndex,
+  relatedEntries,
+  termAncestors,
+} from "@cloudhal/astro-renderer/taxonomy";
+import { themeVariables } from "@cloudhal/astro-renderer/theme-settings";
+import type { ContentEntry } from "@cloudhal/core-contracts";
+/**
+ * One route for the whole graph (RFC-0002 §7 order): a Page answers at its `path`; an article at
+ * its collection's permalink (`/<collection>/<slug>` by default, RFC-0038); a category or tag archive at `<basePath>/<slug>[/page/<n>]`. Anything
+ * else asks the site's redirects (301 with the query kept), then answers 410 for a retired term
+ * or 404. Term feeds live next door in `[...path]/rss.xml.ts`. The header renders the `primary`
+ * menu, or the derived header without one; a `footer` menu replaces the footer links (RFC-0003).
+ * Articles end with reader comments when the site has them on (RFC-0007; `?comments=<n>` pages).
+ * `/search?q=` is the site search (RFC-0019 §3) where the deployment answers it: never cached,
+ * never indexed, and its form sits in the header. A miss answers 404 with the site's page at
+ * `/404` in the request's locale, else the theme's own not-found page in that locale.
+ */
+import { resolveChrome } from "@cloudhal/core-ts/chrome";
+import { blockTypes } from "../blocks.ts";
+import Archive from "../components/Archive.astro";
+import Article from "../components/Article.astro";
+import Breadcrumbs from "../components/Breadcrumbs.astro";
+import MenuPanel from "../components/MenuPanel.astro";
+import NotFound from "../components/NotFound.astro";
+import PostTerms from "../components/PostTerms.astro";
+import RelatedPosts from "../components/RelatedPosts.astro";
+import Search from "../components/Search.astro";
+import { fontLinkHeader, PAIRING_PRELOADS } from "../fonts.ts";
+import { iconSet } from "../icons.ts";
+import Base from "../layouts/Base.astro";
+import { themeSettings } from "../settings.ts";
+import {
+  ARCHIVE_PAGE_SIZE,
+  blocks,
+  collectionIndex,
+  components,
+  NAV_CATEGORIES,
+  RELATED_POSTS,
+  strings,
+} from "../theme.ts";
+
+export async function getStaticPaths() {
+  const source = await getSource(config);
+  const site = await source.site();
+  const { pages } = await staticPaths(source, { perPage: ARCHIVE_PAGE_SIZE });
+  // RFC-0025 §2: the phone menu's page, unless the site has a page there.
+  if (!pages.includes("/menu")) pages.push("/menu");
+  // RFC-0033: every other locale on this host under its prefix (archives follow in a later step).
+  const domains = site.localization?.domains ?? {};
+  const urls = pages.map((p) => localizedPath(site, site.defaultLocale, p));
+  for (const locale of site.locales)
+    if (locale !== site.defaultLocale && domains[locale] === undefined)
+      for (const p of [
+        ...(await staticPaths(source, { perPage: ARCHIVE_PAGE_SIZE, locale })).pages,
+        "/menu",
+      ])
+        urls.push(localizedPath(site, locale, p));
+  return [...new Set(urls)].map((path) => ({
+    params: { path: path === "/" ? undefined : path.slice(1) },
+  }));
+}
+
+// RFC-0043 §1.8 (#167): after a page threw, Astro renders this catch-all as its error route
+// (`/500` matches it) with the original path. Throw again: Astro then answers an empty 500 that
+// the Site Worker turns into the `error` page with a reference, instead of this route's 404.
+const renderError = (Astro.props as { error?: unknown }).error;
+if (renderError !== undefined) throw renderError;
+const source = await getSource(config, Astro);
+// RFC-0043 §1.8: on Cloudflare and in dev the renderer answers before this; the fallback is its page.
+if (!source) return statusPage("not-published", { locale: "en", now: Date.now() });
+const site = await source.site();
+const requested = Astro.params.path ? `/${Astro.params.path}` : "/";
+// RFC-0033 §4: the locale is in the path prefix or the host; a non-canonical locale URL moves.
+const lr = localeRequest(site, Astro.url.host, requested);
+if (lr.redirect !== undefined)
+  return new Response(null, {
+    status: 301,
+    headers: { location: `${lr.redirect}${Astro.url.search}` },
+  });
+const locale = lr.locale;
+const path = lr.path;
+let route = await resolveRoute(source, path, {
+  perPage: ARCHIVE_PAGE_SIZE,
+  search: Astro.url.search,
+  locale,
+});
+// RFC-0033 §4: a site may show a missing translation in its original language, with a notice,
+// never indexed and never in `hreflang` (`localization.fallback`).
+let shownIn = locale;
+if (
+  route.kind === "not-found" &&
+  locale !== site.defaultLocale &&
+  site.localization?.fallback === "default-with-notice"
+) {
+  const original = await resolveRoute(source, path, {
+    perPage: ARCHIVE_PAGE_SIZE,
+    search: Astro.url.search,
+    locale: site.defaultLocale,
+  });
+  if (original.kind === "page" || original.kind === "entry") {
+    route = original;
+    shownIn = site.defaultLocale;
+  }
+}
+if (route.kind === "redirect")
+  return new Response(null, {
+    status: route.status,
+    headers: {
+      location: route.location.startsWith("/")
+        ? localizedPath(site, locale, route.location)
+        : route.location,
+    },
+  });
+if (route.kind === "gone") return new Response(null, { status: 410 });
+// RFC-0025 §2: `/menu` is the phone menu as a page (the menu link's target without JavaScript),
+// unless the site has a page there.
+const isMenu = route.kind === "not-found" && path === "/menu";
+// Reader comments (RFC-0007): tags the response `cloudhal-comments-<id>` and reads the thread;
+// `?comments=<n>` past the last page is a miss.
+const comments =
+  route.kind === "entry"
+    ? await loadComments(config, Astro, route.entry, { locale, site })
+    : undefined;
+// A miss (RFC-0033 §4) answers 404 in the request's locale: the site's page at `/404` (its
+// translation, or the original under `default-with-notice`), else the theme's NotFound below.
+// The authored page answers 404 at its own path too.
+const notFound =
+  (!isMenu && (route.kind === "not-found" || route.kind === "feed")) ||
+  comments?.notFound === true ||
+  (route.kind === "page" && notFoundPageIds(await source.pages()).has(route.page.id));
+if (notFound) {
+  Astro.response.status = 404;
+  const authored = route.kind === "page" ? route.page : await notFoundPage(source, site, locale);
+  route = authored ? { kind: "page", page: authored } : { kind: "not-found" };
+  shownIn = authored?.locale ?? locale;
+}
+
+// Search results (RFC-0019 §3) are per query: never in the edge cache, never in search engines.
+if (route.kind === "search") {
+  Astro.response.headers.set("cache-control", "no-store");
+  Astro.response.headers.set("cloudflare-cdn-cache-control", "no-store");
+  Astro.response.headers.set("x-robots-tag", "noindex");
+}
+const origin = siteOrigin(site, Astro.url);
+// Internal links of a localized page stay in its locale (`src/middleware.ts`).
+const links = await linkLocalizer(source, locale, origin);
+if (links) (Astro.locals as { cloudhalLinks?: (p: string) => string }).cloudhalLinks = links;
+// Media (RFC-0004): assets resolve `assetId` and `asset:<id>`; previews never use transformations.
+const media: MediaContext = {
+  assets: await loadAssetIndex(source),
+  locale,
+  defaultLocale: site.defaultLocale,
+  transform: config.media?.transform ?? "none",
+  preview: Astro.response.headers.get("x-cloudhal-mode") === "preview",
+  onMiss: (id) =>
+    console.warn(`cloudhal: ${path} refers to ${id}, which this version does not have`),
+  // RFC-0026: icons in the site's weight, the theme's own drawings over the set's.
+  icons: { weight: String(site.theme.config?.iconWeight ?? "regular"), set: iconSet },
+  // RFC-0028: one placeholder allowance for the whole page.
+  budget: placeholderBudget(),
+  // RFC-0038: entry links follow the site's collection permalinks.
+  permalinks: site,
+};
+const t = strings(locale, site.theme.config?.strings);
+const index = route.kind === "archive" ? route.index : await loadTaxonomyIndex(source, locale);
+const primary = await source.navigation("primary", locale, { collectionIndex });
+const footerMenu = await source.navigation("footer", locale, { collectionIndex });
+const derivedCategories = !primary && NAV_CATEGORIES;
+const needsEntries = derivedCategories || (route.kind === "entry" && RELATED_POSTS > 0);
+const all = needsEntries ? await source.allEntries(locale) : [];
+const categories = derivedCategories
+  ? archiveSummaries(
+      index,
+      all.filter((e) => e.status === "published"),
+    ).filter((a) => a.taxonomy.key === "category" && !a.term.parentId)
+  : [];
+// The active item: exact path, longest prefix, then the entry's category or collection.
+const activeRoute: ActiveRoute = {
+  path,
+  ...(route.kind === "entry" ? { entry: route.entry } : {}),
+  ...(route.kind === "archive" ? { archiveTermId: route.archive.term.id } : {}),
+};
+const ancestors = (id: string) => {
+  const term = index.terms.get(id);
+  return term ? termAncestors(index, term).map((a) => a.id) : [];
+};
+// The derived header lists top-level pages, never the not-found page.
+const allPages = await source.pages();
+const notFoundIds = notFoundPageIds(allPages);
+const navPages = allPages.filter((p) => !notFoundIds.has(p.id));
+const nav = primary
+  ? markActive(primary, activeItem(primary, activeRoute, ancestors))
+  : markCurrent(derivedNavigation(site, navPages, categories, locale), path);
+const footer = footerMenu
+  ? markActive(footerMenu, activeItem(footerMenu, activeRoute, ancestors))
+  : undefined;
+// RFC-0025: the page's header and footer, and the menus they name beyond primary and footer.
+const chrome = resolveChrome(site, route.kind === "page" ? route.page : undefined);
+const menus: Record<string, ActiveNavItem[] | undefined> = { primary: nav, footer };
+const extraMenus = await Promise.all(
+  chrome.menus
+    .filter((key) => !(key in menus))
+    .map(async (key) => [key, await source.navigation(key, locale, { collectionIndex })] as const),
+);
+for (const [key, menu] of extraMenus)
+  menus[key] = menu ? markActive(menu, activeItem(menu, activeRoute, ancestors)) : undefined;
+// Edge-cache tags next to the site tag (published responses on Cloudflare only), so a publish
+// purges only the responses that show what changed (`cache-tags.ts`). The tags a purge must reach
+// come first; the header's categories (names shown on every page) last.
+const tags: string[] = [];
+
+let entries: Record<string, ContentEntry[]> = {};
+let surfaces: Awaited<ReturnType<typeof loadSurfaceSources>> = {};
+let terms = entryTaxonomy(undefined, { tags: [] });
+let related: ContentEntry[] = [];
+let fields: RenderedFields | undefined;
+if (route.kind === "page") {
+  tags.push(nodeCacheTag(route.page.id));
+  // Lists of the site's entries change with any entry: the site's list tag covers them.
+  if (
+    route.page.sections.some(
+      (s) => s.kind === "contentList" || (s.kind === "surface" && surfaceSources(s).length > 0),
+    )
+  )
+    tags.push(listCacheTag(site.id));
+  // Generated UI (RFC-0020 §3): entry sources load from the same source as the page.
+  surfaces = await loadSurfaceSources(source, route.page.sections);
+  // Each collection's newest entries; a section with a `filter` (RFC-0002 §5) or `where`/`orderBy`
+  // (RFC-0042 §4) lists its own, keyed by section id.
+  entries = await contentListEntries(source, route.page.sections, locale);
+} else if (route.kind === "entry") {
+  terms = entryTaxonomy(index, route.entry);
+  related = relatedEntries(route.entry, all, index, RELATED_POSTS);
+  // RFC-0041 §9: typed fields in the entry's language; values read from the original tag it too.
+  fields = await source.entryFields?.(route.entry, { media, words: { yes: t.yes, no: t.no } });
+  const group = route.entry.translation?.group;
+  if (group && Object.values(fields ?? {}).some((f) => f.fromOriginal))
+    tags.push(nodeCacheTag(group));
+  tags.push(
+    nodeCacheTag(route.entry.id),
+    // the related posts it links to: a retitled or removed one purges this page too
+    ...related.map((e) => nodeCacheTag(e.id)),
+    ...terms.groups.flatMap((g) => g.terms.map((s) => termCacheTag(s.id))),
+    ...terms.trail.map((s) => termCacheTag(s.id)),
+  );
+} else if (route.kind === "archive") {
+  tags.push(
+    // which entries the archive lists (and how many pages it has) changes with its membership
+    listCacheTag(route.archive.term.id),
+    termCacheTag(route.archive.term.id),
+    ...route.archive.trail.map((s) => termCacheTag(s.id)),
+    ...route.archive.entries.map((e) => nodeCacheTag(e.id)),
+  );
+}
+tags.push(
+  ...categories.map((a) => termCacheTag(a.term.id)),
+  ...navigationCacheTags(primary),
+  ...navigationCacheTags(footerMenu),
+  ...extraMenus.flatMap(([, menu]) => navigationCacheTags(menu)),
+);
+// RFC-0025 §2: the footer's surface region loads its entry sources like a page's surfaces.
+const regionSources = chrome.footer.region
+  ? await loadSurfaceSources(source, [chrome.footer.region])
+  : {};
+if (chrome.footer.region && surfaceSources(chrome.footer.region).length > 0)
+  tags.push(listCacheTag(site.id));
+addCacheTags(Astro.response.headers, tags);
+
+// Video players (RFC-0015 §4): the Site Worker allows their frames on this page only.
+if (
+  (route.kind === "page" && usesEmbeds({ sections: route.page.sections })) ||
+  (route.kind === "entry" &&
+    route.entry.body.format === "markdown" &&
+    usesEmbeds({ markdown: route.entry.body.value }))
+)
+  Astro.response.headers.set(EMBED_HEADER, "1");
+
+// Time gates (RFC-0008 §7.3): the published source never returns an embargoed or expired page or
+// entry (it is a 404), so a gate that is closed here means a preview or `cloudhal dev`: say so.
+const gated = route.kind === "page" ? route.page : route.kind === "entry" ? route.entry : undefined;
+const gate = gated ? gateNotice(gated, site, locale, Date.now()) : undefined;
+const notice = gate && { state: gate.state, at: gate.at, text: t[gate.state](gate.when) };
+
+const baseHead =
+  route.kind === "page"
+    ? pageHead(site, route.page, origin, media)
+    : route.kind === "entry"
+      ? entryHead(site, route.entry, origin, terms, media, commentsJsonLd(comments, origin))
+      : route.kind === "archive"
+        ? archiveHead(site, route.archive, origin, media)
+        : route.kind === "search"
+          ? searchHead(site, route.search.query, origin, locale)
+          : {
+              ...searchHead(site, "", origin, locale),
+              title: `${isMenu ? t.menu : t.notFoundTitle} · ${site.name}`,
+              canonical: `${origin}${isMenu ? "/menu" : path}`,
+            };
+// RFC-0042 §2: a collection's JSON-LD preset replaces the article's generic BlogPosting.
+const head =
+  route.kind === "entry"
+    ? await withStructuredData(baseHead, source, route.entry, { origin, media })
+    : baseHead;
+// RFC-0033 §4: self-canonical in the locale, `lang`/`dir`, and the `hreflang` set from the group.
+const fallback = shownIn !== locale;
+const alternates =
+  gated && !fallback && !notFound
+    ? // RFC-0034 §6: language editions published by other sites of the project, on their hosts.
+      await alternatesFor(source, gated, origin, await peerEditions(config, gated))
+    : [];
+const localized = localizeHead(head, site, {
+  locale: shownIn,
+  origin,
+  alternates,
+  ...(gated?.translation ? { translation: gated.translation } : {}),
+});
+// RFC-0042 §5: the feed of the entry's collection, or of each collection a page lists.
+const listed = notFound
+  ? []
+  : route.kind === "entry"
+    ? [route.entry.collection]
+    : route.kind === "page"
+      ? route.page.sections.flatMap((s) => (s.kind === "contentList" ? [s.collection] : []))
+      : [];
+const feeds = [
+  ...localized.feeds,
+  ...[...new Set(listed)].flatMap((c) => collectionFeedLink(site, c, origin, locale) ?? []),
+];
+const meta = {
+  ...localized,
+  feeds,
+  ...(fallback || notFound ? { robots: "noindex,follow" } : {}),
+};
+Astro.response.headers.set("content-language", shownIn);
+// The pairing's fonts as a Link header too (Early Hints), not only as <link rel=preload> in <head>.
+const pairing = themeVariables(site, themeSettings).attributes["data-ch-type-pairing"];
+const preloads = PAIRING_PRELOADS[pairing ?? ""] ?? [];
+if (preloads.length) Astro.response.headers.set("link", fontLinkHeader(preloads));
+// The reader's notice (RFC-0033 §4): machine output until a person reviews it (or always, when
+// the site asks), a page shown in its original language, each with a link to the original.
+const original = alternates.find((a) => a.original && !a.current);
+const tr = gated?.translation;
+const machine =
+  tr?.method === "machine" ||
+  (tr?.method === "machine-reviewed" && site.localization?.label === "always");
+const translationNotice = fallback
+  ? { text: t.notTranslated }
+  : machine
+    ? {
+        text: tr?.review ? t.machineReviewed : t.machineTranslated,
+        ...(original
+          ? { original: { href: original.href, text: t.readOriginal, lang: original.locale } }
+          : {}),
+      }
+    : undefined;
+// The language switcher: this page's versions, else each language's home page.
+const nativeName = (l: string) => {
+  try {
+    return new Intl.DisplayNames([l], { type: "language" }).of(l) ?? l;
+  } catch {
+    return l;
+  }
+};
+// RFC-0034 §6: languages a language edition publishes (another site) follow the site's own.
+const editionLocales = alternates
+  .map((a) => a.locale)
+  .filter((l) => l !== "x-default" && !site.locales.includes(l));
+const languages =
+  site.locales.length + editionLocales.length > 1
+    ? {
+        label: t.languages,
+        items: [...site.locales, ...editionLocales].map((l) => ({
+          locale: l,
+          name: nativeName(l),
+          href: alternates.find((a) => a.locale === l)?.href ?? localeUrl(site, l, "/", origin),
+          current: l === locale,
+        })),
+      }
+    : undefined;
+const searchForm = searchAvailable(config, source)
+  ? {
+      label: t.searchLabel,
+      placeholder: t.searchPlaceholder,
+      button: t.search,
+      modal: t.searchModal,
+      ...(route.kind === "search" ? { query: route.search.query } : {}),
+    }
+  : undefined;
+---
+<Base site={site} meta={meta} nav={nav} footer={footer} notice={notice} translation={translationNotice} languages={languages} search={searchForm} motion={route.kind === "page" ? route.page.motion : undefined} chrome={chrome} menus={menus} words={{ skip: t.skipToContent, main: t.mainMenu, secondary: t.secondaryMenu, menu: t.menu, closeMenu: t.closeMenu, footer: t.footerMenu, legal: t.legalMenu, social: t.socialLinks, credit: t.builtWith }} barWords={{ announcement: t.announcement, dismiss: t.dismiss, privacy: t.privacy, consentNotice: t.consentNotice, consentChoices: t.consentChoices, consentOk: t.consentOk, consentAll: t.consentAll, consentEssential: t.consentEssential, privacyPolicy: t.privacyPolicy, copied: t.copied, linkCopied: t.linkCopied }}>
+  {chrome.footer.region && (
+    <Fragment slot="footer-region">
+      <Sections sections={[chrome.footer.region]} entries={{}} components={components} blocks={blocks} blockTypes={blockTypes} media={media} surfaceSources={regionSources} />
+    </Fragment>
+  )}
+  {isMenu && (
+    <div class="ch-menu-page">
+      <h1>{t.menu}</h1>
+      <MenuPanel
+        iconWeight={media.icons?.weight}
+        nav={chrome.header.nav === "primary" ? nav : (menus[chrome.header.nav] ?? [])}
+        utility={chrome.header.utility ? (menus[chrome.header.utility] ?? []) : []}
+        search={searchForm}
+        words={{ main: t.mainMenu, secondary: t.secondaryMenu }}
+        idSuffix="page"
+      />
+    </div>
+  )}
+  {route.kind === "page" && (
+    <Sections sections={route.page.sections} entries={entries} components={components} blocks={blocks} blockTypes={blockTypes} media={media} surfaceSources={surfaces} />
+  )}
+  {route.kind === "entry" && (
+    <Fragment>
+      <Breadcrumbs
+        label={t.breadcrumb}
+        items={[
+          { name: t.home, href: "/" },
+          ...terms.trail.map((s) => ({ name: s.name, href: s.href })),
+          { name: route.entry.title },
+        ]}
+      />
+      <Article entry={route.entry} terms={terms} locale={locale} t={t} media={media} blocks={blocks} blockTypes={blockTypes} fields={fields} />
+      <PostTerms taxonomy={terms} locale={locale} />
+      <RelatedPosts title={t.related} entries={related} locale={locale} media={media} />
+      <Comments view={comments} />
+    </Fragment>
+  )}
+  {route.kind === "archive" && <Archive archive={route.archive} t={t} media={media} />}
+  {route.kind === "search" && <Search search={route.search} locale={locale} t={t} />}
+  {route.kind === "not-found" && !isMenu && <NotFound t={t} search={searchForm !== undefined} />}
+</Base>
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/llms.txt.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/llms.txt.ts
new file mode 100644
index 00000000..e64e22c8
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/llms.txt.ts
@@ -0,0 +1,41 @@
+import config from "virtual:cloudhal/config";
+import { addCacheTags, listCacheTag } from "@cloudhal/astro-renderer/cache-tags";
+import { llmsTxt } from "@cloudhal/astro-renderer/locale-feeds";
+import { localeRequest } from "@cloudhal/astro-renderer/locales";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import { statusPlain } from "@cloudhal/astro-renderer/status-page";
+import type { APIRoute } from "astro";
+
+/** Static builds: `/<locale>/llms.txt` for every other locale served on this host. */
+export async function getStaticPaths() {
+  const source = await getSource(config);
+  const site = await source.site();
+  const domains = site.localization?.domains ?? {};
+  return site.locales
+    .filter(
+      (l) =>
+        (l !== site.defaultLocale || site.localization?.routing === "prefix-all") && !domains[l],
+    )
+    .map((l) => ({ params: { path: l } }));
+}
+
+/** A locale's `llms.txt` (RFC-0033): `/<locale>/llms.txt`; any other path is not found. */
+export const GET: APIRoute = async ({ request, url, params }) => {
+  const headers = new Headers();
+  const source = await getSource(config, { request, response: { headers } });
+  if (!source) return statusPlain("not-published", { locale: "en", now: Date.now() }, "text");
+  const site = await source.site();
+  const lr = localeRequest(site, url.host, `/${params.path ?? ""}`);
+  if (lr.path !== "/") return new Response(null, { status: 404 });
+  if (lr.redirect !== undefined)
+    return new Response(null, {
+      status: 301,
+      headers: { location: `${lr.redirect === "/" ? "" : lr.redirect}/llms.txt` },
+    });
+  headers.set("content-type", "text/plain; charset=utf-8");
+  addCacheTags(headers, [listCacheTag(site.id)]);
+  return new Response(await llmsTxt(source, { origin: siteOrigin(site, url), locale: lr.locale }), {
+    headers,
+  });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/rss.xml.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/rss.xml.ts
new file mode 100644
index 00000000..01266e73
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/rss.xml.ts
@@ -0,0 +1,96 @@
+import config from "virtual:cloudhal/config";
+import {
+  addCacheTags,
+  listCacheTag,
+  nodeCacheTag,
+  termCacheTag,
+} from "@cloudhal/astro-renderer/cache-tags";
+import { archiveFeedXml, FEED_LIMIT } from "@cloudhal/astro-renderer/feeds";
+import { localeFeedXml } from "@cloudhal/astro-renderer/locale-feeds";
+import { localeRequest, localeUrl, localizedPath } from "@cloudhal/astro-renderer/locales";
+import { loadAssetIndex } from "@cloudhal/astro-renderer/media";
+import { resolveRoute, staticPaths } from "@cloudhal/astro-renderer/routing";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import { statusPlain } from "@cloudhal/astro-renderer/status-page";
+import type { APIRoute } from "astro";
+import { ARCHIVE_PAGE_SIZE } from "../../theme.ts";
+
+const SUFFIX = "/rss.xml";
+
+/**
+ * Static builds: one feed per served archive of a taxonomy with `feed: true`, in every locale on
+ * this host, and each other locale's site feed (`/<locale>/rss.xml`, RFC-0033). The paths include
+ * each collection's feed (`<prefix>/rss.xml`, RFC-0042 §5): this route answers 404 for it and the
+ * renderer's middleware answers with the feed.
+ */
+export async function getStaticPaths() {
+  const source = await getSource(config);
+  const site = await source.site();
+  const domains = site.localization?.domains ?? {};
+  const paths: string[] = [];
+  for (const locale of site.locales) {
+    if (domains[locale] !== undefined) continue;
+    const { feeds } = await staticPaths(source, { perPage: ARCHIVE_PAGE_SIZE, locale });
+    paths.push(...feeds.map((p) => localizedPath(site, locale, p.slice(0, -SUFFIX.length))));
+    const home = localizedPath(site, locale, "/");
+    if (home !== "/") paths.push(home);
+  }
+  return [...new Set(paths)].map((p) => ({ params: { path: p.slice(1) } }));
+}
+
+/**
+ * A category's or tag's RSS feed (`<basePath>/<slug>/rss.xml`, RFC-0002 §7), or a locale's site
+ * feed (`/<locale>/rss.xml`), in the locale of the path or host. Old slugs follow their redirects
+ * (prefix redirects carry `/rss.xml` along); retired terms answer 410.
+ */
+export const GET: APIRoute = async ({ request, url, params }) => {
+  const headers = new Headers();
+  const source = await getSource(config, { request, response: { headers } });
+  if (!source) return statusPlain("not-published", { locale: "en", now: Date.now() }, "text");
+  const site = await source.site();
+  const origin = siteOrigin(site, url);
+  const lr = localeRequest(site, url.host, `/${params.path ?? ""}`);
+  if (lr.redirect !== undefined)
+    return new Response(null, {
+      status: 301,
+      headers: { location: `${lr.redirect === "/" ? "" : lr.redirect}${SUFFIX}` },
+    });
+  if (lr.path === "/") {
+    headers.set("content-type", "application/rss+xml; charset=utf-8");
+    addCacheTags(headers, [listCacheTag(site.id)]);
+    return new Response(await localeFeedXml(source, { origin, locale: lr.locale }), { headers });
+  }
+  const route = await resolveRoute(source, `${lr.path}${SUFFIX}`, {
+    perPage: ARCHIVE_PAGE_SIZE,
+    search: url.search,
+    locale: lr.locale,
+  });
+  if (route.kind === "redirect")
+    return new Response(null, {
+      status: route.status,
+      headers: {
+        location: route.location.startsWith("/")
+          ? localizedPath(site, lr.locale, route.location)
+          : route.location,
+      },
+    });
+  if (route.kind === "gone") return new Response(null, { status: 410 });
+  if (route.kind !== "feed") return new Response(null, { status: 404 });
+  headers.set("content-type", "application/rss+xml; charset=utf-8");
+  addCacheTags(headers, [
+    listCacheTag(route.archive.term.id),
+    termCacheTag(route.archive.term.id),
+    ...route.archive.entries.slice(0, FEED_LIMIT).map((e) => nodeCacheTag(e.id)),
+  ]);
+  const body = archiveFeedXml({
+    site,
+    origin,
+    locale: lr.locale,
+    linkOrigin: localeUrl(site, lr.locale, "", origin),
+    archive: route.archive,
+    taxonomy: route.index,
+    assets: await loadAssetIndex(source),
+  });
+  return new Response(body, { headers });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/search.json.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/search.json.ts
new file mode 100644
index 00000000..326807c5
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/[...path]/search.json.ts
@@ -0,0 +1,23 @@
+import config from "virtual:cloudhal/config";
+import { linkLocalizer, localeRequest } from "@cloudhal/astro-renderer/locales";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { searchJsonResponse } from "@cloudhal/astro-renderer/search";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import type { APIRoute } from "astro";
+
+/** Static builds have no search: nothing to write. */
+export function getStaticPaths() {
+  return [];
+}
+
+/** A locale's search modal endpoint, `/<locale>/search.json` (RFC-0029 §5, RFC-0033). */
+export const GET: APIRoute = async ({ request, url, params }) => {
+  const source = await getSource(config, { request, response: { headers: new Headers() } });
+  if (!source) return searchJsonResponse(config, source, url);
+  const site = await source.site();
+  const lr = localeRequest(site, url.host, `/${params.path ?? ""}`);
+  if (lr.path !== "/" || lr.redirect !== undefined)
+    return new Response(null, { status: 404, headers: { "cache-control": "no-store" } });
+  const localize = await linkLocalizer(source, lr.locale, siteOrigin(site, url));
+  return searchJsonResponse(config, source, url, { locale: lr.locale, localize });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/llms.txt.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/llms.txt.ts
new file mode 100644
index 00000000..c51e3b37
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/llms.txt.ts
@@ -0,0 +1,22 @@
+import config from "virtual:cloudhal/config";
+import { addCacheTags, listCacheTag } from "@cloudhal/astro-renderer/cache-tags";
+import { llmsTxt } from "@cloudhal/astro-renderer/locale-feeds";
+import { hostLocale } from "@cloudhal/astro-renderer/locales";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import { statusPlain } from "@cloudhal/astro-renderer/status-page";
+import type { APIRoute } from "astro";
+
+/** `llms.txt` (llmstxt.org) in the host's locale; other locales at `/<locale>/llms.txt` (RFC-0033). */
+export const GET: APIRoute = async ({ request, url }) => {
+  const headers = new Headers();
+  const source = await getSource(config, { request, response: { headers } });
+  if (!source) return statusPlain("not-published", { locale: "en", now: Date.now() }, "text");
+  const site = await source.site();
+  headers.set("content-type", "text/plain; charset=utf-8");
+  addCacheTags(headers, [listCacheTag(site.id)]);
+  const locale = hostLocale(site, url.host) ?? site.defaultLocale;
+  return new Response(await llmsTxt(source, { origin: siteOrigin(site, url), locale }), {
+    headers,
+  });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/robots.txt.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/robots.txt.ts
new file mode 100644
index 00000000..7bec4753
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/robots.txt.ts
@@ -0,0 +1,13 @@
+import config from "virtual:cloudhal/config";
+import { robotsTxt } from "@cloudhal/astro-renderer/feeds";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import type { APIRoute } from "astro";
+
+export const GET: APIRoute = async ({ request, url }) => {
+  const headers = new Headers();
+  const source = await getSource(config, { request, response: { headers } });
+  headers.set("content-type", "text/plain; charset=utf-8");
+  if (!source) return new Response("User-agent: *\nDisallow: /\n", { status: 503, headers });
+  return new Response(robotsTxt(siteOrigin(await source.site(), url)), { headers });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/rss.xml.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/rss.xml.ts
new file mode 100644
index 00000000..6b60ccaf
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/rss.xml.ts
@@ -0,0 +1,26 @@
+import config from "virtual:cloudhal/config";
+import { addCacheTags, listCacheTag } from "@cloudhal/astro-renderer/cache-tags";
+import { localeFeedXml } from "@cloudhal/astro-renderer/locale-feeds";
+import { hostLocale } from "@cloudhal/astro-renderer/locales";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import { statusPlain } from "@cloudhal/astro-renderer/status-page";
+import type { APIRoute } from "astro";
+
+/**
+ * The site's RSS 2.0 feed: the newest published articles of every collection, in the host's
+ * locale (the default one, or a locale's own domain). Other locales: `/<locale>/rss.xml`.
+ */
+export const GET: APIRoute = async ({ request, url }) => {
+  const headers = new Headers();
+  const source = await getSource(config, { request, response: { headers } });
+  if (!source) return statusPlain("not-published", { locale: "en", now: Date.now() }, "text");
+  const site = await source.site();
+  headers.set("content-type", "application/rss+xml; charset=utf-8");
+  // Lists every collection's newest entries: any entry change purges it (`cloudhal-list-<site>`).
+  addCacheTags(headers, [listCacheTag(site.id)]);
+  const locale = hostLocale(site, url.host) ?? site.defaultLocale;
+  return new Response(await localeFeedXml(source, { origin: siteOrigin(site, url), locale }), {
+    headers,
+  });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/search.json.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/search.json.ts
new file mode 100644
index 00000000..4dbbfdef
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/search.json.ts
@@ -0,0 +1,21 @@
+import config from "virtual:cloudhal/config";
+import { hostLocale, linkLocalizer } from "@cloudhal/astro-renderer/locales";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { searchJsonResponse } from "@cloudhal/astro-renderer/search";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import type { APIRoute } from "astro";
+
+/**
+ * The search modal's endpoint (RFC-0029 §5): the same index and rules as `/search`, as JSON, in
+ * the host's locale (other locales: `/<locale>/search.json`, RFC-0033). Never cached, never
+ * indexed; a static build has no search and writes no file.
+ */
+export const GET: APIRoute = async ({ request, url }) => {
+  // The source's own headers (preview, cache tags) do not apply: the answer is never cached.
+  const source = await getSource(config, { request, response: { headers: new Headers() } });
+  if (!source) return searchJsonResponse(config, source, url);
+  const site = await source.site();
+  const locale = hostLocale(site, url.host) ?? site.defaultLocale;
+  const localize = await linkLocalizer(source, locale, siteOrigin(site, url));
+  return searchJsonResponse(config, source, url, { locale, localize });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/pages/sitemap.xml.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/sitemap.xml.ts
new file mode 100644
index 00000000..21bde422
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/pages/sitemap.xml.ts
@@ -0,0 +1,24 @@
+import config from "virtual:cloudhal/config";
+import { addCacheTags, listCacheTag } from "@cloudhal/astro-renderer/cache-tags";
+import { sitemapXml } from "@cloudhal/astro-renderer/feeds";
+import { localizedSitemap } from "@cloudhal/astro-renderer/locale-feeds";
+import { getSource } from "@cloudhal/astro-renderer/runtime";
+import { siteOrigin } from "@cloudhal/astro-renderer/seo";
+import { statusPlain } from "@cloudhal/astro-renderer/status-page";
+import type { APIRoute } from "astro";
+
+/**
+ * Canonical, indexable URLs of the published site in every locale this host serves (RFC-0033):
+ * pages, articles and indexable archives, each with its language versions as `xhtml:link`.
+ */
+export const GET: APIRoute = async ({ request, url }) => {
+  const headers = new Headers();
+  const source = await getSource(config, { request, response: { headers } });
+  if (!source) return statusPlain("not-published", { locale: "en", now: Date.now() }, "text");
+  const site = await source.site();
+  headers.set("content-type", "application/xml; charset=utf-8");
+  // Lists every page, entry and indexable archive: any entry or term change purges it.
+  addCacheTags(headers, [listCacheTag(site.id)]);
+  const urls = await localizedSitemap(source, siteOrigin(site, url), url.host);
+  return new Response(sitemapXml(urls), { headers });
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/settings.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/settings.ts
new file mode 100644
index 00000000..0d0e8cb3
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/settings.ts
@@ -0,0 +1,312 @@
+/**
+ * This theme's design settings (RFC-0017 §1): what Studio's Appearance form, agents
+ * (`get_theme_settings` / `set_theme_settings`) and the generator may change about its look.
+ * The site's values live in `Site.theme.config`, are checked against this schema, and reach the
+ * page as CSS variables and `data-ch-*` attributes (`themeVariables` in `layouts/Base.astro`,
+ * used by `styles/features/*.css`). Defaults keep the starter's look.
+ *
+ * Keep this file data only, with type imports only (the CLI loads it on its own).
+ */
+import type { PropsSchema } from "@cloudhal/core-ts/blocks";
+
+export const themeSettings: PropsSchema = {
+  type: "object",
+  additionalProperties: false,
+  properties: {
+    // RFC-0023 §1: one seed color and three choices; the color roles (and dark mode) follow.
+    // Without a seed (and in light mode) the four colors below apply, as before.
+    seed: {
+      type: "string",
+      format: "color",
+      title: { en: "Seed color", tr: "Ana renk" },
+      description: {
+        en: "One color the whole palette is built from, light and dark, always readable.",
+        tr: "Tüm paletin, açık ve koyu, okunaklı kalarak üretildiği tek renk.",
+      },
+    },
+    scheme: {
+      type: "string",
+      enum: ["tonal", "vibrant", "neutral", "mono"],
+      "x-labels": {
+        tonal: { en: "Tonal", tr: "Tonlu" },
+        vibrant: { en: "Vibrant", tr: "Canlı" },
+        neutral: { en: "Neutral", tr: "Nötr" },
+        mono: { en: "Monochrome", tr: "Tek renk" },
+      },
+      default: "tonal",
+      "x-widget": "radio",
+      title: { en: "Palette", tr: "Palet" },
+    },
+    contrast: {
+      type: "string",
+      enum: ["standard", "high"],
+      "x-labels": {
+        standard: { en: "Standard (AA)", tr: "Standart (AA)" },
+        high: { en: "High (AAA)", tr: "Yüksek (AAA)" },
+      },
+      default: "standard",
+      title: { en: "Contrast", tr: "Kontrast" },
+    },
+    mode: {
+      type: "string",
+      enum: ["light", "dark", "auto"],
+      "x-labels": {
+        light: { en: "Light", tr: "Açık" },
+        dark: { en: "Dark", tr: "Koyu" },
+        auto: { en: "Follow the reader", tr: "Okura göre" },
+      },
+      default: "light",
+      "x-widget": "radio",
+      title: { en: "Mode", tr: "Mod" },
+    },
+    brand: {
+      type: "string",
+      format: "color",
+      default: "#18181b",
+      title: { en: "Brand color", tr: "Marka rengi" },
+      description: { en: "Buttons and calls to action.", tr: "Butonlar ve çağrılar." },
+    },
+    link: {
+      type: "string",
+      format: "color",
+      default: "#0369a1",
+      title: { en: "Link color", tr: "Bağlantı rengi" },
+    },
+    surface: {
+      type: "string",
+      format: "color",
+      default: "#ffffff",
+      title: { en: "Background", tr: "Arka plan" },
+    },
+    text: {
+      type: "string",
+      format: "color",
+      default: "#18181b",
+      title: { en: "Text", tr: "Metin" },
+    },
+    // RFC-0023 §2: a curated font pairing (self-hosted in public/fonts) and a fluid type scale.
+    // Without a pairing the typeface below applies; without a scale the sizes stay fixed.
+    typePairing: {
+      type: "string",
+      enum: ["system", "editorial", "modern", "humanist", "technical", "classic"],
+      "x-labels": {
+        system: { en: "System", tr: "Sistem" },
+        editorial: { en: "Editorial (Fraunces and Inter)", tr: "Editoryal (Fraunces ve Inter)" },
+        modern: { en: "Modern (Space Grotesk and Inter)", tr: "Modern (Space Grotesk ve Inter)" },
+        humanist: { en: "Humanist (Source Sans)", tr: "Hümanist (Source Sans)" },
+        technical: {
+          en: "Technical (JetBrains Mono and Inter)",
+          tr: "Teknik (JetBrains Mono ve Inter)",
+        },
+        classic: { en: "Classic (Source Serif)", tr: "Klasik (Source Serif)" },
+      },
+      default: "system",
+      title: { en: "Font pairing", tr: "Yazı tipi eşleşmesi" },
+      description: {
+        en: "Headings and text set in fonts that go together. System uses the typeface below.",
+        tr: "Başlıklar ve metin birbirine uyan yazı tipleriyle. Sistem, aşağıdaki yazı tipini kullanır.",
+      },
+    },
+    typeScale: {
+      type: "string",
+      enum: ["compact", "balanced", "dramatic"],
+      "x-labels": {
+        compact: { en: "Compact", tr: "Sıkı" },
+        balanced: { en: "Balanced", tr: "Dengeli" },
+        dramatic: { en: "Dramatic", tr: "Çarpıcı" },
+      },
+      "x-widget": "radio",
+      title: { en: "Type scale", tr: "Yazı ölçeği" },
+      description: {
+        en: "How much bigger headings are than text; sizes adapt to the screen.",
+        tr: "Başlıkların metinden ne kadar büyük olduğu; boyutlar ekrana uyar.",
+      },
+    },
+    font: {
+      type: "string",
+      enum: ["system", "serif", "humanist", "mono"],
+      "x-labels": {
+        system: { en: "System", tr: "Sistem" },
+        serif: { en: "Serif", tr: "Tırnaklı" },
+        humanist: { en: "Humanist", tr: "Hümanist" },
+        mono: { en: "Monospace", tr: "Eş aralıklı" },
+      },
+      default: "system",
+      "x-widget": "radio",
+      title: { en: "Typeface", tr: "Yazı tipi" },
+    },
+    // RFC-0023 §3: corners for buttons, fields, cards and bands, and how much room things get.
+    radius: {
+      type: "string",
+      enum: ["none", "small", "medium", "large", "full"],
+      "x-labels": {
+        none: { en: "Square", tr: "Köşeli" },
+        small: { en: "Slightly rounded", tr: "Hafif yuvarlak" },
+        medium: { en: "Medium", tr: "Orta" },
+        large: { en: "Rounded", tr: "Yuvarlak" },
+        full: { en: "Pill buttons", tr: "Hap düğmeler" },
+      },
+      default: "small",
+      title: { en: "Corners", tr: "Köşeler" },
+    },
+    density: {
+      type: "string",
+      enum: ["compact", "cozy", "airy"],
+      "x-labels": {
+        compact: { en: "Compact", tr: "Sıkı" },
+        cozy: { en: "Cozy", tr: "Rahat" },
+        airy: { en: "Airy", tr: "Ferah" },
+      },
+      default: "cozy",
+      "x-widget": "radio",
+      title: { en: "Spacing", tr: "Boşluk" },
+      description: {
+        en: "How much room sections, cards and buttons get.",
+        tr: "Bölümlerin, kartların ve düğmelerin ne kadar yer kapladığı.",
+      },
+    },
+    // RFC-0024 §1: how much the site moves; a page can set its own level, and readers who ask for
+    // reduced motion always get less.
+    motion: {
+      type: "string",
+      enum: ["none", "subtle", "standard", "expressive"],
+      "x-labels": {
+        none: { en: "Still", tr: "Durağan" },
+        subtle: { en: "Subtle", tr: "İnce" },
+        standard: { en: "Standard", tr: "Standart" },
+        expressive: { en: "Expressive", tr: "Etkileyici" },
+      },
+      default: "none",
+      "x-widget": "radio",
+      title: { en: "Motion", tr: "Hareket" },
+      description: {
+        en: "How much sections move as people scroll and point. Readers who ask for reduced motion always see less.",
+        tr: "Bölümlerin kaydırırken ve üzerine gelirken ne kadar hareket ettiği. Daha az hareket isteyen okurlar her zaman daha azını görür.",
+      },
+    },
+    // RFC-0024 §5: how one page gives way to the next.
+    pageTransition: {
+      type: "string",
+      enum: ["none", "crossfade", "slide", "morph"],
+      "x-labels": {
+        none: { en: "None", tr: "Yok" },
+        crossfade: { en: "Crossfade", tr: "Geçişli solma" },
+        slide: { en: "Slide", tr: "Kaydırma" },
+        morph: { en: "Morph shared parts", tr: "Ortak öğeleri dönüştür" },
+      },
+      default: "none",
+      "x-widget": "radio",
+      title: { en: "Page transition", tr: "Sayfa geçişi" },
+      description: {
+        en: "How one page gives way to the next, in browsers that support it.",
+        tr: "Bir sayfanın diğerine nasıl geçtiği (destekleyen tarayıcılarda).",
+      },
+    },
+    // RFC-0026 26c: how heavy the site's icons are drawn.
+    iconWeight: {
+      type: "string",
+      enum: ["light", "regular", "bold", "fill"],
+      "x-labels": {
+        light: { en: "Light", tr: "İnce" },
+        regular: { en: "Regular", tr: "Normal" },
+        bold: { en: "Bold", tr: "Kalın" },
+        fill: { en: "Filled", tr: "Dolu" },
+      },
+      default: "regular",
+      "x-widget": "radio",
+      title: { en: "Icons", tr: "İkonlar" },
+      description: {
+        en: "Light suits airy, editorial sites; bold and filled read better small and on busy pages.",
+        tr: "İnce, ferah ve editoryal sitelere uyar; kalın ve dolu, küçük boyutta ve kalabalık sayfalarda daha iyi okunur.",
+      },
+    },
+    // RFC-0033 §4a: the theme's own words in a language it does not ship, or worded otherwise.
+    strings: {
+      type: "array",
+      maxItems: 50,
+      title: { en: "Theme words", tr: "Tema metinleri" },
+      description: {
+        en: "The theme's own words (notices, buttons, labels) in a language, over the theme's: one item per language. Agents can draft them; people review.",
+        tr: "Temanın kendi metinleri (bildirimler, düğmeler, etiketler), bir dilde, temanınkilerin yerine: her dil için bir öğe. Agent'lar taslak hazırlayabilir; kişiler gözden geçirir.",
+      },
+      items: {
+        type: "object",
+        additionalProperties: false,
+        required: ["locale"],
+        properties: {
+          locale: { type: "string", maxLength: 35, title: { en: "Language", tr: "Dil" } },
+          machineTranslated: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Machine translation notice", tr: "Makine çevirisi notu" },
+          },
+          machineReviewed: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Reviewed translation notice", tr: "İncelenmiş çeviri notu" },
+          },
+          readOriginal: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Read the original", tr: "Orijinalini oku" },
+          },
+          notTranslated: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Not translated notice", tr: "Çevrilmemiş sayfa notu" },
+          },
+          languages: { type: "string", maxLength: 300, title: { en: "Languages", tr: "Diller" } },
+          home: { type: "string", maxLength: 300, title: { en: "Home", tr: "Ana sayfa" } },
+          menu: { type: "string", maxLength: 300, title: { en: "Menu", tr: "Menü" } },
+          search: { type: "string", maxLength: 300, title: { en: "Search", tr: "Ara" } },
+          searchLabel: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Search label", tr: "Arama etiketi" },
+          },
+          searchPlaceholder: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Search placeholder", tr: "Arama ipucu" },
+          },
+          related: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Related posts", tr: "İlgili yazılar" },
+          },
+          skipToContent: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Skip to content", tr: "İçeriğe geç" },
+          },
+          notFoundTitle: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Not found: title", tr: "Bulunamadı: başlık" },
+          },
+          notFoundText: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Not found: text", tr: "Bulunamadı: metin" },
+          },
+          notFoundHome: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Not found: home link", tr: "Bulunamadı: ana sayfa bağlantısı" },
+          },
+          notFoundSearch: {
+            type: "string",
+            maxLength: 300,
+            title: { en: "Not found: search prompt", tr: "Bulunamadı: arama çağrısı" },
+          },
+        },
+      },
+    },
+  },
+  // WCAG 2.2 AA: body text 4.5:1, links 4.5:1, buttons and other UI parts 3:1 against the page.
+  "x-contrast": [
+    ["text", "surface", 4.5],
+    ["link", "surface", 4.5],
+    ["brand", "surface", 3],
+  ],
+};
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/strings.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/strings.ts
new file mode 100644
index 00000000..0a9d60bb
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/strings.ts
@@ -0,0 +1,279 @@
+/**
+ * The theme's own words per language (RFC-0033 §4a). It ships English, Turkish and Japanese; any
+ * other language gets English, with the site's `strings` setting over it. Plain data, no components,
+ * so tests import it directly.
+ */
+/** The few words the theme itself prints (the content brings its own). */
+const STRINGS = {
+  en: {
+    home: "Home",
+    breadcrumb: "Breadcrumb",
+    related: "Related posts",
+    pagination: "Pagination",
+    newer: "← Newer",
+    older: "Older →",
+    pageOf: (page: number, pages: number) => `Page ${page} of ${pages}`,
+    feed: "RSS feed",
+    posts: (n: number) => (n === 1 ? "1 post" : `${n} posts`),
+    by: (name: string) => `By ${name}`,
+    byPrefix: "By ",
+    and: " and ",
+    updated: (when: string) => `Updated ${when}`,
+    minRead: (n: number) => `${n} min read`,
+    onThisPage: "On this page",
+    /** RFC-0041 §9: the typed fields list on an article, and the words of yes/no fields. */
+    details: "Details",
+    yes: "Yes",
+    no: "No",
+    /** RFC-0019 §2: the corrections list at the end of an article, and the note under the byline. */
+    corrections: "Corrections and updates",
+    correctionKind: { correction: "Correction", clarification: "Clarification", update: "Update" },
+    appended: (kind: string) => `${kind} appended`,
+    /** RFC-0019 §3: the search form in the header and the search page. */
+    /** RFC-0025: the header and footer's own words. */
+    skipToContent: "Skip to content",
+    mainMenu: "Main",
+    footerMenu: "Footer",
+    legalMenu: "Legal",
+    socialLinks: "Social links",
+    secondaryMenu: "Secondary",
+    menu: "Menu",
+    closeMenu: "Close menu",
+    announcement: "Announcement",
+    dismiss: "Dismiss",
+    privacy: "Privacy",
+    consentNotice: "This site keeps only what it needs to work: no tracking cookies.",
+    consentChoices: "Some parts of this site can load content from other services (videos, maps).",
+    consentOk: "OK",
+    consentAll: "Allow all",
+    consentEssential: "Only essential",
+    privacyPolicy: "Privacy policy",
+    copied: "Copied",
+    linkCopied: "Link copied",
+    builtWith: "Built with Cloudhal",
+    search: "Search",
+    searchLabel: "Search this site",
+    searchPlaceholder: "Search the site…",
+    searchResults: (n: number, q: string) =>
+      n === 1 ? `1 result for “${q}”` : `${n} results for “${q}”`,
+    searchNone: (q: string) => `Nothing matches “${q}”. Try fewer or other words.`,
+    searchUpdating: "Search is catching up with the latest changes.",
+    /** RFC-0029 §6: the search modal's words (`data-words`; `{q}` is the query, `#` the count). */
+    searchModal: {
+      kinds: { article: "Articles", page: "Pages", term: "Topics", author: "Authors" },
+      all: "See all results for “{q}”",
+      none: "Nothing matches “{q}”.",
+      recent: "Recent searches",
+      clear: "Clear recent searches",
+      limited: "Too many searches right now.",
+      error: "Search is unavailable right now.",
+      updating: "Search is catching up with the latest changes.",
+      count: { one: "# result", other: "# results" },
+      close: "Close",
+      keys: { move: "move", open: "open", close: "close" },
+    },
+    previous: "← Previous",
+    next: "Next →",
+    /** Previews of an embargoed or expired page or entry (RFC-0008 §7.3); readers never see these. */
+    embargoed: (when: string) => `Embargoed until ${when}. Only previews show it until then.`,
+    expired: (when: string) => `Expired on ${when}. Only previews show it now.`,
+    // RFC-0033: the reader's notice on machine translations, the fallback notice, the switcher.
+    machineTranslated: "This page was translated automatically and has not been reviewed yet.",
+    machineReviewed: "This page was translated automatically and reviewed by a person.",
+    readOriginal: "Read the original",
+    notTranslated:
+      "This page isn't available in your language yet, so it is shown in its original language.",
+    languages: "Languages",
+    // The not-found page (404) when the site has no page at `/404` in the reader's language.
+    notFoundTitle: "Page not found",
+    notFoundText: "The page you are looking for doesn't exist or has moved.",
+    notFoundHome: "Go to the home page",
+    notFoundSearch: "Or search this site:",
+  },
+  tr: {
+    home: "Ana sayfa",
+    breadcrumb: "Sayfa yolu",
+    related: "İlgili yazılar",
+    pagination: "Sayfalar",
+    newer: "← Daha yeni",
+    older: "Daha eski →",
+    pageOf: (page: number, pages: number) => `Sayfa ${page} / ${pages}`,
+    feed: "RSS beslemesi",
+    posts: (n: number) => `${n} yazı`,
+    by: (name: string) => name,
+    byPrefix: "",
+    and: " ve ",
+    updated: (when: string) => `Güncellendi: ${when}`,
+    minRead: (n: number) => `${n} dk okuma`,
+    onThisPage: "Bu sayfada",
+    details: "Ayrıntılar",
+    yes: "Evet",
+    no: "Hayır",
+    corrections: "Düzeltmeler ve güncellemeler",
+    correctionKind: { correction: "Düzeltme", clarification: "Açıklama", update: "Güncelleme" },
+    appended: (kind: string) => `${kind} eklendi`,
+    skipToContent: "İçeriğe geç",
+    mainMenu: "Ana menü",
+    footerMenu: "Alt menü",
+    legalMenu: "Yasal",
+    socialLinks: "Sosyal bağlantılar",
+    secondaryMenu: "İkincil menü",
+    menu: "Menü",
+    closeMenu: "Menüyü kapat",
+    announcement: "Duyuru",
+    dismiss: "Kapat",
+    privacy: "Gizlilik",
+    consentNotice: "Bu site yalnızca çalışması için gerekeni saklar: izleme çerezi yok.",
+    consentChoices:
+      "Bu sitenin bazı bölümleri başka servislerden içerik yükleyebilir (videolar, haritalar).",
+    consentOk: "Tamam",
+    consentAll: "Tümüne izin ver",
+    consentEssential: "Yalnız gerekli",
+    privacyPolicy: "Gizlilik politikası",
+    copied: "Kopyalandı",
+    linkCopied: "Bağlantı kopyalandı",
+    builtWith: "Cloudhal ile yapıldı",
+    search: "Ara",
+    searchLabel: "Sitede ara",
+    searchPlaceholder: "Sitede ara…",
+    searchResults: (n: number, q: string) => `“${q}” için ${n} sonuç`,
+    searchNone: (q: string) =>
+      `“${q}” ile eşleşen bir şey yok. Daha az ya da başka sözcükler deneyin.`,
+    searchUpdating: "Arama son değişiklikleri eklemeye devam ediyor.",
+    searchModal: {
+      kinds: { article: "Yazılar", page: "Sayfalar", term: "Konular", author: "Yazarlar" },
+      all: "“{q}” için tüm sonuçlar",
+      none: "“{q}” ile eşleşen bir şey yok.",
+      recent: "Son aramalar",
+      clear: "Son aramaları temizle",
+      limited: "Şu anda çok fazla arama yapıldı.",
+      error: "Arama şu anda kullanılamıyor.",
+      updating: "Arama son değişiklikleri eklemeye devam ediyor.",
+      count: { one: "# sonuç", other: "# sonuç" },
+      close: "Kapat",
+      keys: { move: "gez", open: "aç", close: "kapat" },
+    },
+    previous: "← Önceki",
+    next: "Sonraki →",
+    embargoed: (when: string) =>
+      `${when} tarihine kadar ambargolu. O zamana kadar yalnızca önizlemede görünür.`,
+    expired: (when: string) =>
+      `${when} tarihinde yayından kalktı. Artık yalnızca önizlemede görünür.`,
+    machineTranslated: "Bu sayfa otomatik olarak çevrildi ve henüz gözden geçirilmedi.",
+    machineReviewed: "Bu sayfa otomatik olarak çevrildi ve bir kişi tarafından gözden geçirildi.",
+    readOriginal: "Orijinalini oku",
+    notTranslated: "Bu sayfa henüz dilinizde yok; bu yüzden orijinal dilinde gösteriliyor.",
+    languages: "Diller",
+    notFoundTitle: "Sayfa bulunamadı",
+    notFoundText: "Aradığınız sayfa yok ya da taşınmış.",
+    notFoundHome: "Ana sayfaya dön",
+    notFoundSearch: "Ya da sitede arayın:",
+  },
+  ja: {
+    home: "ホーム",
+    breadcrumb: "パンくずリスト",
+    related: "関連記事",
+    pagination: "ページ送り",
+    newer: "← 新しい記事",
+    older: "古い記事 →",
+    pageOf: (page: number, pages: number) => `${pages} ページ中 ${page} ページ`,
+    feed: "RSS フィード",
+    posts: (n: number) => `${n} 件の記事`,
+    by: (name: string) => `${name} 著`,
+    byPrefix: "著者:",
+    and: "、",
+    updated: (when: string) => `${when} 更新`,
+    minRead: (n: number) => `${n} 分で読めます`,
+    onThisPage: "このページの内容",
+    details: "詳細",
+    yes: "はい",
+    no: "いいえ",
+    corrections: "訂正と更新",
+    correctionKind: { correction: "訂正", clarification: "補足", update: "更新" },
+    appended: (kind: string) => `${kind}を追記`,
+    skipToContent: "本文へスキップ",
+    mainMenu: "メイン",
+    footerMenu: "フッター",
+    legalMenu: "法的情報",
+    socialLinks: "ソーシャルリンク",
+    secondaryMenu: "サブメニュー",
+    menu: "メニュー",
+    closeMenu: "メニューを閉じる",
+    announcement: "お知らせ",
+    dismiss: "閉じる",
+    privacy: "プライバシー",
+    consentNotice: "このサイトは動作に必要なものだけを保存します。追跡用 Cookie は使いません。",
+    consentChoices:
+      "このサイトの一部は、ほかのサービスのコンテンツ(動画、地図)を読み込むことがあります。",
+    consentOk: "OK",
+    consentAll: "すべて許可",
+    consentEssential: "必須のみ",
+    privacyPolicy: "プライバシーポリシー",
+    copied: "コピーしました",
+    linkCopied: "リンクをコピーしました",
+    builtWith: "Cloudhal で構築",
+    search: "検索",
+    searchLabel: "サイト内検索",
+    searchPlaceholder: "サイト内を検索…",
+    searchResults: (n: number, q: string) => `「${q}」の検索結果 ${n} 件`,
+    searchNone: (q: string) =>
+      `「${q}」に一致するものはありません。言葉を減らすか、別の言葉でお試しください。`,
+    searchUpdating: "検索は最新の変更を反映している途中です。",
+    searchModal: {
+      kinds: { article: "記事", page: "ページ", term: "トピック", author: "著者" },
+      all: "「{q}」の検索結果をすべて見る",
+      none: "「{q}」に一致するものはありません。",
+      recent: "最近の検索",
+      clear: "最近の検索を消去",
+      limited: "現在、検索が集中しています。",
+      error: "現在、検索を利用できません。",
+      updating: "検索は最新の変更を反映している途中です。",
+      count: { one: "# 件", other: "# 件" },
+      close: "閉じる",
+      keys: { move: "移動", open: "開く", close: "閉じる" },
+    },
+    previous: "← 前へ",
+    next: "次へ →",
+    embargoed: (when: string) =>
+      `${when} まで公開を控えています。それまではプレビューでのみ表示されます。`,
+    expired: (when: string) =>
+      `${when} に掲載期限が切れました。現在はプレビューでのみ表示されます。`,
+    machineTranslated: "このページは自動翻訳されたもので、まだ確認されていません。",
+    machineReviewed: "このページは自動翻訳され、人が確認しました。",
+    readOriginal: "原文を読む",
+    notTranslated: "このページはまだお使いの言語で読めないため、元の言語で表示しています。",
+    languages: "言語",
+    notFoundTitle: "ページが見つかりません",
+    notFoundText: "お探しのページは存在しないか、移動しました。",
+    notFoundHome: "ホームページへ",
+    notFoundSearch: "またはサイト内を検索:",
+  },
+} as const;
+
+export type ThemeStrings = (typeof STRINGS)[keyof typeof STRINGS];
+
+/**
+ * The theme's words in `locale` (its language subtag; English for a language the theme does not
+ * ship, and for any word a shipped language lacks), with the site's own wording over them
+ * (`strings` in the theme settings, RFC-0033 §4a: one item per language, matched on the full tag,
+ * then the language): plain-text words only, the keys the settings declare.
+ */
+export function strings(locale: string, overrides?: unknown): ThemeStrings {
+  const lang = (locale.split("-")[0] ?? locale).toLowerCase();
+  const base: ThemeStrings = Object.hasOwn(STRINGS, lang)
+    ? { ...STRINGS.en, ...STRINGS[lang as keyof typeof STRINGS] }
+    : STRINGS.en;
+  if (!Array.isArray(overrides)) return base;
+  const words = base as Record<string, unknown>;
+  const items = overrides as Array<Record<string, unknown> | null>;
+  const item =
+    items.find((o) => o?.locale === locale) ??
+    items.find((o) => typeof o?.locale === "string" && o.locale.toLowerCase() === lang);
+  if (!item) return base;
+  const own = Object.fromEntries(
+    Object.entries(item).filter(
+      ([k, v]) => k !== "locale" && typeof v === "string" && v && typeof words[k] === "string",
+    ),
+  );
+  return Object.keys(own).length ? ({ ...base, ...own } as ThemeStrings) : base;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/ambient.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/ambient.css
new file mode 100644
index 00000000..9c76813d
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/ambient.css
@@ -0,0 +1,185 @@
+/*
+ * Ambient backgrounds (RFC-0024 §4): a layer under a band's or card's content, from its role
+ * colors at low strength, so the surface's text roles keep their contrast. CSS kinds move slowly
+ * (12 s or more a cycle) where motion plays; particles are painted by the ambient module on a
+ * canvas. Everywhere else, and while the reader has paused motion, the layer is a still poster.
+ */
+[data-ch-ambient] {
+  --ch-amb-1: var(--ch-color-brand);
+  --ch-amb-2: var(--ch-color-accent);
+  position: relative;
+  isolation: isolate;
+  overflow: clip;
+}
+[data-ch-colors="brand"] {
+  --ch-amb-2: var(--ch-color-gradient);
+}
+[data-ch-colors="accent"] {
+  --ch-amb-1: var(--ch-color-accent);
+  --ch-amb-2: var(--ch-color-link);
+}
+[data-ch-colors="neutral"] {
+  --ch-amb-1: var(--ch-color-border-strong);
+  --ch-amb-2: var(--ch-color-text-subtle);
+}
+[data-ch-ambient]::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  z-index: -1;
+  pointer-events: none;
+}
+[data-ch-ambient="aurora"]::before {
+  inset: -20%;
+  background:
+    radial-gradient(
+      40% 50% at 20% 30%,
+      color-mix(in oklch, var(--ch-amb-1) 28%, transparent),
+      transparent 70%
+    ),
+    radial-gradient(
+      35% 45% at 80% 20%,
+      color-mix(in oklch, var(--ch-amb-2) 24%, transparent),
+      transparent 70%
+    ),
+    radial-gradient(
+      45% 40% at 60% 90%,
+      color-mix(in oklch, var(--ch-amb-1) 18%, transparent),
+      transparent 70%
+    );
+  filter: blur(24px);
+}
+[data-ch-ambient="gradient-shift"]::before {
+  background-image: linear-gradient(
+    115deg,
+    color-mix(in oklch, var(--ch-amb-1) 22%, transparent),
+    color-mix(in oklch, var(--ch-amb-2) 22%, transparent),
+    color-mix(in oklch, var(--ch-amb-1) 22%, transparent)
+  );
+  background-size: 300% 300%;
+}
+[data-ch-ambient="grain"]::before {
+  inset: -10%;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='180' height='180'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.8' numOctaves='2' stitchTiles='stitch'/%3E%3CfeColorMatrix values='0 0 0 0 .5 0 0 0 0 .5 0 0 0 0 .5 0 0 0 .22 0'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E");
+  opacity: 0.6;
+}
+[data-ch-ambient="beams"]::before {
+  background-image:
+    linear-gradient(
+      105deg,
+      transparent 35%,
+      color-mix(in oklch, var(--ch-amb-1) 20%, transparent) 45%,
+      transparent 55%
+    ),
+    linear-gradient(
+      105deg,
+      transparent 55%,
+      color-mix(in oklch, var(--ch-amb-2) 16%, transparent) 63%,
+      transparent 72%
+    );
+  background-size: 250% 100%;
+}
+/* Particles: a soft still poster until (and unless) the ambient module paints the canvas. */
+[data-ch-ambient="particles"]::before {
+  background:
+    radial-gradient(
+      45% 60% at 25% 35%,
+      color-mix(in oklch, var(--ch-amb-1) 14%, transparent),
+      transparent 70%
+    ),
+    radial-gradient(
+      40% 55% at 75% 65%,
+      color-mix(in oklch, var(--ch-amb-2) 12%, transparent),
+      transparent 70%
+    );
+}
+.ch-ambient {
+  position: absolute;
+  inset: 0;
+  z-index: -1;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+}
+@keyframes ch-amb-aurora {
+  to {
+    translate: 6% -4%;
+    rotate: 8deg;
+  }
+}
+@keyframes ch-amb-pan {
+  to {
+    background-position: 100% 50%;
+  }
+}
+@keyframes ch-amb-drift {
+  to {
+    translate: -6% -4%;
+  }
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-ambient="aurora"]::before {
+    animation: ch-amb-aurora 18s ease-in-out infinite alternate;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-ambient="gradient-shift"]::before {
+    animation: ch-amb-pan 16s ease-in-out infinite alternate;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-ambient="grain"]::before {
+    animation: ch-amb-drift 14s ease-in-out infinite alternate;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-ambient="beams"]::before {
+    animation: ch-amb-pan 12s linear infinite alternate;
+  }
+}
+/*
+ * Page transitions (RFC-0024 §5): themeVariables writes @view-transition when the site chose one;
+ * these shape it. Crossfade is the browser's own, at the level's pace; slide moves the old page
+ * out and the new one in (crossfade at "subtle"); morph moves elements with the same
+ * view-transition name between pages. Nothing animates at "none" or under reduced motion.
+ */
+::view-transition-group(*),
+::view-transition-old(*),
+::view-transition-new(*) {
+  animation-duration: var(--ch-dur-normal, 250ms);
+  animation-timing-function: var(--ch-ease-standard, ease);
+}
+@keyframes ch-vt-out {
+  to {
+    opacity: 0;
+    translate: calc(var(--ch-move-l, 0px) * -0.5) 0;
+  }
+}
+@keyframes ch-vt-in {
+  from {
+    opacity: 0;
+    translate: calc(var(--ch-move-l, 0px) * 0.5) 0;
+  }
+}
+:root[data-ch-page-transition="slide"]:is(
+  [data-ch-motion="standard"],
+  [data-ch-motion="expressive"]
+)::view-transition-old(root) {
+  animation-name: ch-vt-out;
+}
+:root[data-ch-page-transition="slide"]:is(
+  [data-ch-motion="standard"],
+  [data-ch-motion="expressive"]
+)::view-transition-new(root) {
+  animation-name: ch-vt-in;
+}
+:root[data-ch-motion="none"]::view-transition-group(*),
+:root[data-ch-motion="none"]::view-transition-old(*),
+:root[data-ch-motion="none"]::view-transition-new(*) {
+  animation: none;
+}
+@media (prefers-reduced-motion: reduce) {
+  ::view-transition-group(*),
+  ::view-transition-old(*),
+  ::view-transition-new(*) {
+    animation: none !important;
+  }
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/article.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/article.css
new file mode 100644
index 00000000..17573585
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/article.css
@@ -0,0 +1,215 @@
+/* The article (RFC-0018 §3): kicker, title, dek, byline, table of contents. */
+.ch-article-head {
+  @apply space-y-3 border-b border-zinc-200 pt-6 pb-6;
+}
+.ch-kicker {
+  @apply inline-block text-sm font-semibold uppercase;
+  color: var(--ch-color-link);
+  letter-spacing: 0.04em;
+}
+a.ch-kicker:hover {
+  @apply underline underline-offset-4;
+}
+.ch-article-head h1 {
+  @apply text-4xl font-bold tracking-tight sm:text-5xl;
+}
+.ch-dek {
+  @apply text-xl leading-relaxed text-zinc-600;
+}
+.ch-byline {
+  @apply flex flex-wrap items-center gap-x-3 gap-y-1 text-sm text-zinc-500;
+}
+.ch-byline > * + *::before {
+  content: "·";
+  @apply mr-3 text-zinc-400;
+}
+.ch-byline__author {
+  @apply font-medium text-zinc-800;
+}
+.ch-cover {
+  @apply my-6;
+}
+.ch-cover img {
+  @apply w-full rounded-lg;
+}
+.ch-cover figcaption {
+  @apply mt-2 text-sm text-zinc-500;
+}
+.ch-toc {
+  @apply my-6 rounded-lg border border-zinc-200 px-4 py-3 text-sm;
+}
+.ch-toc summary {
+  @apply cursor-pointer font-medium;
+}
+.ch-toc ol {
+  @apply mt-2 space-y-1;
+}
+.ch-toc li[data-depth="3"] {
+  @apply pl-4;
+}
+.ch-toc a {
+  @apply text-zinc-600 underline-offset-4 hover:text-zinc-900 hover:underline;
+}
+.ch-richtext :is(h2, h3)[id] {
+  scroll-margin-top: 1.5rem;
+}
+.ch-byline__author a {
+  @apply underline-offset-4 hover:underline;
+}
+.ch-byline a[href="#ch-corrections"] {
+  @apply font-medium text-amber-800 underline underline-offset-4;
+}
+/* Corrections (RFC-0019 §2): newest first, the kind as a label. */
+.ch-corrections {
+  @apply mt-10 rounded-lg border border-amber-200 bg-amber-50 px-5 py-4;
+  scroll-margin-top: 1.5rem;
+}
+.ch-corrections h2 {
+  @apply text-lg font-semibold;
+}
+.ch-corrections ol {
+  @apply mt-3 space-y-3;
+}
+.ch-correction__meta {
+  @apply flex flex-wrap gap-x-2 text-sm text-zinc-600;
+}
+.ch-correction__meta strong {
+  @apply font-semibold text-amber-900;
+}
+.ch-correction__note {
+  @apply mt-1 text-zinc-800;
+}
+.ch-correction__note a {
+  @apply underline underline-offset-4;
+}
+/* Article lists as cards: cover thumbnail, title, summary, date and reading time. */
+.ch-card-entry {
+  @apply flex gap-4;
+}
+.ch-card-entry__cover {
+  @apply h-24 w-36 shrink-0 rounded-md object-cover sm:h-28 sm:w-44;
+}
+.ch-card-entry__body {
+  @apply min-w-0 space-y-1;
+}
+.ch-card-entry__body a {
+  @apply text-lg font-semibold leading-snug underline-offset-4 hover:underline;
+}
+.ch-card-entry__body p {
+  @apply text-sm text-zinc-600;
+}
+.ch-card-entry__meta {
+  @apply flex flex-wrap gap-x-3 text-xs text-zinc-500;
+}
+.ch-card-entry__meta > * + *::before {
+  content: "·";
+  @apply mr-3;
+}
+
+/* Breadcrumbs, term chips, archives, pagination, related posts (RFC-0002). */
+.ch-breadcrumbs ol {
+  @apply flex flex-wrap gap-1 pt-6 text-sm text-zinc-500;
+}
+.ch-breadcrumbs li + li::before {
+  content: "›";
+  @apply mr-1 text-zinc-400;
+}
+.ch-breadcrumbs a {
+  @apply hover:text-zinc-900;
+}
+.ch-terms {
+  @apply flex flex-wrap gap-2 border-t border-zinc-200 py-4;
+}
+.ch-terms__group {
+  @apply flex flex-wrap gap-2;
+}
+.ch-chip {
+  @apply inline-block rounded-full border border-zinc-300 px-3 py-1 text-sm text-zinc-700;
+}
+a.ch-chip {
+  @apply hover:border-zinc-900 hover:text-zinc-900;
+}
+.ch-terms__group[data-taxonomy="category"] .ch-chip {
+  @apply border-(--ch-color-surface-inverse) bg-(--ch-color-surface-inverse) text-(--ch-color-text-inverse) hover:text-(--ch-color-text-inverse);
+}
+.ch-archive-header {
+  @apply space-y-2 border-b border-zinc-200 pt-4 pb-6;
+}
+.ch-archive-header h1 {
+  @apply text-4xl font-bold tracking-tight;
+}
+.ch-archive-kind {
+  @apply text-sm font-medium tracking-wide text-zinc-500 uppercase;
+}
+.ch-archive-meta {
+  @apply flex gap-4 text-sm text-zinc-500;
+}
+.ch-archive-meta a {
+  @apply underline-offset-4 hover:underline;
+}
+.ch-archive-image {
+  @apply mt-4 w-full rounded;
+}
+/* Author pages (RFC-0019 §1): round portrait, role and profile links. */
+.ch-archive[data-taxonomy="author"] .ch-archive-image {
+  @apply h-24 w-24 rounded-full object-cover;
+}
+.ch-archive-role {
+  @apply text-lg text-zinc-600;
+}
+.ch-archive-links {
+  @apply flex flex-wrap gap-3 text-sm;
+}
+.ch-archive-links a {
+  @apply font-medium underline underline-offset-4;
+}
+.ch-entrylist {
+  @apply space-y-6 py-6;
+}
+.ch-entrylist a {
+  @apply text-lg font-medium underline-offset-4 hover:underline;
+}
+.ch-entrylist p {
+  @apply text-sm text-zinc-600;
+}
+.ch-entrylist time {
+  @apply text-xs text-zinc-500;
+}
+.ch-pagination {
+  @apply flex items-center justify-between border-t border-zinc-200 py-6 text-sm text-zinc-600;
+}
+.ch-pagination a {
+  @apply font-medium text-zinc-900 underline-offset-4 hover:underline;
+}
+.ch-related {
+  @apply border-t border-zinc-200 pt-6;
+}
+.ch-related h2 {
+  @apply text-xl font-semibold;
+}
+
+/* Navigation menus (RFC-0003): dropdowns and nested items as disclosures, no JavaScript. */
+.ch-nav-menu {
+  @apply relative;
+}
+.ch-nav-menu summary {
+  @apply cursor-pointer list-none;
+}
+.ch-nav-menu summary::-webkit-details-marker {
+  display: none;
+}
+.ch-nav-menu__caret {
+  @apply ml-1 text-xs;
+}
+.ch-nav-menu[open] > summary .ch-nav-menu__caret {
+  rotate: 180deg;
+}
+.ch-nav-menu > ul {
+  @apply absolute z-10 mt-2 min-w-40 space-y-1 rounded border border-zinc-200 bg-white p-2 shadow-sm;
+}
+footer .ch-nav-menu > ul {
+  @apply bottom-full mb-2;
+}
+.ch-nav-menu .ch-nav-menu > ul {
+  @apply static mt-1 border-0 p-0 pl-3 shadow-none;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/blocks.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/blocks.css
new file mode 100644
index 00000000..aa826300
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/blocks.css
@@ -0,0 +1,93 @@
+/* Shown in previews only, where an invalid ```surface would draw nothing. */
+.ch-surface-problem {
+  @apply rounded-lg px-4 py-3 text-sm;
+  border: 1px solid var(--ch-color-accent);
+}
+.ch-surface-problem ul {
+  @apply mt-2 list-disc ps-5;
+}
+.ch-richtext table:not([class]) tbody tr:hover {
+  background: var(--ch-color-surface-muted);
+}
+.ch-image {
+  @apply py-6;
+}
+/* Block types (RFC-0015): callout, button, video link and questions. */
+.ch-block {
+  @apply py-4;
+}
+.ch-callout {
+  @apply space-y-2 rounded border-l-4 border-sky-500 bg-sky-50 px-4 py-3;
+}
+.ch-callout--success {
+  @apply border-emerald-500 bg-emerald-50;
+}
+.ch-callout--warning {
+  @apply border-amber-500 bg-amber-50;
+}
+.ch-callout--danger {
+  @apply border-red-500 bg-red-50;
+}
+.ch-button {
+  /* w-fit: a button in a Stack (a flex column) keeps its own width (RFC-0022 22e). */
+  @apply inline-block w-fit rounded px-4 py-2 font-medium;
+}
+.ch-button--primary {
+  @apply text-(--ch-color-on-brand);
+  background: var(--ch-color-brand);
+}
+.ch-button--secondary {
+  @apply border border-zinc-300 text-zinc-900;
+}
+.ch-embed__link {
+  @apply flex items-center gap-3 rounded border border-zinc-200 px-4 py-3 no-underline;
+}
+.ch-embed__play {
+  @apply flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-(--ch-color-surface-inverse) text-(--ch-color-text-inverse);
+}
+.ch-embed__title {
+  @apply font-medium text-zinc-900;
+}
+.ch-embed__host {
+  @apply ml-auto text-sm text-zinc-500;
+}
+.ch-embed__frame {
+  @apply aspect-video w-full rounded border-0;
+}
+.ch-faq__item {
+  @apply border-b border-zinc-200 py-3;
+}
+.ch-faq__item summary {
+  @apply cursor-pointer font-medium;
+}
+.ch-faq__answer {
+  @apply mt-2 space-y-2 text-zinc-700;
+}
+/* This theme's own block type (src/blocks.ts). */
+.testimonial blockquote {
+  @apply border-l-4 border-zinc-300 pl-4 text-lg italic text-zinc-800;
+}
+.testimonial figcaption {
+  @apply mt-2 flex gap-2 text-sm;
+}
+.testimonial__author {
+  @apply font-medium text-zinc-900;
+}
+.testimonial__role {
+  @apply text-zinc-500;
+}
+.ch-image figcaption {
+  @apply mt-2 text-sm text-zinc-500;
+}
+.ch-contentlist {
+  @apply py-6;
+}
+.ch-contentlist ul {
+  @apply space-y-4;
+}
+.ch-contentlist a {
+  @apply text-lg font-medium underline-offset-4 hover:underline;
+}
+.ch-contentlist p {
+  @apply text-sm text-zinc-600;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/carousel.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/carousel.css
new file mode 100644
index 00000000..8d611569
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/carousel.css
@@ -0,0 +1,266 @@
+/*
+ * RFC-0027: carousels. A scroll-snap track (native swipe, momentum and keyboard scrolling, RTL by
+ * logical properties), slides in one frame size, markers as links to the slides.
+ */
+.ch-carousel {
+  --ch-c-gap: calc(var(--spacing) * 4);
+  --ch-c-peek: 0%;
+  --ch-c-n: 1;
+  position: relative;
+}
+.ch-carousel[data-gap="none"] {
+  --ch-c-gap: 0px;
+}
+.ch-carousel[data-gap="s"] {
+  --ch-c-gap: calc(var(--spacing) * 2);
+}
+.ch-carousel[data-gap="l"] {
+  --ch-c-gap: calc(var(--spacing) * 6);
+}
+.ch-carousel[data-gap="xl"] {
+  --ch-c-gap: calc(var(--spacing) * 10);
+}
+.ch-carousel[data-peek="s"] {
+  --ch-c-peek: 12%;
+}
+.ch-carousel[data-peek="m"] {
+  --ch-c-peek: 24%;
+}
+.ch-carousel[data-per-view="2"] {
+  --ch-c-n: 2;
+  --ch-c-n-set: 2;
+}
+.ch-carousel[data-per-view="3"] {
+  --ch-c-n: 3;
+  --ch-c-n-set: 3;
+}
+.ch-carousel[data-per-view="4"] {
+  --ch-c-n: 4;
+  --ch-c-n-set: 4;
+}
+/* perView follows the room the carousel has: at most 2 when medium, 1 when narrow (a peek stays). */
+.ch-carousel {
+  container-type: inline-size;
+}
+@container (max-width: 44rem) {
+  .ch-carousel__track {
+    --ch-c-n: min(var(--ch-c-n-set, 1), 2);
+  }
+}
+@container (max-width: 28rem) {
+  .ch-carousel__track {
+    --ch-c-n: 1;
+  }
+}
+.ch-carousel__track {
+  display: grid;
+  grid-auto-flow: column;
+  /* perView slides, the next one peeking in by --ch-c-peek */
+  grid-auto-columns: calc(
+    (100% - (var(--ch-c-n) - 1) * var(--ch-c-gap) - var(--ch-c-peek)) /
+    var(--ch-c-n)
+  );
+  gap: var(--ch-c-gap);
+  overflow-x: auto;
+  overscroll-behavior-inline: contain;
+  scroll-snap-type: inline mandatory;
+  scrollbar-width: thin;
+  padding-block: 2px;
+}
+/* As many as fit: a rail without perView, by item width. */
+.ch-carousel[data-variant="rail"]:not([data-per-view]) .ch-carousel__track {
+  grid-auto-columns: min(16rem, 85%);
+}
+.ch-carousel[data-item="s"]:not([data-per-view]) .ch-carousel__track {
+  grid-auto-columns: min(12rem, 70%);
+}
+.ch-carousel[data-item="l"]:not([data-per-view]) .ch-carousel__track {
+  grid-auto-columns: min(22rem, 90%);
+}
+.ch-carousel__track:focus-visible {
+  outline: 2px solid var(--ch-color-focus, currentColor);
+  outline-offset: 2px;
+}
+:root:not([data-ch-motion="none"]) .ch-carousel__track {
+  scroll-behavior: smooth;
+}
+@media (prefers-reduced-motion: reduce) {
+  .ch-carousel__track {
+    scroll-behavior: auto !important;
+  }
+}
+.ch-carousel__slide {
+  scroll-snap-align: start;
+  min-width: 0;
+}
+.ch-carousel[data-align="center"] .ch-carousel__slide {
+  scroll-snap-align: center;
+}
+/* A hero: full width like a band, one slide at a time, every slide in one frame. */
+.ch-carousel[data-variant="hero"] {
+  margin-inline: calc(50% - 50vw);
+}
+.ch-carousel[data-variant="hero"] .ch-carousel__track {
+  grid-auto-columns: 100%;
+  gap: 0;
+  scrollbar-width: none;
+}
+.ch-carousel[data-variant="hero"] .ch-carousel__slide {
+  scroll-snap-stop: always;
+}
+.ch-carousel[data-aspect] .ch-carousel__slide {
+  overflow: hidden;
+}
+.ch-carousel[data-aspect="16:9"] .ch-carousel__slide {
+  aspect-ratio: 16 / 9;
+}
+.ch-carousel[data-aspect="21:9"] .ch-carousel__slide {
+  aspect-ratio: 21 / 9;
+}
+.ch-carousel[data-aspect="4:3"] .ch-carousel__slide {
+  aspect-ratio: 4 / 3;
+}
+.ch-carousel[data-aspect="1:1"] .ch-carousel__slide {
+  aspect-ratio: 1;
+}
+.ch-carousel[data-aspect="3:4"] .ch-carousel__slide {
+  aspect-ratio: 3 / 4;
+}
+/* A wide hero frame is too short on a phone: narrow carousels use a taller one (still one size). */
+@container (max-width: 40rem) {
+  .ch-carousel[data-variant="hero"]:is([data-aspect="16:9"], [data-aspect="21:9"])
+    .ch-carousel__slide {
+    aspect-ratio: 4 / 5;
+  }
+}
+/* A slide's content fills its frame: images cover it, a band stays inside it. */
+.ch-carousel[data-aspect] .ch-carousel__slide > * {
+  height: 100%;
+}
+.ch-carousel[data-aspect] .ch-carousel__slide :is(.ch-figure, .ch-figure img) {
+  height: 100%;
+  width: 100%;
+  object-fit: cover;
+  margin: 0;
+}
+.ch-carousel .ch-band {
+  margin-inline: 0;
+  padding-inline: clamp(1rem, 6%, 4rem);
+}
+.ch-carousel[data-variant="hero"] .ch-band {
+  display: flex;
+  align-items: center;
+}
+/* A band holding only a picture fills what its padding leaves (under a transparent header too). */
+.ch-carousel[data-variant="hero"] .ch-band > .ch-band__inner:has(> .ch-figure:only-child) {
+  flex: 1;
+  align-self: stretch;
+  min-height: 0;
+}
+/* Controls: arrows the module reveals (their place kept), markers as links. */
+.ch-carousel__controls {
+  @apply mt-3 flex items-center justify-center gap-3;
+}
+.ch-carousel__arrow {
+  @apply inline-flex size-9 cursor-pointer items-center justify-center rounded-full border border-zinc-300 text-lg;
+  background: var(--ch-color-surface);
+}
+.ch-carousel__arrow[data-ch-pending] {
+  visibility: hidden;
+}
+.ch-carousel__arrow[aria-disabled="true"] {
+  @apply cursor-default opacity-40;
+}
+.ch-carousel__markers {
+  @apply flex flex-wrap items-center justify-center gap-1.5;
+  scroll-target-group: auto;
+}
+.ch-carousel__markers a {
+  @apply inline-flex min-w-7 items-center justify-center rounded-full px-2 py-0.5 text-sm tabular-nums text-zinc-600 no-underline;
+}
+.ch-carousel__markers[data-style="dots"] a {
+  @apply size-6 min-w-6 p-0;
+}
+.ch-carousel__markers[data-style="dots"] a::before {
+  content: "";
+  @apply block size-2 rounded-full bg-current;
+}
+.ch-carousel__markers a:is(:target-current, [aria-current="true"]) {
+  background: var(--ch-color-brand);
+  color: var(--ch-color-on-brand);
+}
+.ch-carousel__markers[data-style="dots"] a:is(:target-current, [aria-current="true"]) {
+  background: transparent;
+  color: var(--ch-color-brand);
+}
+
+/*
+ * RFC-0027 27c: galleries (one image at a time, whole, with thumbnails) and testimonials (centred,
+ * the neighbours peeking in). A gallery shows each image whole on a calm field until RFC-0028's
+ * fit modes (blur-fill) arrive.
+ */
+.ch-carousel[data-variant="gallery"] .ch-carousel__track {
+  grid-auto-columns: 100%;
+  gap: 0;
+  scrollbar-width: none;
+}
+.ch-carousel[data-variant="gallery"] .ch-carousel__slide {
+  scroll-snap-stop: always;
+  background: var(--ch-color-surface-muted);
+  border-radius: var(--ch-radius-m, 0.5rem);
+}
+.ch-carousel[data-variant="gallery"][data-aspect]
+  .ch-carousel__slide
+  :is(.ch-figure, .ch-figure img) {
+  object-fit: contain;
+}
+.ch-carousel__markers[data-style="thumbs"] {
+  @apply flex-nowrap justify-start gap-2 overflow-x-auto;
+  scrollbar-width: thin;
+}
+.ch-carousel__markers[data-style="thumbs"] a {
+  @apply size-16 min-w-16 shrink-0 overflow-hidden rounded p-0 opacity-70;
+  outline: 2px solid transparent;
+  outline-offset: 2px;
+}
+.ch-carousel__markers[data-style="thumbs"] a img {
+  @apply size-full object-cover;
+}
+.ch-carousel__markers[data-style="thumbs"] a:is(:target-current, [aria-current="true"]) {
+  background: transparent;
+  opacity: 1;
+  outline-color: var(--ch-color-brand);
+}
+.ch-carousel[data-variant="testimonials"] {
+  --ch-c-peek: 24%;
+}
+.ch-carousel[data-variant="testimonials"][data-peek="none"] {
+  --ch-c-peek: 0%;
+}
+.ch-carousel[data-variant="testimonials"] .ch-carousel__slide {
+  scroll-snap-align: center;
+}
+.ch-carousel[data-variant="testimonials"] .ch-carousel__track {
+  /* one quote in the middle, its neighbours' edges showing; the first and last centre too */
+  grid-auto-columns: 100%;
+  padding-inline: calc(var(--ch-c-peek) / 2);
+  scroll-padding-inline: calc(var(--ch-c-peek) / 2);
+}
+
+/* RFC-0027 27d: a playing hero's rotation control: first in Tab order (first in the markup), shown
+   at the start of the controls row (clear of a transparent header over the hero). */
+.ch-carousel__rotate {
+  @apply absolute bottom-0 start-4 z-10 inline-flex size-9 cursor-pointer items-center justify-center rounded-full border border-zinc-300 text-base;
+  background: var(--ch-color-surface);
+  color: var(--ch-color-text);
+}
+.ch-carousel__rotate[data-ch-pending] {
+  display: none;
+}
+.ch-carousel__rotate[data-state="playing"] [data-when="stopped"],
+.ch-carousel__rotate[data-state="stopped"] [data-when="playing"] {
+  display: none;
+}
+.ch-carousel__rotate > span {
+  display: inline-flex;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome-menus.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome-menus.css
new file mode 100644
index 00000000..c104f05c
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome-menus.css
@@ -0,0 +1,264 @@
+/*
+ * RFC-0025 25b: the phone menu, submenus, hiding, shrinking and the transparent header.
+ * `--ch-header-h` is the chrome module's measure of the header (a close guess until it runs).
+ */
+:root {
+  --ch-header-h: 4.75rem;
+}
+.ch-menu-slot {
+  display: none;
+}
+@media (max-width: 639.98px) {
+  .ch-header[data-collapse="sm"] :is(.ch-header__nav, .ch-header__utility, .ch-header-search) {
+    display: none;
+  }
+  .ch-header[data-collapse="sm"] .ch-menu-slot {
+    display: block;
+  }
+  .ch-header[data-collapse="sm"] .ch-header__brand {
+    margin-inline-end: auto;
+  }
+}
+@media (max-width: 767.98px) {
+  .ch-header[data-collapse="md"] :is(.ch-header__nav, .ch-header__utility, .ch-header-search) {
+    display: none;
+  }
+  .ch-header[data-collapse="md"] .ch-menu-slot {
+    display: block;
+  }
+  .ch-header[data-collapse="md"] .ch-header__brand {
+    margin-inline-end: auto;
+  }
+}
+@media (max-width: 1023.98px) {
+  .ch-header[data-collapse="lg"] :is(.ch-header__nav, .ch-header__utility, .ch-header-search) {
+    display: none;
+  }
+  .ch-header[data-collapse="lg"] .ch-menu-slot {
+    display: block;
+  }
+  .ch-header[data-collapse="lg"] .ch-header__brand {
+    margin-inline-end: auto;
+  }
+}
+.ch-header[data-collapse="always"] :is(.ch-header__nav, .ch-header__utility, .ch-header-search) {
+  display: none;
+}
+.ch-header[data-collapse="always"] .ch-menu-slot {
+  display: block;
+}
+.ch-header[data-collapse="always"] .ch-header__brand {
+  margin-inline-end: auto;
+}
+.ch-menu__open {
+  @apply inline-flex cursor-pointer list-none items-center gap-2 rounded border border-current/25 px-3 py-1.5 text-sm font-medium;
+}
+.ch-menu__open::-webkit-details-marker {
+  display: none;
+}
+/* What opens over the page reads like the page, whatever the header stands on. */
+:is(.ch-menu__panel, .ch-nav-menu__pop, .ch-menu__dialog) {
+  background: var(--ch-color-surface);
+  color: var(--ch-color-text);
+}
+.ch-menu[open] > .ch-menu__panel {
+  @apply absolute inset-x-4 top-full z-40 overflow-auto rounded-lg border border-zinc-200 p-4 shadow-lg;
+  max-height: calc(100dvh - var(--ch-header-h) - 1rem);
+}
+.ch-menu__panel {
+  @apply grid gap-4;
+}
+.ch-menu__nav ul {
+  @apply grid gap-1;
+}
+.ch-menu__nav a,
+.ch-menu__nav summary,
+.ch-menu__nav li > span {
+  @apply block rounded px-2 py-2 text-base;
+}
+.ch-menu__nav a:hover {
+  background: var(--ch-color-surface-muted);
+}
+/* A group's line: its link (or name) and the caret, side by side. */
+.ch-menu__nav summary {
+  @apply flex items-center justify-between gap-2;
+}
+.ch-menu__nav summary > a {
+  @apply p-0;
+}
+.ch-menu__nav--small a {
+  @apply py-1.5 text-sm;
+}
+.ch-menu__current {
+  @apply font-semibold;
+}
+.ch-menu__panel .ch-nav-menu > ul {
+  @apply static mt-0 border-0 p-0 pl-3 shadow-none;
+}
+.ch-menu__search input {
+  @apply w-full rounded-md border border-zinc-300 px-3 py-2;
+}
+/* Drawers and the full-screen menu: a modal dialog (the browser traps focus, Escape closes it). */
+.ch-menu__dialog {
+  @apply m-0 content-start gap-4 p-4;
+  max-width: none;
+  max-height: none;
+  height: 100dvh;
+  width: min(22rem, calc(100vw - 3rem));
+  border: 0;
+}
+/* Only an open dialog is laid out: a display of its own would show a closed one. */
+.ch-menu__dialog[open] {
+  display: grid;
+}
+.ch-menu__dialog[data-style="drawer-end"] {
+  margin-inline-start: auto;
+}
+.ch-menu__dialog[data-style="fullscreen"] {
+  width: 100vw;
+}
+.ch-menu__dialog::backdrop {
+  background: rgb(0 0 0 / 0.45);
+}
+.ch-menu__bar {
+  @apply flex items-center justify-between gap-3;
+}
+.ch-menu__close {
+  @apply rounded border border-zinc-300 px-3 py-1.5 text-sm font-medium;
+}
+.ch-menu__dialog[open] {
+  transition:
+    translate var(--ch-dur-2, 0.25s) var(--ch-ease-out, ease-out),
+    opacity var(--ch-dur-2, 0.25s) ease-out;
+}
+@starting-style {
+  .ch-menu__dialog[data-style="drawer-start"][open] {
+    translate: -100% 0;
+  }
+  .ch-menu__dialog[data-style="drawer-end"][open] {
+    translate: 100% 0;
+  }
+  .ch-menu__dialog[data-style="fullscreen"][open] {
+    opacity: 0;
+  }
+}
+/* Submenus in the bar: popovers under their button (anchor positioning; the module otherwise). */
+.ch-nav-menu[data-popover] {
+  @apply inline-flex items-center gap-1;
+}
+.ch-nav-menu__btn {
+  @apply inline-flex cursor-pointer items-center gap-1 rounded px-1 py-0.5;
+}
+/* From the text's own color, so it reads on the page and on a transparent header alike. */
+.ch-nav-menu__btn:hover,
+.ch-nav-menu__btn:has(+ :popover-open) {
+  background: color-mix(in oklab, currentColor 12%, transparent);
+}
+.ch-nav-menu__pop {
+  @apply min-w-48 rounded-lg border border-zinc-200 p-2 text-sm shadow-lg;
+  margin: 0;
+  inset: auto;
+  position-area: bottom span-right;
+  margin-block-start: 6px;
+}
+.ch-nav-menu__pop ul {
+  @apply grid gap-0.5;
+}
+.ch-nav-menu__pop a,
+.ch-nav-menu__pop li > span {
+  @apply block rounded px-2 py-1.5;
+}
+.ch-nav-menu__pop a:hover {
+  background: var(--ch-color-surface-muted);
+}
+/* Hiding and shrinking move the header, never its box, so nothing below it shifts. */
+.ch-header[data-behavior="hide-on-scroll"],
+.ch-header[data-shrink],
+.ch-header[data-shrink] .ch-header__inner {
+  transition: translate var(--ch-dur-2, 0.25s) var(--ch-ease-out, ease-out);
+}
+.ch-header[data-shrink][data-ch-scrolled] {
+  translate: 0 -0.75rem;
+}
+.ch-header[data-shrink][data-ch-scrolled] .ch-header__inner {
+  translate: 0 0.375rem;
+}
+.ch-header[data-behavior="hide-on-scroll"][data-ch-hidden] {
+  translate: 0 -100%;
+}
+/* Transparent over a loud first band: that surface's text role, its own fill once scrolled. */
+.ch-header[data-transparent] {
+  margin-block-end: calc(-1 * var(--ch-header-h));
+}
+.ch-header[data-transparent]:not([data-ch-scrolled]) {
+  background: transparent;
+  border-bottom-color: transparent;
+  box-shadow: none;
+}
+.ch-header[data-transparent][data-over="inverse"]:not([data-ch-scrolled]) {
+  color: var(--ch-color-text-inverse);
+}
+.ch-header[data-transparent]:is([data-over="brand"], [data-over="gradient"]):not(
+  [data-ch-scrolled]
+) {
+  color: var(--ch-color-on-brand);
+}
+.ch-header[data-transparent][data-over="accent"]:not([data-ch-scrolled]) {
+  color: var(--ch-color-on-accent);
+}
+.ch-header[data-transparent]:not([data-ch-scrolled])
+  :is(.ch-header__nav, .ch-header__utility, .ch-header__bar-link) {
+  color: inherit;
+}
+.ch-header[data-transparent]:not([data-ch-scrolled]) :is(.ch-header__nav, .ch-header__utility) > a,
+.ch-header[data-transparent]:not([data-ch-scrolled]) .ch-nav-menu[data-popover] > :is(a, button) {
+  color: inherit;
+}
+/* On a brand hero the primary button would vanish into it: its colors swap until the fill. */
+.ch-header[data-transparent]:is([data-over="brand"], [data-over="gradient"]):not([data-ch-scrolled])
+  .ch-button--primary {
+  background: var(--ch-color-on-brand);
+  color: var(--ch-color-brand);
+}
+.ch-header[data-transparent][data-ch-scrolled] {
+  background: var(--ch-color-surface);
+  transition: background-color var(--ch-dur-2, 0.25s) ease-out;
+}
+/* Under a transparent header the page starts at the very top (the band makes its own room). */
+.ch-header[data-transparent] ~ main > .ch-surface:first-child {
+  padding-block-start: 0;
+}
+/* The first band (the root or its first child, three levels at most, like `heroSurface`) starts
+   under the header: it keeps its own room above the content. */
+.ch-header[data-transparent] ~ main > .ch-surface:first-child > .ch-band:first-child,
+.ch-header[data-transparent] ~ main > .ch-surface:first-child > :first-child > .ch-band:first-child,
+.ch-header[data-transparent]
+  ~ main
+  > .ch-surface:first-child
+  > :first-child
+  > :first-child
+  > .ch-band:first-child,
+.ch-header[data-transparent]
+  ~ main
+  > .ch-surface:first-child
+  .ch-carousel[data-variant="hero"]
+  > .ch-carousel__track
+  > .ch-carousel__slide
+  > .ch-band:first-child {
+  padding-block-start: calc(var(--ch-header-h) + 3rem);
+}
+:root[data-ch-motion="none"] :is(.ch-header, .ch-header__inner, .ch-menu__dialog) {
+  transition: none;
+}
+@media (prefers-reduced-motion: reduce) {
+  :is(.ch-header, .ch-header__inner, .ch-menu__dialog) {
+    transition: none;
+  }
+}
+/* The `/menu` page: the phone menu, for readers without the dialog. */
+.ch-menu-page {
+  @apply py-8;
+}
+.ch-menu-page h1 {
+  @apply mb-6 text-3xl font-bold;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome.css
new file mode 100644
index 00000000..dd9e04b4
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/chrome.css
@@ -0,0 +1,193 @@
+/*
+ * Site chrome (RFC-0025 §2): the header and footer from `resolveChrome`. The defaults (logo-left,
+ * static, content width, plain; a simple footer) reproduce the former header and footer.
+ */
+.ch-skip {
+  @apply sr-only;
+}
+.ch-skip:focus {
+  @apply not-sr-only fixed top-2 left-2 z-50 rounded bg-white px-3 py-2 text-sm font-medium text-zinc-900 shadow;
+}
+#main:focus {
+  outline: none;
+}
+.ch-header {
+  @apply relative z-30;
+}
+.ch-header__inner {
+  @apply mx-auto flex max-w-3xl flex-wrap items-center justify-between gap-3 px-4 py-6;
+}
+.ch-header[data-width="wide"] .ch-header__inner {
+  @apply max-w-6xl;
+}
+.ch-header[data-width="full"] .ch-header__inner {
+  @apply max-w-none sm:px-8;
+}
+.ch-header__brand {
+  @apply shrink-0 text-lg font-semibold whitespace-nowrap;
+}
+.ch-header__nav,
+.ch-header__utility {
+  @apply flex flex-wrap gap-4 text-sm text-zinc-600;
+}
+.ch-header__utility {
+  @apply text-xs;
+}
+.ch-header__actions {
+  @apply flex items-center gap-3;
+}
+.ch-header__actions:empty {
+  display: none;
+}
+.ch-header__actions .ch-button {
+  @apply px-3 py-1.5 text-sm whitespace-nowrap;
+}
+/* Layouts: the nav in the middle; everything centered on its own rows; brand and actions apart. */
+@media (min-width: 768px) {
+  .ch-header[data-layout="logo-left-nav-center"] .ch-header__inner {
+    display: grid;
+    grid-template-columns: 1fr auto 1fr;
+  }
+  .ch-header[data-layout="logo-left-nav-center"] .ch-header__actions {
+    justify-self: end;
+  }
+  .ch-header[data-layout="split"] .ch-header__nav {
+    margin-inline-end: auto;
+  }
+  .ch-header[data-layout="split"] .ch-header__brand {
+    order: 2;
+    margin-inline-end: auto;
+  }
+  .ch-header[data-layout="split"] .ch-header__nav {
+    order: 1;
+  }
+  .ch-header[data-layout="split"] .ch-header__actions {
+    order: 3;
+  }
+}
+.ch-header[data-layout="centered"] .ch-header__inner {
+  @apply flex-col justify-center text-center;
+}
+.ch-header[data-layout="centered"] .ch-header__nav {
+  @apply justify-center;
+}
+/* Behaviors: sticky; hide-on-scroll and fixed are sticky too (the chrome module hides the first). */
+.ch-header:is([data-behavior="sticky"], [data-behavior="hide-on-scroll"], [data-behavior="fixed"]) {
+  position: sticky;
+  top: 0;
+  background: var(--ch-color-surface, #fff);
+  border-bottom: 1px solid rgb(0 0 0 / 0.08);
+}
+:root:has(
+  .ch-header:is([data-behavior="sticky"], [data-behavior="hide-on-scroll"], [data-behavior="fixed"])
+) {
+  scroll-padding-top: var(--ch-header-h);
+}
+/* Surfaces: the same color roles as bands. */
+:is(.ch-header, .ch-footer)[data-surface="muted"] {
+  background: var(--ch-color-surface-muted);
+}
+.ch-header[data-surface="raised"] {
+  background: var(--ch-color-surface-raised);
+  box-shadow:
+    0 1px 2px rgb(0 0 0 / 0.05),
+    0 6px 20px -6px rgb(0 0 0 / 0.12);
+}
+:is(.ch-header, .ch-footer)[data-surface="inverse"] {
+  background: var(--ch-color-surface-inverse);
+  color: var(--ch-color-text-inverse);
+}
+.ch-header[data-surface="brand"] {
+  background: var(--ch-color-brand);
+  color: var(--ch-color-on-brand);
+}
+:is(.ch-header, .ch-footer):is([data-surface="inverse"], [data-surface="brand"])
+  :is(.ch-header__nav, .ch-header__utility, .ch-footer__inner) {
+  color: inherit;
+}
+:is(.ch-header, .ch-footer):is([data-surface="inverse"], [data-surface="brand"]) a {
+  color: inherit;
+}
+.ch-logo {
+  @apply block w-auto;
+  height: 1.75rem;
+}
+.ch-logo[data-size="s"] {
+  height: 1.25rem;
+}
+.ch-logo[data-size="l"] {
+  height: 2.5rem;
+}
+.ch-logo[data-variant="dark"] {
+  display: none;
+}
+:root[data-ch-mode="dark"] .ch-logo[data-variant="light"] {
+  display: none;
+}
+:root[data-ch-mode="dark"] .ch-logo[data-variant="dark"] {
+  display: block;
+}
+@media (prefers-color-scheme: dark) {
+  :root[data-ch-mode="auto"] .ch-logo[data-variant="light"] {
+    display: none;
+  }
+  :root[data-ch-mode="auto"] .ch-logo[data-variant="dark"] {
+    display: block;
+  }
+}
+.ch-footer__inner {
+  @apply mx-auto max-w-3xl px-4 py-8 text-xs text-zinc-500;
+}
+/* On the muted surface, the role checked against it (text-muted on surface-muted, 4.5:1). */
+.ch-footer[data-surface="muted"] :is(.ch-footer__inner, .ch-footer__tagline) {
+  color: var(--ch-color-text-muted);
+}
+.ch-footer:not([data-layout="simple"], [data-layout="minimal"]) .ch-footer__inner {
+  @apply max-w-6xl py-12;
+}
+.ch-footer__legal {
+  @apply flex flex-wrap items-center justify-between gap-4;
+}
+.ch-footer[data-layout="minimal"] .ch-footer__legal {
+  @apply justify-center;
+}
+.ch-footer__top {
+  @apply mb-8 grid gap-8 text-sm sm:grid-cols-2 lg:grid-cols-4;
+}
+.ch-footer__brand {
+  @apply text-base font-semibold text-zinc-900;
+}
+.ch-footer__tagline {
+  @apply mt-2 max-w-xs text-zinc-600;
+}
+.ch-footer__social {
+  @apply mt-3 flex flex-wrap gap-3;
+}
+.ch-footer__legal .ch-footer__social {
+  @apply mt-0;
+}
+.ch-footer__social a,
+.ch-footer__col a {
+  @apply hover:text-zinc-700;
+}
+.ch-footer__heading {
+  @apply mb-3 font-medium text-zinc-900;
+}
+.ch-footer__col ul {
+  @apply space-y-2;
+}
+.ch-footer__cta {
+  @apply mb-10 flex flex-wrap items-center justify-between gap-4 rounded-lg px-6 py-8;
+  background: var(--ch-color-surface-muted);
+}
+.ch-footer:is([data-surface="muted"], [data-surface="inverse"]) .ch-footer__cta {
+  background: var(--ch-color-surface-raised);
+  color: var(--ch-color-text);
+}
+.ch-footer__cta-heading {
+  @apply text-xl font-semibold text-zinc-900;
+}
+:is(.ch-footer)[data-surface="inverse"]
+  :is(.ch-footer__brand, .ch-footer__heading, .ch-footer__tagline, .ch-footer__cta-heading) {
+  color: inherit;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/comments.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/comments.css
new file mode 100644
index 00000000..313b3021
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/comments.css
@@ -0,0 +1,75 @@
+/* Reader comments (RFC-0007): `<Comments />` renders plain HTML; these rules only style it. */
+.cloudhal-comments {
+  @apply space-y-4 border-t border-zinc-200 py-8;
+}
+.cloudhal-comments h2 {
+  @apply text-2xl font-semibold;
+}
+.cloudhal-comment-list,
+.cloudhal-comment-replies {
+  @apply space-y-4;
+}
+.cloudhal-comment-replies {
+  @apply mt-4 border-l border-zinc-200 pl-4;
+}
+.cloudhal-comment-meta {
+  @apply flex flex-wrap items-baseline gap-2 text-sm text-zinc-500;
+}
+.cloudhal-comment-author {
+  @apply font-semibold text-zinc-900;
+}
+.cloudhal-comment-badge {
+  @apply rounded bg-zinc-100 px-1.5 text-xs text-zinc-700;
+}
+.cloudhal-comment-body {
+  @apply mt-1 space-y-2 leading-relaxed;
+}
+.cloudhal-comment-body a,
+.cloudhal-comment-context {
+  @apply underline underline-offset-4;
+}
+.cloudhal-comment-actions {
+  @apply mt-1 flex flex-wrap items-start gap-3 text-sm text-zinc-500;
+}
+.cloudhal-comment-actions summary,
+.cloudhal-comment-reply {
+  @apply cursor-pointer underline-offset-4 hover:underline;
+}
+.cloudhal-comment-removed > p {
+  @apply text-sm text-zinc-500 italic;
+}
+.cloudhal-comment-note {
+  @apply rounded border border-zinc-300 bg-zinc-50 p-3 text-sm;
+}
+.cloudhal-comment-form,
+.cloudhal-report-form {
+  @apply max-w-xl space-y-3;
+}
+.cloudhal-comment-form h3 {
+  @apply text-lg font-semibold;
+}
+.cloudhal-comment-form label,
+.cloudhal-report-form label {
+  @apply block text-sm font-medium;
+}
+.cloudhal-comment-form small,
+.cloudhal-comment-privacy {
+  @apply block text-xs text-zinc-500;
+}
+.cloudhal-comment-form :is(input, textarea),
+.cloudhal-report-form :is(input, textarea, select) {
+  @apply w-full rounded border border-zinc-300 px-2 py-1;
+}
+.cloudhal-comment-form [aria-invalid="true"] {
+  @apply border-red-600;
+}
+.cloudhal-comment-form button,
+.cloudhal-report-form button {
+  @apply rounded px-4 py-2 bg-(--ch-color-surface-inverse) text-(--ch-color-text-inverse);
+}
+.cloudhal-comment-form button[data-cancel-reply] {
+  @apply bg-zinc-200 text-zinc-900;
+}
+.cloudhal-comments-pages a {
+  @apply text-sm underline underline-offset-4;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/icons.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/icons.css
new file mode 100644
index 00000000..e2261d10
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/icons.css
@@ -0,0 +1,70 @@
+/*
+ * RFC-0026: icons follow the text (1em, currentColor), sit on its baseline, flip right-to-left
+ * when they point, and stay visible in forced colors.
+ */
+.ch-icon {
+  display: inline-block;
+  flex-shrink: 0;
+  vertical-align: -0.125em;
+}
+[dir="rtl"] .ch-icon[data-ch-mirror] {
+  transform: scaleX(-1);
+}
+@media (forced-colors: active) {
+  .ch-icon {
+    fill: CanvasText;
+  }
+  a .ch-icon,
+  button .ch-icon {
+    fill: currentColor;
+  }
+}
+.ch-footer__social {
+  @apply items-center;
+}
+.ch-social-link {
+  @apply inline-flex size-8 items-center justify-center rounded-full text-lg;
+}
+.ch-social-link:hover {
+  background: color-mix(in oklab, currentColor 12%, transparent);
+}
+
+/* RFC-0026: icons in surfaces — on their own, in buttons, badges and statistics. */
+.ch-icon-box {
+  /* w-fit: in a Stack or Card (a flex column) it keeps its own width, at the start. */
+  @apply inline-flex w-fit items-center justify-center text-2xl;
+}
+.ch-icon-box[data-size="s"] {
+  @apply text-base;
+}
+.ch-icon-box[data-size="l"] {
+  @apply text-4xl;
+}
+.ch-icon-box[data-size="xl"] {
+  @apply text-6xl;
+}
+.ch-icon-box[data-tone="brand"] {
+  color: var(--ch-color-brand);
+}
+.ch-icon-box[data-tone="accent"] {
+  color: var(--ch-color-accent);
+}
+.ch-icon-box[data-tone="success"] {
+  color: #15803d;
+}
+.ch-icon-box[data-tone="warning"] {
+  color: #b45309;
+}
+.ch-icon-box[data-tone="danger"] {
+  color: #b91c1c;
+}
+.ch-button:has(> .ch-button__icon) {
+  @apply inline-flex items-center gap-2;
+}
+.ch-badge > .ch-icon {
+  @apply mr-1;
+}
+.ch-stat__icon {
+  @apply mb-2 block text-3xl;
+  color: var(--ch-color-brand);
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/languages.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/languages.css
new file mode 100644
index 00000000..437af5b7
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/languages.css
@@ -0,0 +1,34 @@
+/* RFC-0033 §4: the language switcher (header action and footer list). */
+.ch-languages {
+  position: relative;
+}
+.ch-languages > summary {
+  cursor: pointer;
+  list-style: none;
+}
+.ch-languages > ul {
+  position: absolute;
+  inset-inline-end: 0;
+  z-index: 20;
+  margin-block-start: 0.5rem;
+  min-inline-size: 10rem;
+  padding: 0.5rem;
+  border: 1px solid rgb(0 0 0 / 0.12);
+  border-radius: 0.5rem;
+  background: var(--ch-color-surface);
+}
+.ch-languages a,
+.ch-footer__languages a {
+  display: block;
+  padding-block: 0.25rem;
+}
+.ch-languages a[aria-current="true"],
+.ch-footer__languages a[aria-current="true"] {
+  font-weight: 600;
+}
+.ch-footer__languages ul {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.25rem 1rem;
+  margin-block: 1rem;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/live-surfaces.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/live-surfaces.css
new file mode 100644
index 00000000..2c3a995d
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/live-surfaces.css
@@ -0,0 +1,238 @@
+/* Live surfaces (RFC-0020 §4): conditional components, inputs and action buttons. */
+.ch-node {
+  display: contents;
+}
+.ch-node[hidden] {
+  display: none;
+}
+/* An action button starts from the browser's button: reset it, then give each style its own look. */
+button.ch-button {
+  @apply cursor-pointer border-0 bg-transparent font-medium;
+  font-family: inherit;
+}
+button.ch-button--primary {
+  @apply text-(--ch-color-on-brand);
+  background: var(--ch-color-brand);
+}
+button.ch-button--secondary {
+  @apply border border-zinc-300 text-zinc-900;
+}
+.ch-toggle {
+  @apply inline-flex w-fit flex-wrap gap-1 rounded-lg bg-zinc-100 p-1;
+}
+.ch-toggle__option input {
+  @apply sr-only;
+}
+.ch-toggle__option span {
+  @apply block cursor-pointer rounded-md px-3 py-1.5 text-sm font-medium text-zinc-600;
+}
+.ch-toggle__option input:checked + span {
+  @apply bg-white text-zinc-900 shadow-sm;
+}
+.ch-toggle__option input:focus-visible + span {
+  @apply outline-2 outline-offset-2;
+}
+.ch-field {
+  @apply grid content-start gap-1.5;
+}
+.ch-field__label {
+  @apply text-sm font-medium;
+}
+.ch-select {
+  @apply w-full max-w-xs rounded-md border border-zinc-300 bg-white px-3 py-2;
+}
+.ch-slider {
+  @apply flex items-center gap-3;
+}
+.ch-slider input {
+  @apply w-full max-w-sm;
+  accent-color: var(--ch-color-brand);
+}
+.ch-slider__value {
+  @apply min-w-12 text-right font-medium tabular-nums;
+}
+/* RFC-0022 §2: local inputs. */
+.ch-input-wrap {
+  @apply flex w-full max-w-xs items-center gap-2;
+}
+.ch-input {
+  @apply w-full max-w-xs rounded-md border border-zinc-300 bg-white px-3 py-2 tabular-nums;
+}
+.ch-input[aria-invalid="true"] {
+  @apply border-red-600;
+}
+.ch-input__unit {
+  @apply shrink-0 text-sm text-zinc-600;
+}
+.ch-field__help {
+  @apply text-sm text-zinc-600;
+}
+[aria-invalid="true"] ~ .ch-field__help,
+.ch-input-wrap:has([aria-invalid="true"]) ~ .ch-field__help {
+  @apply text-red-700;
+}
+.ch-check {
+  @apply flex w-fit cursor-pointer items-center gap-2;
+}
+.ch-check input {
+  @apply size-4;
+  accent-color: var(--ch-color-brand);
+}
+.ch-radio {
+  @apply m-0 grid min-w-0 gap-1.5 border-0 p-0;
+}
+.ch-radio__options {
+  @apply flex flex-col gap-1.5;
+}
+.ch-radio__option {
+  @apply flex w-fit cursor-pointer items-center gap-2;
+}
+.ch-radio__option input {
+  accent-color: var(--ch-color-brand);
+}
+.ch-radio[data-variant="buttons"] .ch-radio__options {
+  @apply inline-flex w-fit flex-row flex-wrap gap-1 rounded-lg bg-zinc-100 p-1;
+}
+.ch-radio[data-variant="buttons"] .ch-radio__option input {
+  @apply sr-only;
+}
+.ch-radio[data-variant="buttons"] .ch-radio__option span {
+  @apply block min-h-9 rounded-md px-3 py-1.5 text-sm font-medium text-zinc-600;
+}
+.ch-radio[data-variant="buttons"] .ch-radio__option input:checked + span {
+  @apply bg-white text-zinc-900 shadow-sm;
+}
+.ch-radio[data-variant="buttons"] .ch-radio__option input:focus-visible + span {
+  @apply outline-2 outline-offset-2;
+}
+.ch-noscript {
+  @apply text-sm text-zinc-600;
+}
+
+/* RFC-0022 §3: charts. Six series colors from the brand color, each distinct at 3:1 on white. */
+:root {
+  --ch-chart-1: var(--ch-color-brand);
+  --ch-chart-2: #2563eb;
+  --ch-chart-3: #d97706;
+  --ch-chart-4: #059669;
+  --ch-chart-5: #db2777;
+  --ch-chart-6: #7c3aed;
+}
+.ch-chart {
+  @apply m-0 grid gap-3;
+}
+.ch-chart__title {
+  @apply text-base font-semibold;
+}
+.ch-chart__svg {
+  @apply block h-auto w-full;
+}
+.ch-chart__grid {
+  stroke: var(--ch-color-border);
+  stroke-width: 1;
+}
+.ch-chart__tick {
+  fill: var(--ch-color-text-muted);
+  font-size: 12px;
+}
+.ch-chart__total {
+  fill: currentColor;
+  font-size: 22px;
+  font-weight: 600;
+}
+.ch-chart__legend {
+  @apply m-0 flex list-none flex-wrap gap-x-4 gap-y-1 p-0 text-sm;
+}
+.ch-chart__legend li {
+  @apply flex items-center gap-1.5;
+}
+.ch-chart__swatch {
+  @apply inline-block size-3 rounded-sm;
+}
+.ch-chart__caption,
+.ch-chart__empty {
+  @apply text-sm text-zinc-600;
+}
+.ch-chart__data summary {
+  @apply cursor-pointer text-sm text-zinc-600;
+}
+.ch-chart__data table {
+  @apply mt-2 w-full border-collapse text-sm tabular-nums;
+}
+.ch-chart__data th,
+.ch-chart__data td {
+  @apply border-b border-zinc-200 px-2 py-1 text-left;
+}
+
+/* RFC-0022 §4: tables. Below 480 px each row is a card whose cells carry their column's label. */
+.ch-table-wrap {
+  @apply w-full;
+}
+.ch-table {
+  @apply w-full border-collapse text-sm tabular-nums;
+}
+.ch-table caption {
+  @apply pb-2 text-left text-base font-semibold;
+}
+.ch-table th,
+.ch-table td {
+  @apply border-b border-zinc-200 px-3 py-2 text-left align-top;
+}
+.ch-table th {
+  @apply font-semibold text-zinc-600;
+}
+.ch-table [data-align="end"] {
+  @apply text-right;
+}
+.ch-table[data-striped="yes"] tbody tr:nth-child(even) {
+  @apply bg-zinc-50;
+}
+.ch-table tr[data-highlight="yes"] {
+  background: color-mix(in srgb, var(--ch-color-brand) 8%, transparent);
+}
+.ch-table tr[data-highlight="yes"] td:first-child {
+  box-shadow: inset 3px 0 0 var(--ch-color-brand);
+}
+@media (max-width: 480px) {
+  .ch-table thead {
+    @apply sr-only;
+  }
+  .ch-table caption {
+    @apply block w-full;
+  }
+  .ch-table,
+  .ch-table tbody,
+  .ch-table tr,
+  .ch-table td {
+    @apply block w-full;
+  }
+  .ch-table tr {
+    @apply mb-3 rounded-lg border border-zinc-200 px-3 py-1;
+  }
+  .ch-table td {
+    @apply flex justify-between gap-4 border-b border-zinc-100 px-0 text-right last:border-b-0;
+  }
+  .ch-table td::before {
+    @apply text-left font-medium text-zinc-600;
+    content: attr(data-label);
+  }
+  .ch-table td[data-phone="hide"] {
+    @apply hidden;
+  }
+  .ch-table tr[data-highlight="yes"] td:first-child {
+    box-shadow: none;
+  }
+}
+
+/*
+ * Corners of controls (src/settings.ts `radius`, RFC-0023 §3): buttons and single-line fields
+ * take `--ch-radius-control`, a pill at `full`; cards and bands keep the smaller radii. After
+ * the base rules, so they win.
+ */
+.ch-button,
+.ch-hero__cta,
+.ch-body
+  :is(input[type="text"], input[type="search"], input[type="number"], input[type="email"], select),
+.ch-body form button[type="submit"]:not(.sr-only) {
+  border-radius: var(--ch-radius-control, 0.25rem);
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-effects.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-effects.css
new file mode 100644
index 00000000..b244cea6
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-effects.css
@@ -0,0 +1,217 @@
+/* Heading effects: a highlighted phrase, the brand gradient, words that take turns. */
+.ch-hl {
+  background-image: linear-gradient(
+    color-mix(in oklch, var(--ch-color-accent) 38%, transparent),
+    color-mix(in oklch, var(--ch-color-accent) 38%, transparent)
+  );
+  background-repeat: no-repeat;
+  background-position: 0 88%;
+  background-size: 100% 0.36em;
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-hl {
+    transition: background-size var(--ch-dur-slow) var(--ch-ease-standard) var(--ch-dur-normal);
+  }
+  :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-pre
+    .ch-hl {
+    background-size: 0% 0.36em;
+  }
+  @starting-style {
+    :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+      .ch-hl {
+      background-size: 0% 0.36em;
+    }
+  }
+}
+/* From the brand to the link color: both read on the page (the token expansion checks them). */
+.ch-gradient-text {
+  color: var(--ch-color-brand);
+}
+@supports (background-clip: text) {
+  .ch-gradient-text {
+    background-image: linear-gradient(90deg, var(--ch-color-brand), var(--ch-color-link));
+    -webkit-background-clip: text;
+    background-clip: text;
+    color: transparent;
+  }
+}
+.ch-rotate {
+  display: inline-grid;
+  vertical-align: bottom;
+}
+.ch-rotate__word {
+  grid-area: 1 / 1;
+  opacity: 0;
+}
+.ch-rotate__word[data-active] {
+  opacity: 1;
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) .ch-rotate__word {
+    translate: 0 0.35em;
+    transition:
+      opacity var(--ch-dur-normal) var(--ch-ease-standard),
+      translate var(--ch-dur-normal) var(--ch-ease-standard);
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-rotate__word[data-active] {
+    translate: 0 0;
+  }
+}
+/* Marquee: a still, wrapping row until the motion module sets it moving (standard and above). */
+.ch-marquee {
+  --ch-mq-gap: calc(var(--spacing) * 10);
+  --ch-mq-dur: 34s;
+  overflow: hidden;
+}
+.ch-marquee[data-gap="s"] {
+  --ch-mq-gap: calc(var(--spacing) * 4);
+}
+.ch-marquee[data-gap="m"] {
+  --ch-mq-gap: calc(var(--spacing) * 6);
+}
+.ch-marquee[data-gap="xl"] {
+  --ch-mq-gap: calc(var(--spacing) * 16);
+}
+.ch-marquee[data-speed="slow"] {
+  --ch-mq-dur: 52s;
+}
+.ch-marquee[data-speed="fast"] {
+  --ch-mq-dur: 20s;
+}
+.ch-marquee__track {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: var(--ch-mq-gap);
+}
+.ch-marquee__track > * {
+  flex: none;
+}
+@keyframes ch-marquee {
+  to {
+    translate: calc(-50% - var(--ch-mq-gap) / 2) 0;
+  }
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) .ch-marquee[data-ch-ready] {
+    mask-image: linear-gradient(90deg, transparent, #000 6%, #000 94%, transparent);
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-marquee[data-ch-ready]
+    .ch-marquee__track {
+    width: max-content;
+    flex-wrap: nowrap;
+    animation: ch-marquee var(--ch-mq-dur) linear infinite;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-marquee[data-ch-ready][data-direction="end"]
+    .ch-marquee__track {
+    animation-direction: reverse;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-marquee[data-ch-ready][data-hover-pause]:is(:hover, :focus-within)
+    .ch-marquee__track {
+    animation-play-state: paused;
+  }
+}
+/* Counter: the final number holds its width while it counts. */
+.ch-counter {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--spacing) * 1);
+}
+.ch-counter__value {
+  font-size: var(--text-4xl);
+  font-weight: 700;
+  line-height: 1.1;
+}
+.ch-counter__num {
+  display: inline-grid;
+  font-variant-numeric: tabular-nums;
+}
+.ch-counter__num > * {
+  grid-area: 1 / 1;
+}
+.ch-counter__hold {
+  visibility: hidden;
+}
+.ch-counter__label {
+  font-size: var(--text-sm);
+  color: var(--ch-color-text-muted);
+}
+/* Loops: decorative, slow, only where motion plays, and paused by the reader's control. */
+[data-ch-loop="gradient-shift"] {
+  background-image: linear-gradient(
+    120deg,
+    color-mix(in oklch, var(--ch-color-brand) 14%, var(--ch-color-surface-raised)),
+    color-mix(in oklch, var(--ch-color-accent) 14%, var(--ch-color-surface-raised)),
+    color-mix(in oklch, var(--ch-color-brand) 14%, var(--ch-color-surface-raised))
+  );
+  background-size: 220% 220%;
+}
+@keyframes ch-loop-float {
+  to {
+    translate: 0 -6px;
+  }
+}
+@keyframes ch-loop-pulse {
+  50% {
+    scale: 1.04;
+  }
+}
+@keyframes ch-loop-spin {
+  to {
+    rotate: 360deg;
+  }
+}
+@keyframes ch-loop-gradient {
+  to {
+    background-position: 100% 50%;
+  }
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) [data-ch-loop="float"] {
+    animation: ch-loop-float 6s ease-in-out infinite alternate;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) [data-ch-loop="pulse"] {
+    animation: ch-loop-pulse 2.8s ease-in-out infinite;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) [data-ch-loop="spin-slow"] {
+    animation: ch-loop-spin 28s linear infinite;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-loop="gradient-shift"] {
+    animation: ch-loop-gradient 14s ease-in-out infinite alternate;
+  }
+}
+/* The reader's pause control: only where something actually moves on its own, once a page. */
+.ch-motion-toggle {
+  display: none;
+}
+.ch-motion-toggle[hidden] {
+  display: none !important;
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) .ch-motion-toggle {
+    display: flex;
+    width: fit-content;
+    margin: calc(var(--spacing) * 4) auto 0;
+    align-items: center;
+    gap: calc(var(--spacing) * 2);
+    border: 1px solid var(--ch-color-border-strong);
+    border-radius: 9999px;
+    padding: calc(var(--spacing) * 1.5) calc(var(--spacing) * 4);
+    font-size: var(--text-sm);
+    color: var(--ch-color-text-muted);
+    background: var(--ch-color-surface);
+    cursor: pointer;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-motion-toggle[aria-pressed="true"] {
+    color: var(--ch-color-text);
+    border-color: var(--ch-color-text);
+  }
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-scroll.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-scroll.css
new file mode 100644
index 00000000..9dc3b3cf
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion-scroll.css
@@ -0,0 +1,309 @@
+/*
+ * Scroll effects (RFC-0024 24b): continuous, tied to the element's place in the viewport. With
+ * scroll-driven animations (Chrome, Safari) they need no script; elsewhere the motion module
+ * writes the progress as --ch-p (0–1). Only "fade-through" plays at "subtle" (it moves nothing).
+ */
+[data-ch-scroll] {
+  --ch-dep-px: calc(var(--ch-dep, 1) * var(--ch-move-m, 0px));
+}
+[data-ch-dep="-3"] {
+  --ch-dep: -3;
+}
+[data-ch-dep="-2"] {
+  --ch-dep: -2;
+}
+[data-ch-dep="-1"] {
+  --ch-dep: -1;
+}
+[data-ch-dep="1"] {
+  --ch-dep: 1;
+}
+[data-ch-dep="2"] {
+  --ch-dep: 2;
+}
+[data-ch-dep="3"] {
+  --ch-dep: 3;
+}
+@keyframes ch-sc-parallax {
+  from {
+    translate: 0 calc(var(--ch-dep-px) * -1);
+  }
+  to {
+    translate: 0 var(--ch-dep-px);
+  }
+}
+@keyframes ch-sc-pan {
+  from {
+    translate: calc(var(--ch-dep-px) * -1) 0;
+  }
+  to {
+    translate: var(--ch-dep-px) 0;
+  }
+}
+@keyframes ch-sc-fade {
+  0%,
+  100% {
+    opacity: 0.25;
+  }
+  30%,
+  70% {
+    opacity: 1;
+  }
+}
+@keyframes ch-sc-scale {
+  0% {
+    scale: 0.88;
+  }
+  45%,
+  100% {
+    scale: 1;
+  }
+}
+@keyframes ch-sc-rotate {
+  from {
+    rotate: -5deg;
+  }
+  to {
+    rotate: 5deg;
+  }
+}
+@media (prefers-reduced-motion: no-preference) {
+  @supports (animation-timeline: view()) {
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) [data-ch-scroll],
+    :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="fade-through"] {
+      animation-duration: auto;
+      animation-timing-function: linear;
+      animation-fill-mode: both;
+      animation-timeline: view();
+      animation-range: cover 0% cover 100%;
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="parallax"] {
+      animation-name: ch-sc-parallax;
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) [data-ch-scroll="pan"] {
+      animation-name: ch-sc-pan;
+    }
+    :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="fade-through"] {
+      animation-name: ch-sc-fade;
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="scale-through"] {
+      animation-name: ch-sc-scale;
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="rotate-through"] {
+      animation-name: ch-sc-rotate;
+    }
+  }
+  @supports not (animation-timeline: view()) {
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="parallax"] {
+      translate: 0 calc((var(--ch-p, 0.5) * 2 - 1) * var(--ch-dep-px));
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"]) [data-ch-scroll="pan"] {
+      translate: calc((var(--ch-p, 0.5) * 2 - 1) * var(--ch-dep-px)) 0;
+    }
+    :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="fade-through"] {
+      opacity: clamp(0.25, calc(1 - (max(var(--ch-p, 0.5), 1 - var(--ch-p, 0.5)) - 0.7) * 2.5), 1);
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="scale-through"] {
+      scale: clamp(0.88, calc(0.88 + var(--ch-p, 0.5) * 0.27), 1);
+    }
+    :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-scroll="rotate-through"] {
+      rotate: calc((var(--ch-p, 0.5) * 2 - 1) * 5deg);
+    }
+  }
+}
+/*
+ * Scroll story (RFC-0024 §3): the first child stays in view beside (or, on phones, above) the
+ * steps; the step being read gets a brand rule at its edge. Without JavaScript the steps simply
+ * follow each other, all equally readable.
+ */
+.ch-scrolly {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+  gap: calc(var(--spacing) * 10);
+  align-items: start;
+}
+.ch-scrolly[data-ratio="2-1"] {
+  grid-template-columns: minmax(0, 2fr) minmax(0, 1fr);
+}
+.ch-scrolly[data-ratio="1-2"] {
+  grid-template-columns: minmax(0, 1fr) minmax(0, 2fr);
+}
+.ch-scrolly > :first-child {
+  grid-row: 1 / span 12;
+  grid-column: 1;
+  position: sticky;
+  top: calc(var(--ch-header-h, 0px) + 12vh);
+}
+.ch-scrolly > .ch-step {
+  grid-column: 2;
+}
+.ch-scrolly[data-side="end"] > :first-child {
+  grid-column: 2;
+}
+.ch-scrolly[data-side="end"] > .ch-step {
+  grid-column: 1;
+}
+.ch-step {
+  display: flex;
+  min-height: 70vh;
+  flex-direction: column;
+  justify-content: center;
+  gap: calc(var(--spacing) * 3);
+  border-inline-start: 3px solid transparent;
+  padding-inline-start: calc(var(--spacing) * 5);
+}
+.ch-scrolly[data-ch-live] > .ch-step[data-ch-active] {
+  border-inline-start-color: var(--ch-color-brand);
+}
+:root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+  .ch-scrolly[data-ch-live]
+  > .ch-step {
+  transition: border-color var(--ch-dur-normal, 0ms) var(--ch-ease-standard);
+}
+@media (max-width: 767px) {
+  .ch-scrolly,
+  .ch-scrolly[data-ratio] {
+    grid-template-columns: minmax(0, 1fr);
+    gap: calc(var(--spacing) * 4);
+  }
+  .ch-scrolly > :first-child,
+  .ch-scrolly[data-side="end"] > :first-child {
+    grid-row: auto;
+    grid-column: 1;
+    top: var(--ch-header-h, 0px);
+    z-index: 1;
+    max-height: 45vh;
+    overflow: hidden;
+    background: var(--ch-color-surface);
+    padding-block: calc(var(--spacing) * 2);
+  }
+  .ch-scrolly > .ch-step,
+  .ch-scrolly[data-side="end"] > .ch-step {
+    grid-column: 1;
+    min-height: 55vh;
+  }
+}
+/* Scroll progress (RFC-0024 §3): a thin bar; hidden where nothing may move. */
+.ch-progress {
+  display: block;
+  height: 3px;
+  overflow: hidden;
+  background: color-mix(in oklch, var(--ch-color-border) 70%, transparent);
+}
+.ch-progress[data-placement="page"] {
+  position: fixed;
+  inset: 0 0 auto 0;
+  z-index: 50;
+}
+.ch-progress[data-placement="section"] {
+  position: sticky;
+  top: var(--ch-header-h, 0px);
+  z-index: 5;
+}
+.ch-progress__bar {
+  display: block;
+  height: 100%;
+  background: var(--ch-color-brand);
+  transform-origin: 0 50%;
+  scale: var(--ch-p, 0) 1;
+}
+.ch-progress[data-tone="accent"] .ch-progress__bar {
+  background: var(--ch-color-accent);
+}
+.ch-progress[data-tone="neutral"] .ch-progress__bar {
+  background: var(--ch-color-text-muted);
+}
+:root[data-ch-motion="none"] .ch-progress {
+  display: none;
+}
+@keyframes ch-progress {
+  from {
+    scale: 0 1;
+  }
+  to {
+    scale: 1 1;
+  }
+}
+@supports (animation-timeline: scroll()) {
+  .ch-surface {
+    view-timeline: --ch-section block;
+  }
+  .ch-progress[data-placement="page"] .ch-progress__bar {
+    animation: ch-progress linear both;
+    animation-duration: auto;
+    animation-timeline: scroll(root);
+  }
+  .ch-progress[data-placement="section"] .ch-progress__bar {
+    animation: ch-progress linear both;
+    animation-duration: auto;
+    animation-timeline: --ch-section;
+    animation-range: contain 0% contain 100%;
+  }
+}
+/*
+ * Kinetic type (RFC-0024 24c): a split heading or text reveals piece by piece; the element itself
+ * stays put, its pieces (words, or characters within words) rise and fade in turn.
+ */
+[data-ch-reveal^="split-"] {
+  --ch-from-tr: none;
+  --ch-from-sc: none;
+  --ch-from-f: none;
+  --ch-from-c: none;
+}
+[data-ch-reveal^="split-"].ch-pre {
+  opacity: 1;
+}
+.ch-split .ch-w {
+  display: inline-block;
+}
+.ch-split[data-mode="chars"] .ch-w {
+  white-space: nowrap;
+}
+.ch-split[data-mode="chars"] .ch-c {
+  display: inline-block;
+}
+.ch-split {
+  --ch-piece-tr: 0 0.45em;
+  --ch-piece-step: 45ms;
+}
+.ch-split[data-mode="chars"] {
+  --ch-piece-step: 22ms;
+}
+.ch-split[data-mode="lines"] {
+  --ch-piece-step: 120ms;
+}
+:root[data-ch-motion="subtle"] .ch-split {
+  --ch-piece-tr: none;
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+    :is(.ch-split:not([data-mode="chars"]) .ch-w, .ch-split[data-mode="chars"] .ch-c) {
+    transition:
+      opacity var(--ch-dur-normal) var(--ch-ease-standard)
+      calc(var(--ch-piece-step) * var(--ch-i, 0)),
+      translate var(--ch-dur-normal) var(--ch-ease-standard)
+      calc(var(--ch-piece-step) * var(--ch-i, 0));
+  }
+  :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+    .ch-pre
+    :is(.ch-split:not([data-mode="chars"]) .ch-w, .ch-split[data-mode="chars"] .ch-c) {
+    opacity: 0;
+    translate: var(--ch-piece-tr);
+  }
+  @starting-style {
+    :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+      :is(.ch-split:not([data-mode="chars"]) .ch-w, .ch-split[data-mode="chars"] .ch-c) {
+      opacity: 0;
+      translate: var(--ch-piece-tr);
+    }
+  }
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion.css
new file mode 100644
index 00000000..4a643f0b
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/motion.css
@@ -0,0 +1,254 @@
+/*
+ * Motion (RFC-0024): presets the renderer writes as data-ch-* attributes; the tokens come from
+ * themeVariables, one set per level, picked by data-ch-motion on <html>. Content is complete
+ * without this layer; nothing animates layout; nothing moves at "none" or under reduced motion.
+ * Reveals use opacity, translate, scale, filter and clip-path; hover effects use transform and
+ * box-shadow, so one element can have both without their transitions overriding each other.
+ */
+[data-ch-reveal] {
+  --ch-from-tr: none;
+  --ch-from-sc: none;
+  --ch-from-f: none;
+  --ch-from-c: none;
+  --ch-rv-dur: var(--ch-dur-normal, 0ms);
+}
+[data-ch-reveal="rise"] {
+  --ch-from-tr: 0 var(--ch-move-m, 0);
+}
+[data-ch-reveal="sink"] {
+  --ch-from-tr: 0 calc(var(--ch-move-m, 0) * -1);
+}
+[data-ch-reveal="slide-start"] {
+  --ch-from-tr: calc(var(--ch-move-l, 0) * -1) 0;
+}
+[data-ch-reveal="slide-end"] {
+  --ch-from-tr: var(--ch-move-l, 0) 0;
+}
+[dir="rtl"] [data-ch-reveal="slide-start"] {
+  --ch-from-tr: var(--ch-move-l, 0) 0;
+}
+[dir="rtl"] [data-ch-reveal="slide-end"] {
+  --ch-from-tr: calc(var(--ch-move-l, 0) * -1) 0;
+}
+[data-ch-reveal="scale-in"] {
+  --ch-from-sc: 0.94;
+}
+[data-ch-reveal="blur-in"] {
+  --ch-from-f: blur(10px);
+}
+[data-ch-reveal="wipe-up"] {
+  --ch-from-c: inset(100% 0 0 0);
+}
+[data-ch-reveal="wipe-start"] {
+  --ch-from-c: inset(0 100% 0 0);
+}
+[data-ch-reveal="mask-rise"] {
+  --ch-from-c: inset(0 0 100% 0);
+  --ch-from-tr: 0 var(--ch-move-s, 0);
+}
+[data-ch-speed="fast"] {
+  --ch-rv-dur: var(--ch-dur-fast, 0ms);
+}
+[data-ch-speed="slow"] {
+  --ch-rv-dur: var(--ch-dur-slow, 0ms);
+}
+[data-ch-d="1"] {
+  --ch-d: 1;
+}
+[data-ch-d="2"] {
+  --ch-d: 2;
+}
+[data-ch-d="3"] {
+  --ch-d: 3;
+}
+[data-ch-d="4"] {
+  --ch-d: 4;
+}
+[data-ch-d="5"] {
+  --ch-d: 5;
+}
+[data-ch-d="6"] {
+  --ch-d: 6;
+}
+[data-ch-d="7"] {
+  --ch-d: 7;
+}
+[data-ch-d="8"] {
+  --ch-d: 8;
+}
+[data-ch-d="9"] {
+  --ch-d: 9;
+}
+[data-ch-d="10"] {
+  --ch-d: 10;
+}
+[data-ch-d="11"] {
+  --ch-d: 11;
+}
+[data-ch-d="12"] {
+  --ch-d: 12;
+}
+[data-ch-d="13"] {
+  --ch-d: 13;
+}
+[data-ch-d="14"] {
+  --ch-d: 14;
+}
+[data-ch-d="15"] {
+  --ch-d: 15;
+}
+[data-ch-d="16"] {
+  --ch-d: 16;
+}
+/* At "subtle" every reveal is a short fade. */
+:root[data-ch-motion="subtle"] [data-ch-reveal] {
+  --ch-from-tr: none;
+  --ch-from-sc: none;
+  --ch-from-f: none;
+  --ch-from-c: none;
+}
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-reveal] {
+    --ch-tr-r:
+      opacity var(--ch-rv-dur) var(--ch-ease-standard) calc(var(--ch-stagger) * var(--ch-d, 0)),
+      translate var(--ch-rv-dur) var(--ch-ease-standard) calc(var(--ch-stagger) * var(--ch-d, 0)),
+      scale var(--ch-rv-dur) var(--ch-ease-standard) calc(var(--ch-stagger) * var(--ch-d, 0)),
+      filter var(--ch-rv-dur) var(--ch-ease-standard) calc(var(--ch-stagger) * var(--ch-d, 0)),
+      clip-path var(--ch-rv-dur) var(--ch-ease-standard) calc(var(--ch-stagger) * var(--ch-d, 0));
+  }
+  /* Below the first screen: the motion module adds .ch-pre while off screen, removes it on entry. */
+  :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-reveal].ch-pre {
+    opacity: 0;
+    translate: var(--ch-from-tr);
+    scale: var(--ch-from-sc);
+    filter: var(--ch-from-f);
+    clip-path: var(--ch-from-c);
+  }
+  /* On the first screen: the entrance plays from the first frame, with no script. */
+  @starting-style {
+    :root:is([data-ch-motion="subtle"], [data-ch-motion="standard"], [data-ch-motion="expressive"])
+      [data-ch-reveal] {
+      opacity: 0;
+      translate: var(--ch-from-tr);
+      scale: var(--ch-from-sc);
+      filter: var(--ch-from-f);
+      clip-path: var(--ch-from-c);
+    }
+  }
+}
+:root:not([data-ch-motion="none"]) [data-ch-hover] {
+  --ch-tr-h:
+    transform var(--ch-dur-fast, 0ms) var(--ch-ease-standard),
+    box-shadow var(--ch-dur-fast, 0ms) var(--ch-ease-standard),
+    background-size var(--ch-dur-normal, 0ms) var(--ch-ease-standard);
+}
+@media (prefers-reduced-motion: reduce) {
+  [data-ch-hover] {
+    --ch-tr-h: outline-color 0s;
+  }
+}
+:is([data-ch-reveal], [data-ch-hover]) {
+  transition: var(--ch-tr-r, outline-offset 0s), var(--ch-tr-h, outline-color 0s);
+}
+/* A hover effect starts at once, whatever its element's reveal delay. */
+[data-ch-hover]:is(:hover, :focus-visible, :focus-within) {
+  transition-delay: 0s;
+}
+/* Effects that do not move anything: every level but "none". */
+:root:not([data-ch-motion="none"])
+  [data-ch-hover="glow"]:is(:hover, :focus-visible, :focus-within) {
+  box-shadow:
+    0 0 0 1px color-mix(in oklch, var(--ch-color-brand) 45%, transparent),
+    0 10px 30px -10px color-mix(in oklch, var(--ch-color-brand) 55%, transparent);
+}
+:root:not([data-ch-motion="none"])
+  :is(
+    [data-ch-hover="underline"]:not(.ch-card),
+    [data-ch-hover="underline"].ch-card :is(h2, h3, h4)
+  ) {
+  text-decoration: none;
+  background-image: linear-gradient(currentColor, currentColor);
+  background-repeat: no-repeat;
+  background-position: 0 100%;
+  background-size: 0% 1px;
+}
+:root:not([data-ch-motion="none"])
+  :is(
+    [data-ch-hover="underline"]:not(.ch-card):is(:hover, :focus-visible),
+    [data-ch-hover="underline"].ch-card:is(:hover, :focus-within) :is(h2, h3, h4)
+  ) {
+  background-size: 100% 1px;
+}
+:root:not([data-ch-motion="none"]) [data-ch-hover="spotlight"] {
+  position: relative;
+  isolation: isolate;
+}
+:root:not([data-ch-motion="none"]) [data-ch-hover="spotlight"]::after {
+  content: "";
+  position: absolute;
+  inset: 0;
+  z-index: -1;
+  border-radius: inherit;
+  pointer-events: none;
+  opacity: 0;
+  background: radial-gradient(
+    280px circle at calc(var(--ch-mx, 0.5) * 100%) calc(var(--ch-my, 0.5) * 100%),
+    color-mix(in oklch, var(--ch-color-brand) 18%, transparent),
+    transparent 70%
+  );
+  transition: opacity var(--ch-dur-fast, 0ms) var(--ch-ease-standard);
+}
+:root:not([data-ch-motion="none"]) [data-ch-hover="spotlight"]:hover::after {
+  opacity: 1;
+}
+/* Effects that move: "standard" and "expressive", for readers who have not asked for less. */
+@media (prefers-reduced-motion: no-preference) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="lift"]:is(:hover, :focus-visible, :focus-within) {
+    transform: translateY(calc(var(--ch-move-s) * -0.5));
+    box-shadow: 0 16px 36px -16px rgb(0 0 0 / 0.3);
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="scale"]:is(:hover, :focus-visible, :focus-within) {
+    transform: scale(1.03);
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="zoom-media"] {
+    overflow: clip;
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="zoom-media"]
+    img {
+    transition: transform var(--ch-dur-slow) var(--ch-ease-standard);
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="zoom-media"]:is(:hover, :focus-within)
+    img {
+    transform: scale(1.06);
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (hover: hover) and (pointer: fine) {
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="tilt"]:hover {
+    transform: perspective(900px) rotateX(calc((0.5 - var(--ch-my, 0.5)) * 7deg))
+      rotateY(calc((var(--ch-mx, 0.5) - 0.5) * 7deg));
+  }
+  :root:is([data-ch-motion="standard"], [data-ch-motion="expressive"])
+    [data-ch-hover="magnetic"]:hover {
+    transform: translate(
+      calc((var(--ch-mx, 0.5) - 0.5) * 12px),
+      calc((var(--ch-my, 0.5) - 0.5) * 12px)
+    );
+  }
+}
+/* The reader's pause control (RFC-0024 §1) stops every loop on the page, ambient layers included. */
+:root[data-ch-motion-paused] *,
+:root[data-ch-motion-paused] *::before,
+:root[data-ch-motion-paused] *::after {
+  animation-play-state: paused !important;
+}
+.ch-motion {
+  display: block;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/overlays.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/overlays.css
new file mode 100644
index 00000000..41d4380d
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/overlays.css
@@ -0,0 +1,324 @@
+/*
+ * RFC-0025 §3: overlays (Dialog, Drawer, Popover, Tooltip, Lightbox). Native top-layer elements,
+ * painted from the color roles; the page behind a modal does not scroll.
+ */
+html:has(dialog:modal) {
+  overflow: hidden;
+  scrollbar-gutter: stable;
+}
+.ch-dialog {
+  margin: auto;
+  padding: 0;
+  border: 0;
+  width: 100%;
+  max-width: min(36rem, calc(100vw - 2rem));
+  max-height: min(85dvh, 48rem);
+  overflow: auto;
+  overscroll-behavior: contain;
+  border-radius: var(--ch-radius-l, 0.75rem);
+  background: var(--ch-color-surface);
+  color: var(--ch-color-text);
+  box-shadow: 0 24px 60px -16px rgb(0 0 0 / 0.4);
+}
+.ch-dialog[data-size="s"] {
+  max-width: min(24rem, calc(100vw - 2rem));
+}
+.ch-dialog[data-size="l"] {
+  max-width: min(52rem, calc(100vw - 2rem));
+}
+.ch-dialog::backdrop {
+  background: rgb(0 0 0 / 0.5);
+}
+.ch-dialog__head {
+  @apply sticky top-0 z-10 flex items-center justify-between gap-4 px-5 py-4;
+  background: inherit;
+  border-bottom: 1px solid var(--ch-color-border);
+}
+.ch-dialog__title {
+  @apply text-lg font-semibold;
+}
+.ch-dialog__close {
+  @apply inline-flex size-9 shrink-0 cursor-pointer items-center justify-center rounded-full;
+}
+.ch-dialog__close:hover,
+.ch-lightbox__nav button:hover {
+  background: color-mix(in oklab, currentColor 12%, transparent);
+}
+.ch-dialog__body {
+  @apply grid gap-4 px-5 py-5;
+}
+/* Drawers: the full height of an edge, or the bottom (a sheet on phones). */
+.ch-drawer {
+  margin: 0;
+  height: 100dvh;
+  max-height: none;
+  width: min(26rem, calc(100vw - 3rem));
+  border-radius: 0;
+}
+.ch-drawer[data-size="s"] {
+  width: min(20rem, calc(100vw - 3rem));
+}
+.ch-drawer[data-size="l"] {
+  width: min(36rem, calc(100vw - 3rem));
+}
+.ch-drawer[data-placement="end"] {
+  margin-inline-start: auto;
+}
+.ch-drawer[data-placement="bottom"] {
+  margin-block-start: auto;
+  width: 100%;
+  max-width: none;
+  height: auto;
+  max-height: 85dvh;
+  border-radius: var(--ch-radius-l, 0.75rem) var(--ch-radius-l, 0.75rem) 0 0;
+}
+/* Popovers and tooltips sit next to their trigger (anchor positioning; the module elsewhere). */
+.ch-popover {
+  margin: 0;
+  inset: auto;
+  position-area: bottom span-right;
+  position-try-fallbacks: flip-block, flip-inline;
+  margin-block-start: 8px;
+  width: 18rem;
+  max-width: calc(100vw - 2rem);
+  padding: 1rem;
+  border: 1px solid var(--ch-color-border);
+  border-radius: var(--ch-radius-m, 0.5rem);
+  background: var(--ch-color-surface);
+  color: var(--ch-color-text);
+  box-shadow: 0 12px 32px -12px rgb(0 0 0 / 0.3);
+}
+.ch-popover[data-width="s"] {
+  width: 12rem;
+}
+.ch-popover[data-width="l"] {
+  width: 26rem;
+}
+.ch-popover[data-placement="top"] {
+  position-area: top span-right;
+  margin-block: 0 8px;
+}
+.ch-popover[data-placement="start"] {
+  position-area: left span-bottom;
+  margin: 0 8px 0 0;
+}
+.ch-popover[data-placement="end"] {
+  position-area: right span-bottom;
+  margin: 0 0 0 8px;
+}
+.ch-popover > * + * {
+  margin-block-start: 0.75rem;
+}
+.ch-tooltip {
+  margin: 0;
+  inset: auto;
+  position-area: top;
+  position-try-fallbacks: flip-block;
+  margin-block-end: 6px;
+  max-width: 16rem;
+  padding: 0.375rem 0.625rem;
+  border: 0;
+  border-radius: var(--ch-radius-s, 0.25rem);
+  background: var(--ch-color-surface-inverse);
+  color: var(--ch-color-text-inverse);
+  font-size: 0.8125rem;
+  line-height: 1.35;
+}
+/* Lightbox: thumbnails, then the images large on a dark stage. */
+.ch-lightbox__grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
+  gap: 0.5rem;
+}
+.ch-lightbox__thumb {
+  display: block;
+  overflow: hidden;
+  border-radius: var(--ch-radius-s, 0.25rem);
+}
+.ch-lightbox__thumb img {
+  aspect-ratio: 1;
+  width: 100%;
+  height: auto;
+  object-fit: cover;
+}
+.ch-lightbox__dialog {
+  max-width: min(72rem, calc(100vw - 2rem));
+  background: #0b0b0c;
+  color: #f4f4f5;
+}
+.ch-lightbox__dialog .ch-dialog__head {
+  border-bottom-color: rgb(255 255 255 / 0.12);
+}
+.ch-lightbox__count {
+  @apply text-sm tabular-nums;
+}
+.ch-lightbox__stage {
+  @apply px-5 py-4;
+}
+/* RFC-0028: one stage size for every picture; each shows whole, its sides filled by itself blurred
+   (the image's own placeholder layer), so moving between portrait and landscape never jumps. */
+.ch-lightbox__item img {
+  display: block;
+  width: 100%;
+  height: min(70dvh, 56rem);
+  object-fit: contain;
+  border-radius: var(--ch-radius-m, 0.5rem);
+}
+.ch-lightbox__item figcaption {
+  @apply mt-3 text-center text-sm;
+  color: #d4d4d8;
+}
+.ch-lightbox__nav {
+  @apply flex justify-center gap-4 pb-5;
+}
+.ch-lightbox__nav button {
+  @apply inline-flex size-11 cursor-pointer items-center justify-center rounded-full text-2xl;
+}
+/* Entrances and exits at the site's motion level (RFC-0024); none under reduced motion. */
+:root:not([data-ch-motion="none"]) :is(.ch-dialog, .ch-popover, .ch-tooltip) {
+  transition:
+    opacity var(--ch-dur-2, 0.2s) ease-out,
+    translate var(--ch-dur-2, 0.2s) var(--ch-ease-out, ease-out),
+    display var(--ch-dur-2, 0.2s) allow-discrete,
+    overlay var(--ch-dur-2, 0.2s) allow-discrete;
+}
+:root:not([data-ch-motion="none"])
+  :is(.ch-dialog:not([open]), .ch-popover:not(:popover-open), .ch-tooltip:not(:popover-open)) {
+  opacity: 0;
+}
+@starting-style {
+  .ch-dialog[open] {
+    opacity: 0;
+    translate: 0 0.5rem;
+  }
+  .ch-drawer[data-placement="end"][open] {
+    translate: 100% 0;
+  }
+  .ch-drawer[data-placement="start"][open] {
+    translate: -100% 0;
+  }
+  .ch-drawer[data-placement="bottom"][open] {
+    translate: 0 100%;
+  }
+  .ch-popover:popover-open {
+    opacity: 0;
+    translate: 0 -0.25rem;
+  }
+  .ch-tooltip:popover-open {
+    opacity: 0;
+  }
+}
+@media (prefers-reduced-motion: reduce) {
+  :is(.ch-dialog, .ch-popover, .ch-tooltip) {
+    transition: none !important;
+  }
+}
+
+/*
+ * RFC-0025 25d: the announcement and consent bars, toasts, mega panels and the footer's region.
+ * A closed bar is hidden by the root marks `prefs.1.js` sets before the page paints.
+ */
+.ch-announcement {
+  @apply relative flex items-center justify-center gap-3 px-10 py-2 text-center text-sm;
+  background: var(--ch-color-surface-inverse);
+  color: var(--ch-color-text-inverse);
+}
+.ch-announcement[data-tone="brand"] {
+  background: var(--ch-color-brand);
+  color: var(--ch-color-on-brand);
+}
+.ch-announcement[data-tone="warning"] {
+  background: #fef3c7;
+  color: #78350f;
+}
+.ch-announcement__text a {
+  @apply ml-2 font-medium underline underline-offset-2;
+  color: inherit;
+}
+.ch-announcement__close {
+  @apply absolute end-2 top-1/2 inline-flex size-8 -translate-y-1/2 cursor-pointer items-center justify-center rounded-full;
+}
+.ch-announcement__close:hover {
+  background: color-mix(in oklab, currentColor 15%, transparent);
+}
+:root[data-ch-announcement-dismissed] .ch-announcement {
+  display: none;
+}
+/* The consent bar: at the bottom, never over what has focus (the page keeps room for it). */
+.ch-consent {
+  @apply fixed inset-x-3 bottom-3 z-50 mx-auto flex max-w-3xl flex-wrap items-center justify-between gap-3 rounded-lg px-4 py-3 text-sm;
+  background: var(--ch-color-surface-raised, var(--ch-color-surface));
+  color: var(--ch-color-text);
+  border: 1px solid var(--ch-color-border);
+  box-shadow: 0 12px 32px -12px rgb(0 0 0 / 0.3);
+}
+.ch-consent__text a {
+  @apply ml-1 underline underline-offset-2;
+}
+.ch-consent__actions {
+  @apply flex gap-2;
+}
+.ch-consent__actions .ch-button {
+  @apply px-3 py-1.5 text-sm;
+}
+:root[data-ch-consent] .ch-consent {
+  display: none;
+}
+:root:not([data-ch-consent]):has(.ch-consent) {
+  scroll-padding-bottom: calc(var(--ch-consent-h, 5rem) + 1rem);
+}
+:root:not([data-ch-consent]):has(.ch-consent) body {
+  padding-bottom: calc(var(--ch-consent-h, 5rem) + 1rem);
+}
+/* Toasts: short news in a live region; the newest at the bottom. */
+.ch-toasts {
+  @apply pointer-events-none fixed inset-x-0 bottom-4 z-50 flex flex-col items-center gap-2;
+}
+.ch-toast {
+  @apply rounded-full px-4 py-2 text-sm shadow-lg;
+  background: var(--ch-color-surface-inverse);
+  color: var(--ch-color-text-inverse);
+}
+:root:not([data-ch-motion="none"]) .ch-toast {
+  transition:
+    opacity var(--ch-dur-2, 0.2s) ease-out,
+    translate var(--ch-dur-2, 0.2s) ease-out;
+}
+@starting-style {
+  .ch-toast {
+    opacity: 0;
+    translate: 0 0.5rem;
+  }
+}
+/* A mega panel: under the header, as wide as it, its groups in columns. */
+.ch-nav-menu__pop--mega {
+  position-area: none;
+  inset: var(--ch-header-h, 4.75rem) 1rem auto 1rem;
+  margin: 0 auto;
+  width: auto;
+  max-width: 72rem;
+  padding: 1.5rem;
+}
+.ch-mega {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(11rem, 1fr));
+  gap: 1.5rem;
+}
+.ch-mega__heading {
+  @apply mb-2 text-xs font-semibold text-zinc-500 uppercase;
+}
+.ch-mega__col ul,
+ul.ch-mega__col {
+  @apply grid gap-0.5;
+}
+/* The footer's surface region sits above the columns, in the footer's width. */
+.ch-footer__region {
+  @apply mb-10 text-base;
+  color: var(--ch-color-text);
+}
+.ch-footer[data-surface="inverse"] .ch-footer__region {
+  color: inherit;
+}
+.ch-footer__region .ch-surface {
+  padding: 0;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/prose.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/prose.css
new file mode 100644
index 00000000..52a21da4
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/prose.css
@@ -0,0 +1,140 @@
+/* Section defaults; a theme overrides these or swaps components. */
+.ch-hero {
+  @apply py-12;
+}
+.ch-hero h1 {
+  @apply text-4xl font-bold tracking-tight;
+}
+.ch-hero__sub {
+  @apply mt-3 text-lg text-zinc-600;
+}
+.ch-hero__cta {
+  @apply mt-6 inline-block rounded px-4 py-2 text-(--ch-color-on-brand);
+  background: var(--ch-color-brand);
+}
+.ch-article-header {
+  @apply space-y-2 border-b border-zinc-200 pt-8 pb-6;
+}
+.ch-article-header h1 {
+  @apply text-4xl font-bold tracking-tight;
+}
+.ch-summary {
+  @apply text-lg text-zinc-600;
+}
+.ch-article-header time {
+  @apply text-sm text-zinc-500;
+}
+.ch-richtext {
+  @apply space-y-4 py-6 leading-relaxed;
+}
+.ch-richtext h1 {
+  @apply text-3xl font-bold;
+}
+.ch-richtext h2 {
+  @apply text-2xl font-semibold;
+}
+.ch-richtext h3 {
+  @apply pt-2 text-xl font-semibold;
+}
+.ch-richtext h2 {
+  @apply pt-4;
+}
+/* The body's own markdown (no class: surface components inside a body keep their styles). The
+   reset clears lists, tables, quotes and code; these bring them back in the theme's roles. */
+.ch-richtext :is(ul, ol):not([class]) {
+  padding-inline-start: 1.5em;
+}
+.ch-richtext ul:not([class]) {
+  list-style: disc;
+}
+.ch-richtext ol:not([class]) {
+  list-style: decimal;
+}
+.ch-richtext :is(ul, ol):not([class]) :is(ul, ol):not([class]) {
+  margin-block-start: 0.35em;
+}
+.ch-richtext ul:not([class]) ul:not([class]) {
+  list-style: circle;
+}
+.ch-richtext li:not([class]) + li:not([class]) {
+  margin-block-start: 0.35em;
+}
+.ch-richtext li::marker {
+  color: var(--ch-color-text-muted);
+}
+/* Task lists: the checkbox is the marker. */
+.ch-richtext ul:not([class]):has(> li > input[type="checkbox"]) {
+  list-style: none;
+  padding-inline-start: 0.25em;
+}
+.ch-richtext li > input[type="checkbox"] {
+  inline-size: 1em;
+  block-size: 1em;
+  margin-inline-end: 0.5em;
+  vertical-align: -0.125em;
+  accent-color: var(--ch-color-brand);
+}
+.ch-richtext blockquote:not([class]) {
+  border-inline-start: 3px solid var(--ch-color-border-strong);
+  padding-inline-start: 1em;
+  color: var(--ch-color-text-muted);
+  font-style: italic;
+}
+.ch-richtext :not(pre) > code {
+  @apply rounded px-1.5 py-0.5;
+  font-size: 0.9em;
+  background: var(--ch-color-surface-muted);
+}
+.ch-richtext pre:not([class]) {
+  @apply overflow-x-auto rounded-lg px-4 py-3 text-sm leading-relaxed;
+  background: var(--ch-color-surface-muted);
+  border: 1px solid var(--ch-color-border);
+}
+.ch-richtext hr:not([class]) {
+  border: 0;
+  border-block-start: 1px solid var(--ch-color-border);
+  margin-block: 2rem;
+}
+/* Tables: ruled rows, a header, the column alignment markdown asked for; wide ones scroll on
+   their own (the page never scrolls sideways). */
+.ch-richtext table:not([class]) {
+  display: block;
+  inline-size: max-content;
+  max-inline-size: 100%;
+  overflow-x: auto;
+  border-collapse: collapse;
+  font-size: 0.95em;
+  font-variant-numeric: tabular-nums;
+}
+.ch-richtext table:not([class]) :is(th, td) {
+  padding: 0.45em 0.8em;
+  border-block-end: 1px solid var(--ch-color-border);
+  text-align: start;
+  vertical-align: top;
+}
+.ch-richtext table:not([class]) th {
+  font-weight: 600;
+  border-block-end-color: var(--ch-color-border-strong);
+}
+.ch-richtext table:not([class]) :is(th, td)[align="center"] {
+  text-align: center;
+}
+.ch-richtext table:not([class]) :is(th, td)[align="right"] {
+  text-align: end;
+}
+/* Footnotes: small raised numbers, the notes listed at the end under a rule. */
+.ch-fnref a {
+  @apply px-0.5 text-xs no-underline;
+  color: var(--ch-color-link);
+}
+.ch-footnotes {
+  @apply mt-10 pt-4 text-sm;
+  border-block-start: 1px solid var(--ch-color-border);
+  color: var(--ch-color-text-muted);
+}
+.ch-footnotes ol {
+  @apply list-decimal space-y-1 ps-5;
+}
+.ch-fnback {
+  @apply no-underline;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search-dialog.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search-dialog.css
new file mode 100644
index 00000000..f077d8aa
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search-dialog.css
@@ -0,0 +1,144 @@
+/*
+ * RFC-0029 §6: the search modal. Painted from the color roles like the overlays (RFC-0025 §3):
+ * centered and 40rem wide on wide screens, a full-height sheet on phones, and the page behind it
+ * does not scroll (`overlays.css`).
+ */
+.ch-search-dialog {
+  margin: 10dvh auto auto;
+  padding: 0;
+  border: 0;
+  width: 100%;
+  max-width: min(40rem, calc(100vw - 2rem));
+  max-height: min(75dvh, 40rem);
+  overflow: hidden;
+  border-radius: var(--ch-radius-l, 0.75rem);
+  background: var(--ch-color-surface);
+  color: var(--ch-color-text);
+  box-shadow: 0 24px 60px -16px rgb(0 0 0 / 0.4);
+}
+.ch-search-dialog[open] {
+  display: flex;
+}
+.ch-search-dialog::backdrop {
+  background: rgb(0 0 0 / 0.5);
+}
+.ch-search-dialog__panel {
+  @apply flex min-h-0 w-full flex-col;
+}
+.ch-search-dialog__bar {
+  @apply flex items-center gap-2 px-4 py-3;
+  border-bottom: 1px solid var(--ch-color-border);
+}
+.ch-search-dialog__bar input {
+  @apply min-w-0 flex-1 bg-transparent py-1 text-lg outline-none;
+}
+.ch-search-dialog__bar input::-webkit-search-cancel-button {
+  display: none;
+}
+.ch-search-dialog__close {
+  @apply shrink-0 cursor-pointer rounded-md px-2 py-1 text-sm;
+  color: var(--ch-color-text-muted);
+}
+.ch-search-dialog__close:hover {
+  background: color-mix(in oklab, currentColor 12%, transparent);
+}
+.ch-search-dialog__body {
+  @apply min-h-0 flex-1 overflow-y-auto px-2 py-2;
+  overscroll-behavior: contain;
+}
+.ch-search-dialog__body:has(.ch-search-dialog__list:empty):has(.ch-search-dialog__note[hidden]) {
+  display: none;
+}
+.ch-search-group + .ch-search-group {
+  @apply mt-2;
+}
+.ch-search-group__label {
+  @apply px-3 pt-2 pb-1 text-xs font-medium;
+  color: var(--ch-color-text-subtle);
+}
+.ch-search-option {
+  @apply grid gap-0.5 rounded-md px-3 py-2 no-underline;
+  color: inherit;
+  scroll-margin: 0.5rem;
+}
+.ch-search-option[aria-selected="true"] {
+  background: color-mix(in oklab, var(--ch-color-link, currentColor) 12%, transparent);
+}
+.ch-search-option__context {
+  @apply text-xs;
+  color: var(--ch-color-text-subtle);
+}
+.ch-search-option__title {
+  @apply font-medium;
+}
+.ch-search-option__snippet {
+  @apply line-clamp-2 text-sm;
+  color: var(--ch-color-text-muted);
+}
+.ch-search-option__snippet mark {
+  @apply rounded-sm px-0.5;
+  background: color-mix(in oklab, #f59e0b 30%, transparent);
+  color: inherit;
+}
+.ch-search-option--all .ch-search-option__title {
+  @apply text-sm;
+  color: var(--ch-color-link, inherit);
+}
+.ch-search-dialog__note {
+  @apply flex flex-wrap items-center gap-2 px-3 py-3 text-sm;
+  color: var(--ch-color-text-muted);
+}
+.ch-search-dialog__note a {
+  @apply underline underline-offset-4;
+}
+.ch-search-clear {
+  @apply cursor-pointer text-sm underline underline-offset-4;
+}
+.ch-search-dialog__keys {
+  @apply hidden items-center gap-4 px-4 py-2 text-xs sm:flex;
+  border-top: 1px solid var(--ch-color-border);
+  color: var(--ch-color-text-subtle);
+}
+.ch-search-dialog__keys kbd {
+  @apply me-1 rounded px-1 font-mono;
+  border: 1px solid var(--ch-color-border);
+}
+.ch-search-dialog[aria-busy="true"] .ch-search-dialog__list {
+  opacity: 0.6;
+}
+/* Phones: a full-height sheet with the field at the top. */
+@media (max-width: 639px) {
+  .ch-search-dialog {
+    margin: 0;
+    max-width: none;
+    max-height: none;
+    height: 100dvh;
+    border-radius: 0;
+  }
+}
+/* The header field opens the modal once the module is here. */
+:root[data-ch-search-ready] [data-ch-search-open] input {
+  cursor: pointer;
+}
+/* Entrance at the site's motion level (RFC-0024); none under reduced motion. */
+:root:not([data-ch-motion="none"]) .ch-search-dialog {
+  transition:
+    opacity var(--ch-dur-2, 0.2s) ease-out,
+    translate var(--ch-dur-2, 0.2s) var(--ch-ease-out, ease-out),
+    display var(--ch-dur-2, 0.2s) allow-discrete,
+    overlay var(--ch-dur-2, 0.2s) allow-discrete;
+}
+:root:not([data-ch-motion="none"]) .ch-search-dialog:not([open]) {
+  opacity: 0;
+}
+@starting-style {
+  .ch-search-dialog[open] {
+    opacity: 0;
+    translate: 0 -0.5rem;
+  }
+}
+@media (prefers-reduced-motion: reduce) {
+  .ch-search-dialog {
+    transition: none !important;
+  }
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search.css
new file mode 100644
index 00000000..bf8e48b4
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/search.css
@@ -0,0 +1,59 @@
+/* Search (RFC-0019 §3): the header form, the page's form, results with highlighted snippets. */
+.ch-header-search input {
+  @apply w-40 rounded-md border border-zinc-300 px-3 py-1.5 text-sm sm:w-48;
+}
+.ch-search h1 {
+  @apply text-3xl font-bold tracking-tight;
+}
+.ch-search-form {
+  @apply mt-4 flex gap-2;
+}
+.ch-search-form input {
+  @apply min-w-0 flex-1 rounded-md border border-zinc-300 px-3 py-2;
+}
+.ch-search-form button {
+  @apply rounded-md px-4 py-2 font-medium bg-(--ch-color-surface-inverse) text-(--ch-color-text-inverse) hover:opacity-90;
+}
+.ch-search-note {
+  @apply mt-4 rounded-md border border-amber-300 bg-amber-50 px-4 py-3 text-sm text-amber-900;
+}
+.ch-search-summary {
+  @apply mt-4 text-sm text-zinc-600;
+}
+.ch-search-results {
+  @apply mt-6 space-y-6;
+}
+.ch-search-context {
+  @apply text-xs font-medium text-zinc-500;
+}
+.ch-search-results h2 {
+  @apply text-lg font-semibold;
+}
+.ch-search-results h2 a {
+  @apply underline-offset-4 hover:underline;
+}
+.ch-search-snippet {
+  @apply mt-1 text-zinc-700;
+}
+.ch-search-snippet mark {
+  @apply rounded-sm bg-amber-100 px-0.5 text-zinc-900;
+}
+.ch-search-results time {
+  @apply mt-1 block text-sm text-zinc-500;
+}
+/* The built-in not-found page: the search page's form, a sentence and a link home. */
+.ch-not-found-text {
+  @apply mt-3 text-zinc-700;
+}
+.ch-not-found .ch-search-form {
+  @apply flex-wrap items-center;
+}
+.ch-not-found-prompt {
+  @apply w-full text-sm text-zinc-600;
+}
+.ch-not-found-home {
+  @apply mt-6;
+}
+.ch-not-found-home a {
+  @apply font-medium underline underline-offset-4;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surface-media.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surface-media.css
new file mode 100644
index 00000000..2f1d235f
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surface-media.css
@@ -0,0 +1,123 @@
+/* RFC-0028 §3: how an image meets its frame. cover (the default) crops around the focal point the
+   renderer sets as object-position; the others show the whole picture, and what fills the bars is
+   the image's placeholder layer: its blurred self (blur-fill), its colour (color-fill) or nothing. */
+.ch-figure:is([data-fit="contain"], [data-fit="blur-fill"], [data-fit="color-fill"]) img,
+.ch-carousel[data-aspect]
+  .ch-carousel__slide
+  .ch-figure:is([data-fit="contain"], [data-fit="blur-fill"], [data-fit="color-fill"])
+  img {
+  object-fit: contain;
+}
+.ch-figure[data-fit="natural"] img {
+  aspect-ratio: auto;
+  height: auto;
+}
+.ch-figure figcaption {
+  @apply mt-2 text-sm text-zinc-500;
+}
+.ch-button--ghost {
+  @apply underline-offset-4 hover:underline;
+}
+.ch-link {
+  @apply font-medium underline underline-offset-4;
+}
+.ch-badge {
+  @apply inline-block w-fit rounded-full bg-zinc-100 px-2.5 py-0.5 text-xs font-medium text-zinc-700;
+}
+.ch-badge[data-tone="info"] {
+  @apply bg-sky-100 text-sky-800;
+}
+.ch-badge[data-tone="success"] {
+  @apply bg-emerald-100 text-emerald-800;
+}
+.ch-badge[data-tone="warning"] {
+  @apply bg-amber-100 text-amber-900;
+}
+.ch-badge[data-tone="danger"] {
+  @apply bg-red-100 text-red-800;
+}
+.ch-stat {
+  @apply flex flex-col gap-1;
+}
+.ch-stat__value {
+  @apply text-4xl font-bold tracking-tight;
+}
+.ch-stat__label {
+  @apply text-sm font-medium text-zinc-700;
+}
+.ch-stat__detail {
+  @apply text-sm text-zinc-500;
+}
+.ch-quote blockquote {
+  @apply border-l-4 border-zinc-300 pl-4 text-lg italic;
+}
+.ch-quote figcaption {
+  @apply mt-2 text-sm text-zinc-600;
+}
+.ch-quote cite {
+  @apply font-medium not-italic text-zinc-900;
+}
+.ch-list {
+  @apply space-y-2 pl-5;
+}
+ul.ch-list {
+  @apply list-disc;
+}
+ol.ch-list {
+  @apply list-decimal;
+}
+.ch-list[data-marker="none"] {
+  @apply list-none pl-0;
+}
+/* RFC-0026: an icon of the set as the bullet ("check" included), in the brand color. */
+.ch-list[data-marker="icon"] {
+  @apply list-none pl-0;
+}
+.ch-list[data-marker="icon"] li {
+  @apply flex items-start gap-2;
+}
+.ch-list__marker {
+  @apply mt-[0.2em];
+  color: var(--ch-color-brand);
+}
+/* Tabs without JavaScript: the n-th checked radio shows the n-th panel. */
+.ch-tabs {
+  @apply flex flex-wrap gap-x-1;
+}
+.ch-tabs__radio {
+  @apply sr-only;
+}
+.ch-tabs__tab {
+  @apply cursor-pointer rounded-t border-b-2 border-transparent px-4 py-2 text-sm font-medium text-zinc-600;
+}
+.ch-tabs__radio:checked + .ch-tabs__tab {
+  @apply border-current text-zinc-900;
+}
+.ch-tabs__radio:focus-visible + .ch-tabs__tab {
+  @apply outline-2 outline-offset-2;
+}
+.ch-tabs__panels {
+  @apply w-full border-t border-zinc-200 pt-4;
+}
+.ch-tabs__panel {
+  @apply hidden;
+}
+.ch-tabs__radio:nth-of-type(1):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(1),
+.ch-tabs__radio:nth-of-type(2):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(2),
+.ch-tabs__radio:nth-of-type(3):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(3),
+.ch-tabs__radio:nth-of-type(4):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(4),
+.ch-tabs__radio:nth-of-type(5):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(5),
+.ch-tabs__radio:nth-of-type(6):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(6),
+.ch-tabs__radio:nth-of-type(7):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(7),
+.ch-tabs__radio:nth-of-type(8):checked ~ .ch-tabs__panels > .ch-tabs__panel:nth-child(8) {
+  @apply flex flex-col gap-4;
+}
+.ch-accordion {
+  @apply divide-y divide-zinc-200 border-y border-zinc-200;
+}
+.ch-disclosure summary {
+  @apply cursor-pointer py-3 font-medium;
+}
+.ch-disclosure__body {
+  @apply flex flex-col gap-3 pb-4;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surfaces.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surfaces.css
new file mode 100644
index 00000000..042f619a
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/surfaces.css
@@ -0,0 +1,310 @@
+/* Generated UI (RFC-0020): surfaces built by agents from the catalog's primitives. Values arrive
+   as data-* attributes from closed sets; nothing a model wrote reaches this file. */
+.ch-surface {
+  @apply py-6;
+}
+.ch-stack {
+  @apply flex flex-col gap-4;
+}
+.ch-row {
+  @apply flex flex-wrap items-center gap-4;
+}
+.ch-row[data-wrap="no"] {
+  @apply flex-nowrap;
+}
+.ch-grid {
+  @apply grid grid-cols-1 gap-4 sm:grid-cols-2;
+}
+.ch-grid[data-cols="1"] {
+  @apply sm:grid-cols-1;
+}
+@media (min-width: 48rem) {
+  .ch-grid[data-cols="3"] {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
+  .ch-grid[data-cols="4"] {
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+  }
+  .ch-grid[data-cols="5"] {
+    grid-template-columns: repeat(5, minmax(0, 1fr));
+  }
+  .ch-grid[data-cols="6"] {
+    grid-template-columns: repeat(6, minmax(0, 1fr));
+  }
+}
+.ch-columns {
+  @apply grid grid-cols-1 gap-6 md:grid-cols-2;
+}
+@media (min-width: 48rem) {
+  .ch-columns[data-ratio="2-1"] {
+    grid-template-columns: 2fr 1fr;
+  }
+  .ch-columns[data-ratio="1-2"] {
+    grid-template-columns: 1fr 2fr;
+  }
+  .ch-columns[data-ratio="1-1-1"] {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
+  .ch-columns[data-ratio="1-2-1"] {
+    grid-template-columns: 1fr 2fr 1fr;
+  }
+}
+:is(.ch-stack, .ch-row, .ch-grid, .ch-columns)[data-gap="none"] {
+  gap: 0;
+}
+:is(.ch-stack, .ch-row, .ch-grid, .ch-columns)[data-gap="s"] {
+  gap: 0.5rem;
+}
+:is(.ch-stack, .ch-row, .ch-grid, .ch-columns)[data-gap="l"] {
+  gap: 2rem;
+}
+:is(.ch-stack, .ch-row, .ch-grid, .ch-columns)[data-gap="xl"] {
+  gap: 3rem;
+}
+:is(.ch-stack, .ch-row)[data-align="center"] {
+  @apply items-center text-center;
+}
+:is(.ch-stack, .ch-row)[data-align="end"] {
+  @apply items-end;
+}
+.ch-row[data-justify="center"] {
+  @apply justify-center;
+}
+.ch-row[data-justify="end"] {
+  @apply justify-end;
+}
+.ch-row[data-justify="between"] {
+  @apply justify-between;
+}
+/* A band leaves the reading column: full width, or wider than the text. */
+.ch-band {
+  @apply relative py-12;
+  margin-inline: calc(50% - 50vw);
+  padding-inline: max(1rem, calc(50vw - 36rem));
+}
+.ch-band[data-width="narrow"] .ch-band__inner {
+  @apply mx-auto max-w-2xl;
+}
+.ch-band[data-width="wide"] .ch-band__inner,
+.ch-band:not([data-width]) .ch-band__inner {
+  @apply mx-auto max-w-6xl;
+}
+/* A band's own children (heading, text, buttons, a grid) need room between them; the theme's
+   spacing unit scales it with the density. */
+.ch-band__inner > * + * {
+  margin-block-start: calc(var(--spacing) * 4);
+}
+.ch-band__inner > .ch-heading + :is(.ch-grid, .ch-columns, .ch-stack, .ch-tabs, .ch-table-wrap) {
+  margin-block-start: calc(var(--spacing) * 6);
+}
+.ch-band[data-spacing="s"] {
+  @apply py-6;
+}
+.ch-band[data-spacing="l"] {
+  @apply py-16;
+}
+.ch-band[data-spacing="xl"] {
+  @apply py-24;
+}
+/*
+ * Surfaces (RFC-0023 §4): what a band or card is painted with, from the color roles only, so
+ * text keeps the contrast the token expansion checked. `data-tone` (older pages) is an alias.
+ */
+:is([data-surface="muted"], [data-tone="muted"]):is(.ch-band, .ch-card) {
+  background: var(--ch-color-surface-muted);
+}
+[data-surface="raised"]:is(.ch-band, .ch-card) {
+  background: var(--ch-color-surface-raised);
+  box-shadow:
+    0 1px 2px rgb(0 0 0 / 0.05),
+    0 6px 20px -6px rgb(0 0 0 / 0.12);
+}
+:is([data-surface="brand"], [data-tone="brand"]):is(.ch-band, .ch-card) {
+  background: var(--ch-color-brand);
+  color: var(--ch-color-on-brand);
+}
+:is([data-surface="inverse"], [data-tone="inverse"]):is(.ch-band, .ch-card) {
+  background: var(--ch-color-surface-inverse);
+  color: var(--ch-color-text-inverse);
+}
+[data-surface="accent"]:is(.ch-band, .ch-card) {
+  background: var(--ch-color-accent);
+  color: var(--ch-color-on-accent);
+}
+/* From the brand to its gradient end: text on brand reads on both (the expansion checks it). */
+[data-surface="gradient"]:is(.ch-band, .ch-card) {
+  background: var(--ch-color-brand);
+  background-image: linear-gradient(
+    135deg in oklch,
+    var(--ch-color-brand),
+    var(--ch-color-gradient)
+  );
+  color: var(--ch-color-on-brand);
+}
+/* Soft light from the brand and accent over the muted surface; plain muted where unsupported. */
+[data-surface="mesh"]:is(.ch-band, .ch-card) {
+  background-color: var(--ch-color-surface-muted);
+  background-image:
+    radial-gradient(
+      at 12% 18%,
+      color-mix(in oklch, var(--ch-color-brand) 16%, transparent),
+      transparent 55%
+    ),
+    radial-gradient(
+      at 88% 8%,
+      color-mix(in oklch, var(--ch-color-accent) 14%, transparent),
+      transparent 50%
+    ),
+    radial-gradient(
+      at 55% 100%,
+      color-mix(in oklch, var(--ch-color-brand) 9%, transparent),
+      transparent 60%
+    );
+}
+[data-surface="dots"]:is(.ch-band, .ch-card) {
+  background-color: var(--ch-color-surface-muted);
+  background-image: radial-gradient(var(--ch-color-border-strong) 1px, transparent 1.5px);
+  background-size: 18px 18px;
+}
+[data-surface="grid"]:is(.ch-band, .ch-card) {
+  background-color: var(--ch-color-surface-muted);
+  background-image:
+    linear-gradient(var(--ch-color-border) 1px, transparent 1px),
+    linear-gradient(90deg, var(--ch-color-border) 1px, transparent 1px);
+  background-size: 28px 28px;
+}
+/* A fixed grey grain (no color in it), faint on light and dark alike. */
+[data-surface="noise"]:is(.ch-band, .ch-card) {
+  background-color: var(--ch-color-surface-muted);
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='160' height='160'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.85' numOctaves='2' stitchTiles='stitch'/%3E%3CfeColorMatrix values='0 0 0 0 .5 0 0 0 0 .5 0 0 0 0 .5 0 0 0 .18 0'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E");
+}
+/* Loud surfaces: their text, buttons and links follow the surface's own text color. */
+:is(
+    [data-surface="brand"],
+    [data-surface="inverse"],
+    [data-surface="accent"],
+    [data-surface="gradient"],
+    [data-tone="brand"],
+    [data-tone="inverse"]
+  )
+  :is(.ch-text, .ch-stat__label, .ch-stat__detail) {
+  color: inherit;
+  opacity: 0.85;
+}
+:is(
+    [data-surface="brand"],
+    [data-surface="inverse"],
+    [data-surface="accent"],
+    [data-surface="gradient"],
+    [data-tone="brand"],
+    [data-tone="inverse"]
+  )
+  .ch-button--primary {
+  @apply bg-(--ch-color-surface) text-(--ch-color-text);
+}
+:is(
+    [data-surface="brand"],
+    [data-surface="inverse"],
+    [data-surface="accent"],
+    [data-surface="gradient"],
+    [data-tone="brand"],
+    [data-tone="inverse"]
+  )
+  .ch-button--secondary {
+  @apply border-current/60 text-inherit;
+}
+:is(
+    [data-surface="brand"],
+    [data-surface="inverse"],
+    [data-surface="accent"],
+    [data-surface="gradient"],
+    [data-tone="brand"],
+    [data-tone="inverse"]
+  )
+  .ch-link {
+  color: inherit;
+}
+:is(
+  [data-surface="brand"],
+  [data-surface="inverse"],
+  [data-surface="accent"],
+  [data-surface="gradient"],
+  [data-surface="raised"]
+).ch-card {
+  border-color: transparent;
+}
+/* A band with an anchor stops below the top of the window when a link jumps to it. */
+.ch-band[id] {
+  scroll-margin-top: 1rem;
+}
+.ch-card {
+  @apply flex flex-col gap-3 rounded-lg border border-zinc-200 p-5 no-underline;
+}
+a.ch-card {
+  @apply hover:border-zinc-400;
+}
+.ch-spacer {
+  @apply h-8;
+}
+.ch-spacer[data-size="s"] {
+  @apply h-4;
+}
+.ch-spacer[data-size="l"] {
+  @apply h-16;
+}
+.ch-spacer[data-size="xl"] {
+  @apply h-24;
+}
+.ch-divider {
+  @apply my-2 border-zinc-200;
+}
+.ch-heading {
+  @apply font-bold tracking-tight;
+}
+h1.ch-heading {
+  @apply text-4xl sm:text-5xl;
+}
+h2.ch-heading {
+  @apply text-3xl;
+}
+h3.ch-heading {
+  @apply text-xl;
+}
+h4.ch-heading {
+  @apply text-lg;
+}
+.ch-text {
+  @apply space-y-2 leading-relaxed;
+}
+.ch-text[data-size="s"] {
+  @apply text-sm;
+}
+.ch-text[data-size="l"] {
+  @apply text-xl;
+  /* A lead keeps a readable measure, even at a dramatic type scale. */
+  max-inline-size: 48ch;
+}
+.ch-text[data-muted="yes"] {
+  @apply text-zinc-600;
+}
+[data-align="center"]:is(.ch-heading, .ch-text) {
+  @apply text-center;
+}
+[data-align="end"]:is(.ch-heading, .ch-text) {
+  @apply text-right;
+}
+.ch-figure img {
+  @apply w-full rounded-lg object-cover;
+}
+.ch-figure[data-ratio="16:9"] img {
+  aspect-ratio: 16 / 9;
+}
+.ch-figure[data-ratio="4:3"] img {
+  aspect-ratio: 4 / 3;
+}
+.ch-figure[data-ratio="1:1"] img {
+  aspect-ratio: 1;
+}
+.ch-figure[data-ratio="3:4"] img {
+  aspect-ratio: 3 / 4;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/tokens.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/tokens.css
new file mode 100644
index 00000000..50ba886b
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/features/tokens.css
@@ -0,0 +1,113 @@
+/*
+ * RFC-0023: the theme's greys and white are color roles (`--ch-color-<role>`, written by
+ * themeVariables from the site's seed, or the former greys when it has none), so a seed restyles
+ * them and dark mode works. Text on brand and inverse fills uses its own roles below.
+ */
+@theme inline {
+  --color-white: var(--ch-color-surface-raised);
+  --color-zinc-50: var(--ch-color-surface-muted);
+  --color-zinc-100: var(--ch-color-surface-muted);
+  --color-zinc-200: var(--ch-color-border);
+  --color-zinc-300: var(--ch-color-border-strong);
+  --color-zinc-400: var(--ch-color-text-subtle);
+  --color-zinc-500: var(--ch-color-text-subtle);
+  --color-zinc-600: var(--ch-color-text-muted);
+  --color-zinc-700: var(--ch-color-text);
+  --color-zinc-800: var(--ch-color-text);
+  --color-zinc-900: var(--ch-color-text);
+  /*
+   * RFC-0023 §2: with a type scale the sizes are fluid steps (`--ch-step-<n>`, written by
+   * themeVariables); without one, Tailwind's fixed sizes. Small print stays fixed.
+   */
+  --text-base: var(--ch-step-0, 1rem);
+  --text-lg: var(--ch-step-1, 1.125rem);
+  --text-xl: var(--ch-step-2, 1.25rem);
+  --text-2xl: var(--ch-step-3, 1.5rem);
+  --text-3xl: var(--ch-step-4, 1.875rem);
+  --text-4xl: var(--ch-step-5, 2.25rem);
+  --text-5xl: var(--ch-step-6, 3rem);
+  /*
+   * RFC-0023 §3: corners and spacing follow the `radius` and `density` settings
+   * (`--ch-radius-*`, `--ch-space-unit`); the fallbacks are Tailwind's own values.
+   */
+  --radius: var(--ch-radius-s, 0.25rem);
+  --radius-sm: var(--ch-radius-s, 0.25rem);
+  --radius-md: var(--ch-radius-m, 0.375rem);
+  --radius-lg: var(--ch-radius-l, 0.5rem);
+  --spacing: var(--ch-space-unit, 0.25rem);
+}
+
+/* Design settings (src/settings.ts, RFC-0017): CSS variables and data-ch-* attributes on <html>. */
+.ch-body {
+  background: var(--ch-color-surface);
+  color: var(--ch-color-text);
+  /* Full-width bands (RFC-0020) use 100vw, which counts a classic scrollbar: never scroll sideways. */
+  overflow-x: clip;
+}
+[data-ch-font="serif"] .ch-body {
+  font-family: ui-serif, Georgia, Cambria, "Times New Roman", serif;
+}
+[data-ch-font="humanist"] .ch-body {
+  font-family:
+    Seravek, "Gill Sans Nova", Ubuntu, Calibri, "DejaVu Sans", source-sans-pro, sans-serif;
+}
+[data-ch-font="mono"] .ch-body {
+  font-family: ui-monospace, "Cascadia Code", "Source Code Pro", Menlo, Consolas, monospace;
+}
+/*
+ * Font pairings (RFC-0023 §2): the families come from fonts.css and load only when used; each is
+ * followed by its metric-matched fallback (font-fallbacks.css), so the swap does not move the
+ * text. They win
+ * over the older typeface setting; `system` keeps it.
+ */
+[data-ch-type-pairing="editorial"] {
+  --ch-font-display: "Fraunces Variable", "Fraunces Variable Fallback", ui-serif, Georgia, serif;
+  --ch-font-text: "Inter Variable", "Inter Variable Fallback", ui-sans-serif, system-ui, sans-serif;
+}
+[data-ch-type-pairing="modern"] {
+  --ch-font-display:
+    "Space Grotesk Variable", "Space Grotesk Variable Fallback", ui-sans-serif, system-ui,
+    sans-serif;
+  --ch-font-text: "Inter Variable", "Inter Variable Fallback", ui-sans-serif, system-ui, sans-serif;
+}
+[data-ch-type-pairing="humanist"] {
+  --ch-font-display:
+    "Source Sans 3 Variable", "Source Sans 3 Variable Fallback", ui-sans-serif, system-ui,
+    sans-serif;
+  --ch-font-text:
+    "Source Sans 3 Variable", "Source Sans 3 Variable Fallback", ui-sans-serif, system-ui,
+    sans-serif;
+}
+[data-ch-type-pairing="technical"] {
+  --ch-font-display:
+    "JetBrains Mono Variable", "JetBrains Mono Variable Fallback", ui-monospace, monospace;
+  --ch-font-text: "Inter Variable", "Inter Variable Fallback", ui-sans-serif, system-ui, sans-serif;
+  --ch-font-code:
+    "JetBrains Mono Variable", "JetBrains Mono Variable Fallback", ui-monospace, monospace;
+}
+[data-ch-type-pairing="classic"] {
+  --ch-font-display:
+    "Source Serif 4 Variable", "Source Serif 4 Variable Fallback", ui-serif, Georgia, serif;
+  --ch-font-text:
+    "Source Serif 4 Variable", "Source Serif 4 Variable Fallback", ui-serif, Georgia, serif;
+}
+[data-ch-type-pairing]:not([data-ch-type-pairing="system"]) .ch-body {
+  font-family: var(--ch-font-text);
+}
+[data-ch-type-pairing]:not([data-ch-type-pairing="system"]) .ch-body :is(h1, h2, h3, h4) {
+  font-family: var(--ch-font-display);
+}
+[data-ch-type-pairing="technical"] .ch-body :is(code, pre, kbd) {
+  font-family: var(--ch-font-code);
+}
+/* Headings without a lonely last word, paragraphs without orphans, where supported. */
+.ch-body :is(h1, h2, h3, h4) {
+  text-wrap: balance;
+}
+.ch-body :is(p, li, blockquote) {
+  text-wrap: pretty;
+}
+/* Links in a body, not buttons: a surface Button keeps its own colours (on-brand on brand). */
+.ch-richtext a:not(.ch-button) {
+  color: var(--ch-color-link);
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/font-fallbacks.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/font-fallbacks.css
new file mode 100644
index 00000000..495c7e8a
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/font-fallbacks.css
@@ -0,0 +1,53 @@
+/*
+ * Generated by scripts/font-fallbacks.ts: do not edit. Metric-matched fallback faces for the
+ * pairings' web fonts (tokens.css lists each right after its web font), so the swap to the web
+ * font does not move the text.
+ */
+@font-face {
+  font-family: "Fraunces Variable Fallback";
+  src: local("Times New Roman"), local("TimesNewRomanPSMT");
+  size-adjust: 113.62%;
+  ascent-override: 86.08%;
+  descent-override: 22.44%;
+  line-gap-override: 0.00%;
+}
+@font-face {
+  font-family: "Inter Variable Fallback";
+  src: local("Arial"), local("ArialMT");
+  size-adjust: 107.12%;
+  ascent-override: 90.44%;
+  descent-override: 22.52%;
+  line-gap-override: 0.00%;
+}
+@font-face {
+  font-family: "Space Grotesk Variable Fallback";
+  src: local("Arial"), local("ArialMT");
+  size-adjust: 109.47%;
+  ascent-override: 89.89%;
+  descent-override: 26.67%;
+  line-gap-override: 0.00%;
+}
+@font-face {
+  font-family: "Source Sans 3 Variable Fallback";
+  src: local("Arial"), local("ArialMT");
+  size-adjust: 92.42%;
+  ascent-override: 110.80%;
+  descent-override: 43.28%;
+  line-gap-override: 0.00%;
+}
+@font-face {
+  font-family: "Source Serif 4 Variable Fallback";
+  src: local("Times New Roman"), local("TimesNewRomanPSMT");
+  size-adjust: 117.91%;
+  ascent-override: 87.87%;
+  descent-override: 28.41%;
+  line-gap-override: 0.00%;
+}
+@font-face {
+  font-family: "JetBrains Mono Variable Fallback";
+  src: local("Courier New"), local("CourierNewPSMT");
+  size-adjust: 99.98%;
+  ascent-override: 102.02%;
+  descent-override: 30.00%;
+  line-gap-override: 0.00%;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/fonts.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/fonts.css
new file mode 100644
index 00000000..3317914b
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/fonts.css
@@ -0,0 +1,113 @@
+/*
+ * Self-hosted variable fonts for the type pairings (RFC-0023 §2): upright, weight axis, latin and
+ * latin-ext (Turkish) subsets from Fontsource 5.3, OFL-1.1 (licences beside the files). A browser
+ * downloads a file only when a page uses its family and characters.
+ */
+@font-face {
+  font-family: "Fraunces Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 100 900;
+  src: url(/fonts/v1/fraunces-latin-ext-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "Fraunces Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 100 900;
+  src: url(/fonts/v1/fraunces-latin-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "Inter Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 100 900;
+  src: url(/fonts/v1/inter-latin-ext-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "Inter Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 100 900;
+  src: url(/fonts/v1/inter-latin-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "JetBrains Mono Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 100 800;
+  src: url(/fonts/v1/jetbrains-mono-latin-ext-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "JetBrains Mono Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 100 800;
+  src: url(/fonts/v1/jetbrains-mono-latin-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "Source Sans 3 Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 200 900;
+  src: url(/fonts/v1/source-sans-3-latin-ext-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C4, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "Source Sans 3 Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 200 900;
+  src: url(/fonts/v1/source-sans-3-latin-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "Source Serif 4 Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 200 900;
+  src: url(/fonts/v1/source-serif-4-latin-ext-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C4, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "Source Serif 4 Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 200 900;
+  src: url(/fonts/v1/source-serif-4-latin-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "Space Grotesk Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 300 700;
+  src: url(/fonts/v1/space-grotesk-latin-ext-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "Space Grotesk Variable";
+  font-style: normal;
+  font-display: swap;
+  font-weight: 300 700;
+  src: url(/fonts/v1/space-grotesk-latin-wght-normal.woff2) format("woff2-variations");
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/styles/global.css b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/global.css
new file mode 100644
index 00000000..7717714a
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/styles/global.css
@@ -0,0 +1,31 @@
+/* Scan `src/` only: automatic detection may walk up the file system (docs/design/starter-references.md §6). */
+@import "tailwindcss" source("..");
+@import "./fonts.css";
+@import "./font-fallbacks.css";
+
+/*
+ * One file per feature (docs/engineering/code-structure.md §8), in cascade order. Unlayered on
+ * purpose: `layer(...)` would let utilities beat component classes, and later files override
+ * earlier ones at equal specificity (reduced motion after reveals, the transparent header after
+ * chrome, forced colors after icons). CSS needs every @import first, so `@theme` lives in tokens.
+ */
+@import "./features/tokens.css";
+@import "./features/prose.css";
+@import "./features/blocks.css";
+@import "./features/article.css";
+@import "./features/comments.css";
+@import "./features/surfaces.css";
+@import "./features/surface-media.css";
+@import "./features/live-surfaces.css";
+@import "./features/motion.css";
+@import "./features/motion-scroll.css";
+@import "./features/motion-effects.css";
+@import "./features/ambient.css";
+@import "./features/search.css";
+@import "./features/search-dialog.css";
+@import "./features/chrome.css";
+@import "./features/chrome-menus.css";
+@import "./features/overlays.css";
+@import "./features/icons.css";
+@import "./features/carousel.css";
+@import "./features/languages.css";
diff --git a/packages/cli/test/fixtures/theme-v0.8.0/src/theme.ts b/packages/cli/test/fixtures/theme-v0.8.0/src/theme.ts
new file mode 100644
index 00000000..6425d6d7
--- /dev/null
+++ b/packages/cli/test/fixtures/theme-v0.8.0/src/theme.ts
@@ -0,0 +1,49 @@
+/**
+ * Theme override point: map a section kind to your own component, e.g.
+ *   import MyHero from "./components/MyHero.astro";
+ *   export const components = { hero: MyHero };
+ */
+import type {
+  BlockComponents,
+  SectionComponents,
+} from "@cloudhal/astro-renderer/components/Sections.astro";
+import type { CollectionIndexHook } from "@cloudhal/astro-renderer/navigation";
+import Testimonial from "./components/blocks/Testimonial.astro";
+import LatestPosts from "./components/LatestPosts.astro";
+
+/** The article lists on pages draw as cards with covers and reading time. */
+export const components: SectionComponents = { contentList: LatestPosts };
+
+/**
+ * Block types (RFC-0015) rendered by this theme's own components, by type name: the types this
+ * theme declares in `src/blocks.ts`, and any built-in it restyles, e.g.
+ *   import Callout from "./components/Callout.astro";
+ *   export const blocks = { callout: Callout, testimonial: Testimonial };
+ * Each gets `{ props, content, contentHtml, media }` (and `section` on pages), in page sections
+ * and inside article and rich-text bodies. Types not listed use Cloudhal's built-in markup.
+ */
+export const blocks: BlockComponents = { testimonial: Testimonial };
+
+/** Entries per category/tag archive page (`/category/<slug>/page/<n>`). */
+export const ARCHIVE_PAGE_SIZE = 20;
+
+/**
+ * Sites without a `primary` menu get a derived header: their top-level pages, then (with this
+ * flag) the top-level categories (by `position`, then name) whose archive is served (active,
+ * public, with posts). Set to `false` for a pages-only header. A `primary` menu replaces it.
+ */
+export const NAV_CATEGORIES = true;
+
+/**
+ * Where this theme serves a collection's index, for menu items that link to a collection
+ * (RFC-0003 §7.1). Return `undefined` to use the default: a published page at the collection's
+ * permalink prefix (`/docs` for `/docs/{slug}`, RFC-0038 §5), else the first published page that
+ * lists the collection (the blog's home page lists `posts`); without one the item is hidden.
+ */
+export const collectionIndex: CollectionIndexHook = () => undefined;
+
+/** "Related posts" under an article: entries sharing its primary category or tags (0 hides it). */
+export const RELATED_POSTS = 3;
+
+// The few words the theme itself prints, per language, and the site's own wording over them.
+export { strings, type ThemeStrings } from "./strings.ts";
diff --git a/packages/cli/test/old-theme-compat.test.ts b/packages/cli/test/old-theme-compat.test.ts
index 8f5a27b9..54dc6792 100644
--- a/packages/cli/test/old-theme-compat.test.ts
+++ b/packages/cli/test/old-theme-compat.test.ts
@@ -8,13 +8,17 @@
  * Its collection has RFC-0042's settings too (list fields, an `unlist` expiry, an `Event` preset)
  * and a page lists it by field: old themes keep the generic `BlogPosting`, and get the expiry, the
  * field listing (both live in the renderer's sources and `ContentList.astro`) and the collection's
- * feed (the renderer's middleware) on upgrade.
+ * feed (the renderer's middleware) on upgrade. RFC-0045: the collection also has a reference and a
+ * repeater (enabled on the test's own store, as the shared suites do): themes that draw fields
+ * get the target's link and the items from the renderer's `EntryFields.astro`, with no change of
+ * their own; older ones show neither.
  */
 import { spawn } from "node:child_process";
 import { cp, mkdtemp, readdir, readFile, rm, symlink } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { GATES_ENFORCED, SiteGraphStore } from "@cloudhal/core-ts";
 import { openLocalStore } from "@cloudhal/core-ts/local";
 import { afterAll, describe, expect, it } from "vitest";
 import { init, readProjectConfig, snapshot } from "../src/index.ts";
@@ -22,9 +26,11 @@ import { init, readProjectConfig, snapshot } from "../src/index.ts";
 const here = path.dirname(fileURLToPath(import.meta.url));
 const STARTER_NODE_MODULES = path.resolve(here, "../../../starters/blog/node_modules");
 const BIN = path.resolve(here, "../bin/cloudhal.ts");
-const FROZEN = ["v0.3.10", "v0.4.0", "v0.5.0"];
+const FROZEN = ["v0.3.10", "v0.4.0", "v0.5.0", "v0.8.0"];
 /** Themes from before RFC-0041 show no field values. */
-const SHOWS_FIELDS = new Set(["v0.5.0"]);
+const SHOWS_FIELDS = new Set(["v0.5.0", "v0.8.0"]);
+/** Themes from RFC-0042 on draw the collection's JSON-LD preset (`withStructuredData`). */
+const PRESETS = new Set(["v0.8.0"]);
 const TITLE = "Old Theme Site";
 
 /** Runs `cloudhal build` in its own process and returns its exit code and output. */
@@ -57,15 +63,23 @@ async function htmlFiles(dir: string): Promise<string[]> {
 async function addTypedFields(projectDir: string): Promise<void> {
   const cfg = await readProjectConfig(projectDir);
   const local = await openLocalStore(path.join(projectDir, cfg.dataDir));
+  // RFC-0045: references and repeaters stay refused in production; the test enables them
+  const store = new SiteGraphStore({
+    sql: local.sql,
+    blobs: local.blobs,
+    gates: GATES_ENFORCED,
+    fieldTypes: { supported: () => true },
+  });
   try {
-    const site = await local.store.getSite(cfg.siteId);
+    const site = await store.getSite(cfg.siteId);
     if (!site) throw new Error("no site");
     // the seed's required category applies to every collection: reuse the seeded post's terms
-    const [hello] = await local.store.listContentEntries(cfg.siteId, "posts");
-    await local.store.updateSite({
+    const [hello] = await store.listContentEntries(cfg.siteId, "posts");
+    await store.updateSite({
       ...site,
       collections: {
         ...site.collections,
+        places: {},
         events: {
           fields: [
             { key: "venue", type: "text", labels: { en: { label: "Venue" } }, localized: true },
@@ -88,6 +102,20 @@ async function addTypedFields(projectDir: string): Promise<void> {
               localized: false,
             },
             { key: "city", type: "text", labels: { en: { label: "City" } }, localized: false },
+            {
+              key: "place",
+              type: "reference",
+              labels: { en: { label: "Place" } },
+              localized: false,
+              collections: ["places"],
+            },
+            {
+              key: "lineup",
+              type: "repeater",
+              labels: { en: { label: "Lineup" } },
+              localized: false,
+              fields: [{ key: "act", type: "text", labels: { en: { label: "Act" } } }],
+            },
           ],
           listFields: ["startsAt"],
           expiry: { field: "endsAt", action: "unlist" },
@@ -105,7 +133,20 @@ async function addTypedFields(projectDir: string): Promise<void> {
     const day = 86_400_000;
     const at = (ms: number) => ({ at: new Date(ms).toISOString(), timeZone: "Europe/Istanbul" });
     const now = Date.now();
-    await local.store.createContentEntry({
+    const pier = await store.createContentEntry({
+      siteId: cfg.siteId,
+      collection: "places",
+      slug: "moda-pier",
+      locale: site.defaultLocale,
+      status: "published",
+      title: "Moda Pier",
+      body: { format: "markdown", value: "A pier on the Asian side, with a view of the old town." },
+      fields: {},
+      tags: [],
+      ...(hello?.terms ? { terms: hello.terms } : {}),
+      author: { kind: "human", id: "user_01HZX8K3Q9CD", name: "Halil" },
+    } as never);
+    await store.createContentEntry({
       siteId: cfg.siteId,
       collection: "events",
       slug: "launch",
@@ -122,12 +163,14 @@ async function addTypedFields(projectDir: string): Promise<void> {
         agenda: "- Talks\n- Lunch",
         startsAt: at(now + 30 * day),
         endsAt: at(now + 30 * day + 1),
+        place: pier.id,
+        lineup: [{ act: "The Ferry Band" }, { act: "Night Owls" }],
       },
       tags: [],
       ...(hello?.terms ? { terms: hello.terms } : {}),
       author: { kind: "human", id: "user_01HZX8K3Q9CD", name: "Halil" },
     } as never);
-    await local.store.createContentEntry({
+    await store.createContentEntry({
       siteId: cfg.siteId,
       collection: "events",
       slug: "retro",
@@ -140,7 +183,7 @@ async function addTypedFields(projectDir: string): Promise<void> {
       ...(hello?.terms ? { terms: hello.terms } : {}),
       author: { kind: "human", id: "user_01HZX8K3Q9CD", name: "Halil" },
     } as never);
-    await local.store.createPage((await local.store.getSite(cfg.siteId)) ?? site, {
+    await store.createPage((await store.getSite(cfg.siteId)) ?? site, {
       siteId: cfg.siteId,
       path: "/events",
       title: "Events",
@@ -211,10 +254,20 @@ describe.each(FROZEN)("a theme copied at %s still builds with today's packages",
     expect(pages.article).toContain("<title>Hello, world · ");
     expect(pages.event).toContain("<title>Launch party · ");
     // themes from before RFC-0041 do not show field values
-    if (!SHOWS_FIELDS.has(version)) expect(pages.event).not.toContain("Kadıköy Hall");
-    // RFC-0042: entryHead is unchanged, so old themes keep the generic BlogPosting
-    expect(pages.event).toContain('"@type":"BlogPosting"');
-    expect(pages.event).not.toContain('"@type":"Event"');
+    if (!SHOWS_FIELDS.has(version)) {
+      expect(pages.event).not.toContain("Kadıköy Hall");
+      expect(pages.event).not.toContain("The Ferry Band");
+    } else {
+      // RFC-0045: the renderer's EntryFields draws the reference as a link, the repeater's items
+      expect(pages.event).toMatch(/<a href="\/places\/moda-pier"[^>]*>Moda Pier<\/a>/);
+      expect(pages.event).toContain("The Ferry Band");
+      expect(pages.event).toContain("Night Owls");
+    }
+    // RFC-0042: entryHead is unchanged, so themes from before it keep the generic BlogPosting;
+    // later ones call withStructuredData and get the collection's Event preset
+    const preset = PRESETS.has(version) ? "Event" : "BlogPosting";
+    expect(pages.event).toContain(`"@type":"${preset}"`);
+    expect(pages.event).not.toContain(`"@type":"${preset === "Event" ? "BlogPosting" : "Event"}"`);
     // the expiry and the field listing come with the renderer: a past event keeps its page but
     // leaves the listing, the sitemap and the feed
     expect(await read("events", "retro", "index.html")).toContain("Retro night");
diff --git a/packages/core-ts/src/fields/conversions.ts b/packages/core-ts/src/fields/conversions.ts
index 052727d8..56aa33ab 100644
--- a/packages/core-ts/src/fields/conversions.ts
+++ b/packages/core-ts/src/fields/conversions.ts
@@ -19,6 +19,7 @@
  * Every result must also fit the new definition (`valueIssues`); anything else is unconvertible.
  */
 import type { FieldDefinition } from "@cloudhal/core-contracts";
+import type { ConversionEntries } from "../references/conversion-maps.ts";
 import { escapeAtLineStarts, unlink } from "./markdown-scan.ts";
 import type { FieldType } from "./types.ts";
 import { valueIssues } from "./value-checks.ts";
@@ -29,6 +30,11 @@ export interface ConvertContext {
   readonly timeZone: string;
   /** The site's default language (`text → select` labels). */
   readonly defaultLocale: string;
+  /**
+   * RFC-0045 §7: the prefetched entry maps of the text ↔ reference rows, present only while such
+   * a conversion runs (`conversion-maps.ts`).
+   */
+  readonly entries?: ConversionEntries | undefined;
 }
 
 /** `value: undefined` means "no value" (the key is removed). */
diff --git a/packages/core-ts/src/fields/index.ts b/packages/core-ts/src/fields/index.ts
index 534ef014..f43d14b9 100644
--- a/packages/core-ts/src/fields/index.ts
+++ b/packages/core-ts/src/fields/index.ts
@@ -10,6 +10,13 @@
  * every write path (`fields_unsupported`) until rollout step 7.
  */
 
+export {
+  type ConversionEntries,
+  conversionCollections,
+  conversionEntries,
+  conversionTargets,
+  foldText,
+} from "../references/conversion-maps.ts";
 export {
   FIELDS_FEATURE_VERSION,
   FIELDS_SUPPORTED,
diff --git a/packages/core-ts/src/fields/resolve.ts b/packages/core-ts/src/fields/resolve.ts
index 82c9dbf3..8ea33ee1 100644
--- a/packages/core-ts/src/fields/resolve.ts
+++ b/packages/core-ts/src/fields/resolve.ts
@@ -14,7 +14,7 @@
  *   version does not know is skipped, so a newer writer's type never breaks an older reader.
  */
 import type { ContentEntry, FieldDefinition } from "@cloudhal/core-contracts";
-import { convertFieldValue } from "./conversions.ts";
+import { type ConvertContext, convertFieldValue } from "./conversions.ts";
 import { convertContext, isBeingRemoved } from "./migration.ts";
 import {
   type FieldIssue,
@@ -80,11 +80,16 @@ function pick(
   return { value: theirs, fromOriginal: theirs !== undefined };
 }
 
-/** The entry's typed values under its collection's definitions (`{}` when it has none). */
+/**
+ * The entry's typed values under its collection's definitions (`{}` when it has none). `convert`
+ * adds to the site's conversion context: RFC-0045's prefetched entry maps, which readers build
+ * only while a text ↔ reference conversion runs.
+ */
 export function resolveFields(
   site: SiteFields,
   entry: FieldsEntry,
   original?: FieldsOriginal,
+  convert?: Pick<ConvertContext, "entries">,
 ): ResolvedFields {
   const out: ResolvedFields = {};
   for (const def of fieldDefinitions(site, entry.collection)) {
@@ -102,7 +107,7 @@ export function resolveFields(
     }
     const converting = def.migration?.fromType;
     const converted = converting
-      ? convertFieldValue(converting, def, value, convertContext(site))
+      ? convertFieldValue(converting, def, value, { ...convertContext(site), ...convert })
       : undefined;
     if (converted?.ok) {
       out[def.key] = {
diff --git a/packages/core-ts/src/index.ts b/packages/core-ts/src/index.ts
index f4e9fe39..b6710be6 100644
--- a/packages/core-ts/src/index.ts
+++ b/packages/core-ts/src/index.ts
@@ -79,6 +79,11 @@ export {
   redirectLocale,
   splitTarget,
 } from "./redirects.ts";
+export {
+  getGroupMembers,
+  type ReferrerCandidates,
+  referrerCandidates,
+} from "./references/reads.ts";
 export type {
   PublishReleaseInput,
   PublishReleaseResult,
diff --git a/packages/core-ts/src/references/conversion-maps.ts b/packages/core-ts/src/references/conversion-maps.ts
new file mode 100644
index 00000000..fd1ee43b
--- /dev/null
+++ b/packages/core-ts/src/references/conversion-maps.ts
@@ -0,0 +1,86 @@
+/**
+ * RFC-0045 §7 "Where the graph reads happen": the prefetched maps the two text ↔ reference
+ * conversion rows read (`ConvertContext.entries`), built from one read of the entries. Every
+ * converter builds them with this one function, so a writer, an operation pass, the live source
+ * and the snapshot source convert identically over the same entries:
+ *
+ * - `byText`: case-folded slug or default-locale title → the groups with such a member among the
+ *   target collections (text → reference picks the one group; none or several is unconvertible);
+ * - `titles`: group → its default-locale member's title (reference → text).
+ *
+ * Archived entries count nothing: a converted value is a newly chosen target, which the store's
+ * target guard requires to be usable (§2.1). Pure and Worker-safe; the conversion rows that read
+ * the maps land with rollout step 4.
+ */
+import type { ContentEntry, FieldDefinition } from "@cloudhal/core-contracts";
+import { memberGroup } from "./members.ts";
+
+/** What the text ↔ reference conversions read of the site's entries. */
+export interface ConversionEntries {
+  /** Case-folded slug or default-locale title → group ids, in first-seen order. */
+  readonly byText: ReadonlyMap<string, readonly string[]>;
+  /** Group id → its default-locale member's title. */
+  readonly titles: ReadonlyMap<string, string>;
+}
+
+/** The one case fold every converter compares with. */
+export const foldText = (text: string): string => text.normalize("NFC").trim().toLowerCase();
+
+/**
+ * The entry collections a definition's running conversion reads, or `undefined` when it needs no
+ * maps: a text → reference conversion (top-level, or a repeater's sub-field with `sub`) reads its
+ * target collections; a reference → text conversion reads titles of every collection (`"*"`).
+ */
+export function conversionTargets(def: FieldDefinition): readonly string[] | undefined {
+  const m = def.migration;
+  if (m?.fromType === undefined) return undefined;
+  let to: { type: string; collections?: readonly string[] } | undefined = def;
+  if (m.sub !== undefined)
+    to = def.type === "repeater" ? def.fields.find((s) => s.key === m.sub) : undefined;
+  if (to === undefined) return undefined;
+  if (m.fromType === "text" && to.type === "reference") return to.collections ?? [];
+  if (m.fromType === "reference" && to.type === "text") return ["*"];
+  return undefined;
+}
+
+/** The collections the running conversions of `defs` read (`"*"`: all), or none. */
+export function conversionCollections(
+  defs: readonly FieldDefinition[],
+): ReadonlySet<string> | undefined {
+  const out = new Set<string>();
+  for (const def of defs) for (const c of conversionTargets(def) ?? []) out.add(c);
+  return out.size === 0 ? undefined : out;
+}
+
+/**
+ * The maps over `entries` (any order; archived ones are skipped). `collections` narrows `byText`
+ * to the conversions' target collections (`"*"` or absent: all); titles cover every collection.
+ */
+export function conversionEntries(
+  entries: Iterable<
+    Pick<ContentEntry, "id" | "collection" | "locale" | "slug" | "title" | "status" | "translation">
+  >,
+  defaultLocale: string,
+  collections?: ReadonlySet<string>,
+): ConversionEntries {
+  const byText = new Map<string, string[]>();
+  const titles = new Map<string, string>();
+  const all = collections === undefined || collections.has("*");
+  const add = (text: string, group: string) => {
+    const key = foldText(text);
+    if (key === "") return;
+    const list = byText.get(key);
+    if (!list) byText.set(key, [group]);
+    else if (!list.includes(group)) list.push(group);
+  };
+  for (const e of entries) {
+    if (e.status === "archived") continue;
+    const group = memberGroup(e);
+    const isDefault = e.locale === defaultLocale;
+    if (isDefault && !titles.has(group)) titles.set(group, e.title);
+    if (!all && !collections.has(e.collection)) continue;
+    add(e.slug, group);
+    if (isDefault) add(e.title, group);
+  }
+  return { byText, titles };
+}
diff --git a/packages/core-ts/src/references/reads.ts b/packages/core-ts/src/references/reads.ts
new file mode 100644
index 00000000..4d78bc1a
--- /dev/null
+++ b/packages/core-ts/src/references/reads.ts
@@ -0,0 +1,97 @@
+/**
+ * RFC-0045 §4 "Batching": the live renderer's reads (`cloudhal dev`, previews). Both filter by
+ * `site_id`; neither applies status or gates, which the source decides for its view.
+ *
+ * - `getGroupMembers`: every entry of this site that is a member of one of the groups, by the
+ *   membership rule (`memberSql`, served by the primary key and `nodes_translation_locale`); one
+ *   read per resolution level.
+ * - `referrerCandidates`: the rows naming a group, and the entries that may show them: each row's
+ *   holder, and the same-site members inheriting from it by the `shared` rule (1: every one; 2:
+ *   those without their own value of `root_key`). The renderer then resolves each candidate, so
+ *   `referencedBy` equals what `resolveFields` shows. Snapshots never call these: purges and the
+ *   snapshot source read snapshot bodies only.
+ *
+ * Worker-safe; no correlated outer references (workerd's SQLite rejects some that better-sqlite3
+ * accepts).
+ */
+import type { ContentEntry } from "@cloudhal/core-contracts";
+import type { SqlDriver } from "@cloudhal/storage";
+import { parseRows } from "../node-sql.ts";
+import { memberGroup } from "./members.ts";
+import { memberSql } from "./sql.ts";
+
+/** The entries of `siteId` that are members of `groupIds`, by group (every group has a list). */
+export async function getGroupMembers(
+  sql: SqlDriver,
+  siteId: string,
+  groupIds: readonly string[],
+): Promise<Map<string, ContentEntry[]>> {
+  const ids = [...new Set(groupIds)];
+  const out = new Map<string, ContentEntry[]>(ids.map((g) => [g, []]));
+  if (ids.length === 0) return out;
+  const rows = await sql.all<{ body: string }>(
+    `SELECT n.body AS body FROM json_each(?) g JOIN nodes n
+      ON n.site_id = ? AND n.kind = 'contentEntry' AND ${memberSql("n", "g.value")}
+      ORDER BY n.created_at, n.id`,
+    [JSON.stringify(ids), siteId],
+  );
+  for (const entry of parseRows<ContentEntry>(rows)) out.get(memberGroup(entry))?.push(entry);
+  return out;
+}
+
+export interface ReferrerCandidates {
+  /** Holders and inheriting members, each once. */
+  readonly candidates: readonly ContentEntry[];
+  /** Every entry read, candidates and the originals of holders that are translations, by id. */
+  readonly byId: ReadonlyMap<string, ContentEntry>;
+}
+
+const inSite = (e: ContentEntry) => e.translation?.source?.siteId === undefined;
+
+/** The entries of `siteId` that may show a value naming `groupId` (see the module comment). */
+export async function referrerCandidates(
+  sql: SqlDriver,
+  siteId: string,
+  groupId: string,
+): Promise<ReferrerCandidates> {
+  const rows = await sql.all<{ holder: string; root_key: string; shared: number }>(
+    "SELECT source_id AS holder, root_key, shared FROM entry_refs WHERE site_id = ? AND target_id = ?",
+    [siteId, groupId],
+  );
+  const holders = [...new Set(rows.map((r) => r.holder))];
+  if (holders.length === 0) return { candidates: [], byId: new Map() };
+  const list = JSON.stringify(holders);
+  const read = await sql.all<{ body: string }>(
+    `SELECT body FROM nodes WHERE site_id = ? AND kind = 'contentEntry'
+      AND (id IN (SELECT value FROM json_each(?))
+        OR json_extract(body, '$.translation.group') IN (SELECT value FROM json_each(?)))`,
+    [siteId, list, list],
+  );
+  const byId = new Map(parseRows<ContentEntry>(read).map((e) => [e.id, e]));
+  const held = new Set(holders);
+  const candidates = [...byId.values()].filter((e) => {
+    if (held.has(e.id)) return true;
+    const from = e.translation?.group;
+    if (from === undefined || !held.has(from) || !inSite(e)) return false;
+    return rows.some(
+      (r) => r.holder === from && (r.shared === 1 || !Object.hasOwn(e.fields ?? {}, r.root_key)),
+    );
+  });
+  // A holder that is a same-site translation resolves through its own original.
+  const missing = [
+    ...new Set(
+      candidates
+        .filter(inSite)
+        .map((e) => e.translation?.group)
+        .filter((g): g is string => g !== undefined && !byId.has(g)),
+    ),
+  ];
+  if (missing.length > 0) {
+    const originals = await sql.all<{ body: string }>(
+      "SELECT body FROM nodes WHERE site_id = ? AND kind = 'contentEntry' AND id IN (SELECT value FROM json_each(?))",
+      [siteId, JSON.stringify(missing)],
+    );
+    for (const e of parseRows<ContentEntry>(originals)) byId.set(e.id, e);
+  }
+  return { candidates, byId };
+}
diff --git a/packages/core-ts/src/testing-reference-reads.ts b/packages/core-ts/src/testing-reference-reads.ts
new file mode 100644
index 00000000..1ac3f7c7
--- /dev/null
+++ b/packages/core-ts/src/testing-reference-reads.ts
@@ -0,0 +1,155 @@
+/**
+ * RFC-0045 step 3 on every backend (`describeSiteGraphStore`): the live renderer's reads,
+ * `getGroupMembers` (the membership rule, by site) and `referrerCandidates` (`entry_refs` by
+ * `(site_id, target_id)`, holders plus same-site members inheriting by the `shared` rule, and the
+ * originals of holders that are translations). Run on SQLite, Miniflare D1 and Durable Object
+ * SQLite, since workerd's SQLite rejects some queries better-sqlite3 accepts. The types stay
+ * refused in production; this suite enables them on a store of its own.
+ */
+import type { Actor, ContentEntry, Site } from "@cloudhal/core-contracts";
+import { describe, expect, it } from "vitest";
+import { GATES_ENFORCED } from "./availability.ts";
+import { nodeHash } from "./hash.ts";
+import { getGroupMembers, referrerCandidates } from "./references/reads.ts";
+import { SiteGraphStore } from "./store.ts";
+import type { SuiteContext } from "./testing-taxonomy.ts";
+
+const person: Actor = { kind: "human", id: "user_01HZX8K3Q9CD", name: "Halil" };
+const L = (label: string) => ({ en: { label } });
+
+const COLLECTIONS: NonNullable<Site["collections"]> = {
+  events: {
+    fields: [
+      {
+        key: "venue",
+        type: "reference",
+        labels: L("Venue"),
+        localized: false,
+        collections: ["places"],
+      },
+      {
+        key: "sponsor",
+        type: "reference",
+        labels: L("Sponsor"),
+        localized: true,
+        collections: ["people"],
+      },
+    ],
+  },
+  places: {},
+  people: {},
+};
+
+export function referenceReadsSuite(ctx: SuiteContext): void {
+  describe("RFC-0045 step 3: the live renderer's reads", () => {
+    let n = 0;
+    const store = () =>
+      new SiteGraphStore({
+        sql: ctx.sql(),
+        blobs: ctx.blobs(),
+        gates: GATES_ENFORCED,
+        fieldTypes: { supported: () => true },
+      });
+    const site = async (projectId: string, slug: string, defaultLocale = "en") =>
+      store().createSite({
+        projectId,
+        name: slug,
+        slug,
+        defaultLocale,
+        locales: [defaultLocale, "tr"],
+        domains: [],
+        pageIds: [],
+        theme: { name: "blog" },
+        collections: COLLECTIONS,
+      });
+    const entry = (s: Site, collection: string, over: Partial<ContentEntry> = {}) =>
+      store().createContentEntry({
+        siteId: s.id,
+        collection,
+        slug: `${collection}-${Math.random().toString(36).slice(2, 8)}`,
+        locale: s.defaultLocale,
+        status: "published",
+        title: `A ${collection}`,
+        body: { format: "markdown", value: "Body" },
+        fields: {},
+        tags: [],
+        author: person,
+        ...over,
+      } as never) as Promise<ContentEntry>;
+    const translate = async (e: ContentEntry, into: Site, over: Partial<ContentEntry> = {}) => {
+      const source = { id: e.id, locale: e.locale, rev: e.rev, hash: await nodeHash(e) };
+      const cross = into.id !== e.siteId;
+      return entry(into, e.collection, {
+        locale: cross ? into.defaultLocale : "tr",
+        translation: {
+          group: e.translation?.group ?? e.id,
+          method: "human",
+          source: cross ? { ...source, siteId: e.siteId } : source,
+        },
+        ...over,
+      });
+    };
+
+    async function world() {
+      n++;
+      const project = await store().createProject({
+        name: "Reads",
+        slug: `reads-${n}`,
+        ownerId: person.id,
+        siteIds: [],
+      });
+      const a = await site(project.id, `reads-a-${n}`);
+      const de = await site(project.id, `reads-de-${n}`, "de");
+      const hall = await entry(a, "places");
+      const hallTr = await translate(hall, a);
+      const hallDe = await translate(hall, de);
+      const ada = await entry(a, "people");
+      const alan = await entry(a, "people");
+      const launch = await entry(a, "events", { fields: { venue: hall.id, sponsor: ada.id } });
+      const launchTr = await translate(launch, a, { fields: { sponsor: alan.id } });
+      const draft = await entry(a, "events", { status: "draft", fields: { venue: hallTr.id } });
+      const launchDe = await translate(launch, de, { fields: { venue: hall.id } });
+      return { a, de, hall, hallTr, hallDe, ada, alan, launch, launchTr, draft, launchDe };
+    }
+    const ids = (list: readonly ContentEntry[]) => list.map((e) => e.id).sort();
+
+    it("reads a group's members of this site only, by the membership rule", async () => {
+      const w = await world();
+      const got = await getGroupMembers(ctx.sql(), w.a.id, [
+        w.hall.id,
+        w.ada.id,
+        "entry_NONE000000",
+      ]);
+      expect(ids(got.get(w.hall.id) ?? [])).toEqual(ids([w.hall, w.hallTr]));
+      expect(ids(got.get(w.ada.id) ?? [])).toEqual([w.ada.id]);
+      expect(got.get("entry_NONE000000")).toEqual([]);
+      // a member's own id is not a group: hallTr's group is hall's
+      expect((await getGroupMembers(ctx.sql(), w.a.id, [w.hallTr.id])).get(w.hallTr.id)).toEqual(
+        [],
+      );
+      // the edition site sees its own member of the same group, and nothing of site A
+      const de = await getGroupMembers(ctx.sql(), w.de.id, [w.hall.id]);
+      expect(ids(de.get(w.hall.id) ?? [])).toEqual([w.hallDe.id]);
+      expect((await getGroupMembers(ctx.sql(), w.a.id, [])).size).toBe(0);
+    });
+
+    it("finds referrer candidates by the shared rule, with the originals they resolve through", async () => {
+      const w = await world();
+      // venue is shared (1): the translation inherits it; the draft holds its own (canonical) row
+      const venue = await referrerCandidates(ctx.sql(), w.a.id, w.hall.id);
+      expect(ids(venue.candidates)).toEqual(ids([w.launch, w.launchTr, w.draft]));
+      // sponsor is localized (2): the translation holds its own value, so it does not inherit ada
+      const ada = await referrerCandidates(ctx.sql(), w.a.id, w.ada.id);
+      expect(ids(ada.candidates)).toEqual([w.launch.id]);
+      // a holder that is a translation comes with its original
+      const alan = await referrerCandidates(ctx.sql(), w.a.id, w.alan.id);
+      expect(ids(alan.candidates)).toEqual([w.launchTr.id]);
+      expect(alan.byId.get(w.launch.id)?.id).toBe(w.launch.id);
+      // the edition's member holds its own row there and pins nothing in site A
+      const de = await referrerCandidates(ctx.sql(), w.de.id, w.hall.id);
+      expect(ids(de.candidates)).toEqual([w.launchDe.id]);
+      expect([...de.byId.values()].every((e) => e.siteId === w.de.id)).toBe(true);
+      expect((await referrerCandidates(ctx.sql(), w.a.id, w.launch.id)).candidates).toEqual([]);
+    });
+  });
+}
diff --git a/packages/core-ts/src/testing.ts b/packages/core-ts/src/testing.ts
index 2c3d9d00..42c88016 100644
--- a/packages/core-ts/src/testing.ts
+++ b/packages/core-ts/src/testing.ts
@@ -18,6 +18,7 @@ import { listingsSuite } from "./testing-listings.ts";
 import { menuSuite } from "./testing-menu.ts";
 import { permalinksSuite } from "./testing-permalinks.ts";
 import { referenceGateSuite } from "./testing-reference-gate.ts";
+import { referenceReadsSuite } from "./testing-reference-reads.ts";
 import { referencesSuite } from "./testing-references.ts";
 import { racingDriver, type SuiteContext, taxonomySuite } from "./testing-taxonomy.ts";
 
@@ -279,6 +280,7 @@ export function describeSiteGraphStore(label: string, factory: StoreFactory): vo
     fieldOperationsSuite(suite);
     referenceGateSuite(suite);
     referencesSuite(suite);
+    referenceReadsSuite(suite);
     listingsSuite(suite);
     entryQuerySuite(suite);
   });

From bc0fa663e1675c2f7a40628bc651e89559ed50c6 Mon Sep 17 00:00:00 2001
From: Madraka <8898640+Madraka@users.noreply.github.com>
Date: Thu, 12 Nov 2026 14:16:30 +0300
Subject: [PATCH 2/2] fix(astro-renderer,core-ts): RFC-0045 step 3a review (PR
 #211)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- reference cards carry their graph `path`; EntryFields links with it, so the locale
  middleware localizes it once (no /tr/tr/…, no /en/en/… under prefix-all); `url` stays
  the canonical
- referencedBy: a total order (date, then id) in both sources, ORDER BY id in the
  candidate reads; a translation resolves with its original only while the view shows it
  (what its page reads through the gated entryById), without it otherwise
- referrer records resolve through the conversion maps (snapshot index and live source)
- live source: conversion maps memoized per collection (2 s) and loaded only from the
  collections the conversion reads; groupMembers and referencedBy pass the rows they read
  as #split's originals pool (no whole-site scan with expiry rules)
- tests: links through localizeLinks under both routings with a fallback card, tied
  dates and limit, the gated-original case, the live shared = 2 path (both suites)
- README: themes calling entryFields pass one placeholderBudget() per request; RFC:
  "Amended in 3a", and the step-4 live referencedBy note in watch list item 3

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Madraka <8898640+Madraka@users.noreply.github.com>
---
 .changeset/rfc45-step3a-renderer.md           |   4 +-
 ...ctions-stage-4-references-and-repeaters.md |   6 +
 packages/astro-renderer/README.md             |   4 +-
 .../src/components/EntryFields.astro          |   9 +-
 packages/astro-renderer/src/live-source.ts    |  55 +++++++--
 .../src/reference-conversions.ts              |  15 +++
 packages/astro-renderer/src/references.ts     |  79 +++++++++----
 packages/astro-renderer/src/source.ts         |   9 +-
 .../astro-renderer/test/references-fixture.ts |  73 +++++++++++-
 .../astro-renderer/test/references.test.ts    | 106 +++++++++++++++++-
 .../core-ts/src/references/conversion-maps.ts |   7 +-
 packages/core-ts/src/references/reads.ts      |   5 +-
 .../core-ts/src/testing-reference-reads.ts    |  13 ++-
 13 files changed, 329 insertions(+), 56 deletions(-)

diff --git a/.changeset/rfc45-step3a-renderer.md b/.changeset/rfc45-step3a-renderer.md
index 0fb2c28f..8813d4cd 100644
--- a/.changeset/rfc45-step3a-renderer.md
+++ b/.changeset/rfc45-step3a-renderer.md
@@ -6,10 +6,10 @@
 RFC-0045 rollout step 3a: the renderer resolves reference and repeater fields. Both types stay refused on every write path until rollout step 7, so nothing changes for existing sites.
 
 - **`@cloudhal/astro-renderer`.**
-  - `entryFields` resolves a reference to cards (`RenderedField.references`: `ReferencedEntry` with group id, id, collection, locale, slug, title, summary, URL, cover image and `fromFallbackLocale`), in stored order, by `pickMember`'s locale rule among the members the source's view shows, gates included. `depth: 2` adds each card's own fields, with their references as cards without fields. Resolution is breadth-first over a visited set of groups, one `groupMembers` call per level, and spends the request's 200 targets (`PlaceholderBudget.references`; `placeholderBudget()` includes it); past the budget the rest resolve to nothing, with one `console.warn` per request.
+  - `entryFields` resolves a reference to cards (`RenderedField.references`: `ReferencedEntry` with group id, id, collection, locale, slug, title, summary, the graph `path` to link with (the locale middleware localizes it), the canonical `url`, cover image and `fromFallbackLocale`), in stored order, by `pickMember`'s locale rule among the members the source's view shows, gates included. `depth: 2` adds each card's own fields, with their references as cards without fields. Resolution is breadth-first over a visited set of groups, one `groupMembers` call per level, and spends the request's 200 targets (`PlaceholderBudget.references`; `placeholderBudget()` includes it); past the budget the rest resolve to nothing, with one `console.warn` per request.
   - A repeater renders its items' sub-fields (`RenderedField.items`), like fields; empty items are left out.
   - An unresolved target leaves nothing behind: no id, no title, no empty item. `value` keeps only the resolved group ids.
-  - `GraphSource.groupMembers?` and `GraphSource.referencedBy?` on `SnapshotSource` (in memory: gate-independent indexes built once per snapshot, filtered per view) and `LiveSource` (one `entry_refs` read expanded by the `shared` rule, each candidate resolved like the snapshot's index). `referencedBy` lists entries whose resolved values name the group, newest first, at most 100.
+  - `GraphSource.groupMembers?` and `GraphSource.referencedBy?` on `SnapshotSource` (in memory: gate-independent indexes built once per snapshot, filtered per view) and `LiveSource` (one `entry_refs` read expanded by the `shared` rule, each candidate resolved like the snapshot's index). `referencedBy` lists entries whose resolved values name the group, exactly as each page resolves them (a translation reads its original only while the view shows it), newest first with ties by id, at most 100.
   - `GraphSource.conversionEntries?` builds the entry maps of a text ↔ reference conversion while one runs (rollout step 4 adds the conversions).
   - `EntryFields.astro` draws references as links (`lang` on a fallback-locale card, a `ul.ch-references` for several) and repeaters as an `ol.ch-items` of nested `dl`s. Old theme copies get both with no change of their own.
   - The site Worker's `GET /__cloudhal/features` answers `{ "gates": 2, "fields": 2 }`.
diff --git a/docs/rfcs/0045-collections-stage-4-references-and-repeaters.md b/docs/rfcs/0045-collections-stage-4-references-and-repeaters.md
index b941ed5b..b2bb0163 100644
--- a/docs/rfcs/0045-collections-stage-4-references-and-repeaters.md
+++ b/docs/rfcs/0045-collections-stage-4-references-and-repeaters.md
@@ -1048,6 +1048,7 @@ The riskiest SQL and interplay. Every phase PR's review checks the items its pha
    - `RELEASE_EXECUTOR_COST` is updated for the re-plan.
 3. **Marker interplay** (phases 2 to 4).
    - `rename_field`'s `root_key` and `fromKey` lag in the fragment (over-blocks only) and in the rows `INSERT` (`fromKey` match).
+   - Step 4: the live `referencedBy` reads candidates from `entry_refs`, and a text value has no row until phase B rewrites its entry. So during a text → reference conversion it lists a converting referrer only after phase B, or step 4 makes it read candidates by collection while such a marker runs. The snapshot's index already resolves through the conversion maps (3a).
    - Text → reference conversion: readers convert on the fly, `field_operation_running` refuses target deletes, moves and group changes, and any marker on `from` or `to` purges everything.
    - `set_field_localized`'s phase-A `UPDATE` of `shared`.
    - `entryRefsRebuild` reading through `fromKey`.
@@ -1204,3 +1205,8 @@ Rollout step 2 shipped in two PRs: 2a, store and integrity, and 2b, the consumer
   - a reference sub-field added over a key that items already hold is `field_key_in_use`;
   - the `shared` subquery matches only reference and repeater definitions, as an aggregate, not a correlated `ORDER BY`, which workerd's SQLite does not resolve;
   - the list-values fingerprint format is 2, so listed collections rebuild once after the `readsOriginal` tightening.
+
+### Amended in 3a (PR #211, 2026-11-12)
+
+- **`ReferencedEntry.path`** (§4): the member's graph path (`entryPath`, no locale prefix). Themes link with it, so the locale middleware localizes it once, like every other entry link. `url` stays the canonical URL, already localized, and absolute only on a locale's own domain.
+- **`referencedBy` follows each page** (§4): a translation resolves with its same-site original while the view shows that original, and without it otherwise, as its page reads it through the gated `entryById`. Ties on date order by id, so both sources agree on order and on what `limit` keeps.
diff --git a/packages/astro-renderer/README.md b/packages/astro-renderer/README.md
index d8b572d8..bad3d1a0 100644
--- a/packages/astro-renderer/README.md
+++ b/packages/astro-renderer/README.md
@@ -74,12 +74,12 @@ Additive, and dormant until rollout step 7 lets sites define the two types. `ent
 
 | Export | Signature |
 |---|---|
-| `RenderedField.references?` | `ReferencedEntry[]`: `{ groupId, id, collection, locale, slug, title, summary?, url, image?, fromFallbackLocale, fields? }` in stored order; the member in the page's locale, else the default locale's under `localization.fallback: default-with-notice` (flagged: set `lang`) |
+| `RenderedField.references?` | `ReferencedEntry[]`: `{ groupId, id, collection, locale, slug, title, summary?, path, url, image?, fromFallbackLocale, fields? }` in stored order. Link with `path` (the graph path, which the locale middleware localizes like every entry link); `url` is the canonical URL, already localized; the member in the page's locale, else the default locale's under `localization.fallback: default-with-notice` (flagged: set `lang`) |
 | `RenderedField.items?` | `RenderedFields[]`: each repeater item's sub-fields, rendered like fields; empty items left out |
 | `EntryFieldsOptions.depth?` | `1` (default): cards; `2`: each card's own `fields`, with *their* references as cards without fields |
 | `GraphSource.groupMembers?` | `(groupIds) => Promise<Map<string, ContentEntry[]>>`: the members this view shows, by group (snapshot: in memory; live: one store read per call) |
 | `GraphSource.referencedBy?` | `(groupId, { collection?, field?, locale?, limit? }) => Promise<ContentEntry[]>`: entries this view lists whose resolved values name the group (a translation inheriting its original's value included), newest first, at most 100 |
-| `PlaceholderBudget.references?` | the request's resolved-target allowance (200, in `placeholderBudget()`); past it targets resolve to nothing, with one `console.warn` |
+| `PlaceholderBudget.references?` | the request's resolved-target allowance (200, in `placeholderBudget()`); past it targets resolve to nothing, with one `console.warn`. The starter passes one `placeholderBudget()` per request in `media.budget`; a theme that calls `entryFields` itself must do the same, once per request (without one, every call gets its own 200) |
 
 Resolution is breadth-first over a visited set of groups, one `groupMembers` call per level, so cycles cost nothing. A "used by" list drawn from `referencedBy` is purged with the target's page when a referrer appears, goes or changes (the purge planner reads snapshot bodies, rollout step 3b); drawing *those* entries' fields is outside that guarantee. The site Worker's `GET /__cloudhal/features` answers `{ "gates": 2, "fields": 2 }`.
 
diff --git a/packages/astro-renderer/src/components/EntryFields.astro b/packages/astro-renderer/src/components/EntryFields.astro
index 0535e932..bb71679a 100644
--- a/packages/astro-renderer/src/components/EntryFields.astro
+++ b/packages/astro-renderer/src/components/EntryFields.astro
@@ -6,8 +6,9 @@
  *
  * Values are escaped text, except rich text (the body's markdown pipeline: raw HTML escaped, links
  * through `safeHref`) and images (`imageAttributes`, the asset's alt in the page's language).
- * RFC-0045: a reference is a link to each target the page's view shows (`lang` on a card from the
- * fallback locale; several in a list), a repeater a nested `dl` per item with something to show.
+ * RFC-0045: a reference is a link to each target the page's view shows, by its graph path (the
+ * locale middleware localizes it, like every entry link; `lang` on a card from the fallback
+ * locale; several in a list), a repeater a nested `dl` per item with something to show.
  * Unresolved targets leave nothing: no id, no attribute, no empty link. No styles of its own:
  * themes style `.ch-fields`, `.ch-field[data-type]`, `[data-field="<key>"]`, `.ch-references` and
  * `.ch-items`.
@@ -34,9 +35,9 @@ const langOf = (c: { fromFallbackLocale: boolean; locale: string }) =>
         <dt>{f.label}</dt>
         {f.references !== undefined ? (
           f.references.length === 1 && !Array.isArray(f.value) ? (
-            <dd><a href={f.references[0]?.url} lang={f.references[0] && langOf(f.references[0])}>{f.references[0]?.title}</a></dd>
+            <dd><a href={f.references[0]?.path} lang={f.references[0] && langOf(f.references[0])}>{f.references[0]?.title}</a></dd>
           ) : (
-            <dd><ul class="ch-references">{f.references.map((c) => <li><a href={c.url} lang={langOf(c)}>{c.title}</a></li>)}</ul></dd>
+            <dd><ul class="ch-references">{f.references.map((c) => <li><a href={c.path} lang={langOf(c)}>{c.title}</a></li>)}</ul></dd>
           )
         ) : f.items !== undefined ? (
           <dd><ol class="ch-items">{f.items.map((item) => <li><Astro.self fields={item} /></li>)}</ol></dd>
diff --git a/packages/astro-renderer/src/live-source.ts b/packages/astro-renderer/src/live-source.ts
index 9025dbd6..055a5c46 100644
--- a/packages/astro-renderer/src/live-source.ts
+++ b/packages/astro-renderer/src/live-source.ts
@@ -27,11 +27,15 @@ import {
 import { type EntrySplit, gateIndex, splitEntries } from "./entry-views.ts";
 import { type EntryFieldsOptions, entryFields, type RenderedFields } from "./fields.ts";
 import { type Navigation, type NavigationOptions, navigationFor } from "./navigation.ts";
-import { conversionMaps } from "./reference-conversions.ts";
+import { conversionMaps, conversionMapsOf, conversionNeeds } from "./reference-conversions.ts";
+
 import { membersIn, type ReferencedByQuery, referrerRecords, referrersIn } from "./references.ts";
 import type { GraphSource, SourceSearchOptions } from "./source.ts";
 import { byNewest, byPosition, compile, shown, termFilter, visible } from "./source-helpers.ts";
 
+/** How long a live source reuses the conversion maps it built (one page render, not a session). */
+const CONVERSION_MAPS_TTL_MS = 2_000;
+
 /**
  * Reads the current nodes on every call. Drafts are included so authors can preview them in dev,
  * and so are gated nodes (a preview shows embargoed and expired content, RFC-0008 §7.3). Without
@@ -43,6 +47,11 @@ export class LiveSource implements GraphSource {
   readonly #siteId: string;
   readonly #includeDrafts: boolean;
   readonly #now: () => number;
+  /** RFC-0045 §7: conversion maps by collection, with when they were built. */
+  readonly #conversions = new Map<
+    string,
+    { at: number; maps: Promise<ConversionEntries | undefined> }
+  >();
 
   constructor(
     store: SiteGraphStore,
@@ -216,7 +225,9 @@ export class LiveSource implements GraphSource {
   /** RFC-0045 §4: one store read (`getGroupMembers`), then this view's gates. */
   async groupMembers(groupIds: readonly string[]): Promise<Map<string, ContentEntry[]>> {
     const read = await getGroupMembers(this.#store.sql, this.#siteId, groupIds);
-    const split = await this.#split([...read.values()].flat());
+    // A translation's original is its group's root, so the rows read are the originals' pool too.
+    const members = [...read.values()].flat();
+    const split = await this.#split(members, members);
     return membersIn(read, groupIds, { listed: split.listed, reachable: split.reachable });
   }
 
@@ -237,16 +248,44 @@ export class LiveSource implements GraphSource {
       return g && g !== e.id ? ids.get(g) : undefined;
     };
     const shownHere = read.candidates.filter((e) => ids.has(e.id));
-    const records = referrerRecords(site, shownHere, originalOf, groupId).get(groupId) ?? [];
-    const split = await this.#split(pool);
+    const maps = await conversionMapsOf(
+      site,
+      shownHere.map((e) => e.collection),
+      (c) => this.conversionEntries(c),
+    );
+    const records =
+      referrerRecords(site, shownHere, { originalOf, maps, only: groupId }).get(groupId) ?? [];
+    // The candidates' originals were read with them: the pool for derived gates as well.
+    const split = await this.#split(pool, pool);
     return referrersIn(records, q, { listed: split.listed, reachable: split.reachable });
   }
 
-  /** RFC-0045 §7: built from the working copy, only while the collection runs a conversion. */
+  /**
+   * RFC-0045 §7: built from the working copy, only while the collection runs a conversion, from
+   * the collections it reads. Kept for `CONVERSION_MAPS_TTL_MS` per collection: one page's calls
+   * (every `entryFields`, depth-2 members, `referencedBy`) share one build, while `cloudhal dev`,
+   * whose one source serves every request, still sees edits.
+   */
   async conversionEntries(collection: string): Promise<ConversionEntries | undefined> {
-    return conversionMaps(await this.site(), collection, async () =>
-      visible(await this.#store.listContentEntries(this.#siteId), true),
-    );
+    const site = await this.site();
+    const needs = conversionNeeds(site, collection);
+    if (!needs) return undefined;
+    const at = Date.now();
+    const hit = this.#conversions.get(collection);
+    if (hit && at - hit.at < CONVERSION_MAPS_TTL_MS) return hit.maps;
+    const maps = conversionMaps(site, collection, async () => {
+      const read = needs.has("*")
+        ? await this.#store.listContentEntries(this.#siteId)
+        : (
+            await Promise.all(
+              [...needs].map((c) => this.#store.listContentEntries(this.#siteId, c)),
+            )
+          ).flat();
+      return visible(read, true);
+    });
+    this.#conversions.set(collection, { at, maps });
+    maps.catch(() => this.#conversions.delete(collection));
+    return maps;
   }
 
   taxonomies(): Promise<Taxonomy[]> {
diff --git a/packages/astro-renderer/src/reference-conversions.ts b/packages/astro-renderer/src/reference-conversions.ts
index f6fa2734..687c75b7 100644
--- a/packages/astro-renderer/src/reference-conversions.ts
+++ b/packages/astro-renderer/src/reference-conversions.ts
@@ -69,3 +69,18 @@ export function cachedConversionMaps(
   }
   return hit;
 }
+
+/** The maps of every collection in `collections` that runs a conversion, by collection. */
+export async function conversionMapsOf(
+  site: Site,
+  collections: Iterable<string>,
+  get: (collection: string) => Promise<ConversionEntries | undefined>,
+): Promise<Map<string, ConversionEntries>> {
+  const out = new Map<string, ConversionEntries>();
+  for (const c of new Set(collections)) {
+    if (!conversionNeeds(site, c)) continue;
+    const maps = await get(c);
+    if (maps) out.set(c, maps);
+  }
+  return out;
+}
diff --git a/packages/astro-renderer/src/references.ts b/packages/astro-renderer/src/references.ts
index e4805096..2f62f504 100644
--- a/packages/astro-renderer/src/references.ts
+++ b/packages/astro-renderer/src/references.ts
@@ -13,11 +13,13 @@
  *   snapshot's published entries, gate-independent and built once per snapshot and isolate; every
  *   lookup then filters through the asking view.
  * - **`referencedBy`** equals the resolved values: a referrer is an entry whose `resolveFields`
- *   (with its published same-site original) names the group. The live source finds candidates in
+ *   names the group, with its same-site original while the view shows it and without it otherwise
+ *   (exactly what its page reads), the running conversions' maps included. The live source finds candidates in
  *   `entry_refs` and resolves them the same way (`referrerRecords`), so both answer alike.
  */
 import type { ContentEntry, Site } from "@cloudhal/core-contracts";
 import {
+  type ConversionEntries,
   isReferenceFieldType,
   membersByGroup,
   originalsOf,
@@ -28,6 +30,7 @@ import {
   resolveFields,
 } from "@cloudhal/core-ts/fields";
 import { itemUrl } from "@cloudhal/core-ts/locale-paths";
+import { entryPath } from "@cloudhal/core-ts/permalinks";
 import type { FieldImage, FieldsSource, RenderedFields } from "./fields.ts";
 import { type PlaceholderBudget, REFERENCE_BUDGET } from "./media.ts";
 import { conversionsFor } from "./reference-conversions.ts";
@@ -43,7 +46,12 @@ export interface ReferencedEntry {
   slug: string;
   title: string;
   summary?: string;
-  /** The member's public URL (its locale's path, or its locale's own domain). */
+  /**
+   * The member's graph path (`entryPath`, no locale prefix): link with it, as every other entry
+   * link does, so the locale middleware (`localizeLinks`) maps it to the page's locale once.
+   */
+  path: string;
+  /** The member's canonical URL: its locale's path, absolute only on a locale's own domain. */
   url: string;
   /** The member's cover image, when the view shows its asset. */
   image?: FieldImage;
@@ -144,6 +152,7 @@ async function cardsOf(level: Level, uses: readonly ReferenceUse[]): Promise<Pic
       slug: m.slug,
       title: m.title,
       ...(m.summary ? { summary: m.summary } : {}),
+      path: entryPath(site, m),
       url: itemUrl(site, undefined, m),
       ...(image ? { image } : {}),
       fromFallbackLocale: picked.fromFallbackLocale,
@@ -198,37 +207,60 @@ export async function referenceCards(
   return out;
 }
 
-/** One referrer of a group: the entry and the field whose resolved value names it. */
+/**
+ * One referrer of a group: the entry and the field whose resolved value names it. A same-site
+ * translation resolves through its original only while the view shows that original (its page
+ * reads it through the gated `entryById`), so its records carry which way they hold.
+ */
 export interface Referrer {
   readonly entry: ContentEntry;
   /** The top-level field key. */
   readonly field: string;
-  /** Set when the value came from the entry's original (which the view must show too). */
-  readonly viaOriginal?: string;
+  /** Holds only while the view shows this original (resolved with it). */
+  readonly withOriginal?: string;
+  /** Holds only while the view does not show this original (resolved without it). */
+  readonly withoutOriginal?: string;
 }
 
+/** The conversion maps by collection, for collections that run a conversion (§7). */
+export type ConversionMaps = ReadonlyMap<string, ConversionEntries>;
+
 /**
- * Referrers by group from `entries`' resolved values (`resolveFields` with `originalOf`); with
- * `only`, just that group's. The snapshot index and the live source share it.
+ * Referrers by group from `entries`' resolved values, with `only` just that group's; the snapshot
+ * index and the live source share it. An entry with an original in `originalOf`'s pool is
+ * resolved both with it and without it, so `referrersIn` can follow the view's choice.
  */
 export function referrerRecords(
   site: Site,
   entries: readonly ContentEntry[],
-  originalOf: (e: ContentEntry) => ContentEntry | undefined,
-  only?: string,
+  input: {
+    originalOf: (e: ContentEntry) => ContentEntry | undefined;
+    maps?: ConversionMaps | undefined;
+    only?: string | undefined;
+  },
 ): Map<string, Referrer[]> {
   const out = new Map<string, Referrer[]>();
-  for (const entry of entries)
-    for (const [key, f] of Object.entries(resolveFields(site, entry, originalOf(entry)))) {
+  const add = (entry: ContentEntry, original: ContentEntry | undefined, cond: object) => {
+    const maps = input.maps?.get(entry.collection);
+    const resolved = resolveFields(site, entry, original, maps ? { entries: maps } : undefined);
+    for (const [key, f] of Object.entries(resolved)) {
       if (!isReferenceFieldType(f.def.type)) continue;
-      const via = f.fromOriginal ? entry.translation?.group : undefined;
       for (const g of new Set(referenceUses(f.def, f.value, "").map((u) => u.groupId))) {
-        if (only !== undefined && g !== only) continue;
+        if (input.only !== undefined && g !== input.only) continue;
         const list = out.get(g) ?? [];
-        list.push({ entry, field: key, ...(via ? { viaOriginal: via } : {}) });
+        list.push({ entry, field: key, ...cond });
         out.set(g, list);
       }
     }
+  };
+  for (const entry of entries) {
+    const original = input.originalOf(entry);
+    if (!original) add(entry, undefined, {});
+    else {
+      add(entry, original, { withOriginal: original.id });
+      add(entry, undefined, { withoutOriginal: original.id });
+    }
+  }
   return out;
 }
 
@@ -263,12 +295,16 @@ export function referrersIn(
     if (q.collection !== undefined && e.collection !== q.collection) continue;
     if (q.field !== undefined && r.field !== q.field) continue;
     if (q.locale !== undefined && e.locale !== q.locale) continue;
-    if (!listed.has(e.id) || (r.viaOriginal !== undefined && !reachable.has(r.viaOriginal)))
-      continue;
+    if (!listed.has(e.id)) continue;
+    if (r.withOriginal !== undefined && !reachable.has(r.withOriginal)) continue;
+    if (r.withoutOriginal !== undefined && reachable.has(r.withoutOriginal)) continue;
     out.set(e.id, e);
   }
   const limit = Math.max(0, Math.min(q.limit ?? REFERENCED_BY_LIMIT, REFERENCED_BY_LIMIT));
-  return [...out.values()].sort(byNewest).slice(0, limit);
+  // A total order, so both sources agree on order and on what `limit` keeps.
+  return [...out.values()]
+    .sort((a, b) => byNewest(a, b) || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
+    .slice(0, limit);
 }
 
 /** The members of `ids` among a view's reachable entries (every id gets a list). */
@@ -285,12 +321,14 @@ export function membersIn(
 export class ReferenceIndex {
   readonly #site: Site;
   readonly #published: readonly ContentEntry[];
+  readonly #maps: ConversionMaps | undefined;
   #members: Map<string, ContentEntry[]> | undefined;
   #referrers: Map<string, Referrer[]> | undefined;
 
-  constructor(site: Site, published: readonly ContentEntry[]) {
+  constructor(site: Site, published: readonly ContentEntry[], maps?: ConversionMaps) {
     this.#site = site;
     this.#published = published;
+    this.#maps = maps;
   }
 
   members(): ReadonlyMap<string, readonly ContentEntry[]> {
@@ -299,7 +337,10 @@ export class ReferenceIndex {
   }
 
   referrers(group: string): readonly Referrer[] {
-    this.#referrers ??= referrerRecords(this.#site, this.#published, originalsOf(this.#published));
+    this.#referrers ??= referrerRecords(this.#site, this.#published, {
+      originalOf: originalsOf(this.#published),
+      maps: this.#maps,
+    });
     return this.#referrers.get(group) ?? [];
   }
 }
diff --git a/packages/astro-renderer/src/source.ts b/packages/astro-renderer/src/source.ts
index 86344a22..0ded19fa 100644
--- a/packages/astro-renderer/src/source.ts
+++ b/packages/astro-renderer/src/source.ts
@@ -30,7 +30,7 @@ import {
 import { gateIndex, splitEntries } from "./entry-views.ts";
 import { type EntryFieldsOptions, entryFields, type RenderedFields } from "./fields.ts";
 import { type Navigation, type NavigationOptions, navigationFor } from "./navigation.ts";
-import { cachedConversionMaps, siteConverts } from "./reference-conversions.ts";
+import { cachedConversionMaps, conversionMapsOf, siteConverts } from "./reference-conversions.ts";
 import { membersIn, type ReferencedByQuery, ReferenceIndex, referrersIn } from "./references.ts";
 import { byNewest, byPosition, compile, shown, termFilter, visible } from "./source-helpers.ts";
 
@@ -546,7 +546,12 @@ export class SnapshotSource implements GraphSource {
 
   async #references(): Promise<ReferenceIndex> {
     const loaded = await this.#load();
-    this.#shared.references ??= new ReferenceIndex(loaded.site, loaded.published);
+    if (this.#shared.references) return this.#shared.references;
+    const { site } = loaded;
+    const maps = await conversionMapsOf(site, Object.keys(site.collections ?? {}), (c) =>
+      this.conversionEntries(c),
+    );
+    this.#shared.references ??= new ReferenceIndex(site, loaded.published, maps);
     return this.#shared.references;
   }
 
diff --git a/packages/astro-renderer/test/references-fixture.ts b/packages/astro-renderer/test/references-fixture.ts
index 42baaadf..db56d6ef 100644
--- a/packages/astro-renderer/test/references-fixture.ts
+++ b/packages/astro-renderer/test/references-fixture.ts
@@ -12,7 +12,11 @@
  *   `launch` names hall, ada, alan, grace twice (one item holds only her) and meetup; its Turkish
  *   translation `lansman` inherits venue, speakers and related and holds its own sponsor (alan);
  *   `meetup` names `launch` back (a cycle); `gig` names cellar; `night` names vault; `party` is a
- *   draft naming hall;
+ *   draft naming hall; `talk` holds a localized sponsor (ada) that its translation `konusma`
+ *   inherits (`shared = 2`);
+ * - `fests` (venue turned non-localized by `flipToShared`, sponsor localized): `fest` (stage,
+ *   ada) is embargoed until `T + 1h`; its published translation `senlik` holds its own copy of the
+ *   venue (hall), which its page shows only while `fest` is hidden, and inherits ada only after;
  * - an edition site (`de`): `halle` (a member of hall's group), `start` (an edition member of
  *   launch naming hall's group) and `baslangic`, a same-site translation of `start` (an edition
  *   chain: it inherits nothing and holds its own venue).
@@ -24,7 +28,7 @@ import type {
   Site,
   Translation,
 } from "@cloudhal/core-contracts";
-import { GATES_ENFORCED, nodeHash, SiteGraphStore } from "@cloudhal/core-ts";
+import { canonicalJson, GATES_ENFORCED, nodeHash, SiteGraphStore } from "@cloudhal/core-ts";
 import { MemoryBlobStore } from "@cloudhal/storage";
 import { BetterSqlite3Driver } from "@cloudhal/storage/sqlite";
 
@@ -75,10 +79,43 @@ const MENTOR: FieldDefinition = {
 
 export const COLLECTIONS: NonNullable<Site["collections"]> = {
   events: { fields: [VENUE, SPONSOR, SPEAKERS, RELATED] },
+  fests: { fields: [{ ...VENUE, localized: true } as FieldDefinition, SPONSOR] },
   places: {},
   people: { fields: [{ key: "bio", type: "text", labels: L("Bio"), localized: true }, MENTOR] },
 };
 
+/**
+ * A field turned non-localized with the translations' copies still stored: the state between a
+ * `set_field_localized` true → false's phase A (the definition and `entry_refs.shared`) and the
+ * phase B that deletes the copies, written directly as the operation's own batches would (the
+ * store refuses such a copy on a write, and the operation tools need rollout step 4).
+ */
+async function flipToShared(
+  store: SiteGraphStore,
+  siteId: string,
+  collection: string,
+  key: string,
+): Promise<void> {
+  const site = (await store.getSite(siteId)) as Site;
+  const c = site.collections?.[collection];
+  const fields = (c?.fields ?? []).map((d) => (d.key === key ? { ...d, localized: false } : d));
+  const next = {
+    ...site,
+    collections: { ...site.collections, [collection]: { ...c, fields } },
+    rev: site.rev + 1,
+  } as Site;
+  await store.sql.run("UPDATE nodes SET rev = ?, hash = ?, body = ? WHERE id = ?", [
+    next.rev,
+    await nodeHash(next),
+    canonicalJson(next),
+    site.id,
+  ]);
+  await store.sql.run(
+    "UPDATE entry_refs SET shared = 1 WHERE site_id = ? AND source_collection = ? AND root_key = ?",
+    [siteId, collection, key],
+  );
+}
+
 export interface RefsWorld {
   store: SiteGraphStore;
   site: Site;
@@ -87,13 +124,19 @@ export interface RefsWorld {
 }
 
 export async function refsWorld(
-  options: { fallback?: "none" | "default-with-notice" } = {},
+  options: {
+    fallback?: "none" | "default-with-notice";
+    routing?: "prefix-except-default" | "prefix-all";
+    /** Every write at the same instant: equal `publishedAt`s everywhere (order ties). */
+    sameInstant?: boolean;
+  } = {},
 ): Promise<RefsWorld> {
   let tick = 0;
+  const step = options.sameInstant ? 0 : 1000;
   const store = new SiteGraphStore({
     sql: await BetterSqlite3Driver.open(":memory:"),
     blobs: new MemoryBlobStore(),
-    now: () => new Date(T - 24 * HOUR + tick++ * 1000),
+    now: () => new Date(T - 24 * HOUR + tick++ * step),
     gates: GATES_ENFORCED,
     fieldTypes: { supported: () => true },
   });
@@ -114,7 +157,14 @@ export async function refsWorld(
     pageIds: [],
     theme: { name: "blog" },
     collections: COLLECTIONS,
-    ...(options.fallback ? { localization: { fallback: options.fallback } } : {}),
+    ...(options.fallback || options.routing
+      ? {
+          localization: {
+            ...(options.fallback ? { fallback: options.fallback } : {}),
+            ...(options.routing ? { routing: options.routing } : {}),
+          },
+        }
+      : {}),
   });
   const edition = await store.createSite({
     projectId: project.id,
@@ -215,5 +265,16 @@ export async function refsWorld(
   e.launchDeTr = await translateIn(e.launchDe, edition, "baslangic", {
     fields: { venue: e.hall.id },
   });
-  return { store, site, edition, e };
+  // a localized value held by the original: one translation inherits it, one holds its own
+  e.talk = await make(site, "events", "talk", { fields: { sponsor: e.ada.id } });
+  e.talkTr = await translate(e.talk, "konusma");
+  // an original gated out at T; its translation holds its own copy of a venue that turns
+  // non-localized below, and inherits the localized sponsor only while the original is shown
+  e.fest = await make(site, "fests", "fest", {
+    availability: { from: new Date(T + HOUR).toISOString() },
+    fields: { venue: e.stage.id, sponsor: e.ada.id },
+  });
+  e.festTr = await translate(e.fest, "senlik", { fields: { venue: e.hall.id } });
+  await flipToShared(store, site.id, "fests", "venue");
+  return { store, site: (await store.getSite(site.id)) as Site, edition, e };
 }
diff --git a/packages/astro-renderer/test/references.test.ts b/packages/astro-renderer/test/references.test.ts
index 9e05c8b5..bafd528c 100644
--- a/packages/astro-renderer/test/references.test.ts
+++ b/packages/astro-renderer/test/references.test.ts
@@ -7,6 +7,7 @@
 import type { ContentEntry, Site } from "@cloudhal/core-contracts";
 import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
 import { entryFields, type FieldsSource, type RenderedFields } from "../src/fields.ts";
+import { linkLocalizer, localizeLinks } from "../src/locales.ts";
 import { placeholderBudget } from "../src/media.ts";
 import { conversionMaps } from "../src/reference-conversions.ts";
 import { LiveSource, SnapshotSource } from "../src/source.ts";
@@ -57,6 +58,7 @@ describe("reference cards (RFC-0045 §4)", () => {
       slug: "hall",
       title: "Title hall",
       summary: "About hall",
+      path: "/places/hall",
       url: "/places/hall",
       fromFallbackLocale: false,
     });
@@ -81,7 +83,11 @@ describe("reference cards (RFC-0045 §4)", () => {
       venue: ["Title salon"],
       speakers: [{ talk: "Keynote" }, { talk: "Hidden" }],
     });
-    expect(tr.venue?.references?.[0]).toMatchObject({ url: "/tr/places/salon", locale: "tr" });
+    expect(tr.venue?.references?.[0]).toMatchObject({
+      path: "/places/salon",
+      url: "/tr/places/salon",
+      locale: "tr",
+    });
     const fb = await refsWorld({ fallback: "default-with-notice" });
     const fbSnap = await snapshotOf(fb, fb.site);
     const withFallback = await fbSnap.entryFields(fb.e.launchTr as ContentEntry);
@@ -94,6 +100,7 @@ describe("reference cards (RFC-0045 §4)", () => {
     expect(withFallback.sponsor?.references?.[0]).toMatchObject({
       fromFallbackLocale: true,
       locale: "en",
+      path: "/people/alan",
       url: "/people/alan",
     });
   });
@@ -202,7 +209,9 @@ describe("reference cards (RFC-0045 §4)", () => {
     expect(maps?.byText.get("salon")).toEqual([w.e.hall?.id]);
     expect(maps?.byText.has("vault")).toBe(false);
     expect(maps?.byText.has("ada")).toBe(false);
-    expect(maps?.titles.get(w.e.ada?.id as string)).toBe("Title ada");
+    // narrowed to the conversion's collections, titles included
+    expect(maps?.titles.get(w.e.hall?.id as string)).toBe("Title hall");
+    expect(maps?.titles.has(w.e.ada?.id as string)).toBe(false);
   });
 });
 
@@ -261,10 +270,12 @@ describe("live and snapshot sources agree (RFC-0045 §4, test plan)", () => {
     const slugs = async (g: string | undefined, q = {}) =>
       (await snap.referencedBy(g as string, q)).map((x) => x.slug).sort();
     // the Turkish launch inherits venue and speakers; the draft party is not shown
-    expect(await slugs(e.hall?.id)).toEqual(["lansman", "launch"]);
-    expect(await slugs(e.hall?.id, { locale: "tr" })).toEqual(["lansman"]);
+    // senlik holds its own copy of venue and its original is hidden at T: its page shows hall
+    expect(await slugs(e.hall?.id)).toEqual(["lansman", "launch", "senlik"]);
+    expect(await slugs(e.hall?.id, { locale: "tr" })).toEqual(["lansman", "senlik"]);
     // sponsor is localized: the translation's own value names alan, the original's ada
-    expect(await slugs(e.ada?.id)).toEqual(["alan", "launch"]);
+    // konusma has no sponsor of its own and inherits talk's localized one (shared = 2)
+    expect(await slugs(e.ada?.id)).toEqual(["alan", "konusma", "launch", "talk"]);
     expect(await slugs(e.alan?.id)).toEqual(["lansman", "launch"]);
     expect(await slugs(e.alan?.id, { field: "sponsor" })).toEqual(["lansman"]);
     // the edition: its member and the edition chain's translation each hold their own value
@@ -276,3 +287,88 @@ describe("live and snapshot sources agree (RFC-0045 §4, test plan)", () => {
     expect(await de.referencedBy(e.ada?.id as string)).toEqual([]);
   });
 });
+
+describe("referencedBy follows what each page shows (RFC-0045 §4)", () => {
+  it("lists a translation by its own values while its original is hidden, by the original's after", async () => {
+    const w = await refsWorld();
+    const { e } = w;
+    const snapAt = async (now: number) => {
+      const snap = await w.store.createSnapshot(w.site.id, { actor: system, reason: "manual" });
+      return (await SnapshotSource.open(w.store, snap.id)).at(now);
+    };
+    for (const now of [T, T + HOUR]) {
+      const snap = await snapAt(now);
+      const live = new LiveSource(w.store, w.site.id, { includeDrafts: false, now: () => now });
+      const page = shown(await snap.entryFields(e.festTr as ContentEntry, { locale: "tr" }));
+      const hidden = now < T + HOUR;
+      // the page: its own copy of venue while fest is hidden; fest's venue and sponsor once it
+      // opens (stage has no Turkish member and the site has no fallback: no venue card then)
+      expect(page.venue).toEqual(hidden ? ["Title salon"] : undefined);
+      expect(page.sponsor).toBeUndefined();
+      for (const source of [snap, live]) {
+        const by = async (g: string | undefined) =>
+          (await source.referencedBy(g as string)).map((x) => x.slug);
+        const at = `${source.mode} at ${new Date(now).toISOString()}`;
+        expect((await by(e.hall?.id)).includes("senlik"), at).toBe(hidden);
+        expect((await by(e.stage?.id)).includes("senlik"), at).toBe(!hidden);
+        expect((await by(e.stage?.id)).includes("fest"), at).toBe(!hidden);
+        expect((await by(e.ada?.id)).includes("senlik"), at).toBe(!hidden);
+      }
+    }
+  });
+
+  it("orders ties by id, so both sources agree on order and on what limit keeps", async () => {
+    const w = await refsWorld({ sameInstant: true });
+    const snap = await snapshotOf(w, w.site);
+    const live = new LiveSource(w.store, w.site.id, { includeDrafts: false, now: () => T });
+    for (const g of [w.e.hall?.id, w.e.ada?.id, w.e.alan?.id] as string[]) {
+      const all = (await snap.referencedBy(g)).map((x) => x.id);
+      expect(all.length).toBeGreaterThan(1);
+      // equal dates everywhere: the order is the ids'
+      expect(all).toEqual([...all].sort());
+      expect((await live.referencedBy(g)).map((x) => x.id)).toEqual(all);
+      for (const limit of [1, 2])
+        expect((await live.referencedBy(g, { limit })).map((x) => x.id)).toEqual(
+          all.slice(0, limit),
+        );
+    }
+  });
+});
+
+describe("reference links go through the locale middleware once (RFC-0045 §4)", () => {
+  // what EntryFields.astro draws: each card's link by its path, repeater items' cards included
+  const html = (fields: RenderedFields): string =>
+    Object.values(fields)
+      .map((f) =>
+        f.items
+          ? f.items.map(html).join("")
+          : (f.references ?? []).map((c) => `<a href="${c.path}">${c.title}</a>`).join(""),
+      )
+      .join("");
+  const hrefs = (out: string) => [...out.matchAll(/href="([^"]*)"/g)].map((m) => m[1]);
+
+  for (const routing of ["prefix-except-default", "prefix-all"] as const)
+    it(`links the page's locale and the fallback once (${routing})`, async () => {
+      const w = await refsWorld({ fallback: "default-with-notice", routing });
+      const snap = await snapshotOf(w, w.site);
+      const origin = "https://refs.example";
+      const pre = routing === "prefix-all" ? "/en" : "";
+      // a Turkish page: its own member (salon) and a fallback card (alan, en)
+      const tr = await snap.entryFields(w.e.launchTr as ContentEntry, { locale: "tr" });
+      const trLinks = await linkLocalizer(snap, "tr", origin);
+      const trOut = trLinks ? localizeLinks(html(tr), trLinks) : html(tr);
+      expect(hrefs(trOut)).toEqual([
+        "/tr/places/salon",
+        `${pre}/people/alan`,
+        `${pre}/people/alan`,
+        `${pre}/events/meetup`,
+      ]);
+      // a default-locale page
+      const en = await snap.entryFields(w.e.launch as ContentEntry);
+      const enLinks = await linkLocalizer(snap, "en", origin);
+      const enOut = enLinks ? localizeLinks(html(en), enLinks) : html(en);
+      expect(hrefs(enOut)[0]).toBe(`${pre}/places/hall`);
+      for (const h of [...hrefs(trOut), ...hrefs(enOut)])
+        expect(h, h).not.toMatch(/^\/(en|tr)\/(en|tr)\//);
+    });
+});
diff --git a/packages/core-ts/src/references/conversion-maps.ts b/packages/core-ts/src/references/conversion-maps.ts
index fd1ee43b..196ab8ce 100644
--- a/packages/core-ts/src/references/conversion-maps.ts
+++ b/packages/core-ts/src/references/conversion-maps.ts
@@ -53,8 +53,9 @@ export function conversionCollections(
 }
 
 /**
- * The maps over `entries` (any order; archived ones are skipped). `collections` narrows `byText`
- * to the conversions' target collections (`"*"` or absent: all); titles cover every collection.
+ * The maps over `entries` (any order; archived ones are skipped), narrowed to `collections` (the
+ * conversions' target collections; `"*"` or absent: all), so a reader that loads only those
+ * collections builds the same maps as one that holds every entry.
  */
 export function conversionEntries(
   entries: Iterable<
@@ -75,10 +76,10 @@ export function conversionEntries(
   };
   for (const e of entries) {
     if (e.status === "archived") continue;
+    if (!all && !collections.has(e.collection)) continue;
     const group = memberGroup(e);
     const isDefault = e.locale === defaultLocale;
     if (isDefault && !titles.has(group)) titles.set(group, e.title);
-    if (!all && !collections.has(e.collection)) continue;
     add(e.slug, group);
     if (isDefault) add(e.title, group);
   }
diff --git a/packages/core-ts/src/references/reads.ts b/packages/core-ts/src/references/reads.ts
index 4d78bc1a..ade83cf4 100644
--- a/packages/core-ts/src/references/reads.ts
+++ b/packages/core-ts/src/references/reads.ts
@@ -64,7 +64,8 @@ export async function referrerCandidates(
   const read = await sql.all<{ body: string }>(
     `SELECT body FROM nodes WHERE site_id = ? AND kind = 'contentEntry'
       AND (id IN (SELECT value FROM json_each(?))
-        OR json_extract(body, '$.translation.group') IN (SELECT value FROM json_each(?)))`,
+        OR json_extract(body, '$.translation.group') IN (SELECT value FROM json_each(?)))
+      ORDER BY id`,
     [siteId, list, list],
   );
   const byId = new Map(parseRows<ContentEntry>(read).map((e) => [e.id, e]));
@@ -88,7 +89,7 @@ export async function referrerCandidates(
   ];
   if (missing.length > 0) {
     const originals = await sql.all<{ body: string }>(
-      "SELECT body FROM nodes WHERE site_id = ? AND kind = 'contentEntry' AND id IN (SELECT value FROM json_each(?))",
+      "SELECT body FROM nodes WHERE site_id = ? AND kind = 'contentEntry' AND id IN (SELECT value FROM json_each(?)) ORDER BY id",
       [siteId, JSON.stringify(missing)],
     );
     for (const e of parseRows<ContentEntry>(originals)) byId.set(e.id, e);
diff --git a/packages/core-ts/src/testing-reference-reads.ts b/packages/core-ts/src/testing-reference-reads.ts
index 1ac3f7c7..e657b58d 100644
--- a/packages/core-ts/src/testing-reference-reads.ts
+++ b/packages/core-ts/src/testing-reference-reads.ts
@@ -109,7 +109,13 @@ export function referenceReadsSuite(ctx: SuiteContext): void {
       const launchTr = await translate(launch, a, { fields: { sponsor: alan.id } });
       const draft = await entry(a, "events", { status: "draft", fields: { venue: hallTr.id } });
       const launchDe = await translate(launch, de, { fields: { venue: hall.id } });
-      return { a, de, hall, hallTr, hallDe, ada, alan, launch, launchTr, draft, launchDe };
+      // a localized value on the original, and a translation without its own: it inherits
+      const talk = await entry(a, "events", { fields: { sponsor: ada.id } });
+      const talkTr = await translate(talk, a);
+      return {
+        ...{ a, de, hall, hallTr, hallDe, ada, alan, launch, launchTr, draft, launchDe },
+        ...{ talk, talkTr },
+      };
     }
     const ids = (list: readonly ContentEntry[]) => list.map((e) => e.id).sort();
 
@@ -138,9 +144,10 @@ export function referenceReadsSuite(ctx: SuiteContext): void {
       // venue is shared (1): the translation inherits it; the draft holds its own (canonical) row
       const venue = await referrerCandidates(ctx.sql(), w.a.id, w.hall.id);
       expect(ids(venue.candidates)).toEqual(ids([w.launch, w.launchTr, w.draft]));
-      // sponsor is localized (2): the translation holds its own value, so it does not inherit ada
+      // sponsor is localized (2): launch's translation holds its own value, so it does not
+      // inherit ada; talk's has none, so it does
       const ada = await referrerCandidates(ctx.sql(), w.a.id, w.ada.id);
-      expect(ids(ada.candidates)).toEqual([w.launch.id]);
+      expect(ids(ada.candidates)).toEqual(ids([w.launch, w.talk, w.talkTr]));
       // a holder that is a translation comes with its original
       const alan = await referrerCandidates(ctx.sql(), w.a.id, w.alan.id);
       expect(ids(alan.candidates)).toEqual([w.launchTr.id]);