vinext 0.0.46 → 0.0.48

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

@@ -1,94 +1,69 @@
-import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import { createAppPayloadCacheKey, getMountedSlotIdsHeader, normalizeAppElements, readAppElementsMetadata, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
-import { __basePath, activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, consumePrefetchResponse, createClientNavigationRenderSnapshot, getClientNavigationRenderContext, getClientNavigationState, getCurrentInterceptionContext, getCurrentNextUrl, getPrefetchCache, getPrefetchedUrls, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, toRscUrl } from "../shims/navigation.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
+import { VINEXT_RSC_MOUNTED_SLOTS_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { __basePath, commitClientNavigationState, consumePrefetchResponse, createClientNavigationRenderSnapshot, getClientNavigationRenderContext, getClientNavigationState, getCurrentInterceptionContext, getCurrentNextUrl, getPrefetchCache, getPrefetchedUrls, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse } from "../shims/navigation.js";
+import { DevRecoveryBoundary } from "../shims/error-boundary.js";
 import { ElementsContext, Slot } from "../shims/slot.js";
 import "../client/instrumentation-client.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
-import { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveAndClassifyNavigationCommit, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolveServerActionRequestState, routerReducer } from "./app-browser-state.js";
-import { devOnCaughtError } from "./app-browser-error.js";
+import { createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
+import { createAppBrowserNavigationController } from "./app-browser-navigation-controller.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 { getServerActionNotFoundClientMessage, isServerActionNotFoundResponse } from "./server-action-not-found.js";
-import { createElement, startTransition, use, useLayoutEffect, useRef, useState } from "react";
+import { createElement, use, useLayoutEffect, useRef, useState } from "react";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-entry.ts
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
 }
+function toOperationLane(kind) {
+	switch (kind) {
+		case "navigate": return "navigation";
+		case "refresh": return "refresh";
+		case "traverse": return "traverse";
+		default: throw new Error("[vinext] Unknown navigation kind: " + String(kind));
+	}
+}
 const MAX_VISITED_RESPONSE_CACHE_SIZE = 50;
 const VISITED_RESPONSE_CACHE_TTL = 5 * 6e4;
 const MAX_TRAVERSAL_CACHE_TTL = 30 * 6e4;
-let nextNavigationRenderId = 0;
-let activeNavigationId = 0;
-const pendingNavigationCommits = /* @__PURE__ */ new Map();
-const pendingNavigationPrePaintEffects = /* @__PURE__ */ new Map();
+const browserNavigationController = createAppBrowserNavigationController();
+const NavigationCommitSignal = browserNavigationController.NavigationCommitSignal;
+function parseEncodedJsonHeader(value) {
+	if (!value) return null;
+	try {
+		return JSON.parse(decodeURIComponent(value));
+	} catch {
+		return null;
+	}
+}
 function isRouterStatePromise(value) {
 	return value instanceof Promise;
 }
-let setBrowserRouterState = null;
-let browserRouterStateRef = null;
-let activePendingBrowserRouterState = null;
 let latestClientParams = {};
 const visitedResponseCache = /* @__PURE__ */ new Map();
-let resolveBrowserRouterStateReady = null;
-let browserRouterStateReadyPromise = null;
-let browserRouterStateHasCommitted = false;
+let browserRouterStateHasEverCommitted = false;
+let pendingNavigationRecoveryHref = null;
 function isServerActionResult(value) {
 	return !!value && typeof value === "object" && "root" in value;
 }
-function getBrowserRouterStateSetter() {
-	if (!setBrowserRouterState) throw new Error("[vinext] Browser router state setter is not initialized");
-	return setBrowserRouterState;
-}
 function getBrowserRouterState() {
-	if (!browserRouterStateRef) throw new Error("[vinext] Browser router state is not initialized");
-	return browserRouterStateRef.current;
+	return browserNavigationController.getBrowserRouterState();
 }
-function waitForBrowserRouterStateReady() {
-	if (browserRouterStateRef || browserRouterStateHasCommitted) return Promise.resolve();
-	if (!browserRouterStateReadyPromise) browserRouterStateReadyPromise = new Promise((resolve) => {
-		resolveBrowserRouterStateReady = resolve;
-	});
-	return browserRouterStateReadyPromise;
+function hasBrowserRouterState() {
+	return browserNavigationController.hasBrowserRouterState();
 }
-function markBrowserRouterStateReady() {
-	browserRouterStateHasCommitted = true;
-	const resolveReady = resolveBrowserRouterStateReady;
-	resolveBrowserRouterStateReady = null;
-	browserRouterStateReadyPromise = null;
-	resolveReady?.();
+function waitForBrowserRouterStateReady() {
+	return browserNavigationController.waitForBrowserRouterStateReady();
 }
 function beginPendingBrowserRouterState() {
-	const setter = getBrowserRouterStateSetter();
-	if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {
-		activePendingBrowserRouterState.settled = true;
-		activePendingBrowserRouterState.resolve(getBrowserRouterState());
-	}
-	let resolve;
-	const promise = new Promise((resolvePromise) => {
-		resolve = resolvePromise;
-	});
-	const pending = {
-		promise,
-		resolve,
-		settled: false
-	};
-	activePendingBrowserRouterState = pending;
-	setter(promise);
-	return pending;
-}
-function settlePendingBrowserRouterState(pending) {
-	if (!pending || pending.settled) return;
-	pending.settled = true;
-	pending.resolve(getBrowserRouterState());
-	if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
-}
-function resolvePendingBrowserRouterState(pending, action) {
-	if (!pending || pending.settled) return;
-	pending.settled = true;
-	pending.resolve(routerReducer(getBrowserRouterState(), action));
-	if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
+	return browserNavigationController.beginPendingBrowserRouterState();
 }
 function applyClientParams(params) {
 	latestClientParams = params;
@@ -109,31 +84,10 @@ function clearClientNavigationCaches() {
 	clearVisitedResponseCache();
 	clearPrefetchState();
 }
-function queuePrePaintNavigationEffect(renderId, effect) {
-	if (!effect) return;
-	pendingNavigationPrePaintEffects.set(renderId, effect);
-}
-/**
-* Run all queued pre-paint effects for renderIds up to and including the
-* given renderId. When React supersedes a startTransition update (rapid
-* clicks on same-route links), the superseded NavigationCommitSignal never
-* mounts, so its pre-paint effect never fires. By draining all effects
-* <= the committed renderId here, the winning transition cleans up after
-* any superseded ones, keeping the counter balanced.
-*
-* Invariant: each superseded navigation gets a commitClientNavigationState()
-* to balance the activateNavigationSnapshot() from its renderNavigationPayload call.
-*/
-function drainPrePaintEffects(upToRenderId) {
-	for (const [id, effect] of pendingNavigationPrePaintEffects) if (id <= upToRenderId) {
-		pendingNavigationPrePaintEffects.delete(id);
-		if (id === upToRenderId) effect();
-		else commitClientNavigationState(void 0, { releaseSnapshot: true });
-	}
-}
-function createNavigationCommitEffect(href, historyUpdateMode, navId, params, previousNextUrl) {
+function createNavigationCommitEffect(options) {
+	const { href, historyUpdateMode, navId, params, previousNextUrl } = options;
 	return () => {
-		if (navId !== activeNavigationId) {
+		if (!browserNavigationController.isCurrentNavigation(navId)) {
 			commitClientNavigationState(void 0, { releaseSnapshot: true });
 			return;
 		}
@@ -142,9 +96,38 @@ function createNavigationCommitEffect(href, historyUpdateMode, navId, params, pr
 		const historyState = createHistoryStateWithPreviousNextUrl(historyUpdateMode === "replace" ? window.history.state : null, previousNextUrl);
 		if (historyUpdateMode === "replace" && window.location.href !== targetHref) replaceHistoryStateWithoutNotify(historyState, "", href);
 		else if (historyUpdateMode === "push" && window.location.href !== targetHref) pushHistoryStateWithoutNotify(historyState, "", href);
+		pendingNavigationRecoveryHref = null;
 		commitClientNavigationState(navId);
 	};
 }
+async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, useTransition = true, actionType = "navigate", operationLane = "navigation") {
+	try {
+		return await browserNavigationController.renderNavigationPayload({
+			actionType,
+			createNavigationCommitEffect: (options) => {
+				pendingNavigationRecoveryHref = options.href;
+				return createNavigationCommitEffect(options);
+			},
+			historyUpdateMode,
+			navigationSnapshot,
+			nextElements: payload,
+			operationLane,
+			params,
+			pendingRouterState,
+			previousNextUrl,
+			targetHref,
+			navId,
+			useTransition
+		});
+	} catch (error) {
+		pendingNavigationRecoveryHref = null;
+		throw error;
+	}
+}
+async function commitSameUrlNavigatePayload(nextElements, returnValue, actionInitiationState) {
+	const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
+	return browserNavigationController.commitSameUrlNavigatePayload(nextElements, navigationSnapshot, returnValue, actionInitiationState);
+}
 function evictVisitedResponseCacheIfNeeded() {
 	while (visitedResponseCache.size >= MAX_VISITED_RESPONSE_CACHE_SIZE) {
 		const oldest = visitedResponseCache.keys().next().value;
@@ -153,7 +136,7 @@ function evictVisitedResponseCacheIfNeeded() {
 	}
 }
 function getVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, navigationKind) {
-	const cacheKey = createAppPayloadCacheKey(rscUrl, interceptionContext);
+	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const cached = visitedResponseCache.get(cacheKey);
 	if (!cached) return null;
 	if ((cached.response.mountedSlotsHeader ?? null) !== mountedSlotsHeader) {
@@ -180,7 +163,7 @@ function getVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, nav
 	return null;
 }
 function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, params) {
-	const cacheKey = createAppPayloadCacheKey(rscUrl, interceptionContext);
+	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	visitedResponseCache.delete(cacheKey);
 	evictVisitedResponseCacheIfNeeded();
 	const now = Date.now();
@@ -217,66 +200,17 @@ function getRequestState(navigationKind, previousNextUrlOverride) {
 		default: throw new Error("[vinext] Unknown navigation kind: " + String(navigationKind));
 	}
 }
-function createRscRequestHeaders(interceptionContext) {
-	const headers = new Headers({ Accept: "text/x-component" });
-	if (interceptionContext !== null) headers.set("X-Vinext-Interception-Context", interceptionContext);
-	return headers;
-}
-/**
-* Resolve all pending navigation commits with renderId <= the committed renderId.
-* Note: Map iteration handles concurrent deletion safely — entries are visited in
-* insertion order and deletion doesn't affect the iterator's view of remaining entries.
-* This pattern is also used in drainPrePaintEffects with the same semantics.
-*/
-function resolveCommittedNavigations(renderId) {
-	for (const [pendingId, resolve] of pendingNavigationCommits) if (pendingId <= renderId) {
-		pendingNavigationCommits.delete(pendingId);
-		resolve();
-	}
-}
-function NavigationCommitSignal({ renderId, children }) {
-	useLayoutEffect(() => {
-		drainPrePaintEffects(renderId);
-		const frame = requestAnimationFrame(() => {
-			resolveCommittedNavigations(renderId);
-		});
-		return () => {
-			cancelAnimationFrame(frame);
-			resolveCommittedNavigations(renderId);
-		};
-	}, [renderId]);
-	return children;
-}
-function normalizeAppElementsPromise(payload) {
-	return Promise.resolve(payload).then((elements) => normalizeAppElements(elements));
+function handleDevRecoveryBoundaryCatch(resetKey) {
+	browserNavigationController.drainPrePaintEffects(resetKey);
 }
-async function commitSameUrlNavigatePayload(nextElements, returnValue) {
-	const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
-	const currentState = getBrowserRouterState();
-	const startedNavigationId = activeNavigationId;
-	const { disposition, pending } = await resolveAndClassifyNavigationCommit({
-		activeNavigationId,
-		currentState,
-		navigationSnapshot,
-		nextElements,
-		renderId: ++nextNavigationRenderId,
-		startedNavigationId,
-		type: "navigate"
-	});
-	if (disposition === "hard-navigate") {
-		window.location.assign(window.location.href);
-		return;
-	}
-	if (disposition === "dispatch") dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "navigate", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
-	if (returnValue) {
-		if (!returnValue.ok) throw returnValue.data;
-		return returnValue.data;
-	}
+function decodeAppElementsPromise(payload) {
+	return Promise.resolve(payload).then((elements) => AppElementsWire.decode(elements));
 }
 function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	const resolvedElements = use(initialElements);
-	const initialMetadata = readAppElementsMetadata(resolvedElements);
+	const initialMetadata = AppElementsWire.readMetadata(resolvedElements);
 	const [treeStateValue, setTreeStateValue] = useState({
+		activeOperation: null,
 		elements: resolvedElements,
 		interceptionContext: initialMetadata.interceptionContext,
 		layoutFlags: initialMetadata.layoutFlags,
@@ -284,21 +218,17 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		previousNextUrl: null,
 		renderId: 0,
 		rootLayoutTreePath: initialMetadata.rootLayoutTreePath,
-		routeId: initialMetadata.routeId
+		routeId: initialMetadata.routeId,
+		visibleCommitVersion: 0
 	});
 	const treeState = isRouterStatePromise(treeStateValue) ? use(treeStateValue) : treeStateValue;
 	const stateRef = useRef(treeState);
 	stateRef.current = treeState;
 	useLayoutEffect(() => {
-		setBrowserRouterState = setTreeStateValue;
-		browserRouterStateRef = stateRef;
-		markBrowserRouterStateReady();
+		const detach = browserNavigationController.attachBrowserRouterState(setTreeStateValue, stateRef);
+		browserRouterStateHasEverCommitted = true;
 		return () => {
-			if (setBrowserRouterState === setTreeStateValue) setBrowserRouterState = null;
-			if (browserRouterStateRef === stateRef) {
-				browserRouterStateRef = null;
-				browserRouterStateHasCommitted = false;
-			}
+			detach();
 			setMountedSlotsHeader(null);
 		};
 	}, [setTreeStateValue]);
@@ -309,84 +239,15 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		if (treeState.renderId !== 0) return;
 		replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(window.history.state, treeState.previousNextUrl), "", window.location.href);
 	}, [treeState.previousNextUrl, treeState.renderId]);
-	const committedTree = createElement(NavigationCommitSignal, { renderId: treeState.renderId }, createElement(ElementsContext.Provider, { value: treeState.elements }, createElement(Slot, { id: treeState.routeId })));
+	const innerTree = createElement(NavigationCommitSignal, { renderId: treeState.renderId }, createElement(ElementsContext.Provider, { value: treeState.elements }, createElement(Slot, { id: treeState.routeId })));
+	const committedTree = import.meta.env.DEV ? createElement(DevRecoveryBoundary, {
+		resetKey: treeState.renderId,
+		onCatch: handleDevRecoveryBoundaryCatch
+	}, innerTree) : innerTree;
 	const ClientNavigationRenderContext = getClientNavigationRenderContext();
 	if (!ClientNavigationRenderContext) return committedTree;
 	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, committedTree);
 }
-function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType, interceptionContext, layoutFlags, previousNextUrl, routeId, rootLayoutTreePath, pendingRouterState, useTransitionMode) {
-	const setter = getBrowserRouterStateSetter();
-	const action = {
-		elements,
-		interceptionContext,
-		layoutFlags,
-		navigationSnapshot,
-		previousNextUrl,
-		renderId,
-		rootLayoutTreePath,
-		routeId,
-		type: actionType
-	};
-	const applyAction = () => {
-		if (pendingRouterState) {
-			resolvePendingBrowserRouterState(pendingRouterState, action);
-			return;
-		}
-		setter(routerReducer(getBrowserRouterState(), action));
-	};
-	if (useTransitionMode) startTransition(applyAction);
-	else applyAction();
-}
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, useTransition = true, actionType = "navigate") {
-	const renderId = ++nextNavigationRenderId;
-	const committed = new Promise((resolve) => {
-		pendingNavigationCommits.set(renderId, resolve);
-	});
-	let snapshotActivated = false;
-	try {
-		const currentState = getBrowserRouterState();
-		const pending = await createPendingNavigationCommit({
-			currentState,
-			nextElements: payload,
-			navigationSnapshot,
-			previousNextUrl,
-			renderId,
-			type: actionType
-		});
-		const disposition = resolvePendingNavigationCommitDisposition({
-			activeNavigationId,
-			currentRootLayoutTreePath: currentState.rootLayoutTreePath,
-			nextRootLayoutTreePath: pending.rootLayoutTreePath,
-			startedNavigationId: navId
-		});
-		if (disposition === "skip") {
-			settlePendingBrowserRouterState(pendingRouterState);
-			const resolve = pendingNavigationCommits.get(renderId);
-			pendingNavigationCommits.delete(renderId);
-			resolve?.();
-			return;
-		}
-		if (disposition === "hard-navigate") {
-			settlePendingBrowserRouterState(pendingRouterState);
-			pendingNavigationCommits.delete(renderId);
-			window.location.assign(targetHref);
-			return;
-		}
-		queuePrePaintNavigationEffect(renderId, createNavigationCommitEffect(targetHref, historyUpdateMode, navId, params, pending.previousNextUrl));
-		activateNavigationSnapshot();
-		snapshotActivated = true;
-		dispatchBrowserTree(pending.action.elements, navigationSnapshot, renderId, actionType, pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, pendingRouterState, useTransition);
-	} catch (error) {
-		pendingNavigationPrePaintEffects.delete(renderId);
-		const resolve = pendingNavigationCommits.get(renderId);
-		pendingNavigationCommits.delete(renderId);
-		if (snapshotActivated) commitClientNavigationState(navId);
-		settlePendingBrowserRouterState(pendingRouterState);
-		resolve?.();
-		throw error;
-	}
-	return committed;
-}
 function restoreHydrationNavigationContext(pathname, searchParams, params) {
 	setNavigationContext({
 		pathname,
@@ -479,17 +340,20 @@ async function readInitialRscStream() {
 		if (vinext.__VINEXT_RSC_NAV__) restoreHydrationNavigationContext(vinext.__VINEXT_RSC_NAV__.pathname, vinext.__VINEXT_RSC_NAV__.searchParams, params);
 		return createProgressiveRscStream();
 	}
-	const rscResponse = await fetch(toRscUrl(window.location.pathname + window.location.search));
+	const rscHeaders = createRscRequestHeaders();
+	const rscResponse = await fetch(await createRscRequestUrl(window.location.pathname + window.location.search, rscHeaders), {
+		credentials: "include",
+		headers: rscHeaders
+	});
 	if (!rscResponse.ok) return recoverFromBadInitialRscResponse(`returned ${rscResponse.status}`);
 	const contentType = rscResponse.headers.get("content-type") ?? "";
 	if (!contentType.startsWith("text/x-component")) return recoverFromBadInitialRscResponse(`returned non-RSC content-type "${contentType || "(missing)"}"`);
 	if (!rscResponse.body) return recoverFromBadInitialRscResponse("returned empty body");
 	clearReloadFlag();
-	let params = {};
-	const paramsHeader = rscResponse.headers.get("X-Vinext-Params");
-	if (paramsHeader) try {
-		params = JSON.parse(decodeURIComponent(paramsHeader));
-		applyClientParams(params);
+	const parsedParams = parseEncodedJsonHeader(rscResponse.headers.get("X-Vinext-Params"));
+	const params = parsedParams ?? {};
+	if (parsedParams) try {
+		applyClientParams(parsedParams);
 	} catch {}
 	restoreHydrationNavigationContext(window.location.pathname, window.location.search, params);
 	return rscResponse.body;
@@ -505,7 +369,7 @@ function registerServerActionCallback() {
 			elements: currentState.elements,
 			previousNextUrl: currentState.previousNextUrl
 		});
-		const fetchResponse = await fetch(toRscUrl(window.location.pathname + window.location.search), {
+		const fetchResponse = await fetch(await createRscRequestUrl(window.location.pathname + window.location.search, headers), {
 			method: "POST",
 			headers,
 			body
@@ -529,8 +393,8 @@ function registerServerActionCallback() {
 		}
 		clearClientNavigationCaches();
 		const result = await createFromFetch(Promise.resolve(fetchResponse), { temporaryReferences });
-		if (isServerActionResult(result)) return commitSameUrlNavigatePayload(Promise.resolve(normalizeAppElements(result.root)), result.returnValue);
-		return commitSameUrlNavigatePayload(Promise.resolve(normalizeAppElements(result)));
+		if (isServerActionResult(result)) return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result.root)), result.returnValue, currentState);
+		return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result)), void 0, currentState);
 	});
 }
 async function main() {
@@ -540,27 +404,31 @@ async function main() {
 	bootstrapHydration(rscStream);
 }
 function bootstrapHydration(rscStream) {
-	const root = normalizeAppElementsPromise(createFromReadableStream(rscStream));
+	if (import.meta.env.DEV) installDevErrorOverlay();
+	const root = decodeAppElementsPromise(createFromReadableStream(rscStream));
 	const initialNavigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
 	replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(window.history.state, null), "", window.location.href);
+	const onUncaughtError = import.meta.env.DEV ? devOnUncaughtError : createOnUncaughtError(() => pendingNavigationRecoveryHref);
 	window.__VINEXT_RSC_ROOT__ = hydrateRoot(document, createElement(BrowserRoot, {
 		initialElements: root,
 		initialNavigationSnapshot
-	}), import.meta.env.DEV ? { onCaughtError: devOnCaughtError } : void 0);
+	}), import.meta.env.DEV ? {
+		onCaughtError: devOnCaughtError,
+		onUncaughtError
+	} : { onUncaughtError });
 	window.__VINEXT_HYDRATED_AT = performance.now();
 	window.__VINEXT_RSC_NAVIGATE__ = async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false) {
-		let _snapshotPending = false;
 		let pendingRouterState = null;
-		const navId = ++activeNavigationId;
+		const navId = browserNavigationController.beginNavigation();
 		let currentHref = href;
 		let currentHistoryMode = historyUpdateMode;
 		let currentPrevNextUrl = previousNextUrlOverride;
 		let redirectCount = redirectDepth;
 		try {
-			if (programmaticTransition && browserRouterStateRef) pendingRouterState = beginPendingBrowserRouterState();
+			if (programmaticTransition && hasBrowserRouterState()) pendingRouterState = beginPendingBrowserRouterState();
 			else {
 				await waitForBrowserRouterStateReady();
-				if (navId !== activeNavigationId) return;
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				if (programmaticTransition) pendingRouterState = beginPendingBrowserRouterState();
 			}
 			while (true) {
@@ -570,7 +438,6 @@ function bootstrapHydration(rscStream) {
 					return;
 				}
 				const url = new URL(currentHref, window.location.origin);
-				const rscUrl = toRscUrl(url.pathname + url.search);
 				const requestState = getRequestState(navigationKind, currentPrevNextUrl);
 				const requestInterceptionContext = requestState.interceptionContext;
 				const requestPreviousNextUrl = requestState.previousNextUrl;
@@ -580,19 +447,17 @@ function bootstrapHydration(rscStream) {
 				setPendingPathname(url.pathname, navId);
 				const elementsAtNavStart = getBrowserRouterState().elements;
 				const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
+				const requestHeaders = createRscRequestHeaders({ interceptionContext: requestInterceptionContext });
+				if (mountedSlotsHeader) requestHeaders.set(VINEXT_RSC_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
+				const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
 				const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
 				if (cachedRoute) {
-					if (navId !== activeNavigationId) return;
+					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const cachedParams = cachedRoute.params;
 					const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
-					const cachedPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
-					if (navId !== activeNavigationId) return;
-					_snapshotPending = true;
-					try {
-						await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
-					} finally {
-						_snapshotPending = false;
-					}
+					const cachedPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
+					if (!browserNavigationController.isCurrentNavigation(navId)) return;
+					await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind), toOperationLane(navigationKind));
 					return;
 				}
 				let navResponse;
@@ -604,23 +469,20 @@ function bootstrapHydration(rscStream) {
 						navResponseUrl = prefetchedResponse.url;
 					}
 				}
-				if (!navResponse) {
-					const requestHeaders = createRscRequestHeaders(requestInterceptionContext);
-					if (mountedSlotsHeader) requestHeaders.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
-					navResponse = await fetch(rscUrl, {
-						headers: requestHeaders,
-						credentials: "include"
-					});
-				}
-				if (navId !== activeNavigationId) return;
+				if (!navResponse) 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) {
 					const responseUrl = navResponseUrl ?? navResponse.url;
 					let hardNavTarget = currentHref;
 					if (responseUrl) {
 						const parsed = new URL(responseUrl, window.location.origin);
+						stripRscCacheBustingSearchParam(parsed);
 						const origUrl = new URL(currentHref, window.location.origin);
-						let pathname = parsed.pathname.replace(/\.rsc$/, "");
+						let pathname = stripRscSuffix(parsed.pathname);
 						if (origUrl.pathname.length > 1 && origUrl.pathname.endsWith("/") && !pathname.endsWith("/")) pathname += "/";
 						hardNavTarget = pathname + parsed.search;
 						if (origUrl.hash) hardNavTarget += origUrl.hash;
@@ -629,9 +491,10 @@ function bootstrapHydration(rscStream) {
 					return;
 				}
 				const finalUrl = new URL(navResponseUrl ?? navResponse.url, window.location.origin);
+				stripRscCacheBustingSearchParam(finalUrl);
 				const requestedUrl = new URL(rscUrl, window.location.origin);
 				if (finalUrl.pathname !== requestedUrl.pathname) {
-					const destinationPath = finalUrl.pathname.replace(/\.rsc$/, "") + finalUrl.search;
+					const destinationPath = stripRscSuffix(finalUrl.pathname) + finalUrl.search;
 					replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(null, requestPreviousNextUrl), "", destinationPath);
 					currentHref = destinationPath;
 					currentHistoryMode = void 0;
@@ -639,37 +502,24 @@ function bootstrapHydration(rscStream) {
 					redirectCount += 1;
 					continue;
 				}
-				let navParams = {};
-				const paramsHeader = navResponse.headers.get("X-Vinext-Params");
-				if (paramsHeader) try {
-					navParams = JSON.parse(decodeURIComponent(paramsHeader));
-				} catch {}
+				const navParams = parseEncodedJsonHeader(navResponse.headers.get("X-Vinext-Params")) ?? {};
 				const navigationSnapshot = createClientNavigationRenderSnapshot(currentHref, navParams);
 				const responseSnapshot = await snapshotRscResponse(navResponse);
-				if (navId !== activeNavigationId) return;
-				const rscPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
-				if (navId !== activeNavigationId) return;
-				_snapshotPending = true;
-				try {
-					await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
-				} finally {
-					_snapshotPending = false;
-				}
-				if (navId !== activeNavigationId) return;
-				storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, readAppElementsMetadata(await rscPayload).interceptionContext), responseSnapshot, navParams);
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
+				const rscPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
+				if (await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind), toOperationLane(navigationKind)) !== "committed") return;
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
+				const resolvedElements = await rscPayload;
+				storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, AppElementsWire.readMetadata(resolvedElements).interceptionContext), responseSnapshot, navParams);
 				return;
 			}
 		} catch (error) {
-			if (_snapshotPending) {
-				_snapshotPending = false;
-				commitClientNavigationState(navId);
-			}
-			if (navId !== activeNavigationId) return;
+			if (!browserNavigationController.isCurrentNavigation(navId)) return;
 			if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
 			window.location.href = currentHref;
 		} finally {
-			settlePendingBrowserRouterState(pendingRouterState);
-			if (navId === activeNavigationId) clearPendingPathname(navId);
+			browserNavigationController.finalizeNavigation(navId, pendingRouterState);
 		}
 	};
 	if ("scrollRestoration" in history) history.scrollRestoration = "manual";
@@ -684,16 +534,17 @@ function bootstrapHydration(rscStream) {
 	});
 	if (import.meta.hot) import.meta.hot.on("rsc:update", async () => {
 		try {
+			if (browserRouterStateHasEverCommitted && !browserNavigationController.hasBrowserRouterState()) {
+				window.location.reload();
+				return;
+			}
+			await waitForBrowserRouterStateReady();
+			if (!browserNavigationController.hasBrowserRouterState()) return;
 			clearClientNavigationCaches();
 			const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
-			const pending = await createPendingNavigationCommit({
-				currentState: getBrowserRouterState(),
-				nextElements: normalizeAppElementsPromise(createFromFetch(fetch(toRscUrl(window.location.pathname + window.location.search)))),
-				navigationSnapshot,
-				renderId: ++nextNavigationRenderId,
-				type: "replace"
-			});
-			dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "replace", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
+			dismissOverlay();
+			const hmrHeaders = createRscRequestHeaders();
+			await browserNavigationController.hmrReplaceTree(decodeAppElementsPromise(createFromFetch(fetch(await createRscRequestUrl(window.location.pathname + window.location.search, hmrHeaders), { headers: hmrHeaders }))), navigationSnapshot);
 		} catch (error) {
 			console.error("[vinext] RSC HMR error:", error);
 		}