vinext 0.0.54 → 0.1.0

package/dist/server/app-page-dispatch.d.ts

@@ -1,10 +1,13 @@
 import { ClassificationReason } from "../build/layout-classification-types.js";
 import { CachedAppPageValue } from "../shims/cache.js";
+import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { AppOutgoingElements } from "./app-elements-wire.js";
+import { NavigationContext } from "../shims/navigation.js";
 import { AppPageFontPreload, LayoutClassificationOptions } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { FetchCacheMode } from "../shims/fetch-cache.js";
@@ -45,6 +48,8 @@ type AppPageDispatchInterceptOptions<TPage = unknown> = {
 };
 type AppPageModule = {
   default?: unknown;
+  dynamic?: unknown;
+  revalidate?: unknown;
 };
 type AppPageDispatchRoute = {
   __buildTimeClassifications?: LayoutClassificationOptions["buildTimeClassifications"];
@@ -73,14 +78,22 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
    * SSR head. Undefined or empty disables emission entirely.
    */
   clientTraceMetadata?: readonly string[];
-  buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams) => Promise<AppPageElement>;
+  buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker) => Promise<AppPageElement>;
+  clientReuseManifest?: ClientReuseManifestParseResult;
   cleanPathname: string;
   clearRequestContext: () => void;
   createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
   debugClassification?: (layoutId: string, reason: ClassificationReason) => void;
   draftModeSecret: string;
   dynamicConfig?: string;
+  dynamicStaleTimeSeconds?: number;
   dynamicParamsConfig?: boolean;
+  /**
+   * Hydrate a source route's lazy page/route-handler modules before reading
+   * `route.page` (e.g. for fetch-cache-mode resolution) on intercept and ISR
+   * revalidation targets obtained via `getSourceRoute`. Idempotent.
+   */
+  ensureRouteLoaded?: (route: TRoute) => unknown;
   fetchCache?: FetchCacheMode | null;
   findIntercept: (pathname: string) => AppPageDispatchIntercept | null;
   formState?: ReactFormState | null;
@@ -90,12 +103,13 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
   getFontStyles: () => string[];
-  getNavigationContext: () => unknown;
+  getNavigationContext: () => NavigationContext | null;
   getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;
   hasGenerateStaticParams: boolean;
   hasPageDefaultExport: boolean;
   hasPageModule: boolean;
   handlerStart: number;
+  htmlLimitedBots?: string;
   interceptionContext: string | null;
   isEdgeRuntime?: boolean;
   isProgressiveActionRender?: boolean;
@@ -112,12 +126,13 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   params: AppPageParams;
   staticParamsValidationParams?: AppPageParams;
   rootParams?: RootParams;
-  probeLayoutAt: (layoutIndex: number) => unknown;
+  probeLayoutAt: (layoutIndex: number, layoutParamAccess?: AppLayoutParamAccessTracker) => unknown;
   probePage: () => unknown;
   expireSeconds?: number;
   renderErrorBoundaryPage: (error: unknown) => Promise<Response | null>;
   renderHttpAccessFallbackPage: (statusCode: number, opts: {
     boundaryComponent?: unknown;
+    boundaryModule?: AppPageModule | null;
     layouts?: readonly AppPageModule[];
     matchedParams: AppPageParams;
   }, middlewareContext: AppPageMiddlewareContext | null) => Promise<Response | null>;
@@ -144,5 +159,4 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
 };
 declare function dispatchAppPage<TRoute extends AppPageDispatchRoute>(options: DispatchAppPageOptions<TRoute>): Promise<Response>;
 //#endregion
-export { dispatchAppPage };
-//# sourceMappingURL=app-page-dispatch.d.ts.map
+export { dispatchAppPage };

package/dist/server/app-page-dispatch.js

@@ -7,17 +7,20 @@ import { shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
 import { consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
-import { createAppPageTreePath } from "./app-page-route-wiring.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import "./app-page-response.js";
 import { buildAppPageSpecialErrorResponse, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
-import { resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule } from "./app-page-boundary.js";
+import { createAppPageTreePath } from "./app-page-route-wiring.js";
 import { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope } from "./app-page-render-observation.js";
 import { readAppPageCacheResponse } from "./app-page-cache.js";
+import { resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule } from "./app-page-boundary.js";
+import { isAppSsrRenderResult } from "./app-page-stream.js";
+import { createAppLayoutParamAccessTracker, isAppLayoutObservationUnsafeForStaticReuse } from "./app-layout-param-observation.js";
 import { resolveAppPageMethodResponse } from "./app-page-method.js";
 import { buildAppPageElement, resolveAppPageIntercept, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams } from "./app-page-request.js";
 import { renderAppPageLifecycle } from "./app-page-render.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import React from "react";
@@ -28,9 +31,81 @@ function resolveAppPageRouteBoundaryModule(route, statusCode) {
 	if (statusCode === 404) return route.notFound ?? null;
 	return null;
 }
+/**
+* Request-time counterpart to the build-time `classifyLayoutSegmentConfig`
+* (`build/report.ts`). Both classify a layout by its `dynamic`/`revalidate`
+* segment config and agree on the shared cases (the build-time version
+* normalizes `revalidate = false` to `Infinity` upstream, so both treat it as
+* static); keep them aligned when either changes.
+*
+* The meaningful difference is scope, not logic: this request-time pass reads
+* the resolved module value, so it classifies layouts that were never captured
+* at build time (e.g. dev mode). Its result is merged on top of the build-time
+* classification map in `createEffectiveLayoutClassifications`, so such layouts
+* are classified here where they previously were not.
+*/
+function classifyLayoutSegmentConfigFromModule(layout) {
+	if (!layout) return null;
+	switch (layout.dynamic) {
+		case "force-dynamic": return {
+			kind: "dynamic",
+			reason: {
+				layer: "segment-config",
+				key: "dynamic",
+				value: "force-dynamic"
+			}
+		};
+		case "force-static":
+		case "error": return {
+			kind: "static",
+			reason: {
+				layer: "segment-config",
+				key: "dynamic",
+				value: layout.dynamic
+			}
+		};
+	}
+	if (layout.revalidate === false || layout.revalidate === Infinity) return {
+		kind: "static",
+		reason: {
+			layer: "segment-config",
+			key: "revalidate",
+			value: Infinity
+		}
+	};
+	if (layout.revalidate === 0) return {
+		kind: "dynamic",
+		reason: {
+			layer: "segment-config",
+			key: "revalidate",
+			value: 0
+		}
+	};
+	return null;
+}
+function createEffectiveLayoutClassifications(route, includeReasons) {
+	const classifications = new Map(route.__buildTimeClassifications ?? []);
+	const reasons = includeReasons ? new Map(route.__buildTimeReasons ?? []) : null;
+	for (let index = 0; index < route.layouts.length; index++) {
+		const classification = classifyLayoutSegmentConfigFromModule(route.layouts[index]);
+		if (classification === null) continue;
+		classifications.set(index, classification.kind);
+		reasons?.set(index, classification.reason);
+	}
+	return {
+		buildTimeClassifications: classifications.size > 0 ? classifications : null,
+		buildTimeReasons: reasons && reasons.size > 0 ? reasons : null
+	};
+}
+function getEffectiveLayoutClassifications(route, debugClassification) {
+	return createEffectiveLayoutClassifications(route, debugClassification !== void 0);
+}
 function shouldReadAppPageCache(options) {
 	return options.isProduction && !options.isProgressiveActionRender && !options.isDraftMode && !options.isForceDynamic && (options.isRscRequest || !options.scriptNonce) && (options.revalidateSeconds === null || options.revalidateSeconds > 0);
 }
+function hasSearchParams(searchParams) {
+	return searchParams !== null && searchParams !== void 0 && searchParams.size > 0;
+}
 function buildAppPageTags(cleanPathname, extraTags, routeSegments) {
 	return buildPageCacheTags(cleanPathname, extraTags, [...routeSegments], "page");
 }
@@ -82,6 +157,7 @@ async function dispatchAppPageInner(options) {
 	const isDynamicError = dynamicConfig === "error";
 	const isForceDynamic = dynamicConfig === "force-dynamic";
 	const isDraftMode = isDraftModeRequest(options.request, options.draftModeSecret);
+	const layoutParamAccess = createAppLayoutParamAccessTracker();
 	setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], route.routeSegments));
 	setCurrentFetchCacheMode(options.fetchCache ?? null);
 	if (options.hasPageModule && !options.hasPageDefaultExport) {
@@ -125,6 +201,7 @@ async function dispatchAppPageInner(options) {
 		const cachedPageResponse = await readAppPageCacheResponse({
 			cleanPathname: options.cleanPathname,
 			clearRequestContext: options.clearRequestContext,
+			hasRequestSearchParams: !isForceStatic && hasSearchParams(options.searchParams),
 			isEdgeRuntime: options.isEdgeRuntime,
 			isRscRequest: options.isRscRequest,
 			isrDebug: options.isrDebug,
@@ -156,6 +233,7 @@ async function dispatchAppPageInner(options) {
 						return toInterceptOptions(options.interceptionContext, intercept);
 					}
 				});
+				await options.ensureRouteLoaded?.(revalidationTarget.route);
 				return runAppPageRevalidationContext({
 					cleanPathname: options.cleanPathname,
 					currentFetchCacheMode: options.resolveRouteFetchCacheMode?.(revalidationTarget.route) ?? (revalidationTarget.route === route ? options.fetchCache ?? null : null),
@@ -171,7 +249,7 @@ async function dispatchAppPageInner(options) {
 					const revalidatedRscCapture = teeAppPageRscStreamForCapture(options.renderToReadableStream(revalidatedElement, { onError: revalidatedOnError }), true);
 					const revalidatedSsrEntry = await options.loadSsrHandler();
 					const revalidatedCapturedRscRef = { value: null };
-					const html = await readStreamAsText(await revalidatedSsrEntry.handleSsr(revalidatedRscCapture.ssrStream, options.getNavigationContext(), {
+					const revalidatedHtmlResult = await revalidatedSsrEntry.handleSsr(revalidatedRscCapture.ssrStream, options.getNavigationContext(), {
 						links: options.getFontLinks(),
 						styles: options.getFontStyles(),
 						preloads: options.getFontPreloads()
@@ -179,11 +257,13 @@ async function dispatchAppPageInner(options) {
 						basePath: options.basePath,
 						clientTraceMetadata: options.clientTraceMetadata,
 						rootParams: options.rootParams,
+						waitForAllReady: true,
 						...revalidatedRscCapture.sideStream ? {
 							sideStream: revalidatedRscCapture.sideStream,
 							capturedRscDataRef: revalidatedCapturedRscRef
 						} : {}
-					}));
+					});
+					const html = await readStreamAsText(isAppSsrRenderResult(revalidatedHtmlResult) ? revalidatedHtmlResult.htmlStream : revalidatedHtmlResult);
 					const rscData = await getCapturedRscDataPromise(revalidatedCapturedRscRef.value);
 					const cacheLife = _consumeRequestScopedCacheLife();
 					options.clearRequestContext();
@@ -253,9 +333,10 @@ async function dispatchAppPageInner(options) {
 	});
 	if (dynamicParamsResponse) return dynamicParamsResponse;
 	const interceptResult = await resolveAppPageIntercept({
-		buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams) {
+		async buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess) {
+			await options.ensureRouteLoaded?.(interceptRoute);
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(interceptRoute) ?? null);
-			return options.buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams);
+			return options.buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess);
 		},
 		cleanPathname: options.cleanPathname,
 		currentRoute: route,
@@ -269,6 +350,7 @@ async function dispatchAppPageInner(options) {
 			return options.getSourceRoute(sourceRouteIndex);
 		},
 		isRscRequest: options.isRscRequest,
+		layoutParamAccess,
 		renderInterceptResponse(sourceRoute, interceptElement) {
 			const interceptOnError = options.createRscOnErrorHandler(options.cleanPathname, sourceRoute.pattern);
 			const interceptStream = options.renderToReadableStream(interceptElement, { onError: interceptOnError });
@@ -293,7 +375,7 @@ async function dispatchAppPageInner(options) {
 	const pageBuildResult = await buildAppPageElement({
 		buildPageElement() {
 			if (options.actionFailed) throw options.actionError;
-			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, options.searchParams);
+			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, options.searchParams, layoutParamAccess);
 		},
 		renderErrorBoundaryPage(buildError) {
 			return options.renderErrorBoundaryPage(buildError);
@@ -304,6 +386,7 @@ async function dispatchAppPageInner(options) {
 		resolveSpecialError: resolveAppPageSpecialError
 	});
 	if (pageBuildResult.response) return pageBuildResult.response;
+	const layoutClassifications = getEffectiveLayoutClassifications(route, options.debugClassification);
 	return renderAppPageLifecycle({
 		basePath: options.basePath,
 		clientTraceMetadata: options.clientTraceMetadata,
@@ -321,6 +404,7 @@ async function dispatchAppPageInner(options) {
 			return options.createRscOnErrorHandler(pathname, routePath);
 		},
 		element: pageBuildResult.element,
+		clientReuseManifest: options.clientReuseManifest,
 		getDraftModeCookieHeader,
 		getFontLinks: options.getFontLinks,
 		getFontPreloads: options.getFontPreloads,
@@ -357,6 +441,7 @@ async function dispatchAppPageInner(options) {
 		loadSsrHandler: options.loadSsrHandler,
 		middlewareContext: options.middlewareContext,
 		params: options.params,
+		layoutParamAccess,
 		rootParams: options.rootParams,
 		peekRenderObservationState() {
 			return {
@@ -365,7 +450,7 @@ async function dispatchAppPageInner(options) {
 			};
 		},
 		probeLayoutAt(layoutIndex) {
-			return options.probeLayoutAt(layoutIndex);
+			return options.probeLayoutAt(layoutIndex, layoutParamAccess);
 		},
 		probePage() {
 			return options.probePage();
@@ -375,9 +460,12 @@ async function dispatchAppPageInner(options) {
 				const treePosition = route.layoutTreePositions?.[index] ?? 0;
 				return AppElementsWire.encodeLayoutId(createAppPageTreePath([...route.routeSegments], treePosition));
 			},
-			buildTimeClassifications: route.__buildTimeClassifications,
-			buildTimeReasons: route.__buildTimeReasons,
+			buildTimeClassifications: layoutClassifications.buildTimeClassifications,
+			buildTimeReasons: layoutClassifications.buildTimeReasons,
 			debugClassification: options.debugClassification,
+			isLayoutObservationDynamic(layoutId) {
+				return isAppLayoutObservationUnsafeForStaticReuse(layoutParamAccess.getLayoutObservation(layoutId));
+			},
 			async runWithIsolatedDynamicScope(fn) {
 				const priorDynamic = consumeDynamicUsage();
 				try {
@@ -391,6 +479,7 @@ async function dispatchAppPageInner(options) {
 				}
 			}
 		},
+		dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds,
 		revalidateSeconds: currentRevalidateSeconds,
 		mountedSlotsHeader: options.mountedSlotsHeader,
 		renderMode: options.renderMode ?? "navigation",
@@ -443,11 +532,12 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
+		serveStreamingMetadata: shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots),
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
 		renderFallbackPage(statusCode) {
-			const parentBoundary = resolveAppPageParentHttpAccessBoundaryModule({
+			const parentBoundaryModule = resolveAppPageParentHttpAccessBoundaryModule({
 				layoutIndex,
 				rootForbiddenModule: options.rootForbiddenModule,
 				rootNotFoundModule: options.rootNotFoundModule,
@@ -456,12 +546,16 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 				routeNotFoundModules: options.route.notFounds,
 				routeUnauthorizedModules: options.route.unauthorizeds,
 				statusCode
-			})?.default;
-			return options.renderHttpAccessFallbackPage(statusCode, {
-				boundaryComponent: parentBoundary,
+			});
+			const fallbackOptions = {
 				layouts: options.route.layouts.slice(0, layoutIndex),
 				matchedParams: options.params
-			}, null);
+			};
+			if (parentBoundaryModule) {
+				fallbackOptions.boundaryComponent = parentBoundaryModule.default;
+				fallbackOptions.boundaryModule = parentBoundaryModule;
+			}
+			return options.renderHttpAccessFallbackPage(statusCode, fallbackOptions, null);
 		},
 		request: options.request,
 		specialError
@@ -473,6 +567,7 @@ async function renderPageSpecialError(options, specialError) {
 		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
+		serveStreamingMetadata: shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots),
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
@@ -490,13 +585,15 @@ async function renderPageSpecialError(options, specialError) {
 				statusCode
 			});
 			const useLayoutAlignedBoundary = boundaryLayoutIndex !== null && (routeBoundaryModule === null || routeBoundaryModule === parentBoundaryModule);
-			const boundaryComponent = useLayoutAlignedBoundary ? parentBoundaryModule?.default ?? void 0 : void 0;
-			const layoutsForBoundary = useLayoutAlignedBoundary && boundaryLayoutIndex !== null ? options.route.layouts.slice(0, boundaryLayoutIndex + 1) : void 0;
-			return options.renderHttpAccessFallbackPage(statusCode, {
-				boundaryComponent,
-				layouts: layoutsForBoundary,
-				matchedParams: options.params
-			}, null);
+			const fallbackOptions = { matchedParams: options.params };
+			if (useLayoutAlignedBoundary && boundaryLayoutIndex !== null) {
+				fallbackOptions.layouts = options.route.layouts.slice(0, boundaryLayoutIndex + 1);
+				if (parentBoundaryModule) {
+					fallbackOptions.boundaryComponent = parentBoundaryModule.default;
+					fallbackOptions.boundaryModule = parentBoundaryModule;
+				}
+			}
+			return options.renderHttpAccessFallbackPage(statusCode, fallbackOptions, null);
 		},
 		request: options.request,
 		specialError
@@ -504,5 +601,3 @@ async function renderPageSpecialError(options, specialError) {
 }
 //#endregion
 export { dispatchAppPage };
-
-//# sourceMappingURL=app-page-dispatch.js.map

package/dist/server/app-page-element-builder.d.ts

@@ -1,6 +1,7 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppElements } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
 
@@ -42,6 +43,7 @@ type BuildPageElementsOptions<TModule extends AppPageModule = AppPageModule, TEr
   rootForbiddenModule?: TModule | null; /** Root-level unauthorized.tsx module. Present when the app defines this file. */
   rootUnauthorizedModule?: TModule | null; /** File-based metadata routes (favicon, manifest, sitemap, etc.). */
   metadataRoutes: readonly MetadataFileRoute[];
+  layoutParamAccess?: AppLayoutParamAccessTracker;
   /**
    * Configured next.config `basePath`. Threaded through `resolveAppPageHead`
    * so file-based metadata route URLs emitted in <head> are prefixed.
@@ -67,5 +69,4 @@ type BuildPageElementsOptions<TModule extends AppPageModule = AppPageModule, TEr
  */
 declare function buildPageElements<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule>(options: BuildPageElementsOptions<TModule, TErrorModule>): Promise<AppElements>;
 //#endregion
-export { AppPageBuildRoute, type AppPageErrorModule, AppPageInterceptOptions, AppPagePageRequest, type AppPageRouteWiringRoute, BuildPageElementsOptions, buildPageElements };
-//# sourceMappingURL=app-page-element-builder.d.ts.map
+export { AppPageBuildRoute, type AppPageErrorModule, AppPageInterceptOptions, AppPagePageRequest, type AppPageRouteWiringRoute, BuildPageElementsOptions, buildPageElements };

package/dist/server/app-page-element-builder.js

@@ -1,12 +1,12 @@
 import { matchRoutePattern } from "../routing/route-pattern.js";
-import { markDynamicUsage, markRenderRequestApiUsage } from "../shims/headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION, shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
 import { createAppPageRenderIdentity } from "./app-page-render-identity.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
-import { buildAppPageElements, createAppPageTreePath } from "./app-page-route-wiring.js";
 import { resolveActiveParallelRouteHeadInputs, resolveAppPageHead } from "./app-page-head.js";
+import { makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
+import { buildAppPageElements, createAppPageTreePath } from "./app-page-route-wiring.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { createElement } from "react";
@@ -57,7 +57,7 @@ async function buildPageElements(options) {
 			[renderIdentity.routeId]: createElement("div", null, "Page has no default export")
 		};
 	}
-	const { hasSearchParams, hasDynamicMetadata, metadata: resolvedMetadata, pageSearchParams, viewport: resolvedViewport } = await resolveAppPageHead({
+	const { hasDynamicMetadata, metadata: resolvedMetadata, pageSearchParams, viewport: resolvedViewport } = await resolveAppPageHead({
 		basePath: options.basePath ?? "",
 		layoutModules: route.layouts,
 		layoutTreePositions: route.layoutTreePositions,
@@ -78,12 +78,10 @@ async function buildPageElements(options) {
 		searchParams
 	});
 	const pageProps = { params: makeThenableParams(params) };
+	let pageSearchParamsThenable;
 	if (searchParams) {
-		pageProps.searchParams = makeThenableParams(pageSearchParams);
-		if (hasSearchParams) {
-			markDynamicUsage();
-			markRenderRequestApiUsage("searchParams");
-		}
+		pageSearchParamsThenable = !shouldSuppressLoadingBoundaries(renderMode) && Boolean(route.loading?.default) ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
+		pageProps.searchParams = pageSearchParamsThenable;
 	}
 	const mountedSlotIds = mountedSlotsHeader ? new Set(mountedSlotsHeader.split(" ")) : null;
 	const slotOverrides = buildSlotOverrides(route, params, routePath, opts);
@@ -92,6 +90,7 @@ async function buildPageElements(options) {
 		element: PageComponent ? createElement(PageComponent, pageProps) : null,
 		globalErrorModule: globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE,
 		isRscRequest,
+		layoutParamAccess: options.layoutParamAccess,
 		mountedSlotIds,
 		makeThenableParams,
 		matchedParams: params,
@@ -105,6 +104,7 @@ async function buildPageElements(options) {
 		rootForbiddenModule: rootForbiddenModule ?? null,
 		rootUnauthorizedModule: rootUnauthorizedModule ?? null,
 		route,
+		searchParams: pageSearchParamsThenable,
 		slotOverrides,
 		renderMode
 	});
@@ -158,5 +158,3 @@ function collectParamNameSet(params) {
 }
 //#endregion
 export { buildPageElements };
-
-//# sourceMappingURL=app-page-element-builder.js.map

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

@@ -72,6 +72,7 @@ type BuildAppPageSpecialErrorResponseOptions = {
   };
   renderFallbackPage?: (statusCode: number) => Promise<Response | null>;
   request: Request;
+  serveStreamingMetadata?: boolean;
   specialError: AppPageSpecialError;
 };
 type ProbeAppPageLayoutsResult = {
@@ -96,7 +97,12 @@ type LayoutClassificationOptions = {
    * active. When undefined, the probe loop skips debug emission entirely.
    */
   debugClassification?: (layoutId: string, reason: ClassificationReason) => void; /** Maps layout index to its layout ID (e.g. "layout:/blog"). */
-  getLayoutId: (layoutIndex: number) => string; /** Runs a function with isolated dynamic usage tracking per layout. */
+  getLayoutId: (layoutIndex: number) => string;
+  /**
+   * Returns whether the completed per-layout observation makes static reuse
+   * unsafe even if the older dynamic scope did not report dynamic usage.
+   */
+  isLayoutObservationDynamic?: (layoutId: string) => boolean; /** Runs a function with isolated dynamic usage tracking per layout. */
   runWithIsolatedDynamicScope: <T>(fn: () => T) => Promise<{
     result: T;
     dynamicDetected: boolean;
@@ -124,5 +130,4 @@ declare function readAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Pr
 declare function teeAppPageRscStreamForCapture(stream: ReadableStream<Uint8Array>, shouldCapture: boolean): AppPageRscStreamCapture;
 declare function buildAppPageFontLinkHeader(preloads: readonly AppPageFontPreload[] | null | undefined): string;
 //#endregion
-export { AppPageFontPreload, AppPageSpecialError, type ClassificationReason, LayoutClassificationOptions, type LayoutFlags, buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };
-//# sourceMappingURL=app-page-execution.d.ts.map
+export { AppPageFontPreload, AppPageSpecialError, LayoutClassificationOptions, type LayoutFlags, buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };

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

@@ -4,6 +4,8 @@ import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, createRscRedire
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
+import { renderSsrErrorMetaTags } from "./app-ssr-error-meta.js";
+import { isPromiseLike } from "../utils/promise.js";
 //#region src/server/app-page-execution.ts
 /**
 * Builds the canonical `NEXT_REDIRECT;<type>;<url>;<status>;` digest that
@@ -28,14 +30,20 @@ function formatNextRedirectDigest(options) {
 /**
 * Marker we tag onto a thrown redirect/notFound error when it originates from
 * `generateMetadata()` (vs. a server component itself). Metadata resolution is
-* suspended/streamed in Next.js, so a redirect from metadata never becomes an
-* HTTP-level 307 — it rides inside the flight payload with a 200 status,
-* regardless of whether the request is RSC or a full document SSR. Page-level
-* redirect()s, by contrast, still produce a 307 for SSR document requests.
+* suspended/streamed in Next.js, so a redirect from metadata is not emitted as
+* a plain HTTP-level 307. Instead the transport depends on the request:
+*   - RSC navigation requests (`Rsc: 1`) ride inside the flight payload with a
+*     200 status; the client router decodes the redirect digest.
+*   - Streaming-capable document requests get a 200 HTML response carrying a
+*     refresh meta tag (the streamed document can't switch to a 307 after the
+*     head has flushed).
+*   - html-limited bots (which Next.js serves a blocking, non-streamed
+*     response) get the HTTP-level 307.
+* Page-level redirect()s, by contrast, still produce a 307 for SSR document
+* requests.
 *
 * See Next.js test:
-*   test/e2e/app-dir/metadata-navigation/metadata-navigation.test.ts
-*   ("should support redirect in generateMetadata")
+*   test/e2e/app-dir/metadata-streaming/metadata-streaming.test.ts
 */
 const APP_PAGE_METADATA_ERROR_MARKER = Symbol.for("vinext.appPage.metadataError");
 function tagAppPageMetadataError(error) {
@@ -49,9 +57,6 @@ function tagAppPageMetadataError(error) {
 	} catch {}
 	return error;
 }
-function isPromiseLike(value) {
-	return Boolean(value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function");
-}
 function getAppPageStatusText(statusCode) {
 	return statusCode === 403 ? "Forbidden" : statusCode === 401 ? "Unauthorized" : "Not Found";
 }
@@ -120,16 +125,34 @@ function sameOriginPathOrAbsolute(location, requestUrl) {
 		return location;
 	}
 }
+function buildMetadataRedirectHtmlResponse(options) {
+	const headers = new Headers({ "Content-Type": "text/html; charset=utf-8" });
+	applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
+	mergeMiddlewareResponseHeaders(headers, options.middlewareContext?.headers ?? null);
+	const pendingCookies = options.getAndClearPendingCookies?.() ?? [];
+	for (const cookie of pendingCookies) headers.append("Set-Cookie", cookie);
+	const errorMetaTags = renderSsrErrorMetaTags([{ digest: options.digest }]);
+	return new Response(`<!DOCTYPE html><html><head>${errorMetaTags}</head><body></body></html>`, {
+		headers,
+		status: 200
+	});
+}
 async function buildAppPageSpecialErrorResponse(options) {
 	if (options.specialError.kind === "redirect") {
 		options.clearRequestContext();
 		const prefixedLocation = applyAppPageRedirectBasePath(options.specialError.location, options.request.url, options.basePath);
-		if (Boolean(options.buildRscRedirectFlightStream) && (options.isRscRequest || options.specialError.fromMetadata === true) && options.buildRscRedirectFlightStream) {
-			const digestUrl = sameOriginPathOrAbsolute(prefixedLocation, options.request.url);
-			const digest = formatNextRedirectDigest({
-				url: digestUrl,
-				statusCode: options.specialError.statusCode
-			});
+		const digestUrl = sameOriginPathOrAbsolute(prefixedLocation, options.request.url);
+		const digest = formatNextRedirectDigest({
+			url: digestUrl,
+			statusCode: options.specialError.statusCode
+		});
+		if (options.specialError.fromMetadata === true && !options.isRscRequest && options.serveStreamingMetadata !== false) return buildMetadataRedirectHtmlResponse({
+			digest,
+			getAndClearPendingCookies: options.getAndClearPendingCookies,
+			isEdgeRuntime: options.isEdgeRuntime,
+			middlewareContext: options.middlewareContext
+		});
+		if (Boolean(options.buildRscRedirectFlightStream) && options.isRscRequest && options.buildRscRedirectFlightStream) {
 			const stream = options.buildRscRedirectFlightStream({ digest });
 			const headers = new Headers({
 				"Content-Type": VINEXT_RSC_CONTENT_TYPE,
@@ -171,23 +194,33 @@ async function probeAppPageLayouts(options) {
 			for (let layoutIndex = options.layoutCount - 1; layoutIndex >= 0; layoutIndex--) {
 				const buildTimeResult = cls?.buildTimeClassifications?.get(layoutIndex);
 				if (cls && buildTimeResult) {
-					layoutFlags[cls.getLayoutId(layoutIndex)] = buildTimeResult === "static" ? "s" : "d";
-					if (cls.debugClassification) cls.debugClassification(cls.getLayoutId(layoutIndex), cls.buildTimeReasons?.get(layoutIndex) ?? { layer: "no-classifier" });
+					const layoutId = cls.getLayoutId(layoutIndex);
+					layoutFlags[layoutId] = buildTimeResult === "static" ? "s" : "d";
 					const errorResponse = await probeLayoutForErrors(options, layoutIndex);
 					if (errorResponse) return errorResponse;
+					const observationDynamic = cls.isLayoutObservationDynamic?.(layoutId) === true;
+					layoutFlags[layoutId] = buildTimeResult === "dynamic" || observationDynamic ? "d" : "s";
+					if (cls.debugClassification) if (observationDynamic && buildTimeResult === "static") cls.debugClassification(layoutId, {
+						layer: "runtime-probe",
+						outcome: "dynamic"
+					});
+					else cls.debugClassification(layoutId, cls.buildTimeReasons?.get(layoutIndex) ?? { layer: "no-classifier" });
 					continue;
 				}
 				if (cls) {
+					const layoutId = cls.getLayoutId(layoutIndex);
 					try {
 						const { dynamicDetected } = await cls.runWithIsolatedDynamicScope(() => options.probeLayoutAt(layoutIndex));
-						layoutFlags[cls.getLayoutId(layoutIndex)] = dynamicDetected ? "d" : "s";
-						if (cls.debugClassification) cls.debugClassification(cls.getLayoutId(layoutIndex), {
+						const observationDynamic = cls.isLayoutObservationDynamic?.(layoutId) === true;
+						const layoutDynamic = dynamicDetected || observationDynamic;
+						layoutFlags[layoutId] = layoutDynamic ? "d" : "s";
+						if (cls.debugClassification) cls.debugClassification(layoutId, {
 							layer: "runtime-probe",
-							outcome: dynamicDetected ? "dynamic" : "static"
+							outcome: layoutDynamic ? "dynamic" : "static"
 						});
 					} catch (error) {
-						layoutFlags[cls.getLayoutId(layoutIndex)] = "d";
-						if (cls.debugClassification) cls.debugClassification(cls.getLayoutId(layoutIndex), {
+						layoutFlags[layoutId] = "d";
+						if (cls.debugClassification) cls.debugClassification(layoutId, {
 							layer: "runtime-probe",
 							outcome: "dynamic",
 							error: error instanceof Error ? error.message : String(error)
@@ -258,5 +291,3 @@ function buildAppPageFontLinkHeader(preloads) {
 }
 //#endregion
 export { buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };
-
-//# sourceMappingURL=app-page-execution.js.map

package/dist/server/app-page-head.d.ts

@@ -59,5 +59,4 @@ declare function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHea
 declare function collectAppPageSearchParams(searchParams: URLSearchParams | null | undefined): AppPageSearchParamsCollection;
 declare function resolveAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): Promise<ResolveAppPageHeadResult>;
 //#endregion
-export { collectAppPageSearchParams, resolveActiveParallelRouteHeadInputs, resolveAppPageHead };
-//# sourceMappingURL=app-page-head.d.ts.map
+export { AppPageSearchParams, collectAppPageSearchParams, resolveActiveParallelRouteHeadInputs, resolveAppPageHead };