vinext 1.0.0-beta.0 → 1.0.0-beta.2

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

@@ -1,3 +1,4 @@
+import { stripBasePath } from "../utils/base-path.js";
 import { NEVER_CACHE_CONTROL } from "./cache-control.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
@@ -6,18 +7,34 @@ import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
-import { resolveAppPageSpecialError } from "./app-page-execution.js";
-import { resolveAppPageHead } from "./app-page-head.js";
+import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
+import { stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
+import { bufferAppPageBinaryStream, buildAppPageSpecialErrorResponse, resolveAppPageSpecialError } from "./app-page-execution.js";
+import { resolveActiveParallelRouteHeadInputs, resolveAppPageHead } from "./app-page-head.js";
 import { createAppPageLayoutEntries, createAppPageSourcePage } from "./app-page-route-wiring.js";
 import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
+import { resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport } from "./app-page-http-access-fallback-metadata.js";
+import "./app-rsc-route-matching.js";
 import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
-import { createAppPageFontData, renderAppPageHtmlResponse } from "./app-page-stream.js";
+import { resolveSlotParamOverrides } from "./app-page-element-builder.js";
+import { createAppPageFontData, createAppPageRscErrorTracker, renderAppPageHtmlResponse } from "./app-page-stream.js";
 import { Fragment, createElement } from "react";
 //#region src/server/app-page-boundary-render.ts
 const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
 function getDefaultExport(module) {
 	return module?.default ?? null;
 }
+function resolveHttpAccessBoundaryTreePosition(route, boundaryModule, statusCode) {
+	if (!route || !boundaryModule) return null;
+	const routeBoundary = statusCode === 403 ? route.forbidden : statusCode === 401 ? route.unauthorized : route.notFound;
+	const layoutBoundaries = statusCode === 403 ? route.forbiddens : statusCode === 401 ? route.unauthorizeds : route.notFounds;
+	if (boundaryModule === routeBoundary && statusCode === 404) return route.notFoundTreePosition ?? null;
+	if (boundaryModule === routeBoundary && statusCode === 403) return route.forbiddenTreePosition ?? null;
+	if (boundaryModule === routeBoundary && statusCode === 401) return route.unauthorizedTreePosition ?? null;
+	for (let index = (layoutBoundaries?.length ?? 0) - 1; index >= 0; index--) if (layoutBoundaries?.[index] === boundaryModule) return route.layoutTreePositions?.[index] ?? null;
+	return null;
+}
 function wrapRenderedBoundaryElement(options) {
 	return wrapAppPageBoundaryElement({
 		element: options.element,
@@ -89,52 +106,95 @@ function createAppPageBoundaryRscPayload(options) {
 		[routeId]: options.element
 	};
 }
-async function renderAppPageBoundaryElementResponse(options) {
-	const requestUrl = new URL(options.requestUrl);
-	const pathname = requestUrl.pathname;
-	return renderAppPageBoundaryResponse({
-		async createHtmlResponse(rscStream, responseStatus) {
-			const fontData = createAppPageFontData({
-				getLinks: options.getFontLinks,
-				getPreloads: options.getFontPreloads,
-				getStyles: options.getFontStyles
-			});
-			const ssrHandler = await options.loadSsrHandler();
-			return renderAppPageHtmlResponse({
-				clearRequestContext: options.clearRequestContext,
-				fontData,
-				fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),
-				isEdgeRuntime: options.isEdgeRuntime,
-				middlewareHeaders: options.middlewareContext.headers,
-				navigationContext: options.getNavigationContext() ?? {
-					pathname,
-					searchParams: requestUrl.searchParams,
-					params: options.navigationParams ?? options.route?.params ?? {}
-				},
-				rscStream,
-				scriptNonce: options.scriptNonce,
-				ssrHandler,
-				status: responseStatus,
-				initialDevServerError: options.initialDevServerError
-			});
-		},
-		createRscOnErrorHandler() {
-			return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);
-		},
-		element: createAppPageBoundaryRscPayload({
-			element: options.element,
-			layoutModules: options.layoutModules,
-			pathname,
-			route: options.route,
-			sourcePageSegments: options.sourcePageSegments
+function renderBoundarySpecialErrorResponse(options, specialError) {
+	return buildAppPageSpecialErrorResponse({
+		basePath: options.basePath,
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
+			renderToReadableStream: options.renderToReadableStream,
+			digest: rscOptions.digest
 		}),
+		clearRequestContext: options.clearRequestContext,
+		getAndClearPendingCookies: options.getAndClearPendingCookies,
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
-		middlewareHeaders: options.middlewareContext.headers,
-		renderToReadableStream: options.renderToReadableStream,
-		status: options.status
+		middlewareContext: options.middlewareContext,
+		serveStreamingMetadata: options.serveStreamingMetadata,
+		request: options.request,
+		specialError
 	});
 }
+async function renderAppPageBoundaryElementResponse(options) {
+	const requestUrl = new URL(options.requestUrl);
+	const pathname = requestUrl.pathname;
+	const payload = createAppPageBoundaryRscPayload({
+		element: options.element,
+		layoutModules: options.layoutModules,
+		pathname,
+		route: options.route,
+		sourcePageSegments: options.sourcePageSegments
+	});
+	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname));
+	const resolveCapturedSpecialError = (error) => resolveAppPageSpecialError(error) ?? resolveAppPageSpecialError(rscErrorTracker.getCapturedSpecialError());
+	const renderSpecialErrorResponse = (specialError) => renderBoundarySpecialErrorResponse(options, specialError);
+	const handleSpecialErrors = options.handleSpecialErrors === true;
+	let response;
+	try {
+		response = await renderAppPageBoundaryResponse({
+			async createHtmlResponse(rscStream, responseStatus) {
+				const fontData = createAppPageFontData({
+					getLinks: options.getFontLinks,
+					getPreloads: options.getFontPreloads,
+					getStyles: options.getFontStyles
+				});
+				const ssrHandler = await options.loadSsrHandler();
+				return renderAppPageHtmlResponse({
+					clearRequestContext: options.clearRequestContext,
+					fontData,
+					fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),
+					isEdgeRuntime: options.isEdgeRuntime,
+					middlewareHeaders: options.middlewareContext.headers,
+					navigationContext: options.getNavigationContext() ?? {
+						pathname,
+						searchParams: requestUrl.searchParams,
+						params: options.navigationParams ?? options.route?.params ?? {}
+					},
+					rscStream,
+					scriptNonce: options.scriptNonce,
+					ssrHandler,
+					status: responseStatus,
+					initialDevServerError: options.initialDevServerError
+				});
+			},
+			createRscOnErrorHandler() {
+				return rscErrorTracker.onRenderError;
+			},
+			element: payload,
+			isEdgeRuntime: options.isEdgeRuntime,
+			isRscRequest: options.isRscRequest,
+			middlewareHeaders: options.middlewareContext.headers,
+			renderToReadableStream: options.renderToReadableStream,
+			status: options.status
+		});
+	} catch (error) {
+		const specialError = handleSpecialErrors ? resolveCapturedSpecialError(error) : null;
+		if (specialError !== null) return renderSpecialErrorResponse(specialError);
+		throw error;
+	}
+	if (!handleSpecialErrors) return response;
+	if (options.isRscRequest && response.body) {
+		const bufferedStream = await bufferAppPageBinaryStream(response.body);
+		response = new Response(bufferedStream, {
+			status: response.status,
+			headers: response.headers
+		});
+	}
+	const specialError = resolveCapturedSpecialError();
+	if (!specialError) return response;
+	if (response.body) try {
+		await response.body.cancel();
+	} catch {}
+	return renderSpecialErrorResponse(specialError);
+}
 async function renderAppPageHttpAccessFallback(options) {
 	const resolvedBoundaryModule = resolveAppPageHttpAccessBoundaryModule({
 		rootForbiddenModule: options.rootForbiddenModule,
@@ -150,18 +210,92 @@ async function renderAppPageHttpAccessFallback(options) {
 	if (!boundaryComponent) return null;
 	const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
 	const pathname = new URL(options.requestUrl).pathname;
+	const routePathname = options.routePathname ?? stripRscSuffix(stripBasePath(pathname, options.basePath ?? ""));
 	const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);
-	const { metadata, viewport } = await resolveAppPageHead({
-		applyFileBasedMetadata: options.applyFileBasedMetadata,
-		basePath: options.basePath ?? "",
-		layoutModules,
-		layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
-		metadataRoutes: options.metadataRoutes,
-		pageModule: boundaryModule,
-		params: options.matchedParams,
-		routePath: options.route?.pattern ?? pathname,
-		routeSegments
-	});
+	const fallbackRouteSegments = routeSegments ?? [];
+	let head;
+	try {
+		if ([
+			401,
+			403,
+			404
+		].includes(options.statusCode)) {
+			const boundaryTreePosition = resolveHttpAccessBoundaryTreePosition(options.route, boundaryModule, options.statusCode);
+			const boundaryParams = boundaryTreePosition == null ? {} : resolveAppPageSegmentParams(fallbackRouteSegments, boundaryTreePosition, options.matchedParams);
+			const intercept = options.intercept;
+			const isSiblingIntercept = intercept?.interceptSlotKey === "__vinext_page_intercept" && intercept.interceptPage != null;
+			const effectiveParams = isSiblingIntercept ? intercept.interceptParams ?? options.matchedParams : options.matchedParams;
+			const slotParams = resolveSlotParamOverrides({ slots: options.route?.slots ?? null }, routePathname);
+			const parallelBranches = resolveActiveParallelRouteHeadInputs({
+				interceptBranchSegments: intercept?.interceptBranchSegments ?? null,
+				interceptLayouts: intercept?.interceptLayouts ?? null,
+				interceptLayoutSegments: intercept?.interceptLayoutSegments ?? null,
+				interceptNotFoundBranchSegments: intercept?.interceptNotFoundBranchSegments ?? null,
+				interceptNotFound: intercept?.interceptNotFound ?? null,
+				interceptNotFoundTreePosition: intercept?.interceptNotFoundTreePosition ?? null,
+				interceptPage: intercept?.interceptPage ?? null,
+				interceptParams: intercept?.interceptParams ?? null,
+				interceptSlotKey: intercept?.interceptSlotKey ?? null,
+				interceptSourcePageSegments: intercept?.interceptSourcePageSegments ?? null,
+				layoutTreePositions: options.route?.layoutTreePositions,
+				params: options.matchedParams,
+				routeSegments: fallbackRouteSegments,
+				slotParams,
+				slots: options.route?.slots ?? null
+			});
+			const primaryParallelBranch = isSiblingIntercept ? {
+				head: {
+					layoutModules: intercept?.interceptLayouts ?? [],
+					layoutParams: (intercept?.interceptLayoutSegments ?? []).map((segments) => resolveAppPageBranchParams(intercept?.interceptBranchSegments ?? segments, segments.length, effectiveParams, segments)),
+					pageModule: intercept?.interceptPage ?? null,
+					params: effectiveParams,
+					routeSegments: intercept?.interceptSourcePageSegments ?? fallbackRouteSegments
+				},
+				...intercept?.interceptNotFound ? {
+					notFoundModule: intercept.interceptNotFound,
+					notFoundParams: resolveAppPageBranchParams(intercept.interceptNotFoundBranchSegments ?? intercept.interceptBranchSegments ?? fallbackRouteSegments, intercept.interceptNotFoundTreePosition ?? 0, effectiveParams)
+				} : {},
+				ownerTreePosition: fallbackRouteSegments.length
+			} : null;
+			const fallbackHeadOptions = {
+				boundaryModule,
+				boundaryParams,
+				branchNotFoundConventions: options.statusCode === 404,
+				layoutModules,
+				layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
+				parallelBranches,
+				params: options.matchedParams,
+				primaryParallelBranch,
+				routeSegments
+			};
+			const [metadata, viewport] = await Promise.all([resolveHttpAccessFallbackMetadata({
+				applyFileBasedMetadata: options.applyFileBasedMetadata,
+				basePath: options.basePath ?? "",
+				...fallbackHeadOptions,
+				metadataRoutes: options.metadataRoutes,
+				routePath: options.route?.pattern ?? pathname
+			}), resolveHttpAccessFallbackViewport(fallbackHeadOptions)]);
+			head = {
+				metadata,
+				viewport
+			};
+		} else head = await resolveAppPageHead({
+			applyFileBasedMetadata: options.applyFileBasedMetadata,
+			basePath: options.basePath ?? "",
+			layoutModules,
+			layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
+			metadataRoutes: options.metadataRoutes,
+			pageModule: boundaryModule,
+			params: options.matchedParams,
+			routePath: options.route?.pattern ?? pathname,
+			routeSegments
+		});
+	} catch (error) {
+		const specialError = resolveAppPageSpecialError(error);
+		if (specialError) return renderBoundarySpecialErrorResponse(options, specialError);
+		throw error;
+	}
+	const { metadata, viewport } = head;
 	const headElements = [createElement("meta", {
 		charSet: "utf-8",
 		key: "charset"
@@ -197,6 +331,7 @@ async function renderAppPageHttpAccessFallback(options) {
 	return renderAppPageBoundaryElementResponse({
 		...options,
 		element,
+		handleSpecialErrors: true,
 		layoutModules: skipLayoutWrapping ? [] : layoutModules,
 		navigationParams: options.matchedParams,
 		route: skipLayoutWrapping ? null : options.route,

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

@@ -1,6 +1,6 @@
 import { RenderObservation } from "./cache-proof.js";
-import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 
 //#region src/server/app-page-cache-finalizer.d.ts

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

@@ -1,6 +1,6 @@
 import { RenderObservation } from "./cache-proof.js";
-import { CacheControlMetadata, CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { CacheControlMetadata, CachedAppPageValue } from "../shims/cache-handler.js";
 import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite } from "./app-page-cache-finalizer.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 

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

@@ -4,11 +4,11 @@ import { AppOutgoingElements } from "./app-elements-wire.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageFontPreload, LayoutClassificationOptions } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
+import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
-import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { CachedAppPageValue } from "../shims/cache-handler.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";
@@ -36,6 +36,9 @@ type AppPageDispatchIntercept<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  notFound?: unknown;
+  notFoundTreePosition?: number | null;
   matchedParams: AppPageParams;
   sourceMatchedParams?: AppPageParams;
   page: TPage;
@@ -49,6 +52,9 @@ type AppPageDispatchInterceptOptions<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  interceptNotFound?: unknown;
+  interceptNotFoundTreePosition?: number | null;
   interceptPage: TPage;
   interceptParams: AppPageParams;
   interceptSlotId?: string | null;
@@ -73,6 +79,7 @@ type AppPageDispatchRoute = {
   error?: AppPageModule | null;
   errors?: readonly (AppPageModule | null | undefined)[];
   forbidden?: AppPageModule | null;
+  forbiddenTreePosition?: number | null;
   forbiddens?: readonly (AppPageModule | null | undefined)[];
   isDynamic: boolean;
   layouts: readonly AppPageModule[];
@@ -85,6 +92,7 @@ type AppPageDispatchRoute = {
   routeSegments: readonly string[];
   slots?: Readonly<Record<string, AppPageDispatchSlot>>;
   unauthorized?: AppPageModule | null;
+  unauthorizedTreePosition?: number | null;
   unauthorizeds?: readonly (AppPageModule | null | undefined)[];
 };
 type AppPagePprRuntime<TRoute extends AppPageDispatchRoute> = {
@@ -112,6 +120,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker, options?: {
     observeMetadataSearchParamsAccess?: boolean;
     observePageSearchParamsAccess?: boolean;
+    serveStreamingMetadata?: boolean;
   }) => Promise<AppPageElement>;
   clientReuseManifest?: ClientReuseManifestParseResult;
   cleanPathname: string;
@@ -184,6 +193,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   renderHttpAccessFallbackPage: (statusCode: number, opts: {
     boundaryComponent?: unknown;
     boundaryModule?: AppPageModule | null;
+    intercept?: AppPageDispatchInterceptOptions | null;
     layouts?: readonly AppPageModule[];
     matchedParams: AppPageParams;
   }, middlewareContext: AppPageMiddlewareContext | null) => Promise<Response | null>;

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

@@ -4,24 +4,24 @@ import "../utils/protocol-headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, markDynamicUsage, peekDynamicUsage, peekRenderRequestApiUsage, setHeadersContext } from "../shims/headers.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, peekDynamicUsage, peekRenderRequestApiUsage, runWithIsolatedDynamicUsage, setHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _peekRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, setRefreshStaleFetchesInForeground } from "../shims/fetch-cache.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import "./app-page-response.js";
+import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
 import { buildAppPageSpecialErrorResponse, probeAppPageThrownError, resolveAppPageSpecialError } from "./app-page-execution.js";
 import { createAppPageTreePath } from "./app-page-route-wiring.js";
 import { consumeAppPageRenderObservationState, discardAppPageRenderState } from "./app-page-render-observation.js";
 import { resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule } from "./app-page-boundary.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { createAppLayoutParamAccessTracker, isAppLayoutObservationUnsafeForStaticReuse } from "./app-layout-param-observation.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageMethodResponse } from "./app-page-method.js";
-import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
-import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { buildAppPageElement, resolveAppPageIntercept, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams } from "./app-page-request.js";
 import { renderAppPageLifecycle } from "./app-page-render.js";
-import React from "react";
 //#region src/server/app-page-dispatch.ts
 function resolveAppPageRouteBoundaryModule(route, statusCode) {
 	if (statusCode === 403) return route.forbidden ?? null;
@@ -140,6 +140,9 @@ function toInterceptOptions(interceptionContext, intercept) {
 		interceptLayouts: intercept.interceptLayouts,
 		interceptLayoutSegments: intercept.interceptLayoutSegments,
 		interceptBranchSegments: intercept.interceptBranchSegments,
+		interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
+		interceptNotFound: intercept.notFound,
+		interceptNotFoundTreePosition: intercept.notFoundTreePosition,
 		interceptPage: intercept.page,
 		interceptParams: intercept.matchedParams,
 		interceptSlotId: intercept.slotId ?? null,
@@ -160,6 +163,9 @@ async function dispatchAppPageInner(options) {
 	const isForceStatic = dynamicConfig === "force-static";
 	const isDynamicError = dynamicConfig === "error";
 	const isForceDynamic = dynamicConfig === "force-dynamic";
+	const isPrerender = process.env.VINEXT_PRERENDER === "1";
+	const serveStreamingMetadata = shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots);
+	const placeGeneratedMetadataInBody = (!isPrerender || options.pprFallbackShell !== void 0) && serveStreamingMetadata;
 	const isPrefetchDynamicShell = options.renderMode === APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
 	const isDraftMode = isDraftModeRequest(options.request, options.draftModeSecret);
 	const requestHeadersContext = getHeadersContext();
@@ -269,7 +275,8 @@ async function dispatchAppPageInner(options) {
 					const { renderAppPageCacheArtifacts } = await import("./app-page-cache-render.js");
 					const revalidatedElement = await options.buildPageElement(revalidationTarget.route, revalidationTarget.params, revalidationTarget.interceptOpts, new URLSearchParams(), void 0, {
 						observeMetadataSearchParamsAccess: revalidationDynamicConfig !== "force-static",
-						observePageSearchParamsAccess: revalidationDynamicConfig !== "force-static"
+						observePageSearchParamsAccess: revalidationDynamicConfig !== "force-static",
+						serveStreamingMetadata: false
 					});
 					const revalidatedOnError = options.createRscOnErrorHandler(options.cleanPathname, revalidationTarget.route.pattern);
 					const rendered = await renderAppPageCacheArtifacts({
@@ -314,7 +321,7 @@ async function dispatchAppPageInner(options) {
 		});
 		if (cachedPageResponse) return cachedPageResponse;
 	}
-	if (options.skipStaticParamsValidation !== true) {
+	if (options.skipStaticParamsValidation !== true && !(options.isProduction && isForceDynamic)) {
 		const dynamicParamsResponse = await validateAppPageDynamicParams({
 			clearRequestContext: options.clearRequestContext,
 			enforceStaticParamsOnly: options.dynamicParamsConfig === false,
@@ -345,7 +352,8 @@ async function dispatchAppPageInner(options) {
 			setCurrentForceDynamicFetchDefault(sourceDynamicConfig === "force-dynamic");
 			return options.buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess, {
 				observeMetadataSearchParamsAccess: sourceDynamicConfig !== "force-static",
-				observePageSearchParamsAccess: sourceDynamicConfig !== "force-static"
+				observePageSearchParamsAccess: sourceDynamicConfig !== "force-static",
+				serveStreamingMetadata: placeGeneratedMetadataInBody
 			});
 		},
 		cleanPathname: options.cleanPathname,
@@ -397,7 +405,8 @@ async function dispatchAppPageInner(options) {
 			if (options.actionFailed) throw options.actionError;
 			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, pageSearchParams, layoutParamAccess, {
 				observeMetadataSearchParamsAccess: !isForceStatic,
-				observePageSearchParamsAccess: !isForceStatic
+				observePageSearchParamsAccess: !isForceStatic,
+				serveStreamingMetadata: placeGeneratedMetadataInBody
 			});
 		},
 		async probePageSpecialError() {
@@ -413,7 +422,7 @@ async function dispatchAppPageInner(options) {
 			return options.renderErrorBoundaryPage(buildError);
 		},
 		renderSpecialError(specialError) {
-			return renderPageSpecialError(options, specialError);
+			return renderPageSpecialError(options, specialError, serveStreamingMetadata, interceptResult.interceptOpts);
 		},
 		resolveSpecialError: resolveAppPageSpecialError
 	});
@@ -441,7 +450,6 @@ async function dispatchAppPageInner(options) {
 	const activeFallbackShellState = options.pprRuntime?.getState() ?? null;
 	const pprFallbackShellSignal = activeFallbackShellState?.abortController.signal;
 	const pprFallbackShellReactSignal = activeFallbackShellState?.reactAbortController.signal;
-	const isPrerender = process.env.VINEXT_PRERENDER === "1";
 	const isSpeculativePrerender = isPrerender && options.request.headers.get("x-vinext-prerender-speculative") === "1";
 	return renderAppPageLifecycle({
 		basePath: options.basePath,
@@ -530,16 +538,7 @@ async function dispatchAppPageInner(options) {
 				return isAppLayoutObservationUnsafeForStaticReuse(layoutParamAccess.getLayoutObservation(layoutId));
 			},
 			async runWithIsolatedDynamicScope(fn) {
-				const priorDynamic = consumeDynamicUsage();
-				try {
-					return {
-						result: await fn(),
-						dynamicDetected: consumeDynamicUsage()
-					};
-				} finally {
-					consumeDynamicUsage();
-					if (priorDynamic) markDynamicUsage();
-				}
+				return runWithIsolatedDynamicUsage(fn);
 			}
 		},
 		dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds,
@@ -550,10 +549,10 @@ async function dispatchAppPageInner(options) {
 			return options.renderErrorBoundaryPage(renderError, errorOrigin);
 		},
 		renderLayoutSpecialError(specialError, layoutIndex) {
-			return renderLayoutSpecialError(options, specialError, layoutIndex);
+			return renderLayoutSpecialError(options, specialError, layoutIndex, serveStreamingMetadata);
 		},
 		renderPageSpecialError(specialError) {
-			return renderPageSpecialError(options, specialError);
+			return renderPageSpecialError(options, specialError, serveStreamingMetadata, interceptResult.interceptOpts);
 		},
 		renderToReadableStream: options.renderToReadableStream,
 		hasCustomGlobalError: options.hasCustomGlobalError,
@@ -568,35 +567,16 @@ async function dispatchAppPageInner(options) {
 		}
 	});
 }
-/**
-* Builds an RSC flight payload that encodes a redirect as a React error chunk.
-* We render a tiny element that immediately throws an `Error` whose `digest`
-* is the canonical `NEXT_REDIRECT;...` string. `renderToReadableStream`'s
-* `onError` returns that digest, react-server-dom-webpack serializes the
-* error into the stream, and the client's `RedirectErrorBoundary` decodes it
-* via `getURLFromRedirectError` / `getRedirectTypeFromError`.
-*
-* The thrown error's digest matches Next.js's well-known router error format,
-* so neither vinext's RSC error handler nor Next.js's reporter logs it as a
-* "real" server error. Mirrors `app-render.tsx generateDynamicFlightRenderResult`
-* where a redirect thrown during RSC rendering propagates through
-* `renderToFlightStream`'s `onError` callback into the flight payload.
-*/
-function buildRscRedirectFlightStream(options, digest) {
-	const throwingElement = React.createElement(function NextRedirectFlightThrower() {
-		const err = /* @__PURE__ */ new Error("NEXT_REDIRECT");
-		err.digest = digest;
-		throw err;
-	});
-	return options.renderToReadableStream(throwingElement, { onError: () => digest });
-}
-async function renderLayoutSpecialError(options, specialError, layoutIndex) {
+async function renderLayoutSpecialError(options, specialError, layoutIndex, serveStreamingMetadata) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
-		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
+			renderToReadableStream: options.renderToReadableStream,
+			digest: rscOptions.digest
+		}),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
-		serveStreamingMetadata: shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots),
+		serveStreamingMetadata,
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
@@ -625,13 +605,16 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 		specialError
 	});
 }
-async function renderPageSpecialError(options, specialError) {
+async function renderPageSpecialError(options, specialError, serveStreamingMetadata, intercept) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
-		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
+			renderToReadableStream: options.renderToReadableStream,
+			digest: rscOptions.digest
+		}),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
-		serveStreamingMetadata: shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots),
+		serveStreamingMetadata,
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
@@ -649,7 +632,10 @@ async function renderPageSpecialError(options, specialError) {
 				statusCode
 			});
 			const useLayoutAlignedBoundary = boundaryLayoutIndex !== null && (routeBoundaryModule === null || routeBoundaryModule === parentBoundaryModule);
-			const fallbackOptions = { matchedParams: options.params };
+			const fallbackOptions = {
+				intercept,
+				matchedParams: options.params
+			};
 			if (useLayoutAlignedBoundary && boundaryLayoutIndex !== null) {
 				fallbackOptions.layouts = options.route.layouts.slice(0, boundaryLayoutIndex + 1);
 				if (parentBoundaryModule) {

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

@@ -22,6 +22,9 @@ type AppPageInterceptOptions<TModule extends AppPageModule = AppPageModule> = {
   interceptLayouts?: readonly (TModule | null | undefined)[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  interceptNotFound?: TModule | null;
+  interceptNotFoundTreePosition?: number | null;
   interceptPage?: TModule | null;
   interceptParams?: AppPageParams | null;
   interceptSlotId?: string | null;
@@ -37,7 +40,9 @@ type AppPagePageRequest<TModule extends AppPageModule = AppPageModule> = {
   mountedSlotsHeader: string | null; /** Semantic RSC payload mode for this page render. */
   renderMode?: AppRscRenderMode; /** Observe page `searchParams` access for cache-safety classification. */
   observePageSearchParamsAccess?: boolean; /** Observe page metadata `searchParams` access for cache-safety classification. */
-  observeMetadataSearchParamsAccess?: boolean;
+  observeMetadataSearchParamsAccess?: boolean; /** Whether generated metadata may stream into the response body. */
+  serveStreamingMetadata?: boolean; /** Whether streamed render errors must be sanitized for client transport. */
+  isProduction?: boolean;
 };
 type BuildPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
@@ -96,6 +101,7 @@ type AppPageNavigationParamInterceptOptions = {
  */
 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 resolveSlotParamOverrides(route: AppPageNavigationParamRoute, routePath: string): Readonly<Record<string, AppPageParams>> | 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, resolveInterceptedSlotSegments };
+export { AppPageBuildRoute, type AppPageErrorModule, AppPageInterceptOptions, AppPagePageRequest, type AppPageRouteWiringRoute, BuildPageElementsOptions, buildPageElements, resolveAppPageNavigationParams, resolveInterceptedSlotSegments, resolveSlotParamOverrides };