react-doctor 0.8.1-dev.7818922 → 0.8.1-dev.7eca0ee

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]="9e32582f-b296-5216-a028-7cc19ed83931")}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]="81bdc95e-12f2-565f-a05c-7b8a60a98f81")}catch(e){}}();
 import { createRequire } from "node:module";
 import * as NodeChildProcess from "node:child_process";
 import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
@@ -37317,6 +37317,10 @@ const listWorkspacePackages = (rootDirectory) => {
 	return packages;
 };
 const REANIMATED_DEPENDENCY_NAME = "react-native-reanimated";
+const MOBX_REACT_PACKAGE_NAME = "mobx-react";
+const MOBX_REACT_LITE_PACKAGE_NAME = "mobx-react-lite";
+const MOBX_STATE_TREE_PACKAGE_NAME = "mobx-state-tree";
+const MOBX_REACT_OBSERVER_PACKAGE_NAME = "mobx-react-observer";
 const SHOPIFY_FLASH_LIST_PACKAGE_NAME = "@shopify/flash-list";
 const resolveWorkspaceDependencyVersion = ({ concreteVersion, packageName, rootDirectory, rootPackageJson, sections, workspaceDirectory, workspacePackageJson }) => {
 	const dependencyDeclaration = getDependencyDeclaration({
@@ -37335,7 +37339,18 @@ const shouldReplaceReactVersion = (currentVersion, nextVersion) => {
 	if (nextMajor === null) return false;
 	return nextMajor < currentMajor;
 };
-const evaluateManifestFacts = (facts, packageJson, directory) => {
+const shouldReplaceSupportedDependencyFact = (currentFact, nextFact, latestSupportedMajor) => {
+	if (currentFact.version === null) return true;
+	if (nextFact.version === null) return false;
+	const currentMajor = getLowestDependencyMajor(currentFact.version);
+	const nextMajor = getLowestDependencyMajor(nextFact.version);
+	if (currentMajor === null) return false;
+	if (nextMajor === null) return true;
+	if (currentMajor > latestSupportedMajor) return false;
+	if (nextMajor > latestSupportedMajor) return true;
+	return nextMajor < currentMajor;
+};
+const evaluateManifestFacts = (facts, packageJson, directory, rootDirectory, rootPackageJson) => {
 	if (facts.expo.version === null) {
 		const spec = getDependencySpec(packageJson, "expo");
 		if (spec !== null) facts.expo = {
@@ -37357,13 +37372,65 @@ const evaluateManifestFacts = (facts, packageJson, directory) => {
 			sourceDirectory: directory
 		};
 	}
+	const mobxSpec = getDependencySpec(packageJson, "mobx");
+	if (mobxSpec !== null) {
+		const nextMobxFact = {
+			version: resolveCatalogBackedDependencyVersion({
+				rootDirectory: directory,
+				rootPackageJson: packageJson,
+				packageName: "mobx",
+				version: mobxSpec
+			}),
+			sourceDirectory: directory
+		};
+		if (shouldReplaceSupportedDependencyFact(facts.mobx, nextMobxFact, 6)) facts.mobx = nextMobxFact;
+	}
+	facts.hasMobxReact = facts.hasMobxReact || getDependencySpec(packageJson, MOBX_REACT_PACKAGE_NAME) !== null;
+	facts.hasMobxReactLite = facts.hasMobxReactLite || getDependencySpec(packageJson, MOBX_REACT_LITE_PACKAGE_NAME) !== null;
+	facts.hasMobxStateTree = facts.hasMobxStateTree || getDependencySpec(packageJson, MOBX_STATE_TREE_PACKAGE_NAME) !== null;
+	facts.hasMobxReactObserver = facts.hasMobxReactObserver || getDependencySpec(packageJson, MOBX_REACT_OBSERVER_PACKAGE_NAME) !== null;
+	const zustandSpec = getDependencySpec(packageJson, "zustand");
+	if (zustandSpec !== null) {
+		const nextZustandFact = {
+			version: resolveCatalogBackedDependencyVersion({
+				rootDirectory: directory,
+				rootPackageJson: packageJson,
+				packageName: "zustand",
+				version: zustandSpec
+			}),
+			sourceDirectory: directory
+		};
+		if (shouldReplaceSupportedDependencyFact(facts.zustand, nextZustandFact, 5)) facts.zustand = nextZustandFact;
+	}
 	if (facts.reanimatedVersion === null) {
 		const spec = getDependencySpec(packageJson, REANIMATED_DEPENDENCY_NAME);
 		if (spec !== null) facts.reanimatedVersion = spec;
 	}
+	if (facts.valtioVersion === null) {
+		const spec = getDependencySpec(packageJson, "valtio");
+		if (spec !== null) facts.valtioVersion = spec;
+	}
 	facts.hasReactNativeAwarePackage = facts.hasReactNativeAwarePackage || isPackageJsonReactNativeAware(packageJson);
 	facts.hasReanimatedAwarePackage = facts.hasReanimatedAwarePackage || isPackageJsonReanimatedAware(packageJson);
 	facts.hasSsrDependency = facts.hasSsrDependency || isPackageJsonSsrAware(packageJson);
+	const remotionSpec = getDependencySpec(packageJson, "remotion");
+	if (remotionSpec !== null) {
+		facts.hasRemotionDependency = true;
+		const resolvedRemotionVersion = resolveCatalogBackedDependencyVersion({
+			rootDirectory,
+			rootPackageJson,
+			packageName: "remotion",
+			version: remotionSpec
+		});
+		const remotionMajorVersion = resolvedRemotionVersion === null ? null : getLowestDependencyMajor(resolvedRemotionVersion);
+		if (remotionMajorVersion === null) {
+			facts.hasUnknownRemotionVersion = true;
+			facts.remotionVersion = null;
+		} else if (!facts.hasUnknownRemotionVersion) {
+			const currentRemotionMajorVersion = facts.remotionVersion === null ? null : getLowestDependencyMajor(facts.remotionVersion);
+			if (currentRemotionMajorVersion === null || remotionMajorVersion < currentRemotionMajorVersion) facts.remotionVersion = resolvedRemotionVersion;
+		}
+	}
 };
 const collectWorkspaceFacts = (rootDirectory, rootPackageJson, { collectReactGroup }) => {
 	const facts = {
@@ -37383,12 +37450,28 @@ const collectWorkspaceFacts = (rootDirectory, rootPackageJson, { collectReactGro
 			version: null,
 			sourceDirectory: null
 		},
+		valtioVersion: null,
+		mobx: {
+			version: null,
+			sourceDirectory: null
+		},
+		hasMobxReact: false,
+		hasMobxReactLite: false,
+		hasMobxStateTree: false,
+		hasMobxReactObserver: false,
+		zustand: {
+			version: null,
+			sourceDirectory: null
+		},
 		hasReactNativeAwarePackage: false,
 		hasReanimatedAwarePackage: false,
 		hasSsrDependency: false,
+		hasRemotionDependency: false,
+		hasUnknownRemotionVersion: false,
+		remotionVersion: null,
 		reanimatedVersion: null
 	};
-	evaluateManifestFacts(facts, rootPackageJson, rootDirectory);
+	evaluateManifestFacts(facts, rootPackageJson, rootDirectory, rootDirectory, rootPackageJson);
 	let isReactGroupSettled = !collectReactGroup;
 	const visitedDirectories = /* @__PURE__ */ new Set();
 	for (const pattern of getWorkspacePatterns(rootDirectory, rootPackageJson)) {
@@ -37397,7 +37480,7 @@ const collectWorkspaceFacts = (rootDirectory, rootPackageJson, { collectReactGro
 			if (visitedDirectories.has(workspaceDirectory)) continue;
 			visitedDirectories.add(workspaceDirectory);
 			const workspacePackageJson = readPackageJson$1(Path.join(workspaceDirectory, "package.json"));
-			evaluateManifestFacts(facts, workspacePackageJson, workspaceDirectory);
+			evaluateManifestFacts(facts, workspacePackageJson, workspaceDirectory, rootDirectory, rootPackageJson);
 			const info = extractDependencyInfo(workspacePackageJson);
 			if (info.framework !== "unknown" && frameworkMergeRank(info.framework) < frameworkMergeRank(facts.framework)) facts.framework = info.framework;
 			if (isReactGroupSettled) continue;
@@ -37618,11 +37701,24 @@ const discoverProjectWithoutPackageJson = (directory) => {
 		tailwindVersion: null,
 		zodVersion: null,
 		zodMajorVersion: null,
+		mobxVersion: null,
+		mobxMajorVersion: null,
+		hasMobxReact: false,
+		hasMobxReactLite: false,
+		hasMobxStateTree: false,
+		hasMobxReactObserver: false,
+		zustandVersion: null,
+		zustandMajorVersion: null,
 		framework: "unknown",
 		hasTypeScript: hasOwnTsConfig,
 		hasReactCompiler: false,
 		hasReactCompilerLintPlugin: false,
 		hasTanStackQuery: false,
+		valtioVersion: null,
+		valtioMajorVersion: null,
+		hasRemotion: false,
+		remotionVersion: null,
+		remotionMajorVersion: null,
 		hasSsrDependency: false,
 		preactVersion: null,
 		preactMajorVersion: null,
@@ -37721,6 +37817,12 @@ const discoverProject = (directory) => {
 		packageName: SHOPIFY_FLASH_LIST_PACKAGE_NAME,
 		version: workspaceFacts.shopifyFlashList.version
 	}) : null;
+	const zustandVersion = resolveCatalogBackedDependencyVersion({
+		rootDirectory: directory,
+		rootPackageJson: packageJson,
+		packageName: "zustand",
+		version: workspaceFacts.zustand.version
+	});
 	const hasReanimated = hasReactNativeWorkspace && workspaceFacts.hasReanimatedAwarePackage;
 	const reanimatedVersion = hasReanimated ? workspaceFacts.reanimatedVersion : null;
 	const nextjsVersion = framework === "nextjs" ? resolveCatalogBackedDependencyVersion({
@@ -37729,7 +37831,20 @@ const discoverProject = (directory) => {
 		packageName: "next",
 		version: workspaceFacts.next.version
 	}) : null;
+	const valtioVersion = resolveCatalogBackedDependencyVersion({
+		rootDirectory: directory,
+		rootPackageJson: packageJson,
+		packageName: "valtio",
+		version: workspaceFacts.valtioVersion
+	});
+	const mobxVersion = resolveCatalogBackedDependencyVersion({
+		rootDirectory: directory,
+		rootPackageJson: packageJson,
+		packageName: "mobx",
+		version: workspaceFacts.mobx.version
+	});
 	const preactVersion = getPreactVersion(packageJson);
+	const remotionVersion = workspaceFacts.remotionVersion;
 	const isPreES2023Target = hasTypeScript && detectPreES2023Target(directory);
 	const projectInfo = {
 		rootDirectory: directory,
@@ -37739,11 +37854,24 @@ const discoverProject = (directory) => {
 		tailwindVersion,
 		zodVersion,
 		zodMajorVersion: zodVersion === null ? null : getLowestDependencyMajor(zodVersion),
+		mobxVersion,
+		mobxMajorVersion: mobxVersion === null ? null : getLowestDependencyMajor(mobxVersion),
+		hasMobxReact: workspaceFacts.hasMobxReact,
+		hasMobxReactLite: workspaceFacts.hasMobxReactLite,
+		hasMobxStateTree: workspaceFacts.hasMobxStateTree,
+		hasMobxReactObserver: workspaceFacts.hasMobxReactObserver,
+		zustandVersion,
+		zustandMajorVersion: zustandVersion === null ? null : getLowestDependencyMajor(zustandVersion),
 		framework,
 		hasTypeScript,
 		hasReactCompiler: detectReactCompiler(directory, packageJson),
 		hasReactCompilerLintPlugin: detectReactCompilerLintPlugin(directory, packageJson),
 		hasTanStackQuery: hasTanStackQuery(packageJson),
+		valtioVersion,
+		valtioMajorVersion: valtioVersion === null ? null : getLowestDependencyMajor(valtioVersion),
+		hasRemotion: workspaceFacts.hasRemotionDependency,
+		remotionVersion,
+		remotionMajorVersion: remotionVersion === null ? null : getLowestDependencyMajor(remotionVersion),
 		hasSsrDependency: workspaceFacts.hasSsrDependency,
 		preactVersion,
 		preactMajorVersion: parseReactMajor(preactVersion),
@@ -37977,7 +38105,6 @@ const LEGACY_RULE_KEY_TO_NATIVE_RULE_KEY = {
 	"react/jsx-no-new-function-as-prop": "react-doctor/jsx-no-new-function-as-prop",
 	"react/jsx-no-new-object-as-prop": "react-doctor/jsx-no-new-object-as-prop",
 	"react/jsx-no-script-url": "react-doctor/jsx-no-script-url",
-	"react/jsx-no-target-blank": "react-doctor/jsx-no-target-blank",
 	"react/jsx-no-undef": "react-doctor/jsx-no-undef",
 	"react/jsx-no-useless-fragment": "react-doctor/jsx-no-useless-fragment",
 	"react/jsx-pascal-case": "react-doctor/jsx-pascal-case",
@@ -40299,9 +40426,25 @@ const BABEL_CONFIG_FILE_NAMES = [
 	".babelrc.json"
 ];
 const LEGACY_PRESET_SPEC = "module:metro-react-native-babel-preset";
+const LEGACY_PRESET_PACKAGE = "metro-react-native-babel-preset";
+const REACT_NATIVE_PACKAGE = "react-native";
+const PRESET_RENAME_MINIMUM_REACT_NATIVE_VERSION = "0.73.0";
+const LEGACY_PRESET_REFERENCE = new RegExp(`['"]${LEGACY_PRESET_SPEC}['"]`);
 const MODERN_PRESET_REFERENCE = new RegExp(`['"]module:@react-native/babel-preset['"]`);
 const ENABLE_BABEL_RUNTIME_VERSION = /enableBabelRuntime["']?\s*:\s*['"]/;
+const isReactNativeVersionAtLeastPresetRename = (rootDirectory, packageJson) => {
+	const installedReactNativeManifestPath = Path.join(rootDirectory, "node_modules", REACT_NATIVE_PACKAGE, "package.json");
+	const reactNativeVersionSpec = (isFile(installedReactNativeManifestPath) ? readPackageJson$1(installedReactNativeManifestPath).version : void 0) ?? getDependencySpec(packageJson, REACT_NATIVE_PACKAGE);
+	if (reactNativeVersionSpec === null || reactNativeVersionSpec === void 0) return false;
+	const normalizedVersionRange = import_semver.validRange(reactNativeVersionSpec);
+	if (normalizedVersionRange === null) return false;
+	const minimumVersion = import_semver.minVersion(normalizedVersionRange);
+	return minimumVersion !== null && import_semver.gte(minimumVersion, PRESET_RENAME_MINIMUM_REACT_NATIVE_VERSION);
+};
+const canResolveLegacyPreset = (rootDirectory, packageJson) => getDependencySpec(packageJson, LEGACY_PRESET_PACKAGE) !== null || isFile(Path.join(rootDirectory, "node_modules", LEGACY_PRESET_PACKAGE, "package.json"));
 const checkReactNativeMetroBabelPreset = (rootDirectory) => {
+	const packageJson = readPackageJson$1(Path.join(rootDirectory, "package.json"));
+	const shouldReportLegacyPreset = isReactNativeVersionAtLeastPresetRename(rootDirectory, packageJson) && !canResolveLegacyPreset(rootDirectory, packageJson);
 	for (const fileName of BABEL_CONFIG_FILE_NAMES) {
 		const filePath = Path.join(rootDirectory, fileName);
 		if (!isFile(filePath)) continue;
@@ -40311,7 +40454,7 @@ const checkReactNativeMetroBabelPreset = (rootDirectory) => {
 		} catch {
 			continue;
 		}
-		if (contents.includes(LEGACY_PRESET_SPEC)) return [buildReactNativeDiagnostic({
+		if (shouldReportLegacyPreset && LEGACY_PRESET_REFERENCE.test(contents)) return [buildReactNativeDiagnostic({
 			filePath: fileName,
 			rule: "rn-no-metro-babel-preset",
 			severity: "error",
@@ -40334,12 +40477,6 @@ const checkReactNativeProject = (rootDirectory, project) => {
 	return [...checkReactNativeMetroBabelPreset(rootDirectory), ...checkReactNativeLibraryDependencies(rootDirectory)];
 };
 const RULE_KEY = "no-vulnerable-react-server-components";
-const DEPENDENCY_SECTIONS = [
-	"dependencies",
-	"devDependencies",
-	"peerDependencies",
-	"optionalDependencies"
-];
 const REACT_RSC_ADVISORIES_BY_MINOR = {
 	"19.0": {
 		rceFixedVersion: "19.0.1",
@@ -40386,20 +40523,13 @@ const enumerateWorkspaceDirectories = (workspaceRoot) => {
 	for (const pattern of patterns) for (const directory of resolveWorkspaceDirectories(workspaceRoot, pattern)) directories.add(directory);
 	return [...directories];
 };
-const readDeclaredSpec = (packageJson, packageName) => {
-	for (const section of DEPENDENCY_SECTIONS) {
-		const spec = packageJson[section]?.[packageName];
-		if (typeof spec === "string") return spec;
-	}
-	return null;
-};
 const resolveVersionInDirectory = (directory, packageName, declaredSpecOverride) => {
 	const manifestPath = Path.join(directory, "node_modules", packageName, "package.json");
 	if (isFile(manifestPath)) {
 		const installedVersion = import_semver.valid(readPackageJson$1(manifestPath).version ?? null);
 		if (installedVersion !== null) return installedVersion;
 	}
-	const candidateSpecs = [readDeclaredSpec(readPackageJson$1(Path.join(directory, "package.json")), packageName), declaredSpecOverride];
+	const candidateSpecs = [getDependencySpec(readPackageJson$1(Path.join(directory, "package.json")), packageName), declaredSpecOverride];
 	for (const spec of candidateSpecs) {
 		const pinnedVersion = spec === null ? null : import_semver.valid(spec);
 		if (pinnedVersion !== null) return pinnedVersion;
@@ -41079,9 +41209,24 @@ const buildCapabilities = (project) => {
 	})) capabilities.add("tailwind:3.4");
 	if (project.zodVersion !== null) capabilities.add("zod");
 	if (project.zodMajorVersion !== null && project.zodMajorVersion >= 4) capabilities.add("zod:4");
+	if (project.mobxVersion !== void 0 && project.mobxVersion !== null || project.hasMobxReact === true || project.hasMobxReactLite === true || project.hasMobxStateTree === true || project.hasMobxReactObserver === true) capabilities.add("mobx");
+	if (project.hasMobxReact === true) capabilities.add("mobx-react");
+	if (project.hasMobxReactLite === true) capabilities.add("mobx-react-lite");
+	if (project.hasMobxReact === true || project.hasMobxReactLite === true) capabilities.add("mobx-react-binding");
+	if (project.hasMobxStateTree === true) capabilities.add("mobx-state-tree");
+	if (project.hasMobxReactObserver === true) capabilities.add("mobx-react-observer");
+	if (project.mobxMajorVersion !== void 0 && project.mobxMajorVersion !== null && project.mobxMajorVersion >= 4 && project.mobxMajorVersion <= 6) addMajorLadder(capabilities, "mobx", project.mobxMajorVersion, 4, 6);
+	if (project.zustandVersion !== void 0 && project.zustandVersion !== null) capabilities.add("zustand");
+	if (project.zustandMajorVersion !== void 0 && project.zustandMajorVersion !== null && project.zustandMajorVersion >= 1 && project.zustandMajorVersion <= 5) addMajorLadder(capabilities, "zustand", project.zustandMajorVersion, 1, 5);
 	if (project.isPreES2023Target) capabilities.add("pre-es2023");
 	if (project.hasReactCompiler) capabilities.add("react-compiler");
 	if (project.hasTanStackQuery) capabilities.add("tanstack-query");
+	if (project.valtioVersion !== null) capabilities.add("valtio");
+	addMajorLadder(capabilities, "valtio", project.valtioMajorVersion, 1, 10);
+	if (project.hasRemotion) {
+		capabilities.add("remotion");
+		addMajorLadder(capabilities, "remotion", project.remotionMajorVersion ?? null, 4, 30);
+	}
 	if (project.hasTypeScript) capabilities.add("typescript");
 	if (project.preactVersion !== null) capabilities.add("preact");
 	addMajorLadder(capabilities, "preact", project.preactMajorVersion, 10, 20);
@@ -42334,6 +42479,35 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
+const parseBaselineDiffPlan = (value) => {
+	const entries = splitNullSeparated(value);
+	const baseFiles = /* @__PURE__ */ new Set();
+	const headFiles = /* @__PURE__ */ new Set();
+	for (let entryIndex = 0; entryIndex < entries.length; entryIndex += 2) {
+		const status = entries[entryIndex];
+		const filePath = entries[entryIndex + 1];
+		if (status === void 0 || filePath === void 0 || status.length !== 1) return null;
+		if (status === "A") {
+			headFiles.add(filePath);
+			continue;
+		}
+		if (status === "D") {
+			baseFiles.add(filePath);
+			continue;
+		}
+		if (status === "M" || status === "T") {
+			baseFiles.add(filePath);
+			headFiles.add(filePath);
+			continue;
+		}
+		return null;
+	}
+	return {
+		baseFiles: [...baseFiles],
+		headFiles: [...headFiles],
+		untrackedFiles: []
+	};
+};
 const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
@@ -42536,6 +42710,45 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
+			baselineDiffPlan: (input) => {
+				if (!isSafeGitRevision(input.ref)) return succeed$2(null);
+				return gen(function* () {
+					const unmerged = yield* runGit(input.directory, [
+						"diff",
+						"--no-ext-diff",
+						"-z",
+						"--name-only",
+						"--diff-filter=U",
+						"--relative"
+					]);
+					if (unmerged.status !== 0 || unmerged.stdout.length > 0) return null;
+					const result = yield* runGit(input.directory, [
+						"diff",
+						"--no-ext-diff",
+						"--no-textconv",
+						"--no-renames",
+						"-z",
+						"--name-status",
+						"--relative",
+						input.ref
+					]);
+					if (result.status !== 0) return null;
+					const plan = parseBaselineDiffPlan(result.stdout);
+					if (plan === null) return null;
+					const untracked = yield* runGit(input.directory, [
+						"ls-files",
+						"--others",
+						"--exclude-standard",
+						"-z"
+					]);
+					if (untracked.status !== 0) return null;
+					return {
+						baseFiles: plan.baseFiles,
+						headFiles: plan.headFiles,
+						untrackedFiles: splitNullSeparated(untracked.stdout)
+					};
+				}).pipe(catch_$1(() => succeed$2(null)), withSpan("Git.baselineDiffPlan"));
+			},
 			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) {
@@ -42685,6 +42898,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 		githubViewerPermission: () => succeed$2(snapshot.githubViewerPermission ?? null),
 		branchExists: (_directory, branch) => succeed$2(snapshot.branchExists?.get(branch) ?? false),
 		mergeBase: ({ ref }) => succeed$2(snapshot.mergeBase?.get(ref) ?? null),
+		baselineDiffPlan: () => succeed$2(snapshot.baselineDiffPlan ?? null),
 		diffSelection: () => succeed$2(snapshot.diffSelection ?? null),
 		stagedFilePaths: () => succeed$2(snapshot.stagedFiles ?? []),
 		showStagedContent: (_directory, relativePath) => succeed$2(snapshot.stagedContent?.get(relativePath) ?? null),
@@ -44022,12 +44236,17 @@ const REACT_ERROR_BOUNDARY_MESSAGE = "This try/catch cannot catch errors thrown
 const REACT_COMPILER_IMPACT = "This component misses React Compiler's automatic memoization & re-renders more than it should";
 const REACT_COMPILER_ACTION = "Rewrite the flagged code so the compiler can optimize it.";
 const REACT_COMPILER_INCOMPATIBLE_LIBRARY_ACTION = "It's how the library works, not a bug in your code. Memoize values you pass from it into other memoized components, or suppress it with `// react-doctor-disable-next-line react-hooks-js/incompatible-library`.";
+const SET_STATE_IN_EFFECT_ACTION = "Prefer deriving or initializing the value before render. If the effect must read a browser API after mount, treat this as advisory or suppress it with `// react-doctor-disable-next-line react-hooks-js/set-state-in-effect`.";
 const REACT_COMPILER_GENERIC_MESSAGE = `${REACT_COMPILER_IMPACT}. ${REACT_COMPILER_ACTION}`;
 const buildReactCompilerMessage = (reasonSummary, action = REACT_COMPILER_ACTION) => {
 	const normalizedSummary = reasonSummary.replace(TRAILING_PERIOD_PATTERN, "");
 	if (!normalizedSummary) return `${REACT_COMPILER_IMPACT}. ${action}`;
 	return `${REACT_COMPILER_IMPACT}: ${normalizedSummary}. ${action}`;
 };
+const buildSetStateInEffectMessage = (reasonSummary) => {
+	const normalizedSummary = reasonSummary.replace(TRAILING_PERIOD_PATTERN, "");
+	return `This synchronous effect update causes an extra render${normalizedSummary ? `: ${normalizedSummary}` : ""}. ${SET_STATE_IN_EFFECT_ACTION}`;
+};
 const PLUGIN_CATEGORY_MAP = {
 	react: "Bugs",
 	"react-hooks": "Bugs",
@@ -44085,6 +44304,10 @@ const resolveCleanedDiagnostic = (message, help, plugin, rule, project) => {
 			message: REACT_ERROR_BOUNDARY_MESSAGE,
 			help: reasonDetail || help
 		};
+		if (rule === "set-state-in-effect") return {
+			message: buildSetStateInEffectMessage(reasonSummary.trim()),
+			help: reasonDetail || help
+		};
 		return {
 			message: buildReactCompilerMessage(reasonSummary.trim(), rule === "incompatible-library" ? REACT_COMPILER_INCOMPATIBLE_LIBRARY_ACTION : REACT_COMPILER_ACTION),
 			help: appendReanimatedSharedValueHint(reasonDetail || help, rule, project)
@@ -46421,12 +46644,19 @@ const isPathInsideDirectory = (childAbsolutePath, parentAbsolutePath) => {
 */
 const materializeSourceTree = (input) => gen(function* () {
 	const materializedFiles = [];
+	const unmaterializedFiles = [];
 	const resolvedTempDirectory = path.resolve(input.tempDirectory);
 	for (const relativePath of input.files) {
 		const content = yield* input.readContent(relativePath).pipe(orElseSucceed(() => null));
-		if (content === null) continue;
+		if (content === null) {
+			unmaterializedFiles.push(relativePath);
+			continue;
+		}
 		const candidateTargetPath = path.resolve(resolvedTempDirectory, relativePath);
-		if (!isPathInsideDirectory(candidateTargetPath, resolvedTempDirectory)) continue;
+		if (!isPathInsideDirectory(candidateTargetPath, resolvedTempDirectory)) {
+			unmaterializedFiles.push(relativePath);
+			continue;
+		}
 		yield* sync(() => {
 			fs.mkdirSync(path.dirname(candidateTargetPath), { recursive: true });
 			fs.writeFileSync(candidateTargetPath, content);
@@ -46443,6 +46673,7 @@ const materializeSourceTree = (input) => gen(function* () {
 	return {
 		tempDirectory: input.tempDirectory,
 		materializedFiles,
+		unmaterializedFiles,
 		cleanup: () => {
 			try {
 				fs.rmSync(input.tempDirectory, {
@@ -46712,54 +46943,80 @@ const buildSkippedChecks = (input) => {
 		skippedCheckReasons
 	};
 };
-const fingerprintDiagnostic = (diagnostic, lineText) => {
+const fingerprintText = (text) => createHash("sha256").update(text).digest("hex");
+const normalizeEvidence = (evidence) => evidence.replace(/\s+/g, " ").trim();
+const getDiagnosticMatchKeys = (diagnostic, evidence) => {
 	const ruleKey = `${diagnostic.plugin}/${diagnostic.rule}`;
-	const snippet = lineText === null || diagnostic.matchByOccurrence ? "" : createHash("sha1").update(lineText.trim()).digest("hex");
-	return `${diagnostic.filePath}\u0000${ruleKey}\u0000${snippet}`;
-};
-/**
-* Diffs a head scan against a base scan to isolate the diagnostics a change
-* introduced (and count the ones it resolved). Matching is a multiset over a
-* position-independent fingerprint — `(filePath, plugin/rule, hash(flagged
-* line text))` — so inserting lines above an existing issue doesn't make it
-* look new, while a genuinely new occurrence (new line text, or one more of
-* the same) surfaces. Identical repeated findings are matched by count.
-*
-* Diagnostics carrying `matchByOccurrence` (resolved at diagnostic creation:
-* every Accessibility-category finding, plus rules opting in via their
-* `matchByOccurrence` metadata flag) drop the line-text snippet and match by
-* `(filePath, plugin/rule)` occurrence count alone. Their identity is the
-* flagged element, not the line's text, so editing the line (reindentation,
-* prettier reflow, collapsing a multi-line JSX element) doesn't reclassify a
-* pre-existing finding as new — while one MORE occurrence of the same rule in
-* the file still surfaces. Expression-level rules keep the line-text snippet:
-* there the flagged expression IS the finding, so changed text means new +
-* fixed.
-*
-* v1 limitation: the fingerprint keys on the head-relative `filePath`, and base
-* content is read at that same path. A file renamed by the change therefore has
-* no base match, so its pre-existing findings are reported as new. This
-* over-reports (never hides a real issue) and is rare; rename-aware base
-* resolution is a follow-up.
+	const messageFingerprint = fingerprintText(`${diagnostic.title ?? ""}\0${diagnostic.message}`);
+	const normalizedEvidence = evidence === null ? "" : normalizeEvidence(evidence);
+	const stableEvidenceKey = normalizedEvidence.length > 0 ? `evidence\0${ruleKey}\0${messageFingerprint}\0${fingerprintText(normalizedEvidence)}` : null;
+	return {
+		stableEvidenceKey,
+		sameFileStableEvidenceKey: stableEvidenceKey === null ? null : `${diagnostic.filePath}\0${stableEvidenceKey}`,
+		sameFileFallbackKey: diagnostic.matchByOccurrence || normalizedEvidence.length === 0 ? `fallback\0${diagnostic.filePath}\0${ruleKey}\0${messageFingerprint}` : null
+	};
+};
+const addDiagnosticIndex = (buckets, key, diagnosticIndex) => {
+	if (key === null) return;
+	const diagnosticIndexes = buckets.get(key) ?? [];
+	diagnosticIndexes.push(diagnosticIndex);
+	buckets.set(key, diagnosticIndexes);
+};
+const takeMatchingDiagnosticIndex = (buckets, key, matchedDiagnosticIndexes) => {
+	if (key === null) return null;
+	for (const diagnosticIndex of buckets.get(key) ?? []) if (!matchedDiagnosticIndexes.has(diagnosticIndex)) return diagnosticIndex;
+	return null;
+};
+const readDiagnosticEvidence = (diagnostic, readEvidence, readLine) => readEvidence?.(diagnostic) ?? readLine(diagnostic.filePath, diagnostic.line);
+const buildMatchCandidates = (diagnostics, readEvidence, readLine) => diagnostics.map((diagnostic, diagnosticIndex) => ({
+	diagnosticIndex,
+	...getDiagnosticMatchKeys(diagnostic, readDiagnosticEvidence(diagnostic, readEvidence, readLine))
+}));
+/**
+* Diffs a head scan against a base scan using a multiset of construct-level
+* evidence. Stable identities combine plugin/rule, the diagnostic message,
+* and normalized diagnosed source, so unchanged findings can move across
+* files while changed constructs or messages remain new. Cardinality is
+* retained for identical findings. Diagnostics explicitly marked
+* `matchByOccurrence` may fall back to same-file plugin/rule/message matching
+* after same-file strict evidence matching. Cross-file evidence matching runs
+* last so a copy cannot consume a reformatted local occurrence. Unreadable
+* evidence uses the same conservative fallback rather than matching across
+* files without proof.
 */
 const computeDiagnosticDelta = (input) => {
-	const unmatchedBaseByFingerprint = /* @__PURE__ */ new Map();
-	for (const diagnostic of input.baseDiagnostics) {
-		const key = fingerprintDiagnostic(diagnostic, input.readBaseLine(diagnostic.filePath, diagnostic.line));
-		unmatchedBaseByFingerprint.set(key, (unmatchedBaseByFingerprint.get(key) ?? 0) + 1);
-	}
-	const newDiagnostics = [];
-	for (const diagnostic of input.headDiagnostics) {
-		const key = fingerprintDiagnostic(diagnostic, input.readHeadLine(diagnostic.filePath, diagnostic.line));
-		const availableMatches = unmatchedBaseByFingerprint.get(key) ?? 0;
-		if (availableMatches > 0) unmatchedBaseByFingerprint.set(key, availableMatches - 1);
-		else newDiagnostics.push(diagnostic);
-	}
-	let fixedCount = 0;
-	for (const remaining of unmatchedBaseByFingerprint.values()) fixedCount += remaining;
+	const baseCandidates = buildMatchCandidates(input.baseDiagnostics, input.readBaseEvidence, input.readBaseLine);
+	const headCandidates = buildMatchCandidates(input.headDiagnostics, input.readHeadEvidence, input.readHeadLine);
+	const baseByStableEvidence = /* @__PURE__ */ new Map();
+	const baseBySameFileStableEvidence = /* @__PURE__ */ new Map();
+	const baseBySameFileFallback = /* @__PURE__ */ new Map();
+	for (const candidate of baseCandidates) {
+		addDiagnosticIndex(baseByStableEvidence, candidate.stableEvidenceKey, candidate.diagnosticIndex);
+		addDiagnosticIndex(baseBySameFileStableEvidence, candidate.sameFileStableEvidenceKey, candidate.diagnosticIndex);
+		addDiagnosticIndex(baseBySameFileFallback, candidate.sameFileFallbackKey, candidate.diagnosticIndex);
+	}
+	const matchedHeadDiagnosticIndexes = /* @__PURE__ */ new Set();
+	const matchedBaseDiagnosticIndexes = /* @__PURE__ */ new Set();
+	const matchCandidates = (baseBuckets, getKey, onMatch) => {
+		for (const candidate of headCandidates) {
+			if (matchedHeadDiagnosticIndexes.has(candidate.diagnosticIndex)) continue;
+			const baseDiagnosticIndex = takeMatchingDiagnosticIndex(baseBuckets, getKey(candidate), matchedBaseDiagnosticIndexes);
+			if (baseDiagnosticIndex === null) continue;
+			matchedHeadDiagnosticIndexes.add(candidate.diagnosticIndex);
+			matchedBaseDiagnosticIndexes.add(baseDiagnosticIndex);
+			onMatch?.(candidate.diagnosticIndex, baseDiagnosticIndex);
+		}
+	};
+	matchCandidates(baseBySameFileStableEvidence, (candidate) => candidate.sameFileStableEvidenceKey);
+	matchCandidates(baseBySameFileFallback, (candidate) => candidate.sameFileFallbackKey);
+	let crossFileMatchCount = 0;
+	matchCandidates(baseByStableEvidence, (candidate) => candidate.stableEvidenceKey, (head, base) => {
+		if (input.headDiagnostics[head]?.filePath !== input.baseDiagnostics[base]?.filePath) crossFileMatchCount += 1;
+	});
 	return {
-		newDiagnostics,
-		fixedCount
+		newDiagnostics: input.headDiagnostics.filter((_diagnostic, diagnosticIndex) => !matchedHeadDiagnosticIndexes.has(diagnosticIndex)),
+		fixedCount: input.baseDiagnostics.length - matchedBaseDiagnosticIndexes.size,
+		crossFileMatchCount
 	};
 };
 /**
@@ -46791,6 +47048,12 @@ const getDiffInfo = (directory, explicitBaseBranch, includeUntracked) => runProm
 	};
 }).pipe(provide(Git.layerNode)));
 const filterSourceFiles = (filePaths) => filePaths.filter(isLintableSourceFile);
+const getBaselineDiffPlan = (directory, ref) => runPromise(gen(function* () {
+	return yield* (yield* Git).baselineDiffPlan({
+		directory,
+		ref
+	});
+}).pipe(provide(Git.layerNode)));
 /**
 * Programmatic façade over `Git.changedLineRanges` (the `lines` scope). Diffs
 * `files` with `--unified=0` against `baseRef` (or the index when `cached`),
@@ -47247,7 +47510,7 @@ const makeNoopConsole = () => ({
 });
 //#endregion
 //#region src/cli/utils/version.ts
-const VERSION = "0.8.1-dev.7818922";
+const VERSION = "0.8.1-dev.7eca0ee";
 //#endregion
 //#region src/cli/utils/json-mode.ts
 let context = null;
@@ -47599,13 +47862,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.8.1-dev.7818922`;
+const resolveSentryRelease = () => process.env.SENTRY_RELEASE || `react-doctor@0.8.1-dev.7eca0ee`;
 /**
 * 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.8.1-dev.7818922") ? "development" : "production");
+const resolveSentryEnvironment = () => process.env.SENTRY_ENVIRONMENT || (isDevVersion("0.8.1-dev.7eca0ee") ? "development" : "production");
 /**
 * Performance-tracing sample rate in `[0, 1]`. Reads `SENTRY_TRACES_SAMPLE_RATE`
 * (set to `0` to disable tracing) and falls back to
@@ -60228,6 +60491,7 @@ const buildOutcomeAttributes = (input) => {
 		new: summary.totalDiagnosticCount,
 		fixed: result.baselineDelta.fixedCount,
 		baseTotal: result.baselineDelta.baseTotalCount,
+		crossFileMatches: result.baselineDelta.crossFileMatchCount ?? null,
 		degraded: false
 	}));
 	else if (input.gateExempt) attributes["baseline.degraded"] = true;
@@ -60341,28 +60605,49 @@ const diagnosticIntersectsLineRanges = (diagnostic, lineRanges) => {
 	return lineRanges.some(([rangeStartLine, rangeEndLine]) => diagnostic.line <= rangeEndLine && diagnosticEndLine >= rangeStartLine);
 };
 //#endregion
+//#region src/cli/utils/is-materializable-git-source.ts
+const GIT_LFS_POINTER_HEADER = "version https://git-lfs.github.com/spec/v1";
+const isMaterializableGitSource = (content) => !content.includes("\0") && !content.startsWith(GIT_LFS_POINTER_HEADER);
+//#endregion
 //#region src/cli/utils/materialize-baseline-files.ts
 /**
-* Materializes the `ref` version of `files` into `tempDirectory` (via
-* `git show <ref>:<path>`), mirroring the project layout + head's config files
-* so the base lints under the same rules as head. Reuses the shared,
-* zip-slip-guarded `materializeSourceTree`. Per-file read misses (e.g. a file
-* the PR added, absent at base) are skipped, which is exactly what we want:
-* a brand-new file has no base counterpart, so all its findings are "new".
+* Materializes the base side of the `ref` → worktree diff into
+* `tempDirectory`, mirroring the project layout plus head's config files so
+* both sides lint under the same rules. Git rename heuristics are disabled by
+* the diff planner, so an old path is retained as a base deletion while its
+* new path is a head addition. Missing head-only additions are expected;
+* missing paths that the plan says must exist at base make `isComplete` false.
 */
 const materializeBaselineFiles = (input) => runPromise(gen(function* () {
 	const git = yield* Git;
-	return yield* materializeSourceTree({
+	const diffPlan = yield* git.baselineDiffPlan({
+		directory: input.directory,
+		ref: input.ref
+	});
+	const baseFiles = input.baseFiles ?? diffPlan?.baseFiles;
+	const headFiles = input.headFiles ?? diffPlan?.headFiles;
+	const untrackedFiles = diffPlan?.untrackedFiles ?? [];
+	if (baseFiles === void 0 || headFiles === void 0) return null;
+	const files = [...new Set([...input.files, ...baseFiles])];
+	const tree = yield* materializeSourceTree({
 		directory: input.directory,
-		files: input.files,
+		files,
 		tempDirectory: input.tempDirectory,
 		readContent: (relativePath) => git.showRefContent({
 			directory: input.directory,
 			ref: input.ref,
 			relativePath,
 			options: { maxBufferBytes: GIT_SHOW_MAX_BUFFER_BYTES }
-		})
+		}).pipe(map$3((content) => content !== null && isMaterializableGitSource(content) ? content : null))
 	});
+	const materializedFiles = new Set(tree.materializedFiles);
+	return {
+		...tree,
+		baseFiles,
+		headFiles,
+		isComplete: baseFiles.every((filePath) => materializedFiles.has(filePath)),
+		untrackedFiles
+	};
 }).pipe(provide(Git.layerNode)));
 /**
 * Resolves the commit a baseline scan should read base content from — the
@@ -60385,8 +60670,8 @@ const resolveMergeBaseRef = async (directory, ref) => {
 //#region src/cli/utils/read-source-line.ts
 /**
 * Builds a cached `(filePath, line) -> source text` reader rooted at
-* `rootDirectory`, used to fingerprint a diagnostic by the content of its
-* flagged line (see `computeDiagnosticDelta`). Wraps core's
+* `rootDirectory`, used as the fallback when construct-level diagnostic
+* evidence cannot be read. Wraps core's
 * `createNodeReadFileLinesSync` with per-file memoization + 1-indexed line
 * lookup; unreadable files / out-of-range lines return `null`.
 */
@@ -60401,6 +60686,338 @@ const createSourceLineReader = (rootDirectory) => {
 	};
 };
 //#endregion
+//#region src/cli/utils/read-diagnostic-evidence.ts
+const SOURCE_EXTENSIONS = [
+	".ts",
+	".tsx",
+	".js",
+	".jsx",
+	".mts",
+	".cts",
+	".mjs",
+	".cjs"
+];
+const COMPONENT_WRAPPER_NAMES = new Set(["memo", "forwardRef"]);
+const getScriptKind = (filePath) => {
+	const extension = path.extname(filePath).toLowerCase();
+	if (extension === ".tsx") return ts.ScriptKind.TSX;
+	if (extension === ".jsx") return ts.ScriptKind.JSX;
+	if (extension === ".js" || extension === ".mjs" || extension === ".cjs") return ts.ScriptKind.JS;
+	return ts.ScriptKind.TS;
+};
+const resolveSafeSourcePath = (rootDirectory, filePath) => {
+	try {
+		const resolvedRootDirectory = fs.realpathSync(rootDirectory);
+		const absolutePath = path.resolve(resolvedRootDirectory, filePath);
+		const relativePath = path.relative(resolvedRootDirectory, absolutePath);
+		if (relativePath.length === 0 || relativePath === ".." || relativePath.startsWith(`..${path.sep}`) || path.isAbsolute(relativePath)) return null;
+		const stats = fs.lstatSync(absolutePath);
+		if (!stats.isFile() || stats.isSymbolicLink()) return null;
+		const realPath = fs.realpathSync(absolutePath);
+		const realRelativePath = path.relative(resolvedRootDirectory, realPath);
+		return realRelativePath !== ".." && !realRelativePath.startsWith(`..${path.sep}`) && !path.isAbsolute(realRelativePath) ? realPath : null;
+	} catch {
+		return null;
+	}
+};
+const readSourceRecord = (rootDirectory, filePath, state) => {
+	const normalizedFilePath = filePath.replace(/\\/g, "/");
+	if (state.recordByFilePath.has(normalizedFilePath)) return state.recordByFilePath.get(normalizedFilePath) ?? null;
+	const absolutePath = resolveSafeSourcePath(rootDirectory, normalizedFilePath);
+	if (absolutePath === null) {
+		state.recordByFilePath.set(normalizedFilePath, null);
+		return null;
+	}
+	try {
+		const sourceText = fs.readFileSync(absolutePath, "utf-8");
+		const record = {
+			absolutePath,
+			filePath: normalizedFilePath,
+			sourceFile: ts.createSourceFile(absolutePath, sourceText, ts.ScriptTarget.Latest, true, getScriptKind(absolutePath)),
+			sourceText
+		};
+		state.recordByFilePath.set(normalizedFilePath, record);
+		return record;
+	} catch {
+		state.recordByFilePath.set(normalizedFilePath, null);
+		return null;
+	}
+};
+const listSourceRecords = (rootDirectory, state) => {
+	if (state.sourceRecords !== null) return state.sourceRecords;
+	state.sourceRecords = listSourceFiles(rootDirectory).flatMap((filePath) => {
+		const record = readSourceRecord(rootDirectory, filePath, state);
+		return record === null ? [] : [record];
+	});
+	return state.sourceRecords;
+};
+const unwrapExpression = (expression) => {
+	let currentExpression = expression;
+	while (ts.isParenthesizedExpression(currentExpression) || ts.isAsExpression(currentExpression) || ts.isTypeAssertionExpression(currentExpression) || ts.isNonNullExpression(currentExpression) || ts.isSatisfiesExpression(currentExpression)) currentExpression = currentExpression.expression;
+	return currentExpression;
+};
+const getCalleeName = (expression) => {
+	const unwrappedExpression = unwrapExpression(expression);
+	if (ts.isIdentifier(unwrappedExpression)) return unwrappedExpression.text;
+	if (ts.isPropertyAccessExpression(unwrappedExpression)) return unwrappedExpression.name.text;
+	return null;
+};
+const isComponentWrapperCall = (node) => {
+	const wrapperName = getCalleeName(node.expression);
+	return wrapperName !== null && COMPONENT_WRAPPER_NAMES.has(wrapperName);
+};
+const getFunctionName = (node) => {
+	if (ts.isFunctionDeclaration(node) && node.name !== void 0) return node.name.text;
+	if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
+		let componentExpression = node;
+		while (true) {
+			const parent = componentExpression.parent;
+			if (ts.isParenthesizedExpression(parent) || ts.isAsExpression(parent) || ts.isTypeAssertionExpression(parent) || ts.isNonNullExpression(parent) || ts.isSatisfiesExpression(parent)) {
+				componentExpression = parent;
+				continue;
+			}
+			if (ts.isCallExpression(parent) && parent.arguments[0] === componentExpression && isComponentWrapperCall(parent)) {
+				componentExpression = parent;
+				continue;
+			}
+			if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) return parent.name.text;
+			return node.name?.text ?? null;
+		}
+	}
+	return null;
+};
+const isComponentFunction = (node) => ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) || ts.isArrowFunction(node);
+const isDefaultExportedComponent = (record, node, componentName) => {
+	if (ts.canHaveModifiers(node) && ts.getModifiers(node)?.some((modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword)) return true;
+	return record.sourceFile.statements.some((statement) => ts.isExportAssignment(statement) && ts.isIdentifier(statement.expression) && statement.expression.text === componentName);
+};
+const findEnclosingComponent = (record, diagnostic) => {
+	if (!Number.isInteger(diagnostic.line) || diagnostic.line < 1) return null;
+	const lineIndex = diagnostic.line - 1;
+	const lineStarts = record.sourceFile.getLineStarts();
+	const lineStart = lineStarts[lineIndex];
+	if (lineStart === void 0) return null;
+	const nextLineStart = lineStarts[lineIndex + 1] ?? record.sourceFile.end;
+	const lineEnd = Math.max(lineStart, nextLineStart - 1);
+	const columnIndex = Number.isInteger(diagnostic.column) ? Math.max(0, diagnostic.column - 1) : 0;
+	const diagnosticPosition = Math.min(lineStart + columnIndex, lineEnd);
+	let component = null;
+	let componentWidth = Number.POSITIVE_INFINITY;
+	const visit = (node) => {
+		if (diagnosticPosition < node.getStart(record.sourceFile) || diagnosticPosition > node.end) return;
+		if (isComponentFunction(node)) {
+			const name = getFunctionName(node);
+			const width = node.end - node.getStart(record.sourceFile);
+			if (name !== null && /^[A-Z]/.test(name) && width < componentWidth) {
+				component = {
+					isDefaultExport: isDefaultExportedComponent(record, node, name),
+					name,
+					node,
+					record
+				};
+				componentWidth = width;
+			}
+		}
+		ts.forEachChild(node, visit);
+	};
+	visit(record.sourceFile);
+	return component;
+};
+const moduleSpecifierTargetsComponent = (callerRecord, moduleSpecifier, componentRecord) => {
+	if (!moduleSpecifier.startsWith(".")) return false;
+	const unresolvedPath = path.resolve(path.dirname(callerRecord.absolutePath), moduleSpecifier);
+	const specifiedExtension = path.extname(unresolvedPath).toLowerCase();
+	const sourcePathWithoutExtension = SOURCE_EXTENSIONS.includes(specifiedExtension) ? unresolvedPath.slice(0, -specifiedExtension.length) : unresolvedPath;
+	return [
+		unresolvedPath,
+		...SOURCE_EXTENSIONS.map((extension) => `${sourcePathWithoutExtension}${extension}`),
+		...sourcePathWithoutExtension === unresolvedPath ? SOURCE_EXTENSIONS.map((extension) => path.join(unresolvedPath, `index${extension}`)) : []
+	].includes(componentRecord.absolutePath);
+};
+const getComponentTagNames = (record, component) => {
+	if (record.absolutePath === component.record.absolutePath) return new Set([component.name]);
+	const tagNames = /* @__PURE__ */ new Set();
+	for (const statement of record.sourceFile.statements) {
+		if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier) || !moduleSpecifierTargetsComponent(record, statement.moduleSpecifier.text, component.record)) continue;
+		const importClause = statement.importClause;
+		if (component.isDefaultExport && importClause?.name !== void 0) tagNames.add(importClause.name.text);
+		const namedBindings = importClause?.namedBindings;
+		if (namedBindings !== void 0 && ts.isNamedImports(namedBindings)) {
+			for (const element of namedBindings.elements) if ((element.propertyName?.text ?? element.name.text) === component.name) tagNames.add(element.name.text);
+		}
+	}
+	return tagNames;
+};
+const getTransparentCall = (functionNode) => {
+	if (functionNode.body === void 0) return null;
+	if (!ts.isBlock(functionNode.body)) {
+		const expression = unwrapExpression(functionNode.body);
+		return ts.isCallExpression(expression) ? expression : null;
+	}
+	if (functionNode.body.statements.length !== 1) return null;
+	const statement = functionNode.body.statements[0];
+	if (statement === void 0) return null;
+	const expression = ts.isExpressionStatement(statement) || ts.isReturnStatement(statement) ? statement.expression : void 0;
+	if (expression === void 0) return null;
+	const unwrappedExpression = unwrapExpression(expression);
+	return ts.isCallExpression(unwrappedExpression) ? unwrappedExpression : null;
+};
+const resolveTransparentTarget = (functionNode) => {
+	const call = getTransparentCall(functionNode);
+	if (call === null) return null;
+	const target = unwrapExpression(call.expression);
+	if (!ts.isIdentifier(target) || call.arguments.length !== functionNode.parameters.length) return null;
+	for (const [parameterIndex, parameter] of functionNode.parameters.entries()) {
+		const argument = call.arguments[parameterIndex];
+		const unwrappedArgument = argument === void 0 ? null : unwrapExpression(argument);
+		if (!ts.isIdentifier(parameter.name) || unwrappedArgument === null || !ts.isIdentifier(unwrappedArgument) || unwrappedArgument.text !== parameter.name.text) return null;
+	}
+	return target.text;
+};
+const getForwardingFunction = (declaration) => {
+	if (ts.isFunctionDeclaration(declaration)) return declaration;
+	if (!ts.isVariableDeclaration(declaration) || declaration.initializer === void 0) return null;
+	const initializer = unwrapExpression(declaration.initializer);
+	if (ts.isArrowFunction(initializer) || ts.isFunctionExpression(initializer)) return initializer;
+	if (ts.isCallExpression(initializer) && getCalleeName(initializer.expression) === "useCallback") {
+		const callback = initializer.arguments[0];
+		if (callback !== void 0 && (ts.isArrowFunction(callback) || ts.isFunctionExpression(callback))) return callback;
+	}
+	return null;
+};
+const getDeclaredBindingName = (node) => {
+	if ((ts.isVariableDeclaration(node) || ts.isParameter(node) || ts.isBindingElement(node) || ts.isFunctionDeclaration(node)) && node.name !== void 0 && ts.isIdentifier(node.name)) return node.name.text;
+	if (ts.isImportClause(node)) return node.name?.text ?? null;
+	if (ts.isImportSpecifier(node) || ts.isNamespaceImport(node)) return node.name.text;
+	return null;
+};
+const findBindingScope = (node) => {
+	let currentNode = node;
+	while (currentNode !== void 0) {
+		if (ts.isParameter(currentNode) && ts.isFunctionLike(currentNode.parent)) return currentNode.parent;
+		if (ts.isBlock(currentNode) || ts.isModuleBlock(currentNode) || ts.isSourceFile(currentNode)) return currentNode;
+		currentNode = currentNode.parent;
+	}
+	return node.getSourceFile();
+};
+const findBindingDeclaration = (record, binding) => {
+	const usagePosition = binding.getStart(record.sourceFile);
+	const candidates = [];
+	const visit = (node) => {
+		if (getDeclaredBindingName(node) === binding.text) {
+			const scope = findBindingScope(node);
+			const isVisibleScope = usagePosition >= scope.getStart(record.sourceFile) && usagePosition <= scope.end;
+			const isVisibleDeclaration = ts.isFunctionDeclaration(node) || ts.isParameter(node) || ts.isBindingElement(node) || ts.isImportClause(node) || ts.isImportSpecifier(node) || ts.isNamespaceImport(node) || node.getStart(record.sourceFile) < usagePosition;
+			if (isVisibleScope && isVisibleDeclaration) candidates.push({
+				declaration: node,
+				scope
+			});
+		}
+		ts.forEachChild(node, visit);
+	};
+	visit(record.sourceFile);
+	let nearestCandidate = null;
+	let nearestScopeWidth = Number.POSITIVE_INFINITY;
+	let isNearestScopeAmbiguous = false;
+	for (const candidate of candidates) {
+		const scopeWidth = candidate.scope.end - candidate.scope.getStart(record.sourceFile);
+		if (scopeWidth < nearestScopeWidth) {
+			nearestCandidate = candidate;
+			nearestScopeWidth = scopeWidth;
+			isNearestScopeAmbiguous = false;
+		} else if (scopeWidth === nearestScopeWidth) isNearestScopeAmbiguous = true;
+	}
+	if (isNearestScopeAmbiguous) return null;
+	const declaration = nearestCandidate?.declaration;
+	return declaration !== void 0 && (ts.isVariableDeclaration(declaration) || ts.isFunctionDeclaration(declaration)) ? declaration : null;
+};
+const resolveHandlerBinding = (record, binding) => {
+	const declaration = findBindingDeclaration(record, binding);
+	if (declaration === null) return binding.text;
+	const forwardingFunction = getForwardingFunction(declaration);
+	const target = forwardingFunction === null ? null : resolveTransparentTarget(forwardingFunction);
+	return target === null || target === binding.text ? binding.text : target;
+};
+const getJsxTagName = (node) => ts.isIdentifier(node.tagName) ? node.tagName.text : null;
+const getHandlerBinding = (node, propName) => {
+	for (const property of node.attributes.properties) {
+		if (!ts.isJsxAttribute(property) || property.name.getText() !== propName) continue;
+		const initializer = property.initializer;
+		if (initializer === void 0 || !ts.isJsxExpression(initializer)) return null;
+		if (initializer.expression === void 0) return null;
+		const expression = unwrapExpression(initializer.expression);
+		return ts.isIdentifier(expression) ? expression : null;
+	}
+	return null;
+};
+const getForwardedHandlerAliases = (rootDirectory, component, propNames, state) => {
+	const cacheKey = `${component.record.filePath}\0${component.name}\0${[...propNames].sort().join("\0")}`;
+	const cachedAliases = state.aliasesByComponent.get(cacheKey);
+	if (cachedAliases !== void 0) return cachedAliases;
+	const bindingsByPropName = /* @__PURE__ */ new Map();
+	const unresolvedPropNames = /* @__PURE__ */ new Set();
+	let callsiteCount = 0;
+	for (const record of listSourceRecords(rootDirectory, state)) {
+		const tagNames = getComponentTagNames(record, component);
+		if (tagNames.size === 0) continue;
+		const visit = (node) => {
+			if (record === component.record && node === component.node) return;
+			if (ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node)) {
+				const tagName = getJsxTagName(node);
+				if (tagName !== null && tagNames.has(tagName)) {
+					callsiteCount += 1;
+					for (const propName of propNames) {
+						const binding = getHandlerBinding(node, propName);
+						if (binding === null) {
+							unresolvedPropNames.add(propName);
+							continue;
+						}
+						const bindings = bindingsByPropName.get(propName) ?? /* @__PURE__ */ new Set();
+						bindings.add(resolveHandlerBinding(record, binding));
+						bindingsByPropName.set(propName, bindings);
+					}
+				}
+			}
+			ts.forEachChild(node, visit);
+		};
+		visit(record.sourceFile);
+	}
+	const aliases = /* @__PURE__ */ new Map();
+	if (callsiteCount > 0) for (const [propName, bindings] of bindingsByPropName) {
+		if (bindings.size !== 1 || unresolvedPropNames.has(propName)) continue;
+		const [bindingName] = bindings;
+		if (bindingName !== void 0) aliases.set(propName, bindingName);
+	}
+	state.aliasesByComponent.set(cacheKey, aliases);
+	return aliases;
+};
+const normalizeForwardedHandlers = (evidence, aliases) => {
+	let normalizedEvidence = evidence;
+	for (const [propName, bindingName] of aliases) normalizedEvidence = normalizedEvidence.replace(new RegExp(`\\{\\s*${propName}\\s*\\}`, "g"), `{${bindingName}}`).replace(new RegExp(`=>\\s*${propName}\\s*\\(`, "g"), `=> ${bindingName}(`);
+	return normalizedEvidence;
+};
+const createDiagnosticEvidenceReader = (rootDirectory, options = {}) => {
+	const state = {
+		aliasesByComponent: /* @__PURE__ */ new Map(),
+		recordByFilePath: /* @__PURE__ */ new Map(),
+		sourceRecords: null
+	};
+	return (diagnostic) => {
+		const record = readSourceRecord(rootDirectory, diagnostic.filePath, state);
+		if (record === null || !Number.isInteger(diagnostic.line)) return null;
+		const sourceLines = record.sourceText.split(/\r?\n/);
+		const startLineIndex = Math.max(0, diagnostic.line - 1);
+		const endLineIndex = Math.max(startLineIndex, (diagnostic.endLine ?? diagnostic.line) - 1);
+		const evidence = sourceLines.slice(startLineIndex, endLineIndex + 1).join("\n");
+		if (!options.resolveForwardedHandlers) return evidence;
+		const propNames = new Set(evidence.match(/\bon[A-Z]\w*\b/g) ?? []);
+		if (propNames.size === 0) return evidence;
+		const component = findEnclosingComponent(record, diagnostic);
+		if (component === null) return evidence;
+		return normalizeForwardedHandlers(evidence, getForwardedHandlerAliases(rootDirectory, component, propNames, state));
+	};
+};
+//#endregion
 //#region src/cli/utils/build-no-score-message.ts
 const ENTERPRISE_CONTACT_HINT = `Want something custom to your company? Contact us at ${ENTERPRISE_CONTACT_URL}.`;
 const buildNoScoreMessage = (isScoreDisabled) => {
@@ -61644,6 +62261,8 @@ const runBaselineComparison = async (params) => {
 		directory: params.directory,
 		ref: params.baselineRef,
 		files: params.options.includePaths,
+		baseFiles: params.baseFiles,
+		headFiles: params.headFiles,
 		tempDirectory
 	}).catch((error) => {
 		rmSync(tempDirectory, {
@@ -61652,7 +62271,24 @@ const runBaselineComparison = async (params) => {
 		});
 		throw error;
 	});
+	if (snapshot === null) {
+		rmSync(tempDirectory, {
+			recursive: true,
+			force: true
+		});
+		return null;
+	}
 	try {
+		if (!snapshot.isComplete) return null;
+		const analyzedHeadFiles = new Set(params.headAnalyzedFiles.map(toForwardSlashes));
+		const baseFiles = new Set(snapshot.baseFiles.map(toForwardSlashes));
+		const trackedHeadFiles = new Set(snapshot.headFiles.map(toForwardSlashes));
+		const expectedHeadFiles = new Set(trackedHeadFiles);
+		for (const filePath of params.options.includePaths) {
+			const normalizedFilePath = toForwardSlashes(filePath);
+			if (!baseFiles.has(normalizedFilePath)) expectedHeadFiles.add(normalizedFilePath);
+		}
+		if (filterSourceFiles([...expectedHeadFiles]).some((filePath) => !analyzedHeadFiles.has(filePath))) return null;
 		const baseLayers = buildRuntimeLayers({
 			directory: snapshot.tempDirectory,
 			hasConfigOverride: true,
@@ -61668,7 +62304,7 @@ const runBaselineComparison = async (params) => {
 		});
 		const baseOutput = await runPromise(restoreLegacyThrow(runInspect({
 			directory: snapshot.tempDirectory,
-			includePaths: params.options.includePaths,
+			includePaths: snapshot.materializedFiles,
 			customRulesOnly: params.options.customRulesOnly,
 			respectInlineDisables: params.options.respectInlineDisables,
 			warnings: params.options.warnings,
@@ -61685,18 +62321,22 @@ const runBaselineComparison = async (params) => {
 			deadlineEpochMs: params.deadlineEpochMs ?? void 0
 		}, {}).pipe(provide(baseLayers), provideService$2(PerFileLintCacheEnabled, false), provideService$2(SidecarLintCacheEnabled, false), provideService$2(Console, silentConsole))));
 		if (baseOutput.didLintFail || countIncompleteLintFiles(baseOutput.lintPartialFailures) > 0) return null;
+		const hasUnscannedUntrackedSourceFiles = filterSourceFiles(snapshot.untrackedFiles.map(toForwardSlashes)).some((filePath) => !analyzedHeadFiles.has(filePath));
 		const delta = computeDiagnosticDelta({
 			headDiagnostics: params.headDiagnostics,
 			baseDiagnostics: baseOutput.diagnostics,
 			readHeadLine: createSourceLineReader(params.directory),
-			readBaseLine: createSourceLineReader(snapshot.tempDirectory)
+			readBaseLine: createSourceLineReader(snapshot.tempDirectory),
+			readHeadEvidence: createDiagnosticEvidenceReader(params.directory, { resolveForwardedHandlers: true }),
+			readBaseEvidence: createDiagnosticEvidenceReader(snapshot.tempDirectory)
 		});
 		return {
 			displayDiagnostics: delta.newDiagnostics,
 			baselineDelta: {
 				baseRef: params.baselineRef,
-				fixedCount: delta.fixedCount,
-				baseTotalCount: baseOutput.diagnostics.length
+				fixedCount: hasUnscannedUntrackedSourceFiles ? 0 : delta.fixedCount,
+				baseTotalCount: baseOutput.diagnostics.length,
+				crossFileMatchCount: delta.crossFileMatchCount
 			}
 		};
 	} finally {
@@ -61803,6 +62443,9 @@ const runInspectWithRuntime = async (directory, options, userConfig, hasConfigOv
 			headDiagnostics: output.diagnostics,
 			resolvedNodeBinaryPath,
 			baselineRef: options.baseline.ref,
+			baseFiles: options.baseline.baseFiles,
+			headFiles: options.baseline.headFiles,
+			headAnalyzedFiles: output.analyzedFiles,
 			deadlineEpochMs
 		});
 		if (comparison) {
@@ -64087,20 +64730,25 @@ const resolveProjectRelativeDirectory = (rootDirectory, projectDirectory) => {
 	return relativeProjectDirectory;
 };
 //#endregion
-//#region src/cli/utils/resolve-project-diff-include-paths.ts
-const resolveProjectDiffIncludePaths = (rootDirectory, projectDirectory, diffInfo) => {
+//#region src/cli/utils/resolve-project-source-file-paths.ts
+const resolveProjectSourceFilePaths = (rootDirectory, projectDirectory, filePaths) => {
 	const relativeProjectDirectory = resolveProjectRelativeDirectory(rootDirectory, projectDirectory);
 	if (relativeProjectDirectory === null) return [];
-	const changedSourceFiles = filterSourceFiles(diffInfo.changedFiles);
-	if (relativeProjectDirectory.length === 0) return changedSourceFiles;
+	const sourceFilePaths = filterSourceFiles([...filePaths]);
+	if (relativeProjectDirectory.length === 0) return sourceFilePaths;
 	const projectPrefix = `${relativeProjectDirectory}/`;
-	return changedSourceFiles.flatMap((filePath) => {
+	return sourceFilePaths.flatMap((filePath) => {
 		const normalizedFilePath = toForwardSlashes(filePath);
 		if (!normalizedFilePath.startsWith(projectPrefix)) return [];
 		const projectRelativePath = normalizedFilePath.slice(projectPrefix.length);
 		return projectRelativePath.length > 0 ? [projectRelativePath] : [];
 	});
 };
+//#endregion
+//#region src/cli/utils/resolve-project-diff-include-paths.ts
+const resolveProjectDiffIncludePaths = (rootDirectory, projectDirectory, diffInfo) => {
+	return resolveProjectSourceFilePaths(rootDirectory, projectDirectory, diffInfo.changedFiles);
+};
 /**
 * Re-keys repo-relative changed line ranges (from `getChangedLineRanges`) to
 * the scanned project, mirroring `resolveProjectDiffIncludePaths`'s boundary
@@ -64639,6 +65287,7 @@ const inspectAction = async (directory, flags) => {
 		const isDiffMode = scope !== "full";
 		const comparisonBaseRef = isDiffMode && diffInfo && !diffInfo.isCurrentChanges ? diffInfo.baseSha ? await resolveMergeBaseRef(resolvedDirectory, diffInfo.baseSha) : diffInfo.diffBaseRef ?? await resolveMergeBaseRef(resolvedDirectory, diffInfo.baseBranch) : null;
 		const baselineRef = scope === "changed" ? comparisonBaseRef : null;
+		const baselineDiffPlan = baselineRef === null ? null : await getBaselineDiffPlan(resolvedDirectory, baselineRef);
 		const linesBaseRef = diffInfo?.isCurrentChanges ? "HEAD" : comparisonBaseRef;
 		const changedLineRanges = scope === "lines" && diffInfo !== null && (diffInfo.isCurrentChanges || linesBaseRef !== null) && diffInfo !== null ? await getChangedLineRanges({
 			directory: resolvedDirectory,
@@ -64669,10 +65318,13 @@ const inspectAction = async (directory, flags) => {
 			const supplyChainEnabled = flags.supplyChain ?? projectConfig?.supplyChain?.enabled !== false;
 			let includePaths;
 			let supplyChainManifestChanged = false;
+			const projectBaselineBaseFiles = baselineDiffPlan === null ? null : resolveProjectSourceFilePaths(resolvedDirectory, scanDirectory, baselineDiffPlan.baseFiles);
+			const projectBaselineHeadFiles = baselineDiffPlan === null ? null : resolveProjectSourceFilePaths(resolvedDirectory, scanDirectory, baselineDiffPlan.headFiles);
 			if (isDiffMode) {
 				const changedSourceFiles = diffInfo === null ? [] : resolveProjectDiffIncludePaths(resolvedDirectory, scanDirectory, diffInfo);
 				supplyChainManifestChanged = supplyChainEnabled && diffInfo !== null && projectManifestChanged(resolvedDirectory, scanDirectory, diffInfo);
-				if (changedSourceFiles.length === 0 && !supplyChainManifestChanged) {
+				const hasBaselineOnlyFiles = (projectBaselineBaseFiles?.length ?? 0) > 0;
+				if (changedSourceFiles.length === 0 && !supplyChainManifestChanged && !hasBaselineOnlyFiles) {
 					if (!isQuiet) {
 						cliLogger.dim(`No changed source files in ${scanDirectory}, skipping.`);
 						cliLogger.break();
@@ -64680,6 +65332,7 @@ const inspectAction = async (directory, flags) => {
 					return null;
 				}
 				includePaths = [...changedSourceFiles];
+				if (includePaths.length === 0 && hasBaselineOnlyFiles) includePaths.push(...projectBaselineBaseFiles ?? []);
 				if (supplyChainManifestChanged) includePaths.push("package.json");
 			}
 			if (!isQuiet && !isMultiProject) cliLogger.dim("  ");
@@ -64691,7 +65344,11 @@ const inspectAction = async (directory, flags) => {
 				configSourceDirectory: projectConfigSourceDirectory ?? void 0,
 				suppressRendering: isMultiProject,
 				concurrentScan: isMultiProject,
-				baseline: baselineRef ? { ref: baselineRef } : void 0,
+				baseline: baselineRef !== null && projectBaselineBaseFiles !== null && projectBaselineHeadFiles !== null ? {
+					ref: baselineRef,
+					baseFiles: projectBaselineBaseFiles,
+					headFiles: projectBaselineHeadFiles
+				} : void 0,
 				changedLineRanges: scope === "lines" && changedLineRanges !== null ? resolveProjectChangedLineRanges(resolvedDirectory, scanDirectory, changedLineRanges) : void 0,
 				supplyChainManifestChanged
 			});
@@ -65891,4 +66548,4 @@ Promise.resolve().then(() => assertNoRemovedFlags(process.argv)).then(() => prog
 export {};
 
 //# sourceMappingURL=cli.js.map
-//# debugId=9e32582f-b296-5216-a028-7cc19ed83931
+//# debugId=81bdc95e-12f2-565f-a05c-7b8a60a98f81