vinext 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/server/app-browser-entry.js

@@ -16,16 +16,15 @@ import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscR
 import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
+import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
 import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { navigationPlanner } from "./navigation-planner.js";
-import { resolveHybridClientRewriteHref } from "../shims/internal/hybrid-client-route-owner.js";
-import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
-import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
+import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
@@ -43,6 +42,7 @@ import { createRoot, hydrateRoot } from "react-dom/client";
 import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hasServerActions, loadServerActionClient } from "virtual:vinext-app-capabilities";
 //#region src/server/app-browser-entry.ts
+const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
 }
@@ -738,6 +738,7 @@ async function main() {
 	if (!claimInitialAppRouterBootstrap()) return;
 	if (hasServerActions) registerServerActionCallback();
 	installAppNavigationFailureListeners();
+	if (HAS_CLIENT_REWRITES) await preloadHybridClientRouteOwner();
 	let devErrorOverlay = null;
 	if (import.meta.env.DEV) {
 		devErrorOverlay = await import("../client/dev-error-overlay.js");
@@ -892,7 +893,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 						mountedSlotsHeader
 					});
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
-					const rewrittenNavigationHref = navigationKind === "navigate" ? resolveHybridClientRewriteHref(currentHref, __basePath) : null;
+					const rewrittenNavigationHref = navigationKind === "navigate" && HAS_CLIENT_REWRITES ? resolveLoadedHybridClientRewriteHref(currentHref, __basePath) : null;
 					const additionalPrefetchRscUrls = rewrittenNavigationHref && rewrittenNavigationHref !== currentHref ? [await createRscRequestUrl(rewrittenNavigationHref, requestHeaders)] : [];
 					const visitedResponseCandidate = shouldBypassNavigationCache ? {
 						cacheKey: AppElementsWire.encodeCacheKey(rscUrl, requestInterceptionContext),

package/dist/server/app-browser-history-controller.d.ts

@@ -18,7 +18,7 @@ type AppBrowserHistoryControllerDeps = {
   readHistoryState: () => unknown; /** Reads `window.location.href`. Injected so the controller stays unit-testable. */
   readCurrentHref: () => string; /** Wraps `pushHistoryStateWithoutNotify(state, "", href)`. */
   pushHistoryState: (state: unknown, href: string) => void; /** Wraps `replaceHistoryStateWithoutNotify(state, "", href)`. */
-  replaceHistoryState: (state: unknown, href: string) => void;
+  replaceHistoryState: (state: unknown, href?: string) => void;
   readVisibleNavigationMetadata: () => VisibleNavigationMetadata | null;
 };
 /**

package/dist/server/app-browser-history-controller.js

@@ -158,9 +158,9 @@ var AppBrowserHistoryController = class {
 			bfcacheVersion: bfcacheIds === void 0 ? void 0 : this.#restorableClientState.currentBfcacheVersion,
 			previousNextUrl
 		});
-		this.#replaceHistoryState(nextHistoryState, this.#readCurrentHref());
+		this.#replaceHistoryState(nextHistoryState);
 		if (this.#isHistoryStateNavigationMetadataInSync(this.#readHistoryState(), previousNextUrl, bfcacheIds)) return;
-		this.#replaceHistoryState(nextHistoryState, this.#readCurrentHref());
+		this.#replaceHistoryState(nextHistoryState);
 	}
 	#isHistoryStateNavigationMetadataInSync(state, previousNextUrl, bfcacheIds) {
 		return readHistoryStatePreviousNextUrl(state) === previousNextUrl && (bfcacheIds === void 0 || areBfcacheIdMapsEqual(readHistoryStateBfcacheIds(state), bfcacheIds) && this.#restorableClientState.isCurrentBfcacheVersion(state));
@@ -179,7 +179,7 @@ var AppBrowserHistoryController = class {
 			bfcacheVersion: this.#restorableClientState.currentBfcacheVersion,
 			previousNextUrl: options.previousNextUrl,
 			traversalIndex: this.#currentHistoryTraversalIndex
-		}), this.#readCurrentHref());
+		}));
 	}
 	/**
 	* Resolves a restorable snapshot candidate for the given history entry and

package/dist/server/app-browser-navigation-controller.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";

package/dist/server/app-browser-state.js

@@ -6,12 +6,12 @@ import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };

package/dist/server/app-browser-visible-commit.js

@@ -1,8 +1,8 @@
 import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
-import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 //#region src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");

package/dist/server/app-fallback-renderer.d.ts

@@ -5,6 +5,7 @@ import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { ReactNode } from "react";
@@ -81,6 +82,7 @@ type AppFallbackRendererCallContext = {
    * render path. Defaults to `false` when no route is matched.
    */
   isEdgeRuntime?: boolean;
+  routePathname?: string;
   sourcePageSegments?: readonly string[] | null;
 };
 type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
@@ -88,6 +90,7 @@ type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   renderHttpAccessFallback: (route: AppPageBoundaryRoute<TModule> | null, statusCode: number, isRscRequest: boolean, request: Request, opts: {
     boundaryComponent?: AppPageComponent | null;
     boundaryModule?: TModule | null;
+    intercept?: AppPageInterceptOptions<TModule> | null;
     layouts?: readonly (TModule | null | undefined)[] | null;
     matchedParams?: AppPageParams;
   }, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;

package/dist/server/app-fallback-renderer.js

@@ -1,8 +1,8 @@
-import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
 import { DEFAULT_NOT_FOUND_MODULE } from "./default-not-found-module.js";
-import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
 	headers: null,
@@ -84,6 +84,7 @@ function createAppFallbackRenderer(options) {
 				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
+				intercept: opts?.intercept ?? null,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
 				isRscRequest,
 				layoutModules: useGlobalNotFound ? [] : opts?.layouts ?? null,
@@ -100,6 +101,7 @@ function createAppFallbackRenderer(options) {
 				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
 				route: useGlobalNotFound ? null : route,
+				routePathname: callContext?.routePathname,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
 				serveStreamingMetadata,

package/dist/server/app-middleware.js

@@ -1,7 +1,7 @@
 import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
 import { FLIGHT_HEADERS } from "./headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
-import { isExternalUrl, proxyExternalRequest } from "../config/config-matchers.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";
@@ -58,6 +58,7 @@ async function proxyExternalMiddlewareRewrite(request, rewriteUrl, context) {
 	const proxyRequest = requestWithMiddlewareRequestHeaders(request, context.requestHeaders ?? context.headers);
 	setHeadersContext(null);
 	setNavigationContext(null);
+	const { proxyExternalRequest } = await import("../config/config-matchers.js");
 	const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);
 	const headers = new Headers(proxyResponse.headers);
 	processMiddlewareHeaders(headers);

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

@@ -5,6 +5,8 @@ import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
+import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -19,13 +21,20 @@ type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {
   errorPaths?: readonly TModule[] | null;
   errors?: readonly (TModule | null | undefined)[] | null;
   forbidden?: TModule | null;
+  forbiddenTreePosition?: number | null;
+  forbiddens?: readonly (TModule | null | undefined)[] | null;
   layoutTreePositions?: readonly number[] | null;
   layouts?: readonly (TModule | null | undefined)[];
   notFound?: TModule | null;
+  notFounds?: readonly (TModule | null | undefined)[] | null;
+  notFoundTreePosition?: number | null;
   params?: AppPageParams;
   pattern?: string;
   routeSegments?: readonly string[];
+  slots?: AppPageRouteWiringRoute<TModule>["slots"];
   unauthorized?: TModule | null;
+  unauthorizedTreePosition?: number | null;
+  unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 };
 type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
@@ -70,11 +79,13 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
 type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {
   boundaryComponent?: AppPageComponent | null;
   boundaryModule?: TModule | null;
+  intercept?: AppPageInterceptOptions<TModule> | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   matchedParams: AppPageParams;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
-  rootUnauthorizedModule?: TModule | null;
+  rootUnauthorizedModule?: TModule | null; /** Normalized, basePath-free application pathname used for route matching. */
+  routePathname?: string;
   route?: AppPageBoundaryRoute<TModule> | null;
   /**
    * When true, the resolved boundary is rendered without wrapping it in the

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.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> = {
@@ -185,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,7 +4,7 @@ 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,10 +16,10 @@ 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
@@ -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,
@@ -318,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,
@@ -419,7 +422,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
 	});
@@ -535,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,
@@ -558,7 +552,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 +605,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 +632,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,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;
@@ -38,7 +41,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 +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 };