@vibecheckai/cli 3.2.6 → 3.3.0

package/bin/runners/runPolish.js

@@ -24,6 +24,8 @@
 
 const fs = require("fs");
 const path = require("path");
+const { EXIT } = require("./lib/exit-codes");
+const { parseGlobalFlags, shouldSuppressOutput, isJsonMode } = require("./lib/global-flags");
 
 // ═══════════════════════════════════════════════════════════════════════════════
 // TERMINAL STYLING
@@ -2856,26 +2858,35 @@ function getCategoryIcon(category) {
 
 async function runPolish(args) {
   const opts = parseArgs(args);
+  const { flags: globalFlags } = parseGlobalFlags(args);
+  const quiet = shouldSuppressOutput(globalFlags);
+  const json = isJsonMode(globalFlags) || opts.json;
   
   if (opts.help) {
     printHelp();
-    return 0;
+    return EXIT.SUCCESS;
   }
   
   const projectPath = path.resolve(opts.path);
   
   // Verify project exists
   if (!await pathExists(projectPath)) {
-    console.error(`${c.red}${icons.cross} Project path does not exist: ${projectPath}${c.reset}`);
-    return 1;
+    if (json) {
+      console.log(JSON.stringify({ success: false, error: `Project path does not exist: ${projectPath}` }));
+    } else {
+      console.error(`${c.red}${icons.cross} Project path does not exist: ${projectPath}${c.reset}`);
+      console.error(`  Verify the path and try again.`);
+    }
+    return EXIT.NOT_FOUND;
   }
   
-  // JSON mode
-  if (opts.json) {
-    const report = await analyzeProject(projectPath, opts);
-    console.log(JSON.stringify(report, null, 2));
-    return report.critical > 0 ? 1 : 0;
-  }
+  try {
+    // JSON mode
+    if (json) {
+      const report = await analyzeProject(projectPath, opts);
+      console.log(JSON.stringify(report, null, 2));
+      return report.critical > 0 ? EXIT.BLOCKING : EXIT.SUCCESS;
+    }
   
   // Interactive mode
   console.log(`
@@ -2914,8 +2925,10 @@ ${c.bold}╔══════════════════════
   console.log(`            ${icons.critical} ${report.critical} critical  ${icons.high} ${report.high} high  ${icons.medium} ${report.medium} medium  ${icons.low} ${report.low} low\n`);
   
   if (report.issues.length === 0) {
-    console.log(`\n${c.green}${c.bold}${icons.check} Perfect!${c.reset} No polish issues found. Your project is production-ready! ${icons.rocket}\n`);
-    return 0;
+    if (!quiet) {
+      console.log(`\n${c.green}${c.bold}${icons.check} Perfect!${c.reset} No polish issues found. Your project is production-ready! ${icons.rocket}\n`);
+    }
+    return EXIT.SUCCESS;
   }
   
   // Group by category
@@ -3016,16 +3029,26 @@ ${c.bold}╔══════════════════════
   }
   
   // Next steps
-  console.log(`${c.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${c.reset}`);
-  console.log(`${c.bold}${icons.rocket} NEXT STEPS${c.reset}`);
-  console.log(`${c.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${c.reset}\n`);
-  console.log(`   1. Fix ${c.red}critical${c.reset} and ${c.yellow}high${c.reset} severity issues first`);
-  console.log(`   2. Use ${c.cyan}vibecheck polish --prompts${c.reset} to get AI-ready fixes`);
-  console.log(`   3. Copy prompts to your AI assistant (Cursor, Copilot, Claude)`);
-  console.log(`   4. Re-run ${c.cyan}vibecheck polish${c.reset} to verify fixes`);
-  console.log(`   5. Run ${c.cyan}vibecheck ship${c.reset} when score is 80+\n`);
+  if (!quiet) {
+    console.log(`${c.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${c.reset}`);
+    console.log(`${c.bold}${icons.rocket} NEXT STEPS${c.reset}`);
+    console.log(`${c.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${c.reset}\n`);
+    console.log(`   1. Fix ${c.red}critical${c.reset} and ${c.yellow}high${c.reset} severity issues first`);
+    console.log(`   2. Use ${c.cyan}vibecheck polish --prompts${c.reset} to get AI-ready fixes`);
+    console.log(`   3. Copy prompts to your AI assistant (Cursor, Copilot, Claude)`);
+    console.log(`   4. Re-run ${c.cyan}vibecheck polish${c.reset} to verify fixes`);
+    console.log(`   5. Run ${c.cyan}vibecheck ship${c.reset} when score is 80+\n`);
+  }
   
-  return report.critical > 0 ? 1 : 0;
+  return report.critical > 0 ? EXIT.BLOCKING : EXIT.SUCCESS;
+  } catch (error) {
+    if (json) {
+      console.log(JSON.stringify({ success: false, error: error.message }));
+    } else {
+      console.error(`${c.red}${icons.cross} Polish analysis failed: ${error.message}${c.reset}`);
+    }
+    return EXIT.INTERNAL_ERROR;
+  }
 }
 
 module.exports = { runPolish };

package/bin/runners/runProve.js

@@ -26,10 +26,9 @@ const {
   generateRunId, 
   createJsonOutput, 
   writeJsonOutput, 
-  exitCodeToVerdict,
-  verdictToExitCode,
   saveArtifact 
 } = require("./lib/cli-output");
+const { EXIT, verdictToExitCode, exitCodeToVerdict } = require("./lib/exit-codes");
 const { parseGlobalFlags, shouldShowBanner } = require("./lib/global-flags");
 const upsell = require("./lib/upsell");
 

package/bin/runners/runReport.js

@@ -18,6 +18,7 @@
 const path = require("path");
 const fs = require("fs");
 const { parseGlobalFlags, shouldShowBanner } = require("./lib/global-flags");
+const { EXIT } = require("./lib/exit-codes");
 
 // Entitlements enforcement
 let entitlements;
@@ -264,11 +265,11 @@ async function runReport(args) {
       default:
         spinner.fail(`Unknown format: ${format}`);
         console.log(`  ${ansi.dim}Supported: html, md, json, sarif, csv, pdf${ansi.reset}`);
-        return 1;
+        return EXIT.USER_ERROR;
     }
   } catch (err) {
     spinner.fail(`Failed to generate report: ${err.message}`);
-    return 1;
+    return EXIT.INTERNAL_ERROR;
   }
 
   // Determine output path

package/bin/runners/runScan.js

@@ -25,6 +25,7 @@ const {
   reportScanError, 
   isApiAvailable 
 } = require("./lib/api-client");
+const { EXIT, verdictToExitCode } = require("./lib/exit-codes");
 
 // ═══════════════════════════════════════════════════════════════════════════════
 // ENHANCED TERMINAL UI & OUTPUT MODULES
@@ -170,57 +171,75 @@ function printHelp(showBanner = true) {
     console.log(BANNER);
   }
   console.log(`
-  ${ansi.bold}Usage:${ansi.reset} vibecheck scan ${ansi.dim}(s)${ansi.reset} [path] [options]
+  ${ansi.bold}USAGE${ansi.reset}
+    ${colors.accent}vibecheck scan${ansi.reset} [path] [options]
   
-  ${ansi.bold}Aliases:${ansi.reset} ${ansi.dim}s${ansi.reset}
-
-  ${ansi.bold}Scan Modes:${ansi.reset}
-    ${colors.accent}(default)${ansi.reset}       Layer 1: AST static analysis ${ansi.dim}(fast)${ansi.reset}
-    ${colors.accent}--truth, -t${ansi.reset}     Layer 1+2: Include build manifest verification ${ansi.dim}(CI/ship)${ansi.reset}
-    ${colors.accent}--reality, -r${ansi.reset}   Layer 1+2+3: Include Playwright runtime proof ${ansi.dim}(full)${ansi.reset}
-    ${colors.accent}--reality-sniff${ansi.reset} Include Reality Sniff AI artifact detection ${ansi.dim}(recommended)${ansi.reset}
-
-  ${ansi.bold}Fix Mode:${ansi.reset}
-    ${colors.accent}--autofix, -f${ansi.reset}   Apply safe fixes + generate AI missions ${ansi.rgb(0, 200, 255)}[STARTER]${ansi.reset}
-
-  ${ansi.bold}Allowlist (suppress false positives):${ansi.reset}
-    ${colors.accent}--allowlist list${ansi.reset}                 Show all allowlist entries
-    ${colors.accent}--allowlist add${ansi.reset}                  Add entry to allowlist
-      ${ansi.dim}--id <finding-id>${ansi.reset}             Finding ID to allowlist
-      ${ansi.dim}--pattern <regex>${ansi.reset}             Pattern to match
-      ${ansi.dim}--reason <text>${ansi.reset}               Reason (required)
-      ${ansi.dim}--scope <global|file|line>${ansi.reset}    Scope (default: global)
-      ${ansi.dim}--expires <days>${ansi.reset}              Auto-expire after N days
-    ${colors.accent}--allowlist remove --id <id>${ansi.reset}     Remove entry from allowlist
-    ${colors.accent}--allowlist check --id <id>${ansi.reset}      Check if finding is allowlisted
-
-  ${ansi.bold}Options:${ansi.reset}
-    ${colors.accent}--url, -u${ansi.reset}       Base URL for reality testing (e.g., http://localhost:3000)
-    ${colors.accent}--verbose, -v${ansi.reset}   Show detailed progress
-    ${colors.accent}--json${ansi.reset}          Output results as JSON
-    ${colors.accent}--sarif${ansi.reset}         Output in SARIF format (GitHub code scanning)
-    ${colors.accent}--no-save${ansi.reset}       Don't save results to .vibecheck/results/
-    ${colors.accent}--help, -h${ansi.reset}      Show this help
-
-  ${ansi.bold}Examples:${ansi.reset}
-    ${ansi.dim}# Quick scan (AST only)${ansi.reset}
+  ${ansi.dim}Aliases: s, check${ansi.reset}
+
+  The core analysis engine. Scans your codebase for route integrity issues,
+  security vulnerabilities, code quality problems, and more.
+
+  ${ansi.bold}SCAN LAYERS${ansi.reset}
+    ${colors.accent}(default)${ansi.reset}         Layer 1: AST static analysis ${ansi.dim}(fast, ~2s)${ansi.reset}
+    ${colors.accent}--truth, -t${ansi.reset}       Layer 1+2: + build manifest verification ${ansi.dim}(CI/ship)${ansi.reset}
+    ${colors.accent}--reality, -r${ansi.reset}     Layer 1+2+3: + Playwright runtime proof ${ansi.dim}[PRO]${ansi.reset}
+    ${colors.accent}--reality-sniff${ansi.reset}   Include Reality Sniff AI artifact detection
+
+  ${ansi.bold}FIX MODE${ansi.reset} ${ansi.cyan}[STARTER]${ansi.reset}
+    ${colors.accent}--autofix, -f${ansi.reset}     Generate AI fix missions for detected issues
+
+  ${ansi.bold}BASELINE TRACKING${ansi.reset}
+    ${colors.accent}--baseline${ansi.reset}        Compare against previous scan ${ansi.dim}(default: on)${ansi.reset}
+    ${colors.accent}--no-baseline${ansi.reset}     Skip baseline comparison
+    ${colors.accent}--update-baseline${ansi.reset} Save current findings as new baseline
+
+  ${ansi.bold}ALLOWLIST (suppress false positives)${ansi.reset}
+    ${colors.accent}--allowlist list${ansi.reset}                   Show all suppressed findings
+    ${colors.accent}--allowlist add --id <id> --reason "..."${ansi.reset}
+    ${colors.accent}--allowlist remove --id <id>${ansi.reset}       Remove suppression
+    ${colors.accent}--allowlist check --id <id>${ansi.reset}        Check if suppressed
+
+  ${ansi.bold}OUTPUT OPTIONS${ansi.reset}
+    ${colors.accent}--json${ansi.reset}            Output as JSON ${ansi.dim}(machine-readable)${ansi.reset}
+    ${colors.accent}--sarif${ansi.reset}           SARIF format ${ansi.dim}(GitHub code scanning)${ansi.reset}
+    ${colors.accent}--no-save${ansi.reset}         Don't save results to .vibecheck/results/
+    ${colors.accent}--verbose, -v${ansi.reset}     Show detailed progress
+
+  ${ansi.bold}GLOBAL OPTIONS${ansi.reset}
+    ${colors.accent}--path, -p <dir>${ansi.reset}  Run in specified directory
+    ${colors.accent}--quiet, -q${ansi.reset}       Suppress non-essential output
+    ${colors.accent}--ci${ansi.reset}              CI mode ${ansi.dim}(quiet + no-banner)${ansi.reset}
+    ${colors.accent}--help, -h${ansi.reset}        Show this help
+
+  ${ansi.bold}💡 EXAMPLES${ansi.reset}
+
+    ${ansi.dim}# Quick scan (most common)${ansi.reset}
     vibecheck scan
 
-    ${ansi.dim}# Scan + autofix with missions${ansi.reset}
+    ${ansi.dim}# Scan with AI fix missions${ansi.reset}
     vibecheck scan --autofix
 
-    ${ansi.dim}# Add false positive to allowlist${ansi.reset}
-    vibecheck scan --allowlist add --id R_DEAD_abc123 --reason "Known toggle"
+    ${ansi.dim}# Suppress a false positive${ansi.reset}
+    vibecheck scan --allowlist add --id R_DEAD_abc123 --reason "Feature toggle"
 
-    ${ansi.dim}# List allowlist entries${ansi.reset}
-    vibecheck scan --allowlist list
+    ${ansi.dim}# CI pipeline (JSON output, strict)${ansi.reset}
+    vibecheck scan --ci --json > results.json
 
-    ${ansi.dim}# Full proof with Playwright${ansi.reset}
+    ${ansi.dim}# Full reality proof (requires running app)${ansi.reset}
     vibecheck scan --reality --url http://localhost:3000
 
-  ${ansi.bold}Output:${ansi.reset}
-    Results saved to: .vibecheck/results/latest.json
-    Missions saved to: .vibecheck/missions/ ${ansi.dim}(with --autofix)${ansi.reset}
+  ${ansi.bold}📄 OUTPUT${ansi.reset}
+    Results:   .vibecheck/results/latest.json
+    Missions:  .vibecheck/missions/ ${ansi.dim}(with --autofix)${ansi.reset}
+    History:   .vibecheck/results/history/
+
+  ${ansi.bold}🔗 RELATED COMMANDS${ansi.reset}
+    ${colors.accent}vibecheck ship${ansi.reset}       Get final SHIP/WARN/BLOCK verdict
+    ${colors.accent}vibecheck fix${ansi.reset}        Apply AI-generated fixes ${ansi.cyan}[STARTER]${ansi.reset}
+    ${colors.accent}vibecheck prove${ansi.reset}      Full proof pipeline with evidence ${ansi.magenta}[PRO]${ansi.reset}
+
+  ${ansi.dim}─────────────────────────────────────────────────────────────${ansi.reset}
+  ${ansi.dim}Documentation: https://docs.vibecheckai.dev/cli/scan${ansi.reset}
   `);
 }
 
@@ -761,7 +780,7 @@ async function runScan(args) {
     console.log(`  ${colors.warning}⚠${ansi.reset} ${ansi.bold}Reality layer requires --url${ansi.reset}`);
     console.log(`  ${ansi.dim}Example: vibecheck scan --reality --url http://localhost:3000${ansi.reset}`);
     console.log();
-    return 1;
+    return EXIT.USER_ERROR;
   }
 
   // Initialize spinner outside try block for error handling
@@ -1389,7 +1408,7 @@ async function runScan(args) {
         }
       }
       
-      return verdict === 'SHIP' ? 0 : verdict === 'WARN' ? 1 : 2;
+      return verdictToExitCode(verdict);
     }
 
   } catch (error) {

package/bin/runners/runShip.js

@@ -18,10 +18,9 @@ const {
   generateRunId, 
   createJsonOutput, 
   writeJsonOutput, 
-  exitCodeToVerdict,
-  verdictToExitCode,
   saveArtifact 
 } = require("./lib/cli-output");
+const { EXIT, verdictToExitCode, exitCodeToVerdict } = require("./lib/exit-codes");
 
 // Route Truth v1 - Fake endpoint detection
 const { buildTruthpack, writeTruthpack, detectFastifyEntry } = require("./lib/truth");
@@ -828,7 +827,7 @@ async function runShip(args, context = {}) {
   } catch (err) {
     if (err.code === 'LIMIT_EXCEEDED' || err.code === 'FEATURE_NOT_AVAILABLE') {
       console.error(`\n  ${colors.error}${icons.error}${ansi.reset} ${err.upgradePrompt || err.message}\n`);
-      return EXIT_CODES.WARN;
+      return EXIT.TIER_REQUIRED;
     }
     throw err;
   }
@@ -1131,7 +1130,7 @@ async function runShip(args, context = {}) {
       console.error(`  ${ansi.dim}${error.stack}${ansi.reset}`);
     }
     
-    return EXIT_CODES.ERROR;
+    return EXIT.INTERNAL_ERROR;
   }
 }
 

package/bin/runners/runValidate.js

@@ -6,6 +6,9 @@ const fs = require("fs");
 const path = require("path");
 const { buildTruthpack } = require("./lib/truth");
 const { routeMatches } = require("./lib/claims");
+const { EXIT } = require("./lib/exit-codes");
+const { formatSoftUpsell, formatWorkflowUpsell, PRICING_URL } = require("./lib/upsell");
+const { getApiKey } = require("./lib/auth");
 
 const c = {
   reset: "\x1b[0m",
@@ -133,12 +136,19 @@ async function runValidate(args) {
     }
     
     // Output results
+    const { key } = getApiKey();
+    const currentTier = key ? "starter" : "free";
+    
     if (opts.json) {
       console.log(JSON.stringify({ issues, valid: issues.length === 0 }, null, 2));
     } else {
       if (issues.length === 0) {
         console.log(`${c.green}✓${c.reset} No hallucinations detected!\n`);
         console.log(`  ${c.dim}All routes and env vars are properly defined.${c.reset}\n`);
+        
+        // Workflow upsell
+        const workflow = formatWorkflowUpsell("validate", currentTier);
+        if (workflow) console.log(`  ${workflow}\n`);
       } else {
         console.log(`${c.yellow}⚠${c.reset} Found ${issues.length} potential issues:\n`);
         
@@ -148,14 +158,21 @@ async function runValidate(args) {
           console.log(`    ${c.dim}${issue.file}:${issue.line}${c.reset}`);
         }
         console.log();
+        
+        // Upsell for auto-fix
+        if (currentTier === "free") {
+          console.log(`  ${c.dim}─────────────────────────────────────────────────────────────${c.reset}`);
+          console.log(`  ${c.cyan}★ STARTER${c.reset}${c.dim}: auto-fix hallucinations with vibecheck fix${c.reset}`);
+          console.log(`  ${c.dim}  Upgrade → ${PRICING_URL}${c.reset}\n`);
+        }
       }
     }
     
-    return issues.some(i => i.severity === "error") ? 1 : 0;
+    return issues.some(i => i.severity === "error") ? EXIT.BLOCKING : EXIT.SUCCESS;
     
   } catch (error) {
     console.error(`${c.red}✗${c.reset} Validation failed: ${error.message}`);
-    return 1;
+    return EXIT.INTERNAL_ERROR;
   }
 }
 

package/bin/runners/runWatch.js

@@ -14,7 +14,8 @@
 
 const fs = require("fs");
 const path = require("path");
-const { parseGlobalFlags, shouldShowBanner } = require("./lib/global-flags");
+const { parseGlobalFlags, shouldShowBanner, shouldSuppressOutput } = require("./lib/global-flags");
+const { EXIT } = require("./lib/exit-codes");
 const { shipCore } = require("./runShip");
 
 // ═══════════════════════════════════════════════════════════════════════════════
@@ -331,12 +332,15 @@ function printHelp(opts = {}) {
 async function runWatch(argsOrOpts = {}) {
   // Handle array args from CLI
   let globalOpts = { noBanner: false, json: false, quiet: false, ci: false };
+  let rawArgs = [];
+  
   if (Array.isArray(argsOrOpts)) {
+    rawArgs = argsOrOpts;
     const { flags } = parseGlobalFlags(argsOrOpts);
     globalOpts = { ...globalOpts, ...flags };
     if (globalOpts.help) {
       printHelp(globalOpts);
-      return 0;
+      return EXIT.SUCCESS;
     }
     const getArg = (flags) => {
       for (const f of flags) {
@@ -346,10 +350,10 @@ async function runWatch(argsOrOpts = {}) {
       return undefined;
     };
     argsOrOpts = {
-      repoRoot: process.cwd(),
+      repoRoot: globalOpts.path || process.cwd(),
       fastifyEntry: getArg(["--fastify-entry"]),
       debounceMs: parseInt(getArg(["--debounce"]) || "500", 10),
-      clearScreen: !argsOrOpts.includes("--no-clear"),
+      clearScreen: !rawArgs.includes("--no-clear"),
       ...globalOpts,
     };
   }
@@ -358,70 +362,117 @@ async function runWatch(argsOrOpts = {}) {
     repoRoot,
     fastifyEntry,
     debounceMs = 500,
-    clearScreen = true
+    clearScreen = true,
+    quiet,
   } = argsOrOpts;
 
   const root = repoRoot || process.cwd();
+  const suppress = shouldSuppressOutput(argsOrOpts);
+  
+  // Validate project path exists
+  if (!fs.existsSync(root)) {
+    console.error(`${c.red}✗${c.reset} Project path does not exist: ${root}`);
+    console.log(`  ${c.dim}Verify the path and try again.${c.reset}`);
+    return EXIT.NOT_FOUND;
+  }
+  
+  // Validate debounce is a valid number
+  if (isNaN(debounceMs) || debounceMs < 0) {
+    console.error(`${c.red}✗${c.reset} Invalid debounce value: ${debounceMs}`);
+    console.log(`  ${c.dim}Debounce must be a positive number in milliseconds.${c.reset}`);
+    return EXIT.USER_ERROR;
+  }
+  
   let runCount = 0;
   let lastFile = null;
+  let watcher = null;
+  let exitCode = EXIT.SUCCESS;
 
-  console.log(`${c.cyan}Starting vibecheck watch...${c.reset}\n`);
-
-  async function runAndDisplay() {
-    runCount++;
-    
-    if (clearScreen) {
-      process.stdout.write(c.clear);
+  try {
+    if (!suppress) {
+      console.log(`${c.cyan}Starting vibecheck watch...${c.reset}\n`);
     }
 
-    const result = await runShipQuiet(root, fastifyEntry);
+    async function runAndDisplay() {
+      runCount++;
+      
+      if (clearScreen && !suppress) {
+        process.stdout.write(c.clear);
+      }
+
+      try {
+        const result = await runShipQuiet(root, fastifyEntry);
 
-    if (result.error) {
-      console.log(`${c.red}Error: ${result.error}${c.reset}`);
-      return;
+        if (result.error) {
+          if (!suppress) {
+            console.log(`${c.red}Error: ${result.error}${c.reset}`);
+            console.log(`  ${c.dim}Will retry on next file change.${c.reset}`);
+          }
+          return;
+        }
+
+        if (!suppress) {
+          printStatus({
+            verdict: result.verdict,
+            findings: result.findings,
+            duration: result.duration,
+            lastFile,
+            runCount
+          });
+
+          printTopFindings(result.findings);
+        }
+      } catch (e) {
+        if (!suppress) {
+          console.log(`${c.red}Analysis error: ${e.message}${c.reset}`);
+        }
+      }
     }
 
-    printStatus({
-      verdict: result.verdict,
-      findings: result.findings,
-      duration: result.duration,
-      lastFile,
-      runCount
+    // Initial run
+    await runAndDisplay();
+
+    // Watch for changes
+    const debouncedRun = debounce(async (filePath) => {
+      lastFile = path.relative(root, filePath);
+      await runAndDisplay();
+    }, debounceMs);
+
+    watcher = watchDirectory(root, (filePath) => {
+      // Only watch source files
+      if (!/\.(ts|tsx|js|jsx|json|env|md|yml|yaml)$/.test(filePath)) return;
+      if (shouldIgnore(filePath)) return;
+      debouncedRun(filePath);
     });
 
-    printTopFindings(result.findings);
-  }
+    // Handle cleanup - store cleanup function for signal handlers
+    const cleanup = () => {
+      if (watcher) {
+        watcher.close();
+        watcher = null;
+      }
+    };
 
-  // Initial run
-  await runAndDisplay();
+    process.on("SIGINT", () => {
+      if (!suppress) {
+        console.log(`\n${c.dim}Watch stopped.${c.reset}`);
+      }
+      cleanup();
+      process.exit(EXIT.SUCCESS);
+    });
 
-  // Watch for changes
-  const debouncedRun = debounce(async (filePath) => {
-    lastFile = path.relative(root, filePath);
-    await runAndDisplay();
-  }, debounceMs);
-
-  const watcher = watchDirectory(root, (filePath) => {
-    // Only watch source files
-    if (!/\.(ts|tsx|js|jsx|json|env|md|yml|yaml)$/.test(filePath)) return;
-    if (shouldIgnore(filePath)) return;
-    debouncedRun(filePath);
-  });
-
-  // Handle cleanup
-  process.on("SIGINT", () => {
-    console.log(`\n${c.dim}Watch stopped.${c.reset}`);
-    watcher.close();
-    process.exit(0);
-  });
-
-  process.on("SIGTERM", () => {
-    watcher.close();
-    process.exit(0);
-  });
-
-  // Keep process alive
-  await new Promise(() => {});
+    process.on("SIGTERM", () => {
+      cleanup();
+      process.exit(EXIT.SUCCESS);
+    });
+
+    // Keep process alive
+    await new Promise(() => {});
+  } catch (error) {
+    console.error(`${c.red}✗${c.reset} Watch failed: ${error.message}`);
+    if (watcher) watcher.close();
+    return EXIT.INTERNAL_ERROR;
+  }
 }
 
 module.exports = { runWatch };