vinext 0.1.7 → 0.2.0

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

@@ -1,8 +1,8 @@
 import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
-import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.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");
@@ -17,6 +17,8 @@ function commitOperationRecord(operation, visibleCommitVersion) {
 	return {
 		id: operation.id,
 		lane: operation.lane,
+		...operation.navigationCommitKind !== void 0 ? { navigationCommitKind: operation.navigationCommitKind } : {},
+		...operation.navigationId !== void 0 ? { navigationId: operation.navigationId } : {},
 		startedVisibleCommitVersion: operation.startedVisibleCommitVersion,
 		state: "committed",
 		visibleCommitVersion
@@ -56,9 +58,23 @@ function reduceApprovedVisibleCommitState(state, commit) {
 	const { action } = commit;
 	switch (action.type) {
 		case "traverse":
-		case "navigate": {
-			const preserveElementIds = action.reuseCurrentBfcacheIds ? commit.decision.preserveElementIds : [];
-			const preservePreviousSlotIds = action.reuseCurrentBfcacheIds ? commit.decision.preservePreviousSlotIds : [];
+		case "navigate":
+		case "replace": {
+			const bfcacheCompatiblePreserveElementIds = action.reuseCurrentBfcacheIds && action.operation.lane !== "refresh" ? commit.decision.preserveElementIds.filter((id) => {
+				const previousBfcacheId = state.bfcacheIds[id];
+				return previousBfcacheId !== void 0 && action.bfcacheIds[id] === previousBfcacheId;
+			}) : [];
+			const preservedSlotOwnerElementIdSet = new Set(bfcacheCompatiblePreserveElementIds);
+			const preservePreviousSlotIds = action.reuseCurrentBfcacheIds ? commit.decision.preservePreviousSlotIds.filter((slotId) => {
+				const targetBinding = action.slotBindings.find((binding) => binding.slotId === slotId);
+				return targetBinding?.ownerLayoutId !== null && targetBinding?.ownerLayoutId !== void 0 && preservedSlotOwnerElementIdSet.has(targetBinding.ownerLayoutId);
+			}) : [];
+			const hmrPreservedSlotOwnerLayoutIds = action.operation.lane === "hmr" ? bfcacheCompatiblePreserveElementIds.filter((id) => preservePreviousSlotIds.some((slotId) => {
+				return action.slotBindings.find((binding) => binding.slotId === slotId)?.ownerLayoutId === id;
+			})) : [];
+			const hmrPreserveElementIds = action.operation.lane === "hmr" && state.routeId === action.routeId && Object.hasOwn(state.elements, state.routeId) ? [state.routeId, ...hmrPreservedSlotOwnerLayoutIds] : hmrPreservedSlotOwnerLayoutIds;
+			const hmrUniquePreserveElementIds = hmrPreserveElementIds.length > 1 ? [...new Set(hmrPreserveElementIds)] : hmrPreserveElementIds;
+			const preserveElementIds = action.operation.lane === "hmr" ? hmrUniquePreserveElementIds : bfcacheCompatiblePreserveElementIds;
 			const mergedElements = mergeElements(state.elements, action.elements, {
 				clearAbsentSlots: action.type === "traverse" || !action.reuseCurrentBfcacheIds,
 				preserveAbsentSlots: action.reuseCurrentBfcacheIds && commit.decision.preserveAbsentSlots,
@@ -84,20 +100,6 @@ function reduceApprovedVisibleCommitState(state, commit) {
 				slotBindings: mergeSlotBindings(state.slotBindings, action.slotBindings, action.layoutIds, preservePreviousSlotIds)
 			}, action.operation);
 		}
-		case "replace": return commitVisibleRouterState(state, {
-			bfcacheIds: action.bfcacheIds,
-			elements: action.elements,
-			interception: action.interception,
-			interceptionContext: action.interceptionContext,
-			layoutFlags: action.layoutFlags,
-			layoutIds: action.layoutIds,
-			navigationSnapshot: action.navigationSnapshot,
-			previousNextUrl: action.previousNextUrl,
-			renderId: action.renderId,
-			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId,
-			slotBindings: action.slotBindings
-		}, action.operation);
 		default: {
 			const _exhaustive = action.type;
 			throw new Error("[vinext] Unknown router action: " + String(_exhaustive));
@@ -176,14 +178,28 @@ function addCommitTransactionTrace(decision, pending) {
 		default: throw new Error("[vinext] Unknown commit decision: " + String(decision));
 	}
 }
-function approveHmrVisibleCommit(pending) {
+function approveHmrVisibleCommit(options) {
+	const { currentState, pending } = options;
 	if (pending.action.operation.lane !== "hmr") throw new Error("[vinext] HMR visible commit approval requires an HMR pending operation");
-	const decision = addCommitTransactionTrace(createVisibleCommitDecision(), pending);
-	if (decision.disposition !== "commit") throw new Error("[vinext] HMR visible commit approval did not produce a commit decision");
-	return createApprovedVisibleCommit({
-		decision,
-		pending
-	});
+	const tracedDecision = addCommitTransactionTrace(resolvePendingNavigationCommitDecision({
+		activeNavigationId: pending.action.operation.id,
+		currentState,
+		pending,
+		routeManifest: options.routeManifest,
+		startedNavigationId: pending.action.operation.id,
+		targetHref: options.targetHref
+	}), pending);
+	if (tracedDecision.disposition === "commit") return {
+		approvedCommit: createApprovedVisibleCommit({
+			decision: tracedDecision,
+			pending
+		}),
+		decision: tracedDecision
+	};
+	return {
+		approvedCommit: null,
+		decision: tracedDecision
+	};
 }
 function approvePendingNavigationCommit(options) {
 	const decision = addCommitTransactionTrace(resolvePendingNavigationCommitDecision({
@@ -213,6 +229,8 @@ function approvePendingNavigationCommit(options) {
 async function resolveAndClassifyNavigationCommit(options) {
 	const pending = await createPendingNavigationCommit({
 		currentState: options.currentState,
+		navigationCommitKind: void 0,
+		navigationId: options.startedNavigationId,
 		nextElements: options.nextElements,
 		navigationSnapshot: options.navigationSnapshot,
 		operationLane: options.operationLane,

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

@@ -6,6 +6,7 @@ import { ReactNode } from "react";
 //#region src/server/app-elements-wire.d.ts
 declare const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
 declare const APP_CACHE_ENTRY_REUSE_PROOF_KEY = "__cacheEntryReuseProof";
+declare const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
 declare const APP_INTERCEPTION_KEY = "__interception";
 declare const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
 declare const APP_LAYOUT_IDS_KEY = "__layoutIds";
@@ -70,6 +71,7 @@ type LayoutFlags = Readonly<Record<string, "s" | "d">>;
 type AppElementsMetadata = {
   artifactCompatibility: ArtifactCompatibilityEnvelope;
   cacheEntryReuseProof?: CacheEntryReuseProof;
+  dynamicStaleTimeSeconds?: number;
   interception: AppElementsInterception | null;
   interceptionContext: string | null;
   layoutIds: readonly string[];
@@ -100,6 +102,7 @@ type AppElementsWireElementKey = {
   treePath: string;
 };
 type AppElementsWireMetadataInput = {
+  dynamicStaleTimeSeconds?: number;
   interception?: AppElementsInterception | null;
   interceptionContext: string | null;
   layoutIds?: readonly string[];
@@ -109,6 +112,7 @@ type AppElementsWireMetadataInput = {
   sourcePage?: string | null;
 };
 type AppElementsWireMetadataEntries = Readonly<{
+  [APP_DYNAMIC_STALE_TIME_KEY]?: number;
   [APP_ROUTE_KEY]: string;
   [APP_INTERCEPTION_KEY]?: AppElementsInterception;
   [APP_INTERCEPTION_CONTEXT_KEY]: string | null;
@@ -123,10 +127,11 @@ type AppElementsWireMetadataEntries = Readonly<{
  * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements
  * which only carry render-time values.
  */
-type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | RenderObservation | readonly string[] | readonly AppElementsSlotBinding[]>>;
+type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | RenderObservation | number | readonly string[] | readonly AppElementsSlotBinding[]>>;
 type AppElementsWireKeys = {
   readonly artifactCompatibility: typeof APP_ARTIFACT_COMPATIBILITY_KEY;
   readonly cacheEntryReuseProof: typeof APP_CACHE_ENTRY_REUSE_PROOF_KEY;
+  readonly dynamicStaleTime: typeof APP_DYNAMIC_STALE_TIME_KEY;
   readonly interception: typeof APP_INTERCEPTION_KEY;
   readonly interceptionContext: typeof APP_INTERCEPTION_CONTEXT_KEY;
   readonly layoutIds: typeof APP_LAYOUT_IDS_KEY;
@@ -149,6 +154,7 @@ type AppElementsWireCodec = {
     element: ReactNode | AppElements;
     artifactCompatibility?: ArtifactCompatibilityEnvelope;
     cacheEntryReuseProof?: CacheEntryReuseProof;
+    dynamicStaleTimeSeconds?: number;
     layoutFlags: LayoutFlags;
     renderObservation?: RenderObservation;
     skipDisposition?: ClientReuseManifestSkipDisposition;
@@ -182,6 +188,7 @@ declare function buildOutgoingAppPayload(input: {
   element: ReactNode | AppElements;
   artifactCompatibility?: ArtifactCompatibilityEnvelope;
   cacheEntryReuseProof?: CacheEntryReuseProof;
+  dynamicStaleTimeSeconds?: number;
   layoutFlags: LayoutFlags;
   renderObservation?: RenderObservation;
   skipDisposition?: ClientReuseManifestSkipDisposition;
@@ -189,4 +196,4 @@ declare function buildOutgoingAppPayload(input: {
 declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 declare const AppElementsWire: AppElementsWireCodec;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_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_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };

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

@@ -8,6 +8,7 @@ import { isValidElement } from "react";
 const APP_INTERCEPTION_SEPARATOR = "\0";
 const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
 const APP_CACHE_ENTRY_REUSE_PROOF_KEY = "__cacheEntryReuseProof";
+const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
 const APP_INTERCEPTION_KEY = "__interception";
 const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
 const APP_LAYOUT_IDS_KEY = "__layoutIds";
@@ -177,6 +178,7 @@ function createAppElementsWireMetadataEntries(input) {
 		[APP_INTERCEPTION_CONTEXT_KEY]: input.interceptionContext,
 		[APP_LAYOUT_IDS_KEY]: layoutIds,
 		[APP_ROOT_LAYOUT_KEY]: input.rootLayoutTreePath,
+		...input.dynamicStaleTimeSeconds === void 0 ? {} : { [APP_DYNAMIC_STALE_TIME_KEY]: input.dynamicStaleTimeSeconds },
 		...input.sourcePage === null || input.sourcePage === void 0 ? {} : { [APP_SOURCE_PAGE_KEY]: input.sourcePage }
 	};
 	const entriesWithInterception = input.interception ? {
@@ -319,6 +321,7 @@ function buildOutgoingAppPayload(input) {
 	if (skippedLayoutIds.size > 0) payload[APP_SKIPPED_LAYOUT_IDS_KEY] = [...skippedLayoutIds];
 	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;
 	if (input.renderObservation) payload[APP_RENDER_OBSERVATION_KEY] = input.renderObservation;
 	return payload;
 }
@@ -394,10 +397,13 @@ function readAppElementsMetadata(elements) {
 	const interception = parseInterceptionMetadata(elements[APP_INTERCEPTION_KEY]);
 	const artifactCompatibility = readArtifactCompatibilityMetadata(elements[APP_ARTIFACT_COMPATIBILITY_KEY]);
 	const cacheEntryReuseProof = parseCacheEntryReuseProofMetadata(elements[APP_CACHE_ENTRY_REUSE_PROOF_KEY]);
+	const dynamicStaleTime = elements[APP_DYNAMIC_STALE_TIME_KEY];
+	const dynamicStaleTimeSeconds = typeof dynamicStaleTime === "number" && Number.isFinite(dynamicStaleTime) && dynamicStaleTime >= 0 ? dynamicStaleTime : void 0;
 	const sourcePage = readSourcePageMetadata(elements[APP_SOURCE_PAGE_KEY]);
 	return {
 		artifactCompatibility,
 		...cacheEntryReuseProof ? { cacheEntryReuseProof } : {},
+		...dynamicStaleTimeSeconds === void 0 ? {} : { dynamicStaleTimeSeconds },
 		interception,
 		interceptionContext: interceptionContext ?? null,
 		layoutIds,
@@ -413,6 +419,7 @@ const AppElementsWire = {
 	keys: {
 		artifactCompatibility: APP_ARTIFACT_COMPATIBILITY_KEY,
 		cacheEntryReuseProof: APP_CACHE_ENTRY_REUSE_PROOF_KEY,
+		dynamicStaleTime: APP_DYNAMIC_STALE_TIME_KEY,
 		interception: APP_INTERCEPTION_KEY,
 		interceptionContext: APP_INTERCEPTION_CONTEXT_KEY,
 		layoutIds: APP_LAYOUT_IDS_KEY,
@@ -440,4 +447,4 @@ const AppElementsWire = {
 	withLayoutFlags
 };
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_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_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_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };

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

@@ -1,4 +1,4 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, 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_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_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 
 //#region src/server/app-elements.d.ts
 declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
@@ -6,4 +6,4 @@ declare function getMountedSlotIds(elements: AppElements): string[];
 declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_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_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

package/dist/server/app-elements.js

@@ -1,11 +1,12 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_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_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_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_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 { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 //#region src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 function getMountedSlotIds(elements) {
 	return Object.keys(elements).filter((key) => {
 		const value = elements[key];
-		return AppElementsWire.isSlotId(key) && value !== null && value !== void 0 && value !== UNMATCHED_SLOT;
+		const parsed = AppElementsWire.parseElementKey(key);
+		return parsed?.kind === "slot" && parsed.name !== "children" && value !== null && value !== void 0 && value !== UNMATCHED_SLOT;
 	}).sort();
 }
 function getMountedSlotIdsHeader(elements) {
@@ -15,4 +16,4 @@ function resolveVisitedResponseInterceptionContext(requestInterceptionContext, p
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_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_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

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

@@ -4,6 +4,7 @@ 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";
+import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { ReactNode } from "react";
@@ -27,11 +28,13 @@ type AppFallbackRendererFontProviders = {
   getFontStyles: () => string[];
 };
 type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> = {
+  applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   clearRequestContext: () => void;
   createRscOnErrorHandler: (request: Request, pathname: string, routePath: string) => AppPageBoundaryOnError;
   fontProviders: AppFallbackRendererFontProviders;
   getNavigationContext: () => NavigationContext | null;
-  globalErrorModule?: TModule | null;
+  globalErrorModule?: TModule | null; /** Whether experimental.globalNotFound is enabled for route-miss 404s. */
+  globalNotFoundEnabled?: boolean;
   /**
    * Loader for the user's `app/global-not-found.tsx` module. When provided,
    * route-miss 404s render this module as a standalone document (skipping the
@@ -73,7 +76,7 @@ type AppFallbackRendererCallContext = {
   sourcePageSegments?: readonly string[] | null;
 };
 type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
-  renderErrorBoundary: (route: AppPageBoundaryRoute<TModule> | null, error: unknown, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;
+  renderErrorBoundary: (route: AppPageBoundaryRoute<TModule> | null, error: unknown, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext, errorOrigin?: "rsc" | "ssr") => Promise<Response | null>;
   renderHttpAccessFallback: (route: AppPageBoundaryRoute<TModule> | null, statusCode: number, isRscRequest: boolean, request: Request, opts: {
     boundaryComponent?: AppPageComponent | null;
     boundaryModule?: TModule | null;

package/dist/server/app-fallback-renderer.js

@@ -1,5 +1,6 @@
 import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
+import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
 import { DEFAULT_NOT_FOUND_MODULE } from "./default-not-found-module.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
@@ -7,7 +8,7 @@ const EMPTY_MW_CTX = {
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
+	const { applyFileBasedMetadata, basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
 	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	const effectiveRootNotFoundModule = rootNotFoundModule ?? DEFAULT_NOT_FOUND_MODULE;
@@ -19,10 +20,12 @@ function createAppFallbackRenderer(options) {
 	}
 	return {
 		async renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext, callContext) {
-			if (statusCode === 404 && !!loadGlobalNotFoundModule && !route && !opts?.boundaryComponent) {
+			const useGlobalNotFound = statusCode === 404 && globalNotFoundEnabled && !route && !opts?.boundaryComponent;
+			if (useGlobalNotFound && loadGlobalNotFoundModule) {
 				const globalNotFoundModule = await resolveGlobalNotFoundModule();
 				const globalNotFoundComponent = globalNotFoundModule?.default ?? null;
 				if (globalNotFoundComponent) return renderAppPageHttpAccessFallback({
+					applyFileBasedMetadata,
 					boundaryComponent: globalNotFoundComponent,
 					boundaryModule: globalNotFoundModule ?? null,
 					buildFontLinkHeader: fontProviders.buildFontLinkHeader,
@@ -56,7 +59,9 @@ function createAppFallbackRenderer(options) {
 					statusCode
 				});
 			}
+			const routeMissRootNotFoundModule = useGlobalNotFound ? DEFAULT_GLOBAL_NOT_FOUND_MODULE : effectiveRootNotFoundModule;
 			return renderAppPageHttpAccessFallback({
+				applyFileBasedMetadata,
 				basePath,
 				trailingSlash,
 				boundaryComponent: opts?.boundaryComponent ?? null,
@@ -73,7 +78,7 @@ function createAppFallbackRenderer(options) {
 				globalErrorModule: effectiveGlobalErrorModule,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
 				isRscRequest,
-				layoutModules: opts?.layouts ?? null,
+				layoutModules: useGlobalNotFound ? [] : opts?.layouts ?? null,
 				loadSsrHandler: ssrLoader,
 				makeThenableParams,
 				matchedParams: opts?.matchedParams ?? route?.params ?? {},
@@ -82,12 +87,13 @@ function createAppFallbackRenderer(options) {
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootForbiddenModule,
-				rootLayouts,
-				rootNotFoundModule: effectiveRootNotFoundModule,
+				rootLayouts: useGlobalNotFound ? [] : rootLayouts,
+				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
-				route,
+				route: useGlobalNotFound ? null : route,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
+				skipLayoutWrapping: useGlobalNotFound,
 				sourcePageSegments: callContext?.sourcePageSegments,
 				statusCode
 			});
@@ -95,8 +101,9 @@ function createAppFallbackRenderer(options) {
 		renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, callContext) {
 			return this.renderHttpAccessFallback(route, 404, isRscRequest, request, { matchedParams }, scriptNonce, middlewareContext, callContext);
 		},
-		renderErrorBoundary(route, error, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, callContext) {
+		renderErrorBoundary(route, error, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, callContext, errorOrigin = "rsc") {
 			return renderAppPageErrorBoundary({
+				applyFileBasedMetadata,
 				basePath,
 				trailingSlash,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
@@ -105,6 +112,7 @@ function createAppFallbackRenderer(options) {
 					return buildRscOnErrorHandler(request, pathname, routePath);
 				},
 				error,
+				errorOrigin,
 				getFontLinks: fontProviders.getFontLinks,
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,

package/dist/server/app-hydration-cache-publication.d.ts

@@ -0,0 +1,11 @@
+//#region src/server/app-hydration-cache-publication.d.ts
+type HydrationCachePublication = {
+  commit(): void;
+  complete(): void;
+  fail(): void;
+  invalidate(): void;
+  publish(publishCandidate: () => () => void): void;
+};
+declare function createHydrationCachePublication(): HydrationCachePublication;
+//#endregion
+export { HydrationCachePublication, createHydrationCachePublication };

package/dist/server/app-hydration-cache-publication.js

@@ -0,0 +1,43 @@
+//#region src/server/app-hydration-cache-publication.ts
+function createHydrationCachePublication() {
+	let state = "pending";
+	let pendingPublication = null;
+	let invalidatePublishedCandidate = null;
+	const publishPendingCandidate = () => {
+		if (state !== "committed" && state !== "complete" || pendingPublication === null) return;
+		const publishCandidate = pendingPublication;
+		pendingPublication = null;
+		invalidatePublishedCandidate = publishCandidate();
+	};
+	return {
+		commit() {
+			if (state !== "pending") return;
+			state = "committed";
+			publishPendingCandidate();
+		},
+		complete() {
+			if (state === "committed") state = "complete";
+		},
+		fail() {
+			if (state === "complete" || state === "invalidated") return;
+			state = "invalidated";
+			pendingPublication = null;
+			invalidatePublishedCandidate?.();
+			invalidatePublishedCandidate = null;
+		},
+		invalidate() {
+			if (state === "invalidated") return;
+			state = "invalidated";
+			pendingPublication = null;
+			invalidatePublishedCandidate?.();
+			invalidatePublishedCandidate = null;
+		},
+		publish(publishCandidate) {
+			if (state === "invalidated") return;
+			pendingPublication = publishCandidate;
+			publishPendingCandidate();
+		}
+	};
+}
+//#endregion
+export { createHydrationCachePublication };

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

@@ -12,11 +12,11 @@ type ApplyAppMiddlewareOptions = {
   basePath?: string;
   cleanPathname: string;
   context: AppMiddlewareContext;
+  hadBasePath?: boolean;
   i18nConfig?: NextI18nConfig | null;
   /**
-   * Whether the inbound request was a `_next/data` fetch. Captured from the
-   * raw incoming headers by the caller, because `x-nextjs-data` is in
-   * INTERNAL_HEADERS and is stripped before this function runs.
+   * Whether the inbound request was recognized as a `_next/data` fetch from
+   * trusted URL normalization before internal headers were stripped.
    */
   isDataRequest?: boolean;
   filePath?: string;
@@ -34,6 +34,7 @@ type ApplyAppMiddlewareOptions = {
 type ApplyAppMiddlewareResult = {
   kind: "continue";
   cleanPathname: string;
+  rewritten: boolean;
   search: string | null;
 } | {
   kind: "response";

package/dist/server/app-middleware.js

@@ -1,5 +1,6 @@
-import { FLIGHT_HEADERS, VINEXT_MW_CTX_HEADER } from "./headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "./middleware-request-headers.js";
+import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
+import { FLIGHT_HEADERS } from "./headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { isExternalUrl, proxyExternalRequest } from "../config/config-matchers.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
@@ -100,6 +101,7 @@ async function applyAppMiddleware(options) {
 	const forwarded = applyForwardedMiddlewareContext(options.request, options.context);
 	const middlewareRequest = requestWithoutFlightHeaders(options.request);
 	let cleanPathname = options.cleanPathname;
+	let rewritten = false;
 	let search = null;
 	if (forwarded.rewriteUrl) try {
 		if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, middlewareRequest)) return {
@@ -108,6 +110,7 @@ async function applyAppMiddleware(options) {
 		};
 		const rewriteParsed = new URL(forwarded.rewriteUrl, middlewareRequest.url);
 		cleanPathname = rewriteParsed.pathname;
+		rewritten = true;
 		search = rewriteParsed.search;
 	} catch (e) {
 		console.error("[vinext] Failed to apply forwarded middleware rewrite:", e);
@@ -116,7 +119,7 @@ async function applyAppMiddleware(options) {
 	if (!forwarded.applied) {
 		const result = await executeMiddleware({
 			basePath: options.basePath,
-			hadBasePath: true,
+			hadBasePath: options.hadBasePath ?? true,
 			filePath: options.filePath,
 			i18nConfig: options.i18nConfig,
 			isDataRequest: options.isDataRequest,
@@ -150,6 +153,7 @@ async function applyAppMiddleware(options) {
 			};
 			const rewriteParsed = new URL(result.rewriteUrl, middlewareRequest.url);
 			cleanPathname = rewriteParsed.pathname;
+			rewritten = true;
 			search = rewriteParsed.search;
 		}
 	}
@@ -161,6 +165,7 @@ async function applyAppMiddleware(options) {
 	return {
 		kind: "continue",
 		cleanPathname,
+		rewritten,
 		search
 	};
 }

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

@@ -1,9 +1,9 @@
 import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { matchRoutePattern } from "../routing/route-pattern.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { matchRoutePattern } from "../routing/route-pattern.js";
 import { stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
 import { Suspense, createElement, isValidElement } from "react";
 //#region src/server/app-optimistic-routing.ts
@@ -162,8 +162,15 @@ function elementHasSuspenseFallback(value, depth = 0) {
 	if (!isUnknownRecord(props)) return false;
 	return elementHasSuspenseFallback(Reflect.get(props, "children"), depth + 1);
 }
-function getPageElementIds(elements) {
-	return Object.keys(elements).filter((key) => AppElementsWire.parseElementKey(key)?.kind === "page").sort();
+function getPageElementIds(elements, route) {
+	const pageElementIds = /* @__PURE__ */ new Set();
+	if (route.pageId && Object.hasOwn(elements, route.pageId)) pageElementIds.add(route.pageId);
+	for (const slotId of route.slotIds) {
+		const parsed = AppElementsWire.parseElementKey(slotId);
+		if (parsed?.kind === "slot" && parsed.name === "children" && Object.hasOwn(elements, slotId)) pageElementIds.add(slotId);
+	}
+	for (const key of Object.keys(elements)) if (AppElementsWire.parseElementKey(key)?.kind === "page") pageElementIds.add(key);
+	return Array.from(pageElementIds).sort();
 }
 function OptimisticRouteSegment() {
 	throw OPTIMISTIC_ROUTE_SEGMENT_SUSPENSE_TRIGGER;
@@ -182,7 +189,7 @@ function createOptimisticRouteTemplate(options) {
 	if (!options.allowLoadingShell && !elementHasSuspenseFallback(routeElement)) return null;
 	if (options.allowLoadingShell && options.elements["__prefetchLoadingShell"] !== "LoadingBoundary") return null;
 	if (options.allowLoadingShell && (routeElement === void 0 || routeElement === null)) return null;
-	const pageElementIds = getPageElementIds(options.elements);
+	const pageElementIds = getPageElementIds(options.elements, match.route);
 	if (pageElementIds.length === 0) return null;
 	return {
 		elements: options.elements,

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

@@ -4,6 +4,7 @@ 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";
+import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -27,6 +28,7 @@ type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {
   unauthorized?: TModule | null;
 };
 type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {
+  applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;
   clearRequestContext: () => void;
   createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
@@ -73,6 +75,7 @@ type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppP
 } & AppPageBoundaryRenderCommonOptions<TModule>;
 type RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {
   error: unknown;
+  errorOrigin?: "rsc" | "ssr";
   matchedParams?: AppPageParams | null;
   route?: AppPageBoundaryRoute<TModule> | null;
   sanitizeErrorForClient: (error: Error) => Error;

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

@@ -3,7 +3,7 @@ import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
-import { ErrorBoundary, GlobalErrorBoundary } from "../shims/error-boundary.js";
+import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
@@ -152,6 +152,7 @@ async function renderAppPageHttpAccessFallback(options) {
 	const pathname = new URL(options.requestUrl).pathname;
 	const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);
 	const { metadata, viewport } = await resolveAppPageHead({
+		applyFileBasedMetadata: options.applyFileBasedMetadata,
 		basePath: options.basePath ?? "",
 		layoutModules,
 		layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
@@ -214,7 +215,7 @@ async function renderAppPageErrorBoundary(options) {
 	if (!errorBoundary.component) return null;
 	const rawError = options.error instanceof Error ? options.error : new Error(String(options.error));
 	rewriteClientHookError(rawError);
-	const errorObject = options.sanitizeErrorForClient(rawError);
+	const errorObject = options.errorOrigin === "ssr" ? rawError : options.sanitizeErrorForClient(rawError);
 	const matchedParams = options.matchedParams ?? options.route?.params ?? {};
 	const layoutModules = options.route?.layouts ?? options.rootLayouts;
 	const pathname = new URL(options.requestUrl).pathname;
@@ -224,6 +225,7 @@ async function renderAppPageErrorBoundary(options) {
 	})];
 	if (!errorBoundary.isGlobalError) try {
 		const { metadata, viewport } = await resolveAppPageHead({
+			applyFileBasedMetadata: options.applyFileBasedMetadata,
 			basePath: options.basePath ?? "",
 			fallbackOnFileMetadataError: true,
 			layoutModules,
@@ -247,7 +249,16 @@ async function renderAppPageErrorBoundary(options) {
 		console.error(`[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`, error);
 	}
 	const buildElement = (BoundaryComponent) => {
-		const boundaryElement = createElement(BoundaryComponent, { error: errorObject });
+		const serializedError = {
+			digest: "digest" in errorObject ? String(errorObject.digest) : void 0,
+			message: errorObject.message,
+			name: errorObject.name,
+			stack: process.env.NODE_ENV !== "production" ? errorObject.stack : void 0
+		};
+		const boundaryElement = errorBoundary.isGlobalError && BoundaryComponent !== DEFAULT_GLOBAL_ERROR_COMPONENT ? createElement(SerializedErrorBoundary, {
+			error: serializedError,
+			fallback: BoundaryComponent
+		}) : createElement(BoundaryComponent, { error: errorObject });
 		return wrapRenderedBoundaryElement({
 			element: createElement(Fragment, null, ...headElements, errorBoundary.isGlobalError ? createElement(GlobalErrorBoundary, {
 				fallback: DEFAULT_GLOBAL_ERROR_COMPONENT,

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

@@ -30,6 +30,7 @@ type FinalizeAppPageHtmlCacheResponseOptions = {
   isrRscKey: AppPageRscCacheKeyBuilder;
   isrSet: AppPageCacheSetter;
   interceptionContext?: string | null;
+  omitPendingDynamicCacheState?: boolean;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;
   revalidateSeconds: number | null;