vinext 0.0.55 → 0.1.1

package/dist/server/app-rsc-cache-busting.js

@@ -1,4 +1,4 @@
-import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "./headers.js";
+import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "./headers.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { parseAppRscRenderMode } from "./app-rsc-render-mode.js";
 //#region src/server/app-rsc-cache-busting.ts
@@ -112,6 +112,16 @@ function isRscCacheBustingSearchPair(pair) {
 		return rawKey === VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM;
 	}
 }
+/**
+* Detect the internal RSC cache-busting search param using the same
+* encoding-aware matching as `stripRscCacheBustingSearchParam`
+* (`isRscCacheBustingSearchPair`). The two share a single matcher so a guard
+* built on this helper and the stripper can never disagree on which pairs
+* count as `_rsc`, including encoded-key edge cases like `%5Frsc`.
+*/
+function hasRscCacheBustingSearchParam(url) {
+	return (url.search.startsWith("?") ? url.search.slice(1) : url.search).split("&").some((pair) => pair.length > 0 && isRscCacheBustingSearchPair(pair));
+}
 async function computeRscCacheBustingSearchParam(headers) {
 	const input = createCacheBustingInput(headers);
 	if (input === null) return "";
@@ -140,6 +150,7 @@ function createRscRequestHeaders(options = {}) {
 	});
 	if (options.interceptionContext !== void 0 && options.interceptionContext !== null) headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, options.interceptionContext);
 	if (options.mountedSlotsHeader !== void 0 && options.mountedSlotsHeader !== null) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
+	if (options.clientReuseManifestHeader !== void 0 && options.clientReuseManifestHeader !== null) headers.set(VINEXT_CLIENT_REUSE_MANIFEST_HEADER, options.clientReuseManifestHeader);
 	const renderMode = options.renderMode ?? "navigation";
 	if (renderMode !== "navigation") headers.set(VINEXT_RSC_RENDER_MODE_HEADER, renderMode);
 	return headers;
@@ -190,6 +201,4 @@ async function resolveInvalidRscCacheBustingRequest(options) {
 	});
 }
 //#endregion
-export { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, computeRscCacheBustingSearchParam, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, isRscCompatibilityIdCompatible, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };
-
-//# sourceMappingURL=app-rsc-cache-busting.js.map
+export { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, computeRscCacheBustingSearchParam, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };

package/dist/server/app-rsc-embedded-chunks.d.ts

@@ -5,5 +5,4 @@ declare function bytesToBase64(bytes: Uint8Array): string;
 declare function decodeRscEmbeddedChunk(chunk: RscEmbeddedChunk): Uint8Array;
 declare function concatUint8Arrays(chunks: readonly Uint8Array[]): Uint8Array<ArrayBuffer>;
 //#endregion
-export { RSC_EMBEDDED_BINARY_CHUNK, RscEmbeddedChunk, bytesToBase64, concatUint8Arrays, decodeRscEmbeddedChunk };
-//# sourceMappingURL=app-rsc-embedded-chunks.d.ts.map
+export { RSC_EMBEDDED_BINARY_CHUNK, RscEmbeddedChunk, bytesToBase64, concatUint8Arrays, decodeRscEmbeddedChunk };

package/dist/server/app-rsc-embedded-chunks.js

@@ -30,5 +30,3 @@ function concatUint8Arrays(chunks) {
 }
 //#endregion
 export { RSC_EMBEDDED_BINARY_CHUNK, bytesToBase64, concatUint8Arrays, decodeRscEmbeddedChunk };
-
-//# sourceMappingURL=app-rsc-embedded-chunks.js.map

package/dist/server/app-rsc-error-handler.d.ts

@@ -17,5 +17,4 @@ type ReportRequestError = (error: Error, requestInfo: {
  */
 declare function createAppRscOnErrorHandler(reportRequestError: ReportRequestError, request: Request, pathname: string, routePath: string): (error: unknown) => string | undefined;
 //#endregion
-export { createAppRscOnErrorHandler };
-//# sourceMappingURL=app-rsc-error-handler.d.ts.map
+export { createAppRscOnErrorHandler };

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

@@ -26,5 +26,3 @@ function createAppRscOnErrorHandler(reportRequestError, request, pathname, route
 }
 //#endregion
 export { createAppRscOnErrorHandler };
-
-//# sourceMappingURL=app-rsc-error-handler.js.map

package/dist/server/app-rsc-errors.d.ts

@@ -26,5 +26,4 @@ declare function errorDigest(input: string): string;
 declare function sanitizeErrorForClient(error: unknown, nodeEnv?: string | undefined): unknown;
 declare function createRscOnErrorHandler(options: CreateRscOnErrorHandlerOptions): (error: unknown) => string | undefined;
 //#endregion
-export { createRscOnErrorHandler, errorDigest, hasDigest, sanitizeErrorForClient };
-//# sourceMappingURL=app-rsc-errors.d.ts.map
+export { createRscOnErrorHandler, errorDigest, hasDigest, sanitizeErrorForClient };

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

@@ -38,5 +38,3 @@ function createRscOnErrorHandler(options) {
 }
 //#endregion
 export { createRscOnErrorHandler, errorDigest, hasDigest, sanitizeErrorForClient };
-
-//# sourceMappingURL=app-rsc-errors.js.map

package/dist/server/app-rsc-handler.d.ts

@@ -1,4 +1,5 @@
 import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
+import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { RootParams } from "../shims/root-params.js";
 import { MiddlewareModule } from "./middleware-runtime.js";
 import { AppMiddlewareContext } from "./app-middleware.js";
@@ -27,7 +28,9 @@ type AppRscRouteMatch<TRoute> = {
   route: TRoute;
 };
 type DispatchMatchedPageOptions<TRoute> = {
+  clientReuseManifest: ClientReuseManifestParseResult;
   cleanPathname: string;
+  displayPathname: string;
   formState: ReactFormState | null;
   actionError?: unknown;
   actionFailed?: boolean;
@@ -130,7 +133,20 @@ type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
   draftModeSecret: string;
   dispatchMatchedPage: (options: DispatchMatchedPageOptions<TRoute>) => Promise<Response>;
   dispatchMatchedRouteHandler: (options: DispatchMatchedRouteHandlerOptions<TRoute>) => Promise<Response>;
+  /**
+   * Hydrate a matched route's lazily-loaded page/route-handler modules before
+   * any synchronous read of `route.page` / `route.routeHandler`. Idempotent and
+   * dedup'd. Provided by the generated RSC entry; absent in older entries.
+   */
+  ensureRouteLoaded?: (route: TRoute) => unknown;
   ensureInstrumentation?: () => Promise<void>;
+  /**
+   * Register cache adapters configured via the vinext() `cache` option. Wired
+   * from the generated RSC entry (which can import `virtual:vinext-cache-adapters`)
+   * so config-driven cache handlers apply to App Router on EVERY runtime — the
+   * Node server and dev included, not just the Cloudflare worker entry.
+   */
+  registerCacheAdapters: (env?: Record<string, unknown>) => void;
   handleProgressiveActionRequest: (options: HandleProgressiveActionRequestOptions) => Promise<Response | ProgressiveActionFormStateResult | null>;
   handleServerActionRequest: (options: HandleServerActionRequestOptions) => Promise<Response | null>;
   i18nConfig: NextI18nConfig | null;
@@ -151,5 +167,4 @@ type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
 };
 declare function createAppRscHandler<TRoute extends AppRscHandlerRoute>(options: CreateAppRscHandlerOptions<TRoute>): (request: Request, ctx: unknown) => Promise<Response>;
 //#endregion
-export { createAppRscHandler };
-//# sourceMappingURL=app-rsc-handler.d.ts.map
+export { createAppRscHandler };

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

@@ -2,24 +2,24 @@ import { createRequestContext, runWithRequestContext } from "../shims/unified-re
 import { hasBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { ACTION_REVALIDATED_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER } from "./headers.js";
-import { isExternalUrl, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
+import { isExternalUrl, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
 import { notFoundResponse } from "./http-error-responses.js";
-import { applyConfigHeadersToResponse, cloneRequestWithHeaders, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute, validateImageUrl } from "./request-pipeline.js";
+import { applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute, validateImageUrl } from "./request-pipeline.js";
 import { headersContextFromRequest } from "../shims/headers.js";
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
-import { createRscRedirectLocation, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { createRscRedirectLocation, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { isImageOptimizationPath } from "./image-optimization.js";
-import { prerenderRouteParamsPayloadMatchesRoute, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
-import { flattenErrorCauses } from "../utils/error-cause.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import "./app-page-response.js";
+import { prerenderRouteParamsPayloadMatchesRoute, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { applyAppMiddleware } from "./app-middleware.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
-import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { handleAppPrerenderEndpoint } from "./app-prerender-endpoints.js";
+import { flattenErrorCauses } from "../utils/error-cause.js";
 import { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { handleMetadataRouteRequest } from "./metadata-route-response.js";
@@ -76,6 +76,12 @@ function applyConfigHeadersToMiddlewareRedirect(response, options) {
 	}
 	return response;
 }
+function requestWithoutRscCacheBustingSearchParam(request) {
+	const url = new URL(request.url);
+	if (!hasRscCacheBustingSearchParam(url)) return request;
+	stripRscCacheBustingSearchParam(url);
+	return cloneRequestWithUrl(request.body ? request.clone() : request, url.toString());
+}
 async function handleAppRscRequest(options, request, preMiddlewareRequestContext, isDataRequest) {
 	const handlerStart = process.env.NODE_ENV !== "production" ? performance.now() : 0;
 	if (process.env.NODE_ENV !== "production") {
@@ -84,7 +90,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	}
 	const normalized = normalizeRscRequest(request, options.basePath);
 	if (normalized instanceof Response) return normalized;
-	const { url, isRscRequest, interceptionContextHeader, mountedSlotsHeader, renderMode } = normalized;
+	const { url, isRscRequest, interceptionContextHeader, mountedSlotsHeader, renderMode, clientReuseManifest } = normalized;
 	let { pathname, cleanPathname } = normalized;
 	const canonicalPathname = cleanPathname;
 	const basePathState = {
@@ -107,7 +113,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const redirect = matchRedirect(matchPathname(stripRscSuffix(pathname)), options.configRedirects, preMiddlewareRequestContext, basePathState);
 	if (redirect) {
 		const destination = sanitizeDestination(redirectDestinationWithBasePath(redirect.destination, options.basePath));
-		const location = isRscRequest && request.headers.get("RSC") === "1" ? await createRscRedirectLocation(destination, request) : destination;
+		const location = isRscRequest && request.headers.get("RSC") === "1" ? await createRscRedirectLocation(destination, request) : preserveRedirectDestinationQuery(destination, url.search);
 		return new Response(null, {
 			status: redirect.permanent ? 308 : 307,
 			headers: { Location: location }
@@ -118,6 +124,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		request
 	});
 	if (rscCacheBustingRedirect) return rscCacheBustingRedirect;
+	const userlandRequest = isRscRequest ? requestWithoutRscCacheBustingSearchParam(request) : request;
 	const middlewareContext = {
 		headers: null,
 		requestHeaders: null,
@@ -132,7 +139,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			isDataRequest,
 			isProxy: options.isMiddlewareProxy,
 			module: options.middlewareModule,
-			request,
+			request: userlandRequest,
 			trailingSlash: options.trailingSlash
 		});
 		if (middlewareResult.kind === "response") return applyConfigHeadersToMiddlewareRedirect(middlewareResult.response, {
@@ -145,11 +152,11 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (middlewareResult.search !== null) url.search = middlewareResult.search;
 	}
 	const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareContext.headers);
-	const postMiddlewareRequestContext = buildPostMwRequestContext(request);
+	const postMiddlewareRequestContext = buildPostMwRequestContext(userlandRequest);
 	const beforeFilesRewrite = await applyRewrite({
 		basePathState,
 		clearRequestContext: options.clearRequestContext,
-		request,
+		request: userlandRequest,
 		requestContext: postMiddlewareRequestContext,
 		rewrites: options.configRewrites.beforeFiles
 	}, matchPathname(cleanPathname));
@@ -217,7 +224,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const afterFilesRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,
-			request,
+			request: userlandRequest,
 			requestContext: postMiddlewareRequestContext,
 			rewrites: options.configRewrites.afterFiles
 		}, matchPathname(cleanPathname));
@@ -231,7 +238,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const fallbackRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,
-			request,
+			request: userlandRequest,
 			requestContext: postMiddlewareRequestContext,
 			rewrites: options.configRewrites.fallback
 		}, matchPathname(cleanPathname));
@@ -270,6 +277,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		return notFoundResponse({ headers });
 	}
 	const { route, params } = match;
+	if (options.ensureRouteLoaded) await options.ensureRouteLoaded(route);
 	const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
 	const prerenderRouteParams = prerenderRouteParamsPayloadMatchesRoute(prerenderRouteParamsPayload, route.pattern, params) ? prerenderRouteParamsPayload.params : null;
 	const renderParams = prerenderRouteParams ?? params;
@@ -292,7 +300,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		});
 	}
 	const pageResponse = await options.dispatchMatchedPage({
+		clientReuseManifest,
 		cleanPathname,
+		displayPathname: canonicalPathname,
 		formState,
 		actionError,
 		actionFailed,
@@ -348,6 +358,7 @@ function applyProgressiveActionSideEffects(response, sideEffects) {
 }
 function createAppRscHandler(options) {
 	return async function appRscHandler(rawRequest, ctx) {
+		options.registerCacheAdapters();
 		await options.ensureInstrumentation?.();
 		const mwCtx = rawRequest.headers.get(VINEXT_MW_CTX_HEADER);
 		const isDataRequest = rawRequest.headers.get("x-nextjs-data") === "1";
@@ -383,5 +394,3 @@ function createAppRscHandler(options) {
 }
 //#endregion
 export { createAppRscHandler };
-
-//# sourceMappingURL=app-rsc-handler.js.map

package/dist/server/app-rsc-render-mode.d.ts

@@ -8,5 +8,4 @@ declare function shouldSuppressLoadingBoundaries(mode: AppRscRenderMode): boolea
 declare function getRscRenderModeCacheVariant(mode: AppRscRenderMode): string | null;
 declare function parseAppRscRenderMode(value: string | null): AppRscRenderMode;
 //#endregion
-export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
-//# sourceMappingURL=app-rsc-render-mode.d.ts.map
+export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };

package/dist/server/app-rsc-render-mode.js

@@ -23,5 +23,3 @@ function parseAppRscRenderMode(value) {
 }
 //#endregion
 export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
-
-//# sourceMappingURL=app-rsc-render-mode.js.map

package/dist/server/app-rsc-request-normalization.d.ts

@@ -1,6 +1,6 @@
+import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
-import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 
 //#region src/server/app-rsc-request-normalization.d.ts
 type NormalizedRscRequest = {
@@ -10,7 +10,7 @@ type NormalizedRscRequest = {
   isRscRequest: boolean; /** Sanitized X-Vinext-Interception-Context header (null bytes stripped). null when absent. */
   interceptionContextHeader: string | null; /** Normalized x-vinext-mounted-slots header (deduplicated, sorted). null when absent or blank. */
   mountedSlotsHeader: string | null; /** Semantic RSC payload mode. HTML requests always normalize to "navigation". */
-  renderMode: AppRscRenderMode; /** Disabled ClientReuseManifest hint. Never authorizes skip transport in this stage. */
+  renderMode: AppRscRenderMode; /** Parsed ClientReuseManifest hint. Verification and skip authorization happen later. */
   clientReuseManifest: ClientReuseManifestParseResult;
 };
 /**
@@ -38,12 +38,11 @@ type NormalizedRscRequest = {
  *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
  *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
  *   10. Read semantic render mode for refresh/action payload rendering
- *   11. Parse disabled ClientReuseManifest hints on canonical RSC payload requests
+ *   11. Parse ClientReuseManifest hints on canonical RSC payload requests
  *
  * @returns A 400 or 404 Response for invalid or out-of-scope inputs,
  *          or a NormalizedRscRequest for valid requests.
  */
 declare function normalizeRscRequest(request: Request, basePath: string): Response | NormalizedRscRequest;
 //#endregion
-export { NormalizedRscRequest, normalizeMountedSlotsHeader, normalizeRscRequest };
-//# sourceMappingURL=app-rsc-request-normalization.d.ts.map
+export { NormalizedRscRequest, normalizeMountedSlotsHeader, normalizeRscRequest };

package/dist/server/app-rsc-request-normalization.js

@@ -7,8 +7,8 @@ import { guardProtocolRelativeUrl } from "./request-pipeline.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
 import { stripRscSuffix } from "./app-rsc-cache-busting.js";
-import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 import { parseClientReuseManifestHeader } from "./client-reuse-manifest.js";
+import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 //#region src/server/app-rsc-request-normalization.ts
 /**
 * Normalize an App Router RSC request.
@@ -35,7 +35,7 @@ import { parseClientReuseManifestHeader } from "./client-reuse-manifest.js";
 *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
 *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
 *   10. Read semantic render mode for refresh/action payload rendering
-*   11. Parse disabled ClientReuseManifest hints on canonical RSC payload requests
+*   11. Parse ClientReuseManifest hints on canonical RSC payload requests
 *
 * @returns A 400 or 404 Response for invalid or out-of-scope inputs,
 *          or a NormalizedRscRequest for valid requests.
@@ -73,5 +73,3 @@ function normalizeRscRequest(request, basePath) {
 }
 //#endregion
 export { normalizeMountedSlotsHeader, normalizeRscRequest };
-
-//# sourceMappingURL=app-rsc-request-normalization.js.map

package/dist/server/app-rsc-response-finalizer.d.ts

@@ -34,5 +34,4 @@ type FinalizeAppRscResponseOptions = {
  */
 declare function finalizeAppRscResponse(response: Response, request: Request, options: FinalizeAppRscResponseOptions): Response;
 //#endregion
-export { finalizeAppRscResponse };
-//# sourceMappingURL=app-rsc-response-finalizer.d.ts.map
+export { finalizeAppRscResponse };

package/dist/server/app-rsc-response-finalizer.js

@@ -5,6 +5,7 @@ import { normalizePath } from "./normalize-path.js";
 import { applyConfigHeadersToResponse } from "./request-pipeline.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
+import { applyCdnResponseHeaders } from "./cache-control.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
 //#region src/server/app-rsc-response-finalizer.ts
 /**
@@ -22,6 +23,7 @@ import { mergeVaryHeader } from "./middleware-response-headers.js";
 function finalizeAppRscResponse(response, request, options) {
 	if (response.status >= 300 && response.status < 400) return response;
 	if (!response.headers.has("x-vinext-static-file")) mergeVaryHeader(response.headers, VINEXT_RSC_VARY_HEADER);
+	if (!response.headers.has("Cache-Control")) applyCdnResponseHeaders(response.headers, { cacheControl: "" });
 	if (!options.configHeaders.length) return response;
 	const url = new URL(request.url);
 	let pathname;
@@ -46,5 +48,3 @@ function finalizeAppRscResponse(response, request, options) {
 }
 //#endregion
 export { finalizeAppRscResponse };
-
-//# sourceMappingURL=app-rsc-response-finalizer.js.map

package/dist/server/app-rsc-route-matching.d.ts

@@ -1,6 +1,12 @@
 import { RoutePatternParams } from "../routing/route-pattern.js";
 
 //#region src/server/app-rsc-route-matching.d.ts
+/**
+ * Sentinel slot key used for sibling-style interception entries.
+ * When a matched intercept carries this key, the render layer replaces the
+ * route's main page element instead of a parallel slot.
+ */
+declare const SIBLING_PAGE_INTERCEPT_SLOT_KEY = "__vinext_page_intercept";
 type AppRscRouteParams = RoutePatternParams;
 type AppRscInterceptForMatching = {
   targetPattern: string;
@@ -25,15 +31,27 @@ type AppRscInterceptForMatching = {
   sourceMatchPattern?: string;
   interceptLayouts: readonly unknown[];
   page: unknown;
+  __pageLoader?: (() => Promise<unknown>) | null;
   params: readonly string[];
 };
 type AppRscSlotForMatching = {
   id?: string | null;
   intercepts?: readonly AppRscInterceptForMatching[];
 };
+type AppRscSiblingInterceptForMatching = {
+  targetPattern: string;
+  sourceMatchPattern: string | null;
+  slotId: string | null;
+  interceptLayouts: readonly unknown[];
+  page: unknown;
+  __pageLoader?: (() => Promise<unknown>) | null;
+  params: readonly string[];
+};
 type AppRscRouteForMatching = {
+  pattern: string;
   patternParts: string[];
   slots?: Record<string, AppRscSlotForMatching>;
+  siblingIntercepts?: AppRscSiblingInterceptForMatching[];
 };
 type AppRscInterceptMatch = AppRscInterceptLookupEntry & {
   matchedParams: AppRscRouteParams;
@@ -47,6 +65,7 @@ type AppRscInterceptLookupEntry = {
   sourceMatchPatternParts: string[] | null;
   interceptLayouts: readonly unknown[];
   page: unknown;
+  __pageLoader?: (() => Promise<unknown>) | null;
   params: readonly string[];
   slotId: string | null;
 };
@@ -59,5 +78,4 @@ declare function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(
 };
 declare function matchAppRscRoutePattern(urlParts: string[], patternParts: string[]): AppRscRouteParams | null;
 //#endregion
-export { createAppRscRouteMatcher, matchAppRscRoutePattern };
-//# sourceMappingURL=app-rsc-route-matching.d.ts.map
+export { SIBLING_PAGE_INTERCEPT_SLOT_KEY, createAppRscRouteMatcher, matchAppRscRoutePattern };

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

@@ -2,6 +2,12 @@ import { splitPathnameForRouteMatch } from "../routing/utils.js";
 import { buildRouteTrie, trieMatch } from "../routing/route-trie.js";
 import { matchRoutePattern, matchRoutePatternPrefix } from "../routing/route-pattern.js";
 //#region src/server/app-rsc-route-matching.ts
+/**
+* Sentinel slot key used for sibling-style interception entries.
+* When a matched intercept carries this key, the render layer replaces the
+* route's main page element instead of a parallel slot.
+*/
+const SIBLING_PAGE_INTERCEPT_SLOT_KEY = "__vinext_page_intercept";
 function createRouteParams() {
 	return Object.create(null);
 }
@@ -54,17 +60,18 @@ function matchInterceptSource(sourceParts, entry) {
 	return matchRoutePatternPrefix(sourceParts, patternParts);
 }
 function createInterceptLookup(routes) {
+	const patternToIndex = new Map(routes.map((r, i) => [r.pattern, i]));
 	const interceptLookup = [];
 	for (let routeIndex = 0; routeIndex < routes.length; routeIndex++) {
 		const route = routes[routeIndex];
-		if (!route.slots) continue;
-		for (const [slotKey, slotModule] of Object.entries(route.slots)) {
+		if (route.slots) for (const [slotKey, slotModule] of Object.entries(route.slots)) {
 			if (!slotModule.intercepts) continue;
 			for (const intercept of slotModule.intercepts) {
 				const sourceMatchPattern = intercept.sourceMatchPattern ?? null;
 				const sourceMatchPatternParts = sourceMatchPattern ? sourceMatchPattern.split("/").filter(Boolean) : null;
+				const ownerRouteIndex = sourceMatchPattern !== null ? patternToIndex.get(sourceMatchPattern) ?? routeIndex : routeIndex;
 				interceptLookup.push({
-					sourceRouteIndex: routeIndex,
+					sourceRouteIndex: ownerRouteIndex,
 					slotKey,
 					slotId: typeof slotModule.id === "string" ? slotModule.id : null,
 					targetPattern: intercept.targetPattern,
@@ -73,10 +80,28 @@ function createInterceptLookup(routes) {
 					sourceMatchPatternParts,
 					interceptLayouts: intercept.interceptLayouts,
 					page: intercept.page,
+					__pageLoader: intercept.__pageLoader,
 					params: intercept.params
 				});
 			}
 		}
+		if (route.siblingIntercepts) for (const intercept of route.siblingIntercepts) {
+			const sourceMatchPattern = intercept.sourceMatchPattern ?? null;
+			const sourceMatchPatternParts = sourceMatchPattern ? sourceMatchPattern.split("/").filter(Boolean) : null;
+			interceptLookup.push({
+				sourceRouteIndex: routeIndex,
+				slotKey: SIBLING_PAGE_INTERCEPT_SLOT_KEY,
+				slotId: typeof intercept.slotId === "string" ? intercept.slotId : null,
+				targetPattern: intercept.targetPattern,
+				targetPatternParts: intercept.targetPattern.split("/").filter(Boolean),
+				sourceMatchPattern,
+				sourceMatchPatternParts,
+				interceptLayouts: intercept.interceptLayouts,
+				page: intercept.page,
+				__pageLoader: intercept.__pageLoader,
+				params: intercept.params
+			});
+		}
 	}
 	return interceptLookup;
 }
@@ -87,6 +112,4 @@ function mergeMatchedParams(sourceParams, targetParams) {
 	return Object.assign(createRouteParams(), sourceParams, targetParams);
 }
 //#endregion
-export { createAppRscRouteMatcher, matchAppRscRoutePattern };
-
-//# sourceMappingURL=app-rsc-route-matching.js.map
+export { SIBLING_PAGE_INTERCEPT_SLOT_KEY, createAppRscRouteMatcher, matchAppRscRoutePattern };

package/dist/server/app-segment-config.d.ts

@@ -8,10 +8,12 @@ type AppRouteSegmentConfigModule = {
   fetchCache?: unknown;
   revalidate?: unknown;
   runtime?: unknown;
+  unstable_dynamicStaleTime?: unknown;
 };
 type EffectiveAppPageSegmentConfig = {
   dynamicConfig?: AppRouteSegmentDynamic;
   dynamicParamsConfig?: boolean;
+  dynamicStaleTimeSeconds?: number;
   fetchCache?: FetchCacheMode;
   revalidateSeconds: number | null;
   runtime?: "edge" | "experimental-edge" | "nodejs";
@@ -19,6 +21,7 @@ type EffectiveAppPageSegmentConfig = {
 type ResolveAppPageSegmentConfigOptions = {
   layouts?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
   page?: AppRouteSegmentConfigModule | null;
+  parallelPages?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
 };
 /**
  * Resolve the route segment config that applies to an App page route.
@@ -32,5 +35,4 @@ declare function resolveAppPageSegmentConfig(options: ResolveAppPageSegmentConfi
 declare function resolveAppPageFetchCacheMode(options: ResolveAppPageSegmentConfigOptions): FetchCacheMode | null;
 declare function isEdgeRuntime(runtime: string | undefined): boolean;
 //#endregion
-export { isEdgeRuntime, resolveAppPageFetchCacheMode, resolveAppPageSegmentConfig };
-//# sourceMappingURL=app-segment-config.d.ts.map
+export { isEdgeRuntime, resolveAppPageFetchCacheMode, resolveAppPageSegmentConfig };

package/dist/server/app-segment-config.js

@@ -33,6 +33,10 @@ function resolveRevalidateSeconds(current, value) {
 	if (current === null) return value;
 	return value < current ? value : current;
 }
+function resolveDynamicStaleTimeSeconds(current, value) {
+	if (typeof value !== "number" || !Number.isInteger(value) || value < 0) return current;
+	return current === void 0 ? value : Math.min(current, value);
+}
 function isCacheFetchCacheMode(value) {
 	return value === "default-cache" || value === "force-cache" || value === "only-cache";
 }
@@ -78,6 +82,10 @@ function resolveAppPageSegmentConfig(options) {
 		}
 		config.revalidateSeconds = resolveRevalidateSeconds(config.revalidateSeconds, segment.revalidate);
 	}
+	for (const segment of [options.page, ...options.parallelPages ?? []]) {
+		if (!segment) continue;
+		config.dynamicStaleTimeSeconds = resolveDynamicStaleTimeSeconds(config.dynamicStaleTimeSeconds, segment.unstable_dynamicStaleTime);
+	}
 	if (config.dynamicConfig === "force-dynamic") config.revalidateSeconds = 0;
 	if (config.fetchCache === void 0) {
 		if (config.dynamicConfig === "force-dynamic") config.fetchCache = "force-no-store";
@@ -94,5 +102,3 @@ function isEdgeRuntime(runtime) {
 }
 //#endregion
 export { isEdgeRuntime, resolveAppPageFetchCacheMode, resolveAppPageSegmentConfig };
-
-//# sourceMappingURL=app-segment-config.js.map

package/dist/server/app-server-action-execution.d.ts

@@ -108,6 +108,15 @@ type HandleProgressiveServerActionRequestOptions = {
   decodeFormState: AppServerActionFormStateDecoder;
   getAndClearPendingCookies: () => string[];
   getDraftModeCookieHeader: () => string | null | undefined;
+  /**
+   * Whether the posted-to route resolves to an App Router *page* (as opposed to
+   * a route handler or no match). Multipart form POSTs to a page are always
+   * server-action attempts in Next.js, so a body that decodes to no action must
+   * surface as 404 action-not-found rather than rendering the page. Route
+   * handlers (which run *after* this dispatch in vinext) legitimately receive
+   * raw multipart POSTs, so they must still fall through. See issue #1340.
+   */
+  hasPageRoute: boolean;
   maxActionBodySize: number;
   middlewareHeaders: Headers | null;
   readFormDataWithLimit: ReadFormDataWithLimit;
@@ -128,6 +137,12 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
   createRscOnErrorHandler: (request: Request, pathname: string, pattern: string) => (error: unknown) => unknown;
   createTemporaryReferenceSet: () => TTemporaryReferences;
   decodeReply: (body: string | FormData, options: DecodeServerActionReplyOptions<TTemporaryReferences>) => Promise<unknown[]> | unknown[];
+  /**
+   * Hydrate a route's lazy page/route-handler modules before reading
+   * `route.page` / `route.routeHandler` on action redirect targets and
+   * re-render targets obtained via `matchRoute`/`getSourceRoute`. Idempotent.
+   */
+  ensureRouteLoaded?: (route: TRoute) => unknown;
   findIntercept: (pathname: string) => AppServerActionIntercept<TPage> | null;
   getAndClearPendingCookies: () => string[];
   getDraftModeCookieHeader: () => string | null | undefined;
@@ -137,7 +152,8 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
   isRscRequest: boolean;
   loadServerAction: (actionId: string) => Promise<unknown>;
   matchRoute: (pathname: string) => AppServerActionMatch<TRoute> | null;
-  maxActionBodySize: number;
+  maxActionBodySize: number; /** Verbatim `serverActions.bodySizeLimit` config string (e.g. "2mb") for the body-exceeded error. */
+  maxActionBodySizeLabel: string;
   middlewareHeaders: Headers | null;
   middlewareStatus: number | null | undefined;
   mountedSlotsHeader: string | null;
@@ -188,5 +204,4 @@ declare function isProgressiveServerActionRequest(request: Pick<Request, "method
 declare function handleProgressiveServerActionRequest(options: HandleProgressiveServerActionRequestOptions): Promise<Response | ProgressiveServerActionResult | null>;
 declare function handleServerActionRscRequest<TElement, TRoute extends AppServerActionRoute, TInterceptOpts, TTemporaryReferences, TPage = unknown>(options: HandleServerActionRscRequestOptions<TElement, TRoute, TInterceptOpts, TTemporaryReferences, TPage>): Promise<Response | null>;
 //#endregion
-export { HandleProgressiveServerActionRequestOptions, HandleServerActionRscRequestOptions, applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };
-//# sourceMappingURL=app-server-action-execution.d.ts.map
+export { HandleProgressiveServerActionRequestOptions, HandleServerActionRscRequestOptions, applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };