vinext 0.0.53 → 0.0.55

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

@@ -1,25 +1,28 @@
 import { stripBasePath } from "../utils/base-path.js";
-import { ACTION_REDIRECT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RSC_REDIRECT_HEADER } from "./headers.js";
+import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_MOUNTED_SLOTS_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 { scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.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 { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
 import { resolveManifestNavigationInterceptionContext } from "./app-browser-interception-context.js";
 import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, getVinextRscCompatibilityId, resolveHardNavigationTargetFromRscResponse, resolveRscCompatibilityNavigationDecision } from "./app-rsc-cache-busting.js";
-import { AppRouterContext } from "../shims/internal/app-router-context.js";
-import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, getClientNavigationRenderContext, getPrefetchCache, invalidatePrefetchCache, navigateClientSide, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname } from "../shims/navigation.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, resolveHardNavigationTargetFromRscResponse, resolveRscCompatibilityNavigationDecision } from "./app-rsc-cache-busting.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 { DevRecoveryBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { ElementsContext, Slot } from "../shims/slot.js";
 import "../client/instrumentation-client.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, isServerActionResult, parseServerActionRevalidationHeader, resolveServerActionRedirectLocation, shouldClearClientNavigationCachesForServerActionResult } from "./app-browser-action-result.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, resolveServerActionRedirectCompatibilityHardNavigationTarget, shouldCheckRscCompatibilityForServerActionResponse, shouldClearClientNavigationCachesForServerActionResult } from "./app-browser-action-result.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 { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition } from "./app-browser-hydration.js";
 import { createPopstateRestoreHandler } from "./app-browser-popstate.js";
 import { createOnUncaughtError } from "./app-browser-error.js";
@@ -28,7 +31,8 @@ import { devOnCaughtError, devOnUncaughtError, installDevErrorOverlay } from "./
 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 { createElement, startTransition, use, useLayoutEffect, useRef, useState } from "react";
+import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
+import { createElement, startTransition, use, useEffect, 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
@@ -62,6 +66,16 @@ const discardedServerActionRefreshScheduler = createDiscardedServerActionRefresh
 	getNavigationRuntime()?.functions.navigate?.(window.location.href, 0, "refresh", void 0, void 0, true);
 } });
 const NavigationCommitSignal = browserNavigationController.NavigationCommitSignal;
+const ACTION_HTTP_FALLBACK_ROBOTS_META_ATTR = "data-vinext-action-http-fallback";
+function syncServerActionHttpFallbackHead(status) {
+	document.head.querySelectorAll(`meta[${ACTION_HTTP_FALLBACK_ROBOTS_META_ATTR}="robots"]`).forEach((node) => node.remove());
+	if (status !== 404) return;
+	const robots = document.createElement("meta");
+	robots.name = "robots";
+	robots.content = "noindex";
+	robots.setAttribute(ACTION_HTTP_FALLBACK_ROBOTS_META_ATTR, "robots");
+	document.head.appendChild(robots);
+}
 function parseEncodedJsonHeader(value) {
 	if (!value) return null;
 	try {
@@ -77,6 +91,8 @@ let latestClientParams = {};
 const visitedResponseCache = /* @__PURE__ */ new Map();
 let browserRouterStateHasEverCommitted = false;
 let pendingNavigationRecoveryHref = null;
+const mpaNavigationScheduler = new AppBrowserMpaNavigationScheduler();
+const unresolvedMpaNavigation = new Promise(() => {});
 let currentHistoryTraversalIndex = readHistoryStateTraversalIndex(window.history.state) ?? 0;
 let nextHistoryTraversalIndex = currentHistoryTraversalIndex;
 function allocateNavigationHistoryTraversalIndex(historyUpdateMode) {
@@ -267,7 +283,8 @@ function createNavigationCommitEffect(options) {
 		commitClientNavigationState(navId);
 	};
 }
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null) {
+async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, payloadOrigin, actionType = "navigate", operationLane = "navigation", traversalIntent = null, scrollIntent = null) {
+	syncServerActionHttpFallbackHead(null);
 	try {
 		return await browserNavigationController.renderNavigationPayload({
 			actionType,
@@ -283,6 +300,7 @@ async function renderNavigationPayload(payload, navigationSnapshot, targetHref,
 			params,
 			pendingRouterState,
 			previousNextUrl,
+			scrollIntent,
 			targetHistoryIndex: traversalIntent === null ? void 0 : traversalIntent.targetHistoryIndex,
 			targetHref,
 			navId
@@ -292,6 +310,52 @@ async function renderNavigationPayload(payload, navigationSnapshot, targetHref,
 		throw error;
 	}
 }
+function resolveActionRedirectTarget(response) {
+	const actionRedirect = response.headers.get(ACTION_REDIRECT_HEADER);
+	if (!actionRedirect) return null;
+	if (isDangerousScheme(actionRedirect)) {
+		console.error(DANGEROUS_URL_BLOCK_MESSAGE);
+		return null;
+	}
+	try {
+		let redirectUrl;
+		if (actionRedirect.startsWith("/") || /^[a-z]+:/i.test(actionRedirect)) redirectUrl = new URL(actionRedirect, window.location.href);
+		else {
+			const baseParsed = new URL(window.location.href);
+			let baseDir = baseParsed.pathname;
+			if (!baseDir.endsWith("/")) baseDir = baseDir + "/";
+			redirectUrl = new URL(actionRedirect, `${baseParsed.origin}${baseDir}${baseParsed.search}`);
+		}
+		if (redirectUrl.origin !== window.location.origin) {
+			browserNavigationController.performHardNavigation(actionRedirect);
+			return null;
+		}
+		const statusHeader = response.headers.get(ACTION_REDIRECT_STATUS_HEADER);
+		const status = statusHeader ? parseInt(statusHeader, 10) : 307;
+		return {
+			href: redirectUrl.href,
+			type: response.headers.get("x-action-redirect-type") ?? "push",
+			status
+		};
+	} catch {
+		browserNavigationController.performHardNavigation(actionRedirect);
+		return null;
+	}
+}
+var ServerActionRedirectError = class extends Error {
+	digest;
+	handled = true;
+	constructor(target) {
+		super("NEXT_REDIRECT");
+		const redirectUrl = new URL(target.href, window.location.href);
+		const redirectHref = redirectUrl.pathname + redirectUrl.search + redirectUrl.hash;
+		const redirectType = target.type === "push" ? "push" : "replace";
+		this.digest = `NEXT_REDIRECT;${redirectType};${encodeURIComponent(redirectHref)};${target.status};`;
+	}
+};
+function createServerActionRedirectError(target) {
+	return new ServerActionRedirectError(target);
+}
 async function commitSameUrlNavigatePayload(nextElements, actionInitiation, returnValue, revalidation = "none") {
 	const navigationSnapshot = createClientNavigationRenderSnapshot(actionInitiation.href, actionInitiation.routerState.navigationSnapshot.params);
 	return browserNavigationController.commitSameUrlNavigatePayload(nextElements, navigationSnapshot, returnValue, actionInitiation.routerState, {
@@ -395,6 +459,35 @@ function getRequestState(navigationKind, targetPathname, previousNextUrlOverride
 function handleDevRecoveryBoundaryCatch(resetKey) {
 	browserNavigationController.drainPrePaintEffects(resetKey);
 }
+function isMpaNavigationState(value) {
+	return value !== null && typeof value === "object" && "kind" in value && value.kind === "mpa-navigation";
+}
+function performMpaNavigation(href, historyUpdateMode) {
+	mpaNavigationScheduler.navigate(window, href, historyUpdateMode);
+}
+function AppRouterRedirectBridge({ children }) {
+	const router = useRouter();
+	useEffect(() => {
+		const handleUnhandledRedirect = (event) => {
+			const error = "reason" in event ? event.reason : event.error;
+			if (!isRedirectError(error)) return;
+			const result = decodeRedirectError(error.digest);
+			if (!result) return;
+			event.preventDefault();
+			startTransition(() => {
+				if (result.type === "push") router.push(result.url);
+				else router.replace(result.url);
+			});
+		};
+		window.addEventListener("error", handleUnhandledRedirect);
+		window.addEventListener("unhandledrejection", handleUnhandledRedirect);
+		return () => {
+			window.removeEventListener("error", handleUnhandledRedirect);
+			window.removeEventListener("unhandledrejection", handleUnhandledRedirect);
+		};
+	}, [router]);
+	return children ?? null;
+}
 function decodeAppElementsPromise(payload) {
 	return Promise.resolve(payload).then((elements) => AppElementsWire.decode(elements));
 }
@@ -416,11 +509,26 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		slotBindings: initialMetadata.slotBindings,
 		visibleCommitVersion: 0
 	});
+	if (isMpaNavigationState(treeStateValue)) {
+		performMpaNavigation(treeStateValue.href, treeStateValue.historyUpdateMode);
+		throw unresolvedMpaNavigation;
+	}
 	const treeState = isRouterStatePromise(treeStateValue) ? use(treeStateValue) : treeStateValue;
 	const stateRef = useRef(treeState);
 	stateRef.current = treeState;
 	useLayoutEffect(() => {
-		const detach = browserNavigationController.attachBrowserRouterState(setTreeStateValue, stateRef);
+		const setAppRouterStateValue = (value) => {
+			setTreeStateValue(value);
+		};
+		const detach = browserNavigationController.attachBrowserRouterState(setAppRouterStateValue, stateRef);
+		registerNavigationRuntimeFunctions({ navigateExternal: (href, historyUpdateMode) => {
+			setTreeStateValue({
+				href,
+				historyUpdateMode,
+				kind: "mpa-navigation"
+			});
+			return new Promise(() => {});
+		} });
 		browserRouterStateHasEverCommitted = true;
 		const hydratedAt = performance.now();
 		window.__VINEXT_HYDRATED_AT = hydratedAt;
@@ -428,12 +536,14 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		window.__NEXT_HYDRATED_AT = hydratedAt;
 		window.__NEXT_HYDRATED_CB?.();
 		return () => {
+			registerNavigationRuntimeFunctions({ navigateExternal: void 0 });
 			detach();
 			setMountedSlotsHeader(null);
 		};
 	}, [setTreeStateValue]);
 	useLayoutEffect(() => {
 		setMountedSlotsHeader(getMountedSlotIdsHeader(stateRef.current.elements));
+		removeStylesheetLinksCoveredByInlineCss();
 		getNavigationRuntime()?.functions.pingVisibleLinks?.();
 	}, [treeState.elements]);
 	useLayoutEffect(() => {
@@ -444,14 +554,15 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		}), "", window.location.href);
 	}, [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 }, routeTree) : routeTree;
+	const innerTree = AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouterInstance }, createElement(AppRouterRedirectBridge, null, routeTree)) : routeTree;
 	const committedTree = import.meta.env.DEV ? createElement(DevRecoveryBoundary, {
 		resetKey: treeState.renderId,
 		onCatch: handleDevRecoveryBoundaryCatch
 	}, innerTree) : innerTree;
+	const scrollScopedTree = createElement(AppRouterScrollCommitProvider, { commitId: treeState.renderId }, committedTree);
 	const ClientNavigationRenderContext = getClientNavigationRenderContext();
-	if (!ClientNavigationRenderContext) return committedTree;
-	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, committedTree);
+	if (!ClientNavigationRenderContext) return scrollScopedTree;
+	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, scrollScopedTree);
 }
 function restoreHydrationNavigationContext(pathname, searchParams, params) {
 	setNavigationContext({
@@ -460,16 +571,15 @@ function restoreHydrationNavigationContext(pathname, searchParams, params) {
 		params
 	});
 }
-function restorePopstateScrollPosition(state) {
+function restorePopstateScrollPosition(state, options) {
+	const shouldContinue = options?.shouldContinue ?? (() => true);
+	if (!shouldContinue()) return;
 	if (!(state && typeof state === "object" && "__vinext_scrollY" in state)) {
 		if (window.location.hash) scrollToHashTargetOnNextFrame(window.location.hash);
 		return;
 	}
 	const y = Number(state.__vinext_scrollY);
-	const x = "__vinext_scrollX" in state ? Number(state.__vinext_scrollX) : 0;
-	requestAnimationFrame(() => {
-		window.scrollTo(x, y);
-	});
+	retryScrollTo("__vinext_scrollX" in state ? Number(state.__vinext_scrollX) : 0, y, { shouldContinue });
 }
 function isSameAppRoutePopstateTarget(href) {
 	if (!hasBrowserRouterState()) return false;
@@ -560,6 +670,7 @@ function applyRuntimeRscBootstrap(rsc) {
 }
 function registerServerActionCallback() {
 	setServerCallback(async (id, args) => {
+		syncServerActionHttpFallbackHead(null);
 		const temporaryReferences = createTemporaryReferenceSet();
 		const actionInitiation = createActionInitiationSnapshot();
 		syncCurrentHistoryStatePreviousNextUrl(actionInitiation.routerState.previousNextUrl);
@@ -570,39 +681,26 @@ function registerServerActionCallback() {
 			elements: actionInitiation.routerState.elements,
 			previousNextUrl: actionInitiation.routerState.previousNextUrl
 		});
-		const fetchResponse = await fetch(await createRscRequestUrl(actionInitiation.path, headers), {
+		const fetchResponse = await fetch(createServerActionRequestUrl(actionInitiation.path), {
 			method: "POST",
 			headers,
 			body
 		});
 		throwOnServerActionNotFound(fetchResponse, id);
-		const actionRedirect = fetchResponse.headers.get(ACTION_REDIRECT_HEADER);
-		if (actionRedirect) {
-			if (isDangerousScheme(actionRedirect)) {
-				console.error(DANGEROUS_URL_BLOCK_MESSAGE);
-				return;
-			}
-			const historyUpdateMode = (fetchResponse.headers.get("x-action-redirect-type") ?? "push") === "push" ? "push" : "replace";
-			const hardNavigationMode = historyUpdateMode === "push" ? "assign" : "replace";
-			let redirectLocation;
-			try {
-				redirectLocation = resolveServerActionRedirectLocation({
-					currentHref: actionInitiation.href,
-					location: actionRedirect,
-					origin: window.location.origin
-				});
-			} catch {
-				clearClientNavigationCaches();
-				browserNavigationController.performHardNavigation(actionRedirect, hardNavigationMode);
-				return;
-			}
+		const hasActionRedirect = fetchResponse.headers.has(ACTION_REDIRECT_HEADER);
+		const actionRedirectTarget = resolveActionRedirectTarget(fetchResponse);
+		if (hasActionRedirect && !actionRedirectTarget) return;
+		const actionRedirectCompatibilityHardNavigationTarget = resolveServerActionRedirectCompatibilityHardNavigationTarget({
+			actionRedirectHref: actionRedirectTarget?.href ?? null,
+			clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
+			response: fetchResponse
+		});
+		if (actionRedirectCompatibilityHardNavigationTarget) {
 			clearClientNavigationCaches();
-			startTransition(() => {
-				navigateClientSide(redirectLocation.href, historyUpdateMode, true, true);
-			});
+			browserNavigationController.performHardNavigation(actionRedirectCompatibilityHardNavigationTarget, actionRedirectTarget?.type === "push" ? "assign" : "replace");
 			return;
 		}
-		if (resolveRscCompatibilityNavigationDecision({
+		if (!actionRedirectTarget && shouldCheckRscCompatibilityForServerActionResponse(fetchResponse) && resolveRscCompatibilityNavigationDecision({
 			clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
 			currentHref: actionInitiation.href,
 			origin: window.location.origin,
@@ -613,12 +711,44 @@ function registerServerActionCallback() {
 			return;
 		}
 		const revalidation = parseServerActionRevalidationHeader(fetchResponse.headers);
-		const result = await createFromFetch(Promise.resolve(fetchResponse), { temporaryReferences });
+		const invalidResponseError = await readInvalidServerActionResponseError(fetchResponse.clone(), actionRedirectTarget !== null);
+		if (invalidResponseError) throw invalidResponseError;
+		if (actionRedirectTarget && !shouldCheckRscCompatibilityForServerActionResponse(fetchResponse)) {
+			browserNavigationController.performHardNavigation(actionRedirectTarget.href);
+			return;
+		}
+		const flightResponse = fetchResponse.status === 303 ? new Response(fetchResponse.body, {
+			headers: fetchResponse.headers,
+			status: 200,
+			statusText: "OK"
+		}) : fetchResponse;
+		const result = await createFromFetch(Promise.resolve(flightResponse), { temporaryReferences });
 		if (shouldClearClientNavigationCachesForServerActionResult(result, revalidation)) clearClientNavigationCaches();
+		if (actionRedirectTarget) {
+			if (isServerActionResult(result) && result.root !== void 0) {
+				const decoded = AppElementsWire.decode(result.root);
+				const hashIdx = actionRedirectTarget.href.indexOf("#");
+				const actionScrollIntent = beginAppRouterScrollIntent((hashIdx !== -1 ? actionRedirectTarget.href.slice(hashIdx) : "") || null);
+				if (actionRedirectTarget.type === "push") saveScrollPosition();
+				renderNavigationPayload(Promise.resolve(decoded), createClientNavigationRenderSnapshot(actionRedirectTarget.href, actionInitiation.routerState.navigationSnapshot.params), actionRedirectTarget.href, actionInitiation.navigationId, actionRedirectTarget.type === "push" ? "push" : "replace", {}, null, null, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, actionRedirectTarget.type === "push" ? "navigate" : "replace", "server-action", null, actionScrollIntent).catch(() => {
+					browserNavigationController.performHardNavigation(actionRedirectTarget.href);
+				});
+				throw createServerActionRedirectError(actionRedirectTarget);
+			}
+			browserNavigationController.performHardNavigation(actionRedirectTarget.href);
+			return;
+		}
+		syncServerActionHttpFallbackHead(isServerActionResult(result) && result.root !== void 0 ? null : fetchResponse.status);
 		if (isServerActionResult(result)) {
-			if (result.root !== void 0) return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result.root)), actionInitiation, result.returnValue, revalidation);
+			if (result.root !== void 0) {
+				const returnValue = result.returnValue && !result.returnValue.ok ? {
+					ok: false,
+					data: normalizeServerActionThrownValue(result.returnValue.data, fetchResponse.status)
+				} : result.returnValue;
+				return commitSameUrlNavigatePayload(Promise.resolve(AppElementsWire.decode(result.root)), actionInitiation, returnValue, revalidation);
+			}
 			if (result.returnValue) {
-				if (!result.returnValue.ok) throw result.returnValue.data;
+				if (!result.returnValue.ok) throw normalizeServerActionThrownValue(result.returnValue.data, fetchResponse.status);
 				return result.returnValue.data;
 			}
 			return;
@@ -663,7 +793,7 @@ function bootstrapHydration(rscStream) {
 	registerNavigationRuntimeFunctions({
 		clearNavigationCaches: clearClientNavigationCaches,
 		commitHashNavigation: commitHashOnlyNavigation,
-		navigate: async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false, traversalIntent) {
+		navigate: async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false, traversalIntent, scrollIntent) {
 			let pendingRouterState = null;
 			const navId = browserNavigationController.beginNavigation();
 			discardedServerActionRefreshScheduler.markNavigationStart();
@@ -676,6 +806,10 @@ function bootstrapHydration(rscStream) {
 				currentHistoryIndex: currentHistoryTraversalIndex,
 				historyState: window.history.state
 			}) : null;
+			const performHardNavigationForScrollIntent = (targetHref) => {
+				consumeAppRouterScrollIntent(scrollIntent ?? null);
+				return browserNavigationController.performHardNavigation(targetHref);
+			};
 			try {
 				const shouldUsePendingRouterState = programmaticTransition;
 				if (shouldUsePendingRouterState && hasBrowserRouterState()) pendingRouterState = beginPendingBrowserRouterState();
@@ -709,7 +843,7 @@ function bootstrapHydration(rscStream) {
 							responseUrl: cachedRoute.response.url
 						});
 						if (compatibilityDecision.kind === "hard-navigate") {
-							browserNavigationController.performHardNavigation(compatibilityDecision.hardNavigationTarget);
+							performHardNavigationForScrollIntent(compatibilityDecision.hardNavigationTarget);
 							return;
 						}
 						if (!browserNavigationController.isCurrentNavigation(navId)) return;
@@ -717,13 +851,14 @@ function bootstrapHydration(rscStream) {
 						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);
+						await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, detachedNavigationCommits ? null : pendingRouterState, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, toActionType(navigationKind), toOperationLane(navigationKind), activeTraversalIntent, scrollIntent);
 						return;
 					}
 					let navResponse;
 					let navResponseUrl = null;
 					if (navigationKind !== "refresh") {
-						const prefetchedResponse = consumePrefetchResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader);
+						const prefetchedResponse = await consumePrefetchResponseForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, { shouldConsume: () => browserNavigationController.isCurrentNavigation(navId) });
+						if (!browserNavigationController.isCurrentNavigation(navId)) return;
 						if (prefetchedResponse) {
 							navResponse = restoreRscResponse(prefetchedResponse, false);
 							navResponseUrl = prefetchedResponse.url;
@@ -749,7 +884,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).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).catch((error) => {
 									if (browserNavigationController.isCurrentNavigation(navId)) console.error("[vinext] Optimistic RSC navigation error:", error);
 								});
 							}
@@ -762,8 +897,7 @@ 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) {
-						const responseUrl = navResponseUrl ?? navResponse.url;
-						browserNavigationController.performHardNavigation(resolveHardNavigationTargetFromRscResponse(responseUrl, currentHref, window.location.origin));
+						performHardNavigationForScrollIntent(resolveHardNavigationTargetFromRscResponse(navResponseUrl ?? navResponse.url, currentHref, window.location.origin));
 						return;
 					}
 					const compatibilityDecision = resolveRscCompatibilityNavigationDecision({
@@ -774,7 +908,7 @@ function bootstrapHydration(rscStream) {
 						responseUrl: navResponseUrl ?? navResponse.url
 					});
 					if (compatibilityDecision.kind === "hard-navigate") {
-						browserNavigationController.performHardNavigation(compatibilityDecision.hardNavigationTarget);
+						performHardNavigationForScrollIntent(compatibilityDecision.hardNavigationTarget);
 						return;
 					}
 					const redirectDecision = resolveRscRedirectLifecycleHop({
@@ -787,7 +921,7 @@ function bootstrapHydration(rscStream) {
 					});
 					if (redirectDecision.kind === "terminal-hard-navigation") {
 						if (redirectDecision.reason === "maxRedirectsExceeded") console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-						browserNavigationController.performHardNavigation(redirectDecision.href);
+						performHardNavigationForScrollIntent(redirectDecision.href);
 						return;
 					}
 					if (redirectDecision.kind === "follow") {
@@ -802,12 +936,12 @@ function bootstrapHydration(rscStream) {
 						navResponse.body?.cancel().catch(() => {});
 						const resolvedTarget = new URL(flightRedirectTarget, window.location.origin);
 						if (resolvedTarget.origin !== window.location.origin) {
-							browserNavigationController.performHardNavigation(resolvedTarget.href);
+							performHardNavigationForScrollIntent(resolvedTarget.href);
 							return;
 						}
 						if (redirectCount >= 10) {
 							console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-							browserNavigationController.performHardNavigation(resolvedTarget.href);
+							performHardNavigationForScrollIntent(resolvedTarget.href);
 							return;
 						}
 						currentHref = `${resolvedTarget.pathname}${resolvedTarget.search}${resolvedTarget.hash}`;
@@ -827,7 +961,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) !== "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) !== "committed") return;
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const resolvedElements = await rscPayload;
 					const metadata = AppElementsWire.readMetadata(resolvedElements);
@@ -843,7 +977,7 @@ function bootstrapHydration(rscStream) {
 			} catch (error) {
 				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
-				browserNavigationController.performHardNavigation(currentHref);
+				performHardNavigationForScrollIntent(currentHref);
 			} finally {
 				browserNavigationController.finalizeNavigation(navId, pendingRouterState);
 				discardedServerActionRefreshScheduler.markNavigationSettled();
@@ -905,8 +1039,9 @@ if (typeof document !== "undefined") {
 	window.addEventListener("pagehide", () => {
 		isPageUnloading = true;
 	});
-	window.addEventListener("pageshow", () => {
+	window.addEventListener("pageshow", (event) => {
 		isPageUnloading = false;
+		if (event.persisted) mpaNavigationScheduler.reset();
 	});
 	main();
 }