react-doctor 0.7.6-dev.1f14fa1 → 0.7.6-dev.3f22fe3

package/dist/cli.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="9a5c1a3c-7706-5a23-bca4-ddddd2f085af")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="4c1e681e-4dee-5ffd-a4ba-69b876f47147")}catch(e){}}();
 import { createRequire } from "node:module";
 import * as NodeChildProcess from "node:child_process";
 import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
@@ -39594,6 +39594,49 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
+const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
+const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
+const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
+	...survivingDiagnostic,
+	severity: "error"
+} : survivingDiagnostic;
+const dedupeRelatedDiagnostics = (diagnostics) => {
+	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
+	const uniqueDiagnostics = [];
+	for (const diagnostic of diagnostics) {
+		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
+				continue;
+			}
+		}
+		uniqueDiagnostics.push(diagnostic);
+	}
+	return uniqueDiagnostics;
+};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -41823,6 +41866,7 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
+const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
 * behind a `Context.Service`. The production layer (`layerNode`)
@@ -41893,6 +41937,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			args,
 			directory
 		});
+		const listUntrackedFilePaths = (directory, includePaths = []) => runGit(directory, [
+			"ls-files",
+			"-z",
+			"--others",
+			"--exclude-standard",
+			...includePaths.length > 0 ? ["--", ...includePaths] : []
+		]).pipe(map$3((result) => result.status === 0 ? splitNullSeparated(result.stdout) : null));
+		const mergeUntracked = (directory, trackedFilePaths, includeUntracked) => includeUntracked ? listUntrackedFilePaths(directory).pipe(map$3((untracked) => untracked === null ? trackedFilePaths : [...new Set([...trackedFilePaths, ...untracked])])) : succeed$2(trackedFilePaths);
 		const currentBranch = (directory) => runGit(directory, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -42015,7 +42067,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
-			diffSelection: ({ directory, explicitBaseBranch }) => gen(function* () {
+			diffSelection: ({ directory, explicitBaseBranch, includeUntracked = false }) => gen(function* () {
 				if (explicitBaseBranch !== void 0 && explicitBaseBranch.trim().length === 0) return yield* fail$4(new ReactDoctorError({ reason: new GitBaseBranchInvalid({ detail: "Diff base branch cannot be empty." }) }));
 				if (explicitBaseBranch !== void 0) {
 					const range = parseGitDiffRange(explicitBaseBranch);
@@ -42044,7 +42096,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 						"HEAD"
 					]);
 					if (uncommitted.status !== 0) return null;
-					const files = splitNullSeparated(uncommitted.stdout);
+					const files = yield* mergeUntracked(directory, splitNullSeparated(uncommitted.stdout), includeUntracked);
 					if (files.length === 0) return null;
 					return {
 						currentBranch: resolvedCurrentBranch,
@@ -42074,7 +42126,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					currentBranch: resolvedCurrentBranch,
 					baseBranch,
 					diffBaseRef: mergeBaseRef,
-					changedFiles: splitNullSeparated(diff.stdout),
+					changedFiles: yield* mergeUntracked(directory, splitNullSeparated(diff.stdout), includeUntracked),
 					isCurrentChanges: false
 				};
 			}).pipe(withSpan("Git.diffSelection")),
@@ -42120,7 +42172,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					stdout: result.stdout
 				};
 			}).pipe(withSpan("Git.grep")),
-			changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
+			changedLineRanges: ({ directory, baseRef, cached, files, includeUntracked = false }) => gen(function* () {
 				if (files.length === 0) return [];
 				if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
 				const result = yield* runGit(directory, [
@@ -42134,7 +42186,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					...files
 				]);
 				if (result.status !== 0) return null;
-				return parseChangedLineRanges(result.stdout);
+				const changedLineRanges = parseChangedLineRanges(result.stdout);
+				if (cached || !includeUntracked) return changedLineRanges;
+				const untrackedFilePaths = yield* listUntrackedFilePaths(directory, files);
+				if (untrackedFilePaths === null) return changedLineRanges;
+				return [...changedLineRanges, ...untrackedFilePaths.map((file) => ({
+					file,
+					ranges: [[1, UNTRACKED_FILE_LAST_LINE]]
+				}))];
 			}).pipe(catch_$1((error) => error.reason._tag === "GitInvocationFailed" ? succeed$2(null) : fail$4(error)), withSpan("Git.changedLineRanges"))
 		});
 	})).pipe(provide$2(layer$3.pipe(provide$2(mergeAll$1(layer$2, layer$1)))));
@@ -42719,13 +42778,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 1,
+	version: 2,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 1 || !isRecord$1(persisted.rulesets)) return entries;
+	if (persisted.version !== 2 || !isRecord$1(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord$1(bucket) || !isRecord$1(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -42745,7 +42804,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 1 && isRecord$1(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 2 && isRecord$1(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord$1(existingBucket) && isRecord$1(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -42759,7 +42818,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 1,
+				version: 2,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord$1(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -42810,23 +42869,6 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -42834,16 +42876,6 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
-				continue;
-			}
-		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -43643,11 +43675,11 @@ const buildRelatedLocations = (labels, filePath) => {
 	}
 	return related;
 };
-const isOxlintOutput = (value) => {
-	if (typeof value !== "object" || value === null) return false;
-	const candidate = value;
-	return Array.isArray(candidate.diagnostics);
-};
+const isOxlintSpan = (value) => isRecord$1(value) && typeof value.offset === "number" && typeof value.length === "number" && typeof value.line === "number" && typeof value.column === "number";
+const isOxlintLabel = (value) => isRecord$1(value) && isOxlintSpan(value.span);
+const isMappableOxlintDiagnostic = (value) => isRecord$1(value) && typeof value.code === "string" && value.code.length > 0 && typeof value.filename === "string" && value.filename.length > 0 && (value.severity === "warning" || value.severity === "error") && Array.isArray(value.labels) && value.labels.every(isOxlintLabel);
+const isEngineFailureDiagnostic = (value) => !isRecord$1(value) || typeof value.filename !== "string" || value.filename.length === 0;
+const isOxlintOutput = (value) => isRecord$1(value) && Array.isArray(value.diagnostics);
 /**
 * Parses one oxlint subprocess's stdout into a flat `Diagnostic[]`.
 * Tolerates the leading-notice-line shape oxlint sometimes prints
@@ -43666,6 +43698,8 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
+	const engineFailureDiagnostic = parsed.diagnostics.find(isEngineFailureDiagnostic);
+	if (engineFailureDiagnostic !== void 0) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: JSON.stringify(engineFailureDiagnostic).slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
 	const sourceBufferCache = /* @__PURE__ */ new Map();
 	const sourceLinesCache = /* @__PURE__ */ new Map();
@@ -43700,7 +43734,7 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		minifiedFileCache.set(absolutePath, minified);
 		return minified;
 	};
-	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => diagnostic.code && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
+	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => isMappableOxlintDiagnostic(diagnostic) && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
 		const { plugin, rule } = parseRuleCode(diagnostic.code);
 		const primaryLabel = diagnostic.labels[0];
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
@@ -45535,7 +45569,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
+	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
+	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -45664,7 +45699,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -45672,7 +45707,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	})));
+	}))));
+	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -46266,10 +46302,11 @@ const computeDiagnosticDelta = (input) => {
 * render diff-base mistakes (`GitBaseBranchInvalid` /
 * `GitBaseBranchMissing`) as clean user errors instead of crashes.
 */
-const getDiffInfo = (directory, explicitBaseBranch) => runPromise(gen(function* () {
+const getDiffInfo = (directory, explicitBaseBranch, includeUntracked) => runPromise(gen(function* () {
 	const selection = yield* (yield* Git).diffSelection({
 		directory,
-		explicitBaseBranch
+		explicitBaseBranch,
+		includeUntracked
 	});
 	if (selection === null) return null;
 	return {
@@ -46605,6 +46642,43 @@ const isNonInteractiveEnvironment = () => NON_INTERACTIVE_ENVIRONMENT_VARIABLES.
 //#region src/cli/utils/constants.ts
 const REACT_DOCTOR_CONFIG_PROJECT_NAME = "react-doctor";
 const STAGED_FILES_TEMP_DIR_PREFIX = "react-doctor-staged-";
+const STAGED_SNAPSHOT_ADDITIONAL_CONFIG_FILENAMES = [
+	".babelrc",
+	".babelrc.json",
+	".eslintignore",
+	".eslintrc.json",
+	".oxlintignore",
+	"app.config.cjs",
+	"app.config.js",
+	"app.config.json",
+	"app.config.mjs",
+	"app.config.ts",
+	"app.json",
+	"babel.config.cjs",
+	"babel.config.js",
+	"babel.config.json",
+	"babel.config.mjs",
+	"eslint.config.cjs",
+	"eslint.config.cts",
+	"eslint.config.js",
+	"eslint.config.mjs",
+	"eslint.config.mts",
+	"eslint.config.ts",
+	"next.config.cjs",
+	"next.config.js",
+	"next.config.mjs",
+	"next.config.ts",
+	"oxlint.config.json",
+	"react-doctor.config.json",
+	"vite.config.cjs",
+	"vite.config.cts",
+	"vite.config.js",
+	"vite.config.mjs",
+	"vite.config.mts",
+	"vite.config.ts",
+	"vitest.config.js",
+	"vitest.config.ts"
+];
 const BASELINE_FILES_TEMP_DIR_PREFIX = "react-doctor-baseline-";
 const SCAN_RESULT_CACHE_FILENAME = "scan-cache.json";
 const RUN_GIT_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
@@ -46619,6 +46693,7 @@ const METRIC = {
 	cliInvoked: "cli.invoked",
 	cliError: "cli.error",
 	cliEnvironmentError: "cli.env_error",
+	stagedSnapshotDivergence: "staged.snapshot_divergence",
 	projectDetected: "project.detected",
 	projectPathSelected: "project.path_selected",
 	projectConfigSelected: "project.config_selected",
@@ -46699,7 +46774,7 @@ const makeNoopConsole = () => ({
 });
 //#endregion
 //#region src/cli/utils/version.ts
-const VERSION = "0.7.6-dev.1f14fa1";
+const VERSION = "0.7.6-dev.3f22fe3";
 //#endregion
 //#region src/cli/utils/json-mode.ts
 let context = null;
@@ -47068,13 +47143,13 @@ const isDevVersion = (version) => version === "0.0.0" || version.includes("-");
 * uploads source-map artifacts under, so stack frames symbolicate. Honors the
 * standard `SENTRY_RELEASE` override.
 */
-const resolveSentryRelease = () => process.env.SENTRY_RELEASE || `react-doctor@0.7.6-dev.1f14fa1`;
+const resolveSentryRelease = () => process.env.SENTRY_RELEASE || `react-doctor@0.7.6-dev.3f22fe3`;
 /**
 * Deployment environment shown in Sentry's environment filter. Defaults to
 * `production` for tagged releases and `development` for dev/unbuilt versions,
 * overridable via the standard `SENTRY_ENVIRONMENT` env var.
 */
-const resolveSentryEnvironment = () => process.env.SENTRY_ENVIRONMENT || (isDevVersion("0.7.6-dev.1f14fa1") ? "development" : "production");
+const resolveSentryEnvironment = () => process.env.SENTRY_ENVIRONMENT || (isDevVersion("0.7.6-dev.3f22fe3") ? "development" : "production");
 /**
 * Performance-tracing sample rate in `[0, 1]`. Reads `SENTRY_TRACES_SAMPLE_RATE`
 * (set to `0` to disable tracing) and falls back to
@@ -47266,7 +47341,7 @@ const NON_BLOCKING_REACT_DOCTOR_COMMAND = [
 	"fi"
 ].join(" ");
 const PACKAGE_JSON_FILE_NAME = "package.json";
-const runGit = (projectRoot, args) => {
+const runGitRaw = (projectRoot, args) => {
 	try {
 		return execFileSync("git", [...args], {
 			cwd: projectRoot,
@@ -47277,11 +47352,12 @@ const runGit = (projectRoot, args) => {
 				"ignore"
 			],
 			maxBuffer: RUN_GIT_MAX_BUFFER_BYTES
-		}).trim();
+		});
 	} catch {
 		return null;
 	}
 };
+const runGit = (projectRoot, args) => runGitRaw(projectRoot, args)?.trim() ?? null;
 const resolveGitPath = (baseDirectory, value) => Path.isAbsolute(value) ? value : Path.resolve(baseDirectory, value);
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const getPackageJsonPath = (projectRoot) => Path.join(projectRoot, PACKAGE_JSON_FILE_NAME);
@@ -59152,6 +59228,17 @@ const buildRuleBlastRadii = (diagnostics) => buildSortedRuleGroups(diagnostics).
 })).toSorted((left, right) => right.fileCount - left.fileCount);
 const findMigrationScaleBuckets = (diagnostics) => buildRuleBlastRadii(diagnostics).filter((bucket) => bucket.fileCount >= 40);
 //#endregion
+//#region src/cli/utils/has-lint-hard-failure.ts
+const hasLintHardFailure = (result) => result.skippedChecks.includes("lint");
+//#endregion
+//#region src/cli/utils/is-inspect-result-complete.ts
+const isInspectResultComplete = (result) => isScanComplete({
+	analyzedFileCount: result.analyzedFiles?.length,
+	scannedFileCount: result.scannedFileCount,
+	skippedCheckCount: result.skippedChecks.length,
+	skippedCheckReasonCount: Object.keys(result.skippedCheckReasons ?? {}).length
+});
+//#endregion
 //#region src/cli/utils/scan-result-cache.ts
 const CACHE_DISABLED_VALUES = new Set(["1", "true"]);
 const TOOLCHAIN_PACKAGE_SPECIFIERS = [
@@ -59557,15 +59644,12 @@ const buildOutcomeAttributes = (input) => {
 	const summary = summarizeDiagnostics(result.diagnostics);
 	const blockingLevel = resolveTelemetryBlocking(input.userConfig);
 	const gateDiagnostics = filterDiagnosticsForSurface(result.diagnostics, "ciFailure", input.userConfig);
+	const complete = isInspectResultComplete(result);
+	const didLintHardFail = hasLintHardFailure(result);
+	const failsOnHardFailure = didLintHardFail && blockingLevel !== "none";
 	const wouldBlock = !input.scoreOnly && !input.gateExempt && shouldBlockCi(gateDiagnostics, blockingLevel);
-	const complete = isScanComplete({
-		analyzedFileCount: result.analyzedFiles?.length,
-		scannedFileCount: result.scannedFileCount,
-		skippedCheckCount: result.skippedChecks.length,
-		skippedCheckReasonCount: Object.keys(result.skippedCheckReasons ?? {}).length
-	});
 	const isClean = result.diagnostics.length === 0 && complete;
-	const outcome = wouldBlock ? "blocked" : isClean ? "clean" : "ok";
+	const outcome = didLintHardFail ? "error" : wouldBlock ? "blocked" : isClean ? "clean" : "ok";
 	const firings = summarizeRuleFirings(result.diagnostics);
 	const countByRule = /* @__PURE__ */ new Map();
 	const countByCategory = /* @__PURE__ */ new Map();
@@ -59610,7 +59694,7 @@ const buildOutcomeAttributes = (input) => {
 	const attributes = {
 		...withNamespace("outcome", {
 			status: outcome,
-			exitCode: wouldBlock ? 1 : 0,
+			exitCode: failsOnHardFailure || wouldBlock ? 1 : 0,
 			wouldBlock,
 			blocking: blockingLevel,
 			clean: isClean,
@@ -63792,10 +63876,15 @@ const warnIfAiTrainingEnvironment = () => {
 //#region src/cli/utils/validate-mode-flags.ts
 const usedDiffAlias = (flags) => flags.diff !== void 0 && flags.diff !== false && flags.diff !== "false" && flags.diff !== "";
 const usedScope = (flags) => typeof flags.scope === "string" && flags.scope.length > 0;
+const validateIncludeUntrackedScope = (includeUntracked, scope) => {
+	if (!includeUntracked || scope !== void 0 && scope !== "full") return;
+	throw new CliInputError("--include-untracked requires the files, changed, or lines scope (via --scope, --diff, or config).");
+};
 const validateModeFlags = (flags) => {
 	if (usedScope(flags) && usedDiffAlias(flags)) throw new CliInputError("Cannot combine --scope and --diff; --diff is the deprecated alias.");
 	if (flags.staged && usedDiffAlias(flags)) throw new CliInputError("Cannot combine --staged and --diff; pick one mode.");
 	if (flags.staged && (flags.scope === "full" || flags.scope === "changed")) throw new CliInputError(`Cannot combine --staged with --scope ${flags.scope}; use --scope files or --scope lines, or drop --scope.`);
+	if (flags.includeUntracked && flags.staged) throw new CliInputError("Cannot combine --include-untracked with --staged; the git index never holds untracked files.");
 	if (flags.score && flags.json) throw new CliInputError("Cannot combine --score and --json; pick one output mode.");
 	if (flags.score && flags.telemetry === false) throw new CliInputError("Cannot combine --score with --no-telemetry; --score prints the score that --no-telemetry disables.");
 	if (flags.debug && (flags.score === false || flags.telemetry === false)) {
@@ -63804,6 +63893,39 @@ const validateModeFlags = (flags) => {
 	}
 };
 //#endregion
+//#region src/cli/utils/parse-staged-snapshot-divergences.ts
+const SNAPSHOT_CONFIG_FILENAMES = new Set([...STAGED_FILES_PROJECT_CONFIG_FILENAMES, ...STAGED_SNAPSHOT_ADDITIONAL_CONFIG_FILENAMES]);
+const parseStagedSnapshotDivergences = (statusOutput) => {
+	const divergentConfigFiles = /* @__PURE__ */ new Set();
+	const statusEntries = statusOutput.split("\0").filter((entry) => entry.length > 0);
+	for (let entryIndex = 0; entryIndex < statusEntries.length; entryIndex += 1) {
+		const entry = statusEntries[entryIndex];
+		const [indexStatus, worktreeStatus] = entry;
+		const filePath = entry.slice(3);
+		const hasRenameOrCopySource = indexStatus === "R" || indexStatus === "C" || worktreeStatus === "R" || worktreeStatus === "C";
+		const sourcePath = hasRenameOrCopySource ? statusEntries[entryIndex + 1] : void 0;
+		const worktreePaths = worktreeStatus === "R" || worktreeStatus === "C" ? [filePath, sourcePath] : [filePath];
+		if (worktreeStatus !== " ") {
+			for (const worktreePath of worktreePaths) if (worktreePath && SNAPSHOT_CONFIG_FILENAMES.has(Path.basename(worktreePath))) divergentConfigFiles.add(worktreePath);
+		}
+		if (hasRenameOrCopySource) entryIndex += 1;
+	}
+	return [...divergentConfigFiles].sort();
+};
+//#endregion
+//#region src/cli/utils/find-staged-snapshot-divergences.ts
+const findStagedSnapshotDivergences = (directory) => {
+	const statusOutput = runGitRaw(directory, [
+		"status",
+		"--porcelain=v1",
+		"-z",
+		"--untracked-files=all",
+		"--ignored=matching"
+	]);
+	if (statusOutput === null) return null;
+	return parseStagedSnapshotDivergences(statusOutput);
+};
+//#endregion
 //#region src/cli/commands/inspect.ts
 const filterCompletedScansByCategories = (completedScans, categoryFilters) => {
 	if (categoryFilters.size === 0) return [...completedScans];
@@ -63818,9 +63940,14 @@ const filterCompletedScansByCategories = (completedScans, categoryFilters) => {
 /**
 * Post-scan finalization shared by the staged-arm and project-loop
 * paths of `inspectAction`: emit the JSON report (when in JSON mode)
-* and set `process.exitCode = 1` when a diagnostic at or above the
-* `--blocking` threshold (default `"error"`) reaches the `ciFailure`
-* surface. `--blocking none` keeps the scan advisory (always exits 0).
+* and set `process.exitCode = 1` when any scan's lint pass hard-failed
+* (an engine/plugin/binding failure destroys the findings, so success
+* would be a false clean) or a diagnostic at or above the `--blocking`
+* threshold (default `"error"`) reaches the `ciFailure` surface.
+* `--blocking none` keeps the scan advisory (always exits 0), and
+* fail-open degradations — `--no-lint`, `--max-duration` truncation,
+* supply-chain/security skips — stay advisory too, surfaced through
+* `complete: false` in the JSON report.
 */
 const finalizeScans = (input) => {
 	const baselineDeltas = input.completedScans.flatMap((scan) => scan.result.baselineDelta ? [scan.result.baselineDelta] : []);
@@ -63850,8 +63977,13 @@ const finalizeScans = (input) => {
 			baselineDegraded
 		}));
 	}
+	const blockingLevel = resolveBlockingLevel(input.flags, input.userConfig);
+	if (input.completedScans.some(({ result }) => hasLintHardFailure(result)) && blockingLevel !== "none") {
+		process.exitCode = 1;
+		return;
+	}
 	if (input.isScoreOnly || baselineDegraded) return;
-	if (shouldBlockCi(filterScansForSurface(input.completedScans, "ciFailure"), resolveBlockingLevel(input.flags, input.userConfig))) process.exitCode = 1;
+	if (shouldBlockCi(filterScansForSurface(input.completedScans, "ciFailure"), blockingLevel)) process.exitCode = 1;
 };
 const buildChangedFilesDiffInfo = (changedFiles) => ({
 	currentBranch: process.env.GITHUB_HEAD_REF?.trim() || null,
@@ -63889,6 +64021,7 @@ const inspectAction = async (directory, flags) => {
 	recordCount(METRIC.cliInvoked, 1, { command: "inspect" });
 	try {
 		validateModeFlags(flags);
+		if (flags.staged) setJsonReportMode("staged");
 		await maybeMigrateLegacyConfig(requestedDirectory, {
 			isQuiet,
 			isStaged: Boolean(flags.staged)
@@ -63904,6 +64037,14 @@ const inspectAction = async (directory, flags) => {
 			cliLogger.dim(`Redirected to ${highlighter.info(toRelativePath(resolvedDirectory, requestedDirectory))} via react-doctor config "rootDir".`);
 			cliLogger.break();
 		}
+		if (flags.staged) {
+			const divergentConfigFiles = findStagedSnapshotDivergences(resolvedDirectory);
+			if (divergentConfigFiles === null) throw new CliInputError("Could not verify that staged configuration matches the worktree. Run the command from a Git worktree with Git available.");
+			if (divergentConfigFiles.length > 0) {
+				recordCount(METRIC.stagedSnapshotDivergence, 1, { divergentInputCount: divergentConfigFiles.length });
+				throw new CliInputError(`Cannot scan staged files while configuration differs between the index and worktree: ${divergentConfigFiles.join(", ")}. Stage or restore those files, then rerun react-doctor --staged.`);
+			}
+		}
 		const explainArgument = flags.explain;
 		if (explainArgument !== void 0) {
 			await runExplain(explainArgument, {
@@ -63924,7 +64065,6 @@ const inspectAction = async (directory, flags) => {
 			json: flags.json
 		});
 		if (flags.staged) {
-			setJsonReportMode("staged");
 			const stagedFiles = await getStagedSourceFiles(resolvedDirectory);
 			if (stagedFiles.length === 0) {
 				if (isJsonMode) writeJsonReport(buildJsonReport({
@@ -64005,13 +64145,15 @@ const inspectAction = async (directory, flags) => {
 		const projectDirectories = await selectProjects(resolvedDirectory, flags.project, skipPrompts, userConfig?.projects);
 		const changedFilesDiffInfo = flags.changedFilesFrom ? buildChangedFilesDiffInfo(readChangedFilesFrom(Path.resolve(flags.changedFilesFrom))) : null;
 		const requestedScope = resolveScope(flags, userConfig);
+		const includeUntracked = flags.includeUntracked ?? false;
 		const scopeRequest = requestedScope.scope === void 0 && changedFilesDiffInfo !== null ? {
 			...requestedScope,
 			scope: "changed"
 		} : requestedScope;
+		validateIncludeUntrackedScope(includeUntracked, scopeRequest.scope);
 		const wantsDiffMode = scopeRequest.scope !== void 0 && scopeRequest.scope !== "full";
 		const shouldDetectDiff = changedFilesDiffInfo === null && (wantsDiffMode || scopeRequest.scope === void 0 && !skipPrompts && !isQuiet);
-		const diffInfo = changedFilesDiffInfo ?? (shouldDetectDiff ? await getDiffInfo(resolvedDirectory, scopeRequest.base) : null);
+		const diffInfo = changedFilesDiffInfo ?? (shouldDetectDiff ? await getDiffInfo(resolvedDirectory, scopeRequest.base, includeUntracked) : null);
 		const scope = await finalizeScope({
 			requested: scopeRequest,
 			diffInfo,
@@ -64025,7 +64167,8 @@ const inspectAction = async (directory, flags) => {
 		const changedLineRanges = scope === "lines" && diffInfo !== null && (diffInfo.isCurrentChanges || linesBaseRef !== null) && diffInfo !== null ? await getChangedLineRanges({
 			directory: resolvedDirectory,
 			baseRef: linesBaseRef ?? void 0,
-			files: [...diffInfo.changedFiles]
+			files: [...diffInfo.changedFiles],
+			includeUntracked
 		}) : null;
 		if (scope === "lines" && changedLineRanges === null && !isQuiet) {
 			cliLogger.warn("Could not determine changed lines (no base ref or git diff failed); reporting all issues in changed files.");
@@ -64958,6 +65101,7 @@ const ROOT_FLAG_SPEC = {
 		"--dead-code",
 		"--debug",
 		"--help",
+		"--include-untracked",
 		"--json",
 		"--json-compact",
 		"--lint",
@@ -65221,7 +65365,7 @@ ${highlighter.dim("Learn more:")}
   ${highlighter.info(CI_URL)}
 `;
 const collectCategoryOption = (value, previousValues) => [...previousValues ?? [], value];
-const program = new Command().name("react-doctor").description("Diagnose React codebase health").version(VERSION, "-v, --version", "display the version number").argument("[directory]", "project directory to scan", ".").option("--lint", "enable linting").option("--no-lint", "skip linting").option("--dead-code", "enable dead-code analysis (default)").option("--no-dead-code", "skip dead-code analysis (unused files / exports / dependencies, circular imports)").option("--supply-chain", "enable the dependency supply-chain scan (default)").option("--no-supply-chain", "skip the dependency supply-chain scan (Socket.dev dependency health checks)").option("--verbose", "show every rule and per-file details (default shows top 3 rules)").option("--debug", "force a Sentry trace and print its id at the end (paste it into a bug report)").option("--output-dir <dir>", "directory for the full diagnostics dump (default: a temp folder)").option("--score", "output only the score").option("--json", "output a single structured JSON report (suppresses other output)").option("--json-compact", "with --json, emit compact JSON (no indentation)").option("--json-out <path>", "with --json, write the report to a file instead of stdout").option("-y, --yes", "skip prompts, scan all workspace projects").option("--no-parallel", "lint serially with one worker (default: parallel across CPU cores; set the worker count with REACT_DOCTOR_PARALLEL)").option("--project <name>", "select projects: workspace names or directory paths (comma-separated for multiple); overrides the `projects` config field").option("--scope <value>", "how much supported JS/TS source to scan/report: full (default), files, changed (only new issues vs base), or lines (issues whose source spans touch changed lines)").option("--base <ref>", "base git ref for files/changed/lines scope (auto-detected when omitted)").addOption(new Option("--diff [base]", "[deprecated] alias for --scope changed (pass `false` to force a full scan)").hideHelp()).addOption(new Option("--changed-files-from <file>", "scan source files listed in a newline-delimited changed-files file").hideHelp()).option("--no-score", "skip the score API, the share URL, and crash reporting").addOption(new Option("--category <category>", "only show diagnostics in a category (repeatable; e.g. Security)").argParser(collectCategoryOption)).option("--no-telemetry", "alias for --no-score (skip the score API, share URL, and crash reporting)").option("--staged", "scan only staged (git index) files for pre-commit hooks").option("--max-duration <seconds>", "scan time budget for the whole run, shared across workspace projects: past it, remaining lint batches and dead-code are skipped and partial results are reported (skipped files are listed in the JSON report)").option("--blocking <level>", "severity that fails CI: error (default), warning, or none (advisory)").addOption(new Option("--fail-on <level>", "[deprecated] alias for --blocking <level>").hideHelp()).option("--no-respect-inline-disables", "audit mode: neutralize inline lint suppressions before scanning").option("--warnings", "show warning-severity diagnostics (default)").option("--no-warnings", "hide warning-severity diagnostics (errors only)").option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").addHelpText("after", renderRootHelpEpilog);
+const program = new Command().name("react-doctor").description("Diagnose React codebase health").version(VERSION, "-v, --version", "display the version number").argument("[directory]", "project directory to scan", ".").option("--lint", "enable linting").option("--no-lint", "skip linting").option("--dead-code", "enable dead-code analysis (default)").option("--no-dead-code", "skip dead-code analysis (unused files / exports / dependencies, circular imports)").option("--supply-chain", "enable the dependency supply-chain scan (default)").option("--no-supply-chain", "skip the dependency supply-chain scan (Socket.dev dependency health checks)").option("--verbose", "show every rule and per-file details (default shows top 3 rules)").option("--debug", "force a Sentry trace and print its id at the end (paste it into a bug report)").option("--output-dir <dir>", "directory for the full diagnostics dump (default: a temp folder)").option("--score", "output only the score").option("--json", "output a single structured JSON report (suppresses other output)").option("--json-compact", "with --json, emit compact JSON (no indentation)").option("--json-out <path>", "with --json, write the report to a file instead of stdout").option("-y, --yes", "skip prompts, scan all workspace projects").option("--no-parallel", "lint serially with one worker (default: parallel across CPU cores; set the worker count with REACT_DOCTOR_PARALLEL)").option("--project <name>", "select projects: workspace names or directory paths (comma-separated for multiple); overrides the `projects` config field").option("--scope <value>", "how much supported JS/TS source to scan/report: full (default), files, changed (only new issues vs base), or lines (issues whose source spans touch changed lines)").option("--base <ref>", "base git ref for files/changed/lines scope (auto-detected when omitted)").option("--include-untracked", "with --scope files/changed/lines, also scan ordinary untracked files (respects .gitignore)").addOption(new Option("--diff [base]", "[deprecated] alias for --scope changed (pass `false` to force a full scan)").hideHelp()).addOption(new Option("--changed-files-from <file>", "scan source files listed in a newline-delimited changed-files file").hideHelp()).option("--no-score", "skip the score API, the share URL, and crash reporting").addOption(new Option("--category <category>", "only show diagnostics in a category (repeatable; e.g. Security)").argParser(collectCategoryOption)).option("--no-telemetry", "alias for --no-score (skip the score API, share URL, and crash reporting)").option("--staged", "scan only staged (git index) files for pre-commit hooks").option("--max-duration <seconds>", "scan time budget for the whole run, shared across workspace projects: past it, remaining lint batches and dead-code are skipped and partial results are reported (skipped files are listed in the JSON report)").option("--blocking <level>", "severity that fails CI: error (default), warning, or none (advisory)").addOption(new Option("--fail-on <level>", "[deprecated] alias for --blocking <level>").hideHelp()).option("--no-respect-inline-disables", "audit mode: neutralize inline lint suppressions before scanning").option("--warnings", "show warning-severity diagnostics (default)").option("--no-warnings", "hide warning-severity diagnostics (errors only)").option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").addHelpText("after", renderRootHelpEpilog);
 program.action(inspectAction);
 program.command("why <location>").description("Explain why a rule fired (or why a suppression didn't apply) at a file:line").option("--project <name>", "select projects: workspace names or directory paths (comma-separated for multiple)").option("-c, --cwd <cwd>", "working directory", process.cwd()).option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").action((location, options) => whyAction(location, options));
 program.command("install").alias("setup").description("Install the react-doctor skill into your coding agents and optional git hook").option("-y, --yes", "skip prompts, install for all detected agents").option("--dry-run", "show what would be installed without writing files").option("--agent-hooks", "install native non-blocking agent hooks for Claude Code and Cursor").option("-c, --cwd <cwd>", "working directory", process.cwd()).option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").addHelpText("after", renderInstallHelpEpilog).action(installAction);
@@ -65271,4 +65415,4 @@ Promise.resolve().then(() => assertNoRemovedFlags(process.argv)).then(() => prog
 export {};
 
 //# sourceMappingURL=cli.js.map
-//# debugId=9a5c1a3c-7706-5a23-bca4-ddddd2f085af
+//# debugId=4c1e681e-4dee-5ffd-a4ba-69b876f47147

package/dist/index.d.ts

@@ -10256,7 +10256,7 @@ declare const buildJsonReport: (input: BuildJsonReportInput) => JsonReportV3$1;
  * render diff-base mistakes (`GitBaseBranchInvalid` /
  * `GitBaseBranchMissing`) as clean user errors instead of crashes.
  */
-declare const getDiffInfo: (directory: string, explicitBaseBranch?: string) => Promise<DiffInfo | null>;
+declare const getDiffInfo: (directory: string, explicitBaseBranch?: string, includeUntracked?: boolean) => Promise<DiffInfo | null>;
 declare const filterSourceFiles: (filePaths: string[]) => string[];
 /**
  * Programmatic façade over `Git.changedLineRanges` (the `lines` scope). Diffs

package/dist/index.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="11364a34-6c8b-5bd3-b9e8-aaa7c0ea264c")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="4da79386-f10f-5bae-95ac-7333b2d6c4e8")}catch(e){}}();
 import { r as __toESM$1, t as __commonJSMin$1 } from "./chunk-N93fKeF6.js";
 import { createRequire } from "node:module";
 import reactDoctorPlugin, { ALL_REACT_DOCTOR_RULE_KEYS, CROSS_FILE_DEPENDENCY_COLLECTORS, CROSS_FILE_RULE_IDS, FRAMEWORK_SPECIFIC_RULE_KEYS, FRAMEWORK_TOKENS, MOTION_LIBRARY_PACKAGES, REACT_COMPILER_RULES, REACT_DOCTOR_RULES, classifySecurityScanFile, collectCrossFileDependencyProbes, resetManifestCaches, shouldReadSecurityScanContent } from "oxlint-plugin-react-doctor";
@@ -36366,6 +36366,49 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
+const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
+const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
+const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
+	...survivingDiagnostic,
+	severity: "error"
+} : survivingDiagnostic;
+const dedupeRelatedDiagnostics = (diagnostics) => {
+	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
+	const uniqueDiagnostics = [];
+	for (const diagnostic of diagnostics) {
+		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
+				continue;
+			}
+		}
+		uniqueDiagnostics.push(diagnostic);
+	}
+	return uniqueDiagnostics;
+};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -38579,6 +38622,7 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
+const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
 * behind a `Context.Service`. The production layer (`layerNode`)
@@ -38649,6 +38693,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			args,
 			directory
 		});
+		const listUntrackedFilePaths = (directory, includePaths = []) => runGit(directory, [
+			"ls-files",
+			"-z",
+			"--others",
+			"--exclude-standard",
+			...includePaths.length > 0 ? ["--", ...includePaths] : []
+		]).pipe(map$3((result) => result.status === 0 ? splitNullSeparated(result.stdout) : null));
+		const mergeUntracked = (directory, trackedFilePaths, includeUntracked) => includeUntracked ? listUntrackedFilePaths(directory).pipe(map$3((untracked) => untracked === null ? trackedFilePaths : [...new Set([...trackedFilePaths, ...untracked])])) : succeed$2(trackedFilePaths);
 		const currentBranch = (directory) => runGit(directory, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -38771,7 +38823,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
-			diffSelection: ({ directory, explicitBaseBranch }) => gen(function* () {
+			diffSelection: ({ directory, explicitBaseBranch, includeUntracked = false }) => gen(function* () {
 				if (explicitBaseBranch !== void 0 && explicitBaseBranch.trim().length === 0) return yield* fail$4(new ReactDoctorError({ reason: new GitBaseBranchInvalid({ detail: "Diff base branch cannot be empty." }) }));
 				if (explicitBaseBranch !== void 0) {
 					const range = parseGitDiffRange(explicitBaseBranch);
@@ -38800,7 +38852,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 						"HEAD"
 					]);
 					if (uncommitted.status !== 0) return null;
-					const files = splitNullSeparated(uncommitted.stdout);
+					const files = yield* mergeUntracked(directory, splitNullSeparated(uncommitted.stdout), includeUntracked);
 					if (files.length === 0) return null;
 					return {
 						currentBranch: resolvedCurrentBranch,
@@ -38830,7 +38882,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					currentBranch: resolvedCurrentBranch,
 					baseBranch,
 					diffBaseRef: mergeBaseRef,
-					changedFiles: splitNullSeparated(diff.stdout),
+					changedFiles: yield* mergeUntracked(directory, splitNullSeparated(diff.stdout), includeUntracked),
 					isCurrentChanges: false
 				};
 			}).pipe(withSpan("Git.diffSelection")),
@@ -38876,7 +38928,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					stdout: result.stdout
 				};
 			}).pipe(withSpan("Git.grep")),
-			changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
+			changedLineRanges: ({ directory, baseRef, cached, files, includeUntracked = false }) => gen(function* () {
 				if (files.length === 0) return [];
 				if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
 				const result = yield* runGit(directory, [
@@ -38890,7 +38942,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					...files
 				]);
 				if (result.status !== 0) return null;
-				return parseChangedLineRanges(result.stdout);
+				const changedLineRanges = parseChangedLineRanges(result.stdout);
+				if (cached || !includeUntracked) return changedLineRanges;
+				const untrackedFilePaths = yield* listUntrackedFilePaths(directory, files);
+				if (untrackedFilePaths === null) return changedLineRanges;
+				return [...changedLineRanges, ...untrackedFilePaths.map((file) => ({
+					file,
+					ranges: [[1, UNTRACKED_FILE_LAST_LINE]]
+				}))];
 			}).pipe(catch_$1((error) => error.reason._tag === "GitInvocationFailed" ? succeed$2(null) : fail$4(error)), withSpan("Git.changedLineRanges"))
 		});
 	})).pipe(provide$2(layer$2.pipe(provide$2(mergeAll$1(layer$1, layer)))));
@@ -39475,13 +39534,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 1,
+	version: 2,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 1 || !isRecord(persisted.rulesets)) return entries;
+	if (persisted.version !== 2 || !isRecord(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord(bucket) || !isRecord(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -39501,7 +39560,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 1 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 2 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord(existingBucket) && isRecord(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -39515,7 +39574,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 1,
+				version: 2,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -39566,23 +39625,6 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -39590,16 +39632,6 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
-				continue;
-			}
-		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -40399,11 +40431,11 @@ const buildRelatedLocations = (labels, filePath) => {
 	}
 	return related;
 };
-const isOxlintOutput = (value) => {
-	if (typeof value !== "object" || value === null) return false;
-	const candidate = value;
-	return Array.isArray(candidate.diagnostics);
-};
+const isOxlintSpan = (value) => isRecord(value) && typeof value.offset === "number" && typeof value.length === "number" && typeof value.line === "number" && typeof value.column === "number";
+const isOxlintLabel = (value) => isRecord(value) && isOxlintSpan(value.span);
+const isMappableOxlintDiagnostic = (value) => isRecord(value) && typeof value.code === "string" && value.code.length > 0 && typeof value.filename === "string" && value.filename.length > 0 && (value.severity === "warning" || value.severity === "error") && Array.isArray(value.labels) && value.labels.every(isOxlintLabel);
+const isEngineFailureDiagnostic = (value) => !isRecord(value) || typeof value.filename !== "string" || value.filename.length === 0;
+const isOxlintOutput = (value) => isRecord(value) && Array.isArray(value.diagnostics);
 /**
 * Parses one oxlint subprocess's stdout into a flat `Diagnostic[]`.
 * Tolerates the leading-notice-line shape oxlint sometimes prints
@@ -40422,6 +40454,8 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
+	const engineFailureDiagnostic = parsed.diagnostics.find(isEngineFailureDiagnostic);
+	if (engineFailureDiagnostic !== void 0) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: JSON.stringify(engineFailureDiagnostic).slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
 	const sourceBufferCache = /* @__PURE__ */ new Map();
 	const sourceLinesCache = /* @__PURE__ */ new Map();
@@ -40456,7 +40490,7 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		minifiedFileCache.set(absolutePath, minified);
 		return minified;
 	};
-	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => diagnostic.code && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
+	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => isMappableOxlintDiagnostic(diagnostic) && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
 		const { plugin, rule } = parseRuleCode(diagnostic.code);
 		const primaryLabel = diagnostic.labels[0];
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
@@ -42291,7 +42325,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
+	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
+	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -42420,7 +42455,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -42428,7 +42463,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	})));
+	}))));
+	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -42948,10 +42984,11 @@ const buildSkippedChecks = (input) => {
 * render diff-base mistakes (`GitBaseBranchInvalid` /
 * `GitBaseBranchMissing`) as clean user errors instead of crashes.
 */
-const getDiffInfo = (directory, explicitBaseBranch) => runPromise(gen(function* () {
+const getDiffInfo = (directory, explicitBaseBranch, includeUntracked) => runPromise(gen(function* () {
 	const selection = yield* (yield* Git).diffSelection({
 		directory,
-		explicitBaseBranch
+		explicitBaseBranch,
+		includeUntracked
 	});
 	if (selection === null) return null;
 	return {
@@ -43241,4 +43278,4 @@ const toJsonReport = (result, options) => buildJsonReport({
 export { AmbiguousProjectError, NoReactDependencyError, NotADirectoryError, PackageJsonNotFoundError, ProjectNotFoundError, ReactDoctorError, buildJsonReport, buildJsonReportError, clearCaches, defineConfig, diagnose, filterSourceFiles, getDiffInfo, hasReactRuntime, isProjectDiscoveryError, isReactDoctorError, summarizeDiagnostics, toJsonReport };
 
 //# sourceMappingURL=index.js.map
-//# debugId=11364a34-6c8b-5bd3-b9e8-aaa7c0ea264c
+//# debugId=4da79386-f10f-5bae-95ac-7333b2d6c4e8

package/dist/lsp.js

@@ -36344,6 +36344,49 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
+const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
+const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
+const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
+	...survivingDiagnostic,
+	severity: "error"
+} : survivingDiagnostic;
+const dedupeRelatedDiagnostics = (diagnostics) => {
+	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
+	const uniqueDiagnostics = [];
+	for (const diagnostic of diagnostics) {
+		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
+				continue;
+			}
+		}
+		uniqueDiagnostics.push(diagnostic);
+	}
+	return uniqueDiagnostics;
+};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -38557,6 +38600,7 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
+const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
 * behind a `Context.Service`. The production layer (`layerNode`)
@@ -38627,6 +38671,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			args,
 			directory
 		});
+		const listUntrackedFilePaths = (directory, includePaths = []) => runGit(directory, [
+			"ls-files",
+			"-z",
+			"--others",
+			"--exclude-standard",
+			...includePaths.length > 0 ? ["--", ...includePaths] : []
+		]).pipe(map$3((result) => result.status === 0 ? splitNullSeparated(result.stdout) : null));
+		const mergeUntracked = (directory, trackedFilePaths, includeUntracked) => includeUntracked ? listUntrackedFilePaths(directory).pipe(map$3((untracked) => untracked === null ? trackedFilePaths : [...new Set([...trackedFilePaths, ...untracked])])) : succeed$2(trackedFilePaths);
 		const currentBranch = (directory) => runGit(directory, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -38749,7 +38801,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
-			diffSelection: ({ directory, explicitBaseBranch }) => gen(function* () {
+			diffSelection: ({ directory, explicitBaseBranch, includeUntracked = false }) => gen(function* () {
 				if (explicitBaseBranch !== void 0 && explicitBaseBranch.trim().length === 0) return yield* fail$4(new ReactDoctorError({ reason: new GitBaseBranchInvalid({ detail: "Diff base branch cannot be empty." }) }));
 				if (explicitBaseBranch !== void 0) {
 					const range = parseGitDiffRange(explicitBaseBranch);
@@ -38778,7 +38830,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 						"HEAD"
 					]);
 					if (uncommitted.status !== 0) return null;
-					const files = splitNullSeparated(uncommitted.stdout);
+					const files = yield* mergeUntracked(directory, splitNullSeparated(uncommitted.stdout), includeUntracked);
 					if (files.length === 0) return null;
 					return {
 						currentBranch: resolvedCurrentBranch,
@@ -38808,7 +38860,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					currentBranch: resolvedCurrentBranch,
 					baseBranch,
 					diffBaseRef: mergeBaseRef,
-					changedFiles: splitNullSeparated(diff.stdout),
+					changedFiles: yield* mergeUntracked(directory, splitNullSeparated(diff.stdout), includeUntracked),
 					isCurrentChanges: false
 				};
 			}).pipe(withSpan("Git.diffSelection")),
@@ -38854,7 +38906,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					stdout: result.stdout
 				};
 			}).pipe(withSpan("Git.grep")),
-			changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
+			changedLineRanges: ({ directory, baseRef, cached, files, includeUntracked = false }) => gen(function* () {
 				if (files.length === 0) return [];
 				if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
 				const result = yield* runGit(directory, [
@@ -38868,7 +38920,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					...files
 				]);
 				if (result.status !== 0) return null;
-				return parseChangedLineRanges(result.stdout);
+				const changedLineRanges = parseChangedLineRanges(result.stdout);
+				if (cached || !includeUntracked) return changedLineRanges;
+				const untrackedFilePaths = yield* listUntrackedFilePaths(directory, files);
+				if (untrackedFilePaths === null) return changedLineRanges;
+				return [...changedLineRanges, ...untrackedFilePaths.map((file) => ({
+					file,
+					ranges: [[1, UNTRACKED_FILE_LAST_LINE]]
+				}))];
 			}).pipe(catch_$1((error) => error.reason._tag === "GitInvocationFailed" ? succeed$2(null) : fail$4(error)), withSpan("Git.changedLineRanges"))
 		});
 	})).pipe(provide$2(layer$2.pipe(provide$2(mergeAll$1(layer$1, layer)))));
@@ -39453,13 +39512,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 1,
+	version: 2,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 1 || !isRecord(persisted.rulesets)) return entries;
+	if (persisted.version !== 2 || !isRecord(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord(bucket) || !isRecord(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -39479,7 +39538,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 1 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 2 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord(existingBucket) && isRecord(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -39493,7 +39552,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 1,
+				version: 2,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -39544,23 +39603,6 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -39568,16 +39610,6 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
-				continue;
-			}
-		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -40377,11 +40409,11 @@ const buildRelatedLocations = (labels, filePath) => {
 	}
 	return related;
 };
-const isOxlintOutput = (value) => {
-	if (typeof value !== "object" || value === null) return false;
-	const candidate = value;
-	return Array.isArray(candidate.diagnostics);
-};
+const isOxlintSpan = (value) => isRecord(value) && typeof value.offset === "number" && typeof value.length === "number" && typeof value.line === "number" && typeof value.column === "number";
+const isOxlintLabel = (value) => isRecord(value) && isOxlintSpan(value.span);
+const isMappableOxlintDiagnostic = (value) => isRecord(value) && typeof value.code === "string" && value.code.length > 0 && typeof value.filename === "string" && value.filename.length > 0 && (value.severity === "warning" || value.severity === "error") && Array.isArray(value.labels) && value.labels.every(isOxlintLabel);
+const isEngineFailureDiagnostic = (value) => !isRecord(value) || typeof value.filename !== "string" || value.filename.length === 0;
+const isOxlintOutput = (value) => isRecord(value) && Array.isArray(value.diagnostics);
 /**
 * Parses one oxlint subprocess's stdout into a flat `Diagnostic[]`.
 * Tolerates the leading-notice-line shape oxlint sometimes prints
@@ -40400,6 +40432,8 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
+	const engineFailureDiagnostic = parsed.diagnostics.find(isEngineFailureDiagnostic);
+	if (engineFailureDiagnostic !== void 0) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: JSON.stringify(engineFailureDiagnostic).slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
 	const sourceBufferCache = /* @__PURE__ */ new Map();
 	const sourceLinesCache = /* @__PURE__ */ new Map();
@@ -40434,7 +40468,7 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		minifiedFileCache.set(absolutePath, minified);
 		return minified;
 	};
-	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => diagnostic.code && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
+	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => isMappableOxlintDiagnostic(diagnostic) && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
 		const { plugin, rule } = parseRuleCode(diagnostic.code);
 		const primaryLabel = diagnostic.labels[0];
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
@@ -42269,7 +42303,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
+	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
+	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -42398,7 +42433,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -42406,7 +42441,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	})));
+	}))));
+	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -44524,6 +44560,7 @@ const METRIC = {
 	cliInvoked: "cli.invoked",
 	cliError: "cli.error",
 	cliEnvironmentError: "cli.env_error",
+	stagedSnapshotDivergence: "staged.snapshot_divergence",
 	projectDetected: "project.detected",
 	projectPathSelected: "project.path_selected",
 	projectConfigSelected: "project.config_selected",
@@ -44878,5 +44915,5 @@ const startLanguageServer = () => {
 };
 //#endregion
 export { startLanguageServer };
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f9337714-b38f-5f28-ac00-c9d7d79ebaea")}catch(e){}}();
-//# debugId=f9337714-b38f-5f28-ac00-c9d7d79ebaea
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b75c36e9-f19d-5127-be1a-89ac93910ff0")}catch(e){}}();
+//# debugId=b75c36e9-f19d-5127-be1a-89ac93910ff0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-doctor",
-  "version": "0.7.6-dev.1f14fa1",
+  "version": "0.7.6-dev.3f22fe3",
   "description": "Your agent writes bad React. This catches it",
   "keywords": [
     "accessibility",
@@ -65,8 +65,8 @@
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
     "yaml": "^2.9.0",
-    "oxlint-plugin-react-doctor": "0.7.6-dev.1f14fa1",
-    "deslop-js": "0.7.6"
+    "deslop-js": "0.7.6",
+    "oxlint-plugin-react-doctor": "0.7.6-dev.3f22fe3"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.27.0",