vinext 1.3.1 → 1.4.1

package/dist/server/app-elements-wire.js

@@ -3,7 +3,6 @@ import { compareStrings } from "../utils/compare.js";
 import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
 import { createAppElementsWireSlotId, isAppElementsWireSlotId, parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
 import { createArtifactCompatibilityEnvelope, parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
-import { releaseAppElementRenderDependency } from "./app-render-dependency.js";
 import { isValidElement } from "react";
 //#region src/server/app-elements-wire.ts
 const APP_INTERCEPTION_SEPARATOR = "\0";
@@ -14,7 +13,6 @@ const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
 const APP_INTERCEPTION_KEY = "__interception";
 const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
 const APP_LAYOUT_IDS_KEY = "__layoutIds";
-const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
 const APP_ROUTE_KEY = "__route";
 const APP_ROOT_LAYOUT_KEY = "__rootLayout";
 const APP_SKIPPED_LAYOUT_IDS_KEY = "__skippedLayoutIds";
@@ -33,7 +31,6 @@ const APP_BFCACHE_SEGMENT_IDENTITIES_KEY = "__bfcacheSegmentIdentities";
 const APP_STATIC_SIBLINGS_KEY = "__staticSiblings";
 const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
 const UNMATCHED_SLOT = Symbol.for("vinext.unmatchedSlot");
-const EMPTY_SKIPPED_LAYOUT_IDS = /* @__PURE__ */ new Set();
 function createCacheProofRejectionCodeSet(codes) {
 	return new Set(codes);
 }
@@ -147,15 +144,6 @@ function normalizeAppElements(elements) {
 	for (const [key, value] of Object.entries(elements)) normalized[key] = isAppElementsWireSlotId(key) && value === "__VINEXT_UNMATCHED_SLOT__" ? UNMATCHED_SLOT : value;
 	return normalized;
 }
-function isLayoutFlagsRecord(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	for (const v of Object.values(value)) if (v !== "s" && v !== "d") return false;
-	return true;
-}
-function parseLayoutFlags(value) {
-	if (isLayoutFlagsRecord(value)) return value;
-	return {};
-}
 function parseLayoutIdList(value, fieldName) {
 	if (value === void 0) return [];
 	if (!Array.isArray(value)) throw new Error(`[vinext] Invalid ${fieldName} in App Router payload: expected layout id string[]`);
@@ -242,7 +230,7 @@ function parseInterceptionMetadata(value) {
 * Used to distinguish the App Router payload object from bare React elements at
 * the render boundary. Narrows to `Readonly<Record<string, unknown>>` because
 * the outgoing payload carries heterogeneous values (ReactNodes for the rendered
-* tree, plus metadata like `__layoutFlags` which is a plain object). Delegates
+* tree, plus metadata like `__artifactCompatibility`, a plain object). Delegates
 * to React's canonical `isValidElement` so we don't depend on React's internal
 * `$$typeof` marker scheme.
 */
@@ -252,36 +240,15 @@ function isAppElementsRecord(value) {
 	if (isValidElement(value)) return false;
 	return true;
 }
-function withLayoutFlags(elements, layoutFlags) {
-	return {
-		...elements,
-		[APP_LAYOUT_FLAGS_KEY]: layoutFlags
-	};
-}
 function buildOutgoingAppPayload(input) {
 	if (!isAppElementsRecord(input.element)) return input.element;
-	const skippedLayoutIds = createSkippedLayoutIds(input.skipDisposition);
 	const payload = {};
-	for (const [key, value] of Object.entries(input.element)) {
-		if (skippedLayoutIds.has(key)) {
-			releaseAppElementRenderDependency(input.element, key);
-			continue;
-		}
-		payload[key] = value === UNMATCHED_SLOT ? APP_UNMATCHED_SLOT_WIRE_VALUE : value;
-	}
-	payload[APP_LAYOUT_FLAGS_KEY] = input.layoutFlags;
-	if (skippedLayoutIds.size > 0) payload[APP_SKIPPED_LAYOUT_IDS_KEY] = [...skippedLayoutIds];
+	for (const [key, value] of Object.entries(input.element)) payload[key] = value === UNMATCHED_SLOT ? APP_UNMATCHED_SLOT_WIRE_VALUE : value;
 	payload[APP_ARTIFACT_COMPATIBILITY_KEY] = input.artifactCompatibility ?? createArtifactCompatibilityEnvelope();
 	if (input.cacheEntryReuseProof) payload[APP_CACHE_ENTRY_REUSE_PROOF_KEY] = input.cacheEntryReuseProof;
 	if (input.dynamicStaleTimeSeconds !== void 0) payload[APP_DYNAMIC_STALE_TIME_KEY] = input.dynamicStaleTimeSeconds;
 	return payload;
 }
-function createSkippedLayoutIds(skipDisposition) {
-	if (skipDisposition?.enabled !== true) return EMPTY_SKIPPED_LAYOUT_IDS;
-	const skippedLayoutIds = /* @__PURE__ */ new Set();
-	for (const id of skipDisposition.skippedEntryIds) if (parseAppElementsWireElementKey(id)?.kind === "layout") skippedLayoutIds.add(id);
-	return skippedLayoutIds;
-}
 function readArtifactCompatibilityMetadata(value) {
 	if (value === void 0) return createArtifactCompatibilityEnvelope();
 	return parseArtifactCompatibilityEnvelope(value) ?? createArtifactCompatibilityEnvelope();
@@ -351,7 +318,6 @@ function readAppElementsMetadata(elements) {
 	const rootLayoutTreePath = elements[APP_ROOT_LAYOUT_KEY];
 	if (rootLayoutTreePath === void 0) throw new Error("[vinext] Missing __rootLayout key in App Router payload");
 	if (rootLayoutTreePath !== null && typeof rootLayoutTreePath !== "string") throw new Error("[vinext] Invalid __rootLayout in App Router payload: expected string or null");
-	const layoutFlags = parseLayoutFlags(elements[APP_LAYOUT_FLAGS_KEY]);
 	const layoutIds = parseLayoutIds(elements[APP_LAYOUT_IDS_KEY]);
 	const skippedLayoutIds = parseSkippedLayoutIds(elements[APP_SKIPPED_LAYOUT_IDS_KEY]);
 	const slotBindings = parseSlotBindings(elements[APP_SLOT_BINDINGS_KEY], { layoutIds });
@@ -369,7 +335,6 @@ function readAppElementsMetadata(elements) {
 		interception,
 		interceptionContext: interceptionContext ?? null,
 		layoutIds,
-		layoutFlags,
 		routeId,
 		rootLayoutTreePath,
 		bfcacheSegmentIdentities,
@@ -386,7 +351,6 @@ const AppElementsWire = {
 		interception: APP_INTERCEPTION_KEY,
 		interceptionContext: APP_INTERCEPTION_CONTEXT_KEY,
 		layoutIds: APP_LAYOUT_IDS_KEY,
-		layoutFlags: APP_LAYOUT_FLAGS_KEY,
 		rootLayout: APP_ROOT_LAYOUT_KEY,
 		route: APP_ROUTE_KEY,
 		bfcacheSegmentIdentities: APP_BFCACHE_SEGMENT_IDENTITIES_KEY,
@@ -406,8 +370,7 @@ const AppElementsWire = {
 	encodeTemplateId: createAppPayloadTemplateId,
 	isSlotId: isAppElementsWireSlotId,
 	parseElementKey: parseAppElementsWireElementKey,
-	readMetadata: readAppElementsMetadata,
-	withLayoutFlags
+	readMetadata: readAppElementsMetadata
 };
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata };

package/dist/server/app-elements.d.ts

@@ -1,4 +1,4 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsBfcacheSegmentIdentities, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsBfcacheSegmentIdentities, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata } from "./app-elements-wire.js";
 //#region src/server/app-elements.d.ts
 export declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 /** Prefix of the element that streams a route's generateMetadata() tags in the body. */
@@ -7,4 +7,4 @@ export declare function getMountedSlotIds(elements: AppElements): string[];
 export declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 export declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsBfcacheSegmentIdentities, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsBfcacheSegmentIdentities, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata };

package/dist/server/app-elements.js

@@ -1,5 +1,5 @@
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata } from "./app-elements-wire.js";
 //#region src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 /** Prefix of the element that streams a route's generateMetadata() tags in the body. */
@@ -18,4 +18,4 @@ function resolveVisitedResponseInterceptionContext(requestInterceptionContext, p
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_STREAMING_METADATA_BODY_ID_PREFIX, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_STREAMING_METADATA_BODY_ID_PREFIX, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext };

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

@@ -75,11 +75,11 @@ export declare function isExternalHistoryState(state: unknown): boolean;
  */
 export declare function isAppOwnedHistoryState(state: unknown): boolean;
 export declare function createAppOwnedHistoryState(state: unknown): unknown;
-export declare function createHistoryStateWithTreeSnapshotId(state: unknown, treeSnapshotId: number | null): unknown;
+export declare function createHistoryStateWithTreeSnapshotId(state: unknown, treeSnapshotId: string | null): unknown;
 export declare function createHistoryStateWithTreeSnapshotClaim(state: unknown, claimed: boolean): unknown;
 export declare function isHistoryStateTreeSnapshotClaimed(state: unknown): boolean;
 export declare function clearHistoryStateTreeSnapshotId(state: unknown): unknown;
-export declare function readHistoryStateTreeSnapshotId(state: unknown): number | null;
+export declare function readHistoryStateTreeSnapshotId(state: unknown): string | null;
 export declare function readHistoryStateActiveRoutePaths(state: unknown): readonly string[] | null;
 export declare function resolveActiveRoutePaths(slotBindings: readonly {
   activeRouteId?: string | null;

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

@@ -210,7 +210,7 @@ function createAppOwnedHistoryState(state) {
 function createHistoryStateWithTreeSnapshotId(state, treeSnapshotId) {
 	const nextState = cloneHistoryState(state);
 	const previousTreeSnapshotId = readHistoryStateTreeSnapshotId(nextState);
-	if (isNonNegativeSafeInteger(treeSnapshotId)) {
+	if (isTreeSnapshotId(treeSnapshotId)) {
 		nextState[VINEXT_TREE_SNAPSHOT_ID_HISTORY_STATE_KEY] = treeSnapshotId;
 		if (previousTreeSnapshotId !== treeSnapshotId) delete nextState[VINEXT_TREE_SNAPSHOT_CLAIMED_HISTORY_STATE_KEY];
 	} else {
@@ -233,7 +233,10 @@ function clearHistoryStateTreeSnapshotId(state) {
 }
 function readHistoryStateTreeSnapshotId(state) {
 	const value = readHistoryStateRecord(state)?.[VINEXT_TREE_SNAPSHOT_ID_HISTORY_STATE_KEY];
-	return isNonNegativeSafeInteger(value) ? value : null;
+	return isTreeSnapshotId(value) ? value : null;
+}
+function isTreeSnapshotId(value) {
+	return typeof value === "string" && value.length > 0;
 }
 function readHistoryStateActiveRoutePaths(state) {
 	const value = readHistoryStateRecord(state)?.[VINEXT_ACTIVE_ROUTE_PATHS_HISTORY_STATE_KEY];

package/dist/server/app-mounted-layouts.d.ts

@@ -0,0 +1,21 @@
+import { AppElements } from "./app-elements-wire.js";
+import "./app-elements.js";
+//#region src/server/app-mounted-layouts.d.ts
+export declare function hashMountedLayoutIdentity(identity: string): string;
+export declare function parseMountedLayoutsHeader(value: string | null): ReadonlySet<string> | null;
+/**
+ * The header for the outermost layouts a client state holds. Only that prefix
+ * can be left out of a render, as a layout below one that re-renders renders
+ * inside it.
+ */
+export declare function createMountedLayoutsHeader(elements: AppElements, layoutIds: readonly string[]): string | null;
+/**
+ * Whether a client state still holds, unchanged, every layout a payload left
+ * out. A navigation that started from another state, or a payload stored for
+ * another client, can name layouts this one doesn't hold.
+ */
+export declare function holdsSkippedLayouts(current: {
+  elements: AppElements;
+  layoutIds: readonly string[];
+}, next: AppElements): boolean;
+//#endregion

package/dist/server/app-mounted-layouts.js

@@ -0,0 +1,67 @@
+import { fnv1a64 } from "../utils/hash.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
+//#region src/server/app-mounted-layouts.ts
+/**
+* A client navigation names the layouts it already holds, so a render that's
+* never stored can leave them out, as Next.js leaves out the segments above
+* where a navigation diverges from its router state tree.
+*
+* Each entry hashes a layout's segment identity, which binds the layout to its
+* route prefix and that prefix's params, so a layout whose params changed never
+* matches.
+*/
+const MAX_MOUNTED_LAYOUTS = 64;
+const MOUNTED_LAYOUT_HASH = /^[0-9a-f]{16}$/;
+function hashMountedLayoutIdentity(identity) {
+	return fnv1a64(identity);
+}
+function serializeMountedLayouts(identities) {
+	if (identities.length === 0) return null;
+	return identities.slice(0, MAX_MOUNTED_LAYOUTS).map(hashMountedLayoutIdentity).join(",");
+}
+function parseMountedLayoutsHeader(value) {
+	if (!value) return null;
+	const hashes = /* @__PURE__ */ new Set();
+	for (const entry of value.split(",", 65)) {
+		const hash = entry.trim();
+		if (!MOUNTED_LAYOUT_HASH.test(hash)) return null;
+		hashes.add(hash);
+	}
+	if (hashes.size === 0 || hashes.size > MAX_MOUNTED_LAYOUTS) return null;
+	return hashes;
+}
+/**
+* The header for the outermost layouts a client state holds. Only that prefix
+* can be left out of a render, as a layout below one that re-renders renders
+* inside it.
+*/
+function createMountedLayoutsHeader(elements, layoutIds) {
+	const identities = AppElementsWire.readMetadata(elements).bfcacheSegmentIdentities;
+	const held = [];
+	for (const layoutId of layoutIds) {
+		const identity = identities[layoutId];
+		if (identity === void 0 || !Object.hasOwn(elements, layoutId)) break;
+		held.push(identity);
+	}
+	return serializeMountedLayouts(held);
+}
+/**
+* Whether a client state still holds, unchanged, every layout a payload left
+* out. A navigation that started from another state, or a payload stored for
+* another client, can name layouts this one doesn't hold.
+*/
+function holdsSkippedLayouts(current, next) {
+	const nextMetadata = AppElementsWire.readMetadata(next);
+	if (nextMetadata.skippedLayoutIds.length === 0) return true;
+	const currentIdentities = AppElementsWire.readMetadata(current.elements).bfcacheSegmentIdentities;
+	const currentLayoutIds = new Set(current.layoutIds);
+	for (const layoutId of nextMetadata.skippedLayoutIds) {
+		if (!currentLayoutIds.has(layoutId) || !Object.hasOwn(current.elements, layoutId)) return false;
+		const identity = nextMetadata.bfcacheSegmentIdentities[layoutId];
+		if (identity === void 0 || identity !== currentIdentities[layoutId]) return false;
+	}
+	return true;
+}
+//#endregion
+export { createMountedLayoutsHeader, hashMountedLayoutIdentity, holdsSkippedLayouts, parseMountedLayoutsHeader };

package/dist/server/app-optimistic-routing.d.ts

@@ -1,7 +1,7 @@
 import { BrowserRouteManifest, BrowserRouteManifestRoute } from "../routing/browser-route-manifest.js";
-import { OptimisticRouteTrieMatch } from "../routing/optimistic-route-trie.js";
 import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { OptimisticRouteTrieMatch } from "../routing/optimistic-route-trie.js";
 //#region src/server/app-optimistic-routing.d.ts
 type OptimisticRouteMatch = OptimisticRouteTrieMatch<BrowserRouteManifestRoute>;
 export type OptimisticRouteTemplate = {
@@ -90,5 +90,23 @@ export declare function resolveOptimisticNavigationPayload(options: {
   routeManifest: BrowserRouteManifest;
   templates: ReadonlyMap<string, OptimisticRouteTemplate>;
 }): OptimisticNavigationPayload | null;
+export type LearnedOptimisticRouteTemplate = {
+  key: string;
+  template: OptimisticRouteTemplate;
+};
+/**
+ * Optimistic route templates and the prefetch sources they were learned from.
+ * `clear()` retires every template, so none can outlive the prefetch payload
+ * it was derived from, and drops any result a learning started before the
+ * clear resolves to. Sources that are still cached are learned again on the
+ * next optimistic navigation.
+ */
+export declare function createOptimisticRouteTemplateStore(): {
+  templates: ReadonlyMap<string, OptimisticRouteTemplate>;
+  clear(): void;
+  hasSource(sourceKey: string): boolean;
+  learn(sourceKey: string, learnTemplate: () => Promise<LearnedOptimisticRouteTemplate | null>): Promise<void>;
+  pendingLearning(): Promise<void>[];
+};
 //#endregion
 export {};

package/dist/server/app-optimistic-routing.js

@@ -3,10 +3,10 @@ import { stripBasePath } from "../utils/base-path.js";
 import { decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";
 import { buildOptimisticRouteTrie, matchOptimisticRouteTrie } from "../routing/optimistic-route-trie.js";
+import { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId } from "./bfcache-identity.js";
-import { stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
 import { canonicalizeAppPageParams, resolveAppPagePatternStateKey, resolveAppPageSemanticSegmentStateKey } from "./app-page-segment-state.js";
 import { Suspense, createElement, isValidElement } from "react";
 //#region src/server/app-optimistic-routing.ts
@@ -36,8 +36,7 @@ function hrefToRouteParts(href, basePath) {
 		return null;
 	}
 	stripRscCacheBustingSearchParam(url);
-	const withoutRscSuffix = stripRscSuffix(url.pathname);
-	const appPathname = stripBasePath(withoutRscSuffix, basePath);
+	const appPathname = stripBasePath(url.pathname, basePath);
 	const pathname = appPathname === "" ? "/" : appPathname;
 	return {
 		normalized: splitPathnameForRouteMatch(pathname),
@@ -310,5 +309,45 @@ function resolveOptimisticNavigationPayload(options) {
 		urlParts: urlParts.normalized
 	};
 }
+/**
+* Optimistic route templates and the prefetch sources they were learned from.
+* `clear()` retires every template, so none can outlive the prefetch payload
+* it was derived from, and drops any result a learning started before the
+* clear resolves to. Sources that are still cached are learned again on the
+* next optimistic navigation.
+*/
+function createOptimisticRouteTemplateStore() {
+	const templates = /* @__PURE__ */ new Map();
+	const learnedSources = /* @__PURE__ */ new Set();
+	const learning = /* @__PURE__ */ new Map();
+	let generation = 0;
+	return {
+		templates,
+		clear() {
+			generation += 1;
+			templates.clear();
+			learnedSources.clear();
+			learning.clear();
+		},
+		hasSource(sourceKey) {
+			return learnedSources.has(sourceKey) || learning.has(sourceKey);
+		},
+		learn(sourceKey, learnTemplate) {
+			const learnedGeneration = generation;
+			const promise = learnTemplate().then((learned) => {
+				if (learned === null || learnedGeneration !== generation) return;
+				templates.set(learned.key, learned.template);
+				learnedSources.add(sourceKey);
+			}).finally(() => {
+				if (learning.get(sourceKey) === promise) learning.delete(sourceKey);
+			});
+			learning.set(sourceKey, promise);
+			return promise;
+		},
+		pendingLearning() {
+			return [...learning.values()];
+		}
+	};
+}
 //#endregion
-export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload };
+export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, createOptimisticRouteTemplateStore, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload };

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

@@ -2,26 +2,25 @@ import { stripBasePath } from "../utils/base-path.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { isRenderDynamicLatched, isStaticGenerationAccessError } from "../shims/internal/headers-state.js";
+import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import { createArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
+import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
-import { stripRscSuffix } from "./app-rsc-cache-busting.js";
-import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
 import { bufferAppPageBinaryStream, buildAppPageSpecialErrorResponse, resolveAppPageSpecialError } from "./app-page-execution.js";
-import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
-import { createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage } from "./app-page-route-wiring.js";
-import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
 import { createAppPageMetadataSearchParamsObserver } from "./app-page-search-params-observation.js";
-import { hasAppPageDynamicMetadata, prepareAppPageHead, resolveActiveParallelRouteHeadInputs, resolveAppPageHead, slotInterceptKeepsSourceHead } from "./app-page-head.js";
+import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
+import { hasAppPageDynamicMetadata, prepareAppPageHead, resolveActiveParallelRouteHeadInputs, resolveAppPageHead, resolveInterceptLayoutsBesidePage, slotInterceptKeepsSourceHead } from "./app-page-head.js";
 import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { createRouteNotFoundHeadPlanOptions, recoverAppPageRouteHead, resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport } from "./app-page-http-access-fallback-metadata.js";
 import "./app-rsc-route-matching.js";
+import { createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage } from "./app-page-route-wiring.js";
 import { resolveSlotParamOverrides } from "./app-page-element-builder.js";
 import { createAppPageFontData, createAppPageRscErrorTracker, createAppPageSsrErrorHandler, renderAppPageHtmlResponse } from "./app-page-stream.js";
 import { Fragment, Suspense, createElement } from "react";
@@ -258,7 +257,7 @@ async function renderAppPageHttpAccessFallback(options) {
 	if (!boundaryComponent) return null;
 	const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
 	const pathname = new URL(options.requestUrl).pathname;
-	const routePathname = options.routePathname ?? stripRscSuffix(stripBasePath(pathname, options.basePath ?? ""));
+	const routePathname = options.routePathname ?? stripBasePath(pathname, options.basePath ?? "");
 	const headBoundaryModule = options.headBoundaryModule ?? boundaryModule;
 	const headLayoutModules = options.headLayoutModules ?? layoutModules;
 	const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, headLayoutModules);
@@ -301,6 +300,7 @@ async function renderAppPageHttpAccessFallback(options) {
 				head: {
 					layoutModules: intercept?.interceptLayouts ?? [],
 					layoutParams: (intercept?.interceptLayoutSegments ?? []).map((layoutSegments) => resolveAppPageBranchParams(intercept?.interceptBranchSegments ?? layoutSegments, layoutSegments.length, effectiveParams, layoutSegments)),
+					layoutsBesidePage: resolveInterceptLayoutsBesidePage(intercept?.interceptLayoutSegments, intercept?.interceptBranchSegments),
 					pageModule: intercept?.interceptPage ?? null,
 					params: effectiveParams,
 					routeSegments: intercept?.interceptSourcePageSegments ?? segments
@@ -611,6 +611,7 @@ async function renderAppPageErrorBoundary(options) {
 			skipLayoutWrapping: errorBoundary.isGlobalError
 		});
 	};
+	const isErrorStatus = errorBoundary.isGlobalError || !options.isRscRequest;
 	const renderWith = async (BoundaryComponent) => {
 		const response = await renderAppPageBoundaryElementResponse({
 			...options,
@@ -620,9 +621,9 @@ async function renderAppPageErrorBoundary(options) {
 			navigationParams: matchedParams,
 			route: options.route,
 			routePattern: options.route?.pattern,
-			status: errorBoundary.isGlobalError ? 500 : 200
+			status: isErrorStatus ? 500 : 200
 		});
-		if (errorBoundary.isGlobalError) applyCdnResponseHeaders(response.headers, { cacheControl: NEVER_CACHE_CONTROL });
+		if (isErrorStatus) applyCdnResponseHeaders(response.headers, { cacheControl: NEVER_CACHE_CONTROL });
 		return response;
 	};
 	try {
@@ -635,10 +636,5 @@ async function renderAppPageErrorBoundary(options) {
 		throw renderError;
 	}
 }
-const _clientHookPattern = /\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\b.*is not a function/;
-function rewriteClientHookError(error) {
-	const match = error.message.match(_clientHookPattern);
-	if (match) error.message = buildClientHookErrorMessage(`${match[1]}()`);
-}
 //#endregion
 export { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };

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

@@ -1,10 +1,10 @@
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
-import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
+import { isAppPageRouteGroupSegment } from "./app-page-segment-state.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
-import { isAppPageRouteGroupSegment } from "./app-page-segment-state.js";
 //#region src/server/app-page-boundary.ts
 function resolveAppPageHttpAccessBoundaryComponent(options) {
 	return options.getDefaultExport(resolveAppPageHttpAccessBoundaryModule({

package/dist/server/app-page-cache-finalizer.d.ts

@@ -2,6 +2,7 @@ import { RenderObservation } from "./cache-proof.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { AppPageCacheSetter } from "./isr-cache.js";
+import { CdnAppPageDocument } from "../shims/cdn-cache.js";
 import { AppPageRscRenderStatus } from "./app-page-rsc-render-status.js";
 //#region src/server/app-page-cache-finalizer.d.ts
 type AppPageDebugLogger = (event: string, detail: string) => void;
@@ -30,6 +31,8 @@ type FinalizeAppPageCacheabilityEvaluationOptions = {
   /** An RSC render's status, from its document's shell. */
   resolveRscRenderStatus?: () => Promise<AppPageRscRenderStatus>;
   revalidateSeconds: number | null;
+  /** Hands the CDN adapter the page's document to store beside the response. */
+  captureAdmittedDocument?: (document: CdnAppPageDocument | null) => void;
 };
 type FinalizeAppPageHtmlCacheResponseOptions = {
   bypassInterceptionContextCache?: boolean;
@@ -66,15 +69,20 @@ type FinalizeAppPageHtmlCacheResponseOptions = {
 };
 type ScheduleAppPageRscCacheWriteOptions = {
   bypassInterceptionContextCache?: boolean;
+  /** Hands the CDN adapter the page's document to store beside the response. */
+  captureAdmittedDocument?: (document: CdnAppPageDocument | null) => void;
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
   consumeDynamicUsage: () => boolean;
   consumeRenderObservationState?: () => AppPageRenderObservationState;
+  /** Observes the document the render's status resolution rendered, if any. */
+  createHtmlRenderObservation?: BuildAppPageCacheRenderObservation;
   createRscRenderObservation: BuildAppPageCacheRenderObservation;
   dynamicUsedDuringBuild: boolean;
   getPageTags: () => string[];
   getRequestCacheLife?: () => AppPageRequestCacheLife | null;
   isrDebug?: AppPageDebugLogger;
+  isrHtmlKey?: (pathname: string) => string;
   isrRscKey: AppPageRscCacheKeyBuilder;
   isrSet: AppPageCacheSetter;
   interceptionContext?: string | null;
@@ -82,7 +90,10 @@ type ScheduleAppPageRscCacheWriteOptions = {
   mountedSlotsHeader?: string | null;
   omitPendingDynamicCacheState?: boolean;
   renderMode?: AppRscRenderMode;
-  /** The render's status, from its document's shell. Without it the render is a 200. */
+  /**
+   * The render's status, from its document's shell, and the page's document
+   * when it rendered one to store. Without it the render is a 200.
+   */
   resolveRscRenderStatus?: () => Promise<AppPageRscRenderStatus>;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;