vinext 0.1.7 → 0.2.0

package/dist/server/app-page-cache-finalizer.js

@@ -1,15 +1,21 @@
+import { NEXTJS_CACHE_HEADER, VINEXT_CACHE_HEADER } from "./headers.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 //#region src/server/app-page-cache-finalizer.ts
-function applyPendingDynamicCdnHeaders(headers, tags) {
+function applyPendingDynamicCdnHeaders(headers, tags, options = {}) {
 	applyCdnResponseHeaders(headers, {
 		cacheControl: headers.get("Cache-Control") ?? "",
 		pendingDynamicCheck: true,
 		tags
 	});
+	if (options.omitCacheState === true) {
+		headers.delete(VINEXT_CACHE_HEADER);
+		headers.delete(NEXTJS_CACHE_HEADER);
+		return;
+	}
 	setCacheStateHeaders(headers, "MISS");
 }
 function resolveAppPageCacheWritePolicy(options) {
@@ -30,7 +36,7 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 	const htmlKey = options.isrHtmlKey(options.cleanPathname);
 	const rscKey = options.isrRscKey(options.cleanPathname, null, void 0, options.interceptionContext);
 	const clientHeaders = new Headers(response.headers);
-	if (options.preserveClientResponseHeaders !== true) applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags());
+	if (options.preserveClientResponseHeaders !== true) applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags(), { omitCacheState: options.omitPendingDynamicCacheState === true });
 	const cachePromise = (async () => {
 		try {
 			const cachedHtml = await readStreamAsText(streamForCache);
@@ -57,7 +63,8 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 				cacheTags: pageTags,
 				state: observationState
 			});
-			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200, htmlRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
+			const linkHeader = response.headers.get("link");
+			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200, htmlRenderObservation, linkHeader ? { link: linkHeader } : void 0), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
 			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200, rscRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
 			await Promise.all(writes);
 			options.isrDebug?.("HTML cache written", htmlKey);

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

@@ -38,6 +38,7 @@ type RenderAppPageCacheArtifactsResult = {
   cacheControl?: CacheControlMetadata;
   html: string;
   htmlRenderObservation: ReturnType<typeof createAppPageRenderObservation>;
+  linkHeader?: string;
   rscData?: ArrayBuffer;
   rscRenderObservation?: ReturnType<typeof createAppPageRenderObservation>;
   tags: string[];

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

@@ -2,9 +2,9 @@ import { consumeDynamicUsage, consumeInvalidDynamicUsageError } from "../shims/h
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { getCollectedFetchTags } from "../shims/fetch-cache.js";
 import { readStreamAsText } from "../utils/text-stream.js";
-import { teeAppPageRscStreamForCapture } from "./app-page-execution.js";
+import { buildAppPageFontLinkHeader, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope } from "./app-page-render-observation.js";
-import { isAppSsrRenderResult } from "./app-page-stream.js";
+import { buildAppPageLinkHeader, isAppSsrRenderResult } from "./app-page-stream.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 //#region src/server/app-page-cache-render.ts
 /**
@@ -16,10 +16,11 @@ import { buildAppPageTags } from "./implicit-tags.js";
 async function renderAppPageCacheArtifacts(options) {
 	const rscCapture = teeAppPageRscStreamForCapture(options.renderToReadableStream(options.element, { onError: options.onError }), options.captureRscData);
 	const capturedRscDataRef = { value: null };
+	const fontPreloads = options.getFontPreloads();
 	const htmlResult = await (await options.loadSsrHandler()).handleSsr(rscCapture.ssrStream, options.getNavigationContext(), {
 		links: options.getFontLinks(),
 		styles: options.getFontStyles(),
-		preloads: options.getFontPreloads()
+		preloads: fontPreloads
 	}, {
 		basePath: options.basePath,
 		clientTraceMetadata: options.clientTraceMetadata,
@@ -31,7 +32,9 @@ async function renderAppPageCacheArtifacts(options) {
 			capturedRscDataRef
 		} : {}
 	});
-	const html = await readStreamAsText(isAppSsrRenderResult(htmlResult) ? htmlResult.htmlStream : htmlResult);
+	const htmlStream = isAppSsrRenderResult(htmlResult) ? htmlResult.htmlStream : htmlResult;
+	const linkHeader = buildAppPageLinkHeader(isAppSsrRenderResult(htmlResult) ? htmlResult.linkHeader : void 0, buildAppPageFontLinkHeader(fontPreloads), options.reactMaxHeadersLength);
+	const html = await readStreamAsText(htmlStream);
 	let rscData;
 	if (options.captureRscData) {
 		const capturedPromise = capturedRscDataRef.value;
@@ -60,6 +63,7 @@ async function renderAppPageCacheArtifacts(options) {
 			params: options.navigationParams,
 			state: observationState
 		}),
+		...linkHeader ? { linkHeader } : {},
 		tags,
 		cacheControl: typeof cacheLife?.revalidate === "number" ? {
 			revalidate: cacheLife.revalidate,

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

@@ -25,6 +25,7 @@ type AppPageCacheRenderResult = {
   cacheControl?: CacheControlMetadata;
   html: string;
   htmlRenderObservation?: RenderObservation;
+  linkHeader?: string;
   rscData: ArrayBuffer;
   rscRenderObservation?: RenderObservation;
   tags: string[];

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

@@ -19,7 +19,7 @@ function recordAppPageCacheOutcome(recordCacheOutcome, input) {
 function buildAppPageCacheTags(pathname, extraTags) {
 	const tags = [
 		pathname,
-		`_N_T_${pathname}`,
+		`_N_T_${pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname}`,
 		"_N_T_/layout"
 	];
 	const segments = pathname.split("/");
@@ -43,6 +43,8 @@ function buildAppPageCachedHeaders(options) {
 	applyCdnResponseHeaders(headers, { cacheControl: options.cacheControl });
 	setCacheStateHeaders(headers, options.cacheState);
 	applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
+	if (options.linkHeader) if (Array.isArray(options.linkHeader)) for (const value of options.linkHeader) headers.append("Link", value);
+	else headers.set("Link", options.linkHeader);
 	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 	return headers;
@@ -84,6 +86,7 @@ function buildAppPageCachedResponse(cachedValue, options) {
 		cacheState: options.cacheState,
 		contentType: "text/html; charset=utf-8",
 		isEdgeRuntime: options.isEdgeRuntime,
+		linkHeader: cachedValue.headers?.link,
 		middlewareHeaders: options.middlewareHeaders
 	});
 	return new Response(cachedValue.html, {
@@ -177,7 +180,7 @@ async function readAppPageCacheResponse(options) {
 				const revalidateSeconds = revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;
 				const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;
 				const writes = [options.isrSet(options.isRscRequest ? isrKey : options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
-				if (!options.isRscRequest) writes.push(options.isrSet(isrKey, buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds));
+				if (!options.isRscRequest) writes.push(options.isrSet(isrKey, buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation, revalidatedPage.linkHeader ? { link: revalidatedPage.linkHeader } : void 0), revalidateSeconds, revalidatedPage.tags, expireSeconds));
 				await Promise.all(writes);
 				options.isrDebug?.("regen complete", options.cleanPathname);
 			});

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

@@ -10,8 +10,10 @@ import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ISRCacheEntry } from "./isr-cache.js";
+import { PprFallbackShellState } from "../shims/ppr-fallback-shell.js";
 import { FetchCacheMode } from "../shims/fetch-cache.js";
 import { AppPagePprFallbackCacheShell } from "./app-ppr-fallback-shell.js";
+import { WarmPprFallbackShellCachesOptions } from "./app-ppr-fallback-shell-render.js";
 import { ValidateAppPageDynamicParamsOptions } from "./app-page-request.js";
 import { ReactNode } from "react";
 import { ReactFormState } from "react-dom/client";
@@ -32,7 +34,10 @@ type AppPageBackgroundRegenerationErrorContext = {
 type AppPageBackgroundRegenerator = (key: string, renderFn: () => Promise<void>, errorContext?: AppPageBackgroundRegenerationErrorContext) => void;
 type AppPageDispatchIntercept<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
+  interceptLayoutSegments?: readonly (readonly string[])[] | null;
+  interceptBranchSegments?: readonly string[] | null;
   matchedParams: AppPageParams;
+  sourceMatchedParams?: AppPageParams;
   page: TPage;
   slotId?: string | null;
   slotKey: string;
@@ -42,6 +47,8 @@ type AppPageDispatchIntercept<TPage = unknown> = {
 type AppPageDispatchInterceptOptions<TPage = unknown> = {
   interceptionContext: string | null;
   interceptLayouts?: readonly unknown[] | null;
+  interceptLayoutSegments?: readonly (readonly string[])[] | null;
+  interceptBranchSegments?: readonly string[] | null;
   interceptPage: TPage;
   interceptParams: AppPageParams;
   interceptSlotId?: string | null;
@@ -80,6 +87,14 @@ type AppPageDispatchRoute = {
   unauthorized?: AppPageModule | null;
   unauthorizeds?: readonly (AppPageModule | null | undefined)[];
 };
+type AppPagePprRuntime<TRoute extends AppPageDispatchRoute> = {
+  beginFinalRender(state: AppPagePprState): void;
+  getState(): AppPagePprState | null;
+  run<T>(shell: NonNullable<DispatchAppPageOptions<TRoute>["pprFallbackShell"]>, fn: () => T): T;
+  tryServe(options: DispatchAppPageOptions<TRoute>, currentRevalidateSeconds: number | null, isDraftMode: boolean, isForceStatic: boolean, isForceDynamic: boolean): Promise<Response | null>;
+  warm(options: WarmPprFallbackShellCachesOptions): Promise<void>;
+};
+type AppPagePprState = PprFallbackShellState;
 type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   /** Configured basePath (e.g. "/blog"). Used to prefix redirect Locations. */basePath?: string;
   /**
@@ -94,7 +109,10 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
    * `next.config`. Undefined falls back to the React default downstream.
    */
   reactMaxHeadersLength?: number;
-  buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker) => Promise<AppPageElement>;
+  buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker, options?: {
+    observeMetadataSearchParamsAccess?: boolean;
+    observePageSearchParamsAccess?: boolean;
+  }) => Promise<AppPageElement>;
   clientReuseManifest?: ClientReuseManifestParseResult;
   cleanPathname: string;
   displayPathname?: string;
@@ -147,6 +165,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
     fallbackParamNames: readonly string[];
     routePattern: string;
   };
+  pprRuntime?: AppPagePprRuntime<TRoute>;
   /**
    * Set of concrete URL paths that were pre-rendered at build time for this
    * route. When the exact cache entry for a known pregenerated path is absent
@@ -159,9 +178,9 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   staticParamsValidationParams?: AppPageParams;
   rootParams?: RootParams;
   probeLayoutAt: (layoutIndex: number, layoutParamAccess?: AppLayoutParamAccessTracker) => unknown;
-  probePage: () => unknown;
+  probePage: (searchParams?: URLSearchParams) => unknown;
   expireSeconds?: number;
-  renderErrorBoundaryPage: (error: unknown) => Promise<Response | null>;
+  renderErrorBoundaryPage: (error: unknown, errorOrigin?: "rsc" | "ssr") => Promise<Response | null>;
   renderHttpAccessFallbackPage: (statusCode: number, opts: {
     boundaryComponent?: unknown;
     boundaryModule?: AppPageModule | null;
@@ -197,6 +216,16 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   }) => void;
   renderMode?: AppRscRenderMode;
 };
+declare function shouldReadAppPageCache(options: {
+  isProgressiveActionRender: boolean;
+  isDraftMode: boolean;
+  isForceDynamic: boolean;
+  isProduction: boolean;
+  isRscRequest: boolean;
+  revalidateSeconds: number | null;
+  scriptNonce?: string;
+}): boolean;
+declare function hasSearchParams(searchParams: URLSearchParams | null | undefined): boolean;
 declare function dispatchAppPage<TRoute extends AppPageDispatchRoute>(options: DispatchAppPageOptions<TRoute>): Promise<Response>;
 //#endregion
-export { dispatchAppPage };
+export { AppPageBoundaryOnError, AppPageDispatchRoute, AppPagePprRuntime, AppPagePprState, AppPageRenderableElement, DispatchAppPageOptions, dispatchAppPage, hasSearchParams, shouldReadAppPageCache };

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

@@ -3,8 +3,7 @@ import { getRequestExecutionContext } from "../shims/request-context.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
-import { beginPprFallbackShellFinalRender, createPprFallbackShellState, getPprFallbackShellState, runWithPprFallbackShellState } from "../shims/ppr-fallback-shell.js";
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, isDraftModeRequest, markDynamicUsage, peekRenderRequestApiUsage, setHeadersContext } from "../shims/headers.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, markDynamicUsage, peekDynamicUsage, peekRenderRequestApiUsage, setHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _peekRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
@@ -108,6 +107,7 @@ async function runAppPageRevalidationContext(options, renderFn) {
 	const { createStaticGenerationHeadersContext } = await import("./app-static-generation.js");
 	return runWithRequestContext(createRequestContext({
 		headersContext: createStaticGenerationHeadersContext({
+			draftModeEnabled: false,
 			draftModeSecret: options.draftModeSecret,
 			dynamicConfig: options.dynamicConfig,
 			routeKind: "page",
@@ -132,6 +132,8 @@ function toInterceptOptions(interceptionContext, intercept) {
 	return {
 		interceptionContext,
 		interceptLayouts: intercept.interceptLayouts,
+		interceptLayoutSegments: intercept.interceptLayoutSegments,
+		interceptBranchSegments: intercept.interceptBranchSegments,
 		interceptPage: intercept.page,
 		interceptParams: intercept.matchedParams,
 		interceptSlotId: intercept.slotId ?? null,
@@ -140,75 +142,10 @@ function toInterceptOptions(interceptionContext, intercept) {
 		interceptSourcePageSegments: intercept.sourcePageSegments ?? null
 	};
 }
-/**
-* Request-phase fallback-shell gate. Callers must run the exact cache read and
-* static-param validation before this classification step.
-*/
-function classifyPprFallbackShellEligibility(options, currentRevalidateSeconds, isDraftMode, isForceStatic, isForceDynamic) {
-	if (options.renderedConcreteUrlPaths?.has(options.cleanPathname) === true) return { kind: "skip-known-pregenerated-route" };
-	const fallbackShells = options.pprFallbackCacheShells;
-	if (!fallbackShells || fallbackShells.length === 0) return { kind: "skip-no-fallback-shells" };
-	if (options.isRscRequest) return { kind: "skip-rsc-request" };
-	if (options.request.method !== "GET") return { kind: "skip-non-get" };
-	if (!isForceStatic && hasSearchParams(options.searchParams)) return { kind: "skip-search-params" };
-	if (!shouldReadAppPageCache({
-		isDraftMode,
-		isForceDynamic,
-		isProgressiveActionRender: options.isProgressiveActionRender === true,
-		isProduction: options.isProduction,
-		isRscRequest: false,
-		revalidateSeconds: currentRevalidateSeconds,
-		scriptNonce: options.scriptNonce
-	})) return { kind: "skip-cache-disabled" };
-	return {
-		kind: "probe-fallback-shells",
-		fallbackShells
-	};
-}
-async function probePprFallbackShellCache(options, route, fallbackShells, currentRevalidateSeconds) {
-	const { readAppPageFallbackShellCacheResponse } = await import("./app-page-cache.js");
-	const { rewriteAppPprFallbackShellHtmlNavigation } = await import("./app-ppr-fallback-shell.js");
-	for (const fallbackShell of fallbackShells) {
-		const fallbackShellResponse = await readAppPageFallbackShellCacheResponse({
-			clearRequestContext: options.clearRequestContext,
-			expireSeconds: options.expireSeconds,
-			fallbackPathname: fallbackShell.pathname,
-			isEdgeRuntime: options.isEdgeRuntime,
-			isrDebug: options.isrDebug,
-			isrGet: options.isrGet,
-			isrHtmlKey: options.isrHtmlKey,
-			middlewareHeaders: options.middlewareContext.headers,
-			middlewareStatus: options.middlewareContext.status,
-			revalidateSeconds: currentRevalidateSeconds ?? 0,
-			rewriteHtml(html) {
-				return rewriteAppPprFallbackShellHtmlNavigation({
-					html,
-					params: options.params,
-					pathname: options.cleanPathname,
-					searchParams: options.searchParams
-				});
-			}
-		});
-		if (fallbackShellResponse) return fallbackShellResponse;
-	}
-	return null;
-}
-async function tryServePprFallbackShell(options, route, currentRevalidateSeconds, isDraftMode, isForceStatic, isForceDynamic) {
-	const decision = classifyPprFallbackShellEligibility(options, currentRevalidateSeconds, isDraftMode, isForceStatic, isForceDynamic);
-	switch (decision.kind) {
-		case "skip-known-pregenerated-route":
-		case "skip-no-fallback-shells":
-		case "skip-rsc-request":
-		case "skip-non-get":
-		case "skip-search-params":
-		case "skip-cache-disabled": return null;
-		case "probe-fallback-shells": return await probePprFallbackShellCache(options, route, decision.fallbackShells, currentRevalidateSeconds);
-	}
-}
 async function dispatchAppPage(options) {
 	const dispatch = () => runWithFetchDedupe(() => dispatchAppPageInner(options));
-	if (!options.pprFallbackShell) return await dispatch();
-	return await runWithPprFallbackShellState(createPprFallbackShellState(options.pprFallbackShell), dispatch);
+	if (!options.pprFallbackShell || !options.pprRuntime) return await dispatch();
+	return await options.pprRuntime.run(options.pprFallbackShell, dispatch);
 }
 async function dispatchAppPageInner(options) {
 	const route = options.route;
@@ -218,7 +155,11 @@ async function dispatchAppPageInner(options) {
 	const isDynamicError = dynamicConfig === "error";
 	const isForceDynamic = dynamicConfig === "force-dynamic";
 	const isDraftMode = isDraftModeRequest(options.request, options.draftModeSecret);
+	const requestHeadersContext = getHeadersContext();
+	const hasRequestSearchParams = !isForceStatic && hasSearchParams(options.searchParams);
+	const pageSearchParams = isForceStatic ? new URLSearchParams() : options.searchParams;
 	const layoutParamAccess = createAppLayoutParamAccessTracker();
+	const hasActiveLoadingBoundary = shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") ? false : Boolean(route.loading?.default);
 	setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], route.routeSegments));
 	setCurrentFetchCacheMode(options.fetchCache ?? null);
 	setCurrentForceDynamicFetchDefault(isForceDynamic);
@@ -238,9 +179,10 @@ async function dispatchAppPageInner(options) {
 		options.clearRequestContext();
 		return methodResponse;
 	}
-	if ((isForceStatic || isDynamicError) && !isDraftMode) {
+	if (isForceStatic || isDynamicError) {
 		const { createStaticGenerationHeadersContext } = await import("./app-static-generation.js");
 		setHeadersContext(createStaticGenerationHeadersContext({
+			draftModeEnabled: isDraftMode,
 			draftModeSecret: options.draftModeSecret,
 			dynamicConfig,
 			routeKind: "page",
@@ -266,7 +208,7 @@ async function dispatchAppPageInner(options) {
 		const cachedPageResponse = await readAppPageCacheResponse({
 			cleanPathname: options.cleanPathname,
 			clearRequestContext: options.clearRequestContext,
-			hasRequestSearchParams: !isForceStatic && hasSearchParams(options.searchParams),
+			hasRequestSearchParams,
 			isEdgeRuntime: options.isEdgeRuntime,
 			isRscRequest: options.isRscRequest,
 			isrDebug: options.isrDebug,
@@ -300,19 +242,23 @@ async function dispatchAppPageInner(options) {
 				});
 				revalidationTarget.navigationParams = resolveAppPageNavigationParams(revalidationTarget.route, revalidationTarget.navigationParams, options.cleanPathname, revalidationTarget.interceptOpts);
 				await options.ensureRouteLoaded?.(revalidationTarget.route);
+				const revalidationDynamicConfig = options.resolveRouteDynamicConfig?.(revalidationTarget.route) ?? (revalidationTarget.route === route ? dynamicConfig : void 0);
 				return runAppPageRevalidationContext({
 					cleanPathname: options.cleanPathname,
 					displayPathname: options.displayPathname,
 					currentFetchCacheMode: options.resolveRouteFetchCacheMode?.(revalidationTarget.route) ?? (revalidationTarget.route === route ? options.fetchCache ?? null : null),
 					draftModeSecret: options.draftModeSecret,
-					dynamicConfig: options.resolveRouteDynamicConfig?.(revalidationTarget.route) ?? (revalidationTarget.route === route ? dynamicConfig : void 0),
+					dynamicConfig: revalidationDynamicConfig,
 					params: revalidationTarget.navigationParams,
 					routePattern: revalidationTarget.route.pattern,
 					routeSegments: revalidationTarget.route.routeSegments,
 					setNavigationContext: options.setNavigationContext
 				}, async () => {
 					const { renderAppPageCacheArtifacts } = await import("./app-page-cache-render.js");
-					const revalidatedElement = await options.buildPageElement(revalidationTarget.route, revalidationTarget.params, revalidationTarget.interceptOpts, new URLSearchParams());
+					const revalidatedElement = await options.buildPageElement(revalidationTarget.route, revalidationTarget.params, revalidationTarget.interceptOpts, new URLSearchParams(), void 0, {
+						observeMetadataSearchParamsAccess: revalidationDynamicConfig !== "force-static",
+						observePageSearchParamsAccess: revalidationDynamicConfig !== "force-static"
+					});
 					const revalidatedOnError = options.createRscOnErrorHandler(options.cleanPathname, revalidationTarget.route.pattern);
 					const rendered = await renderAppPageCacheArtifacts({
 						basePath: options.basePath,
@@ -338,6 +284,7 @@ async function dispatchAppPageInner(options) {
 					return {
 						html: rendered.html,
 						htmlRenderObservation: rendered.htmlRenderObservation,
+						linkHeader: rendered.linkHeader,
 						rscData: rendered.rscData,
 						rscRenderObservation: rendered.rscRenderObservation,
 						tags: rendered.tags,
@@ -365,14 +312,29 @@ async function dispatchAppPageInner(options) {
 		});
 		if (dynamicParamsResponse) return dynamicParamsResponse;
 	}
-	const fallbackShellResponse = await tryServePprFallbackShell(options, route, currentRevalidateSeconds, isDraftMode, isForceStatic, isForceDynamic);
+	const fallbackShellResponse = options.pprRuntime ? await options.pprRuntime.tryServe(options, currentRevalidateSeconds, isDraftMode, isForceStatic, isForceDynamic) : null;
 	if (fallbackShellResponse) return fallbackShellResponse;
+	let interceptDynamicConfig;
+	let interceptDynamicConfigResolved = false;
 	const interceptResult = await resolveAppPageIntercept({
 		async buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess) {
-			await options.ensureRouteLoaded?.(interceptRoute);
+			const sourceDynamicConfig = interceptDynamicConfigResolved ? interceptDynamicConfig : options.resolveRouteDynamicConfig?.(interceptRoute);
+			if (sourceDynamicConfig === "force-static" || sourceDynamicConfig === "error") {
+				const { createStaticGenerationHeadersContext } = await import("./app-static-generation.js");
+				setHeadersContext(createStaticGenerationHeadersContext({
+					draftModeEnabled: isDraftMode,
+					draftModeSecret: options.draftModeSecret,
+					dynamicConfig: sourceDynamicConfig,
+					routeKind: "page",
+					routePattern: interceptRoute.pattern
+				}));
+			} else setHeadersContext(requestHeadersContext);
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(interceptRoute) ?? null);
-			setCurrentForceDynamicFetchDefault(options.resolveRouteDynamicConfig?.(interceptRoute) === "force-dynamic");
-			return options.buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess);
+			setCurrentForceDynamicFetchDefault(sourceDynamicConfig === "force-dynamic");
+			return options.buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess, {
+				observeMetadataSearchParamsAccess: sourceDynamicConfig !== "force-static",
+				observePageSearchParamsAccess: sourceDynamicConfig !== "force-static"
+			});
 		},
 		cleanPathname: options.cleanPathname,
 		currentRoute: route,
@@ -404,6 +366,12 @@ async function dispatchAppPageInner(options) {
 				headers: interceptHeaders
 			});
 		},
+		async resolveSearchParams(sourceRoute, searchParams) {
+			await options.ensureRouteLoaded?.(sourceRoute);
+			interceptDynamicConfig = options.resolveRouteDynamicConfig?.(sourceRoute);
+			interceptDynamicConfigResolved = true;
+			return interceptDynamicConfig === "force-static" ? new URLSearchParams() : searchParams;
+		},
 		searchParams: options.searchParams,
 		setNavigationContext: options.setNavigationContext,
 		toInterceptOpts(intercept) {
@@ -414,12 +382,15 @@ async function dispatchAppPageInner(options) {
 	const buildCurrentPageElement = () => buildAppPageElement({
 		buildPageElement() {
 			if (options.actionFailed) throw options.actionError;
-			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, options.searchParams, layoutParamAccess);
+			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, pageSearchParams, layoutParamAccess, {
+				observeMetadataSearchParamsAccess: !isForceStatic,
+				observePageSearchParamsAccess: !isForceStatic
+			});
 		},
 		async probePageSpecialError() {
 			if (!shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") && route.loading?.default) return null;
 			return resolveAppPageSpecialError(await probeAppPageThrownError({
-				probePage: options.probePage,
+				probePage: () => options.probePage(pageSearchParams),
 				runWithSuppressedHookWarning(probe) {
 					return options.runWithSuppressedHookWarning(probe);
 				}
@@ -433,12 +404,11 @@ async function dispatchAppPageInner(options) {
 		},
 		resolveSpecialError: resolveAppPageSpecialError
 	});
-	const fallbackShellState = getPprFallbackShellState();
+	const fallbackShellState = options.pprRuntime?.getState() ?? null;
 	if (fallbackShellState && process.env.VINEXT_PRERENDER === "1" && !options.isRscRequest) {
 		const warmupBuildResult = await buildCurrentPageElement();
 		if (warmupBuildResult.response) return warmupBuildResult.response;
-		const { warmPprFallbackShellCaches } = await import("./app-ppr-fallback-shell-render.js");
-		await warmPprFallbackShellCaches({
+		await options.pprRuntime.warm({
 			element: warmupBuildResult.element,
 			onError: options.createRscOnErrorHandler(options.cleanPathname, route.pattern),
 			renderToReadableStream: options.renderToReadableStream,
@@ -451,11 +421,11 @@ async function dispatchAppPageInner(options) {
 	const navigationParams = resolveAppPageNavigationParams(route, options.params, options.cleanPathname, interceptResult.interceptOpts);
 	options.setNavigationContext({
 		pathname: options.displayPathname ?? options.cleanPathname,
-		searchParams: options.searchParams,
+		searchParams: pageSearchParams,
 		params: navigationParams
 	});
 	const layoutClassifications = getEffectiveLayoutClassifications(route, options.debugClassification);
-	const activeFallbackShellState = getPprFallbackShellState();
+	const activeFallbackShellState = options.pprRuntime?.getState() ?? null;
 	const pprFallbackShellSignal = activeFallbackShellState?.abortController.signal;
 	const pprFallbackShellReactSignal = activeFallbackShellState?.reactAbortController.signal;
 	return renderAppPageLifecycle({
@@ -465,6 +435,7 @@ async function dispatchAppPageInner(options) {
 		cleanPathname: options.cleanPathname,
 		clearRequestContext: options.clearRequestContext,
 		consumeDynamicUsage,
+		peekDynamicUsage,
 		consumeInvalidDynamicUsageError,
 		consumeRenderObservationState: consumeAppPageRenderObservationState,
 		createRscOnErrorHandler(pathname, routePath) {
@@ -487,7 +458,8 @@ async function dispatchAppPageInner(options) {
 			return _peekRequestScopedCacheLife();
 		},
 		handlerStart: options.handlerStart,
-		hasLoadingBoundary: shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") ? false : Boolean(route.loading?.default),
+		hasLoadingBoundary: hasActiveLoadingBoundary,
+		omitPendingDynamicCacheState: !options.isRscRequest && hasRequestSearchParams,
 		formState: options.formState ?? null,
 		isProgressiveActionRender: options.isProgressiveActionRender === true,
 		isDynamicError,
@@ -512,7 +484,7 @@ async function dispatchAppPageInner(options) {
 		pprFallbackShellSignal,
 		pprFallbackShellReactSignal,
 		abortPprFallbackShell: activeFallbackShellState ? () => {
-			beginPprFallbackShellFinalRender(activeFallbackShellState);
+			options.pprRuntime.beginFinalRender(activeFallbackShellState);
 		} : void 0,
 		layoutParamAccess,
 		rootParams: options.rootParams,
@@ -526,8 +498,9 @@ async function dispatchAppPageInner(options) {
 			return options.probeLayoutAt(layoutIndex, layoutParamAccess);
 		},
 		probePage() {
-			return options.probePage();
+			return options.probePage(pageSearchParams);
 		},
+		probePageBeforeRender: options.isRscRequest,
 		classification: {
 			getLayoutId(index) {
 				const treePosition = route.layoutTreePositions?.[index] ?? 0;
@@ -556,8 +529,8 @@ async function dispatchAppPageInner(options) {
 		revalidateSeconds: currentRevalidateSeconds,
 		mountedSlotsHeader: options.mountedSlotsHeader,
 		renderMode: options.renderMode ?? "navigation",
-		renderErrorBoundaryResponse(renderError) {
-			return options.renderErrorBoundaryPage(renderError);
+		renderErrorBoundaryResponse(renderError, errorOrigin) {
+			return options.renderErrorBoundaryPage(renderError, errorOrigin);
 		},
 		renderLayoutSpecialError(specialError, layoutIndex) {
 			return renderLayoutSpecialError(options, specialError, layoutIndex);
@@ -674,4 +647,4 @@ async function renderPageSpecialError(options, specialError) {
 	});
 }
 //#endregion
-export { dispatchAppPage };
+export { dispatchAppPage, hasSearchParams, shouldReadAppPageCache };

package/dist/server/app-page-element-builder.d.ts

@@ -1,6 +1,7 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppElements } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
@@ -19,6 +20,8 @@ type AppPageBuildRoute<TModule extends AppPageModule = AppPageModule, TErrorModu
 type AppPageInterceptOptions<TModule extends AppPageModule = AppPageModule> = {
   interceptionContext?: string | null;
   interceptLayouts?: readonly (TModule | null | undefined)[] | null;
+  interceptLayoutSegments?: readonly (readonly string[])[] | null;
+  interceptBranchSegments?: readonly string[] | null;
   interceptPage?: TModule | null;
   interceptParams?: AppPageParams | null;
   interceptSlotId?: string | null;
@@ -32,9 +35,12 @@ type AppPagePageRequest<TModule extends AppPageModule = AppPageModule> = {
   isRscRequest: boolean; /** The incoming HTTP request (available but unused by this module). */
   request: Request; /** Normalized x-vinext-mounted-slots header value. */
   mountedSlotsHeader: string | null; /** Semantic RSC payload mode for this page render. */
-  renderMode?: AppRscRenderMode;
+  renderMode?: AppRscRenderMode; /** Observe page `searchParams` access for cache-safety classification. */
+  observePageSearchParamsAccess?: boolean; /** Observe page metadata `searchParams` access for cache-safety classification. */
+  observeMetadataSearchParamsAccess?: boolean;
 };
 type BuildPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
+  applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   route: AppPageBuildRoute<TModule, TErrorModule>;
   params: AppPageParams;
   routePath: string;
@@ -89,6 +95,7 @@ type AppPageNavigationParamInterceptOptions = {
  * {@link https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/create-metadata.tsx|create-metadata.tsx}.
  */
 declare function buildPageElements<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule>(options: BuildPageElementsOptions<TModule, TErrorModule>): Promise<AppElements>;
+declare function resolveInterceptedSlotSegments(sourcePageSegments: readonly string[] | null | undefined, slotKey: string): readonly string[] | null;
 declare function resolveAppPageNavigationParams(route: AppPageNavigationParamRoute, routeParams: AppPageParams, routePath: string, opts?: AppPageNavigationParamInterceptOptions | null): AppPageParams;
 //#endregion
-export { AppPageBuildRoute, type AppPageErrorModule, AppPageInterceptOptions, AppPagePageRequest, type AppPageRouteWiringRoute, BuildPageElementsOptions, buildPageElements, resolveAppPageNavigationParams };
+export { AppPageBuildRoute, type AppPageErrorModule, AppPageInterceptOptions, AppPagePageRequest, type AppPageRouteWiringRoute, BuildPageElementsOptions, buildPageElements, resolveAppPageNavigationParams, resolveInterceptedSlotSegments };