vinext 0.0.55 → 0.1.1

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

@@ -2,13 +2,18 @@ import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVe
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
+import { NO_STORE_CACHE_CONTROL } from "./cache-control.js";
 import { buildAppPageHtmlResponse, buildAppPageRscResponse, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy } from "./app-page-response.js";
 import { buildAppPageFontLinkHeader, readAppPageBinaryStream, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
-import { createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError } from "./app-page-stream.js";
+import { probeAppPageBeforeRender } from "./app-page-probe.js";
+import { DEFAULT_CACHE_VARIANT_BUDGET, buildCacheVariantWithRouteBudget, buildRenderObservation, buildRenderRequestApiObservations, createStaticLayoutArtifactReuseDecision } from "./cache-proof.js";
 import { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse } from "./app-page-cache.js";
+import { createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId } from "./static-layout-client-reuse-proof.js";
+import { buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError } from "./app-page-stream.js";
+import { getStaticLayoutObservationSkipRejection } from "./app-layout-param-observation.js";
 import { hasDigest } from "./app-rsc-errors.js";
-import { probeAppPageBeforeRender } from "./app-page-probe.js";
+import { createClientReuseSkipTransportPlan, crossCheckClientReuseManifestEntryWithCache } from "./skip-cache-proof.js";
 //#region src/server/app-page-render.ts
 function buildResponseTiming(options) {
 	if (options.isProduction) return;
@@ -49,6 +54,146 @@ function createAppPageArtifactCompatibility(element, routePattern) {
 		rootBoundaryId
 	});
 }
+function readStringMetadata(element, key) {
+	const value = element[key];
+	return typeof value === "string" ? value : null;
+}
+function createStaticLayoutOutputScope(input) {
+	const routeId = readStringMetadata(input.element, AppElementsWire.keys.route);
+	if (routeId === null) return null;
+	return {
+		kind: "layout",
+		layoutId: input.layoutId,
+		rootBoundaryId: input.artifactCompatibility.rootBoundaryId,
+		routeId
+	};
+}
+function createRenderAndSendSkipDisposition() {
+	return {
+		code: "SKIP_MODEL_DISABLED",
+		enabled: false,
+		mode: "renderAndSend"
+	};
+}
+function rejectStaticLayoutObservation(entry, code, fields = {}) {
+	return {
+		kind: "rejected",
+		rejection: {
+			code,
+			entryId: entry.id,
+			fields
+		},
+		skipDisposition: createRenderAndSendSkipDisposition()
+	};
+}
+function rejectUnsafeStaticLayoutObservation(entry, layoutParamAccess) {
+	const observation = layoutParamAccess?.getLayoutObservation(entry.id);
+	if (!observation) return rejectStaticLayoutObservation(entry, "SKIP_LAYOUT_PARAMS_OBSERVATION_INCOMPLETE");
+	const observationRejection = getStaticLayoutObservationSkipRejection(observation);
+	if (observationRejection) return rejectStaticLayoutObservation(entry, observationRejection.code, observationRejection.fields);
+	return null;
+}
+function createRenderLifecycleSkipDisposition(input) {
+	if (!input.isRscRequest || input.clientReuseManifest === void 0) return;
+	const clientReuseManifest = input.clientReuseManifest;
+	if (clientReuseManifest.kind !== "parsed" || clientReuseManifest.manifest.entries.length === 0) return;
+	if (!isAppElementsRecord(input.element) || input.artifactCompatibility === void 0) return {
+		code: "SKIP_MODEL_DISABLED",
+		enabled: false,
+		mode: "renderAndSend"
+	};
+	const element = input.element;
+	const artifactCompatibility = input.artifactCompatibility;
+	const staticLayoutIds = new Set(Object.entries(input.layoutFlags).filter(([, flag]) => flag === "s").map(([layoutId]) => layoutId));
+	return createClientReuseSkipTransportPlan({
+		manifest: clientReuseManifest,
+		verifyEntry(entry) {
+			if (entry.kind !== "layout" || !staticLayoutIds.has(entry.id) || AppElementsWire.parseElementKey(entry.id)?.kind !== "layout") return crossCheckClientReuseManifestEntryWithCache({
+				artifact: {
+					compatibility: artifactCompatibility,
+					invalidation: { kind: "unknown" },
+					payloadHash: null
+				},
+				cacheDecision: null,
+				entry
+			});
+			const currentOutput = createStaticLayoutOutputScope({
+				artifactCompatibility,
+				element,
+				layoutId: entry.id
+			});
+			if (currentOutput === null) return crossCheckClientReuseManifestEntryWithCache({
+				artifact: {
+					compatibility: artifactCompatibility,
+					invalidation: { kind: "unknown" },
+					payloadHash: null
+				},
+				cacheDecision: null,
+				entry
+			});
+			const observationRejection = rejectUnsafeStaticLayoutObservation(entry, input.layoutParamAccess);
+			if (observationRejection) return observationRejection;
+			const candidateRouteId = createStaticLayoutClientReuseRouteId(entry.id);
+			const candidateOutput = {
+				...currentOutput,
+				routeId: candidateRouteId
+			};
+			const candidateVariant = buildCacheVariantWithRouteBudget({
+				budget: DEFAULT_CACHE_VARIANT_BUDGET,
+				dimensions: [],
+				output: candidateOutput,
+				routeBudget: {
+					routeId: candidateRouteId,
+					variantCacheKeys: []
+				}
+			});
+			const skipArtifactCompatibility = candidateVariant.kind === "variant" ? createStaticLayoutClientReuseArtifactCompatibility({
+				artifactCompatibility,
+				layoutId: entry.id,
+				rootBoundaryId: candidateOutput.rootBoundaryId,
+				routeId: candidateOutput.routeId,
+				variantCacheKey: candidateVariant.variant.cacheKey
+			}) : artifactCompatibility;
+			const cacheDecision = createStaticLayoutArtifactReuseDecision({
+				candidateArtifactCompatibility: skipArtifactCompatibility,
+				candidateObservation: buildRenderObservation({
+					boundaryOutcome: { kind: "success" },
+					cacheability: "public",
+					cacheTags: [],
+					completeness: "complete",
+					dynamicFetches: [],
+					output: candidateOutput,
+					pathTags: [input.cleanPathname],
+					requestApis: buildRenderRequestApiObservations({
+						completeness: "complete",
+						observed: []
+					})
+				}),
+				candidateVariant,
+				currentArtifactCompatibility: skipArtifactCompatibility,
+				currentOutput
+			});
+			return crossCheckClientReuseManifestEntryWithCache({
+				artifact: {
+					compatibility: skipArtifactCompatibility,
+					invalidation: { kind: "valid" },
+					payloadHash: candidateVariant.kind === "variant" ? createStaticLayoutClientReusePayloadHash({
+						artifactCompatibility: skipArtifactCompatibility,
+						layoutId: entry.id,
+						rootBoundaryId: candidateOutput.rootBoundaryId,
+						routeId: candidateOutput.routeId,
+						variantCacheKey: candidateVariant.variant.cacheKey
+					}) : null
+				},
+				cacheDecision,
+				entry
+			});
+		}
+	}).skipDisposition;
+}
+function isSkipTransportEnabled(skipDisposition) {
+	return skipDisposition?.enabled === true;
+}
 /**
 * Wraps an RSC response body to report invalid dynamic usage errors after the
 * stream is fully consumed. In dev mode, errors from cookies()/headers() inside
@@ -151,18 +296,29 @@ async function renderAppPageLifecycle(options) {
 		params: options.params,
 		state: options.peekRenderObservationState?.() ?? createEmptyAppPageRenderObservationState()
 	});
+	const skipDisposition = options.skipDisposition ?? createRenderLifecycleSkipDisposition({
+		artifactCompatibility,
+		cleanPathname: options.cleanPathname,
+		clientReuseManifest: options.clientReuseManifest,
+		element: options.element,
+		isRscRequest: options.isRscRequest,
+		layoutFlags,
+		layoutParamAccess: options.layoutParamAccess
+	});
+	const shouldBypassRscCacheForSkipTransport = options.isRscRequest && isSkipTransportEnabled(skipDisposition);
 	const outgoingElement = AppElementsWire.encodeOutgoingPayload({
 		element: options.element,
 		layoutFlags,
 		...artifactCompatibility ? { artifactCompatibility } : {},
-		renderObservation: payloadRenderObservation
+		renderObservation: payloadRenderObservation,
+		skipDisposition: options.isRscRequest ? skipDisposition : void 0
 	});
 	const compileEnd = options.isProduction ? void 0 : performance.now();
 	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(options.cleanPathname, options.routePattern));
 	const rscStream = runWithFetchDedupe(() => options.renderToReadableStream(outgoingElement, { onError: rscErrorTracker.onRenderError }));
 	let revalidateSeconds = options.revalidateSeconds;
 	let expireSeconds = options.expireSeconds;
-	const shouldCaptureRscForCacheMetadata = options.isProgressiveActionRender !== true && (options.isProduction || options.isPrerender === true) && (revalidateSeconds === null || revalidateSeconds > 0 && revalidateSeconds !== Infinity) && !options.isDraftMode && !options.isForceDynamic;
+	const shouldCaptureRscForCacheMetadata = options.isProgressiveActionRender !== true && (options.isProduction || options.isPrerender === true) && (revalidateSeconds === null || revalidateSeconds > 0 && revalidateSeconds !== Infinity) && !options.isDraftMode && !options.isForceDynamic && !shouldBypassRscCacheForSkipTransport;
 	const rscCapture = teeAppPageRscStreamForCapture(rscStream, shouldCaptureRscForCacheMetadata);
 	const rscForResponse = rscCapture.ssrStream;
 	const capturedRscDataRef = { value: null };
@@ -177,7 +333,7 @@ async function renderAppPageLifecycle(options) {
 			}));
 		}
 		const dynamicUsedDuringBuild = options.consumeDynamicUsage();
-		const rscResponsePolicy = resolveAppPageRscResponsePolicy({
+		const rscResponsePolicy = shouldBypassRscCacheForSkipTransport ? { cacheControl: NO_STORE_CACHE_CONTROL } : resolveAppPageRscResponsePolicy({
 			dynamicUsedDuringBuild,
 			isDraftMode: options.isDraftMode,
 			isDynamicError: options.isDynamicError,
@@ -187,7 +343,9 @@ async function renderAppPageLifecycle(options) {
 			expireSeconds,
 			revalidateSeconds
 		});
+		if (shouldBypassRscCacheForSkipTransport) options.isrDebug?.("RSC cache write skipped (skip transport payload)", options.cleanPathname);
 		const rscResponse = buildAppPageRscResponse(rscForResponse, {
+			dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic && (dynamicUsedDuringBuild || !shouldCaptureRscForCacheMetadata) ? options.dynamicStaleTimeSeconds : void 0,
 			isEdgeRuntime: options.isEdgeRuntime,
 			middlewareContext: options.middlewareContext,
 			mountedSlotsHeader: options.mountedSlotsHeader,
@@ -250,7 +408,7 @@ async function renderAppPageLifecycle(options) {
 			if (!options.isProduction) renderEnd = performance.now();
 		},
 		renderErrorBoundaryResponse(error) {
-			return options.renderErrorBoundaryResponse(error);
+			return options.renderErrorBoundaryResponse(rscErrorTracker.getCapturedError() ?? error);
 		},
 		async renderHtmlStream() {
 			const ssrHandler = await options.loadSsrHandler();
@@ -260,6 +418,7 @@ async function renderAppPageLifecycle(options) {
 				navigationContext: options.getNavigationContext(),
 				basePath: options.basePath,
 				clientTraceMetadata: options.clientTraceMetadata,
+				reactMaxHeadersLength: options.reactMaxHeadersLength,
 				rootParams: options.rootParams,
 				formState: options.formState ?? null,
 				rscStream: rscForResponse,
@@ -275,8 +434,10 @@ async function renderAppPageLifecycle(options) {
 		resolveSpecialError: resolveAppPageSpecialError
 	});
 	if (htmlRender.response) return htmlRender.response;
-	const htmlStream = htmlRender.htmlStream;
+	let htmlStream = htmlRender.htmlStream;
 	if (!htmlStream) throw new Error("[vinext] Expected an HTML stream when no fallback response was returned");
+	const linkHeader = buildAppPageLinkHeader(htmlRender.linkHeader, fontLinkHeader, options.reactMaxHeadersLength);
+	if (options.isPrerender === true) await htmlRender.metadataReady;
 	if (options.hasLoadingBoundary) {
 		const captured = rscErrorTracker.getCapturedSpecialError();
 		if (captured) {
@@ -295,7 +456,7 @@ async function renderAppPageLifecycle(options) {
 		if (cleanResponse) return cleanResponse;
 	}
 	if (options.isPrerender === true) {
-		await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);
+		await settleCapturedRscRenderForCacheMetadata(htmlRender.capturedRscData);
 		({expireSeconds, revalidateSeconds} = applyRequestCacheLife({
 			expireSeconds,
 			requestCacheLife: readRequestCacheLifeForPrerender(options),
@@ -332,7 +493,7 @@ async function renderAppPageLifecycle(options) {
 	if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {
 		const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {
 			draftCookie,
-			fontLinkHeader,
+			linkHeader,
 			isEdgeRuntime: options.isEdgeRuntime,
 			middlewareContext: options.middlewareContext,
 			policy: htmlResponsePolicy,
@@ -392,7 +553,7 @@ async function renderAppPageLifecycle(options) {
 	}
 	return buildAppPageHtmlResponse(safeHtmlStream, {
 		draftCookie,
-		fontLinkHeader,
+		linkHeader,
 		isEdgeRuntime: options.isEdgeRuntime,
 		middlewareContext: options.middlewareContext,
 		policy: htmlResponsePolicy,
@@ -407,5 +568,3 @@ async function settleCapturedRscRenderForCacheMetadata(capturedRscDataPromise) {
 }
 //#endregion
 export { renderAppPageLifecycle };
-
-//# sourceMappingURL=app-page-render.js.map

package/dist/server/app-page-request.d.ts

@@ -1,10 +1,12 @@
 import { AppPageSpecialError } from "./app-page-execution.js";
+import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 
 //#region src/server/app-page-request.d.ts
 type AppPageParams = Record<string, string | string[]>;
 type GenerateStaticParams = (args: {
   params: AppPageParams;
 }) => unknown;
+type Awaitable<T> = T | Promise<T>;
 type GenerateStaticParamsModule = {
   generateStaticParams?: GenerateStaticParams | null;
 };
@@ -38,6 +40,7 @@ type BuildAppPageElementResult<TElement> = {
 type AppPageInterceptMatch<TPage = unknown> = {
   matchedParams: AppPageParams;
   page: TPage;
+  __pageLoader?: (() => Promise<TPage>) | null;
   slotId?: string | null;
   slotKey: string;
   sourceRouteIndex: number;
@@ -47,7 +50,7 @@ type ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts> = {
   currentRoute: TRoute;
   findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;
   getRouteParamNames: (route: TRoute) => readonly string[];
-  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;
+  getSourceRoute: (sourceRouteIndex: number) => Awaitable<TRoute | undefined>;
   isRscRequest: boolean;
   toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;
 };
@@ -63,7 +66,7 @@ type ResolveAppPageInterceptionRerenderTargetOptions<TRoute, TPage, TInterceptOp
   currentRoute: TRoute;
   findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;
   getRouteParamNames: (route: TRoute) => readonly string[];
-  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;
+  getSourceRoute: (sourceRouteIndex: number) => Awaitable<TRoute | undefined>;
   isRscRequest: boolean;
   toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;
 };
@@ -76,13 +79,14 @@ type ResolveAppPageInterceptionRerenderTargetResult<TRoute, TInterceptOpts> = {
 type ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts> = ResolveAppPageInterceptionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>;
 type ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts> = ResolveAppPageInterceptionRerenderTargetResult<TRoute, TInterceptOpts>;
 type ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement> = {
-  buildPageElement: (route: TRoute, params: AppPageParams, interceptOpts: TInterceptOpts | undefined, searchParams: URLSearchParams) => Promise<TElement>;
+  buildPageElement: (route: TRoute, params: AppPageParams, interceptOpts: TInterceptOpts | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker) => Promise<TElement>;
   cleanPathname: string;
   currentRoute: TRoute;
   findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;
   getRouteParamNames: (route: TRoute) => readonly string[];
-  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;
+  getSourceRoute: (sourceRouteIndex: number) => Awaitable<TRoute | undefined>;
   isRscRequest: boolean;
+  layoutParamAccess?: AppLayoutParamAccessTracker;
   renderInterceptResponse: (route: TRoute, element: TElement) => Promise<Response> | Response;
   searchParams: URLSearchParams;
   setNavigationContext: (context: {
@@ -114,11 +118,10 @@ declare function validateAppPageDynamicParams(options: ValidateAppPageDynamicPar
  * `setNavigationContext` + element build + Response wrap) and the server-action
  * POST path (entries/app-rsc-entry.ts), which runs its own response pipeline.
  */
-declare function resolveAppPageInterceptMatch<TRoute, TPage, TInterceptOpts>(options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>): ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> | null;
-declare function resolveAppPageInterceptionRerenderTarget<TRoute, TPage, TInterceptOpts>(options: ResolveAppPageInterceptionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>): ResolveAppPageInterceptionRerenderTargetResult<TRoute, TInterceptOpts>;
-declare function resolveAppPageActionRerenderTarget<TRoute, TPage, TInterceptOpts>(options: ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>): ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts>;
+declare function resolveAppPageInterceptMatch<TRoute, TPage, TInterceptOpts>(options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>): Promise<ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> | null>;
+declare function resolveAppPageInterceptionRerenderTarget<TRoute, TPage, TInterceptOpts>(options: ResolveAppPageInterceptionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>): Promise<ResolveAppPageInterceptionRerenderTargetResult<TRoute, TInterceptOpts>>;
+declare function resolveAppPageActionRerenderTarget<TRoute, TPage, TInterceptOpts>(options: ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>): Promise<ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts>>;
 declare function resolveAppPageIntercept<TRoute, TPage, TInterceptOpts, TElement>(options: ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement>): Promise<ResolveAppPageInterceptResult<TInterceptOpts>>;
 declare function buildAppPageElement<TElement>(options: BuildAppPageElementOptions<TElement>): Promise<BuildAppPageElementResult<TElement>>;
 //#endregion
-export { ValidateAppPageDynamicParamsOptions, buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageGenerateStaticParamsSources, resolveAppPageIntercept, resolveAppPageInterceptMatch, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams };
-//# sourceMappingURL=app-page-request.d.ts.map
+export { ValidateAppPageDynamicParamsOptions, buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageGenerateStaticParamsSources, resolveAppPageIntercept, resolveAppPageInterceptMatch, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams };

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

@@ -90,8 +90,8 @@ async function validateAppPageDynamicParams(options) {
 * `setNavigationContext` + element build + Response wrap) and the server-action
 * POST path (entries/app-rsc-entry.ts), which runs its own response pipeline.
 */
-function resolveAppPageInterceptMatch(options) {
-	const interceptState = resolveAppPageInterceptState(options);
+async function resolveAppPageInterceptMatch(options) {
+	const interceptState = await resolveAppPageInterceptState(options);
 	if (interceptState.kind !== "source-route") return null;
 	return {
 		interceptOpts: options.toInterceptOpts(interceptState.intercept),
@@ -100,11 +100,12 @@ function resolveAppPageInterceptMatch(options) {
 		sourceRoute: interceptState.sourceRoute
 	};
 }
-function resolveAppPageInterceptState(options) {
+async function resolveAppPageInterceptState(options) {
 	if (!options.isRscRequest) return { kind: "none" };
 	const intercept = options.findIntercept(options.cleanPathname);
 	if (!intercept) return { kind: "none" };
-	const sourceRoute = options.getSourceRoute(intercept.sourceRouteIndex);
+	if (intercept.__pageLoader && intercept.page == null) intercept.page = await intercept.__pageLoader();
+	const sourceRoute = await options.getSourceRoute(intercept.sourceRouteIndex);
 	if (!sourceRoute) return { kind: "none" };
 	if (sourceRoute === options.currentRoute) return {
 		kind: "current-route",
@@ -116,8 +117,8 @@ function resolveAppPageInterceptState(options) {
 		sourceRoute
 	};
 }
-function resolveAppPageInterceptionRerenderTarget(options) {
-	const interceptState = resolveAppPageInterceptState({
+async function resolveAppPageInterceptionRerenderTarget(options) {
+	const interceptState = await resolveAppPageInterceptState({
 		cleanPathname: options.cleanPathname,
 		currentRoute: options.currentRoute,
 		findIntercept: options.findIntercept,
@@ -143,7 +144,7 @@ function resolveAppPageActionRerenderTarget(options) {
 	return resolveAppPageInterceptionRerenderTarget(options);
 }
 async function resolveAppPageIntercept(options) {
-	const interceptState = resolveAppPageInterceptState({
+	const interceptState = await resolveAppPageInterceptState({
 		cleanPathname: options.cleanPathname,
 		currentRoute: options.currentRoute,
 		findIntercept: options.findIntercept,
@@ -153,15 +154,17 @@ async function resolveAppPageIntercept(options) {
 		toInterceptOpts: options.toInterceptOpts
 	});
 	if (interceptState.kind === "source-route") {
+		const renderRoute = interceptState.sourceRoute;
+		const renderParams = pickRouteParams(interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute));
 		options.setNavigationContext({
 			params: interceptState.intercept.matchedParams,
 			pathname: options.cleanPathname,
 			searchParams: options.searchParams
 		});
-		const interceptElement = await options.buildPageElement(interceptState.sourceRoute, pickRouteParams(interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute)), options.toInterceptOpts(interceptState.intercept), options.searchParams);
+		const interceptElement = await options.buildPageElement(renderRoute, renderParams, options.toInterceptOpts(interceptState.intercept), options.searchParams, options.layoutParamAccess);
 		return {
 			interceptOpts: void 0,
-			response: await options.renderInterceptResponse(interceptState.sourceRoute, interceptElement)
+			response: await options.renderInterceptResponse(renderRoute, interceptElement)
 		};
 	}
 	return {
@@ -191,5 +194,3 @@ async function buildAppPageElement(options) {
 }
 //#endregion
 export { buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageGenerateStaticParamsSources, resolveAppPageIntercept, resolveAppPageInterceptMatch, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams };
-
-//# sourceMappingURL=app-page-request.js.map

package/dist/server/app-page-response.d.ts

@@ -36,6 +36,7 @@ type AppPageHtmlResponsePolicy = {
   shouldWriteToCache: boolean;
 } & AppPageResponsePolicy;
 type BuildAppPageRscResponseOptions = {
+  dynamicStaleTimeSeconds?: number;
   isEdgeRuntime?: boolean;
   middlewareContext: AppPageMiddlewareContext;
   mountedSlotsHeader?: string | null;
@@ -44,8 +45,8 @@ type BuildAppPageRscResponseOptions = {
   timing?: AppPageResponseTiming;
 };
 type BuildAppPageHtmlResponseOptions = {
-  draftCookie?: string | null;
-  fontLinkHeader?: string;
+  draftCookie?: string | null; /** Combined preload `Link` header value (React hints + font preloads), already capped. */
+  linkHeader?: string;
   isEdgeRuntime?: boolean;
   middlewareContext: AppPageMiddlewareContext;
   policy: AppPageResponsePolicy;
@@ -64,5 +65,4 @@ declare function applyEdgeRuntimeHeader(headers: Headers, isEdgeRuntime: boolean
 declare function buildAppPageRscResponse(body: ReadableStream, options: BuildAppPageRscResponseOptions): Response;
 declare function buildAppPageHtmlResponse(body: ReadableStream, options: BuildAppPageHtmlResponseOptions): Response;
 //#endregion
-export { AppPageMiddlewareContext, AppPageResponseTiming, applyEdgeRuntimeHeader, buildAppPageHtmlResponse, buildAppPageRscResponse, mergeMiddlewareResponseHeaders, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy };
-//# sourceMappingURL=app-page-response.d.ts.map
+export { AppPageMiddlewareContext, AppPageResponseTiming, applyEdgeRuntimeHeader, buildAppPageHtmlResponse, buildAppPageRscResponse, mergeMiddlewareResponseHeaders, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy };

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

@@ -1,4 +1,4 @@
-import { VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
+import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
@@ -11,6 +11,9 @@ function applyTimingHeader(headers, timing) {
 	const renderMs = timing.responseKind === "html" && timing.renderEnd !== void 0 && timing.compileEnd !== void 0 ? Math.round(timing.renderEnd - timing.compileEnd) : -1;
 	headers.set(VINEXT_TIMING_HEADER, `${handlerStart},${compileMs},${renderMs}`);
 }
+function applyDynamicStaleTimeHeader(headers, dynamicStaleTimeSeconds) {
+	if (dynamicStaleTimeSeconds !== void 0 && Number.isInteger(dynamicStaleTimeSeconds) && dynamicStaleTimeSeconds >= 0) headers.set(VINEXT_DYNAMIC_STALE_TIME_HEADER, String(dynamicStaleTimeSeconds));
+}
 function resolveAppPageRscResponsePolicy(options) {
 	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
@@ -85,6 +88,7 @@ function buildAppPageRscResponse(body, options) {
 	applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
 	if (options.params && Object.keys(options.params).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(options.params)));
 	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
+	applyDynamicStaleTimeHeader(headers, options.dynamicStaleTimeSeconds);
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
 	if (options.policy.cacheState) setCacheStateHeaders(headers, options.policy.cacheState);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
@@ -104,7 +108,7 @@ function buildAppPageHtmlResponse(body, options) {
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
 	if (options.policy.cacheState) setCacheStateHeaders(headers, options.policy.cacheState);
 	if (options.draftCookie) headers.append("Set-Cookie", options.draftCookie);
-	if (options.fontLinkHeader) headers.set("Link", options.fontLinkHeader);
+	if (options.linkHeader) headers.set("Link", options.linkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
@@ -114,5 +118,3 @@ function buildAppPageHtmlResponse(body, options) {
 }
 //#endregion
 export { applyEdgeRuntimeHeader, buildAppPageHtmlResponse, buildAppPageRscResponse, mergeMiddlewareResponseHeaders, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy };
-
-//# sourceMappingURL=app-page-response.js.map

package/dist/server/app-page-route-wiring.d.ts

@@ -1,6 +1,8 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
 import { AppElements, AppElementsInterception } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { ThenableParamsObserver } from "../shims/thenable-params.js";
+import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
 import { AppPageRenderIdentity } from "./app-page-render-identity.js";
@@ -104,7 +106,8 @@ type AppPageLayoutEntry<TModule extends AppPageModule = AppPageModule, TErrorMod
 type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   element: ReactNode;
   globalErrorModule?: TErrorModule | null;
-  makeThenableParams: (params: AppPageParams) => unknown;
+  layoutParamAccess?: AppLayoutParamAccessTracker;
+  makeThenableParams: MakeThenableParams;
   matchedParams: AppPageParams;
   metadataPlacement?: "body" | "head";
   resolvedMetadata: Metadata | null;
@@ -114,8 +117,10 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   rootNotFoundModule?: TModule | null;
   rootUnauthorizedModule?: TModule | null;
   route: AppPageRouteWiringRoute<TModule, TErrorModule>;
+  searchParams?: unknown;
   slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;
 };
+type MakeThenableParams = (params: AppPageParams, observer?: ThenableParamsObserver) => unknown;
 type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = BuildAppPageRouteElementOptions<TModule, TErrorModule> & {
   interception?: AppElementsInterception | null;
   interceptionContext?: string | null;
@@ -126,11 +131,17 @@ type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule,
   routePath: string;
 };
 declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
+declare function probeAppPageLayoutWithTracking<TModule extends AppPageModule>(options: {
+  layoutIndex: number;
+  layoutParamAccess: AppLayoutParamAccessTracker | undefined;
+  makeThenableParams: MakeThenableParams;
+  matchedParams: AppPageParams;
+  route: Pick<AppPageRouteWiringRoute<TModule>, "layoutTreePositions" | "layouts" | "routeSegments">;
+}): unknown;
 declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "errorTreePositions" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
   forbiddens?: readonly (TModule | null | undefined)[] | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
-export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, resolveAppPageChildSegments };
-//# sourceMappingURL=app-page-route-wiring.d.ts.map
+export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };