vinext 0.0.55 → 0.1.1

package/dist/shims/navigation.js

@@ -1,5 +1,5 @@
 import { stripBasePath } from "../utils/base-path.js";
-import { VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER } from "../server/headers.js";
+import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
@@ -8,9 +8,11 @@ import { isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, toBrowserN
 import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
 import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
+import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
 import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
-import { createExternalHistoryStatePreservingMetadata } from "../server/app-history-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
+import { createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata } from "../server/app-history-state.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam } from "../server/app-rsc-cache-busting.js";
+import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navigation.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
@@ -25,6 +27,8 @@ import * as React$1 from "react";
 */
 const _LAYOUT_SEGMENT_CTX_KEY = Symbol.for("vinext.layoutSegmentContext");
 const _SERVER_INSERTED_HTML_CTX_KEY = Symbol.for("vinext.serverInsertedHTMLContext");
+const _BFCACHE_ID_MAP_CTX_KEY = Symbol.for("vinext.bfcacheIdMapContext");
+const _BFCACHE_SEGMENT_ID_CTX_KEY = Symbol.for("vinext.bfcacheSegmentIdContext");
 function getServerInsertedHTMLContext() {
 	if (typeof React$1.createContext !== "function") return null;
 	const globalState = globalThis;
@@ -42,6 +46,18 @@ function getLayoutSegmentContext() {
 	if (!globalState[_LAYOUT_SEGMENT_CTX_KEY]) globalState[_LAYOUT_SEGMENT_CTX_KEY] = React$1.createContext({ children: [] });
 	return globalState[_LAYOUT_SEGMENT_CTX_KEY] ?? null;
 }
+function getBfcacheIdMapContext() {
+	if (typeof React$1.createContext !== "function") return null;
+	const globalState = globalThis;
+	if (!globalState[_BFCACHE_ID_MAP_CTX_KEY]) globalState[_BFCACHE_ID_MAP_CTX_KEY] = React$1.createContext(null);
+	return globalState[_BFCACHE_ID_MAP_CTX_KEY] ?? null;
+}
+function getBfcacheSegmentIdContext() {
+	if (typeof React$1.createContext !== "function") return null;
+	const globalState = globalThis;
+	if (!globalState[_BFCACHE_SEGMENT_ID_CTX_KEY]) globalState[_BFCACHE_SEGMENT_ID_CTX_KEY] = React$1.createContext(null);
+	return globalState[_BFCACHE_SEGMENT_ID_CTX_KEY] ?? null;
+}
 /**
 * Read the child segments for a parallel route below the current layout.
 * Returns [] if no context is available (RSC environment, outside React tree)
@@ -58,6 +74,7 @@ function useChildSegments(parallelRoutesKey = "children") {
 }
 const _READONLY_SEARCH_PARAMS = Symbol("vinext.navigation.readonlySearchParams");
 const _READONLY_SEARCH_PARAMS_SOURCE = Symbol("vinext.navigation.readonlySearchParamsSource");
+const _READONLY_SEARCH_PARAMS_SOURCE_KEY = Symbol("vinext.navigation.readonlySearchParamsSourceKey");
 const GLOBAL_ACCESSORS_KEY = Symbol.for("vinext.navigation.globalAccessors");
 const _GLOBAL_ACCESSORS_KEY = GLOBAL_ACCESSORS_KEY;
 const _GLOBAL_HYDRATION_CONTEXT_KEY = Symbol.for("vinext.navigation.clientHydrationContext");
@@ -71,6 +88,9 @@ function _getClientHydrationContext() {
 function _setClientHydrationContext(ctx) {
 	globalThis[_GLOBAL_HYDRATION_CONTEXT_KEY] = ctx;
 }
+function clearClientHydrationContext() {
+	if (typeof window !== "undefined") _setClientHydrationContext(null);
+}
 let _serverContext = null;
 let _serverInsertedHTMLCallbacks = [];
 let _getServerContext = () => {
@@ -111,6 +131,7 @@ function _registerStateAccessors(accessors) {
 	_clearInsertedHTMLCallbacks = accessors.clearInsertedHTMLCallbacks;
 }
 const PAGES_NAVIGATION_ACCESSOR_KEY = Symbol.for("vinext.navigation.pagesNavigationContextAccessor");
+const PAGES_NAVIGATION_NOTIFY_KEY = Symbol.for("vinext.navigation.pagesNavigationNotify");
 function _getPagesNavigationContext() {
 	const accessor = globalThis[PAGES_NAVIGATION_ACCESSOR_KEY];
 	if (!accessor) return null;
@@ -200,6 +221,91 @@ function getPrefetchedUrls() {
 	if (!window.__VINEXT_RSC_PREFETCHED_URLS__) window.__VINEXT_RSC_PREFETCHED_URLS__ = /* @__PURE__ */ new Set();
 	return window.__VINEXT_RSC_PREFETCHED_URLS__;
 }
+function isDynamicStaleTimeSeconds(value) {
+	return typeof value === "number" && Number.isFinite(value) && Number.isInteger(value) && value >= 0;
+}
+function isCacheExpiresAt(value) {
+	return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function parseDynamicStaleTimeSeconds(value) {
+	if (value === null || value === "") return void 0;
+	const seconds = Number(value);
+	return isDynamicStaleTimeSeconds(seconds) ? seconds : void 0;
+}
+function resolveCachedRscResponseTtlMs(cached, fallbackTtlMs) {
+	const seconds = cached.dynamicStaleTimeSeconds;
+	if (!isDynamicStaleTimeSeconds(seconds)) return fallbackTtlMs;
+	return seconds * 1e3;
+}
+function resolveCachedRscResponseExpiresAt(timestamp, cached, fallbackTtlMs) {
+	if (isCacheExpiresAt(cached.expiresAt)) return cached.expiresAt;
+	return timestamp + resolveCachedRscResponseTtlMs(cached, fallbackTtlMs);
+}
+function resolvePrefetchCacheEntryExpiresAt(entry) {
+	if (entry.expiresAt !== void 0) return entry.expiresAt;
+	if (entry.snapshot) return resolveCachedRscResponseExpiresAt(entry.timestamp, entry.snapshot, PREFETCH_CACHE_TTL);
+	return entry.timestamp + PREFETCH_CACHE_TTL;
+}
+function resolvePrefetchCacheEntryMountedSlotsHeader(entry) {
+	if (entry.mountedSlotsHeader !== void 0) return entry.mountedSlotsHeader;
+	return entry.snapshot?.mountedSlotsHeader ?? null;
+}
+function normalizeRscCacheLookupUrl(rscUrl) {
+	try {
+		const url = new URL(rscUrl, "http://vinext.local");
+		stripRscCacheBustingSearchParam(url);
+		return `${url.pathname}${url.search}`;
+	} catch {
+		return null;
+	}
+}
+function parsePrefetchCacheKey(cacheKey) {
+	const separatorIndex = cacheKey.indexOf("\0");
+	if (separatorIndex === -1) return {
+		interceptionContext: null,
+		rscUrl: cacheKey
+	};
+	return {
+		interceptionContext: cacheKey.slice(separatorIndex + 1),
+		rscUrl: cacheKey.slice(0, separatorIndex)
+	};
+}
+function isPrefetchCacheEntryCompatibleWithMountedSlots(entry, mountedSlotsHeader) {
+	if (resolvePrefetchCacheEntryMountedSlotsHeader(entry) === mountedSlotsHeader) return true;
+	return (entry.snapshot?.mountedSlotsHeader ?? null) === mountedSlotsHeader;
+}
+function findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader) {
+	const exactCacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
+	const cache = getPrefetchCache();
+	const exactEntry = cache.get(exactCacheKey);
+	if (exactEntry && exactEntry.cacheForNavigation !== false && isPrefetchCacheEntryCompatibleWithMountedSlots(exactEntry, mountedSlotsHeader)) return {
+		cacheKey: exactCacheKey,
+		entry: exactEntry
+	};
+	const normalizedTarget = normalizeRscCacheLookupUrl(rscUrl);
+	if (normalizedTarget === null) return null;
+	for (const [cacheKey, entry] of cache) {
+		if (cacheKey === exactCacheKey) continue;
+		if (entry.cacheForNavigation === false) continue;
+		const source = parsePrefetchCacheKey(cacheKey);
+		if (source.interceptionContext !== interceptionContext) continue;
+		if (normalizeRscCacheLookupUrl(source.rscUrl) !== normalizedTarget) continue;
+		if (!isPrefetchCacheEntryCompatibleWithMountedSlots(entry, mountedSlotsHeader)) continue;
+		return {
+			cacheKey,
+			entry
+		};
+	}
+	return null;
+}
+function hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext = null, mountedSlotsHeader = null) {
+	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader);
+	if (match === null) return false;
+	if (match.entry.pending !== void 0) return true;
+	if (resolvePrefetchCacheEntryExpiresAt(match.entry) > Date.now()) return true;
+	deletePrefetchCacheEntry(getPrefetchCache(), getPrefetchedUrls(), match.cacheKey, match.entry, true);
+	return false;
+}
 /**
 * Evict prefetch cache entries if at capacity.
 * First sweeps expired entries, then falls back to FIFO eviction.
@@ -209,7 +315,7 @@ function evictPrefetchCacheIfNeeded() {
 	if (cache.size < 50) return;
 	const now = Date.now();
 	const prefetched = getPrefetchedUrls();
-	for (const [key, entry] of cache) if (now - entry.timestamp >= PREFETCH_CACHE_TTL) deletePrefetchCacheEntry(cache, prefetched, key, entry, true);
+	for (const [key, entry] of cache) if (resolvePrefetchCacheEntryExpiresAt(entry) <= now) deletePrefetchCacheEntry(cache, prefetched, key, entry, true);
 	while (cache.size >= 50) {
 		const oldest = cache.keys().next().value;
 		if (oldest !== void 0) {
@@ -258,8 +364,7 @@ function invalidatePrefetchCacheEntry(cacheKey) {
 function schedulePrefetchInvalidation(cacheKey, entry) {
 	if (entry.onInvalidateCallbacks === void 0 || entry.onInvalidateCallbacks.size === 0) return;
 	clearPrefetchInvalidation(entry);
-	const elapsed = Date.now() - entry.timestamp;
-	const delay = Math.max(0, PREFETCH_CACHE_TTL - elapsed);
+	const delay = Math.max(0, resolvePrefetchCacheEntryExpiresAt(entry) - Date.now());
 	entry.invalidationTimer = setTimeout(() => {
 		invalidatePrefetchCacheEntry(cacheKey);
 	}, delay);
@@ -303,12 +408,15 @@ function storePrefetchResponse(rscUrl, response, interceptionContext = null, opt
 	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	evictPrefetchCacheIfNeeded();
 	const entry = {
+		mountedSlotsHeader: null,
 		outcome: "pending",
 		timestamp: Date.now()
 	};
 	addPrefetchInvalidationCallback(entry, options?.onInvalidate);
 	entry.pending = snapshotRscResponse(response).then((snapshot) => {
+		entry.mountedSlotsHeader = snapshot.mountedSlotsHeader ?? null;
 		entry.snapshot = snapshot;
+		entry.expiresAt = resolveCachedRscResponseExpiresAt(entry.timestamp, snapshot, PREFETCH_CACHE_TTL);
 	}).catch(() => {
 		deletePrefetchCacheEntry(getPrefetchCache(), getPrefetchedUrls(), cacheKey, entry, false);
 	}).finally(() => {
@@ -321,10 +429,12 @@ function storePrefetchResponse(rscUrl, response, interceptionContext = null, opt
 	getPrefetchCache().set(cacheKey, entry);
 }
 function createCachedRscResponseSnapshot(response, buffer, responseUrl = null) {
+	const dynamicStaleTimeSeconds = parseDynamicStaleTimeSeconds(response.headers.get(VINEXT_DYNAMIC_STALE_TIME_HEADER));
 	return {
 		compatibilityIdHeader: response.headers.get(VINEXT_RSC_COMPATIBILITY_ID_HEADER),
 		buffer,
 		contentType: response.headers.get("content-type") ?? "text/x-component",
+		...dynamicStaleTimeSeconds !== void 0 ? { dynamicStaleTimeSeconds } : {},
 		mountedSlotsHeader: response.headers.get(VINEXT_MOUNTED_SLOTS_HEADER),
 		paramsHeader: response.headers.get(VINEXT_PARAMS_HEADER),
 		url: responseUrl ?? response.url
@@ -356,6 +466,7 @@ function restoreRscResponse(cached, copy = true) {
 	const headers = new Headers({ "content-type": cached.contentType });
 	if (cached.mountedSlotsHeader != null) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, cached.mountedSlotsHeader);
 	if (cached.compatibilityIdHeader != null) headers.set(VINEXT_RSC_COMPATIBILITY_ID_HEADER, cached.compatibilityIdHeader);
+	if (isDynamicStaleTimeSeconds(cached.dynamicStaleTimeSeconds)) headers.set(VINEXT_DYNAMIC_STALE_TIME_HEADER, String(cached.dynamicStaleTimeSeconds));
 	if (cached.paramsHeader != null) headers.set(VINEXT_PARAMS_HEADER, cached.paramsHeader);
 	return new Response(copy ? cached.buffer.slice(0) : cached.buffer, {
 		status: 200,
@@ -376,17 +487,17 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 	const now = Date.now();
 	const entry = {
 		cacheForNavigation: behavior.cacheForNavigation ?? true,
+		mountedSlotsHeader,
 		optimisticRouteShell: behavior.optimisticRouteShell === true,
 		outcome: "pending",
 		timestamp: now
 	};
 	addPrefetchInvalidationCallback(entry, options?.onInvalidate);
 	entry.pending = fetchPromise.then(async (response) => {
-		if (response.ok) entry.snapshot = {
-			...await snapshotRscResponse(response),
-			mountedSlotsHeader
-		};
-		else deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
+		if (response.ok) {
+			entry.snapshot = await snapshotRscResponse(response);
+			entry.expiresAt = resolveCachedRscResponseExpiresAt(entry.timestamp, entry.snapshot, PREFETCH_CACHE_TTL);
+		} else deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
 	}).catch(() => {
 		deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
 	}).finally(() => {
@@ -405,26 +516,32 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 * Returns null if the entry is still in flight or doesn't exist.
 */
 function consumePrefetchResponse(rscUrl, interceptionContext = null, mountedSlotsHeader = null) {
-	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const cache = getPrefetchCache();
-	const entry = cache.get(cacheKey);
-	if (!entry) return null;
+	const exactCacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
+	const exactEntry = cache.get(exactCacheKey);
+	if (exactEntry && exactEntry.cacheForNavigation !== false && !isPrefetchCacheEntryCompatibleWithMountedSlots(exactEntry, mountedSlotsHeader)) deletePrefetchCacheEntry(cache, getPrefetchedUrls(), exactCacheKey, exactEntry, false);
+	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader);
+	if (!match) return null;
+	const { cacheKey, entry } = match;
 	if (entry.pending || entry.outcome !== "cache-seeded") return null;
 	if (entry.cacheForNavigation === false) return null;
 	deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, entry, false);
 	if (entry.snapshot) {
-		if ((entry.snapshot.mountedSlotsHeader ?? null) !== mountedSlotsHeader) return null;
-		if (Date.now() - entry.timestamp >= PREFETCH_CACHE_TTL) return null;
+		if (!isPrefetchCacheEntryCompatibleWithMountedSlots(entry, mountedSlotsHeader)) return null;
+		if (resolvePrefetchCacheEntryExpiresAt(entry) <= Date.now()) return null;
+		if (entry.expiresAt !== void 0 || entry.snapshot.expiresAt !== void 0) return {
+			...entry.snapshot,
+			expiresAt: resolvePrefetchCacheEntryExpiresAt(entry)
+		};
 		return entry.snapshot;
 	}
 	return null;
 }
 async function consumePrefetchResponseForNavigation(rscUrl, interceptionContext = null, mountedSlotsHeader = null, options) {
-	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const cache = getPrefetchCache();
-	const entry = cache.get(cacheKey);
-	if (!entry) return null;
-	if (entry.cacheForNavigation === false) return null;
+	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader);
+	if (!match) return null;
+	const { cacheKey, entry } = match;
 	if (entry.pending !== void 0) {
 		await entry.pending.catch(() => {});
 		if (cache.get(cacheKey) !== entry) return null;
@@ -471,7 +588,25 @@ function notifyNavigationListeners() {
 	if (!state) return;
 	for (const fn of state.listeners) fn();
 }
+if (!isServer) globalThis[PAGES_NAVIGATION_NOTIFY_KEY] = notifyNavigationListeners;
 let _cachedEmptyServerSearchParams = null;
+const _readonlyPagesSearchParamsCache = /* @__PURE__ */ new WeakMap();
+let _cachedReadonlyPagesSearchParamsKey = null;
+let _cachedReadonlyPagesSearchParams = null;
+function getReadonlyPagesSearchParams(searchParams) {
+	const cached = _readonlyPagesSearchParamsCache.get(searchParams);
+	if (cached) return cached;
+	const key = searchParams.toString();
+	if (_cachedReadonlyPagesSearchParamsKey === key && _cachedReadonlyPagesSearchParams) {
+		_readonlyPagesSearchParamsCache.set(searchParams, _cachedReadonlyPagesSearchParams);
+		return _cachedReadonlyPagesSearchParams;
+	}
+	const readonly = new ReadonlyURLSearchParams(searchParams);
+	_readonlyPagesSearchParamsCache.set(searchParams, readonly);
+	_cachedReadonlyPagesSearchParamsKey = key;
+	_cachedReadonlyPagesSearchParams = readonly;
+	return readonly;
+}
 /**
 * Get cached pathname snapshot for useSyncExternalStore.
 * Note: Returns cached value from ClientNavigationState, not live window.location.
@@ -481,6 +616,8 @@ let _cachedEmptyServerSearchParams = null;
 * be visible until the next commit.
 */
 function getPathnameSnapshot() {
+	const pagesCtx = _getPagesNavigationContext();
+	if (pagesCtx) return pagesCtx.pathname;
 	return getClientNavigationState()?.cachedPathname ?? "/";
 }
 let _cachedEmptyClientSearchParams = null;
@@ -493,6 +630,9 @@ let _cachedEmptyClientSearchParams = null;
 * be visible until the next commit.
 */
 function getSearchParamsSnapshot() {
+	if (_getServerContext()) return getServerSearchParamsSnapshot();
+	const pagesCtx = _getPagesNavigationContext();
+	if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 	const cached = getClientNavigationState()?.cachedReadonlySearchParams;
 	if (cached) return cached;
 	if (_cachedEmptyClientSearchParams === null) _cachedEmptyClientSearchParams = new ReadonlyURLSearchParams();
@@ -519,7 +659,7 @@ function getServerSearchParamsSnapshot() {
 	const ctx = _getServerContext();
 	if (!ctx) {
 		const pagesCtx = _getPagesNavigationContext();
-		if (pagesCtx) return new ReadonlyURLSearchParams(pagesCtx.searchParams);
+		if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 		if (_cachedEmptyServerSearchParams === null) _cachedEmptyServerSearchParams = new ReadonlyURLSearchParams();
 		return _cachedEmptyServerSearchParams;
 	}
@@ -527,9 +667,15 @@ function getServerSearchParamsSnapshot() {
 	const cached = ctx[_READONLY_SEARCH_PARAMS];
 	const cachedSource = ctx[_READONLY_SEARCH_PARAMS_SOURCE];
 	if (cached && cachedSource === source) return cached;
+	const sourceKey = source.toString();
+	if (cached && ctx[_READONLY_SEARCH_PARAMS_SOURCE_KEY] === sourceKey) {
+		ctx[_READONLY_SEARCH_PARAMS_SOURCE] = source;
+		return cached;
+	}
 	const readonly = new ReadonlyURLSearchParams(source);
 	ctx[_READONLY_SEARCH_PARAMS] = readonly;
 	ctx[_READONLY_SEARCH_PARAMS_SOURCE] = source;
+	ctx[_READONLY_SEARCH_PARAMS_SOURCE_KEY] = sourceKey;
 	return readonly;
 }
 /**
@@ -630,15 +776,18 @@ function clearPendingPathname(navId) {
 }
 function getClientParamsSnapshot() {
 	const state = getClientNavigationState();
+	const ctx = _getServerContext();
+	if (ctx) return ctx.params;
 	const pagesCtx = _getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.params;
-	if (state && Object.keys(state.clientParams).length > 0) return state.clientParams;
 	return state?.clientParams ?? _EMPTY_PARAMS;
 }
 function getServerParamsSnapshot() {
 	const ctx = _getServerContext();
 	if (ctx) return ctx.params;
-	return _getPagesNavigationContext()?.params ?? _EMPTY_PARAMS;
+	const pagesCtx = _getPagesNavigationContext();
+	if (pagesCtx) return pagesCtx.params;
+	return _EMPTY_PARAMS;
 }
 function subscribeToNavigation(cb) {
 	const state = getClientNavigationState();
@@ -656,10 +805,16 @@ function usePathname() {
 	if (isServer) {
 		const ctx = _getServerContext();
 		if (ctx) return ctx.pathname;
-		return _getPagesNavigationContext()?.pathname ?? "/";
+		const pagesCtx = _getPagesNavigationContext();
+		return pagesCtx ? pagesCtx.pathname : "/";
 	}
 	const renderSnapshot = useClientNavigationRenderSnapshot();
-	const pathname = React$1.useSyncExternalStore(subscribeToNavigation, getPathnameSnapshot, () => _getServerContext()?.pathname ?? _getPagesNavigationContext()?.pathname ?? "/");
+	const pathname = React$1.useSyncExternalStore(subscribeToNavigation, getPathnameSnapshot, () => {
+		const ctx = _getServerContext();
+		if (ctx) return ctx.pathname;
+		const pagesCtx = _getPagesNavigationContext();
+		return pagesCtx ? pagesCtx.pathname : "/";
+	});
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.pathname;
 	return pathname;
 }
@@ -721,11 +876,13 @@ function commitClientNavigationState(navId, options) {
 	if (!state) return;
 	if ((navId !== void 0 || options?.releaseSnapshot === true) && state.navigationSnapshotActiveCount > 0) state.navigationSnapshotActiveCount -= 1;
 	const urlChanged = syncCommittedUrlStateFromLocation();
+	let paramsChanged = false;
 	if (state.pendingClientParams !== null && state.pendingClientParamsJson !== null) {
 		state.clientParams = state.pendingClientParams;
 		state.clientParamsJson = state.pendingClientParamsJson;
 		state.pendingClientParams = null;
 		state.pendingClientParamsJson = null;
+		paramsChanged = true;
 	}
 	if (state.pendingPathnameNavId === null || navId !== void 0 && state.pendingPathnameNavId === navId) {
 		state.pendingPathname = null;
@@ -733,10 +890,8 @@ function commitClientNavigationState(navId, options) {
 	}
 	const shouldNotify = urlChanged || state.hasPendingNavigationUpdate;
 	state.hasPendingNavigationUpdate = false;
-	if (shouldNotify) {
-		notifyNavigationListeners();
-		getNavigationRuntime()?.functions.pingVisibleLinks?.();
-	}
+	if (urlChanged || paramsChanged) clearClientHydrationContext();
+	if (shouldNotify) notifyNavigationListeners();
 }
 function pushHistoryStateWithoutNotify(data, unused, url) {
 	withSuppressedUrlNotifications(() => {
@@ -768,8 +923,9 @@ function commitHashOnlyHistoryState(href, mode, scroll) {
 		commitAppRouterHashNavigation(href, mode, scroll);
 		return;
 	}
-	if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", href);
-	else pushHistoryStateWithoutNotify(null, "", href);
+	const historyState = createHashOnlyHistoryStatePreservingNavigationMetadata(window.history.state);
+	if (mode === "replace") replaceHistoryStateWithoutNotify(historyState, "", href);
+	else pushHistoryStateWithoutNotify(historyState, "", href);
 }
 function applyAppRouterScrollFallback(intent) {
 	if (typeof document === "undefined" || typeof window === "undefined") return;
@@ -808,6 +964,7 @@ function restoreScrollPosition(state) {
 * Navigate to a URL, handling external URLs, hash-only changes, and RSC navigation.
 */
 async function navigateClientSide(href, mode, scroll, programmaticTransition = false) {
+	getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 	let normalizedHref = href;
 	if (isExternalUrl(href)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
@@ -835,6 +992,17 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 		if (scroll) scrollToHashTarget(hash);
 		return;
 	}
+	if (hasPendingAppRouterPageRedirect(typeof document === "undefined" ? void 0 : document)) {
+		const mpaNavigate = getNavigationRuntime()?.functions.navigateExternal;
+		if (mpaNavigate) {
+			await mpaNavigate(fullHref, mode);
+			return;
+		}
+		if (mode === "replace") window.location.replace(fullHref);
+		else window.location.assign(fullHref);
+		await new Promise(() => {});
+		return;
+	}
 	const hashIdx = fullHref.indexOf("#");
 	const hash = hashIdx !== -1 ? fullHref.slice(hashIdx) : "";
 	const scrollIntent = scroll ? beginAppRouterScrollIntent(hash || null) : null;
@@ -873,13 +1041,15 @@ function releaseScheduledAppRouterNavigationAfterCurrentTask(release) {
 	queueMicrotask(release);
 }
 /**
-* Public App Router instance, exposed for the browser entry so it can wire
-* `window.next.router` to the same singleton returned from `useRouter()`.
+* App Router public router instance. Mirrors Next.js's
+* `publicAppRouterInstance` from
+* `packages/next/src/client/components/app-router-instance.ts`.
 *
-* Mirrors `publicAppRouterInstance` from Next.js's
-* `packages/next/src/client/components/app-router-instance.ts` (line 392).
+* Exported so the App Router browser entry can install it on
+* `window.next.router` for Next.js parity (see `client/window-next.ts`).
+* Internal callers in this file continue to use `_appRouter` for brevity.
 */
-const appRouterInstance = {
+const _appRouter = {
 	bfcacheId: "0",
 	push(href, options) {
 		assertSafeNavigationUrl(href);
@@ -967,19 +1137,47 @@ const appRouterInstance = {
 		});
 	}
 };
+function formatPublicBfcacheId(value) {
+	if (!value || value === "0") return PUBLIC_INITIAL_BFCACHE_ID;
+	return value;
+}
+function readBfcacheIdFromContext() {
+	const segmentContext = getBfcacheSegmentIdContext();
+	const idMapContext = getBfcacheIdMapContext();
+	if (!segmentContext || !idMapContext || typeof React$1.useContext !== "function") return formatPublicBfcacheId(null);
+	try {
+		const segmentId = React$1.useContext(segmentContext);
+		const idMap = React$1.useContext(idMapContext);
+		return formatPublicBfcacheId(segmentId !== null ? idMap?.[segmentId] : null);
+	} catch (error) {
+		if (process.env.NODE_ENV !== "production") console.warn("[vinext] readBfcacheIdFromContext failed:", error);
+		return formatPublicBfcacheId(null);
+	}
+}
+/**
+* Public App Router instance, exposed for the browser entry so it can wire
+* `window.next.router` to the same singleton returned from `useRouter()`.
+*
+* Mirrors `publicAppRouterInstance` from Next.js's
+* `packages/next/src/client/components/app-router-instance.ts` (line 392).
+*/
+const appRouterInstance = _appRouter;
 /**
 * App Router's useRouter — returns push/replace/back/forward/refresh.
 * Different from Pages Router's useRouter (next/router).
 *
-* Returns a stable singleton: the same object reference on every call,
-* matching Next.js behavior so components using referential equality
-* (e.g. useMemo / useEffect deps, React.memo) don't re-render unnecessarily.
+* Preserves the mounted AppRouterContext router as the authority for methods
+* and layers the nearest segment's contextual `bfcacheId` on top.
 */
 function useRouter() {
-	if (!AppRouterContext || typeof React$1.useContext !== "function") throw new Error("invariant expected app router to be mounted");
+	if (!AppRouterContext || typeof React$1.useContext !== "function" || typeof React$1.useMemo !== "function") throw new Error("invariant expected app router to be mounted");
 	const router = React$1.useContext(AppRouterContext);
 	if (router === null) throw new Error("invariant expected app router to be mounted");
-	return router;
+	const bfcacheId = readBfcacheIdFromContext();
+	return React$1.useMemo(() => ({
+		...router,
+		bfcacheId
+	}), [router, bfcacheId]);
 }
 /**
 * Returns the active child segment one level below the layout where it's called.
@@ -1361,6 +1559,9 @@ if (!isServer) {
 	const state = getClientNavigationState();
 	if (state && !state.patchInstalled) {
 		state.patchInstalled = true;
+		window.addEventListener("popstate", () => {
+			getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
+		});
 		window.addEventListener("popstate", (event) => {
 			if (!hasAppNavigationRuntime()) {
 				commitClientNavigationState();
@@ -1369,15 +1570,19 @@ if (!isServer) {
 		});
 		window.history.pushState = function patchedPushState(data, unused, url) {
 			state.originalPushState.call(window.history, createExternalHistoryStatePreservingMetadata(data, window.history.state), unused, url);
-			if (state.suppressUrlNotifyCount === 0) commitClientNavigationState();
+			if (state.suppressUrlNotifyCount === 0) {
+				getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
+				commitClientNavigationState();
+			}
 		};
 		window.history.replaceState = function patchedReplaceState(data, unused, url) {
 			state.originalReplaceState.call(window.history, createExternalHistoryStatePreservingMetadata(data, window.history.state), unused, url);
-			if (state.suppressUrlNotifyCount === 0) commitClientNavigationState();
+			if (state.suppressUrlNotifyCount === 0) {
+				getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
+				commitClientNavigationState();
+			}
 		};
 	}
 }
 //#endregion
-export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
-
-//# sourceMappingURL=navigation.js.map
+export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.react-server.d.ts

@@ -11,5 +11,4 @@ declare function useSelectedLayoutSegments(): never;
 declare function useServerInsertedHTML(): never;
 declare function unstable_isUnrecognizedActionError(): boolean;
 //#endregion
-export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, type NavigationContext, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
-//# sourceMappingURL=navigation.react-server.d.ts.map
+export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, type NavigationContext, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.react-server.js

@@ -28,5 +28,3 @@ function unstable_isUnrecognizedActionError() {
 }
 //#endregion
 export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
-
-//# sourceMappingURL=navigation.react-server.js.map

package/dist/shims/offline.d.ts

@@ -1,5 +1,4 @@
 //#region src/shims/offline.d.ts
 declare function useOffline(): boolean;
 //#endregion
-export { useOffline };
-//# sourceMappingURL=offline.d.ts.map
+export { useOffline };

package/dist/shims/offline.js

@@ -13,5 +13,3 @@ function useOffline() {
 }
 //#endregion
 export { useOffline };
-
-//# sourceMappingURL=offline.js.map

package/dist/shims/og.d.ts

@@ -14,5 +14,4 @@ declare class ImageResponse extends Response {
   constructor(element: ReactElement, options?: ImageResponseOptions$1);
 }
 //#endregion
-export { ImageResponse, type ImageResponseOptions };
-//# sourceMappingURL=og.d.ts.map
+export { ImageResponse, type ImageResponseOptions };

package/dist/shims/og.js

@@ -1,4 +1,3 @@
-import { ImageResponse as ImageResponse$1 } from "@vercel/og";
 //#region src/shims/og.tsx
 const CACHE_HEADERS = {
 	noCache: "no-cache, no-store",
@@ -15,7 +14,8 @@ var ImageResponse = class extends Response {
 	static displayName = "ImageResponse";
 	constructor(element, options) {
 		const readable = new ReadableStream({ async start(controller) {
-			const imageResponse = new ImageResponse$1(element, options);
+			const { ImageResponse: VercelImageResponse } = await import("@vercel/og");
+			const imageResponse = new VercelImageResponse(element, options);
 			if (!imageResponse.body) {
 				controller.close();
 				return;
@@ -46,5 +46,3 @@ var ImageResponse = class extends Response {
 };
 //#endregion
 export { ImageResponse };
-
-//# sourceMappingURL=og.js.map

package/dist/shims/pages-router-runtime.d.ts

@@ -1,7 +1,12 @@
 //#region src/shims/pages-router-runtime.d.ts
 type PagesRouterPopStateHandler = (event: PopStateEvent) => void;
 declare function setPagesRouterPopStateHandler(handler: PagesRouterPopStateHandler): void;
+/**
+ * Register the function that stamps Next.js-shaped state onto the initial
+ * document entry (called once at install time). Router.ts registers this so
+ * the runtime module stays free of router internals.
+ */
+declare function setStampInitialHistoryState(fn: () => void): void;
 declare function installPagesRouterRuntime(): void;
 //#endregion
-export { installPagesRouterRuntime, setPagesRouterPopStateHandler };
-//# sourceMappingURL=pages-router-runtime.d.ts.map
+export { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState };