vinext 1.0.0-beta.8 → 1.0.0

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

@@ -1,7 +1,9 @@
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
+import { searchParamsToRecord } from "../utils/query.js";
 import { mergeMetadataEntries, mergeViewport, postProcessMetadata, resolveModuleMetadata as resolveModuleMetadata$1, resolveModuleViewport } from "../shims/metadata.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { tagAppPageMetadataError } from "./app-page-execution.js";
+import { createAppMetadataModuleRoute, traceGenerateMetadata } from "./app-metadata-tracing.js";
 //#region src/server/app-page-head.ts
 /**
 * Wrapped {@link _resolveModuleMetadata} that tags any thrown error with the
@@ -15,9 +17,9 @@ import { tagAppPageMetadataError } from "./app-page-execution.js";
 * See https://github.com/cloudflare/vinext/issues/1347
 * and Next.js test/e2e/app-dir/metadata-streaming.
 */
-async function resolveModuleMetadata(...args) {
+async function resolveModuleMetadata(moduleRoute, ...args) {
 	try {
-		return await resolveModuleMetadata$1(...args);
+		return await (typeof args[0].generateMetadata === "function" ? traceGenerateMetadata(moduleRoute, () => resolveModuleMetadata$1(...args)) : resolveModuleMetadata$1(...args));
 	} catch (error) {
 		throw tagAppPageMetadataError(error);
 	}
@@ -25,6 +27,7 @@ async function resolveModuleMetadata(...args) {
 function resolveActiveParallelRouteHeadInputs(options) {
 	return Object.entries(options.slots ?? {}).map(([slotKey, slot]) => {
 		const ownerTreePosition = options.layoutTreePositions?.[slot.layoutIndex ?? 0] ?? 0;
+		const ownerRouteSegments = options.routeSegments.slice(0, ownerTreePosition);
 		const ownerParams = resolveAppPageSegmentParams(options.routeSegments, ownerTreePosition, options.params);
 		const slotParams = options.slotParams?.[slotKey] ?? options.params;
 		const notFoundParams = slot.notFound ? {
@@ -35,6 +38,8 @@ function resolveActiveParallelRouteHeadInputs(options) {
 			const interceptLayouts = options.interceptLayouts ?? [];
 			const inheritedSlotNotFound = slot.notFoundTreePosition === 0 ? slot.notFound ?? null : null;
 			const interceptNotFound = options.interceptNotFound ?? inheritedSlotNotFound;
+			const interceptRouteSegments = options.interceptSourcePageSegments ?? options.routeSegments;
+			const interceptNotFoundRouteSegments = options.interceptNotFound ? (options.interceptNotFoundBranchSegments ?? interceptRouteSegments).slice(0, options.interceptNotFoundTreePosition ?? 0) : [...ownerRouteSegments, ...(slot.routeSegments ?? []).slice(0, slot.notFoundTreePosition ?? 0)];
 			const interceptNotFoundParams = interceptNotFound ? {
 				...ownerParams,
 				...resolveParallelLayoutParams(options.interceptNotFoundBranchSegments ?? options.interceptBranchSegments ?? options.routeSegments, options.interceptNotFound ? options.interceptNotFoundTreePosition ?? 0 : slot.notFoundTreePosition ?? 0, options.interceptParams ?? options.params)
@@ -52,15 +57,18 @@ function resolveActiveParallelRouteHeadInputs(options) {
 					layoutTreePositions: [...slot.layout ? [0] : [], ...interceptLayouts.filter(isPresent).map(() => options.routeSegments.length)],
 					pageModule: options.interceptPage,
 					params: options.interceptParams ?? options.params,
-					routeSegments: options.interceptSourcePageSegments ?? options.routeSegments
+					routeSegments: interceptRouteSegments
 				},
 				...interceptNotFound ? {
 					notFoundModule: interceptNotFound,
+					notFoundModuleRouteSegments: interceptNotFoundRouteSegments,
 					notFoundParams: interceptNotFoundParams
 				} : {},
 				ownerTreePosition
 			};
 		}
+		const slotRouteSegments = slot.routeSegments ?? options.routeSegments;
+		const moduleRouteSegments = slot.routeSegments ?? [];
 		return {
 			head: {
 				layoutModules: [slot.layout, ...slot.configLayouts ?? []].filter(isPresent),
@@ -71,10 +79,13 @@ function resolveActiveParallelRouteHeadInputs(options) {
 				layoutTreePositions: [...slot.layout ? [0] : [], ...slot.configLayoutTreePositions ?? []],
 				pageModule: slot.page,
 				params: slotParams,
-				routeSegments: slot.routeSegments ?? options.routeSegments
+				...ownerRouteSegments.length > 0 ? { moduleRoutePrefixSegments: ownerRouteSegments } : {},
+				...slot.routeSegments ? {} : { moduleRouteSegments },
+				routeSegments: slotRouteSegments
 			},
 			...slot.notFound ? {
 				notFoundModule: slot.notFound,
+				notFoundModuleRouteSegments: [...ownerRouteSegments, ...moduleRouteSegments.slice(0, slot.notFoundTreePosition ?? 0)],
 				notFoundParams
 			} : {},
 			ownerTreePosition
@@ -91,23 +102,9 @@ function hasGenerateMetadata(module) {
 	return typeof module?.generateMetadata === "function";
 }
 function collectAppPageSearchParams(searchParams) {
-	const pageSearchParams = Object.create(null);
-	let hasSearchParams = false;
-	searchParams?.forEach((value, key) => {
-		hasSearchParams = true;
-		const currentValue = pageSearchParams[key];
-		if (Array.isArray(currentValue)) {
-			pageSearchParams[key] = [...currentValue, value];
-			return;
-		}
-		if (currentValue !== void 0) {
-			pageSearchParams[key] = [currentValue, value];
-			return;
-		}
-		pageSearchParams[key] = value;
-	});
+	const pageSearchParams = searchParamsToRecord(searchParams);
 	return {
-		hasSearchParams,
+		hasSearchParams: Object.keys(pageSearchParams).length > 0,
 		pageSearchParams
 	};
 }
@@ -154,7 +151,7 @@ async function resolveLayoutMetadata(layoutInputs, params, routeSegments) {
 	for (const layoutInput of layoutInputs) {
 		const parentForLayout = accumulatedMetadata;
 		const layoutParams = resolveAppPageSegmentParams(routeSegments, layoutInput.treePosition, params);
-		const metadataPromise = resolveModuleMetadata(layoutInput.module, layoutParams, void 0, parentForLayout);
+		const metadataPromise = resolveModuleMetadata(createAppMetadataModuleRoute(routeSegments.slice(0, layoutInput.treePosition), "layout"), layoutInput.module, layoutParams, void 0, parentForLayout);
 		layoutMetadataPromises.push(metadataPromise);
 		metadataPromise.catch(() => null);
 		accumulatedMetadata = metadataPromise.then(async (metadataResult) => {
@@ -194,6 +191,8 @@ function parallelRouteHasDynamicMetadata(parallelRoute) {
 async function resolveParallelRouteMetadata(parallelRoute, fallbackParams, fallbackRouteSegments, pageSearchParams, parent, searchParamsObserver) {
 	const params = parallelRoute.params ?? fallbackParams;
 	const routeSegments = parallelRoute.routeSegments ?? fallbackRouteSegments;
+	const moduleRoutePrefixSegments = parallelRoute.moduleRoutePrefixSegments ?? [];
+	const moduleRouteSegments = parallelRoute.moduleRouteSegments ?? routeSegments;
 	const metadataResults = [];
 	const metadataSources = [];
 	let accumulatedMetadata = parent;
@@ -201,7 +200,8 @@ async function resolveParallelRouteMetadata(parallelRoute, fallbackParams, fallb
 	const layoutTreePositions = parallelRoute.layoutTreePositions ?? [];
 	const layoutParams = parallelRoute.layoutParams ?? [];
 	for (const [index, layoutModule] of layoutModules.entries()) {
-		const layoutMetadata = await resolveModuleMetadata(layoutModule, layoutParams[index] ?? resolveParallelLayoutParams(routeSegments, layoutTreePositions[index] ?? 0, params), void 0, accumulatedMetadata);
+		const currentLayoutParams = layoutParams[index] ?? resolveParallelLayoutParams(routeSegments, layoutTreePositions[index] ?? 0, params);
+		const layoutMetadata = await resolveModuleMetadata(createAppMetadataModuleRoute([...moduleRoutePrefixSegments, ...moduleRouteSegments.slice(0, layoutTreePositions[index] ?? 0)], "layout"), layoutModule, currentLayoutParams, void 0, accumulatedMetadata);
 		metadataResults.push(layoutMetadata);
 		metadataSources.push({
 			metadata: layoutMetadata,
@@ -213,7 +213,7 @@ async function resolveParallelRouteMetadata(parallelRoute, fallbackParams, fallb
 		}
 	}
 	if (parallelRoute.pageModule) {
-		const pageMetadata = await resolveModuleMetadata(parallelRoute.pageModule, params, pageSearchParams, accumulatedMetadata, searchParamsObserver);
+		const pageMetadata = await resolveModuleMetadata(createAppMetadataModuleRoute([...moduleRoutePrefixSegments, ...moduleRouteSegments], "page"), parallelRoute.pageModule, params, pageSearchParams, accumulatedMetadata, searchParamsObserver);
 		metadataResults.push(pageMetadata);
 		metadataSources.push({
 			metadata: pageMetadata,
@@ -267,7 +267,7 @@ function resolveOrderedAppPageMetadata(options) {
 		let accumulatedEntriesPromise = Promise.resolve([]);
 		for (const source of options.sources) {
 			const parentPromise = accumulatedEntriesPromise.then((entries) => entries.length > 0 ? mergeMetadataEntries(entries) : {});
-			const metadataPromise = resolveModuleMetadata(source.module, source.params, source.searchParams, parentPromise, source.searchParamsObserver);
+			const metadataPromise = resolveModuleMetadata(source.moduleRoute, source.module, source.params, source.searchParams, parentPromise, source.searchParamsObserver);
 			metadataPromises.push(metadataPromise);
 			metadataPromise.catch(() => null);
 			accumulatedEntriesPromise = Promise.all([accumulatedEntriesPromise, metadataPromise]).then(([entries, metadata]) => metadata ? [...entries, { metadata }] : entries);
@@ -317,7 +317,7 @@ function prepareAppPageHeadInner(options) {
 	layoutMetadataResultsForParent.catch(() => null);
 	const pageParentPromise = layoutMetadataResultsForParent.then((metadataResults) => metadataResults.length > 0 ? mergeMetadataEntries(metadataResults.map((metadata) => ({ metadata }))) : {});
 	pageParentPromise.catch(() => null);
-	const pageMetadataPromise = options.pageModule ? resolveModuleMetadata(options.pageModule, options.params, pageSearchParams, pageParentPromise, options.searchParamsObserver) : Promise.resolve(null);
+	const pageMetadataPromise = options.pageModule ? resolveModuleMetadata(createAppMetadataModuleRoute(routeSegments, "page"), options.pageModule, options.params, pageSearchParams, pageParentPromise, options.searchParamsObserver) : Promise.resolve(null);
 	const parallelRoutes = options.parallelRoutes ?? [];
 	const parallelRouteMetadataPromise = Promise.all(parallelRoutes.map((parallelRoute) => resolveParallelRouteMetadata(parallelRoute, options.params, routeSegments, pageSearchParams, pageParentPromise, options.searchParamsObserver)));
 	const parallelRouteViewportPromises = [];

package/dist/server/app-page-http-access-fallback-metadata.d.ts

@@ -6,8 +6,10 @@ import { ActiveParallelRouteHeadInput, AppPageHeadModule, ApplyAppPageFileBasedM
 type HttpAccessFallbackMetadataPlanOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   boundaryModule?: TModule | null;
   boundaryParams: AppPageParams;
+  boundaryRouteSegments?: readonly string[] | null;
   /** Whether active branches may replace the fallback with their local not-found convention. */
   branchNotFoundConventions?: boolean;
+  errorConvention: "forbidden" | "not-found" | "unauthorized";
   layoutModules: readonly (TModule | null | undefined)[];
   layoutTreePositions?: readonly number[] | null;
   parallelBranches?: readonly ActiveParallelRouteHeadInput<TModule>[] | null;
@@ -22,8 +24,7 @@ type ResolveHttpAccessFallbackMetadataOptions<TModule extends AppPageHeadModule
   metadataRoutes: readonly MetadataFileRoute[];
   routePath: string;
 };
-declare function createHttpAccessFallbackMetadataPlan<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): OrderedAppPageMetadataSource<TModule>[];
-declare function resolveHttpAccessFallbackMetadata<TModule extends AppPageHeadModule>(options: ResolveHttpAccessFallbackMetadataOptions<TModule>): Promise<Metadata | null>;
-declare function resolveHttpAccessFallbackViewport<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): Promise<ResolvedViewport>;
-//#endregion
-export { createHttpAccessFallbackMetadataPlan, resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport };
+export declare function createHttpAccessFallbackMetadataPlan<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): OrderedAppPageMetadataSource<TModule>[];
+export declare function resolveHttpAccessFallbackMetadata<TModule extends AppPageHeadModule>(options: ResolveHttpAccessFallbackMetadataOptions<TModule>): Promise<Metadata | null>;
+export declare function resolveHttpAccessFallbackViewport<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): Promise<ResolvedViewport>;
+//#endregion

package/dist/server/app-page-http-access-fallback-metadata.js

@@ -1,5 +1,6 @@
 import { mergeViewport, resolveModuleViewport } from "../shims/metadata.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
+import { createAppMetadataModuleRoute } from "./app-metadata-tracing.js";
 import { resolveOrderedAppPageMetadata } from "./app-page-head.js";
 //#region src/server/app-page-http-access-fallback-metadata.ts
 function isPresent(value) {
@@ -24,6 +25,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 			source: {
 				includeWhenEmpty: true,
 				module: layoutModule,
+				moduleRoute: createAppMetadataModuleRoute(routeSegments.slice(0, treePosition), options.errorConvention),
 				params: resolveAppPageSegmentParams(routeSegments, treePosition, options.params),
 				routeSegments: routeSegments.slice(0, treePosition)
 			}
@@ -31,7 +33,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 	}
 	let activeBoundaryModule = options.boundaryModule;
 	let activeBoundaryParams = options.boundaryParams;
-	let activeBoundaryRouteSegments = routeSegments;
+	let activeBoundaryRouteSegments = options.boundaryRouteSegments ?? [];
 	const appendFallbackLeaf = () => {
 		if (fallbackLeafMode === "final") {
 			plan.push({ kind: "fallback-leaf" });
@@ -43,6 +45,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 			source: {
 				includeWhenEmpty: true,
 				module: activeBoundaryModule,
+				moduleRoute: createAppMetadataModuleRoute(activeBoundaryRouteSegments, options.errorConvention),
 				params: activeBoundaryParams,
 				routeSegments: activeBoundaryRouteSegments
 			}
@@ -54,6 +57,8 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 		const parallelRoute = branch.head;
 		const parallelParams = parallelRoute.params ?? options.params;
 		const parallelRouteSegments = parallelRoute.routeSegments ?? routeSegments;
+		const parallelModuleRoutePrefix = parallelRoute.moduleRoutePrefixSegments ?? [];
+		const parallelModuleRouteSegments = parallelRoute.moduleRouteSegments ?? parallelRouteSegments;
 		const layoutModules = [...parallelRoute.layoutModules ?? [], parallelRoute.layoutModule].filter(isPresent);
 		const layoutTreePositions = parallelRoute.layoutTreePositions ?? [];
 		const layoutParams = parallelRoute.layoutParams ?? [];
@@ -62,6 +67,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 			source: {
 				includeWhenEmpty: true,
 				module: layoutModule,
+				moduleRoute: createAppMetadataModuleRoute([...parallelModuleRoutePrefix, ...parallelModuleRouteSegments.slice(0, layoutTreePositions[index] ?? 0)], options.errorConvention),
 				params: layoutParams[index] ?? resolveAppPageBranchParams(parallelRouteSegments, layoutTreePositions[index] ?? 0, parallelParams),
 				routeSegments: parallelRouteSegments
 			}
@@ -69,7 +75,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 		if (options.branchNotFoundConventions !== false && branch.notFoundModule) {
 			activeBoundaryModule = branch.notFoundModule;
 			activeBoundaryParams = branch.notFoundParams ?? parallelParams;
-			activeBoundaryRouteSegments = parallelRouteSegments;
+			activeBoundaryRouteSegments = branch.notFoundModuleRouteSegments ?? [...parallelModuleRoutePrefix, ...parallelModuleRouteSegments];
 		}
 		appendFallbackLeaf();
 	}
@@ -79,6 +85,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 		return [{
 			includeWhenEmpty: true,
 			module: activeBoundaryModule,
+			moduleRoute: createAppMetadataModuleRoute(activeBoundaryRouteSegments, options.errorConvention),
 			params: activeBoundaryParams,
 			routeSegments: activeBoundaryRouteSegments
 		}];

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

@@ -1,15 +1,9 @@
 //#region src/server/app-page-method.d.ts
-type AppPageMethodPolicyOptions = {
-  dynamicConfig?: string;
-  hasGenerateStaticParams: boolean;
-  isDynamicRoute: boolean;
-  revalidateSeconds: number | null;
-};
 type ResolveAppPageMethodResponseOptions = {
+  /** `isAppPageStaticEligible` for the route. */
+  isStaticEligible: boolean;
   middlewareHeaders?: Headers | null;
   request: Pick<Request, "headers" | "method">;
-} & AppPageMethodPolicyOptions;
-declare function isStaticOrSsgAppPageCandidate(options: AppPageMethodPolicyOptions): boolean;
-declare function resolveAppPageMethodResponse(options: ResolveAppPageMethodResponseOptions): Response | null;
-//#endregion
-export { isStaticOrSsgAppPageCandidate, resolveAppPageMethodResponse };
+};
+export declare function resolveAppPageMethodResponse(options: ResolveAppPageMethodResponseOptions): Response | null;
+//#endregion

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

@@ -6,20 +6,13 @@ function isNonGetOrHead(method) {
 	const normalizedMethod = method.toUpperCase();
 	return normalizedMethod !== "GET" && normalizedMethod !== "HEAD";
 }
-function isStaticOrSsgAppPageCandidate(options) {
-	if (options.dynamicConfig === "force-dynamic" || options.revalidateSeconds === 0) return false;
-	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") return true;
-	if (options.revalidateSeconds !== null && options.revalidateSeconds > 0) return true;
-	if (options.hasGenerateStaticParams) return true;
-	return !options.isDynamicRoute;
-}
 function resolveAppPageMethodResponse(options) {
 	if (!isNonGetOrHead(options.request.method)) return null;
 	if (isPossibleAppRouteActionRequest(options.request)) return null;
-	if (!isStaticOrSsgAppPageCandidate(options)) return null;
+	if (!options.isStaticEligible) return null;
 	const headers = new Headers();
 	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 	return methodNotAllowedResponse("GET, HEAD", { headers });
 }
 //#endregion
-export { isStaticOrSsgAppPageCandidate, resolveAppPageMethodResponse };
+export { resolveAppPageMethodResponse };

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

@@ -1,8 +1,7 @@
 import { AppPageParams } from "./app-page-boundary.js";
 //#region src/server/app-page-params.d.ts
-declare function getAppPageSegmentParamName(segment: string): string | null;
-declare function resolveAppPageSegmentParamScopeKeys(routeSegments: readonly string[] | null | undefined, treePosition: number): readonly string[];
-declare function resolveAppPageSegmentParams(routeSegments: readonly string[] | null | undefined, treePosition: number, matchedParams: AppPageParams): AppPageParams;
-declare function resolveAppPageBranchParams(branchSegments: readonly string[], treePosition: number, matchedParams: AppPageParams, scopedSegments?: readonly string[]): AppPageParams;
-//#endregion
-export { getAppPageSegmentParamName, resolveAppPageBranchParams, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams };
+export declare function getAppPageSegmentParamName(segment: string): string | null;
+export declare function resolveAppPageSegmentParamScopeKeys(routeSegments: readonly string[] | null | undefined, treePosition: number): readonly string[];
+export declare function resolveAppPageSegmentParams(routeSegments: readonly string[] | null | undefined, treePosition: number, matchedParams: AppPageParams): AppPageParams;
+export declare function resolveAppPageBranchParams(branchSegments: readonly string[], treePosition: number, matchedParams: AppPageParams, scopedSegments?: readonly string[]): AppPageParams;
+//#endregion

package/dist/server/app-page-ppr-runtime.d.ts

@@ -1,6 +1,6 @@
 import { createAppPprFallbackShells } from "./app-ppr-fallback-shell.js";
 import { AppPageDispatchRoute, AppPagePprRuntime } from "./app-page-dispatch.js";
 //#region src/server/app-page-ppr-runtime.d.ts
-declare const appPagePprRuntime: AppPagePprRuntime<AppPageDispatchRoute>;
+export declare const appPagePprRuntime: AppPagePprRuntime<AppPageDispatchRoute>;
 //#endregion
-export { appPagePprRuntime, createAppPprFallbackShells };
+export { createAppPprFallbackShells };

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

@@ -11,7 +11,7 @@ type ProbeReactServerSubtreeOptions = Readonly<{
  * immediate function body. The real RSC render remains authoritative; probe
  * failures only make static-layout skip fall back to render-and-send.
  */
-declare function probeReactServerSubtree(node: unknown, options?: ProbeReactServerSubtreeOptions): Promise<void>;
+export declare function probeReactServerSubtree(node: unknown, options?: ProbeReactServerSubtreeOptions): Promise<void>;
 /**
  * Build a probePage() invocation for the App Router request lifecycle.
  *
@@ -29,7 +29,7 @@ declare function probeReactServerSubtree(node: unknown, options?: ProbeReactServ
  * Returns `null` when the route has no page component (eg. interception-only
  * routes), matching the caller contract on `probePage`.
  */
-declare function probeAppPage(options: {
+export declare function probeAppPage(options: {
   pageComponent: unknown;
   asyncRouteParams: unknown;
   searchParams: URLSearchParams | null | undefined;
@@ -102,7 +102,7 @@ type AppPageProbeIntercept = Readonly<{
  * real render still observes that access and skips the query-invariant cache
  * write (the same loading.tsx backstop), so this cannot under-bail.
  */
-declare function buildAppPageProbes(options: {
+export declare function buildAppPageProbes(options: {
   route: AppPageProbeRoute;
   pageComponent: unknown;
   asyncRouteParams: unknown;
@@ -135,6 +135,5 @@ type ProbeAppPageBeforeRenderOptions = {
   /** When provided, enables per-layout static/dynamic classification. */
   classification?: LayoutClassificationOptions | null;
 };
-declare function probeAppPageBeforeRender(options: ProbeAppPageBeforeRenderOptions): Promise<ProbeAppPageBeforeRenderResult>;
-//#endregion
-export { buildAppPageProbes, probeAppPage, probeAppPageBeforeRender, probeReactServerSubtree };
+export declare function probeAppPageBeforeRender(options: ProbeAppPageBeforeRenderOptions): Promise<ProbeAppPageBeforeRenderResult>;
+//#endregion

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

@@ -1,7 +1,7 @@
 import { isPromiseLike } from "../utils/promise.js";
 import { isNextRouterError } from "../shims/navigation-errors.js";
 import "../shims/navigation-server.js";
-import { markAppPagePropsForUseCache } from "../shims/internal/app-page-props-cache-key.js";
+import { markAppPagePropsForUseCache, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { probeAppPageComponent, probeAppPageLayouts } from "./app-page-execution.js";
 import { collectAppPageSearchParams } from "./app-page-head.js";
 import { makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
@@ -152,10 +152,11 @@ function probeAppPage(options) {
 	const { pageComponent, asyncRouteParams, searchParams } = options;
 	if (typeof pageComponent !== "function") return null;
 	const { pageSearchParams } = collectAppPageSearchParams(searchParams);
-	const result = pageComponent(markAppPagePropsForUseCache({
+	const asyncSearchParams = makeObservedAppPageSearchParamsThenable(pageSearchParams, { observeReactPromiseStatus: true });
+	const result = pageComponent(markAppPagePropsForUseCache(withUseCachePageMarker(pageComponent, {
 		params: asyncRouteParams,
-		searchParams: makeObservedAppPageSearchParamsThenable(pageSearchParams, { observeReactPromiseStatus: true })
-	}));
+		searchParams: asyncSearchParams
+	})));
 	if (isPromiseLike(result)) return result.then(async (resolved) => {
 		await probeReactServerSubtreeForDynamicUsage(resolved);
 		return resolved;

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

@@ -9,7 +9,7 @@ type AppPageRenderIdentityInput = {
   interceptSourceMatchedUrl?: string | null;
   interceptSlotId?: string | null;
 };
-type AppPageRenderIdentity = {
+export type AppPageRenderIdentity = {
   displayPathname: string;
   interception: AppElementsInterception | null;
   interceptionContext: string | null;
@@ -18,7 +18,6 @@ type AppPageRenderIdentity = {
   routeId: string;
   targetMatchedPathname: string;
 };
-declare function normalizeAppPageInterceptionProofPathname(pathname: string | null): string | null;
-declare function createAppPageRenderIdentity(input: AppPageRenderIdentityInput): AppPageRenderIdentity;
-//#endregion
-export { AppPageRenderIdentity, createAppPageRenderIdentity, normalizeAppPageInterceptionProofPathname };
+export declare function normalizeAppPageInterceptionProofPathname(pathname: string | null): string | null;
+export declare function createAppPageRenderIdentity(input: AppPageRenderIdentityInput): AppPageRenderIdentity;
+//#endregion

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

@@ -1,14 +1,14 @@
 import { BoundaryOutcome, CacheProofOutputScope, RenderCacheability, RenderObservation, RenderObservationCompleteness, RenderRequestApiKind } from "./cache-proof.js";
 import { ReactNode } from "react";
 //#region src/server/app-page-render-observation.d.ts
-type AppPageRenderObservationState = Readonly<{
+export type AppPageRenderObservationState = Readonly<{
   dynamicFetches: readonly string[];
   requestApis: readonly RenderRequestApiKind[];
 }>;
-declare function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState;
-declare function consumeAppPageRenderObservationState(): AppPageRenderObservationState;
-declare function discardAppPageRenderState(): void;
-declare function createAppPageRenderObservation(options: {
+export declare function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState;
+export declare function consumeAppPageRenderObservationState(): AppPageRenderObservationState;
+export declare function discardAppPageRenderState(): void;
+export declare function createAppPageRenderObservation(options: {
   boundaryOutcome: BoundaryOutcome;
   cacheTags: readonly string[];
   cacheability: RenderCacheability;
@@ -18,18 +18,17 @@ declare function createAppPageRenderObservation(options: {
   params: Record<string, unknown>;
   state: AppPageRenderObservationState;
 }): RenderObservation;
-declare function createAppPageRscOutputScope(options: {
+export declare function createAppPageRscOutputScope(options: {
   element: ReactNode | Readonly<Record<string, ReactNode>>;
   mountedSlotsHeader?: string | null;
   renderEpoch: string | null;
   rootBoundaryId: string | null;
   routePattern: string;
 }): CacheProofOutputScope;
-declare function createAppPageHtmlOutputScope(options: {
+export declare function createAppPageHtmlOutputScope(options: {
   element: ReactNode | Readonly<Record<string, ReactNode>>;
   renderEpoch: string | null;
   rootBoundaryId: string | null;
   routePattern: string;
 }): CacheProofOutputScope;
-//#endregion
-export { AppPageRenderObservationState, consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState, discardAppPageRenderState };
+//#endregion

package/dist/server/app-page-render-observation.js

@@ -1,6 +1,6 @@
 import { fnv1a64 } from "../utils/hash.js";
-import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
+import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";

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

@@ -9,6 +9,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { AppPageCacheSetter } from "./isr-cache.js";
 import { ReactNode } from "react";
@@ -21,8 +22,17 @@ type AppPageRequestCacheLife = {
   expire?: number;
   stale?: number;
 };
-type RenderAppPageLifecycleOptions = {
+type AppPageRenderableElement = ReactNode | Readonly<Record<string, ReactNode>>;
+type PreparedAppPageElement = {
+  element: AppPageRenderableElement;
+  response?: never;
+} | {
+  element?: never;
+  response: Response;
+};
+type RenderAppPageLifecycleOptionsBase = {
   basePath?: string;
+  bypassInterceptionContextCache?: boolean;
   /**
    * Allow-list of OpenTelemetry propagation keys to emit as `<meta>` tags in
    * the SSR head. From `experimental.clientTraceMetadata` in `next.config`.
@@ -42,7 +52,7 @@ type RenderAppPageLifecycleOptions = {
   consumeRenderObservationState?: () => AppPageRenderObservationState;
   /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */
   consumeInvalidDynamicUsageError?: () => unknown;
-  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
+  createRscOnErrorHandler: (pathname: string, routePath: string, overrides?: AppRenderErrorContextOverrides) => AppPageBoundaryOnError;
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
   getFontStyles: () => string[];
@@ -60,6 +70,17 @@ type RenderAppPageLifecycleOptions = {
   isEdgeRuntime?: boolean;
   isForceDynamic: boolean;
   isForceStatic: boolean;
+  /**
+   * Whether Next.js would classify the route as static or SSG from its config
+   * (`isAppPageStaticEligible`). Other routes are never full-page cached.
+   */
+  isStaticEligible: boolean;
+  /**
+   * Production render that may be stored under a query-free key: SSR
+   * `useSearchParams()` waits until the render is known to be dynamic, and
+   * bails out to client rendering otherwise.
+   */
+  isCacheCandidate?: boolean;
   isProgressiveActionRender?: boolean;
   isPrerender?: boolean;
   isSpeculativePrerender?: boolean;
@@ -67,6 +88,8 @@ type RenderAppPageLifecycleOptions = {
   probePageBeforeRender?: boolean;
   omitPendingDynamicCacheState?: boolean;
   isRscRequest: boolean;
+  traceOperation?: "prerender" | "render";
+  onRenderComplete?: (completion: Promise<void>) => void;
   isrDebug?: AppPageDebugLogger;
   isrHtmlKey: (pathname: string) => string;
   isrRscKey: (pathname: string, mountedSlotsHeader?: string | null, renderMode?: AppRscRenderMode, interceptionContext?: string | null, interceptionId?: string | null) => string;
@@ -111,9 +134,22 @@ type RenderAppPageLifecycleOptions = {
   renderMode?: AppRscRenderMode;
   waitUntil?: (promise: Promise<void>) => void;
   layoutParamAccess?: AppLayoutParamAccessTracker;
-  element: ReactNode | Readonly<Record<string, ReactNode>>;
   classification?: LayoutClassificationOptions | null;
 };
-declare function renderAppPageLifecycle(options: RenderAppPageLifecycleOptions): Promise<Response>;
-//#endregion
-export { renderAppPageLifecycle };
+type RenderAppPageLifecycleOptions = RenderAppPageLifecycleOptionsBase & ({
+  element: AppPageRenderableElement;
+  prepareElement?: never;
+} | {
+  element?: never;
+  prepareElement: () => Promise<PreparedAppPageElement>;
+});
+/**
+ * A render that is known dynamic is never cacheable: a route Next.js can't make
+ * static, draft mode, `force-dynamic`, `revalidate = 0`, or a dynamic API read
+ * before the response left the render. Responses that leave the render before
+ * its response policy, such as error boundaries and special errors, get the
+ * same header as the normal render.
+ */
+export declare function applyIneligibleRouteCachePolicy(response: Response, options: Pick<RenderAppPageLifecycleOptions, "isDraftMode" | "isDynamicError" | "isForceDynamic" | "isForceStatic" | "isProduction" | "isProgressiveActionRender" | "isRscRequest" | "isStaticEligible" | "middlewareContext" | "peekDynamicUsage" | "revalidateSeconds" | "scriptNonce">): Response;
+export declare function renderAppPageLifecycle(options: RenderAppPageLifecycleOptions): Promise<Response>;
+//#endregion