vinext 1.0.0-beta.8 → 1.0.0

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

@@ -1,7 +1,8 @@
-import { NEXT_CACHE_TAGS_HEADER, NEXT_ROUTER_STALE_TIME_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_STALE_TIME_PENDING_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
-import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
+import { VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
+import { NEXT_CACHE_TAGS_HEADER, NEXT_ROUTER_STALE_TIME_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_STALE_TIME_PENDING_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
+import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyPrerenderCacheLifeHeader } from "./prerender-cache-life-header.js";
 import { markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
@@ -28,14 +29,27 @@ function applyClientStaleTimeHeader(headers, staleTimeSeconds) {
 function applyPrerenderCacheTagsHeader(headers, cacheTags) {
 	if (cacheTags && cacheTags.length > 0) headers.set(NEXT_CACHE_TAGS_HEADER, cacheTags.join(","));
 }
+/**
+* Next.js sends `private, no-cache, no-store, max-age=0, must-revalidate` for
+* an App page response it knows is dynamic. Dev responses never cache, so they
+* keep vinext's dev `no-store` header.
+*/
+function resolveUncacheableCacheControl(isProduction) {
+	return isProduction ? NEVER_CACHE_CONTROL : NO_STORE_CACHE_CONTROL;
+}
 function resolveAppPageRscResponsePolicy(options) {
-	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
-	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
-	if (options.revalidateSeconds === 0) return { cacheControl: NO_STORE_CACHE_CONTROL };
-	if ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds || options.revalidateSeconds === Infinity) return {
+	if (options.isDraftMode) return { cacheControl: resolveUncacheableCacheControl(options.isProduction) };
+	if (options.isStaticEligible === false) return { cacheControl: resolveUncacheableCacheControl(options.isProduction) };
+	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: resolveUncacheableCacheControl(options.isProduction) };
+	if (options.revalidateSeconds === 0) return { cacheControl: resolveUncacheableCacheControl(options.isProduction) };
+	if ((options.isForceStatic || options.isDynamicError) && (options.revalidateSeconds === null || options.revalidateSeconds === Infinity)) return {
 		cacheControl: STATIC_CACHE_CONTROL,
 		cacheState: "STATIC"
 	};
+	if (options.revalidateSeconds === Infinity) return {
+		cacheControl: STATIC_CACHE_CONTROL,
+		cacheState: options.isProduction ? "MISS" : "STATIC"
+	};
 	if (options.revalidateSeconds) return {
 		cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),
 		cacheState: options.isProduction ? "MISS" : void 0
@@ -44,11 +58,15 @@ function resolveAppPageRscResponsePolicy(options) {
 }
 function resolveAppPageHtmlResponsePolicy(options) {
 	if (options.isDraftMode) return {
-		cacheControl: NO_STORE_CACHE_CONTROL,
+		cacheControl: resolveUncacheableCacheControl(options.isProduction),
+		shouldWriteToCache: false
+	};
+	if (options.isStaticEligible === false) return {
+		cacheControl: resolveUncacheableCacheControl(options.isProduction),
 		shouldWriteToCache: false
 	};
 	if (options.isForceDynamic) return {
-		cacheControl: NO_STORE_CACHE_CONTROL,
+		cacheControl: resolveUncacheableCacheControl(options.isProduction),
 		shouldWriteToCache: false
 	};
 	if (options.hasScriptNonce) return {
@@ -60,16 +78,16 @@ function resolveAppPageHtmlResponsePolicy(options) {
 		shouldWriteToCache: false
 	};
 	if (options.revalidateSeconds === 0) return {
-		cacheControl: NO_STORE_CACHE_CONTROL,
+		cacheControl: resolveUncacheableCacheControl(options.isProduction),
 		shouldWriteToCache: false
 	};
-	if ((options.isForceStatic || options.isDynamicError) && options.revalidateSeconds === null) return {
+	if ((options.isForceStatic || options.isDynamicError) && (options.revalidateSeconds === null || options.revalidateSeconds === Infinity)) return {
 		cacheControl: STATIC_CACHE_CONTROL,
 		cacheState: options.isProduction ? "MISS" : "STATIC",
 		shouldWriteToCache: options.isProduction
 	};
 	if (options.dynamicUsedDuringRender) return {
-		cacheControl: NO_STORE_CACHE_CONTROL,
+		cacheControl: resolveUncacheableCacheControl(options.isProduction),
 		shouldWriteToCache: false
 	};
 	if (options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity) return {
@@ -140,4 +158,4 @@ function buildAppPageHtmlResponse(body, options) {
 	return response;
 }
 //#endregion
-export { applyClientStaleTimeHeader, applyEdgeRuntimeHeader, buildAppPageHtmlResponse, buildAppPageRscResponse, mergeMiddlewareResponseHeaders, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy };
+export { applyClientStaleTimeHeader, applyEdgeRuntimeHeader, buildAppPageHtmlResponse, buildAppPageRscResponse, mergeMiddlewareResponseHeaders, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy, resolveUncacheableCacheControl };

package/dist/server/app-page-route-wiring.d.ts

@@ -22,13 +22,13 @@ type AppPageErrorComponent = ComponentType<{
   error: unknown;
   reset: () => void;
 }>;
-type AppPageModule = Record<string, unknown> & {
+export type AppPageModule = Record<string, unknown> & {
   default?: AppPageComponent | null | undefined;
 };
-type AppPageErrorModule = Record<string, unknown> & {
+export type AppPageErrorModule = Record<string, unknown> & {
   default?: AppPageErrorComponent | null | undefined;
 };
-type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
+export type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   /** Graph-owned semantic slot identity. */
   id?: string | null;
   /** Slot prop name passed to the owning layout (e.g. "modal" from @modal). */
@@ -57,7 +57,7 @@ type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErro
   /** Param names captured by `slotPatternParts`, in order. */
   slotParamNames?: readonly string[] | null;
 };
-type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
+export type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   ids?: AppRouteSemanticIds | null;
   error?: TErrorModule | null;
   errorPaths?: readonly TErrorModule[] | null;
@@ -105,7 +105,7 @@ type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErr
   templateTreePositions?: readonly number[] | null;
   templates?: readonly (TModule | null | undefined)[] | null;
 };
-type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {
+export type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {
   branchSegments?: readonly string[] | null;
   /** Route-matcher-resolved semantic branch, aligned with the flattened branch. */
   identitySegments?: readonly AppPageSemanticSegment[] | null;
@@ -123,7 +123,7 @@ type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {
   props?: Readonly<Record<string, unknown>>;
   routeSegments?: readonly string[] | null;
 };
-type AppPageLayoutEntry<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
+export type AppPageLayoutEntry<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   errorModule?: TErrorModule | null | undefined;
   forbiddenModule?: TModule | null | undefined;
   id: string;
@@ -177,27 +177,27 @@ type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule,
   semanticInterceptionTargetRouteId?: string | null;
   sourcePageSegments?: readonly string[] | null;
 };
-type AppPageTemplateEntry<TModule extends AppPageModule = AppPageModule> = {
+export type AppPageTemplateEntry<TModule extends AppPageModule = AppPageModule> = {
   id: string;
   templateModule?: TModule | null | undefined;
   treePath: string;
   treePosition: number;
 };
-declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
-declare function probeAppPageLayoutWithTracking<TModule extends AppPageModule>(options: {
+export declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
+export declare function probeAppPageLayoutWithTracking<TModule extends AppPageModule>(options: {
   layoutIndex: number;
   layoutParamAccess: AppLayoutParamAccessTracker | undefined;
   makeThenableParams: MakeThenableParams;
   matchedParams: AppPageParams;
   route: Pick<AppPageRouteWiringRoute<TModule>, "layoutTreePositions" | "layouts" | "routeSegments">;
 }): unknown;
-declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "errorTreePositions" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
+export declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "errorTreePositions" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
   forbiddens?: readonly (TModule | null | undefined)[] | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
-declare function createAppPageSourcePage(routeSegments: readonly string[] | null | undefined): string;
-declare function resolveAppPageLoadingModuleAtOrAbove<TModule extends AppPageModule>(route: Pick<AppPageRouteWiringRoute<TModule>, "loading" | "loadings" | "loadingTreePositions">, treePosition: number): TModule | null;
-declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean, scriptNonce?: string): ReactNode;
-declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
+export declare function createAppPageSourcePage(routeSegments: readonly string[] | null | undefined): string;
+export declare function resolveAppPageLoadingModuleAtOrAbove<TModule extends AppPageModule>(route: Pick<AppPageRouteWiringRoute<TModule>, "loading" | "loadings" | "loadingTreePositions">, treePosition: number): TModule | null;
+export declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean, scriptNonce?: string): ReactNode;
+export declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
-export { AppPageErrorModule, AppPageLayoutEntry, AppPageModule, AppPageRouteWiringRoute, AppPageRouteWiringSlot, AppPageSlotOverride, AppPageTemplateEntry, buildAppPageElements, createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments, resolveAppPageLoadingModuleAtOrAbove };
+export { resolveAppPageChildSegments };

package/dist/server/app-page-route-wiring.js

@@ -1,6 +1,7 @@
+import { fnv1a64 } from "../utils/hash.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
 import { createAppRenderDependency, registerAppElementRenderDependencies, renderAfterAppDependencies, renderAppComponentWithDependencyBarrier } from "./app-render-dependency.js";
 import { APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY } from "./app-elements.js";
 import { createInlineScriptTag, escapeHtmlAttr } from "./html.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
@@ -15,9 +16,11 @@ import { resolveAppPageBranchParams, resolveAppPageSegmentParamScopeKeys, resolv
 import { probeReactServerSubtree } from "./app-page-probe.js";
 import { APP_PAGE_SEGMENT_KEY, resolveAppPageChildSegments, resolveAppPageSegmentStateKey, resolveAppPageTemplateStateKey } from "./app-page-segment-state.js";
 import { createAppPageSegmentPlan } from "./app-page-segment-plan.js";
+import { resolveAppPageModuleTraceSegment, traceGetLayoutOrPageModule } from "./app-page-tracing.js";
 import { Fragment, Suspense } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-page-route-wiring.tsx
+const APP_PAGE_SLOT_SEGMENT_KEY = "(__SLOT__)";
 const APP_PAGE_LAYOUT_PROBE_CHILD = /* @__PURE__ */ jsx(Fragment, {});
 const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
 const DEFAULT_NOT_FOUND_COMPONENT = DefaultNotFound;
@@ -188,9 +191,10 @@ function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, get
 		const slotId = resolveAppPageSlotId(slot, layoutEntries[targetIndex]?.treePath ?? "/");
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
 		const routeSegments = resolveSlotOverride(slotKey, slotName)?.routeSegments ?? slot.routeSegments;
+		const slotSegments = routeSegments ? resolveAppPageLayoutSegmentProviderSegments(routeSegments, 0, slotParams) : [];
 		parallelSlots[slotName] = /* @__PURE__ */ jsx(LayoutSegmentProvider, {
 			providerId: slotId,
-			segmentMap: { children: routeSegments ? resolveAppPageLayoutSegmentProviderSegments(routeSegments, 0, slotParams) : [] },
+			segmentMap: { children: slotSegments },
 			children: /* @__PURE__ */ jsx(Slot, { id: slotId })
 		});
 	}
@@ -257,12 +261,7 @@ function hasStreamedIcons(metadata) {
 	return Boolean(icons.shortcut || icons.icon || icons.apple || icons.other);
 }
 function createStreamedIconKey(pathname, metadataHtml) {
-	let hash = 2166136261;
-	for (let index = 0; index < metadataHtml.length; index++) {
-		hash ^= metadataHtml.charCodeAt(index);
-		hash = Math.imul(hash, 16777619);
-	}
-	return `${pathname}:${(hash >>> 0).toString(36)}`;
+	return `vi${fnv1a64(`${pathname}\0${metadataHtml}`)}`;
 }
 const STREAMED_ICON_KEY_PLACEHOLDER = "vinext-pending-streamed-icon-key";
 const REINSERT_STREAMED_ICONS_SCRIPT = `document.querySelectorAll('body link[rel="icon"], body link[rel="apple-touch-icon"]').forEach(el => document.head.appendChild(el));const a='data-vinext-streamed-icon',o=el=>{const m=el.getAttribute(a),i=m.lastIndexOf(':');return Number(m.slice(i+1))};[...document.querySelectorAll('link['+a+']')].sort((l,r)=>o(l)-o(r)).forEach(el=>document.head.appendChild(el))`;
@@ -274,10 +273,11 @@ function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement, t
 		streamedIconKey
 	});
 	const metadataKey = streamedIconKey ? createStreamedIconKey(pathname, renderedMetadataHtml) : "";
+	const parserInsertedMetadataHtml = (streamedIconKey ? renderedMetadataHtml.replaceAll(`<link data-vinext-streamed-icon="${STREAMED_ICON_KEY_PLACEHOLDER}:`, `<link data-vinext-streamed-icon="${escapeHtmlAttr(metadataKey)}:`) : renderedMetadataHtml) + createInlineScriptTag(REINSERT_STREAMED_ICONS_SCRIPT, scriptNonce);
 	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("div", {
 		hidden: true,
 		suppressHydrationWarning: true,
-		dangerouslySetInnerHTML: { __html: (streamedIconKey ? renderedMetadataHtml.replaceAll(`<link data-vinext-streamed-icon="${STREAMED_ICON_KEY_PLACEHOLDER}:`, `<link data-vinext-streamed-icon="${escapeHtmlAttr(metadataKey)}:`) : renderedMetadataHtml) + createInlineScriptTag(REINSERT_STREAMED_ICONS_SCRIPT, scriptNonce) }
+		dangerouslySetInnerHTML: { __html: parserInsertedMetadataHtml }
 	}), /* @__PURE__ */ jsx(StreamedIconsInsertion, { metadataKey })] });
 }
 async function AppPageStreamingMetadata(props) {
@@ -489,7 +489,8 @@ function buildAppPageElements(options) {
 	for (let index = 0; index < layoutEntries.length; index++) {
 		const layoutEntry = layoutEntries[index];
 		if (isPrefetchLoadingShell && !includesPrefetchTreePosition(layoutEntry.treePosition)) continue;
-		const layoutComponent = getDefaultExport(layoutEntry.layoutModule);
+		if (!layoutEntry.layoutModule) continue;
+		const layoutComponent = traceGetLayoutOrPageModule(resolveAppPageModuleTraceSegment(routeSegments, layoutEntry.treePosition), () => getDefaultExport(layoutEntry.layoutModule));
 		if (!layoutComponent) continue;
 		const layoutParams = resolveAppPageSegmentParams(options.route.routeSegments, layoutEntry.treePosition, options.matchedParams);
 		recordLayoutSkipObservationScope({
@@ -535,17 +536,20 @@ function buildAppPageElements(options) {
 		const slotLoadingEntries = createAppPageSlotLoadingEntries(slot, hasSlotTreeOverride ? slotOverride ?? null : null);
 		const prefetchSlotLoadingEntry = isOwnedAtRoutePrefetchCutoff ? prefetchLoadingEntry : isPrefetchLoadingShell ? getFirstLoadingEntry(slotLoadingEntries) : null;
 		if (isPrefetchLoadingShell && prefetchSlotLoadingEntry === null) continue;
-		const overrideOrPageComponent = getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);
-		const defaultComponent = getDefaultExport(slot.default);
-		if (!overrideOrPageComponent && defaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
-		const slotComponent = overrideOrPageComponent ?? defaultComponent;
+		const resolvedOverrideOrPageComponent = slotOverride?.pageModule || slot.page ? traceGetLayoutOrPageModule(APP_PAGE_SEGMENT_KEY, () => getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page)) : null;
+		const resolvedDefaultComponent = getDefaultExport(slot.default);
+		if (!resolvedOverrideOrPageComponent && resolvedDefaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
+		const slotComponent = resolvedOverrideOrPageComponent ?? resolvedDefaultComponent;
+		const overrideOrPageComponent = resolvedOverrideOrPageComponent;
 		if (!slotComponent && !isOwnedAtRoutePrefetchCutoff) {
 			elements[slotId] = AppElementsWire.unmatchedSlotValue;
 			continue;
 		}
 		let slotElement;
-		if (prefetchSlotLoadingEntry) slotElement = /* @__PURE__ */ jsx(getDefaultExport(prefetchSlotLoadingEntry.loadingModule), {});
-		else {
+		if (prefetchSlotLoadingEntry) {
+			const PrefetchSlotLoadingComponent = getDefaultExport(prefetchSlotLoadingEntry.loadingModule);
+			slotElement = /* @__PURE__ */ jsx(PrefetchSlotLoadingComponent, {});
+		} else {
 			const slotProps = { params: options.makeThenableParams(slotParams) };
 			if (options.searchParams !== void 0) slotProps.searchParams = options.searchParams;
 			if (slotOverride?.props) Object.assign(slotProps, slotOverride.props);
@@ -561,18 +565,20 @@ function buildAppPageElements(options) {
 			branchLayouts.set(treePosition, entries);
 		};
 		if (hasSlotTreeOverride) for (const [layoutIndex, layoutModule] of (slotOverride?.layoutModules ?? []).entries()) {
-			const component = getDefaultExport(layoutModule);
-			if (!component) continue;
+			if (!layoutModule) continue;
 			const treePosition = slotOverride?.layoutSegments?.[layoutIndex]?.length ?? branchSegments.length;
+			const component = traceGetLayoutOrPageModule(resolveAppPageModuleTraceSegment(branchSegments, treePosition), () => getDefaultExport(layoutModule));
+			if (!component) continue;
 			addBranchLayout(treePosition, {
 				component,
 				params: resolveSlotLayoutParams(branchSegments, treePosition, slotParams)
 			});
 		}
 		else for (const [layoutIndex, layoutModule] of (slot.configLayouts ?? []).entries()) {
-			const component = getDefaultExport(layoutModule);
-			if (!component) continue;
+			if (!layoutModule) continue;
 			const treePosition = slot.configLayoutTreePositions?.[layoutIndex] ?? 0;
+			const component = traceGetLayoutOrPageModule(resolveAppPageModuleTraceSegment(slotRouteSegments, treePosition), () => getDefaultExport(layoutModule));
+			if (!component) continue;
 			addBranchLayout(treePosition, {
 				component,
 				params: {
@@ -581,7 +587,7 @@ function buildAppPageElements(options) {
 				}
 			});
 		}
-		const slotLayoutComponent = overrideOrPageComponent ? getDefaultExport(slot.layout) : null;
+		const slotLayoutComponent = overrideOrPageComponent && slot.layout ? traceGetLayoutOrPageModule(APP_PAGE_SLOT_SEGMENT_KEY, () => getDefaultExport(slot.layout)) : null;
 		if (slotLayoutComponent) {
 			const rootEntries = branchLayouts.get(0) ?? [];
 			branchLayouts.set(0, [{
@@ -659,9 +665,10 @@ function buildAppPageElements(options) {
 		segmentMap: { children: [APP_PAGE_SEGMENT_KEY] },
 		children: /* @__PURE__ */ jsx(Slot, { id: pageElementId })
 	}), createAppPageStreamingMetadataOutlet(streamingMetadataOutletId, options.streamingMetadataOutletSuspended)] });
-	if (isPrefetchLoadingShell) if (prefetchLoadingComponent === null) routeChildren = null;
-	else routeChildren = /* @__PURE__ */ jsx(prefetchLoadingComponent, {});
-	else {
+	if (isPrefetchLoadingShell) {
+		if (prefetchLoadingComponent === null) routeChildren = null;
+		else routeChildren = /* @__PURE__ */ jsx(prefetchLoadingComponent, {});
+	} else {
 		routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, { children: routeChildren });
 		if (routeLoadingComponent) routeChildren = /* @__PURE__ */ jsx(Suspense, {
 			fallback: /* @__PURE__ */ jsx(routeLoadingComponent, {}),

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

@@ -2,10 +2,31 @@ import { ThenableParams, ThenableParamsObserver } from "../shims/thenable-params
 import { AppPageSearchParams } from "./app-page-head.js";
 //#region src/server/app-page-search-params-observation.d.ts
 type AppPageSearchParamsObservationOptions = {
-  markDynamic?: boolean;
   observeReactPromiseStatus?: boolean;
 };
-declare function createAppPageSearchParamsObserver(options?: AppPageSearchParamsObservationOptions): ThenableParamsObserver;
-declare function makeObservedAppPageSearchParamsThenable(pageSearchParams: AppPageSearchParams, options?: AppPageSearchParamsObservationOptions): ThenableParams<AppPageSearchParams>;
-//#endregion
-export { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable };
+type ClientPageSsrSearchParamsOptions = {
+  isForceStatic?: boolean;
+  isPprFallbackShell?: boolean;
+};
+export declare function createAppPageSearchParamsObserver(): ThenableParamsObserver;
+export declare function makeObservedAppPageSearchParamsThenable(pageSearchParams: AppPageSearchParams, options?: AppPageSearchParamsObservationOptions): ThenableParams<AppPageSearchParams>;
+/**
+ * The `searchParams` a client page receives during SSR (see
+ * `shims/client-page-root.tsx`). Its RSC payload carries no query, so this is
+ * the only place a client page can read it on the server, and a read counts
+ * like a server page's: the render is dynamic and won't be stored.
+ *
+ * `force-static` renders read an empty query, which isn't a read, and PPR
+ * fallback shells keep their untracked query, so neither is observed.
+ */
+export declare function makeClientPageSsrSearchParamsThenable(searchParams: URLSearchParams, options: ClientPageSsrSearchParamsOptions): ThenableParams<AppPageSearchParams>;
+/**
+ * The client page `searchParams` of one SSR render, one promise per page,
+ * keyed by the page's props object as the browser keys its own. React writes
+ * `status` and `value` onto a promise it tracks, so a promise shared across
+ * pages would show one page's `use()` to a sibling in SSR only.
+ *
+ * The cache lives in this render's navigation context and is dropped with it.
+ */
+export declare function createClientPageSsrSearchParamsSource(searchParams: URLSearchParams, options: ClientPageSsrSearchParamsOptions): (pageProps: object) => ThenableParams<AppPageSearchParams>;
+//#endregion

package/dist/server/app-page-search-params-observation.js

@@ -1,24 +1,60 @@
 import { markDynamicUsage, markRenderRequestApiUsage, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "../shims/headers.js";
+import { searchParamsToRecord } from "../utils/query.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
 //#region src/server/app-page-search-params-observation.ts
-function markAppPageSearchParamsAccess(markDynamic) {
+function markAppPageSearchParamsAccess() {
 	throwIfStaticGenerationAccessError();
 	throwIfInsideCacheScope("searchParams");
-	if (markDynamic) markDynamicUsage();
+	markDynamicUsage();
 	markRenderRequestApiUsage("searchParams");
 }
-function createAppPageSearchParamsObserver(options = {}) {
+function createAppPageSearchParamsObserver() {
 	return { observeParamAccess() {
-		markAppPageSearchParamsAccess(options.markDynamic !== false);
+		markAppPageSearchParamsAccess();
 	} };
 }
 function makeObservedAppPageSearchParamsThenable(pageSearchParams, options = {}) {
-	const observer = createAppPageSearchParamsObserver(options);
+	const observer = createAppPageSearchParamsObserver();
 	if (options.observeReactPromiseStatus === true) return makeThenableParams(pageSearchParams, {
 		...observer,
 		observeReactPromiseStatus: true
 	});
 	return makeThenableParams(pageSearchParams, observer);
 }
+/**
+* The `searchParams` a client page receives during SSR (see
+* `shims/client-page-root.tsx`). Its RSC payload carries no query, so this is
+* the only place a client page can read it on the server, and a read counts
+* like a server page's: the render is dynamic and won't be stored.
+*
+* `force-static` renders read an empty query, which isn't a read, and PPR
+* fallback shells keep their untracked query, so neither is observed.
+*/
+function makeClientPageSsrSearchParamsThenable(searchParams, options) {
+	return makeClientPageSsrSearchParamsThenableFromRecord(searchParamsToRecord(searchParams), options);
+}
+/**
+* The client page `searchParams` of one SSR render, one promise per page,
+* keyed by the page's props object as the browser keys its own. React writes
+* `status` and `value` onto a promise it tracks, so a promise shared across
+* pages would show one page's `use()` to a sibling in SSR only.
+*
+* The cache lives in this render's navigation context and is dropped with it.
+*/
+function createClientPageSsrSearchParamsSource(searchParams, options) {
+	const pageSearchParams = searchParamsToRecord(searchParams);
+	const byPage = /* @__PURE__ */ new WeakMap();
+	return (pageProps) => {
+		let thenable = byPage.get(pageProps);
+		if (!thenable) {
+			thenable = makeClientPageSsrSearchParamsThenableFromRecord(pageSearchParams, options);
+			byPage.set(pageProps, thenable);
+		}
+		return thenable;
+	};
+}
+function makeClientPageSsrSearchParamsThenableFromRecord(pageSearchParams, options) {
+	return options.isForceStatic !== true && options.isPprFallbackShell !== true ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
+}
 //#endregion
-export { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable };
+export { createAppPageSearchParamsObserver, createClientPageSsrSearchParamsSource, makeClientPageSsrSearchParamsThenable, makeObservedAppPageSearchParamsThenable };

package/dist/server/app-page-segment-plan.d.ts

@@ -32,7 +32,7 @@ type AppPageSegmentPlan<TModule extends AppPageModule> = Readonly<{
  * semantics — which segment intercepts, which params bind it — so this layer
  * only binds keys and derives identities from graph ids.
  */
-declare function createAppPageSegmentPlan<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: {
+export declare function createAppPageSegmentPlan<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: {
   includeSlot: (ownerTreePosition: number, targetTreePosition: number) => boolean;
   interception: AppElementsInterception | null;
   layoutEntries: readonly AppPageLayoutEntry<TModule, TErrorModule>[];
@@ -52,5 +52,4 @@ declare function createAppPageSegmentPlan<TModule extends AppPageModule, TErrorM
   slotBindings: readonly AppElementsSlotBinding[];
   templateEntries: readonly AppPageTemplateEntry<TModule>[];
 }): AppPageSegmentPlan<TModule>;
-//#endregion
-export { createAppPageSegmentPlan };
+//#endregion

package/dist/server/app-page-segment-state.d.ts

@@ -1,16 +1,16 @@
 import { AppPageParams } from "./app-page-boundary.js";
 //#region src/server/app-page-segment-state.d.ts
-declare const APP_PAGE_SEGMENT_KEY = "__PAGE__";
-declare function isAppPageRouteGroupSegment(segment: string): boolean;
-declare function canonicalizeAppPageParams(params: AppPageParams): void;
-declare function resolveAppPageChildSegments(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string[];
-declare function resolveAppPageSegmentStateKey(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string;
+export declare const APP_PAGE_SEGMENT_KEY = "__PAGE__";
+export declare function isAppPageRouteGroupSegment(segment: string): boolean;
+export declare function canonicalizeAppPageParams(params: AppPageParams): void;
+export declare function resolveAppPageChildSegments(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string[];
+export declare function resolveAppPageSegmentStateKey(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string;
 /**
  * A branch segment already resolved by route matching: the interception marker
  * is split off and the param map that binds the segment is chosen. Downstream
  * layers serialise these; they never reparse filesystem interception syntax.
  */
-type AppPageSemanticSegment = Readonly<{
+export type AppPageSemanticSegment = Readonly<{
   /** Interception marker this segment carries, or null when it is a plain segment. */
   marker: string | null;
   /** Whether the route's matched params or the slot's own params bind the segment. */
@@ -18,9 +18,8 @@ type AppPageSemanticSegment = Readonly<{
   /** Segment name with any interception marker removed. */
   segment: string;
 }>;
-declare function resolveAppPageSemanticSegmentStateKey(semanticSegment: AppPageSemanticSegment, params: AppPageParams): string;
-declare function resolveAppPageRouteStateKey(routeSegments: readonly string[], params: AppPageParams): string;
-declare function resolveAppPagePatternStateKey(patternParts: readonly string[], params: AppPageParams): string;
-declare function resolveAppPageTemplateStateKey(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string;
-//#endregion
-export { APP_PAGE_SEGMENT_KEY, AppPageSemanticSegment, canonicalizeAppPageParams, isAppPageRouteGroupSegment, resolveAppPageChildSegments, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey, resolveAppPageSemanticSegmentStateKey, resolveAppPageTemplateStateKey };
+export declare function resolveAppPageSemanticSegmentStateKey(semanticSegment: AppPageSemanticSegment, params: AppPageParams): string;
+export declare function resolveAppPageRouteStateKey(routeSegments: readonly string[], params: AppPageParams): string;
+export declare function resolveAppPagePatternStateKey(patternParts: readonly string[], params: AppPageParams): string;
+export declare function resolveAppPageTemplateStateKey(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string;
+//#endregion

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

@@ -6,7 +6,7 @@ import { InitialNavigationCacheMetadata } from "./app-ssr-stream.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { ReactFormState } from "react-dom/client";
 //#region src/server/app-page-stream.d.ts
-type AppPageFontData = {
+export type AppPageFontData = {
   links: string[];
   preloads: readonly AppPageFontPreload[];
   styles: string[];
@@ -16,9 +16,10 @@ type CreateAppPageFontDataOptions = {
   getPreloads: () => AppPageFontPreload[];
   getStyles: () => string[];
 };
-type AppSsrRenderResult = {
+export type AppSsrRenderResult = {
   htmlStream: ReadableStream<Uint8Array>;
   metadataReady: Promise<void>;
+  renderComplete?: Promise<void>;
   capturedRscData: Promise<ArrayBuffer> | null;
   shellErrorRecovered?: boolean;
   /**
@@ -28,7 +29,7 @@ type AppSsrRenderResult = {
    */
   linkHeader?: string;
 };
-declare function isAppSsrRenderResult(value: unknown): value is AppSsrRenderResult;
+export declare function isAppSsrRenderResult(value: unknown): value is AppSsrRenderResult;
 /**
  * Combine the React-emitted preload `Link` header with vinext's font preload
  * `Link` header, capping the result to `reactMaxHeadersLength`.
@@ -44,8 +45,8 @@ declare function isAppSsrRenderResult(value: unknown): value is AppSsrRenderResu
  * the render-critical entries survive and trailing font preloads are dropped
  * first.
  */
-declare function buildAppPageLinkHeader(reactLinkHeader: string | undefined, fontLinkHeader: string | undefined, maxHeadersLength: number | undefined): string;
-type AppPageSsrHandler = {
+export declare function buildAppPageLinkHeader(reactLinkHeader: string | undefined, fontLinkHeader: string | undefined, maxHeadersLength: number | undefined): string;
+export type AppPageSsrHandler = {
   handleSsr: (rscStream: ReadableStream<Uint8Array>, navigationContext: NavigationContext | null, fontData: AppPageFontData, options?: {
     formState?: ReactFormState | null;
     scriptNonce?: string;
@@ -55,6 +56,8 @@ type AppPageSsrHandler = {
      * in the SSR head. Sourced from `experimental.clientTraceMetadata`.
      */
     clientTraceMetadata?: readonly string[];
+    /** Private marker used to identify only this render's injected trace tags. */
+    clientTraceMetadataMarker?: string;
     /**
      * Maximum total length (in characters) of the preload `Link` header
      * emitted during SSR. `0` disables emission. From `reactMaxHeadersLength`
@@ -74,8 +77,12 @@ type AppPageSsrHandler = {
     isStaticGeneration?: boolean;
     /** `dynamic = "force-static"` suppresses the useSearchParams bailout. */
     isForceStatic?: boolean;
+    /** Production render that may be stored under a query-free key. */
+    isCacheCandidate?: boolean;
     /** Dev-only: original server error to surface in the browser overlay. */
     initialDevServerError?: unknown;
+    /** Report an SSR/Fizz render failure through instrumentation. */
+    onSsrError?: (error: unknown) => unknown;
     /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
     mirrorNextFlight?: boolean;
     /** When true, an SSR-phase-only shell render error resolves to the
@@ -101,6 +108,8 @@ type RenderAppPageHtmlStreamOptions = {
    * the SSR head. Undefined or empty disables emission.
    */
   clientTraceMetadata?: readonly string[];
+  /** Private marker used to identify only this render's injected trace tags. */
+  clientTraceMetadataMarker?: string;
   /**
    * Maximum total length (in characters) of the preload `Link` header emitted
    * during SSR. `0` disables emission. From `reactMaxHeadersLength` in
@@ -124,10 +133,14 @@ type RenderAppPageHtmlStreamOptions = {
   isStaticGeneration?: boolean;
   /** `dynamic = "force-static"` suppresses the useSearchParams bailout. */
   isForceStatic?: boolean;
+  /** Production render that may be stored under a query-free key. */
+  isCacheCandidate?: boolean;
   /** Override the default shell-error recovery decision passed to handleSsr. */
   fallbackToErrorDocumentOnShellError?: boolean;
   /** Dev-only: original server error to surface in the browser overlay. */
   initialDevServerError?: unknown;
+  /** Report an SSR/Fizz render failure through instrumentation. */
+  onSsrError?: (error: unknown) => unknown;
   /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
   mirrorNextFlight?: boolean;
   /** True when the app supplies a custom global-error.tsx. Disables the
@@ -146,6 +159,7 @@ type AppPageHtmlStreamRecoveryResult = {
   htmlStream: ReadableStream<Uint8Array> | null;
   response: Response | null;
   metadataReady: Promise<void>;
+  renderComplete: Promise<void>;
   capturedRscData: Promise<ArrayBuffer> | null;
   shellErrorRecovered: boolean;
   /** React-emitted preload `Link` header (already capped). */
@@ -167,12 +181,14 @@ type AppPageRscErrorTracker = {
    * synchronously inside a route-level Suspense boundary (loading.tsx).
    */
   getCapturedSpecialError: () => unknown;
+  isCapturedError: (error: unknown) => boolean;
   onRenderError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
 };
-declare function createAppPageFontData(options: CreateAppPageFontDataOptions): AppPageFontData;
-declare function renderAppPageHtmlStream(options: RenderAppPageHtmlStreamOptions): Promise<AppSsrRenderResult>;
-declare function renderAppPageHtmlResponse(options: RenderAppPageHtmlResponseOptions): Promise<Response>;
-declare function renderAppPageHtmlStreamWithRecovery<TSpecialError>(options: RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError>): Promise<AppPageHtmlStreamRecoveryResult>;
-declare function createAppPageRscErrorTracker(baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown): AppPageRscErrorTracker;
+export declare function createAppPageSsrErrorHandler(baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown, isCapturedRscError: (error: unknown) => boolean): (error: unknown) => unknown;
+export declare function createAppPageFontData(options: CreateAppPageFontDataOptions): AppPageFontData;
+export declare function renderAppPageHtmlStream(options: RenderAppPageHtmlStreamOptions): Promise<AppSsrRenderResult>;
+export declare function renderAppPageHtmlResponse(options: RenderAppPageHtmlResponseOptions): Promise<Response>;
+export declare function renderAppPageHtmlStreamWithRecovery<TSpecialError>(options: RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError>): Promise<AppPageHtmlStreamRecoveryResult>;
+export declare function createAppPageRscErrorTracker(baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown): AppPageRscErrorTracker;
 //#endregion
-export { AppPageFontData, AppPageSsrHandler, AppSsrRenderResult, buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, isAppSsrRenderResult, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery };
+export { deferUntilStreamConsumed };