@astryxdesign/cli 0.1.4-canary.cb78dd0 → 0.1.4-canary.cb964b6

package/CHANGELOG.md

@@ -36,7 +36,7 @@ Thanks to everyone who contributed to this release:
 - Strict config + integration v1 schema (integrations, issuesUrl, hooks.postCodemod) and new @astryxdesign/cli/integration export.
 - File-based codemod API (createCodemod/createConfigCodemod) with the @astryxdesign/cli/codemod export and integration codemod discovery in upgrade.
 - component, template, and upgrade now print a one-line non-blocking warning when a configured integration has validation issues, pointing to validate-integration.
-- Add a Kanban Board page template: color-coded status columns, draggable task cards with priority tags, and board toolbar. Based on a design by @cg-hub18.
+- Add a Kanban Board page template: color-coded status columns, draggable task cards with priority tags, and board toolbar.
 - Add frame-first layout guidance: new `astryx docs layout` topic (shell choice, region budgets, app archetypes, cards-vs-rows policy, responsive contracts), layout rules in the generated agent cheat sheet, and layout anti-patterns in `docs principles`.
 - Add a v0.1.3 config codemod that migrates astryx.config layout.components to experimental.xle.components.
 - Add v0.1.0 codemods for migrating `declare module "@xds/core/..."` type augmentations and `.xds-*` / `[data-xds-theme]` / `@layer xds-theme` CSS surfaces to their `@astryxdesign`/`astryx-*` equivalents.
@@ -80,7 +80,6 @@ Thanks to everyone who contributed to this release:
 Thanks to everyone who contributed to this release:
 
 - @AKnassa
-- @cg-hub18
 - @ejhammond
 - @ernestt
 - @harshavardhan194

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.4-canary.cb78dd0",
+  "version": "0.1.4-canary.cb964b6",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -75,16 +75,12 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@astryxdesign/charts": "0.1.4-canary.cb78dd0",
-    "@astryxdesign/core": "0.1.4-canary.cb78dd0",
-    "@astryxdesign/lab": "0.1.4-canary.cb78dd0",
-    "@astryxdesign/theme-neutral": "0.1.4-canary.cb78dd0",
-    "gpt-tokenizer": "^3.4.0"
+    "@astryxdesign/core": "0.1.4-canary.cb964b6",
+    "@astryxdesign/lab": "0.1.4-canary.cb964b6",
+    "@astryxdesign/theme-neutral": "0.1.4-canary.cb964b6",
+    "gpt-tokenizer": "^2.0.0"
   },
   "peerDependenciesMeta": {
-    "@astryxdesign/charts": {
-      "optional": true
-    },
     "@astryxdesign/core": {
       "optional": true
     },
@@ -96,11 +92,10 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/charts": "0.1.4-canary.cb78dd0",
-    "@astryxdesign/core": "0.1.4-canary.cb78dd0",
-    "@astryxdesign/lab": "0.1.4-canary.cb78dd0",
-    "@astryxdesign/theme-neutral": "0.1.4-canary.cb78dd0",
-    "gpt-tokenizer": "^3.4.0"
+    "@astryxdesign/core": "0.1.4-canary.cb964b6",
+    "@astryxdesign/lab": "0.1.4-canary.cb964b6",
+    "@astryxdesign/theme-neutral": "0.1.4-canary.cb964b6",
+    "gpt-tokenizer": "^2.0.0"
   },
   "scripts": {
     "astryx": "node bin/astryx.mjs",

package/src/api/component.mjs

@@ -8,7 +8,6 @@
  */
 
 import * as fs from 'node:fs';
-import * as path from 'node:path';
 import {ERROR_CODES} from '../lib/error-codes.mjs';
 import {findCoreDir, discoverExternalPackages} from '../utils/paths.mjs';
 import {
@@ -561,7 +560,7 @@ export async function component(name, options = {}) {
 
     // Examples: blocks in the component's own directory, or
     // componentsUsed match for sub-components without a directory.
-    const ownDir = allBlocks.filter(b => path.basename(b.category) === dirName);
+    const ownDir = allBlocks.filter(b => b.category.split('/').pop() === dirName);
     const examples = ownDir.length > 0
       ? ownDir
       : allBlocks.filter(b => b.componentsUsed?.some(c => c === dirName));

package/src/api/doctor.mjs

@@ -115,21 +115,10 @@ function findThemePackages(cwd) {
     return found;
   }
   for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
     if (!entry.name.startsWith('theme-')) continue;
-    const dir = path.join(scopeDir, entry.name);
-    // pnpm installs packages as symlinks into node_modules/.pnpm, and a
-    // symlink dirent reports isDirectory() as false — stat the target instead.
-    let isDir = entry.isDirectory();
-    if (!isDir && entry.isSymbolicLink()) {
-      try {
-        isDir = fs.statSync(dir).isDirectory();
-      } catch {
-        isDir = false;
-      }
-    }
-    if (!isDir) continue;
     const name = `@astryxdesign/${entry.name}`;
-    found.push({name, version: pkgVersion(dir)});
+    found.push({name, version: pkgVersion(path.join(scopeDir, entry.name))});
   }
   return found;
 }

package/src/api/template.mjs

@@ -63,17 +63,6 @@ const DEMO_IMAGE_PATTERNS = [
   /https?:\/\/(?:[\w-]+\.)*lookaside\.facebook\.com\/[^\s'"`)]+/g,
 ];
 
-/**
- * Normalize path into Unix path (using forward slashes) for consistent comparison
- * across Windows, macOS, and Linux.
- *
- * @param {string} p - The file path to normalize.
- * @returns {string} The normalized Unix path.
- */
-function toPosixPath(p) {
-  return p.replace(/\\/g, '/');
-}
-
 /**
  * Replace demo image references with a self-contained placeholder data URI so
  * scaffolded pages render with zero setup. Builders drop in their own images.
@@ -155,7 +144,7 @@ async function discoverBlocks() {
     const tsxPath = path.join(path.dirname(docPath), basename + '.tsx');
     if (!fs.existsSync(tsxPath)) continue;
     const doc = await loadDocModule(docPath);
-    const relPath = toPosixPath(path.relative(BLOCKS_DIR, path.dirname(docPath)));
+    const relPath = path.relative(BLOCKS_DIR, path.dirname(docPath));
     blocks.push({
       type: 'block',
       dirName: basename,
@@ -191,7 +180,7 @@ async function discoverExternalBlocks(cwd = process.cwd()) {
       const tsxPath = path.join(path.dirname(docPath), basename + '.tsx');
       if (!fs.existsSync(tsxPath)) continue;
       const doc = await loadDocModule(docPath);
-      const relPath = toPosixPath(path.relative(ext.blocksDir, path.dirname(docPath)));
+      const relPath = path.relative(ext.blocksDir, path.dirname(docPath));
       blocks.push({
         type: 'block',
         dirName: basename,
@@ -439,7 +428,7 @@ export async function findShowcase(componentName, cwd, options) {
 
   // Priority 1: own directory (components/Badge/ for "Badge")
   const dirMatch = showcases.find(b => {
-    const catDir = path.basename(b.category).toLowerCase();
+    const catDir = b.category.split('/').pop()?.toLowerCase();
     return catDir === lc;
   });
   if (dirMatch) return toResult(dirMatch);

package/src/codemods/__tests__/runner.test.mjs

@@ -99,43 +99,5 @@ describe('runCodemods — unified config codemod path', () => {
     expect(fs.readFileSync(path.join(srcDir, 'a.ts'), 'utf-8')).toContain(
       'const bar = 1',
     );
-    // writtenFiles must be returned (consumed by upgrade.mjs to run the
-    // post-codemod formatting/lint hooks). Regression guard: it was previously
-    // built internally but omitted from the return object, so hooks received an
-    // empty file list and silently skipped, leaving codemod output unformatted.
-    expect(result.writtenFiles).toEqual([path.join(srcDir, 'a.ts')]);
-  });
-
-  it('returns writtenFiles for every changed file (post-codemod hook input)', async () => {
-    const srcDir = path.join(tmpDir, 'src');
-    fs.mkdirSync(srcDir);
-    fs.writeFileSync(path.join(srcDir, 'a.ts'), 'const foo = 1;\n');
-    fs.writeFileSync(path.join(srcDir, 'b.ts'), 'const foo = 2;\n');
-    fs.writeFileSync(path.join(srcDir, 'c.ts'), 'const untouched = 3;\n');
-
-    const versionManifests = [
-      {
-        version: '0.1.3',
-        transforms: [
-          {
-            name: 'synthetic-code-codemod',
-            meta: {title: 'Synthetic code codemod'},
-            transform: file => file.source.replace(/foo/g, 'bar'),
-          },
-        ],
-      },
-    ];
-
-    const result = await runCodemods(versionManifests, {
-      apply: true,
-      path: './src',
-      silent: true,
-    });
-
-    expect(result.totalFilesChanged).toBe(2);
-    // Only the two files that actually changed are reported (not c.ts).
-    expect([...result.writtenFiles].sort()).toEqual(
-      [path.join(srcDir, 'a.ts'), path.join(srcDir, 'b.ts')].sort(),
-    );
   });
 });

package/src/codemods/runner.mjs

@@ -178,7 +178,6 @@ function toUnifiedEntry(transformEntry, version) {
  * @param {string|undefined} options.codemod - Run only this specific transform
  * @param {Set<string>} [options.skipCodemods] - Transform names to exclude
  * @param {boolean} [options.silent] - Suppress all human-facing output (for --json)
- * @returns {{totalFilesChanged: number, totalTransformsApplied: number, totalValidationBlocked: number, writtenFiles: string[], errors: Array, skippedOptional: Array}}
  */
 export async function runCodemods(
   versionManifests,
@@ -406,7 +405,6 @@ export async function runCodemods(
     totalFilesChanged,
     totalTransformsApplied,
     totalValidationBlocked,
-    writtenFiles,
     errors,
     skippedOptional,
   };

package/src/commands/agent-docs.mjs

@@ -9,12 +9,11 @@
  * - Claude Code: CLAUDE.md (root) or .claude/CLAUDE.md
  * - Cursor: .cursorrules
  * - Codex/generic: AGENTS.md
- * - Hermes Agent: .hermes.md or HERMES.md (existing), else AGENTS.md
  *
  * Auto-detect: discovers existing files and updates them in place.
  * Default (no existing files): creates .claude/CLAUDE.md.
  *
- * --agent <tool>: target a specific tool preset (claude, cursor, codex, hermes, all)
+ * --agent <tool>: target a specific tool preset (claude, cursor, codex, all)
  * --agent-docs-path <path>: explicit file path(s)
  */
 
@@ -30,8 +29,7 @@ import {ERROR_CODES} from '../lib/error-codes.mjs';
 
 const AGENTS_MD = 'AGENTS.md';
 const CLAUDE_MD = 'CLAUDE.md';
-const CLAUDE_DIR_MD = '.claude/CLAUDE.md'; // cross-platform literal
-
+const CLAUDE_DIR_MD = path.join('.claude', 'CLAUDE.md');
 
 const MARKER_START = '<!-- ASTRYX:START -->';
 const MARKER_END = '<!-- ASTRYX:END -->';
@@ -47,7 +45,6 @@ const AGENT_PRESETS = {
   claude: [CLAUDE_MD, CLAUDE_DIR_MD],
   cursor: ['.cursorrules', AGENTS_MD],
   codex: [AGENTS_MD],
-  hermes: ['.hermes.md', 'HERMES.md', AGENTS_MD],
 };
 
 /**
@@ -66,7 +63,7 @@ export function discoverAgentDocs(targetDir) {
  * Searches for existing files first, falls back to default creation path.
  *
  * @param {string} targetDir
- * @param {string} agent - Preset name: 'claude', 'cursor', 'codex', 'hermes', 'all'
+ * @param {string} agent - Preset name: 'claude', 'cursor', 'codex', 'all'
  * @returns {{inject: string[], create: string[]}} Files to inject into vs create fresh
  */
 export function resolveAgentPaths(targetDir, agent) {
@@ -388,7 +385,7 @@ export function removeAgentDocs(targetDir) {
  * @param {object} [options]
  * @param {boolean} [options.zh]
  * @param {string} [options.lang]
- * @param {string} [options.agent] - Tool preset: 'claude', 'cursor', 'codex', 'hermes', 'all'
+ * @param {string} [options.agent] - Tool preset: 'claude', 'cursor', 'codex', 'all'
  * @param {string[]} [options.paths] - Explicit paths (overrides agent/auto-detect)
  * @param {boolean} [options.onlyReplace] - Only update files that already have Astryx markers (for upgrades)
  * @returns {string[]} List of files written
@@ -470,14 +467,14 @@ export function installAgentDocs(targetDir, {zh = false, lang, agent, paths, onl
   return written;
 }
 
-const VALID_AGENTS = ['claude', 'cursor', 'codex', 'hermes', 'all'];
+const VALID_AGENTS = ['claude', 'cursor', 'codex', 'all'];
 
 export function registerAgentDocs(program) {
   program
     .command('agent-docs')
     .description('Install/update the component index for AI coding agents')
     .option('--remove', 'Remove the design system section from all agent doc files')
-    .option('--agent <tool>', 'Target tool: claude, cursor, codex, hermes, all')
+    .option('--agent <tool>', 'Target tool: claude, cursor, codex, all')
     .option('--agent-docs-path <path...>', 'Explicit file path(s) to write to')
     .action(options => {
       const targetDir = process.cwd();

package/src/commands/agent-docs.test.mjs

@@ -449,17 +449,6 @@ describe('installAgentDocs', () => {
     expect(fs.existsSync(path.join(tmpDir, 'AGENTS.md'))).toBe(true);
   });
 
-  it('respects --agent hermes preset: creates AGENTS.md', () => {
-    setupCorePackage(tmpDir);
-
-    const written = installAgentDocs(tmpDir, {agent: 'hermes'});
-
-    expect(written).toEqual(['AGENTS.md']);
-    const content = fs.readFileSync(path.join(tmpDir, 'AGENTS.md'), 'utf-8');
-    expect(content).toContain('<!-- ASTRYX:START -->');
-    expect(fs.existsSync(path.join(tmpDir, '.claude'))).toBe(false);
-  });
-
   it('respects explicit --paths', () => {
     setupCorePackage(tmpDir);
 
@@ -559,26 +548,4 @@ describe('resolveAgentPaths', () => {
     expect(result.create).toContain('AGENTS.md');
     expect(result.create).toContain('.claude/CLAUDE.md');
   });
-
-  it('hermes preset creates AGENTS.md when nothing exists', () => {
-    const result = resolveAgentPaths(tmpDir, 'hermes');
-    expect(result).toEqual({inject: [], create: ['AGENTS.md']});
-  });
-
-  it('hermes preset finds existing .hermes.md', () => {
-    fs.writeFileSync(path.join(tmpDir, '.hermes.md'), '');
-    const result = resolveAgentPaths(tmpDir, 'hermes');
-    expect(result).toEqual({inject: ['.hermes.md'], create: []});
-  });
-
-  it('hermes preset finds existing HERMES.md when no .hermes.md', () => {
-    fs.writeFileSync(path.join(tmpDir, 'HERMES.md'), '');
-    const result = resolveAgentPaths(tmpDir, 'hermes');
-    expect(result).toEqual({inject: ['HERMES.md'], create: []});
-  });
-
-  it('claude preset still creates .claude/CLAUDE.md when nothing exists (hermes is additive)', () => {
-    const result = resolveAgentPaths(tmpDir, 'claude');
-    expect(result).toEqual({inject: [], create: ['.claude/CLAUDE.md']});
-  });
 });

package/src/commands/build-theme.mjs

@@ -175,85 +175,14 @@ async function getKnownValues(componentName) {
   return _knownValuesCache.get(componentName);
 }
 
-/**
- * Resolve `@astryxdesign/core`'s package root relative to the CLI package. Core
- * and the CLI ship as siblings (`@astryxdesign/core`, `@astryxdesign/cli`), so
- * `../../../core` from `src/commands/` reaches core whether installed from npm
- * or run inside the monorepo. Returns null if it can't be found.
- */
-function resolveCoreRoot() {
-  const cliDir = path.dirname(fileURLToPath(import.meta.url));
-  const coreRoot = path.resolve(cliDir, '../../../core');
-  return fs.existsSync(coreRoot) ? coreRoot : null;
-}
-
-/**
- * Read the type declarations `@astryxdesign/core/<Component>` exposes so we can
- * check whether a given augmentation-target interface actually exists before
- * generating a module augmentation against it.
- *
- * Reads the shipped `dist/<Component>/index.d.ts` (what a consumer's TypeScript
- * actually sees), falling back to the `src/<Component>/index.ts` in the
- * monorepo. Returns the file contents, or '' if nothing is found.
- */
-const _componentDeclCache = new Map();
-function readComponentDeclarations(pascalName) {
-  if (_componentDeclCache.has(pascalName)) {
-    return _componentDeclCache.get(pascalName);
-  }
-  let contents = '';
-  const coreRoot = resolveCoreRoot();
-  if (coreRoot) {
-    const candidates = [
-      path.join(coreRoot, 'dist', pascalName, 'index.d.ts'),
-      path.join(coreRoot, 'src', pascalName, 'index.ts'),
-    ];
-    for (const file of candidates) {
-      try {
-        if (fs.existsSync(file)) {
-          contents = fs.readFileSync(file, 'utf-8');
-          break;
-        }
-      } catch {
-        // ignore and try the next candidate
-      }
-    }
-  }
-  _componentDeclCache.set(pascalName, contents);
-  return contents;
-}
-
-/**
- * Determine whether `@astryxdesign/core/<Component>` exports an interface named
- * `interfaceName` that can be augmented via module augmentation.
- *
- * Only interfaces are extension points — closed literal-union types (e.g.
- * `HeadingType`, `ButtonSize`) are NOT augmentable, so a generated augmentation
- * against them is dead code. We check that the name is exported (directly or
- * re-exported) as a type/interface.
- */
-function componentHasAugmentableInterface(pascalName, interfaceName) {
-  const decl = readComponentDeclarations(pascalName);
-  if (!decl) return false;
-  // Word-boundary match so `ButtonVariantMap` doesn't match `XButtonVariantMap`.
-  const re = new RegExp(`\\b${interfaceName}\\b`);
-  return re.test(decl);
-}
-
 /**
  * Generate TypeScript declaration content with module augmentation for custom
  * component prop values found in the theme's `components` keys. Reads known
  * values from doc files to filter out base prop values.
  *
- * Interface naming convention: PascalCase(component) + PascalCase(prop) + Map
- *   banner + status → BannerStatusMap
- *   button + variant → ButtonVariantMap
- *
- * An augmentation is only emitted when `@astryxdesign/core/<Component>` actually
- * exports a matching interface. Props backed by closed literal-union types
- * (e.g. Button `size`, Heading `type`/`level`) have no augmentation point, so
- * generating a `declare module` block for them would be dead code — those are
- * skipped.
+ * Interface naming convention: Astryx + PascalCase(component) + PascalCase(prop) + Map
+ *   banner + status → XDSBannerStatusMap
+ *   button + variant → XDSButtonVariantMap
  *
  * @param {object} themeDef - Theme definition (resolved by defineTheme)
  * @returns {Promise<string|null>} TypeScript declaration content, or null if no augmentations needed
@@ -305,14 +234,7 @@ async function generateVariantDeclarationsAsync(themeDef) {
       const pascal = toPascalCase(component);
       const propPascal = prop.charAt(0).toUpperCase() + prop.slice(1);
       const modulePath = `@astryxdesign/core/${pascal}`;
-      const interfaceName = `${pascal}${propPascal}Map`;
-
-      // Only augment interfaces that actually exist as an extension point in
-      // core. Props backed by closed literal-union types (e.g. Button `size`,
-      // Heading `type`/`level`) have no `*Map` interface — a `declare module`
-      // block against a non-existent interface just creates a new, unused
-      // interface and never extends the component's prop union, so skip it.
-      if (!componentHasAugmentableInterface(pascal, interfaceName)) continue;
+      const interfaceName = `XDS${pascal}${propPascal}Map`;
 
       sections.push(`declare module '${modulePath}' {`);
       sections.push(`  interface ${interfaceName} {`);
@@ -325,13 +247,6 @@ async function generateVariantDeclarationsAsync(themeDef) {
     }
   }
 
-  // If every custom value targeted a non-augmentable prop, there's nothing to
-  // emit beyond the header — return null so no `.variants.d.ts` is written.
-  const hasEmittedAugmentation = sections.some(line =>
-    line.startsWith('declare module'),
-  );
-  if (!hasEmittedAugmentation) return null;
-
   return sections.join('\n');
 }
 
@@ -518,21 +433,13 @@ ${iconReExport}`;
 /**
  * Generate TypeScript declarations for a built theme module.
  */
-function generateBuiltTypes(themeDef, iconInfo, variantsFileName) {
+function generateBuiltTypes(themeDef, iconInfo) {
   const iconType = iconInfo
     ? `import type { IconRegistry } from '@astryxdesign/core/Icon';
 export declare const ${iconInfo.exportName}: IconRegistry;
 `
     : '';
-  // Pull in the generated custom-variant augmentations so that importing the
-  // theme's types also loads the module augmentations (otherwise the
-  // `.variants.d.ts` is emitted but never referenced, and the custom variants
-  // never widen the component prop unions for consumers).
-  const variantsRef = variantsFileName
-    ? `/// <reference path="./${variantsFileName}" />
-`
-    : '';
-  return `${variantsRef}import type { DefinedTheme } from '@astryxdesign/core/theme';
+  return `import type { DefinedTheme } from '@astryxdesign/core/theme';
 ${iconType}export declare const ${toIdentifier(themeDef.name)}Theme: DefinedTheme;
 `;
 }
@@ -987,23 +894,19 @@ export function registerTheme(program) {
 
       const iconInfo = extractIconInfo(filePath);
 
-      // Type augmentation .d.ts if theme has custom prop values. Computed
-      // before the main .d.ts so the latter can reference it (see below).
+      // Generate all file contents in memory first.
+      const cssContent = generatedHeader(sourceRelative, 'css', buildCommand) + css;
+      const jsContent = generatedHeader(sourceRelative, 'js', buildCommand) + generateBuiltModule(resolvedTheme || themeDef, iconInfo);
+      const dtsContent = generatedHeader(sourceRelative, 'ts', buildCommand) + generateBuiltTypes(themeDef, iconInfo);
+
+      // Type augmentation .d.ts if theme has custom prop values
       const augmentationSource = resolvedTheme || themeDef;
       const variantDecl = await generateVariantDeclarationsAsync(augmentationSource);
-      const variantsFileName = variantDecl ? `${baseName}.variants.d.ts` : null;
-      const variantDtsPath = variantDecl ? path.join(outDir, variantsFileName) : null;
+      const variantDtsPath = variantDecl ? path.join(outDir, `${baseName}.variants.d.ts`) : null;
       const variantContent = variantDecl
         ? generatedHeader(sourceRelative, 'ts', buildCommand) + variantDecl
         : null;
 
-      // Generate all file contents in memory first. The main .d.ts references
-      // the variants file (when present) via a triple-slash directive so
-      // importing the theme also loads the custom-variant augmentations.
-      const cssContent = generatedHeader(sourceRelative, 'css', buildCommand) + css;
-      const jsContent = generatedHeader(sourceRelative, 'js', buildCommand) + generateBuiltModule(resolvedTheme || themeDef, iconInfo);
-      const dtsContent = generatedHeader(sourceRelative, 'ts', buildCommand) + generateBuiltTypes(themeDef, iconInfo, variantsFileName);
-
       // Atomic-ish write: stage every file as `<dest>.tmp`, then rename
       // each into place. If any stage step fails we clean up partials and
       // exit; if a rename fails mid-way we still have the originals (or

package/src/commands/component-resolution.test.mjs

@@ -78,13 +78,13 @@ describe('findShowcase() priority', () => {
   it('Badge resolves to Badge dir, not a sibling that uses Badge', async () => {
     const result = await findShowcase('Badge');
     expect(result).not.toBeNull();
-    expect(result.filePath).toMatch(/[/\\]Badge[/\\]/);
+    expect(result.filePath).toMatch(/\/Badge\//);
   });
 
   it('Avatar resolves to Avatar dir, not AvatarStatusDot', async () => {
     const result = await findShowcase('Avatar');
     expect(result).not.toBeNull();
-    expect(result.filePath).toMatch(/[/\\]Avatar[/\\]/);
+    expect(result.filePath).toMatch(/\/Avatar\//);
     expect(result.filePath).not.toMatch(/AvatarStatusDot/);
   });
 
@@ -92,7 +92,7 @@ describe('findShowcase() priority', () => {
     const result = await findShowcase('ClickableCard');
     expect(result).not.toBeNull();
     expect(result.name).toBe('ClickableCard');
-    expect(result.filePath).toMatch(/[/\\]Card[/\\]/);
+    expect(result.filePath).toMatch(/\/Card\//);
   });
 
   it('SelectableCard resolves via componentsUsed in Card/', async () => {
@@ -104,7 +104,7 @@ describe('findShowcase() priority', () => {
   it('Stack resolves to Stack dir despite componentsUsed elsewhere', async () => {
     const result = await findShowcase('Stack');
     expect(result).not.toBeNull();
-    expect(result.filePath).toMatch(/[/\\]Stack[/\\]/);
+    expect(result.filePath).toMatch(/\/Stack\//);
   });
 
   it('returns null for nonexistent component', async () => {

package/src/commands/doctor.test.mjs

@@ -63,33 +63,6 @@ function installPkg(name, version = '1.0.0') {
   return dir;
 }
 
-/**
- * Mirror pnpm's layout: the real package lives under node_modules/.pnpm and
- * the entry in the scope directory is a symlink to it.
- */
-function installPkgPnpmStyle(name, version = '1.0.0') {
-  const realDir = path.join(
-    tmpDir,
-    'node_modules',
-    '.pnpm',
-    `${name.replace('/', '+')}@${version}`,
-    'node_modules',
-    ...name.split('/'),
-  );
-  fs.mkdirSync(realDir, {recursive: true});
-  fs.writeFileSync(
-    path.join(realDir, 'package.json'),
-    JSON.stringify({name, version, main: 'index.js'}),
-  );
-  fs.writeFileSync(path.join(realDir, 'index.js'), 'module.exports = {};');
-  const linkPath = path.join(tmpDir, 'node_modules', ...name.split('/'));
-  fs.mkdirSync(path.dirname(linkPath), {recursive: true});
-  // 'junction' keeps this working on Windows without elevated permissions;
-  // it is ignored on posix.
-  fs.symlinkSync(realDir, linkPath, 'junction');
-  return linkPath;
-}
-
 function find(checks, id) {
   return checks.find(c => c.id === id);
 }
@@ -146,13 +119,6 @@ describe('doctor — individual checks', () => {
     expect(res.status).toBe('pass');
   });
 
-  it('themes: detects pnpm-style symlinked theme packages (#3530)', () => {
-    installPkgPnpmStyle('@astryxdesign/theme-neutral', '0.1.2');
-    const res = checkThemes({cwd: tmpDir, configTheme: 'default'});
-    expect(res.status).toBe('pass');
-    expect(res.message).toContain('@astryxdesign/theme-neutral');
-  });
-
   it('config: INFO when no astryx.config.mjs', async () => {
     const res = await checkConfig({cwd: tmpDir, configPath: null});
     expect(res.status).toBe('info');

package/src/commands/init.mjs

@@ -198,7 +198,7 @@ export function registerInit(program) {
     .option('--features <list>', 'Comma-separated features to install (agents, theme, template)')
     .option('--all', 'Install all features, no prompts')
     .option('--remove-agents', 'Remove AI agent docs from all agent doc files')
-    .option('--agent <tool>', 'Target AI tool for agent docs: claude, cursor, codex, hermes, all')
+    .option('--agent <tool>', 'Target AI tool for agent docs: claude, cursor, codex, all')
     .option('--agent-docs-path <path...>', 'Explicit file path(s) for agent docs')
     .action(async (options) => {
       const targetDir = process.cwd();

package/src/lib/component-discovery.mjs

@@ -335,13 +335,10 @@ export function resolveImportPath(coreDir, componentName) {
     ? JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
     : null;
 
-  const exportKeys = Object.keys(pkg?.exports || {});
-
   // Priority 1: exact subpath export matching the component name (e.g. ./Heading)
   // This allows convenience re-export directories to win over the source directory.
-  const exactMatch = exportKeys.find(k => k.toLowerCase() === `./${componentName}`.toLowerCase());
-  if (exactMatch) {
-    return `@astryxdesign/core/${exactMatch.slice(2)}`;
+  if (pkg?.exports?.[`./${componentName}`]) {
+    return `@astryxdesign/core/${componentName}`;
   }
 
   const sourcePath = findComponentSource(coreDir, componentName);
@@ -351,9 +348,8 @@ export function resolveImportPath(coreDir, componentName) {
   const relToSrc = path.relative(srcDir, sourcePath);
   const topDir = relToSrc.split(path.sep)[0];
 
-  const topMatch = exportKeys.find(k => k.toLowerCase() === `./${topDir}`.toLowerCase());
-  if (topMatch) {
-    return `@astryxdesign/core/${topMatch.slice(2)}`;
+  if (pkg?.exports?.[`./${topDir}`]) {
+    return `@astryxdesign/core/${topDir}`;
   }
 
   return '@astryxdesign/core';