vinext 1.4.4 → 1.4.5

package/dist/server/app-rsc-handler.js

@@ -1,60 +1,60 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
-import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { buildRequestHeadersFromMiddlewareResponse, hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
-import { isExternalUrl } from "../utils/external-url.js";
-import { hasBasePath, restoreBasePath, stripBasePath } from "../utils/base-path.js";
-import "./app-rsc-vary.js";
-import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
-import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, hasUrlParserDotSegment, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute, stripRequestUrlFragment } from "./request-pipeline.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
+import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
-import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
-import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
-import { isLocaleRedirect, normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
-import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
-import { markRouteCacheabilityDynamic, preserveRouteCacheabilityResponsePolicy } from "../shims/cacheability-classification.js";
-import { NEVER_CACHE_CONTROL, SERVER_ACTION_CACHE_CONTROL, applyCdnResponseHeaders, captureCdnResponsePolicyOverrides, isCdnResponsePolicyHeader, reconcileCdnResponseHeadersAfterOuterPolicy } from "./cache-control.js";
-import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
-import { getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersContext, hasEffectiveRequestCookieChanges, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, runWithHeadersContext } from "../shims/headers.js";
-import { normalizePathTrailingSlash } from "../shims/url-utils.js";
-import { mergeRewriteQuery } from "../utils/query.js";
-import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { traceFindPageComponents } from "./pages-execution-tracing.js";
-import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, markImageOptimizationSignal, resolveDevImageRedirect } from "./image-optimization.js";
-import { parseCacheabilityManifest } from "./cacheability-manifest.js";
-import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
-import { openForwardedMiddlewareContext } from "./forwarded-middleware-context.js";
-import { consumeResponseStageLinkProvenance, copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
-import { setFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
-import { mergeMiddlewareResponseHeaders, mergeMiddlewareResponseHeadersOntoResponse, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
-import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeDynamicShellRscRequestHeaders, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
-import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
-import { flattenErrorCauses } from "../utils/error-cause.js";
+import { isExternalUrl } from "../utils/external-url.js";
+import "./app-rsc-vary.js";
+import { getActiveDraftModeState, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersContext, hasEffectiveRequestCookieChanges, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, runStaticParamsCheckDetached, runWithHeadersContext } from "../shims/headers.js";
+import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_ROUTE_MISS_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
-import { applyAppRscConfigHeaders, finalizeAppRscResponse, isStreamedActionRedirectResponse, markAppRscApplicationResponse, markAppRscResponseConfigHeadersApplied, markAppRscRouteHandlerResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
-import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
+import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { flattenErrorCauses } from "../utils/error-cause.js";
+import { hasBasePath, restoreBasePath, stripBasePath } from "../utils/base-path.js";
+import { mergeRewriteQuery } from "../utils/query.js";
+import { buildRequestHeadersFromMiddlewareResponse, hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import "./app-page-response.js";
-import { parseNextHttpErrorDigest } from "./next-error-digest.js";
+import { mergeMiddlewareResponseHeaders, mergeMiddlewareResponseHeadersOntoResponse, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
+import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeDynamicShellRscRequestHeaders, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { applyAppRscConfigHeaders, finalizeAppRscResponse, isAppRscResponseConfigHeadersApplied, isStreamedActionRedirectResponse, markAppRscApplicationResponse, markAppRscResponseConfigHeadersApplied, markAppRscRouteHandlerResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
+import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { isAppRouteHandlerRoute } from "./app-rsc-route-matching.js";
 import { resolveAppPageNavigationParams } from "./app-page-navigation-params.js";
-import { traceAppPageRender } from "./app-page-tracing.js";
-import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
+import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
+import { isLocaleRedirect, normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
+import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
+import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
+import { openForwardedMiddlewareContext } from "./forwarded-middleware-context.js";
+import { hasPagesPreviewCookie } from "./pages-response-stage.js";
+import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
+import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
+import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
+import { parseNextHttpErrorDigest } from "./next-error-digest.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, markImageOptimizationSignal, resolveDevImageRedirect } from "./image-optimization.js";
+import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
+import { NEVER_CACHE_CONTROL, SERVER_ACTION_CACHE_CONTROL, applyCdnResponseHeaders, captureCdnResponsePolicyOverrides, isCdnResponsePolicyHeader, reconcileCdnResponseHeadersAfterOuterPolicy } from "./cache-control.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, hasUrlParserDotSegment, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute, stripRequestUrlFragment } from "./request-pipeline.js";
+import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { respondServerActionNotFound } from "./server-action-not-found.js";
 import { createRouteTreePrefetchResponse, isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
+import { markRouteCacheabilityDynamic, preserveRouteCacheabilityResponsePolicy, resetRouteCacheability } from "../shims/cacheability-classification.js";
 import { createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedAppRouteCacheIdentity, createSharedHybridPagesCacheIdentity, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery } from "./app-worker-stages.js";
-import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
-import { hasPagesPreviewCookie } from "./pages-response-stage.js";
-import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";
 import { adapterSharedCacheIdentity, adapterUsesSharedCacheIdentity, pagesCacheIdentityOrigin, pagesPageSharesAcrossHosts } from "./shared-cache-identity.js";
+import { parseCacheabilityManifest } from "./cacheability-manifest.js";
 import { consumePagesResponseStagePolicyOwner, withoutResponseStageVary } from "./response-stage-policy.js";
-//#region src/server/app-rsc-handler.ts
+import { consumeResponseStageLinkProvenance, copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
+import { traceAppPageRender } from "./app-page-tracing.js";
+import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
+import { normalizePathTrailingSlash } from "../shims/url-utils.js";
+import { replaceFrameworkRequestRoute, resetFrameworkRequestRoute, setFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
+// src/server/app-rsc-handler.ts
 const HAS_CONFIG_HEADERS = process.env.__VINEXT_HAS_CONFIG_HEADERS !== "false";
 const HAS_CONFIG_REDIRECTS = process.env.__VINEXT_HAS_CONFIG_REDIRECTS !== "false";
 const HAS_CONFIG_REWRITES = process.env.__VINEXT_HAS_CONFIG_REWRITES !== "false";
@@ -192,6 +192,28 @@ function withStoredSpecialErrorStatus(response, isSegmentPrefetch) {
 		statusText: status === response.status ? response.statusText : ""
 	}));
 }
+/** Send a routing-level not-found from a dispatch as an unmatched route's 404. */
+function withRouteMissCacheControl(response) {
+	if (!response.headers.has("x-vinext-route-miss")) return response;
+	replaceFrameworkRequestRoute("/404");
+	let unmarkedResponse = response;
+	try {
+		response.headers.delete(VINEXT_ROUTE_MISS_HEADER);
+		response.headers.delete(VINEXT_PARAMS_HEADER);
+	} catch {
+		const headers = new Headers(response.headers);
+		headers.delete(VINEXT_ROUTE_MISS_HEADER);
+		headers.delete(VINEXT_PARAMS_HEADER);
+		unmarkedResponse = preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
+			headers,
+			status: response.status,
+			statusText: response.statusText
+		}));
+		copyLinkHeaderProvenance(response.headers, unmarkedResponse.headers);
+		if (isAppRscResponseConfigHeadersApplied(response)) markAppRscResponseConfigHeadersApplied(unmarkedResponse);
+	}
+	return withUnmatchedRouteCacheControl(unmarkedResponse);
+}
 function hasProperty(value, key) {
 	return key in value;
 }
@@ -206,11 +228,6 @@ function isExecutionContextLike(value) {
 function isForwardedActionContext(value) {
 	return value !== null && typeof value === "object" && hasProperty(value, "actionForwarded") && value.actionForwarded === true;
 }
-function createMissingServerActionResponse(options, actionId) {
-	console.warn(getServerActionNotFoundMessage(actionId));
-	options.clearRequestContext();
-	return createServerActionNotFoundResponse();
-}
 async function applyRewrite(options, cleanPathname, recordCacheability = true) {
 	if (!HAS_CONFIG_REWRITES || !options.rewrites.length) return null;
 	const sourcePathname = options.paramsPathname ?? cleanPathname;
@@ -316,7 +333,12 @@ function withServerActionCacheControl(response) {
 	if (isStreamedActionRedirectResponse(response)) return response;
 	return withNeverCacheControl(response, SERVER_ACTION_CACHE_CONTROL);
 }
-async function handleAppRscRequest(options, request, preMiddlewareRequestContext, middlewareContext, isDataRequest, isMiddlewareDataRequest, pagesDataRequest, dispatchInternalRequest, allowInternalRscDocumentFallback, dispatchResponseStage, responseStageProbeMode = null, setInterceptionResponseUncacheable = () => {}) {
+async function handleAppRscRequest(options, request, preMiddlewareRequestContext, middlewareContext, isDataRequest, isMiddlewareDataRequest, pagesDataRequest, dispatchInternalRequest, allowInternalRscDocumentFallback, dispatchResponseStage, responseStageProbeMode = null, reportInterceptionResponseUncacheable = () => {}) {
+	let interceptionResponseUncacheable = false;
+	const setInterceptionResponseUncacheable = (uncacheable) => {
+		interceptionResponseUncacheable = uncacheable;
+		reportInterceptionResponseUncacheable(uncacheable);
+	};
 	const handlerStart = process.env.NODE_ENV !== "production" ? performance.now() : 0;
 	if (process.env.NODE_ENV !== "production") {
 		const originBlock = options.validateDevRequestOrigin?.(request);
@@ -862,6 +884,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const preActionMatch = directPreActionMatch ?? interceptionPreActionMatch;
 	const isInterceptionMatch = interceptionPreActionMatch !== null;
 	const rendersRawRequestMatch = options.matchRawRequestRoute !== void 0 && (isPossibleAppRouteActionRequest(request) || isDraftModeRequest(request, options.draftModeSecret) || isDraftModeEnabled());
+	const isActiveDraftMode = () => getActiveDraftModeState() ?? isDraftModeRequest(request, options.draftModeSecret);
 	const usesRawRequestMatch = () => rendersRawRequestMatch && cleanPathnameIsRequestPathname && !isInterceptionMatch;
 	const renderedRouteMatch = (routeMatch) => routeMatch !== null && usesRawRequestMatch() ? options.matchRawRequestRoute(requestPathname) ?? routeMatch : routeMatch;
 	const renderedPreActionMatch = renderedRouteMatch(preActionMatch);
@@ -884,7 +907,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const handleServerAction = async (routeMatch, routePathname) => {
 		if (!filesystemRouteEligible || !isPostRequest || !actionId) return null;
 		if (routeMatch && isAppRouteHandlerRoute(routeMatch.route)) return null;
-		if (!options.handleServerActionRequest) return markServerActionResponse(createMissingServerActionResponse(options, actionId));
+		if (!options.handleServerActionRequest) return markServerActionResponse(respondServerActionNotFound(actionId, options.clearRequestContext));
 		const sourceConfigHeaders = new Headers();
 		await applyAppRscConfigHeaders(sourceConfigHeaders, request, {
 			basePath: options.basePath,
@@ -918,7 +941,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const handleProgressiveAction = async (routeMatch, unrenderedRouteMatch) => {
 		if (!filesystemRouteEligible || !isProgressiveActionRequest) return null;
 		if (routeMatch && isAppRouteHandlerRoute(routeMatch.route)) return null;
-		if (!options.handleProgressiveActionRequest) return unrenderedRouteMatch?.route.__loadPage && !unrenderedRouteMatch.route.__loadRouteHandler ? markServerActionResponse(createMissingServerActionResponse(options, null)) : null;
+		if (!options.handleProgressiveActionRequest) return unrenderedRouteMatch?.route.__loadPage && !unrenderedRouteMatch.route.__loadRouteHandler ? markServerActionResponse(respondServerActionNotFound(null, options.clearRequestContext)) : null;
 		const progressiveActionResult = await options.handleProgressiveActionRequest({
 			actionId,
 			cleanPathname,
@@ -1084,194 +1107,280 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return dynamicPagesFallbackResponse;
 	}
-	if (!match) for (const rewrite of options.configRewrites.fallback) {
-		const fallbackRewrite = await applyRewrite({
-			basePathState: currentBasePathState(),
-			clearRequestContext: options.clearRequestContext,
-			middlewareContext,
-			request,
-			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
-			rewrites: [rewrite],
-			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
-		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
-		if (fallbackRewrite instanceof Response) {
+	let nextFallbackRewriteIndex = 0;
+	const rejectedRoutes = /* @__PURE__ */ new Set();
+	let shouldResumeRoutingAfterMiss = false;
+	const canResumeRoutingAfterMiss = () => nextFallbackRewriteIndex < options.configRewrites.fallback.length;
+	const resumeRoutingAfterMiss = () => {
+		if (!canResumeRoutingAfterMiss()) return false;
+		shouldResumeRoutingAfterMiss = true;
+		return true;
+	};
+	let bypassInterceptionContextCacheBeforeMatch = bypassInterceptionContextCache;
+	let interceptionResponseUncacheableBeforeMatch = interceptionResponseUncacheable;
+	const finishRouting = async () => {
+		if (!match) for (let rewriteIndex = nextFallbackRewriteIndex; rewriteIndex < options.configRewrites.fallback.length; rewriteIndex++) {
+			const rewrite = options.configRewrites.fallback[rewriteIndex];
+			const fallbackRewrite = await applyRewrite({
+				basePathState: currentBasePathState(),
+				clearRequestContext: options.clearRequestContext,
+				middlewareContext,
+				request,
+				requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
+				paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
+				rewrites: [rewrite],
+				validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
+			}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
+			if (fallbackRewrite instanceof Response) {
+				invalidateInterceptionCacheProof();
+				return fallbackRewrite;
+			}
+			if (!fallbackRewrite) continue;
+			nextFallbackRewriteIndex = rewriteIndex + 1;
+			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
+			cleanPathname = pathnameForResolvedUrl(resolvedUrl);
+			cleanPathnameIsRequestPathname = false;
 			invalidateInterceptionCacheProof();
-			return fallbackRewrite;
+			resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
+			filesystemRouteEligible = resolvedPathnameHasBasePath;
+			const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
+			if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
+			const rewrittenImageEndpointResponse = await serveImageEndpointIfMatched();
+			if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
+			const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
+			if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
+			const rewrittenPublicFileResponse = servePublicFileIfMatched();
+			if (rewrittenPublicFileResponse) return rewrittenPublicFileResponse;
+			match = matchCleanPathname();
+			if (match && rejectedRoutes.has(match.route)) match = null;
+			const rewrittenStaticPagesResponse = await renderPagesForMatchKind("static");
+			if (rewrittenStaticPagesResponse) {
+				options.clearRequestContext();
+				return rewrittenStaticPagesResponse;
+			}
+			const rewrittenDynamicPagesResponse = await renderPagesForMatchKind("dynamic");
+			if (rewrittenDynamicPagesResponse) {
+				options.clearRequestContext();
+				return rewrittenDynamicPagesResponse;
+			}
+			if (match) break;
 		}
-		if (!fallbackRewrite) continue;
-		resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
-		cleanPathname = pathnameForResolvedUrl(resolvedUrl);
-		cleanPathnameIsRequestPathname = false;
-		invalidateInterceptionCacheProof();
-		resolvedPathnameHasBasePath = !options.basePath || rewrite.basePath !== false;
-		filesystemRouteEligible = resolvedPathnameHasBasePath;
-		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
-		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
-		const rewrittenImageEndpointResponse = await serveImageEndpointIfMatched();
-		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
-		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
-		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
-		const rewrittenPublicFileResponse = servePublicFileIfMatched();
-		if (rewrittenPublicFileResponse) return rewrittenPublicFileResponse;
-		match = matchCleanPathname();
-		const rewrittenStaticPagesResponse = await renderPagesForMatchKind("static");
-		if (rewrittenStaticPagesResponse) {
+		if (interceptionCacheProofInvalidated && interceptionSourceContext !== null) {
+			const finalInterceptionTargetPathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
+			const finalInterceptionSourceMatch = filesystemRouteEligible && match !== null ? options.matchInterceptRoute?.(finalInterceptionTargetPathname, interceptionSourceContext, interceptionIdHeader) ?? null : null;
+			const hasVerifiedFinalInterceptionSource = hasVerifiedInterceptionSource && interceptionSourceMatch !== null && provesConcreteInterceptionSource(finalInterceptionSourceMatch) && finalInterceptionSourceMatch !== null && finalInterceptionSourceMatch.route === interceptionSourceMatch.route && haveSamePageParams(finalInterceptionSourceMatch.params, interceptionSourceMatch.params) && isSameInterceptionSource(finalInterceptionSourceMatch, {
+				params: interceptionSourceMatch.authorizationParams ?? interceptionSourceMatch.params,
+				route: interceptionSourceMatch.authorizationRoute ?? interceptionSourceMatch.route
+			});
+			if (interceptionIdHeader !== null && !hasVerifiedFinalInterceptionSource) {
+				options.clearRequestContext();
+				setInterceptionResponseUncacheable(true);
+				return badRequestResponse();
+			}
+			if (!hasVerifiedFinalInterceptionSource) interceptionSourceContext = null;
+			bypassInterceptionContextCache = !hasVerifiedFinalInterceptionSource;
+			setInterceptionResponseUncacheable(bypassInterceptionContextCache);
+		}
+		if ((!filesystemRouteEligible || !match) && isNextStaticPath(cleanPathname, "", assetPrefixPathname(options.assetPrefix ?? ""))) {
 			options.clearRequestContext();
-			return rewrittenStaticPagesResponse;
+			const headers = new Headers();
+			mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
+			applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
+			return notFoundStaticAssetResponse(headers);
 		}
-		const rewrittenDynamicPagesResponse = await renderPagesForMatchKind("dynamic");
-		if (rewrittenDynamicPagesResponse) {
+		if (!filesystemRouteEligible) {
 			options.clearRequestContext();
-			return rewrittenDynamicPagesResponse;
+			const headers = new Headers();
+			mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
+			return withUnmatchedRouteCacheControl(notFoundResponse({ headers }));
 		}
-		if (match) break;
-	}
-	if (interceptionCacheProofInvalidated && interceptionSourceContext !== null) {
-		const finalInterceptionTargetPathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
-		const finalInterceptionSourceMatch = filesystemRouteEligible && match !== null ? options.matchInterceptRoute?.(finalInterceptionTargetPathname, interceptionSourceContext, interceptionIdHeader) ?? null : null;
-		const hasVerifiedFinalInterceptionSource = hasVerifiedInterceptionSource && interceptionSourceMatch !== null && provesConcreteInterceptionSource(finalInterceptionSourceMatch) && finalInterceptionSourceMatch !== null && finalInterceptionSourceMatch.route === interceptionSourceMatch.route && haveSamePageParams(finalInterceptionSourceMatch.params, interceptionSourceMatch.params) && isSameInterceptionSource(finalInterceptionSourceMatch, {
-			params: interceptionSourceMatch.authorizationParams ?? interceptionSourceMatch.params,
-			route: interceptionSourceMatch.authorizationRoute ?? interceptionSourceMatch.route
-		});
-		if (interceptionIdHeader !== null && !hasVerifiedFinalInterceptionSource) {
+		if (pagesDataRequest) {
 			options.clearRequestContext();
-			setInterceptionResponseUncacheable(true);
-			return badRequestResponse();
+			if (runMiddleware && (middlewareContext.status === null || middlewareContext.status === 200 || middlewareContext.status === 404)) {
+				const response = buildNextDataNotFoundResponse();
+				const headers = new Headers(response.headers);
+				mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
+				headers.set("x-nextjs-matched-path", matchPathname(canonicalPathname));
+				if (resolvedUrl !== originalResolvedUrl) headers.set("x-nextjs-rewrite", resolvedUrl);
+				return new Response("{}", {
+					status: 200,
+					headers
+				});
+			}
+			return buildNextDataNotFoundResponse();
 		}
-		if (!hasVerifiedFinalInterceptionSource) interceptionSourceContext = null;
-		bypassInterceptionContextCache = !hasVerifiedFinalInterceptionSource;
-		setInterceptionResponseUncacheable(bypassInterceptionContextCache);
-	}
-	if ((!filesystemRouteEligible || !match) && isNextStaticPath(cleanPathname, "", assetPrefixPathname(options.assetPrefix ?? ""))) {
-		options.clearRequestContext();
-		const headers = new Headers();
-		mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
-		applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
-		return notFoundStaticAssetResponse(headers);
-	}
-	if (!filesystemRouteEligible) {
-		options.clearRequestContext();
-		const headers = new Headers();
-		mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
-		return withUnmatchedRouteCacheControl(notFoundResponse({ headers }));
-	}
-	if (pagesDataRequest) {
-		options.clearRequestContext();
-		if (runMiddleware && (middlewareContext.status === null || middlewareContext.status === 200 || middlewareContext.status === 404)) {
-			const response = buildNextDataNotFoundResponse();
-			const headers = new Headers(response.headers);
+		if (isProgressiveActionRequest && !progressiveActionHandled || isServerActionRequest && !serverActionHandled) {
+			const finalRouteMatch = renderedRouteMatch(match);
+			setRootParams(finalRouteMatch ? pickRootParams(finalRouteMatch.params, finalRouteMatch.route.rootParamNames) : null);
+			if (isServerActionRequest) {
+				const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestPathname : cleanPathname);
+				if (serverActionResponse) return serverActionResponse;
+			} else {
+				const progressiveActionResult = await handleProgressiveAction(finalRouteMatch, match);
+				if (progressiveActionResult instanceof Response) return progressiveActionResult;
+				progressiveActionFormState = progressiveActionResult;
+			}
+		}
+		const renderUnmatchedRoute = async () => {
+			setFrameworkRequestRoute("/404", isRscRequest);
+			const notFoundResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
+			if (notFoundResponseStage) {
+				const response = await notFoundResponseStage(responseStageRequest(), {
+					kind: "app-not-found",
+					buildId: options.buildId,
+					cacheability: responseStageCacheability(resolvedUrl),
+					canonicalPathname,
+					cleanPathname,
+					draftModeCookie,
+					isRscRequest,
+					middlewareCookieOverlay,
+					mountedSlotsHeader,
+					protocolVersion: 13,
+					requestOrigin: url.origin,
+					renderMode,
+					resolvedUrl,
+					scriptNonce: scriptNonce ?? null
+				});
+				return withUnmatchedRouteCacheControl(await composeResponseStageResponse(response));
+			}
+			const renderedNotFoundResponse = await traceAppPageRender("/404", "render", () => options.renderNotFound({
+				isRscRequest,
+				middlewareContext,
+				request,
+				route: null,
+				scriptNonce
+			}));
+			if (renderedNotFoundResponse) return markAppRscApplicationResponse(withUnmatchedRouteCacheControl(renderedNotFoundResponse));
+			options.clearRequestContext();
+			const headers = new Headers();
 			mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
-			headers.set("x-nextjs-matched-path", matchPathname(canonicalPathname));
-			if (resolvedUrl !== originalResolvedUrl) headers.set("x-nextjs-rewrite", resolvedUrl);
-			return new Response("{}", {
-				status: 200,
-				headers
-			});
+			return withUnmatchedRouteCacheControl(notFoundResponse({ headers }));
+		};
+		if (!match) {
+			if (process.env.NODE_ENV !== "production" && canonicalPathname === "/favicon.ico") {
+				options.clearRequestContext();
+				return new Response("", { status: 404 });
+			}
+			return renderUnmatchedRoute();
 		}
-		return buildNextDataNotFoundResponse();
-	}
-	if (isProgressiveActionRequest && !progressiveActionHandled || isServerActionRequest && !serverActionHandled) {
-		const finalRouteMatch = renderedRouteMatch(match);
-		setRootParams(finalRouteMatch ? pickRootParams(finalRouteMatch.params, finalRouteMatch.route.rootParamNames) : null);
-		if (isServerActionRequest) {
-			const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestPathname : cleanPathname);
-			if (serverActionResponse) return serverActionResponse;
-		} else {
-			const progressiveActionResult = await handleProgressiveAction(finalRouteMatch, match);
-			if (progressiveActionResult instanceof Response) return progressiveActionResult;
-			progressiveActionFormState = progressiveActionResult;
+		bypassInterceptionContextCacheBeforeMatch = bypassInterceptionContextCache;
+		interceptionResponseUncacheableBeforeMatch = interceptionResponseUncacheable;
+		match = renderedRouteMatch(match);
+		const { route, params } = match;
+		const requestPathnameDiffersFromCachePath = requestPathname !== cleanPathname;
+		const rawRequestPathnameIsObservable = isInterceptionMatch || route.routeHandler != null || typeof route.__loadRouteHandler === "function";
+		if ((!isInterceptionMatch || requestPathnameDiffersFromCachePath) && options.matchRequestRoute) {
+			const cachePathMatch = options.matchRoute(cleanPathname);
+			if (requestPathnameDiffersFromCachePath && rawRequestPathnameIsObservable || !cachePathMatch || cachePathMatch.route.pattern !== route.pattern || !haveSamePageParams(cachePathMatch.params, params)) {
+				bypassInterceptionContextCache = true;
+				setInterceptionResponseUncacheable(true);
+			}
 		}
-	}
-	if (!match) {
-		if (process.env.NODE_ENV !== "production" && canonicalPathname === "/favicon.ico") {
-			options.clearRequestContext();
-			return new Response("", { status: 404 });
+		const cachePathname = cleanPathnameIsRequestPathname ? cleanPathname : rewriteCachePathname(canonicalPathname, cleanPathname);
+		if (options.ensureRouteLoaded) await traceFindPageComponents(route.pattern, () => options.ensureRouteLoaded(route));
+		const resolvedSearchParams = getResolvedSearchParams();
+		const isRouteTreePrefetch = isRouteTreePrefetchRequest(request) && !route.routeHandler;
+		if (isRouteTreePrefetch && !isFinalRouteMatch && canResumeRoutingAfterMiss() && !isActiveDraftMode() && options.isDynamicParamsMiss && await runStaticParamsCheckDetached(() => options.isDynamicParamsMiss(route, params))) {
+			setRootParams(null);
+			resumeRoutingAfterMiss();
+			return new Response(null, { status: 404 });
 		}
-		setFrameworkRequestRoute("/404", isRscRequest);
-		const notFoundResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
-		if (notFoundResponseStage) return withUnmatchedRouteCacheControl(await composeResponseStageResponse(await notFoundResponseStage(responseStageRequest(), {
-			kind: "app-not-found",
-			buildId: options.buildId,
-			cacheability: responseStageCacheability(resolvedUrl),
-			canonicalPathname,
-			cleanPathname,
-			draftModeCookie,
-			isRscRequest,
-			middlewareCookieOverlay,
-			mountedSlotsHeader,
-			protocolVersion: 13,
-			requestOrigin: url.origin,
-			renderMode,
-			resolvedUrl,
-			scriptNonce: scriptNonce ?? null
-		})));
-		const renderedNotFoundResponse = await traceAppPageRender("/404", "render", () => options.renderNotFound({
-			isRscRequest,
-			middlewareContext,
-			request,
-			route: null,
-			scriptNonce
-		}));
-		if (renderedNotFoundResponse) return markAppRscApplicationResponse(withUnmatchedRouteCacheControl(renderedNotFoundResponse));
-		options.clearRequestContext();
-		const headers = new Headers();
-		mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
-		return withUnmatchedRouteCacheControl(notFoundResponse({ headers }));
-	}
-	match = renderedRouteMatch(match);
-	const { route, params } = match;
-	const requestPathnameDiffersFromCachePath = requestPathname !== cleanPathname;
-	const rawRequestPathnameIsObservable = isInterceptionMatch || route.routeHandler != null || typeof route.__loadRouteHandler === "function";
-	if ((!isInterceptionMatch || requestPathnameDiffersFromCachePath) && options.matchRequestRoute) {
-		const cachePathMatch = options.matchRoute(cleanPathname);
-		if (requestPathnameDiffersFromCachePath && rawRequestPathnameIsObservable || !cachePathMatch || cachePathMatch.route.pattern !== route.pattern || !haveSamePageParams(cachePathMatch.params, params)) {
-			bypassInterceptionContextCache = true;
-			setInterceptionResponseUncacheable(true);
+		setFrameworkRequestRoute(patternToNextFormat(route.pattern), isRscRequest);
+		if (isRouteTreePrefetch) {
+			const response = await createRouteTreePrefetchResponse(route, {
+				buildId: options.buildId,
+				prefetchInlining: options.prefetchInlining
+			});
+			options.clearRequestContext();
+			return applyMiddlewareContextToResponse(response, middlewareContext);
 		}
-	}
-	const cachePathname = cleanPathnameIsRequestPathname ? cleanPathname : rewriteCachePathname(canonicalPathname, cleanPathname);
-	setFrameworkRequestRoute(patternToNextFormat(route.pattern), isRscRequest);
-	if (options.ensureRouteLoaded) await traceFindPageComponents(route.pattern, () => options.ensureRouteLoaded(route));
-	const resolvedSearchParams = getResolvedSearchParams();
-	if (isRouteTreePrefetchRequest(request) && !route.routeHandler) {
-		const response = await createRouteTreePrefetchResponse(route, {
-			buildId: options.buildId,
-			prefetchInlining: options.prefetchInlining
+		const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
+		const prerenderRouteParamsMatch = matchPrerenderRouteParamsPayload(prerenderRouteParamsPayload, route.pattern, params);
+		const prerenderRouteParams = prerenderRouteParamsMatch?.params ?? null;
+		const isPrerenderFallbackShell = prerenderRouteParamsMatch?.kind === "fallback-shell";
+		const renderParams = prerenderRouteParams ?? params;
+		const responseStageMatchKind = isInterceptionMatch ? "interception" : cleanPathnameIsRequestPathname && options.matchRequestRoute ? usesRawRequestMatch() ? "raw-request" : "request" : "resolved";
+		const responseStageRoutePathname = isInterceptionMatch ? preActionRoutePathname : cleanPathnameIsRequestPathname ? requestPathname || "/" : cleanPathname || "/";
+		const matchedResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
+		let runtimeFallbackShells = [];
+		if (options.createPprFallbackShells && request.method === "GET" && !isRscRequest && !isPrerenderFallbackShell && route.params) runtimeFallbackShells = options.createPprFallbackShells({
+			params: route.params,
+			pattern: route.pattern,
+			rootParamNames: route.rootParamNames
+		}, params);
+		options.setNavigationContext({
+			pathname: canonicalPathname,
+			searchParams: resolvedSearchParams,
+			params: renderParams
 		});
-		options.clearRequestContext();
-		return applyMiddlewareContextToResponse(response, middlewareContext);
-	}
-	const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
-	const prerenderRouteParamsMatch = matchPrerenderRouteParamsPayload(prerenderRouteParamsPayload, route.pattern, params);
-	const prerenderRouteParams = prerenderRouteParamsMatch?.params ?? null;
-	const isPrerenderFallbackShell = prerenderRouteParamsMatch?.kind === "fallback-shell";
-	const renderParams = prerenderRouteParams ?? params;
-	const responseStageMatchKind = isInterceptionMatch ? "interception" : cleanPathnameIsRequestPathname && options.matchRequestRoute ? usesRawRequestMatch() ? "raw-request" : "request" : "resolved";
-	const responseStageRoutePathname = isInterceptionMatch ? preActionRoutePathname : cleanPathnameIsRequestPathname ? requestPathname || "/" : cleanPathname || "/";
-	const matchedResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
-	let runtimeFallbackShells = [];
-	if (options.createPprFallbackShells && request.method === "GET" && !isRscRequest && !isPrerenderFallbackShell && route.params) runtimeFallbackShells = options.createPprFallbackShells({
-		params: route.params,
-		pattern: route.pattern,
-		rootParamNames: route.rootParamNames
-	}, params);
-	options.setNavigationContext({
-		pathname: canonicalPathname,
-		searchParams: resolvedSearchParams,
-		params: renderParams
-	});
-	const rootParams = pickRootParams(renderParams, route.rootParamNames);
-	setRootParams(rootParams);
-	if (route.routeHandler) {
-		const routeHandlerRuntime = isEdgeRouteHandler(route.routeHandler) ? "edge" : "node";
-		const routeHandlerRequest = routeHandlerRuntime === "edge" ? userlandRequest : request;
-		const routeHandlerUrl = new URL(routeHandlerRequest.url);
-		const internalRscValues = routeHandlerRuntime === "edge" ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
-		routeHandlerUrl.search = resolvedSearchParams.toString();
-		for (const internalRscValue of internalRscValues) routeHandlerUrl.searchParams.append(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, internalRscValue);
-		if (matchedResponseStage) return composeResponseStageResponse(await matchedResponseStage(responseStageRequest(), {
-			kind: "app-route-handler",
+		const rootParams = pickRootParams(renderParams, route.rootParamNames);
+		setRootParams(rootParams);
+		if (route.routeHandler) {
+			const routeHandlerRuntime = isEdgeRouteHandler(route.routeHandler) ? "edge" : "node";
+			const routeHandlerRequest = routeHandlerRuntime === "edge" ? userlandRequest : request;
+			const routeHandlerUrl = new URL(routeHandlerRequest.url);
+			const internalRscValues = routeHandlerRuntime === "edge" ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
+			routeHandlerUrl.search = resolvedSearchParams.toString();
+			for (const internalRscValue of internalRscValues) routeHandlerUrl.searchParams.append(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, internalRscValue);
+			if (matchedResponseStage) {
+				const response = await matchedResponseStage(responseStageRequest(), {
+					kind: "app-route-handler",
+					buildId: options.buildId,
+					cacheability: responseStageCacheability(resolvedUrl),
+					bypassInterceptionContextCache,
+					cachePathname,
+					canUseCanonicalLoadingShell: route.canUseCanonicalLoadingShell === true,
+					canonicalPathname,
+					cleanPathname,
+					draftModeCookie,
+					forceDynamic: route.forceDynamic === true,
+					interceptionContext: interceptionContextHeader,
+					interceptionId: interceptionIdHeader,
+					isRscRequest,
+					matchKind: responseStageMatchKind,
+					middlewareCookieOverlay,
+					mountedSlotsHeader,
+					params,
+					protocolVersion: 13,
+					requestOrigin: url.origin,
+					renderMode,
+					resolvedUrl,
+					routePattern: route.pattern,
+					routePathname: responseStageRoutePathname,
+					scriptNonce: scriptNonce ?? null
+				});
+				return withRouteMissCacheControl(await composeResponseStageResponse(response, response.headers.has("x-vinext-route-miss") ? void 0 : routeHandlerRuntime));
+			}
+			const { setCurrentFetchSoftTags } = await import("../shims/fetch-cache.js");
+			setCurrentFetchSoftTags(buildPageCacheTags(cleanPathname, [], [...route.routeSegments], "route"));
+			const routeHandlerResponse = await options.dispatchMatchedRouteHandler({
+				bypassInterceptionContextCache,
+				cachePathname,
+				cleanPathname,
+				middlewareContext,
+				params: route.isDynamic ? renderParams : null,
+				renderNotFound() {
+					options.setNavigationContext({
+						pathname: canonicalPathname,
+						searchParams: resolvedSearchParams,
+						params: {}
+					});
+					setRootParams({});
+					return renderUnmatchedRoute();
+				},
+				request: cloneRequestWithUrl(routeHandlerRequest, routeHandlerUrl.toString()),
+				route,
+				resumeRoutingAfterMiss,
+				searchParams: resolvedSearchParams
+			});
+			if (routeHandlerResponse.headers.has("x-vinext-route-miss")) return markAppRscApplicationResponse(withRouteMissCacheControl(routeHandlerResponse));
+			return markAppRscRouteHandlerResponse(routeHandlerResponse, routeHandlerRuntime);
+		}
+		const failedProgressiveActionResult = progressiveActionFormState && "actionError" in progressiveActionFormState ? progressiveActionFormState : null;
+		const actionHttpFallbackStatus = failedProgressiveActionResult ? progressiveActionHttpFallbackStatus(failedProgressiveActionResult.actionError) : null;
+		const normalizedProgressiveActionError = actionHttpFallbackStatus === null || actionHttpFallbackStatus === 404 ? failedProgressiveActionResult?.actionError : { digest: "NEXT_NOT_FOUND" };
+		const pageResponse = withStoredSpecialErrorStatus(withRouteMissCacheControl(matchedResponseStage ? await matchedResponseStage(responseStageRequest(), {
+			kind: "app-page",
 			buildId: options.buildId,
 			cacheability: responseStageCacheability(resolvedUrl),
 			bypassInterceptionContextCache,
@@ -1281,7 +1390,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			cleanPathname,
 			draftModeCookie,
 			forceDynamic: route.forceDynamic === true,
-			interceptionContext: interceptionContextHeader,
+			interceptionContext: interceptionSourceContext,
 			interceptionId: interceptionIdHeader,
 			isRscRequest,
 			matchKind: responseStageMatchKind,
@@ -1295,84 +1404,62 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			routePattern: route.pattern,
 			routePathname: responseStageRoutePathname,
 			scriptNonce: scriptNonce ?? null
-		}), routeHandlerRuntime);
-		const { setCurrentFetchSoftTags } = await import("../shims/fetch-cache.js");
-		setCurrentFetchSoftTags(buildPageCacheTags(cleanPathname, [], [...route.routeSegments], "route"));
-		const routeHandlerResponse = await options.dispatchMatchedRouteHandler({
+		}).then((response) => transportedResponseStage && isRscRequest ? withRoutedRscHeaders(response, resolveAppPageNavigationParams(route, params, cleanPathname), resolvedUrl, interceptionSourceContext !== null) : response).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
 			bypassInterceptionContextCache,
 			cachePathname,
 			cleanPathname,
+			displayPathname: canonicalPathname,
+			formState: progressiveActionFormState?.formState ?? null,
+			actionError: normalizedProgressiveActionError,
+			actionFailed: failedProgressiveActionResult !== null,
+			handlerStart,
+			interceptionContext: interceptionSourceContext,
+			interceptionId: interceptionIdHeader,
+			interceptionPathname: cleanPathnameIsRequestPathname ? requestPathname : cleanPathname,
+			isProgressiveActionRender: progressiveActionFormState !== null,
+			isRscRequest,
 			middlewareContext,
-			params: route.isDynamic ? renderParams : null,
-			request: cloneRequestWithUrl(routeHandlerRequest, routeHandlerUrl.toString()),
+			mountedSlotsHeader,
+			params: renderParams,
+			pprFallbackCacheShells: runtimeFallbackShells,
+			pprFallbackShell: isPrerenderFallbackShell ? {
+				fallbackParamNames: prerenderRouteParamsMatch.fallbackParamNames,
+				routePattern: route.pattern
+			} : void 0,
+			renderedConcreteUrlPaths: getRenderedConcreteUrlPathsForRoute(route.pattern),
+			resumeRoutingAfterMiss: isFinalRouteMatch || isServerActionRequest || isProgressiveActionRequest ? void 0 : resumeRoutingAfterMiss,
+			skipStaticParamsValidation: isPrerenderFallbackShell,
+			staticParamsValidationParams: prerenderRouteParams === null || isPrerenderFallbackShell ? void 0 : params,
+			rootParams,
+			request,
+			renderedPathAndSearch: resolvedUrl,
 			route,
-			searchParams: resolvedSearchParams
+			scriptNonce,
+			searchParams: resolvedSearchParams,
+			renderMode
+		})), isRscRequest && request.headers.get("Next-Router-Prefetch") === "1" && request.headers.has("Next-Router-Segment-Prefetch"));
+		if (progressiveActionFormState) return markServerActionResponse(markAppRscApplicationResponse(applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState)));
+		return markAppRscApplicationResponse(pageResponse);
+	};
+	let response = await finishRouting();
+	while (shouldResumeRoutingAfterMiss) {
+		await response.body?.cancel();
+		shouldResumeRoutingAfterMiss = false;
+		resetFrameworkRequestRoute();
+		resetRouteCacheability();
+		options.setNavigationContext({
+			pathname: canonicalPathname,
+			searchParams: getResolvedSearchParams(),
+			params: {}
 		});
-		return markAppRscRouteHandlerResponse(routeHandlerResponse, routeHandlerRuntime);
+		setRootParams(null);
+		bypassInterceptionContextCache = bypassInterceptionContextCacheBeforeMatch;
+		setInterceptionResponseUncacheable(interceptionResponseUncacheableBeforeMatch);
+		if (match) rejectedRoutes.add(match.route);
+		match = null;
+		response = await finishRouting();
 	}
-	const failedProgressiveActionResult = progressiveActionFormState && "actionError" in progressiveActionFormState ? progressiveActionFormState : null;
-	const actionHttpFallbackStatus = failedProgressiveActionResult ? progressiveActionHttpFallbackStatus(failedProgressiveActionResult.actionError) : null;
-	const normalizedProgressiveActionError = actionHttpFallbackStatus === null || actionHttpFallbackStatus === 404 ? failedProgressiveActionResult?.actionError : { digest: "NEXT_NOT_FOUND" };
-	const pageResponse = withStoredSpecialErrorStatus(matchedResponseStage ? await matchedResponseStage(responseStageRequest(), {
-		kind: "app-page",
-		buildId: options.buildId,
-		cacheability: responseStageCacheability(resolvedUrl),
-		bypassInterceptionContextCache,
-		cachePathname,
-		canUseCanonicalLoadingShell: route.canUseCanonicalLoadingShell === true,
-		canonicalPathname,
-		cleanPathname,
-		draftModeCookie,
-		forceDynamic: route.forceDynamic === true,
-		interceptionContext: interceptionSourceContext,
-		interceptionId: interceptionIdHeader,
-		isRscRequest,
-		matchKind: responseStageMatchKind,
-		middlewareCookieOverlay,
-		mountedSlotsHeader,
-		params,
-		protocolVersion: 13,
-		requestOrigin: url.origin,
-		renderMode,
-		resolvedUrl,
-		routePattern: route.pattern,
-		routePathname: responseStageRoutePathname,
-		scriptNonce: scriptNonce ?? null
-	}).then((response) => transportedResponseStage && isRscRequest ? withRoutedRscHeaders(response, resolveAppPageNavigationParams(route, params, cleanPathname), resolvedUrl, interceptionSourceContext !== null) : response).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
-		bypassInterceptionContextCache,
-		cachePathname,
-		cleanPathname,
-		displayPathname: canonicalPathname,
-		formState: progressiveActionFormState?.formState ?? null,
-		actionError: normalizedProgressiveActionError,
-		actionFailed: failedProgressiveActionResult !== null,
-		handlerStart,
-		interceptionContext: interceptionSourceContext,
-		interceptionId: interceptionIdHeader,
-		interceptionPathname: cleanPathnameIsRequestPathname ? requestPathname : cleanPathname,
-		isProgressiveActionRender: progressiveActionFormState !== null,
-		isRscRequest,
-		middlewareContext,
-		mountedSlotsHeader,
-		params: renderParams,
-		pprFallbackCacheShells: runtimeFallbackShells,
-		pprFallbackShell: isPrerenderFallbackShell ? {
-			fallbackParamNames: prerenderRouteParamsMatch.fallbackParamNames,
-			routePattern: route.pattern
-		} : void 0,
-		renderedConcreteUrlPaths: getRenderedConcreteUrlPathsForRoute(route.pattern),
-		skipStaticParamsValidation: isPrerenderFallbackShell,
-		staticParamsValidationParams: prerenderRouteParams === null || isPrerenderFallbackShell ? void 0 : params,
-		rootParams,
-		request,
-		renderedPathAndSearch: resolvedUrl,
-		route,
-		scriptNonce,
-		searchParams: resolvedSearchParams,
-		renderMode
-	}), isRscRequest && request.headers.get("Next-Router-Prefetch") === "1" && request.headers.has("Next-Router-Segment-Prefetch"));
-	if (progressiveActionFormState) return markServerActionResponse(markAppRscApplicationResponse(applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState)));
-	return markAppRscApplicationResponse(pageResponse);
+	return response;
 }
 function progressiveActionHttpFallbackStatus(actionError) {
 	const actionErrorDigest = actionError && typeof actionError === "object" && "digest" in actionError ? String(actionError.digest) : null;
@@ -1515,5 +1602,4 @@ function createAppRscRequestHandler(options) {
 	};
 	return appRscHandler;
 }
-//#endregion
 export { createAppRscRequestHandler };