vinext 0.1.0 → 0.1.2

package/dist/server/app-browser-entry.js

@@ -1,4 +1,3 @@
-import { stripBasePath } from "../utils/base-path.js";
 import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RSC_REDIRECT_HEADER } from "./headers.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { AppElementsWire } from "./app-elements-wire.js";
@@ -9,12 +8,13 @@ import { installWindowNext } from "../client/window-next.js";
 import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
 import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import { resolveManifestNavigationInterceptionContext } from "./app-browser-interception-context.js";
-import { createHistoryStateWithNavigationMetadata, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, resolveHardNavigationTargetFromRscResponse, resolveRscCompatibilityNavigationDecision } from "./app-rsc-cache-busting.js";
+import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
+import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, resolveRscCompatibilityNavigationDecision } from "./app-rsc-cache-busting.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
+import { navigationPlanner } from "./navigation-planner.js";
 import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, decodeRedirectError, getBfcacheIdMapContext, getClientNavigationRenderContext, getPrefetchCache, invalidatePrefetchCache, isRedirectError, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, useRouter } from "../shims/navigation.js";
+import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, getBfcacheIdMapContext, getClientNavigationRenderContext, getPrefetchCache, invalidatePrefetchCache, isRedirectError, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, useRouter } from "../shims/navigation.js";
 import { DevRecoveryBoundary, RedirectBoundary } from "../shims/error-boundary.js";
 import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
@@ -23,18 +23,19 @@ import { createDiscardedServerActionRefreshScheduler, createServerActionInitiati
 import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, isCacheRestorableAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
-import { clearHardNavigationLoopGuard, createAppBrowserNavigationController } from "./app-browser-navigation-controller.js";
+import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
 import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition } from "./app-browser-hydration.js";
+import { AppBrowserHistoryController } from "./app-browser-history-controller.js";
 import { createVisitedResponseCacheEntry, isVisitedResponseCacheEntryFresh } from "./app-visited-response-cache.js";
-import { createPopstateRestoreHandler } from "./app-browser-popstate.js";
-import { createOnUncaughtError } from "./app-browser-error.js";
+import { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition } from "./app-browser-popstate.js";
+import { createOnUncaughtError, prodOnCaughtError } from "./app-browser-error.js";
 import { dismissOverlay } from "./dev-error-overlay-store.js";
 import { devOnCaughtError, devOnUncaughtError, installDevErrorOverlay, installViteHmrErrorHandler, reportInitialDevServerErrors } from "./dev-error-overlay.js";
 import { throwOnServerActionNotFound } from "./server-action-not-found.js";
-import { resolveRscRedirectLifecycleHop } from "./app-browser-rsc-redirect.js";
 import { createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, resolveOptimisticNavigationPayload } from "./app-optimistic-routing.js";
 import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
 import { createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { flushSync } from "react-dom";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-entry.ts
@@ -57,9 +58,26 @@ const optimisticRouteTemplateLearning = /* @__PURE__ */ new Map();
 function getBrowserRouteManifest() {
 	return getNavigationRuntime()?.bootstrap.routeManifest ?? null;
 }
+const historyController = new AppBrowserHistoryController({
+	initialHistoryState: window.history.state,
+	maxHistoryStateSnapshots: 50,
+	readHistoryState: () => window.history.state,
+	readCurrentHref: () => window.location.href,
+	pushHistoryState: (state, href) => pushHistoryStateWithoutNotify(state, "", href),
+	replaceHistoryState: (state, href) => replaceHistoryStateWithoutNotify(state, "", href),
+	readVisibleNavigationMetadata: () => {
+		if (!hasBrowserRouterState()) return null;
+		const routerState = getBrowserRouterState();
+		return {
+			bfcacheIds: routerState.bfcacheIds,
+			previousNextUrl: routerState.previousNextUrl
+		};
+	}
+});
 const browserNavigationController = createAppBrowserNavigationController({
+	basePath: __basePath,
 	getRouteManifest: getBrowserRouteManifest,
-	syncHistoryStatePreviousNextUrl: syncCurrentHistoryStatePreviousNextUrl
+	syncHistoryStatePreviousNextUrl: (previousNextUrl, bfcacheIds) => historyController.syncCurrentHistoryStatePreviousNextUrl(previousNextUrl, bfcacheIds)
 });
 const discardedServerActionRefreshScheduler = createDiscardedServerActionRefreshScheduler({ runRefresh() {
 	clearClientNavigationCaches();
@@ -96,67 +114,30 @@ const mpaNavigationScheduler = new AppBrowserMpaNavigationScheduler();
 const unresolvedMpaNavigation = new Promise(() => {});
 const RSC_HMR_SETTLE_DELAY_MS = 150;
 let latestRscHmrUpdateId = 0;
-const initialHistoryBfcacheVersion = readHistoryStateBfcacheVersion(window.history.state);
-let currentBfcacheVersion = initialHistoryBfcacheVersion === null ? 0 : initialHistoryBfcacheVersion + 1;
-let currentHistoryTraversalIndex = readHistoryStateTraversalIndex(window.history.state) ?? 0;
-let nextHistoryTraversalIndex = currentHistoryTraversalIndex;
-function isCurrentBfcacheVersion(state) {
-	return isHistoryStateBfcacheVersionCurrent(state, currentBfcacheVersion);
-}
+let synchronousPopstateScrollRestoreNavigationId = null;
 function waitForRscHmrSettle(delayMs = RSC_HMR_SETTLE_DELAY_MS) {
 	return new Promise((resolve) => {
 		window.setTimeout(resolve, delayMs);
 	});
 }
-function readCurrentBfcacheVersionHistoryIds(state) {
-	const ids = readHistoryStateBfcacheIds(state);
-	if (ids === null) return null;
-	return isCurrentBfcacheVersion(state) ? ids : null;
-}
-function invalidateRestorableBfcacheIds() {
-	currentBfcacheVersion += 1;
-}
-function allocateNavigationHistoryTraversalIndex(historyUpdateMode) {
-	switch (historyUpdateMode) {
-		case "push": return nextHistoryTraversalIndex + 1;
-		case "replace": return currentHistoryTraversalIndex;
-		case void 0: return null;
-		default: throw new Error("[vinext] Unknown history update mode: " + String(historyUpdateMode));
-	}
-}
-function commitHistoryTraversalIndex(index) {
-	currentHistoryTraversalIndex = index;
-	if (index !== null) nextHistoryTraversalIndex = Math.max(nextHistoryTraversalIndex, index);
-}
-function commitHashOnlyNavigation(href, historyUpdateMode, scroll) {
-	const navigationHistoryIndex = allocateNavigationHistoryTraversalIndex(historyUpdateMode);
-	const previousNextUrl = hasBrowserRouterState() ? getBrowserRouterState().previousNextUrl : readHistoryStatePreviousNextUrl(window.history.state);
-	const bfcacheIds = hasBrowserRouterState() ? getBrowserRouterState().bfcacheIds : readCurrentBfcacheVersionHistoryIds(window.history.state);
-	const historyState = createHistoryStateWithNavigationMetadata(createHashOnlyNavigationBaseHistoryState(historyUpdateMode, scroll), {
-		bfcacheIds,
-		bfcacheVersion: bfcacheIds === null ? void 0 : currentBfcacheVersion,
-		previousNextUrl,
-		traversalIndex: navigationHistoryIndex
+function restoreHistoryStateSnapshot(historyState) {
+	const navId = browserNavigationController.getActiveNavigationId();
+	let restored = false;
+	flushSync(() => {
+		restored = historyController.restoreHistorySnapshot({
+			historyState,
+			stageClientParams,
+			approveVisibleRestore: ({ state, beforeCommit }) => browserNavigationController.restoreHistorySnapshotVisibleState({
+				beforeCommit,
+				navId,
+				state,
+				targetHref: window.location.href
+			})
+		});
 	});
-	if (historyUpdateMode === "replace") replaceHistoryStateWithoutNotify(historyState, "", href);
-	else pushHistoryStateWithoutNotify(historyState, "", href);
-	commitHistoryTraversalIndex(navigationHistoryIndex);
-}
-function createHashOnlyNavigationBaseHistoryState(historyUpdateMode, scroll) {
-	if (historyUpdateMode !== "replace") return null;
-	return scroll ? stripVinextScrollState(window.history.state) : window.history.state;
-}
-function stripVinextScrollState(state) {
-	if (!state || typeof state !== "object") return state;
-	const nextState = {};
-	for (const [key, value] of Object.entries(state)) {
-		if (key === "__vinext_scrollX" || key === "__vinext_scrollY") continue;
-		nextState[key] = value;
-	}
-	return Object.keys(nextState).length > 0 ? nextState : null;
-}
-function commitTraversalIndexFromHistoryState(historyState) {
-	commitHistoryTraversalIndex(readHistoryStateTraversalIndex(historyState));
+	if (!restored) return false;
+	commitClientNavigationState();
+	return true;
 }
 function getBrowserRouterState() {
 	return browserNavigationController.getBrowserRouterState();
@@ -190,7 +171,7 @@ function clearPrefetchState() {
 function clearClientNavigationCaches() {
 	clearVisitedResponseCache();
 	clearPrefetchState();
-	invalidateRestorableBfcacheIds();
+	historyController.invalidateRestorableClientState();
 }
 function isSettledPrefetchCacheEntry(entry) {
 	return entry.outcome === "cache-seeded" && entry.pending === void 0 && entry.snapshot !== void 0;
@@ -258,28 +239,6 @@ async function learnOptimisticRouteTemplatesFromPrefetchCache(options) {
 	if (learning.length === 0) return;
 	await Promise.allSettled(learning);
 }
-function areBfcacheIdMapsEqual(a, b) {
-	if (a === b) return true;
-	if (a === null || b === null) return false;
-	const aEntries = Object.entries(a);
-	const bEntries = Object.entries(b);
-	if (aEntries.length !== bEntries.length) return false;
-	return aEntries.every(([key, value]) => b[key] === value);
-}
-function isHistoryStateNavigationMetadataInSync(state, previousNextUrl, bfcacheIds) {
-	return readHistoryStatePreviousNextUrl(state) === previousNextUrl && (bfcacheIds === void 0 || areBfcacheIdMapsEqual(readHistoryStateBfcacheIds(state), bfcacheIds) && isCurrentBfcacheVersion(state));
-}
-function syncCurrentHistoryStatePreviousNextUrl(previousNextUrl, bfcacheIds) {
-	if (isHistoryStateNavigationMetadataInSync(window.history.state, previousNextUrl, bfcacheIds)) return;
-	const nextHistoryState = createHistoryStateWithNavigationMetadata(window.history.state, {
-		bfcacheIds,
-		bfcacheVersion: bfcacheIds === void 0 ? void 0 : currentBfcacheVersion,
-		previousNextUrl
-	});
-	replaceHistoryStateWithoutNotify(nextHistoryState, "", window.location.href);
-	if (isHistoryStateNavigationMetadataInSync(window.history.state, previousNextUrl, bfcacheIds)) return;
-	window.history.replaceState(nextHistoryState, "", window.location.href);
-}
 function createActionInitiationSnapshot() {
 	const routerState = getBrowserRouterState();
 	return createServerActionInitiationSnapshot({
@@ -295,37 +254,19 @@ function createNavigationCommitEffect(options) {
 			commitClientNavigationState(void 0, { releaseSnapshot: true });
 			return;
 		}
-		const targetHref = new URL(href, window.location.origin).href;
-		const preserveExistingState = historyUpdateMode === "replace";
-		const navigationHistoryIndex = targetHistoryIndex !== void 0 ? targetHistoryIndex : allocateNavigationHistoryTraversalIndex(historyUpdateMode);
-		const historyState = createHistoryStateWithNavigationMetadata(preserveExistingState ? window.history.state : null, {
+		historyController.commitNavigationHistory({
 			bfcacheIds,
-			bfcacheVersion: currentBfcacheVersion,
+			href,
+			historyUpdateMode,
 			previousNextUrl,
-			traversalIndex: navigationHistoryIndex
+			stageClientParams: () => stageClientParams(params),
+			targetHistoryIndex
 		});
-		let wroteHistoryState = false;
-		if (historyUpdateMode === "replace" && window.location.href !== targetHref) {
-			stageClientParams(params);
-			replaceHistoryStateWithoutNotify(historyState, "", href);
-			wroteHistoryState = true;
-			commitHistoryTraversalIndex(navigationHistoryIndex);
-		} else if (historyUpdateMode === "push" && window.location.href !== targetHref) {
-			stageClientParams(params);
-			pushHistoryStateWithoutNotify(historyState, "", href);
-			wroteHistoryState = true;
-			commitHistoryTraversalIndex(navigationHistoryIndex);
-		}
-		if (!wroteHistoryState) {
-			syncCurrentHistoryStatePreviousNextUrl(previousNextUrl, bfcacheIds);
-			stageClientParams(params);
-			if (targetHistoryIndex !== void 0) commitHistoryTraversalIndex(targetHistoryIndex);
-		}
 		pendingNavigationRecoveryHref = null;
 		commitClientNavigationState(navId);
 	};
 }
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null, scrollIntent = null, restoredBfcacheIds = null) {
+async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null, scrollIntent = null, restoredBfcacheIds = null, reuseCurrentBfcacheIds = true, visibleCommitMode = "transition") {
 	syncServerActionHttpFallbackHead(null);
 	try {
 		return await browserNavigationController.renderNavigationPayload({
@@ -344,9 +285,11 @@ async function renderNavigationPayload(payload, navigationSnapshot, targetHref,
 			previousNextUrl,
 			scrollIntent,
 			restoredBfcacheIds,
+			reuseCurrentBfcacheIds,
 			targetHistoryIndex: traversalIntent === null ? void 0 : traversalIntent.targetHistoryIndex,
 			targetHref,
-			navId
+			navId,
+			visibleCommitMode
 		});
 	} catch (error) {
 		pendingNavigationRecoveryHref = null;
@@ -450,9 +393,8 @@ function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, par
 		response: snapshot
 	}));
 }
-function isSamePageSearchNavigation(currentSnapshot, targetUrl) {
-	if (stripBasePath(targetUrl.pathname, __basePath) !== currentSnapshot.pathname) return false;
-	return targetUrl.searchParams.toString() !== currentSnapshot.searchParams.toString();
+function clientNavigationSnapshotHref(snapshot) {
+	return `${window.location.origin}${createSnapshotPathAndSearch(snapshot)}`;
 }
 function getRequestState(navigationKind, targetPathname, previousNextUrlOverride, traverseHistoryState) {
 	if (previousNextUrlOverride !== void 0) return {
@@ -476,6 +418,16 @@ function getRequestState(navigationKind, targetPathname, previousNextUrlOverride
 				interceptionContext: manifestInterceptionContext,
 				previousNextUrl: window.location.pathname + window.location.search
 			};
+			const middlewareRewriteInterceptionContext = resolveMiddlewareRewriteNavigationInterceptionContext({
+				basePath: __basePath,
+				currentPathname: window.location.pathname,
+				routeManifest: getBrowserRouteManifest(),
+				targetPathname
+			});
+			if (middlewareRewriteInterceptionContext !== null) return {
+				interceptionContext: middlewareRewriteInterceptionContext,
+				previousNextUrl: window.location.pathname + window.location.search
+			};
 			return {
 				interceptionContext: null,
 				previousNextUrl: null
@@ -584,6 +536,9 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 			setMountedSlotsHeader(null);
 		};
 	}, [setTreeStateValue]);
+	useLayoutEffect(() => {
+		historyController.rememberHistoryStateSnapshot(treeState);
+	}, [treeState]);
 	useLayoutEffect(() => {
 		setMountedSlotsHeader(getMountedSlotIdsHeader(stateRef.current.elements));
 		removeStylesheetLinksCoveredByInlineCss();
@@ -591,12 +546,10 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	}, [treeState.elements]);
 	useLayoutEffect(() => {
 		if (treeState.renderId !== 0) return;
-		replaceHistoryStateWithoutNotify(createHistoryStateWithNavigationMetadata(window.history.state, {
+		historyController.writeHydratedHistoryMetadata({
 			bfcacheIds: treeState.bfcacheIds,
-			bfcacheVersion: currentBfcacheVersion,
-			previousNextUrl: treeState.previousNextUrl,
-			traversalIndex: currentHistoryTraversalIndex
-		}), "", window.location.href);
+			previousNextUrl: treeState.previousNextUrl
+		});
 	}, [
 		treeState.bfcacheIds,
 		treeState.previousNextUrl,
@@ -634,16 +587,16 @@ function restorePopstateScrollPosition(state, options) {
 		return;
 	}
 	const y = Number(state.__vinext_scrollY);
-	retryScrollTo("__vinext_scrollX" in state ? Number(state.__vinext_scrollX) : 0, y, { shouldContinue });
+	retryScrollTo("__vinext_scrollX" in state ? Number(state.__vinext_scrollX) : 0, y, {
+		minFrames: 1,
+		shouldContinue
+	});
 }
 function isSameAppRoutePopstateTarget(href) {
 	if (!hasBrowserRouterState()) return false;
 	const target = new URL(href, window.location.origin);
 	const routerState = getBrowserRouterState();
-	const targetPathname = stripBasePath(target.pathname, __basePath);
-	const targetSearch = new URLSearchParams(target.search).toString();
-	const currentSearch = routerState.navigationSnapshot.searchParams.toString();
-	return targetPathname === routerState.navigationSnapshot.pathname && targetSearch === currentSearch;
+	return createBasePathStrippedPathAndSearch(target, __basePath) === createSnapshotPathAndSearch(routerState.navigationSnapshot);
 }
 let isPageUnloading = false;
 const RSC_RELOAD_KEY = "__vinext_rsc_initial_reload__";
@@ -724,11 +677,11 @@ function applyRuntimeRscBootstrap(rsc) {
 	if (rsc.nav) restoreHydrationNavigationContext(rsc.nav.pathname, rsc.nav.searchParams, params);
 }
 function registerServerActionCallback() {
-	setServerCallback(async (id, args) => {
+	const serverActionCallback = async (id, args) => {
 		syncServerActionHttpFallbackHead(null);
 		const temporaryReferences = createTemporaryReferenceSet();
 		const actionInitiation = createActionInitiationSnapshot();
-		syncCurrentHistoryStatePreviousNextUrl(actionInitiation.routerState.previousNextUrl, actionInitiation.routerState.bfcacheIds);
+		historyController.syncCurrentHistoryStatePreviousNextUrl(actionInitiation.routerState.previousNextUrl, actionInitiation.routerState.bfcacheIds);
 		const body = await encodeReply(args, { temporaryReferences });
 		const { headers } = resolveServerActionRequestState({
 			actionId: id,
@@ -766,6 +719,7 @@ function registerServerActionCallback() {
 			return;
 		}
 		const revalidation = parseServerActionRevalidationHeader(fetchResponse.headers);
+		if (revalidation !== "none") clearClientNavigationCaches();
 		const invalidResponseError = await readInvalidServerActionResponseError(fetchResponse.clone(), actionRedirectTarget !== null);
 		if (invalidResponseError) throw invalidResponseError;
 		if (actionRedirectTarget && !shouldCheckRscCompatibilityForServerActionResponse(fetchResponse)) {
@@ -778,7 +732,7 @@ function registerServerActionCallback() {
 			statusText: "OK"
 		}) : fetchResponse;
 		const result = await createFromFetch(Promise.resolve(flightResponse), { temporaryReferences });
-		if (shouldClearClientNavigationCachesForServerActionResult(result, revalidation)) clearClientNavigationCaches();
+		if (revalidation === "none" && shouldClearClientNavigationCachesForServerActionResult(result, revalidation)) clearClientNavigationCaches();
 		if (actionRedirectTarget) {
 			if (isServerActionResult(result) && result.root !== void 0) {
 				const decoded = AppElementsWire.decode(result.root);
@@ -809,6 +763,10 @@ function registerServerActionCallback() {
 			return;
 		}
 		return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result)), actionInitiation, void 0, revalidation);
+	};
+	setServerCallback((id, args) => {
+		const releaseCacheInvalidationGuard = historyController.beginCacheInvalidationGuard();
+		return Promise.resolve().then(() => serverActionCallback(id, args)).finally(releaseCacheInvalidationGuard);
 	});
 }
 async function main() {
@@ -825,10 +783,7 @@ async function main() {
 function bootstrapHydration(rscStream) {
 	const root = decodeAppElementsPromise(createFromReadableStream(rscStream));
 	const initialNavigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
-	replaceHistoryStateWithoutNotify(createHistoryStateWithNavigationMetadata(window.history.state, {
-		previousNextUrl: null,
-		traversalIndex: currentHistoryTraversalIndex
-	}), "", window.location.href);
+	historyController.writeBootstrapHistoryMetadata();
 	const onUncaughtError = import.meta.env.DEV ? devOnUncaughtError : createOnUncaughtError(() => pendingNavigationRecoveryHref);
 	const formState = consumeInitialFormState(getVinextBrowserGlobal());
 	const hydrateRootOptions = import.meta.env.DEV ? createVinextHydrateRootOptions({
@@ -837,6 +792,7 @@ function bootstrapHydration(rscStream) {
 		onUncaughtError
 	}) : createVinextHydrateRootOptions({
 		formState,
+		onCaughtError: prodOnCaughtError,
 		onUncaughtError
 	});
 	window.__VINEXT_RSC_ROOT__ = hydrateRootInTransition({
@@ -851,8 +807,8 @@ function bootstrapHydration(rscStream) {
 	});
 	registerNavigationRuntimeFunctions({
 		clearNavigationCaches: clearClientNavigationCaches,
-		commitHashNavigation: commitHashOnlyNavigation,
-		navigate: async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false, traversalIntent, scrollIntent) {
+		commitHashNavigation: (href, historyUpdateMode, scroll) => historyController.commitHashOnlyNavigation(href, historyUpdateMode, scroll),
+		navigate: async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false, traversalIntent, scrollIntent, visibleCommitMode = "transition") {
 			let pendingRouterState = null;
 			const navId = browserNavigationController.beginNavigation();
 			discardedServerActionRefreshScheduler.markNavigationStart();
@@ -861,15 +817,13 @@ function bootstrapHydration(rscStream) {
 			let currentPrevNextUrl = previousNextUrlOverride;
 			let redirectCount = redirectDepth;
 			let detachedNavigationCommits = false;
-			const activeTraversalIntent = navigationKind === "traverse" ? traversalIntent ?? resolveHistoryTraversalIntent({
-				currentHistoryIndex: currentHistoryTraversalIndex,
-				historyState: window.history.state
-			}) : null;
+			const activeTraversalIntent = navigationKind === "traverse" ? traversalIntent ?? historyController.resolveTraversalIntent(window.history.state) : null;
 			const performHardNavigationForScrollIntent = (targetHref) => {
 				consumeAppRouterScrollIntent(scrollIntent ?? null);
 				return browserNavigationController.performHardNavigation(targetHref);
 			};
-			let restoredBfcacheIds = navigationKind === "traverse" ? readCurrentBfcacheVersionHistoryIds(activeTraversalIntent?.historyState ?? window.history.state) : null;
+			let restoredBfcacheIds = navigationKind === "traverse" ? historyController.readCurrentBfcacheVersionHistoryIds(activeTraversalIntent?.historyState ?? window.history.state) : null;
+			const reuseCurrentBfcacheIds = navigationKind !== "traverse" || !historyController.isCacheInvalidationGuarded() && historyController.isCurrentBfcacheVersion(activeTraversalIntent?.historyState ?? window.history.state);
 			try {
 				const shouldUsePendingRouterState = programmaticTransition;
 				if (shouldUsePendingRouterState && hasBrowserRouterState()) pendingRouterState = beginPendingBrowserRouterState();
@@ -883,12 +837,19 @@ function bootstrapHydration(rscStream) {
 					const requestState = getRequestState(navigationKind, url.pathname, currentPrevNextUrl, activeTraversalIntent?.historyState);
 					const requestInterceptionContext = requestState.interceptionContext;
 					const requestPreviousNextUrl = requestState.previousNextUrl;
-					if (navigationKind === "refresh") syncCurrentHistoryStatePreviousNextUrl(requestPreviousNextUrl, getBrowserRouterState().bfcacheIds);
+					if (navigationKind === "refresh") historyController.syncCurrentHistoryStatePreviousNextUrl(requestPreviousNextUrl, getBrowserRouterState().bfcacheIds);
 					setPendingPathname(url.pathname, navId);
 					const routerStateAtNavStart = getBrowserRouterState();
 					const elementsAtNavStart = routerStateAtNavStart.elements;
 					const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
-					const shouldBypassNavigationCache = navigationKind === "navigate" && isSamePageSearchNavigation(routerStateAtNavStart.navigationSnapshot, url);
+					const earlyIntentDecision = navigationKind === "navigate" ? navigationPlanner.classifyEarlyNavigationIntent({
+						basePath: __basePath,
+						currentHref: clientNavigationSnapshotHref(routerStateAtNavStart.navigationSnapshot),
+						mode: "push",
+						scroll: false,
+						targetHref: url.href
+					}) : null;
+					const shouldBypassNavigationCache = earlyIntentDecision?.kind === "flightNavigation" && earlyIntentDecision.bypassNavigationCache;
 					const requestHeaders = createRscRequestHeaders({
 						interceptionContext: requestInterceptionContext,
 						mountedSlotsHeader,
@@ -897,36 +858,32 @@ function bootstrapHydration(rscStream) {
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
 					const cachedRoute = shouldBypassNavigationCache ? null : getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
 					if (cachedRoute) {
-						const compatibilityDecision = resolveRscCompatibilityNavigationDecision({
+						const cachedFetchDecision = navigationPlanner.classifyRscFetchResult({
 							clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
+							compatibilityIdHeader: cachedRoute.response.compatibilityIdHeader ?? null,
 							currentHref,
-							origin: window.location.origin,
-							responseCompatibilityId: cachedRoute.response.compatibilityIdHeader,
-							responseUrl: cachedRoute.response.url
-						});
-						if (compatibilityDecision.kind === "hard-navigate") {
-							performHardNavigationForScrollIntent(compatibilityDecision.hardNavigationTarget);
-							return;
-						}
-						const cachedRedirectDecision = resolveRscRedirectLifecycleHop({
-							currentHref,
-							historyUpdateMode: currentHistoryMode ?? "replace",
+							effectiveHistoryUpdateMode: currentHistoryMode ?? "replace",
+							hasBody: true,
+							isRscContentType: true,
 							origin: window.location.origin,
 							redirectDepth: redirectCount,
 							requestPreviousNextUrl,
-							responseUrl: cachedRoute.response.url
+							responseOk: true,
+							responseUrl: cachedRoute.response.url,
+							source: "cached",
+							streamedRedirectTarget: null
 						});
-						if (cachedRedirectDecision.kind === "terminal-hard-navigation") {
-							if (cachedRedirectDecision.reason === "maxRedirectsExceeded") console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-							performHardNavigationForScrollIntent(cachedRedirectDecision.href);
+						if (cachedFetchDecision.kind === "hardNavigate") {
+							if (cachedFetchDecision.reason === "redirectDepthExhausted") console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
+							performHardNavigationForScrollIntent(cachedFetchDecision.url);
 							return;
 						}
-						if (cachedRedirectDecision.kind === "follow") {
+						if (cachedFetchDecision.kind === "followRedirect") {
 							if (navigationKind === "traverse") restoredBfcacheIds = null;
-							currentHref = cachedRedirectDecision.href;
-							currentHistoryMode = cachedRedirectDecision.historyUpdateMode;
-							currentPrevNextUrl = cachedRedirectDecision.previousNextUrl;
-							redirectCount = cachedRedirectDecision.redirectDepth;
+							currentHref = cachedFetchDecision.redirect.href;
+							currentHistoryMode = cachedFetchDecision.redirect.historyUpdateMode;
+							currentPrevNextUrl = cachedFetchDecision.redirect.previousNextUrl;
+							redirectCount = cachedFetchDecision.redirect.redirectDepth;
 							continue;
 						}
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
@@ -934,7 +891,7 @@ function bootstrapHydration(rscStream) {
 						const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
 						const cachedPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
-						if (await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds) === "no-commit") {
+						if (await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds, reuseCurrentBfcacheIds, visibleCommitMode) === "no-commit") {
 							deleteVisitedResponse(rscUrl, requestInterceptionContext);
 							continue;
 						}
@@ -972,7 +929,7 @@ function bootstrapHydration(rscStream) {
 							if (optimisticPayload !== null) {
 								detachedNavigationCommits = true;
 								const optimisticNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, optimisticPayload.params);
-								renderNavigationPayload(Promise.resolve(optimisticPayload.elements), optimisticNavigationSnapshot, currentHref, navId, currentHistoryMode, optimisticPayload.params, requestPreviousNextUrl, null, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds).catch((error) => {
+								renderNavigationPayload(Promise.resolve(optimisticPayload.elements), optimisticNavigationSnapshot, currentHref, navId, currentHistoryMode, optimisticPayload.params, requestPreviousNextUrl, null, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds, reuseCurrentBfcacheIds, visibleCommitMode).catch((error) => {
 									if (browserNavigationController.isCurrentNavigation(navId)) console.error("[vinext] Optimistic RSC navigation error:", error);
 								});
 							}
@@ -989,61 +946,36 @@ function bootstrapHydration(rscStream) {
 						});
 					}
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
-					const isRscResponse = (navResponse.headers.get("content-type") ?? "").startsWith("text/x-component");
-					if (!navResponse.ok || !isRscResponse || !navResponse.body) {
-						performHardNavigationForScrollIntent(resolveHardNavigationTargetFromRscResponse(navResponseUrl ?? navResponse.url, currentHref, window.location.origin));
-						return;
-					}
-					const compatibilityDecision = resolveRscCompatibilityNavigationDecision({
+					const navContentType = navResponse.headers.get("content-type") ?? "";
+					const liveFetchDecision = navigationPlanner.classifyRscFetchResult({
 						clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
+						compatibilityIdHeader: navResponse.headers.get(VINEXT_RSC_COMPATIBILITY_ID_HEADER),
 						currentHref,
-						origin: window.location.origin,
-						responseCompatibilityId: navResponse.headers.get(VINEXT_RSC_COMPATIBILITY_ID_HEADER),
-						responseUrl: navResponseUrl ?? navResponse.url
-					});
-					if (compatibilityDecision.kind === "hard-navigate") {
-						performHardNavigationForScrollIntent(compatibilityDecision.hardNavigationTarget);
-						return;
-					}
-					const redirectDecision = resolveRscRedirectLifecycleHop({
-						currentHref,
-						historyUpdateMode: currentHistoryMode ?? "replace",
+						effectiveHistoryUpdateMode: currentHistoryMode ?? "replace",
+						hasBody: navResponse.body !== null,
+						isRscContentType: navContentType.startsWith(VINEXT_RSC_CONTENT_TYPE),
 						origin: window.location.origin,
 						redirectDepth: redirectCount,
 						requestPreviousNextUrl,
-						responseUrl: navResponseUrl ?? navResponse.url
+						responseOk: navResponse.ok,
+						responseUrl: navResponseUrl ?? navResponse.url,
+						source: "live",
+						streamedRedirectTarget: navResponse.headers.get(VINEXT_RSC_REDIRECT_HEADER)
 					});
-					if (redirectDecision.kind === "terminal-hard-navigation") {
-						if (redirectDecision.reason === "maxRedirectsExceeded") console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-						performHardNavigationForScrollIntent(redirectDecision.href);
+					if (liveFetchDecision.kind === "hardNavigate") {
+						if (liveFetchDecision.discardBody) navResponse.body?.cancel().catch(() => {});
+						if (liveFetchDecision.reason === "redirectDepthExhausted") console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
+						if (liveFetchDecision.reason === "streamedRedirectLoop") console.error("[vinext] RSC streamed redirect resolved to the current URL — aborting navigation to prevent infinite loop.");
+						performHardNavigationForScrollIntent(liveFetchDecision.url);
 						return;
 					}
-					if (redirectDecision.kind === "follow") {
-						if (navigationKind === "traverse") restoredBfcacheIds = null;
-						currentHref = redirectDecision.href;
-						currentHistoryMode = redirectDecision.historyUpdateMode;
-						currentPrevNextUrl = redirectDecision.previousNextUrl;
-						redirectCount = redirectDecision.redirectDepth;
-						continue;
-					}
-					const flightRedirectTarget = navResponse.headers.get(VINEXT_RSC_REDIRECT_HEADER);
-					if (flightRedirectTarget) {
-						navResponse.body?.cancel().catch(() => {});
-						const resolvedTarget = new URL(flightRedirectTarget, window.location.origin);
-						if (resolvedTarget.origin !== window.location.origin) {
-							performHardNavigationForScrollIntent(resolvedTarget.href);
-							return;
-						}
-						if (redirectCount >= 10) {
-							console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-							performHardNavigationForScrollIntent(resolvedTarget.href);
-							return;
-						}
+					if (liveFetchDecision.kind === "followRedirect") {
+						if (liveFetchDecision.discardBody) navResponse.body?.cancel().catch(() => {});
 						if (navigationKind === "traverse") restoredBfcacheIds = null;
-						currentHref = `${resolvedTarget.pathname}${resolvedTarget.search}${resolvedTarget.hash}`;
-						currentHistoryMode = currentHistoryMode ?? "replace";
-						currentPrevNextUrl = requestPreviousNextUrl;
-						redirectCount += 1;
+						currentHref = liveFetchDecision.redirect.href;
+						currentHistoryMode = liveFetchDecision.redirect.historyUpdateMode;
+						currentPrevNextUrl = liveFetchDecision.redirect.previousNextUrl;
+						redirectCount = liveFetchDecision.redirect.redirectDepth;
 						continue;
 					}
 					const navParams = parseEncodedJsonHeader(navResponse.headers.get("X-Vinext-Params")) ?? {};
@@ -1059,7 +991,7 @@ function bootstrapHydration(rscStream) {
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const rscPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(reactResponse)));
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
-					if (await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds) !== "committed") return;
+					if (await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent, restoredBfcacheIds, reuseCurrentBfcacheIds, visibleCommitMode) !== "committed") return;
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					try {
 						const renderedElements = await rscPayload;
@@ -1087,7 +1019,6 @@ function bootstrapHydration(rscStream) {
 			}
 		}
 	});
-	if ("scrollRestoration" in history) history.scrollRestoration = "manual";
 	const handlePopstate = createPopstateRestoreHandler({
 		getActiveNavigationId: browserNavigationController.getActiveNavigationId.bind(browserNavigationController),
 		getPendingNavigation: () => window.__VINEXT_RSC_PENDING__,
@@ -1099,17 +1030,26 @@ function bootstrapHydration(rscStream) {
 		restorePopstateScrollPosition,
 		setPendingNavigation: (pendingNavigation) => {
 			window.__VINEXT_RSC_PENDING__ = pendingNavigation;
-		}
+		},
+		shouldSkipScrollRestore: (navId) => synchronousPopstateScrollRestoreNavigationId === navId
 	});
 	window.addEventListener("popstate", (event) => {
 		const href = window.location.href;
 		if (isSameAppRoutePopstateTarget(href)) {
 			notifyAppRouterTransitionStart(href, "traverse");
-			commitTraversalIndexFromHistoryState(event.state);
+			historyController.commitTraversalIndexFromHistoryState(event.state);
 			restorePopstateScrollPosition(event.state);
 			return;
 		}
 		handlePopstate(event);
+		if (restoreHistoryStateSnapshot(event.state)) restoreSynchronousPopstateScrollPosition({
+			getActiveNavigationId: () => browserNavigationController.getActiveNavigationId(),
+			isCurrentNavigation: (navId) => browserNavigationController.isCurrentNavigation(navId),
+			markScrollRestoreConsumed: (navId) => {
+				synchronousPopstateScrollRestoreNavigationId = navId;
+			},
+			restorePopstateScrollPosition
+		}, event.state);
 	});
 	if (import.meta.hot) {
 		const applyRscHmrUpdate = async (updateId) => {