@astryxdesign/cli 0.1.7-canary.c0ff997 → 0.1.7-canary.cbfb48e

package/docs/working-with-ai.doc.mjs

@@ -42,13 +42,13 @@ export const docs = {
         },
         {
           type: 'prose',
-          text: 'By default this creates `AGENTS.md` (the tool-agnostic standard most agents read). To target a specific tool\'s file instead:',
+          text: 'If you prefer to target a specific file format:',
         },
         {
           type: 'code',
           lang: 'bash',
           label: 'Manual options',
-          code: `npx @astryxdesign/cli init --features agents --agent claude    # .claude/CLAUDE.md
+          code: `npx @astryxdesign/cli init --features agents --agent claude    # CLAUDE.md
 npx @astryxdesign/cli init --features agents --agent cursor    # .cursorrules
 npx @astryxdesign/cli init --features agents --agent codex     # AGENTS.md (Copilot, Codex, etc.)`,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.7-canary.c0ff997",
+  "version": "0.1.7-canary.cbfb48e",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -79,10 +79,10 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@astryxdesign/charts": "0.1.7-canary.c0ff997",
-    "@astryxdesign/core": "0.1.7-canary.c0ff997",
-    "@astryxdesign/lab": "0.1.7-canary.c0ff997",
-    "@astryxdesign/theme-neutral": "0.1.7-canary.c0ff997",
+    "@astryxdesign/charts": "0.1.7-canary.cbfb48e",
+    "@astryxdesign/core": "0.1.7-canary.cbfb48e",
+    "@astryxdesign/lab": "0.1.7-canary.cbfb48e",
+    "@astryxdesign/theme-neutral": "0.1.7-canary.cbfb48e",
     "gpt-tokenizer": "^3.4.0"
   },
   "peerDependenciesMeta": {
@@ -100,10 +100,10 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/charts": "0.1.7-canary.c0ff997",
-    "@astryxdesign/core": "0.1.7-canary.c0ff997",
-    "@astryxdesign/lab": "0.1.7-canary.c0ff997",
-    "@astryxdesign/theme-neutral": "0.1.7-canary.c0ff997",
+    "@astryxdesign/charts": "0.1.7-canary.cbfb48e",
+    "@astryxdesign/core": "0.1.7-canary.cbfb48e",
+    "@astryxdesign/lab": "0.1.7-canary.cbfb48e",
+    "@astryxdesign/theme-neutral": "0.1.7-canary.cbfb48e",
     "gpt-tokenizer": "^3.4.0"
   },
   "scripts": {

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

@@ -21,7 +21,6 @@ describe('registry', () => {
         '0.1.3',
         '0.1.5',
         '0.1.7',
-        '0.1.8',
       ]);
     });
   });

package/src/codemods/registry.mjs

@@ -22,7 +22,6 @@ const registry = new Map([
   ['0.1.3', () => import('./transforms/v0.1.3/index.mjs')],
   ['0.1.5', () => import('./transforms/v0.1.5/index.mjs')],
   ['0.1.7', () => import('./transforms/v0.1.7/index.mjs')],
-  ['0.1.8', () => import('./transforms/v0.1.8/index.mjs')],
 ]);
 
 // Re-export from the shared utility so registry callers and other consumers

package/src/codemods/transforms/v0.1.0/__tests__/drop-xds-prefix-imports.test.mjs

@@ -166,50 +166,15 @@ describe('drop-xds-prefix-imports', () => {
     expect(output).toContain('export const other = Card;');
   });
 
-  it('un-prefixes override keys inside an @xds/core mock factory', async () => {
+  it('un-prefixes normally when there is NO local collision', async () => {
     const input = [
-      `vi.mock('@xds/core/Text', async orig => ({`,
-      `  ...(await orig<typeof import('@xds/core/Text')>()),`,
-      `  useXDSTruncation: () => ({ref: vi.fn(), isTruncated: true, fullText: ''}),`,
-      `}));`,
-    ].join('\n');
-    const output = await applyTransform(input);
-    expect(output).toContain('useTruncation:');
-    expect(output).not.toContain('useXDSTruncation');
-    // This codemod does not touch the module-path string (that is the
-    // module-specifiers codemod's job); the @xds/core/Text path stays here.
-    expect(output).toContain(`vi.mock('@xds/core/Text'`);
-  });
-
-  it('un-prefixes component override keys inside a bare @xds/core jest.mock factory', async () => {
-    const input = [
-      `jest.mock('@xds/core', () => ({`,
-      `  XDSButton: () => null,`,
-      `  useXDSToast: () => ({}),`,
-      `}));`,
-    ].join('\n');
-    const output = await applyTransform(input);
-    expect(output).toContain('Button:');
-    expect(output).toContain('useToast:');
-    expect(output).not.toContain('XDSButton');
-    expect(output).not.toContain('useXDSToast');
-  });
-
-  it('does NOT touch mock factory keys for a non-@xds package', async () => {
-    const input = [
-      `vi.mock('some-other-pkg', () => ({`,
-      `  useXDSFoo: () => 1,`,
-      `}));`,
+      `import {XDSCodeBlock} from '@xds/core/CodeBlock';`,
+      `export const App = () => <XDSCodeBlock code="x" />;`,
     ].join('\n');
     const output = await applyTransform(input);
-    expect(output).toBe(input);
-  });
-
-  it('does NOT touch useXDS keys in an unrelated object literal (not a mock factory)', async () => {
-    const input = [`const config = {`, `  useXDSWhatever: true,`, `};`].join(
-      '\n',
-    );
-    const output = await applyTransform(input);
-    expect(output).toBe(input);
+    expect(output).toContain('{CodeBlock}');
+    expect(output).toContain('@xds/core/CodeBlock');
+    expect(output).toContain('<CodeBlock code="x" />');
+    expect(output).not.toContain('AstryxCodeBlock');
   });
 });

package/src/codemods/transforms/v0.1.0/__tests__/migrate-xds-module-specifiers.test.mjs

@@ -89,47 +89,4 @@ describe('migrate-xds-module-specifiers', () => {
     expect(output).not.toContain('defaultTheme');
     expect(output).not.toContain('neutralTheme as');
   });
-
-  it('rewrites the mocked module path in vi.mock (including the inline import() type arg)', async () => {
-    const input = [
-      "vi.mock('@xds/core/Text', async orig => ({",
-      "  ...(await orig<typeof import('@xds/core/Text')>()),",
-      '}));',
-    ].join('\n');
-    const output = await applyTransform(input);
-    expect(output).toMatch(/vi\.mock\(['"]@astryxdesign\/core\/Text['"]/);
-    // The inline dynamic import() type argument is rewritten too.
-    expect(output).toMatch(/import\(['"]@astryxdesign\/core\/Text['"]\)/);
-    expect(output).not.toContain('@xds/');
-  });
-
-  it('rewrites the mocked module path in jest.mock (bare @xds/core)', async () => {
-    const output = await applyTransform(
-      "jest.mock('@xds/core', () => ({}));",
-      'test.ts',
-    );
-    expect(output).toMatch(/jest\.mock\(['"]@astryxdesign\/core['"]/);
-    expect(output).not.toContain('@xds/');
-  });
-
-  it('rewrites vi.doMock / jest.doMock and a bare mock() call', async () => {
-    const output = await applyTransform(
-      [
-        "vi.doMock('@xds/lab/Thing', () => ({}));",
-        "jest.doMock('@xds/core/Text', () => ({}));",
-        "mock('@xds/core', () => ({}));",
-      ].join('\n'),
-      'test.ts',
-    );
-    expect(output).toMatch(/vi\.doMock\(['"]@astryxdesign\/lab\/Thing['"]/);
-    expect(output).toMatch(/jest\.doMock\(['"]@astryxdesign\/core\/Text['"]/);
-    expect(output).toMatch(/[^.]mock\(['"]@astryxdesign\/core['"]/);
-    expect(output).not.toContain('@xds/');
-  });
-
-  it('does NOT rewrite the mock path for a non-@xds package', async () => {
-    const input = "vi.mock('some-other-pkg', () => ({useXDSFoo: () => 1}));";
-    const output = await applyTransform(input);
-    expect(output).toBe(input);
-  });
 });

package/src/codemods/transforms/v0.1.0/drop-xds-prefix-imports.mjs

@@ -35,19 +35,11 @@
  *    including type references in generic type-argument positions such as
  *    `useMemo<XDSTableColumn<Issue>[]>(...)`
  * 3. Re-exports from @xds/core: export {XDSButton} from '@xds/core/Button'
- * 4. Object-property keys inside a test-framework mock factory for an
- *    `@xds/core` module: the partial-mock override in
- *    `vi.mock('@xds/core/Text', async orig => ({...await orig(),
- *    useXDSTruncation: () => ...}))` must be un-prefixed to `useTruncation`,
- *    otherwise the key targets a name the renamed module no longer exports and
- *    the mock silently overrides nothing.
  *
  * Does NOT touch:
  * - import source paths (`@xds/core/Button` stays -- subpath dirs are unchanged
  *   by the prefix migration)
  * - identifiers not bound to an @xds/core import
- * - object-property keys outside an `@xds/core` mock factory (an unrelated
- *   `{useXDSFoo: ...}` literal, or a mock of some other package, is untouched)
  * - the `XDSBaseProps`-style names only when they are NOT imported from core
  */
 
@@ -56,8 +48,7 @@ export const meta = {
   description:
     'Rewrites @xds/core imports and their usages from the prefixed names ' +
     '(XDSButton, useXDSTheme, XDSIconRegistry, XDSButtonProps) to their bare ' +
-    'names (Button, useTheme, IconRegistry, ButtonProps), including override ' +
-    'keys in a vi.mock/jest.mock factory for an @xds/core module. Only renames ' +
+    'names (Button, useTheme, IconRegistry, ButtonProps). Only renames ' +
     'bindings imported from @xds/core, leaving unrelated identifiers untouched.',
   pr: '#2880',
 };
@@ -83,81 +74,6 @@ function bareName(name) {
   return null;
 }
 
-// A test-framework mock of an `@xds/core` module (`vi.mock('@xds/core/Text',
-// factory)`). We only rewrite override keys inside such a factory, so scope the
-// detection tightly: callee must be `vi.mock`/`vi.doMock`/`jest.mock`/
-// `jest.doMock` (or a bare `mock`) AND the first argument must be a string
-// literal that resolves to `@xds/core` (bare or subpath).
-const MOCK_METHOD_NAMES = new Set(['mock', 'doMock']);
-const MOCK_OBJECT_NAMES = new Set(['vi', 'jest']);
-
-function isMockCallee(callee) {
-  if (
-    callee.type === 'MemberExpression' &&
-    !callee.computed &&
-    callee.object.type === 'Identifier' &&
-    MOCK_OBJECT_NAMES.has(callee.object.name) &&
-    callee.property.type === 'Identifier' &&
-    MOCK_METHOD_NAMES.has(callee.property.name)
-  ) {
-    return true;
-  }
-  return callee.type === 'Identifier' && callee.name === 'mock';
-}
-
-function isXdsCoreMockCall(node) {
-  if (node.type !== 'CallExpression' || !isMockCallee(node.callee))
-    return false;
-  const [arg] = node.arguments;
-  const value =
-    arg && (arg.type === 'StringLiteral' || arg.type === 'Literal')
-      ? arg.value
-      : null;
-  return typeof value === 'string' && XDS_CORE_SOURCE.test(value);
-}
-
-// Rename XDS-prefixed object-property KEYS (not values, not nested objects)
-// within the given AST subtree. Used only on a recognized @xds/core mock
-// factory, so the scope guard lives at the call site.
-function renameMockFactoryKeys(node, seen, onChange) {
-  if (!node || typeof node !== 'object') return;
-  if (Array.isArray(node)) {
-    for (const child of node) renameMockFactoryKeys(child, seen, onChange);
-    return;
-  }
-  if (seen.has(node)) return;
-  seen.add(node);
-
-  if (
-    (node.type === 'ObjectProperty' || node.type === 'Property') &&
-    !node.computed &&
-    node.key &&
-    node.key.type === 'Identifier'
-  ) {
-    const bare = bareName(node.key.name);
-    if (bare && bare !== node.key.name) {
-      node.key.name = bare;
-      onChange();
-    }
-  }
-
-  for (const key of Object.keys(node)) {
-    if (
-      key === 'loc' ||
-      key === 'start' ||
-      key === 'end' ||
-      key === 'range' ||
-      key === 'comments' ||
-      key === 'leadingComments' ||
-      key === 'trailingComments' ||
-      key === 'tokens'
-    ) {
-      continue;
-    }
-    renameMockFactoryKeys(node[key], seen, onChange);
-  }
-}
-
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
@@ -274,26 +190,11 @@ export default function transformer(file, api) {
     }
   });
 
-  // 3. Un-prefix override keys inside @xds/core mock factories. Independent of
-  // the import bindings above: the override key is a factory object property,
-  // not a reference to an imported binding, so it must match the renamed export
-  // name of the mocked module regardless of what the file imports.
-  const seenMockNodes = new Set();
-  root.find(j.CallExpression).forEach(path => {
-    if (!isXdsCoreMockCall(path.node)) return;
-    // Only walk the factory argument(s), never the module-path string.
-    for (const arg of path.node.arguments.slice(1)) {
-      renameMockFactoryKeys(arg, seenMockNodes, () => {
-        hasChanges = true;
-      });
-    }
-  });
-
   if (localRenames.size === 0) {
     return hasChanges ? root.toSource() : undefined;
   }
 
-  // 4. Rename references to renamed local bindings
+  // 3. Rename references to renamed local bindings
   // Identifiers (type refs, value refs, etc.)
   root.find(j.Identifier).forEach(path => {
     const newName = localRenames.get(path.node.name);
@@ -330,7 +231,7 @@ export default function transformer(file, api) {
     }
   });
 
-  // 5. Rename TS type references in generic type-argument positions.
+  // 4. Rename TS type references in generic type-argument positions.
   //
   // `j.find(j.Identifier)` (and `j.find(j.TSTypeReference)`) do NOT visit
   // identifiers nested inside generic type arguments with the tsx/babel parser

package/src/codemods/transforms/v0.1.0/migrate-xds-module-specifiers.mjs

@@ -12,9 +12,8 @@
 export const meta = {
   title: 'Migrate module specifiers from @xds/* to @astryxdesign/*',
   description:
-    'Updates JS/TS import, export, dynamic import, require, TS import-type, ' +
-    'and test-framework mock (vi.mock / jest.mock) module specifiers from ' +
-    '@xds/* to the @astryxdesign/* packages used by Astryx v0.1.0.',
+    'Updates JS/TS import, export, dynamic import, and require module ' +
+    'specifiers from @xds/* to the @astryxdesign/* packages used by Astryx v0.1.0.',
   pr: '#3092',
   fileExtensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs'],
 };
@@ -74,30 +73,6 @@ function isCollapsedThemeSource(value) {
   return false;
 }
 
-// Test-framework mock calls take the mocked module path as their first
-// argument (`vi.mock('@xds/core/Text', factory)`). That path is a plain string
-// literal -- not an ImportDeclaration source -- so it slips past the import/
-// export handlers and, left unrewritten, the mock would target the stale
-// `@xds/*` path and stop intercepting the renamed `@astryxdesign/*` import.
-// Recognized callees: `vi.mock`, `vi.doMock`, `jest.mock`, `jest.doMock`, and
-// a bare `mock(...)` (destructured from the test runner).
-const MOCK_METHOD_NAMES = new Set(['mock', 'doMock']);
-const MOCK_OBJECT_NAMES = new Set(['vi', 'jest']);
-
-function isMockCall(callee) {
-  if (
-    callee.type === 'MemberExpression' &&
-    !callee.computed &&
-    callee.object.type === 'Identifier' &&
-    MOCK_OBJECT_NAMES.has(callee.object.name) &&
-    callee.property.type === 'Identifier' &&
-    MOCK_METHOD_NAMES.has(callee.property.name)
-  ) {
-    return true;
-  }
-  return callee.type === 'Identifier' && callee.name === 'mock';
-}
-
 function remapThemeExportNames(importPath, j) {
   let changed = false;
   importPath.node.specifiers = (importPath.node.specifiers || []).map(spec => {
@@ -143,53 +118,12 @@ export default function transformer(file, api) {
     const isRequire =
       path.node.callee.type === 'Identifier' &&
       path.node.callee.name === 'require';
-    if (isDynamicImport || isRequire || isMockCall(path.node.callee)) {
-      const [arg] = path.node.arguments;
-      if (arg?.type === 'StringLiteral' || arg?.type === 'Literal') {
-        hasChanges = rewriteLiteral(arg) || hasChanges;
-      }
+    if (!isDynamicImport && !isRequire) return;
+    const [arg] = path.node.arguments;
+    if (arg?.type === 'StringLiteral' || arg?.type === 'Literal') {
+      hasChanges = rewriteLiteral(arg) || hasChanges;
     }
   });
 
-  // TS `import(...)` TYPE specifiers -- e.g. the `import('@xds/core/Text')` in
-  // `typeof import('@xds/core/Text')` -- parse to a `TSImportType` node, not a
-  // dynamic-import CallExpression, so the handler above never reaches them.
-  // ast-types' traversal also doesn't descend into a `TSImportType` nested in a
-  // generic type-argument position (e.g. `orig<typeof import('@xds/core/Text')>()`),
-  // so `j.find(j.TSImportType)` misses it. Walk the raw AST to cover every
-  // position. Re-visiting a node the loop above handled is harmless: the
-  // literal is already rewritten, so the second pass is a no-op.
-  const seenTypeImportNodes = new Set();
-  const rewriteTSImportTypes = node => {
-    if (!node || typeof node !== 'object') return;
-    if (Array.isArray(node)) {
-      for (const child of node) rewriteTSImportTypes(child);
-      return;
-    }
-    if (seenTypeImportNodes.has(node)) return;
-    seenTypeImportNodes.add(node);
-
-    if (node.type === 'TSImportType' && node.argument) {
-      hasChanges = rewriteLiteral(node.argument) || hasChanges;
-    }
-
-    for (const key of Object.keys(node)) {
-      if (
-        key === 'loc' ||
-        key === 'start' ||
-        key === 'end' ||
-        key === 'range' ||
-        key === 'comments' ||
-        key === 'leadingComments' ||
-        key === 'trailingComments' ||
-        key === 'tokens'
-      ) {
-        continue;
-      }
-      rewriteTSImportTypes(node[key]);
-    }
-  };
-  rewriteTSImportTypes(root.get().node);
-
   return hasChanges ? root.toSource() : undefined;
 }

package/src/commands/agent-docs.mjs

@@ -12,7 +12,7 @@
  * - 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 AGENTS.md (the tool-agnostic standard).
+ * Default (no existing files): creates .claude/CLAUDE.md.
  *
  * --agent <tool>: target a specific tool preset (claude, cursor, codex, hermes, all)
  * --agent-docs-path <path>: explicit file path(s)
@@ -104,78 +104,6 @@ export function isAstryxInitialized(targetDir = process.cwd()) {
   return false;
 }
 
-/**
- * Parse the Astryx version a managed block was generated for, from its header
- * line ("Astryx v1.2.3 · N components"). Returns null when the block predates
- * the versioned header (e.g. a legacy XDS block) or has no header at all.
- *
- * @param {string} content File contents, or just the block text.
- * @returns {string|null}
- */
-export function parseBlockVersion(content) {
-  const match = /Astryx v(\d+\.\d+\.\d+[^\s·]*)/.exec(content ?? '');
-  return match ? match[1] : null;
-}
-
-/**
- * Read-only staleness assessment of the managed agent-docs block(s) against the
- * installed core version. This is the detection half of the `astryx upgrade`
- * agent-docs refresh: it never writes, so `upgrade` can run it on EVERY path —
- * including the up-to-date / no-codemods short-circuits — and decide whether to
- * rewrite a stale block, nudge an uninitialized repo, or stay silent.
- *
- * A managed block is:
- * - `stale`   — it carries a legacy XDS marker, has no parseable version, or
- *               records a version other than the installed one.
- * - `current` — every managed block already matches the installed version.
- * And the project is `missing` when no managed block exists anywhere (the repo
- * has agent-doc files without our markers, or none at all — i.e. never `init`ed).
- *
- * @param {string} targetDir
- * @param {string} [installedVersion] Defaults to the installed core version.
- * @returns {{
- *   installedVersion: string,
- *   status: 'missing' | 'stale' | 'current',
- *   files: Array<{path: string, blockVersion: string|null, legacy: boolean, stale: boolean}>,
- *   staleFiles: string[],
- *   blockVersions: string[],
- * }}
- */
-export function inspectAgentDocs(targetDir, installedVersion) {
-  const version = installedVersion ?? getXdsVersion(findCoreDir(targetDir));
-  const files = [];
-
-  for (const rel of discoverAgentDocs(targetDir)) {
-    let content;
-    try {
-      content = fs.readFileSync(path.join(targetDir, rel), 'utf-8');
-    } catch {
-      continue; // Unreadable — treat as absent.
-    }
-    const hasNew = content.includes(MARKER_START);
-    const hasLegacy = content.includes(LEGACY_MARKER_START);
-    if (!hasNew && !hasLegacy) continue; // Not a block we manage.
-
-    const legacy = !hasNew && hasLegacy;
-    const blockVersion = parseBlockVersion(content);
-    const stale = legacy || blockVersion == null || blockVersion !== version;
-    files.push({path: rel, blockVersion, legacy, stale});
-  }
-
-  const staleEntries = files.filter(f => f.stale);
-  const staleFiles = staleEntries.map(f => f.path);
-  const blockVersions = [
-    ...new Set(staleEntries.map(f => f.blockVersion).filter(Boolean)),
-  ];
-
-  let status;
-  if (files.length === 0) status = 'missing';
-  else if (staleFiles.length > 0) status = 'stale';
-  else status = 'current';
-
-  return {installedVersion: version, status, files, staleFiles, blockVersions};
-}
-
 /**
  * Resolve which file(s) to write for a given agent tool preset.
  * Searches for existing files first, falls back to default creation path.
@@ -511,7 +439,7 @@ export function removeAgentDocs(targetDir) {
  *
  * Strategy (when no agent/paths specified):
  * - Discover all existing agent doc files and update them
- * - If nothing found, create AGENTS.md as default (tool-agnostic standard)
+ * - If nothing found, create .claude/CLAUDE.md as default
  *
  * @param {string} targetDir
  * @param {object} [options]
@@ -586,16 +514,14 @@ export function installAgentDocs(targetDir, {zh = false, lang, agent, paths, onl
     return written;
   }
 
-  // Nothing exists — create root AGENTS.md as the default (skip if onlyReplace).
-  // AGENTS.md is the tool-agnostic standard (Codex/Copilot, Cursor, and most
-  // agents read it), so it's the safe default. Claude-specific output is opt-in
-  // via `--agent claude` (→ .claude/CLAUDE.md); `--agent all` writes both.
+  // Nothing exists — create .claude/CLAUDE.md as default (skip if onlyReplace)
   if (onlyReplace) return written;
 
-  const defaultPath = AGENTS_MD;
+  const defaultPath = CLAUDE_DIR_MD;
+  fs.mkdirSync(path.join(targetDir, '.claude'), {recursive: true});
   injectXdsBlock(path.join(targetDir, defaultPath), compressedIndex, {
     createIfMissing: true,
-    header: `# AGENTS.md\n\nProject-specific guidance for AI coding agents.`,
+    header: `# CLAUDE.md\n\nProject-specific guidance for AI coding agents.`,
   });
   written.push(defaultPath);
   return written;