refactor: enhance CLI options handling and improve automated environment detection

Author: aidenybai

packages/react-doctor/src/cli.ts

@@ -3,10 +3,17 @@ import { existsSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { Command } from "commander";
-import { OPEN_BASE_URL, SCORE_GOOD_THRESHOLD, SCORE_OK_THRESHOLD } from "./constants.js";
+import { AMI_INSTALL_URL, AMI_RELEASES_URL, AMI_WEBSITE_URL, OPEN_BASE_URL } from "./constants.js";
 import { scan } from "./scan.js";
-import type { Diagnostic, DiffInfo, EstimatedScoreResult, ScanOptions } from "./types.js";
+import type {
+  Diagnostic,
+  DiffInfo,
+  EstimatedScoreResult,
+  ReactDoctorConfig,
+  ScanOptions,
+} from "./types.js";
 import { fetchEstimatedScore } from "./utils/calculate-score.js";
+import { colorizeByScore } from "./utils/colorize-by-score.js";
 import { createFramedLine, renderFramedBoxString } from "./utils/framed-box.js";
 import { filterSourceFiles, getDiffInfo } from "./utils/get-diff-files.js";
 import { handleError } from "./utils/handle-error.js";
@@ -43,6 +50,36 @@ const exitWithFixHint = () => {
 process.on("SIGINT", exitWithFixHint);
 process.on("SIGTERM", exitWithFixHint);
 
+const AUTOMATED_ENVIRONMENT_VARIABLES = [
+  "CI",
+  "CLAUDECODE",
+  "CURSOR_AGENT",
+  "CODEX_CI",
+  "OPENCODE",
+  "AMP_HOME",
+  "AMI",
+];
+
+const isAutomatedEnvironment = (): boolean =>
+  AUTOMATED_ENVIRONMENT_VARIABLES.some((envVariable) => Boolean(process.env[envVariable]));
+
+const resolveCliScanOptions = (
+  flags: CliFlags,
+  userConfig: ReactDoctorConfig | null,
+  programInstance: Command,
+): ScanOptions => {
+  const isCliOverride = (optionName: string) =>
+    programInstance.getOptionValueSource(optionName) === "cli";
+
+  return {
+    lint: isCliOverride("lint") ? flags.lint : (userConfig?.lint ?? flags.lint),
+    deadCode: isCliOverride("deadCode") ? flags.deadCode : (userConfig?.deadCode ?? flags.deadCode),
+    verbose: isCliOverride("verbose") ? Boolean(flags.verbose) : (userConfig?.verbose ?? false),
+    scoreOnly: flags.score,
+    offline: flags.offline,
+  };
+};
+
 const resolveDiffMode = async (
   diffInfo: DiffInfo | null,
   effectiveDiff: boolean | string | undefined,
@@ -105,37 +142,17 @@ const program = new Command()
         logger.break();
       }
 
-      const isCliOverride = (optionName: string) =>
-        program.getOptionValueSource(optionName) === "cli";
-
-      const scanOptions: ScanOptions = {
-        lint: isCliOverride("lint") ? flags.lint : (userConfig?.lint ?? flags.lint),
-        deadCode: isCliOverride("deadCode")
-          ? flags.deadCode
-          : (userConfig?.deadCode ?? flags.deadCode),
-        verbose: isCliOverride("verbose") ? Boolean(flags.verbose) : (userConfig?.verbose ?? false),
-        scoreOnly: isScoreOnly,
-        offline: flags.offline,
-      };
-
-      const isAutomatedEnvironment = [
-        process.env.CI,
-        process.env.CLAUDECODE,
-        process.env.CURSOR_AGENT,
-        process.env.CODEX_CI,
-        process.env.OPENCODE,
-        process.env.AMP_HOME,
-        process.env.AMI,
-      ].some(Boolean);
-      const shouldSkipPrompts = flags.yes || isAutomatedEnvironment || !process.stdin.isTTY;
+      const scanOptions = resolveCliScanOptions(flags, userConfig, program);
+      const shouldSkipPrompts = flags.yes || isAutomatedEnvironment() || !process.stdin.isTTY;
       const shouldSkipAmiPrompts = shouldSkipPrompts || !flags.ami;
       const projectDirectories = await selectProjects(
         resolvedDirectory,
         flags.project,
         shouldSkipPrompts,
       );
 
-      const effectiveDiff = isCliOverride("diff") ? flags.diff : userConfig?.diff;
+      const isDiffCliOverride = program.getOptionValueSource("diff") === "cli";
+      const effectiveDiff = isDiffCliOverride ? flags.diff : userConfig?.diff;
       const explicitBaseBranch = typeof effectiveDiff === "string" ? effectiveDiff : undefined;
       const diffInfo = getDiffInfo(resolvedDirectory, explicitBaseBranch);
       const isDiffMode = await resolveDiffMode(
@@ -209,16 +226,6 @@ ${highlighter.dim("Learn more:")}
 `,
   );
 
-const AMI_WEBSITE_URL = "https://ami.dev";
-const AMI_INSTALL_URL = `${AMI_WEBSITE_URL}/install.sh`;
-const AMI_RELEASES_URL = "https://github.com/millionco/ami-releases/releases";
-
-const colorizeByScore = (text: string, score: number): string => {
-  if (score >= SCORE_GOOD_THRESHOLD) return highlighter.success(text);
-  if (score >= SCORE_OK_THRESHOLD) return highlighter.warn(text);
-  return highlighter.error(text);
-};
-
 const DEEPLINK_FIX_PROMPT = "/{slash-command:ami:react-doctor}";
 
 const isAmiInstalled = (): boolean => {

packages/react-doctor/src/constants.ts

@@ -40,3 +40,19 @@ export const OFFLINE_MESSAGE =
 export const OFFLINE_FLAG_MESSAGE = "Score not calculated. Remove --offline to calculate score.";
 
 export const DEFAULT_BRANCH_CANDIDATES = ["main", "master"];
+
+export const ERROR_RULE_PENALTY = 1.5;
+
+export const WARNING_RULE_PENALTY = 0.75;
+
+export const ERROR_ESTIMATED_FIX_RATE = 0.85;
+
+export const WARNING_ESTIMATED_FIX_RATE = 0.8;
+
+export const MAX_KNIP_RETRIES = 5;
+
+export const AMI_WEBSITE_URL = "https://ami.dev";
+
+export const AMI_INSTALL_URL = `${AMI_WEBSITE_URL}/install.sh`;
+
+export const AMI_RELEASES_URL = "https://github.com/millionco/ami-releases/releases";

packages/react-doctor/src/index.ts

@@ -1,11 +1,9 @@
 import path from "node:path";
 import { performance } from "node:perf_hooks";
-import { JSX_FILE_PATTERN } from "./constants.js";
 import type { Diagnostic, DiffInfo, ProjectInfo, ReactDoctorConfig, ScoreResult } from "./types.js";
 import { calculateScore } from "./utils/calculate-score.js";
-import { checkReducedMotion } from "./utils/check-reduced-motion.js";
+import { combineDiagnostics, computeJsxIncludePaths } from "./utils/combine-diagnostics.js";
 import { discoverProject } from "./utils/discover-project.js";
-import { filterIgnoredDiagnostics } from "./utils/filter-diagnostics.js";
 import { loadConfig } from "./utils/load-config.js";
 import { runKnip } from "./utils/run-knip.js";
 import { runOxlint } from "./utils/run-oxlint.js";
@@ -45,9 +43,9 @@ export const diagnose = async (
     throw new Error("No React dependency found in package.json");
   }
 
-  const jsxIncludePaths = isDiffMode
-    ? includePaths.filter((filePath) => JSX_FILE_PATTERN.test(filePath))
-    : undefined;
+  const jsxIncludePaths = computeJsxIncludePaths(includePaths);
+
+  const emptyDiagnostics: Diagnostic[] = [];
 
   const lintPromise = effectiveLint
     ? runOxlint(
@@ -58,27 +56,26 @@ export const diagnose = async (
         jsxIncludePaths,
       ).catch((error: unknown) => {
         console.error("Lint failed:", error);
-        return [] as Diagnostic[];
+        return emptyDiagnostics;
       })
-    : Promise.resolve([] as Diagnostic[]);
+    : Promise.resolve(emptyDiagnostics);
 
   const deadCodePromise =
     effectiveDeadCode && !isDiffMode
       ? runKnip(resolvedDirectory).catch((error: unknown) => {
           console.error("Dead code analysis failed:", error);
-          return [] as Diagnostic[];
+          return emptyDiagnostics;
         })
-      : Promise.resolve([] as Diagnostic[]);
+      : Promise.resolve(emptyDiagnostics);
 
   const [lintDiagnostics, deadCodeDiagnostics] = await Promise.all([lintPromise, deadCodePromise]);
-  const allDiagnostics = [
-    ...lintDiagnostics,
-    ...deadCodeDiagnostics,
-    ...(isDiffMode ? [] : checkReducedMotion(resolvedDirectory)),
-  ];
-  const diagnostics = userConfig
-    ? filterIgnoredDiagnostics(allDiagnostics, userConfig)
-    : allDiagnostics;
+  const diagnostics = combineDiagnostics(
+    lintDiagnostics,
+    deadCodeDiagnostics,
+    resolvedDirectory,
+    isDiffMode,
+    userConfig,
+  );
 
   const elapsedMilliseconds = performance.now() - startTime;
   const score = await calculateScore(diagnostics);