oxlint-plugin-react-doctor 0.7.9-dev.db5fe10 → 0.7.9-dev.e5a5f73

package/dist/index.js

@@ -1,8 +1,8 @@
 import { KEYS } from "eslint-visitor-keys";
 import * as path from "node:path";
+import { parseSync, visitorKeys } from "oxc-parser";
 import * as fs from "node:fs";
 import { readFileSync } from "node:fs";
-import { parseSync, visitorKeys } from "oxc-parser";
 import { analyze } from "eslint-scope";
 //#region src/plugin/utils/is-node-of-type.ts
 const isNodeOfType = (node, type) => node !== null && typeof node === "object" && "type" in node && node.type === type;
@@ -327,7 +327,15 @@ const defineRule = (rule) => {
 let lastContentLineIndex;
 const buildLineStartOffsets = (content) => {
 	const lineStartOffsets = [0];
-	for (let newlineIndex = content.indexOf("\n"); newlineIndex !== -1; newlineIndex = content.indexOf("\n", newlineIndex + 1)) lineStartOffsets.push(newlineIndex + 1);
+	for (let characterIndex = 0; characterIndex < content.length; characterIndex += 1) {
+		const character = content[characterIndex];
+		if (character === "\r" && content[characterIndex + 1] === "\n") {
+			characterIndex += 1;
+			lineStartOffsets.push(characterIndex + 1);
+			continue;
+		}
+		if (character === "\r" || character === "\n" || character === "\u2028" || character === "\u2029") lineStartOffsets.push(characterIndex + 1);
+	}
 	return lineStartOffsets;
 };
 const getLineStartOffsets = (content) => {
@@ -4342,7 +4350,8 @@ const SECRET_VALUE_PATTERNS = [
 ];
 const JWT_LITERAL_VALUE_PATTERN = /\beyJ[A-Za-z0-9_-]{8,}\.eyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{16,}\b/;
 const PUBLIC_ENV_SECRET_NAME_PATTERN = /\b(?:NEXT_PUBLIC|VITE|REACT_APP|EXPO_PUBLIC)_[A-Z0-9_]*(?:SECRET|TOKEN|PASSWORD|PRIVATE|DATABASE_URL|SERVICE_ROLE|AWS_ACCESS_KEY|AWS_SECRET)[A-Z0-9_]*\b/i;
-const FULL_ENV_LEAK_CONTEXT_PATTERN = /\b(?:process\.env|import\.meta\.env|window\.__[A-Z0-9_]*ENV[A-Z0-9_]*__|__[A-Z0-9_]*ENV[A-Z0-9_]*__)\b/;
+const FULL_ENV_LEAK_CONTEXT_PATTERN = /\b(?:process\s*\.\s*env|import\s*\.\s*meta\s*\.\s*env|window\.__[A-Z0-9_]*ENV[A-Z0-9_]*__|__[A-Z0-9_]*ENV[A-Z0-9_]*__)\b/;
+const FULL_ENV_LEAK_COMMENT_TRIVIA_PATTERN = /\b(?:(?:process|window)\s*(?:\/[*/]|<!--|-->|\.\s*(?:\/[*/]|<!--|-->))|import\s*(?:\/[*/]|<!--|-->|\.\s*(?:\/[*/]|<!--|-->|meta\s*(?:\/[*/]|<!--|-->|\.\s*(?:\/[*/]|<!--|-->)))))/;
 const FULL_ENV_LEAK_SECRET_NAME_PATTERN = /\b(?:DATABASE_URL|AWS_SECRET_ACCESS_KEY|AWS_ACCESS_KEY_ID|MAILGUN_API_KEY|SALESFORCE_CLIENT_SECRET|OKTA_CLIENT_SECRET|SESSION_SECRET|COOKIE_SECRET|PRIVATE_KEY|SERVICE_ROLE)\b/;
 const TRUSTED_PUBLIC_SECRET_NAME_PATTERN = /(?:SENTRY_DSN|PUBLIC_KEY|PUBLISHABLE|ANON_KEY|POSTHOG_(?:PROJECT_)?TOKEN|POSTHOG_KEY|TLDRAW_LICENSE_KEY|CLERK_PUBLISHABLE_KEY|ALGOLIA_SEARCH_KEY|GC_API_KEY|GOOGLE_MAPS_API_KEY|MAPBOX_TOKEN|MIXPANEL_TOKEN|FACEBOOK_CLIENT_TOKEN|(?:NEXT_PUBLIC|VITE|REACT_APP|EXPO_PUBLIC)_(?:DISABLE|ENABLE|ALLOW|REQUIRE)_)|(?:TOKEN|SECRET|PASSWORD|PRIVATE)_(?:KIND|TYPE|URL|URI|ENDPOINT|HEADER|NAME)$/i;
 const PUBLIC_CLIENT_KEY_PATTERNS = [
@@ -4500,6 +4509,172 @@ const findSuspiciousPublicEnvSecretNamePattern = (content) => {
 //#region src/plugin/rules/security-scan/utils/has-full-env-leak-shape.ts
 const hasFullEnvLeakShape = (content) => FULL_ENV_LEAK_CONTEXT_PATTERN.test(content) && FULL_ENV_LEAK_SECRET_NAME_PATTERN.test(content);
 //#endregion
+//#region src/plugin/utils/attach-parent-references.ts
+const attachParentReferences = (root) => {
+	const visit = (node, parent) => {
+		const writableNode = node;
+		writableNode.parent = parent;
+		const nodeRecord = node;
+		for (const key of Object.keys(nodeRecord)) {
+			if (key === "parent") continue;
+			const child = nodeRecord[key];
+			if (Array.isArray(child)) {
+				for (const item of child) if (isAstNode(item)) visit(item, node);
+			} else if (isAstNode(child)) visit(child, node);
+		}
+	};
+	visit(root, null);
+};
+//#endregion
+//#region src/plugin/utils/cross-file-probe-recorder.ts
+let activeProbeTrace = null;
+const recordExistenceProbe = (absolutePath) => {
+	activeProbeTrace?.existencePaths.add(absolutePath);
+};
+const recordContentProbe = (absolutePath) => {
+	activeProbeTrace?.contentPaths.add(absolutePath);
+};
+const isProbeRecorderActive = () => activeProbeTrace !== null;
+const collectCrossFileProbes = (collect) => {
+	const previousTrace = activeProbeTrace;
+	const trace = {
+		existencePaths: /* @__PURE__ */ new Set(),
+		contentPaths: /* @__PURE__ */ new Set()
+	};
+	activeProbeTrace = trace;
+	try {
+		collect();
+	} finally {
+		activeProbeTrace = previousTrace;
+	}
+	return trace;
+};
+//#endregion
+//#region src/plugin/utils/parse-source-file.ts
+const FILENAME_TO_LANG = {
+	".ts": "ts",
+	".tsx": "tsx",
+	".js": "js",
+	".jsx": "jsx",
+	".mjs": "js",
+	".cjs": "js",
+	".mts": "ts",
+	".cts": "ts"
+};
+const resolveLang = (filename) => {
+	return FILENAME_TO_LANG[path.extname(filename).toLowerCase()] ?? "tsx";
+};
+const parseSourceText = ({ filename, sourceText, shouldAttachParentReferences = true }) => {
+	try {
+		const result = parseSync(filename, sourceText, {
+			astType: "ts",
+			lang: resolveLang(filename)
+		});
+		if (result.errors.some((parseError) => parseError.severity === "Error")) return null;
+		const parsedProgram = result.program;
+		if (shouldAttachParentReferences) attachParentReferences(parsedProgram);
+		return parsedProgram;
+	} catch {
+		return null;
+	}
+};
+const parseCache = /* @__PURE__ */ new Map();
+const parseSourceFile = (absoluteFilePath) => {
+	if (!(absoluteFilePath.endsWith(".d.ts") || absoluteFilePath.endsWith(".d.mts") || absoluteFilePath.endsWith(".d.cts"))) recordContentProbe(absoluteFilePath);
+	let fileStat;
+	try {
+		fileStat = fs.statSync(absoluteFilePath);
+	} catch {
+		return null;
+	}
+	if (!fileStat.isFile()) return null;
+	if (fileStat.size > 2e6) return null;
+	const cached = parseCache.get(absoluteFilePath);
+	if (cached && cached.mtimeMs === fileStat.mtimeMs && cached.size === fileStat.size) return cached.program;
+	if (absoluteFilePath.endsWith(".d.ts") || absoluteFilePath.endsWith(".d.mts") || absoluteFilePath.endsWith(".d.cts")) {
+		parseCache.set(absoluteFilePath, {
+			mtimeMs: fileStat.mtimeMs,
+			size: fileStat.size,
+			program: null
+		});
+		return null;
+	}
+	let sourceText;
+	try {
+		sourceText = fs.readFileSync(absoluteFilePath, "utf8");
+	} catch {
+		parseCache.set(absoluteFilePath, {
+			mtimeMs: fileStat.mtimeMs,
+			size: fileStat.size,
+			program: null
+		});
+		return null;
+	}
+	const parsedProgram = parseSourceText({
+		filename: absoluteFilePath,
+		sourceText
+	});
+	parseCache.set(absoluteFilePath, {
+		mtimeMs: fileStat.mtimeMs,
+		size: fileStat.size,
+		program: parsedProgram
+	});
+	return parsedProgram;
+};
+//#endregion
+//#region src/plugin/rules/security-scan/utils/mask-source-comments.ts
+const SOURCE_FILE_EXTENSION_PATTERN$1 = /\.(?:[cm]?[jt]sx?)$/i;
+const POSSIBLE_SOURCE_COMMENT_PATTERN = /\/\/|\/\*|<!--/;
+const LINE_TERMINATORS = new Set([
+	"\r",
+	"\n",
+	"\u2028",
+	"\u2029"
+]);
+const hasPossibleAnnexBClosingComment = (content) => {
+	let searchIndex = 0;
+	while (searchIndex < content.length) {
+		const closingCommentIndex = content.indexOf("-->", searchIndex);
+		if (closingCommentIndex === -1) return false;
+		let prefixIndex = closingCommentIndex - 1;
+		while (prefixIndex >= 0 && !LINE_TERMINATORS.has(content[prefixIndex] ?? "")) {
+			if (content[prefixIndex]?.trim() !== "") break;
+			prefixIndex -= 1;
+		}
+		if (prefixIndex < 0 || LINE_TERMINATORS.has(content[prefixIndex] ?? "")) return true;
+		searchIndex = closingCommentIndex + 3;
+	}
+	return false;
+};
+const maskSourceComments = (relativePath, content) => {
+	if (!SOURCE_FILE_EXTENSION_PATTERN$1.test(relativePath)) return content;
+	if (!content.startsWith("#!") && !POSSIBLE_SOURCE_COMMENT_PATTERN.test(content) && !hasPossibleAnnexBClosingComment(content)) return content;
+	try {
+		const result = parseSync(relativePath, content, {
+			astType: "ts",
+			lang: resolveLang(relativePath)
+		});
+		if (result.errors.some((parseError) => parseError.severity === "Error")) return void 0;
+		const firstLineTerminatorIndex = content.search(/[\r\n\u2028\u2029]/);
+		const ignoredRanges = [...content.startsWith("#!") ? [{
+			start: 0,
+			end: firstLineTerminatorIndex === -1 ? content.length : firstLineTerminatorIndex
+		}] : [], ...result.comments];
+		if (ignoredRanges.length === 0) return content;
+		const contentParts = [];
+		let previousEnd = 0;
+		for (const ignoredRange of ignoredRanges) {
+			contentParts.push(content.slice(previousEnd, ignoredRange.start));
+			contentParts.push(content.slice(ignoredRange.start, ignoredRange.end).replace(/[^\r\n\u2028\u2029]/g, " "));
+			previousEnd = ignoredRange.end;
+		}
+		contentParts.push(content.slice(previousEnd));
+		return contentParts.join("");
+	} catch {
+		return;
+	}
+};
+//#endregion
 //#region src/plugin/rules/security-scan/utils/scan-artifact-leak.ts
 const scanArtifactLeak = (file, findLeakPattern, message) => {
 	if (DOCUMENTATION_CONTEXT_PATTERN.test(file.relativePath)) return [];
@@ -4515,12 +4690,39 @@ const scanArtifactLeak = (file, findLeakPattern, message) => {
 };
 //#endregion
 //#region src/plugin/rules/security-scan/artifact-env-leak.ts
+const ARTIFACT_ENV_LEAK_MESSAGE = "A browser artifact contains server-secret environment names or a full environment dump shape.";
+const findArtifactEnvLeakPattern = (content) => findSuspiciousPublicEnvSecretNamePattern(content) ?? (hasFullEnvLeakShape(content) ? FULL_ENV_LEAK_SECRET_NAME_PATTERN : void 0);
 const artifactEnvLeak = defineRule({
 	id: "artifact-env-leak",
 	title: "Server env leaked to browser artifact",
 	severity: "error",
 	recommendation: "Treat public env prefixes as publication, not secrecy; keep secret env vars server-only and rebuild after rotating leaked keys.",
-	scan: (file) => scanArtifactLeak(file, (content) => findSuspiciousPublicEnvSecretNamePattern(content) ?? (hasFullEnvLeakShape(content) ? FULL_ENV_LEAK_SECRET_NAME_PATTERN : void 0), "A browser artifact contains server-secret environment names or a full environment dump shape.")
+	scan: (file) => {
+		let isRawCandidateExact = false;
+		const findRawCandidatePattern = (content) => {
+			const suspiciousPublicNamePattern = findSuspiciousPublicEnvSecretNamePattern(content);
+			if (suspiciousPublicNamePattern) {
+				isRawCandidateExact = true;
+				return suspiciousPublicNamePattern;
+			}
+			if (!FULL_ENV_LEAK_SECRET_NAME_PATTERN.test(content)) return void 0;
+			if (FULL_ENV_LEAK_CONTEXT_PATTERN.test(content)) {
+				isRawCandidateExact = true;
+				return FULL_ENV_LEAK_SECRET_NAME_PATTERN;
+			}
+			return FULL_ENV_LEAK_COMMENT_TRIVIA_PATTERN.test(content) ? FULL_ENV_LEAK_SECRET_NAME_PATTERN : void 0;
+		};
+		const rawCandidateFindings = scanArtifactLeak(file, findRawCandidatePattern, ARTIFACT_ENV_LEAK_MESSAGE);
+		if (rawCandidateFindings.length === 0) return rawCandidateFindings;
+		const rawFindings = isRawCandidateExact ? rawCandidateFindings : scanArtifactLeak(file, findArtifactEnvLeakPattern, ARTIFACT_ENV_LEAK_MESSAGE);
+		const executableContent = maskSourceComments(file.relativePath, file.content);
+		if (executableContent === void 0) return rawCandidateFindings;
+		if (executableContent === file.content) return rawFindings;
+		return scanArtifactLeak({
+			...file,
+			content: executableContent
+		}, findArtifactEnvLeakPattern, ARTIFACT_ENV_LEAK_MESSAGE);
+	}
 });
 //#endregion
 //#region src/plugin/rules/security-scan/artifact-secret-leak.ts
@@ -6534,6 +6736,28 @@ const asyncParallel = defineRule({
 	}
 });
 //#endregion
+//#region src/plugin/utils/collect-function-return-statements.ts
+const collectFunctionReturnStatements = (functionNode) => {
+	if (!isFunctionLike$1(functionNode) || !isNodeOfType(functionNode.body, "BlockStatement")) return [];
+	const returnStatements = [];
+	walkAst(functionNode.body, (node) => {
+		if (node !== functionNode.body && (isFunctionLike$1(node) || isNodeOfType(node, "ClassDeclaration") || isNodeOfType(node, "ClassExpression"))) return false;
+		if (isNodeOfType(node, "ReturnStatement")) returnStatements.push(node);
+	});
+	return returnStatements;
+};
+//#endregion
+//#region src/plugin/utils/is-nullish-expression.ts
+const isNullishExpression = (expression) => isNodeOfType(expression, "Literal") && expression.value === null || isNodeOfType(expression, "Identifier") && expression.name === "undefined" || isNodeOfType(expression, "UnaryExpression") && expression.operator === "void";
+//#endregion
+//#region src/plugin/utils/strip-this-parameter.ts
+const stripThisParameter = (parameters) => {
+	const firstParameter = parameters[0];
+	if (!firstParameter) return parameters;
+	if (isNodeOfType(firstParameter, "Identifier") && firstParameter.name === "this") return parameters.slice(1);
+	return parameters;
+};
+//#endregion
 //#region src/plugin/rules/security/auth-token-in-web-storage.ts
 const MESSAGE$60 = "Storing an auth token in `localStorage`/`sessionStorage` exposes it to any XSS on the page: JavaScript can read web storage and exfiltrate the token. Keep tokens in an `HttpOnly`, `Secure`, `SameSite` cookie instead.";
 const STORAGE_NAMES = new Set(["localStorage", "sessionStorage"]);
@@ -6545,12 +6769,8 @@ const STORAGE_GLOBALS = new Set([
 const SENSITIVE_KEY_PATTERN = /token|jwt|secret|password|passwd|credential|api[-_]?key|bearer|private[-_]?key/i;
 const NON_AUTH_TOKEN_PATTERN = /csrf|xsrf|device|fcm|apns|push|design|tokeniz|syntax|css|theme|color/i;
 const STRONG_AUTH_KEY_PATTERN = /jwt|secret|password|passwd|credential|private[-_]?key|api[-_]?key|bearer|access[-_]?token|refresh[-_]?token|auth[-_]?token|id[-_]?token|session/i;
-const PRODUCT_API_KEY_RECORDS_PATTERN = /(?:^|[._:-])(?:created|saved|integration|mailing)[-_]?api[-_]?keys$/i;
-const PRODUCT_API_KEY_COLLECTION_PATTERN = /[._:-](?:created|generated|saved)[-_]?api[-_]?keys$/i;
 const isAuthCredentialKey = (key) => {
-	if (PRODUCT_API_KEY_RECORDS_PATTERN.test(key)) return false;
 	if (!SENSITIVE_KEY_PATTERN.test(key)) return false;
-	if (PRODUCT_API_KEY_COLLECTION_PATTERN.test(key)) return false;
 	if (NON_AUTH_TOKEN_PATTERN.test(key) && !STRONG_AUTH_KEY_PATTERN.test(key)) return false;
 	return true;
 };
@@ -6559,11 +6779,63 @@ const isDirectWebStorageObject = (node) => {
 	if (isNodeOfType(node, "MemberExpression") && !node.computed && isNodeOfType(node.object, "Identifier") && STORAGE_GLOBALS.has(node.object.name) && isNodeOfType(node.property, "Identifier")) return STORAGE_NAMES.has(node.property.name);
 	return false;
 };
-const isWebStorageObject = (node) => {
-	if (isDirectWebStorageObject(node)) return true;
-	if (!isNodeOfType(node, "Identifier")) return false;
-	const binding = findVariableInitializer(node, node.name);
-	return binding?.initializer ? isDirectWebStorageObject(binding.initializer) : false;
+const immutableInitializer = (identifier, visitedIdentifiers = /* @__PURE__ */ new Set()) => {
+	if (visitedIdentifiers.has(identifier)) return null;
+	visitedIdentifiers.add(identifier);
+	const binding = findVariableInitializer(identifier, identifier.name);
+	if (!binding?.initializer) return null;
+	if (isNodeOfType(binding.initializer, "FunctionDeclaration")) return binding.initializer;
+	const declarator = binding.bindingIdentifier.parent;
+	if (!declarator || !isNodeOfType(declarator, "VariableDeclarator")) return null;
+	const declaration = declarator.parent;
+	if (!declaration || !isNodeOfType(declaration, "VariableDeclaration")) return null;
+	if (declaration.kind !== "const") return null;
+	const initializer = stripParenExpression(binding.initializer);
+	if (!isNodeOfType(initializer, "Identifier")) return initializer;
+	return immutableInitializer(initializer, visitedIdentifiers) ?? initializer;
+};
+const isWebStorageFactoryResult = (node, visitedNodes) => {
+	const expression = stripParenExpression(node);
+	if (isWebStorageObject(expression, new Set(visitedNodes))) return true;
+	if (isNodeOfType(expression, "ConditionalExpression")) {
+		const consequent = stripParenExpression(expression.consequent);
+		const alternate = stripParenExpression(expression.alternate);
+		return (isNullishExpression(consequent) || isWebStorageFactoryResult(consequent, visitedNodes)) && (isNullishExpression(alternate) || isWebStorageFactoryResult(alternate, visitedNodes)) && (!isNullishExpression(consequent) || !isNullishExpression(alternate));
+	}
+	if (isNodeOfType(expression, "LogicalExpression")) {
+		if (expression.operator === "&&") return isWebStorageFactoryResult(expression.right, visitedNodes);
+		const left = stripParenExpression(expression.left);
+		const right = stripParenExpression(expression.right);
+		const isLeftStorage = isWebStorageFactoryResult(left, visitedNodes);
+		const isRightStorage = isWebStorageFactoryResult(right, visitedNodes);
+		return (isLeftStorage || isNullishExpression(left)) && (isRightStorage || isNullishExpression(right)) && (isLeftStorage || isRightStorage);
+	}
+	return false;
+};
+const isWebStorageObject = (node, visitedNodes = /* @__PURE__ */ new Set()) => {
+	const expression = stripParenExpression(node);
+	if (visitedNodes.has(expression)) return false;
+	visitedNodes.add(expression);
+	if (isDirectWebStorageObject(expression)) return true;
+	if (isNodeOfType(expression, "Identifier")) {
+		const initializer = immutableInitializer(expression);
+		return initializer ? isWebStorageObject(initializer, new Set(visitedNodes)) : false;
+	}
+	if (!isNodeOfType(expression, "CallExpression")) return false;
+	const callee = stripParenExpression(expression.callee);
+	if (!isNodeOfType(callee, "Identifier")) return false;
+	const factory = immutableInitializer(callee);
+	if (!isFunctionLike$1(factory)) return false;
+	if (isNodeOfType(factory, "ArrowFunctionExpression") && !isNodeOfType(factory.body, "BlockStatement")) return isWebStorageFactoryResult(factory.body, visitedNodes);
+	let didReturnWebStorage = false;
+	for (const returnStatement of collectFunctionReturnStatements(factory)) {
+		if (!returnStatement.argument) continue;
+		const strippedReturn = stripParenExpression(returnStatement.argument);
+		if (isNullishExpression(strippedReturn)) continue;
+		if (!isWebStorageFactoryResult(strippedReturn, visitedNodes)) return false;
+		didReturnWebStorage = true;
+	}
+	return didReturnWebStorage;
 };
 const resolveStaticKeyString = (node) => {
 	if (isNodeOfType(node, "Literal") && typeof node.value === "string") return node.value;
@@ -6583,6 +6855,56 @@ const staticMemberName = (member) => {
 	if (member.computed && isNodeOfType(member.property, "Literal") && typeof member.property.value === "string") return member.property.value;
 	return null;
 };
+const parameterIndex = (expression, parameterSymbolIds, scopes, canUnwrapSerialization, visitedNodes = /* @__PURE__ */ new Set()) => {
+	const strippedExpression = stripParenExpression(expression);
+	if (visitedNodes.has(strippedExpression)) return null;
+	visitedNodes.add(strippedExpression);
+	if (isNodeOfType(strippedExpression, "Identifier")) {
+		const directSymbolId = scopes.symbolFor(strippedExpression)?.id;
+		const directIndex = directSymbolId === void 0 ? -1 : parameterSymbolIds.indexOf(directSymbolId);
+		if (directIndex !== -1) return directIndex;
+		const initializer = immutableInitializer(strippedExpression);
+		return initializer ? parameterIndex(initializer, parameterSymbolIds, scopes, canUnwrapSerialization, visitedNodes) : null;
+	}
+	if (canUnwrapSerialization && isNodeOfType(strippedExpression, "CallExpression") && isNodeOfType(strippedExpression.callee, "MemberExpression") && !strippedExpression.callee.computed && isNodeOfType(strippedExpression.callee.object, "Identifier") && strippedExpression.callee.object.name === "JSON" && isNodeOfType(strippedExpression.callee.property, "Identifier") && strippedExpression.callee.property.name === "stringify") {
+		const serializedArgument = strippedExpression.arguments[0];
+		return serializedArgument ? parameterIndex(serializedArgument, parameterSymbolIds, scopes, true, visitedNodes) : null;
+	}
+	return null;
+};
+const storageHelperSinkCache = /* @__PURE__ */ new WeakMap();
+const findStorageHelperSinks = (functionNode, scopes) => {
+	const cachedSinks = storageHelperSinkCache.get(functionNode);
+	if (cachedSinks) return cachedSinks;
+	if (!isNodeOfType(functionNode, "FunctionDeclaration") && !isNodeOfType(functionNode, "FunctionExpression") && !isNodeOfType(functionNode, "ArrowFunctionExpression")) {
+		storageHelperSinkCache.set(functionNode, []);
+		return [];
+	}
+	const parameterSymbolIds = stripThisParameter(functionNode.params).map((parameter) => {
+		const strippedParameter = stripParenExpression(parameter);
+		const identifier = isNodeOfType(strippedParameter, "Identifier") ? strippedParameter : isNodeOfType(strippedParameter, "AssignmentPattern") && isNodeOfType(strippedParameter.left, "Identifier") ? strippedParameter.left : null;
+		return identifier ? scopes.symbolFor(identifier)?.id ?? null : null;
+	});
+	const helperSinks = [];
+	walkAst(functionNode.body, (child) => {
+		if (child !== functionNode.body && isFunctionLike$1(child)) return false;
+		if (!isNodeOfType(child, "CallExpression")) return;
+		const callee = stripParenExpression(child.callee);
+		if (!isNodeOfType(callee, "MemberExpression") || callee.computed || !isNodeOfType(callee.property, "Identifier") || callee.property.name !== "setItem" || !isWebStorageObject(callee.object)) return;
+		const keyExpression = child.arguments[0];
+		const valueExpression = child.arguments[1];
+		if (!keyExpression || !valueExpression) return;
+		const keyParameterIndex = parameterIndex(keyExpression, parameterSymbolIds, scopes, false);
+		const valueParameterIndex = parameterIndex(valueExpression, parameterSymbolIds, scopes, true);
+		if (keyParameterIndex === null || valueParameterIndex === null) return;
+		helperSinks.push({
+			keyParameterIndex,
+			valueParameterIndex
+		});
+	});
+	storageHelperSinkCache.set(functionNode, helperSinks);
+	return helperSinks;
+};
 const authTokenInWebStorage = defineRule({
 	id: "auth-token-in-web-storage",
 	title: "Auth token in web storage",
@@ -6590,14 +6912,23 @@ const authTokenInWebStorage = defineRule({
 	recommendation: "Don't persist auth tokens (JWTs, access/refresh tokens, secrets) in `localStorage`/`sessionStorage`; they're readable by any XSS. Use an `HttpOnly` cookie set by the server.",
 	create: skipNonProductionFiles((context) => ({
 		CallExpression(node) {
-			const callee = node.callee;
-			if (!isNodeOfType(callee, "MemberExpression") || callee.computed) return;
-			if (!isNodeOfType(callee.property, "Identifier") || callee.property.name !== "setItem") return;
-			if (!isWebStorageObject(stripParenExpression(callee.object))) return;
-			const keyArgument = node.arguments?.[0];
-			if (!keyArgument) return;
-			const keyString = resolveStaticKeyString(keyArgument);
-			if (keyString === null || !isAuthCredentialKey(keyString)) return;
+			const callee = stripParenExpression(node.callee);
+			const keyArguments = [];
+			if (isNodeOfType(callee, "MemberExpression") && !callee.computed && isNodeOfType(callee.property, "Identifier") && callee.property.name === "setItem" && isWebStorageObject(stripParenExpression(callee.object))) {
+				const keyArgument = node.arguments[0];
+				if (keyArgument) keyArguments.push(keyArgument);
+			} else if (isNodeOfType(callee, "Identifier")) {
+				const helperFunction = immutableInitializer(callee);
+				const helperSinks = helperFunction ? findStorageHelperSinks(helperFunction, context.scopes) : [];
+				for (const helperSink of helperSinks) {
+					const keyArgument = node.arguments[helperSink.keyParameterIndex];
+					if (keyArgument && node.arguments[helperSink.valueParameterIndex]) keyArguments.push(keyArgument);
+				}
+			}
+			if (!keyArguments.some((keyArgument) => {
+				const keyString = resolveStaticKeyString(keyArgument);
+				return keyString !== null && isAuthCredentialKey(keyString);
+			})) return;
 			context.report({
 				node,
 				message: MESSAGE$60
@@ -6845,9 +7176,6 @@ const isCreateElementCall = (node) => {
 	return false;
 };
 //#endregion
-//#region src/plugin/utils/is-nullish-expression.ts
-const isNullishExpression = (expression) => isNodeOfType(expression, "Literal") && expression.value === null || isNodeOfType(expression, "Identifier") && expression.name === "undefined" || isNodeOfType(expression, "UnaryExpression") && expression.operator === "void";
-//#endregion
 //#region src/plugin/rules/react-builtins/button-has-type.ts
 const MISSING_MESSAGE$2 = "Your users can submit the form by accident because a `<button>` with no `type` defaults to submit.";
 const INVALID_MESSAGE = "This button has an invalid `type`, so the browser may treat it like a submit button.";
@@ -7309,6 +7637,7 @@ const areExpressionsStructurallyEqual = (a, b) => {
 	if (a.type !== b.type) return false;
 	if (isNodeOfType(a, "ThisExpression")) return true;
 	if (isNodeOfType(a, "Identifier") && isNodeOfType(b, "Identifier")) return a.name === b.name;
+	if (isNodeOfType(a, "PrivateIdentifier") && isNodeOfType(b, "PrivateIdentifier")) return a.name === b.name;
 	if (isNodeOfType(a, "Literal") && isNodeOfType(b, "Literal")) return a.value === b.value;
 	if (isNodeOfType(a, "MemberExpression") && isNodeOfType(b, "MemberExpression")) {
 		if (a.computed !== b.computed) return false;
@@ -8364,17 +8693,6 @@ const createMethodMutationAnalysis = (context) => {
 //#region src/plugin/utils/is-member-property.ts
 const isMemberProperty = (node, propertyName) => Boolean(node && isNodeOfType(node, "MemberExpression") && isNodeOfType(node.property, "Identifier") && node.property.name === propertyName);
 //#endregion
-//#region src/plugin/utils/collect-function-return-statements.ts
-const collectFunctionReturnStatements = (functionNode) => {
-	if (!isFunctionLike$1(functionNode) || !isNodeOfType(functionNode.body, "BlockStatement")) return [];
-	const returnStatements = [];
-	walkAst(functionNode.body, (node) => {
-		if (node !== functionNode.body && (isFunctionLike$1(node) || isNodeOfType(node, "ClassDeclaration") || isNodeOfType(node, "ClassExpression"))) return false;
-		if (isNodeOfType(node, "ReturnStatement")) returnStatements.push(node);
-	});
-	return returnStatements;
-};
-//#endregion
 //#region src/plugin/utils/statement-always-exits.ts
 const statementAlwaysExits = (statement) => {
 	if (isNodeOfType(statement, "ReturnStatement") || isNodeOfType(statement, "ThrowStatement")) return true;
@@ -8641,7 +8959,7 @@ const isReactNamespaceImport = (identifier, scopes) => {
 	if (!symbol || !isImportedFromReact(symbol)) return false;
 	return isNodeOfType(symbol.declarationNode, "ImportDefaultSpecifier") || isNodeOfType(symbol.declarationNode, "ImportNamespaceSpecifier") || getImportedName(symbol.declarationNode) === "default";
 };
-const isReactNamespaceReceiver = (receiver, scopes, options) => {
+const isReactNamespaceReceiver$1 = (receiver, scopes, options) => {
 	if (!isNodeOfType(receiver, "Identifier")) return false;
 	if (isReactNamespaceImport(receiver, scopes)) return true;
 	return Boolean(options.allowGlobalReactNamespace && receiver.name === "React" && scopes.isGlobalReference(receiver));
@@ -8654,7 +8972,7 @@ const isDestructuredReactApiBinding = (identifier, apiNames, scopes, options) =>
 	for (const property of pattern.properties) {
 		if (!isNodeOfType(property, "Property") || property.value !== symbol.bindingIdentifier) continue;
 		const propertyName = getStaticPropertyKeyName(property);
-		return Boolean(propertyName && includesApiName(apiNames, propertyName) && isReactNamespaceReceiver(stripParenExpression(symbol.initializer), scopes, options));
+		return Boolean(propertyName && includesApiName(apiNames, propertyName) && isReactNamespaceReceiver$1(stripParenExpression(symbol.initializer), scopes, options));
 	}
 	return false;
 };
@@ -8678,7 +8996,7 @@ const isReactApiCallee = (rawCallee, apiNames, scopes, options, visitedSymbolIds
 		return Boolean(options.allowUnboundBareCalls && includesApiName(apiNames, callee.name) && scopes.isGlobalReference(callee));
 	}
 	if (!isNodeOfType(callee, "MemberExpression") || !includesApiName(apiNames, getStaticPropertyName(callee) ?? "")) return false;
-	return isReactNamespaceReceiver(stripParenExpression(callee.object), scopes, options);
+	return isReactNamespaceReceiver$1(stripParenExpression(callee.object), scopes, options);
 };
 //#endregion
 //#region src/plugin/utils/is-proven-browser-api-receiver.ts
@@ -9083,119 +9401,6 @@ const findReExportTargetsForName = (programRoot, exportedName) => {
 	return exportAllTargets;
 };
 //#endregion
-//#region src/plugin/utils/attach-parent-references.ts
-const attachParentReferences = (root) => {
-	const visit = (node, parent) => {
-		const writableNode = node;
-		writableNode.parent = parent;
-		const nodeRecord = node;
-		for (const key of Object.keys(nodeRecord)) {
-			if (key === "parent") continue;
-			const child = nodeRecord[key];
-			if (Array.isArray(child)) {
-				for (const item of child) if (isAstNode(item)) visit(item, node);
-			} else if (isAstNode(child)) visit(child, node);
-		}
-	};
-	visit(root, null);
-};
-//#endregion
-//#region src/plugin/utils/cross-file-probe-recorder.ts
-let activeProbeTrace = null;
-const recordExistenceProbe = (absolutePath) => {
-	activeProbeTrace?.existencePaths.add(absolutePath);
-};
-const recordContentProbe = (absolutePath) => {
-	activeProbeTrace?.contentPaths.add(absolutePath);
-};
-const isProbeRecorderActive = () => activeProbeTrace !== null;
-const collectCrossFileProbes = (collect) => {
-	const previousTrace = activeProbeTrace;
-	const trace = {
-		existencePaths: /* @__PURE__ */ new Set(),
-		contentPaths: /* @__PURE__ */ new Set()
-	};
-	activeProbeTrace = trace;
-	try {
-		collect();
-	} finally {
-		activeProbeTrace = previousTrace;
-	}
-	return trace;
-};
-//#endregion
-//#region src/plugin/utils/parse-source-file.ts
-const FILENAME_TO_LANG = {
-	".ts": "ts",
-	".tsx": "tsx",
-	".js": "js",
-	".jsx": "jsx",
-	".mjs": "js",
-	".cjs": "js",
-	".mts": "ts",
-	".cts": "ts"
-};
-const resolveLang = (filename) => {
-	return FILENAME_TO_LANG[path.extname(filename).toLowerCase()] ?? "tsx";
-};
-const parseSourceText = ({ filename, sourceText, shouldAttachParentReferences = true }) => {
-	try {
-		const result = parseSync(filename, sourceText, {
-			astType: "ts",
-			lang: resolveLang(filename)
-		});
-		if (result.errors.some((parseError) => parseError.severity === "Error")) return null;
-		const parsedProgram = result.program;
-		if (shouldAttachParentReferences) attachParentReferences(parsedProgram);
-		return parsedProgram;
-	} catch {
-		return null;
-	}
-};
-const parseCache = /* @__PURE__ */ new Map();
-const parseSourceFile = (absoluteFilePath) => {
-	if (!(absoluteFilePath.endsWith(".d.ts") || absoluteFilePath.endsWith(".d.mts") || absoluteFilePath.endsWith(".d.cts"))) recordContentProbe(absoluteFilePath);
-	let fileStat;
-	try {
-		fileStat = fs.statSync(absoluteFilePath);
-	} catch {
-		return null;
-	}
-	if (!fileStat.isFile()) return null;
-	if (fileStat.size > 2e6) return null;
-	const cached = parseCache.get(absoluteFilePath);
-	if (cached && cached.mtimeMs === fileStat.mtimeMs && cached.size === fileStat.size) return cached.program;
-	if (absoluteFilePath.endsWith(".d.ts") || absoluteFilePath.endsWith(".d.mts") || absoluteFilePath.endsWith(".d.cts")) {
-		parseCache.set(absoluteFilePath, {
-			mtimeMs: fileStat.mtimeMs,
-			size: fileStat.size,
-			program: null
-		});
-		return null;
-	}
-	let sourceText;
-	try {
-		sourceText = fs.readFileSync(absoluteFilePath, "utf8");
-	} catch {
-		parseCache.set(absoluteFilePath, {
-			mtimeMs: fileStat.mtimeMs,
-			size: fileStat.size,
-			program: null
-		});
-		return null;
-	}
-	const parsedProgram = parseSourceText({
-		filename: absoluteFilePath,
-		sourceText
-	});
-	parseCache.set(absoluteFilePath, {
-		mtimeMs: fileStat.mtimeMs,
-		size: fileStat.size,
-		program: parsedProgram
-	});
-	return parsedProgram;
-};
-//#endregion
 //#region src/plugin/utils/resolve-relative-import-path.ts
 const MODULE_FILE_EXTENSIONS = [
 	".ts",
@@ -14662,6 +14867,29 @@ const getReleaseVerbName = (node) => {
 	}
 	return null;
 };
+const isRetainedAbortControllerRefRelease = (releaseReceiver, usage, context) => {
+	const releaseFunction = findEnclosingFunction$1(releaseReceiver);
+	const usageFunction = findEnclosingFunction$1(usage.node);
+	if (!releaseFunction || !usageFunction || !isFunctionLike$1(usageFunction) || !isReturnedEffectCleanupFunction(releaseFunction) || !hasReactRefCurrentOrigin(releaseReceiver, context.scopes)) return false;
+	const controllerKey = getListenerAbortControllerKey(usage, context);
+	const refCurrentKey = resolveExpressionKey(releaseReceiver, context);
+	if (controllerKey === null || refCurrentKey === null) return false;
+	const usageFunctionBody = usageFunction.body;
+	const previousAbortCalls = [];
+	const ownershipAssignments = [];
+	walkAst(usageFunctionBody, (child) => {
+		if (child !== usageFunctionBody && isFunctionLike$1(child)) return false;
+		if (isNodeOfType(child, "AssignmentExpression") && resolveExpressionKey(child.left, context) === refCurrentKey && resolveExpressionKey(child.right, context) === controllerKey) {
+			ownershipAssignments.push(child);
+			return;
+		}
+		if (!isNodeOfType(child, "CallExpression")) return;
+		const childCallee = isNodeOfType(child.callee, "ChainExpression") ? child.callee.expression : stripParenExpression(child.callee);
+		if (isNodeOfType(childCallee, "MemberExpression") && !childCallee.computed && isNodeOfType(childCallee.property, "Identifier") && childCallee.property.name === "abort" && resolveExpressionKey(childCallee.object, context) === refCurrentKey) previousAbortCalls.push(child);
+	});
+	const safeOwnershipAssignments = ownershipAssignments.filter((assignment) => doMatchingNodesCoverEveryPathBeforeUsage(assignment, previousAbortCalls, usageFunction, context));
+	return doMatchingNodesCoverEveryPathBeforeUsage(usage.node, safeOwnershipAssignments, usageFunction, context);
+};
 const doesReleaseCallMatchUsage = (node, usage, context) => {
 	const callNode = isNodeOfType(node, "ChainExpression") ? node.expression : node;
 	if (!isNodeOfType(callNode, "CallExpression")) return false;
@@ -14681,6 +14909,7 @@ const doesReleaseCallMatchUsage = (node, usage, context) => {
 	if (usage.kind === "socket") return usage.handleKey !== null && releaseReceiverKey === usage.handleKey && (SOCKET_RELEASE_VERB_NAMES.has(releaseVerbName) || UNIVERSAL_RELEASE_VERB_NAMES.has(releaseVerbName));
 	if (usage.handleKey !== null && releaseReceiverKey === usage.handleKey && (releaseVerbName === "unsubscribe" || releaseVerbName === "unsub" || releaseVerbName === "close" || releaseVerbName === "unwatch" || releaseVerbName === "unlisten" || BOUND_RESOURCE_RELEASE_METHOD_NAMES.has(releaseVerbName))) return true;
 	if (releaseVerbName === "abort" && releaseReceiverKey === getListenerAbortControllerKey(usage, context)) return true;
+	if (releaseVerbName === "abort" && isRetainedAbortControllerRefRelease(callee.object, usage, context)) return true;
 	if (usage.receiverKey === null || releaseReceiverKey !== usage.receiverKey) return false;
 	const pairedVerbNames = usage.registrationVerbName ? PAIRED_RELEASE_VERB_NAMES_BY_REGISTRATION_VERB.get(usage.registrationVerbName) : null;
 	if (!pairedVerbNames || !matchesPairedReleaseVerb(releaseVerbName, pairedVerbNames)) return false;
@@ -14714,9 +14943,12 @@ const doesReleaseCallMatchUsage = (node, usage, context) => {
 		return isNodeOfType(handlerArgument, "Literal") && handlerArgument.value === null;
 	}
 	if (releaseVerbName === "removeEventListener" || releaseVerbName === "removeListener" || releaseVerbName === "off") {
-		const releaseHandler = callNode.arguments?.[1];
+		const usesUnaryListenerSignature = usage.registrationVerbName === "addListener" && isNodeOfType(usage.node, "CallExpression") && usage.node.arguments?.length === 1 && callNode.arguments?.length === 1;
+		const releaseHandler = usesUnaryListenerSignature ? callNode.arguments?.[0] : callNode.arguments?.[1];
 		if (!releaseHandler) return releaseVerbName === "off";
-		return usage.handlerKey !== null && resolveExpressionKey(releaseHandler, context) === usage.handlerKey;
+		const expectedHandlerKey = usesUnaryListenerSignature ? usage.eventKey : usage.handlerKey;
+		const registrationHandler = isNodeOfType(usage.node, "CallExpression") ? usage.node.arguments?.[usesUnaryListenerSignature ? 0 : 1] : null;
+		return expectedHandlerKey !== null && resolveExpressionKey(releaseHandler, context) === expectedHandlerKey || registrationHandler !== null && resolveStableValue(releaseHandler, context) === resolveStableValue(registrationHandler, context);
 	}
 	if (releaseVerbName === "unobserve" && usage.eventKey !== null) return releaseEventKey === usage.eventKey;
 	return true;
@@ -14729,8 +14961,7 @@ const isReturnedEffectCleanupFunction = (functionNode) => {
 		currentNode = parentNode;
 		parentNode = currentNode.parent;
 	}
-	if (!isNodeOfType(parentNode, "ReturnStatement") || parentNode.argument !== currentNode) return false;
-	const effectCallback = findEnclosingFunction$1(parentNode);
+	const effectCallback = isNodeOfType(parentNode, "ReturnStatement") && parentNode.argument === currentNode ? findEnclosingFunction$1(parentNode) : isNodeOfType(parentNode, "ArrowFunctionExpression") && parentNode.body === currentNode ? parentNode : null;
 	const effectCall = effectCallback?.parent;
 	return Boolean(effectCallback && isNodeOfType(effectCall, "CallExpression") && isHookCall$2(effectCall, CLEANUP_EFFECT_HOOK_NAMES));
 };
@@ -14742,13 +14973,188 @@ const isPotentiallyReachableFunction = (functionNode, context) => {
 	if (!symbol) return false;
 	return symbol.references.some((reference) => findEnclosingFunction$1(reference.identifier) !== functionNode);
 };
+const isJsxRefAttribute = (node) => isNodeOfType(node, "JSXAttribute") && isNodeOfType(node.name, "JSXIdentifier") && node.name.name === "ref";
+const isFunctionForwardedToReactRef = (functionNode, context) => {
+	const bindingIdentifier = getFunctionBindingIdentifier$1(functionNode);
+	if (!bindingIdentifier) return false;
+	const symbol = context.scopes.symbolFor(bindingIdentifier);
+	if (!symbol) return false;
+	return symbol.references.some((reference) => {
+		const referenceRoot = findTransparentExpressionRoot(reference.identifier);
+		const expressionContainer = referenceRoot.parent;
+		return Boolean(isNodeOfType(expressionContainer, "JSXExpressionContainer") && expressionContainer.expression === referenceRoot && isJsxRefAttribute(expressionContainer.parent));
+	});
+};
+const findRetainedDisposerStorages = (disposerFunction, usage, context) => {
+	if (!isFunctionLike$1(disposerFunction) || disposerFunction.async || disposerFunction.generator) return [];
+	const usageFunction = findEnclosingFunction$1(usage.node);
+	if (!usageFunction || !isFunctionLike$1(usageFunction)) return [];
+	const assignments = /* @__PURE__ */ new Map();
+	const collectAssignment = (expression) => {
+		const expressionRoot = findTransparentExpressionRoot(expression);
+		const assignment = expressionRoot.parent;
+		if (!isNodeOfType(assignment, "AssignmentExpression") || assignment.operator !== "=" || assignment.right !== expressionRoot) return;
+		const refSymbol = resolveReactRefSymbol(stripParenExpression(assignment.left), context.scopes);
+		const refCurrentKey = resolveExpressionKey(assignment.left, context);
+		const retainedFunction = findEnclosingFunction$1(assignment);
+		const assignmentStart = getRangeStart(assignment);
+		if (!refSymbol || !refCurrentKey || !retainedFunction || retainedFunction !== usageFunction || assignmentStart === null) return;
+		assignments.set(assignmentStart, {
+			assignmentNode: assignment,
+			refCurrentKey,
+			retainedFunction
+		});
+	};
+	collectAssignment(disposerFunction);
+	const bindingIdentifier = getFunctionBindingIdentifier$1(disposerFunction);
+	const symbol = bindingIdentifier ? context.scopes.symbolFor(bindingIdentifier) : null;
+	for (const reference of symbol?.references ?? []) collectAssignment(reference.identifier);
+	walkAst(usageFunction.body, (child) => {
+		if (child !== usageFunction.body && isFunctionLike$1(child)) return false;
+		if (isNodeOfType(child, "AssignmentExpression") && resolveStableValue(child.right, context) === disposerFunction) collectAssignment(child.right);
+	});
+	return [...assignments.values()];
+};
+const isRetainedDisposerStorageEstablished = (storage, usage, context) => doMatchingNodesCoverEveryPathBeforeUsage(usage.node, [storage.assignmentNode], storage.retainedFunction, context) || doMatchingNodesCoverEveryPathAfterUsage(usage.node, [storage.assignmentNode], context);
+const hasUnsafeRetainedDisposerOverwrite = (storage, usage, context) => {
+	let hasUnsafeOverwrite = false;
+	walkAst(storage.retainedFunction.body, (child) => {
+		if (hasUnsafeOverwrite) return false;
+		if (child !== storage.retainedFunction.body && isFunctionLike$1(child)) return false;
+		if (!isNodeOfType(child, "AssignmentExpression") || child === storage.assignmentNode || resolveExpressionKey(child.left, context) !== storage.refCurrentKey || !canNodeReachLaterNodeWithinFunction(usage.node, child, storage.retainedFunction, context)) return;
+		const storedValue = resolveStableValue(child.right, context);
+		if (!storedValue || !isFunctionLike$1(storedValue) || !doesCleanupFunctionReleaseUsage(storedValue, usage, context)) {
+			hasUnsafeOverwrite = true;
+			return false;
+		}
+	});
+	return hasUnsafeOverwrite;
+};
+const hasEffectCleanupInvocation = (storage, usage, context) => {
+	const componentFunction = findEnclosingFunction$1(storage.retainedFunction);
+	if (!componentFunction || !isFunctionLike$1(componentFunction)) return false;
+	const cleanupFunctionInvokesRef = (cleanupFunction) => {
+		if (!isFunctionLike$1(cleanupFunction)) return false;
+		let didFindCleanupCall = false;
+		walkAst(cleanupFunction.body, (child) => {
+			if (didFindCleanupCall) return false;
+			if (child !== cleanupFunction.body && isFunctionLike$1(child)) return false;
+			if (isNodeOfType(child, "CallExpression") && resolveExpressionKey(child.callee, context) === storage.refCurrentKey) {
+				const callRoot = findTransparentExpressionRoot(child);
+				const callStatement = callRoot.parent;
+				const isDirectBlockStatement = isNodeOfType(cleanupFunction.body, "BlockStatement") && isNodeOfType(callStatement, "ExpressionStatement") && callStatement.parent === cleanupFunction.body;
+				const isConciseBody = cleanupFunction.body === callRoot;
+				if ((isDirectBlockStatement || isConciseBody) && !hasUnprovenReturnBeforeRefOwnedRelease(cleanupFunction, child, storage.refCurrentKey, context)) {
+					didFindCleanupCall = true;
+					return false;
+				}
+			}
+		});
+		return didFindCleanupCall;
+	};
+	const effectReturnsCleanup = (effectCallback) => {
+		if (!isFunctionLike$1(effectCallback)) return false;
+		if (!isNodeOfType(effectCallback.body, "BlockStatement")) {
+			const cleanupFunction = resolveRefOwnedCleanupFunction(effectCallback.body, context);
+			return Boolean(cleanupFunction && cleanupFunctionInvokesRef(cleanupFunction));
+		}
+		const matchingReturns = [];
+		walkInsideStatementBlocks(effectCallback.body, (child) => {
+			if (!isNodeOfType(child, "ReturnStatement") || !child.argument) return;
+			const cleanupFunction = resolveRefOwnedCleanupFunction(child.argument, context);
+			if (!cleanupFunction || !cleanupFunctionInvokesRef(cleanupFunction)) return;
+			matchingReturns.push(child);
+		});
+		return doMatchingNodesCoverEveryPathFromFunctionEntry(effectCallback, matchingReturns, context);
+	};
+	let didFindInvocation = false;
+	walkAst(componentFunction.body, (child) => {
+		if (didFindInvocation) return false;
+		if (!isNodeOfType(child, "CallExpression") || findEnclosingFunction$1(child) !== componentFunction || !isReactApiCall(child, "useEffect", context.scopes)) return;
+		const effectCallback = getEffectCallback(child);
+		if (effectCallback && effectReturnsCleanup(effectCallback)) {
+			didFindInvocation = true;
+			return false;
+		}
+	});
+	return didFindInvocation;
+};
+const hasCallbackRefReplacementInvocation = (storage, usage, context) => {
+	const isReturnedCallbackRefShape = () => {
+		if (!isFunctionLike$1(storage.retainedFunction)) return false;
+		const callbackCall = findTransparentExpressionRoot(storage.retainedFunction).parent;
+		if (!isNodeOfType(callbackCall, "CallExpression") || !isReactApiCall(callbackCall, "useCallback", context.scopes)) return false;
+		const nodeParameter = storage.retainedFunction.params?.[0];
+		const nodeParameterKey = resolveExpressionKey(nodeParameter, context);
+		if (!nodeParameterKey || usage.receiverKey !== nodeParameterKey) return false;
+		const bindingIdentifier = getFunctionBindingIdentifier$1(storage.retainedFunction);
+		const symbol = bindingIdentifier ? context.scopes.symbolFor(bindingIdentifier) : null;
+		if (!Boolean(symbol?.references.some((reference) => {
+			const referenceRoot = findTransparentExpressionRoot(reference.identifier);
+			const property = referenceRoot.parent;
+			if (!isNodeOfType(property, "Property") || property.value !== referenceRoot || !isNodeOfType(property.parent, "ObjectExpression")) return false;
+			const returnedObject = findTransparentExpressionRoot(property.parent);
+			const returnStatement = returnedObject.parent;
+			if (!isNodeOfType(returnStatement, "ReturnStatement") || returnStatement.argument !== returnedObject) return false;
+			const hookFunction = findEnclosingFunction$1(returnStatement);
+			return Boolean(hookFunction && getFunctionBindingIdentifier$1(hookFunction)?.name.startsWith("use"));
+		}))) return false;
+		const usageStart = getRangeStart(usage.node);
+		if (usageStart === null) return false;
+		let hasNullExit = false;
+		walkAst(storage.retainedFunction.body, (child) => {
+			if (hasNullExit) return false;
+			if (child !== storage.retainedFunction.body && isFunctionLike$1(child)) return false;
+			if (!isNodeOfType(child, "IfStatement") || (getRangeStart(child) ?? usageStart) >= usageStart) return;
+			const test = stripParenExpression(child.test);
+			if (!isNodeOfType(test, "UnaryExpression") || test.operator !== "!" || resolveExpressionKey(test.argument, context) !== nodeParameterKey) return;
+			const consequent = child.consequent;
+			hasNullExit = isNodeOfType(consequent, "ReturnStatement") || isNodeOfType(consequent, "BlockStatement") && consequent.body.some((statement) => isNodeOfType(statement, "ReturnStatement"));
+			if (hasNullExit) return false;
+		});
+		return hasNullExit;
+	};
+	if (!isFunctionForwardedToReactRef(storage.retainedFunction, context) && !isReturnedCallbackRefShape()) return false;
+	const cleanupCalls = [];
+	walkAst(storage.retainedFunction.body, (child) => {
+		if (child !== storage.retainedFunction.body && isFunctionLike$1(child)) return false;
+		if (isNodeOfType(child, "CallExpression") && resolveExpressionKey(child.callee, context) === storage.refCurrentKey) cleanupCalls.push(child);
+	});
+	return doMatchingNodesCoverEveryPathBeforeUsage(usage.node, cleanupCalls, storage.retainedFunction, context);
+};
+const isRetainedDisposerRefRelease = (releaseNode, usage, context) => {
+	const disposerFunction = findEnclosingFunction$1(releaseNode);
+	if (!disposerFunction) return false;
+	return findRetainedDisposerStorages(disposerFunction, usage, context).some((storage) => isRetainedDisposerStorageEstablished(storage, usage, context) && !hasUnsafeRetainedDisposerOverwrite(storage, usage, context) && (hasEffectCleanupInvocation(storage, usage, context) || hasCallbackRefReplacementInvocation(storage, usage, context)));
+};
+const isSelfReleasingListenerRelease = (releaseNode, releaseFunction, usage, context) => {
+	if (usage.kind !== "subscribe" || usage.registrationVerbName !== "addEventListener" || usage.receiverKey === null || usage.eventKey === null || !isNodeOfType(usage.node, "CallExpression") || !isFunctionLike$1(releaseFunction) || releaseFunction.async || releaseFunction.generator || !isNodeOfType(releaseFunction.body, "BlockStatement") || !doMatchingNodesCoverEveryPathFromFunctionEntry(releaseFunction, [releaseNode], context)) return false;
+	const registrationCapture = resolveEventListenerCapture(usage.node.arguments?.[2], { allowIndeterminateEntries: true });
+	const releaseCall = isNodeOfType(releaseNode, "ChainExpression") ? releaseNode.expression : releaseNode;
+	if (!isNodeOfType(releaseCall, "CallExpression")) return false;
+	const releaseCapture = resolveEventListenerCapture(releaseCall.arguments?.[2], { allowIndeterminateEntries: true });
+	if (registrationCapture === null || releaseCapture === null || registrationCapture !== releaseCapture) return false;
+	const ownerFunction = findEnclosingFunction$1(releaseFunction);
+	if (!ownerFunction || !isFunctionLike$1(ownerFunction)) return false;
+	const triggerRegistrations = [];
+	walkAst(ownerFunction.body, (child) => {
+		if (child !== ownerFunction.body && isFunctionLike$1(child)) return false;
+		if (!isNodeOfType(child, "CallExpression")) return;
+		const registrationDetails = getCallRegistrationDetails(child, context);
+		if (registrationDetails.registrationVerbName === "addEventListener" && registrationDetails.receiverKey === usage.receiverKey && resolveStableValue(child.arguments?.[1], context) === releaseFunction) triggerRegistrations.push(child);
+	});
+	if (triggerRegistrations.some((triggerRegistration) => triggerRegistration === usage.node)) return true;
+	return doMatchingNodesCoverEveryPathAfterUsage(usage.node, triggerRegistrations, context) || doMatchingNodesCoverEveryPathBeforeUsage(usage.node, triggerRegistrations, ownerFunction, context);
+};
 const isReleaseReachableForUsage = (releaseNode, usage, context) => {
 	if (!isNodeReachableWithinFunction(releaseNode, context)) return false;
 	const releaseFunction = findEnclosingFunction$1(releaseNode);
 	if (!releaseFunction) return true;
 	if (releaseFunction === findEnclosingFunction$1(usage.node)) return true;
+	if (isRetainedDisposerRefRelease(releaseNode, usage, context)) return true;
 	const usageFunction = findEnclosingFunction$1(usage.node);
 	if (usageFunction && isFunctionLike$1(usageFunction) && getAssignedReactRefSymbol(usageFunction, context) && isCleanupFunctionReferencedByReturn(usageFunction, releaseFunction, context)) return isReactRefCallbackCleanupOwnedByEffect(usageFunction, releaseFunction, usage, context);
+	if (isSelfReleasingListenerRelease(releaseNode, releaseFunction, usage, context)) return true;
 	return isPotentiallyReachableFunction(releaseFunction, context);
 };
 const fileContainsReleaseForUsage = (usage, context) => {
@@ -15016,6 +15422,11 @@ const doesResourceResultEscape = (resourceNode, allowReturnedResourceEscape, all
 			parentNode = currentNode.parent;
 			continue;
 		}
+		if (isNodeOfType(parentNode, "ConditionalExpression") && (parentNode.consequent === currentNode || parentNode.alternate === currentNode) || isNodeOfType(parentNode, "LogicalExpression") && (parentNode.right === currentNode || parentNode.left === currentNode && parentNode.operator !== "&&")) {
+			currentNode = parentNode;
+			parentNode = currentNode.parent;
+			continue;
+		}
 		if (isNodeOfType(parentNode, "VariableDeclarator") && parentNode.init === currentNode && isNodeOfType(parentNode.id, "Identifier") && isNodeOfType(parentNode.parent, "VariableDeclaration") && parentNode.parent.kind === "const") {
 			const ownerFunction = findEnclosingFunction$1(resourceNode);
 			const resourceSymbol = context.scopes.symbolFor(parentNode.id);
@@ -16877,7 +17288,7 @@ const collectCaptureDepKeys = (callback, scopes, declaredExactBindingKeys, allow
 				keys.add(depKey);
 				continue;
 			}
-			const identitySourceKeys = resolveReactiveIdentitySourceKeys(symbol, scopes);
+			const identitySourceKeys = resolvePureCalledFunctionSourceKeys(reference, symbol, scopes) ?? resolveRenderDerivedMutableSourceKeys(reference, symbol, scopes) ?? resolveReactiveIdentitySourceKeys(symbol, scopes);
 			if (identitySourceKeys) {
 				if (identitySourceKeys.size === 0) stableCapturedNames.add(depKey);
 				for (const identitySourceKey of identitySourceKeys) keys.add(identitySourceKey);
@@ -16960,6 +17371,161 @@ const resolveReactiveIdentitySourceKeys = (symbol, scopes) => {
 	if (symbol.kind !== "const" || !symbol.initializer || !isNodeOfType(symbol.declarationNode, "VariableDeclarator") || symbol.declarationNode.id !== symbol.bindingIdentifier || symbol.references.some((reference) => reference.flag !== "read")) return null;
 	return resolveIdentitySourceKeysFromExpression(symbol.initializer, scopes, new Set([symbol.id]));
 };
+const isPureDerivedExpression = (expression) => {
+	const candidate = unwrapExpression$3(expression);
+	if (isNodeOfType(candidate, "Literal") || isNodeOfType(candidate, "Identifier")) return true;
+	if (isNodeOfType(candidate, "MemberExpression")) return isPureDerivedExpression(candidate.object) && (!candidate.computed || isPureDerivedExpression(candidate.property));
+	if (isNodeOfType(candidate, "BinaryExpression") || isNodeOfType(candidate, "LogicalExpression")) return isPureDerivedExpression(candidate.left) && isPureDerivedExpression(candidate.right);
+	if (isNodeOfType(candidate, "UnaryExpression")) return candidate.operator !== "delete" && isPureDerivedExpression(candidate.argument);
+	if (isNodeOfType(candidate, "ConditionalExpression")) return isPureDerivedExpression(candidate.test) && isPureDerivedExpression(candidate.consequent) && isPureDerivedExpression(candidate.alternate);
+	if (isNodeOfType(candidate, "TemplateLiteral")) return candidate.expressions.every((nestedExpression) => isPureDerivedExpression(nestedExpression));
+	return false;
+};
+const isPureDerivedStatement = (statement) => {
+	if (isNodeOfType(statement, "BlockStatement")) return statement.body.every((nestedStatement) => isPureDerivedStatement(nestedStatement));
+	if (isNodeOfType(statement, "ReturnStatement")) return !statement.argument || isPureDerivedExpression(statement.argument);
+	if (isNodeOfType(statement, "IfStatement")) return isPureDerivedExpression(statement.test) && isPureDerivedStatement(statement.consequent) && (!statement.alternate || isPureDerivedStatement(statement.alternate));
+	return false;
+};
+const isPureDerivedFunction = (functionNode) => {
+	if (!isNodeOfType(functionNode, "FunctionDeclaration") && !isNodeOfType(functionNode, "FunctionExpression") && !isNodeOfType(functionNode, "ArrowFunctionExpression")) return false;
+	if (functionNode.async || functionNode.generator) return false;
+	return isNodeOfType(functionNode.body, "BlockStatement") ? isPureDerivedStatement(functionNode.body) : isPureDerivedExpression(functionNode.body);
+};
+const resolvePureCalledFunctionSourceKeys = (reference, symbol, scopes) => {
+	if (symbol.references.some((symbolReference) => symbolReference.flag !== "read")) return null;
+	const referenceRoot = findTransparentExpressionRoot(reference.identifier);
+	const callExpression = referenceRoot.parent;
+	if (!isNodeOfType(callExpression, "CallExpression") || callExpression.callee !== referenceRoot) return null;
+	const functionNode = getFunctionValueNode(symbol);
+	if (!functionNode || !isPureDerivedFunction(functionNode)) return null;
+	const sourceKeys = /* @__PURE__ */ new Set();
+	for (const capturedReference of closureCaptures(functionNode, scopes)) {
+		const capturedSymbol = capturedReference.resolvedSymbol;
+		if (!capturedSymbol || capturedSymbol.id === symbol.id) continue;
+		if (isOutsideAllFunctions(capturedSymbol) || symbolHasStableValue(capturedSymbol, scopes)) continue;
+		const capturedKey = computeDepKey(capturedReference);
+		if (!capturedKey) return null;
+		if (capturedKey === capturedSymbol.name) {
+			const nestedSourceKeys = resolveReactiveIdentitySourceKeys(capturedSymbol, scopes);
+			if (nestedSourceKeys) {
+				for (const nestedSourceKey of nestedSourceKeys) sourceKeys.add(nestedSourceKey);
+				continue;
+			}
+		}
+		sourceKeys.add(capturedKey);
+	}
+	return sourceKeys.size > 0 ? sourceKeys : null;
+};
+const mergeDerivedExpressionSourceKeys = (expressions, scopes, visitedSymbolIds) => {
+	const sourceKeys = /* @__PURE__ */ new Set();
+	for (const expression of expressions) {
+		const expressionSourceKeys = resolveDerivedExpressionSourceKeys(expression, scopes, visitedSymbolIds);
+		if (!expressionSourceKeys) return null;
+		for (const expressionSourceKey of expressionSourceKeys) sourceKeys.add(expressionSourceKey);
+	}
+	return sourceKeys;
+};
+const resolveDerivedExpressionSourceKeys = (expression, scopes, visitedSymbolIds) => {
+	const candidate = unwrapExpression$3(expression);
+	if (isNodeOfType(candidate, "Literal")) return /* @__PURE__ */ new Set();
+	if (isNodeOfType(candidate, "Identifier")) {
+		if (scopes.isGlobalReference(candidate)) return /* @__PURE__ */ new Set();
+		const sourceSymbol = scopes.symbolFor(candidate);
+		if (!sourceSymbol) return null;
+		if (isOutsideAllFunctions(sourceSymbol) || symbolHasStableValue(sourceSymbol, scopes)) return /* @__PURE__ */ new Set();
+		if (sourceSymbol.kind === "const" && sourceSymbol.initializer && isNodeOfType(sourceSymbol.declarationNode, "VariableDeclarator") && sourceSymbol.declarationNode.id === sourceSymbol.bindingIdentifier && sourceSymbol.references.every((sourceReference) => sourceReference.flag === "read") && !visitedSymbolIds.has(sourceSymbol.id)) {
+			visitedSymbolIds.add(sourceSymbol.id);
+			const sourceKeys = resolveDerivedExpressionSourceKeys(sourceSymbol.initializer, scopes, visitedSymbolIds);
+			visitedSymbolIds.delete(sourceSymbol.id);
+			if (sourceKeys) return sourceKeys;
+		}
+		return new Set([sourceSymbol.name]);
+	}
+	if (isNodeOfType(candidate, "MemberExpression")) {
+		if (hasComputedMemberExpression(candidate)) return null;
+		const sourceKey = stringifyMemberChain(candidate);
+		const rootIdentifier = getMemberRootIdentifier(candidate);
+		const rootSymbol = rootIdentifier ? scopes.symbolFor(rootIdentifier) : null;
+		if (!sourceKey || !rootSymbol) return null;
+		if (isOutsideAllFunctions(rootSymbol) || symbolHasStableValue(rootSymbol, scopes)) return /* @__PURE__ */ new Set();
+		return new Set([sourceKey]);
+	}
+	if (isNodeOfType(candidate, "BinaryExpression") || isNodeOfType(candidate, "LogicalExpression")) return mergeDerivedExpressionSourceKeys([candidate.left, candidate.right], scopes, visitedSymbolIds);
+	if (isNodeOfType(candidate, "UnaryExpression") && candidate.operator !== "delete") return resolveDerivedExpressionSourceKeys(candidate.argument, scopes, visitedSymbolIds);
+	if (isNodeOfType(candidate, "ConditionalExpression")) return mergeDerivedExpressionSourceKeys([
+		candidate.test,
+		candidate.consequent,
+		candidate.alternate
+	], scopes, visitedSymbolIds);
+	if (isNodeOfType(candidate, "TemplateLiteral")) return mergeDerivedExpressionSourceKeys(candidate.expressions, scopes, visitedSymbolIds);
+	if (isNodeOfType(candidate, "NewExpression")) {
+		const callee = unwrapExpression$3(candidate.callee);
+		if (!isNodeOfType(callee, "Identifier") || callee.name !== "Error" || !scopes.isGlobalReference(callee)) return null;
+		const argumentsToAnalyze = [];
+		for (const argument of candidate.arguments) {
+			if (!isAstNode(argument) || isNodeOfType(argument, "SpreadElement")) return null;
+			argumentsToAnalyze.push(argument);
+		}
+		return mergeDerivedExpressionSourceKeys(argumentsToAnalyze, scopes, visitedSymbolIds);
+	}
+	return null;
+};
+const resolveWriteControlSourceKeys = (assignment, boundaryFunction, scopes) => {
+	const sourceKeys = /* @__PURE__ */ new Set();
+	let currentNode = assignment;
+	while (currentNode.parent && currentNode.parent !== boundaryFunction) {
+		const parentNode = currentNode.parent;
+		if (isNodeOfType(parentNode, "IfStatement")) {
+			if (parentNode.test === currentNode) return null;
+			const testSourceKeys = resolveDerivedExpressionSourceKeys(parentNode.test, scopes, /* @__PURE__ */ new Set());
+			if (!testSourceKeys) return null;
+			for (const testSourceKey of testSourceKeys) sourceKeys.add(testSourceKey);
+		} else if (!isNodeOfType(parentNode, "ExpressionStatement") && !isNodeOfType(parentNode, "BlockStatement")) return null;
+		currentNode = parentNode;
+	}
+	return currentNode.parent === boundaryFunction ? sourceKeys : null;
+};
+const isReadOnlyInitialStateUse = (referenceNode, scopes) => {
+	const referenceRoot = findTransparentExpressionRoot(referenceNode);
+	const callExpression = referenceRoot.parent;
+	return isNodeOfType(callExpression, "CallExpression") && callExpression.arguments.some((argument) => argument === referenceRoot) && isReactApiCall(callExpression, "useState", scopes, {
+		allowGlobalReactNamespace: true,
+		allowUnboundBareCalls: true,
+		resolveNamedAliases: true
+	});
+};
+const resolveRenderDerivedMutableSourceKeys = (capturedReference, symbol, scopes) => {
+	if (symbol.kind !== "let" || !isNodeOfType(symbol.declarationNode, "VariableDeclarator") || symbol.declarationNode.id !== symbol.bindingIdentifier) return null;
+	const boundaryFunction = findEnclosingFunction$1(symbol.bindingIdentifier);
+	if (!boundaryFunction) return null;
+	const capturingFunction = findEnclosingFunction$1(capturedReference.identifier);
+	if (!capturingFunction || capturingFunction === boundaryFunction) return null;
+	const sourceKeys = /* @__PURE__ */ new Set();
+	if (symbol.initializer) {
+		const initializerSourceKeys = resolveDerivedExpressionSourceKeys(symbol.initializer, scopes, new Set([symbol.id]));
+		if (!initializerSourceKeys) return null;
+		for (const initializerSourceKey of initializerSourceKeys) sourceKeys.add(initializerSourceKey);
+	}
+	let writeCount = 0;
+	for (const symbolReference of symbol.references) {
+		if (symbolReference.flag === "read") {
+			if (findEnclosingFunction$1(symbolReference.identifier) !== capturingFunction && !isReadOnlyInitialStateUse(symbolReference.identifier, scopes)) return null;
+			continue;
+		}
+		if (symbolReference.flag !== "write") return null;
+		const referenceRoot = findTransparentExpressionRoot(symbolReference.identifier);
+		const assignment = referenceRoot.parent;
+		if (!isNodeOfType(assignment, "AssignmentExpression") || assignment.operator !== "=" || assignment.left !== referenceRoot || findEnclosingFunction$1(referenceRoot) !== boundaryFunction) return null;
+		const assignmentSourceKeys = resolveDerivedExpressionSourceKeys(assignment.right, scopes, new Set([symbol.id]));
+		const controlSourceKeys = resolveWriteControlSourceKeys(assignment, boundaryFunction, scopes);
+		if (!assignmentSourceKeys || !controlSourceKeys) return null;
+		for (const assignmentSourceKey of assignmentSourceKeys) sourceKeys.add(assignmentSourceKey);
+		for (const controlSourceKey of controlSourceKeys) sourceKeys.add(controlSourceKey);
+		writeCount += 1;
+	}
+	return writeCount > 0 && sourceKeys.size > 0 ? sourceKeys : null;
+};
 const isUseCallbackResultDep = (node, scopes) => {
 	const rootSymbol = getRootSymbol(node, scopes);
 	const initializer = rootSymbol?.initializer ? unwrapExpression$3(rootSymbol.initializer) : null;
@@ -27251,7 +27817,11 @@ const mouseEventsHaveKeyEvents = defineRule({
 //#region src/plugin/utils/has-directive.ts
 const hasDirective = (programNode, directive) => {
 	if (!isNodeOfType(programNode, "Program")) return false;
-	return Boolean(programNode.body?.some((statement) => isNodeOfType(statement, "ExpressionStatement") && isNodeOfType(statement.expression, "Literal") && statement.expression.value === directive));
+	for (const statement of programNode.body) {
+		if (!isNodeOfType(statement, "ExpressionStatement") || statement.directive === void 0) return false;
+		if (statement.directive === directive) return true;
+	}
+	return false;
 };
 //#endregion
 //#region src/plugin/rules/nextjs/nextjs-async-client-component.ts
@@ -29183,7 +29753,7 @@ const nextjsNoVercelOgImport = defineRule({
 //#endregion
 //#region src/plugin/rules/a11y/no-access-key.ts
 const MESSAGE$39 = "Screen reader users can lose their shortcuts because `accessKey` clashes with them, so remove it.";
-const isUndefinedIdentifier = (expression) => isNodeOfType(expression, "Identifier") && expression.name === "undefined";
+const isUndefinedIdentifier$1 = (expression) => isNodeOfType(expression, "Identifier") && expression.name === "undefined";
 const noAccessKey = defineRule({
 	id: "no-access-key",
 	title: "accessKey attribute used",
@@ -29208,7 +29778,7 @@ const noAccessKey = defineRule({
 			if (isNodeOfType(attributeValue, "JSXExpressionContainer")) {
 				const expression = attributeValue.expression;
 				if (!expression || expression.type === "JSXEmptyExpression") return;
-				if (isUndefinedIdentifier(expression)) return;
+				if (isUndefinedIdentifier$1(expression)) return;
 				context.report({
 					node: accessKey,
 					message: MESSAGE$39
@@ -29973,6 +30543,12 @@ const isReactNamespaceImportReference = (ref) => Boolean(ref?.resolved?.defs.som
 	const importDeclaration = declarationNode.parent;
 	return Boolean(importDeclaration && isNodeOfType(importDeclaration, "ImportDeclaration") && isNodeOfType(importDeclaration.source, "Literal") && importDeclaration.source.value === "react");
 }));
+const isReactNamespaceReceiver = (analysis, node) => {
+	const receiver = stripParenExpression(node);
+	if (!isNodeOfType(receiver, "Identifier")) return false;
+	const namespaceReference = getRef(analysis, receiver);
+	return namespaceReference?.resolved ? isReactNamespaceImportReference(namespaceReference) : receiver.name === "React";
+};
 const isGenuineReactHookDeclarator = (analysis, declarator, hookName) => {
 	if (!isNodeOfType(declarator, "VariableDeclarator") || !isNodeOfType(declarator.init, "CallExpression")) return false;
 	const callee = stripParenExpression(declarator.init.callee);
@@ -29981,24 +30557,20 @@ const isGenuineReactHookDeclarator = (analysis, declarator, hookName) => {
 		if (!reference?.resolved) return callee.name === hookName;
 		return isReactNamedImportReference(reference, hookName);
 	}
-	if (!isNodeOfType(callee, "MemberExpression") || callee.computed || !isNodeOfType(callee.object, "Identifier") || !isNodeOfType(callee.property, "Identifier") || callee.property.name !== hookName) return false;
-	const namespaceReference = getRef(analysis, callee.object);
-	if (!namespaceReference?.resolved) return callee.object.name === "React";
-	return isReactNamespaceImportReference(namespaceReference);
+	if (!isNodeOfType(callee, "MemberExpression") || callee.computed || !isNodeOfType(callee.property, "Identifier") || callee.property.name !== hookName) return false;
+	return isReactNamespaceReceiver(analysis, callee.object);
 };
 const isHookCallee$1 = (analysis, node, hookName) => {
 	if (!node) return false;
 	if (isNodeOfType(node, "Identifier")) {
 		if (node.name === hookName) return true;
 		if (isReactNamedImportReference(getRef(analysis, node), hookName)) return true;
-		const parent = node.parent;
-		if (parent && isNodeOfType(parent, "MemberExpression") && isNodeOfType(parent.object, "Identifier") && parent.object.name === "React" && isNodeOfType(parent.property, "Identifier") && parent.property.name === hookName) return true;
+		const receiverRoot = findTransparentExpressionRoot(node);
+		const parent = receiverRoot.parent;
+		if (parent && isNodeOfType(parent, "MemberExpression") && parent.object === receiverRoot && isReactNamespaceReceiver(analysis, node) && isNodeOfType(parent.property, "Identifier") && parent.property.name === hookName) return true;
 		return false;
 	}
-	if (isNodeOfType(node, "MemberExpression")) {
-		const receiver = stripParenExpression(node.object);
-		return isNodeOfType(receiver, "Identifier") && receiver.name === "React" && isNodeOfType(node.property, "Identifier") && node.property.name === hookName;
-	}
+	if (isNodeOfType(node, "MemberExpression")) return isReactNamespaceReceiver(analysis, node.object) && isNodeOfType(node.property, "Identifier") && node.property.name === hookName;
 	return false;
 };
 const isUseEffect = (node) => {
@@ -30422,7 +30994,88 @@ const isIndependentWriterIdentifier = (componentFunction, identifier, includeDef
 	if (HANDLER_BINDING_NAME_PATTERN.test(bindingName)) return true;
 	return isSetterWiredToJsxHandler(componentFunction, bindingName);
 };
-const hasUserInputSetterWriter = (setterRef, effectNode, includeDeferredWriters = false) => {
+const isSynchronousFunction = (functionNode) => {
+	const functionMetadata = functionNode;
+	return functionMetadata.async !== true && functionMetadata.generator !== true;
+};
+const findBindingVariable = (analysis, bindingIdentifier) => {
+	for (const scope of analysis.scopeManager.scopes) for (const variable of scope.variables) if (variable.identifiers.includes(bindingIdentifier)) return variable;
+	return null;
+};
+const getImmutableFunctionVariable = (analysis, componentFunction, functionNode) => {
+	if (!isSynchronousFunction(functionNode) || !isAstDescendant(functionNode, componentFunction)) return null;
+	const bindingIdentifier = getFunctionBindingIdentifier$1(functionNode);
+	if (!bindingIdentifier) return null;
+	const variable = findBindingVariable(analysis, bindingIdentifier);
+	if (!variable || variable.defs.length !== 1 || variable.references.some((reference) => reference.isWrite() && !reference.init)) return null;
+	const definition = variable.defs[0];
+	if (definition.type === "FunctionName") return definition.node === functionNode ? variable : null;
+	if (definition.type !== "Variable") return null;
+	const declarator = definition.node;
+	if (!isNodeOfType(declarator, "VariableDeclarator") || !isNodeOfType(declarator.parent, "VariableDeclaration") || declarator.parent.kind !== "const") return null;
+	if (declarator.init === functionNode) return variable;
+	if (isNodeOfType(declarator.init, "CallExpression") && declarator.init.arguments?.[0] === functionNode && isGenuineReactHookDeclarator(analysis, declarator, "useCallback")) return variable;
+	return null;
+};
+const getJsxEventValueAttribute = (identifier) => {
+	const expression = findTransparentExpressionRoot(identifier);
+	const expressionContainer = expression.parent;
+	if (!isNodeOfType(expressionContainer, "JSXExpressionContainer") || expressionContainer.expression !== expression) return null;
+	const attribute = expressionContainer.parent;
+	if (!isNodeOfType(attribute, "JSXAttribute")) return null;
+	const attributeName = getJsxAttributeName(attribute.name);
+	return attributeName && isEventHandlerName(attributeName) ? attribute : null;
+};
+const getInlineJsxEventCallbackAttribute = (callExpression) => {
+	const callbackFunction = findEnclosingFunction$1(callExpression);
+	if (!callbackFunction || !isSynchronousFunction(callbackFunction)) return null;
+	return getJsxEventValueAttribute(callbackFunction);
+};
+const isReactHookDependencyReference = (identifier) => {
+	const expression = findTransparentExpressionRoot(identifier);
+	const dependencyArray = expression.parent;
+	if (!isNodeOfType(dependencyArray, "ArrayExpression") || !(dependencyArray.elements ?? []).includes(expression)) return false;
+	const hookCall = dependencyArray.parent;
+	if (!isNodeOfType(hookCall, "CallExpression") || hookCall.arguments?.[1] !== dependencyArray) return false;
+	const callee = hookCall.callee;
+	if (isNodeOfType(callee, "Identifier")) return /^use[A-Z0-9]/.test(callee.name);
+	return Boolean(isNodeOfType(callee, "MemberExpression") && !callee.computed && isNodeOfType(callee.property, "Identifier") && /^use[A-Z0-9]/.test(callee.property.name));
+};
+const hasReachableJsxEventCallPath = (analysis, context, componentFunction, functionVariable, visitedVariables) => {
+	if (visitedVariables.has(functionVariable)) return false;
+	const nextVisitedVariables = new Set(visitedVariables).add(functionVariable);
+	const callExpressions = [];
+	let hasDirectJsxEventReference = false;
+	for (const reference of functionVariable.references) {
+		if (reference.init) continue;
+		const identifier = reference.identifier;
+		if (reference.isWrite()) return false;
+		const jsxEventValueAttribute = getJsxEventValueAttribute(identifier);
+		if (jsxEventValueAttribute) {
+			if (isNodeReachableWithinFunction(jsxEventValueAttribute, context)) hasDirectJsxEventReference = true;
+			continue;
+		}
+		if (isReactHookDependencyReference(identifier)) continue;
+		const callExpression = getCallExpr(reference);
+		if (!callExpression) return false;
+		const jsxEventCallbackAttribute = getInlineJsxEventCallbackAttribute(callExpression);
+		if (jsxEventCallbackAttribute) {
+			if (isNodeReachableWithinFunction(callExpression, context) && isNodeReachableWithinFunction(jsxEventCallbackAttribute, context)) hasDirectJsxEventReference = true;
+			continue;
+		}
+		callExpressions.push(callExpression);
+	}
+	if (hasDirectJsxEventReference) return true;
+	for (const callExpression of callExpressions) {
+		if (!isNodeReachableWithinFunction(callExpression, context)) continue;
+		const callerFunction = findEnclosingFunction$1(callExpression);
+		if (!callerFunction || callerFunction === componentFunction) continue;
+		const callerVariable = getImmutableFunctionVariable(analysis, componentFunction, callerFunction);
+		if (callerVariable && hasReachableJsxEventCallPath(analysis, context, componentFunction, callerVariable, nextVisitedVariables)) return true;
+	}
+	return false;
+};
+const hasUserInputSetterWriter = (analysis, context, setterRef, effectNode, includeDeferredWriters = false) => {
 	if (!setterRef.resolved) return false;
 	const componentFunction = findEnclosingFunction$1(effectNode);
 	if (!componentFunction) return false;
@@ -30431,6 +31084,11 @@ const hasUserInputSetterWriter = (setterRef, effectNode, includeDeferredWriters
 		const identifier = reference.identifier;
 		if (isAstDescendant(identifier, effectNode)) continue;
 		if (isIndependentWriterIdentifier(componentFunction, identifier, includeDeferredWriters)) return true;
+		if (!isNodeReachableWithinFunction(identifier, context)) continue;
+		const writerFunction = findEnclosingFunction$1(identifier);
+		if (!writerFunction || writerFunction === componentFunction) continue;
+		const writerVariable = getImmutableFunctionVariable(analysis, componentFunction, writerFunction);
+		if (writerVariable && hasReachableJsxEventCallPath(analysis, context, componentFunction, writerVariable, /* @__PURE__ */ new Set())) return true;
 	}
 	return false;
 };
@@ -31320,7 +31978,7 @@ const areInMutuallyExclusiveBranches = (leftNode, rightNode) => {
 	}
 	return false;
 };
-const collectEffectStateWriteFacts = (analysis, effectNode, currentFilename) => {
+const collectEffectStateWriteFacts = (analysis, context, effectNode, currentFilename) => {
 	const frames = collectBoundedEffectExecutionFrames(analysis, effectNode, currentFilename);
 	if (frames.length === 0) return [];
 	const effectHasCleanup = hasCleanup(analysis, effectNode);
@@ -31350,7 +32008,7 @@ const collectEffectStateWriteFacts = (analysis, effectNode, currentFilename) =>
 			for (const returnedExpression of returnedExpressions) mergeEvidence(valueEvidence, collectValueEvidence(analysis, returnedExpression, updaterFrame, remainingValueCallFrames));
 		} else valueEvidence = collectValueEvidence(analysis, writtenValue, frame, remainingValueCallFrames);
 		const sourceReferences = [...valueEvidence.sourceReferences].filter((sourceReference) => getUseStateDecl(analysis, sourceReference) !== stateDeclarator);
-		const hasIndependentWriter = hasUserInputSetterWriter(setterReference, effectNode, true);
+		const hasIndependentWriter = hasUserInputSetterWriter(analysis, context, setterReference, effectNode, true);
 		const doesMatchStateInitializer = matchesStateInitializer(analysis, callExpression, stateDeclarator);
 		if (effectHasCleanup && (frame.isDeferred || valueEvidence.hasUnknownSource || valueEvidence.hasDeferredIntroducedValue || valueEvidence.readsExternalValue)) cleanupManagedStateDeclarators.add(stateDeclarator);
 		const isRenderKnownCopy = sourceReferences.length > 0 && !frame.isDeferred && !valueEvidence.hasUnknownSource && !valueEvidence.hasDeferredIntroducedValue && !valueEvidence.readsExternalValue && !hasIndependentWriter;
@@ -31391,7 +32049,7 @@ const noAdjustStateOnPropChange = defineRule({
 		const dependencyReferences = getEffectDepsRefs(analysis, node);
 		if (!dependencyReferences) return;
 		if (!dependencyReferences.flatMap((reference) => isState(analysis, reference) ? [] : getUpstreamRefs(analysis, reference)).some((reference) => isProp(analysis, reference))) return;
-		for (const fact of collectEffectStateWriteFacts(analysis, node, context.filename)) {
+		for (const fact of collectEffectStateWriteFacts(analysis, context, node, context.filename)) {
 			if (!fact.isRenderKnownCopy || fact.resetsSourceState) continue;
 			context.report({
 				node: fact.callExpression,
@@ -34078,6 +34736,7 @@ const noChainStateUpdates = defineRule({
 	id: "no-chain-state-updates",
 	title: "State updates chained through effects",
 	severity: "warn",
+	disabledWhen: ["react:18"],
 	tags: ["test-noise"],
 	recommendation: "Set all the related state together in the event handler that starts it, instead of having one useEffect react to a state change and set more state. See https://react.dev/learn/you-might-not-need-an-effect#chains-of-computations",
 	create: (context) => ({ CallExpression(node) {
@@ -35964,7 +36623,7 @@ const noDerivedState = defineRule({
 				if (!isUseEffect(node)) return;
 				const analysis = getProgramAnalysis(node);
 				if (!analysis) return;
-				for (const fact of collectEffectStateWriteFacts(analysis, node, context.filename)) {
+				for (const fact of collectEffectStateWriteFacts(analysis, context, node, context.filename)) {
 					if (!fact.isRenderKnownCopy || fact.resetsSourceState) continue;
 					reportStateWrite(fact.callExpression, fact.stateDeclarator);
 				}
@@ -35984,7 +36643,7 @@ const noDerivedStateEffect = defineRule({
 		if (!isHookCall$2(node, EFFECT_HOOK_NAMES$1)) return;
 		const analysis = getProgramAnalysis(node);
 		if (!analysis) return;
-		if (!collectEffectStateWriteFacts(analysis, node, context.filename).find((fact) => fact.isRenderKnownCopy && !fact.resetsSourceState)) return;
+		if (!collectEffectStateWriteFacts(analysis, context, node, context.filename).find((fact) => fact.isRenderKnownCopy && !fact.resetsSourceState)) return;
 		context.report({
 			node,
 			message: "You pay an extra render for state you can derive from other values."
@@ -36460,9 +37119,20 @@ const noDidMountSetState = defineRule({
 	}
 });
 //#endregion
+//#region src/plugin/utils/find-enclosing-class.ts
+const findEnclosingClass = (node) => {
+	let ancestor = node.parent;
+	while (ancestor) {
+		if (isNodeOfType(ancestor, "ClassDeclaration") || isNodeOfType(ancestor, "ClassExpression")) return ancestor;
+		ancestor = ancestor.parent ?? null;
+	}
+	return null;
+};
+//#endregion
 //#region src/plugin/rules/react-builtins/no-did-update-set-state.ts
 const LIFECYCLE_NAMES$1 = new Set(["componentDidUpdate"]);
 const MESSAGE$27 = "Calling setState in componentDidUpdate can trigger another update immediately, loop forever, and freeze the component.";
+const DIFFERENCE_OPERATORS = new Set(["!=", "!=="]);
 const EQUALITY_OPERATORS = new Set([
 	"==",
 	"===",
@@ -36474,6 +37144,8 @@ const FUNCTION_NODE_TYPES = new Set([
 	"FunctionExpression",
 	"ArrowFunctionExpression"
 ]);
+const CLASS_NODE_TYPES = new Set(["ClassDeclaration", "ClassExpression"]);
+const callbackRefFieldNamesByClass = /* @__PURE__ */ new WeakMap();
 const isLifecycleMethodFunction = (node) => {
 	if (!FUNCTION_NODE_TYPES.has(node.type)) return false;
 	const parent = node.parent;
@@ -36529,6 +37201,187 @@ const getStaticMemberName = (node) => {
 	if (!isNodeOfType(node, "MemberExpression") || node.computed === true) return null;
 	return isNodeOfType(node.property, "Identifier") ? node.property.name : null;
 };
+const getMemberIdentity = (property) => {
+	const propertyName = getPropertyKeyName$2(property);
+	if (propertyName !== void 0) return isNodeOfType(property, "PrivateIdentifier") ? `#${propertyName}` : propertyName;
+	return isNodeOfType(property, "Literal") && typeof property.value === "string" ? property.value : null;
+};
+const collectPreviousSourcePaths = (pattern, domain, members, previousSourcePaths) => {
+	if (!pattern) return;
+	const unwrappedPattern = stripParenExpression(pattern);
+	if (isNodeOfType(unwrappedPattern, "Identifier")) {
+		previousSourcePaths.set(unwrappedPattern.name, {
+			domain,
+			members: [...members],
+			source: "previous"
+		});
+		return;
+	}
+	if (isNodeOfType(unwrappedPattern, "AssignmentPattern")) {
+		collectPreviousSourcePaths(unwrappedPattern.left, domain, members, previousSourcePaths);
+		return;
+	}
+	if (!isNodeOfType(unwrappedPattern, "ObjectPattern")) return;
+	for (const property of unwrappedPattern.properties) {
+		if (!isNodeOfType(property, "Property")) continue;
+		const propertyName = getStaticPropertyKeyName(property, { allowComputedString: true });
+		if (!propertyName) continue;
+		collectPreviousSourcePaths(property.value, domain, [...members, propertyName], previousSourcePaths);
+	}
+};
+const getStateSourcePath = (node, previousSourcePaths) => {
+	let currentNode = stripParenExpression(node);
+	const members = [];
+	while (isNodeOfType(currentNode, "MemberExpression")) {
+		const memberName = getStaticMemberName(currentNode);
+		if (!memberName) return null;
+		members.unshift(memberName);
+		currentNode = stripParenExpression(currentNode.object);
+	}
+	if (isNodeOfType(currentNode, "ThisExpression")) {
+		const [domain, ...pathMembers] = members;
+		if (domain !== "props" && domain !== "state") return null;
+		return {
+			domain,
+			members: pathMembers,
+			source: "current"
+		};
+	}
+	if (!isNodeOfType(currentNode, "Identifier")) return null;
+	const previousSourcePath = previousSourcePaths.get(currentNode.name);
+	return previousSourcePath ? {
+		...previousSourcePath,
+		members: [...previousSourcePath.members, ...members]
+	} : null;
+};
+const haveMatchingStateSourcePaths = (left, right) => left.domain === right.domain && left.members.length === right.members.length && left.members.every((member, index) => member === right.members[index]);
+const collectConjunctiveStateSourceComparisons = (test, previousSourcePaths, comparisons) => {
+	const expression = stripParenExpression(test);
+	if (isNodeOfType(expression, "LogicalExpression") && expression.operator === "&&") {
+		collectConjunctiveStateSourceComparisons(expression.left, previousSourcePaths, comparisons);
+		collectConjunctiveStateSourceComparisons(expression.right, previousSourcePaths, comparisons);
+		return;
+	}
+	if (!isNodeOfType(expression, "BinaryExpression") || !EQUALITY_OPERATORS.has(expression.operator)) return;
+	const leftPath = getStateSourcePath(expression.left, previousSourcePaths);
+	const rightPath = getStateSourcePath(expression.right, previousSourcePaths);
+	if (Boolean(leftPath) === Boolean(rightPath)) return;
+	const path = leftPath ?? rightPath;
+	if (!path) return;
+	comparisons.push({
+		comparedValue: leftPath ? expression.right : expression.left,
+		isDifference: DIFFERENCE_OPERATORS.has(expression.operator),
+		path
+	});
+};
+const isHistoricalToCurrentTransitionGuard = (test, previousSourcePaths) => {
+	const expression = stripParenExpression(test);
+	if (isNodeOfType(expression, "LogicalExpression") && expression.operator === "||") return isHistoricalToCurrentTransitionGuard(expression.left, previousSourcePaths) && isHistoricalToCurrentTransitionGuard(expression.right, previousSourcePaths);
+	const comparisons = [];
+	collectConjunctiveStateSourceComparisons(expression, previousSourcePaths, comparisons);
+	return comparisons.some((comparison, index) => comparisons.slice(index + 1).some((candidate) => comparison.path.source !== candidate.path.source && comparison.isDifference !== candidate.isDifference && haveMatchingStateSourcePaths(comparison.path, candidate.path) && areExpressionsStructurallyEqual(comparison.comparedValue, candidate.comparedValue)));
+};
+const getThisFieldName = (node) => {
+	const unwrappedNode = stripParenExpression(node);
+	if (!isNodeOfType(unwrappedNode, "MemberExpression") || unwrappedNode.computed === true || !isNodeOfType(stripParenExpression(unwrappedNode.object), "ThisExpression")) return null;
+	return getMemberIdentity(unwrappedNode.property);
+};
+const isUndefinedIdentifier = (node) => {
+	const unwrappedNode = stripParenExpression(node);
+	return isNodeOfType(unwrappedNode, "Identifier") && unwrappedNode.name === "undefined";
+};
+const isDirectRefParameterValue = (node, parameterSymbolId, scopes) => {
+	const unwrappedNode = stripParenExpression(node);
+	if (isNodeOfType(unwrappedNode, "Identifier")) return scopes.symbolFor(unwrappedNode)?.id === parameterSymbolId;
+	if (!isNodeOfType(unwrappedNode, "LogicalExpression") || unwrappedNode.operator !== "??") return false;
+	const left = stripParenExpression(unwrappedNode.left);
+	return isNodeOfType(left, "Identifier") && scopes.symbolFor(left)?.id === parameterSymbolId && isUndefinedIdentifier(unwrappedNode.right);
+};
+const getCallbackRefAssignedFields = (callback, scopes) => {
+	const firstParameter = (callback.params ?? [])[0];
+	if (!firstParameter) return /* @__PURE__ */ new Set();
+	const parameterIdentifier = isNodeOfType(firstParameter, "AssignmentPattern") ? firstParameter.left : firstParameter;
+	if (!isNodeOfType(parameterIdentifier, "Identifier")) return /* @__PURE__ */ new Set();
+	const parameterSymbolId = scopes.symbolFor(parameterIdentifier)?.id;
+	if (parameterSymbolId === void 0) return /* @__PURE__ */ new Set();
+	const body = callback.body;
+	if (!body) return /* @__PURE__ */ new Set();
+	const assignedFieldNames = /* @__PURE__ */ new Set();
+	walkAst(body, (node) => {
+		if (node !== body && (FUNCTION_NODE_TYPES.has(node.type) && !isImmediatelyInvokedFunction(node) || CLASS_NODE_TYPES.has(node.type))) return false;
+		const assignmentTarget = isNodeOfType(node, "AssignmentExpression") && node.left || isNodeOfType(node, "UpdateExpression") && node.argument || isNodeOfType(node, "UnaryExpression") && node.operator === "delete" && node.argument || null;
+		if (!assignmentTarget) return;
+		const fieldName = getThisFieldName(assignmentTarget);
+		if (!fieldName) return;
+		if (isNodeOfType(node, "AssignmentExpression") && node.operator === "=" && isDirectRefParameterValue(node.right, parameterSymbolId, scopes)) {
+			assignedFieldNames.add(fieldName);
+			return;
+		}
+		assignedFieldNames.delete(fieldName);
+	});
+	return assignedFieldNames;
+};
+const getClassMemberCallback = (classNode, memberName) => {
+	const classBody = classNode.body?.body ?? [];
+	for (const member of classBody) {
+		if (!isNodeOfType(member, "MethodDefinition") && !isNodeOfType(member, "PropertyDefinition")) continue;
+		if (member.static === true) continue;
+		const key = member.key;
+		if (getMemberIdentity(key) !== memberName) continue;
+		const value = member.value;
+		return value && FUNCTION_NODE_TYPES.has(value.type) ? value : null;
+	}
+	return null;
+};
+const collectCallbackRefFieldsFromExpression = (expression, classNode, fieldNames, scopes) => {
+	const unwrappedExpression = stripParenExpression(expression);
+	if (FUNCTION_NODE_TYPES.has(unwrappedExpression.type)) {
+		for (const fieldName of getCallbackRefAssignedFields(unwrappedExpression, scopes)) fieldNames.add(fieldName);
+		return;
+	}
+	const handlerName = getThisFieldName(unwrappedExpression);
+	if (handlerName) {
+		const callback = getClassMemberCallback(classNode, handlerName);
+		if (callback) for (const fieldName of getCallbackRefAssignedFields(callback, scopes)) fieldNames.add(fieldName);
+		return;
+	}
+	if (isNodeOfType(unwrappedExpression, "ConditionalExpression")) {
+		collectCallbackRefFieldsFromExpression(unwrappedExpression.consequent, classNode, fieldNames, scopes);
+		collectCallbackRefFieldsFromExpression(unwrappedExpression.alternate, classNode, fieldNames, scopes);
+		return;
+	}
+	if (isNodeOfType(unwrappedExpression, "LogicalExpression")) {
+		if (unwrappedExpression.operator !== "&&") collectCallbackRefFieldsFromExpression(unwrappedExpression.left, classNode, fieldNames, scopes);
+		collectCallbackRefFieldsFromExpression(unwrappedExpression.right, classNode, fieldNames, scopes);
+	}
+};
+const getCallbackRefFieldNames = (classNode, scopes) => {
+	if (!classNode) return /* @__PURE__ */ new Set();
+	const cachedFieldNames = callbackRefFieldNamesByClass.get(classNode);
+	if (cachedFieldNames) return cachedFieldNames;
+	const fieldNames = /* @__PURE__ */ new Set();
+	const classBody = classNode.body;
+	if (classBody) walkAst(classBody, (node) => {
+		if (node !== classBody && CLASS_NODE_TYPES.has(node.type)) return false;
+		if (!isNodeOfType(node, "JSXAttribute") || !isNodeOfType(node.name, "JSXIdentifier") || node.name.name !== "ref" || !node.value || !isNodeOfType(node.value, "JSXExpressionContainer") || !node.value.expression) return;
+		collectCallbackRefFieldsFromExpression(node.value.expression, classNode, fieldNames, scopes);
+	});
+	callbackRefFieldNamesByClass.set(classNode, fieldNames);
+	return fieldNames;
+};
+const collectLifecycleWrittenFieldNames = (lifecycleFunction) => {
+	const fieldNames = /* @__PURE__ */ new Set();
+	const body = lifecycleFunction.body;
+	if (!body) return fieldNames;
+	walkAst(body, (node) => {
+		if (FUNCTION_NODE_TYPES.has(node.type) && !isImmediatelyInvokedFunction(node)) return false;
+		const target = isNodeOfType(node, "AssignmentExpression") && node.left || isNodeOfType(node, "UpdateExpression") && node.argument || null;
+		if (!target) return;
+		const fieldName = getThisFieldName(target);
+		if (fieldName) fieldNames.add(fieldName);
+	});
+	return fieldNames;
+};
 const getThisStateFieldName = (node) => {
 	const unwrappedNode = stripParenExpression(node);
 	if (!isNodeOfType(unwrappedNode, "MemberExpression")) return null;
@@ -36546,15 +37399,17 @@ const collectLocalInitializers = (lifecycleFunction) => {
 	});
 	return initializers;
 };
-const derivesFromPostMountValue = (node, localInitializers, visitedNames = /* @__PURE__ */ new Set()) => {
+const derivesFromPostMountValue = (node, localInitializers, callbackRefFieldNames, visitedNames = /* @__PURE__ */ new Set()) => {
 	if (readsPostMountValue(node)) return true;
+	const fieldName = getThisFieldName(node);
+	if (fieldName && callbackRefFieldNames.has(fieldName)) return true;
 	const referencedNames = /* @__PURE__ */ new Set();
 	collectReferenceIdentifierNames(node, referencedNames);
 	for (const referencedName of referencedNames) {
 		if (visitedNames.has(referencedName)) continue;
 		const initializer = localInitializers.get(referencedName);
 		if (!initializer) continue;
-		if (derivesFromPostMountValue(initializer, localInitializers, new Set([...visitedNames, referencedName]))) return true;
+		if (derivesFromPostMountValue(initializer, localInitializers, callbackRefFieldNames, new Set([...visitedNames, referencedName]))) return true;
 	}
 	return false;
 };
@@ -36568,50 +37423,84 @@ const getSetStateFieldValue = (setStateCall, fieldName) => {
 	}
 	return null;
 };
-const isConvergentPostMountGuard = (test, setStateCall, localInitializers) => {
-	let qualifies = false;
-	walkAst(test, (node) => {
-		if (qualifies) return false;
-		if (!isNodeOfType(node, "BinaryExpression") || !EQUALITY_OPERATORS.has(node.operator)) return;
-		const leftFieldName = getThisStateFieldName(node.left);
-		const rightFieldName = getThisStateFieldName(node.right);
-		const fieldName = leftFieldName ?? rightFieldName;
-		const comparedValue = leftFieldName ? node.right : node.left;
-		if (!fieldName || !leftFieldName && !rightFieldName) return;
-		const assignedValue = getSetStateFieldValue(setStateCall, fieldName);
-		if (!assignedValue || !areExpressionsStructurallyEqual(comparedValue, assignedValue)) return;
-		if (!derivesFromPostMountValue(comparedValue, localInitializers)) return;
-		qualifies = true;
-		return false;
-	});
-	return qualifies;
-};
-const isDiffGuardTest = (test, paramNames, derivedNames) => {
-	if (referencesAnyName(test, paramNames)) return true;
-	let qualifies = false;
-	walkAst(test, (node) => {
-		if (qualifies) return false;
-		if (!isNodeOfType(node, "BinaryExpression")) return;
-		if (!EQUALITY_OPERATORS.has(node.operator)) return;
-		if (isStatefulOperand(node.left, paramNames, derivedNames) && isStatefulOperand(node.right, paramNames, derivedNames) && (referencesAnyName(node.left, derivedNames) || referencesAnyName(node.right, derivedNames))) {
-			qualifies = true;
-			return false;
-		}
-	});
-	return qualifies;
+const isConvergentPostMountGuard = (test, setStateCall, localInitializers, callbackRefFieldNames, isTruthfulBranch) => {
+	const expression = stripParenExpression(test);
+	if (isNodeOfType(expression, "LogicalExpression")) {
+		if (expression.operator !== "&&" && expression.operator !== "||") return false;
+		const leftIsConvergent = isConvergentPostMountGuard(expression.left, setStateCall, localInitializers, callbackRefFieldNames, isTruthfulBranch);
+		const rightIsConvergent = isConvergentPostMountGuard(expression.right, setStateCall, localInitializers, callbackRefFieldNames, isTruthfulBranch);
+		return isTruthfulBranch && expression.operator === "||" || !isTruthfulBranch && expression.operator === "&&" ? leftIsConvergent && rightIsConvergent : leftIsConvergent || rightIsConvergent;
+	}
+	if (!isNodeOfType(expression, "BinaryExpression") || !(isTruthfulBranch ? DIFFERENCE_OPERATORS.has(expression.operator) : EQUALITY_OPERATORS.has(expression.operator) && !DIFFERENCE_OPERATORS.has(expression.operator))) return false;
+	const leftFieldName = getThisStateFieldName(expression.left);
+	const rightFieldName = getThisStateFieldName(expression.right);
+	const fieldName = leftFieldName ?? rightFieldName;
+	const comparedValue = leftFieldName ? expression.right : expression.left;
+	if (!fieldName) return false;
+	const assignedValue = getSetStateFieldValue(setStateCall, fieldName);
+	if (!assignedValue || !areExpressionsStructurallyEqual(comparedValue, assignedValue)) return false;
+	return isUndefinedIdentifier(comparedValue) || derivesFromPostMountValue(comparedValue, localInitializers, callbackRefFieldNames);
+};
+const containsPositiveStateFieldTest = (test, fieldName) => {
+	const unwrappedTest = stripParenExpression(test);
+	if (getThisStateFieldName(unwrappedTest) === fieldName) return true;
+	return isNodeOfType(unwrappedTest, "LogicalExpression") && unwrappedTest.operator === "&&" && (containsPositiveStateFieldTest(unwrappedTest.left, fieldName) || containsPositiveStateFieldTest(unwrappedTest.right, fieldName));
 };
-const isInsideDiffGuard = (setStateCall) => {
+const isConvergentUndefinedClearGuard = (test, setStateCall) => {
+	if (!isNodeOfType(setStateCall, "CallExpression")) return false;
+	const argument = setStateCall.arguments?.[0];
+	if (!argument || !isNodeOfType(argument, "ObjectExpression")) return false;
+	for (const property of argument.properties ?? []) {
+		if (!isNodeOfType(property, "Property") || property.computed === true || !isUndefinedIdentifier(property.value)) continue;
+		const fieldName = isNodeOfType(property.key, "Identifier") && property.key.name || isNodeOfType(property.key, "Literal") && typeof property.key.value === "string" && property.key.value || null;
+		if (fieldName && containsPositiveStateFieldTest(test, fieldName)) return true;
+	}
+	return false;
+};
+const isDiffGuardTest = (test, paramNames, derivedNames, isTruthfulBranch) => {
+	const expression = stripParenExpression(test);
+	if (isNodeOfType(expression, "LogicalExpression")) {
+		if (expression.operator !== "&&" && expression.operator !== "||") return false;
+		const leftIsDiffGuard = isDiffGuardTest(expression.left, paramNames, derivedNames, isTruthfulBranch);
+		const rightIsDiffGuard = isDiffGuardTest(expression.right, paramNames, derivedNames, isTruthfulBranch);
+		return isTruthfulBranch && expression.operator === "||" || !isTruthfulBranch && expression.operator === "&&" ? leftIsDiffGuard && rightIsDiffGuard : leftIsDiffGuard || rightIsDiffGuard;
+	}
+	if (!isNodeOfType(expression, "BinaryExpression") || !(isTruthfulBranch ? DIFFERENCE_OPERATORS.has(expression.operator) : EQUALITY_OPERATORS.has(expression.operator) && !DIFFERENCE_OPERATORS.has(expression.operator))) return false;
+	return isStatefulOperand(expression.left, paramNames, derivedNames) && isStatefulOperand(expression.right, paramNames, derivedNames) && (referencesAnyName(expression.left, paramNames) || referencesAnyName(expression.right, paramNames) || referencesAnyName(expression.left, derivedNames) || referencesAnyName(expression.right, derivedNames));
+};
+const isInsideDiffGuard = (setStateCall, scopes) => {
 	const lifecycleFunction = findEnclosingLifecycleFunction(setStateCall);
 	if (!lifecycleFunction) return false;
 	const paramNames = /* @__PURE__ */ new Set();
-	for (const param of lifecycleFunction.params ?? []) collectPatternNames(param, paramNames);
+	const parameters = lifecycleFunction.params ?? [];
+	for (const param of parameters) collectPatternNames(param, paramNames);
+	const previousSourcePaths = /* @__PURE__ */ new Map();
+	const [previousPropsParameter, previousStateParameter] = parameters;
+	collectPreviousSourcePaths(previousPropsParameter, "props", [], previousSourcePaths);
+	collectPreviousSourcePaths(previousStateParameter, "state", [], previousSourcePaths);
 	const derivedNames = collectDiffSourceLocalNames(lifecycleFunction, paramNames);
 	const localInitializers = collectLocalInitializers(lifecycleFunction);
+	const lifecycleWrittenFieldNames = collectLifecycleWrittenFieldNames(lifecycleFunction);
+	const callbackRefFieldNames = new Set([...getCallbackRefFieldNames(findEnclosingClass(lifecycleFunction), scopes)].filter((fieldName) => !lifecycleWrittenFieldNames.has(fieldName)));
 	let child = setStateCall;
 	let ancestor = setStateCall.parent;
 	while (ancestor && ancestor !== lifecycleFunction) {
-		const guardTest = isNodeOfType(ancestor, "IfStatement") && child !== ancestor.test && ancestor.test || isNodeOfType(ancestor, "ConditionalExpression") && child !== ancestor.test && ancestor.test || isNodeOfType(ancestor, "LogicalExpression") && ancestor.operator === "&&" && child === ancestor.right && ancestor.left || null;
-		if (guardTest && (isDiffGuardTest(guardTest, paramNames, derivedNames) || isConvergentPostMountGuard(guardTest, setStateCall, localInitializers))) return true;
+		let guardTest = null;
+		let isTruthfulBranch = true;
+		if (isNodeOfType(ancestor, "IfStatement")) {
+			if (child === ancestor.consequent) guardTest = ancestor.test;
+			else if (child === ancestor.alternate) {
+				guardTest = ancestor.test;
+				isTruthfulBranch = false;
+			}
+		} else if (isNodeOfType(ancestor, "ConditionalExpression")) {
+			if (child === ancestor.consequent) guardTest = ancestor.test;
+			else if (child === ancestor.alternate) {
+				guardTest = ancestor.test;
+				isTruthfulBranch = false;
+			}
+		} else if (isNodeOfType(ancestor, "LogicalExpression") && ancestor.operator === "&&" && child === ancestor.right) guardTest = ancestor.left;
+		if (guardTest && (isDiffGuardTest(guardTest, paramNames, derivedNames, isTruthfulBranch) || isTruthfulBranch && isHistoricalToCurrentTransitionGuard(guardTest, previousSourcePaths) || isConvergentPostMountGuard(guardTest, setStateCall, localInitializers, callbackRefFieldNames, isTruthfulBranch) || isTruthfulBranch && isConvergentUndefinedClearGuard(guardTest, setStateCall))) return true;
 		child = ancestor;
 		ancestor = ancestor.parent ?? null;
 	}
@@ -36633,7 +37522,7 @@ const noDidUpdateSetState = defineRule({
 			if (!isNodeOfType(stripParenExpression(node.callee.object), "ThisExpression")) return;
 			if (!isNodeOfType(node.callee.property, "Identifier") || node.callee.property.name !== "setState") return;
 			if (!isSetStateCallInLifecycle(node, LIFECYCLE_NAMES$1, { disallowInNestedFunctions: mode === "disallow-in-func" })) return;
-			if (isInsideDiffGuard(node)) return;
+			if (isInsideDiffGuard(node, context.scopes)) return;
 			context.report({
 				node: node.callee,
 				message: MESSAGE$27
@@ -40355,41 +41244,223 @@ const readLogicalConditionResult = (operator, leftResult, rightResult) => {
 	if (leftResult === false && rightResult === false) return false;
 	return null;
 };
-const readHydrationConditionResult = (expression, context, runtime) => {
+const readHydrationConditionResult = (expression, context, runtime, state) => {
 	const unwrappedExpression = stripParenExpression(expression);
 	const predicateMatch = matchBrowserPredicate(unwrappedExpression, context);
 	if (predicateMatch) return predicateMatch[`${runtime}Result`];
 	const staticResult = readInitialStateBoolean(unwrappedExpression, context.scopes);
 	if (staticResult !== null) return staticResult;
+	const expressionSymbol = isNodeOfType(unwrappedExpression, "Identifier") ? context.scopes.symbolFor(unwrappedExpression) : null;
+	const parameterValue = expressionSymbol ? state.parameterValuesBySymbolId.get(expressionSymbol.id) : null;
+	if (expressionSymbol && parameterValue && !state.visitedSymbolIds.has(expressionSymbol.id)) {
+		state.visitedSymbolIds.add(expressionSymbol.id);
+		const result = readHydrationConditionResult(parameterValue, context, runtime, state);
+		state.visitedSymbolIds.delete(expressionSymbol.id);
+		return result;
+	}
+	if (expressionSymbol && expressionSymbol.kind === "const" && expressionSymbol.initializer && expressionSymbol.references.every((reference) => reference.flag === "read") && !state.visitedSymbolIds.has(expressionSymbol.id)) {
+		state.visitedSymbolIds.add(expressionSymbol.id);
+		const result = readHydrationConditionResult(expressionSymbol.initializer, context, runtime, state);
+		state.visitedSymbolIds.delete(expressionSymbol.id);
+		return result;
+	}
+	if (isNodeOfType(unwrappedExpression, "CallExpression")) {
+		const callArguments = unwrappedExpression.arguments ?? [];
+		if (isReactApiCall(unwrappedExpression, "useMemo", context.scopes, {
+			allowGlobalReactNamespace: true,
+			resolveNamedAliases: true
+		})) {
+			const callbackArgument = callArguments[0];
+			if (!callbackArgument || isNodeOfType(callbackArgument, "SpreadElement")) return null;
+			const callbackFunction = resolveExactLocalFunction(callbackArgument, context.scopes);
+			return isFunctionLike$1(callbackFunction) && callbackFunction.params.length === 0 ? readHydrationFunctionResult(callbackFunction, context, runtime, state) : null;
+		}
+		const callee = stripParenExpression(unwrappedExpression.callee);
+		if (isNodeOfType(callee, "Identifier") && callee.name === "Boolean" && context.scopes.isGlobalReference(callee) && callArguments.length === 1 && !isNodeOfType(callArguments[0], "SpreadElement")) return readHydrationConditionResult(callArguments[0], context, runtime, state);
+		const helperFunction = resolveExactLocalFunction(callee, context.scopes);
+		if (!isFunctionLike$1(helperFunction) || helperFunction.async || isNodeOfType(helperFunction, "FunctionDeclaration") && helperFunction.generator || isNodeOfType(helperFunction, "FunctionExpression") && helperFunction.generator || helperFunction.params.some((parameter) => !isNodeOfType(parameter, "Identifier")) || callArguments.some((argument) => isNodeOfType(argument, "SpreadElement"))) return null;
+		const parameterValuesBySymbolId = new Map(state.parameterValuesBySymbolId);
+		for (let parameterIndex = 0; parameterIndex < helperFunction.params.length; parameterIndex++) {
+			const parameter = helperFunction.params[parameterIndex];
+			const argument = callArguments[parameterIndex];
+			if (!argument || !isNodeOfType(parameter, "Identifier")) continue;
+			const parameterSymbol = context.scopes.symbolFor(parameter);
+			if (parameterSymbol) parameterValuesBySymbolId.set(parameterSymbol.id, argument);
+		}
+		return readHydrationFunctionResult(helperFunction, context, runtime, {
+			...state,
+			parameterValuesBySymbolId
+		});
+	}
 	if (isNodeOfType(unwrappedExpression, "UnaryExpression") && unwrappedExpression.operator === "!") {
-		const argumentResult = readHydrationConditionResult(unwrappedExpression.argument, context, runtime);
+		const argumentResult = readHydrationConditionResult(unwrappedExpression.argument, context, runtime, state);
 		return argumentResult === null ? null : !argumentResult;
 	}
 	if (!isNodeOfType(unwrappedExpression, "LogicalExpression") || unwrappedExpression.operator !== "&&" && unwrappedExpression.operator !== "||") return null;
-	return readLogicalConditionResult(unwrappedExpression.operator, readHydrationConditionResult(unwrappedExpression.left, context, runtime), readHydrationConditionResult(unwrappedExpression.right, context, runtime));
+	return readLogicalConditionResult(unwrappedExpression.operator, readHydrationConditionResult(unwrappedExpression.left, context, runtime, state), readHydrationConditionResult(unwrappedExpression.right, context, runtime, state));
+};
+const readHydrationStatementResult = (statement, context, runtime, state) => {
+	if (isNodeOfType(statement, "ReturnStatement")) return {
+		didReturn: true,
+		value: statement.argument ? readHydrationConditionResult(statement.argument, context, runtime, state) : null
+	};
+	if (isNodeOfType(statement, "BlockStatement")) {
+		for (const childStatement of statement.body) {
+			const result = readHydrationStatementResult(childStatement, context, runtime, state);
+			if (result.didReturn) return result;
+			if (statementAlwaysExits(childStatement)) break;
+		}
+		return {
+			didReturn: false,
+			value: null
+		};
+	}
+	if (!isNodeOfType(statement, "IfStatement")) return {
+		didReturn: false,
+		value: null
+	};
+	const conditionResult = readHydrationConditionResult(statement.test, context, runtime, state);
+	if (conditionResult !== null) {
+		const selectedBranch = conditionResult ? statement.consequent : statement.alternate;
+		return selectedBranch ? readHydrationStatementResult(selectedBranch, context, runtime, state) : {
+			didReturn: false,
+			value: null
+		};
+	}
+	const consequentResult = readHydrationStatementResult(statement.consequent, context, runtime, state);
+	const alternateResult = statement.alternate ? readHydrationStatementResult(statement.alternate, context, runtime, state) : {
+		didReturn: false,
+		value: null
+	};
+	return consequentResult.didReturn && alternateResult.didReturn && consequentResult.value !== null && consequentResult.value === alternateResult.value ? consequentResult : {
+		didReturn: consequentResult.didReturn || alternateResult.didReturn,
+		value: null
+	};
 };
-const matchHydrationCondition = (expression, context) => {
+const readHydrationFunctionResult = (functionNode, context, runtime, state) => {
+	if (!isFunctionLike$1(functionNode) || state.visitedFunctionNodes.has(functionNode)) return null;
+	state.visitedFunctionNodes.add(functionNode);
+	const result = isNodeOfType(functionNode.body, "BlockStatement") ? readHydrationStatementResult(functionNode.body, context, runtime, state).value : readHydrationConditionResult(functionNode.body, context, runtime, state);
+	state.visitedFunctionNodes.delete(functionNode);
+	return result;
+};
+const doEquivalentExpressionBindingsMatch = (leftExpression, rightExpression, scopes) => {
+	const left = stripParenExpression(leftExpression);
+	const right = stripParenExpression(rightExpression);
+	if (isNodeOfType(left, "Identifier") && isNodeOfType(right, "Identifier")) {
+		const leftSymbol = scopes.symbolFor(left);
+		const rightSymbol = scopes.symbolFor(right);
+		return leftSymbol || rightSymbol ? leftSymbol?.id === rightSymbol?.id : true;
+	}
+	if (isNodeOfType(left, "MemberExpression") && isNodeOfType(right, "MemberExpression")) return doEquivalentExpressionBindingsMatch(left.object, right.object, scopes) && (!left.computed || doEquivalentExpressionBindingsMatch(left.property, right.property, scopes));
+	if (isNodeOfType(left, "CallExpression") && isNodeOfType(right, "CallExpression")) {
+		const rightArguments = right.arguments ?? [];
+		return doEquivalentExpressionBindingsMatch(left.callee, right.callee, scopes) && (left.arguments ?? []).every((argument, index) => {
+			const rightArgument = rightArguments[index];
+			return Boolean(rightArgument && doEquivalentExpressionBindingsMatch(argument, rightArgument, scopes));
+		});
+	}
+	return true;
+};
+const areHelperReturnValuesEquivalent = (leftValue, rightValue, context) => {
+	if (areExpressionsStructurallyEqual(leftValue, rightValue)) return doEquivalentExpressionBindingsMatch(leftValue, rightValue, context.scopes);
+	const leftBoolean = readInitialStateBoolean(leftValue, context.scopes);
+	const rightBoolean = readInitialStateBoolean(rightValue, context.scopes);
+	return leftBoolean !== null && rightBoolean !== null && leftBoolean === rightBoolean;
+};
+const doHelperReturnValuesDiffer = (leftValues, rightValues, context) => {
+	const everyValueHasEquivalent = (values, candidateValues) => values.every((value) => candidateValues.some((candidateValue) => areHelperReturnValuesEquivalent(value, candidateValue, context)));
+	return !everyValueHasEquivalent(leftValues, rightValues) || !everyValueHasEquivalent(rightValues, leftValues);
+};
+const matchHydrationConditionInternal = (expression, context, state) => {
 	const unwrappedExpression = stripParenExpression(expression);
 	const predicateMatch = matchBrowserPredicate(unwrappedExpression, context);
 	if (predicateMatch) return {
 		predicateMatch,
 		predicateNode: unwrappedExpression
 	};
-	if (isNodeOfType(unwrappedExpression, "UnaryExpression") && unwrappedExpression.operator === "!") return matchHydrationCondition(unwrappedExpression.argument, context);
-	if (!isNodeOfType(unwrappedExpression, "LogicalExpression") || unwrappedExpression.operator !== "&&" && unwrappedExpression.operator !== "||") return null;
-	const leftMatch = matchHydrationCondition(unwrappedExpression.left, context);
-	const rightMatch = matchHydrationCondition(unwrappedExpression.right, context);
-	if (leftMatch && rightMatch) {
-		const clientResult = readHydrationConditionResult(unwrappedExpression, context, "client");
-		const serverResult = readHydrationConditionResult(unwrappedExpression, context, "server");
-		return clientResult !== null && serverResult !== null && clientResult !== serverResult ? leftMatch : null;
+	if (isNodeOfType(unwrappedExpression, "Identifier")) {
+		const symbol = context.scopes.symbolFor(unwrappedExpression);
+		const parameterValue = symbol ? state.parameterValuesBySymbolId.get(symbol.id) : null;
+		if (symbol && parameterValue && !state.visitedSymbolIds.has(symbol.id)) {
+			state.visitedSymbolIds.add(symbol.id);
+			const match = matchHydrationConditionInternal(parameterValue, context, state);
+			state.visitedSymbolIds.delete(symbol.id);
+			return match;
+		}
+		if (!symbol || symbol.kind !== "const" || !symbol.initializer || symbol.references.some((reference) => reference.flag !== "read") || state.visitedSymbolIds.has(symbol.id)) return null;
+		state.visitedSymbolIds.add(symbol.id);
+		const match = matchHydrationConditionInternal(symbol.initializer, context, state);
+		state.visitedSymbolIds.delete(symbol.id);
+		return match;
+	}
+	if (isNodeOfType(unwrappedExpression, "CallExpression")) {
+		const callArguments = unwrappedExpression.arguments ?? [];
+		if (isReactApiCall(unwrappedExpression, "useMemo", context.scopes, {
+			allowGlobalReactNamespace: true,
+			resolveNamedAliases: true
+		})) {
+			const callbackArgument = callArguments[0];
+			if (!callbackArgument || isNodeOfType(callbackArgument, "SpreadElement")) return null;
+			const callbackFunction = resolveExactLocalFunction(callbackArgument, context.scopes);
+			return isFunctionLike$1(callbackFunction) && callbackFunction.params.length === 0 ? matchHydrationFunctionResult(callbackFunction, context, state) : null;
+		}
+		const callee = stripParenExpression(unwrappedExpression.callee);
+		if (isNodeOfType(callee, "Identifier") && callee.name === "Boolean" && context.scopes.isGlobalReference(callee) && callArguments.length === 1 && !isNodeOfType(callArguments[0], "SpreadElement")) return matchHydrationConditionInternal(callArguments[0], context, state);
+		const helperFunction = resolveExactLocalFunction(callee, context.scopes);
+		if (!isFunctionLike$1(helperFunction) || helperFunction.async || isNodeOfType(helperFunction, "FunctionDeclaration") && helperFunction.generator || isNodeOfType(helperFunction, "FunctionExpression") && helperFunction.generator || helperFunction.params.some((parameter) => !isNodeOfType(parameter, "Identifier")) || callArguments.some((argument) => isNodeOfType(argument, "SpreadElement"))) return null;
+		const parameterValuesBySymbolId = new Map(state.parameterValuesBySymbolId);
+		for (let parameterIndex = 0; parameterIndex < helperFunction.params.length; parameterIndex++) {
+			const parameter = helperFunction.params[parameterIndex];
+			const argument = callArguments[parameterIndex];
+			if (!argument || !isNodeOfType(parameter, "Identifier")) continue;
+			const parameterSymbol = context.scopes.symbolFor(parameter);
+			if (parameterSymbol) parameterValuesBySymbolId.set(parameterSymbol.id, argument);
+		}
+		return matchHydrationFunctionResult(helperFunction, context, {
+			...state,
+			parameterValuesBySymbolId
+		});
 	}
+	if (isNodeOfType(unwrappedExpression, "UnaryExpression") && unwrappedExpression.operator === "!") return matchHydrationConditionInternal(unwrappedExpression.argument, context, state);
+	if (!isNodeOfType(unwrappedExpression, "LogicalExpression") || unwrappedExpression.operator !== "&&" && unwrappedExpression.operator !== "||") return null;
+	const leftMatch = matchHydrationConditionInternal(unwrappedExpression.left, context, state);
+	const rightMatch = matchHydrationConditionInternal(unwrappedExpression.right, context, state);
 	const nestedMatch = leftMatch ?? rightMatch;
 	if (!nestedMatch) return null;
-	const otherResult = readInitialStateBoolean(leftMatch ? unwrappedExpression.right : unwrappedExpression.left, context.scopes);
-	if (unwrappedExpression.operator === "&&" && otherResult === false || unwrappedExpression.operator === "||" && otherResult === true) return null;
-	return nestedMatch;
+	const clientResult = readHydrationConditionResult(unwrappedExpression, context, "client", state);
+	const serverResult = readHydrationConditionResult(unwrappedExpression, context, "server", state);
+	return clientResult !== null && serverResult !== null && clientResult === serverResult ? null : nestedMatch;
 };
+const matchHydrationReturningStatement = (statement, context, state) => {
+	if (isNodeOfType(statement, "ReturnStatement")) return statement.argument ? matchHydrationConditionInternal(statement.argument, context, state) : null;
+	if (isNodeOfType(statement, "IfStatement")) {
+		const conditionMatch = matchHydrationConditionInternal(statement.test, context, state);
+		const consequentValues = getReturnedValues(statement.consequent);
+		const alternateValues = statement.alternate ? getReturnedValues(statement.alternate) : findFollowingReturnedValues(statement);
+		if (conditionMatch && consequentValues.length > 0 && alternateValues.length > 0 && doHelperReturnValuesDiffer(consequentValues, alternateValues, context)) return conditionMatch;
+		return matchHydrationReturningStatement(statement.consequent, context, state) ?? (statement.alternate ? matchHydrationReturningStatement(statement.alternate, context, state) : null);
+	}
+	if (!isNodeOfType(statement, "BlockStatement")) return null;
+	for (const childStatement of statement.body) {
+		const match = matchHydrationReturningStatement(childStatement, context, state);
+		if (match) return match;
+		if (statementAlwaysExits(childStatement)) break;
+	}
+	return null;
+};
+const matchHydrationFunctionResult = (functionNode, context, state) => {
+	if (!isFunctionLike$1(functionNode) || state.visitedFunctionNodes.has(functionNode)) return null;
+	state.visitedFunctionNodes.add(functionNode);
+	const match = isNodeOfType(functionNode.body, "BlockStatement") ? matchHydrationReturningStatement(functionNode.body, context, state) : matchHydrationConditionInternal(functionNode.body, context, state);
+	state.visitedFunctionNodes.delete(functionNode);
+	return match;
+};
+const matchHydrationCondition = (expression, context) => matchHydrationConditionInternal(expression, context, {
+	parameterValuesBySymbolId: /* @__PURE__ */ new Map(),
+	visitedFunctionNodes: /* @__PURE__ */ new Set(),
+	visitedSymbolIds: /* @__PURE__ */ new Set()
+});
 const areNodeArraysEquivalent = (leftNodes, rightNodes) => leftNodes.length === rightNodes.length && leftNodes.every((leftNode, index) => areRenderedBranchesEquivalent(leftNode, rightNodes[index]));
 const areRenderedBranchesEquivalent = (leftNode, rightNode) => {
 	if (!leftNode || !rightNode) return leftNode === rightNode;
@@ -40532,17 +41603,17 @@ const noHydrationBranchOnBrowserGlobal = defineRule({
 			const { predicateMatch, predicateNode } = conditionMatch;
 			if (reportedNodes.has(predicateNode)) return;
 			if (rightBranch && areRenderedBranchesEquivalent(leftBranch, rightBranch)) return;
-			const componentOrHookNode = findRenderPhaseComponentOrHook(predicateNode, context.scopes);
+			const componentOrHookNode = findRenderPhaseComponentOrHook(conditionNode, context.scopes);
 			if (!componentOrHookNode) return;
 			if (!hasClientRenderEvidence(componentOrHookNode, fileHasUseClientDirective)) return;
-			if (requiresRenderedContext && !isInRenderedOutput(predicateNode, componentOrHookNode, context.scopes)) return;
+			if (requiresRenderedContext && !isInRenderedOutput(conditionNode, componentOrHookNode, context.scopes)) return;
 			if (!isRenderedValue(leftBranch) && (!rightBranch || !isRenderedValue(rightBranch))) {
-				const attribute = findEnclosingJsxAttribute(predicateNode);
+				const attribute = findEnclosingJsxAttribute(conditionNode);
 				if (!attribute || isEventHandlerAttribute(attribute)) return;
 			}
-			if (fileIsEmailTemplate || isGatedByFalsyInitialState(predicateNode, context.scopes)) return;
-			if (isAfterClientOnlyEarlyReturn(predicateNode, componentOrHookNode, context.scopes)) return;
-			const openingElement = findEnclosingJsxOpeningElement(predicateNode);
+			if (fileIsEmailTemplate || isGatedByFalsyInitialState(conditionNode, context.scopes)) return;
+			if (isAfterClientOnlyEarlyReturn(conditionNode, componentOrHookNode, context.scopes)) return;
+			const openingElement = findEnclosingJsxOpeningElement(conditionNode);
 			if (hasSuppressHydrationWarningAttribute(openingElement) && !isStructuralRenderedValue(leftBranch) && !isStructuralRenderedValue(rightBranch)) return;
 			if (branchRootsSuppressSameElement(leftBranch, rightBranch)) return;
 			if (isGeneratedImageRenderContext(context, openingElement ?? leftBranch)) return;
@@ -40924,7 +41995,7 @@ const noInitializeState = defineRule({
 		if (!dependencies || !isNodeOfType(dependencies, "ArrayExpression") || (dependencies.elements ?? []).length !== 0) return;
 		const analysis = getProgramAnalysis(node);
 		if (!analysis) return;
-		for (const fact of collectEffectStateWriteFacts(analysis, node, context.filename)) {
+		for (const fact of collectEffectStateWriteFacts(analysis, context, node, context.filename)) {
 			if (!fact.isRenderKnownCopy || fact.matchesStateInitializer || fact.resetsSourceState) continue;
 			const stateName = getStateName(fact.stateDeclarator);
 			context.report({
@@ -41282,7 +42353,8 @@ const noJsxElementType = defineRule({
 	create: (context) => {
 		let isJsxImported = false;
 		const flaggedAnnotations = [];
-		const checkReturnType = (returnType) => {
+		const collectComponentReturnType = (functionNode, returnType) => {
+			if (!(isNodeOfType(functionNode, "TSDeclareFunction") ? Boolean(functionNode.id && isReactComponentName(functionNode.id.name)) : isComponentFunction$1(functionNode))) return;
 			const typeAnnotation = extractReturnTypeAnnotation(returnType);
 			if (!typeAnnotation) return;
 			if (isJsxElementTypeReference(typeAnnotation)) flaggedAnnotations.push(typeAnnotation);
@@ -41292,19 +42364,16 @@ const noJsxElementType = defineRule({
 				if (isJsxImportBinding(node)) isJsxImported = true;
 			},
 			FunctionDeclaration(node) {
-				checkReturnType(node.returnType);
+				collectComponentReturnType(node, node.returnType);
 			},
 			ArrowFunctionExpression(node) {
-				checkReturnType(node.returnType);
+				collectComponentReturnType(node, node.returnType);
 			},
 			FunctionExpression(node) {
-				checkReturnType(node.returnType);
+				collectComponentReturnType(node, node.returnType);
 			},
 			TSDeclareFunction(node) {
-				checkReturnType(node.returnType);
-			},
-			TSMethodSignature(node) {
-				checkReturnType(node.returnType);
+				collectComponentReturnType(node, node.returnType);
 			},
 			"Program:exit"() {
 				if (isJsxImported) return;
@@ -44331,6 +45400,114 @@ const DATA_SINK_METHOD_NAMES = new Set([
 	"deserialize"
 ]);
 //#endregion
+//#region src/plugin/utils/get-transparent-react-callback-wrapper-argument.ts
+const getTransparentReactCallbackWrapperArgument = (initializer, resultSymbol, scopes) => {
+	const callExpression = stripParenExpression(initializer);
+	if (!isNodeOfType(callExpression, "CallExpression")) return null;
+	const callbackArgument = callExpression.arguments[0];
+	if (!callbackArgument) return null;
+	if (resultSymbol && symbolHasReactUseEffectEventOrigin(resultSymbol, scopes)) return callbackArgument;
+	return isReactApiCall(callExpression, "useCallback", scopes, {
+		allowGlobalReactNamespace: true,
+		allowUnboundBareCalls: true
+	}) ? callbackArgument : null;
+};
+//#endregion
+//#region src/plugin/rules/state-and-effects/utils/resolve-parent-callback-provenance.ts
+const getDeclarationKind$1 = (declarator) => {
+	const declaration = declarator.parent;
+	return declaration && isNodeOfType(declaration, "VariableDeclaration") ? declaration.kind : null;
+};
+const hasMutableBindingWrite$2 = (reference) => Boolean(reference.resolved?.references.some((candidateReference) => candidateReference.isWrite() && !candidateReference.init));
+const mergeRequiredBranches = (leftNames, rightNames) => {
+	if (!leftNames || !rightNames) return null;
+	return new Set([...leftNames, ...rightNames]);
+};
+const getPropReferenceName = (analysis, identifier) => {
+	if (!isNodeOfType(identifier, "Identifier")) return null;
+	const reference = getRef(analysis, identifier);
+	if (!reference || !isProp(analysis, reference) || isWholePropsObjectReference(analysis, reference)) return null;
+	const bindingIdentifier = (reference.resolved?.defs.find((definition) => definition.type === "Parameter"))?.name;
+	return (bindingIdentifier && getDestructuredBindingPropertyName(bindingIdentifier)) ?? identifier.name;
+};
+const getSingleConstDeclarator = (reference) => {
+	if (!reference.resolved || hasMutableBindingWrite$2(reference)) return null;
+	const declarators = reference.resolved.defs.map((definition) => definition.node).filter((definitionNode) => isNodeOfType(definitionNode, "VariableDeclarator"));
+	if (declarators.length !== 1) return null;
+	const declarator = declarators[0];
+	if (!declarator || getDeclarationKind$1(declarator) !== "const") return null;
+	return declarator;
+};
+const resolveParentCallbackPropNames = (analysis, expression, scopes, visitedReferences, allowFunctionForwarder = false) => {
+	const unwrappedExpression = stripParenExpression(expression);
+	if (isFunctionLike$1(unwrappedExpression)) {
+		if (!allowFunctionForwarder || Boolean(unwrappedExpression.async)) return null;
+		const callbackNames = /* @__PURE__ */ new Set();
+		walkInsideStatementBlocks(unwrappedExpression.body, (child) => {
+			if (!isNodeOfType(child, "CallExpression")) return;
+			const resolvedNames = resolveParentCallbackPropNames(analysis, child.callee, scopes, new Set(visitedReferences), false);
+			if (!resolvedNames) return;
+			for (const resolvedName of resolvedNames) callbackNames.add(resolvedName);
+		});
+		return callbackNames.size > 0 ? callbackNames : null;
+	}
+	if (isNodeOfType(unwrappedExpression, "ConditionalExpression")) return mergeRequiredBranches(resolveParentCallbackPropNames(analysis, unwrappedExpression.consequent, scopes, new Set(visitedReferences), false), resolveParentCallbackPropNames(analysis, unwrappedExpression.alternate, scopes, new Set(visitedReferences), false));
+	if (isNodeOfType(unwrappedExpression, "LogicalExpression")) return mergeRequiredBranches(resolveParentCallbackPropNames(analysis, unwrappedExpression.left, scopes, new Set(visitedReferences), false), resolveParentCallbackPropNames(analysis, unwrappedExpression.right, scopes, new Set(visitedReferences)));
+	if (isNodeOfType(unwrappedExpression, "Identifier")) {
+		const propName = getPropReferenceName(analysis, unwrappedExpression);
+		if (propName) return new Set([propName]);
+		const reference = getRef(analysis, unwrappedExpression);
+		if (!reference?.resolved || visitedReferences.has(reference.resolved)) return null;
+		const declarator = getSingleConstDeclarator(reference);
+		if (!declarator || !isNodeOfType(declarator, "VariableDeclarator") || !declarator.init) return null;
+		visitedReferences.add(reference.resolved);
+		const wrappedArgument = getTransparentReactCallbackWrapperArgument(declarator.init, scopes.symbolFor(unwrappedExpression), scopes);
+		const allowsFunctionForwarder = Boolean(wrappedArgument && !isReactApiCall(declarator.init, "useCallback", scopes, {
+			allowGlobalReactNamespace: true,
+			allowUnboundBareCalls: true
+		}));
+		return resolveParentCallbackPropNames(analysis, wrappedArgument ?? declarator.init, scopes, visitedReferences, allowsFunctionForwarder);
+	}
+	if (!isNodeOfType(unwrappedExpression, "MemberExpression")) return null;
+	const propertyName = getStaticMemberPropertyName(unwrappedExpression);
+	if (!propertyName) return null;
+	const receiver = stripParenExpression(unwrappedExpression.object);
+	if (!isNodeOfType(receiver, "Identifier")) return null;
+	const receiverReference = getRef(analysis, receiver);
+	if (!receiverReference?.resolved || visitedReferences.has(receiverReference.resolved)) return null;
+	if (isWholePropsObjectReference(analysis, receiverReference)) return new Set([propertyName]);
+	const declarator = getSingleConstDeclarator(receiverReference);
+	if (!declarator || !isNodeOfType(declarator, "VariableDeclarator") || !declarator.init) return null;
+	visitedReferences.add(receiverReference.resolved);
+	const initializer = stripParenExpression(declarator.init);
+	if (propertyName === "current" && isNodeOfType(initializer, "CallExpression")) {
+		if (!isReactApiCall(initializer, "useRef", scopes, {
+			allowGlobalReactNamespace: true,
+			allowUnboundBareCalls: true
+		})) return null;
+		const callbackArgument = initializer.arguments[0];
+		if (!callbackArgument) return null;
+		let callbackNames = resolveParentCallbackPropNames(analysis, callbackArgument, scopes, new Set(visitedReferences), false);
+		if (!callbackNames) return null;
+		for (const candidateReference of receiverReference.resolved.references) {
+			const candidateIdentifier = candidateReference.identifier;
+			const candidateMember = candidateIdentifier.parent;
+			if (!candidateMember || !isNodeOfType(candidateMember, "MemberExpression") || candidateMember.object !== candidateIdentifier || getStaticMemberPropertyName(candidateMember) !== "current") continue;
+			const assignment = candidateMember.parent;
+			if (!assignment || !isNodeOfType(assignment, "AssignmentExpression") || assignment.left !== candidateMember) continue;
+			if (assignment.operator !== "=") return null;
+			callbackNames = mergeRequiredBranches(callbackNames, resolveParentCallbackPropNames(analysis, assignment.right, scopes, new Set(visitedReferences), false));
+			if (!callbackNames) return null;
+		}
+		return callbackNames;
+	}
+	if (!isNodeOfType(initializer, "ObjectExpression")) return null;
+	const property = initializer.properties.find((candidateProperty) => isNodeOfType(candidateProperty, "Property") && getStaticPropertyKeyName(candidateProperty, { allowComputedString: true }) === propertyName);
+	if (!property || !isNodeOfType(property, "Property")) return null;
+	return resolveParentCallbackPropNames(analysis, property.value, scopes, visitedReferences, false);
+};
+const getParentCallbackPropNames = ({ analysis, expression, scopes }) => resolveParentCallbackPropNames(analysis, expression, scopes, /* @__PURE__ */ new Set(), false);
+//#endregion
 //#region src/plugin/rules/state-and-effects/no-pass-data-to-parent.ts
 const isUseStateIdentifier = (identifier) => {
 	if (!isNodeOfType(identifier, "Identifier")) return false;
@@ -44359,14 +45536,18 @@ const FUNCTION_WRAPPER_HOOK_NAMES$1 = new Set([
 	"useStableCallback",
 	"useCallbackRef"
 ]);
-const getWrapperHookWrappedFunction = (initializer) => {
+const getWrapperHookWrappedFunction = (initializer, resultSymbol, scopes) => {
 	if (!isNodeOfType(initializer, "CallExpression")) return null;
+	const transparentReactArgument = getTransparentReactCallbackWrapperArgument(initializer, resultSymbol, scopes);
+	if (transparentReactArgument) return transparentReactArgument;
 	const callee = initializer.callee;
 	const calleeName = isNodeOfType(callee, "Identifier") ? callee.name : isNodeOfType(callee, "MemberExpression") && isNodeOfType(callee.property, "Identifier") ? callee.property.name : null;
 	if (!calleeName || !FUNCTION_WRAPPER_HOOK_NAMES$1.has(calleeName)) return null;
 	const wrapped = initializer.arguments?.[0];
-	if (!wrapped || !isFunctionLike$1(wrapped)) return null;
-	return wrapped;
+	if (!wrapped) return null;
+	if (calleeName === "useEffectEvent") return null;
+	if (isFunctionLike$1(wrapped)) return wrapped;
+	return null;
 };
 const HANDLER_NAMED_PROP_PATTERN = /^(on|handle)[A-Z]/;
 const wrappedFunctionNotifiesParent = (analysis, wrappedFunction) => getDownstreamRefs(analysis, wrappedFunction).some((innerRef) => {
@@ -44376,16 +45557,29 @@ const wrappedFunctionNotifiesParent = (analysis, wrappedFunction) => getDownstre
 	const innerParent = innerIdentifier.parent;
 	return Boolean(innerParent && isNodeOfType(innerParent, "CallExpression") && innerParent.callee === innerIdentifier);
 });
-const isDirectParentCallbackRef = (analysis, ref) => {
+const isDirectParentCallbackRef = (analysis, ref, scopes) => {
 	if (isProp(analysis, ref)) return true;
+	if (hasMutableBindingWrite$1(ref)) {
+		if (!(ref.resolved?.references.filter((candidateReference) => candidateReference.isWrite() && !candidateReference.init) ?? []).every((candidateReference) => {
+			const candidateIdentifier = candidateReference.identifier;
+			const assignment = candidateIdentifier.parent;
+			if (!assignment || !isNodeOfType(assignment, "AssignmentExpression") || assignment.operator !== "=" || assignment.left !== candidateIdentifier) return false;
+			const assignedReferences = getDownstreamRefs(analysis, assignment.right);
+			return assignedReferences.length > 0 && assignedReferences.every((assignedReference) => isProp(analysis, assignedReference));
+		})) return false;
+	}
 	return Boolean(ref.resolved?.defs.some((def) => {
 		const node = def.node;
 		if (!isNodeOfType(node, "VariableDeclarator") || !node.init) return false;
 		const initializer = unwrapChainExpression(node.init);
-		const wrappedFunction = getWrapperHookWrappedFunction(initializer);
+		const wrappedFunction = getWrapperHookWrappedFunction(initializer, isNodeOfType(node.id, "Identifier") ? scopes.symbolFor(node.id) ?? null : null, scopes);
 		if (wrappedFunction) {
 			if (wrappedFunction.async) return false;
-			return wrappedFunctionNotifiesParent(analysis, wrappedFunction);
+			if (isFunctionLike$1(wrappedFunction)) return wrappedFunctionNotifiesParent(analysis, wrappedFunction);
+			const directName = getParentCallbackPropName(analysis, wrappedFunction);
+			const downstreamReferences = getDownstreamRefs(analysis, wrappedFunction);
+			if (directName !== null) return true;
+			return downstreamReferences.some((wrappedReference) => !hasMutableBindingWrite$1(wrappedReference) && getUpstreamRefs(analysis, wrappedReference).some((upstreamReference) => isProp(analysis, upstreamReference)));
 		}
 		if (!isNodeOfType(initializer, "Identifier") && !isNodeOfType(initializer, "MemberExpression")) return false;
 		return getDownstreamRefs(analysis, initializer).some((initializerRef) => getUpstreamRefs(analysis, initializerRef).some((upstreamRef) => isProp(analysis, upstreamRef)));
@@ -44395,7 +45589,7 @@ const getDeclarationKind = (declarator) => {
 	const declaration = declarator.parent;
 	return declaration && isNodeOfType(declaration, "VariableDeclaration") ? declaration.kind : null;
 };
-const hasMutableBindingWrite = (reference) => Boolean(reference.resolved?.references.some((candidateReference) => candidateReference.isWrite() && !candidateReference.init));
+const hasMutableBindingWrite$1 = (reference) => Boolean(reference.resolved?.references.some((candidateReference) => candidateReference.isWrite() && !candidateReference.init));
 const getParentCallbackPropName = (analysis, expression, visitedVariables = /* @__PURE__ */ new Set()) => {
 	const unwrappedExpression = stripParenExpression(expression);
 	if (isNodeOfType(unwrappedExpression, "Identifier")) {
@@ -44407,7 +45601,7 @@ const getParentCallbackPropName = (analysis, expression, visitedVariables = /* @
 			const bindingIdentifier = callbackVariable.defs.find((definition) => definition.type === "Parameter")?.name;
 			return (bindingIdentifier && getDestructuredBindingPropertyName(bindingIdentifier)) ?? unwrappedExpression.name;
 		}
-		if (hasMutableBindingWrite(callbackReference)) return null;
+		if (hasMutableBindingWrite$1(callbackReference)) return null;
 		const definitions = callbackVariable.defs.map((definition) => definition.node).filter((definitionNode) => isNodeOfType(definitionNode, "VariableDeclarator"));
 		if (definitions.length !== 1) return null;
 		const declarator = definitions[0];
@@ -44473,7 +45667,7 @@ const getRefAliasDeclarator = (identifier) => {
 const getRefBindingProvenance = (analysis, receiver, isReactUseRefCall) => {
 	if (!isNodeOfType(receiver, "Identifier")) return null;
 	const receiverReference = getRef(analysis, receiver);
-	if (!receiverReference?.resolved || hasMutableBindingWrite(receiverReference)) return null;
+	if (!receiverReference?.resolved || hasMutableBindingWrite$1(receiverReference)) return null;
 	const variables = /* @__PURE__ */ new Set();
 	let currentVariable = receiverReference.resolved;
 	let refCall = null;
@@ -44489,7 +45683,7 @@ const getRefBindingProvenance = (analysis, receiver, isReactUseRefCall) => {
 		}
 		if (getDeclarationKind(declarator) !== "const" || !isNodeOfType(stripParenExpression(declarator.init), "Identifier")) return null;
 		const upstreamReference = getRef(analysis, stripParenExpression(declarator.init));
-		if (!upstreamReference?.resolved || hasMutableBindingWrite(upstreamReference)) return null;
+		if (!upstreamReference?.resolved || hasMutableBindingWrite$1(upstreamReference)) return null;
 		currentVariable = upstreamReference.resolved;
 	}
 	if (!refCall) return null;
@@ -44564,7 +45758,7 @@ const isParentPropsContextMerge = (analysis, expression) => {
 	while (isNodeOfType(currentExpression, "Identifier")) {
 		const currentReference = getRef(analysis, currentExpression);
 		const currentVariable = currentReference?.resolved;
-		if (!currentReference || !currentVariable || visitedVariables.has(currentVariable) || hasMutableBindingWrite(currentReference)) return false;
+		if (!currentReference || !currentVariable || visitedVariables.has(currentVariable) || hasMutableBindingWrite$1(currentReference)) return false;
 		visitedVariables.add(currentVariable);
 		const definitions = currentVariable.defs.filter((definition) => isNodeOfType(definition.node, "VariableDeclarator"));
 		if (definitions.length !== 1) return false;
@@ -44578,11 +45772,11 @@ const isParentPropsContextMerge = (analysis, expression) => {
 	const propsExpression = stripParenExpression(propsSpread.argument);
 	if (!isNodeOfType(propsExpression, "Identifier")) return false;
 	const propsReference = getRef(analysis, propsExpression);
-	if (!propsReference?.resolved || !isWholePropsObjectReference(analysis, propsReference) || hasMutableBindingWrite(propsReference) || propsReference.resolved.references.some((candidateReference) => candidateReference !== propsReference)) return false;
+	if (!propsReference?.resolved || !isWholePropsObjectReference(analysis, propsReference) || hasMutableBindingWrite$1(propsReference) || propsReference.resolved.references.some((candidateReference) => candidateReference !== propsReference)) return false;
 	const contextExpression = stripParenExpression(contextSpread.argument);
 	if (!isNodeOfType(contextExpression, "Identifier")) return false;
 	const contextReference = getRef(analysis, contextExpression);
-	if (!contextReference?.resolved || hasMutableBindingWrite(contextReference) || contextReference.resolved.references.some((candidateReference) => !candidateReference.init && candidateReference !== contextReference)) return false;
+	if (!contextReference?.resolved || hasMutableBindingWrite$1(contextReference) || contextReference.resolved.references.some((candidateReference) => !candidateReference.init && candidateReference !== contextReference)) return false;
 	const contextInitializer = contextReference.resolved?.defs.map((definition) => definition.node).find((definitionNode) => isNodeOfType(definitionNode, "VariableDeclarator"));
 	if (!contextInitializer || !isNodeOfType(contextInitializer, "VariableDeclarator") || getDeclarationKind(contextInitializer) !== "const" || !contextInitializer.init || !isNodeOfType(contextInitializer.init, "CallExpression")) return false;
 	const contextHook = stripParenExpression(contextInitializer.init.callee);
@@ -44596,7 +45790,7 @@ const getImmutableParentCallbackPropName = (analysis, expression) => {
 	while (isNodeOfType(currentExpression, "Identifier")) {
 		const currentReference = getRef(analysis, currentExpression);
 		const currentVariable = currentReference?.resolved;
-		if (!currentReference || !currentVariable || visitedVariables.has(currentVariable) || hasMutableBindingWrite(currentReference)) return null;
+		if (!currentReference || !currentVariable || visitedVariables.has(currentVariable) || hasMutableBindingWrite$1(currentReference)) return null;
 		visitedVariables.add(currentVariable);
 		const definition = currentVariable.defs.length === 1 ? currentVariable.defs[0] : null;
 		const bindingIdentifier = definition?.name;
@@ -44665,7 +45859,7 @@ const getCommandCallbackPropName = (analysis, expression, isReactUseRefCall) =>
 	while (isNodeOfType(currentExpression, "Identifier")) {
 		const callbackReference = getRef(analysis, currentExpression);
 		const callbackVariable = callbackReference?.resolved;
-		if (!callbackReference || !callbackVariable || visitedVariables.has(callbackVariable) || hasMutableBindingWrite(callbackReference)) return null;
+		if (!callbackReference || !callbackVariable || visitedVariables.has(callbackVariable) || hasMutableBindingWrite$1(callbackReference)) return null;
 		visitedVariables.add(callbackVariable);
 		const definition = callbackVariable.defs.length === 1 ? callbackVariable.defs[0] : null;
 		const declarator = definition?.node;
@@ -44685,10 +45879,11 @@ const getCommandCallbackPropName = (analysis, expression, isReactUseRefCall) =>
 	if (!propertyName || !COMMAND_PROP_NAME_PATTERN.test(propertyName)) return null;
 	return refCurrentObjectPreservesCallbackProperty(analysis, currentExpression.object, propertyName, isReactUseRefCall) ? propertyName : null;
 };
-const isWrapperHookCallbackRef = (analysis, ref) => Boolean(ref.resolved?.defs.some((def) => {
+const isWrapperHookCallbackRef = (analysis, ref, scopes) => Boolean(ref.resolved?.defs.some((def) => {
 	const node = def.node;
 	if (!isNodeOfType(node, "VariableDeclarator") || !node.init) return false;
-	return getWrapperHookWrappedFunction(unwrapChainExpression(node.init)) !== null;
+	const resultSymbol = isNodeOfType(node.id, "Identifier") ? scopes.symbolFor(node.id) ?? null : null;
+	return getWrapperHookWrappedFunction(unwrapChainExpression(node.init), resultSymbol, scopes) !== null;
 }));
 const isHandlerBagArgument = (analysis, argument) => {
 	if (!isNodeOfType(argument, "ObjectExpression")) return false;
@@ -44707,14 +45902,25 @@ const isHandlerBagArgument = (analysis, argument) => {
 };
 const getFunctionalUpdaterDataRefs = (analysis, updater) => getDownstreamRefs(analysis, updater).filter((updaterRef) => !updaterRef.resolved?.defs.some((def) => def.type === "Parameter" && def.node === updater));
 const HOOK_NAME_PATTERN$1 = /^use[A-Z0-9]/;
-const EXTERNAL_SUBSCRIPTION_HOOK_NAMES = new Set([
+const EXTERNAL_SUBSCRIPTION_HOOK_NAMES$1 = new Set([
 	"useIntersectionObserver",
 	"useMatchMedia",
+	"useMediaJobProgress",
 	"useMediaQuery",
 	"useResizeObserver",
 	"useVisibility",
 	"useWindowSize"
 ]);
+const isCallbackPropReference = (analysis, ref) => {
+	if (!isProp(analysis, ref)) return false;
+	const identifier = ref.identifier;
+	if (!isNodeOfType(identifier, "Identifier")) return false;
+	if (!isWholePropsObjectReference(analysis, ref)) return HANDLER_NAMED_PROP_PATTERN.test(identifier.name);
+	const member = identifier.parent;
+	if (!member || !isNodeOfType(member, "MemberExpression") || member.object !== identifier) return false;
+	const propertyName = getStaticMemberPropertyName(member);
+	return Boolean(propertyName && HANDLER_NAMED_PROP_PATTERN.test(propertyName));
+};
 const isParentWiredHookResultRef = (analysis, ref) => Boolean(ref.resolved?.defs.some((def) => {
 	const node = def.node;
 	if (!isNodeOfType(node, "VariableDeclarator") || !node.init) return false;
@@ -44722,7 +45928,7 @@ const isParentWiredHookResultRef = (analysis, ref) => Boolean(ref.resolved?.defs
 	if (!isNodeOfType(init, "CallExpression")) return false;
 	const callee = init.callee;
 	if (!isNodeOfType(callee, "Identifier") || !HOOK_NAME_PATTERN$1.test(callee.name)) return false;
-	return (init.arguments ?? []).some((hookArgument) => getDownstreamRefs(analysis, hookArgument).some((downstreamRef) => isProp(analysis, downstreamRef)));
+	return (init.arguments ?? []).some((hookArgument) => getDownstreamRefs(analysis, hookArgument).some((downstreamRef) => isCallbackPropReference(analysis, downstreamRef)));
 }));
 const isParentWiredHookResultArgument = (analysis, argument) => {
 	if (!isNodeOfType(argument, "Identifier")) return false;
@@ -44735,19 +45941,19 @@ const isParentWiredHookCalleeRef = (analysis, ref) => {
 	if (!isNodeOfType(identifier, "Identifier") || !HOOK_NAME_PATTERN$1.test(identifier.name)) return false;
 	const parent = identifier.parent;
 	if (!parent || !isNodeOfType(parent, "CallExpression") || parent.callee !== identifier) return false;
-	return (parent.arguments ?? []).some((hookArgument) => getDownstreamRefs(analysis, hookArgument).some((downstreamRef) => isProp(analysis, downstreamRef)));
+	return (parent.arguments ?? []).some((hookArgument) => getDownstreamRefs(analysis, hookArgument).some((downstreamRef) => isCallbackPropReference(analysis, downstreamRef)));
 };
 const isExternalSubscriptionHookRef = (ref) => {
 	const identifier = ref.identifier;
 	if (!isNodeOfType(identifier, "Identifier")) return false;
-	if (EXTERNAL_SUBSCRIPTION_HOOK_NAMES.has(identifier.name) && isCalleePosition(identifier)) return true;
+	if (EXTERNAL_SUBSCRIPTION_HOOK_NAMES$1.has(identifier.name) && isCalleePosition(identifier)) return true;
 	return Boolean(ref.resolved?.defs.some((def) => {
 		const node = def.node;
 		if (!isNodeOfType(node, "VariableDeclarator") || !node.init) return false;
 		const initializer = stripParenExpression(node.init);
 		if (!isNodeOfType(initializer, "CallExpression")) return false;
 		const callee = stripParenExpression(initializer.callee);
-		return isNodeOfType(callee, "Identifier") && EXTERNAL_SUBSCRIPTION_HOOK_NAMES.has(callee.name);
+		return isNodeOfType(callee, "Identifier") && EXTERNAL_SUBSCRIPTION_HOOK_NAMES$1.has(callee.name);
 	}));
 };
 const isImportBindingRef = (ref) => Boolean(ref.resolved?.defs.some((def) => def.type === "ImportBinding"));
@@ -44783,16 +45989,22 @@ const noPassDataToParent = defineRule({
 				const callExpr = getCallExpr(ref);
 				if (!callExpr || !isNodeOfType(callExpr, "CallExpression")) continue;
 				const callbackRefProvenance = getCallbackRefProvenance(analysis, node, callExpr, isReactUseRefCall, isReactUseEffectCall);
-				if (isRefCall(analysis, ref) && !callbackRefProvenance) continue;
 				if (!isSynchronous(ref.identifier, effectFn)) continue;
 				const calleeNode = unwrapChainExpression(callExpr.callee);
 				const identifier = ref.identifier;
-				if (callbackRefProvenance) {
-					if ([...callbackRefProvenance.callbackPropNames].some((callbackPropName) => COMMAND_PROP_NAME_PATTERN.test(callbackPropName))) continue;
+				const resolvedCallbackPropNames = isNodeOfType(calleeNode, "MemberExpression") && getStaticMemberPropertyName(calleeNode) === "current" ? null : getParentCallbackPropNames({
+					analysis,
+					expression: calleeNode,
+					scopes: context.scopes
+				});
+				const callbackPropNames = callbackRefProvenance?.callbackPropNames ?? resolvedCallbackPropNames;
+				if (isRefCall(analysis, ref) && !callbackPropNames) continue;
+				if (callbackPropNames) {
+					if ([...callbackPropNames].some((callbackPropName) => COMMAND_PROP_NAME_PATTERN.test(callbackPropName))) continue;
 				} else if (calleeNode === identifier) {
 					const callbackPropName = getCommandCallbackPropName(analysis, identifier, isReactUseRefCall);
 					if (callbackPropName && COMMAND_PROP_NAME_PATTERN.test(callbackPropName)) continue;
-					if (!isDirectParentCallbackRef(analysis, ref)) continue;
+					if (!isDirectParentCallbackRef(analysis, ref, context.scopes)) continue;
 					if (isNodeOfType(identifier, "Identifier") && COMMAND_PROP_NAME_PATTERN.test(identifier.name)) continue;
 				} else if (isNodeOfType(calleeNode, "MemberExpression") && stripParenExpression(calleeNode.object) === identifier) {
 					if (!isWholePropsObjectReference(analysis, ref)) continue;
@@ -44800,10 +46012,10 @@ const noPassDataToParent = defineRule({
 				} else continue;
 				const methodName = getCallMethodName(calleeNode);
 				const isPropCallbackNamedLikeStringRead = Boolean(methodName && STRING_READ_METHOD_NAMES.has(methodName) && isNodeOfType(calleeNode, "MemberExpression") && stripParenExpression(calleeNode.object) === ref.identifier && isWholePropsObjectReference(analysis, ref));
-				if (methodName && DATA_SINK_METHOD_NAMES.has(methodName) && !isPropCallbackNamedLikeStringRead) continue;
+				if (methodName && DATA_SINK_METHOD_NAMES.has(methodName) && !isPropCallbackNamedLikeStringRead && !callbackPropNames) continue;
 				if (methodName && COMMAND_PROP_NAME_PATTERN.test(methodName)) continue;
-				if (!callbackRefProvenance && isNamespacedApiCallee(calleeNode)) continue;
-				const isSetterNamedCallee = callbackRefProvenance ? [...callbackRefProvenance.callbackPropNames].every((callbackPropName) => SETTER_NAMED_PROP_PATTERN.test(callbackPropName)) : Boolean((isNodeOfType(identifier, "Identifier") ? identifier.name : methodName) && SETTER_NAMED_PROP_PATTERN.test((isNodeOfType(identifier, "Identifier") ? identifier.name : methodName) ?? ""));
+				if (!callbackPropNames && isNamespacedApiCallee(calleeNode)) continue;
+				const isSetterNamedCallee = callbackPropNames ? [...callbackPropNames].every((callbackPropName) => SETTER_NAMED_PROP_PATTERN.test(callbackPropName)) : Boolean((isNodeOfType(identifier, "Identifier") ? identifier.name : methodName) && SETTER_NAMED_PROP_PATTERN.test((isNodeOfType(identifier, "Identifier") ? identifier.name : methodName) ?? ""));
 				const isLeafRef = (argRef) => getUpstreamRefs(analysis, argRef).length === 1;
 				const argsUpstreamRefs = (callExpr.arguments ?? []).flatMap((argument) => {
 					if (isFunctionLike$1(argument)) {
@@ -44818,7 +46030,7 @@ const noPassDataToParent = defineRule({
 					}
 					return getDownstreamRefs(analysis, argument);
 				}).flatMap((argumentRef) => isExternallyDrivenState(analysis, argumentRef) ? [] : getUpstreamRefs(analysis, argumentRef)).filter(isLeafRef);
-				if (calleeNode === identifier && isWrapperHookCallbackRef(analysis, ref)) argsUpstreamRefs.push(...getArgsUpstreamRefs(analysis, ref).filter(isLeafRef));
+				if (calleeNode === identifier && isWrapperHookCallbackRef(analysis, ref, context.scopes)) argsUpstreamRefs.push(...getArgsUpstreamRefs(analysis, ref).filter(isLeafRef));
 				if (!argsUpstreamRefs.some((argRef) => {
 					if (isUseStateIdentifier(argRef.identifier)) return false;
 					if (isExternalSubscriptionHookRef(argRef)) return false;
@@ -44856,9 +46068,47 @@ const isCallResultConsumedAsArgument = (callExpression) => {
 	return false;
 };
 //#endregion
+//#region src/plugin/rules/state-and-effects/utils/is-custom-hook-state-result-reference.ts
+const NON_STATE_CUSTOM_HOOK_NAMES = new Set([
+	"useCallbackRef",
+	"useEffectEvent",
+	"useEvent",
+	"useEventCallback",
+	"useLatest",
+	"useMemoizedFn",
+	"useStableCallback"
+]);
+const EXTERNAL_SUBSCRIPTION_HOOK_NAMES = new Set([
+	"useIntersectionObserver",
+	"useMatchMedia",
+	"useMediaJobProgress",
+	"useMediaQuery",
+	"useResizeObserver",
+	"useVisibility",
+	"useWindowSize"
+]);
+const getHookCalleeName = (initializer) => {
+	const unwrappedInitializer = stripParenExpression(initializer);
+	if (!isNodeOfType(unwrappedInitializer, "CallExpression")) return null;
+	const callee = stripParenExpression(unwrappedInitializer.callee);
+	if (isNodeOfType(callee, "Identifier")) return callee.name;
+	if (isNodeOfType(callee, "MemberExpression") && isNodeOfType(callee.property, "Identifier")) return callee.property.name;
+	return null;
+};
+const isCustomHookStateResultReference = (analysis, reference) => Boolean(reference.resolved?.defs.some((definition) => {
+	const declarator = definition.node;
+	if (!isNodeOfType(declarator, "VariableDeclarator") || !declarator.init) return false;
+	const calleeName = getHookCalleeName(declarator.init);
+	if (!calleeName || !HOOK_NAME_PATTERN$3.test(calleeName) || BUILTIN_HOOK_NAMES.has(calleeName) || NON_STATE_CUSTOM_HOOK_NAMES.has(calleeName) || EXTERNAL_SUBSCRIPTION_HOOK_NAMES.has(calleeName)) return false;
+	const initializer = stripParenExpression(declarator.init);
+	if (!isNodeOfType(initializer, "CallExpression")) return false;
+	return initializer.arguments.some((argument) => getDownstreamRefs(analysis, argument).some((argumentReference) => isProp(analysis, argumentReference)));
+}));
+//#endregion
 //#region src/plugin/rules/state-and-effects/no-pass-live-state-to-parent.ts
 const SETTER_NAMED_CALLBACK_PATTERN = /^set[A-Z]/;
 const DATA_FETCHING_CALLBACK_PATTERN = /^(fetch|refetch|load|query|request)([A-Z_]|$)/;
+const hasMutableBindingWrite = (reference) => Boolean(reference.resolved?.references.some((candidateReference) => candidateReference.isWrite() && !candidateReference.init));
 const getCallCalleeName = (callExpr) => {
 	if (!isNodeOfType(callExpr, "CallExpression")) return null;
 	const callee = callExpr.callee;
@@ -44903,6 +46153,10 @@ const collectUpstreamStateRefs = (analysis, ref, stateRefs, visited) => {
 		stateRefs.push(ref);
 		return;
 	}
+	if (isCustomHookStateResultReference(analysis, ref)) {
+		stateRefs.push(ref);
+		return;
+	}
 	for (const def of ref.resolved?.defs ?? []) {
 		if (def.type === "ImportBinding" || def.type === "Parameter") continue;
 		const defNode = def.node;
@@ -44932,6 +46186,32 @@ const collectPropCallbackBoundStateRefs = (analysis, ref, isPropCallbackRef) =>
 	}
 	return stateRefs;
 };
+const collectDirectCallStateRefs = (analysis, callExpression) => {
+	const stateReferences = [];
+	for (const argument of callExpression.arguments) {
+		if (isFunctionLike$1(argument)) continue;
+		for (const argumentReference of getDownstreamRefs(analysis, argument)) {
+			if (resolveToFunction(argumentReference)) continue;
+			collectUpstreamStateRefs(analysis, argumentReference, stateReferences, /* @__PURE__ */ new Set());
+		}
+	}
+	return stateReferences;
+};
+const getTransparentWrapperPropReference = (analysis, reference, context) => {
+	for (const definition of reference.resolved?.defs ?? []) {
+		const declarator = definition.node;
+		if (!isNodeOfType(declarator, "VariableDeclarator") || !isNodeOfType(declarator.id, "Identifier") || !declarator.init) continue;
+		const resultSymbol = context.scopes.symbolFor(declarator.id);
+		const callbackArgument = getTransparentReactCallbackWrapperArgument(declarator.init, resultSymbol, context.scopes);
+		if (!callbackArgument) continue;
+		const callbackReferences = getDownstreamRefs(analysis, callbackArgument);
+		const callbackReference = callbackReferences.find((candidateReference) => isPropCallbackInvocationRef(analysis, candidateReference));
+		if (callbackReference) return callbackReference;
+		const propReference = callbackReferences.find((candidateReference) => isProp(analysis, candidateReference) && !candidateReference.resolved?.references.some((candidateUsage) => candidateUsage.isWrite() && !candidateUsage.init));
+		if (propReference) return propReference;
+	}
+	return null;
+};
 const isSetterNamedCallbackReceivingData = (callbackRef) => {
 	const callExpr = getCallExpr(callbackRef);
 	if (!callExpr || !isNodeOfType(callExpr, "CallExpression")) return false;
@@ -44967,6 +46247,16 @@ const resolvesToLocalHookReturnBinding = (ref) => Boolean(ref?.resolved?.defs?.s
 	const calleeName = getInitializerCalleeName(node.init);
 	return calleeName !== null && isReactHookName(calleeName) && !FUNCTION_WRAPPER_HOOK_NAMES.has(calleeName);
 }));
+const getDirectLocalEffectHelper = (callExpression, effectFunction, context) => {
+	const helperFunction = resolveExactLocalFunction(callExpression.callee, context.scopes);
+	if (!helperFunction) return null;
+	let ancestor = callExpression.parent;
+	while (ancestor && ancestor !== effectFunction) {
+		if (isFunctionLike$1(ancestor)) return null;
+		ancestor = ancestor.parent;
+	}
+	return ancestor === effectFunction ? helperFunction : null;
+};
 const noPassLiveStateToParent = defineRule({
 	id: "no-pass-live-state-to-parent",
 	title: "Live state pushed to parent via effect",
@@ -44981,20 +46271,32 @@ const noPassLiveStateToParent = defineRule({
 		if (!effectFnRefs) return;
 		const effectFn = getEffectFn(analysis, node);
 		if (!effectFn) return;
+		const effectFunctionBody = isNodeOfType(effectFn, "ArrowFunctionExpression") || isNodeOfType(effectFn, "FunctionExpression") || isNodeOfType(effectFn, "FunctionDeclaration") ? effectFn.body : null;
 		for (const ref of effectFnRefs) {
-			const propCallbackRefs = getEventualCallRefsTo(analysis, ref, (innerRef) => isParentNotificationCallbackRef(analysis, innerRef));
-			if (propCallbackRefs.length === 0) continue;
-			if (resolvesToLocalHookReturnBinding(ref)) continue;
-			if (!isSynchronous(ref.identifier, effectFn)) continue;
 			const callExpr = getCallExpr(ref);
-			if (!callExpr) continue;
+			if (!callExpr || !isNodeOfType(callExpr, "CallExpression")) continue;
+			const directLocalEffectHelper = getDirectLocalEffectHelper(callExpr, effectFn, context);
+			const callGraphReferences = directLocalEffectHelper ? [ref, ...getDownstreamRefs(analysis, directLocalEffectHelper)] : [ref];
+			const resolvedCallbackPropNames = getParentCallbackPropNames({
+				analysis,
+				expression: callExpr.callee,
+				scopes: context.scopes
+			});
+			const callExpressionRoot = findTransparentExpressionRoot(callExpr);
+			const notificationCallbackPropNames = Boolean(resolvedCallbackPropNames && callExpr.arguments.length > 0 && (!isCallResultCapturedToLocal(callExpr) || isNodeOfType(callExpressionRoot.parent, "ReturnStatement") && callExpressionRoot.parent.parent === effectFunctionBody) && [...resolvedCallbackPropNames].every((callbackPropName) => !DATA_FETCHING_CALLBACK_PATTERN.test(callbackPropName))) ? resolvedCallbackPropNames : null;
+			if (!notificationCallbackPropNames && hasMutableBindingWrite(ref)) continue;
+			const propCallbackRefs = callGraphReferences.flatMap((callGraphReference) => getEventualCallRefsTo(analysis, callGraphReference, (innerRef) => isParentNotificationCallbackRef(analysis, innerRef)));
+			const transparentPropReference = propCallbackRefs.length === 0 ? getTransparentWrapperPropReference(analysis, ref, context) : null;
+			if (propCallbackRefs.length === 0 && !transparentPropReference && !notificationCallbackPropNames) continue;
+			if (!notificationCallbackPropNames && resolvesToLocalHookReturnBinding(ref)) continue;
+			if (!isSynchronous(ref.identifier, effectFn) && !directLocalEffectHelper) continue;
 			if (isCallResultConsumedAsArgument(callExpr)) continue;
 			const calleeNode = callExpr.callee;
 			const methodName = calleeNode ? getCallMethodName(calleeNode) : null;
 			const isPropCallbackNamedLikeStringRead = Boolean(methodName && STRING_READ_METHOD_NAMES.has(methodName) && calleeNode && isNodeOfType(calleeNode, "MemberExpression") && stripParenExpression(calleeNode.object) === ref.identifier && isWholePropsObjectReference(analysis, ref));
-			if (methodName && DATA_SINK_METHOD_NAMES.has(methodName) && !isPropCallbackNamedLikeStringRead) continue;
-			if (calleeNode && isNamespacedApiCallee(calleeNode)) continue;
-			const stateArgRefs = collectPropCallbackBoundStateRefs(analysis, ref, (innerRef) => isParentNotificationCallbackRef(analysis, innerRef));
+			if (methodName && DATA_SINK_METHOD_NAMES.has(methodName) && !isPropCallbackNamedLikeStringRead && !notificationCallbackPropNames) continue;
+			if (!notificationCallbackPropNames && calleeNode && isNamespacedApiCallee(calleeNode)) continue;
+			const stateArgRefs = transparentPropReference || notificationCallbackPropNames ? collectDirectCallStateRefs(analysis, callExpr) : callGraphReferences.flatMap((callGraphReference) => collectPropCallbackBoundStateRefs(analysis, callGraphReference, (innerRef) => isParentNotificationCallbackRef(analysis, innerRef)));
 			const handsSetterNamedCallbackData = propCallbackRefs.some(isSetterNamedCallbackReceivingData);
 			if (stateArgRefs.length === 0 && !handsSetterNamedCallbackData) continue;
 			context.report({
@@ -45387,6 +46689,7 @@ const isStateLikeDependency = (analysis, element, isPropName) => {
 	if (!analysis) return true;
 	const reference = getRef(analysis, element);
 	if (!reference) return true;
+	if (isCustomHookStateResultReference(analysis, reference)) return true;
 	const upstreamReferences = getUpstreamRefs(analysis, reference);
 	if (upstreamReferences.some((upstreamReference) => isState(analysis, upstreamReference))) return true;
 	return !upstreamReferences.some((upstreamReference) => isProp(analysis, upstreamReference));
@@ -45403,6 +46706,22 @@ const getRefHeldPropCallbackName = (callExpression, isPropName) => {
 	if (!callbackArgument || !isNodeOfType(callbackArgument, "Identifier")) return null;
 	return isPropName(callbackArgument.name) ? callbackArgument.name : null;
 };
+const getTransparentWrappedPropCallbackName = (callExpression, context, isPropName) => {
+	const callee = stripParenExpression(callExpression.callee);
+	if (!isNodeOfType(callee, "Identifier")) return null;
+	const binding = findVariableInitializer(callExpression, callee.name);
+	if (!binding?.initializer) return null;
+	const resultSymbol = context.scopes.symbolFor(callee);
+	const callbackArgument = getTransparentReactCallbackWrapperArgument(binding.initializer, resultSymbol, context.scopes);
+	if (!callbackArgument) return null;
+	const callbackSource = stripParenExpression(callbackArgument);
+	if (isNodeOfType(callbackSource, "Identifier")) return isPropName(callbackSource.name, callbackSource) ? callbackSource.name : null;
+	if (!isNodeOfType(callbackSource, "MemberExpression")) return null;
+	const receiver = stripParenExpression(callbackSource.object);
+	const propertyName = getStaticPropertyName(callbackSource);
+	if (!isNodeOfType(receiver, "Identifier") || !propertyName) return null;
+	return isPropName(receiver.name, receiver) ? propertyName : null;
+};
 const noPropCallbackInEffect = defineRule({
 	id: "no-prop-callback-in-effect",
 	title: "Parent kept in sync with a callback effect",
@@ -45436,9 +46755,16 @@ const noPropCallbackInEffect = defineRule({
 				walkInsideStatementBlocks(callback.body, (child) => {
 					if (!isNodeOfType(child, "CallExpression")) return;
 					const directCallee = stripParenExpression(child.callee);
-					const calleeName = isNodeOfType(directCallee, "Identifier") && propStackTracker.isPropName(directCallee.name) && directCallee.name || getRefHeldPropCallbackName(child, propStackTracker.isPropName);
+					const resolvedCallbackPropNames = analysis && propStackTracker.getCurrentPropNames().size > 0 ? getParentCallbackPropNames({
+						analysis,
+						expression: directCallee,
+						scopes: context.scopes
+					}) : null;
+					const calleeName = resolvedCallbackPropNames && [...resolvedCallbackPropNames][0] || isNodeOfType(directCallee, "Identifier") && propStackTracker.isPropName(directCallee.name) && directCallee.name || getRefHeldPropCallbackName(child, propStackTracker.isPropName) || getTransparentWrappedPropCallbackName(child, context, propStackTracker.isPropName);
 					if (!calleeName) return;
-					if (!isResultDiscardedCall(child)) return;
+					const callExpressionRoot = findTransparentExpressionRoot(child);
+					const isDirectEffectReturn = isNodeOfType(callExpressionRoot.parent, "ReturnStatement") && callExpressionRoot.parent.parent === callback.body;
+					if (!isResultDiscardedCall(child) && !isDirectEffectReturn) return;
 					if (reportedNodes.has(child)) return;
 					reportedNodes.add(child);
 					context.report({
@@ -46271,6 +47597,69 @@ const noRedundantShouldComponentUpdate = defineRule({
 	}
 });
 //#endregion
+//#region src/plugin/rules/correctness/no-ref-callback-cleanup-before-react-19.ts
+const resolveFunctionExpressions = (rawExpression, scopes, visitedSymbolIds = /* @__PURE__ */ new Set()) => {
+	const expression = stripParenExpression(rawExpression);
+	if (isFunctionLike$1(expression)) return expression.async || expression.generator ? [] : [expression];
+	if (isNodeOfType(expression, "ConditionalExpression")) {
+		if (isNodeOfType(expression.test, "Literal")) return resolveFunctionExpressions(expression.test.value ? expression.consequent : expression.alternate, scopes, visitedSymbolIds);
+		return [...resolveFunctionExpressions(expression.consequent, scopes, visitedSymbolIds), ...resolveFunctionExpressions(expression.alternate, scopes, visitedSymbolIds)];
+	}
+	if (isNodeOfType(expression, "LogicalExpression")) {
+		if (isNodeOfType(expression.left, "Literal")) {
+			const isLeftTruthy = Boolean(expression.left.value);
+			if (expression.operator === "&&" && !isLeftTruthy) return [];
+			if (expression.operator === "||" && isLeftTruthy) return [];
+			if (expression.operator === "??" && expression.left.value !== null) return [];
+		}
+		if (expression.operator === "&&") return resolveFunctionExpressions(expression.right, scopes, visitedSymbolIds);
+		return [...resolveFunctionExpressions(expression.left, scopes, visitedSymbolIds), ...resolveFunctionExpressions(expression.right, scopes, visitedSymbolIds)];
+	}
+	if (isNodeOfType(expression, "SequenceExpression")) {
+		const finalExpression = expression.expressions.at(-1);
+		return finalExpression ? resolveFunctionExpressions(finalExpression, scopes, visitedSymbolIds) : [];
+	}
+	if (isNodeOfType(expression, "CallExpression")) {
+		if (!isReactApiCall(expression, "useCallback", scopes)) return [];
+		const callback = expression.arguments[0];
+		return callback && !isNodeOfType(callback, "SpreadElement") ? resolveFunctionExpressions(callback, scopes, visitedSymbolIds) : [];
+	}
+	if (!isNodeOfType(expression, "Identifier")) return [];
+	const symbol = scopes.symbolFor(expression);
+	if (!symbol || visitedSymbolIds.has(symbol.id)) return [];
+	if (symbol.kind === "function" && isNodeOfType(symbol.declarationNode, "FunctionDeclaration") && symbol.references.every((reference) => reference.flag === "read")) return resolveFunctionExpressions(symbol.declarationNode, scopes, new Set([...visitedSymbolIds, symbol.id]));
+	const initializer = getDirectConstInitializer(symbol);
+	if (!initializer) return [];
+	return resolveFunctionExpressions(initializer, scopes, new Set([...visitedSymbolIds, symbol.id]));
+};
+const functionReturnsCleanupFunction = (functionExpression, scopes) => {
+	if (!isFunctionLike$1(functionExpression)) return false;
+	if (!isNodeOfType(functionExpression.body, "BlockStatement")) return resolveFunctionExpressions(functionExpression.body, scopes).length > 0;
+	return collectFunctionReturnStatements(functionExpression).some((returnStatement) => Boolean(returnStatement.argument && resolveFunctionExpressions(returnStatement.argument, scopes).length > 0));
+};
+const callbackReturnsCleanupFunction = (callback, scopes) => {
+	return resolveFunctionExpressions(callback, scopes).some((functionExpression) => functionReturnsCleanupFunction(functionExpression, scopes));
+};
+const noRefCallbackCleanupBeforeReact19 = defineRule({
+	id: "no-ref-callback-cleanup-before-react-19",
+	title: "Ref cleanup requires React 19",
+	requires: ["react:18"],
+	disabledWhen: ["react:19"],
+	severity: "warn",
+	recommendation: "React 18 ignores functions returned from ref callbacks. Handle cleanup when React calls the ref with `null`, or require React 19 before returning a cleanup function.",
+	create: (context) => ({ JSXAttribute(node) {
+		if (getJsxAttributeName(node.name) !== "ref") return;
+		if (!isNodeOfType(node.value, "JSXExpressionContainer")) return;
+		const callback = node.value.expression;
+		if (!callback || isNodeOfType(callback, "JSXEmptyExpression")) return;
+		if (!callbackReturnsCleanupFunction(callback, context.scopes)) return;
+		context.report({
+			node,
+			message: "This ref callback returns a cleanup function, but React 18 ignores ref cleanup returns, so the cleanup never runs. Handle detachment when React calls the ref with `null`, or require React 19."
+		});
+	} })
+});
+//#endregion
 //#region src/plugin/rules/state-and-effects/no-ref-current-in-render.ts
 const REPEATED_ANCESTOR_TYPES = new Set([
 	"DoWhileStatement",
@@ -46866,7 +48255,7 @@ const doConditionsImplyFormula = (conditions, target) => {
 	}
 	return facts.didConflict || evaluateBooleanFormula$1(target, facts.assignments) === true;
 };
-const getFunctionBindingSymbol = (functionNode, scopes) => {
+const getFunctionBindingSymbol$1 = (functionNode, scopes) => {
 	if (isNodeOfType(functionNode, "FunctionDeclaration") && functionNode.id) return scopes.symbolFor(functionNode.id);
 	const parent = functionNode.parent;
 	if ((isNodeOfType(functionNode, "ArrowFunctionExpression") || isNodeOfType(functionNode, "FunctionExpression")) && isNodeOfType(parent, "VariableDeclarator") && parent.init === functionNode && isNodeOfType(parent.id, "Identifier")) return scopes.symbolFor(parent.id);
@@ -46899,7 +48288,7 @@ const isNodeEvaluatedDuringRender = (node, componentNode, scopes, visitedFunctio
 	const synchronousCallbackCall = getSynchronousCallbackCall(functionNode);
 	if (synchronousCallbackCall) return isNodeEvaluatedDuringRender(synchronousCallbackCall, componentNode, scopes, visitedFunctionSymbolIds);
 	if (executesDuringRender(functionNode, scopes)) return isNodeEvaluatedDuringRender(functionNode.parent ?? functionNode, componentNode, scopes, visitedFunctionSymbolIds);
-	const functionSymbol = getFunctionBindingSymbol(functionNode, scopes);
+	const functionSymbol = getFunctionBindingSymbol$1(functionNode, scopes);
 	if (!functionSymbol || visitedFunctionSymbolIds.has(functionSymbol.id)) return false;
 	visitedFunctionSymbolIds.add(functionSymbol.id);
 	let callCount = 0;
@@ -46948,7 +48337,7 @@ const collectExposureConditions = (analysis, context, node, componentNode, prote
 				parent = synchronousCallbackCall.parent;
 				continue;
 			}
-			const functionSymbol = getFunctionBindingSymbol(parent, context.scopes);
+			const functionSymbol = getFunctionBindingSymbol$1(parent, context.scopes);
 			if (functionSymbol?.references.length === 1) {
 				const callExpression = isReferenceDirectlyCalled(functionSymbol.references[0].identifier);
 				if (callExpression) {
@@ -47158,7 +48547,7 @@ const getSetterExposureConditions = (analysis, context, setterReference, compone
 	const functionNode = findEnclosingFunction$1(setterReference.identifier);
 	if (!functionNode) return null;
 	if (isInlineJsxCallback(functionNode)) return [collectExposureConditions(analysis, context, functionNode, componentNode, protectedSymbolIds)];
-	const functionSymbol = getFunctionBindingSymbol(functionNode, context.scopes);
+	const functionSymbol = getFunctionBindingSymbol$1(functionNode, context.scopes);
 	if (!functionSymbol || functionSymbol.references.length === 0) return null;
 	const conditionsByReference = [];
 	for (const reference of functionSymbol.references) {
@@ -53031,12 +54420,6 @@ const isInsideEs6Component$1 = (methodDefinition) => {
 	if (!owningClass) return false;
 	return isPreactOrReactComponentClass(owningClass);
 };
-const stripThisParameter = (params) => {
-	const first = params[0];
-	if (!first) return params;
-	if (isNodeOfType(first, "Identifier") && first.name === "this") return params.slice(1);
-	return params;
-};
 const preactNoRenderArguments = defineRule({
 	id: "preact-no-render-arguments",
 	title: "render() reads props from arguments",
@@ -56238,8 +57621,39 @@ const isUseStateSetterInScope = (node, setterName) => isHookBindingInScope(node,
 	destructureIndex: 1
 });
 //#endregion
+//#region src/plugin/utils/unwrap-return-expression.ts
+const unwrapReturnExpression = (node) => isNodeOfType(node, "ReturnStatement") && node.argument ? node.argument : node;
+//#endregion
 //#region src/plugin/rules/performance/rendering-hydration-no-flicker.ts
 const USE_EFFECT_ONLY = new Set(["useEffect"]);
+const USE_CALLBACK_ONLY = new Set(["useCallback"]);
+const USE_STATE_ONLY = new Set(["useState"]);
+const REACT_API_CALL_OPTIONS = {
+	allowGlobalReactNamespace: true,
+	allowUnboundBareCalls: true,
+	resolveNamedAliases: true
+};
+const expressionReadsDerivedSymbol = (context, expression, stateDerivedSymbolIds) => {
+	let readsDerivedSymbol = false;
+	walkAst(expression, (node) => {
+		if (readsDerivedSymbol) return false;
+		if (node !== expression && isFunctionLike$1(node)) return false;
+		if (isNodeOfType(node, "Identifier") && stateDerivedSymbolIds.has(context.scopes.symbolFor(node)?.id ?? -1)) readsDerivedSymbol = true;
+	});
+	return readsDerivedSymbol;
+};
+const getStaticObjectPropertyName = (property) => {
+	if (!isNodeOfType(property, "Property") || property.computed || property.method || property.kind !== "init") return null;
+	if (isNodeOfType(property.key, "Identifier")) return property.key.name;
+	if (isNodeOfType(property.key, "Literal") && (typeof property.key.value === "string" || typeof property.key.value === "number")) return String(property.key.value);
+	return null;
+};
+const isNonVisibleJsxSpreadProperty = (propertyName) => propertyName === "id" || propertyName.startsWith("aria-") || /^on[A-Z]/.test(propertyName);
+const isTransparentAssignmentTarget = (identifier) => {
+	const expressionRoot = findTransparentExpressionRoot(identifier);
+	const parent = expressionRoot.parent;
+	return Boolean(isNodeOfType(parent, "AssignmentExpression") && parent.left === expressionRoot || isNodeOfType(parent, "UpdateExpression") && parent.argument === expressionRoot || isNodeOfType(parent, "UnaryExpression") && parent.operator === "delete" && parent.argument === expressionRoot);
+};
 const argumentsReadRefCurrent = (callArguments) => callArguments.some((argument) => {
 	let readsCurrent = false;
 	walkAst(argument, (child) => {
@@ -56291,6 +57705,166 @@ const isStateUsedOnlyInIdOrAriaAttributes = (setterCall, setterName) => {
 	});
 	return referenceCount > 0 && !nonAriaReferenceFound;
 };
+const isGlobalWindowMember = (context, node, propertyName) => {
+	const member = stripParenExpression(node);
+	if (!isNodeOfType(member, "MemberExpression") || member.computed) return false;
+	const receiver = stripParenExpression(member.object);
+	return isNodeOfType(receiver, "Identifier") && receiver.name === "window" && context.scopes.isGlobalReference(receiver) && isNodeOfType(member.property, "Identifier") && member.property.name === propertyName;
+};
+const getDirectWindowWidthSetter = (context, statement) => {
+	const call = unwrapDiscardedExpression(statement);
+	if (!isNodeOfType(call, "CallExpression") || call.arguments?.length !== 1) return null;
+	if (!isNodeOfType(call.callee, "Identifier") || !isSetterCall(call)) return null;
+	const argument = call.arguments[0];
+	return isGlobalWindowMember(context, argument, "innerWidth") ? call : null;
+};
+const getResizeListenerHandler = (context, statement, methodName) => {
+	const call = unwrapDiscardedExpression(statement);
+	if (!isNodeOfType(call, "CallExpression") || call.arguments?.length !== 2) return null;
+	if (!isGlobalWindowMember(context, call.callee, methodName)) return null;
+	const eventName = call.arguments[0];
+	const handler = call.arguments[1];
+	if (!isNodeOfType(eventName, "Literal") || eventName.value !== "resize") return null;
+	return isNodeOfType(handler, "Identifier") ? handler : null;
+};
+const getCleanupResizeHandler = (context, statement) => {
+	if (!isNodeOfType(statement, "ReturnStatement") || !isFunctionLike$1(statement.argument)) return null;
+	const cleanupStatements = getCallbackStatements(statement.argument);
+	if (cleanupStatements.length !== 1) return null;
+	return getResizeListenerHandler(context, unwrapReturnExpression(cleanupStatements[0]), "removeEventListener");
+};
+const findExactViewportState = (context, componentFunction, setterCall) => {
+	if (!isFunctionLike$1(componentFunction) || !isNodeOfType(componentFunction.body, "BlockStatement")) return null;
+	const componentBody = componentFunction.body;
+	if (!isNodeOfType(setterCall.callee, "Identifier")) return null;
+	const setterSymbol = context.scopes.symbolFor(setterCall.callee);
+	if (!setterSymbol || setterSymbol.kind !== "const" || !isNodeOfType(setterSymbol.declarationNode, "VariableDeclarator")) return null;
+	const declarator = setterSymbol.declarationNode;
+	if (!isNodeOfType(declarator.id, "ArrayPattern")) return null;
+	const stateIdentifier = declarator.id.elements?.[0];
+	const setterIdentifier = declarator.id.elements?.[1];
+	if (!isNodeOfType(stateIdentifier, "Identifier") || !isNodeOfType(setterIdentifier, "Identifier") || setterIdentifier !== setterSymbol.bindingIdentifier || !isNodeOfType(declarator.init, "CallExpression") || !isReactApiCall(declarator.init, USE_STATE_ONLY, context.scopes, REACT_API_CALL_OPTIONS)) return null;
+	const initializer = declarator.init.arguments?.[0];
+	if (!isNodeOfType(initializer, "Literal") || initializer.value !== 0) return null;
+	const stateSymbol = context.scopes.symbolFor(stateIdentifier);
+	if (!stateSymbol) return null;
+	const stateDerivedSymbolIds = new Set([stateSymbol.id]);
+	let didAddDerivedSymbol = true;
+	while (didAddDerivedSymbol) {
+		didAddDerivedSymbol = false;
+		for (const statement of componentBody.body ?? []) {
+			if (!isNodeOfType(statement, "VariableDeclaration")) continue;
+			for (const candidateDeclarator of statement.declarations ?? []) {
+				if (!isNodeOfType(candidateDeclarator.id, "Identifier") || !candidateDeclarator.init) continue;
+				const candidateInitializer = stripParenExpression(candidateDeclarator.init);
+				if (isFunctionLike$1(candidateInitializer) || isNodeOfType(candidateInitializer, "CallExpression") && isReactApiCall(candidateInitializer, USE_CALLBACK_ONLY, context.scopes, REACT_API_CALL_OPTIONS)) continue;
+				if (!expressionReadsDerivedSymbol(context, candidateInitializer, stateDerivedSymbolIds)) continue;
+				const candidateSymbol = context.scopes.symbolFor(candidateDeclarator.id);
+				if (candidateSymbol?.kind === "const" && candidateSymbol.references.every((reference) => reference.flag === "read" && !isTransparentAssignmentTarget(reference.identifier)) && !stateDerivedSymbolIds.has(candidateSymbol.id)) {
+					stateDerivedSymbolIds.add(candidateSymbol.id);
+					didAddDerivedSymbol = true;
+				}
+			}
+		}
+	}
+	const staticSpreadVisibilityBySymbolId = /* @__PURE__ */ new Map();
+	const hasOnlyStaticObjectReferences = (identifier, visitedSymbolIds = /* @__PURE__ */ new Set()) => {
+		const symbol = context.scopes.symbolFor(identifier);
+		if (!symbol) return false;
+		if (visitedSymbolIds.has(symbol.id)) return true;
+		const nextVisitedSymbolIds = new Set(visitedSymbolIds);
+		nextVisitedSymbolIds.add(symbol.id);
+		let hasUnknownReference = false;
+		walkAst(componentBody, (node) => {
+			if (hasUnknownReference || !isNodeOfType(node, "Identifier") || context.scopes.symbolFor(node)?.id !== symbol.id || node === symbol.bindingIdentifier) return;
+			const referenceRoot = findTransparentExpressionRoot(node);
+			const parent = referenceRoot.parent;
+			if (isNodeOfType(parent, "JSXSpreadAttribute") && parent.argument === referenceRoot) return;
+			if (isNodeOfType(parent, "VariableDeclarator") && parent.init === referenceRoot && isNodeOfType(parent.id, "Identifier") && isNodeOfType(parent.parent, "VariableDeclaration") && parent.parent.kind === "const" && hasOnlyStaticObjectReferences(parent.id, nextVisitedSymbolIds)) return;
+			hasUnknownReference = true;
+			return false;
+		});
+		return !hasUnknownReference;
+	};
+	const classifyStaticSpreadObject = (identifier, visitedSymbolIds = /* @__PURE__ */ new Set()) => {
+		const symbol = context.scopes.symbolFor(identifier);
+		if (!symbol || visitedSymbolIds.has(symbol.id)) return "unknown";
+		const cachedVisibility = staticSpreadVisibilityBySymbolId.get(symbol.id);
+		if (cachedVisibility) return cachedVisibility;
+		if (symbol.kind !== "const" || !isNodeOfType(symbol.declarationNode, "VariableDeclarator") || !isNodeOfType(symbol.declarationNode.id, "Identifier") || symbol.declarationNode.id !== symbol.bindingIdentifier || !symbol.declarationNode.init) return "unknown";
+		if (!hasOnlyStaticObjectReferences(identifier)) return "unknown";
+		const initializer = stripParenExpression(symbol.declarationNode.init);
+		const nextVisitedSymbolIds = new Set(visitedSymbolIds);
+		nextVisitedSymbolIds.add(symbol.id);
+		if (isNodeOfType(initializer, "Identifier")) {
+			const visibility = classifyStaticSpreadObject(initializer, nextVisitedSymbolIds);
+			staticSpreadVisibilityBySymbolId.set(symbol.id, visibility);
+			return visibility;
+		}
+		if (!isNodeOfType(initializer, "ObjectExpression")) return "unknown";
+		let visibility = "non-visible";
+		for (const property of initializer.properties ?? []) {
+			const propertyName = getStaticObjectPropertyName(property);
+			if (!isNodeOfType(property, "Property") || !propertyName) {
+				visibility = "unknown";
+				break;
+			}
+			if (expressionReadsDerivedSymbol(context, property.value, stateDerivedSymbolIds) && !isNonVisibleJsxSpreadProperty(propertyName)) visibility = "visible";
+		}
+		staticSpreadVisibilityBySymbolId.set(symbol.id, visibility);
+		return visibility;
+	};
+	let hasNonAriaReference = false;
+	walkAst(componentBody, (node) => {
+		if (hasNonAriaReference) return false;
+		if (!isNodeOfType(node, "Identifier") || !stateDerivedSymbolIds.has(context.scopes.symbolFor(node)?.id ?? -1)) return;
+		if (findEnclosingFunction$1(node) !== componentFunction) return;
+		const parent = node.parent;
+		if (parent && (isNodeOfType(parent, "MemberExpression") && parent.property === node && !parent.computed || isNodeOfType(parent, "Property") && parent.key === node && !parent.computed)) return;
+		let cursor = parent;
+		while (cursor && cursor !== componentBody) {
+			if (isFunctionLike$1(cursor)) return;
+			if (isNodeOfType(cursor, "JSXSpreadAttribute")) {
+				if (isNodeOfType(node, "Identifier") && classifyStaticSpreadObject(node) === "visible") hasNonAriaReference = true;
+				return;
+			}
+			if (isNodeOfType(cursor, "JSXAttribute")) {
+				if (isEventHandlerAttribute(cursor)) return;
+				if (!isInsideIdOrAriaAttribute(node)) hasNonAriaReference = true;
+				return;
+			}
+			if (isNodeOfType(cursor, "ReturnStatement")) {
+				hasNonAriaReference = true;
+				return;
+			}
+			cursor = cursor.parent;
+		}
+	});
+	return hasNonAriaReference ? stateIdentifier.name : null;
+};
+const isExactViewportSubscriptionEffect = (context, effectCall, callback) => {
+	if (!isReactApiCall(effectCall, USE_EFFECT_ONLY, context.scopes, REACT_API_CALL_OPTIONS)) return false;
+	if (!isFunctionLike$1(callback) || callback.async || !isNodeOfType(callback.body, "BlockStatement")) return false;
+	const statements = getCallbackStatements(callback);
+	if (statements.length !== 4) return false;
+	const handlerDeclaration = statements[0];
+	if (!isNodeOfType(handlerDeclaration, "VariableDeclaration") || handlerDeclaration.kind !== "const" || handlerDeclaration.declarations?.length !== 1) return false;
+	const handlerDeclarator = handlerDeclaration.declarations[0];
+	if (!isNodeOfType(handlerDeclarator.id, "Identifier") || !isFunctionLike$1(handlerDeclarator.init)) return false;
+	const handlerStatements = getCallbackStatements(handlerDeclarator.init);
+	if (handlerStatements.length !== 1) return false;
+	const handlerSetter = getDirectWindowWidthSetter(context, unwrapReturnExpression(handlerStatements[0]));
+	const subscribedHandler = getResizeListenerHandler(context, statements[1], "addEventListener");
+	const immediateSetter = getDirectWindowWidthSetter(context, statements[2]);
+	const cleanupHandler = getCleanupResizeHandler(context, statements[3]);
+	if (!handlerSetter || !subscribedHandler || !immediateSetter || !cleanupHandler) return false;
+	const handlerSymbol = context.scopes.symbolFor(handlerDeclarator.id);
+	if (!handlerSymbol || context.scopes.symbolFor(subscribedHandler) !== handlerSymbol || context.scopes.symbolFor(cleanupHandler) !== handlerSymbol) return false;
+	if (!isNodeOfType(handlerSetter.callee, "Identifier") || !isNodeOfType(immediateSetter.callee, "Identifier") || context.scopes.symbolFor(handlerSetter.callee) !== context.scopes.symbolFor(immediateSetter.callee)) return false;
+	const componentFunction = findEnclosingFunction$1(effectCall);
+	if (!isFunctionLike$1(componentFunction) || !isNodeOfType(componentFunction.body, "BlockStatement")) return false;
+	return findExactViewportState(context, componentFunction, immediateSetter) !== null;
+};
 const renderingHydrationNoFlicker = defineRule({
 	id: "rendering-hydration-no-flicker",
 	title: "useEffect setState flashes on mount",
@@ -56303,7 +57877,14 @@ const renderingHydrationNoFlicker = defineRule({
 		if (!isNodeOfType(depsNode, "ArrayExpression") || depsNode.elements?.length !== 0) return;
 		const callback = getEffectCallback(node);
 		if (!callback || !isNodeOfType(callback, "ArrowFunctionExpression") && !isNodeOfType(callback, "FunctionExpression")) return;
-		const bodyStatements = (isNodeOfType(callback.body, "BlockStatement") ? callback.body.body ?? [] : [callback.body]).filter((statement) => !isNoOpStatement(statement));
+		if (isExactViewportSubscriptionEffect(context, node, callback)) {
+			context.report({
+				node,
+				message: "This flashes for your users because useEffect(setState, []) runs after the first paint, so use useSyncExternalStore, or add suppressHydrationWarning"
+			});
+			return;
+		}
+		const bodyStatements = getCallbackStatements(callback);
 		if (bodyStatements.length !== 1) return;
 		const soleStatement = bodyStatements[0];
 		if (!isNodeOfType(soleStatement, "ExpressionStatement")) return;
@@ -64945,6 +66526,109 @@ const isDeferrableSideEffectCall = (objectName, methodName) => {
 	if (ANALYTICS_DEFERRABLE_OBJECTS.has(objectName)) return ANALYTICS_DEFERRABLE_METHODS.has(methodName);
 	return false;
 };
+const NEXT_SERVER_SOURCE = "next/server";
+const NEXT_AFTER_EXPORT_NAMES = new Set(["after", "unstable_after"]);
+const isNextAfterImportSymbol = (symbol, contextNode) => {
+	if (symbol.kind !== "import") return false;
+	const importBinding = getImportBindingForName(contextNode, symbol.name);
+	return Boolean(importBinding && importBinding.source === NEXT_SERVER_SOURCE && !importBinding.isNamespace && importBinding.exportedName && NEXT_AFTER_EXPORT_NAMES.has(importBinding.exportedName));
+};
+const isDirectObjectPatternBinding = (symbol) => {
+	if (!isNodeOfType(symbol.declarationNode, "VariableDeclarator")) return false;
+	if (!isNodeOfType(symbol.declarationNode.id, "ObjectPattern")) return false;
+	let bindingNode = symbol.bindingIdentifier;
+	if (isNodeOfType(bindingNode.parent, "AssignmentPattern") && bindingNode.parent.left === bindingNode) bindingNode = bindingNode.parent;
+	const property = bindingNode.parent;
+	return Boolean(isNodeOfType(property, "Property") && property.value === bindingNode && property.parent === symbol.declarationNode.id);
+};
+const isNextServerNamespace = (expression, contextNode, scopes) => {
+	let candidate = stripParenExpression(expression);
+	const visitedSymbolIds = /* @__PURE__ */ new Set();
+	while (isNodeOfType(candidate, "Identifier")) {
+		const symbol = scopes.symbolFor(candidate);
+		if (!symbol || visitedSymbolIds.has(symbol.id)) return false;
+		if (symbol.kind === "import") {
+			const importBinding = getImportBindingForName(contextNode, symbol.name);
+			return Boolean(importBinding?.source === NEXT_SERVER_SOURCE && importBinding.isNamespace);
+		}
+		if (symbol.kind !== "const" || !symbol.initializer || !isNodeOfType(symbol.declarationNode, "VariableDeclarator") || symbol.declarationNode.id !== symbol.bindingIdentifier) return false;
+		visitedSymbolIds.add(symbol.id);
+		candidate = stripParenExpression(symbol.initializer);
+	}
+	return false;
+};
+const isNextAfterCallee = (callee, contextNode, scopes, visitedSymbolIds = /* @__PURE__ */ new Set()) => {
+	const candidate = stripParenExpression(callee);
+	if (isNodeOfType(candidate, "MemberExpression")) {
+		const propertyName = getStaticPropertyKeyName(candidate, { allowComputedString: true });
+		return Boolean(propertyName && NEXT_AFTER_EXPORT_NAMES.has(propertyName) && isNextServerNamespace(candidate.object, contextNode, scopes));
+	}
+	if (!isNodeOfType(candidate, "Identifier")) return false;
+	const symbol = scopes.symbolFor(candidate);
+	if (!symbol || visitedSymbolIds.has(symbol.id)) return false;
+	if (isNextAfterImportSymbol(symbol, contextNode)) return true;
+	const destructuredPropertyName = getDestructuredBindingPropertyName(symbol.bindingIdentifier);
+	if (symbol.kind === "const" && symbol.initializer && isDirectObjectPatternBinding(symbol) && destructuredPropertyName && NEXT_AFTER_EXPORT_NAMES.has(destructuredPropertyName)) return isNextServerNamespace(symbol.initializer, contextNode, scopes);
+	if (symbol.kind !== "const" || !symbol.initializer || !isNodeOfType(symbol.declarationNode, "VariableDeclarator") || symbol.declarationNode.id !== symbol.bindingIdentifier) return false;
+	visitedSymbolIds.add(symbol.id);
+	return isNextAfterCallee(symbol.initializer, contextNode, scopes, visitedSymbolIds);
+};
+const getDirectArgumentCall = (expression) => {
+	const expressionRoot = findTransparentExpressionRoot(expression);
+	const parent = expressionRoot.parent;
+	if (!isNodeOfType(parent, "CallExpression")) return null;
+	return parent.arguments[0] === expressionRoot ? parent : null;
+};
+const isScheduledByNextAfter = (expression, scopes) => {
+	const callExpression = getDirectArgumentCall(expression);
+	return Boolean(callExpression && isNextAfterCallee(callExpression.callee, callExpression, scopes));
+};
+const getFunctionBindingSymbol = (functionNode, scopes) => {
+	if (isNodeOfType(functionNode, "FunctionDeclaration") && functionNode.id) return scopes.scopeFor(functionNode).symbols.find((symbol) => symbol.declarationNode === functionNode) ?? null;
+	const functionRoot = findTransparentExpressionRoot(functionNode);
+	const parent = functionRoot.parent;
+	if (!isNodeOfType(parent, "VariableDeclarator") || parent.init !== functionRoot || !isNodeOfType(parent.id, "Identifier")) return null;
+	return scopes.symbolFor(parent.id);
+};
+const isDirectlyExported = (symbol) => {
+	let declaration = symbol.declarationNode;
+	if (isNodeOfType(declaration, "VariableDeclarator")) declaration = declaration.parent;
+	return Boolean(declaration?.parent && (isNodeOfType(declaration.parent, "ExportNamedDeclaration") || isNodeOfType(declaration.parent, "ExportDefaultDeclaration")));
+};
+const isLexicallyInsideFunction = (node, functionNode) => {
+	let enclosingFunction = findEnclosingFunction$1(node);
+	while (enclosingFunction) {
+		if (enclosingFunction === functionNode) return true;
+		enclosingFunction = findEnclosingFunction$1(enclosingFunction);
+	}
+	return false;
+};
+const isExclusivelyScheduledByNextAfter = (functionNode, scopes, visitedFunctionSymbolIds) => {
+	if (isScheduledByNextAfter(functionNode, scopes)) return true;
+	const functionSymbol = getFunctionBindingSymbol(functionNode, scopes);
+	if (!functionSymbol || isDirectlyExported(functionSymbol) || visitedFunctionSymbolIds.has(functionSymbol.id)) return false;
+	const nextVisitedFunctionSymbolIds = new Set(visitedFunctionSymbolIds).add(functionSymbol.id);
+	let hasAfterUse = false;
+	for (const reference of functionSymbol.references) {
+		if (reference.flag !== "read") return false;
+		if (isLexicallyInsideFunction(reference.identifier, functionNode)) continue;
+		if (isScheduledByNextAfter(reference.identifier, scopes)) {
+			hasAfterUse = true;
+			continue;
+		}
+		if (!isInsideNextAfterCallback(reference.identifier, scopes, nextVisitedFunctionSymbolIds)) return false;
+		hasAfterUse = true;
+	}
+	return hasAfterUse;
+};
+const isInsideNextAfterCallback = (node, scopes, visitedFunctionSymbolIds = /* @__PURE__ */ new Set()) => {
+	let enclosingFunction = findEnclosingFunction$1(node);
+	while (enclosingFunction) {
+		if (isExclusivelyScheduledByNextAfter(enclosingFunction, scopes, visitedFunctionSymbolIds)) return true;
+		enclosingFunction = findEnclosingFunction$1(enclosingFunction);
+	}
+	return false;
+};
 const serverAfterNonblocking = defineRule({
 	id: "server-after-nonblocking",
 	title: "Blocking side effect before response",
@@ -64979,6 +66663,7 @@ const serverAfterNonblocking = defineRule({
 				if (!objectName) return;
 				const methodName = node.callee.property.name;
 				if (!isDeferrableSideEffectCall(objectName, methodName)) return;
+				if (isInsideNextAfterCallback(node, context.scopes)) return;
 				context.report({
 					node,
 					message: `${objectName}.${methodName}() runs before the response, so your users wait longer for it.`
@@ -66031,14 +67716,6 @@ const isStateKey = (key) => {
 	if (isNodeOfType(key, "Literal") && typeof key.value === "string") return key.value === "state";
 	return false;
 };
-const findEnclosingClass = (node) => {
-	let ancestor = node.parent;
-	while (ancestor) {
-		if (isNodeOfType(ancestor, "ClassDeclaration") || isNodeOfType(ancestor, "ClassExpression")) return ancestor;
-		ancestor = ancestor.parent ?? null;
-	}
-	return null;
-};
 const isInConstructor = (node) => {
 	let ancestor = node.parent;
 	while (ancestor) {
@@ -66253,17 +67930,34 @@ const stylePropObject = defineRule({
 		};
 	}
 });
+//#endregion
+//#region src/plugin/rules/security-scan/utils/has-use-server-directive-in-content.ts
+const hasUseServerDirectiveInContent = (content, relativePath = "source.tsx") => {
+	const programNode = parseSourceText({
+		filename: relativePath,
+		sourceText: content,
+		shouldAttachParentReferences: false
+	});
+	return programNode === null ? false : hasDirective(programNode, "use server");
+};
+//#endregion
+//#region src/plugin/rules/security-scan/supabase-client-owned-authz-field.ts
+const scanSupabaseClientOwnedAuthzField = scanByPattern({
+	shouldScan: (file) => isClientSourcePath(file.relativePath),
+	pattern: /\b(?:ownerId|ownerID|creatorId|creatorID|userId|userID|uid|providerId|providerID|orgId|orgID|tenantId|tenantID|teamId|teamID|workspaceId|workspaceID|ghostOrg|role|roles|isAdmin|admin)\b/,
+	requireAll: [/\b(?:supabase\b|\.from\s*\(\s*["'][^"']+["']\s*\))[\s\S]{0,700}\b(?:insert|upsert|update)\s*\(\s*(?:\{|\[?\s*\{)[\s\S]{0,700}\b(?:ownerId|creatorId|userId|orgId|tenantId|role|isAdmin)\b/i],
+	message: "Client Supabase code appears to write user, tenant, owner, or role fields that should be enforced by RLS."
+});
 const supabaseClientOwnedAuthzField = defineRule({
 	id: "supabase-client-owned-authz-field",
 	title: "Client writes Supabase authorization field",
 	severity: "error",
 	recommendation: "Use RLS policies based on `auth.uid()` and server-owned membership rows; do not trust client-provided owner, org, or role columns.",
-	scan: scanByPattern({
-		shouldScan: (file) => isClientSourcePath(file.relativePath),
-		pattern: /\b(?:ownerId|ownerID|creatorId|creatorID|userId|userID|uid|providerId|providerID|orgId|orgID|tenantId|tenantID|teamId|teamID|workspaceId|workspaceID|ghostOrg|role|roles|isAdmin|admin)\b/,
-		requireAll: [/\b(?:supabase\b|\.from\s*\(\s*["'][^"']+["']\s*\))[\s\S]{0,700}\b(?:insert|upsert|update)\s*\(\s*(?:\{|\[?\s*\{)[\s\S]{0,700}\b(?:ownerId|creatorId|userId|orgId|tenantId|role|isAdmin)\b/i],
-		message: "Client Supabase code appears to write user, tenant, owner, or role fields that should be enforced by RLS."
-	})
+	scan: (file) => {
+		const findings = scanSupabaseClientOwnedAuthzField(file);
+		if (findings.length === 0) return findings;
+		return hasUseServerDirectiveInContent(file.content, file.relativePath) ? [] : findings;
+	}
 });
 //#endregion
 //#region src/plugin/rules/security-scan/utils/is-supabase-migration-path.ts
@@ -70733,6 +72427,17 @@ const reactDoctorRules = [
 			requires: [...new Set(["react", ...noRedundantShouldComponentUpdate.requires ?? []])]
 		}
 	},
+	{
+		key: "react-doctor/no-ref-callback-cleanup-before-react-19",
+		id: "no-ref-callback-cleanup-before-react-19",
+		source: "react-doctor",
+		originallyExternal: false,
+		rule: {
+			...noRefCallbackCleanupBeforeReact19,
+			framework: "global",
+			category: "Bugs"
+		}
+	},
 	{
 		key: "react-doctor/no-ref-current-in-render",
 		id: "no-ref-current-in-render",