vinext 0.1.7 → 0.1.8

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,
@@ -365,14 +311,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 +365,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 +381,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 +403,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 +420,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 +434,7 @@ async function dispatchAppPageInner(options) {
 		cleanPathname: options.cleanPathname,
 		clearRequestContext: options.clearRequestContext,
 		consumeDynamicUsage,
+		peekDynamicUsage,
 		consumeInvalidDynamicUsageError,
 		consumeRenderObservationState: consumeAppPageRenderObservationState,
 		createRscOnErrorHandler(pathname, routePath) {
@@ -487,7 +457,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 +483,7 @@ async function dispatchAppPageInner(options) {
 		pprFallbackShellSignal,
 		pprFallbackShellReactSignal,
 		abortPprFallbackShell: activeFallbackShellState ? () => {
-			beginPprFallbackShellFinalRender(activeFallbackShellState);
+			options.pprRuntime.beginFinalRender(activeFallbackShellState);
 		} : void 0,
 		layoutParamAccess,
 		rootParams: options.rootParams,
@@ -526,8 +497,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 +528,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 +646,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;

package/dist/server/app-page-element-builder.js

@@ -1,17 +1,27 @@
 import { matchRoutePattern } from "../routing/route-pattern.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_NAVIGATION, shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
 import { createAppPageRenderIdentity } from "./app-page-render-identity.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
+import { resolveAppPageBranchParams } from "./app-page-params.js";
 import { resolveActiveParallelRouteHeadInputs, resolveAppPageHead } from "./app-page-head.js";
-import { makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
+import { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
 import { buildAppPageElements, createAppPageSourcePage, createAppPageTreePath } from "./app-page-route-wiring.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 import "./app-rsc-route-matching.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { createElement } from "react";
 //#region src/server/app-page-element-builder.ts
+function resolveInterceptLayoutParams(branchSegments, layoutSegments, params) {
+	return resolveAppPageBranchParams(branchSegments, layoutSegments.length, params, layoutSegments);
+}
+const REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
+function isReactOwnedPageComponent(component) {
+	if (typeof component !== "function") return true;
+	const candidate = component;
+	return candidate.$$typeof === REACT_CLIENT_REFERENCE || candidate.prototype?.isReactComponent != null;
+}
 /**
 * Build the App Router element tree for a matched route.
 *
@@ -30,7 +40,8 @@ import { createElement } from "react";
 */
 async function buildPageElements(options) {
 	const { route, params, routePath, displayPathname = routePath, pageRequest, globalErrorModule, rootNotFoundModule, rootForbiddenModule, rootUnauthorizedModule, metadataRoutes } = options;
-	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION } = pageRequest;
+	const slotParamOverrides = resolveSlotParamOverrides(route, routePath);
+	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION, observeMetadataSearchParamsAccess = false, observePageSearchParamsAccess = false } = pageRequest;
 	const pageModule = route.page;
 	const isSiblingIntercept = opts?.interceptSlotKey === "__vinext_page_intercept" && !!opts?.interceptPage;
 	const effectivePageModule = isSiblingIntercept ? opts.interceptPage : pageModule;
@@ -64,44 +75,68 @@ async function buildPageElements(options) {
 		};
 	}
 	const { hasDynamicMetadata, metadata: resolvedMetadata, pageSearchParams, viewport: resolvedViewport } = await resolveAppPageHead({
+		applyFileBasedMetadata: options.applyFileBasedMetadata,
 		basePath: options.basePath ?? "",
 		layoutModules: route.layouts,
 		layoutTreePositions: route.layoutTreePositions,
 		metadataRoutes,
-		pageModule: effectivePageModule ?? null,
-		parallelRoutes: resolveActiveParallelRouteHeadInputs({
+		pageModule: isSiblingIntercept ? null : effectivePageModule ?? null,
+		parallelRoutes: [...resolveActiveParallelRouteHeadInputs({
+			interceptBranchSegments: opts?.interceptBranchSegments ?? null,
 			interceptLayouts: opts?.interceptLayouts ?? null,
+			interceptLayoutSegments: opts?.interceptLayoutSegments ?? null,
 			interceptPage: opts?.interceptPage ?? null,
 			interceptParams: opts?.interceptParams ?? null,
 			interceptSlotKey: opts?.interceptSlotKey ?? null,
+			layoutTreePositions: route.layoutTreePositions,
 			params,
 			routeSegments: route.routeSegments ?? [],
+			slotParams: slotParamOverrides,
 			slots: route.slots ?? null
-		}),
+		}), ...isSiblingIntercept ? [{
+			layoutModules: opts?.interceptLayouts ?? [],
+			layoutParams: (opts?.interceptLayoutSegments ?? []).map((segments) => resolveInterceptLayoutParams(opts?.interceptBranchSegments ?? segments, segments, effectiveParams)),
+			pageModule: effectivePageModule ?? null,
+			params: effectiveParams,
+			routeSegments: opts?.interceptSourcePageSegments ?? route.routeSegments ?? []
+		}] : []],
 		params: effectiveParams,
 		routePath: route.pattern,
 		routeSegments: route.routeSegments ?? null,
-		searchParams
+		searchParams,
+		searchParamsObserver: observeMetadataSearchParamsAccess ? createAppPageSearchParamsObserver() : void 0
 	});
 	const pageProps = { params: makeThenableParams(effectiveParams) };
-	let pageSearchParamsThenable;
-	if (searchParams) {
-		pageSearchParamsThenable = !shouldSuppressLoadingBoundaries(renderMode) && Boolean(route.loading?.default) ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
-		pageProps.searchParams = pageSearchParamsThenable;
-	}
+	const hasRequestSearchParams = Object.keys(pageSearchParams).length > 0;
+	const createPageElement = (PageComponent, props) => {
+		if (isReactOwnedPageComponent(PageComponent)) {
+			const invocationProps = { ...props };
+			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams, { markDynamic: hasRequestSearchParams }) : makeThenableParams(pageSearchParams);
+			return createElement(PageComponent, invocationProps);
+		}
+		const ServerPageComponent = PageComponent;
+		const PageInvoker = () => {
+			const invocationProps = { ...props };
+			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
+			return ServerPageComponent(invocationProps);
+		};
+		return createElement(PageInvoker);
+	};
+	const pageSearchParamsThenable = searchParams ? makeThenableParams(pageSearchParams) : void 0;
 	const mountedSlotIds = mountedSlotsHeader ? new Set(mountedSlotsHeader.split(" ")) : null;
 	const slotOverrides = buildSlotOverrides(route, params, routePath, opts);
 	const metadataPlacement = hasDynamicMetadata && shouldServeStreamingMetadata(pageRequest.request.headers.get("user-agent") ?? "", options.htmlLimitedBots) ? "body" : "head";
-	let siblingInterceptElement = isSiblingIntercept && EffectivePageComponent ? createElement(EffectivePageComponent, pageProps) : null;
-	if (isSiblingIntercept && siblingInterceptElement !== null && opts?.interceptLayouts?.length) {
-		const siblingThenableParams = makeThenableParams(effectiveParams);
-		for (let i = opts.interceptLayouts.length - 1; i >= 0; i--) {
-			const LayoutComponent = opts.interceptLayouts[i]?.default;
-			if (LayoutComponent) siblingInterceptElement = createElement(LayoutComponent, { params: siblingThenableParams }, siblingInterceptElement);
+	let siblingInterceptElement = isSiblingIntercept && EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps) : null;
+	if (isSiblingIntercept && siblingInterceptElement !== null && opts?.interceptLayouts?.length) for (let i = opts.interceptLayouts.length - 1; i >= 0; i--) {
+		const LayoutComponent = opts.interceptLayouts[i]?.default;
+		if (LayoutComponent) {
+			const interceptLayoutSegments = opts.interceptLayoutSegments?.[i] ?? [];
+			siblingInterceptElement = createElement(LayoutComponent, { params: makeThenableParams(resolveInterceptLayoutParams(opts.interceptBranchSegments ?? interceptLayoutSegments, interceptLayoutSegments, effectiveParams)) }, siblingInterceptElement);
 		}
 	}
 	return buildAppPageElements({
-		element: isSiblingIntercept ? siblingInterceptElement : EffectivePageComponent ? createElement(EffectivePageComponent, pageProps) : null,
+		element: isSiblingIntercept ? siblingInterceptElement : EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps) : null,
+		createPageElement,
 		globalErrorModule: globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE,
 		isRscRequest,
 		layoutParamAccess: options.layoutParamAccess,
@@ -142,7 +177,9 @@ async function buildPageElements(options) {
 function buildSlotOverrides(route, routeParams, routePath, opts) {
 	const overrides = {};
 	if (opts && opts.interceptSlotKey && opts.interceptPage && opts.interceptSlotKey !== "__vinext_page_intercept") overrides[opts.interceptSlotKey] = {
+		branchSegments: opts.interceptBranchSegments ?? null,
 		layoutModules: opts.interceptLayouts || null,
+		layoutSegments: opts.interceptLayoutSegments ?? null,
 		pageModule: opts.interceptPage,
 		params: opts.interceptParams || routeParams
 	};

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

@@ -1,31 +1,45 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { ThenableParamsObserver } from "../shims/thenable-params.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
+import { applyFileBasedMetadata } from "./file-based-metadata.js";
 
 //#region src/server/app-page-head.d.ts
 type AppPageSearchParams = Record<string, string | string[]>;
 type AppPageHeadModule = Record<string, unknown>;
+type ApplyAppPageFileBasedMetadata = typeof applyFileBasedMetadata;
 type AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+  layoutParams?: readonly AppPageParams[] | null;
   layoutModule?: TModule | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
+  layoutTreePositions?: readonly number[] | null;
   pageModule?: TModule | null;
   params?: AppPageParams | null;
   routeSegments?: readonly string[] | null;
 };
 type AppPageHeadSlot<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+  configLayouts?: readonly (TModule | null | undefined)[] | null;
+  configLayoutTreePositions?: readonly number[] | null;
   layout?: TModule | null;
+  layoutIndex?: number;
   page?: TModule | null;
+  routeSegments?: readonly string[] | null;
 };
 type ResolveActiveParallelRouteHeadInputsOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   interceptLayouts?: readonly (TModule | null | undefined)[] | null;
+  interceptBranchSegments?: readonly string[] | null;
+  interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptPage?: TModule | null;
   interceptParams?: AppPageParams | null;
   interceptSlotKey?: string | null;
+  layoutTreePositions?: readonly number[] | null;
   params: AppPageParams;
   routeSegments: readonly string[];
+  slotParams?: Readonly<Record<string, AppPageParams>> | null;
   slots?: Record<string, AppPageHeadSlot<TModule>> | null;
 };
 type ResolveAppPageHeadOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+  applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   /**
    * Configured next.config `basePath`. Threaded into `applyFileBasedMetadata`
    * so file-based metadata route URLs (icon, opengraph-image, manifest, ...)
@@ -43,6 +57,7 @@ type ResolveAppPageHeadOptions<TModule extends AppPageHeadModule = AppPageHeadMo
   routePath: string;
   routeSegments?: readonly string[] | null;
   searchParams?: URLSearchParams | null;
+  searchParamsObserver?: ThenableParamsObserver;
 };
 type ResolveAppPageHeadResult = {
   hasDynamicMetadata: boolean;
@@ -59,4 +74,4 @@ declare function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHea
 declare function collectAppPageSearchParams(searchParams: URLSearchParams | null | undefined): AppPageSearchParamsCollection;
 declare function resolveAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): Promise<ResolveAppPageHeadResult>;
 //#endregion
-export { AppPageSearchParams, collectAppPageSearchParams, resolveActiveParallelRouteHeadInputs, resolveAppPageHead };
+export { AppPageSearchParams, ApplyAppPageFileBasedMetadata, collectAppPageSearchParams, resolveActiveParallelRouteHeadInputs, resolveAppPageHead };