@astryxdesign/cli 0.6.3-canary.b333c39 → 0.6.3-canary.b7cc8b8

package/api/docs/_adapter.d.mts

@@ -16,43 +16,40 @@
  */
 export function loadDocsCatalog(cwd?: string): Promise<DocsCatalog>;
 /**
- * The overlay languages a topic ships for its own file or any extension.
- * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @returns {string[]}
+ * @param {string} docPath
+ * @param {{lang?: string|null}} [opts]
+ * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
  */
-export function overlayLanguages(entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry): string[];
+export function loadReferenceDocs(docPath: string, { lang }?: {
+    lang?: string | null;
+}): Promise<import("./docs.type.mjs").DocsDetailResponse["data"]>;
 /**
- * One topic, lowered for `lang`: overlaid, extensions merged, keys stamped.
- * Memoized per catalog, so a read that references a topic twice loads it once.
- * Every read of the catalog shares the memoized node, so it is frozen; the
- * lenses hand readers copies.
- * @param {DocsCatalog} catalog
+ * Load one catalog entry: its own doc, plus any extension an integration
+ * merged onto it, in configuration order.
+ *
+ * A localization overlay applies to each file before the extensions are
+ * merged, so an extension written in the base language stays readable under
+ * `--dense`/`--zh` (it replaces its own sections and leaves the rest
+ * translated) rather than being dropped.
+ *
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {string | null} [lang]
- * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
+ * @param {{lang?: string|null}} [opts]
+ * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
  */
-export function lowerTopic(catalog: DocsCatalog, entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry, lang?: string | null): Promise<import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode>;
+export function loadTopicDoc(entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry, { lang }?: {
+    lang?: string | null;
+}): Promise<import("./docs.type.mjs").DocsDetailResponse["data"]>;
 /**
- * How a token reference finds its target: the topic it names in `catalog`,
- * lowered for the same language.
- * @param {DocsCatalog} catalog
- * @param {string | null} lang
- * @returns {(topic: string) => Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode | null>}
- */
-export function referenceTargets(catalog: DocsCatalog, lang: string | null): (topic: string) => Promise<import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode | null>;
-/**
- * One topic, compiled for `lang`: lowered, then every token reference linked.
- * @param {DocsCatalog} catalog
+ * The overlay languages a topic ships for its own file or any extension.
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {string | null} [lang]
- * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
+ * @returns {string[]}
  */
-export function compileTopic(catalog: DocsCatalog, entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry, lang?: string | null): Promise<import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode>;
+export function overlayLanguages(entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry): string[];
 /**
  * Resolve `topic` against the project's catalog (throwing `ERR_UNKNOWN_TOPIC`
- * when unmatched) and lower it with any --dense/--zh overlay and any
- * integration extension applied. Shared by the leaves so topic normalization
- * and unknown-topic handling live in exactly one place.
+ * when unmatched), and load it with any --dense/--zh overlay and any
+ * integration extension applied. Shared by the detail and section leaves so
+ * topic normalization and unknown-topic handling live in exactly one place.
  *
  * @param {string} topic
  * @param {object} [options]
@@ -62,7 +59,7 @@ export function compileTopic(catalog: DocsCatalog, entry: import("../../foundati
  * @param {string} [options.cwd]
  * @returns {Promise<{
  *   catalog: DocsCatalog,
- *   node: import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode,
+ *   docsData: import('./docs.type.mjs').DocsDetailResponse['data'],
  *   lang: string | null,
  * }>}
  */
@@ -73,7 +70,7 @@ export function resolveTopicDocs(topic: string, options?: {
     cwd?: string | undefined;
 }): Promise<{
     catalog: DocsCatalog;
-    node: import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode;
+    docsData: import("./docs.type.mjs").DocsDetailResponse["data"];
     lang: string | null;
 }>;
 /** The localized overlays a docs read can apply. */

package/api/docs/_adapter.mjs

@@ -7,24 +7,29 @@
  *   packages/cli/assets/docs/{topic}.doc.mjs plus every topic the configured
  *   integrations contribute — and, when a --dense/--zh overlay is requested,
  *   the sibling {topic}.doc.dense.mjs / {topic}.doc.zh.mjs.
- * @output Catalog access, the compiler input for a topic, and the compiled
- *   node for it: lowered (overlaid, extensions merged, keys stamped) or linked
- *   (token references resolved too), memoized per catalog.
- * @position Sits beside docs.mjs (api/docs/). Loads authored files and hands
- *   them to foundation/doc-compiler, so no leaf, doctor check or search loads,
- *   merges, or resolves docs on its own. Discovery itself lives in
- *   foundation/discovery/docs-discovery, which the catalog comes from.
+ * @output Catalog access, overlay- and extension-merged reference-doc data,
+ *   and a combined resolve step ({catalog, docsData}) that the detail and
+ *   section leaves share.
+ * @position Sits beside docs.mjs (api/docs/). Owns everything ≥2 leaves need so
+ *   no leaf re-implements resolution, overlay merging, or unknown-topic
+ *   handling. Discovery itself lives in foundation/discovery/docs-discovery,
+ *   which api/search and the agent-docs block read through the same catalog.
  */
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {pathToFileURL} from 'node:url';
 import {Project} from '../../foundation/config/project.mjs';
-import {DocsCatalog} from '../../foundation/discovery/docs-discovery.mjs';
 import {
-  linkReferenceTopic,
-  lowerReferenceTopic,
-} from '../../foundation/doc-compiler/compile.mjs';
+  DocsCatalog,
+  mergeTopic,
+  problemsInTopic,
+  withSourceTitle,
+} from '../../foundation/discovery/docs-discovery.mjs';
+import {
+  sectionKeyProblems,
+  withSectionKeys,
+} from '../../foundation/discovery/docs-section-key.mjs';
 import {AstryxError} from '../error.mjs';
 import {ERROR_CODES} from '../../foundation/response/error-codes.mjs';
 import {parseDoc} from '../../authoring/doctypes/parse.mjs';
@@ -51,176 +56,141 @@ export async function loadDocsCatalog(cwd = process.cwd()) {
   }
 }
 
-/** The localized overlays a docs read can apply. */
-export const OVERLAY_LANGUAGES = ['zh', 'dense'];
-
-/**
- * Where the `lang` overlay of a doc file lives: `{topic}.doc.{lang}.mjs`.
- * @param {string} docPath
- * @param {string} lang
- * @returns {string}
- */
-function overlayPath(docPath, lang) {
-  return path.join(
-    path.dirname(docPath),
-    `${path.basename(docPath, '.doc.mjs')}.doc.${lang}.mjs`,
-  );
-}
-
-/**
- * The overlay languages a topic ships for its own file or any extension.
- * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @returns {string[]}
- */
-export function overlayLanguages(entry) {
-  const files = [entry.path, ...entry.extensions.map(ext => ext.path)];
-  return OVERLAY_LANGUAGES.filter(lang =>
-    files.some(file => fs.existsSync(overlayPath(file, lang))),
-  );
-}
-
 /**
- * The overlay a read applies: none for the authored language.
- * @param {string | null | undefined} lang
- * @returns {string | null}
- */
-function overlayLanguage(lang) {
-  return lang && lang !== 'en' ? lang : null;
-}
-
-/**
- * Load one authored file and the overlay for `lang`. A failure is recorded on
- * the result, not thrown, so the compiler reports it in reading order.
  * @param {string} docPath
- * @param {string | null} lang
- * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').AuthoredFile>}
+ * @param {{lang?: string|null}} [opts]
+ * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
  */
-async function loadAuthoredFile(docPath, lang) {
-  const file = path.basename(docPath);
-  let doc;
-  try {
-    const mod = await import(pathToFileURL(docPath).href);
-    doc = parseDoc(mod.docs ?? mod.default, file);
-  } catch (error) {
-    return {file, error};
+export async function loadReferenceDocs(docPath, {lang} = {}) {
+  const mod = await import(pathToFileURL(docPath).href);
+  const parsed = parseDoc(mod.docs ?? mod.default, path.basename(docPath));
+  if (!('sections' in parsed)) {
+    throw new Error(`${path.basename(docPath)} is not a reference document.`);
   }
-  if (!lang) return {file, doc};
-  const translationPath = overlayPath(docPath, lang);
-  if (!fs.existsSync(translationPath)) return {file, doc};
-  try {
-    const translationMod = await import(pathToFileURL(translationPath).href);
-    return {
-      file,
-      doc,
-      overlay: translationMod.docsZh || translationMod.docsDense || null,
-    };
-  } catch (overlayError) {
-    return {file, doc, overlayError};
+  const problems = problemsInTopic(parsed);
+  if (problems.length > 0) {
+    throw new Error(
+      `${path.basename(docPath)} is invalid: ${problems.join('; ')}`,
+    );
   }
-}
+  const docs = parsed;
+  if (!lang || lang === 'en') return docs;
 
-/**
- * Everything the compiler needs for one topic, read from disk.
- * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {string | null} lang
- * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').ReferenceTopicInput>}
- */
-async function loadCompilerInput(entry, lang) {
-  const extensions = [];
-  for (const extension of entry.extensions) {
-    extensions.push({
-      ...(await loadAuthoredFile(extension.path, lang)),
-      provider: extension.package,
-    });
+  const translationPath = overlayPath(docPath, lang);
+  if (!fs.existsSync(translationPath)) return docs;
+
+  const translationMod = await import(pathToFileURL(translationPath).href);
+  const translation = translationMod.docsZh || translationMod.docsDense;
+  if (!translation) return docs;
+
+  // Overlays are keyed to a base section by title (`section`), not by array
+  // position. Position-keying silently grafted each overlay title onto whatever
+  // base section happened to share its index, so an overlay that omitted or
+  // reordered a section corrupted every section after it — `docs tokens --dense`
+  // printed the colour table under a "Spacing" heading (#2182). An overlay may
+  // now cover any subset of sections, in any order; sections it does not name
+  // keep their base content.
+  /** @type {Map<string, any>} */
+  const bySection = new Map();
+  for (const ts of translation.sections ?? []) {
+    if (ts?.section != null) bySection.set(ts.section, ts);
   }
+
   return {
-    id: entry.name,
-    provider: entry.package,
-    replaces: entry.replaces ?? null,
-    lang,
-    base: await loadAuthoredFile(entry.path, lang),
-    extensions,
+    ...docs,
+    description: translation.description || docs.description,
+    sections: docs.sections.map(
+      (
+        /** @type {import('@astryxdesign/cli/authoring').ReferenceSection} */ section,
+      ) => {
+        const ts = bySection.get(section.title);
+        if (!ts) return section;
+        const localized = {
+          ...section,
+          title: ts.title || section.title,
+          content: section.content.map(
+            (
+              /** @type {import('@astryxdesign/cli/authoring').ReferenceContentBlock} */ block,
+              /** @type {number} */ bi,
+            ) => {
+              const tb = ts.content?.[bi];
+              if (!tb) return block;
+              if (tb.type === 'prose' && block.type === 'prose')
+                return {...block, text: tb.text};
+              if (tb.type === 'list' && block.type === 'list')
+                return {...block, items: tb.items};
+              return block;
+            },
+          ),
+        };
+        return withSourceTitle(localized, section.title);
+      },
+    ),
   };
 }
 
-/** @type {WeakMap<DocsCatalog, Map<string, Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>>>} */
-const loweredByCatalog = new WeakMap();
-
 /**
- * One topic, lowered for `lang`: overlaid, extensions merged, keys stamped.
- * Memoized per catalog, so a read that references a topic twice loads it once.
- * Every read of the catalog shares the memoized node, so it is frozen; the
- * lenses hand readers copies.
- * @param {DocsCatalog} catalog
+ * Load one catalog entry: its own doc, plus any extension an integration
+ * merged onto it, in configuration order.
+ *
+ * A localization overlay applies to each file before the extensions are
+ * merged, so an extension written in the base language stays readable under
+ * `--dense`/`--zh` (it replaces its own sections and leaves the rest
+ * translated) rather than being dropped.
+ *
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {string | null} [lang]
- * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
+ * @param {{lang?: string|null}} [opts]
+ * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
  */
-export function lowerTopic(catalog, entry, lang = null) {
-  const overlay = overlayLanguage(lang);
-  let cache = loweredByCatalog.get(catalog);
-  if (!cache) {
-    cache = new Map();
-    loweredByCatalog.set(catalog, cache);
-  }
-  const key = `${entry.name.toLowerCase()}\u0000${overlay ?? ''}`;
-  let lowered = cache.get(key);
-  if (!lowered) {
-    lowered = loadCompilerInput(entry, overlay).then(input =>
-      deepFreeze(lowerReferenceTopic(input)),
-    );
-    cache.set(key, lowered);
+export async function loadTopicDoc(entry, {lang} = {}) {
+  let doc = await loadReferenceDocs(entry.path, {lang});
+  for (const extension of entry.extensions) {
+    doc = mergeTopic(doc, await loadReferenceDocs(extension.path, {lang}));
+    // Merging matches on keys, so this holds unless merge itself regresses.
+    const problems = sectionKeyProblems(doc.sections);
+    if (problems.length > 0) {
+      throw new Error(
+        `${path.basename(extension.path)}, extending ${entry.name}, leaves two sections with one key: ${problems.join('; ')}`,
+      );
+    }
   }
-  return lowered;
+  // Derived keys are stamped only now, so they never take part in merging.
+  return withSectionKeys(doc);
 }
 
-/**
- * Freeze a value and everything in it.
- * @template T
- * @param {T} value
- * @returns {T}
- */
-function deepFreeze(value) {
-  if (value !== null && typeof value === 'object' && !Object.isFrozen(value)) {
-    Object.freeze(value);
-    for (const child of Object.values(value)) deepFreeze(child);
-  }
-  return value;
-}
+/** The localized overlays a docs read can apply. */
+export const OVERLAY_LANGUAGES = ['zh', 'dense'];
 
 /**
- * How a token reference finds its target: the topic it names in `catalog`,
- * lowered for the same language.
- * @param {DocsCatalog} catalog
- * @param {string | null} lang
- * @returns {(topic: string) => Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode | null>}
+ * Where the `lang` overlay of a doc file lives: `{topic}.doc.{lang}.mjs`.
+ * @param {string} docPath
+ * @param {string} lang
+ * @returns {string}
  */
-export function referenceTargets(catalog, lang) {
-  return async topic => {
-    const target = catalog.resolve(topic);
-    return target ? lowerTopic(catalog, target, lang) : null;
-  };
+function overlayPath(docPath, lang) {
+  return path.join(
+    path.dirname(docPath),
+    `${path.basename(docPath, '.doc.mjs')}.doc.${lang}.mjs`,
+  );
 }
 
 /**
- * One topic, compiled for `lang`: lowered, then every token reference linked.
- * @param {DocsCatalog} catalog
+ * The overlay languages a topic ships for its own file or any extension.
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {string | null} [lang]
- * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
+ * @returns {string[]}
  */
-export async function compileTopic(catalog, entry, lang = null) {
-  return linkReferenceTopic(
-    await lowerTopic(catalog, entry, lang),
-    referenceTargets(catalog, lang),
+export function overlayLanguages(entry) {
+  const files = [entry.path, ...entry.extensions.map(ext => ext.path)];
+  return OVERLAY_LANGUAGES.filter(lang =>
+    files.some(file => fs.existsSync(overlayPath(file, lang))),
   );
 }
 
 /**
  * Resolve `topic` against the project's catalog (throwing `ERR_UNKNOWN_TOPIC`
- * when unmatched) and lower it with any --dense/--zh overlay and any
- * integration extension applied. Shared by the leaves so topic normalization
- * and unknown-topic handling live in exactly one place.
+ * when unmatched), and load it with any --dense/--zh overlay and any
+ * integration extension applied. Shared by the detail and section leaves so
+ * topic normalization and unknown-topic handling live in exactly one place.
  *
  * @param {string} topic
  * @param {object} [options]
@@ -230,7 +200,7 @@ export async function compileTopic(catalog, entry, lang = null) {
  * @param {string} [options.cwd]
  * @returns {Promise<{
  *   catalog: DocsCatalog,
- *   node: import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode,
+ *   docsData: import('./docs.type.mjs').DocsDetailResponse['data'],
  *   lang: string | null,
  * }>}
  */
@@ -251,6 +221,6 @@ export async function resolveTopicDocs(topic, options = {}) {
     );
   }
 
-  const node = await lowerTopic(catalog, entry, effectiveLang);
-  return {catalog, node, lang: effectiveLang};
+  const docsData = await loadTopicDoc(entry, {lang: effectiveLang});
+  return {catalog, docsData, lang: effectiveLang};
 }

package/api/docs/detail/detail.d.mts

@@ -1,6 +1,21 @@
 // @generated by scripts/sync-api-types.mjs from the JSDoc in api/**/*.mjs.
 // DO NOT EDIT — run `pnpm sync:api-types` to regenerate.
 
+/**
+ * Resolve token-ref blocks by inlining the referenced section's table.
+ * This allows section docs to reference token tables without duplicating data.
+ *
+ * The reference is resolved through the catalog, so a topic may point at one
+ * an integration contributed (or replaced) rather than only at a built-in. It
+ * names the section by key or authored title, so it resolves in every language.
+ * @param {import('../docs.type.mjs').DocsDetailResponse['data']} docsData
+ * @param {import('../../../foundation/discovery/docs-discovery.mjs').DocsCatalog} catalog
+ * @param {{lang?: string | null}} [options]
+ * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse['data']>}
+ */
+export function resolveTokenRefs(docsData: import("../docs.type.mjs").DocsDetailResponse["data"], catalog: import("../../../foundation/discovery/docs-discovery.mjs").DocsCatalog, { lang }?: {
+    lang?: string | null;
+}): Promise<import("../docs.type.mjs").DocsDetailResponse["data"]>;
 /**
  * @param {string} topic
  * @param {object} [options]

package/api/docs/detail/detail.mjs

@@ -3,17 +3,84 @@
 /**
  * @file docs.detail leaf — load one topic's full reference doc.
  *
- * @input A topic name plus optional {lang, zh, dense, cwd}. Resolves the topic
- *   via the shared adapter and compiles it with its token references linked.
+ * @input A topic name plus optional {lang, zh, dense}. Resolves and loads the
+ *   topic via the shared adapter, then inlines any token-ref blocks.
  * @output { type: 'docs.detail', data: ReferenceDoc } — the full doc with
- *   token-refs inlined, matching `astryx --json docs <topic>`.
- * @position Leaf under api/docs. Reads the compiled node through the detail
- *   lens; resolution, overlays and extensions happen in the compiler.
+ *   token-refs resolved, matching `xds --json docs <topic>`.
+ * @position Leaf under api/docs. Owns resolveTokenRefs (used only here); shares
+ *   discovery/loading/topic-resolution with the section leaf via _adapter.mjs.
  */
 
-import {linkReferenceTopic} from '../../../foundation/doc-compiler/compile.mjs';
-import {detailView} from '../../../foundation/doc-compiler/lenses.mjs';
-import {referenceTargets, resolveTopicDocs} from '../_adapter.mjs';
+import {loadTopicDoc, resolveTopicDocs} from '../_adapter.mjs';
+import {
+  sectionKey,
+  sourceTitle,
+  withSourceTitle,
+} from '../../../foundation/discovery/docs-section-key.mjs';
+
+/**
+ * Resolve token-ref blocks by inlining the referenced section's table.
+ * This allows section docs to reference token tables without duplicating data.
+ *
+ * The reference is resolved through the catalog, so a topic may point at one
+ * an integration contributed (or replaced) rather than only at a built-in. It
+ * names the section by key or authored title, so it resolves in every language.
+ * @param {import('../docs.type.mjs').DocsDetailResponse['data']} docsData
+ * @param {import('../../../foundation/discovery/docs-discovery.mjs').DocsCatalog} catalog
+ * @param {{lang?: string | null}} [options]
+ * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse['data']>}
+ */
+export async function resolveTokenRefs(docsData, catalog, {lang = null} = {}) {
+  const resolved = {...docsData, sections: [...docsData.sections]};
+  for (let si = 0; si < resolved.sections.length; si++) {
+    const section = resolved.sections[si];
+    /** @type {import('@astryxdesign/cli/authoring').ReferenceContentBlock[]} */
+    const newContent = [];
+    for (const block of section.content) {
+      if (block.type === 'token-ref') {
+        const refEntry = catalog.resolve(block.topic);
+        if (!refEntry) {
+          newContent.push({type: 'prose', text: `[token-ref: unknown topic "${block.topic}"]`});
+          continue;
+        }
+        const refDocs = await loadTopicDoc(refEntry, {lang});
+        const wanted = block.section.toLowerCase();
+        const refSection = refDocs.sections.find(
+          (/** @type {import('@astryxdesign/cli/authoring').ReferenceSection} */ s) =>
+            sectionKey(s) === block.section ||
+            sourceTitle(s).toLowerCase() === wanted,
+        );
+        if (!refSection) {
+          newContent.push({type: 'prose', text: `[token-ref: section "${block.section}" not found in "${block.topic}"]`});
+          continue;
+        }
+        // Inline the referenced section's content blocks (tables, prose, etc.)
+        // and carry over the previewType
+        for (const refBlock of refSection.content) {
+          newContent.push(refBlock);
+        }
+        // If the referenced section has a previewType, attach it to our section
+        if (refSection.previewType && !section.previewType) {
+          resolved.sections[si] = withSourceTitle(
+            {...section, previewType: refSection.previewType, content: newContent},
+            sourceTitle(section),
+          );
+        }
+      } else {
+        newContent.push(block);
+      }
+    }
+    if (resolved.sections[si] === section) {
+      resolved.sections[si] = withSourceTitle(
+        {...section, content: newContent},
+        sourceTitle(section),
+      );
+    } else {
+      resolved.sections[si].content = newContent;
+    }
+  }
+  return resolved;
+}
 
 /**
  * @param {string} topic
@@ -25,10 +92,7 @@ import {referenceTargets, resolveTopicDocs} from '../_adapter.mjs';
  * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse>}
  */
 export async function detail(topic, options = {}) {
-  const {catalog, node, lang} = await resolveTopicDocs(topic, options);
-  const linked = await linkReferenceTopic(
-    node,
-    referenceTargets(catalog, lang),
-  );
-  return {type: 'docs.detail', data: detailView(linked)};
+  const {catalog, docsData, lang} = await resolveTopicDocs(topic, options);
+  const resolved = await resolveTokenRefs(docsData, catalog, {lang});
+  return {type: 'docs.detail', data: resolved};
 }

package/api/docs/detail/section/section.mjs

@@ -4,15 +4,14 @@
  * @file docs.detail.section leaf — load a single section of a topic.
  *
  * @input A topic name, a section query, and optional {lang, zh, dense}. Resolves
- *   the topic via the shared adapter, finds the section in its lowered compiled
- *   node by its stable key, then by exact title, then by a title that contains
- *   the query, and links only that section.
+ *   and loads the topic via the shared adapter, then finds the section by its
+ *   stable key, then by exact title, then by a title that contains the query.
  * @output { type: 'docs.detail.section', data: ReferenceSection } with any
  *   token-ref blocks inlined — matching `astryx --json docs <topic> <section>`.
  *   Throws ERR_UNKNOWN_SECTION when nothing matches, or when the query matches
  *   more than one section (the candidates come back as suggestions).
- * @position Leaf nested under api/docs/detail. Shares topic resolution with the
- *   detail leaf via _adapter.mjs and reads through the compiler's lenses.
+ * @position Leaf nested under api/docs/detail. Shares discovery/loading/
+ *   topic-resolution with the detail leaf via _adapter.mjs.
  */
 
 import {AstryxError} from '../../../error.mjs';
@@ -21,12 +20,8 @@ import {
   findDocSection,
   sectionKey,
 } from '../../../../foundation/discovery/docs-section-key.mjs';
-import {linkReferenceSection} from '../../../../foundation/doc-compiler/compile.mjs';
-import {
-  readerSections,
-  sectionView,
-} from '../../../../foundation/doc-compiler/lenses.mjs';
-import {referenceTargets, resolveTopicDocs} from '../../_adapter.mjs';
+import {resolveTopicDocs} from '../../_adapter.mjs';
+import {resolveTokenRefs} from '../detail.mjs';
 
 /**
  * @param {string} topic
@@ -49,30 +44,31 @@ export async function section(topic, sectionName, options = {}) {
       ERROR_CODES.ERR_UNKNOWN_SECTION,
     );
   }
+  const {catalog, docsData, lang} = await resolveTopicDocs(topic, options);
 
-  const {catalog, node, lang} = await resolveTopicDocs(topic, options);
-  const sections = readerSections(node);
-  const {section: match, candidates} = findDocSection(sections, sectionName);
+  const {section: match, candidates} = findDocSection(
+    docsData.sections,
+    sectionName,
+  );
   if (!match) {
     const ambiguous = candidates.length > 1;
     throw new AstryxError(
       ambiguous
         ? `Section "${sectionName}" matches ${candidates.length} sections in "${topic}". Read one by its key.`
         : `Section "${sectionName}" not found in "${topic}"`,
-      (ambiguous ? candidates : sections).map(s => ({
+      (ambiguous ? candidates : docsData.sections).map(s => ({
         name: sectionKey(s),
         reason: s.title,
       })),
       ERROR_CODES.ERR_UNKNOWN_SECTION,
     );
   }
-
   // A section read on its own inlines its token refs, as the whole topic does;
-  // otherwise a section that is only a token-ref prints blank. Only this
-  // section is linked, so a broken reference elsewhere cannot fail the read.
-  const linked = await linkReferenceSection(
-    match,
-    referenceTargets(catalog, lang),
+  // otherwise a section that is only a token-ref prints blank.
+  const {sections} = await resolveTokenRefs(
+    {...docsData, sections: [match]},
+    catalog,
+    {lang},
   );
-  return {type: 'docs.detail.section', data: sectionView(node, linked)};
+  return {type: 'docs.detail.section', data: sections[0]};
 }