lacuna-cli 0.1.5 → 0.1.7

package/dist/commands/analyze.js

@@ -5,8 +5,9 @@ import { loadConfig } from '../lib/config.js';
 import { detectEnvironment } from '../lib/detector.js';
 import { runCommand } from '../lib/runner.js';
 import { startCoverageSpinner } from '../lib/coverage-spinner.js';
-import { loadCoverage, extractGaps, filterTestableGaps, findUncoveredFiles } from '../lib/coverage/index.js';
+import { loadCoverage, extractGaps, filterTestableGaps, findUncoveredFiles, findTestFiles } from '../lib/coverage/index.js';
 import { reportTerminal, buildJsonReport, buildMarkdownReport, getExitCode } from '../lib/reporter.js';
+const EMPTY_REPORT = { files: [], totalLineRate: 0, totalFunctionRate: 0 };
 export default class Analyze extends Command {
     static description = 'Analyze test coverage and show gaps — no files are changed';
     static examples = [
@@ -52,38 +53,48 @@ export default class Analyze extends Command {
             this.log(`${chalk.dim('Detected:')}  ${chalk.cyan(env.testRunner)} (${env.language})`);
             this.log(`${chalk.dim('Threshold:')} ${threshold}%\n`);
         }
-        const spinner = startCoverageSpinner(chalk.dim(`  Running: ${env.coverageCommand}`), env.testRunner);
-        const result = await runCommand(env.coverageCommand, process.cwd(), config.coverageTimeout * 1000, spinner.onLine);
-        spinner.stop();
-        if (result.timedOut) {
-            this.log(chalk.red(`\nTest suite timed out after ${config.coverageTimeout}s.`));
-            this.log(chalk.yellow('\nThis usually means a test has an open handle (unclosed server, timer, or connection).'));
-            this.log(chalk.dim(`\nIncrease the timeout in .lacuna.json: { "coverageTimeout": ${config.coverageTimeout * 2} }`));
-            this.exit(2);
-        }
-        // only bail if literally zero tests ran (suites crashed on load)
-        const zeroTests = /Tests:\s+0 total|no tests found/i.test(result.stdout + result.stderr);
-        if (zeroTests) {
-            this.log(chalk.red('\nYour test suites are failing before any tests run.'));
-            this.log(chalk.yellow('\nThis usually means:'));
-            this.log('  • A missing environment variable (check .env / .env.test)');
-            this.log('  • A broken import or missing module');
-            this.log('  • A setup file failing (DB connection, mock config, etc.)\n');
-            this.log(chalk.dim('Run this to see the actual error:'));
-            this.log(chalk.cyan(`  ${env.testCommand} 2>&1 | head -80`));
-            this.exit(2);
-        }
-        // partial failures are fine — coverage is still collected for passing tests
-        let report;
-        try {
-            report = await loadCoverage(config);
+        // Check if there are any test files before running the coverage command
+        const existingTests = await findTestFiles(process.cwd(), {}, config);
+        const hasTests = existingTests.length > 0;
+        let report = EMPTY_REPORT;
+        if (!hasTests) {
+            if (flags.format === 'terminal') {
+                this.log(chalk.dim('  No test files yet — scanning source files for coverage gaps.\n'));
+            }
         }
-        catch {
-            this.log(chalk.red(`Could not read coverage report from ./${config.coverageDir}/\n`));
-            this.log(chalk.yellow('Make sure your vitest config has coverage enabled:'));
-            this.log(chalk.dim('  // vitest.config.ts'));
-            this.log(chalk.dim('  test: { coverage: { reporter: ["lcov", "text-summary"] } }'));
-            this.exit(2);
+        else {
+            const spinner = startCoverageSpinner(chalk.dim(`  Running: ${env.coverageCommand}`), env.testRunner);
+            const result = await runCommand(env.coverageCommand, process.cwd(), config.coverageTimeout * 1000, spinner.onLine);
+            spinner.stop();
+            if (result.timedOut) {
+                this.log(chalk.red(`\nTest suite timed out after ${config.coverageTimeout}s.`));
+                this.log(chalk.yellow('\nThis usually means a test has an open handle (unclosed server, timer, or connection).'));
+                this.log(chalk.dim(`\nIncrease the timeout in .lacuna.json: { "coverageTimeout": ${config.coverageTimeout * 2} }`));
+                this.exit(2);
+            }
+            // bail if suites crashed on load (test files exist but zero tests ran)
+            const combined = result.stdout + result.stderr;
+            if (/Tests:\s+0 total/i.test(combined)) {
+                this.log(chalk.red('\nYour test suites are failing before any tests run.'));
+                this.log(chalk.yellow('\nThis usually means:'));
+                this.log('  • A missing environment variable (check .env / .env.test)');
+                this.log('  • A broken import or missing module');
+                this.log('  • A setup file failing (DB connection, mock config, etc.)\n');
+                this.log(chalk.dim('Run this to see the actual error:'));
+                this.log(chalk.cyan(`  ${env.testCommand} 2>&1 | head -80`));
+                this.exit(2);
+            }
+            // partial failures are fine — coverage is still collected for passing tests
+            try {
+                report = await loadCoverage(config);
+            }
+            catch {
+                this.log(chalk.red(`Could not read coverage report from ./${config.coverageDir}/\n`));
+                this.log(chalk.yellow('Make sure your vitest config has coverage enabled:'));
+                this.log(chalk.dim('  // vitest.config.ts'));
+                this.log(chalk.dim('  test: { coverage: { reporter: ["lcov", "text-summary"] } }'));
+                this.exit(2);
+            }
         }
         const gaps = await filterTestableGaps(extractGaps(report, threshold), config.ignore);
         // append files that never appeared in the coverage report (never imported by any test)

package/dist/commands/analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/commands/analyze.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/commands/analyze.ts"],"names":[],"mappings":"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"}

package/dist/commands/fix.d.ts

@@ -9,6 +9,8 @@ export default class Fix extends Command {
         model: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         workers: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         fresh: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'regenerate-on-failure': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'fix-polluters': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/fix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../src/commands/fix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAM5C,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,OAAO;IACtC,MAAM,CAAC,WAAW,SAAgG;IAElH,MAAM,CAAC,QAAQ,WAKd;IAED,MAAM,CAAC,KAAK;;;;;;;MA2BX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiE3B"}
+{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../src/commands/fix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAA;AAM5C,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,OAAO;IACtC,MAAM,CAAC,WAAW,SAAgG;IAElH,MAAM,CAAC,QAAQ,WAOd;IAED,MAAM,CAAC,KAAK;;;;;;;;;MAoCX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqF3B"}

package/dist/commands/fix.js

@@ -10,6 +10,8 @@ export default class Fix extends Command {
         '$ lacuna fix --workers 4',
         '$ lacuna fix --file src/utils/math.test.ts',
         '$ lacuna fix --dry-run',
+        '$ lacuna fix --regenerate-on-failure',
+        '$ lacuna fix --fix-polluters',
     ];
     static flags = {
         'dry-run': Flags.boolean({
@@ -38,6 +40,15 @@ export default class Fix extends Command {
             description: 'Re-run the full test suite even if a recent failing-files cache exists',
             default: false,
         }),
+        'regenerate-on-failure': Flags.boolean({
+            description: 'If fix exhausts all retries, delete the test and regenerate it from scratch (default: on). Use --no-regenerate-on-failure to disable.',
+            default: true,
+            allowNo: true,
+        }),
+        'fix-polluters': Flags.boolean({
+            description: 'After fixing, bisect the test suite to identify files that corrupt shared state, then use AI to add cleanup',
+            default: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(Fix);
@@ -69,6 +80,8 @@ export default class Fix extends Command {
                 targetFile: flags.file,
                 workers: flags.workers,
                 fresh: flags.fresh,
+                regenerateOnFailure: flags['regenerate-on-failure'],
+                fixPolluters: flags['fix-polluters'],
                 log: (msg) => this.log(msg),
             });
         }
@@ -79,21 +92,37 @@ export default class Fix extends Command {
         this.log(chalk.bold('Results'));
         this.log(`  ${chalk.dim('Files processed:')} ${result.filesProcessed}`);
         this.log(`  ${chalk.dim('Files fixed:')}     ${chalk.green(String(result.filesFixed))}`);
-        const stillFailing = result.filesProcessed - result.filesFixed;
+        if (result.filesAlreadyPassing > 0) {
+            this.log(`  ${chalk.dim('Already passing:')} ${chalk.dim(String(result.filesAlreadyPassing))}`);
+        }
+        if (result.pollutersFixed > 0) {
+            this.log(`  ${chalk.dim('Polluters fixed:')} ${chalk.green(String(result.pollutersFixed))}`);
+        }
+        if (result.victimsRegenerated > 0) {
+            this.log(`  ${chalk.dim('Victims regen:')}   ${chalk.green(String(result.victimsRegenerated))}`);
+        }
+        const stillFailing = result.filesProcessed - result.filesFixed - result.filesAlreadyPassing;
         if (stillFailing > 0) {
             this.log(`  ${chalk.dim('Still failing:')}  ${chalk.red(String(stillFailing))}`);
         }
+        if (result.filesAlreadyPassing > 0 && !flags['fix-polluters']) {
+            this.log(chalk.dim(`\n  ${result.filesAlreadyPassing} file(s) passed in isolation but fail in the suite. Use --fix-polluters to bisect + regenerate them.`));
+        }
         if (result.errors.length > 0) {
             this.log(chalk.red(`\n  ${result.errors.length} error(s):`));
             for (const err of result.errors) {
-                const lines = err.split('\n').slice(0, 8);
+                const lines = err.split('\n').slice(0, 15);
                 this.log(chalk.dim('  ' + lines.join('\n  ')));
             }
         }
         if (result.filesProcessed === 0) {
             this.exit(0);
         }
-        else if (result.filesFixed === result.filesProcessed) {
+        else if (stillFailing === 0) {
+            if (result.filesAlreadyPassing > 0 && result.filesFixed === 0) {
+                this.log(chalk.yellow(`\n  No tests were repaired — all skipped as already passing. Run lacuna fix --fresh to re-scan.`));
+                this.exit(1);
+            }
             this.log(chalk.green('\n  All failing tests fixed.'));
             this.exit(0);
         }

package/dist/commands/fix.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../src/commands/fix.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../src/commands/fix.ts"],"names":[],"mappings":"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"}

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAkcrC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAAiE;IACnF,MAAM,CAAC,QAAQ,WAAoB;IAE7B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2K3B"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAwnBrC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAAiE;IACnF,MAAM,CAAC,QAAQ,WAAoB;IAE7B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2K3B"}

package/dist/commands/init.js

@@ -26,9 +26,8 @@ async function readProjectMeta(cwd) {
         return { isReact: false, isReactNative: false, isExpo: false, isNextJs: false, isTypeScript: false, isVue: false, isAngular: false, isSvelte: false, isNestJs: false };
     }
 }
-async function isPackageInstalled(pkg, cwd) {
-    // Check all dependency fields in package.json (covers workspaces where the
-    // package is declared in the root manifest but installed at workspace level)
+async function checkPackageInstallState(pkg, cwd) {
+    // Check package.json first — the source of truth for declared dependencies
     try {
         const json = JSON.parse(await readFile(join(cwd, 'package.json'), 'utf-8'));
         const all = {
@@ -38,17 +37,46 @@ async function isPackageInstalled(pkg, cwd) {
             ...json['optionalDependencies'],
         };
         if (pkg in all)
-            return true;
+            return 'declared';
     }
-    catch { /* fall through to node_modules check */ }
-    // Fallback: check if the package is present in node_modules (pnpm workspaces,
-    // hoisted installs, or cases where the root manifest differs from what's installed)
+    catch { /* fall through */ }
+    // Check node_modules — present but undeclared means it was installed on a different
+    // branch or manually, and won't survive a fresh CI checkout
     try {
         await access(join(cwd, 'node_modules', pkg));
-        return true;
+        return 'undeclared';
     }
     catch { /* not found */ }
-    return false;
+    return 'missing';
+}
+// Convenience wrapper used for checking individual extra packages (setupFilePackages)
+async function isPackageInstalled(pkg, cwd) {
+    return (await checkPackageInstallState(pkg, cwd)) !== 'missing';
+}
+// Resolves the jest version range that a preset (e.g. jest-expo) declares as its
+// peer dependency, so we install a compatible jest rather than whatever is latest.
+// Falls back to bare 'jest' if the lookup fails (offline, registry unavailable, etc).
+function resolveJestVersionForPreset(preset, cwd) {
+    // 1. Check if preset is already installed locally — no network needed
+    try {
+        const localPkg = JSON.parse(execSync(`cat node_modules/${preset}/package.json 2>/dev/null`, { cwd, encoding: 'utf-8', stdio: 'pipe' }));
+        const range = localPkg?.peerDependencies?.jest;
+        const major = range?.match(/\d+/)?.[0];
+        if (major)
+            return { pkg: `jest@${major}`, warned: false };
+    }
+    catch { /* not installed yet */ }
+    // 2. Fall back to npm registry lookup
+    try {
+        const out = execSync(`npm info ${preset} peerDependencies.jest 2>/dev/null`, { cwd, encoding: 'utf-8', stdio: 'pipe' }).trim();
+        const cleaned = out.replace(/^['"]|['"]$/g, '');
+        const major = cleaned.match(/\d+/)?.[0];
+        if (major)
+            return { pkg: `jest@${major}`, warned: false };
+    }
+    catch { /* registry unreachable */ }
+    // 3. Could not resolve — warn so the user knows to check manually
+    return { pkg: 'jest', warned: true };
 }
 async function writeFileWithDir(filePath, content) {
     await mkdir(dirname(filePath), { recursive: true });
@@ -91,34 +119,121 @@ async function findProjectRoot(startDir) {
         }
     }
 }
-function buildSetupFileContent(variant) {
+function buildSetupFileContent(variant, runner, isExpo = false) {
+    // Mock cleanup — prevents spy state from leaking across tests and test files.
+    // beforeEach: restores any globalThis spies left by previous files in the same worker
+    //             (works in concert with restoreMocks: true in vitest.config.ts)
+    // afterEach:  belt-and-suspenders cleanup within the file
+    const vitestCleanup = [
+        ``,
+        `// ── Mock cleanup ──────────────────────────────────────────────────────────`,
+        `// restoreMocks/clearMocks in vitest.config.ts handle this automatically,`,
+        `// but explicit hooks here guard against any gaps.`,
+        `// vi is available globally (globals: true in vitest.config.ts).`,
+        ``,
+        `beforeEach(() => {`,
+        `  vi.restoreAllMocks()`,
+        `})`,
+        ``,
+        `afterEach(() => {`,
+        `  vi.restoreAllMocks()`,
+        `  vi.clearAllMocks()`,
+        `})`,
+    ].join('\n');
+    const jestCleanup = [
+        ``,
+        `// ── Mock cleanup ──────────────────────────────────────────────────────────`,
+        `// Runs after every test to prevent mock state leaking across test files.`,
+        `afterEach(() => {`,
+        `  jest.restoreAllMocks()`,
+        `  jest.clearAllMocks()`,
+        `})`,
+    ].join('\n');
+    const cleanup = runner === 'vitest' ? vitestCleanup : jestCleanup;
     if (variant === 'react-native') {
+        const expoMocks = isExpo ? [
+            ``,
+            `// ── Expo module mocks ─────────────────────────────────────────────────────`,
+            `jest.mock('expo-constants', () => ({`,
+            `  default: { expoConfig: { name: 'App', slug: 'app' } },`,
+            `}))`,
+            ``,
+            `jest.mock('expo-router', () => ({`,
+            `  useRouter: jest.fn(() => ({ push: jest.fn(), replace: jest.fn(), back: jest.fn() })),`,
+            `  useLocalSearchParams: jest.fn(() => ({})),`,
+            `  usePathname: jest.fn(() => '/'),`,
+            `  useSegments: jest.fn(() => []),`,
+            `  Link: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `  router: { push: jest.fn(), replace: jest.fn(), back: jest.fn() },`,
+            `}))`,
+            ``,
+            `jest.mock('expo-status-bar', () => ({`,
+            `  StatusBar: jest.fn(() => null),`,
+            `}))`,
+        ] : [];
         return [
             `// React Native / Expo test setup`,
-            `// @testing-library/react-native matchers`,
-            `import '@testing-library/react-native/extend-expect'`,
+            `import React from 'react'`,
+            ``,
+            `// ── Native module mocks ───────────────────────────────────────────────────`,
+            `// These modules rely on native code that is unavailable in the Jest environment.`,
             ``,
-            `import { jest } from '@jest/globals'`,
+            `// Safe area context — provides insets/frame for components that use useSafeAreaInsets`,
+            `jest.mock('react-native-safe-area-context', () => ({`,
+            `  SafeAreaProvider: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `  SafeAreaView: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `  useSafeAreaInsets: jest.fn(() => ({ top: 0, bottom: 0, left: 0, right: 0 })),`,
+            `  useSafeAreaFrame: jest.fn(() => ({ x: 0, y: 0, width: 390, height: 844 })),`,
+            `}))`,
             ``,
-            `// Silence the native animated warning in tests`,
-            `jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper')`,
+            `// Gesture handler — required by react-navigation and many UI libraries`,
+            `jest.mock('react-native-gesture-handler', () => {`,
+            `  const RN = jest.requireActual('react-native')`,
+            `  return {`,
+            `    ...RN,`,
+            `    GestureHandlerRootView: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `    PanGestureHandler: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `    TapGestureHandler: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `    Swipeable: jest.fn(({ children }: { children: React.ReactNode }) => children),`,
+            `  }`,
+            `})`,
+            ``,
+            `// AsyncStorage — native async key-value store`,
+            `jest.mock('@react-native-async-storage/async-storage', () =>`,
+            `  jest.requireActual('@react-native-async-storage/async-storage/jest/async-storage-mock')`,
+            `)`,
+            ``,
+            `// React Navigation — mock the navigation hooks to avoid needing a real NavigationContainer`,
+            `jest.mock('@react-navigation/native', () => ({`,
+            `  ...jest.requireActual('@react-navigation/native'),`,
+            `  useNavigation: jest.fn(() => ({ navigate: jest.fn(), goBack: jest.fn(), push: jest.fn(), replace: jest.fn() })),`,
+            `  useRoute: jest.fn(() => ({ params: {} })),`,
+            `  useFocusEffect: jest.fn((cb: () => void) => cb()),`,
+            `  useIsFocused: jest.fn(() => true),`,
+            `}))`,
+            ...expoMocks,
+            jestCleanup,
         ].join('\n') + '\n';
     }
     if (variant === 'angular') {
-        return `import 'jest-preset-angular/setup-jest'\n`;
+        return `import 'jest-preset-angular/setup-jest'\n` + jestCleanup + '\n';
     }
     if (variant === 'nest') {
-        return `// NestJS test setup — no DOM environment needed\n`;
+        return `// NestJS test setup — no DOM environment needed\n` + jestCleanup + '\n';
     }
     if (variant === 'vue') {
-        return `import '@testing-library/jest-dom'\n`;
+        return `import '@testing-library/jest-dom'\n` + cleanup + '\n';
     }
     if (variant === 'svelte') {
-        return `import '@testing-library/jest-dom'\n`;
+        return `import '@testing-library/jest-dom'\n` + cleanup + '\n';
     }
     const lines = [`import '@testing-library/jest-dom'`];
     if (variant === 'nextjs') {
-        lines.push(``, `// ── Next.js global mocks ──────────────────────────────────────────────────`, `// These run before every test so individual test files don't need to mock them.`, ``, `import { vi } from 'vitest'`, ``, `// next/navigation — useRouter, usePathname, etc. are server-side and fail in jsdom`, `vi.mock('next/navigation', () => ({`, `  useRouter:       vi.fn(() => ({ push: vi.fn(), replace: vi.fn(), back: vi.fn(), forward: vi.fn(), prefetch: vi.fn() })),`, `  usePathname:     vi.fn(() => '/'),`, `  useSearchParams: vi.fn(() => new URLSearchParams()),`, `  useParams:       vi.fn(() => ({})),`, `  redirect:        vi.fn(),`, `  notFound:        vi.fn(),`, `}))`, ``, `// next/headers — server-only, throws in jsdom`, `vi.mock('next/headers', () => ({`, `  cookies: vi.fn(() => ({ get: vi.fn(), set: vi.fn(), delete: vi.fn(), has: vi.fn(), getAll: vi.fn(() => []) })),`, `  headers: vi.fn(() => new Headers()),`, `}))`, ``, `// next/cache — no-ops in tests`, `vi.mock('next/cache', () => ({`, `  revalidatePath:  vi.fn(),`, `  revalidateTag:   vi.fn(),`, `  unstable_cache:  vi.fn((fn: () => unknown) => fn),`, `}))`, ``, `// next/image — uses Next.js image optimization which breaks in jsdom`, `vi.mock('next/image', () => ({`, `  default: vi.fn(({ src, alt, ...props }: Record<string, unknown>) => null),`, `}))`, ``, `// next/font — font loading tries to fetch/read files at import time, fails in tests`, `// Add any fonts your project uses that aren't listed here`, `vi.mock('next/font/google', () => new Proxy({}, {`, `  get: (_: object, fontName: string) =>`, `    () => ({ className: \`font-\${fontName.toLowerCase()}\`, style: { fontFamily: fontName } }),`, `}))`, `vi.mock('next/font/local', () => ({`, `  default: vi.fn(() => ({ className: 'font-local', style: { fontFamily: 'local' } })),`, `}))`);
+        lines.push(``, `// ── Next.js global mocks ──────────────────────────────────────────────────`, `// These run before every test so individual test files don't need to mock them.`, ``, `import { vi, beforeEach, afterEach } from 'vitest'`, ``, `// next/navigation — useRouter, usePathname, etc. are server-side and fail in jsdom`, `vi.mock('next/navigation', () => ({`, `  useRouter:       vi.fn(() => ({ push: vi.fn(), replace: vi.fn(), back: vi.fn(), forward: vi.fn(), prefetch: vi.fn() })),`, `  usePathname:     vi.fn(() => '/'),`, `  useSearchParams: vi.fn(() => new URLSearchParams()),`, `  useParams:       vi.fn(() => ({})),`, `  redirect:        vi.fn(),`, `  notFound:        vi.fn(),`, `}))`, ``, `// next/headers — server-only, throws in jsdom`, `vi.mock('next/headers', () => ({`, `  cookies: vi.fn(() => ({ get: vi.fn(), set: vi.fn(), delete: vi.fn(), has: vi.fn(), getAll: vi.fn(() => []) })),`, `  headers: vi.fn(() => new Headers()),`, `}))`, ``, `// next/cache — no-ops in tests`, `vi.mock('next/cache', () => ({`, `  revalidatePath:  vi.fn(),`, `  revalidateTag:   vi.fn(),`, `  unstable_cache:  vi.fn((fn: () => unknown) => fn),`, `}))`, ``, `// next/image — uses Next.js image optimization which breaks in jsdom`, `vi.mock('next/image', () => ({`, `  default: vi.fn(({ src, alt, ...props }: Record<string, unknown>) => null),`, `}))`, ``, `// next/font — font loading tries to fetch/read files at import time, fails in tests`, `// Add any fonts your project uses that aren't listed here`, `vi.mock('next/font/google', () => new Proxy({}, {`, `  get: (_: object, fontName: string) =>`, `    () => ({ className: \`font-\${fontName.toLowerCase()}\`, style: { fontFamily: fontName } }),`, `}))`, `vi.mock('next/font/local', () => ({`, `  default: vi.fn(() => ({ className: 'font-local', style: { fontFamily: 'local' } })),`, `}))`, vitestCleanup);
+    }
+    else {
+        // plain react
+        lines.push(cleanup);
     }
     return lines.join('\n') + '\n';
 }
@@ -146,7 +261,7 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
         return undefined;
     }
     const meta = await readProjectMeta(cwd);
-    const alreadyInstalled = await isPackageInstalled(runner, cwd);
+    const installState = await checkPackageInstallState(runner, cwd);
     // ── Determine packages to install ─────────────────────────────────────────
     const basePackages = [];
     const setupFilePackages = [];
@@ -173,11 +288,22 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
         // @vitejs/plugin-react is NOT needed for Vitest — esbuild handles JSX/TSX natively.
     }
     else if (runner === 'jest') {
-        if (meta.isTypeScript) {
+        if (meta.isReactNative) {
+            // Use the jest version that the preset actually supports — resolved at init time
+            // so this stays correct when jest-expo bumps its peer dep in the future.
+            const rnPreset = meta.isExpo ? 'jest-expo' : '@react-native/jest-preset';
+            const { pkg: jestPkg, warned } = resolveJestVersionForPreset(rnPreset, cwd);
+            if (warned) {
+                log(chalk.yellow(`  ⚠ Could not resolve compatible jest version for ${rnPreset}. Installing latest — if tests fail with version mismatch errors, pin jest to the version in ${rnPreset}'s peerDependencies.`));
+            }
+            const jestMajor = jestPkg.includes('@') ? jestPkg.split('@')[1] : '';
+            basePackages.push(jestPkg, jestMajor ? `@types/jest@${jestMajor}` : '@types/jest');
+        }
+        else if (meta.isTypeScript) {
             basePackages.push('jest', '@types/jest', 'ts-jest');
         }
         else {
-            basePackages.push('jest');
+            basePackages.push('jest', '@types/jest');
         }
         if (meta.isReactNative) {
             // Don't add jest-environment-jsdom for RN
@@ -227,7 +353,7 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
         return undefined;
     })();
     // ── Install missing packages ───────────────────────────────────────────────
-    if (!alreadyInstalled) {
+    if (installState === 'missing') {
         const allPackages = [...basePackages, ...setupFilePackages];
         log(chalk.yellow(`\n  ${runner} is not installed.`));
         log(chalk.dim(`  Packages: ${allPackages.join(', ')}`));
@@ -245,6 +371,30 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
             }
         }
     }
+    else if (installState === 'undeclared') {
+        // Package exists in node_modules but is NOT declared in package.json.
+        // This usually means it was installed on a different branch and won't survive
+        // a fresh CI checkout — node_modules is not committed to git.
+        const allPackages = [...basePackages, ...setupFilePackages];
+        log(chalk.yellow(`\n  ${runner} was found in node_modules but is not declared in package.json.`));
+        log(chalk.dim(`  This works locally but will break CI — a fresh checkout won't have node_modules.`));
+        const doAdd = await confirm({
+            message: `Add ${allPackages.join(', ')} to package.json? (recommended for CI)`,
+            default: true,
+        });
+        if (!doAdd) {
+            log(chalk.dim(`  Skipped. Add manually: npm install -D ${allPackages.join(' ')}`));
+        }
+        else {
+            log(chalk.dim(`\n  Adding to package.json...`));
+            try {
+                execSync(`npm install -D ${allPackages.join(' ')}`, { cwd, stdio: 'inherit' });
+            }
+            catch {
+                log(chalk.red(`  Failed. Run manually: npm install -D ${allPackages.join(' ')}`));
+            }
+        }
+    }
     else if ((meta.isNextJs || meta.isReact) && setupFilePackages.length > 0) {
         // Runner is installed — check if the extra testing-library packages are present.
         // Must use a for-loop: Array.filter ignores async callbacks (the Promise is always truthy).
@@ -280,11 +430,23 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
                             : meta.isVue ? 'vue'
                                 : meta.isSvelte ? 'svelte'
                                     : 'react';
-            const setupContent = buildSetupFileContent(setupVariant);
+            const setupContent = buildSetupFileContent(setupVariant, runner, meta.isExpo);
             await writeFileWithDir(absSetup, setupContent);
             log(chalk.green(`  ✓ Created ${setupFilePath}`));
-            if (meta.isNextJs)
+            if (meta.isNextJs) {
                 log(chalk.dim(`    Includes global mocks for next/navigation, next/headers, next/cache`));
+                // Create the empty module that the server-only alias points to.
+                // Without this file, Vitest crashes when any source file imports 'server-only'.
+                const emptyModulePath = resolve(cwd, 'test/empty-module.ts');
+                try {
+                    await access(emptyModulePath);
+                }
+                catch {
+                    await writeFileWithDir(emptyModulePath, 'export default {}\n');
+                    log(chalk.green(`  ✓ Created test/empty-module.ts`));
+                    log(chalk.dim(`    Used as the server-only alias target in vitest.config.ts`));
+                }
+            }
             createdSetupFile = setupFilePath;
         }
     }
@@ -306,8 +468,14 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
             // to stay consistent with whatever the project has configured.
             // No React plugin needed: Vitest uses esbuild which handles JSX/TSX natively.
             const aliasTarget = meta.isNextJs ? await resolveAtAlias(cwd) : null;
+            // Next.js: add server-only alias so Vitest doesn't crash on Next.js server-only imports.
+            // server-only is a Next.js guard that throws at build time if server code leaks to the client;
+            // in Vitest it just needs to resolve to something harmless.
+            const serverOnlyAlias = meta.isNextJs
+                ? `,\n      'server-only': path.resolve(__dirname, './test/empty-module.ts')`
+                : '';
             const aliasBlock = aliasTarget
-                ? `\n  resolve: {\n    alias: { '@': path.resolve(__dirname, '${aliasTarget}') },\n  },`
+                ? `\n  resolve: {\n    alias: { '@': path.resolve(__dirname, '${aliasTarget}')${serverOnlyAlias} },\n  },`
                 : '';
             const pathImport = aliasTarget ? `import path from 'path'\n` : '';
             const vuePlugin = meta.isVue ? `\nimport vue from '@vitejs/plugin-vue'` : '';
@@ -323,6 +491,12 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
                 `export default defineConfig({${aliasBlock}${pluginsBlock}`,
                 `  test: {`,
                 `    globals: true,${envLine}${setupLine}`,
+                `    // Restore and clear all mocks automatically before each test.`,
+                `    // restoreMocks runs at the Vitest worker level and can restore globalThis spies`,
+                `    // that the module-level vi instance cannot see — preventing cross-file contamination`,
+                `    // when multiple test files share the same worker thread.`,
+                `    restoreMocks: true,`,
+                `    clearMocks: true,`,
                 `    coverage: {`,
                 `      provider: 'v8',`,
                 `      reporter: ['lcov', 'text-summary'],`,
@@ -345,17 +519,19 @@ async function ensureTestRunnerSetup(runner, sourceDir, cwd, log) {
         }
         catch {
             const setupLine = createdSetupFile
-                ? `\n  setupFilesAfterFramework: ['<rootDir>/${createdSetupFile}'],`
+                ? `\n  setupFilesAfterEnv: ['<rootDir>/${createdSetupFile}'],`
                 : '';
             const needsJsdom = (meta.isReact || meta.isVue || meta.isSvelte) && !meta.isReactNative && !meta.isAngular && !meta.isNestJs;
             const envLine = needsJsdom ? `\n  testEnvironment: 'jsdom',` : '';
-            const tsLines = meta.isTypeScript
+            // React Native / Expo: babel-preset-expo already handles TypeScript — don't override transform
+            // or it replaces the preset's JS transform and setup.js files fail to parse.
+            const tsLines = meta.isTypeScript && !meta.isReactNative
                 ? `\n  transform: { '^.+\\\\.tsx?$': 'ts-jest' },`
                 : '';
             const rnPreset = meta.isExpo ? 'jest-expo' : 'react-native';
             const presetLine = meta.isReactNative ? `\n  preset: '${rnPreset}',` : '';
             const transformIgnoreLine = meta.isReactNative
-                ? `\n  transformIgnorePatterns: ['node_modules/(?!(react-native|@react-native|@react-navigation|expo|@expo|@testing-library)/)',],`
+                ? `\n  transformIgnorePatterns: ['node_modules/(?!(.pnpm/[^/]*/node_modules/)?(react-native(-[^/]+)?|@react-native|@react-navigation|expo(-[^/]+)?|@expo|@testing-library)/)'],`
                 : '';
             const angularPreset = meta.isAngular ? `\n  preset: 'jest-preset-angular',` : '';
             const content = [
@@ -488,7 +664,7 @@ export default class Init extends Command {
         if (hasMocks) {
             mocksFile = await input({
                 message: 'Path to shared mock file:',
-                default: `${sourceDir}/test/mocks.ts`,
+                default: (await readProjectMeta(cwd)).isReactNative ? `${sourceDir}/test/mock.tsx` : `${sourceDir}/test/mocks.ts`,
             });
         }
         // ── Coverage threshold ────────────────────────────────────────────────────
@@ -502,7 +678,7 @@ export default class Init extends Command {
             testRunner: testRunner,
             coverageFormat: 'lcov',
             coverageDir: 'coverage',
-            sourceDir,
+            sourceDir: [sourceDir],
             threshold,
             maxIterations: 3,
         };