vinext 1.3.1 → 1.4.0

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

@@ -1,9 +1,9 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { withBasePath } from "../shims/url-utils.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
-import { claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
 import { resolveActiveRoutePaths } from "./app-history-state.js";
+import { claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit, createPendingNavigationCommitFromElements } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
@@ -408,7 +408,6 @@ function createAppBrowserNavigationController(deps = {}) {
 				elements: options.restoredState.elements,
 				interception: options.restoredState.interception,
 				interceptionContext: options.restoredState.interceptionContext,
-				layoutFlags: options.restoredState.layoutFlags,
 				layoutIds: options.restoredState.layoutIds,
 				navigationSnapshot: options.restoredState.navigationSnapshot,
 				operation,

package/dist/server/app-browser-rsc-redirect.js

@@ -13,8 +13,7 @@ function toVisibleAppHref(href, origin) {
 	stripRscCacheBustingSearchParam(url);
 	return `${stripRscSuffix(url.pathname)}${url.search}${url.hash}`;
 }
-function toStreamedRedirectVisibleAppHref(href, origin) {
-	const url = new URL(href, origin);
+function toStreamedRedirectVisibleAppHref(url) {
 	return `${url.pathname}${url.search}${url.hash}`;
 }
 function resolveRedirectLifecycleHopFromTarget(options) {
@@ -53,10 +52,11 @@ function resolveRscRedirectLifecycleHop(options) {
 	});
 }
 function resolveStreamedRscRedirectLifecycleHop(options) {
-	const streamedRedirectUrl = new URL(options.streamedRedirectTarget, options.origin);
+	const requestedUrl = new URL(options.currentHref, options.origin);
+	const streamedRedirectUrl = new URL(options.streamedRedirectTarget, requestedUrl);
 	return resolveRedirectLifecycleHopFromTarget({
 		...options,
-		redirectedHref: toStreamedRedirectVisibleAppHref(options.streamedRedirectTarget, options.origin),
+		redirectedHref: toStreamedRedirectVisibleAppHref(streamedRedirectUrl),
 		targetUrl: streamedRedirectUrl
 	});
 }

package/dist/server/app-browser-server-action-client.d.ts

@@ -21,6 +21,8 @@ type ActionRedirectTarget = {
 export type ClientServerActionDeps = {
   basePath: string;
   clearClientNavigationCaches(): void;
+  /** Evict only the cached navigation data that may be dynamic. */
+  clearDynamicClientNavigationCaches(): void;
   clientRscCompatibilityId: string | null;
   commitSameUrlNavigatePayload(elements: Promise<AppElements>, actionInitiation: ClientServerActionInitiation, returnValue: ServerActionResult["returnValue"] | undefined, revalidation: ServerActionRevalidationKind, renderedPathAndSearch: string | null): Promise<unknown>;
   navigationPlanner: typeof navigationPlanner;

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

@@ -1,10 +1,10 @@
 import { hasBasePath } from "../utils/base-path.js";
 import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl } from "./app-rsc-cache-busting.js";
 import { throwOnServerActionNotFound } from "./server-action-not-found.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
 import { parseRenderedPathAndSearchHeader } from "../shims/navigation.js";
 import { resolveServerActionRequestState } from "./app-browser-state.js";
@@ -89,7 +89,8 @@ async function invokeClientServerAction(id, args, actionInitiation, deps) {
 	const actionResultDecision = deps.navigationPlanner.classifyServerActionResult(actionResultFacts);
 	if (applyServerActionResultDecision(actionResultDecision, () => deps.clearClientNavigationCaches(), (url, historyMode) => deps.performHardNavigation(url, historyMode))) return;
 	const revalidation = parseServerActionRevalidationHeader(fetchResponse.headers);
-	if (revalidation !== "none") deps.clearClientNavigationCaches();
+	if (revalidation === "staticAndDynamic") deps.clearClientNavigationCaches();
+	else if (revalidation === "dynamicOnly") deps.clearDynamicClientNavigationCaches();
 	const invalidResponseError = await readInvalidServerActionResponseError(fetchResponse.clone(), actionRedirectTarget !== null);
 	if (invalidResponseError) throw invalidResponseError;
 	if (actionRedirectTarget && !fetchResponseIsRsc) {

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

@@ -1,13 +1,13 @@
 import { BrowserRouteManifest } from "../routing/browser-route-manifest.js";
 import { CacheEntryReuseProof } from "./cache-proof.js";
-import { AppElements, AppElementsInterception, AppElementsSlotBinding, LayoutFlags } from "./app-elements-wire.js";
+import { AppElements, AppElementsInterception, AppElementsSlotBinding } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { NavigationTrace } from "./navigation-trace.js";
 import { OperationLane } from "./operation-token.js";
 import "./navigation-planner.js";
 import { BfcacheIdMap, HistoryTraversalIntent, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
-import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 //#region src/server/app-browser-state.d.ts
 type OperationRecordBase = {
   id: number;
@@ -30,7 +30,6 @@ export type AppRouterState = {
   elements: AppElements;
   interception: AppElementsInterception | null;
   interceptionContext: string | null;
-  layoutFlags: LayoutFlags;
   layoutIds: readonly string[];
   previousNextUrl: string | null;
   renderId: number;
@@ -46,7 +45,6 @@ export type AppRouterAction = {
   elements: AppElements;
   interception: AppElementsInterception | null;
   interceptionContext: string | null;
-  layoutFlags: LayoutFlags;
   layoutIds: readonly string[];
   navigationSnapshot: ClientNavigationRenderSnapshot;
   operation: PendingOperationRecord;

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

@@ -3,17 +3,18 @@ import { VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from
 import { NEXT_ACTION_HEADER, RSC_ACTION_HEADER } from "./headers.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { normalizePath } from "./normalize-path.js";
+import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
-import { bindAppElementsRenderedSearch } from "../shims/slot.js";
-import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
-import { createCacheEntryReuseProof } from "./cache-proof.js";
 import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.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 { holdsSkippedLayouts } from "./app-mounted-layouts.js";
+import { createCacheEntryReuseProof } from "./cache-proof.js";
+import { bindAppElementsRenderedSearch } from "../shims/slot.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };
@@ -239,6 +240,11 @@ function mapNavigationDecisionToPendingDisposition(decision) {
 function mergeSkippedLayoutPreservation(options) {
 	if (options.decision.disposition !== "dispatch") return options.decision;
 	if (options.pending.skippedLayoutIds.length === 0) return options.decision;
+	if (!holdsSkippedLayouts(options.currentState, options.pending.action.elements)) return {
+		disposition: "hard-navigate",
+		preserveElementIds: [],
+		trace: options.decision.trace
+	};
 	const currentLayoutIds = new Set(options.currentState.layoutIds);
 	const targetLayoutIds = new Set(options.pending.action.layoutIds);
 	const preserveElementIds = [...options.decision.preserveElementIds];
@@ -303,7 +309,6 @@ function createPendingNavigationCommitFromElements(options) {
 			interception: metadata.interception,
 			interceptionContext: metadata.interceptionContext,
 			layoutIds: metadata.layoutIds,
-			layoutFlags: metadata.layoutFlags,
 			slotBindings: metadata.slotBindings,
 			navigationSnapshot: options.navigationSnapshot,
 			operation: createOperationRecord({

package/dist/server/app-browser-supplemental-refresh.js

@@ -1,8 +1,9 @@
 import { addBasePathToPathname, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { normalizePath } from "./normalize-path.js";
-import { APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_SLOT_BINDINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
+import { APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_SLOT_BINDINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { isNestedBfcacheSlotSegmentIdFor } from "./bfcache-identity.js";
 //#region src/server/app-browser-supplemental-refresh.ts
 const SUPPLEMENTAL_REFRESH_TIMEOUT_MS = 1e4;
 var SupplementalRefreshError = class extends Error {
@@ -67,6 +68,7 @@ function mergeRefreshedParallelSlot(currentElements, refreshedElements) {
 				[APP_SLOT_BINDINGS_KEY]: normalizeAppElementsSlotBindings(slotBindings, { layoutIds: refreshedMetadata.layoutIds })
 			};
 			for (const binding of retainedBindings) merged[binding.slotId] = currentElements[binding.slotId];
+			copySlotIdentities(merged, refreshedElements, currentElements, retainedBindings.map((binding) => binding.slotId));
 			if (promotedBindings.length === 1) merged[promotedBindings[0].slotId] = refreshedElements[refreshedChildrenBindings[0].slotId];
 			copyRefreshedBranchElements(merged, currentElements, { overwrite: false });
 			return merged;
@@ -79,6 +81,7 @@ function mergeRefreshedParallelSlot(currentElements, refreshedElements) {
 			[APP_SLOT_BINDINGS_KEY]: normalizeAppElementsSlotBindings(slotBindings, { layoutIds: currentMetadata.layoutIds })
 		};
 		for (const binding of refreshedBindings) merged[binding.slotId] = refreshedElements[binding.slotId];
+		copySlotIdentities(merged, currentElements, refreshedElements, refreshedBindings.map((binding) => binding.slotId));
 		copyRefreshedBranchElements(merged, refreshedElements);
 		return merged;
 	}
@@ -93,9 +96,21 @@ function mergeRefreshedParallelSlot(currentElements, refreshedElements) {
 		[interception.slotId]: refreshedSlot,
 		[APP_SLOT_BINDINGS_KEY]: normalizeAppElementsSlotBindings(slotBindings, { layoutIds: currentMetadata.layoutIds })
 	};
+	copySlotIdentities(merged, currentElements, refreshedElements, [interception.slotId]);
 	copyRefreshedBranchElements(merged, refreshedElements);
 	return merged;
 }
+function copySlotIdentities(target, baseElements, slotElements, slotIds) {
+	const isSlotSegment = (id) => slotIds.some((slotId) => id === slotId || isNestedBfcacheSlotSegmentIdFor(id, slotId));
+	const isNestedSegment = (id) => !slotIds.includes(id) && isSlotSegment(id);
+	for (const id of Object.keys(baseElements)) if (isNestedSegment(id)) delete target[id];
+	for (const [id, element] of Object.entries(slotElements)) if (isNestedSegment(id)) target[id] = element;
+	const identities = {};
+	for (const [id, identity] of Object.entries(AppElementsWire.readMetadata(baseElements).bfcacheSegmentIdentities)) if (!isSlotSegment(id)) identities[id] = identity;
+	for (const [id, identity] of Object.entries(AppElementsWire.readMetadata(slotElements).bfcacheSegmentIdentities)) if (isSlotSegment(id)) identities[id] = identity;
+	if (Object.keys(identities).length > 0) target[APP_BFCACHE_SEGMENT_IDENTITIES_KEY] = identities;
+	else delete target[APP_BFCACHE_SEGMENT_IDENTITIES_KEY];
+}
 function copyRefreshedBranchElements(target, refreshedElements, options = {}) {
 	for (const [elementId, element] of Object.entries(refreshedElements)) {
 		const parsed = AppElementsWire.parseElementKey(elementId);

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

@@ -1,9 +1,9 @@
 import { BrowserRouteManifest } from "../routing/browser-route-manifest.js";
 import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { NavigationTrace } from "./navigation-trace.js";
 import { OperationLane } from "./operation-token.js";
-import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { AppNavigationPayloadOrigin, AppRouterAction, AppRouterState, PendingNavigationCommit } from "./app-browser-state.js";
 //#region src/server/app-browser-visible-commit.d.ts
 type VisibleCommitDecision = {

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

@@ -1,10 +1,10 @@
 import { AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { mergeElements } from "../shims/slot.js";
-import { resolveAppPageRouteStateKey } from "./app-page-segment-state.js";
 import { createBfcacheSegmentIdentityMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
+import { mergeElements } from "../shims/slot.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
+import { resolveAppPageRouteStateKey } from "./app-page-segment-state.js";
 //#region src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");
 function hasSameServerTemplateSeedIdentity(id, currentSnapshot, nextSnapshot) {
@@ -105,7 +105,6 @@ function reduceApprovedVisibleCommitState(state, commit) {
 				elements: mergedElements,
 				interception: action.interception,
 				interceptionContext: action.interceptionContext,
-				layoutFlags: mergeLayoutFlags(state.layoutFlags, action.layoutFlags, preserveElementIds),
 				layoutIds: action.layoutIds,
 				navigationSnapshot: action.navigationSnapshot,
 				previousNextUrl: action.previousNextUrl,
@@ -145,15 +144,6 @@ function createVisibleCommitDecision(trace = createNavigationTrace(NavigationTra
 		trace
 	};
 }
-function mergeLayoutFlags(previousFlags, nextFlags, preserveElementIds) {
-	const merged = { ...nextFlags };
-	for (const id of preserveElementIds) {
-		if (Object.hasOwn(merged, id)) continue;
-		const value = previousFlags[id];
-		if (value) merged[id] = value;
-	}
-	return merged;
-}
 function createApprovedVisibleCommit(options) {
 	return {
 		[approvedVisibleCommitBrand]: true,

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

@@ -1,6 +1,5 @@
 import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { CacheEntryReuseProof } from "./cache-proof.js";
-import { ClientReuseManifestSkipDisposition } from "./client-reuse-manifest.js";
 import { BfcacheSegmentIdentity } from "./bfcache-identity.js";
 import { compareStrings } from "../utils/compare.js";
 import { AppElementsWireElementKey } from "./app-elements-wire-key.js";
@@ -12,7 +11,6 @@ export declare const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
 export declare const APP_INTERCEPTION_KEY = "__interception";
 export declare const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
 export declare const APP_LAYOUT_IDS_KEY = "__layoutIds";
-export declare const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
 export declare const APP_ROUTE_KEY = "__route";
 export declare const APP_ROOT_LAYOUT_KEY = "__rootLayout";
 export declare const APP_SKIPPED_LAYOUT_IDS_KEY = "__skippedLayoutIds";
@@ -51,28 +49,10 @@ export declare const compareAppElementsSlotIds: typeof compareStrings;
 export declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
   layoutIds?: readonly string[];
 }): readonly AppElementsSlotBinding[];
-export type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
-type AppWireElementValue = ReactNode | string | null | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
+export type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
+type AppWireElementValue = ReactNode | string | null | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
 export type AppElements = Readonly<Record<string, AppElementValue>>;
 export type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
-/**
- * Per-layout static/dynamic flags. `"s"` = static (skippable on next nav);
- * `"d"` = dynamic (must always render).
- *
- * Lifecycle (partial — later PRs extend this):
- *
- *   1. PROBE   — probeAppPageLayouts (server/app-page-execution.ts) returns
- *                LayoutFlags for every layout in the route at render time.
- *
- *   2. ATTACH  — AppElementsWire.encodeOutgoingPayload writes `__layoutFlags`
- *                into the outgoing App Router payload record.
- *
- *   3. WIRE    — renderToReadableStream serializes the record as RSC row 0.
- *
- *   4. PARSE   — AppElementsWire.readMetadata extracts layoutFlags from the
- *                wire payload on the client side.
- */
-export type LayoutFlags = Readonly<Record<string, "s" | "d">>;
 export type AppElementsBfcacheSegmentIdentities = Readonly<Record<string, BfcacheSegmentIdentity>>;
 type AppElementsMetadata = {
   artifactCompatibility: ArtifactCompatibilityEnvelope;
@@ -81,7 +61,6 @@ type AppElementsMetadata = {
   interception: AppElementsInterception | null;
   interceptionContext: string | null;
   layoutIds: readonly string[];
-  layoutFlags: LayoutFlags;
   routeId: string;
   rootLayoutTreePath: string | null;
   bfcacheSegmentIdentities: AppElementsBfcacheSegmentIdentities;
@@ -113,11 +92,11 @@ type AppElementsWireMetadataEntries = Readonly<{
 }>;
 /**
  * The outgoing wire payload shape. Includes ReactNode values for the
- * rendered tree plus metadata values like LayoutFlags attached under
- * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements
+ * rendered tree plus metadata values attached under known keys (e.g.
+ * __artifactCompatibility). Distinct from AppElements / AppWireElements
  * which only carry render-time values.
  */
-export type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | number | readonly string[] | readonly AppElementsSlotBinding[]>>;
+export type AppOutgoingElements = Readonly<Record<string, ReactNode | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | number | readonly string[] | readonly AppElementsSlotBinding[]>>;
 type AppElementsWireKeys = {
   readonly artifactCompatibility: typeof APP_ARTIFACT_COMPATIBILITY_KEY;
   readonly cacheEntryReuseProof: typeof APP_CACHE_ENTRY_REUSE_PROOF_KEY;
@@ -125,7 +104,6 @@ type AppElementsWireKeys = {
   readonly interception: typeof APP_INTERCEPTION_KEY;
   readonly interceptionContext: typeof APP_INTERCEPTION_CONTEXT_KEY;
   readonly layoutIds: typeof APP_LAYOUT_IDS_KEY;
-  readonly layoutFlags: typeof APP_LAYOUT_FLAGS_KEY;
   readonly rootLayout: typeof APP_ROOT_LAYOUT_KEY;
   readonly route: typeof APP_ROUTE_KEY;
   readonly bfcacheSegmentIdentities: typeof APP_BFCACHE_SEGMENT_IDENTITIES_KEY;
@@ -145,8 +123,6 @@ type AppElementsWireCodec = {
     artifactCompatibility?: ArtifactCompatibilityEnvelope;
     cacheEntryReuseProof?: CacheEntryReuseProof;
     dynamicStaleTimeSeconds?: number;
-    layoutFlags: LayoutFlags;
-    skipDisposition?: ClientReuseManifestSkipDisposition;
   }): ReactNode | AppOutgoingElements;
   encodePageId(routePath: string, interceptionContext: string | null): string;
   encodeRouteId(routePath: string, interceptionContext: string | null): string;
@@ -155,9 +131,6 @@ type AppElementsWireCodec = {
   isSlotId(key: string): boolean;
   parseElementKey(key: string): AppElementsWireElementKey | null;
   readMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
-  withLayoutFlags<T extends Record<string, unknown>>(elements: T, layoutFlags: LayoutFlags): T & {
-    [APP_LAYOUT_FLAGS_KEY]: LayoutFlags;
-  };
 };
 export declare function normalizeAppElements(elements: AppWireElements): AppElements;
 /**
@@ -165,21 +138,16 @@ export declare function normalizeAppElements(elements: AppWireElements): AppElem
  * 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.
  */
 export declare function isAppElementsRecord(value: unknown): value is Readonly<Record<string, unknown>>;
-export declare function withLayoutFlags<T extends Record<string, unknown>>(elements: T, layoutFlags: LayoutFlags): T & {
-  [APP_LAYOUT_FLAGS_KEY]: LayoutFlags;
-};
 export declare function buildOutgoingAppPayload(input: {
   element: ReactNode | AppElements;
   artifactCompatibility?: ArtifactCompatibilityEnvelope;
   cacheEntryReuseProof?: CacheEntryReuseProof;
   dynamicStaleTimeSeconds?: number;
-  layoutFlags: LayoutFlags;
-  skipDisposition?: ClientReuseManifestSkipDisposition;
 }): ReactNode | AppOutgoingElements;
 export declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 export declare const AppElementsWire: AppElementsWireCodec;

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