@boyingliu01/xp-gate 0.8.2 → 0.8.4

package/lib/doctor.js

@@ -87,114 +87,120 @@ function checkEnv(checks) {
 }
 
 /**
- * Build check report for the doctor.
- * Returns { checks: Array<{name, status, detail}>, issues: number }
+ * Validate config file exists, is parseable, and has a known mode.
+ * Returns { config: object|null, checks: Array, issues: number }
+ * When config is unrecoverable, returns null to stop further checks.
  */
-function diagnose() {
-  const checks = [];
-  let issues = 0;
+function checkConfig() {
   const config = getConfig();
-
-  // --- Check 1: Config file ---
   if (config === null) {
-    checks.push({ name: 'Config file', status: 'FAIL', detail: 'Not found' });
-    issues++;
-    return { checks, issues }; // Cannot proceed without config
+    return { config: null, checks: [{ name: 'Config file', status: 'FAIL', detail: 'Not found' }], issues: 1 };
   }
-
   if (config === 'corrupt') {
-    checks.push({ name: 'Config file', status: 'FAIL', detail: 'Corrupt JSON' });
-    issues++;
-    return { checks, issues }; // Cannot proceed with corrupt config
+    return { config: null, checks: [{ name: 'Config file', status: 'FAIL', detail: 'Corrupt JSON' }], issues: 1 };
   }
-
-  checks.push({ name: 'Config file', status: 'PASS', detail: CONFIG_FILE });
-
-  // Check mode
   if (config.mode !== 'local' && config.mode !== 'global') {
-    checks.push({ name: 'Install mode', status: 'FAIL', detail: `Unknown: ${config.mode}` });
-    issues++;
-    return { checks, issues };
+    return { config: null, checks: [
+      { name: 'Config file', status: 'PASS', detail: CONFIG_FILE },
+      { name: 'Install mode', status: 'FAIL', detail: `Unknown: ${config.mode}` }
+    ], issues: 1 };
   }
+  return { config, checks: [
+    { name: 'Config file', status: 'PASS', detail: CONFIG_FILE },
+    { name: 'Install mode', status: 'PASS', detail: config.mode }
+  ], issues: 0 };
+}
 
-  checks.push({ name: 'Install mode', status: 'PASS', detail: config.mode });
-
-  // --- Check 2: Hooks files ---
-  if (config.mode === 'local') {
-    const gitDir = getGitDir();
-    if (!gitDir) {
-      checks.push({ name: 'Git repository', status: 'FAIL', detail: 'Not in a git repo' });
-      issues++;
-    } else {
-      const hooksDir = path.join(gitDir, 'hooks');
-      const preCommit = path.join(hooksDir, 'pre-commit');
-      const prePush = path.join(hooksDir, 'pre-push');
-
-      if (!fs.existsSync(preCommit) || !isXpGateFile(preCommit, SIGNATURES['pre-commit'])) {
-        checks.push({ name: 'Hooks: pre-commit', status: 'FAIL', detail: 'Missing or not xp-gate' });
-        issues++;
-      } else {
-        checks.push({ name: 'Hooks: pre-commit', status: 'PASS', detail: preCommit });
-      }
+function checkLocalHooks(checks) {
+  let issues = 0;
+  const gitDir = getGitDir();
+  if (!gitDir) {
+    checks.push({ name: 'Git repository', status: 'FAIL', detail: 'Not in a git repo' });
+    return 1;
+  }
+  const hooksDir = path.join(gitDir, 'hooks');
+  issues += checkSingleHook(hooksDir, 'pre-commit', SIGNATURES['pre-commit'], 'Hooks', checks);
+  issues += checkSingleHook(hooksDir, 'pre-push', SIGNATURES['pre-push'], 'Hooks', checks);
+  return issues;
+}
 
-      if (!fs.existsSync(prePush) || !isXpGateFile(prePush, SIGNATURES['pre-push'])) {
-        checks.push({ name: 'Hooks: pre-push', status: 'FAIL', detail: 'Missing or not xp-gate' });
-        issues++;
-      } else {
-        checks.push({ name: 'Hooks: pre-push', status: 'PASS', detail: prePush });
-      }
-    }
-  } else if (config.mode === 'global') {
-    // Check global hooks directory
-    const preCommit = path.join(GLOBAL_HOOKS_DIR, 'pre-commit');
-    const prePush = path.join(GLOBAL_HOOKS_DIR, 'pre-push');
-
-    if (!fs.existsSync(preCommit) || !isXpGateFile(preCommit, SIGNATURES['pre-commit'])) {
-      checks.push({ name: 'Global hooks: pre-commit', status: 'FAIL', detail: 'Missing or not xp-gate' });
-      issues++;
-    } else {
-      checks.push({ name: 'Global hooks: pre-commit', status: 'PASS', detail: preCommit });
-    }
+function checkGlobalHooks(checks) {
+  let issues = 0;
+  issues += checkSingleHook(GLOBAL_HOOKS_DIR, 'pre-commit', SIGNATURES['pre-commit'], 'Global hooks', checks);
+  issues += checkSingleHook(GLOBAL_HOOKS_DIR, 'pre-push', SIGNATURES['pre-push'], 'Global hooks', checks);
 
-    if (!fs.existsSync(prePush) || !isXpGateFile(prePush, SIGNATURES['pre-push'])) {
-      checks.push({ name: 'Global hooks: pre-push', status: 'FAIL', detail: 'Missing or not xp-gate' });
-      issues++;
-    } else {
-      checks.push({ name: 'Global hooks: pre-push', status: 'PASS', detail: prePush });
-    }
+  const hooksPath = getCurrentHooksPath();
+  if (hooksPath === null || hooksPath === '') {
+    checks.push({ name: 'Git core.hooksPath', status: 'FAIL', detail: 'Not set' });
+    issues++;
+  } else if (hooksPath !== GLOBAL_HOOKS_DIR) {
+    checks.push({ name: 'Git core.hooksPath', status: 'FAIL', detail: `Expected ${GLOBAL_HOOKS_DIR}, got ${hooksPath}` });
+    issues++;
+  } else {
+    checks.push({ name: 'Git core.hooksPath', status: 'PASS', detail: GLOBAL_HOOKS_DIR });
+  }
+  return issues;
+}
 
-    // --- Check 4: core.hooksPath (global mode only) ---
-    const hooksPath = getCurrentHooksPath();
-    if (hooksPath === null || hooksPath === '') {
-      checks.push({ name: 'Git core.hooksPath', status: 'FAIL', detail: 'Not set' });
-      issues++;
-    } else if (hooksPath !== GLOBAL_HOOKS_DIR) {
-      checks.push({ name: 'Git core.hooksPath', status: 'FAIL', detail: `Expected ${GLOBAL_HOOKS_DIR}, got ${hooksPath}` });
-      issues++;
-    } else {
-      checks.push({ name: 'Git core.hooksPath', status: 'PASS', detail: GLOBAL_HOOKS_DIR });
-    }
+/**
+ * Check a single hook file exists and is an xp-gate file.
+ */
+function checkSingleHook(hooksDir, name, signature, label, checks) {
+  const hookPath = path.join(hooksDir, name);
+  if (!fs.existsSync(hookPath) || !isXpGateFile(hookPath, signature)) {
+    checks.push({ name: `${label}: ${name}`, status: 'FAIL', detail: 'Missing or not xp-gate' });
+    return 1;
   }
+  checks.push({ name: `${label}: ${name}`, status: 'PASS', detail: hookPath });
+  return 0;
+}
 
-  // --- Check 3: Adapters directory ---
-  const adaptersDir = config.mode === 'local'
-    ? path.join(path.dirname(getGitDir() || ''), 'githooks', 'adapters')
+function checkAdapters(checks, mode, gitDir) {
+  const adaptersDir = mode === 'local'
+    ? path.join(path.dirname(gitDir || ''), 'githooks', 'adapters')
     : GLOBAL_ADAPTERS_DIR;
 
   if (!adaptersDir || !fs.existsSync(adaptersDir)) {
     checks.push({ name: 'Adapters directory', status: 'FAIL', detail: 'Missing' });
-    issues++;
+    return 1;
+  }
+  const adapterFiles = fs.readdirSync(adaptersDir).filter(f => f.endsWith('.sh'));
+  if (adapterFiles.length === 0) {
+    checks.push({ name: 'Adapters directory', status: 'FAIL', detail: 'Empty directory' });
+    return 1;
+  }
+  checks.push({ name: 'Adapters directory', status: 'PASS', detail: `${adapterFiles.length} adapter(s)` });
+  return 0;
+}
+
+/**
+ * Build check report for the doctor.
+ * Returns { checks: Array<{name, status, detail}>, issues: number }
+ */
+function diagnose() {
+  const checks = [];
+  let issues = 0;
+
+  // --- Check 1: Config file ---
+  const configResult = checkConfig();
+  if (configResult.config === null) {
+    return { checks: configResult.checks, issues: configResult.issues };
+  }
+  const { config } = configResult;
+  checks.push(...configResult.checks);
+  issues += configResult.issues;
+
+  // --- Check 2: Hooks files ---
+  if (config.mode === 'local') {
+    issues += checkLocalHooks(checks);
   } else {
-    const adapterFiles = fs.readdirSync(adaptersDir).filter(f => f.endsWith('.sh'));
-    if (adapterFiles.length === 0) {
-      checks.push({ name: 'Adapters directory', status: 'FAIL', detail: 'Empty directory' });
-      issues++;
-    } else {
-      checks.push({ name: 'Adapters directory', status: 'PASS', detail: `${adapterFiles.length} adapter(s)` });
-    }
+    issues += checkGlobalHooks(checks);
   }
 
-  // --- Check 5: Environment dependencies ---
+  // --- Check 3: Adapters directory ---
+  issues += checkAdapters(checks, config.mode, getGitDir());
+
+  // --- Check 4: Environment dependencies ---
   checkEnv(checks);
 
   return { checks, issues };
@@ -214,6 +220,19 @@ function printReport(checks) {
   }
 }
 
+/**
+ * Copy a hook file from package source to target, creating parent dir if needed.
+ */
+function restoreHook(srcFile, destFile, label) {
+  if (!fs.existsSync(srcFile)) return false;
+  const destDir = path.dirname(destFile);
+  fs.mkdirSync(destDir, { recursive: true });
+  fs.copyFileSync(srcFile, destFile);
+  fs.chmodSync(destFile, 0o755);
+  console.log(`  ✓ Restored ${label}`);
+  return true;
+}
+
 /**
  * Attempt to fix known issues.
  * Only operates when mode === 'active' (local or global).
@@ -231,58 +250,17 @@ function fixIssues(checks, config) {
     const gitDir = getGitDir();
     if (gitDir) {
       const hooksDir = path.join(gitDir, 'hooks');
-      const preCommit = path.join(hooksDir, 'pre-commit');
-      const prePush = path.join(hooksDir, 'pre-push');
-
-      if (!fs.existsSync(preCommit) || !isXpGateFile(preCommit, SIGNATURES['pre-commit'])) {
-        const src = path.join(srcDir, 'hooks', 'pre-commit');
-        if (fs.existsSync(src)) {
-          fs.mkdirSync(hooksDir, { recursive: true });
-          fs.copyFileSync(src, preCommit);
-          fs.chmodSync(preCommit, 0o755);
-          console.log('  ✓ Restored pre-commit hook');
-          fixed = true;
-        }
-      }
-
-      if (!fs.existsSync(prePush) || !isXpGateFile(prePush, SIGNATURES['pre-push'])) {
-        const src = path.join(srcDir, 'hooks', 'pre-push');
-        if (fs.existsSync(src)) {
-          fs.mkdirSync(hooksDir, { recursive: true });
-          fs.copyFileSync(src, prePush);
-          fs.chmodSync(prePush, 0o755);
-          console.log('  ✓ Restored pre-push hook');
-          fixed = true;
-        }
-      }
-    }
-  } else if (config.mode === 'global') {
-    const preCommit = path.join(GLOBAL_HOOKS_DIR, 'pre-commit');
-    const prePush = path.join(GLOBAL_HOOKS_DIR, 'pre-push');
-
-    if (!fs.existsSync(preCommit) || !isXpGateFile(preCommit, SIGNATURES['pre-commit'])) {
-      const src = path.join(srcDir, 'hooks', 'pre-commit');
-      if (fs.existsSync(src)) {
-        fs.mkdirSync(GLOBAL_HOOKS_DIR, { recursive: true });
-        fs.copyFileSync(src, preCommit);
-        fs.chmodSync(preCommit, 0o755);
-        console.log('  ✓ Restored global pre-commit hook');
-        fixed = true;
-      }
-    }
-
-    if (!fs.existsSync(prePush) || !isXpGateFile(prePush, SIGNATURES['pre-push'])) {
-      const src = path.join(srcDir, 'hooks', 'pre-push');
-      if (fs.existsSync(src)) {
-        fs.mkdirSync(GLOBAL_HOOKS_DIR, { recursive: true });
-        fs.copyFileSync(src, prePush);
-        fs.chmodSync(prePush, 0o755);
-        console.log('  ✓ Restored global pre-push hook');
-        fixed = true;
-      }
+      fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-commit'), path.join(hooksDir, 'pre-commit'), 'pre-commit hook') || fixed;
+      fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-push'), path.join(hooksDir, 'pre-push'), 'pre-push hook') || fixed;
     }
+  } else {
+    const hooksDir = GLOBAL_HOOKS_DIR;
+    fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-commit'), path.join(hooksDir, 'pre-commit'), 'global pre-commit hook') || fixed;
+    fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-push'), path.join(hooksDir, 'pre-push'), 'global pre-push hook') || fixed;
+  }
 
-    // Fix core.hooksPath
+  // Fix core.hooksPath (global mode only)
+  if (config.mode === 'global') {
     const hooksPath = getCurrentHooksPath();
     if (hooksPath !== GLOBAL_HOOKS_DIR) {
       try {
@@ -324,6 +302,14 @@ function fixIssues(checks, config) {
  * @param {string[]} args CLI arguments
  * @returns {number} exit code (0 = all clear, 1 = issues found)
  */
+function isActiveMode(config) {
+  return config && config !== 'corrupt' && (config.mode === 'local' || config.mode === 'global');
+}
+
+function isUninstalledMode(config) {
+  return config && config !== 'corrupt' && config.mode === 'uninstalled';
+}
+
 async function doctor(args) {
   const fixMode = args.includes('--fix');
 
@@ -333,14 +319,14 @@ async function doctor(args) {
   const config = getConfig();
 
   // §4.8: mode === "uninstalled" → print "xp-gate is not installed"
-  if (config && config !== 'corrupt' && config.mode === 'uninstalled') {
+  if (isUninstalledMode(config)) {
     console.log('xp-gate is not installed.');
     console.log('Run xp-gate init to install.');
     return 0;
   }
 
   // §4.13: --fix only when mode === "active"
-  if (fixMode && config && config !== 'corrupt' && (config.mode === 'local' || config.mode === 'global')) {
+  if (fixMode && isActiveMode(config)) {
     fixIssues(null, config);
   }
 
@@ -355,8 +341,8 @@ async function doctor(args) {
 
   console.log(`\n✗ ${issues} issue(s) found`);
 
-  if (fixMode && config && config !== 'corrupt' && (config.mode === 'local' || config.mode === 'global')) {
-    // Re-run diagnosis after fix to report updated status
+  // Re-run diagnosis after fix to report updated status
+  if (fixMode && isActiveMode(config)) {
     console.log('\nRe-running diagnosis after fix...');
     const { checks: postChecks } = diagnose();
     printReport(postChecks);

package/lib/gate-audit.ts

@@ -117,12 +117,9 @@ export function readTailEntries(
 }
 
 /**
- * Compute per-gate aggregate statistics.
+ * Read and parse all valid audit entries from the log file.
  */
-export function computeStats(
-  repoRoot: string = process.cwd(),
-): { gate_id: string; pass_pct: string; avg_ms: number; avg_issues: number }[] {
-  const logPath = join(repoRoot, AUDIT_DIR, AUDIT_FILE);
+function parseAuditEntries(logPath: string): GateAuditEntry[] {
   if (!existsSync(logPath)) {
     return [];
   }
@@ -132,7 +129,6 @@ export function computeStats(
     return [];
   }
 
-  // Parse all valid entries
   const entries: GateAuditEntry[] = [];
   for (const line of content.split('\n')) {
     if (line.trim()) {
@@ -143,8 +139,13 @@ export function computeStats(
       }
     }
   }
+  return entries;
+}
 
-  // Aggregate by gate_id
+/**
+ * Aggregate audit entries by gate_id, computing sums for passed/ms/issues.
+ */
+function aggregateByGate(entries: GateAuditEntry[]): Map<string, { total: number; passed: number; ms: number; issues: number }> {
   const buckets = new Map<string, { total: number; passed: number; ms: number; issues: number }>();
 
   for (const e of entries) {
@@ -156,6 +157,23 @@ export function computeStats(
     buckets.set(e.gate_id, b);
   }
 
+  return buckets;
+}
+
+/**
+ * Compute per-gate aggregate statistics.
+ */
+export function computeStats(
+  repoRoot: string = process.cwd(),
+): { gate_id: string; pass_pct: string; avg_ms: number; avg_issues: number }[] {
+  const logPath = join(repoRoot, AUDIT_DIR, AUDIT_FILE);
+  const entries = parseAuditEntries(logPath);
+  if (entries.length === 0) {
+    return [];
+  }
+
+  const buckets = aggregateByGate(entries);
+
   const results: { gate_id: string; pass_pct: string; avg_ms: number; avg_issues: number }[] = [];
 
   for (const [gate_id, b] of Array.from(buckets.entries())) {
@@ -167,7 +185,6 @@ export function computeStats(
     });
   }
 
-  // Sort by gate_id for stable output
   results.sort((a, b) => a.gate_id.localeCompare(b.gate_id));
   return results;
 }

package/lib/init.js

@@ -86,7 +86,7 @@ function printUsage() {
   console.log('  2) Local   — install hooks into current project only\n');
   console.log('Usage:');
   console.log('  xp-gate init --global     # all projects');
-  console.log('  xp-gate init              # current project');
+  console.log('  xp-gate init --baseline   # current project + create lint baseline');
   console.log('  xp-gate setup-global      # all projects (alias)\n');
 }
 
@@ -265,7 +265,18 @@ async function init(args) {
 
   if (!installMode) { printUsage(); return 0; }
   if (installMode === 'global') return setupGlobal(args);
-  return installLocal(args);
+  const code = await installLocal(args);
+  if (code === 0 && args.includes('--baseline')) {
+    try {
+      const { createBaseline } = require('./baseline.js');
+      console.log('\nCreating lint baseline...');
+      const baseline = await createBaseline();
+      console.log(`✅ Lint baseline created — ${Object.keys(baseline).length} files tracked.`);
+    } catch (e) {
+      console.log(`ℹ️  Lint baseline creation skipped: ${e.message}`);
+    }
+  }
+  return code;
 }
 
 async function installLocal(args) {

package/lib/migrate.js

@@ -16,98 +16,99 @@ const HOME = process.env.HOME || process.env.USERPROFILE || os.homedir();
  * @param {string[]} args - CLI arguments (--dry-run supported)
  * @returns {Promise<number>} exit code (0 = success)
  */
-async function migrate(args = []) {
-  const options = { dryRun: args.includes('--dry-run') };
-
-  const npmrcPath = path.join(HOME, '.npmrc');
-  const cacheDir = path.join(HOME, '.config', 'xp-gate', 'cache');
-
-  let npmrcChanged = false;
-  let npmrcRemovedCount = 0;
-
-  // === Phase 1: ~/.npmrc cleanup ===
-  console.log('Checking ~/.npmrc for GitHub Packages residue...');
-
+function cleanNpmrc({ npmrcPath, dryRun }) {
   if (!fs.existsSync(npmrcPath)) {
     console.log('  No ~/.npmrc found — nothing to clean.');
-  } else {
-    const content = fs.readFileSync(npmrcPath, 'utf8');
-    const lines = content.split('\n');
-
-    // Find lines that reference npm.pkg.github.com
-    const linesToRemove = [];
-    const keptLines = [];
-
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (line.includes('npm.pkg.github.com')) {
-        linesToRemove.push(line);
-      } else {
-        keptLines.push(line);
-      }
-    }
+    return { changed: false, removedCount: 0 };
+  }
 
-    npmrcRemovedCount = linesToRemove.length;
+  const content = fs.readFileSync(npmrcPath, 'utf8');
+  const lines = content.split('\n');
+  const linesToRemove = [];
+  const keptLines = [];
 
-    if (npmrcRemovedCount === 0) {
-      console.log('  No GitHub Packages lines found — ~/.npmrc is clean.');
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (line.includes('npm.pkg.github.com')) {
+      linesToRemove.push(line);
     } else {
-      console.log(`  Found ${npmrcRemovedCount} npm.pkg.github.com line(s):`);
-
-      for (const line of linesToRemove) {
-        // Mask auth tokens in output for safety
-        const masked = line.replace(/(:_authToken=).+/, '$1***');
-        console.log(`    - ${masked}`);
-      }
-
-      if (options.dryRun) {
-        console.log('');
-        console.log('  [Dry-run] No changes made. Would remove the above line(s).');
-      } else {
-        // Write back without GitHub Packages lines
-        const newContent = keptLines.join('\n');
-        fs.writeFileSync(npmrcPath, newContent, 'utf8');
-        console.log('  Cleaned successfully.');
-        npmrcChanged = true;
-      }
+      keptLines.push(line);
     }
   }
 
-  // === Phase 2: Cache check ===
-  console.log('');
-  console.log('Checking ~/.config/xp-gate/cache/ for old downloads...');
+  if (linesToRemove.length === 0) {
+    console.log('  No GitHub Packages lines found — ~/.npmrc is clean.');
+    return { changed: false, removedCount: 0 };
+  }
+
+  console.log(`  Found ${linesToRemove.length} npm.pkg.github.com line(s):`);
+  for (const line of linesToRemove) {
+    const masked = line.replace(/(:_authToken=).+/, '$1***');
+    console.log(`    - ${masked}`);
+  }
+
+  if (dryRun) {
+    console.log('');
+    console.log('  [Dry-run] No changes made. Would remove the above line(s).');
+    return { changed: false, removedCount: linesToRemove.length };
+  }
+
+  const newContent = keptLines.join('\n');
+  fs.writeFileSync(npmrcPath, newContent, 'utf8');
+  console.log('  Cleaned successfully.');
+  return { changed: true, removedCount: linesToRemove.length };
+}
 
+function checkCacheDir({ cacheDir, dryRun }) {
   if (!fs.existsSync(cacheDir)) {
     console.log('  No old cache directory found.');
-  } else {
-    const items = fs.readdirSync(cacheDir);
+    return;
+  }
 
-    if (items.length === 0) {
-      console.log('  Cache directory exists but is empty.');
-    } else {
-      console.log(`  Found ${items.length} cached file(s) from old installation.`);
-      for (const item of items) {
-        const itemPath = path.join(cacheDir, item);
-        const stat = fs.statSync(itemPath);
-        const size = stat.isFile() ? `(${formatSize(stat.size)})` : '(directory)';
-        console.log(`    - ${item} ${size}`);
-      }
-
-      if (!options.dryRun) {
-        console.log('  Note: These files are harmless but no longer needed.');
-        console.log('  You can safely remove them with: rm -rf ' + cacheDir);
-      }
-    }
+  const items = fs.readdirSync(cacheDir);
+  if (items.length === 0) {
+    console.log('  Cache directory exists but is empty.');
+    return;
+  }
+
+  console.log(`  Found ${items.length} cached file(s) from old installation.`);
+  for (const item of items) {
+    const itemPath = path.join(cacheDir, item);
+    const stat = fs.statSync(itemPath);
+    const size = stat.isFile() ? `(${formatSize(stat.size)})` : '(directory)';
+    console.log(`    - ${item} ${size}`);
   }
 
-  // === Phase 3: Summary ===
+  if (!dryRun) {
+    console.log('  Note: These files are harmless but no longer needed.');
+    console.log('  You can safely remove them with: rm -rf ' + cacheDir);
+  }
+}
+
+function printSummary(removedCount, cacheDir, wasDryRun) {
+  const hasCacheItems = fs.existsSync(cacheDir) && fs.readdirSync(cacheDir).length > 0;
+  const removedLabel = removedCount > 0 ? `${removedCount} GitHub Packages line(s) ${wasDryRun ? 'would be ' : ''}removed` : 'No changes needed';
   console.log('');
   console.log('Migration Summary:');
-  console.log(`  ~/.npmrc: ${npmrcRemovedCount > 0 ? `${npmrcRemovedCount} GitHub Packages line(s) ${options.dryRun ? 'would be' : ''}removed` : 'No changes needed'}`);
-  console.log(`  Cache:    ${fs.existsSync(cacheDir) && fs.readdirSync(cacheDir).length > 0 ? 'Old files found (can be cleaned manually)' : 'No old cache found'}`);
+  console.log(`  ~/.npmrc: ${removedLabel}`);
+  console.log(`  Cache:    ${hasCacheItems ? 'Old files found (can be cleaned manually)' : 'No old cache found'}`);
   console.log('');
   console.log('Migration complete. xp-gate v0.5.x no longer requires GitHub Packages or PAT tokens.');
+}
+
+async function migrate(args = []) {
+  const options = { dryRun: args.includes('--dry-run') };
+  const npmrcPath = path.join(HOME, '.npmrc');
+  const cacheDir = path.join(HOME, '.config', 'xp-gate', 'cache');
+
+  console.log('Checking ~/.npmrc for GitHub Packages residue...');
+  const { removedCount } = cleanNpmrc({ npmrcPath, dryRun: options.dryRun });
+
+  console.log('');
+  console.log('Checking ~/.config/xp-gate/cache/ for old downloads...');
+  checkCacheDir({ cacheDir, dryRun: options.dryRun });
 
+  printSummary(removedCount, cacheDir, options.dryRun);
   return 0;
 }