vinext 0.1.1 → 0.1.3

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

@@ -1,43 +1,46 @@
-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";
 import { APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI } from "./app-rsc-render-mode.js";
 import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
-import { installWindowNext } from "../client/window-next.js";
+import { installWindowNext, setWindowNextInternalSourcePage } 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 { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
-import { RestorableClientStateController, createHistoryStateWithNavigationMetadata, readHistoryStateBfcacheIds, 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 { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId } 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 { DevRecoveryBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, getBfcacheIdMapContext, getClientNavigationRenderContext, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, isRedirectError, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, useRouter } from "../shims/navigation.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
 import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import "../client/instrumentation-client.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, resolveServerActionRedirectCompatibilityHardNavigationTarget, shouldCheckRscCompatibilityForServerActionResponse, shouldClearClientNavigationCachesForServerActionResult } from "./app-browser-action-result.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult } from "./app-browser-action-result.js";
 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, createBasePathStrippedPathAndSearch, createSnapshotPathAndSearch } from "./app-browser-navigation-controller.js";
+import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
+import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.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, restoreSynchronousPopstateScrollPosition } from "./app-browser-popstate.js";
-import { createOnUncaughtError } from "./app-browser-error.js";
+import { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, prodOnRecoverableError } 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 { devOnCaughtError, 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";
+import { createRoot, hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-entry.ts
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
@@ -55,13 +58,37 @@ const CLIENT_RSC_COMPATIBILITY_ID = getVinextRscCompatibilityId();
 const optimisticRouteTemplates = /* @__PURE__ */ new Map();
 const optimisticRouteTemplateSources = /* @__PURE__ */ new Set();
 const optimisticRouteTemplateLearning = /* @__PURE__ */ new Map();
+function claimInitialAppRouterBootstrap() {
+	if (window.__VINEXT_RSC_ROOT__ || window.__VINEXT_RSC_BOOTSTRAP_STATE__) return false;
+	window.__VINEXT_RSC_BOOTSTRAP_STATE__ = "starting";
+	return true;
+}
+function markInitialAppRouterBootstrapHydrated() {
+	window.__VINEXT_RSC_BOOTSTRAP_STATE__ = "hydrated";
+}
 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();
@@ -93,79 +120,30 @@ function isRouterStatePromise(value) {
 let latestClientParams = {};
 const visitedResponseCache = /* @__PURE__ */ new Map();
 let browserRouterStateHasEverCommitted = false;
-let pendingNavigationRecoveryHref = null;
 const mpaNavigationScheduler = new AppBrowserMpaNavigationScheduler();
 const unresolvedMpaNavigation = new Promise(() => {});
 const RSC_HMR_SETTLE_DELAY_MS = 150;
+const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
 let latestRscHmrUpdateId = 0;
-let currentHistoryTraversalIndex = readHistoryStateTraversalIndex(window.history.state) ?? 0;
-let nextHistoryTraversalIndex = currentHistoryTraversalIndex;
 let synchronousPopstateScrollRestoreNavigationId = null;
-const restorableClientState = new RestorableClientStateController({
-	initialHistoryState: window.history.state,
-	maxHistoryStateSnapshots: 50
-});
 function waitForRscHmrSettle(delayMs = RSC_HMR_SETTLE_DELAY_MS) {
 	return new Promise((resolve) => {
 		window.setTimeout(resolve, delayMs);
 	});
 }
-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 : restorableClientState.readCurrentBfcacheVersionHistoryIds(window.history.state);
-	const historyState = createHistoryStateWithNavigationMetadata(createHashOnlyNavigationBaseHistoryState(historyUpdateMode, scroll), {
-		bfcacheIds,
-		bfcacheVersion: bfcacheIds === null ? void 0 : restorableClientState.currentBfcacheVersion,
-		previousNextUrl,
-		traversalIndex: navigationHistoryIndex
-	});
-	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));
-}
 function restoreHistoryStateSnapshot(historyState) {
-	const decision = restorableClientState.resolveHistoryStateSnapshotRestore(historyState);
-	if (decision.kind === "skip") return false;
 	const navId = browserNavigationController.getActiveNavigationId();
 	let restored = false;
 	flushSync(() => {
-		restored = browserNavigationController.restoreHistorySnapshotVisibleState({
-			beforeCommit: () => {
-				commitHistoryTraversalIndex(decision.targetHistoryIndex);
-				stageClientParams(decision.state.navigationSnapshot.params);
-			},
-			navId,
-			state: decision.state,
-			targetHref: window.location.href
+		restored = historyController.restoreHistorySnapshot({
+			historyState,
+			stageClientParams,
+			approveVisibleRestore: ({ state, beforeCommit }) => browserNavigationController.restoreHistorySnapshotVisibleState({
+				beforeCommit,
+				navId,
+				state,
+				targetHref: window.location.href
+			})
 		});
 	});
 	if (!restored) return false;
@@ -204,7 +182,7 @@ function clearPrefetchState() {
 function clearClientNavigationCaches() {
 	clearVisitedResponseCache();
 	clearPrefetchState();
-	restorableClientState.invalidateClientState();
+	historyController.invalidateRestorableClientState();
 }
 function isSettledPrefetchCacheEntry(entry) {
 	return entry.outcome === "cache-seeded" && entry.pending === void 0 && entry.snapshot !== void 0;
@@ -272,28 +250,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) && restorableClientState.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 : restorableClientState.currentBfcacheVersion,
-		previousNextUrl
-	});
-	replaceHistoryStateWithoutNotify(nextHistoryState, "", window.location.href);
-	if (isHistoryStateNavigationMetadataInSync(window.history.state, previousNextUrl, bfcacheIds)) return;
-	replaceHistoryStateWithoutNotify(nextHistoryState, "", window.location.href);
-}
 function createActionInitiationSnapshot() {
 	const routerState = getBrowserRouterState();
 	return createServerActionInitiationSnapshot({
@@ -309,64 +265,39 @@ 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: restorableClientState.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;
+		clearAppNavigationFailureTarget(href);
 		commitClientNavigationState(navId);
 	};
 }
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null, scrollIntent = null, restoredBfcacheIds = null, reuseCurrentBfcacheIds = true) {
+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({
-			actionType,
-			createNavigationCommitEffect: (options) => {
-				pendingNavigationRecoveryHref = options.href;
-				return createNavigationCommitEffect(options);
-			},
-			historyUpdateMode,
-			navigationSnapshot,
-			nextElements: payload,
-			operationLane,
-			payloadOrigin,
-			params,
-			pendingRouterState,
-			previousNextUrl,
-			scrollIntent,
-			restoredBfcacheIds,
-			reuseCurrentBfcacheIds,
-			targetHistoryIndex: traversalIntent === null ? void 0 : traversalIntent.targetHistoryIndex,
-			targetHref,
-			navId
-		});
-	} catch (error) {
-		pendingNavigationRecoveryHref = null;
-		throw error;
-	}
+	return browserNavigationController.renderNavigationPayload({
+		actionType,
+		createNavigationCommitEffect,
+		historyUpdateMode,
+		navigationSnapshot,
+		nextElements: payload,
+		operationLane,
+		payloadOrigin,
+		params,
+		pendingRouterState,
+		previousNextUrl,
+		scrollIntent,
+		restoredBfcacheIds,
+		reuseCurrentBfcacheIds,
+		targetHistoryIndex: traversalIntent === null ? void 0 : traversalIntent.targetHistoryIndex,
+		targetHref,
+		navId,
+		visibleCommitMode
+	});
 }
 function resolveActionRedirectTarget(response) {
 	const actionRedirect = response.headers.get(ACTION_REDIRECT_HEADER);
@@ -432,23 +363,39 @@ function evictVisitedResponseCacheIfNeeded() {
 		visitedResponseCache.delete(oldest);
 	}
 }
-function getVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, navigationKind) {
+function readVisitedResponseCacheCandidate(rscUrl, interceptionContext, mountedSlotsHeader, navigationKind) {
 	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const cached = visitedResponseCache.get(cacheKey);
-	if (!cached) return null;
-	if ((cached.response.mountedSlotsHeader ?? null) !== mountedSlotsHeader) {
-		visitedResponseCache.delete(cacheKey);
-		return null;
-	}
-	if (isVisitedResponseCacheEntryFresh(cached, {
-		navigationKind,
-		now: Date.now()
-	})) {
-		visitedResponseCache.delete(cacheKey);
-		visitedResponseCache.set(cacheKey, cached);
-		return cached;
+	if (!cached) return {
+		cacheKey,
+		entry: null,
+		facts: {
+			candidate: "missing",
+			navigationKind
+		}
+	};
+	return {
+		cacheKey,
+		entry: cached,
+		facts: {
+			candidate: "present",
+			fresh: isVisitedResponseCacheEntryFresh(cached, {
+				navigationKind,
+				now: Date.now()
+			}),
+			mountedSlotsMatch: (cached.response.mountedSlotsHeader ?? null) === mountedSlotsHeader,
+			navigationKind
+		}
+	};
+}
+function applyVisitedResponseCacheCandidateDecision(candidate, decision) {
+	if (candidate.entry === null) return null;
+	if (decision.kind === "reuse") {
+		visitedResponseCache.delete(candidate.cacheKey);
+		visitedResponseCache.set(candidate.cacheKey, candidate.entry);
+		return candidate.entry;
 	}
-	visitedResponseCache.delete(cacheKey);
+	visitedResponseCache.delete(candidate.cacheKey);
 	return null;
 }
 function deleteVisitedResponse(rscUrl, interceptionContext) {
@@ -465,9 +412,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 {
@@ -598,23 +544,25 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 			return new Promise(() => {});
 		} });
 		browserRouterStateHasEverCommitted = true;
-		const hydratedAt = performance.now();
-		window.__VINEXT_HYDRATED_AT = hydratedAt;
-		window.__NEXT_HYDRATED = true;
-		window.__NEXT_HYDRATED_AT = hydratedAt;
-		window.__NEXT_HYDRATED_CB?.();
 		return () => {
 			registerNavigationRuntimeFunctions({ navigateExternal: void 0 });
 			detach();
 			setMountedSlotsHeader(null);
 		};
 	}, [setTreeStateValue]);
+	useEffect(() => {
+		const hydratedAt = performance.now();
+		window.__VINEXT_HYDRATED_AT = hydratedAt;
+		window.__NEXT_HYDRATED = true;
+		window.__NEXT_HYDRATED_AT = hydratedAt;
+		window.__NEXT_HYDRATED_CB?.();
+	}, []);
 	useLayoutEffect(() => {
-		restorableClientState.rememberHistoryStateSnapshot({
-			historyIndex: currentHistoryTraversalIndex,
-			state: treeState
-		});
+		historyController.rememberHistoryStateSnapshot(treeState);
 	}, [treeState]);
+	useEffect(() => {
+		setWindowNextInternalSourcePage(AppElementsWire.readMetadata(treeState.elements).sourcePage);
+	}, [treeState.elements]);
 	useLayoutEffect(() => {
 		setMountedSlotsHeader(getMountedSlotIdsHeader(stateRef.current.elements));
 		removeStylesheetLinksCoveredByInlineCss();
@@ -622,12 +570,10 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	}, [treeState.elements]);
 	useLayoutEffect(() => {
 		if (treeState.renderId !== 0) return;
-		replaceHistoryStateWithoutNotify(createHistoryStateWithNavigationMetadata(window.history.state, {
+		historyController.writeHydratedHistoryMetadata({
 			bfcacheIds: treeState.bfcacheIds,
-			bfcacheVersion: restorableClientState.currentBfcacheVersion,
-			previousNextUrl: treeState.previousNextUrl,
-			traversalIndex: currentHistoryTraversalIndex
-		}), "", window.location.href);
+			previousNextUrl: treeState.previousNextUrl
+		});
 	}, [
 		treeState.bfcacheIds,
 		treeState.previousNextUrl,
@@ -642,13 +588,17 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	const redirectedTree = createElement(AppRouterRedirectBridge, null, BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: treeState.bfcacheIds }, stateKeyTree) : stateKeyTree);
 	const innerTree = AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouterInstance }, redirectedTree) : redirectedTree;
 	const committedTree = import.meta.env.DEV ? createElement(DevRecoveryBoundary, {
+		isImplicitRootErrorBoundary: true,
 		resetKey: treeState.renderId,
 		onCatch: handleDevRecoveryBoundaryCatch
 	}, innerTree) : innerTree;
-	const scrollScopedTree = createElement(AppRouterScrollCommitProvider, { commitId: treeState.renderId }, committedTree);
+	const rootErrorTree = createElement(GlobalErrorBoundary, {
+		fallback: DEFAULT_GLOBAL_ERROR_COMPONENT,
+		children: createElement(AppRouterScrollCommitProvider, { commitId: treeState.renderId }, committedTree)
+	});
 	const ClientNavigationRenderContext = getClientNavigationRenderContext();
-	if (!ClientNavigationRenderContext) return scrollScopedTree;
-	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, scrollScopedTree);
+	if (!ClientNavigationRenderContext) return rootErrorTree;
+	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, rootErrorTree);
 }
 function restoreHydrationNavigationContext(pathname, searchParams, params) {
 	setNavigationContext({
@@ -759,7 +709,7 @@ function registerServerActionCallback() {
 		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,
@@ -776,31 +726,23 @@ function registerServerActionCallback() {
 		const hasActionRedirect = fetchResponse.headers.has(ACTION_REDIRECT_HEADER);
 		const actionRedirectTarget = resolveActionRedirectTarget(fetchResponse);
 		if (hasActionRedirect && !actionRedirectTarget) return;
-		const actionRedirectCompatibilityHardNavigationTarget = resolveServerActionRedirectCompatibilityHardNavigationTarget({
+		const actionResultFacts = createServerActionResultFacts({
 			actionRedirectHref: actionRedirectTarget?.href ?? null,
+			actionRedirectType: actionRedirectTarget?.type ?? null,
 			clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
-			response: fetchResponse
-		});
-		if (actionRedirectCompatibilityHardNavigationTarget) {
-			clearClientNavigationCaches();
-			browserNavigationController.performHardNavigation(actionRedirectCompatibilityHardNavigationTarget, actionRedirectTarget?.type === "push" ? "assign" : "replace");
-			return;
-		}
-		if (!actionRedirectTarget && shouldCheckRscCompatibilityForServerActionResponse(fetchResponse) && resolveRscCompatibilityNavigationDecision({
-			clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
+			compatibilityIdHeader: fetchResponse.headers.get(VINEXT_RSC_COMPATIBILITY_ID_HEADER),
+			contentTypeHeader: fetchResponse.headers.get("content-type"),
 			currentHref: actionInitiation.href,
 			origin: window.location.origin,
-			responseCompatibilityId: fetchResponse.headers.get("X-Vinext-RSC-Compatibility-Id"),
 			responseUrl: fetchResponse.url
-		}).kind === "hard-navigate") {
-			browserNavigationController.performHardNavigation(actionInitiation.href);
-			return;
-		}
+		});
+		const fetchResponseIsRsc = actionResultFacts.isRscContentType;
+		if (applyServerActionResultDecision(navigationPlanner.classifyServerActionResult(actionResultFacts), clearClientNavigationCaches, (url, historyMode) => browserNavigationController.performHardNavigation(url, historyMode))) 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)) {
+		if (actionRedirectTarget && !fetchResponseIsRsc) {
 			browserNavigationController.performHardNavigation(actionRedirectTarget.href);
 			return;
 		}
@@ -843,12 +785,14 @@ function registerServerActionCallback() {
 		return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result)), actionInitiation, void 0, revalidation);
 	};
 	setServerCallback((id, args) => {
-		const releaseCacheInvalidationGuard = restorableClientState.beginCacheInvalidationGuard();
+		const releaseCacheInvalidationGuard = historyController.beginCacheInvalidationGuard();
 		return Promise.resolve().then(() => serverActionCallback(id, args)).finally(releaseCacheInvalidationGuard);
 	});
 }
 async function main() {
+	if (!claimInitialAppRouterBootstrap()) return;
 	registerServerActionCallback();
+	installAppNavigationFailureListeners();
 	if (import.meta.env.DEV) {
 		installDevErrorOverlay();
 		installViteHmrErrorHandler(import.meta.hot);
@@ -861,34 +805,44 @@ 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);
-	const onUncaughtError = import.meta.env.DEV ? devOnUncaughtError : createOnUncaughtError(() => pendingNavigationRecoveryHref);
+	historyController.writeBootstrapHistoryMetadata();
+	const onUncaughtError = createOnUncaughtError();
 	const formState = consumeInitialFormState(getVinextBrowserGlobal());
 	const hydrateRootOptions = import.meta.env.DEV ? createVinextHydrateRootOptions({
 		formState,
-		onCaughtError: devOnCaughtError,
+		onCaughtError: createDevOnCaughtError(devOnCaughtError, onUncaughtError),
 		onUncaughtError
 	}) : createVinextHydrateRootOptions({
 		formState,
+		onCaughtError: createProdOnCaughtError(onUncaughtError),
+		onRecoverableError: prodOnRecoverableError,
 		onUncaughtError
 	});
-	window.__VINEXT_RSC_ROOT__ = hydrateRootInTransition({
-		children: createElement(BrowserRoot, {
-			initialElements: root,
-			initialNavigationSnapshot
-		}),
+	const children = createElement(BrowserRoot, {
+		initialElements: root,
+		initialNavigationSnapshot
+	});
+	const errorShellStyles = document.querySelectorAll("style[data-vinext-error-shell-style]");
+	if (document.documentElement.id === "__next_error__") {
+		const { formState: _inertFormState, ...createRootOptions } = hydrateRootOptions;
+		for (const style of errorShellStyles) style.remove();
+		startTransition(() => {
+			const clientRoot = createRoot(document, createRootOptions);
+			clientRoot.render(children);
+			window.__VINEXT_RSC_ROOT__ = clientRoot;
+		});
+	} else window.__VINEXT_RSC_ROOT__ = hydrateRootInTransition({
+		children,
 		container: document,
 		hydrateRoot,
 		options: hydrateRootOptions,
 		startTransition
 	});
+	markInitialAppRouterBootstrapHydrated();
 	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();
@@ -897,16 +851,15 @@ 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);
+				const didNavigate = browserNavigationController.performHardNavigation(targetHref);
+				if (!didNavigate) clearAppNavigationFailureTarget(targetHref);
+				return didNavigate;
 			};
-			let restoredBfcacheIds = navigationKind === "traverse" ? restorableClientState.readCurrentBfcacheVersionHistoryIds(activeTraversalIntent?.historyState ?? window.history.state) : null;
-			const reuseCurrentBfcacheIds = navigationKind !== "traverse" || !restorableClientState.isCacheInvalidationGuarded() && restorableClientState.isCurrentBfcacheVersion(activeTraversalIntent?.historyState ?? window.history.state);
+			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();
@@ -920,50 +873,80 @@ 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,
 						renderMode: navigationKind === "refresh" ? APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI : void 0
 					});
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
-					const cachedRoute = shouldBypassNavigationCache ? null : getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
-					if (cachedRoute) {
-						const compatibilityDecision = resolveRscCompatibilityNavigationDecision({
-							clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
-							currentHref,
-							origin: window.location.origin,
-							responseCompatibilityId: cachedRoute.response.compatibilityIdHeader,
-							responseUrl: cachedRoute.response.url
-						});
-						if (compatibilityDecision.kind === "hard-navigate") {
-							performHardNavigationForScrollIntent(compatibilityDecision.hardNavigationTarget);
-							return;
+					const visitedResponseCandidate = shouldBypassNavigationCache ? {
+						cacheKey: AppElementsWire.encodeCacheKey(rscUrl, requestInterceptionContext),
+						entry: null,
+						facts: {
+							candidate: "missing",
+							navigationKind
 						}
-						const cachedRedirectDecision = resolveRscRedirectLifecycleHop({
+					} : readVisitedResponseCacheCandidate(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
+					const cachedRoute = applyVisitedResponseCacheCandidateDecision(visitedResponseCandidate, navigationPlanner.classifyVisitedResponseCacheCandidate(visitedResponseCandidate.facts));
+					const visitedResponse = cachedRoute === null ? { status: "unavailable" } : { status: "available" };
+					const prefetchProbeDecision = navigationPlanner.classifyNavigationPrefetchProbe({
+						bypassNavigationCache: shouldBypassNavigationCache,
+						navigationKind,
+						visitedResponse
+					});
+					let routeManifest = navigationKind === "navigate" ? getBrowserRouteManifest() : null;
+					const hasPrefetchCandidate = prefetchProbeDecision.kind === "probe" && hasPrefetchCacheEntryForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, { notifyInvalidation: false });
+					const reuseDecision = navigationPlanner.classifyNavigationReuse({
+						bypassNavigationCache: shouldBypassNavigationCache,
+						navigationKind,
+						optimisticRouteShell: routeManifest === null ? {
+							reason: "routeManifestMissing",
+							status: "unavailable"
+						} : { status: "available" },
+						prefetch: hasPrefetchCandidate ? { status: "available" } : { status: "unavailable" },
+						targetHref: currentHref,
+						visitedResponse
+					});
+					if (reuseDecision.kind === "reuseVisitedResponse" && cachedRoute) {
+						const cachedFetchDecision = navigationPlanner.classifyRscFetchResult({
+							clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
+							compatibilityIdHeader: cachedRoute.response.compatibilityIdHeader ?? null,
 							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;
@@ -971,7 +954,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, reuseCurrentBfcacheIds) === "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;
 						}
@@ -980,7 +963,8 @@ function bootstrapHydration(rscStream) {
 					let navResponse;
 					let navResponseExpiresAt;
 					let navResponseUrl = null;
-					if (navigationKind !== "refresh" && !shouldBypassNavigationCache) {
+					let fallbackReuseDecision = reuseDecision;
+					if (reuseDecision.kind === "consumePrefetch") {
 						const prefetchedResponse = await consumePrefetchResponseForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, { shouldConsume: () => browserNavigationController.isCurrentNavigation(navId) });
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
 						if (prefetchedResponse) {
@@ -988,9 +972,22 @@ function bootstrapHydration(rscStream) {
 							navResponseExpiresAt = prefetchedResponse.expiresAt;
 							navResponseUrl = prefetchedResponse.url;
 						}
+						if (!navResponse) {
+							routeManifest = navigationKind === "navigate" ? getBrowserRouteManifest() : null;
+							fallbackReuseDecision = navigationPlanner.classifyNavigationReuse({
+								bypassNavigationCache: shouldBypassNavigationCache,
+								navigationKind,
+								optimisticRouteShell: routeManifest === null ? {
+									reason: "routeManifestMissing",
+									status: "unavailable"
+								} : { status: "available" },
+								prefetch: { status: "unavailable" },
+								targetHref: currentHref,
+								visitedResponse: { status: "unavailable" }
+							});
+						}
 					}
-					if (!navResponse && navigationKind === "navigate") {
-						const routeManifest = getBrowserRouteManifest();
+					if (!navResponse && fallbackReuseDecision.kind === "attemptOptimisticRouteShell") {
 						await learnOptimisticRouteTemplatesFromPrefetchCache({
 							interceptionContext: requestInterceptionContext,
 							mountedSlotsHeader,
@@ -1009,7 +1006,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, reuseCurrentBfcacheIds).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);
 								});
 							}
@@ -1026,61 +1023,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")) ?? {};
@@ -1096,7 +1068,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, reuseCurrentBfcacheIds) !== "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;
@@ -1117,7 +1089,7 @@ function bootstrapHydration(rscStream) {
 			} catch (error) {
 				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
-				performHardNavigationForScrollIntent(currentHref);
+				performHardNavigationForScrollIntent(navigationPlanner.classifyRscNavigationError({ currentHref }).url);
 			} finally {
 				browserNavigationController.finalizeNavigation(navId, pendingRouterState);
 				discardedServerActionRefreshScheduler.markNavigationSettled();
@@ -1142,7 +1114,7 @@ function bootstrapHydration(rscStream) {
 		const href = window.location.href;
 		if (isSameAppRoutePopstateTarget(href)) {
 			notifyAppRouterTransitionStart(href, "traverse");
-			commitTraversalIndexFromHistoryState(event.state);
+			historyController.commitTraversalIndexFromHistoryState(event.state);
 			restorePopstateScrollPosition(event.state);
 			return;
 		}