vinext 1.4.0 → 1.4.2

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

@@ -4,11 +4,11 @@ import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROU
 import { buildRequestHeadersFromMiddlewareResponse, hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.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, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute } from "./request-pipeline.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, hasUrlParserDotSegment, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute, stripRequestUrlFragment } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
@@ -18,7 +18,7 @@ import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js
 import { 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, applyCdnResponseHeaders, captureCdnResponsePolicyOverrides, isCdnResponsePolicyHeader, reconcileCdnResponseHeadersAfterOuterPolicy } from "./cache-control.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 { mergeRewriteQuery } from "../utils/query.js";
@@ -31,22 +31,23 @@ import { openForwardedMiddlewareContext } from "./forwarded-middleware-context.j
 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, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { applyAppRscConfigHeaders, finalizeAppRscResponse, isStreamedActionRedirectResponse, markAppRscResponseConfigHeadersApplied, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import "./app-page-response.js";
 import { parseNextHttpErrorDigest } from "./next-error-digest.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 { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createRouteTreePrefetchResponse, isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
-import { createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedHybridPagesCacheIdentity, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery } from "./app-worker-stages.js";
+import { createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedAppRouteCacheIdentity, createSharedHybridPagesCacheIdentity, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery } from "./app-worker-stages.js";
 import { flattenErrorCauses } from "../utils/error-cause.js";
-import { applyAppRscConfigHeaders, finalizeAppRscResponse, markAppRscResponseConfigHeadersApplied } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { hasPagesPreviewCookie } from "./pages-response-stage.js";
 import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";
@@ -132,11 +133,8 @@ function readCacheabilityRequestProjection(options) {
 	};
 	return parsedCacheabilityRequestProjection.manifest;
 }
-function hasUrlParserDotSegment(pathname) {
-	return pathname.split("/").some((segment) => {
-		const decodedDots = segment.replaceAll(/%2e/gi, ".");
-		return decodedDots === "." || decodedDots === "..";
-	});
+function isSameInterceptionSource(a, b) {
+	return b != null && (a.authorizationRoute ?? a.route) === b.route && haveSamePageParams(a.authorizationParams ?? a.params, b.params);
 }
 function applyMiddlewareContextToResponse(response, middlewareContext, appendToPostConfigLink = false) {
 	if (!middlewareContext.headers && middlewareContext.status == null) return response;
@@ -152,6 +150,27 @@ function applyMiddlewareContextToResponse(response, middlewareContext, appendToP
 	}));
 }
 /**
+* These headers describe the current routed request, not the shared RSC
+* bytes, so they are composed above a transported response stage: a cache HIT
+* cannot replay another query/path and never loses dynamic params. An
+* intercepted response's params include its target's, which this match lacks,
+* so the response stage keeps them under an interception context, in its
+* cache identity.
+*/
+function withRoutedRscHeaders(response, navigationParams, resolvedUrl, keepsRenderedParams) {
+	const headers = new Headers(response.headers);
+	if (!keepsRenderedParams || !headers.has("X-Vinext-Params")) {
+		if (Object.keys(navigationParams).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(navigationParams)));
+		else headers.delete(VINEXT_PARAMS_HEADER);
+	}
+	headers.set(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, encodeURIComponent(resolvedUrl));
+	return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
+		headers,
+		status: response.status,
+		statusText: response.statusText
+	}));
+}
+/**
 * Next.js answers a Link's segment prefetch of a page whose notFound(),
 * forbidden() or unauthorized() it stored with a 200, so its router renders
 * the page's fallback without loading the document. A shared response stage
@@ -257,17 +276,10 @@ function requestWithoutRscCacheBustingSearchParam(request) {
 	stripRscCacheBustingSearchParam(url);
 	return cloneRequestWithUrl(request, url.toString());
 }
-function requestWithoutRscSuffix(request) {
-	const url = new URL(request.url);
-	const pathname = stripRscSuffix(url.pathname);
-	if (pathname === url.pathname) return request;
-	url.pathname = pathname;
-	return cloneRequestWithUrl(request, url.toString());
-}
-/** Send a response with the never-cache policy, rebuilding immutable headers. */
-function withNeverCacheControl(response) {
+/** Send a response with a never-cache policy, rebuilding immutable headers. */
+function withNeverCacheControl(response, cacheControl = NEVER_CACHE_CONTROL) {
 	const applyNoStore = (headers) => {
-		applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
+		applyCdnResponseHeaders(headers, { cacheControl });
 	};
 	let markedResponse = response;
 	try {
@@ -290,6 +302,19 @@ function withUnmatchedRouteCacheControl(response) {
 	unmatchedRouteResponses.add(markedResponse);
 	return markedResponse;
 }
+const serverActionResponses = /* @__PURE__ */ new WeakSet();
+function markServerActionResponse(response) {
+	serverActionResponses.add(response);
+	return response;
+}
+/**
+* A fetch action's redirect that streams its target's render keeps the
+* target's policy, as in Next.js. Every other action response is never cached.
+*/
+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 = () => {}) {
 	const handlerStart = process.env.NODE_ENV !== "production" ? performance.now() : 0;
 	if (process.env.NODE_ENV !== "production") {
@@ -320,8 +345,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		setInterceptionResponseUncacheable(true);
 		return badRequestResponse();
 	}
-	const { requestCleanPathname } = normalized;
-	let { pathname, cleanPathname } = normalized;
+	const { pathname, requestPathname } = normalized;
+	let cleanPathname = pathname;
 	let resolvedUrl = cleanPathname + url.search;
 	const originalResolvedUrl = serializeResolvedUrl(resolvedUrl, url);
 	const getResolvedSearchParams = () => new URL(resolvedUrl, url).searchParams;
@@ -331,7 +356,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		hadBasePath
 	};
 	let cleanPathnameIsRequestPathname = true;
-	const matchCleanPathname = () => cleanPathnameIsRequestPathname && options.matchRequestRoute ? options.matchRequestRoute(requestCleanPathname) : options.matchRoute(cleanPathname);
+	const matchCleanPathname = () => cleanPathnameIsRequestPathname && options.matchRequestRoute ? options.matchRequestRoute(requestPathname) : options.matchRoute(cleanPathname);
 	if (interceptionIdHeader !== null && (!isRscRequest || interceptionContextHeader === null || request.method !== "GET" && request.method !== "HEAD" || !options.hasInterceptionId(interceptionIdHeader))) {
 		setInterceptionResponseUncacheable(true);
 		return badRequestResponse();
@@ -346,9 +371,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const provesConcreteInterceptionSource = (sourceMatch, sourceContext = interceptionContextHeader) => {
 		if (sourceMatch === null) return false;
 		if (sourceMatch.interceptionSourceIsConcrete !== void 0) return sourceMatch.interceptionSourceIsConcrete;
-		return sourceContext !== null && (options.matchRequestRoute ?? options.matchRoute)(sourceContext)?.route === sourceMatch.route;
+		return sourceContext !== null && (options.matchRequestRoute ?? options.matchRoute)(sourceContext)?.route === (sourceMatch.authorizationRoute ?? sourceMatch.route);
 	};
-	if (provesConcreteInterceptionSource(hadBasePath && hasRawInterceptionContext && interceptionContextHeader !== null ? options.matchInterceptRoute?.(requestCleanPathname, interceptionContextHeader, interceptionIdHeader) ?? null : null)) setInterceptionResponseUncacheable(false);
+	if (provesConcreteInterceptionSource(hadBasePath && hasRawInterceptionContext && interceptionContextHeader !== null ? options.matchInterceptRoute?.(requestPathname, interceptionContextHeader, interceptionIdHeader) ?? null : null)) setInterceptionResponseUncacheable(false);
 	if (pathname === "/__vinext/prerender/static-params" || pathname === "/__vinext/prerender/pages-static-paths" || pathname === "/__vinext/prerender/metadata-routes") {
 		const { handleAppPrerenderEndpoint } = await import("./app-prerender-endpoints.js");
 		const prerenderEndpointResponse = await handleAppPrerenderEndpoint(request, {
@@ -364,16 +389,16 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (prerenderEndpointResponse) return prerenderEndpointResponse;
 	}
 	if (!isDataRequest && !options.skipTrailingSlashRedirect) {
-		const trailingSlashRedirect = options.trailingSlash && options.isMetadataRoutePath && await options.isMetadataRoutePath(cleanPathname) ? null : normalizeTrailingSlash(requestCleanPathname, hadBasePath ? options.basePath : "", options.trailingSlash, url.search);
+		const trailingSlashRedirect = options.trailingSlash && options.isMetadataRoutePath && await options.isMetadataRoutePath(cleanPathname) ? null : normalizeTrailingSlash(requestPathname, hadBasePath ? options.basePath : "", options.trailingSlash, url.search);
 		if (trailingSlashRedirect) return trailingSlashRedirect;
 	}
 	const matchPathname = (p) => normalizeDefaultLocalePathname(p, options.i18nConfig, { hostname: url.hostname });
-	const restoreLocaleRootTrailingSlash = !pagesDataRequest && shouldRestoreLocaleRootTrailingSlash(stripRscSuffix(url.pathname), options);
-	const headerMatchPathname = normalizeDefaultLocalePathname(requestCleanPathname, options.i18nConfig, {
+	const restoreLocaleRootTrailingSlash = !pagesDataRequest && shouldRestoreLocaleRootTrailingSlash(url.pathname, options);
+	const headerMatchPathname = normalizeDefaultLocalePathname(requestPathname, options.i18nConfig, {
 		hostname: url.hostname,
 		restoreRootTrailingSlash: restoreLocaleRootTrailingSlash
 	});
-	const redirectPathname = matchPathname(requestCleanPathname);
+	const redirectPathname = matchPathname(requestPathname);
 	const configMatchers = HAS_CONFIG_REDIRECTS && options.configRedirects.length ? await import("../config/config-matchers.js") : null;
 	const redirect = configMatchers ? configMatchers.matchRedirect(redirectPathname, options.configRedirects, preMiddlewareRequestContext, basePathState, dispatchResponseStage ? void 0 : markConditionalRedirectCacheability) : null;
 	if (configMatchers && redirect) {
@@ -399,9 +424,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	};
 	const runMiddleware = isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? void 0 : options.runMiddleware;
 	const isolatedMiddlewareSource = runMiddleware && request.body && !request.bodyUsed ? request.clone() : null;
-	const normalizedUserlandRequest = requestWithoutRscSuffix(request);
-	const userlandRequest = requestWithoutRscCacheBustingSearchParam(normalizedUserlandRequest);
-	const isolatedMiddlewareRequest = isolatedMiddlewareSource ? requestWithoutRscCacheBustingSearchParam(requestWithoutRscSuffix(isolatedMiddlewareSource)) : void 0;
+	const userlandRequest = requestWithoutRscCacheBustingSearchParam(request);
+	const isolatedMiddlewareRequest = isolatedMiddlewareSource ? requestWithoutRscCacheBustingSearchParam(isolatedMiddlewareSource) : void 0;
 	let didMiddlewareRewrite = false;
 	let didMiddlewareRewritePathname = false;
 	let resolvedPathnameHasBasePath = hadBasePath;
@@ -413,7 +437,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const middlewareResult = await runMiddleware({
 			cleanPathname,
 			context: middlewareContext,
-			externalRewriteRequest: normalizedUserlandRequest,
+			externalRewriteRequest: request,
 			hadBasePath,
 			isDataRequest: isMiddlewareDataRequest,
 			middlewareRequest: isolatedMiddlewareRequest,
@@ -448,8 +472,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		cleanPathname = middlewareResult.cleanPathname;
 		didMiddlewareRewrite = middlewareResult.rewritten;
 		if (didMiddlewareRewrite) resolvedPathnameHasBasePath = middlewareResult.rewriteHadBasePath ?? true;
-		if (didMiddlewareRewrite || cleanPathname !== normalized.cleanPathname) cleanPathnameIsRequestPathname = false;
-		didMiddlewareRewritePathname = cleanPathname !== normalized.cleanPathname;
+		if (didMiddlewareRewrite || cleanPathname !== pathname) cleanPathnameIsRequestPathname = false;
+		didMiddlewareRewritePathname = cleanPathname !== pathname;
 		if (middlewareResult.search !== null) url.search = middlewareResult.search;
 		resolvedUrl = cleanPathname + url.search;
 	}
@@ -505,7 +529,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			const rscPath = canonicalRsc.navigation ? createCanonicalRscRequestUrl(dispatchRequest.url) : await createRscRequestUrl(dispatchRequest.url, canonicalRsc.headers);
 			dispatchRequest = cloneRequestWithUrl(dispatchRequest, new URL(rscPath, dispatchRequest.url).toString());
 		}
-		const cacheIdentity = cache !== "shared" || stageProps.kind === "app-full-request" || stageProps.kind === "hybrid-pages" || !adapterUsesSharedCacheIdentity() ? void 0 : stageProps.kind === "app-page" && adapterSharedCacheIdentity() === "query-free" && responseStagePolicy === null && stageProps.matchKind !== "interception" && stageProps.interceptionContext === null && stageProps.interceptionId === null && stageProps.mountedSlotsHeader === null ? createSharedAppPageCacheIdentity(dispatchRequest, stageProps) : createSharedAppCacheIdentity(dispatchRequest, stageProps);
+		const cacheIdentity = cache !== "shared" || stageProps.kind === "app-full-request" || stageProps.kind === "hybrid-pages" || !adapterUsesSharedCacheIdentity() ? void 0 : adapterSharedCacheIdentity() !== "query-free" || responseStagePolicy !== null ? createSharedAppCacheIdentity(dispatchRequest, stageProps) : stageProps.kind === "app-page" && stageProps.matchKind !== "interception" && stageProps.interceptionContext === null && stageProps.interceptionId === null && stageProps.mountedSlotsHeader === null ? createSharedAppPageCacheIdentity(dispatchRequest, stageProps) : stageProps.kind === "app-metadata" || stageProps.kind === "app-route-handler" && stageProps.matchKind !== "interception" ? createSharedAppRouteCacheIdentity(dispatchRequest, stageProps) : createSharedAppCacheIdentity(dispatchRequest, stageProps);
 		let response = await dispatchResponseStage(dispatchRequest, stageProps, cacheIdentity ? {
 			cache,
 			cacheIdentity
@@ -518,16 +542,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				statusText: response.statusText
 			});
 		}
-		if (props.kind !== "app-page" || !props.isRscRequest) return response;
-		const headers = new Headers(response.headers);
-		if (Object.keys(props.params).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(props.params)));
-		else headers.delete(VINEXT_PARAMS_HEADER);
-		headers.set(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, encodeURIComponent(props.resolvedUrl));
-		return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
-			headers,
-			status: response.status,
-			statusText: response.statusText
-		}));
+		return response;
 	} : void 0;
 	const responseStageRequest = (stageRequest = request) => {
 		const activeHeaders = getHeadersContext()?.headers;
@@ -536,7 +551,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	};
 	const renderMetadataRouteIfMatched = async () => {
 		if (!filesystemRouteEligible || (options.isMetadataRoute ? !options.isMetadataRoute(cleanPathname) : !options.handleMetadataRouteRequest)) return null;
-		const metadataRoutePathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+		const metadataRoutePathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
 		const metadataResponseStage = transportedResponseStage ?? options.renderResponseStageLocally;
 		if (metadataResponseStage) {
 			const response = await metadataResponseStage(responseStageRequest(), {
@@ -616,9 +631,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
 			middlewareContext,
-			request: normalizedUserlandRequest,
+			request,
 			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
+			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
 			rewrites: [rewrite],
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
@@ -637,10 +652,13 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const isPostRequest = request.method.toUpperCase() === "POST";
 	const contentType = request.headers.get("content-type") || "";
 	const isProgressiveActionRequest = isPostRequest && !actionId && contentType.startsWith("multipart/form-data");
-	const serveImageEndpointIfMatched = () => {
-		if (!filesystemRouteEligible || !resolvedPathnameHasBasePath || !isImageOptimizationPath(cleanPathname)) return null;
+	const serveImageEndpointIfMatched = async () => {
+		if (!filesystemRouteEligible || !resolvedPathnameHasBasePath || !isImageOptimizationPath(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname)) return null;
 		const imageUrl = new URL(resolvedUrl, url);
-		const imageRedirect = resolveDevImageRedirect(imageUrl, [...options.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...options.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], options.imageConfig?.qualities, { isDev: options.isDev });
+		const imageRedirect = resolveDevImageRedirect(imageUrl, [...options.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...options.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], options.imageConfig?.qualities, {
+			isDev: options.isDev,
+			localPatterns: options.imageConfig?.localPatterns
+		});
 		const middlewareHeaders = new Headers();
 		mergeMiddlewareResponseHeaders(middlewareHeaders, middlewareContext.headers);
 		if (!imageRedirect) return new Response("Invalid image optimization parameters", {
@@ -649,12 +667,12 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		});
 		const overrideHeaders = middlewareContext.requestHeaders ?? middlewareContext.headers;
 		return markImageOptimizationSignal(Response.redirect(new URL(imageRedirect, url.origin).href, 302), {
-			middlewareHeaders,
+			middlewareHeaders: new Headers(await loadPreHandlerResponseHeaders()),
 			requestHeaders: overrideHeaders ? buildRequestHeadersFromMiddlewareResponse(request.headers, overrideHeaders) : null,
 			search: imageUrl.search
 		});
 	};
-	const imageEndpointResponse = serveImageEndpointIfMatched();
+	const imageEndpointResponse = await serveImageEndpointIfMatched();
 	if (imageEndpointResponse) return imageEndpointResponse;
 	const metadataRouteResponse = await renderMetadataRouteIfMatched();
 	if (metadataRouteResponse) return composeResponseStageResponse(metadataRouteResponse);
@@ -663,7 +681,6 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const publicFileResponse = resolvePublicFileRoute({
 			cleanPathname: cleanPathnameIsRequestPathname ? cleanPathname : normalizePathnameForRouteMatch(cleanPathname),
 			middlewareContext,
-			pathname,
 			publicFiles: options.publicFiles,
 			request
 		});
@@ -680,7 +697,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		params: {}
 	});
 	const directPreActionMatch = filesystemRouteEligible ? matchCleanPathname() : null;
-	const preActionRoutePathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+	const preActionRoutePathname = cleanPathnameIsRequestPathname ? requestPathname : cleanPathname;
 	let interceptionSourceContext = interceptionSourcePathname !== null ? interceptionContextHeader : null;
 	let interceptionSourceMatch = filesystemRouteEligible && interceptionSourcePathname !== null && interceptionContextHeader !== null ? options.matchInterceptRoute?.(preActionRoutePathname, interceptionContextHeader, interceptionIdHeader) ?? null : null;
 	let hasVerifiedInterceptionSource = provesConcreteInterceptionSource(interceptionSourceMatch);
@@ -698,7 +715,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		bypassInterceptionContextCache = true;
 		setInterceptionResponseUncacheable(true);
 	};
-	if (interceptionSourceMatch !== null && interceptionContextHeader !== null && interceptionSourcePathname !== null && !(interceptionSourceMatch.route === directPreActionMatch?.route && haveSamePageParams(interceptionSourceMatch.params, directPreActionMatch.params))) {
+	if (interceptionSourceMatch !== null && interceptionContextHeader !== null && interceptionSourcePathname !== null && !isSameInterceptionSource(interceptionSourceMatch, directPreActionMatch)) {
 		const sourceRequestPathname = options.skipTrailingSlashRedirect ? interceptionContextHeader : normalizeTrailingSlashPathname(interceptionContextHeader, options.trailingSlash) ?? interceptionContextHeader;
 		const decodedSourceRequestPathname = options.skipTrailingSlashRedirect ? interceptionSourcePathname : normalizeTrailingSlashPathname(interceptionSourcePathname, options.trailingSlash) ?? interceptionSourcePathname;
 		const adoptRewrittenInterceptionSource = (rewrittenPathname) => {
@@ -708,7 +725,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				interceptionSourceContext = rewrittenPathname;
 			}
 			const rewrittenSourceMatch = options.matchRoute(rewrittenPathname);
-			return interceptionSourceMatch !== null && rewrittenSourceMatch?.route === interceptionSourceMatch.route && haveSamePageParams(rewrittenSourceMatch.params, interceptionSourceMatch.params);
+			return interceptionSourceMatch !== null && isSameInterceptionSource(interceptionSourceMatch, rewrittenSourceMatch);
 		};
 		if (configMatchers?.matchRedirect(matchPathname(sourceRequestPathname), options.configRedirects, preMiddlewareRequestContext, currentBasePathState(), dispatchResponseStage ? void 0 : markConditionalRedirectCacheability)) {
 			options.clearRequestContext();
@@ -718,7 +735,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (runMiddleware) {
 			const sourceUrl = new URL(userlandRequest.url);
 			sourceUrl.search = new URL(resolvedUrl, url).search;
-			const sourceUrlPathname = resolvedPathnameHasBasePath && options.basePath ? sourceRequestPathname === "/" ? options.basePath : options.basePath + sourceRequestPathname : sourceRequestPathname;
+			const sourceUrlPathname = resolvedPathnameHasBasePath ? restoreBasePath(sourceRequestPathname, options.basePath) : sourceRequestPathname;
 			sourceUrl.pathname = sourceUrlPathname;
 			if (sourceUrl.pathname !== sourceUrlPathname) {
 				options.clearRequestContext();
@@ -749,7 +766,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				sourceMiddlewareResult = await runWithHeadersContext(sourceHeadersContext, () => runMiddleware({
 					cleanPathname: decodedSourceRequestPathname,
 					context: sourceMiddlewareContext,
-					externalRewriteRequest: normalizedUserlandRequest,
+					externalRewriteRequest: request,
 					hadBasePath: resolvedPathnameHasBasePath,
 					isDataRequest: isMiddlewareDataRequest,
 					request: sourceMiddlewareRequest,
@@ -792,21 +809,22 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 				sourceRulesPathname = sourceMiddlewareResult.cleanPathname;
 			}
 		}
-		if (HAS_CONFIG_REWRITES && options.configRewrites.beforeFiles.length) {
+		if (HAS_CONFIG_REWRITES && (options.configRewrites.beforeFiles.length || options.configRewrites.afterFiles.length)) {
 			const { matchRewrite } = await import("../config/config-matchers.js");
 			const sourceRewriteContext = requestContextForResolvedUrl(buildPostMwRequestContext(userlandRequest), resolvedUrl, url);
-			let didRewriteSource = false;
-			for (const rewrite of options.configRewrites.beforeFiles) {
-				const destination = matchRewrite(matchPathname(sourceRulesPathname), [rewrite], sourceRewriteContext, currentBasePathState(), matchPathname(sourceRulesPathname), dispatchResponseStage === void 0 ? markConditionalRewriteCacheability : void 0);
-				if (!destination) continue;
-				if (isExternalUrl(destination) || destination.includes("?")) {
-					options.clearRequestContext();
-					return notFoundResponse();
+			const rewriteSource = (rewrites, stopAtRoute) => {
+				let didRewriteSource = false;
+				for (const rewrite of rewrites) {
+					const destination = matchRewrite(matchPathname(sourceRulesPathname), [rewrite], sourceRewriteContext, currentBasePathState(), matchPathname(sourceRulesPathname), dispatchResponseStage === void 0 ? markConditionalRewriteCacheability : void 0);
+					if (!destination) continue;
+					if (isExternalUrl(destination) || destination.includes("?")) return false;
+					sourceRulesPathname = pathnameForResolvedUrl(destination);
+					didRewriteSource = true;
+					if (stopAtRoute && options.matchRoute(sourceRulesPathname)) break;
 				}
-				sourceRulesPathname = pathnameForResolvedUrl(destination);
-				didRewriteSource = true;
-			}
-			if (didRewriteSource && !adoptRewrittenInterceptionSource(sourceRulesPathname)) {
+				return !didRewriteSource || adoptRewrittenInterceptionSource(sourceRulesPathname);
+			};
+			if (!rewriteSource(options.configRewrites.beforeFiles, false) || (interceptionSourceMatch.authorizationRoute ?? interceptionSourceMatch.route).isDynamic && !rewriteSource(options.configRewrites.afterFiles, true)) {
 				options.clearRequestContext();
 				return notFoundResponse();
 			}
@@ -831,7 +849,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const isInterceptionMatch = interceptionPreActionMatch !== null;
 	const rendersRawRequestMatch = options.matchRawRequestRoute !== void 0 && (isPossibleAppRouteActionRequest(request) || isDraftModeRequest(request, options.draftModeSecret) || isDraftModeEnabled());
 	const usesRawRequestMatch = () => rendersRawRequestMatch && cleanPathnameIsRequestPathname && !isInterceptionMatch;
-	const renderedRouteMatch = (routeMatch) => routeMatch !== null && usesRawRequestMatch() ? options.matchRawRequestRoute(requestCleanPathname) ?? routeMatch : routeMatch;
+	const renderedRouteMatch = (routeMatch) => routeMatch !== null && usesRawRequestMatch() ? options.matchRawRequestRoute(requestPathname) ?? routeMatch : routeMatch;
 	const renderedPreActionMatch = renderedRouteMatch(preActionMatch);
 	if (renderedPreActionMatch) setRootParams(pickRootParams(renderedPreActionMatch.params, renderedPreActionMatch.route.rootParamNames));
 	if (pagesDataRequest && didMiddlewareRewritePathname && preActionMatch && !preActionMatch.route.isDynamic) {
@@ -852,11 +870,9 @@ 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 createMissingServerActionResponse(options, actionId);
+		if (!options.handleServerActionRequest) return markServerActionResponse(createMissingServerActionResponse(options, actionId));
 		const sourceConfigHeaders = new Headers();
-		const sourceConfigUrl = new URL(request.url);
-		sourceConfigUrl.pathname = hadBasePath ? addBasePathToPathname(requestCleanPathname, options.basePath) : requestCleanPathname;
-		await applyAppRscConfigHeaders(sourceConfigHeaders, cloneRequestWithUrl(request, sourceConfigUrl.toString()), {
+		await applyAppRscConfigHeaders(sourceConfigHeaders, request, {
 			basePath: options.basePath,
 			configHeaders: options.configHeaders,
 			i18nConfig: options.i18nConfig,
@@ -865,7 +881,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			recordCacheability: dispatchResponseStage === void 0,
 			requestContext: preMiddlewareRequestContext
 		});
-		return options.handleServerActionRequest({
+		const serverActionResponse = await options.handleServerActionRequest({
 			actionId,
 			cleanPathname,
 			contentType,
@@ -881,13 +897,14 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			sourceConfigHeaders,
 			searchParams: getResolvedSearchParams()
 		});
+		return serverActionResponse && markServerActionResponse(serverActionResponse);
 	};
 	let progressiveActionHandled = false;
 	let progressiveActionFormState = null;
 	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 ? createMissingServerActionResponse(options, null) : null;
+		if (!options.handleProgressiveActionRequest) return unrenderedRouteMatch?.route.__loadPage && !unrenderedRouteMatch.route.__loadRouteHandler ? markServerActionResponse(createMissingServerActionResponse(options, null)) : null;
 		const progressiveActionResult = await options.handleProgressiveActionRequest({
 			actionId,
 			cleanPathname,
@@ -896,7 +913,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			request,
 			routeMatch
 		});
-		if (progressiveActionResult instanceof Response) return progressiveActionResult;
+		if (progressiveActionResult instanceof Response) return markServerActionResponse(progressiveActionResult);
 		if (progressiveActionResult?.kind !== "form-state") return null;
 		if ("actionError" in progressiveActionResult && middlewareContext.status === null && progressiveActionHttpFallbackStatus(progressiveActionResult.actionError) === null) middlewareContext.status = 500;
 		return progressiveActionResult;
@@ -915,7 +932,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	let match = preActionMatch;
 	const renderPagesForMatchKind = async (matchKind) => {
 		if (!filesystemRouteEligible) return null;
-		const pagesRouteUrl = cleanPathnameIsRequestPathname ? requestCleanPathname + resolvedUrl.slice(pathnameForResolvedUrl(resolvedUrl).length) : resolvedUrl;
+		const pagesRouteUrl = cleanPathnameIsRequestPathname ? requestPathname + resolvedUrl.slice(pathnameForResolvedUrl(resolvedUrl).length) : resolvedUrl;
 		let sharedOuterPolicyNeedsReconciliation = false;
 		const dispatchPagesResponseStage = dispatchResponseStage ? async (stageRequest, resourceKind, dataKind, hasRequestAwareDocument, runsInitialProps) => {
 			const pagesOnDemandRevalidate = resourceKind === "page" && isOnDemandRevalidateRequest(stageRequest.headers.get("x-prerender-revalidate"));
@@ -1009,9 +1026,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
 			middlewareContext,
-			request: normalizedUserlandRequest,
+			request,
 			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
+			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
 			rewrites: [rewrite],
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
@@ -1028,7 +1045,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		filesystemRouteEligible = resolvedPathnameHasBasePath;
 		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
 		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
-		const rewrittenImageEndpointResponse = serveImageEndpointIfMatched();
+		const rewrittenImageEndpointResponse = await serveImageEndpointIfMatched();
 		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
 		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
 		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
@@ -1057,9 +1074,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			basePathState: currentBasePathState(),
 			clearRequestContext: options.clearRequestContext,
 			middlewareContext,
-			request: normalizedUserlandRequest,
+			request,
 			requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
-			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname),
+			paramsPathname: matchPathname(cleanPathnameIsRequestPathname ? requestPathname : cleanPathname),
 			rewrites: [rewrite],
 			validateExternalRewriteRequest: () => validateClaimedOutsideBasePathRsc(true)
 		}, matchPathname(cleanPathname), dispatchResponseStage === void 0);
@@ -1076,7 +1093,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		filesystemRouteEligible = resolvedPathnameHasBasePath;
 		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
 		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
-		const rewrittenImageEndpointResponse = serveImageEndpointIfMatched();
+		const rewrittenImageEndpointResponse = await serveImageEndpointIfMatched();
 		if (rewrittenImageEndpointResponse) return rewrittenImageEndpointResponse;
 		const rewrittenMetadataResponse = await renderMetadataRouteIfMatched();
 		if (rewrittenMetadataResponse) return composeResponseStageResponse(rewrittenMetadataResponse);
@@ -1096,9 +1113,12 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (match) break;
 	}
 	if (interceptionCacheProofInvalidated && interceptionSourceContext !== null) {
-		const finalInterceptionTargetPathname = cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname;
+		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?.route === interceptionSourceMatch.route && haveSamePageParams(finalInterceptionSourceMatch.params, interceptionSourceMatch.params);
+		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);
@@ -1140,7 +1160,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const finalRouteMatch = renderedRouteMatch(match);
 		setRootParams(finalRouteMatch ? pickRootParams(finalRouteMatch.params, finalRouteMatch.route.rootParamNames) : null);
 		if (isServerActionRequest) {
-			const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname);
+			const serverActionResponse = await handleServerAction(finalRouteMatch, cleanPathnameIsRequestPathname ? requestPathname : cleanPathname);
 			if (serverActionResponse) return serverActionResponse;
 		} else {
 			const progressiveActionResult = await handleProgressiveAction(finalRouteMatch, match);
@@ -1186,7 +1206,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	}
 	match = renderedRouteMatch(match);
 	const { route, params } = match;
-	const requestPathnameDiffersFromCachePath = requestCleanPathname !== cleanPathname;
+	const requestPathnameDiffersFromCachePath = requestPathname !== cleanPathname;
 	const rawRequestPathnameIsObservable = isInterceptionMatch || route.routeHandler != null || typeof route.__loadRouteHandler === "function";
 	if ((!isInterceptionMatch || requestPathnameDiffersFromCachePath) && options.matchRequestRoute) {
 		const cachePathMatch = options.matchRoute(cleanPathname);
@@ -1213,7 +1233,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	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 ? requestCleanPathname || "/" : cleanPathname || "/";
+	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({
@@ -1229,7 +1249,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const rootParams = pickRootParams(renderParams, route.rootParamNames);
 	setRootParams(rootParams);
 	if (route.routeHandler) {
-		const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : normalizedUserlandRequest;
+		const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : request;
 		const routeHandlerUrl = new URL(routeHandlerRequest.url);
 		const internalRscValues = isEdgeRouteHandler(route.routeHandler) ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 		routeHandlerUrl.search = resolvedSearchParams.toString();
@@ -1301,7 +1321,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		routePattern: route.pattern,
 		routePathname: responseStageRoutePathname,
 		scriptNonce: scriptNonce ?? null
-	}).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
+	}).then((response) => transportedResponseStage && isRscRequest ? withRoutedRscHeaders(response, resolveAppPageNavigationParams(route, params, cleanPathname), resolvedUrl, interceptionSourceContext !== null) : response).then(composeResponseStageResponse) : await options.dispatchMatchedPage({
 		bypassInterceptionContextCache,
 		cachePathname,
 		cleanPathname,
@@ -1312,7 +1332,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		handlerStart,
 		interceptionContext: interceptionSourceContext,
 		interceptionId: interceptionIdHeader,
-		interceptionPathname: cleanPathnameIsRequestPathname ? requestCleanPathname : cleanPathname,
+		interceptionPathname: cleanPathnameIsRequestPathname ? requestPathname : cleanPathname,
 		isProgressiveActionRender: progressiveActionFormState !== null,
 		isRscRequest,
 		middlewareContext,
@@ -1334,7 +1354,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		searchParams: resolvedSearchParams,
 		renderMode
 	}), isRscRequest && request.headers.get("Next-Router-Prefetch") === "1" && request.headers.has("Next-Router-Segment-Prefetch"));
-	if (progressiveActionFormState) return applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState);
+	if (progressiveActionFormState) return markServerActionResponse(applyProgressiveActionSideEffects(pageResponse, progressiveActionFormState));
 	return pageResponse;
 }
 function progressiveActionHttpFallbackStatus(actionError) {
@@ -1375,8 +1395,9 @@ function applyProgressiveActionSideEffects(response, sideEffects) {
 }
 /** Build the request-only handler without retaining the response renderer graph. */
 function createAppRscRequestHandler(options) {
-	const handleAppRscRequestLifecycle = async (rawRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState) => {
-		const rawRequestSignal = rawRequest.signal;
+	const handleAppRscRequestLifecycle = async (hostRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState) => {
+		const rawRequestSignal = hostRequest.signal;
+		const rawRequest = stripRequestUrlFragment(hostRequest);
 		const mwCtx = openForwardedMiddlewareContext(rawRequest.headers.get(VINEXT_MW_CTX_HEADER), options.devForwardedMiddlewareContextKey);
 		const pagesDataUrl = new URL(rawRequest.url);
 		const pagesDataInScope = !options.basePath || hasBasePath(pagesDataUrl.pathname, options.basePath);
@@ -1402,7 +1423,7 @@ function createAppRscRequestHandler(options) {
 		let appRequest = rawRequest;
 		if (pagesDataNormalization?.isDataReq) {
 			const appRequestUrl = new URL(pagesDataNormalization.request.url);
-			appRequestUrl.pathname = addBasePathToPathname(appRequestUrl.pathname, options.basePath);
+			appRequestUrl.pathname = restoreBasePath(appRequestUrl.pathname, options.basePath);
 			appRequest = cloneRequestWithUrl(pagesDataCandidate, appRequestUrl.toString());
 		}
 		const request = cloneRequestWithHeaders(appRequest, filteredHeaders);
@@ -1440,11 +1461,12 @@ function createAppRscRequestHandler(options) {
 				basePath: options.basePath,
 				configHeaders: options.configHeaders,
 				i18nConfig: options.i18nConfig,
-				restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(stripRscSuffix(new URL(rawRequest.url).pathname), options),
+				restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(new URL(rawRequest.url).pathname, options),
 				middlewareHeaders: middlewareContext.headers,
 				recordCacheability: dispatchResponseStage === void 0,
 				requestContext: preMiddlewareRequestContext
 			});
+			if (serverActionResponses.has(response)) return withServerActionCacheControl(response);
 			return interceptionResponseUncacheable || unmatchedRouteResponses.has(response) ? withNeverCacheControl(response) : response;
 		}, {
 			cacheComponents: options.createPprFallbackShells !== void 0,
@@ -1457,7 +1479,8 @@ function createAppRscRequestHandler(options) {
 			await closeAfterResponse(requestContext);
 			throw error;
 		}
-		return closeAfterResponseWithBody(response, requestContext);
+		const closedResponse = closeAfterResponseWithBody(response, requestContext);
+		return isStreamedActionRedirectResponse(response) ? markStreamedActionRedirectResponse(closedResponse) : closedResponse;
 	};
 	const appRscHandler = async function appRscHandler(rawRequest, ctx, allowInternalRscDocumentFallback = false, dispatchResponseStage, responseStageProbeMode = null, transportedPrerenderState, detachedTrace = false) {
 		options.registerCacheAdapters();
@@ -1468,7 +1491,7 @@ function createAppRscRequestHandler(options) {
 			detached: detachedTrace,
 			getStatus: (response) => response?.status,
 			headers: rawRequest.headers,
-			isRsc: traceUrl.pathname.endsWith(".rsc") || rawRequest.headers.get("RSC") === "1",
+			isRsc: rawRequest.headers.get("RSC") === "1",
 			method: rawRequest.method,
 			target: traceUrl.pathname + traceUrl.search
 		});