vinext 1.0.0-beta.0 → 1.0.0-beta.2

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

@@ -1,4 +1,4 @@
-import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RSC_REDIRECT_HEADER } from "./headers.js";
+import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
@@ -24,8 +24,7 @@ import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { navigationPlanner } from "./navigation-planner.js";
-import { resolveHybridClientRewriteHref } from "../shims/internal/hybrid-client-route-owner.js";
-import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
+import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
@@ -43,6 +42,7 @@ import { createRoot, hydrateRoot } from "react-dom/client";
 import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hasServerActions, loadServerActionClient } from "virtual:vinext-app-capabilities";
 //#region src/server/app-browser-entry.ts
+const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
 }
@@ -597,9 +597,10 @@ function BrowserRoot({ hydrationCachePublication, initialElements, initialNaviga
 		resetKey: treeState.renderId,
 		onCatch: handleDevRecoveryBoundaryCatch
 	}, innerTree) : innerTree;
+	const scrollScopedTree = createElement(AppRouterScrollCommitProvider, { commitId: treeState.renderId }, committedTree);
 	const rootErrorTree = createElement(GlobalErrorBoundary, {
 		fallback: DEFAULT_GLOBAL_ERROR_COMPONENT,
-		children: createElement(AppRouterScrollCommitProvider, { commitId: treeState.renderId }, committedTree)
+		children: scrollScopedTree
 	});
 	const ClientNavigationRenderContext = getClientNavigationRenderContext();
 	if (!ClientNavigationRenderContext) return rootErrorTree;
@@ -737,6 +738,7 @@ async function main() {
 	if (!claimInitialAppRouterBootstrap()) return;
 	if (hasServerActions) registerServerActionCallback();
 	installAppNavigationFailureListeners();
+	if (HAS_CLIENT_REWRITES) await preloadHybridClientRouteOwner();
 	let devErrorOverlay = null;
 	if (import.meta.env.DEV) {
 		devErrorOverlay = await import("../client/dev-error-overlay.js");
@@ -763,7 +765,8 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 		const metadata = AppElementsWire.readMetadata(elements);
 		if (!isCompleteAppPayloadMetadata(metadata)) return;
 		const mountedSlotsHeader = getMountedSlotIdsHeader(elements);
-		const rscUrl = await createRscRequestUrl(initialPathAndSearch, createRscRequestHeaders({ mountedSlotsHeader }));
+		const headers = createRscRequestHeaders({ mountedSlotsHeader });
+		const rscUrl = await createRscRequestUrl(initialPathAndSearch, headers);
 		if (cacheGeneration !== clientNavigationCacheGeneration) return;
 		const snapshot = {
 			compatibilityIdHeader: CLIENT_RSC_COMPATIBILITY_ID,
@@ -851,9 +854,9 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 			let redirectCount = redirectDepth;
 			let detachedNavigationCommits = false;
 			const activeTraversalIntent = navigationKind === "traverse" ? traversalIntent ?? historyController.resolveTraversalIntent(window.history.state) : null;
-			const performHardNavigationForScrollIntent = (targetHref) => {
+			const performHardNavigationForScrollIntent = (targetHref, mode) => {
 				consumeAppRouterScrollIntent(scrollIntent ?? null);
-				const didNavigate = browserNavigationController.performHardNavigation(targetHref);
+				const didNavigate = browserNavigationController.performHardNavigation(targetHref, mode);
 				if (!didNavigate) clearAppNavigationFailureTarget(targetHref);
 				return didNavigate;
 			};
@@ -890,7 +893,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 						mountedSlotsHeader
 					});
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
-					const rewrittenNavigationHref = navigationKind === "navigate" ? resolveHybridClientRewriteHref(currentHref, __basePath) : null;
+					const rewrittenNavigationHref = navigationKind === "navigate" && HAS_CLIENT_REWRITES ? resolveLoadedHybridClientRewriteHref(currentHref, __basePath) : null;
 					const additionalPrefetchRscUrls = rewrittenNavigationHref && rewrittenNavigationHref !== currentHref ? [await createRscRequestUrl(rewrittenNavigationHref, requestHeaders)] : [];
 					const visitedResponseCandidate = shouldBypassNavigationCache ? {
 						cacheKey: AppElementsWire.encodeCacheKey(rscUrl, requestInterceptionContext),
@@ -1033,6 +1036,8 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const navContentType = navResponse.headers.get("content-type") ?? "";
 					const streamedRedirectTarget = navResponse.headers.get(VINEXT_RSC_REDIRECT_HEADER);
+					const streamedRedirectTypeHeader = navResponse.headers.get(VINEXT_RSC_REDIRECT_TYPE_HEADER);
+					const streamedRedirectType = streamedRedirectTypeHeader === "push" || streamedRedirectTypeHeader === "replace" ? streamedRedirectTypeHeader : null;
 					if (blockDangerousStreamedRscRedirect(navResponse, streamedRedirectTarget)) return;
 					const liveFetchDecision = navigationPlanner.classifyRscFetchResult({
 						clientCompatibilityId: CLIENT_RSC_COMPATIBILITY_ID,
@@ -1047,13 +1052,14 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 						responseOk: navResponse.ok,
 						responseUrl: navResponseUrl ?? navResponse.url,
 						source: "live",
-						streamedRedirectTarget
+						streamedRedirectTarget,
+						streamedRedirectType
 					});
 					if (liveFetchDecision.kind === "hardNavigate") {
 						if (liveFetchDecision.discardBody) navResponse.body?.cancel().catch(() => {});
 						if (liveFetchDecision.reason === "redirectDepthExhausted") console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
 						if (liveFetchDecision.reason === "streamedRedirectLoop") console.error("[vinext] RSC streamed redirect resolved to the current URL — aborting navigation to prevent infinite loop.");
-						performHardNavigationForScrollIntent(liveFetchDecision.url);
+						performHardNavigationForScrollIntent(liveFetchDecision.url, liveFetchDecision.hardNavigationMode);
 						return;
 					}
 					if (liveFetchDecision.kind === "followRedirect") {
@@ -1204,7 +1210,8 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 			}
 		};
 		import.meta.hot.on("rsc:update", () => {
-			handleRscUpdate(++latestRscHmrUpdateId);
+			const updateId = ++latestRscHmrUpdateId;
+			handleRscUpdate(updateId);
 		});
 	}
 }

package/dist/server/app-browser-history-controller.d.ts

@@ -18,7 +18,7 @@ type AppBrowserHistoryControllerDeps = {
   readHistoryState: () => unknown; /** Reads `window.location.href`. Injected so the controller stays unit-testable. */
   readCurrentHref: () => string; /** Wraps `pushHistoryStateWithoutNotify(state, "", href)`. */
   pushHistoryState: (state: unknown, href: string) => void; /** Wraps `replaceHistoryStateWithoutNotify(state, "", href)`. */
-  replaceHistoryState: (state: unknown, href: string) => void;
+  replaceHistoryState: (state: unknown, href?: string) => void;
   readVisibleNavigationMetadata: () => VisibleNavigationMetadata | null;
 };
 /**

package/dist/server/app-browser-history-controller.js

@@ -158,9 +158,9 @@ var AppBrowserHistoryController = class {
 			bfcacheVersion: bfcacheIds === void 0 ? void 0 : this.#restorableClientState.currentBfcacheVersion,
 			previousNextUrl
 		});
-		this.#replaceHistoryState(nextHistoryState, this.#readCurrentHref());
+		this.#replaceHistoryState(nextHistoryState);
 		if (this.#isHistoryStateNavigationMetadataInSync(this.#readHistoryState(), previousNextUrl, bfcacheIds)) return;
-		this.#replaceHistoryState(nextHistoryState, this.#readCurrentHref());
+		this.#replaceHistoryState(nextHistoryState);
 	}
 	#isHistoryStateNavigationMetadataInSync(state, previousNextUrl, bfcacheIds) {
 		return readHistoryStatePreviousNextUrl(state) === previousNextUrl && (bfcacheIds === void 0 || areBfcacheIdMapsEqual(readHistoryStateBfcacheIds(state), bfcacheIds) && this.#restorableClientState.isCurrentBfcacheVersion(state));
@@ -179,7 +179,7 @@ var AppBrowserHistoryController = class {
 			bfcacheVersion: this.#restorableClientState.currentBfcacheVersion,
 			previousNextUrl: options.previousNextUrl,
 			traversalIndex: this.#currentHistoryTraversalIndex
-		}), this.#readCurrentHref());
+		}));
 	}
 	/**
 	* Resolves a restorable snapshot candidate for the given history entry and

package/dist/server/app-browser-navigation-controller.js

@@ -259,12 +259,14 @@ function createAppBrowserNavigationController(deps = {}) {
 		}
 		if (visibleCommitMode === "synchronous") {
 			flushSync(() => {
-				setter(captureCandidateState(applyApprovedVisibleCommit(getBrowserRouterState(), commit)));
+				const committedState = captureCandidateState(applyApprovedVisibleCommit(getBrowserRouterState(), commit));
+				setter(committedState);
 			});
 			return;
 		}
 		startTransition(() => {
-			setter(captureCandidateState(applyApprovedVisibleCommit(getBrowserRouterState(), commit)));
+			const committedState = captureCandidateState(applyApprovedVisibleCommit(getBrowserRouterState(), commit));
+			setter(committedState);
 		});
 	}
 	function dispatchSynchronousVisibleCommit(commit) {

package/dist/server/app-browser-server-action-client.js

@@ -49,7 +49,7 @@ var ServerActionRedirectError = class extends Error {
 		const redirectUrl = new URL(target.href, window.location.href);
 		const redirectHref = redirectUrl.pathname + redirectUrl.search + redirectUrl.hash;
 		const redirectType = target.type === "push" ? "push" : "replace";
-		this.digest = `NEXT_REDIRECT;${redirectType};${encodeURIComponent(redirectHref)};${target.status};`;
+		this.digest = `NEXT_REDIRECT;${redirectType};${redirectHref};${target.status};`;
 	}
 };
 async function invokeClientServerAction(id, args, actionInitiation, deps) {

package/dist/server/app-elements-wire.d.ts

@@ -1,6 +1,7 @@
 import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { CacheEntryReuseProof, RenderObservation } from "./cache-proof.js";
 import { ClientReuseManifestSkipDisposition } from "./client-reuse-manifest.js";
+import { compareStrings } from "../utils/compare.js";
 import { ReactNode } from "react";
 
 //#region src/server/app-elements-wire.d.ts
@@ -42,7 +43,7 @@ type AppElementsInterception = Readonly<{
   targetMatchedUrl: string;
   targetRouteId: string;
 }>;
-declare const compareAppElementsSlotIds: (left: string, right: string) => number;
+declare const compareAppElementsSlotIds: typeof compareStrings;
 declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
   layoutIds?: readonly string[];
 }): readonly AppElementsSlotBinding[];

package/dist/server/app-fallback-renderer.d.ts

@@ -5,6 +5,7 @@ import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { ReactNode } from "react";
@@ -32,6 +33,7 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   clearRequestContext: () => void;
   createRscOnErrorHandler: (request: Request, pathname: string, routePath: string) => AppPageBoundaryOnError;
   fontProviders: AppFallbackRendererFontProviders;
+  getAndClearPendingCookies?: () => string[];
   getNavigationContext: () => NavigationContext | null;
   globalErrorModule?: TModule | null; /** Whether experimental.globalNotFound is enabled for route-miss 404s. */
   globalNotFoundEnabled?: boolean;
@@ -57,6 +59,13 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
   basePath?: string; /** Configured next.config `trailingSlash`, threaded into canonical URL rendering. */
   trailingSlash?: boolean;
+  /**
+   * Serialized next.config `htmlLimitedBots` regexp source. Used to decide, per
+   * request user-agent, whether a `generateMetadata()` redirect thrown from a
+   * fallback boundary should stream (200) or block (307) — matching the
+   * matched-page dispatch path via `shouldServeStreamingMetadata`.
+   */
+  htmlLimitedBots?: string;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;
   rscRenderer: (element: ReactNode | AppElements, options: {
@@ -73,6 +82,7 @@ type AppFallbackRendererCallContext = {
    * render path. Defaults to `false` when no route is matched.
    */
   isEdgeRuntime?: boolean;
+  routePathname?: string;
   sourcePageSegments?: readonly string[] | null;
 };
 type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
@@ -80,6 +90,7 @@ type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   renderHttpAccessFallback: (route: AppPageBoundaryRoute<TModule> | null, statusCode: number, isRscRequest: boolean, request: Request, opts: {
     boundaryComponent?: AppPageComponent | null;
     boundaryModule?: TModule | null;
+    intercept?: AppPageInterceptOptions<TModule> | null;
     layouts?: readonly (TModule | null | undefined)[] | null;
     matchedParams?: AppPageParams;
   }, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;

package/dist/server/app-fallback-renderer.js

@@ -1,5 +1,6 @@
-import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
 import { DEFAULT_NOT_FOUND_MODULE } from "./default-not-found-module.js";
 //#region src/server/app-fallback-renderer.ts
@@ -8,7 +9,7 @@ const EMPTY_MW_CTX = {
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { applyFileBasedMetadata, basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
+	const { applyFileBasedMetadata, basePath = "", htmlLimitedBots, clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getAndClearPendingCookies, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
 	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	const effectiveRootNotFoundModule = rootNotFoundModule ?? DEFAULT_NOT_FOUND_MODULE;
@@ -20,12 +21,15 @@ function createAppFallbackRenderer(options) {
 	}
 	return {
 		async renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext, callContext) {
+			const serveStreamingMetadata = shouldServeStreamingMetadata(request.headers.get("user-agent") ?? "", htmlLimitedBots);
 			const useGlobalNotFound = statusCode === 404 && globalNotFoundEnabled && !route && !opts?.boundaryComponent;
 			if (useGlobalNotFound && loadGlobalNotFoundModule) {
 				const globalNotFoundModule = await resolveGlobalNotFoundModule();
 				const globalNotFoundComponent = globalNotFoundModule?.default ?? null;
 				if (globalNotFoundComponent) return renderAppPageHttpAccessFallback({
 					applyFileBasedMetadata,
+					basePath,
+					trailingSlash,
 					boundaryComponent: globalNotFoundComponent,
 					boundaryModule: globalNotFoundModule ?? null,
 					buildFontLinkHeader: fontProviders.buildFontLinkHeader,
@@ -36,6 +40,7 @@ function createAppFallbackRenderer(options) {
 					getFontLinks: fontProviders.getFontLinks,
 					getFontPreloads: fontProviders.getFontPreloads,
 					getFontStyles: fontProviders.getFontStyles,
+					getAndClearPendingCookies,
 					getNavigationContext,
 					globalErrorModule: effectiveGlobalErrorModule,
 					isEdgeRuntime: callContext?.isEdgeRuntime,
@@ -46,6 +51,7 @@ function createAppFallbackRenderer(options) {
 					matchedParams: opts?.matchedParams ?? {},
 					middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
 					metadataRoutes,
+					request,
 					requestUrl: request.url,
 					resolveChildSegments,
 					rootForbiddenModule: null,
@@ -55,6 +61,7 @@ function createAppFallbackRenderer(options) {
 					route: null,
 					renderToReadableStream: rscRenderer,
 					scriptNonce,
+					serveStreamingMetadata,
 					skipLayoutWrapping: true,
 					statusCode
 				});
@@ -74,8 +81,10 @@ function createAppFallbackRenderer(options) {
 				getFontLinks: fontProviders.getFontLinks,
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,
+				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
+				intercept: opts?.intercept ?? null,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
 				isRscRequest,
 				layoutModules: useGlobalNotFound ? [] : opts?.layouts ?? null,
@@ -84,6 +93,7 @@ function createAppFallbackRenderer(options) {
 				matchedParams: opts?.matchedParams ?? route?.params ?? {},
 				middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
 				metadataRoutes,
+				request,
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootForbiddenModule,
@@ -91,8 +101,10 @@ function createAppFallbackRenderer(options) {
 				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
 				route: useGlobalNotFound ? null : route,
+				routePathname: callContext?.routePathname,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
+				serveStreamingMetadata,
 				skipLayoutWrapping: useGlobalNotFound,
 				sourcePageSegments: callContext?.sourcePageSegments,
 				statusCode
@@ -116,6 +128,7 @@ function createAppFallbackRenderer(options) {
 				getFontLinks: fontProviders.getFontLinks,
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,
+				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
@@ -125,6 +138,7 @@ function createAppFallbackRenderer(options) {
 				matchedParams: matchedParams ?? route?.params ?? {},
 				middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
 				metadataRoutes,
+				request,
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootLayouts,

package/dist/server/app-middleware.js

@@ -1,7 +1,7 @@
 import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
 import { FLIGHT_HEADERS } from "./headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
-import { isExternalUrl, proxyExternalRequest } from "../config/config-matchers.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";
@@ -58,6 +58,7 @@ async function proxyExternalMiddlewareRewrite(request, rewriteUrl, context) {
 	const proxyRequest = requestWithMiddlewareRequestHeaders(request, context.requestHeaders ?? context.headers);
 	setHeadersContext(null);
 	setNavigationContext(null);
+	const { proxyExternalRequest } = await import("../config/config-matchers.js");
 	const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);
 	const headers = new Headers(proxyResponse.headers);
 	processMiddlewareHeaders(headers);

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

@@ -5,6 +5,8 @@ import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
+import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -19,19 +21,27 @@ type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {
   errorPaths?: readonly TModule[] | null;
   errors?: readonly (TModule | null | undefined)[] | null;
   forbidden?: TModule | null;
+  forbiddenTreePosition?: number | null;
+  forbiddens?: readonly (TModule | null | undefined)[] | null;
   layoutTreePositions?: readonly number[] | null;
   layouts?: readonly (TModule | null | undefined)[];
   notFound?: TModule | null;
+  notFounds?: readonly (TModule | null | undefined)[] | null;
+  notFoundTreePosition?: number | null;
   params?: AppPageParams;
   pattern?: string;
   routeSegments?: readonly string[];
+  slots?: AppPageRouteWiringRoute<TModule>["slots"];
   unauthorized?: TModule | null;
+  unauthorizedTreePosition?: number | null;
+  unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 };
 type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;
   clearRequestContext: () => void;
   createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
+  getAndClearPendingCookies?: () => string[];
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
   getFontStyles: () => string[];
@@ -42,12 +52,24 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   loadSsrHandler: () => Promise<AppPageSsrHandler>;
   makeThenableParams: (params: AppPageParams) => unknown;
   middlewareContext: AppPageMiddlewareContext;
-  metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
+  metadataRoutes: MetadataFileRoute[];
+  /**
+   * Whether metadata-origin redirects should ride as a 200 streaming response
+   * (HTML meta-refresh / RSC flight) rather than a blocking 307. Mirrors the
+   * matched-page dispatch decision `shouldServeStreamingMetadata(userAgent,
+   * htmlLimitedBots)`: html-limited bots get the blocking 307, so a
+   * `generateMetadata()` redirect thrown from a fallback boundary matches the
+   * matched-page path instead of always defaulting to streaming. Undefined
+   * means "not computed" and is treated as streaming, preserving prior behavior
+   * for callers that never hit metadata redirects.
+   */
+  serveStreamingMetadata?: boolean; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
   basePath?: string; /** Configured next.config `trailingSlash`, threaded into canonical URL rendering. */
   trailingSlash?: boolean;
   renderToReadableStream: (element: ReactNode | AppElements, options: {
     onError: AppPageBoundaryOnError;
   }) => ReadableStream<Uint8Array>;
+  request: Request;
   requestUrl: string;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootLayouts: readonly (TModule | null | undefined)[];
@@ -57,11 +79,13 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
 type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {
   boundaryComponent?: AppPageComponent | null;
   boundaryModule?: TModule | null;
+  intercept?: AppPageInterceptOptions<TModule> | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   matchedParams: AppPageParams;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
-  rootUnauthorizedModule?: TModule | null;
+  rootUnauthorizedModule?: TModule | null; /** Normalized, basePath-free application pathname used for route matching. */
+  routePathname?: string;
   route?: AppPageBoundaryRoute<TModule> | null;
   /**
    * When true, the resolved boundary is rendered without wrapping it in the