vinext 1.0.1 → 1.1.0

package/dist/server/app-rsc-route-matching.js

@@ -1,4 +1,4 @@
-import { decodeMatchedParams, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
+import { decodeMatchedParams, decodeRouteSegment, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { createAppRouteGraphInterceptionId } from "../routing/app-route-ids.js";
 import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
 import { extractRawRoutePatternParams, matchRoutePatternPrefix, matchRoutePatternRaw } from "../routing/route-pattern.js";
@@ -18,17 +18,6 @@ function appRscPathnameParts(pathname, isNormalized = false) {
 	const normalizedPathname = pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "");
 	return isNormalized ? splitPathSegments(normalizedPathname) : splitPathnameForRouteMatch(normalizedPathname);
 }
-function appRscInterceptionSourcePathnameParts(pathname) {
-	const pathOnly = pathname.split("?")[0];
-	const normalizedPathname = pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "");
-	return splitPathSegments(normalizedPathname).map((segment) => {
-		try {
-			return decodeURIComponent(segment);
-		} catch {
-			return segment;
-		}
-	});
-}
 function isAppRouteHandlerRoute(route) {
 	return route.routeHandler != null || typeof route.__loadRouteHandler === "function";
 }
@@ -36,11 +25,38 @@ function normalizeMatchedParamsForRoute(result) {
 	if (isAppRouteHandlerRoute(result.route)) decodeMatchedParams(result.params);
 	else canonicalizeAppPageParams(result.params);
 }
-function createAppRscRouteMatcher(routes) {
+/**
+* @param decodedPathnamePatterns Static page patterns that answer their
+*   segment-decoded pathname (built by `buildAppDecodedPathnamePatterns`).
+*/
+function createAppRscRouteMatcher(routes, decodedPathnamePatterns = []) {
 	const routeTrie = buildRouteTrie(routes);
 	const interceptLookup = createInterceptLookup(routes);
 	const interceptionIds = new Set(interceptLookup.flatMap((entry) => entry.interceptionId === null ? [] : [entry.interceptionId]));
 	const routeIndexes = new Map(routes.map((route, index) => [route, index]));
+	const decodedPathnamePatternSet = new Set(decodedPathnamePatterns);
+	const decodedPathnameRoutes = /* @__PURE__ */ new Map();
+	for (const route of routes) {
+		const key = route.patternParts.join("/");
+		if (decodedPathnamePatternSet.has(route.pattern) && !decodedPathnameRoutes.has(key)) decodedPathnameRoutes.set(key, route);
+	}
+	function matchRawRequestParts(rawParts) {
+		const result = trieMatchRaw(routeTrie, rawParts);
+		if (result) normalizeMatchedParamsForRoute(result);
+		return result;
+	}
+	function matchRequestParts(rawParts) {
+		const result = matchRawRequestParts(rawParts);
+		if (!result) return null;
+		if (decodedPathnameRoutes.size > 0 && result.route.patternParts.some((part) => part.startsWith(":")) && !isAppRouteHandlerRoute(result.route) && rawParts.some((part) => part.includes("%"))) {
+			const route = decodedPathnameRoutes.get(rawParts.map(decodeRouteSegment).join("/"));
+			if (route && route !== result.route) return {
+				route,
+				params: createRouteParams()
+			};
+		}
+		return result;
+	}
 	return {
 		hasInterceptionId(interceptionId) {
 			return interceptionIds.has(interceptionId);
@@ -54,16 +70,16 @@ function createAppRscRouteMatcher(routes) {
 			return result;
 		},
 		matchRequestRoute(url) {
-			const result = trieMatchRaw(routeTrie, appRscPathnameParts(url, true));
-			if (!result) return null;
-			normalizeMatchedParamsForRoute(result);
-			return result;
+			return matchRequestParts(appRscPathnameParts(url, true));
+		},
+		matchRawRequestRoute(url) {
+			return matchRawRequestParts(appRscPathnameParts(url, true));
 		},
 		findIntercept(pathname, sourcePathname = null, interceptionId = null) {
 			if (sourcePathname === null) return null;
 			const urlParts = appRscPathnameParts(pathname, true);
-			const sourceParts = appRscInterceptionSourcePathnameParts(sourcePathname);
-			const matchedSourceRoute = trieMatchRaw(routeTrie, sourceParts);
+			const sourceParts = appRscPathnameParts(sourcePathname, true);
+			const matchedSourceRoute = matchRawRequestParts(sourceParts);
 			for (const entry of interceptLookup) {
 				if (interceptionId !== null && entry.interceptionId !== interceptionId) continue;
 				if (!matchInterceptSource(sourceParts, entry)) continue;
@@ -75,6 +91,7 @@ function createAppRscRouteMatcher(routes) {
 				const sourceRoute = routes[concreteSourceRouteIndex];
 				if (sourceRoute && isAppRouteHandlerRoute(sourceRoute)) continue;
 				const matchedSourceParams = concreteSourceRoute ? concreteSourceRoute.params : sourceRoute ? matchSlotOwnerSourceParams(sourceParts, sourceRoute.patternParts, entry.sourceMatchPatternParts !== null) : null;
+				if (!concreteSourceRoute && matchedSourceParams) canonicalizeAppPageParams(matchedSourceParams);
 				if (matchedSourceParams === null && entry.sourceMatchPatternParts === null) continue;
 				const sourceParams = matchedSourceParams && entry.sourceMatchPatternParts !== null ? pickPatternParams(matchedSourceParams, entry.sourceMatchPatternParts) : matchedSourceParams ?? createRouteParams();
 				return {

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

@@ -19,10 +19,10 @@ import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { buildAppPageTags } from "./implicit-tags.js";
+import "./app-page-stream.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
-import "./app-page-stream.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 import { createRootParamsUsageController, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";

package/dist/server/app-ssr-entry.d.ts

@@ -46,8 +46,9 @@ export declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navCont
   initialDevServerError?: unknown;
   /** Report an SSR/Fizz render failure through instrumentation. */
   onSsrError?: (error: unknown) => unknown;
-  /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
-  mirrorNextFlight?: boolean;
+  /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport, or start
+   *  mirroring once a function returns true. */
+  mirrorNextFlight?: boolean | (() => boolean);
   /** When true, wait for the full React tree (including Suspense boundaries)
    *  to resolve before returning the HTML stream. Used for static prerender
    *  and ISR cache writes to avoid caching fallback content. */

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

@@ -1,8 +1,6 @@
 import "./server-globals.js";
 import { notFoundResponse } from "./http-error-responses.js";
-import { isOpenRedirectShaped } from "./open-redirect.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
+import { isOpenRedirectShaped, repeatedSlashRedirectResponse } from "./open-redirect.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
 import { onRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
@@ -12,18 +10,20 @@ import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonSt
 import { getClientTraceMetadataHTML, markClientTraceMetadataBlock } from "./client-trace-metadata.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation-server.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { getNextErrorDigest } from "./next-error-digest.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
-import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-observation.js";
 import { isAppRenderAbortError } from "./app-render-abort-error.js";
 import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
+import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-observation.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
 import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { startCandidateSearchParamsGate } from "./app-ssr-search-params-gate.js";
@@ -357,6 +357,8 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 }
 var app_ssr_entry_default = { async fetch(request) {
 	const url = new URL(request.url);
+	const slashRedirect = repeatedSlashRedirectResponse(url.pathname + url.search);
+	if (slashRedirect) return slashRedirect;
 	if (isOpenRedirectShaped(url.pathname)) return notFoundResponse();
 	const result = await (await import.meta.viteRsc.loadModule("rsc", "index")).default(request);
 	if (result instanceof Response) return result;

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

@@ -6,7 +6,12 @@ type RscEmbedTransform = {
   getRawBuffer(): Promise<ArrayBuffer>;
 };
 type RscEmbedTransformOptions = {
-  mirrorNextFlight?: boolean;
+  /**
+   * Mirror inline Flight chunks into Next.js's `self.__next_f` transport. A
+   * function is checked at each flush; once it returns true, the chunks
+   * already embedded are mirrored first.
+   */
+  mirrorNextFlight?: boolean | (() => boolean);
   scriptNonce?: string;
   getInitialNavigationCacheMetadata?: () => InitialNavigationCacheMetadata;
 };

package/dist/server/app-ssr-stream.js

@@ -49,12 +49,36 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 	const reader = embedStream.getReader();
 	let pendingChunks = [];
 	const rawChunks = [];
+	let embeddedRawChunkCount = 0;
+	let rawBufferTaken = false;
+	let finalized = false;
 	let reading = false;
 	let mirroredNextFlightBootstrap = false;
 	const textDecoder = new TextDecoder("utf-8", {
 		fatal: true,
 		ignoreBOM: true
 	});
+	function decodeChunk(bytes) {
+		try {
+			return textDecoder.decode(bytes);
+		} catch {
+			return [3, bytesToBase64(bytes)];
+		}
+	}
+	function releaseRawChunks() {
+		const mayStartMirror = typeof options.mirrorNextFlight === "function" && !mirroredNextFlightBootstrap && !finalized;
+		if (rawBufferTaken && !mayStartMirror) rawChunks.length = 0;
+	}
+	function startNextFlightMirror() {
+		if (mirroredNextFlightBootstrap) return "";
+		const mirror = options.mirrorNextFlight;
+		if (mirror !== true && (typeof mirror !== "function" || !mirror())) return "";
+		mirroredNextFlightBootstrap = true;
+		let scripts = createInlineScriptTag(createNextFlightBootstrapScript(), options.scriptNonce) + createInlineScriptTag(createNextFlightCleanupScript(), options.scriptNonce);
+		for (let index = 0; index < embeddedRawChunkCount; index++) scripts += createInlineScriptTag(createNextFlightChunkScript(decodeChunk(rawChunks[index])), options.scriptNonce);
+		releaseRawChunks();
+		return scripts;
+	}
 	async function pumpReader() {
 		if (reading) return;
 		reading = true;
@@ -63,11 +87,7 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 				const result = await reader.read();
 				if (result.done) break;
 				rawChunks.push(result.value);
-				try {
-					pendingChunks.push(textDecoder.decode(result.value));
-				} catch {
-					pendingChunks.push([3, bytesToBase64(result.value)]);
-				}
+				pendingChunks.push(decodeChunk(result.value));
 			}
 		} catch (error) {
 			if (process.env.NODE_ENV !== "production") console.warn("[vinext] RSC embed stream read error:", error);
@@ -80,8 +100,10 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 	return {
 		flush() {
 			if (pendingChunks.length === 0) return "";
+			const mirrorScripts = startNextFlightMirror();
 			const chunks = pendingChunks;
 			pendingChunks = [];
+			embeddedRawChunkCount += chunks.length;
 			const embeddedChunks = [];
 			let textChunks = [];
 			let textLength = 0;
@@ -100,30 +122,27 @@ function createRscEmbedTransform(embedStream, optionsOrNonce = {}) {
 				embeddedChunks.push(chunk);
 			}
 			flushTextChunks();
-			let scripts = "";
+			let scripts = mirrorScripts;
 			for (const chunk of embeddedChunks) {
 				scripts += createInlineScriptTag(createNavigationRuntimeRscChunkScript(chunk), options.scriptNonce);
-				if (options.mirrorNextFlight) {
-					if (!mirroredNextFlightBootstrap) {
-						scripts += createInlineScriptTag(createNextFlightBootstrapScript(), options.scriptNonce);
-						scripts += createInlineScriptTag(createNextFlightCleanupScript(), options.scriptNonce);
-						mirroredNextFlightBootstrap = true;
-					}
-					scripts += createInlineScriptTag(createNextFlightChunkScript(chunk), options.scriptNonce);
-				}
+				if (mirroredNextFlightBootstrap) scripts += createInlineScriptTag(createNextFlightChunkScript(chunk), options.scriptNonce);
 			}
 			return scripts;
 		},
 		async finalize() {
 			await pumpPromise;
 			let scripts = this.flush();
+			scripts += startNextFlightMirror();
+			finalized = true;
+			releaseRawChunks();
 			scripts += createInlineScriptTag(createNavigationRuntimeRscDoneScript(options.getInitialNavigationCacheMetadata?.()), options.scriptNonce);
 			return scripts;
 		},
 		async getRawBuffer() {
 			await pumpPromise;
 			const buffer = concatUint8Arrays(rawChunks);
-			rawChunks.length = 0;
+			rawBufferTaken = true;
+			releaseRawChunks();
 			return buffer.buffer;
 		}
 	};

package/dist/server/app-worker-stages.d.ts

@@ -3,7 +3,7 @@ import { VinextResponseStageCacheability, VinextResponseStageDispatchOptions, Vi
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { TrustedPrerenderState } from "./prerender-route-params.js";
 //#region src/server/app-worker-stages.d.ts
-export declare const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 10;
+export declare const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 11;
 export declare const APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER = "x-vinext-app-metadata-stage-no-match";
 type AppPageParams = Record<string, string | string[]>;
 type AppWorkerResponseStageEnvelope = {
@@ -34,7 +34,7 @@ export type AppMatchedWorkerResponseStageProps = AppWorkerResponseStageEnvelope
   interceptionContext: string | null;
   interceptionId: string | null;
   isRscRequest: boolean;
-  matchKind: "interception" | "request" | "resolved";
+  matchKind: "interception" | "raw-request" | "request" | "resolved";
   mountedSlotsHeader: string | null;
   params: AppPageParams;
   resolvedUrl: string;

package/dist/server/app-worker-stages.js

@@ -3,7 +3,7 @@ import { cacheabilityManifestPageState, cacheabilityRequestIdentity, cacheabilit
 import { keepOnlyValidatedRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { isTrustedPrerenderState } from "./prerender-route-params.js";
 //#region src/server/app-worker-stages.ts
-const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 10;
+const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 11;
 const APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER = "x-vinext-app-metadata-stage-no-match";
 const STATIC_FILE_SIGNAL_TOKEN_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 /** Normalize a shared App page HEAD request onto its method-invariant GET representation. */
@@ -80,7 +80,7 @@ function isCanonicalHttpOrigin(value) {
 function isAppWorkerResponseStageProps(value) {
 	if (!value || typeof value !== "object") return false;
 	const props = value;
-	if (props.protocolVersion !== 10 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
+	if (props.protocolVersion !== 11 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
 	if (props.kind === "app-full-request") return typeof props.prerenderDiscovery === "boolean" && typeof props.staticFileSignalToken === "string" && STATIC_FILE_SIGNAL_TOKEN_RE.test(props.staticFileSignalToken) && (props.trustedPrerenderState === null || isTrustedPrerenderState(props.trustedPrerenderState));
 	if (props.kind === "hybrid-pages") {
 		const hybrid = props;
@@ -91,7 +91,7 @@ function isAppWorkerResponseStageProps(value) {
 		const special = props;
 		return typeof special.canonicalPathname === "string" && special.canonicalPathname.startsWith("/") && typeof special.cleanPathname === "string" && special.cleanPathname.startsWith("/") && typeof special.isRscRequest === "boolean" && (special.mountedSlotsHeader === null || typeof special.mountedSlotsHeader === "string") && typeof special.resolvedUrl === "string" && special.resolvedUrl.startsWith("/") && (props.kind !== "app-metadata" || typeof props.routePathname === "string" && props.routePathname.startsWith("/")) && (special.renderMode === "navigation" || special.renderMode === "prefetch-empty" || special.renderMode === "prefetch-dynamic-shell" || special.renderMode === "prefetch-loading-shell");
 	}
-	return (props.kind === "app-page" || props.kind === "app-route-handler") && typeof props.bypassInterceptionContextCache === "boolean" && typeof props.cachePathname === "string" && props.cachePathname.startsWith("/") && typeof props.canUseCanonicalLoadingShell === "boolean" && typeof props.canonicalPathname === "string" && props.canonicalPathname.startsWith("/") && typeof props.cleanPathname === "string" && props.cleanPathname.startsWith("/") && (props.forceDynamic === void 0 || typeof props.forceDynamic === "boolean") && (props.interceptionContext === null || typeof props.interceptionContext === "string") && (props.interceptionId === null || typeof props.interceptionId === "string") && typeof props.isRscRequest === "boolean" && (props.matchKind === "interception" || props.matchKind === "request" || props.matchKind === "resolved") && (props.mountedSlotsHeader === null || typeof props.mountedSlotsHeader === "string") && isAppPageParams(props.params) && typeof props.resolvedUrl === "string" && props.resolvedUrl.startsWith("/") && typeof props.routePattern === "string" && props.routePattern.startsWith("/") && typeof props.routePathname === "string" && props.routePathname.startsWith("/") && (props.renderMode === "navigation" || props.renderMode === "prefetch-empty" || props.renderMode === "prefetch-dynamic-shell" || props.renderMode === "prefetch-loading-shell");
+	return (props.kind === "app-page" || props.kind === "app-route-handler") && typeof props.bypassInterceptionContextCache === "boolean" && typeof props.cachePathname === "string" && props.cachePathname.startsWith("/") && typeof props.canUseCanonicalLoadingShell === "boolean" && typeof props.canonicalPathname === "string" && props.canonicalPathname.startsWith("/") && typeof props.cleanPathname === "string" && props.cleanPathname.startsWith("/") && (props.forceDynamic === void 0 || typeof props.forceDynamic === "boolean") && (props.interceptionContext === null || typeof props.interceptionContext === "string") && (props.interceptionId === null || typeof props.interceptionId === "string") && typeof props.isRscRequest === "boolean" && (props.matchKind === "interception" || props.matchKind === "raw-request" || props.matchKind === "request" || props.matchKind === "resolved") && (props.mountedSlotsHeader === null || typeof props.mountedSlotsHeader === "string") && isAppPageParams(props.params) && typeof props.resolvedUrl === "string" && props.resolvedUrl.startsWith("/") && typeof props.routePattern === "string" && props.routePattern.startsWith("/") && typeof props.routePathname === "string" && props.routePathname.startsWith("/") && (props.renderMode === "navigation" || props.renderMode === "prefetch-empty" || props.renderMode === "prefetch-dynamic-shell" || props.renderMode === "prefetch-loading-shell");
 }
 function isSerializedHeaders(value) {
 	return Array.isArray(value) && value.every((entry) => Array.isArray(entry) && entry.length === 2 && typeof entry[0] === "string" && typeof entry[1] === "string");

package/dist/server/cacheability-request.js

@@ -1,6 +1,6 @@
 import "../utils/protocol-headers.js";
 import { isVinextRscVaryField } from "./app-rsc-vary.js";
-import { VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_ROUTE_HEADER } from "./headers.js";
+import { VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_ROUTE_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
 import { isNonCacheableCacheControl } from "../shims/cdn-cache.js";
 import { CACHEABILITY_REQUEST_STATE, recordConfigCdnCachePolicyHeader } from "../shims/cacheability-classification.js";
 import { NO_STORE_CACHE_CONTROL, applyCdnResponseBuildIdentityHeaders, applyCdnResponseHeaders, hasExplicitNonCacheableResponsePolicy, isCdnResponsePolicyHeader, readCdnResponseCacheControl, readCdnResponsePolicyHeaderName } from "./cache-control.js";
@@ -348,9 +348,10 @@ async function captureCacheabilityAdmissionBody(body, deadlineAt, limit = CACHEA
 		throw error;
 	}
 }
-function responseWithCachePolicy(response, body, outcome, browserCacheControl) {
+function responseWithCachePolicy(response, body, outcome, browserCacheControl, completedStatus) {
 	const headers = new Headers(response.headers);
 	if (typeof body === "string") headers.delete("Content-Length");
+	for (const [name, value] of Object.entries(completedStatus?.headers ?? {})) if (!headers.has(name)) headers.set(name, value);
 	applyCdnResponseHeaders(headers, outcome?.cacheable === true && outcome.cacheControl ? {
 		cacheControl: outcome.cacheControl,
 		tags: outcome.tags,
@@ -359,10 +360,13 @@ function responseWithCachePolicy(response, body, outcome, browserCacheControl) {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		browserCacheControl
 	});
+	const status = completedStatus?.status ?? response.status;
+	const completed = completedStatus?.status;
+	if (completed === 401 || completed === 403 || completed === 404) headers.set(VINEXT_SPECIAL_ERROR_STATUS_HEADER, String(completed));
 	return new Response(body, {
 		headers,
-		status: response.status,
-		statusText: response.statusText
+		status,
+		statusText: status === response.status ? response.statusText : ""
 	});
 }
 async function stripSharedHtmlClientTraceMetadata(body, marker) {
@@ -499,7 +503,7 @@ async function finalizeWorkerCacheabilityAdmission(response, state) {
 	const effectivePolicyHeader = readCdnResponsePolicyHeaderName(response.headers);
 	const replacesRendererPolicy = outcome !== rendererOutcome && effectivePolicyHeader !== null && state.configCdnCachePolicy?.get(effectivePolicyHeader) === response.headers.get(effectivePolicyHeader);
 	if (state.route.kind === "app-page" && !replacesRendererPolicy && rendererOutcome?.searchParamsUnread !== true) return responseWithCachePolicy(response, captured.body, null, browserCacheControl);
-	return responseWithCachePolicy(response, representation === "html" && state.clientTraceMetadataMarker ? await stripSharedHtmlClientTraceMetadata(captured.body, state.clientTraceMetadataMarker) : captured.body, outcome, browserCacheControl);
+	return responseWithCachePolicy(response, representation === "html" && state.clientTraceMetadataMarker ? await stripSharedHtmlClientTraceMetadata(captured.body, state.clientTraceMetadataMarker) : captured.body, outcome, browserCacheControl, rendererOutcome ?? void 0);
 }
 async function finalizeWorkerCacheabilityResponse(response, ctx) {
 	const state = readState(ctx);

package/dist/server/config-headers.js

@@ -1,4 +1,5 @@
 import { matchHeaders } from "../config/config-matchers.js";
+import "./headers.js";
 import { markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityFinalResponseUncacheable } from "../shims/cacheability-classification.js";
 import { isCdnResponsePolicyHeader, isNonCacheableCdnResponsePolicy } from "./cache-control.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
@@ -77,6 +78,7 @@ function applyConfigHeadersToResponse(responseHeaders, options) {
 	if (options.recordCacheability !== false) markExplicitConfigResponseVeto(matched);
 	for (const header of matched) {
 		const lowerName = header.key.toLowerCase();
+		if (lowerName === "x-vinext-special-error-status") continue;
 		if (lowerName === "link") {
 			if (options.middlewareHeaders?.get(lowerName)) continue;
 			const postConfigLink = options.appendToPostConfigLink ? responseHeaders.get(lowerName) : null;

package/dist/server/dev-server.js

@@ -21,6 +21,7 @@ import { createInlineScriptTag, createNonceAttribute, safeJsonStringify } from "
 import { applyDocumentAssetProps, extractDocumentAssetProps, markDocumentAssetPropsProtectedTags, stripDocumentAssetPropsProtectionMarkers } from "./pages-document-asset-props.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { getScriptNonceFromNodeHeaderSources } from "./csp.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { logRequest, now } from "./request-log.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
@@ -148,6 +149,15 @@ function stripDevPagesNotFoundFramingHeaders(res) {
 	res.removeHeader("Transfer-Encoding");
 }
 /**
+* Vite's `transformIndexHtml` treats its URL as the HTML document's path, so
+* the request query carries no meaning there. Since Vite 8.3.3 it also maps
+* `/?q` onto the project root directory and then watches the filesystem root
+* for each inline `<style>` proxy module, so pass the bare path.
+*/
+function toHtmlTransformPath(url) {
+	return stripViteModuleQuery(url);
+}
+/**
 * Stream a Pages Router page response using progressive SSR.
 *
 * Sends the HTML shell (head, layout, Suspense fallbacks) immediately
@@ -244,7 +254,7 @@ async function streamPageToResponseImpl(routePattern, res, element, options) {
 </body>
 </html>`;
 	}
-	let transformedShell = await server.transformIndexHtml(url, shellTemplate);
+	let transformedShell = await server.transformIndexHtml(toHtmlTransformPath(url), shellTemplate);
 	transformedShell = stripDocumentAssetPropsProtectionMarkers(applyDocumentAssetProps(transformedShell, documentAssetProps, {
 		configuredCrossOrigin: crossOrigin,
 		protectedAssetMarker,
@@ -1130,7 +1140,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
   ${protectedErrorScripts}
 </body>
 </html>`;
-				const transformedHtml = stripDocumentAssetPropsProtectionMarkers(applyDocumentAssetProps(await server.transformIndexHtml(url, html), {}, {
+				const transformedHtml = stripDocumentAssetPropsProtectionMarkers(applyDocumentAssetProps(await server.transformIndexHtml(toHtmlTransformPath(url), html), {}, {
 					configuredCrossOrigin: context.crossOrigin,
 					protectedAssetMarker
 				}), protectedAssetMarker);

package/dist/server/headers.d.ts

@@ -58,6 +58,12 @@ export declare const VINEXT_PARAMS_HEADER = "X-Vinext-Params";
 export declare const VINEXT_DYNAMIC_STALE_TIME_HEADER = "X-Vinext-Dynamic-Stale-Time";
 /** Marks an RSC body carrying completion metadata after the Flight payload. */
 export declare const VINEXT_RSC_COMPLETION_METADATA_HEADER = "X-Vinext-Rsc-Completion-Metadata";
+/**
+ * Carries the stored status of an App page RSC response whose 401, 403 or 404
+ * is its page's notFound(), forbidden() or unauthorized(). Middleware and
+ * config headers can't set it, and the request stage strips it.
+ */
+export declare const VINEXT_SPECIAL_ERROR_STATUS_HEADER = "x-vinext-special-error-status";
 /** URL-encoded rendered path and search after middleware/config rewrites. */
 export declare const VINEXT_RENDERED_PATH_AND_SEARCH_HEADER = "X-Vinext-Rendered-Path-And-Search";
 /** Prerender-only JSON side channel carrying request cacheLife metadata. */
@@ -66,6 +72,14 @@ export declare const VINEXT_PRERENDER_CACHE_LIFE_HEADER = "x-vinext-prerender-ca
 export declare const VINEXT_PRERENDER_REWRITTEN_HEADER = "x-vinext-prerender-rewritten";
 /** Marks a local prerender-server 500 that originated from a thrown render error. */
 export declare const VINEXT_PRERENDER_RENDER_ERROR_HEADER = "x-vinext-prerender-render-error";
+/**
+ * Prerender-only marker: the response's 401, 403, 404 or redirect is its page's
+ * notFound(), forbidden(), unauthorized() or redirect(), which escaped the shell.
+ * Its value is the JSON of the headers to store: a redirect's own location, or
+ * `{}`. Only the prerender server sets it, from the special error the page
+ * recorded on its ctx, and it drops one that the response carries.
+ */
+export declare const VINEXT_PRERENDER_SPECIAL_ERROR_HEADER = "x-vinext-prerender-special-error";
 /** Internal marker persisted only inside metadata-route APP_ROUTE cache values. */
 export declare const VINEXT_METADATA_ROUTE_CACHE_HEADER = "x-vinext-metadata-route-cache";
 /** Disabled-by-default client hint describing already-held App Router payload entries. */

package/dist/server/headers.js

@@ -58,6 +58,12 @@ const VINEXT_PARAMS_HEADER = "X-Vinext-Params";
 const VINEXT_DYNAMIC_STALE_TIME_HEADER = "X-Vinext-Dynamic-Stale-Time";
 /** Marks an RSC body carrying completion metadata after the Flight payload. */
 const VINEXT_RSC_COMPLETION_METADATA_HEADER = "X-Vinext-Rsc-Completion-Metadata";
+/**
+* Carries the stored status of an App page RSC response whose 401, 403 or 404
+* is its page's notFound(), forbidden() or unauthorized(). Middleware and
+* config headers can't set it, and the request stage strips it.
+*/
+const VINEXT_SPECIAL_ERROR_STATUS_HEADER = "x-vinext-special-error-status";
 /** URL-encoded rendered path and search after middleware/config rewrites. */
 const VINEXT_RENDERED_PATH_AND_SEARCH_HEADER = "X-Vinext-Rendered-Path-And-Search";
 /** Prerender-only JSON side channel carrying request cacheLife metadata. */
@@ -66,6 +72,14 @@ const VINEXT_PRERENDER_CACHE_LIFE_HEADER = "x-vinext-prerender-cache-life";
 const VINEXT_PRERENDER_REWRITTEN_HEADER = "x-vinext-prerender-rewritten";
 /** Marks a local prerender-server 500 that originated from a thrown render error. */
 const VINEXT_PRERENDER_RENDER_ERROR_HEADER = "x-vinext-prerender-render-error";
+/**
+* Prerender-only marker: the response's 401, 403, 404 or redirect is its page's
+* notFound(), forbidden(), unauthorized() or redirect(), which escaped the shell.
+* Its value is the JSON of the headers to store: a redirect's own location, or
+* `{}`. Only the prerender server sets it, from the special error the page
+* recorded on its ctx, and it drops one that the response carries.
+*/
+const VINEXT_PRERENDER_SPECIAL_ERROR_HEADER = "x-vinext-prerender-special-error";
 /** Internal marker persisted only inside metadata-route APP_ROUTE cache values. */
 const VINEXT_METADATA_ROUTE_CACHE_HEADER = "x-vinext-metadata-route-cache";
 /** Disabled-by-default client hint describing already-held App Router payload entries. */
@@ -175,4 +189,4 @@ const VINEXT_INTERNAL_HEADERS = [
 	VINEXT_TRACE_ROUTE_HEADER.toLowerCase()
 ];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, MIDDLEWARE_SKIP_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_CACHE_TAGS_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STALE_TIME_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_CACHEABILITY_PROBE_ROUTE_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_EXPECTED_WORKER_VERSION_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERCEPTION_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_READINESS_HEADER, VINEXT_PRERENDER_READINESS_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_REVALIDATE_HOST_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_STATE_FINGERPRINT_HEADER, VINEXT_RSC_VARY_HEADER, VINEXT_STALE_TIME_PENDING_HEADER, VINEXT_TIMING_HEADER, VINEXT_TRACE_BUFFERED_BODY_HEADER, VINEXT_TRACE_ERROR_HEADER, VINEXT_TRACE_ROUTE_HEADER, isVinextRscVaryField };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, MIDDLEWARE_SKIP_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_CACHE_TAGS_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STALE_TIME_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_CACHEABILITY_PROBE_ROUTE_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_EXPECTED_WORKER_VERSION_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERCEPTION_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_READINESS_HEADER, VINEXT_PRERENDER_READINESS_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_REVALIDATE_HOST_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_STATE_FINGERPRINT_HEADER, VINEXT_RSC_VARY_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER, VINEXT_STALE_TIME_PENDING_HEADER, VINEXT_TIMING_HEADER, VINEXT_TRACE_BUFFERED_BODY_HEADER, VINEXT_TRACE_ERROR_HEADER, VINEXT_TRACE_ROUTE_HEADER, isVinextRscVaryField };

package/dist/server/image-optimization.d.ts

@@ -117,6 +117,22 @@ export declare const IMAGE_CONTENT_SECURITY_POLICY = "script-src 'none'; frame-s
  * Returns false for SVG (unless dangerouslyAllowSVG is true), HTML, or any non-image type.
  */
 export declare function isSafeImageContentType(contentType: string | null, dangerouslyAllowSVG?: boolean): boolean;
+/**
+ * Cache state for a successful image response, sent as both `X-Nextjs-Cache`
+ * and `X-Vinext-Cache`.
+ *
+ * Next.js keeps optimized images in an image cache and labels each 200 with
+ * where the bytes came from: `MISS` when the optimizer ran for this request,
+ * `HIT` or `STALE` when the cache served them. vinext has no image cache on any
+ * runtime, so every successful response is transformed (or passed through) from
+ * the source for the request that receives it. Next.js behaves the same way
+ * when its image cache is disabled (`images.maximumDiskCacheSize: 0`): every
+ * 200 is a `MISS`. `HIT` and `STALE` need a cache of optimized images.
+ *
+ * Next.js sets the header after its ETag check, so a 304 and error responses
+ * go out without it. Only full image responses carry either header here too.
+ */
+export declare const IMAGE_RESPONSE_CACHE_STATE = "MISS";
 /**
  * Handlers for image optimization I/O operations.
  * Workers provide these callbacks to adapt their specific bindings.

package/dist/server/image-optimization.js

@@ -1,4 +1,5 @@
 import { badRequestResponse } from "./http-error-responses.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 //#region src/server/image-optimization.ts
 /**
 * Image optimization request handler.
@@ -182,11 +183,32 @@ function setImageSecurityHeaders(headers, config) {
 	headers.set("X-Content-Type-Options", "nosniff");
 	headers.set("Content-Disposition", config?.contentDispositionType === "attachment" ? "attachment" : "inline");
 }
-function createPassthroughImageResponse(source, config) {
-	const headers = new Headers(source.headers);
+/**
+* Cache state for a successful image response, sent as both `X-Nextjs-Cache`
+* and `X-Vinext-Cache`.
+*
+* Next.js keeps optimized images in an image cache and labels each 200 with
+* where the bytes came from: `MISS` when the optimizer ran for this request,
+* `HIT` or `STALE` when the cache served them. vinext has no image cache on any
+* runtime, so every successful response is transformed (or passed through) from
+* the source for the request that receives it. Next.js behaves the same way
+* when its image cache is disabled (`images.maximumDiskCacheSize: 0`): every
+* 200 is a `MISS`. `HIT` and `STALE` need a cache of optimized images.
+*
+* Next.js sets the header after its ETag check, so a 304 and error responses
+* go out without it. Only full image responses carry either header here too.
+*/
+const IMAGE_RESPONSE_CACHE_STATE = "MISS";
+/** Headers shared by every successful image response, transformed or not. */
+function setImageResponseHeaders(headers, config) {
 	headers.set("Cache-Control", IMAGE_CACHE_CONTROL);
 	headers.set("Vary", "Accept");
 	setImageSecurityHeaders(headers, config);
+	setCacheStateHeaders(headers, IMAGE_RESPONSE_CACHE_STATE);
+}
+function createPassthroughImageResponse(source, config) {
+	const headers = new Headers(source.headers);
+	setImageResponseHeaders(headers, config);
 	return new Response(source.body, {
 		status: 200,
 		headers
@@ -216,9 +238,7 @@ async function handleImageOptimization(request, handlers, allowedWidths, imageCo
 			quality
 		});
 		const headers = new Headers(transformed.headers);
-		headers.set("Cache-Control", IMAGE_CACHE_CONTROL);
-		headers.set("Vary", "Accept");
-		setImageSecurityHeaders(headers, imageConfig);
+		setImageResponseHeaders(headers, imageConfig);
 		if (!isSafeImageContentType(headers.get("Content-Type"), imageConfig?.dangerouslyAllowSVG)) headers.set("Content-Type", format);
 		return new Response(transformed.body, {
 			status: 200,
@@ -287,4 +307,4 @@ function handleConfiguredImageOptimization(request, fetchAsset, allowedWidths, i
 	}, allowedWidths, imageConfig);
 }
 //#endregion
-export { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_CACHE_CONTROL, IMAGE_CONTENT_SECURITY_POLICY, IMAGE_OPTIMIZATION_PATH, VINEXT_IMAGE_OPTIMIZATION_PATH, getImageOptimizer, handleConfiguredImageOptimization, handleImageOptimization, isImageOptimizationPath, isSafeImageContentType, negotiateImageFormat, parseImageParams, resolveDevImageRedirect, setImageOptimizer };
+export { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_CACHE_CONTROL, IMAGE_CONTENT_SECURITY_POLICY, IMAGE_OPTIMIZATION_PATH, IMAGE_RESPONSE_CACHE_STATE, VINEXT_IMAGE_OPTIMIZATION_PATH, getImageOptimizer, handleConfiguredImageOptimization, handleImageOptimization, isImageOptimizationPath, isSafeImageContentType, negotiateImageFormat, parseImageParams, resolveDevImageRedirect, setImageOptimizer };

package/dist/server/isr-cache.js

@@ -1,12 +1,12 @@
 import { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER } from "../utils/protocol-headers.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
+import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
 import { reportRequestError } from "./instrumentation.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, getRscRenderModeCacheVariant } from "./app-rsc-render-mode.js";
-import { normalizeAppPageInterceptionProofPathname } from "./app-page-render-identity.js";
 import { getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret } from "./revalidation-request.js";
 //#region src/server/isr-cache.ts
 /**
@@ -183,7 +183,7 @@ function appIsrHtmlKey(pathname) {
 	return appIsrCacheKey(pathname, "html");
 }
 function normalizeInterceptionContextForCacheKey(interceptionContext) {
-	return normalizeAppPageInterceptionProofPathname(interceptionContext);
+	return isInterceptionMatchedUrlPath(interceptionContext) ? interceptionContext : null;
 }
 /**
 * Build the ISR cache key for an RSC payload.