@astryxdesign/cli 0.1.7-canary.cc83e7a → 0.1.7-canary.d91c851

package/docs/theme.doc.zh.mjs

@@ -10,7 +10,7 @@ export const docsZh = {
     { section: 'Theme Props', title: 'Theme 属性', content: [null] },
     { section: 'Creating a Custom Theme', title: '创建自定义主题', content: [{ type: 'prose', text: '使用 CLI 向导（推荐）或手动 defineTheme。只覆盖与默认值不同的令牌。' }, null] },
     { section: 'defineTheme', title: 'defineTheme', content: [{ type: 'prose', text: '支持比例配置（typography、radius、motion）+ 显式令牌覆盖 + 组件覆盖。' }, null, null] },
-    { section: 'Building Themes for Production', title: '生产构建', content: [{ type: 'prose', text: 'npx astryx theme build 将 defineTheme 编译为静态 CSS。输出 .css + .js（__built:true）+ .d.ts。' }, null, null, null, null] },
+    { section: 'Building Themes for Production', title: '生产构建', content: [{ type: 'prose', text: 'astryx theme build 将 defineTheme 编译为静态 CSS。输出 .css + .js（__built:true）+ .d.ts。' }, null, null, null, null] },
     { section: 'Runtime vs Built Themes', title: '运行时 vs 构建', content: [{ type: 'prose', text: '运行时：useInsertionEffect 在客户端注入样式。构建：静态 CSS 在首次渲染时就存在。SSR 应用请使用 /built + theme.css。' }, null, null, null] },
     { section: 'Light/Dark Mode', title: '亮/暗模式', content: [{ type: 'prose', text: "令牌值使用 [light, dark] 元组实现自动模式切换。Theme 上 mode='system'（默认）跟随系统偏好。" }, null, null] },
     { section: 'Nesting Themes', title: '嵌套主题', content: [{ type: 'prose', text: '将不同部分包裹在独立的 <Theme> 提供者中。' }, null] },

package/docs/tokens.doc.mjs

@@ -1068,7 +1068,7 @@ export const docs = {
         },
         {
           "type": "prose",
-          "text": "See `npx astryx docs styling` for how to apply tokens via xstyle, className, and compound component patterns. See `npx astryx docs theme` for overriding tokens with defineTheme."
+          "text": "See `astryx docs styling` for how to apply tokens via xstyle, className, and compound component patterns. See `astryx docs theme` for overriding tokens with defineTheme."
         }
       ]
     }

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

@@ -34,7 +34,7 @@ export const docs = {
           type: 'code',
           lang: 'text',
           label: 'Paste this into your AI',
-          code: 'Install @astryxdesign/cli and run `npx astryx init --features agents` to set up your Astryx context. Read the generated file.',
+          code: 'Install @astryxdesign/cli and run `npx @astryxdesign/cli init --features agents` to set up your Astryx context. Read the generated file.',
         },
         {
           type: 'prose',
@@ -48,9 +48,9 @@ export const docs = {
           type: 'code',
           lang: 'bash',
           label: 'Manual options',
-          code: `npx astryx init --features agents --agent claude    # CLAUDE.md
-npx astryx init --features agents --agent cursor    # .cursorrules
-npx astryx init --features agents --agent codex     # AGENTS.md (Copilot, Codex, etc.)`,
+          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.)`,
         },
       ],
     },
@@ -65,9 +65,9 @@ npx astryx init --features agents --agent codex     # AGENTS.md (Copilot, Codex,
           type: 'list',
           style: 'ordered',
           items: [
-            '`npx astryx template --list`: find a related page pattern to use as reference',
-            '`npx astryx template <name> --skeleton`: study the layout structure',
-            '`npx astryx component <Name>`: read props and examples for every component used',
+            '`astryx template --list`: find a related page pattern to use as reference',
+            '`astryx template <name> --skeleton`: study the layout structure',
+            '`astryx component <Name>`: read props and examples for every component used',
           ],
         },
         {
@@ -88,7 +88,7 @@ npx astryx init --features agents --agent codex     # AGENTS.md (Copilot, Codex,
           lang: 'bash',
           label: 'Install as a Cursor user rule',
           code: `mkdir -p ~/.cursor/rules
-npx astryx init --features agents --agent-docs-path ~/.cursor/rules/xds.mdc`,
+npx @astryxdesign/cli init --features agents --agent-docs-path ~/.cursor/rules/xds.mdc`,
         },
       ],
     },
@@ -109,12 +109,12 @@ npx astryx init --features agents --agent-docs-path ~/.cursor/rules/xds.mdc`,
 2. How do you make an Dialog non-dismissible?
 3. What prop does Selector use for its items?
 
-If you don't know all three, run \`npx astryx init --features agents\` to generate agent docs, then read the generated file.`,
+If you don't know all three, run \`npx @astryxdesign/cli init --features agents\` to generate agent docs, then read the generated file.`,
         },
       ],
     },
     {
-      title: 'The npx astryx Pattern',
+      title: 'The astryx Pattern',
       content: [
         {
           type: 'prose',
@@ -130,16 +130,16 @@ If you don't know all three, run \`npx astryx init --features agents\` to genera
         },
         {
           type: 'prose',
-          text: 'With this alias, agents use `npx astryx component --list` instead of guessing the binary path. The `--` separator is standard npm convention for passing flags to scripts.',
+          text: 'With this alias, agents use `astryx component --list` instead of guessing the binary path. The `--` separator is standard npm convention for passing flags to scripts.',
         },
         {
           type: 'code',
           lang: 'bash',
           label: 'Reliable CLI invocation',
-          code: `npx astryx component --list
-npx astryx component Dialog --dense
-npx astryx docs styling --dense
-npx astryx docs tokens --dense`,
+          code: `astryx component --list
+astryx component Dialog --dense
+astryx docs styling --dense
+astryx docs tokens --dense`,
         },
       ],
     },
@@ -154,9 +154,9 @@ npx astryx docs tokens --dense`,
           type: 'code',
           lang: 'bash',
           label: 'Dense output for pasting into AI conversations',
-          code: `npx astryx component Dialog --dense
-npx astryx docs styling --dense
-npx astryx docs tokens --dense`,
+          code: `astryx component Dialog --dense
+astryx docs styling --dense
+astryx docs tokens --dense`,
         },
       ],
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.7-canary.cc83e7a",
+  "version": "0.1.7-canary.d91c851",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -67,22 +67,22 @@
   "files": [
     "bin",
     "src",
+    "scripts/postinstall.mjs",
     "templates",
     "docs",
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@clack/prompts": "^1.7.0",
     "commander": "^12.1.0",
     "jiti": "^2.7.0",
     "jscodeshift": "^17.3.0",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@astryxdesign/charts": "0.1.7-canary.cc83e7a",
-    "@astryxdesign/core": "0.1.7-canary.cc83e7a",
-    "@astryxdesign/lab": "0.1.7-canary.cc83e7a",
-    "@astryxdesign/theme-neutral": "0.1.7-canary.cc83e7a",
+    "@astryxdesign/charts": "0.1.7-canary.d91c851",
+    "@astryxdesign/core": "0.1.7-canary.d91c851",
+    "@astryxdesign/lab": "0.1.7-canary.d91c851",
+    "@astryxdesign/theme-neutral": "0.1.7-canary.d91c851",
     "gpt-tokenizer": "^3.4.0"
   },
   "peerDependenciesMeta": {
@@ -100,14 +100,15 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/charts": "0.1.7-canary.cc83e7a",
-    "@astryxdesign/core": "0.1.7-canary.cc83e7a",
-    "@astryxdesign/lab": "0.1.7-canary.cc83e7a",
-    "@astryxdesign/theme-neutral": "0.1.7-canary.cc83e7a",
+    "@astryxdesign/charts": "0.1.7-canary.d91c851",
+    "@astryxdesign/core": "0.1.7-canary.d91c851",
+    "@astryxdesign/lab": "0.1.7-canary.d91c851",
+    "@astryxdesign/theme-neutral": "0.1.7-canary.d91c851",
     "gpt-tokenizer": "^3.4.0"
   },
   "scripts": {
     "astryx": "node bin/astryx.mjs",
+    "postinstall": "node scripts/postinstall.mjs",
     "typecheck:template-docs": "tsc --project tsconfig.template-docs.json",
     "typecheck:json-api": "tsc --project tsconfig.json-api.json && tsc --project tsconfig.api-contract.json"
   }

package/scripts/postinstall.mjs

@@ -0,0 +1,74 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file @astryxdesign/cli postinstall — nudge to run `astryx init`.
+ *
+ * Enforcement layer 2 of making `astryx init` foolproof: when the CLI is
+ * installed as a project dependency and the project hasn't run init yet, print a
+ * one-line next-step so agents/humans discover it.
+ *
+ * Reuses the ONE setup check (isAstryxInitialized from agent-docs.mjs — a
+ * dep-free import chain, safe at install time). Non-interactive, never fails the
+ * install, and stays quiet:
+ *   - in the monorepo/source build (not under node_modules),
+ *   - during npx's transient fetch (npx runs the bin — likely `init` — right
+ *     after, so nudging here would double up), and
+ *   - once setup is already done.
+ */
+
+import {fileURLToPath, pathToFileURL} from 'node:url';
+
+const HERE = fileURLToPath(import.meta.url);
+
+/**
+ * Pure decision: should the postinstall print the setup nudge? Split out so the
+ * matrix is unit-testable without an actual npm install.
+ *
+ * @param {object} opts
+ * @param {string} opts.scriptPath - Absolute path of this script (location tells
+ *   us dependency vs monorepo vs npx-cache).
+ * @param {string} [opts.npmCommand] - process.env.npm_command ('install', 'exec', …).
+ * @param {boolean} opts.isSetUp - Whether the project already ran init.
+ * @returns {boolean}
+ */
+export function shouldNudge({scriptPath, npmCommand, isSetUp} = {}) {
+  if (!scriptPath || !scriptPath.includes('node_modules')) return false; // monorepo/source build
+  if (scriptPath.includes('_npx') || npmCommand === 'exec') return false; // npx transient — init runs next
+  if (isSetUp) return false; // already set up — stay quiet
+  return true;
+}
+
+/** @param {string} root @returns {Promise<boolean>} */
+async function projectIsSetUp(root) {
+  try {
+    const {isAstryxInitialized} = await import('../src/commands/agent-docs.mjs');
+    return isAstryxInitialized(root);
+  } catch {
+    return false; // best-effort — if the check can't load, fall through and nudge
+  }
+}
+
+async function main() {
+  const root = process.env.INIT_CWD || process.cwd();
+  const nudge = shouldNudge({
+    scriptPath: HERE,
+    npmCommand: process.env.npm_command,
+    isSetUp: await projectIsSetUp(root),
+  });
+  if (nudge) {
+    // Scoped package form (`@astryxdesign/cli`) — always resolves to us. Bare
+    // `npx astryx` would fetch an unrelated look-alike package (see PR #4151).
+    // After that lands, switch this to its getCliInvocation() single source of truth.
+    process.stdout.write(
+      '\nNext step: run `npx @astryxdesign/cli init` to finish setup and install the Astryx agent prompt.\n\n',
+    );
+  }
+}
+
+// Run only when executed directly (`node scripts/postinstall.mjs`), never when
+// imported by tests.
+if (import.meta.url === pathToFileURL(process.argv[1] || '').href) {
+  main()
+    .catch(() => {})
+    .finally(() => process.exit(0));
+}

package/src/api/doctor.mjs

@@ -26,7 +26,7 @@ import {createRequire} from 'node:module';
 
 import {MIN_NODE_VERSION, isNodeVersionSupported} from '../lib/node-version.mjs';
 import {CLI_ROOT, findCoreDir} from '../utils/paths.mjs';
-import {detectPackageManager} from '../utils/package-manager.mjs';
+import {detectPackageManager, getCliInvocation} from '../utils/package-manager.mjs';
 import {findConfigPath, Project} from '../lib/project.mjs';
 import {semverCompare} from '../utils/semver.mjs';
 
@@ -343,7 +343,7 @@ export function checkAgentDocs(ctx) {
       label: 'AI agent docs',
       status: 'info',
       message: 'No agent docs (CLAUDE.md / AGENTS.md / .cursorrules) found.',
-      fix: 'Generate agent docs with `astryx init --features agents`.',
+      fix: `Generate agent docs with \`${getCliInvocation(ctx.cwd)} init --features agents\`.`,
     };
   }
 
@@ -365,7 +365,7 @@ export function checkAgentDocs(ctx) {
       label: 'AI agent docs',
       status: 'warn',
       message: `Agent docs present (${present.join(', ')}) but no Astryx section markers found.`,
-      fix: 'Add the Astryx section to your agent docs with `astryx init --features agents`.',
+      fix: `Add the Astryx section to your agent docs with \`${getCliInvocation(ctx.cwd)} init --features agents\`.`,
     };
   }
 

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

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

package/src/codemods/ensure-jscodeshift.mjs

@@ -3,16 +3,15 @@
 /**
  * @file Lazy jscodeshift installer
  *
- * Checks if jscodeshift is available and offers to install it on-demand.
+ * Checks if jscodeshift is available and installs it on-demand.
  * Keeps the CLI lean — jscodeshift is only needed for codemods.
  *
- * In non-interactive environments (CI, LLM agents), the interactive prompt
- * is skipped. Pass `installDeps: true` to auto-install without prompting,
- * or the command will fail with a helpful error message.
+ * Non-interactive by default (no prompts): pass `installDeps: true` to
+ * auto-install, otherwise the command fails fast with a helpful error.
  */
 
 import {execSync} from 'node:child_process';
-import * as p from '@clack/prompts';
+import * as p from '../lib/term-log.mjs';
 import {detectPackageManager} from '../utils/package-manager.mjs';
 
 /**
@@ -30,32 +29,17 @@ export async function ensureJscodeshift({installDeps = false, silent = false} =
   } catch {
     log.warn('jscodeshift is required for codemods but not installed.');
 
-    const isInteractive = process.stdout.isTTY && !process.env.CI;
-
     if (installDeps) {
-      // Explicit opt-in — install without prompting
+      // Explicit opt-in — install without prompting.
       return installJscodeshift(silent);
     }
 
-    if (!isInteractive || silent) {
-      // Non-interactive environment (or --json) — fail fast with a helpful message
-      log.error(
-        'Cannot run codemods without jscodeshift. ' +
-          'Use --install-deps to auto-install in non-interactive environments.',
-      );
-      return false;
-    }
-
-    // Interactive TTY — prompt as before
-    const shouldInstall = await p.confirm({
-      message: 'Install jscodeshift now?',
-      initialValue: true,
-    });
-    if (p.isCancel(shouldInstall) || !shouldInstall) {
-      p.log.error('Cannot run codemods without jscodeshift.');
-      return false;
-    }
-    return installJscodeshift(silent);
+    // Non-interactive by default: fail fast with a helpful message instead of
+    // prompting (the CLI never blocks on a TTY).
+    log.error(
+      'Cannot run codemods without jscodeshift. Use --install-deps to auto-install.',
+    );
+    return false;
   }
 }
 

package/src/codemods/registry.mjs

@@ -22,6 +22,7 @@ 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/run-codemod.mjs

@@ -29,7 +29,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import * as p from '@clack/prompts';
+import * as p from '../lib/term-log.mjs';
 import {findConfigPath} from '../lib/project.mjs';
 import {fixDirectiveCorruption, validateOutput} from './runner.mjs';
 

package/src/codemods/runner.mjs

@@ -10,7 +10,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import * as p from '@clack/prompts';
+import * as p from '../lib/term-log.mjs';
 import {humanLog} from '../lib/json.mjs';
 import {runConfigCodemod} from './run-codemod.mjs';
 
@@ -184,7 +184,7 @@ export async function runCodemods(
   versionManifests,
   {apply, path: srcPath, codemod, skipCodemods, silent = false},
 ) {
-  // No-op stub object so silent mode skips clack stdout entirely without
+  // No-op stub object so silent mode skips log output entirely without
   // littering the body with `if (!silent)` guards.
   const log = silent
     ? {step() {}, info() {}, success() {}, warn() {}, error() {}, message() {}}

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

@@ -166,15 +166,50 @@ describe('drop-xds-prefix-imports', () => {
     expect(output).toContain('export const other = Card;');
   });
 
-  it('un-prefixes normally when there is NO local collision', async () => {
+  it('un-prefixes override keys inside an @xds/core mock factory', async () => {
     const input = [
-      `import {XDSCodeBlock} from '@xds/core/CodeBlock';`,
-      `export const App = () => <XDSCodeBlock code="x" />;`,
+      `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('{CodeBlock}');
-    expect(output).toContain('@xds/core/CodeBlock');
-    expect(output).toContain('<CodeBlock code="x" />');
-    expect(output).not.toContain('AstryxCodeBlock');
+    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,`,
+      `}));`,
+    ].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);
   });
 });

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

@@ -89,4 +89,47 @@ 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,11 +35,19 @@
  *    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
  */
 
@@ -48,7 +56,8 @@ 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). Only renames ' +
+    'names (Button, useTheme, IconRegistry, ButtonProps), including override ' +
+    'keys in a vi.mock/jest.mock factory for an @xds/core module. Only renames ' +
     'bindings imported from @xds/core, leaving unrelated identifiers untouched.',
   pr: '#2880',
 };
@@ -74,6 +83,81 @@ 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);
@@ -190,11 +274,26 @@ 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;
   }
 
-  // 3. Rename references to renamed local bindings
+  // 4. 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);
@@ -231,7 +330,7 @@ export default function transformer(file, api) {
     }
   });
 
-  // 4. Rename TS type references in generic type-argument positions.
+  // 5. 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