vinext 0.0.55 → 0.1.1

package/dist/server/app-layout-param-observation.d.ts

@@ -1,5 +1,6 @@
 import { RenderRequestApiKind } from "./cache-proof.js";
 import { UnstableCacheObservation } from "../shims/cache.js";
+import { ClientReuseManifestRejectionCode, ClientReuseManifestTraceFields } from "./client-reuse-manifest.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
 
 //#region src/server/app-layout-param-observation.d.ts
@@ -9,6 +10,13 @@ type AppLayoutParamAccessObservation = Readonly<{
   cacheableFetchCount: number;
   completeness: "complete" | "unknown";
   dynamicFetchCount: number;
+  /**
+   * `markDynamicUsage()` fired during the probe (e.g. `"use cache: private"`,
+   * `connection()`) with no other observable trace. Folded in from the
+   * isolated probe scope so this signal can't diverge from the Layer-3
+   * `dynamicDetected` path it replaced.
+   */
+  dynamicUsageObserved: boolean;
   finiteRevalidateSeconds: number | null;
   keys: readonly string[];
   observed: boolean;
@@ -23,8 +31,13 @@ type AppLayoutParamAccessTracker = Readonly<{
   recordLayoutParamScope: (layoutId: string, paramScopeKeys: readonly string[]) => void;
   runLayoutProbe: (layoutId: string, probe: () => unknown) => unknown;
 }>;
+type StaticLayoutObservationSkipCode = Extract<ClientReuseManifestRejectionCode, `SKIP_LAYOUT_${string}`>;
+type StaticLayoutObservationSkipRejection = Readonly<{
+  code: StaticLayoutObservationSkipCode;
+  fields: ClientReuseManifestTraceFields;
+}>;
+declare function getStaticLayoutObservationSkipRejection(observation: AppLayoutParamAccessObservation): StaticLayoutObservationSkipRejection | null;
 declare function isAppLayoutObservationUnsafeForStaticReuse(observation: AppLayoutParamAccessObservation): boolean;
 declare function createAppLayoutParamAccessTracker(): AppLayoutParamAccessTracker;
 //#endregion
-export { AppLayoutParamAccessObservation, AppLayoutParamAccessTracker, createAppLayoutParamAccessTracker, isAppLayoutObservationUnsafeForStaticReuse };
-//# sourceMappingURL=app-layout-param-observation.d.ts.map
+export { AppLayoutParamAccessObservation, AppLayoutParamAccessTracker, StaticLayoutObservationSkipRejection, createAppLayoutParamAccessTracker, getStaticLayoutObservationSkipRejection, isAppLayoutObservationUnsafeForStaticReuse };

package/dist/server/app-layout-param-observation.js

@@ -1,13 +1,49 @@
 import { isInsideUnifiedScope, runWithUnifiedStateMutation } from "../shims/unified-request-context.js";
-import { peekRenderRequestApiUsage } from "../shims/headers.js";
+import { peekDynamicUsage, peekRenderRequestApiUsage } from "../shims/headers.js";
 import { _peekRequestScopedCacheLife, _peekUnstableCacheObservations } from "../shims/cache.js";
 import { getCollectedFetchTags, peekCacheableFetchObservations, peekDynamicFetchObservations } from "../shims/fetch-cache.js";
+import { isPromiseLike } from "../utils/promise.js";
 //#region src/server/app-layout-param-observation.ts
-function isAppLayoutObservationUnsafeForStaticReuse(observation) {
-	return observation.completeness !== "complete" || observation.paramScopeKeys.length > 0 || observation.observed || observation.requestApis.length > 0 || observation.finiteRevalidateSeconds !== null || observation.cacheLifeObserved || observation.cacheTags.length > 0 || observation.cacheableFetchCount > 0 || observation.dynamicFetchCount > 0 || observation.unstableCaches.length > 0;
+const STATIC_LAYOUT_OBSERVATION_SKIP_RULES = [
+	["SKIP_LAYOUT_PARAMS_OBSERVATION_INCOMPLETE", (observation) => observation.completeness !== "complete"],
+	["SKIP_LAYOUT_PARAMS_PRESENT", (observation) => observation.paramScopeKeys.length > 0],
+	["SKIP_LAYOUT_PARAMS_OBSERVED", (observation) => observation.observed],
+	["SKIP_LAYOUT_DYNAMIC_USAGE_OBSERVED", (observation) => observation.dynamicUsageObserved],
+	["SKIP_LAYOUT_REQUEST_API_OBSERVED", (observation) => observation.requestApis.length > 0],
+	["SKIP_LAYOUT_REVALIDATE_PRESENT", (observation) => observation.finiteRevalidateSeconds !== null],
+	["SKIP_LAYOUT_CACHE_LIFE_OBSERVED", (observation) => observation.cacheLifeObserved],
+	["SKIP_LAYOUT_UNSTABLE_CACHE_OBSERVED", (observation) => observation.unstableCaches.length > 0],
+	["SKIP_LAYOUT_CACHE_TAGS_OBSERVED", (observation) => observation.cacheTags.length > 0],
+	["SKIP_LAYOUT_CACHEABLE_FETCHES_OBSERVED", (observation) => observation.cacheableFetchCount > 0],
+	["SKIP_LAYOUT_DYNAMIC_FETCHES_OBSERVED", (observation) => observation.dynamicFetchCount > 0]
+];
+function createStaticLayoutObservationTraceFields(observation) {
+	return {
+		cacheLifeObserved: observation.cacheLifeObserved,
+		cacheTags: observation.cacheTags,
+		cacheableFetchCount: observation.cacheableFetchCount,
+		dynamicFetchCount: observation.dynamicFetchCount,
+		dynamicUsageObserved: observation.dynamicUsageObserved,
+		finiteRevalidateSeconds: observation.finiteRevalidateSeconds,
+		observedParamKeys: observation.keys,
+		paramScopeKeys: observation.paramScopeKeys,
+		requestApis: observation.requestApis,
+		unstableCacheCount: observation.unstableCaches.length,
+		unstableCacheKeyHashes: observation.unstableCaches.map((cache) => cache.keyHash),
+		unstableCacheRevalidates: observation.unstableCaches.map((cache) => String(cache.revalidate)),
+		unstableCacheTagCounts: observation.unstableCaches.map((cache) => String(cache.tagCount)),
+		unstableCacheTagHashes: observation.unstableCaches.map((cache) => cache.tagHash ?? "none")
+	};
 }
-function isPromiseLike(value) {
-	return Boolean(value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function");
+function getStaticLayoutObservationSkipRejection(observation) {
+	for (const [code, matches] of STATIC_LAYOUT_OBSERVATION_SKIP_RULES) if (matches(observation)) return {
+		code,
+		fields: createStaticLayoutObservationTraceFields(observation)
+	};
+	return null;
+}
+function isAppLayoutObservationUnsafeForStaticReuse(observation) {
+	return getStaticLayoutObservationSkipRejection(observation) !== null;
 }
 function createAppLayoutParamAccessTracker() {
 	const observations = /* @__PURE__ */ new Map();
@@ -19,6 +55,7 @@ function createAppLayoutParamAccessTracker() {
 			cacheTags: /* @__PURE__ */ new Set(),
 			cacheableFetches: /* @__PURE__ */ new Set(),
 			dynamicFetches: /* @__PURE__ */ new Set(),
+			dynamicUsageObserved: false,
 			finiteRevalidateSeconds: null,
 			keys: /* @__PURE__ */ new Set(),
 			observed: false,
@@ -53,6 +90,7 @@ function createAppLayoutParamAccessTracker() {
 	};
 	const recordProbeDependencies = (layoutId) => {
 		const observation = ensureObservation(layoutId);
+		if (peekDynamicUsage()) observation.dynamicUsageObserved = true;
 		if (_peekRequestScopedCacheLife() !== null) observation.cacheLifeObserved = true;
 		for (const tag of getCollectedFetchTags()) observation.cacheTags.add(tag);
 		for (const url of peekCacheableFetchObservations()) observation.cacheableFetches.add(url);
@@ -74,6 +112,7 @@ function createAppLayoutParamAccessTracker() {
 				cacheableFetchCount: 0,
 				completeness: "unknown",
 				dynamicFetchCount: 0,
+				dynamicUsageObserved: false,
 				finiteRevalidateSeconds: null,
 				keys: [],
 				observed: false,
@@ -87,6 +126,7 @@ function createAppLayoutParamAccessTracker() {
 				cacheableFetchCount: observation.cacheableFetches.size,
 				completeness: observation.probeComplete ? "complete" : "unknown",
 				dynamicFetchCount: observation.dynamicFetches.size,
+				dynamicUsageObserved: observation.dynamicUsageObserved,
 				finiteRevalidateSeconds: observation.finiteRevalidateSeconds,
 				keys: [...observation.keys].sort(),
 				observed: observation.observed,
@@ -125,6 +165,4 @@ function createAppLayoutParamAccessTracker() {
 	};
 }
 //#endregion
-export { createAppLayoutParamAccessTracker, isAppLayoutObservationUnsafeForStaticReuse };
-
-//# sourceMappingURL=app-layout-param-observation.js.map
+export { createAppLayoutParamAccessTracker, getStaticLayoutObservationSkipRejection, isAppLayoutObservationUnsafeForStaticReuse };

package/dist/server/app-middleware.d.ts

@@ -42,5 +42,4 @@ declare function isExternalMiddlewareRewrite(rewriteUrl: string, request: Reques
 declare function proxyExternalMiddlewareRewrite(request: Request, rewriteUrl: string, context: AppMiddlewareContext): Promise<Response>;
 declare function applyAppMiddleware(options: ApplyAppMiddlewareOptions): Promise<ApplyAppMiddlewareResult>;
 //#endregion
-export { AppMiddlewareContext, ApplyAppMiddlewareOptions, ApplyAppMiddlewareResult, FLIGHT_HEADERS, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
-//# sourceMappingURL=app-middleware.d.ts.map
+export { AppMiddlewareContext, ApplyAppMiddlewareOptions, ApplyAppMiddlewareResult, FLIGHT_HEADERS, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };

package/dist/server/app-middleware.js

@@ -163,5 +163,3 @@ async function applyAppMiddleware(options) {
 }
 //#endregion
 export { FLIGHT_HEADERS, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
-
-//# sourceMappingURL=app-middleware.js.map

package/dist/server/app-mounted-slots-header.d.ts

@@ -32,5 +32,4 @@
  */
 declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;
 //#endregion
-export { normalizeMountedSlotsHeader };
-//# sourceMappingURL=app-mounted-slots-header.d.ts.map
+export { normalizeMountedSlotsHeader };

package/dist/server/app-mounted-slots-header.js

@@ -56,5 +56,3 @@ function normalizeMountedSlotsHeader(raw) {
 }
 //#endregion
 export { normalizeMountedSlotsHeader };
-
-//# sourceMappingURL=app-mounted-slots-header.js.map

package/dist/server/app-optimistic-routing.d.ts

@@ -50,5 +50,4 @@ declare function resolveOptimisticNavigationPayload(options: {
   templates: ReadonlyMap<string, OptimisticRouteTemplate>;
 }): OptimisticNavigationPayload | null;
 //#endregion
-export { OptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload };
-//# sourceMappingURL=app-optimistic-routing.d.ts.map
+export { OptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload };

package/dist/server/app-optimistic-routing.js

@@ -204,5 +204,3 @@ function resolveOptimisticNavigationPayload(options) {
 }
 //#endregion
 export { createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload };
-
-//# sourceMappingURL=app-optimistic-routing.js.map

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

@@ -1,5 +1,6 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppElements } from "./app-elements-wire.js";
+import { NavigationContext } from "../shims/navigation.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
@@ -32,7 +33,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
   getFontStyles: () => string[];
-  getNavigationContext: () => unknown;
+  getNavigationContext: () => NavigationContext | null;
   globalErrorModule?: TModule | null;
   isEdgeRuntime?: boolean;
   isRscRequest: boolean;
@@ -51,6 +52,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
 };
 type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {
   boundaryComponent?: AppPageComponent | null;
+  boundaryModule?: TModule | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   matchedParams: AppPageParams;
   rootForbiddenModule?: TModule | null;
@@ -76,5 +78,4 @@ type RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageMo
 declare function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(options: RenderAppPageHttpAccessFallbackOptions<TModule>): Promise<Response | null>;
 declare function renderAppPageErrorBoundary<TModule extends AppPageModule>(options: RenderAppPageErrorBoundaryOptions<TModule>): Promise<Response | null>;
 //#endregion
-export { AppPageBoundaryRoute, renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };
-//# sourceMappingURL=app-page-boundary-render.d.ts.map
+export { AppPageBoundaryRoute, renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };

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

@@ -1,15 +1,19 @@
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { ErrorBoundary } from "../shims/error-boundary.js";
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
+import { ErrorBoundary, GlobalErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
+import { resolveAppPageSpecialError } from "./app-page-execution.js";
+import { resolveAppPageHead } from "./app-page-head.js";
 import { createAppPageLayoutEntries } from "./app-page-route-wiring.js";
 import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
-import { resolveAppPageHead } from "./app-page-head.js";
-import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { createAppPageFontData, renderAppPageHtmlResponse } from "./app-page-stream.js";
 import { Fragment, createElement } from "react";
 //#region src/server/app-page-boundary-render.ts
+const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
 function getDefaultExport(module) {
 	return module?.default ?? null;
 }
@@ -25,9 +29,12 @@ function wrapRenderedBoundaryElement(options) {
 		makeThenableParams: options.makeThenableParams,
 		matchedParams: options.matchedParams,
 		renderErrorBoundary(GlobalErrorComponent, children) {
-			return createElement(ErrorBoundary, {
-				fallback: GlobalErrorComponent,
-				children
+			return createElement(GlobalErrorBoundary, {
+				fallback: DEFAULT_GLOBAL_ERROR_COMPONENT,
+				children: createElement(ErrorBoundary, {
+					fallback: GlobalErrorComponent,
+					children
+				})
 			});
 		},
 		renderLayout(LayoutComponent, children, asyncParams) {
@@ -80,7 +87,8 @@ function createAppPageBoundaryRscPayload(options) {
 	};
 }
 async function renderAppPageBoundaryElementResponse(options) {
-	const pathname = new URL(options.requestUrl).pathname;
+	const requestUrl = new URL(options.requestUrl);
+	const pathname = requestUrl.pathname;
 	return renderAppPageBoundaryResponse({
 		async createHtmlResponse(rscStream, responseStatus) {
 			const fontData = createAppPageFontData({
@@ -95,11 +103,16 @@ async function renderAppPageBoundaryElementResponse(options) {
 				fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),
 				isEdgeRuntime: options.isEdgeRuntime,
 				middlewareHeaders: options.middlewareContext.headers,
-				navigationContext: options.getNavigationContext(),
+				navigationContext: options.getNavigationContext() ?? {
+					pathname,
+					searchParams: requestUrl.searchParams,
+					params: options.navigationParams ?? options.route?.params ?? {}
+				},
 				rscStream,
 				scriptNonce: options.scriptNonce,
 				ssrHandler,
-				status: responseStatus
+				status: responseStatus,
+				initialDevServerError: options.initialDevServerError
 			});
 		},
 		createRscOnErrorHandler() {
@@ -119,8 +132,7 @@ async function renderAppPageBoundaryElementResponse(options) {
 	});
 }
 async function renderAppPageHttpAccessFallback(options) {
-	const boundaryComponent = options.boundaryComponent ?? resolveAppPageHttpAccessBoundaryComponent({
-		getDefaultExport,
+	const resolvedBoundaryModule = resolveAppPageHttpAccessBoundaryModule({
 		rootForbiddenModule: options.rootForbiddenModule,
 		rootNotFoundModule: options.rootNotFoundModule,
 		rootUnauthorizedModule: options.rootUnauthorizedModule,
@@ -129,6 +141,8 @@ async function renderAppPageHttpAccessFallback(options) {
 		routeUnauthorizedModule: options.route?.unauthorized,
 		statusCode: options.statusCode
 	});
+	const boundaryModule = options.boundaryModule ?? resolvedBoundaryModule;
+	const boundaryComponent = options.boundaryComponent ?? getDefaultExport(boundaryModule);
 	if (!boundaryComponent) return null;
 	const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
 	const pathname = new URL(options.requestUrl).pathname;
@@ -138,6 +152,7 @@ async function renderAppPageHttpAccessFallback(options) {
 		layoutModules,
 		layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
 		metadataRoutes: options.metadataRoutes,
+		pageModule: boundaryModule,
 		params: options.matchedParams,
 		routePath: options.route?.pattern ?? pathname,
 		routeSegments
@@ -177,6 +192,7 @@ async function renderAppPageHttpAccessFallback(options) {
 		...options,
 		element,
 		layoutModules: skipLayoutWrapping ? [] : layoutModules,
+		navigationParams: options.matchedParams,
 		route: skipLayoutWrapping ? null : options.route,
 		routePattern: options.route?.pattern,
 		status: options.statusCode
@@ -224,27 +240,44 @@ async function renderAppPageErrorBoundary(options) {
 	} catch (error) {
 		console.error(`[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`, error);
 	}
-	const element = wrapRenderedBoundaryElement({
-		element: createElement(Fragment, null, ...headElements, createElement(errorBoundary.component, { error: errorObject })),
-		globalErrorModule: options.globalErrorModule,
-		includeGlobalErrorBoundary: !errorBoundary.isGlobalError,
-		isRscRequest: options.isRscRequest,
-		layoutModules,
-		layoutTreePositions: options.route?.layoutTreePositions,
-		makeThenableParams: options.makeThenableParams,
-		matchedParams,
-		resolveChildSegments: options.resolveChildSegments,
-		routeSegments: options.route?.routeSegments,
-		skipLayoutWrapping: errorBoundary.isGlobalError
-	});
-	return renderAppPageBoundaryElementResponse({
+	const buildElement = (BoundaryComponent) => {
+		const boundaryElement = createElement(BoundaryComponent, { error: errorObject });
+		return wrapRenderedBoundaryElement({
+			element: createElement(Fragment, null, ...headElements, errorBoundary.isGlobalError ? createElement(GlobalErrorBoundary, {
+				fallback: DEFAULT_GLOBAL_ERROR_COMPONENT,
+				children: boundaryElement
+			}) : boundaryElement),
+			globalErrorModule: options.globalErrorModule,
+			includeGlobalErrorBoundary: !errorBoundary.isGlobalError,
+			isRscRequest: options.isRscRequest,
+			layoutModules,
+			layoutTreePositions: options.route?.layoutTreePositions,
+			makeThenableParams: options.makeThenableParams,
+			matchedParams,
+			resolveChildSegments: options.resolveChildSegments,
+			routeSegments: options.route?.routeSegments,
+			skipLayoutWrapping: errorBoundary.isGlobalError
+		});
+	};
+	const renderWith = (BoundaryComponent) => renderAppPageBoundaryElementResponse({
 		...options,
-		element,
+		element: buildElement(BoundaryComponent),
+		initialDevServerError: rawError,
 		layoutModules,
+		navigationParams: matchedParams,
 		route: options.route,
 		routePattern: options.route?.pattern,
 		status: 200
 	});
+	try {
+		return await renderWith(errorBoundary.component);
+	} catch (renderError) {
+		if (errorBoundary.isGlobalError && !isNavigationSignalError(renderError) && !resolveAppPageSpecialError(renderError)) {
+			console.error(`[vinext] global-error.tsx threw while rendering for ${options.route?.pattern ?? pathname}; falling back to the built-in default global-error:`, renderError);
+			return renderWith(DEFAULT_GLOBAL_ERROR_COMPONENT);
+		}
+		throw renderError;
+	}
 }
 const _clientHookPattern = /\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\b.*is not a function/;
 function rewriteClientHookError(error) {
@@ -253,5 +286,3 @@ function rewriteClientHookError(error) {
 }
 //#endregion
 export { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };
-
-//# sourceMappingURL=app-page-boundary-render.js.map

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

@@ -10,6 +10,15 @@ type ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {
   routeUnauthorizedModule?: TModule | null;
   statusCode: number;
 };
+type ResolveAppPageHttpAccessBoundaryModuleOptions<TModule> = {
+  rootForbiddenModule?: TModule | null;
+  rootNotFoundModule?: TModule | null;
+  rootUnauthorizedModule?: TModule | null;
+  routeForbiddenModule?: TModule | null;
+  routeNotFoundModule?: TModule | null;
+  routeUnauthorizedModule?: TModule | null;
+  statusCode: number;
+};
 type ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {
   layoutIndex: number;
   rootForbiddenModule?: TModule | null;
@@ -64,6 +73,7 @@ type RenderAppPageBoundaryResponseOptions<TElement> = {
   status: number;
 };
 declare function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>): TComponent | null;
+declare function resolveAppPageHttpAccessBoundaryModule<TModule>(options: ResolveAppPageHttpAccessBoundaryModuleOptions<TModule>): TModule | null;
 declare function resolveAppPageParentHttpAccessBoundaryModule<TModule>(options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>): TModule | null;
 /**
  * Like {@link resolveAppPageParentHttpAccessBoundaryModule}, but also returns
@@ -89,5 +99,4 @@ declare function resolveAppPageErrorBoundary<TModule, TComponent>(options: Resol
 declare function wrapAppPageBoundaryElement<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>(options: WrapAppPageBoundaryElementOptions<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>): TElement;
 declare function renderAppPageBoundaryResponse<TElement>(options: RenderAppPageBoundaryResponseOptions<TElement>): Promise<Response>;
 //#endregion
-export { AppPageParams, renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
-//# sourceMappingURL=app-page-boundary.d.ts.map
+export { AppPageParams, renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageHttpAccessBoundaryModule, resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };

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

@@ -5,11 +5,22 @@ import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 //#region src/server/app-page-boundary.ts
 function resolveAppPageHttpAccessBoundaryComponent(options) {
+	return options.getDefaultExport(resolveAppPageHttpAccessBoundaryModule({
+		rootForbiddenModule: options.rootForbiddenModule,
+		rootNotFoundModule: options.rootNotFoundModule,
+		rootUnauthorizedModule: options.rootUnauthorizedModule,
+		routeForbiddenModule: options.routeForbiddenModule,
+		routeNotFoundModule: options.routeNotFoundModule,
+		routeUnauthorizedModule: options.routeUnauthorizedModule,
+		statusCode: options.statusCode
+	})) ?? null;
+}
+function resolveAppPageHttpAccessBoundaryModule(options) {
 	let boundaryModule;
 	if (options.statusCode === 403) boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;
 	else if (options.statusCode === 401) boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;
 	else boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;
-	return options.getDefaultExport(boundaryModule) ?? null;
+	return boundaryModule ?? null;
 }
 function resolveAppPageParentHttpAccessBoundaryModule(options) {
 	return resolveAppPageParentHttpAccessBoundary(options).module;
@@ -106,6 +117,4 @@ async function renderAppPageBoundaryResponse(options) {
 	return options.createHtmlResponse(rscStream, options.status);
 }
 //#endregion
-export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
-
-//# sourceMappingURL=app-page-boundary.js.map
+export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageHttpAccessBoundaryModule, resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };

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

@@ -22,7 +22,7 @@ type AppPageCacheOutcomeMetric = Readonly<{
    */
   cacheKey: string;
   outcome: "hit" | "miss" | "stale";
-  reason: "empty-entry" | "no-entry" | "non-app-page-entry" | "read-error" | "served" | "stale-empty-entry";
+  reason: "empty-entry" | "no-entry" | "non-app-page-entry" | "query-variant-unproven" | "read-error" | "served" | "stale-empty-entry";
 }>;
 type AppPageCacheOutcomeRecorder = (metric: AppPageCacheOutcomeMetric) => void;
 type BuildAppPageCacheRenderObservation = (input: {
@@ -59,6 +59,7 @@ type ReadAppPageCacheResponseOptions = {
   isrRscKey: AppPageRscCacheKeyBuilder;
   isrSet: AppPageCacheSetter;
   interceptionContext?: string | null;
+  hasRequestSearchParams?: boolean;
   middlewareHeaders?: Headers | null;
   middlewareStatus?: number | null;
   mountedSlotsHeader?: string | null;
@@ -116,5 +117,4 @@ declare function finalizeAppPageHtmlCacheResponse(response: Response, options: F
 declare function finalizeAppPageRscCacheResponse(response: Response, options: ScheduleAppPageRscCacheWriteOptions): Response;
 declare function scheduleAppPageRscCacheWrite(options: ScheduleAppPageRscCacheWriteOptions): boolean;
 //#endregion
-export { AppPageCacheOutcomeMetric, buildAppPageCacheTags, buildAppPageCachedResponse, finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, readAppPageCacheResponse, scheduleAppPageRscCacheWrite };
-//# sourceMappingURL=app-page-cache.d.ts.map
+export { AppPageCacheOutcomeMetric, buildAppPageCacheTags, buildAppPageCachedResponse, finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, readAppPageCacheResponse, scheduleAppPageRscCacheWrite };

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

@@ -4,12 +4,30 @@ import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { readStreamAsText } from "../utils/text-stream.js";
-import { buildCachedRevalidateCacheControl } from "./cache-control.js";
+import { applyCdnResponseHeaders, buildCachedRevalidateCacheControl } from "./cache-control.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
+import { hasCompleteNegativeRequestApiProof } from "./cache-proof.js";
 import { createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 //#region src/server/app-page-cache.ts
-const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
+/**
+* Apply the CDN cache adapter's headers to a freshly-streamed response whose
+* dynamic-ness is not yet proven.
+*
+* The cacheable `Cache-Control` value computed by the response policy is already
+* present on `headers`; the default adapter replaces it with `no-store` (so the
+* page is served from the origin store on later requests), while an edge adapter
+* may instead emit `CDN-Cache-Control`/`Cache-Tag` so the CDN performs SWR and
+* can be purged by tag. `tags` are the page's render tags (canonicalised).
+*/
+function applyPendingDynamicCdnHeaders(headers, tags) {
+	applyCdnResponseHeaders(headers, {
+		cacheControl: headers.get("Cache-Control") ?? "",
+		pendingDynamicCheck: true,
+		tags
+	});
+	setCacheStateHeaders(headers, "MISS");
+}
 function recordAppPageCacheOutcome(recordCacheOutcome, input) {
 	try {
 		recordCacheOutcome?.(input);
@@ -39,10 +57,10 @@ function buildAppPageCacheControl(cacheState, revalidateSeconds, expireSeconds)
 }
 function buildAppPageCachedHeaders(options) {
 	const headers = new Headers({
-		"Cache-Control": options.cacheControl,
 		"Content-Type": options.contentType,
 		Vary: VINEXT_RSC_VARY_HEADER
 	});
+	applyCdnResponseHeaders(headers, { cacheControl: options.cacheControl });
 	setCacheStateHeaders(headers, options.cacheState);
 	applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
 	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
@@ -52,6 +70,9 @@ function buildAppPageCachedHeaders(options) {
 function getCachedAppPageValue(entry) {
 	return entry?.value.value && entry.value.value.kind === "APP_PAGE" ? entry.value.value : null;
 }
+function hasQueryInvariantAppPageProof(cachedValue) {
+	return cachedValue.renderObservation !== void 0 && hasCompleteNegativeRequestApiProof(cachedValue.renderObservation, ["searchParams"]);
+}
 function resolveAppPageCacheWritePolicy(options) {
 	let revalidateSeconds = options.revalidateSeconds;
 	let expireSeconds = options.expireSeconds;
@@ -114,6 +135,16 @@ async function readAppPageCacheResponse(options) {
 			options.isrDebug?.("MISS (non app-page cache entry)", options.cleanPathname);
 			return null;
 		}
+		if (cachedValue && options.hasRequestSearchParams === true && !hasQueryInvariantAppPageProof(cachedValue)) {
+			recordAppPageCacheOutcome(options.recordCacheOutcome, {
+				artifact,
+				cacheKey: isrKey,
+				outcome: "miss",
+				reason: "query-variant-unproven"
+			});
+			options.isrDebug?.("MISS (query-bearing request lacks cache proof)", options.cleanPathname);
+			return null;
+		}
 		if (cachedValue && !cached?.isStale) {
 			const hitResponse = buildAppPageCachedResponse(cachedValue, {
 				cacheState: "HIT",
@@ -212,10 +243,7 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 	const htmlKey = options.isrHtmlKey(options.cleanPathname);
 	const rscKey = options.isrRscKey(options.cleanPathname, null, void 0, options.interceptionContext);
 	const clientHeaders = new Headers(response.headers);
-	if (options.preserveClientResponseHeaders !== true) {
-		clientHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
-		setCacheStateHeaders(clientHeaders, "MISS");
-	}
+	if (options.preserveClientResponseHeaders !== true) applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags());
 	const cachePromise = (async () => {
 		try {
 			const cachedHtml = await readStreamAsText(streamForCache);
@@ -261,8 +289,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	if (!scheduleAppPageRscCacheWrite(options)) return response;
 	if (options.preserveClientResponseHeaders === true) return response;
 	const clientHeaders = new Headers(response.headers);
-	clientHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
-	setCacheStateHeaders(clientHeaders, "MISS");
+	applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags());
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -306,5 +333,3 @@ function scheduleAppPageRscCacheWrite(options) {
 }
 //#endregion
 export { buildAppPageCacheTags, buildAppPageCachedResponse, finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, readAppPageCacheResponse, scheduleAppPageRscCacheWrite };
-
-//# sourceMappingURL=app-page-cache.js.map