vinext 0.1.1 → 0.1.3

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

@@ -1,5 +1,6 @@
 import { addBasePathToPathname } from "../utils/base-path.js";
 import { VINEXT_RSC_REDIRECT_HEADER } from "./headers.js";
+import { runWithConnectionProbe } from "../shims/headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, createRscRedirectLocation } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
@@ -180,10 +181,15 @@ async function buildAppPageSpecialErrorResponse(options) {
 	}
 	if (options.renderFallbackPage) {
 		const fallbackResponse = await options.renderFallbackPage(options.specialError.statusCode);
-		if (fallbackResponse) return mergeAppPageSpecialErrorHeaders(fallbackResponse, options.middlewareContext);
+		if (fallbackResponse) return mergeAppPageSpecialErrorHeaders(options.specialError.fromMetadata === true && options.serveStreamingMetadata !== false ? new Response(fallbackResponse.body, {
+			headers: fallbackResponse.headers,
+			status: 200,
+			statusText: fallbackResponse.statusText
+		}) : fallbackResponse, options.middlewareContext);
 	}
 	options.clearRequestContext();
-	return mergeAppPageSpecialErrorHeaders(new Response(getAppPageStatusText(options.specialError.statusCode), { status: options.specialError.statusCode }), options.middlewareContext);
+	const responseStatus = options.specialError.fromMetadata === true && options.serveStreamingMetadata !== false ? 200 : options.specialError.statusCode;
+	return mergeAppPageSpecialErrorHeaders(new Response(getAppPageStatusText(options.specialError.statusCode), { status: responseStatus }), options.middlewareContext);
 }
 /** See `LayoutFlags` type docblock in app-elements.ts for lifecycle. */
 async function probeAppPageLayouts(options) {
@@ -210,7 +216,10 @@ async function probeAppPageLayouts(options) {
 				if (cls) {
 					const layoutId = cls.getLayoutId(layoutIndex);
 					try {
-						const { dynamicDetected } = await cls.runWithIsolatedDynamicScope(() => options.probeLayoutAt(layoutIndex));
+						const { dynamicDetected } = await cls.runWithIsolatedDynamicScope(async () => {
+							const outcome = await runWithConnectionProbe(() => options.probeLayoutAt(layoutIndex));
+							return outcome.completed ? outcome.result : null;
+						});
 						const observationDynamic = cls.isLayoutObservationDynamic?.(layoutId) === true;
 						const layoutDynamic = dynamicDetected || observationDynamic;
 						layoutFlags[layoutId] = layoutDynamic ? "d" : "s";
@@ -239,25 +248,51 @@ async function probeAppPageLayouts(options) {
 	};
 }
 async function probeLayoutForErrors(options, layoutIndex) {
-	try {
-		const layoutResult = options.probeLayoutAt(layoutIndex);
-		if (isPromiseLike(layoutResult)) await layoutResult;
-	} catch (error) {
-		return options.onLayoutError(error, layoutIndex);
-	}
-	return null;
-}
-async function probeAppPageComponent(options) {
-	return options.runWithSuppressedHookWarning(async () => {
+	const outcome = await runWithConnectionProbe(async () => {
 		try {
-			const pageResult = options.probePage();
-			if (isPromiseLike(pageResult)) if (options.awaitAsyncResult) await pageResult;
-			else Promise.resolve(pageResult).catch(() => {});
+			const layoutResult = options.probeLayoutAt(layoutIndex);
+			if (isPromiseLike(layoutResult)) await layoutResult;
 		} catch (error) {
-			return options.onError(error);
+			return options.onLayoutError(error, layoutIndex);
 		}
 		return null;
 	});
+	return outcome.completed ? outcome.result : null;
+}
+async function probeAppPageComponent(options) {
+	return options.runWithSuppressedHookWarning(async () => {
+		const outcome = await runWithConnectionProbe(async () => {
+			try {
+				const pageResult = options.probePage();
+				if (isPromiseLike(pageResult)) if (options.awaitAsyncResult) await pageResult;
+				else Promise.resolve(pageResult).catch(() => {});
+			} catch (error) {
+				return options.onError(error);
+			}
+			return null;
+		});
+		return outcome.completed ? outcome.result : null;
+	});
+}
+async function probeAppPageThrownError(options) {
+	return options.runWithSuppressedHookWarning(async () => {
+		const outcome = await runWithConnectionProbe(async () => {
+			try {
+				const pageResult = options.probePage();
+				if (isPromiseLike(pageResult)) await pageResult;
+			} catch (error) {
+				return {
+					error,
+					thrown: true
+				};
+			}
+			return {
+				error: null,
+				thrown: false
+			};
+		});
+		return outcome.completed && outcome.result.thrown ? outcome.result.error : null;
+	});
 }
 async function readAppPageBinaryStream(stream) {
 	const reader = stream.getReader();
@@ -290,4 +325,4 @@ function buildAppPageFontLinkHeader(preloads) {
 	return preloads.map((preload) => `<${preload.href}>; rel=preload; as=font; type=${preload.type}; crossorigin`).join(", ");
 }
 //#endregion
-export { buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };
+export { buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, probeAppPageThrownError, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };

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

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

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

@@ -227,6 +227,10 @@ function buildAppPageProbes(options) {
 }
 async function probeAppPageBeforeRender(options) {
 	let layoutFlags = {};
+	if (options.skipProbes) return {
+		response: null,
+		layoutFlags
+	};
 	if (options.layoutCount > 0) {
 		const layoutProbeResult = await probeAppPageLayouts({
 			layoutCount: options.layoutCount,

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

@@ -7,6 +7,8 @@ type AppPageRenderObservationState = Readonly<{
   requestApis: readonly RenderRequestApiKind[];
 }>;
 declare function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState;
+declare function consumeAppPageRenderObservationState(): AppPageRenderObservationState;
+declare function discardAppPageRenderState(): void;
 declare function createAppPageRenderObservation(options: {
   boundaryOutcome: BoundaryOutcome;
   cacheTags: readonly string[];
@@ -31,4 +33,4 @@ declare function createAppPageHtmlOutputScope(options: {
   routePattern: string;
 }): CacheProofOutputScope;
 //#endregion
-export { AppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState };
+export { AppPageRenderObservationState, consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState, discardAppPageRenderState };

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

@@ -1,7 +1,10 @@
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage } from "../shims/headers.js";
 import { fnv1a64 } from "../utils/hash.js";
+import { _consumeRequestScopedCacheLife } from "../shims/cache.js";
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import "./app-elements.js";
+import { consumeDynamicFetchObservations } from "../shims/fetch-cache.js";
 import { buildRenderObservation, buildRenderRequestApiObservations } from "./cache-proof.js";
 //#region src/server/app-page-render-observation.ts
 function readRootBoundaryId(element) {
@@ -30,6 +33,19 @@ function createEmptyAppPageRenderObservationState() {
 		requestApis: []
 	};
 }
+function consumeAppPageRenderObservationState() {
+	return {
+		dynamicFetches: consumeDynamicFetchObservations(),
+		requestApis: consumeRenderRequestApiUsage()
+	};
+}
+function discardAppPageRenderState() {
+	_consumeRequestScopedCacheLife();
+	consumeDynamicFetchObservations();
+	consumeRenderRequestApiUsage();
+	consumeInvalidDynamicUsageError();
+	consumeDynamicUsage();
+}
 function createAppPageRenderObservation(options) {
 	return buildRenderObservation({
 		boundaryOutcome: options.boundaryOutcome,
@@ -63,4 +79,4 @@ function createAppPageHtmlOutputScope(options) {
 	};
 }
 //#endregion
-export { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState };
+export { consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState, discardAppPageRenderState };

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

@@ -7,8 +7,8 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ReactNode } from "react";
 import { ReactFormState } from "react-dom/client";
 
@@ -49,6 +49,7 @@ type RenderAppPageLifecycleOptions = {
   peekRequestCacheLife?: () => AppPageRequestCacheLife | null;
   getDraftModeCookieHeader: () => string | null | undefined;
   handlerStart: number;
+  hasCustomGlobalError?: boolean;
   hasLoadingBoundary: boolean;
   dynamicStaleTimeSeconds?: number;
   isDynamicError: boolean;
@@ -68,7 +69,11 @@ type RenderAppPageLifecycleOptions = {
   layoutCount: number;
   loadSsrHandler: () => Promise<AppPageSsrHandler>;
   middlewareContext: AppPageMiddlewareContext;
+  navigationParams: Record<string, unknown>;
   params: Record<string, unknown>;
+  pprFallbackShellSignal?: AbortSignal;
+  pprFallbackShellReactSignal?: AbortSignal;
+  abortPprFallbackShell?: () => void;
   rootParams?: RootParams;
   peekRenderObservationState?: () => AppPageRenderObservationState;
   probeLayoutAt: (layoutIndex: number) => unknown;
@@ -81,8 +86,14 @@ type RenderAppPageLifecycleOptions = {
   renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;
   renderToReadableStream: (element: ReactNode | AppOutgoingElements, options: {
     onError: AppPageBoundaryOnError;
+    signal?: AbortSignal;
   }) => ReadableStream<Uint8Array>;
-  routeHasLocalBoundary: boolean;
+  prerenderToReadableStream?: (element: ReactNode | AppOutgoingElements, options: {
+    onError: AppPageBoundaryOnError;
+    signal?: AbortSignal;
+  }) => Promise<{
+    prelude: ReadableStream<Uint8Array>;
+  }>;
   routePattern: string;
   runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;
   scriptNonce?: string;

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

@@ -1,8 +1,8 @@
+import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVersion } from "./artifact-compatibility.js";
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
-import { NO_STORE_CACHE_CONTROL } from "./cache-control.js";
 import { buildAppPageHtmlResponse, buildAppPageRscResponse, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy } from "./app-page-response.js";
 import { buildAppPageFontLinkHeader, readAppPageBinaryStream, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { probeAppPageBeforeRender } from "./app-page-probe.js";
@@ -10,7 +10,7 @@ import { DEFAULT_CACHE_VARIANT_BUDGET, buildCacheVariantWithRouteBudget, buildRe
 import { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse } from "./app-page-cache.js";
 import { createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId } from "./static-layout-client-reuse-proof.js";
-import { buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError } from "./app-page-stream.js";
+import { buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery } from "./app-page-stream.js";
 import { getStaticLayoutObservationSkipRejection } from "./app-layout-param-observation.js";
 import { hasDigest } from "./app-rsc-errors.js";
 import { createClientReuseSkipTransportPlan, crossCheckClientReuseManifestEntryWithCache } from "./skip-cache-proof.js";
@@ -249,6 +249,7 @@ function wrapRscResponseForDevErrorReporting(response, consumeInvalidDynamicUsag
 async function renderAppPageLifecycle(options) {
 	const preRenderResult = await probeAppPageBeforeRender({
 		hasLoadingBoundary: options.hasLoadingBoundary,
+		skipProbes: options.pprFallbackShellSignal !== void 0,
 		layoutCount: options.layoutCount,
 		probeLayoutAt(layoutIndex) {
 			return options.probeLayoutAt(layoutIndex);
@@ -293,7 +294,7 @@ async function renderAppPageLifecycle(options) {
 		cleanPathname: options.cleanPathname,
 		completeness: "partial",
 		output: rscOutputScope,
-		params: options.params,
+		params: options.navigationParams,
 		state: options.peekRenderObservationState?.() ?? createEmptyAppPageRenderObservationState()
 	});
 	const skipDisposition = options.skipDisposition ?? createRenderLifecycleSkipDisposition({
@@ -315,11 +316,31 @@ async function renderAppPageLifecycle(options) {
 	});
 	const compileEnd = options.isProduction ? void 0 : performance.now();
 	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(options.cleanPathname, options.routePattern));
-	const rscStream = runWithFetchDedupe(() => options.renderToReadableStream(outgoingElement, { onError: rscErrorTracker.onRenderError }));
+	let rscStream = await runWithFetchDedupe(async () => {
+		if (options.pprFallbackShellSignal && options.prerenderToReadableStream) {
+			const reactSignal = options.pprFallbackShellReactSignal ?? options.pprFallbackShellSignal;
+			const pendingResult = options.prerenderToReadableStream(outgoingElement, {
+				onError: rscErrorTracker.onRenderError,
+				signal: reactSignal
+			});
+			if (options.abortPprFallbackShell) setTimeout(options.abortPprFallbackShell, 0);
+			return (await pendingResult).prelude;
+		}
+		return options.renderToReadableStream(outgoingElement, { onError: rscErrorTracker.onRenderError });
+	});
+	let pprFallbackShellRsc = null;
+	if (options.pprFallbackShellSignal) pprFallbackShellRsc = new Uint8Array(await readAppPageBinaryStream(rscStream));
 	let revalidateSeconds = options.revalidateSeconds;
 	let expireSeconds = options.expireSeconds;
 	const shouldCaptureRscForCacheMetadata = options.isProgressiveActionRender !== true && (options.isProduction || options.isPrerender === true) && (revalidateSeconds === null || revalidateSeconds > 0 && revalidateSeconds !== Infinity) && !options.isDraftMode && !options.isForceDynamic && !shouldBypassRscCacheForSkipTransport;
-	const rscCapture = teeAppPageRscStreamForCapture(rscStream, shouldCaptureRscForCacheMetadata);
+	const createBufferedRscStream = (close) => new ReadableStream({ start(controller) {
+		if (pprFallbackShellRsc) controller.enqueue(pprFallbackShellRsc);
+		if (close) controller.close();
+	} });
+	const rscCapture = pprFallbackShellRsc ? {
+		ssrStream: createBufferedRscStream(false),
+		...shouldCaptureRscForCacheMetadata ? { sideStream: createBufferedRscStream(true) } : {}
+	} : teeAppPageRscStreamForCapture(rscStream, shouldCaptureRscForCacheMetadata);
 	const rscForResponse = rscCapture.ssrStream;
 	const capturedRscDataRef = { value: null };
 	if (rscCapture.sideStream && options.isRscRequest) capturedRscDataRef.value = readAppPageBinaryStream(rscCapture.sideStream);
@@ -349,7 +370,7 @@ async function renderAppPageLifecycle(options) {
 			isEdgeRuntime: options.isEdgeRuntime,
 			middlewareContext: options.middlewareContext,
 			mountedSlotsHeader: options.mountedSlotsHeader,
-			params: options.params,
+			params: options.navigationParams,
 			policy: rscResponsePolicy,
 			timing: buildResponseTiming({
 				compileEnd,
@@ -371,7 +392,7 @@ async function renderAppPageLifecycle(options) {
 					cleanPathname: options.cleanPathname,
 					completeness: "complete",
 					output: rscOutputScope,
-					params: options.params,
+					params: options.navigationParams,
 					state: input.state
 				});
 			},
@@ -415,17 +436,19 @@ async function renderAppPageLifecycle(options) {
 			return renderAppPageHtmlStream({
 				capturedRscDataRef,
 				fontData,
+				hasCustomGlobalError: options.hasCustomGlobalError,
 				navigationContext: options.getNavigationContext(),
 				basePath: options.basePath,
 				clientTraceMetadata: options.clientTraceMetadata,
 				reactMaxHeadersLength: options.reactMaxHeadersLength,
 				rootParams: options.rootParams,
+				pprFallbackShellSignal: options.pprFallbackShellSignal,
 				formState: options.formState ?? null,
 				rscStream: rscForResponse,
 				scriptNonce: options.scriptNonce,
 				sideStream: rscCapture.sideStream,
 				ssrHandler,
-				waitForAllReady: options.isPrerender
+				waitForAllReady: options.isPrerender === true
 			});
 		},
 		renderSpecialErrorResponse(specialError) {
@@ -448,13 +471,6 @@ async function renderAppPageLifecycle(options) {
 			}
 		}
 	}
-	if (shouldRerenderAppPageWithGlobalError({
-		capturedError: rscErrorTracker.getCapturedError(),
-		hasLocalBoundary: options.routeHasLocalBoundary
-	})) {
-		const cleanResponse = await options.renderErrorBoundaryResponse(rscErrorTracker.getCapturedError());
-		if (cleanResponse) return cleanResponse;
-	}
 	if (options.isPrerender === true) {
 		await settleCapturedRscRenderForCacheMetadata(htmlRender.capturedRscData);
 		({expireSeconds, revalidateSeconds} = applyRequestCacheLife({
@@ -489,6 +505,21 @@ async function renderAppPageLifecycle(options) {
 		renderEnd,
 		responseKind: "html"
 	});
+	if (htmlRender.shellErrorRecovered) {
+		const response = buildAppPageHtmlResponse(safeHtmlStream, {
+			draftCookie,
+			linkHeader,
+			isEdgeRuntime: options.isEdgeRuntime,
+			middlewareContext: {
+				headers: options.middlewareContext.headers,
+				status: 500
+			},
+			policy: { cacheControl: NEVER_CACHE_CONTROL },
+			timing: htmlResponseTiming
+		});
+		applyCdnResponseHeaders(response.headers, { cacheControl: NEVER_CACHE_CONTROL });
+		return response;
+	}
 	const shouldSpeculativelyWriteCache = options.isProduction && shouldCaptureRscForCacheMetadata && revalidateSeconds === null && !options.isDynamicError && !options.isForceStatic && !options.scriptNonce && options.isProgressiveActionRender !== true && !dynamicUsedDuringRender;
 	if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {
 		const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {
@@ -516,7 +547,7 @@ async function renderAppPageLifecycle(options) {
 					cleanPathname: options.cleanPathname,
 					completeness: "complete",
 					output: htmlOutputScope,
-					params: options.params,
+					params: options.navigationParams,
 					state: input.state
 				});
 			},
@@ -528,7 +559,7 @@ async function renderAppPageLifecycle(options) {
 					cleanPathname: options.cleanPathname,
 					completeness: "complete",
 					output: rscOutputScope,
-					params: options.params,
+					params: options.navigationParams,
 					state: input.state
 				});
 			},

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

@@ -29,6 +29,7 @@ type ResolveAppPageGenerateStaticParamsSourcesOptions = {
 };
 type BuildAppPageElementOptions<TElement> = {
   buildPageElement: () => Promise<TElement>;
+  probePageSpecialError?: () => Promise<AppPageSpecialError | null>;
   renderErrorBoundaryPage: (error: unknown) => Promise<Response | null>;
   renderSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;
   resolveSpecialError: (error: unknown) => AppPageSpecialError | null;
@@ -44,6 +45,7 @@ type AppPageInterceptMatch<TPage = unknown> = {
   slotId?: string | null;
   slotKey: string;
   sourceRouteIndex: number;
+  sourcePageSegments?: readonly string[] | null;
 };
 type ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts> = {
   cleanPathname: string;
@@ -87,6 +89,7 @@ type ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement> = {
   getSourceRoute: (sourceRouteIndex: number) => Awaitable<TRoute | undefined>;
   isRscRequest: boolean;
   layoutParamAccess?: AppLayoutParamAccessTracker;
+  resolveNavigationParams: (route: TRoute, params: AppPageParams, pathname: string, interceptOpts: TInterceptOpts) => AppPageParams;
   renderInterceptResponse: (route: TRoute, element: TElement) => Promise<Response> | Response;
   searchParams: URLSearchParams;
   setNavigationContext: (context: {

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

@@ -155,13 +155,14 @@ async function resolveAppPageIntercept(options) {
 	});
 	if (interceptState.kind === "source-route") {
 		const renderRoute = interceptState.sourceRoute;
+		const interceptOpts = options.toInterceptOpts(interceptState.intercept);
 		const renderParams = pickRouteParams(interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute));
 		options.setNavigationContext({
-			params: interceptState.intercept.matchedParams,
+			params: options.resolveNavigationParams(renderRoute, interceptState.intercept.matchedParams, options.cleanPathname, interceptOpts),
 			pathname: options.cleanPathname,
 			searchParams: options.searchParams
 		});
-		const interceptElement = await options.buildPageElement(renderRoute, renderParams, options.toInterceptOpts(interceptState.intercept), options.searchParams, options.layoutParamAccess);
+		const interceptElement = await options.buildPageElement(renderRoute, renderParams, interceptOpts, options.searchParams, options.layoutParamAccess);
 		return {
 			interceptOpts: void 0,
 			response: await options.renderInterceptResponse(renderRoute, interceptElement)
@@ -179,7 +180,8 @@ async function buildAppPageElement(options) {
 			response: null
 		};
 	} catch (error) {
-		const specialError = options.resolveSpecialError(error);
+		const buildSpecialError = options.resolveSpecialError(error);
+		const specialError = (buildSpecialError ? await options.probePageSpecialError?.() : null) ?? buildSpecialError;
 		if (specialError) return {
 			element: null,
 			response: await options.renderSpecialError(specialError)

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

@@ -1,7 +1,7 @@
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-response.ts
 function applyTimingHeader(headers, timing) {

package/dist/server/app-page-route-wiring.d.ts

@@ -113,6 +113,7 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   resolvedMetadata: Metadata | null;
   resolvedMetadataPathname?: string;
   resolvedViewport: Viewport;
+  trailingSlash?: boolean;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
   rootUnauthorizedModule?: TModule | null;
@@ -129,6 +130,7 @@ type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule,
   renderIdentity?: AppPageRenderIdentity;
   renderMode?: AppRscRenderMode;
   routePath: string;
+  sourcePageSegments?: readonly string[] | null;
 };
 declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
 declare function probeAppPageLayoutWithTracking<TModule extends AppPageModule>(options: {
@@ -142,6 +144,8 @@ declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErro
   forbiddens?: readonly (TModule | null | undefined)[] | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
+declare function createAppPageSourcePage(routeSegments: readonly string[] | null | undefined): string;
+declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean): ReactNode;
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
-export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };
+export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };

package/dist/server/app-page-route-wiring.js

@@ -2,7 +2,8 @@ import { createAppRenderDependency, registerAppElementRenderDependencies, render
 import { APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY } from "./app-elements.js";
-import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { ErrorBoundary, ForbiddenBoundary, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { AppRouterScrollTarget } from "../shims/app-router-scroll.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead, renderMetadataToHtml } from "../shims/metadata.js";
@@ -14,6 +15,7 @@ import { Fragment, Suspense } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-page-route-wiring.tsx
 const APP_PAGE_LAYOUT_PROBE_CHILD = /* @__PURE__ */ jsx(Fragment, {});
+const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
 function getDefaultExport(module) {
 	return module?.default ?? null;
 }
@@ -85,6 +87,9 @@ function createAppPageTemplateEntries(route) {
 		};
 	});
 }
+function createAppPageSourcePage(routeSegments) {
+	return `/${[...routeSegments ?? [], "page"].join("/")}`;
+}
 function createAppPageErrorEntries(route) {
 	return (route.errorPaths ?? route.errors ?? []).flatMap((errorModule, index) => {
 		if (!errorModule) return [];
@@ -139,21 +144,22 @@ function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride, op
 	}
 	return normalizeAppElementsSlotBindings(bindings, { layoutIds: layoutEntries.map((entry) => entry.id) });
 }
-function createAppPageRouteHead(metadata, viewport, pathname, metadataPlacement) {
+function createAppPageRouteHead(metadata, viewport, pathname, metadataPlacement, trailingSlash) {
 	return /* @__PURE__ */ jsxs(Fragment$1, { children: [
 		/* @__PURE__ */ jsx("meta", { charSet: "utf-8" }),
 		metadata && metadataPlacement === "head" ? /* @__PURE__ */ jsx(MetadataHead, {
 			metadata,
-			pathname
+			pathname,
+			trailingSlash
 		}) : null,
 		/* @__PURE__ */ jsx(ViewportHead, { viewport })
 	] });
 }
-function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement) {
+function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement, trailingSlash) {
 	if (!metadata || metadataPlacement !== "body") return null;
 	return /* @__PURE__ */ jsx("div", {
 		hidden: true,
-		dangerouslySetInnerHTML: { __html: renderMetadataToHtml(metadata, pathname) }
+		dangerouslySetInnerHTML: { __html: renderMetadataToHtml(metadata, pathname, { trailingSlash }) }
 	});
 }
 function buildAppPageElements(options) {
@@ -205,6 +211,7 @@ function buildAppPageElements(options) {
 		layoutIds: options.route.ids?.layouts ?? layoutEntries.map((entry) => entry.id),
 		rootLayoutTreePath,
 		routeId,
+		sourcePage: createAppPageSourcePage(options.sourcePageSegments ?? routeSegments),
 		slotBindings: createAppPageSlotBindings(options.route, layoutEntries, resolveSlotOverride, {
 			interception: renderIdentity?.interception ?? options.interception ?? null,
 			interceptionContext,
@@ -426,17 +433,20 @@ function buildAppPageElements(options) {
 		});
 	}
 	const globalErrorComponent = getErrorBoundaryExport(options.globalErrorModule);
-	if (globalErrorComponent) routeChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
-		fallback: globalErrorComponent,
-		children: routeChildren
+	routeChildren = /* @__PURE__ */ jsx(GlobalErrorBoundary, {
+		fallback: DEFAULT_GLOBAL_ERROR_COMPONENT,
+		children: globalErrorComponent ? /* @__PURE__ */ jsx(ErrorBoundary, {
+			fallback: globalErrorComponent,
+			children: routeChildren
+		}) : routeChildren
 	});
 	elements[routeId] = /* @__PURE__ */ jsxs(Fragment$1, { children: [
-		createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement),
+		createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash),
 		routeChildren,
-		createAppPageRouteBodyMetadata(options.resolvedMetadata, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement)
+		createAppPageRouteBodyMetadata(options.resolvedMetadata, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash)
 	] });
 	registerAppElementRenderDependencies(elements, renderDependenciesByElementId);
 	return elements;
 }
 //#endregion
-export { buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };
+export { buildAppPageElements, createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };

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

@@ -18,6 +18,7 @@ type AppSsrRenderResult = {
   htmlStream: ReadableStream<Uint8Array>;
   metadataReady: Promise<void>;
   capturedRscData: Promise<ArrayBuffer> | null;
+  shellErrorRecovered?: boolean;
   /**
    * Preload `Link` header value emitted by React during SSR (via `onHeaders`),
    * already capped to `reactMaxHeadersLength`. Empty/undefined when React
@@ -62,9 +63,14 @@ type AppPageSsrHandler = {
     sideStream?: ReadableStream<Uint8Array>;
     capturedRscDataRef?: {
       value: Promise<ArrayBuffer> | null;
-    }; /** When true, wait for the full React tree before emitting bytes. */
+    }; /** Abort signal for a build-time PPR fallback-shell static render. */
+    pprFallbackShellSignal?: AbortSignal; /** When true, wait for the full React tree before emitting bytes. */
     waitForAllReady?: boolean; /** Dev-only: original server error to surface in the browser overlay. */
     initialDevServerError?: unknown;
+    /** When true, an SSR-phase-only shell render error resolves to the
+     *  default `__next_error__` error-document shell (with the original
+     *  flight payload and bootstrap) instead of rejecting. See handleSsr. */
+    fallbackToErrorDocumentOnShellError?: boolean;
   }) => Promise<ReadableStream<Uint8Array> | AppSsrRenderResult>;
 };
 type RenderAppPageHtmlStreamOptions = {
@@ -93,9 +99,14 @@ type RenderAppPageHtmlStreamOptions = {
   sideStream?: ReadableStream<Uint8Array>; /** Out-parameter filled with accumulated raw RSC bytes after stream consumption. */
   capturedRscDataRef?: {
     value: Promise<ArrayBuffer> | null;
-  }; /** When true, wait for the full React tree before emitting bytes. */
+  }; /** Abort signal for a build-time PPR fallback-shell static render. */
+  pprFallbackShellSignal?: AbortSignal; /** When true, wait for the full React tree before emitting bytes. */
   waitForAllReady?: boolean; /** Dev-only: original server error to surface in the browser overlay. */
   initialDevServerError?: unknown;
+  /** True when the app supplies a custom global-error.tsx. Disables the
+   *  default error-document shell fallback so SSR shell errors keep driving
+   *  the server-rendered global-error boundary re-render. */
+  hasCustomGlobalError?: boolean;
 };
 type RenderAppPageHtmlResponseOptions = {
   clearRequestContext: () => void;
@@ -108,7 +119,8 @@ type AppPageHtmlStreamRecoveryResult = {
   htmlStream: ReadableStream<Uint8Array> | null;
   response: Response | null;
   metadataReady: Promise<void>;
-  capturedRscData: Promise<ArrayBuffer> | null; /** React-emitted preload `Link` header (already capped). */
+  capturedRscData: Promise<ArrayBuffer> | null;
+  shellErrorRecovered: boolean; /** React-emitted preload `Link` header (already capped). */
   linkHeader?: string;
 };
 type RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError> = {
@@ -129,10 +141,6 @@ type AppPageRscErrorTracker = {
   getCapturedSpecialError: () => unknown;
   onRenderError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
 };
-type ShouldRerenderAppPageWithGlobalErrorOptions = {
-  capturedError: unknown;
-  hasLocalBoundary: boolean;
-};
 declare function createAppPageFontData(options: CreateAppPageFontDataOptions): AppPageFontData;
 declare function renderAppPageHtmlStream(options: RenderAppPageHtmlStreamOptions): Promise<AppSsrRenderResult>;
 /**
@@ -146,6 +154,5 @@ declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Array>, on
 declare function renderAppPageHtmlResponse(options: RenderAppPageHtmlResponseOptions): Promise<Response>;
 declare function renderAppPageHtmlStreamWithRecovery<TSpecialError>(options: RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError>): Promise<AppPageHtmlStreamRecoveryResult>;
 declare function createAppPageRscErrorTracker(baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown): AppPageRscErrorTracker;
-declare function shouldRerenderAppPageWithGlobalError(options: ShouldRerenderAppPageWithGlobalErrorOptions): boolean;
 //#endregion
-export { AppPageFontData, AppPageSsrHandler, AppSsrRenderResult, buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, isAppSsrRenderResult, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError };
+export { AppPageFontData, AppPageSsrHandler, AppSsrRenderResult, buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, isAppSsrRenderResult, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery };