vinext 0.1.3 → 0.1.5

package/dist/server/app-bfcache-identity.js

@@ -0,0 +1,127 @@
+import { countConsumedPathnameSegments, isInvisibleSegment, normalizePathnameForRouteMatch, splitPathSegments } from "../routing/utils.js";
+import { normalizePath } from "./normalize-path.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
+import "./app-bfcache-id.js";
+import { isBfcacheSegmentId } from "./app-history-state.js";
+//#region src/server/app-bfcache-identity.ts
+let nextBfcacheId = 0;
+function rememberBfcacheId(value) {
+	const match = /^_b_(\d+)_$/.exec(value);
+	if (!match) return;
+	nextBfcacheId = Math.max(nextBfcacheId, Number(match[1]));
+}
+function mintBfcacheId() {
+	nextBfcacheId += 1;
+	return `_b_${nextBfcacheId}_`;
+}
+function getVisibleTreePathSegments(treePath) {
+	return splitPathSegments(treePath).filter((segment) => !isInvisibleSegment(segment));
+}
+function getTreePathIdentityPrefix(pathname, treePath) {
+	const pathnameSegments = splitPathSegments(pathname);
+	const consumedPathnameSegments = countConsumedPathnameSegments(getVisibleTreePathSegments(treePath), pathnameSegments.length);
+	if (consumedPathnameSegments === 0) return "/";
+	return `/${pathnameSegments.slice(0, consumedPathnameSegments).join("/")}`;
+}
+function readAppElementsMetadata(elements) {
+	let metadata;
+	try {
+		metadata = AppElementsWire.readMetadata(elements);
+	} catch {
+		return null;
+	}
+	const slotBindingsBySlotId = /* @__PURE__ */ new Map();
+	for (const binding of metadata.slotBindings) slotBindingsBySlotId.set(binding.slotId, binding);
+	return {
+		metadata,
+		slotBindingsBySlotId
+	};
+}
+function createActiveSlotIdentity(id, parsed) {
+	const activeSlotBinding = parsed?.slotBindingsBySlotId.get(id);
+	if (activeSlotBinding?.activeRouteId != null) return `${id}@${activeSlotBinding.activeRouteId}`;
+	const interception = parsed?.metadata.interception;
+	if (interception?.slotId !== id) return null;
+	return `${id}@${interception.targetRouteId}`;
+}
+/**
+* Derive BFCache identity from AppElements wire keys. Keep wire-key parsing
+* contained here until vinext has a route-manifest authority equivalent to
+* Next.js CacheNode or segment-cache state.
+*/
+function createBfcacheSegmentIdentity(id, options) {
+	const parsed = AppElementsWire.parseElementKey(id);
+	if (!parsed) return null;
+	if (parsed.kind === "page") return `${id}@${options.pathname}`;
+	if (parsed.kind === "slot") {
+		const activeSlotIdentity = createActiveSlotIdentity(id, options.metadata);
+		if (activeSlotIdentity !== null) return activeSlotIdentity;
+		return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
+	}
+	if (parsed.kind === "layout" || parsed.kind === "template") return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
+	return null;
+}
+function collectBfcacheSegmentIds(elements, parsed) {
+	const ids = new Set(Object.keys(elements));
+	const metadata = parsed === void 0 ? readAppElementsMetadata(elements) : parsed;
+	for (const layoutId of metadata?.metadata.layoutIds ?? []) ids.add(layoutId);
+	return Array.from(ids).filter(isBfcacheSegmentId);
+}
+function createInitialBfcacheIdMap(elements) {
+	const ids = {};
+	for (const id of collectBfcacheSegmentIds(elements)) ids[id] = "0";
+	return ids;
+}
+function normalizeBfcachePathname(pathname) {
+	const normalized = normalizePath(normalizePathnameForRouteMatch(pathname));
+	return normalized.length > 1 ? normalized.replace(/\/$/, "") : normalized;
+}
+function createBfcacheSegmentStateKeyMap(options) {
+	const metadata = readAppElementsMetadata(options.elements);
+	const normalizedPathname = normalizeBfcachePathname(options.pathname);
+	const stateKeys = {};
+	for (const id of collectBfcacheSegmentIds(options.elements, metadata)) {
+		const stateKey = createBfcacheSegmentIdentity(id, {
+			metadata,
+			pathname: normalizedPathname
+		});
+		if (stateKey !== null) stateKeys[id] = stateKey;
+	}
+	return stateKeys;
+}
+function createNextBfcacheIdMap(options) {
+	const current = options.reuseCurrent === false ? {} : options.current;
+	for (const value of Object.values(current)) rememberBfcacheId(value);
+	for (const value of Object.values(options.restored ?? {})) rememberBfcacheId(value);
+	const currentMetadata = readAppElementsMetadata(options.currentElements);
+	const nextMetadata = readAppElementsMetadata(options.elements);
+	const currentPathname = normalizeBfcachePathname(options.currentPathname);
+	const nextPathname = normalizeBfcachePathname(options.nextPathname);
+	const ids = {};
+	for (const id of collectBfcacheSegmentIds(options.elements, nextMetadata)) {
+		const currentValue = createBfcacheSegmentIdentity(id, {
+			metadata: currentMetadata,
+			pathname: currentPathname
+		}) === createBfcacheSegmentIdentity(id, {
+			metadata: nextMetadata,
+			pathname: nextPathname
+		}) ? current[id] : void 0;
+		const value = options.restored?.[id] ?? currentValue ?? mintBfcacheId();
+		ids[id] = value;
+		rememberBfcacheId(value);
+	}
+	return ids;
+}
+function preserveBfcacheIdsForMergedElements(options) {
+	const ids = {};
+	for (const id of collectBfcacheSegmentIds(options.elements)) {
+		const value = options.next[id] ?? options.previous[id];
+		if (value === void 0) continue;
+		ids[id] = value;
+		rememberBfcacheId(value);
+	}
+	return ids;
+}
+//#endregion
+export { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };

package/dist/server/app-browser-action-result.js

@@ -33,7 +33,7 @@ function parseServerActionRevalidationHeader(headers) {
 	}
 }
 function createServerActionHttpFallbackError(status) {
-	if (status < 400 || status > 599) return null;
+	if (status !== 401 && status !== 403 && status !== 404) return null;
 	const digest = status === 404 ? "NEXT_HTTP_ERROR_FALLBACK;404" : `NEXT_HTTP_ERROR_FALLBACK;${status}`;
 	const error = /* @__PURE__ */ new Error(status === 404 ? "NEXT_NOT_FOUND" : `NEXT_HTTP_ERROR_FALLBACK;${status}`);
 	return Object.assign(error, { digest });

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

@@ -6,25 +6,28 @@ import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } fr
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
 import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
-import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
-import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
-import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
-import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
-import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
-import { navigationPlanner } from "./navigation-planner.js";
-import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, getBfcacheIdMapContext, getClientNavigationRenderContext, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, isRedirectError, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, useRouter } from "../shims/navigation.js";
+import { getBfcacheIdMapContext, setNavigationContext } from "../shims/navigation-context-state.js";
+import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
+import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
 import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
+import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
+import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
 import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult } from "./app-browser-action-result.js";
 import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
+import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
+import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
+import { navigationPlanner } from "./navigation-planner.js";
+import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, getClientNavigationRenderContext, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
-import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, isCacheRestorableAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
+import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
 import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
 import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition } from "./app-browser-hydration.js";
@@ -839,10 +842,14 @@ function bootstrapHydration(rscStream) {
 		startTransition
 	});
 	markInitialAppRouterBootstrapHydrated();
+	let activeNavigationAbortController = null;
 	registerNavigationRuntimeFunctions({
 		clearNavigationCaches: clearClientNavigationCaches,
 		commitHashNavigation: (href, historyUpdateMode, scroll) => historyController.commitHashOnlyNavigation(href, historyUpdateMode, scroll),
 		navigate: async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false, traversalIntent, scrollIntent, visibleCommitMode = "transition") {
+			activeNavigationAbortController?.abort();
+			const navigationAbortController = new AbortController();
+			activeNavigationAbortController = navigationAbortController;
 			let pendingRouterState = null;
 			const navId = browserNavigationController.beginNavigation();
 			discardedServerActionRefreshScheduler.markNavigationStart();
@@ -1019,7 +1026,8 @@ function bootstrapHydration(rscStream) {
 						}
 						navResponse = await fetch(rscUrl, {
 							headers: requestHeaders,
-							credentials: "include"
+							credentials: "include",
+							signal: navigationAbortController.signal
 						});
 					}
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
@@ -1065,6 +1073,7 @@ function bootstrapHydration(rscStream) {
 						headers: navResponse.headers
 					});
 					const cacheBufferPromise = new Response(cacheBranch).arrayBuffer();
+					cacheBufferPromise.catch(() => {});
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const rscPayload = decodeAppElementsPromise(createFromFetch(Promise.resolve(reactResponse)));
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
@@ -1091,6 +1100,7 @@ function bootstrapHydration(rscStream) {
 				if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
 				performHardNavigationForScrollIntent(navigationPlanner.classifyRscNavigationError({ currentHref }).url);
 			} finally {
+				if (activeNavigationAbortController === navigationAbortController) activeNavigationAbortController = null;
 				browserNavigationController.finalizeNavigation(navId, pendingRouterState);
 				discardedServerActionRefreshScheduler.markNavigationSettled();
 			}

package/dist/server/app-browser-navigation-controller.d.ts

@@ -2,7 +2,7 @@ import { RouteManifest } from "../routing/app-route-graph.js";
 import { AppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
 import { AppElements } from "./app-elements-wire.js";
-import { OperationLane } from "./navigation-planner.js";
+import { OperationLane } from "./operation-token.js";
 import { ServerActionRevalidationKind } from "./app-browser-action-result.js";
 import { ClientNavigationRenderSnapshot, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { AppNavigationPayloadOrigin, AppRouterState } from "./app-browser-state.js";

package/dist/server/app-browser-navigation-controller.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";

package/dist/server/app-browser-state.d.ts

@@ -2,9 +2,10 @@ import { RouteManifest } from "../routing/app-route-graph.js";
 import { CacheEntryReuseProof } from "./cache-proof.js";
 import { AppElements, AppElementsInterception, AppElementsSlotBinding, LayoutFlags } from "./app-elements-wire.js";
 import { NavigationTrace } from "./navigation-trace.js";
-import { OperationLane } from "./navigation-planner.js";
-import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
+import { OperationLane } from "./operation-token.js";
 import { BfcacheIdMap, HistoryTraversalIntent, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 
 //#region src/server/app-browser-state.d.ts
 type OperationRecordBase = {
@@ -70,7 +71,6 @@ type AppNavigationPayloadOrigin = Readonly<{
 } | {
   origin: "visited-cache";
 }>;
-type BfcacheStateKeyMap = Readonly<Record<string, string>>;
 declare const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
 declare const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
 type PendingNavigationCommitDisposition = "dispatch" | "hard-navigate" | "skip";
@@ -91,25 +91,6 @@ type NonDispatchPendingNavigationCommitDispositionDecision = {
   trace: NavigationTrace;
 };
 type PendingNavigationCommitDispositionDecision = DispatchPendingNavigationCommitDispositionDecision | NonDispatchPendingNavigationCommitDispositionDecision;
-declare function createInitialBfcacheIdMap(elements: AppElements): BfcacheIdMap;
-declare function createBfcacheSegmentStateKeyMap(options: {
-  elements: AppElements;
-  pathname: string;
-}): BfcacheStateKeyMap;
-declare function createNextBfcacheIdMap(options: {
-  current: BfcacheIdMap;
-  currentElements: AppElements;
-  currentPathname: string;
-  elements: AppElements;
-  nextPathname: string;
-  restored?: BfcacheIdMap | null;
-  reuseCurrent?: boolean;
-}): BfcacheIdMap;
-declare function preserveBfcacheIdsForMergedElements(options: {
-  elements: AppElements;
-  next: BfcacheIdMap;
-  previous: BfcacheIdMap;
-}): BfcacheIdMap;
 declare function isCacheRestorableAppPayloadMetadata(metadata: CacheRestorableAppPayloadMetadata): metadata is CacheRestorableAppPayloadMetadata & {
   cacheEntryReuseProof: CacheEntryReuseProof;
 };

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

@@ -1,143 +1,20 @@
-import { countConsumedPathnameSegments, isInvisibleSegment, normalizePathnameForRouteMatch, splitPathSegments } from "../routing/utils.js";
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
 import { NEXT_ACTION_HEADER, RSC_ACTION_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
-import "./app-bfcache-id.js";
-import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isBfcacheSegmentId, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
+import { createCacheEntryReuseProof } from "./cache-proof.js";
+import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
+import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
-import { createCacheEntryReuseProof } from "./cache-proof.js";
 //#region src/server/app-browser-state.ts
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };
 const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "visited-cache" };
-let nextBfcacheId = 0;
-function rememberBfcacheId(value) {
-	const match = /^_b_(\d+)_$/.exec(value);
-	if (!match) return;
-	nextBfcacheId = Math.max(nextBfcacheId, Number(match[1]));
-}
-function mintBfcacheId() {
-	nextBfcacheId += 1;
-	return `_b_${nextBfcacheId}_`;
-}
-function getVisibleTreePathSegments(treePath) {
-	return splitPathSegments(treePath).filter((segment) => !isInvisibleSegment(segment));
-}
-function getTreePathIdentityPrefix(pathname, treePath) {
-	const pathnameSegments = splitPathSegments(pathname);
-	const consumedPathnameSegments = countConsumedPathnameSegments(getVisibleTreePathSegments(treePath), pathnameSegments.length);
-	if (consumedPathnameSegments === 0) return "/";
-	return `/${pathnameSegments.slice(0, consumedPathnameSegments).join("/")}`;
-}
-function readAppElementsMetadata(elements) {
-	let metadata;
-	try {
-		metadata = AppElementsWire.readMetadata(elements);
-	} catch {
-		return null;
-	}
-	const slotBindingsBySlotId = /* @__PURE__ */ new Map();
-	for (const binding of metadata.slotBindings) slotBindingsBySlotId.set(binding.slotId, binding);
-	return {
-		metadata,
-		slotBindingsBySlotId
-	};
-}
-function createActiveSlotIdentity(id, parsed) {
-	const activeSlotBinding = parsed?.slotBindingsBySlotId.get(id);
-	if (activeSlotBinding?.activeRouteId != null) return `${id}@${activeSlotBinding.activeRouteId}`;
-	const interception = parsed?.metadata.interception;
-	if (interception?.slotId !== id) return null;
-	return `${id}@${interception.targetRouteId}`;
-}
-/**
-* Legacy bridge for deriving a bfcache segment identity from AppElements wire
-* keys. Keep wire-key parsing contained here until Vinext has a route-manifest
-* semantic authority equivalent to Next.js CacheNode/segment-cache state.
-*/
-function createBfcacheSegmentIdentity(id, options) {
-	const parsed = AppElementsWire.parseElementKey(id);
-	if (!parsed) return null;
-	if (parsed.kind === "page") return `${id}@${options.pathname}`;
-	if (parsed.kind === "slot") {
-		const activeSlotIdentity = createActiveSlotIdentity(id, options.metadata);
-		if (activeSlotIdentity !== null) return activeSlotIdentity;
-		return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
-	}
-	if (parsed.kind === "layout" || parsed.kind === "template") return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
-	return null;
-}
-function collectBfcacheSegmentIds(elements, parsed) {
-	const ids = new Set(Object.keys(elements));
-	const metadata = parsed === void 0 ? readAppElementsMetadata(elements) : parsed;
-	for (const layoutId of metadata?.metadata.layoutIds ?? []) ids.add(layoutId);
-	return Array.from(ids).filter(isBfcacheSegmentId);
-}
-function createInitialBfcacheIdMap(elements) {
-	const ids = {};
-	for (const id of collectBfcacheSegmentIds(elements)) ids[id] = "0";
-	return ids;
-}
-function normalizeBfcachePathname(pathname) {
-	const normalized = normalizePath(normalizePathnameForRouteMatch(pathname));
-	return normalized.length > 1 ? normalized.replace(/\/$/, "") : normalized;
-}
-function createBfcacheSegmentStateKeyMap(options) {
-	const metadata = readAppElementsMetadata(options.elements);
-	const normalizedPathname = normalizeBfcachePathname(options.pathname);
-	const stateKeys = {};
-	for (const id of collectBfcacheSegmentIds(options.elements, metadata)) {
-		const stateKey = createBfcacheSegmentIdentity(id, {
-			metadata,
-			pathname: normalizedPathname
-		});
-		if (stateKey !== null) stateKeys[id] = stateKey;
-	}
-	return stateKeys;
-}
-function createNextBfcacheIdMap(options) {
-	const current = options.reuseCurrent === false ? {} : options.current;
-	for (const value of Object.values(current)) rememberBfcacheId(value);
-	for (const value of Object.values(options.restored ?? {})) rememberBfcacheId(value);
-	const currentMetadata = readAppElementsMetadata(options.currentElements);
-	const nextMetadata = readAppElementsMetadata(options.elements);
-	const currentPathname = normalizeBfcachePathname(options.currentPathname);
-	const nextPathname = normalizeBfcachePathname(options.nextPathname);
-	const ids = {};
-	for (const id of collectBfcacheSegmentIds(options.elements, nextMetadata)) {
-		const currentValue = createBfcacheSegmentIdentity(id, {
-			metadata: currentMetadata,
-			pathname: currentPathname
-		}) === createBfcacheSegmentIdentity(id, {
-			metadata: nextMetadata,
-			pathname: nextPathname
-		}) ? current[id] : void 0;
-		const value = options.restored?.[id] ?? currentValue ?? mintBfcacheId();
-		ids[id] = value;
-		rememberBfcacheId(value);
-	}
-	return ids;
-}
-function preserveBfcacheIdsForMergedElements(options) {
-	const ids = {};
-	for (const id of collectBfcacheSegmentIds(options.elements)) {
-		const nextValue = options.next[id];
-		if (nextValue !== void 0) {
-			ids[id] = nextValue;
-			continue;
-		}
-		const previousValue = options.previous[id];
-		if (previousValue !== void 0) {
-			ids[id] = previousValue;
-			rememberBfcacheId(previousValue);
-		}
-	}
-	return ids;
-}
 function createOperationRecord(options) {
 	return {
 		id: options.id,
@@ -192,7 +69,17 @@ function resolveServerActionRequestState(options) {
 }
 function resolvePendingNavigationCommitDispositionDecision(options) {
 	const traceFields = createPendingNavigationTraceFields(options);
-	if (options.startedNavigationId !== options.activeNavigationId || options.pending.action.operation.startedVisibleCommitVersion !== options.currentState.visibleCommitVersion) return {
+	const targetSnapshot = createPendingRouteSnapshot(options.pending);
+	const verdict = verifyOperationTokenForCommit(createPendingNavigationOperationToken({
+		pending: options.pending,
+		routeManifest: options.routeManifest ?? null,
+		startedNavigationId: options.startedNavigationId,
+		targetSnapshot
+	}), {
+		activeNavigationId: options.activeNavigationId,
+		visibleCommitVersion: options.currentState.visibleCommitVersion
+	});
+	if (!verdict.authorized) return {
 		disposition: "skip",
 		preserveElementIds: [],
 		trace: createNavigationTrace(NavigationTraceReasonCodes.staleOperation, traceFields)
@@ -202,6 +89,8 @@ function resolvePendingNavigationCommitDispositionDecision(options) {
 		pending: options.pending,
 		routeManifest: options.routeManifest ?? null,
 		targetHref: options.targetHref,
+		targetSnapshot,
+		token: verdict.token,
 		traceFields
 	}));
 	return mergeSkippedLayoutPreservation({
@@ -277,6 +166,7 @@ function createPendingNavigationOperationToken(options) {
 		deploymentVersion: null,
 		graphVersion: options.routeManifest?.graphVersion ?? null,
 		lane: options.pending.action.operation.lane,
+		navigationId: options.startedNavigationId,
 		operationId: options.pending.action.operation.id,
 		targetSnapshotFingerprint: createRootBoundarySnapshotFingerprint(options.targetSnapshot)
 	};
@@ -285,17 +175,11 @@ function createRootBoundarySnapshotFingerprint(snapshot) {
 	return `${snapshot.routeId}|root:${snapshot.rootBoundaryId ?? "unknown"}`;
 }
 function planPendingRootBoundaryFlightResponse(options) {
-	const targetSnapshot = createPendingRouteSnapshot(options.pending);
-	const token = createPendingNavigationOperationToken({
-		pending: options.pending,
-		routeManifest: options.routeManifest,
-		targetSnapshot
-	});
 	const cacheEntryReuseProof = options.pending.cacheEntryReuseProof;
 	return navigationPlanner.plan({
 		routeManifest: options.routeManifest,
 		state: {
-			nextOperationToken: token,
+			nextOperationToken: options.token,
 			traceFields: options.traceFields,
 			visibleCommitVersion: options.currentState.visibleCommitVersion,
 			visibleSnapshot: createVisibleRouteSnapshot(options.currentState)
@@ -304,10 +188,10 @@ function planPendingRootBoundaryFlightResponse(options) {
 			kind: "flightResponseArrived",
 			result: {
 				...cacheEntryReuseProof ? { cacheEntryReuseProof } : {},
-				href: options.targetHref ?? targetSnapshot.displayUrl,
-				targetSnapshot
+				href: options.targetHref ?? options.targetSnapshot.displayUrl,
+				targetSnapshot: options.targetSnapshot
 			},
-			token
+			token: options.token
 		}
 	});
 }

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

@@ -1,5 +1,5 @@
-import { ensureNavigationRuntimeRscBootstrap, getNavigationRuntime } from "../client/navigation-runtime.js";
 import { decodeRscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
+import { ensureNavigationRuntimeRscBootstrap, getNavigationRuntime } from "../client/navigation-runtime.js";
 //#region src/server/app-browser-stream.ts
 function getVinextBrowserGlobal() {
 	return globalThis;

package/dist/server/app-browser-visible-commit.d.ts

@@ -1,7 +1,7 @@
 import { RouteManifest } from "../routing/app-route-graph.js";
 import { AppElements } from "./app-elements-wire.js";
 import { NavigationTrace } from "./navigation-trace.js";
-import { OperationLane } from "./navigation-planner.js";
+import { OperationLane } from "./operation-token.js";
 import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { AppNavigationPayloadOrigin, AppRouterAction, AppRouterState, PendingNavigationCommit } from "./app-browser-state.js";
 

package/dist/server/app-browser-visible-commit.js

@@ -1,8 +1,9 @@
 import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { mergeElements } from "../shims/slot.js";
-import { createPendingNavigationCommit, preserveBfcacheIdsForMergedElements, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
+import { preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
+import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 //#region src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");
 function applyApprovedVisibleCommit(state, commit) {

package/dist/server/app-fallback-renderer.d.ts

@@ -1,6 +1,6 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppElements } from "./app-elements-wire.js";
-import { NavigationContext } from "../shims/navigation.js";
+import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";

package/dist/server/app-layout-param-observation.d.ts

@@ -1,5 +1,5 @@
+import { UnstableCacheObservation } from "../shims/cache-request-state.js";
 import { RenderRequestApiKind } from "./cache-proof.js";
-import { UnstableCacheObservation } from "../shims/cache.js";
 import { ClientReuseManifestRejectionCode, ClientReuseManifestTraceFields } from "./client-reuse-manifest.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
 

package/dist/server/app-layout-param-observation.js

@@ -1,6 +1,6 @@
 import { isInsideUnifiedScope, runWithUnifiedStateMutation } from "../shims/unified-request-context.js";
 import { peekDynamicUsage, peekRenderRequestApiUsage } from "../shims/headers.js";
-import { _peekRequestScopedCacheLife, _peekUnstableCacheObservations } from "../shims/cache.js";
+import { _peekRequestScopedCacheLife, _peekUnstableCacheObservations } from "../shims/cache-request-state.js";
 import { getCollectedFetchTags, peekCacheableFetchObservations, peekDynamicFetchObservations } from "../shims/fetch-cache.js";
 import { isPromiseLike } from "../utils/promise.js";
 //#region src/server/app-layout-param-observation.ts

package/dist/server/app-middleware.js

@@ -5,8 +5,9 @@ import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";
 import { applyMiddlewareRequestHeaders, setHeadersContext } from "../shims/headers.js";
-import { setNavigationContext } from "../shims/navigation.js";
+import { setNavigationContext } from "../shims/navigation-context-state.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import "../shims/navigation.js";
 //#region src/server/app-middleware.ts
 const FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);
 function isForwardedMiddlewareContext(value) {

package/dist/server/app-page-boundary-render.d.ts

@@ -1,6 +1,6 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppElements } from "./app-elements-wire.js";
-import { NavigationContext } from "../shims/navigation.js";
+import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";

package/dist/server/app-page-boundary.js

@@ -1,6 +1,6 @@
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 //#region src/server/app-page-boundary.ts