react-doctor 0.7.5 → 0.7.6-dev.0a8d30b

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]="ab586686-464c-58e6-a96d-70f7b39b1c5d")}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]="80f981d4-ebf0-5bc0-9643-8a68d27626a5")}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";
@@ -32930,7 +32930,6 @@ const IGNORED_DIRECTORIES = new Set([
 	"out",
 	"storybook-static"
 ]);
-const JSX_FILE_PATTERN = /\.(tsx|jsx)$/;
 const MILLISECONDS_PER_SECOND = 1e3;
 const SCORE_API_URL = "https://www.react.doctor/api/score";
 const FETCH_TIMEOUT_MS = 1e4;
@@ -33040,7 +33039,7 @@ const SOCKET_FREE_USER_AGENT = "react-doctor-supply-chain";
 const FILE_LINT_CACHE_FILENAME = "file-lint-cache.json";
 const FILE_LINT_CACHE_MAX_FILE_COUNT = 5e4;
 const SIDECAR_LINT_CACHE_FILENAME = "sidecar-lint-cache.json";
-const CORE_PACKAGE_VERSION = "0.7.5";
+const CORE_PACKAGE_VERSION = "0.7.6";
 const DEAD_CODE_CACHE_FILENAME = "dead-code-cache.json";
 const DEAD_CODE_SUMMARY_CACHE_FILENAME = "dead-code-summaries.json";
 const SUPPLY_CHAIN_PLUGIN = "socket";
@@ -33143,13 +33142,15 @@ const listSourceFilesViaFilesystem = (rootDirectory) => {
 const listSourceFilesWithSize = (rootDirectory) => collectSizedSourceFiles(rootDirectory, (listSourceFilesViaGit(rootDirectory) ?? listSourceFilesViaFilesystem(rootDirectory)).sort());
 const listSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).map((entry) => entry.path);
 const countSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).length;
+const UTF8_BOM_CHARACTER = "";
+const stripUtf8Bom = (content) => content.startsWith(UTF8_BOM_CHARACTER) ? content.slice(1) : content;
 const cachedPackageJsons = /* @__PURE__ */ new Map();
 const clearPackageJsonCache = () => {
 	cachedPackageJsons.clear();
 };
 const readPackageJsonUncached = (packageJsonPath) => {
 	try {
-		return JSON.parse(NFS.readFileSync(packageJsonPath, "utf-8"));
+		return JSON.parse(stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8")));
 	} catch (error) {
 		if (error instanceof SyntaxError) return {};
 		if (isErrnoException(error)) {
@@ -36790,7 +36791,6 @@ const PNPM_WORKSPACE_FILE = "pnpm-workspace.yaml";
 const PNPM_LOCKFILE = "pnpm-lock.yaml";
 const PACKAGE_JSON_FILE = "package.json";
 const PNPM_HARDENING_RULE_KEY = "require-pnpm-hardening";
-const UTF8_BOM_CHAR = "";
 const HARDENING_SETTING_KEYS = new Set([
 	"minimumReleaseAge",
 	"blockExoticSubdeps",
@@ -36815,12 +36815,11 @@ const stripInlineComment = (rawValue) => {
 	return rawValue;
 };
 const unquote = (rawValue) => rawValue.replace(/^["']|["']$/g, "");
-const stripBom = (rawContent) => rawContent.startsWith(UTF8_BOM_CHAR) ? rawContent.slice(1) : rawContent;
 const parseHardeningSettings = (content) => {
 	let minimumReleaseAge = null;
 	let blockExoticSubdeps = null;
 	let trustPolicy = null;
-	const lines = stripBom(content).split(/\r?\n/);
+	const lines = stripUtf8Bom(content).split(/\r?\n/);
 	for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
 		const lineText = lines[lineIndex];
 		if (lineText === void 0) continue;
@@ -36854,7 +36853,7 @@ const isPnpmManagedProject = (rootDirectory) => {
 	const packageJsonPath = Path.join(rootDirectory, PACKAGE_JSON_FILE);
 	if (!isFile(packageJsonPath)) return false;
 	try {
-		const packageJsonRaw = NFS.readFileSync(packageJsonPath, "utf-8");
+		const packageJsonRaw = stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8"));
 		const packageJson = JSON.parse(packageJsonRaw);
 		if (packageJson !== null && typeof packageJson === "object" && "packageManager" in packageJson && typeof packageJson.packageManager === "string" && packageJson.packageManager.startsWith("pnpm@")) return true;
 	} catch {
@@ -37516,9 +37515,7 @@ const highlighter = {
 	gray: import_picocolors.default.gray,
 	bold: import_picocolors.default.bold
 };
-const NEXT_ENTRY_FILE_PATTERN = /^(?:\.\/)?(?:src\/)?(?:middleware|proxy)\.(?:tsx?|jsx?|mts|mjs)$/;
-const shouldIncludeExplicitLintPath = (filePath, project) => JSX_FILE_PATTERN.test(filePath) || project?.framework === "nextjs" && NEXT_ENTRY_FILE_PATTERN.test(filePath);
-const computeExplicitLintIncludePaths = (includePaths, project) => includePaths.length > 0 ? includePaths.filter((filePath) => shouldIncludeExplicitLintPath(filePath, project)) : void 0;
+const computeExplicitLintIncludePaths = (includePaths) => includePaths.length > 0 ? includePaths.filter(isLintableSourceFile) : void 0;
 const LINGUIST_ATTRIBUTE_PATTERN = /^linguist-(?:vendored|generated)(?:=([a-zA-Z0-9]+))?$/i;
 const FALSY_VALUES = new Set([
 	"false",
@@ -38360,11 +38357,11 @@ const resolveDeadCodeTimeout = (input) => {
 		phaseTimeoutMs: workerTimeoutMs + DEAD_CODE_PHASE_TIMEOUT_OVER_WORKER_MS
 	};
 };
-const resolveLintIncludePaths = (rootDirectory, userConfig, project) => {
+const resolveLintIncludePaths = (rootDirectory, userConfig) => {
 	if (!Array.isArray(userConfig?.ignore?.files) || userConfig.ignore.files.length === 0) return;
 	const ignoredPatterns = compileIgnoredFilePatterns(userConfig);
 	return listSourceFiles(rootDirectory).filter((filePath) => {
-		if (!shouldIncludeExplicitLintPath(filePath, project)) return false;
+		if (!isLintableSourceFile(filePath)) return false;
 		return !isFileIgnoredByPatterns(filePath, rootDirectory, ignoredPatterns);
 	});
 };
@@ -38582,6 +38579,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`)
@@ -38652,6 +38650,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",
@@ -38774,7 +38780,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);
@@ -38803,7 +38809,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,
@@ -38833,7 +38839,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")),
@@ -38879,7 +38885,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, [
@@ -38893,7 +38899,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)))));
@@ -39125,7 +39138,7 @@ const normalizeConfigForHash = (config) => {
 	if (Array.isArray(clone?.jsPlugins)) clone.jsPlugins = clone.jsPlugins.map((_, index) => `<plugin:${index}>`);
 	return clone;
 };
-const computeRulesetHash = (input) => crypto.createHash("sha1").update(JSON.stringify(normalizeConfigForHash(input.config))).update("\0").update([...input.toolchainVersions].join("\0")).update("\0").update([...input.ignorePatterns].join("\n")).update("\0").update(input.tsconfigContent ?? "").digest("hex");
+const computeRulesetHash = (input) => crypto.createHash("sha1").update(JSON.stringify(normalizeConfigForHash(input.config))).update("\0").update([...input.toolchainVersions].join("\0")).update("\0").update([...input.ignorePatterns].join("\n")).update("\0").update(input.tsconfigContent ?? "").update("\0").update(input.respectInlineDisables ? "respect-inline-disables" : "audit-mode").digest("hex");
 /**
 * Loads a plugin module via the local require resolver and extracts
 * `(name, ruleNames)` from either `module.exports.meta + rules` or
@@ -39161,7 +39174,7 @@ const resolveReactHooksJsPlugin = (hasReactCompiler, customRulesOnly) => {
 	} catch {
 		return null;
 	}
-	const { ruleNames } = readPluginShape(pluginSpecifier, (spec) => bundledRequire$1(spec));
+	const { ruleNames } = readPluginShape(pluginSpecifier, (specifier) => bundledRequire$1(specifier));
 	return {
 		entry: {
 			name: "react-hooks-js",
@@ -39569,6 +39582,23 @@ 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 = [];
@@ -39576,6 +39606,16 @@ 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;
@@ -39618,6 +39658,12 @@ const mapWithConcurrency = async (items, concurrency, task) => {
 	if (errors.length > 0) throw errors[0];
 	return results;
 };
+const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
+	let lineNumber = 1;
+	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
+	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === 10) lineNumber++;
+	return lineNumber;
+};
 const REANIMATED_SHARED_VALUE_HINT = "If this is a Reanimated shared value, prefer its React Compiler-compatible `.get()` / `.set()` accessors over `.value` — https://docs.swmansion.com/react-native-reanimated/docs/core/useSharedValue/#react-compiler-support";
 const ACCESSORS_MIN_VERSION = "3.15.0";
 const supportsAccessors = (reanimatedVersion) => {
@@ -40189,13 +40235,6 @@ const findOutermostEnclosingFunctionRange = (sourceFile, targetLine) => {
 	visit(sourceFile);
 	return foundRange;
 };
-const NEWLINE_BYTE = 10;
-const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
-	let lineNumber = 1;
-	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
-	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === NEWLINE_BYTE) lineNumber++;
-	return lineNumber;
-};
 /**
 * Drops `react-doctor/react-compiler-no-manual-memoization` diagnostics
 * whose enclosing function also carries a `react-hooks-js` (React
@@ -40400,8 +40439,33 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
+	const sourceBufferCache = /* @__PURE__ */ new Map();
+	const sourceLinesCache = /* @__PURE__ */ new Map();
+	const resolveAbsolutePath = (filename) => Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
+	const readSourceBuffer = (filename) => {
+		const absolutePath = resolveAbsolutePath(filename);
+		const cached = sourceBufferCache.get(absolutePath);
+		if (cached !== void 0) return cached;
+		let sourceBuffer;
+		try {
+			sourceBuffer = NFS.readFileSync(absolutePath);
+		} catch {
+			sourceBuffer = null;
+		}
+		sourceBufferCache.set(absolutePath, sourceBuffer);
+		return sourceBuffer;
+	};
+	const readSourceLines = (filename) => {
+		const absolutePath = resolveAbsolutePath(filename);
+		const cached = sourceLinesCache.get(absolutePath);
+		if (cached !== void 0) return cached;
+		const sourceBuffer = readSourceBuffer(filename);
+		const sourceLines = sourceBuffer ? sourceBuffer.toString("utf8").split("\n") : null;
+		sourceLinesCache.set(absolutePath, sourceLines);
+		return sourceLines;
+	};
 	const isMinifiedDiagnosticFile = (filename) => {
-		const absolutePath = Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
+		const absolutePath = resolveAbsolutePath(filename);
 		const cached = minifiedFileCache.get(absolutePath);
 		if (cached !== void 0) return cached;
 		const minified = isMinifiedSource(absolutePath);
@@ -40414,8 +40478,17 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
 		const normalizedFilePath = diagnostic.filename.replaceAll("\\", "/");
 		const primarySpan = primaryLabel?.span;
+		const sourceBuffer = primarySpan ? readSourceBuffer(diagnostic.filename) : null;
 		const relatedLocations = buildRelatedLocations(diagnostic.labels, normalizedFilePath);
 		const category = resolveDiagnosticCategory(plugin, rule);
+		const matchByOccurrence = resolveMatchByOccurrence(rule, category);
+		const sourceLines = primarySpan ? readSourceLines(diagnostic.filename) : null;
+		const primaryLineIndex = primarySpan ? primarySpan.line - 1 : -1;
+		const primaryLine = sourceLines?.[primaryLineIndex];
+		const primaryColumnIndex = primarySpan ? primarySpan.column - 1 : -1;
+		const isJsxTagLabel = primaryLine !== void 0 && primaryColumnIndex >= 0 && (primaryLine[primaryColumnIndex] === "<" || primaryLine[primaryColumnIndex - 1] === "<");
+		const jsxOpenerEndLineIndex = sourceLines && isJsxTagLabel ? findJsxOpenerSpan(sourceLines, primaryLineIndex) : null;
+		const primarySpanEndLine = jsxOpenerEndLineIndex !== null ? jsxOpenerEndLineIndex + 1 : primarySpan && sourceBuffer ? lineOfUtf8Offset(sourceBuffer, primarySpan.offset + Math.max(primarySpan.length - 1, 0)) : void 0;
 		return {
 			filePath: normalizedFilePath,
 			plugin,
@@ -40429,10 +40502,11 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 			column: primarySpan?.column ?? 0,
 			...primarySpan ? {
 				offset: primarySpan.offset,
-				length: primarySpan.length
+				length: primarySpan.length,
+				...primarySpanEndLine !== void 0 ? { endLine: primarySpanEndLine } : {}
 			} : {},
 			category,
-			...resolveMatchByOccurrence(rule, category) ? { matchByOccurrence: true } : {},
+			...matchByOccurrence ? { matchByOccurrence: true } : {},
 			...relatedLocations.length > 0 ? { relatedLocations } : {}
 		};
 	}), rootDirectory);
@@ -40449,6 +40523,11 @@ const buildOxlintChildEnv = (sourceEnv) => {
 	if (!isCompileCacheDisabled && !isCompileCacheAlreadySet) childEnv.NODE_COMPILE_CACHE = Path.join(os.tmpdir(), NODE_COMPILE_CACHE_DIR_NAME);
 	return childEnv;
 };
+const buildProfiledNodeArguments = (input) => [
+	...input.cpuProfileDirectory ? ["--cpu-prof", `--cpu-prof-dir=${input.cpuProfileDirectory}`] : [],
+	...input.heapProfileDirectory ? ["--heap-prof", `--heap-prof-dir=${input.heapProfileDirectory}`] : [],
+	...input.argumentsList
+];
 const SANITIZED_ENV = buildOxlintChildEnv(process.env);
 /**
 * Spawn one oxlint subprocess with hard ceilings on wall time and
@@ -40473,7 +40552,11 @@ const spawnOxlint = (args, rootDirectory, nodeBinaryPath, spawnTimeoutMs = OXLIN
 		reject(new ReactDoctorError({ reason: new OxlintSpawnFailed({ cause: "lint phase aborted" }) }));
 		return;
 	}
-	const child = spawn(nodeBinaryPath, args, {
+	const child = spawn(nodeBinaryPath, buildProfiledNodeArguments({
+		argumentsList: args,
+		cpuProfileDirectory: SANITIZED_ENV.REACT_DOCTOR_CPU_PROFILE_DIR,
+		heapProfileDirectory: SANITIZED_ENV.REACT_DOCTOR_HEAP_PROFILE_DIR
+	}), {
 		cwd: rootDirectory,
 		env: SANITIZED_ENV,
 		stdio: [
@@ -41117,7 +41200,7 @@ const runOxlint = async (options) => {
 				};
 			}
 		};
-		if (perFileLintCacheEnabled && respectInlineDisables && !project.hasReactCompiler && extendsPaths.length === 0 && userPlugins.length === 0) {
+		if (perFileLintCacheEnabled && !project.hasReactCompiler && extendsPaths.length === 0 && userPlugins.length === 0) {
 			const rulesetHash = computeRulesetHash({
 				config: buildConfig({
 					extendsPaths: [],
@@ -41125,7 +41208,8 @@ const runOxlint = async (options) => {
 				}),
 				toolchainVersions: resolveOxlintToolchainVersions(nodeBinaryPath),
 				ignorePatterns: combinedPatterns,
-				tsconfigContent
+				tsconfigContent,
+				respectInlineDisables
 			});
 			const cache = createFileLintCache(resolveReactDoctorCacheDir(rootDirectory), rulesetHash);
 			const cacheKeyByFile = /* @__PURE__ */ new Map();
@@ -41168,7 +41252,8 @@ const runOxlint = async (options) => {
 				}),
 				toolchainVersions: resolveOxlintToolchainVersions(nodeBinaryPath),
 				ignorePatterns: combinedPatterns,
-				tsconfigContent
+				tsconfigContent,
+				respectInlineDisables
 			})) : null;
 			const probeAnswers = createSidecarProbeAnswerResolver({
 				rootDirectory,
@@ -42208,7 +42293,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		directory: scanDirectory,
 		repo
 	}).pipe(orElseSucceed(() => null)) : succeed$2(null));
-	const lintIncludePaths = (input.skipJsxIncludeFilter ? input.includePaths.length > 0 ? [...input.includePaths] : void 0 : computeExplicitLintIncludePaths([...input.includePaths], project)) ?? resolveLintIncludePaths(scanDirectory, resolvedConfig.config, project);
+	const lintIncludePaths = (input.skipExplicitIncludePathFilter ? input.includePaths.length > 0 ? [...input.includePaths] : void 0 : computeExplicitLintIncludePaths([...input.includePaths])) ?? resolveLintIncludePaths(scanDirectory, resolvedConfig.config);
 	const fallbackScannedFilePaths = input.suppressScanSummary ? (lintIncludePaths ?? (yield* filesService.listSourceFiles(scanDirectory))).map((relativePath) => Path.resolve(scanDirectory, relativePath)) : [];
 	const beforeLint = hooks.beforeLint ?? NO_HOOKS.beforeLint;
 	const afterLint = hooks.afterLint ?? NO_HOOKS.afterLint;
@@ -42879,10 +42964,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 {
@@ -43172,4 +43258,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=ab586686-464c-58e6-a96d-70f7b39b1c5d
+//# debugId=80f981d4-ebf0-5bc0-9643-8a68d27626a5