@astryxdesign/cli 0.6.4-canary.9143f03 → 0.6.4-canary.9cc70a9

package/README.md

@@ -89,7 +89,6 @@ Options:
 | `hook`        | List hooks or print hook docs                                                 |
 | `init`        | Initialize the design system in your project                                  |
 | `integration` | Author and verify an Astryx integration package                               |
-| `layout`      | Generate XDS layouts from compressed expressions (XLE/XLO)                    |
 | `search`      | Search components, hooks, docs, and templates in one ranked list              |
 | `swizzle`     | Copy component source for customization                                       |
 | `template`    | Inject a page or block template                                               |
@@ -475,9 +474,6 @@ Every response has a `type` discriminant. The full set is below (generated from
 | `integration.template-conflicts`  | The integration identity, structural issues, and non-blocking Core template-id conflicts as {id, severity: warning, integrationPackage, integrationType, integrationName, coreMatches, message, command}.                                                                                                                                                                                                                                                                                                                                                                                                             |
 | `integration.component-conflicts` | The integration identity, structural issues, and non-blocking conflicts where an integration component name is also owned by Core; each conflict includes the exact package-qualified command.                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | `integration.doc-conflicts`       | The integration identity, structural issues, and Core doc overlaps. Each finding includes `severity` (`info` \| `error`) and `relationship` (`replaces` \| `extends` \| `accidental`).                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `layout.expand`                   | The expansion: parsed form, generated TSX code, componentsUsed, states (count of useState hooks scaffolded), todos, blocksReferenced (each {name, mode}), warnings, and written (the output path, or null when nothing was written).                                                                                                                                                                                                                                                                                                                                                                                  |
-| `layout.check`                    | The validation result: a valid flag, the detected form, errors (each with line/col, message, formatted text, and suggestions), warnings, and the expression re-printed in both canonical surfaces (compact and outline).                                                                                                                                                                                                                                                                                                                                                                                              |
-| `layout.grammar`                  | The XLE/XLO grammar cheatsheet: a text field with the full reference plus an aliases map (short name → canonical component) generated from this install's registry.                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 
 <!-- END GENERATED: response-types -->
 <!-- Generated by scripts/generate-cli-readme.mjs from the response-types EnumDoc. Run `pnpm -F @astryxdesign/cli readme`. -->
@@ -578,12 +574,12 @@ There is no factory: write a plain object. For editor autocomplete and
 type-checking, annotate it with the `AstryxConfig` type exported from
 `@astryxdesign/cli/authoring`.
 
-| Field                         | Type                           | Purpose                                                                                         |
-| ----------------------------- | ------------------------------ | ----------------------------------------------------------------------------------------------- |
-| `integrations`                | `string[]`                     | Integration package names to load (see [Integrations](#integrations)).                          |
-| `issuesUrl`                   | `string`                       | Where "report an issue" links point for your project. Defaults to the core issue tracker.       |
-| `hooks.postCodemod`           | `PostCodemodHook[]`            | Commands to run after `astryx upgrade` applies codemods (e.g. reinstall, rebuild, reformat).    |
-| `experimental.xle.components` | `Record<string, XleComponent>` | Register app-local components so layout (XLE) expressions can reference them by name. Unstable. |
+| Field                         | Type                           | Purpose                                                                                                                  |
+| ----------------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------ |
+| `integrations`                | `string[]`                     | Integration package names to load (see [Integrations](#integrations)).                                                   |
+| `issuesUrl`                   | `string`                       | Where "report an issue" links point for your project. Defaults to the core issue tracker.                                |
+| `hooks.postCodemod`           | `PostCodemodHook[]`            | Commands to run after `astryx upgrade` applies codemods (e.g. reinstall, rebuild, reformat).                             |
+| `experimental.xle.components` | `Record<string, XleComponent>` | No effect. Its only reader was the removed `layout` command. Still accepted so existing configs keep loading; delete it. |
 
 The config is validated against a strict schema when the CLI loads it, so an
 unknown field is a hard error rather than a silent no-op. `astryx doctor`

package/api/index.d.mts

@@ -33,14 +33,12 @@ export * from "./gap-report/gap-report.type.mjs";
 export * from "./upgrade/upgrade.type.mjs";
 export * from "./init/init.type.mjs";
 export * from "./doctor/doctor.type.mjs";
-export * from "./layout/layout.type.mjs";
 export * from "./integration/integration-authoring.type.mjs";
 export * from "./integration/pack-check.type.mjs";
 export * from "./integration/validate-integration.type.mjs";
 export * from "./integration/authoring-checks.type.mjs";
 export type Logger = import("./logger.mjs").Logger;
 export { themeBuild, themeAdd, themeTemplate, themeList, themeListAvailable, themeTargets, themePaletteGenerate, generateTonalPalette, listThemes } from "./theme/theme.mjs";
-export { layoutExpand, layoutCheck, layoutGrammar } from "./layout/layout.mjs";
 export { integrationAdd, integrationAddAgentDoc, integrationAddCodemod, integrationAddComponent, integrationAddDoc, integrationAddTemplate } from "./integration/add-contribution.mjs";
 export { validateIntegration, summarizeIssues } from "./integration/validate-integration.mjs";
 export { integrationTemplateConflicts, integrationComponentConflicts, integrationDocConflicts } from "./integration/authoring-checks.mjs";

package/api/index.mjs

@@ -44,7 +44,6 @@ export {gapReport} from './gap-report/gap-report.mjs';
 export {upgrade} from './upgrade/upgrade.mjs';
 export {init} from './init/init.mjs';
 export {doctor} from './doctor/doctor.mjs';
-export {layoutExpand, layoutCheck, layoutGrammar} from './layout/layout.mjs';
 export {
   integrationAdd,
   integrationAddAgentDoc,
@@ -93,7 +92,6 @@ export * from './gap-report/gap-report.type.mjs';
 export * from './upgrade/upgrade.type.mjs';
 export * from './init/init.type.mjs';
 export * from './doctor/doctor.type.mjs';
-export * from './layout/layout.type.mjs';
 export * from './integration/integration-authoring.type.mjs';
 export * from './integration/pack-check.type.mjs';
 export * from './integration/validate-integration.type.mjs';

package/api/json/index.ts

@@ -26,7 +26,6 @@ export type * from '../gap-report/gap-report.type.mjs';
 export type * from '../upgrade/upgrade.type.mjs';
 export type * from '../init/init.type.mjs';
 export type * from '../doctor/doctor.type.mjs';
-export type * from '../layout/layout.type.mjs';
 export type * from '../integration/validate-integration.type.mjs';
 export type * from '../integration/authoring-checks.type.mjs';
 export type * from '../integration/pack-check.type.mjs';

package/api/template/template-integration.test.mjs

@@ -19,7 +19,6 @@ import {
 } from './template.mjs';
 import {search} from '../search/search.mjs';
 import {build} from '../build/build.mjs';
-import {layoutExpand} from '../layout/layout.mjs';
 import {runCli} from '../../test-utils/run-cli.mjs';
 
 let tmpDir;
@@ -518,53 +517,7 @@ describe('integration template discovery', () => {
     });
   });
 
-  it('resolves a replacement block through the layout alias', async () => {
-    const pkgDir = installWidgets(tmpDir);
-    writeTemplate(pkgDir, 'acme-card-callout', {
-      kind: 'block',
-      source:
-        'export default function AcmeCardCallout() { return <span>Acme replacement block</span>; }\n',
-    });
-    declareReplaces(pkgDir, {
-      'acme-card-callout': 'CardCallout',
-    });
-
-    const accidental = path.join(tmpDir, 'node_modules', '@acme', 'extra');
-    fs.mkdirSync(path.join(accidental, 'templates'), {recursive: true});
-    fs.writeFileSync(
-      path.join(accidental, 'package.json'),
-      JSON.stringify({name: '@acme/extra', version: '1.0.0'}),
-    );
-    fs.writeFileSync(
-      path.join(accidental, 'astryx.integration.mjs'),
-      `export default {templates: './templates'};\n`,
-    );
-    writeTemplate(accidental, 'CardCallout', {
-      kind: 'block',
-      body: `export default {type: 'block', name: 'ZZZ accidental block', description: 'collision'};\n`,
-      source:
-        'export default function Accidental() { return <span>Accidental block</span>; }\n',
-    });
-    fs.writeFileSync(
-      path.join(tmpDir, 'astryx.config.mjs'),
-      `export default { integrations: ['@acme/widgets', '@acme/extra'] };\n`,
-    );
-
-    const result = await layoutExpand('C{card-callout}', {
-      name: 'ReplacementLayout',
-      cwd: tmpDir,
-    });
-
-    expect(result.data.code).toContain('Acme replacement block');
-    expect(result.data.code).not.toContain('Accidental block');
-    expect(result.data.blocksReferenced).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({name: 'CardCallout', mode: 'splice'}),
-      ]),
-    );
-  }, 30_000);
-
-  it('resolves chained block aliases consistently in template and layout', async () => {
+  it('resolves chained block aliases consistently in template', async () => {
     const [firstTarget, secondTarget] = (await discoverCoreTemplates()).filter(
       candidate => candidate.type === 'block',
     );
@@ -592,29 +545,12 @@ describe('integration template discovery', () => {
       cwd: tmpDir,
     });
     expect(firstTemplate.data.source).toContain('First chain replacement');
-    const layoutId = id =>
-      id.replace(/([a-z0-9])([A-Z])/gu, '$1-$2').toLowerCase();
-    const firstLayout = await layoutExpand(
-      `C{${layoutId(firstTarget.dirName)}}`,
-      {
-        cwd: tmpDir,
-      },
-    );
-    expect(firstLayout.data.code).toContain('First chain replacement');
-    expect(firstLayout.data.code).not.toContain('Final chain replacement');
 
     const secondTemplate = await template(secondTarget.dirName, {
       show: true,
       cwd: tmpDir,
     });
     expect(secondTemplate.data.source).toContain('Final chain replacement');
-    const secondLayout = await layoutExpand(
-      `C{${layoutId(secondTarget.dirName)}}`,
-      {
-        cwd: tmpDir,
-      },
-    );
-    expect(secondLayout.data.code).toContain('Final chain replacement');
   }, 30_000);
 
   it('keeps the old discovery behavior when no replacement is declared', async () => {

package/api/template/template.mjs

@@ -8,7 +8,7 @@
  * the requested one, and routes to a leaf (list/show/skeleton/copy/cdn). The shared
  * discovery/IO + cross-command helpers live in `foundation/discovery/template-adapter.mjs` and are
  * RE-EXPORTED here so external import paths (`api/template/template.mjs`) —
- * used by component, layout, search, init, discover, Doctor integration, and
+ * used by component, search, init, discover, Doctor integration, and
  * lib/project — keep resolving unchanged.
  *
  * @position api/template — the template dispatcher + barrel; leaves live under

package/api/upgrade/run/run.mjs

@@ -114,7 +114,7 @@ export async function run(options = {}, {cwd = process.cwd()} = {}) {
   // Resolve the source dir against the API's cwd (not process.cwd()) so a
   // programmatic caller in another directory scans the right tree. Confine it to
   // cwd: --apply rewrites files in place, so a `..`-escaping or out-of-tree
-  // absolute --path must be rejected (parity with template/theme/swizzle/layout,
+  // absolute --path must be rejected (parity with template/theme/swizzle,
   // and this is the most destructive command). allowAbsolute permits an absolute
   // path that still resolves inside cwd.
   let path_;

package/authoring/config/config.doc.mjs

@@ -77,7 +77,7 @@ export const doc = {
           name: 'experimental.xle.components',
           type: 'Record<string, XleComponent>',
           description:
-            'Custom components the layout expander (XLE) may emit, keyed by tag.',
+            'No effect. Its only reader was the removed `layout` command. The key is still accepted so existing configs keep loading; delete it.',
         },
       ],
     },

package/authoring/config/type.ts

@@ -115,8 +115,8 @@ export interface AstryxConfig {
     /** Experimental XLE (layout expression) configuration. */
     xle?: {
       /**
-       * Register app-local components so XLE layout expressions can
-       * reference them by name via {hint}. Keyed by component name.
+       * No effect. Its only reader was the removed `layout` command. Still
+       * accepted so existing configs keep loading; delete it.
        */
       components?: Record<string, XleComponent>;
     };

package/authoring/doctypes/command/command.doc.mjs

@@ -151,7 +151,7 @@ export const doc = {
       name: 'subcommands',
       type: 'string[]',
       description:
-        'Subcommand names (for command groups like `theme` / `layout`).',
+        'Subcommand names (for command groups like `theme`).',
     },
     {
       name: 'examples',

package/authoring/doctypes/command/type.ts

@@ -75,7 +75,7 @@ export interface CommandDoc extends AuthoredDocGraphFields {
   args?: CommandArgDoc[];
   /** Flags/options. */
   options?: CommandOptionDoc[];
-  /** Subcommand names (for command groups like `theme` / `layout`). */
+  /** Subcommand names (for command groups like `theme`). */
   subcommands?: string[];
   /** Terminal examples. */
   examples?: CommandExampleDoc[];

package/clients/cli/command-result-coverage.test.mjs

@@ -29,17 +29,17 @@ import {program} from './index.mjs';
 import {reportsResult, reportsResultVia} from './lib/define-command.mjs';
 
 /**
- * Commands with no action of their own: bare `astryx layout` prints its
- * subcommand list and does nothing else, so there is no run to report on.
+ * Commands with no action of their own: a group that prints its subcommand
+ * list and does nothing else has no run to report on.
  *
  * Pinned as a SET rather than skipped silently — if a command joins this list,
  * that is a real change to what the CLI does and it should be read, not
- * absorbed. (`theme` is deliberately NOT here: it HAS an action — the one that
- * rejects an unknown subcommand — so it goes through the converter like any
- * other. Its bare form prints help and never returns from that action, which
- * the recorder covers where help is recorded, not here.)
+ * absorbed. Every group ships an action today: `theme`, for instance, HAS one
+ * — the one that rejects an unknown subcommand — so it goes through the
+ * converter like any other. Its bare form prints help and never returns from
+ * that action, which the recorder covers where help is recorded, not here.
  */
-const NO_ACTION_OF_THEIR_OWN = ['layout'];
+const NO_ACTION_OF_THEIR_OWN = [];
 
 /**
  * Commands that record for themselves instead of returning a descriptor.

package/clients/cli/commands/debug-result-summary.test.mjs

@@ -179,9 +179,9 @@ describe('DebugEvent result summary', () => {
   it(
     'says so explicitly when a command has no result set',
     async () => {
-      // `layout check` returns a verdict on one expression: nothing was looked
+      // Bare `integration` prints its subcommand list: nothing was looked
       // up, and the run says that rather than leaving four ambiguous nulls.
-      const {event} = await runWithDebug(['layout', 'check', 'VStack>Text']);
+      const {event} = await runWithDebug(['integration']);
       expect(event.output).toMatchObject({
         resultKind: 'none',
         resultCount: null,

package/clients/cli/commands/text-json-parity.test.mjs

@@ -377,23 +377,6 @@ const CASES = [
     // Needs a packable project; pack itself may exit differently.
     skipFieldChecks: true,
   },
-  // ── Layout command: remove these cases when the layout command is deleted ──
-  {
-    name: 'layout check',
-    args: ['layout', 'check', 'Button'],
-    skipFieldChecks: true,
-  },
-  {
-    name: 'layout expand',
-    args: ['layout', 'expand', 'Button'],
-    skipFieldChecks: true,
-  },
-  {
-    name: 'layout grammar',
-    args: ['layout', 'grammar'],
-    skipFieldChecks: true,
-  },
-  // ── End layout cases ──
   {
     name: 'manifest',
     args: ['manifest'],

package/clients/cli/index.mjs

@@ -103,9 +103,6 @@ export const JSON_SUPPORTED = new Set([
   'doctor integration templates',
   'doctor integration components',
   'doctor integration docs',
-  'layout expand',
-  'layout check',
-  'layout grammar',
 ]);
 
 /**
@@ -264,7 +261,6 @@ const commands = [
   {name: 'gap-report', path: './commands/gap-report.mjs', register: 'registerGapReport'},
   // agent-docs folded into init — functions still importable from agent-docs.mjs
   {name: 'template', path: './commands/template.mjs', register: 'registerTemplate'},
-  {name: 'layout', path: './commands/layout.mjs', register: 'registerLayout'},
   {name: 'upgrade', path: './commands/upgrade.mjs', register: 'registerUpgrade'},
   {name: 'theme', path: './commands/build-theme.mjs', register: 'registerTheme'},
   {name: 'integration', path: './commands/integration.mjs', register: 'registerIntegration'},

package/clients/cli/lib/exit-codes.test.mjs

@@ -34,7 +34,7 @@ manifest.commands.forEach(walk);
 
 describe('command exit codes', () => {
   it('every CommandDoc documents its exit codes', () => {
-    expect(commandDocs.length).toBeGreaterThan(30);
+    expect(commandDocs.length).toBeGreaterThan(25);
     for (const doc of commandDocs) {
       expect(doc.exitCodes?.length, doc.name).toBeGreaterThan(0);
     }
@@ -54,13 +54,6 @@ describe('command exit codes', () => {
     },
   );
 
-  it('bare `astryx layout` exits 1 in both modes, as documented', async () => {
-    const doc = commandDocs.find((d) => d.name === 'layout');
-    expect(doc.exitCodes.find((e) => e.code === 1)?.when).toMatch(/^no subcommand/);
-    expect((await runCli(['layout'])).status).toBe(1);
-    expect((await runCli(['layout', '--json'])).status).toBe(1);
-  });
-
   it('`astryx discover` with a blank query exits 1 only when packages are discovered', async () => {
     const doc = commandDocs.find((d) => d.name === 'discover');
     expect(doc.exitCodes.find((e) => e.code === 1)?.when).toMatch(/blank query when packages are discovered/);

package/clients/cli/lib/json-shim.test.mjs

@@ -225,23 +225,6 @@ describe('--json shim: help shown for a failed invocation is an error envelope',
     expect(parsed.error).toMatch(/bogus/);
   });
 
-  it('astryx layout --json (group, no subcommand) emits ERR_MISSING_ARGUMENT, exit 1', async () => {
-    const {status, stdout, stderr} = await runCli(['layout', '--json']);
-    expect(status).toBe(1);
-    expect(stderr).toBe('');
-    const parsed = parseJson(stdout);
-    expect(parsed).not.toHaveProperty('type');
-    expect(parsed.code).toBe('ERR_MISSING_ARGUMENT');
-    expect(parsed.suggestions.map((s) => s.name)).toContain('layout expand');
-  });
-
-  it('astryx layout (no --json) still prints help to stderr, exit 1', async () => {
-    const {status, stdout, stderr} = await runCli(['layout']);
-    expect(status).toBe(1);
-    expect(stdout).toBe('');
-    expect(stderr).toMatch(/Usage: astryx layout/);
-  });
-
   it('the real binary emits the same envelope for help bogus --json', () => {
     // One program per process, so the root's own outputHelp patch is used here.
     const bin = fileURLToPath(new URL('../bin/astryx.mjs', import.meta.url));
@@ -257,6 +240,9 @@ describe('--json shim: help shown for a failed invocation is an error envelope',
   });
 
   it('a group added after install gets the same error envelope', () => {
+    // This is the only coverage of the no-subcommand path: every group the CLI
+    // ships has an action of its own (see command-result-coverage.test.mjs), so
+    // a group without one has to be built here.
     const program = new Command('astryx');
     installJsonShim(program);
     // Added later, so only the prototype-level patch covers its outputHelp.
@@ -282,11 +268,11 @@ describe('--json shim: help shown for a failed invocation is an error envelope',
     expect(parsed.suggestions).toEqual([{name: 'late child', reason: 'available subcommand'}]);
   });
 
-  it('astryx help layout --json still emits the help envelope, exit 0', async () => {
-    const {status, stdout} = await runCli(['help', 'layout', '--json']);
+  it('astryx help theme --json still emits the help envelope, exit 0', async () => {
+    const {status, stdout} = await runCli(['help', 'theme', '--json']);
     expect(status).toBe(0);
     const parsed = parseJson(stdout);
     expect(parsed.type).toBe('help');
-    expect(parsed.data.command).toBe('astryx layout');
+    expect(parsed.data.command).toBe('astryx theme');
   });
 });

package/clients/cli/lib/manifest.mjs

@@ -100,9 +100,6 @@ export const RESPONSE_TYPES = {
   'doctor integration templates': ['integration.template-conflicts'],
   'doctor integration components': ['integration.component-conflicts'],
   'doctor integration docs': ['integration.doc-conflicts'],
-  'layout expand': ['layout.expand'],
-  'layout check': ['layout.check'],
-  'layout grammar': ['layout.grammar'],
 };
 
 /**
@@ -183,11 +180,6 @@ const EXAMPLES = {
     'astryx doctor integration docs @acme/widgets --json',
   ],
   init: ['astryx init', 'astryx init --all --json'],
-  'layout expand': [
-    `astryx layout expand 'V[g6] > C{card-callout}*4' ./src/Page.tsx`,
-  ],
-  'layout check': [`astryx layout check 'A[cp6] > L > LC > S[p6]' --json`],
-  'layout grammar': ['astryx layout grammar'],
 };
 
 /**

package/foundation/discovery/template-adapter.mjs

@@ -4,7 +4,7 @@
  * @file Shared template discovery + IO.
  *
  * Owns everything the template leaves (list/show/skeleton/copy) AND other
- * commands (component, layout, search, init, discover, Doctor integration)
+ * commands (component, search, init, discover, Doctor integration)
  * share: template discovery across core/external/integration sources, the
  * template-spec loaders, and the cross-command helpers (stripTemplateAssetRefs,
  * findShowcase, findRelatedBlocks, extractComponents, listTemplates). The

package/foundation/doc-compiler/doc-loads.test.mjs

@@ -191,18 +191,6 @@ const RUNNERS = {
       'import ./integration.doc.mjs',
     ],
   },
-  'clients/cli/commands/layout.mjs': {
-    runs: SELF_DOCS,
-    sites: [
-      'import ../../../api/layout/layoutCheck.doc.mjs',
-      'import ../../../api/layout/layoutExpand.doc.mjs',
-      'import ../../../api/layout/layoutGrammar.doc.mjs',
-      'import ./layout-check.doc.mjs',
-      'import ./layout-expand.doc.mjs',
-      'import ./layout-grammar.doc.mjs',
-      'import ./layout.doc.mjs',
-    ],
-  },
   'clients/cli/commands/search.mjs': {
     runs: SELF_DOCS,
     sites: [

package/foundation/response/response-types.doc.mjs

@@ -318,22 +318,5 @@ export const doc = {
       description:
         'The integration identity, structural issues, and Core doc overlaps. Each finding includes `severity` (`info` | `error`) and `relationship` (`replaces` | `extends` | `accidental`).',
     },
-
-    // layout (XLE/XLO)
-    {
-      value: 'layout.expand',
-      description:
-        'The expansion: parsed form, generated TSX code, componentsUsed, states (count of useState hooks scaffolded), todos, blocksReferenced (each {name, mode}), warnings, and written (the output path, or null when nothing was written).',
-    },
-    {
-      value: 'layout.check',
-      description:
-        'The validation result: a valid flag, the detected form, errors (each with line/col, message, formatted text, and suggestions), warnings, and the expression re-printed in both canonical surfaces (compact and outline).',
-    },
-    {
-      value: 'layout.grammar',
-      description:
-        "The XLE/XLO grammar cheatsheet: a text field with the full reference plus an aliases map (short name → canonical component) generated from this install's registry.",
-    },
   ],
 };

package/foundation/xle/browser.d.mts

@@ -2,8 +2,8 @@
 // DO NOT EDIT — run `pnpm sync:api-types` to regenerate.
 
 /**
- * Validate an expression and return both canonical surfaces — the browser
- * twin of `layout check`. Never throws on invalid input; returns the errors.
+ * Validate an expression and return both canonical surfaces. Never throws on
+ * invalid input; returns the errors.
  *
  * @param {string} expression
  * @param {import('./xle-ast').Registry | import('./browser').SerializedRegistry | object} registry - serialized or hydrated
@@ -19,7 +19,7 @@ export function checkExpression(expression: string, registry: import("./xle-ast"
     loose?: boolean | undefined;
 }): import("./browser").CheckResult;
 /**
- * Validate + expand to TSX — the browser twin of `layout expand`.
+ * Validate + expand to TSX.
  * Returns either {code, ...} or {errors} (never writes files).
  *
  * @param {string} expression

package/foundation/xle/browser.mjs

@@ -44,8 +44,8 @@ function formatIssue(issue) {
 }
 
 /**
- * Validate an expression and return both canonical surfaces — the browser
- * twin of `layout check`. Never throws on invalid input; returns the errors.
+ * Validate an expression and return both canonical surfaces. Never throws on
+ * invalid input; returns the errors.
  *
  * @param {string} expression
  * @param {import('./xle-ast').Registry | import('./browser').SerializedRegistry | object} registry - serialized or hydrated
@@ -85,7 +85,7 @@ export function checkExpression(expression, registry, opts = {}) {
 }
 
 /**
- * Validate + expand to TSX — the browser twin of `layout expand`.
+ * Validate + expand to TSX.
  * Returns either {code, ...} or {errors} (never writes files).
  *
  * @param {string} expression

package/foundation/xle/expand.mjs

@@ -13,7 +13,7 @@
  *
  * @input  validated doc (nodes carry .bound) + registry
  * @output expand() → {code, componentsUsed, states, todos}
- * @position lib/xle — last stage; api/layout.mjs orchestrates
+ * @position lib/xle — last stage; the browser barrel orchestrates
  */
 
 import {PAYLOAD_PROPS} from './validate.mjs';
@@ -751,7 +751,7 @@ export function expand(doc, registry, options = {}) {
     : [];
 
   const code = [
-    `// Generated by \`astryx layout expand\` — this file is the artifact; edit freely.`,
+    `// Generated by the Astryx XLE expander — this file is the artifact; edit freely.`,
     ...importLines,
     ...blockSection,
     '',

package/foundation/xle/parse.mjs

@@ -302,7 +302,7 @@ function parseAttrToken(token, line) {
  * Guard against unbounded recursion in the compact parser. A layout tree this
  * deep is never hand-authored; without the cap the recursive descent blows the
  * JS call stack and surfaces a raw RangeError (→ ERR_UNKNOWN, no line/col)
- * instead of a located ERR_LAYOUT_PARSE. The counter is module-level so it
+ * instead of a located parse error. The counter is module-level so it
  * spans group / attribute sub-streams; each parse entry point resets it.
  */
 const MAX_COMPACT_DEPTH = 512;

package/foundation/xle/print.mjs

@@ -3,8 +3,8 @@
 /**
  * @file XLE canonical printers — AST → compact (XLE) or outline (XLO) text.
  *
- * Used by `astryx layout check --form …` so either party (agent or human)
- * can request the other surface, and by round-trip conformance tests.
+ * Used by `checkExpression` so either party (agent or human) can request the
+ * other surface, and by round-trip conformance tests.
  * Printing is best-effort canonical: spelling variants the lexer
  * normalized are emitted in canonical form.
  *

package/foundation/xle/splice.mjs

@@ -18,7 +18,7 @@
  *
  * @input  block TSX source (splice) or a name+importPath (import)
  * @output prepareSpliceModule / parseImportStatements + import-merge helpers
- * @position lib/xle — used by expand.mjs; sources gathered in api/layout.mjs
+ * @position lib/xle — used by expand.mjs; sources gathered by the caller
  */
 
 const IMPORT_RE =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.6.4-canary.9143f03",
+  "version": "0.6.4-canary.9cc70a9",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -101,10 +101,10 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@astryxdesign/charts": "0.6.4-canary.9143f03",
-    "@astryxdesign/core": "0.6.4-canary.9143f03",
-    "@astryxdesign/lab": "0.6.4-canary.9143f03",
-    "@astryxdesign/theme-neutral": "0.6.4-canary.9143f03"
+    "@astryxdesign/charts": "0.6.4-canary.9cc70a9",
+    "@astryxdesign/core": "0.6.4-canary.9cc70a9",
+    "@astryxdesign/lab": "0.6.4-canary.9cc70a9",
+    "@astryxdesign/theme-neutral": "0.6.4-canary.9cc70a9"
   },
   "peerDependenciesMeta": {
     "@astryxdesign/charts": {
@@ -121,10 +121,10 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/charts": "0.6.4-canary.9143f03",
-    "@astryxdesign/core": "0.6.4-canary.9143f03",
-    "@astryxdesign/lab": "0.6.4-canary.9143f03",
-    "@astryxdesign/theme-neutral": "0.6.4-canary.9143f03",
+    "@astryxdesign/charts": "0.6.4-canary.9cc70a9",
+    "@astryxdesign/core": "0.6.4-canary.9cc70a9",
+    "@astryxdesign/lab": "0.6.4-canary.9cc70a9",
+    "@astryxdesign/theme-neutral": "0.6.4-canary.9cc70a9",
     "@heroicons/react": "^2.2.0",
     "@stylexjs/stylex": "^0.19.0",
     "@types/babel__core": "^7.20.5",