vinext 0.0.55 → 0.1.1

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

@@ -1,5 +1,5 @@
 import { stripBasePath } from "../utils/base-path.js";
-import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RSC_REDIRECT_HEADER } from "./headers.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";
@@ -9,30 +9,33 @@ 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, createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.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 { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, decodeRedirectError, getClientNavigationRenderContext, getPrefetchCache, invalidatePrefetchCache, isRedirectError, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, useRouter } from "../shims/navigation.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 { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
-import { ElementsContext, Slot } from "../shims/slot.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 { 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, isCacheRestorableAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
-import { clearHardNavigationLoopGuard, createAppBrowserNavigationController } from "./app-browser-navigation-controller.js";
-import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.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 { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition } from "./app-browser-hydration.js";
-import { createPopstateRestoreHandler } from "./app-browser-popstate.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 { dismissOverlay } from "./dev-error-overlay-store.js";
-import { devOnCaughtError, devOnUncaughtError, installDevErrorOverlay } from "./dev-error-overlay.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, useRef, useState } from "react";
+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
@@ -48,8 +51,6 @@ function toOperationLane(kind) {
 	}
 }
 const MAX_VISITED_RESPONSE_CACHE_SIZE = 50;
-const VISITED_RESPONSE_CACHE_TTL = 5 * 6e4;
-const MAX_TRAVERSAL_CACHE_TTL = 30 * 6e4;
 const CLIENT_RSC_COMPATIBILITY_ID = getVinextRscCompatibilityId();
 const optimisticRouteTemplates = /* @__PURE__ */ new Map();
 const optimisticRouteTemplateSources = /* @__PURE__ */ new Set();
@@ -58,6 +59,7 @@ function getBrowserRouteManifest() {
 	return getNavigationRuntime()?.bootstrap.routeManifest ?? null;
 }
 const browserNavigationController = createAppBrowserNavigationController({
+	basePath: __basePath,
 	getRouteManifest: getBrowserRouteManifest,
 	syncHistoryStatePreviousNextUrl: syncCurrentHistoryStatePreviousNextUrl
 });
@@ -76,6 +78,7 @@ function syncServerActionHttpFallbackHead(status) {
 	robots.setAttribute(ACTION_HTTP_FALLBACK_ROBOTS_META_ATTR, "robots");
 	document.head.appendChild(robots);
 }
+const BfcacheIdMapContext = getBfcacheIdMapContext();
 function parseEncodedJsonHeader(value) {
 	if (!value) return null;
 	try {
@@ -93,8 +96,20 @@ let browserRouterStateHasEverCommitted = false;
 let pendingNavigationRecoveryHref = null;
 const mpaNavigationScheduler = new AppBrowserMpaNavigationScheduler();
 const unresolvedMpaNavigation = new Promise(() => {});
+const RSC_HMR_SETTLE_DELAY_MS = 150;
+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;
@@ -110,7 +125,10 @@ function commitHistoryTraversalIndex(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
 	});
@@ -134,6 +152,26 @@ function stripVinextScrollState(state) {
 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
+		});
+	});
+	if (!restored) return false;
+	commitClientNavigationState();
+	return true;
+}
 function getBrowserRouterState() {
 	return browserNavigationController.getBrowserRouterState();
 }
@@ -166,6 +204,7 @@ function clearPrefetchState() {
 function clearClientNavigationCaches() {
 	clearVisitedResponseCache();
 	clearPrefetchState();
+	restorableClientState.invalidateClientState();
 }
 function isSettledPrefetchCacheEntry(entry) {
 	return entry.outcome === "cache-seeded" && entry.pending === void 0 && entry.snapshot !== void 0;
@@ -184,7 +223,7 @@ function parsePrefetchCacheKey(cacheKey) {
 async function learnOptimisticRouteTemplateFromPrefetch(options) {
 	const source = parsePrefetchCacheKey(options.cacheKey);
 	if (source.interceptionContext !== options.interceptionContext) return false;
-	if ((options.entry.snapshot.mountedSlotsHeader ?? null) !== options.mountedSlotsHeader) return false;
+	if (resolvePrefetchCacheEntryMountedSlotsHeader(options.entry) !== options.mountedSlotsHeader) return false;
 	if (options.interceptionContext !== null) return false;
 	const elements = await decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(options.entry.snapshot))));
 	const template = createOptimisticRouteTemplate({
@@ -233,12 +272,27 @@ async function learnOptimisticRouteTemplatesFromPrefetchCache(options) {
 	if (learning.length === 0) return;
 	await Promise.allSettled(learning);
 }
-function syncCurrentHistoryStatePreviousNextUrl(previousNextUrl) {
-	if (readHistoryStatePreviousNextUrl(window.history.state) === previousNextUrl) return;
-	const nextHistoryState = createHistoryStateWithPreviousNextUrl(window.history.state, previousNextUrl);
+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);
-	if (readHistoryStatePreviousNextUrl(window.history.state) === previousNextUrl) return;
-	window.history.replaceState(nextHistoryState, "", window.location.href);
 }
 function createActionInitiationSnapshot() {
 	const routerState = getBrowserRouterState();
@@ -249,7 +303,7 @@ function createActionInitiationSnapshot() {
 	});
 }
 function createNavigationCommitEffect(options) {
-	const { href, historyUpdateMode, navId, params, previousNextUrl, targetHistoryIndex } = options;
+	const { bfcacheIds, href, historyUpdateMode, navId, params, previousNextUrl, targetHistoryIndex } = options;
 	return () => {
 		if (!browserNavigationController.isCurrentNavigation(navId)) {
 			commitClientNavigationState(void 0, { releaseSnapshot: true });
@@ -259,6 +313,8 @@ function createNavigationCommitEffect(options) {
 		const preserveExistingState = historyUpdateMode === "replace";
 		const navigationHistoryIndex = targetHistoryIndex !== void 0 ? targetHistoryIndex : allocateNavigationHistoryTraversalIndex(historyUpdateMode);
 		const historyState = createHistoryStateWithNavigationMetadata(preserveExistingState ? window.history.state : null, {
+			bfcacheIds,
+			bfcacheVersion: restorableClientState.currentBfcacheVersion,
 			previousNextUrl,
 			traversalIndex: navigationHistoryIndex
 		});
@@ -275,7 +331,7 @@ function createNavigationCommitEffect(options) {
 			commitHistoryTraversalIndex(navigationHistoryIndex);
 		}
 		if (!wroteHistoryState) {
-			syncCurrentHistoryStatePreviousNextUrl(previousNextUrl);
+			syncCurrentHistoryStatePreviousNextUrl(previousNextUrl, bfcacheIds);
 			stageClientParams(params);
 			if (targetHistoryIndex !== void 0) commitHistoryTraversalIndex(targetHistoryIndex);
 		}
@@ -283,7 +339,7 @@ function createNavigationCommitEffect(options) {
 		commitClientNavigationState(navId);
 	};
 }
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null, scrollIntent = 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) {
 	syncServerActionHttpFallbackHead(null);
 	try {
 		return await browserNavigationController.renderNavigationPayload({
@@ -301,6 +357,8 @@ async function renderNavigationPayload(payload, navigationSnapshot, targetHref,
 			pendingRouterState,
 			previousNextUrl,
 			scrollIntent,
+			restoredBfcacheIds,
+			reuseCurrentBfcacheIds,
 			targetHistoryIndex: traversalIntent === null ? void 0 : traversalIntent.targetHistoryIndex,
 			targetHref,
 			navId
@@ -382,18 +440,10 @@ function getVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, nav
 		visitedResponseCache.delete(cacheKey);
 		return null;
 	}
-	if (navigationKind === "refresh") return null;
-	if (navigationKind === "traverse") {
-		const createdAt = cached.expiresAt - VISITED_RESPONSE_CACHE_TTL;
-		if (Date.now() - createdAt >= MAX_TRAVERSAL_CACHE_TTL) {
-			visitedResponseCache.delete(cacheKey);
-			return null;
-		}
-		visitedResponseCache.delete(cacheKey);
-		visitedResponseCache.set(cacheKey, cached);
-		return cached;
-	}
-	if (cached.expiresAt > Date.now()) {
+	if (isVisitedResponseCacheEntryFresh(cached, {
+		navigationKind,
+		now: Date.now()
+	})) {
 		visitedResponseCache.delete(cacheKey);
 		visitedResponseCache.set(cacheKey, cached);
 		return cached;
@@ -401,16 +451,23 @@ function getVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, nav
 	visitedResponseCache.delete(cacheKey);
 	return null;
 }
+function deleteVisitedResponse(rscUrl, interceptionContext) {
+	visitedResponseCache.delete(AppElementsWire.encodeCacheKey(rscUrl, interceptionContext));
+}
 function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, params) {
 	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	visitedResponseCache.delete(cacheKey);
 	evictVisitedResponseCacheIfNeeded();
 	const now = Date.now();
-	visitedResponseCache.set(cacheKey, {
+	visitedResponseCache.set(cacheKey, createVisitedResponseCacheEntry({
+		now,
 		params,
-		expiresAt: now + VISITED_RESPONSE_CACHE_TTL,
 		response: snapshot
-	});
+	}));
+}
+function isSamePageSearchNavigation(currentSnapshot, targetUrl) {
+	if (stripBasePath(targetUrl.pathname, __basePath) !== currentSnapshot.pathname) return false;
+	return targetUrl.searchParams.toString() !== currentSnapshot.searchParams.toString();
 }
 function getRequestState(navigationKind, targetPathname, previousNextUrlOverride, traverseHistoryState) {
 	if (previousNextUrlOverride !== void 0) return {
@@ -434,6 +491,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
@@ -494,8 +561,9 @@ function decodeAppElementsPromise(payload) {
 function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	const resolvedElements = use(initialElements);
 	const initialMetadata = AppElementsWire.readMetadata(resolvedElements);
-	const [treeStateValue, setTreeStateValue] = useState({
+	const [treeStateValue, setTreeStateValue] = useState(() => ({
 		activeOperation: null,
+		bfcacheIds: createInitialBfcacheIdMap(resolvedElements),
 		elements: resolvedElements,
 		interception: initialMetadata.interception,
 		interceptionContext: initialMetadata.interceptionContext,
@@ -508,7 +576,7 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		routeId: initialMetadata.routeId,
 		slotBindings: initialMetadata.slotBindings,
 		visibleCommitVersion: 0
-	});
+	}));
 	if (isMpaNavigationState(treeStateValue)) {
 		performMpaNavigation(treeStateValue.href, treeStateValue.historyUpdateMode);
 		throw unresolvedMpaNavigation;
@@ -541,6 +609,12 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 			setMountedSlotsHeader(null);
 		};
 	}, [setTreeStateValue]);
+	useLayoutEffect(() => {
+		restorableClientState.rememberHistoryStateSnapshot({
+			historyIndex: currentHistoryTraversalIndex,
+			state: treeState
+		});
+	}, [treeState]);
 	useLayoutEffect(() => {
 		setMountedSlotsHeader(getMountedSlotIdsHeader(stateRef.current.elements));
 		removeStylesheetLinksCoveredByInlineCss();
@@ -549,12 +623,24 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	useLayoutEffect(() => {
 		if (treeState.renderId !== 0) return;
 		replaceHistoryStateWithoutNotify(createHistoryStateWithNavigationMetadata(window.history.state, {
+			bfcacheIds: treeState.bfcacheIds,
+			bfcacheVersion: restorableClientState.currentBfcacheVersion,
 			previousNextUrl: treeState.previousNextUrl,
 			traversalIndex: currentHistoryTraversalIndex
 		}), "", window.location.href);
-	}, [treeState.previousNextUrl, treeState.renderId]);
+	}, [
+		treeState.bfcacheIds,
+		treeState.previousNextUrl,
+		treeState.renderId
+	]);
 	const routeTree = createElement(RedirectBoundary, null, createElement(NavigationCommitSignal, { renderId: treeState.renderId }, createElement(ElementsContext.Provider, { value: treeState.elements }, createElement(Slot, { id: treeState.routeId }))));
-	const innerTree = AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouterInstance }, createElement(AppRouterRedirectBridge, null, routeTree)) : routeTree;
+	const bfcacheStateKeys = useMemo(() => createBfcacheSegmentStateKeyMap({
+		elements: treeState.elements,
+		pathname: treeState.navigationSnapshot.pathname
+	}), [treeState.elements, treeState.navigationSnapshot.pathname]);
+	const stateKeyTree = createElement(BfcacheStateKeyMapContext.Provider, { value: bfcacheStateKeys }, routeTree);
+	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, {
 		resetKey: treeState.renderId,
 		onCatch: handleDevRecoveryBoundaryCatch
@@ -579,16 +665,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__";
@@ -669,11 +755,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);
+		syncCurrentHistoryStatePreviousNextUrl(actionInitiation.routerState.previousNextUrl, actionInitiation.routerState.bfcacheIds);
 		const body = await encodeReply(args, { temporaryReferences });
 		const { headers } = resolveServerActionRequestState({
 			actionId: id,
@@ -711,6 +797,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)) {
@@ -723,7 +810,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);
@@ -754,16 +841,24 @@ function registerServerActionCallback() {
 			return;
 		}
 		return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result)), actionInitiation, void 0, revalidation);
+	};
+	setServerCallback((id, args) => {
+		const releaseCacheInvalidationGuard = restorableClientState.beginCacheInvalidationGuard();
+		return Promise.resolve().then(() => serverActionCallback(id, args)).finally(releaseCacheInvalidationGuard);
 	});
 }
 async function main() {
 	registerServerActionCallback();
+	if (import.meta.env.DEV) {
+		installDevErrorOverlay();
+		installViteHmrErrorHandler(import.meta.hot);
+		reportInitialDevServerErrors();
+	}
 	const rscStream = await readInitialRscStream();
 	if (rscStream === null) return;
 	bootstrapHydration(rscStream);
 }
 function bootstrapHydration(rscStream) {
-	if (import.meta.env.DEV) installDevErrorOverlay();
 	const root = decodeAppElementsPromise(createFromReadableStream(rscStream));
 	const initialNavigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
 	replaceHistoryStateWithoutNotify(createHistoryStateWithNavigationMetadata(window.history.state, {
@@ -810,6 +905,8 @@ function bootstrapHydration(rscStream) {
 				consumeAppRouterScrollIntent(scrollIntent ?? null);
 				return browserNavigationController.performHardNavigation(targetHref);
 			};
+			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);
 			try {
 				const shouldUsePendingRouterState = programmaticTransition;
 				if (shouldUsePendingRouterState && hasBrowserRouterState()) pendingRouterState = beginPendingBrowserRouterState();
@@ -823,17 +920,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);
+					if (navigationKind === "refresh") syncCurrentHistoryStatePreviousNextUrl(requestPreviousNextUrl, getBrowserRouterState().bfcacheIds);
 					setPendingPathname(url.pathname, navId);
-					const elementsAtNavStart = getBrowserRouterState().elements;
+					const routerStateAtNavStart = getBrowserRouterState();
+					const elementsAtNavStart = routerStateAtNavStart.elements;
 					const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
+					const shouldBypassNavigationCache = navigationKind === "navigate" && isSamePageSearchNavigation(routerStateAtNavStart.navigationSnapshot, url);
 					const requestHeaders = createRscRequestHeaders({
 						interceptionContext: requestInterceptionContext,
+						mountedSlotsHeader,
 						renderMode: navigationKind === "refresh" ? APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI : void 0
 					});
-					if (mountedSlotsHeader) requestHeaders.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
-					const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
+					const cachedRoute = shouldBypassNavigationCache ? null : getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
 					if (cachedRoute) {
 						const compatibilityDecision = resolveRscCompatibilityNavigationDecision({
 							clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
@@ -846,21 +945,47 @@ function bootstrapHydration(rscStream) {
 							performHardNavigationForScrollIntent(compatibilityDecision.hardNavigationTarget);
 							return;
 						}
+						const cachedRedirectDecision = resolveRscRedirectLifecycleHop({
+							currentHref,
+							historyUpdateMode: currentHistoryMode ?? "replace",
+							origin: window.location.origin,
+							redirectDepth: redirectCount,
+							requestPreviousNextUrl,
+							responseUrl: cachedRoute.response.url
+						});
+						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);
+							return;
+						}
+						if (cachedRedirectDecision.kind === "follow") {
+							if (navigationKind === "traverse") restoredBfcacheIds = null;
+							currentHref = cachedRedirectDecision.href;
+							currentHistoryMode = cachedRedirectDecision.historyUpdateMode;
+							currentPrevNextUrl = cachedRedirectDecision.previousNextUrl;
+							redirectCount = cachedRedirectDecision.redirectDepth;
+							continue;
+						}
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
 						const cachedParams = cachedRoute.params;
 						const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
 						const cachedPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
-						await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent);
+						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") {
+							deleteVisitedResponse(rscUrl, requestInterceptionContext);
+							continue;
+						}
 						return;
 					}
 					let navResponse;
+					let navResponseExpiresAt;
 					let navResponseUrl = null;
-					if (navigationKind !== "refresh") {
+					if (navigationKind !== "refresh" && !shouldBypassNavigationCache) {
 						const prefetchedResponse = await consumePrefetchResponseForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, { shouldConsume: () => browserNavigationController.isCurrentNavigation(navId) });
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
 						if (prefetchedResponse) {
 							navResponse = restoreRscResponse(prefetchedResponse, false);
+							navResponseExpiresAt = prefetchedResponse.expiresAt;
 							navResponseUrl = prefetchedResponse.url;
 						}
 					}
@@ -884,16 +1009,22 @@ 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).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).catch((error) => {
 									if (browserNavigationController.isCurrentNavigation(navId)) console.error("[vinext] Optimistic RSC navigation error:", error);
 								});
 							}
 						}
 					}
-					if (!navResponse) navResponse = await fetch(rscUrl, {
-						headers: requestHeaders,
-						credentials: "include"
-					});
+					if (!navResponse) {
+						if (navigationKind === "navigate") {
+							const clientReuseManifestHeader = createClientReuseManifestHeaderFromVisibleAppState(routerStateAtNavStart);
+							if (clientReuseManifestHeader !== null) requestHeaders.set(VINEXT_CLIENT_REUSE_MANIFEST_HEADER, clientReuseManifestHeader);
+						}
+						navResponse = await fetch(rscUrl, {
+							headers: requestHeaders,
+							credentials: "include"
+						});
+					}
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const isRscResponse = (navResponse.headers.get("content-type") ?? "").startsWith("text/x-component");
 					if (!navResponse.ok || !isRscResponse || !navResponse.body) {
@@ -925,6 +1056,7 @@ function bootstrapHydration(rscStream) {
 						return;
 					}
 					if (redirectDecision.kind === "follow") {
+						if (navigationKind === "traverse") restoredBfcacheIds = null;
 						currentHref = redirectDecision.href;
 						currentHistoryMode = redirectDecision.historyUpdateMode;
 						currentPrevNextUrl = redirectDecision.previousNextUrl;
@@ -944,7 +1076,10 @@ function bootstrapHydration(rscStream) {
 							performHardNavigationForScrollIntent(resolvedTarget.href);
 							return;
 						}
+						if (navigationKind === "traverse") restoredBfcacheIds = null;
 						currentHref = `${resolvedTarget.pathname}${resolvedTarget.search}${resolvedTarget.hash}`;
+						currentHistoryMode = currentHistoryMode ?? "replace";
+						currentPrevNextUrl = requestPreviousNextUrl;
 						redirectCount += 1;
 						continue;
 					}
@@ -961,17 +1096,22 @@ 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) !== "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) !== "committed") return;
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
-					const resolvedElements = await rscPayload;
-					const metadata = AppElementsWire.readMetadata(resolvedElements);
-					if (!isCacheRestorableAppPayloadMetadata(metadata)) {
-						cacheBufferPromise.catch(() => {});
-						return;
-					}
-					cacheBufferPromise.then((cacheBuffer) => {
-						storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, metadata.interceptionContext), createCachedRscResponseSnapshot(navResponse, cacheBuffer, navResponseUrl), navParams);
-					}).catch(() => {});
+					try {
+						const renderedElements = await rscPayload;
+						const metadata = AppElementsWire.readMetadata(renderedElements);
+						if (!isCacheRestorableAppPayloadMetadata(metadata)) {
+							cacheBufferPromise.catch(() => {});
+							return;
+						}
+						const cacheBuffer = await cacheBufferPromise;
+						storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, metadata.interceptionContext), {
+							...createCachedRscResponseSnapshot(navResponse, cacheBuffer, navResponseUrl),
+							...navResponseExpiresAt !== void 0 ? { expiresAt: navResponseExpiresAt } : {},
+							mountedSlotsHeader: getMountedSlotIdsHeader(renderedElements)
+						}, navParams);
+					} catch {}
 					return;
 				}
 			} catch (error) {
@@ -984,7 +1124,6 @@ function bootstrapHydration(rscStream) {
 			}
 		}
 	});
-	if ("scrollRestoration" in history) history.scrollRestoration = "manual";
 	const handlePopstate = createPopstateRestoreHandler({
 		getActiveNavigationId: browserNavigationController.getActiveNavigationId.bind(browserNavigationController),
 		getPendingNavigation: () => window.__VINEXT_RSC_PENDING__,
@@ -996,7 +1135,8 @@ function bootstrapHydration(rscStream) {
 		restorePopstateScrollPosition,
 		setPendingNavigation: (pendingNavigation) => {
 			window.__VINEXT_RSC_PENDING__ = pendingNavigation;
-		}
+		},
+		shouldSkipScrollRestore: (navId) => synchronousPopstateScrollRestoreNavigationId === navId
 	});
 	window.addEventListener("popstate", (event) => {
 		const href = window.location.href;
@@ -1007,27 +1147,45 @@ function bootstrapHydration(rscStream) {
 			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 handleRscUpdate = async () => {
+		const applyRscHmrUpdate = async (updateId) => {
+			if (updateId !== latestRscHmrUpdateId) return;
+			if (document.documentElement.id === "__next_error__") {
+				window.location.reload();
+				return;
+			}
+			if (browserRouterStateHasEverCommitted && !browserNavigationController.hasBrowserRouterState()) {
+				window.location.reload();
+				return;
+			}
+			await waitForBrowserRouterStateReady();
+			if (updateId !== latestRscHmrUpdateId) return;
+			if (!browserNavigationController.hasBrowserRouterState()) return;
+			clearClientNavigationCaches();
+			const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
+			dismissOverlay();
+			const hmrHeaders = createRscRequestHeaders();
+			await browserNavigationController.hmrReplaceTree(decodeAppElementsPromise(createFromFetch(fetch(await createRscRequestUrl(window.location.pathname + window.location.search, hmrHeaders), { headers: hmrHeaders }))), navigationSnapshot);
+		};
+		const handleRscUpdate = async (updateId) => {
 			try {
-				if (browserRouterStateHasEverCommitted && !browserNavigationController.hasBrowserRouterState()) {
-					window.location.reload();
-					return;
-				}
-				await waitForBrowserRouterStateReady();
-				if (!browserNavigationController.hasBrowserRouterState()) return;
-				clearClientNavigationCaches();
-				const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
-				dismissOverlay();
-				const hmrHeaders = createRscRequestHeaders();
-				await browserNavigationController.hmrReplaceTree(decodeAppElementsPromise(createFromFetch(fetch(await createRscRequestUrl(window.location.pathname + window.location.search, hmrHeaders), { headers: hmrHeaders }))), navigationSnapshot);
+				await waitForRscHmrSettle();
+				await applyRscHmrUpdate(updateId);
 			} catch (error) {
 				console.error("[vinext] RSC HMR error:", error);
 			}
 		};
 		import.meta.hot.on("rsc:update", () => {
-			handleRscUpdate();
+			handleRscUpdate(++latestRscHmrUpdateId);
 		});
 	}
 }
@@ -1047,5 +1205,3 @@ if (typeof document !== "undefined") {
 }
 //#endregion
 export {};
-
-//# sourceMappingURL=app-browser-entry.js.map