@astryxdesign/cli 0.1.0-canary.ec1f71f → 0.1.0-canary.f718310

package/docs/theme.doc.dense.mjs

@@ -5,8 +5,8 @@
 export const docsDense = {
   description: 'Theme provider, custom themes, light/dark, component overrides',
   sections: [
-    { title: 'Quick Start', content: [null, null, null, null, { type: 'prose', text: 'default import = runtime injection. /built import = pre-compiled CSS (pair with theme.css).' }] },
-    { title: 'Themes', content: [null, null, { type: 'prose', text: 'published: neutral (start here), butter, chocolate, gothic (dark-only), matcha, stone, y2k. @astryxdesign/theme-{name} = source (runtime). @astryxdesign/theme-{name}/built = optimized (+ theme.css).' }] },
+    { title: 'Quick Start', content: [null, null, { type: 'prose', text: 'default import = runtime injection. /built import = pre-compiled CSS (pair with theme.css).' }] },
+    { title: 'Themes', content: [null, { type: 'prose', text: 'published: neutral (start here), butter, chocolate, gothic (dark-only), matcha, stone, y2k. @astryxdesign/theme-{name} = source (runtime). @astryxdesign/theme-{name}/built = optimized (+ theme.css).' }] },
     { title: 'Props', content: [null] },
     { title: 'Custom Theme', content: [{ type: 'prose', text: 'CLI wizard or manual defineTheme. only override tokens that differ.' }, null] },
     { title: 'defineTheme', content: [{ type: 'prose', text: 'scale configs (color, typography, radius, motion) + explicit token overrides + component overrides. color derives full palette from accent hex via HCT.' }, null, null] },

package/docs/theme.doc.mjs

@@ -14,12 +14,6 @@ export const docs = {
       title: 'Quick Start',
   category: 'guide',
       content: [
-        {
-          type: 'code',
-          lang: 'bash',
-          label: 'Install a theme package',
-          code: 'npm install @astryxdesign/theme-neutral',
-        },
         {
           type: 'code',
           lang: 'tsx',
@@ -51,10 +45,6 @@ function App() {
   );
 }`,
         },
-        {
-          type: 'prose',
-          text: 'Each theme ships as its own npm package. Install the one you want, then wrap your app in `<Theme>` — the same pattern works for every theme; just swap the package and import name.',
-        },
         {
           type: 'prose',
           text: 'The default import uses runtime style injection, which works everywhere with no build step. The `/built` import skips injection and relies on the pre-compiled CSS file for better performance and SSR support.',
@@ -65,10 +55,6 @@ function App() {
       title: 'Available Themes',
   category: 'guide',
       content: [
-        {
-          type: 'prose',
-          text: 'Install the theme package you want with `npm install @astryxdesign/theme-{name}`, then import its theme object as shown below.',
-        },
         {
           type: 'table',
           headers: ['Theme', 'Import', 'Description'],

package/docs/theme.doc.zh.mjs

@@ -5,8 +5,8 @@
 export const docsZh = {
   description: 'Theme 提供者、自定义主题、亮/暗模式和组件样式覆盖。',
   sections: [
-    { title: '快速开始', content: [null, null, null, null, { type: 'prose', text: '默认导入使用运行时样式注入。/built 导入使用预编译 CSS（需配合 theme.css）。' }] },
-    { title: '可用主题', content: [null, null, { type: 'prose', text: '已发布主题：neutral（推荐起点）、butter、chocolate、gothic（仅暗色）、matcha、stone、y2k。@astryxdesign/theme-{name} = 源码版（运行时注入）。@astryxdesign/theme-{name}/built = 优化版（配合 theme.css）。' }] },
+    { title: '快速开始', content: [null, null, { type: 'prose', text: '默认导入使用运行时样式注入。/built 导入使用预编译 CSS（需配合 theme.css）。' }] },
+    { title: '可用主题', content: [null, { type: 'prose', text: '已发布主题：neutral（推荐起点）、butter、chocolate、gothic（仅暗色）、matcha、stone、y2k。@astryxdesign/theme-{name} = 源码版（运行时注入）。@astryxdesign/theme-{name}/built = 优化版（配合 theme.css）。' }] },
     { title: 'Theme 属性', content: [null] },
     { title: '创建自定义主题', content: [{ type: 'prose', text: '使用 CLI 向导（推荐）或手动 defineTheme。只覆盖与默认值不同的令牌。' }, null] },
     { title: 'defineTheme', content: [{ type: 'prose', text: '支持比例配置（typography、radius、motion）+ 显式令牌覆盖 + 组件覆盖。' }, null, null] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.0-canary.ec1f71f",
+  "version": "0.1.0-canary.f718310",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -15,7 +15,7 @@
     "url": "https://github.com/facebook/astryx/issues"
   },
   "keywords": [
-    "astryx",
+    "xds",
     "cli",
     "design-system",
     "init",
@@ -54,9 +54,9 @@
     "jscodeshift": "^17.3.0"
   },
   "peerDependencies": {
-    "@astryxdesign/core": "0.1.0-canary.ec1f71f",
-    "@astryxdesign/lab": "0.1.0-canary.ec1f71f",
-    "@astryxdesign/theme-neutral": "0.1.0-canary.ec1f71f"
+    "@astryxdesign/core": "0.1.0-canary.f718310",
+    "@astryxdesign/lab": "0.1.0-canary.f718310",
+    "@astryxdesign/theme-neutral": "0.1.0-canary.f718310"
   },
   "peerDependenciesMeta": {
     "@astryxdesign/core": {
@@ -70,9 +70,9 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/core": "0.1.0-canary.ec1f71f",
-    "@astryxdesign/lab": "0.1.0-canary.ec1f71f",
-    "@astryxdesign/theme-neutral": "0.1.0-canary.ec1f71f"
+    "@astryxdesign/core": "0.1.0-canary.f718310",
+    "@astryxdesign/lab": "0.1.0-canary.f718310",
+    "@astryxdesign/theme-neutral": "0.1.0-canary.f718310"
   },
   "scripts": {
     "astryx": "node bin/astryx.mjs",

package/src/api/search.mjs

@@ -41,184 +41,14 @@ import {
 } from '../lib/component-discovery.mjs';
 import {discoverHooks, findHookDoc} from '../lib/hook-discovery.mjs';
 import {levenshteinDistance} from '../lib/string-utils.mjs';
-import {discoverTemplates, extractComponents} from './template.mjs';
+import {discoverTemplates} from './template.mjs';
 import {AstryxError} from './error.mjs';
 
 const DOCS_DIR = path.join(CLI_ROOT, 'docs');
 
-/**
- * Synonym / intent map: product-language terms an agent is likely to type,
- * expanded to the catalog's vocabulary so oblique queries still rank. Keys and
- * values are matched bidirectionally (typing any value also pulls in the key
- * and its siblings). Lowercase, single words or short phrases.
- */
-const SYNONYMS = {
-  dashboard: ['overview', 'analytics', 'kpi', 'kpis', 'metrics', 'stats', 'reporting', 'insights', 'control'],
-  login: ['signin', 'auth', 'authentication', 'sso', 'credentials', 'account'],
-  signup: ['register', 'registration', 'onboarding'],
-  payment: ['checkout', 'billing', 'card', 'pay', 'purchase', 'order'],
-  pricing: ['plans', 'plan', 'tiers', 'tier', 'subscription', 'subscriptions'],
-  chat: ['messaging', 'message', 'messages', 'conversation', 'inbox', 'dm'],
-  settings: ['preferences', 'config', 'configuration', 'account'],
-  calendar: ['schedule', 'scheduling', 'events', 'event', 'month', 'agenda'],
-  table: ['list', 'rows', 'records', 'grid', 'spreadsheet', 'datatable'],
-  gallery: ['photos', 'photo', 'images', 'image', 'pictures'],
-  hero: ['banner', 'splash', 'headline', 'landing'],
-  form: ['fields', 'input', 'inputs', 'survey'],
-  profile: ['bio', 'avatar', 'user'],
-  documentation: ['docs', 'reference', 'guide', 'api'],
-  navigation: ['nav', 'menu', 'sidebar'],
-};
-
-// Flatten into a token -> Set(expansions) lookup (bidirectional).
-const SYNONYM_INDEX = (() => {
-  const idx = new Map();
-  const add = (a, b) => {
-    if (!idx.has(a)) idx.set(a, new Set());
-    idx.get(a).add(b);
-  };
-  for (const [key, vals] of Object.entries(SYNONYMS)) {
-    for (const v of vals) {
-      add(key, v);
-      add(v, key);
-      for (const v2 of vals) if (v2 !== v) add(v, v2);
-    }
-  }
-  return idx;
-})();
-
-/**
- * Light stemmer: strips common English suffixes so "charts"/"charting" and
- * "chart" share a root. Deliberately crude (no Porter) — good enough to bridge
- * plural/gerund gaps without a dependency.
- * @param {string} w
- * @returns {string}
- */
-export function stem(w) {
-  let s = w;
-  for (const suf of ['ing', 'ed', 'ies', 'es', 's']) {
-    if (s.length > suf.length + 2 && s.endsWith(suf)) {
-      s = suf === 'ies' ? s.slice(0, -3) + 'y' : s.slice(0, -suf.length);
-      break;
-    }
-  }
-  return s;
-}
-
-
 /** Valid domain filters for `--type`. */
 export const SEARCH_DOMAINS = ['component', 'hook', 'doc', 'template'];
 
-/**
- * Filler words stripped from multi-word queries so natural-language phrasing
- * ("a page where you can see business stats") ranks on its content words.
- */
-const STOPWORDS = new Set([
-  'a', 'an', 'the', 'of', 'for', 'to', 'with', 'and', 'or', 'in', 'on', 'at',
-  'by', 'that', 'this', 'my', 'your', 'our', 'their', 'is', 'are', 'be', 'it',
-  'its', 'as', 'from', 'page', 'screen', 'app', 'application', 'view', 'where',
-  'you', 'can', 'some', 'like', 'just', 'basically', 'kinda', 'want', 'wants',
-  'need', 'needs', 'something', 'thing', 'things', 'build', 'make', 'create',
-  'i', 'me', 'we', 'us', 'so', 'up', 'out', 'over', 'side', 'one', 'big',
-]);
-
-/**
- * Split a query into meaningful content tokens (lowercased, stopwords + very
- * short words removed). Empty for single-word queries (callers fall back to
- * whole-phrase scoring).
- * @param {string} term - Already-lowercased query.
- * @returns {string[]}
- */
-export function tokenizeQuery(term) {
-  return term
-    .split(/\s+/)
-    // Strip only leading/trailing punctuation; keep joined identifiers intact
-    // (e.g. "foo_bar" stays one token) so gibberish stays gibberish.
-    .map(t => t.replace(/^[^a-z0-9]+|[^a-z0-9]+$/g, ''))
-    .filter(t => t.length >= 2 && !STOPWORDS.has(t));
-}
-
-/**
- * Score a candidate against a query, handling multi-word natural language.
- * Tries the whole phrase (so exact/near matches still win) AND a per-token
- * pass (so "data table with filters" matches `table-page` via table+filter),
- * and returns whichever is stronger.
- *
- * @param {string} term - Lowercased full query.
- * @param {string[]} tokens - Content tokens from tokenizeQuery(term).
- * @param {object} candidate
- * @returns {{score: number, reason: string} | null}
- */
-/**
- * Minimum per-token score (in the multi-word pass) to count as a real match.
- * 50 = a genuine name/keyword/description hit; below that is loose Levenshtein
- * fuzz that would otherwise turn gibberish queries into noise.
- */
-const MIN_TOKEN_SCORE = 50;
-
-/**
- * Best score for a token against a candidate, fanning out through synonyms
- * (synonym hits are discounted so a direct hit always wins).
- * @returns {{score: number, reason: string} | null}
- */
-function bestForToken(tok, candidate) {
-  let best = scoreCandidate(tok, candidate);
-  const syns = SYNONYM_INDEX.get(tok);
-  if (syns) {
-    for (const s of syns) {
-      const h = scoreCandidate(s, candidate);
-      if (h) {
-        const score = Math.round(h.score * 0.85);
-        if (!best || score > best.score) best = {score, reason: `${h.reason} (~${tok})`};
-      }
-    }
-  }
-  return best;
-}
-
-export function scoreQuery(term, tokens, candidate) {
-  const full = scoreCandidate(term, candidate);
-
-  // 0–1 content tokens: keep whole-phrase fuzzy matching (typo tolerance for
-  // single words), but if stopwords left exactly one DIFFERENT token (e.g.
-  // "pricing page" → "pricing"), score that token too and take the stronger.
-  if (tokens.length <= 1) {
-    const single = tokens.length === 1 ? bestForToken(tokens[0], candidate) : null;
-    if (full && (!single || full.score >= single.score)) return full;
-    return single;
-  }
-
-  // Multi-word natural language: score each content token, counting only
-  // strong hits, then reward coverage so candidates matching more terms win.
-  let sum = 0;
-  let matched = 0;
-  const hitTerms = [];
-  for (const tok of tokens) {
-    const h = bestForToken(tok, candidate);
-    if (h && h.score >= MIN_TOKEN_SCORE) {
-      sum += h.score;
-      matched++;
-      hitTerms.push(tok);
-    }
-  }
-  if (matched === 0) return full;
-
-  // Reward the AVERAGE strength of the concepts that matched (not divided by
-  // total query length — that penalizes verbose / low-fidelity prompts), plus
-  // a bonus per additional matched concept and a coverage term. A candidate
-  // that matches several of the query's concepts beats one matching a single
-  // incidental word.
-  const avgMatched = sum / matched;
-  const coverage = matched / tokens.length;
-  const tokenScore = Math.round(avgMatched + Math.min(matched - 1, 3) * 12 + coverage * 15);
-
-  if (full && full.score >= tokenScore) return full;
-  return {
-    score: tokenScore,
-    reason: `matches ${matched}/${tokens.length} terms: ${hitTerms.join(', ')}`,
-  };
-}
-
 /**
  * Score a single candidate against the search term across name, keywords,
  * and prose signals. Returns the best (highest) score plus a human reason,
@@ -277,13 +107,10 @@ export function scoreCandidate(term, {name, keywords = [], description = '', pro
     else if (dist === 2) consider(30, `keyword "${kw}" (distance ${dist})`);
   }
 
-  // ── Prose / description signals (stem-tolerant whole word) ──────
-  // Match the term's stem as a whole word, tolerating plural/gerund suffixes
-  // so "chart" matches "charts" and "filter" matches "filtering".
+  // ── Prose / description signals (whole-word boundary) ───────────
   if (term.length >= 3) {
-    const root = stem(term);
-    const escaped = root.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const re = new RegExp(`\\b${escaped}(s|es|ing|ed|ies)?\\b`);
+    const escaped = term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const re = new RegExp(`\\b${escaped}\\b`);
     if (description && re.test(description.toLowerCase())) {
       consider(50, `description mentions "${term}"`);
     } else {
@@ -413,30 +240,14 @@ async function gatherTemplates(cwd) {
   } catch {
     return [];
   }
-  return templates.map(t => {
-    // Blocks ship componentsUsed; page templates don't, so derive them from the
-    // source. Category words (e.g. "Dashboard - Analytics") are strong intent
-    // signal for pages, which otherwise only index on name + description.
-    let keywords = Array.isArray(t.componentsUsed) ? [...t.componentsUsed] : [];
-    if (t.type === 'page') {
-      if (t.filePath) {
-        try {
-          keywords = keywords.concat(extractComponents(t.filePath));
-        } catch {
-          // Best-effort: skip keyword enrichment if the source can't be read.
-        }
-      }
-      if (t.category) keywords = keywords.concat(t.category.split(/[^A-Za-z0-9]+/).filter(Boolean));
-    }
-    return {
-      domain: 'template',
-      name: t.dirName,
-      keywords,
-      description: t.description || '',
-      _displayName: t.name,
-      _kind: t.type, // 'page' | 'block'
-    };
-  });
+  return templates.map(t => ({
+    domain: 'template',
+    name: t.dirName,
+    keywords: Array.isArray(t.componentsUsed) ? t.componentsUsed : [],
+    description: t.description || '',
+    _displayName: t.name,
+    _kind: t.type, // 'page' | 'block'
+  }));
 }
 
 /**
@@ -514,7 +325,6 @@ export async function search(query, options = {}) {
   }
 
   const term = String(query).trim().toLowerCase();
-  const tokens = tokenizeQuery(term);
 
   const coreDir = findCoreDir(cwd);
   if (!coreDir) {
@@ -532,13 +342,9 @@ export async function search(query, options = {}) {
 
   const all = [...components, ...hooks, ...docTopics, ...templates];
 
-  // Score every candidate on its own merits. The consumer groups results by
-  // role (page / block / component) and takes the top of each, so there's no
-  // cross-role competition to engineer — a target page only needs to be the
-  // strongest PAGE, not outrank every component.
   const scored = [];
   for (const candidate of all) {
-    const hit = scoreQuery(term, tokens, candidate);
+    const hit = scoreCandidate(term, candidate);
     if (hit) scored.push(toResult(candidate, hit.score, hit.reason));
   }
 

package/src/api/template.mjs

@@ -95,7 +95,6 @@ async function discoverPages() {
       dirName: dir.name,
       name: doc?.name || dir.name,
       description: doc?.description || '',
-      category: doc?.category || '',
       isReady: doc?.isReady ?? true,
       scaffold: doc?.scaffold ?? false,
       filePath: path.join(dirPath, 'page.tsx'),
@@ -246,7 +245,7 @@ const UBIQUITOUS = new Set([
   'StackItem', 'Icon',
 ]);
 
-export function extractComponents(pagePath) {
+function extractComponents(pagePath) {
   const src = fs.readFileSync(pagePath, 'utf-8');
   // Match JSX opening tags, e.g. `<Section` or the legacy `<XDSSection`.
   // Templates author bare component names post un-prefix migration

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

@@ -16,7 +16,6 @@ describe('registry', () => {
         '0.0.13',
         '0.0.14',
         '0.0.15',
-        '0.1.0',
       ]);
     });
   });

package/src/codemods/registry.mjs

@@ -17,7 +17,6 @@ const registry = new Map([
   ['0.0.13', () => import('./transforms/v0.0.13/index.mjs')],
   ['0.0.14', () => import('./transforms/v0.0.14/index.mjs')],
   ['0.0.15', () => import('./transforms/v0.0.15/index.mjs')],
-  ['0.1.0', () => import('./transforms/v0.1.0/index.mjs')],
 ]);
 
 // Re-export from the shared utility so registry callers and other consumers

package/src/codemods/runner.mjs

@@ -11,6 +11,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as p from '@clack/prompts';
+import {getRunPrefix} from '../utils/package-manager.mjs';
 import {humanLog} from '../lib/json.mjs';
 
 // Known corruption patterns that indicate a broken transform.
@@ -86,6 +87,39 @@ function findSourceFiles(dir) {
   return results.sort();
 }
 
+/**
+ * Detect the project's formatter and run it on changed files.
+ * Tries prettier, then biome. Silently skips if none found.
+ *
+ * @param {string[]} files - Absolute paths to files that were modified
+ * @param {boolean} [silent] - Suppress human-facing output
+ */
+async function formatChangedFiles(files, silent = false) {
+  if (files.length === 0) return;
+
+  const {execSync} = await import('node:child_process');
+  const fileArgs = files.map(f => `"${f}"`).join(' ');
+  const prefix = getRunPrefix();
+
+  const formatters = [
+    {name: 'prettier', cmd: `${prefix} prettier --write ${fileArgs}`},
+    {name: 'biome', cmd: `${prefix} biome format --write ${fileArgs}`},
+  ];
+
+  for (const {name, cmd} of formatters) {
+    try {
+      execSync(cmd, {stdio: 'pipe', timeout: 30000});
+      if (!silent)
+        p.log.info(
+          `Formatted ${files.length} file${files.length === 1 ? '' : 's'} with ${name}`,
+        );
+      return;
+    } catch {
+      // Formatter not available or failed — try next
+    }
+  }
+}
+
 /**
  * Validate transform output before writing to disk.
  *
@@ -128,86 +162,6 @@ export function validateOutput(result, source, j, {parse = true} = {}) {
   return {valid: true};
 }
 
-function isConfigCodemod(transformEntry) {
-  return transformEntry.meta?.codemodType === 'config';
-}
-
-const CONFIG_CODEMOD_PATHS = new Set([
-  'package.json',
-  'astryx.config.mjs',
-  'xds.config.mjs',
-]);
-
-function resolveConfigPath(relativePath) {
-  if (!CONFIG_CODEMOD_PATHS.has(relativePath)) {
-    throw new Error(`unsupported config codemod path: ${relativePath}`);
-  }
-  return path.resolve(process.cwd(), relativePath);
-}
-
-function readOptionalConfigFile(relativePath) {
-  const fullPath = resolveConfigPath(relativePath);
-  if (!fs.existsSync(fullPath)) return null;
-  return {path: relativePath, source: fs.readFileSync(fullPath, 'utf-8')};
-}
-
-function getConfigCodemodContext() {
-  return {
-    packageJson: readOptionalConfigFile('package.json'),
-    astryxConfig: readOptionalConfigFile('astryx.config.mjs'),
-    xdsConfig: readOptionalConfigFile('xds.config.mjs'),
-  };
-}
-
-async function runConfigCodemod(transformEntry, {apply, log}) {
-  const {transform} = transformEntry;
-  const api = {config: getConfigCodemodContext()};
-  const result = await transform({path: process.cwd(), source: ''}, api);
-  const errors = result?.errors ?? [];
-  if (errors.length > 0) {
-    for (const error of errors) {
-      log.error(`    ✗ ${error.file ?? 'config'} — ${error.error}`);
-    }
-    return {filesChanged: 0, errors};
-  }
-
-  const changes = result?.changes ?? [];
-  if (changes.length === 0) return {filesChanged: 0, errors: []};
-
-  for (const change of changes) {
-    const fullPath = resolveConfigPath(change.path);
-    if (change.delete) {
-      if (apply) fs.rmSync(fullPath, {force: true});
-      log[apply ? 'success' : 'warn'](
-        `    ${apply ? '✓' : '~'} ${change.path} (delete${apply ? '' : ', dry run'})`,
-      );
-      continue;
-    }
-
-    if (apply) {
-      fs.writeFileSync(fullPath, change.source, 'utf-8');
-    }
-    log[apply ? 'success' : 'warn'](
-      `    ${apply ? '✓' : '~'} ${change.path}${apply ? '' : ' (would change)'}`,
-    );
-  }
-
-  if (changes.length > 0) {
-    const verb = apply ? 'Updated' : 'Would update';
-    log.info(
-      `  ${verb} ${changes.length} config file${changes.length === 1 ? '' : 's'}`,
-    );
-  }
-
-  return {
-    filesChanged: changes.length,
-    writtenFiles: changes
-      .filter(change => !change.delete && path.extname(change.path) !== '.json')
-      .map(change => resolveConfigPath(change.path)),
-    errors: [],
-  };
-}
-
 /**
  * Run codemods against source files.
  *
@@ -243,12 +197,18 @@ export async function runCodemods(
 
   if (files.length === 0) {
     log.warn('No source files found.');
-  } else {
-    log.info(
-      `Found ${files.length} source file${files.length === 1 ? '' : 's'}`,
-    );
+    return {
+      ok: true,
+      totalFilesChanged: 0,
+      totalTransformsApplied: 0,
+      errors: [],
+      writtenFiles: [],
+      skippedOptional: [],
+    };
   }
 
+  log.info(`Found ${files.length} source file${files.length === 1 ? '' : 's'}`);
+
   // Dynamically import jscodeshift
   const jscodeshift = (await import('jscodeshift')).default;
 
@@ -279,24 +239,6 @@ export async function runCodemods(
 
       log.info(`  ${meta.title}`);
 
-      if (isConfigCodemod(transformEntry)) {
-        const result = await runConfigCodemod(transformEntry, {apply, log});
-        if (result.errors.length > 0) {
-          for (const error of result.errors) {
-            errors.push({
-              file: error.file ?? 'config',
-              codemod: name,
-              error: error.error,
-            });
-          }
-        } else if (result.filesChanged > 0) {
-          totalFilesChanged += result.filesChanged;
-          totalTransformsApplied += result.filesChanged;
-          writtenFiles.push(...(result.writtenFiles ?? []));
-        }
-        continue;
-      }
-
       let filesChanged = 0;
 
       for (const filePath of files) {
@@ -381,6 +323,12 @@ export async function runCodemods(
     }
   }
 
+  // Post-codemod formatting: run the project's formatter on changed files
+  // so codemods don't introduce style drift (jscodeshift may change quotes, etc.)
+  if (apply && writtenFiles.length > 0) {
+    await formatChangedFiles(writtenFiles, silent);
+  }
+
   if (totalValidationBlocked > 0) {
     log.warn(
       `${totalValidationBlocked} file${totalValidationBlocked === 1 ? ' was' : 's were'} blocked by validation — no changes written to ${totalValidationBlocked === 1 ? 'that file' : 'those files'}.`,
@@ -418,9 +366,7 @@ export async function runCodemods(
       if (meta.description) {
         log.info(`    ${meta.description}`);
       }
-      log.info(
-        `    Run: astryx upgrade --codemod ${name} --path <dir> --apply`,
-      );
+      log.info(`    Run: astryx upgrade --codemod ${name} --path <dir> --apply`);
     }
   }