vinext 1.0.0-beta.1 → 1.0.0-beta.3

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,12 +7,17 @@ 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 { 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 { resolveAppPageHead } from "./app-page-head.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 { 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
@@ -19,6 +25,16 @@ 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,
@@ -194,10 +210,76 @@ 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 fallbackRouteSegments = routeSegments ?? [];
 	let head;
 	try {
-		head = await resolveAppPageHead({
+		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,

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-finalizer.js

@@ -1,7 +1,7 @@
 import { NEXTJS_CACHE_HEADER, VINEXT_CACHE_HEADER } from "./headers.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 //#region src/server/app-page-cache-finalizer.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";
 
@@ -18,7 +18,7 @@ type AppPageCacheOutcomeMetric = Readonly<{
    */
   cacheKey: string;
   outcome: "hit" | "miss" | "stale";
-  reason: "empty-entry" | "no-entry" | "non-app-page-entry" | "query-variant-unproven" | "read-error" | "served" | "stale-empty-entry";
+  reason: "empty-entry" | "expired" | "no-entry" | "non-app-page-entry" | "query-variant-unproven" | "read-error" | "served" | "stale-empty-entry";
 }>;
 type AppPageCacheOutcomeRecorder = (metric: AppPageCacheOutcomeMetric) => void;
 type AppPageCacheRenderResult = {

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

@@ -1,9 +1,9 @@
 import { VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { decideIsr } from "./isr-decision.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
+import { setCacheStateHeaders } from "./cache-headers.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 { applyEdgeRuntimeHeader } from "./app-page-response.js";
@@ -58,7 +58,7 @@ function hasQueryInvariantAppPageProof(cachedValue) {
 function resolveRegeneratedAppPageCachePolicy(options) {
 	let revalidateSeconds = options.routeRevalidateSeconds;
 	const renderRevalidateSeconds = options.renderCacheControl?.revalidate;
-	if (renderRevalidateSeconds !== void 0) revalidateSeconds = revalidateSeconds > 0 ? Math.min(revalidateSeconds, renderRevalidateSeconds) : renderRevalidateSeconds;
+	if (typeof renderRevalidateSeconds === "number") revalidateSeconds = revalidateSeconds > 0 ? Math.min(revalidateSeconds, renderRevalidateSeconds) : renderRevalidateSeconds;
 	return {
 		expireSeconds: options.renderCacheControl?.expire ?? options.expireSeconds,
 		revalidateSeconds
@@ -105,6 +105,10 @@ function buildAppPageCachedResponse(cachedValue, options) {
 	});
 }
 async function serveAppPageCachedHtml(options, transformValue) {
+	if (options.cached?.isExpired) {
+		options.isrDebug?.("MISS (expired)", options.pathname);
+		return null;
+	}
 	if (typeof options.cachedValue.html !== "string" || options.cachedValue.html.length === 0) {
 		if (options.cached?.isStale) options.scheduleRegeneration();
 		options.isrDebug?.(options.emptyDebugMessage, options.pathname);
@@ -137,6 +141,16 @@ async function readAppPageCacheResponse(options) {
 	try {
 		const cached = await options.isrGet(isrKey);
 		const cachedValue = getCachedAppPageValue(cached);
+		if (cached?.isExpired) {
+			recordAppPageCacheOutcome(options.recordCacheOutcome, {
+				artifact,
+				cacheKey: isrKey,
+				outcome: "miss",
+				reason: "expired"
+			});
+			options.isrDebug?.("MISS (expired)", options.cleanPathname);
+			return null;
+		}
 		if (cached && !cachedValue) {
 			recordAppPageCacheOutcome(options.recordCacheOutcome, {
 				artifact,

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,11 @@ type AppPageDispatchIntercept<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptLoadings?: readonly unknown[] | null;
+  interceptLoadingTreePositions?: readonly number[] | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  notFound?: unknown;
+  notFoundTreePosition?: number | null;
   matchedParams: AppPageParams;
   sourceMatchedParams?: AppPageParams;
   page: TPage;
@@ -49,6 +54,11 @@ type AppPageDispatchInterceptOptions<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptLoadings?: readonly unknown[] | null;
+  interceptLoadingTreePositions?: readonly number[] | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  interceptNotFound?: unknown;
+  interceptNotFoundTreePosition?: number | null;
   interceptPage: TPage;
   interceptParams: AppPageParams;
   interceptSlotId?: string | null;
@@ -63,6 +73,8 @@ type AppPageModule = {
 };
 type AppPageDispatchSlot = {
   default?: AppPageModule | null;
+  loading?: AppPageModule | null;
+  loadings?: readonly (AppPageModule | null | undefined)[] | null;
   page?: AppPageModule | null;
   slotPatternParts?: readonly string[] | null;
   slotParamNames?: readonly string[] | null;
@@ -73,11 +85,14 @@ 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[];
   layoutTreePositions?: readonly number[];
   loading?: AppPageModule | null;
+  loadings?: readonly (AppPageModule | null | undefined)[];
+  loadingTreePositions?: readonly number[];
   notFound?: AppPageModule | null;
   notFounds?: readonly (AppPageModule | null | undefined)[];
   params: readonly string[];
@@ -85,6 +100,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> = {
@@ -185,6 +201,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

@@ -1,10 +1,10 @@
-import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 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";
@@ -16,13 +16,29 @@ 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 { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { buildAppPageElement, resolveAppPageIntercept, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams } from "./app-page-request.js";
 import { renderAppPageLifecycle } from "./app-page-render.js";
 //#region src/server/app-page-dispatch.ts
+function getActiveLoadingTreePositions(route) {
+	const positions = [];
+	for (const [index, loadingModule] of (route.loadings ?? []).entries()) {
+		if (!loadingModule?.default) continue;
+		const treePosition = route.loadingTreePositions?.[index];
+		if (treePosition !== void 0) positions.push(treePosition);
+	}
+	if (positions.length === 0 && route.loading?.default) positions.push(route.routeSegments.length);
+	return positions;
+}
+function getAppPageLayoutProbeCount(route, loadingTreePositions) {
+	const firstLoadingTreePosition = loadingTreePositions.reduce((first, position) => first === null || position < first ? position : first, null);
+	if (firstLoadingTreePosition === null) return route.layouts.length;
+	const firstSuspendedLayoutIndex = (route.layoutTreePositions ?? []).findIndex((position) => position > firstLoadingTreePosition);
+	return firstSuspendedLayoutIndex === -1 ? route.layouts.length : firstSuspendedLayoutIndex;
+}
 function resolveAppPageRouteBoundaryModule(route, statusCode) {
 	if (statusCode === 403) return route.forbidden ?? null;
 	if (statusCode === 401) return route.unauthorized ?? null;
@@ -110,7 +126,7 @@ function hasSearchParams(searchParams) {
 }
 async function runAppPageRevalidationContext(options, renderFn) {
 	const { createStaticGenerationHeadersContext } = await import("./app-static-generation.js");
-	return runWithRequestContext(createRequestContext({
+	const requestContext = createRequestContext({
 		headersContext: createStaticGenerationHeadersContext({
 			draftModeEnabled: false,
 			draftModeSecret: options.draftModeSecret,
@@ -122,7 +138,8 @@ async function runAppPageRevalidationContext(options, renderFn) {
 		currentForceDynamicFetchDefault: options.dynamicConfig === "force-dynamic",
 		executionContext: getRequestExecutionContext(),
 		unstableCacheRevalidation: "foreground"
-	}), async () => {
+	});
+	const revalidation = runWithRequestContext(requestContext, async () => {
 		ensureFetchPatch();
 		setRefreshStaleFetchesInForeground(process.env.VINEXT_PRERENDER === "1");
 		setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], options.routeSegments));
@@ -133,6 +150,11 @@ async function runAppPageRevalidationContext(options, renderFn) {
 		});
 		return await runWithFetchDedupe(renderFn);
 	});
+	try {
+		return await revalidation;
+	} finally {
+		await closeAfterResponse(requestContext);
+	}
 }
 function toInterceptOptions(interceptionContext, intercept) {
 	return {
@@ -140,6 +162,11 @@ function toInterceptOptions(interceptionContext, intercept) {
 		interceptLayouts: intercept.interceptLayouts,
 		interceptLayoutSegments: intercept.interceptLayoutSegments,
 		interceptBranchSegments: intercept.interceptBranchSegments,
+		interceptLoadings: intercept.interceptLoadings,
+		interceptLoadingTreePositions: intercept.interceptLoadingTreePositions,
+		interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
+		interceptNotFound: intercept.notFound,
+		interceptNotFoundTreePosition: intercept.notFoundTreePosition,
 		interceptPage: intercept.page,
 		interceptParams: intercept.matchedParams,
 		interceptSlotId: intercept.slotId ?? null,
@@ -170,7 +197,8 @@ async function dispatchAppPageInner(options) {
 	const hasRequestSearchParams = !shouldUseEmptySearchParams && hasSearchParams(options.searchParams);
 	const pageSearchParams = shouldUseEmptySearchParams ? new URLSearchParams() : options.searchParams;
 	const layoutParamAccess = createAppLayoutParamAccessTracker();
-	const hasActiveLoadingBoundary = Boolean(route.loading?.default);
+	const activeLoadingTreePositions = getActiveLoadingTreePositions(route);
+	const hasActiveLoadingBoundary = activeLoadingTreePositions.length > 0;
 	setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], route.routeSegments));
 	setCurrentFetchCacheMode(options.fetchCache ?? null);
 	setCurrentForceDynamicFetchDefault(isForceDynamic);
@@ -318,7 +346,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,
@@ -407,7 +435,7 @@ async function dispatchAppPageInner(options) {
 			});
 		},
 		async probePageSpecialError() {
-			if (route.loading?.default) return null;
+			if (hasActiveLoadingBoundary) return null;
 			return resolveAppPageSpecialError(await probeAppPageThrownError({
 				probePage: () => options.probePage(pageSearchParams),
 				runWithSuppressedHookWarning(probe) {
@@ -419,7 +447,7 @@ async function dispatchAppPageInner(options) {
 			return options.renderErrorBoundaryPage(buildError);
 		},
 		renderSpecialError(specialError) {
-			return renderPageSpecialError(options, specialError, serveStreamingMetadata);
+			return renderPageSpecialError(options, specialError, serveStreamingMetadata, interceptResult.interceptOpts);
 		},
 		resolveSpecialError: resolveAppPageSpecialError
 	});
@@ -497,7 +525,7 @@ async function dispatchAppPageInner(options) {
 		isrSet: options.isrSet,
 		interceptionContext: options.interceptionContext,
 		expireSeconds: options.expireSeconds,
-		layoutCount: route.layouts.length,
+		layoutCount: getAppPageLayoutProbeCount(route, activeLoadingTreePositions),
 		loadSsrHandler: options.loadSsrHandler,
 		middlewareContext: options.middlewareContext,
 		navigationParams,
@@ -535,16 +563,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,
@@ -558,7 +577,7 @@ async function dispatchAppPageInner(options) {
 			return renderLayoutSpecialError(options, specialError, layoutIndex, serveStreamingMetadata);
 		},
 		renderPageSpecialError(specialError) {
-			return renderPageSpecialError(options, specialError, serveStreamingMetadata);
+			return renderPageSpecialError(options, specialError, serveStreamingMetadata, interceptResult.interceptOpts);
 		},
 		renderToReadableStream: options.renderToReadableStream,
 		hasCustomGlobalError: options.hasCustomGlobalError,
@@ -611,7 +630,7 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex, serv
 		specialError
 	});
 }
-async function renderPageSpecialError(options, specialError, serveStreamingMetadata) {
+async function renderPageSpecialError(options, specialError, serveStreamingMetadata, intercept) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
 		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
@@ -638,7 +657,10 @@ async function renderPageSpecialError(options, specialError, serveStreamingMetad
 				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,11 @@ type AppPageInterceptOptions<TModule extends AppPageModule = AppPageModule> = {
   interceptLayouts?: readonly (TModule | null | undefined)[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptLoadings?: readonly (TModule | null | undefined)[] | null;
+  interceptLoadingTreePositions?: readonly number[] | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  interceptNotFound?: TModule | null;
+  interceptNotFoundTreePosition?: number | null;
   interceptPage?: TModule | null;
   interceptParams?: AppPageParams | null;
   interceptSlotId?: string | null;
@@ -38,7 +43,8 @@ type AppPagePageRequest<TModule extends AppPageModule = AppPageModule> = {
   renderMode?: AppRscRenderMode; /** Observe page `searchParams` access for cache-safety classification. */
   observePageSearchParamsAccess?: boolean; /** Observe page metadata `searchParams` access for cache-safety classification. */
   observeMetadataSearchParamsAccess?: boolean; /** Whether generated metadata may stream into the response body. */
-  serveStreamingMetadata?: boolean;
+  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;
@@ -97,6 +103,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 };