@qzsy/vinext 0.1.11 → 0.1.80

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

@@ -3,7 +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 { 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";
@@ -107,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",
@@ -131,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,
@@ -152,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);
@@ -172,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",
@@ -200,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,
@@ -234,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,
@@ -272,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,
@@ -301,12 +314,27 @@ async function dispatchAppPageInner(options) {
 	}
 	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,
@@ -338,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) {
@@ -348,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);
 				}
@@ -384,7 +421,7 @@ 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);
@@ -398,6 +435,7 @@ async function dispatchAppPageInner(options) {
 		cleanPathname: options.cleanPathname,
 		clearRequestContext: options.clearRequestContext,
 		consumeDynamicUsage,
+		peekDynamicUsage,
 		consumeInvalidDynamicUsageError,
 		consumeRenderObservationState: consumeAppPageRenderObservationState,
 		createRscOnErrorHandler(pathname, routePath) {
@@ -420,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,
@@ -459,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;
@@ -489,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);

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

@@ -20,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;
@@ -33,7 +35,9 @@ 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;

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 { matchRoutePattern } from "../routing/route-pattern.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;
@@ -40,6 +51,7 @@ async function buildPageElements(options) {
 	const hasPageModule = !!pageModule;
 	const renderIdentity = createAppPageRenderIdentity({
 		displayPathname,
+		targetMatchedPathname: routePath,
 		interceptionContext: opts?.interceptionContext ?? null,
 		interceptSourceMatchedUrl: opts?.interceptSourceMatchedUrl ?? null,
 		interceptSlotId: isSiblingIntercept ? null : opts?.interceptSlotId ?? null
@@ -69,40 +81,63 @@ async function buildPageElements(options) {
 		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,
@@ -143,7 +178,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,5 +1,6 @@
 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";
 
@@ -8,23 +9,33 @@ 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> = {
@@ -46,6 +57,7 @@ type ResolveAppPageHeadOptions<TModule extends AppPageHeadModule = AppPageHeadMo
   routePath: string;
   routeSegments?: readonly string[] | null;
   searchParams?: URLSearchParams | null;
+  searchParamsObserver?: ThenableParamsObserver;
 };
 type ResolveAppPageHeadResult = {
   hasDynamicMetadata: boolean;

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

@@ -1,6 +1,6 @@
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
 import { mergeMetadataEntries, mergeViewport, postProcessMetadata, resolveModuleMetadata as resolveModuleMetadata$1, resolveModuleViewport } from "../shims/metadata.js";
-import { resolveAppPageSegmentParams } from "./app-page-params.js";
+import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { tagAppPageMetadataError } from "./app-page-execution.js";
 //#region src/server/app-page-head.ts
 /**
@@ -24,23 +24,44 @@ async function resolveModuleMetadata(...args) {
 }
 function resolveActiveParallelRouteHeadInputs(options) {
 	return Object.entries(options.slots ?? {}).map(([slotKey, slot]) => {
-		if (options.interceptSlotKey === slotKey && options.interceptPage) return {
-			layoutModules: options.interceptLayouts ?? [],
-			pageModule: options.interceptPage,
-			params: options.interceptParams ?? options.params,
-			routeSegments: options.routeSegments
-		};
+		const ownerTreePosition = options.layoutTreePositions?.[slot.layoutIndex ?? 0] ?? 0;
+		const ownerParams = resolveAppPageSegmentParams(options.routeSegments, ownerTreePosition, options.params);
+		if (options.interceptSlotKey === slotKey && options.interceptPage) {
+			const interceptLayouts = options.interceptLayouts ?? [];
+			return {
+				layoutModules: [slot.layout, ...interceptLayouts].filter(isPresent),
+				layoutParams: [...slot.layout ? [ownerParams] : [], ...interceptLayouts.filter(isPresent).map((_, index) => {
+					const segments = options.interceptLayoutSegments?.[index] ?? [];
+					return {
+						...ownerParams,
+						...resolveParallelLayoutParams(options.interceptBranchSegments ?? segments, segments.length, options.interceptParams ?? options.params)
+					};
+				})],
+				layoutTreePositions: [...slot.layout ? [0] : [], ...interceptLayouts.filter(isPresent).map(() => options.routeSegments.length)],
+				pageModule: options.interceptPage,
+				params: options.interceptParams ?? options.params,
+				routeSegments: options.routeSegments
+			};
+		}
 		return {
-			layoutModules: slot.layout ? [slot.layout] : [],
+			layoutModules: [slot.layout, ...slot.configLayouts ?? []].filter(isPresent),
+			layoutParams: [...slot.layout ? [ownerParams] : [], ...(slot.configLayoutTreePositions ?? []).map((treePosition) => ({
+				...ownerParams,
+				...resolveParallelLayoutParams(slot.routeSegments ?? options.routeSegments, treePosition, options.slotParams?.[slotKey] ?? options.params)
+			}))],
+			layoutTreePositions: [...slot.layout ? [0] : [], ...slot.configLayoutTreePositions ?? []],
 			pageModule: slot.page,
-			params: options.params,
-			routeSegments: options.routeSegments
+			params: options.slotParams?.[slotKey] ?? options.params,
+			routeSegments: slot.routeSegments ?? options.routeSegments
 		};
 	});
 }
 function isPresent(value) {
 	return value !== null && value !== void 0;
 }
+function resolveParallelLayoutParams(routeSegments, treePosition, params) {
+	return resolveAppPageBranchParams(routeSegments, treePosition, params);
+}
 function hasGenerateMetadata(module) {
 	return typeof module?.generateMetadata === "function";
 }
@@ -111,7 +132,7 @@ async function resolveLayoutViewport(layoutInputs, params, routeSegments) {
 		return resolveModuleViewport(layoutInput.module, layoutParams);
 	}));
 }
-async function resolveParallelRouteHead(parallelRoute, fallbackParams, fallbackRouteSegments, pageSearchParams, parent) {
+async function resolveParallelRouteHead(parallelRoute, fallbackParams, fallbackRouteSegments, pageSearchParams, parent, searchParamsObserver) {
 	const params = parallelRoute.params ?? fallbackParams;
 	const routeSegments = parallelRoute.routeSegments ?? fallbackRouteSegments;
 	const metadataResults = [];
@@ -119,13 +140,15 @@ async function resolveParallelRouteHead(parallelRoute, fallbackParams, fallbackR
 	const metadataSources = [];
 	let accumulatedMetadata = parent;
 	const layoutModules = [...parallelRoute.layoutModules ?? [], parallelRoute.layoutModule].filter(isPresent);
+	const layoutTreePositions = parallelRoute.layoutTreePositions ?? [];
+	const layoutParams = parallelRoute.layoutParams ?? [];
 	const hasDynamicMetadata = layoutModules.some(hasGenerateMetadata) || hasGenerateMetadata(parallelRoute.pageModule);
-	const layoutViewportPromises = layoutModules.map((layoutModule) => resolveModuleViewport(layoutModule, params));
-	const pageViewportPromise = parallelRoute.pageModule ? resolveModuleViewport(parallelRoute.pageModule, params) : Promise.resolve(null);
+	const layoutViewportPromises = layoutModules.map((layoutModule, index) => resolveModuleViewport(layoutModule, layoutParams[index] ?? resolveParallelLayoutParams(routeSegments, layoutTreePositions[index] ?? 0, params)));
+	const pageViewportPromise = parallelRoute.pageModule ? resolveModuleViewport(parallelRoute.pageModule, params, pageSearchParams, searchParamsObserver) : Promise.resolve(null);
 	for (const layoutViewportPromise of layoutViewportPromises) layoutViewportPromise.catch(() => null);
 	pageViewportPromise.catch(() => null);
-	for (const layoutModule of layoutModules) {
-		const layoutMetadata = await resolveModuleMetadata(layoutModule, params, void 0, accumulatedMetadata);
+	for (const [index, layoutModule] of layoutModules.entries()) {
+		const layoutMetadata = await resolveModuleMetadata(layoutModule, layoutParams[index] ?? resolveParallelLayoutParams(routeSegments, layoutTreePositions[index] ?? 0, params), void 0, accumulatedMetadata);
 		metadataResults.push(layoutMetadata);
 		metadataSources.push({
 			metadata: layoutMetadata,
@@ -137,7 +160,7 @@ async function resolveParallelRouteHead(parallelRoute, fallbackParams, fallbackR
 		}
 	}
 	if (parallelRoute.pageModule) {
-		const pageMetadata = await resolveModuleMetadata(parallelRoute.pageModule, params, pageSearchParams, accumulatedMetadata);
+		const pageMetadata = await resolveModuleMetadata(parallelRoute.pageModule, params, pageSearchParams, accumulatedMetadata, searchParamsObserver);
 		metadataResults.push(pageMetadata);
 		metadataSources.push({
 			metadata: pageMetadata,
@@ -170,9 +193,9 @@ async function resolveAppPageHeadInner(options) {
 	layoutMetadataResultsForParent.catch(() => null);
 	const pageParentPromise = layoutMetadataResultsForParent.then((metadataResults) => metadataResults.length > 0 ? mergeMetadataEntries(metadataResults.map((metadata) => ({ metadata }))) : {});
 	pageParentPromise.catch(() => null);
-	const pageMetadataPromise = options.pageModule ? resolveModuleMetadata(options.pageModule, options.params, pageSearchParams, pageParentPromise) : Promise.resolve(null);
-	const pageViewportPromise = options.pageModule ? resolveModuleViewport(options.pageModule, options.params) : Promise.resolve(null);
-	const parallelRouteHeadPromise = Promise.all((options.parallelRoutes ?? []).map((parallelRoute) => resolveParallelRouteHead(parallelRoute, options.params, routeSegments, pageSearchParams, pageParentPromise)));
+	const pageMetadataPromise = options.pageModule ? resolveModuleMetadata(options.pageModule, options.params, pageSearchParams, pageParentPromise, options.searchParamsObserver) : Promise.resolve(null);
+	const pageViewportPromise = options.pageModule ? resolveModuleViewport(options.pageModule, options.params, pageSearchParams, options.searchParamsObserver) : Promise.resolve(null);
+	const parallelRouteHeadPromise = Promise.all((options.parallelRoutes ?? []).map((parallelRoute) => resolveParallelRouteHead(parallelRoute, options.params, routeSegments, pageSearchParams, pageParentPromise, options.searchParamsObserver)));
 	const [layoutMetadataResults, layoutViewportResults, pageMetadata, pageViewport, parallelRouteHeads] = await Promise.all([
 		layoutMetadataPromise,
 		layoutViewportPromise,

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

@@ -4,5 +4,6 @@ import { AppPageParams } from "./app-page-boundary.js";
 declare function getAppPageSegmentParamName(segment: string): string | null;
 declare function resolveAppPageSegmentParamScopeKeys(routeSegments: readonly string[] | null | undefined, treePosition: number): readonly string[];
 declare function resolveAppPageSegmentParams(routeSegments: readonly string[] | null | undefined, treePosition: number, matchedParams: AppPageParams): AppPageParams;
+declare function resolveAppPageBranchParams(branchSegments: readonly string[], treePosition: number, matchedParams: AppPageParams, scopedSegments?: readonly string[]): AppPageParams;
 //#endregion
-export { getAppPageSegmentParamName, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams };
+export { getAppPageSegmentParamName, resolveAppPageBranchParams, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams };

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

@@ -35,5 +35,12 @@ function resolveAppPageSegmentParams(routeSegments, treePosition, matchedParams)
 	}
 	return segmentParams;
 }
+function resolveAppPageBranchParams(branchSegments, treePosition, matchedParams, scopedSegments = branchSegments) {
+	const branchParamNames = new Set(branchSegments.map(getAppPageSegmentParamName).filter((name) => name !== null));
+	const scopedParams = {};
+	for (const [name, value] of Object.entries(matchedParams)) if (!branchParamNames.has(name)) scopedParams[name] = value;
+	Object.assign(scopedParams, resolveAppPageSegmentParams(scopedSegments, treePosition, matchedParams));
+	return scopedParams;
+}
 //#endregion
-export { getAppPageSegmentParamName, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams };
+export { getAppPageSegmentParamName, resolveAppPageBranchParams, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams };

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

@@ -119,6 +119,7 @@ type ProbeAppPageBeforeRenderResult = {
 };
 type ProbeAppPageBeforeRenderOptions = {
   hasLoadingBoundary: boolean;
+  probePageBeforeRender?: boolean;
   skipProbes?: boolean;
   layoutCount: number;
   probeLayoutAt: (layoutIndex: number) => unknown;

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

@@ -12,6 +12,7 @@ const DEFAULT_SUBTREE_PROBE_MAX_NODES = 1e3;
 const REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref");
 const REACT_LAZY_TYPE = Symbol.for("react.lazy");
 const REACT_MEMO_TYPE = Symbol.for("react.memo");
+const REACT_CLIENT_REFERENCE_TYPE = Symbol.for("react.client.reference");
 var AppPageSubtreeProbeLimitError = class extends Error {
 	constructor(message) {
 		super(message);
@@ -36,6 +37,9 @@ function isObjectLike(value) {
 function isUnknownFunction(value) {
 	return typeof value === "function";
 }
+function isReactClientReference(value) {
+	return isObjectLike(value) && Reflect.get(value, "$$typeof") === REACT_CLIENT_REFERENCE_TYPE;
+}
 function readReactMemoType(value) {
 	if (!isObjectLike(value) || Reflect.get(value, "$$typeof") !== REACT_MEMO_TYPE) return null;
 	return { innerType: Reflect.get(value, "type") };
@@ -80,6 +84,7 @@ async function probeReactServerSubtree(node, options = {}) {
 	};
 	const renderElementType = async (type, props, depth, wrapperDepth = 0) => {
 		if (wrapperDepth > maxDepth) throw new AppPageSubtreeProbeLimitError("App page layout subtree probe exceeded max depth");
+		if (isReactClientReference(type)) return false;
 		if (isUnknownFunction(type)) {
 			await visit(type(props), depth + 1);
 			return true;
@@ -252,7 +257,7 @@ async function probeAppPageBeforeRender(options) {
 			layoutFlags
 		};
 	}
-	if (options.hasLoadingBoundary) return {
+	if (options.hasLoadingBoundary || options.probePageBeforeRender === false) return {
 		response: null,
 		layoutFlags
 	};

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

@@ -2,6 +2,7 @@ import { AppElementsInterception } from "./app-elements-wire.js";
 //#region src/server/app-page-render-identity.d.ts
 type AppPageRenderIdentityInput = {
   displayPathname: string;
+  targetMatchedPathname?: string;
   interceptionContext?: string | null;
   interceptSourceMatchedUrl?: string | null;
   interceptSlotId?: string | null;

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

@@ -13,7 +13,7 @@ function normalizeAppPageInterceptionProofPathname(pathname) {
 }
 function createAppPageRenderIdentity(input) {
 	const interceptionContext = input.interceptionContext ?? null;
-	const targetMatchedPathname = normalizeAppPageRenderMatchedPathname(input.displayPathname);
+	const targetMatchedPathname = normalizeAppPageRenderMatchedPathname(input.targetMatchedPathname ?? input.displayPathname);
 	const sourceMatchedPathname = normalizeAppPageInterceptionProofPathname(input.interceptSourceMatchedUrl ?? null);
 	const slotId = input.interceptSlotId ?? null;
 	const matchedRoutePathname = sourceMatchedPathname ?? targetMatchedPathname;

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

@@ -37,6 +37,7 @@ type RenderAppPageLifecycleOptions = {
   cleanPathname: string;
   clearRequestContext: () => void;
   consumeDynamicUsage: () => boolean;
+  peekDynamicUsage?: () => boolean;
   consumeRenderObservationState?: () => AppPageRenderObservationState; /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */
   consumeInvalidDynamicUsageError?: () => unknown;
   createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
@@ -60,6 +61,8 @@ type RenderAppPageLifecycleOptions = {
   isProgressiveActionRender?: boolean;
   isPrerender?: boolean;
   isProduction: boolean;
+  probePageBeforeRender?: boolean;
+  omitPendingDynamicCacheState?: boolean;
   isRscRequest: boolean;
   isrDebug?: AppPageDebugLogger;
   isrHtmlKey: (pathname: string) => string;
@@ -81,7 +84,7 @@ type RenderAppPageLifecycleOptions = {
   expireSeconds?: number;
   formState?: ReactFormState | null;
   revalidateSeconds: number | null;
-  renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;
+  renderErrorBoundaryResponse: (error: unknown, errorOrigin: "rsc" | "ssr") => Promise<Response | null>;
   renderLayoutSpecialError: (specialError: AppPageSpecialError, layoutIndex: number) => Promise<Response>;
   renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;
   renderToReadableStream: (element: ReactNode | AppOutgoingElements, options: {