vinext 1.0.0-beta.8 → 1.0.0

package/dist/server/app-hydration-cache-publication.d.ts

@@ -1,11 +1,10 @@
 //#region src/server/app-hydration-cache-publication.d.ts
-type HydrationCachePublication = {
+export type HydrationCachePublication = {
   commit(): void;
   complete(): void;
   fail(): void;
   invalidate(): void;
   publish(publishCandidate: () => () => void): void;
 };
-declare function createHydrationCachePublication(): HydrationCachePublication;
-//#endregion
-export { HydrationCachePublication, createHydrationCachePublication };
+export declare function createHydrationCachePublication(): HydrationCachePublication;
+//#endregion

package/dist/server/app-inline-css-client.d.ts

@@ -1,6 +1,5 @@
 //#region src/server/app-inline-css-client.d.ts
 type InlineCssStylesheetLinkElement = Pick<HTMLLinkElement, "getAttribute" | "hasAttribute">;
-declare function isInlineCssStylesheetLinkElement(link: InlineCssStylesheetLinkElement): boolean;
-declare function removeStylesheetLinksCoveredByInlineCss(): void;
-//#endregion
-export { isInlineCssStylesheetLinkElement, removeStylesheetLinksCoveredByInlineCss };
+export declare function isInlineCssStylesheetLinkElement(link: InlineCssStylesheetLinkElement): boolean;
+export declare function removeStylesheetLinksCoveredByInlineCss(): void;
+//#endregion

package/dist/server/app-interception-context-header.d.ts

@@ -27,6 +27,5 @@
  * an absent header. This is intentionally more permissive than rejecting the
  * whole request — interception is a progressive enhancement.
  */
-declare function normalizeInterceptionContextHeader(raw: string | null | undefined): string | null;
-//#endregion
-export { normalizeInterceptionContextHeader };
+export declare function normalizeInterceptionContextHeader(raw: string | null | undefined): string | null;
+//#endregion

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

@@ -3,7 +3,7 @@ import { ClientReuseManifestRejectionCode, ClientReuseManifestTraceFields } from
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
 import { UnstableCacheObservation } from "../shims/cache-request-state.js";
 //#region src/server/app-layout-param-observation.d.ts
-type AppLayoutParamAccessObservation = Readonly<{
+export type AppLayoutParamAccessObservation = Readonly<{
   cacheLifeObserved: boolean;
   cacheTags: readonly string[];
   cacheableFetchCount: number;
@@ -23,7 +23,7 @@ type AppLayoutParamAccessObservation = Readonly<{
   requestApis: readonly RenderRequestApiKind[];
   unstableCaches: readonly UnstableCacheObservation[];
 }>;
-type AppLayoutParamAccessTracker = Readonly<{
+export type AppLayoutParamAccessTracker = Readonly<{
   createThenableParamsObserver: (layoutId: string) => ThenableParamsObserver;
   getLayoutObservation: (layoutId: string) => AppLayoutParamAccessObservation;
   recordLayoutFiniteRevalidate: (layoutId: string, revalidateSeconds: number) => void;
@@ -31,12 +31,11 @@ type AppLayoutParamAccessTracker = Readonly<{
   runLayoutProbe: (layoutId: string, probe: () => unknown) => unknown;
 }>;
 type StaticLayoutObservationSkipCode = Extract<ClientReuseManifestRejectionCode, `SKIP_LAYOUT_${string}`>;
-type StaticLayoutObservationSkipRejection = Readonly<{
+export 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, StaticLayoutObservationSkipRejection, createAppLayoutParamAccessTracker, getStaticLayoutObservationSkipRejection, isAppLayoutObservationUnsafeForStaticReuse };
+export declare function getStaticLayoutObservationSkipRejection(observation: AppLayoutParamAccessObservation): StaticLayoutObservationSkipRejection | null;
+export declare function isAppLayoutObservationUnsafeForStaticReuse(observation: AppLayoutParamAccessObservation): boolean;
+export declare function createAppLayoutParamAccessTracker(): AppLayoutParamAccessTracker;
+//#endregion

package/dist/server/app-metadata-tracing.d.ts

@@ -0,0 +1,12 @@
+//#region src/server/app-metadata-tracing.d.ts
+type AppMetadataModuleType = "forbidden" | "layout" | "not-found" | "page" | "unauthorized";
+export declare function createAppMetadataModuleRoute(routeSegments: readonly string[], moduleType: AppMetadataModuleType): string;
+export declare function traceGenerateMetadata<T>(moduleRoute: string, callback: () => T): T;
+export declare function createGenerateMetadataSpanDescriptor(moduleRoute: string): {
+  readonly attributes: {
+    readonly "next.page": string;
+  };
+  readonly name: `generateMetadata ${string}`;
+  readonly type: "ResolveMetadata.generateMetadata";
+};
+//#endregion

package/dist/server/app-metadata-tracing.js

@@ -0,0 +1,17 @@
+import { frameworkTracer } from "./tracer.js";
+//#region src/server/app-metadata-tracing.ts
+function createAppMetadataModuleRoute(routeSegments, moduleType) {
+	return `/${[...routeSegments.filter((segment) => !segment.startsWith("@")), moduleType].join("/")}`;
+}
+function traceGenerateMetadata(moduleRoute, callback) {
+	return frameworkTracer.trace(createGenerateMetadataSpanDescriptor(moduleRoute), callback);
+}
+function createGenerateMetadataSpanDescriptor(moduleRoute) {
+	return {
+		attributes: { "next.page": moduleRoute },
+		name: `generateMetadata ${moduleRoute}`,
+		type: "ResolveMetadata.generateMetadata"
+	};
+}
+//#endregion
+export { createAppMetadataModuleRoute, createGenerateMetadataSpanDescriptor, traceGenerateMetadata };

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

@@ -2,12 +2,12 @@ import { NextI18nConfig } from "../config/next-config.js";
 import { MiddlewareModule } from "./middleware-runtime.js";
 import { FLIGHT_HEADERS } from "./headers.js";
 //#region src/server/app-middleware.d.ts
-type AppMiddlewareContext = {
+export type AppMiddlewareContext = {
   headers: Headers | null;
   requestHeaders: Headers | null;
   status: number | null;
 };
-type ApplyAppMiddlewareOptions = {
+export type ApplyAppMiddlewareOptions = {
   basePath?: string;
   cleanPathname: string;
   context: AppMiddlewareContext;
@@ -35,17 +35,25 @@ type ApplyAppMiddlewareOptions = {
    */
   trailingSlash?: boolean;
 };
-type ApplyAppMiddlewareResult = {
+export type ApplyAppMiddlewareResult = {
   kind: "continue";
   cleanPathname: string;
+  /** Present on real middleware results; optional for older generated callers. */
+  matched?: boolean;
+  /** True when this pathname can match middleware for some request context. */
+  pathnameEligible?: boolean;
   rewritten: boolean;
   search: string | null;
 } | {
   kind: "response";
+  /** Present on real middleware results; optional for older generated callers. */
+  matched?: boolean;
+  /** True when this pathname can match middleware for some request context. */
+  pathnameEligible?: boolean;
   response: Response;
 };
-declare function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean;
-declare function proxyExternalMiddlewareRewrite(request: Request, rewriteUrl: string, context: AppMiddlewareContext): Promise<Response>;
-declare function applyAppMiddleware(options: ApplyAppMiddlewareOptions): Promise<ApplyAppMiddlewareResult>;
+export declare function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean;
+export declare function proxyExternalMiddlewareRewrite(request: Request, rewriteUrl: string, context: AppMiddlewareContext): Promise<Response>;
+export declare function applyAppMiddleware(options: ApplyAppMiddlewareOptions): Promise<ApplyAppMiddlewareResult>;
 //#endregion
-export { AppMiddlewareContext, ApplyAppMiddlewareOptions, ApplyAppMiddlewareResult, FLIGHT_HEADERS, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
+export { FLIGHT_HEADERS };

package/dist/server/app-middleware.js

@@ -1,14 +1,13 @@
 import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
-import { FLIGHT_HEADERS } from "./headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { FLIGHT_HEADERS } from "./headers.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";
 import { applyMiddlewareRequestHeaders, setHeadersContext } from "../shims/headers.js";
-import { setNavigationContext } from "../shims/navigation-context-state.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
-import "../shims/navigation.js";
+import { setNavigationContext } from "../shims/navigation-context-accessors.js";
 //#region src/server/app-middleware.ts
 const FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);
 function isForwardedMiddlewareContext(value) {
@@ -139,6 +138,8 @@ function applyForwardedMiddlewareContext(request, context) {
 }
 async function applyAppMiddleware(options) {
 	const forwarded = applyForwardedMiddlewareContext(options.request, options.context);
+	let matched = forwarded.applied;
+	let pathnameEligible = forwarded.applied;
 	let cleanPathname = options.cleanPathname;
 	let rewritten = false;
 	let search = null;
@@ -149,13 +150,18 @@ async function applyAppMiddleware(options) {
 				if (options.middlewareRequest) cancelRequestBody(options.middlewareRequest);
 				return {
 					kind: "response",
+					matched,
+					pathnameEligible,
 					response: validationResponseWithMiddlewareHeaders(validationResponse, options.context)
 				};
 			}
 			if (options.middlewareRequest) cancelRequestBody(options.middlewareRequest);
+			const externalRequest = options.externalRewriteRequest ?? options.request;
 			return {
 				kind: "response",
-				response: await proxyExternalMiddlewareRewrite(options.externalRewriteRequest ?? options.request, forwarded.rewriteUrl, options.context)
+				matched,
+				pathnameEligible,
+				response: await proxyExternalMiddlewareRewrite(externalRequest, forwarded.rewriteUrl, options.context)
 			};
 		}
 		const rewriteParsed = new URL(forwarded.rewriteUrl, options.request.url);
@@ -179,6 +185,12 @@ async function applyAppMiddleware(options) {
 				isProxy: options.isProxy,
 				module: options.module,
 				normalizedPathname: cleanPathname,
+				onMatch() {
+					matched = true;
+				},
+				onPathMatch() {
+					pathnameEligible = true;
+				},
 				requestBodyAlreadyIsolated: true,
 				request: middlewareRequest,
 				trailingSlash: options.trailingSlash
@@ -190,14 +202,20 @@ async function applyAppMiddleware(options) {
 			cancelRequestBody(options.request);
 			if (result.redirectUrl) return {
 				kind: "response",
+				matched,
+				pathnameEligible,
 				response: responseFromMiddlewareRedirect(result)
 			};
 			if (result.response) return {
 				kind: "response",
+				matched,
+				pathnameEligible,
 				response: result.response
 			};
 			return {
 				kind: "response",
+				matched,
+				pathnameEligible,
 				response: internalServerErrorResponse()
 			};
 		}
@@ -209,11 +227,16 @@ async function applyAppMiddleware(options) {
 				const validationResponse = await options.validateExternalRewriteRequest?.();
 				if (validationResponse) return {
 					kind: "response",
+					matched,
+					pathnameEligible,
 					response: validationResponseWithMiddlewareHeaders(validationResponse, options.context)
 				};
+				const externalRequest = options.externalRewriteRequest ?? options.request;
 				return {
 					kind: "response",
-					response: await proxyExternalMiddlewareRewrite(options.externalRewriteRequest ?? options.request, result.rewriteUrl, options.context)
+					matched,
+					pathnameEligible,
+					response: await proxyExternalMiddlewareRewrite(externalRequest, result.rewriteUrl, options.context)
 				};
 			}
 			const rewriteParsed = new URL(result.rewriteUrl, middlewareRequest.url);
@@ -231,6 +254,8 @@ async function applyAppMiddleware(options) {
 	return {
 		kind: "continue",
 		cleanPathname,
+		matched,
+		pathnameEligible,
 		rewritten,
 		search
 	};

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

@@ -30,6 +30,5 @@
  *   - app-elements (outgoing x-vinext-mounted-slots construction)
  *   - isr-cache (RSC cache key generation)
  */
-declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;
-//#endregion
-export { normalizeMountedSlotsHeader };
+export declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;
+//#endregion

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

@@ -1,4 +1,4 @@
-import { AppElementsWire } from "./app-elements-wire.js";
+import { isAppElementsWireSlotId } from "./app-elements-wire-key.js";
 //#region src/server/app-mounted-slots-header.ts
 /**
 * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
@@ -45,7 +45,7 @@ const MAX_SLOT_TOKENS = 16;
 */
 function isValidSlotToken(token) {
 	if (token.length === 0 || token.length > MAX_TOKEN_LENGTH) return false;
-	return AppElementsWire.isSlotId(token);
+	return isAppElementsWireSlotId(token);
 }
 function normalizeMountedSlotsHeader(raw) {
 	if (!raw) return null;

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

@@ -6,7 +6,7 @@ type OptimisticRouteMatch = {
   params: Record<string, string | string[]>;
   route: RouteManifestRoute;
 };
-type OptimisticRouteTemplate = {
+export type OptimisticRouteTemplate = {
   elements: AppElements;
   mountedSlotsHeader: string | null;
   omittedBfcacheSegmentIds: readonly string[];
@@ -21,22 +21,27 @@ type OptimisticNavigationPayload = {
   template: OptimisticRouteTemplate;
   urlParts: readonly string[];
 };
-declare function getOptimisticRouteTemplateKey(options: {
+export declare function getOptimisticRouteTemplateKey(options: {
   interceptionContext: string | null;
   mountedSlotsHeader: string | null;
   routeId: string;
 }): string;
-declare function getOptimisticPrefetchSourceKey(options: {
+export declare function getOptimisticPrefetchSourceKey(options: {
   cacheKey: string;
   interceptionContext: string | null;
   mountedSlotsHeader: string | null;
 }): string;
-declare function matchOptimisticRouteManifestRoute(options: {
+export declare function matchOptimisticRouteManifestRoute(options: {
   basePath: string;
   href: string;
   routeManifest: RouteManifest;
 }): OptimisticRouteMatch | null;
-declare function createOptimisticRouteTemplate(options: {
+export declare function resolveOptimisticNavigationParamsForHref(options: {
+  basePath: string;
+  href: string;
+  routeManifest: RouteManifest;
+}): Record<string, string | string[]> | null;
+export declare function createOptimisticRouteTemplate(options: {
   allowLoadingShell?: boolean;
   basePath: string;
   elements: AppElements;
@@ -45,7 +50,7 @@ declare function createOptimisticRouteTemplate(options: {
   mountedSlotsHeader: string | null;
   routeManifest: RouteManifest;
 }): OptimisticRouteTemplate | null;
-declare function createOptimisticRouteElements(template: OptimisticRouteTemplate): AppElements;
+export declare function createOptimisticRouteElements(template: OptimisticRouteTemplate): AppElements;
 /**
  * A loading-shell prefetch stops at the first loading boundary, so layouts
  * below that boundary are present in the route metadata but absent from the
@@ -54,7 +59,7 @@ declare function createOptimisticRouteElements(template: OptimisticRouteTemplate
  * keeps the shared segment active in this case, which also means the ancestor
  * loading boundary does not re-trigger.
  */
-declare function canCommitOptimisticRouteTemplate(options: {
+export declare function canCommitOptimisticRouteTemplate(options: {
   currentElements: AppElements;
   currentLayoutIds: readonly string[];
   currentParams: Readonly<Record<string, string | string[]>>;
@@ -63,7 +68,7 @@ declare function canCommitOptimisticRouteTemplate(options: {
   targetUrlParts: readonly string[];
   template: OptimisticRouteTemplate;
 }): boolean;
-declare function resolveOptimisticNavigationPayload(options: {
+export declare function resolveOptimisticNavigationPayload(options: {
   basePath: string;
   href: string;
   interceptionContext: string | null;
@@ -71,5 +76,4 @@ declare function resolveOptimisticNavigationPayload(options: {
   routeManifest: RouteManifest;
   templates: ReadonlyMap<string, OptimisticRouteTemplate>;
 }): OptimisticNavigationPayload | null;
-//#endregion
-export { OptimisticRouteTemplate, canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload };
+//#endregion

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

@@ -1,6 +1,6 @@
+import { isUnknownRecord } from "../utils/record.js";
 import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";
@@ -127,7 +127,8 @@ function hrefToRouteParts(href, basePath) {
 		return null;
 	}
 	stripRscCacheBustingSearchParam(url);
-	const appPathname = stripBasePath(stripRscSuffix(url.pathname), basePath);
+	const withoutRscSuffix = stripRscSuffix(url.pathname);
+	const appPathname = stripBasePath(withoutRscSuffix, basePath);
 	const pathname = appPathname === "" ? "/" : appPathname;
 	return {
 		normalized: splitPathnameForRouteMatch(pathname),
@@ -163,6 +164,18 @@ function resolveOptimisticNavigationParams(options) {
 		routeParams
 	};
 }
+function resolveOptimisticNavigationParamsForHref(options) {
+	const urlParts = hrefToRouteParts(options.href, options.basePath);
+	if (urlParts === null) return null;
+	const match = matchOptimisticRouteManifestRoute(options);
+	if (match === null) return null;
+	return resolveOptimisticNavigationParams({
+		match,
+		rawUrlParts: urlParts.raw,
+		routeManifest: options.routeManifest,
+		urlParts: urlParts.normalized
+	}).navigationParams;
+}
 function collectRenderedBfcacheSegmentIds(value, candidates, rendered, depth = 0) {
 	if (depth > 100) return;
 	if (Array.isArray(value)) {
@@ -356,4 +369,4 @@ function resolveOptimisticNavigationPayload(options) {
 	};
 }
 //#endregion
-export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload };
+export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload };

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

@@ -10,6 +10,7 @@ import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
 import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
 import { ComponentType, ReactNode } from "react";
 //#region src/server/app-page-boundary-render.d.ts
 type AppPageComponent = ComponentType<any>;
@@ -17,7 +18,7 @@ type AppPageModule = Record<string, unknown> & {
   default?: AppPageComponent | null | undefined;
 };
 type AppPageBoundaryOnError = (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
-type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {
+export type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {
   error?: TModule | null;
   errorPaths?: readonly TModule[] | null;
   errors?: readonly (TModule | null | undefined)[] | null;
@@ -41,7 +42,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;
   clearRequestContext: () => void;
-  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
+  createRscOnErrorHandler: (pathname: string, routePath: string, overrides?: AppRenderErrorContextOverrides) => AppPageBoundaryOnError;
   getAndClearPendingCookies?: () => string[];
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
@@ -108,7 +109,6 @@ type RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageMo
   route?: AppPageBoundaryRoute<TModule> | null;
   sanitizeErrorForClient: (error: Error) => Error;
 } & AppPageBoundaryRenderCommonOptions<TModule>;
-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 };
+export declare function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(options: RenderAppPageHttpAccessFallbackOptions<TModule>): Promise<Response | null>;
+export declare function renderAppPageErrorBoundary<TModule extends AppPageModule>(options: RenderAppPageErrorBoundaryOptions<TModule>): Promise<Response | null>;
+//#endregion

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

@@ -1,9 +1,9 @@
 import { stripBasePath } from "../utils/base-path.js";
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
-import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
@@ -18,7 +18,7 @@ import { resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport }
 import "./app-rsc-route-matching.js";
 import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { resolveSlotParamOverrides } from "./app-page-element-builder.js";
-import { createAppPageFontData, createAppPageRscErrorTracker, renderAppPageHtmlResponse } from "./app-page-stream.js";
+import { createAppPageFontData, createAppPageRscErrorTracker, createAppPageSsrErrorHandler, 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;
@@ -133,7 +133,8 @@ async function renderAppPageBoundaryElementResponse(options) {
 		route: options.route,
 		sourcePageSegments: options.sourcePageSegments
 	});
-	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname));
+	const baseRscOnErrorHandler = options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);
+	const rscErrorTracker = createAppPageRscErrorTracker(baseRscOnErrorHandler);
 	const resolveCapturedSpecialError = (error) => resolveAppPageSpecialError(error) ?? resolveAppPageSpecialError(rscErrorTracker.getCapturedSpecialError());
 	const renderSpecialErrorResponse = (specialError) => renderBoundarySpecialErrorResponse(options, specialError);
 	const handleSpecialErrors = options.handleSpecialErrors === true;
@@ -147,6 +148,7 @@ async function renderAppPageBoundaryElementResponse(options) {
 					getStyles: options.getFontStyles
 				});
 				const ssrHandler = await options.loadSsrHandler();
+				const onSsrError = options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname, { renderSource: "server-rendering" });
 				return renderAppPageHtmlResponse({
 					clearRequestContext: options.clearRequestContext,
 					fontData,
@@ -163,7 +165,8 @@ async function renderAppPageBoundaryElementResponse(options) {
 					scriptNonce: options.scriptNonce,
 					ssrHandler,
 					status: responseStatus,
-					initialDevServerError: options.initialDevServerError
+					initialDevServerError: options.initialDevServerError,
+					onSsrError: createAppPageSsrErrorHandler(onSsrError, rscErrorTracker.isCapturedError)
 				});
 			},
 			createRscOnErrorHandler() {
@@ -254,6 +257,7 @@ async function renderAppPageHttpAccessFallback(options) {
 				},
 				...intercept?.interceptNotFound ? {
 					notFoundModule: intercept.interceptNotFound,
+					notFoundModuleRouteSegments: (intercept.interceptNotFoundBranchSegments ?? intercept.interceptSourcePageSegments ?? fallbackRouteSegments).slice(0, intercept.interceptNotFoundTreePosition ?? 0),
 					notFoundParams: resolveAppPageBranchParams(intercept.interceptNotFoundBranchSegments ?? intercept.interceptBranchSegments ?? fallbackRouteSegments, intercept.interceptNotFoundTreePosition ?? 0, effectiveParams)
 				} : {},
 				ownerTreePosition: fallbackRouteSegments.length
@@ -261,7 +265,9 @@ async function renderAppPageHttpAccessFallback(options) {
 			const fallbackHeadOptions = {
 				boundaryModule,
 				boundaryParams,
+				boundaryRouteSegments: fallbackRouteSegments.slice(0, boundaryTreePosition ?? 0),
 				branchNotFoundConventions: options.statusCode === 404,
+				errorConvention: options.statusCode === 403 ? "forbidden" : options.statusCode === 401 ? "unauthorized" : "not-found",
 				layoutModules,
 				layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
 				parallelBranches,

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

@@ -1,5 +1,5 @@
 //#region src/server/app-page-boundary.d.ts
-type AppPageParams = Record<string, string | string[]>;
+export type AppPageParams = Record<string, string | string[]>;
 type ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {
   getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;
   rootForbiddenModule?: TModule | null;
@@ -72,9 +72,9 @@ type RenderAppPageBoundaryResponseOptions<TElement> = {
   }) => ReadableStream<Uint8Array>;
   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;
+export declare function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>): TComponent | null;
+export declare function resolveAppPageHttpAccessBoundaryModule<TModule>(options: ResolveAppPageHttpAccessBoundaryModuleOptions<TModule>): TModule | null;
+export declare function resolveAppPageParentHttpAccessBoundaryModule<TModule>(options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>): TModule | null;
 /**
  * Like {@link resolveAppPageParentHttpAccessBoundaryModule}, but also returns
  * the layout index that owns the resolved boundary so callers can slice the
@@ -91,12 +91,11 @@ declare function resolveAppPageParentHttpAccessBoundaryModule<TModule>(options:
  *
  * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/create-component-tree.tsx
  */
-declare function resolveAppPageParentHttpAccessBoundary<TModule>(options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>): {
+export declare function resolveAppPageParentHttpAccessBoundary<TModule>(options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>): {
   module: TModule | null;
   layoutIndex: number | null;
 };
-declare function resolveAppPageErrorBoundary<TModule, TComponent>(options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>): ResolveAppPageErrorBoundaryResult<TComponent>;
-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, resolveAppPageHttpAccessBoundaryModule, resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
+export declare function resolveAppPageErrorBoundary<TModule, TComponent>(options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>): ResolveAppPageErrorBoundaryResult<TComponent>;
+export declare function wrapAppPageBoundaryElement<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>(options: WrapAppPageBoundaryElementOptions<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>): TElement;
+export declare function renderAppPageBoundaryResponse<TElement>(options: RenderAppPageBoundaryResponseOptions<TElement>): Promise<Response>;
+//#endregion

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

@@ -1,6 +1,7 @@
+import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.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 { applyEdgeRuntimeHeader } from "./app-page-response.js";
 //#region src/server/app-page-boundary.ts

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

@@ -14,14 +14,31 @@ type BuildAppPageCacheRenderObservation = (input: {
   cacheTags: readonly string[];
   state: AppPageRenderObservationState;
 }) => RenderObservation;
+type FinalizeAppPageCacheabilityEvaluationOptions = {
+  capturedDynamicUsageBeforeContextCleanup?: () => boolean;
+  consumeDynamicUsage: () => boolean;
+  consumeRenderObservationState?: () => AppPageRenderObservationState;
+  getPageTags: () => string[];
+  getRequestCacheLife?: () => AppPageRequestCacheLife | null;
+  expireSeconds?: number;
+  /**
+   * `false` for routes Next.js classifies as dynamic (ƒ), which are never
+   * cacheable even when a cacheLife resolves during the render.
+   */
+  isStaticEligible: boolean;
+  revalidateSeconds: number | null;
+};
 type FinalizeAppPageHtmlCacheResponseOptions = {
+  bypassInterceptionContextCache?: boolean;
   capturedDynamicUsageBeforeContextCleanup?: () => boolean;
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
+  /** Private marker surrounding this render's injected client trace metadata. */
+  clientTraceMetadataMarker?: string;
   consumeDynamicUsage: () => boolean;
   consumeRenderObservationState?: () => AppPageRenderObservationState;
-  createHtmlRenderObservation?: BuildAppPageCacheRenderObservation;
-  createRscRenderObservation?: BuildAppPageCacheRenderObservation;
+  createHtmlRenderObservation: BuildAppPageCacheRenderObservation;
+  createRscRenderObservation: BuildAppPageCacheRenderObservation;
   getPageTags: () => string[];
   getRequestCacheLife?: () => AppPageRequestCacheLife | null;
   isrDebug?: AppPageDebugLogger;
@@ -33,16 +50,18 @@ type FinalizeAppPageHtmlCacheResponseOptions = {
   omitPendingDynamicCacheState?: boolean;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;
+  isStaticEligible: boolean;
   revalidateSeconds: number | null;
   linkHeader: string | null;
   waitUntil?: (promise: Promise<void>) => void;
 };
 type ScheduleAppPageRscCacheWriteOptions = {
+  bypassInterceptionContextCache?: boolean;
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
   consumeDynamicUsage: () => boolean;
   consumeRenderObservationState?: () => AppPageRenderObservationState;
-  createRscRenderObservation?: BuildAppPageCacheRenderObservation;
+  createRscRenderObservation: BuildAppPageCacheRenderObservation;
   dynamicUsedDuringBuild: boolean;
   getPageTags: () => string[];
   getRequestCacheLife?: () => AppPageRequestCacheLife | null;
@@ -56,11 +75,16 @@ type ScheduleAppPageRscCacheWriteOptions = {
   renderMode?: AppRscRenderMode;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;
+  isStaticEligible: boolean;
   revalidateSeconds: number | null;
   waitUntil?: (promise: Promise<void>) => void;
 };
-declare function finalizeAppPageHtmlCacheResponse(response: Response, options: FinalizeAppPageHtmlCacheResponseOptions): Response;
-declare function finalizeAppPageRscCacheResponse(response: Response, options: ScheduleAppPageRscCacheWriteOptions): Response;
-declare function scheduleAppPageRscCacheWrite(options: ScheduleAppPageRscCacheWriteOptions): boolean;
-//#endregion
-export { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite };
+/**
+ * Complete probe/admission classification for an App Page response that does
+ * not enter the ISR cache-write path. Ordinary requests pass through unchanged.
+ */
+export declare function finalizeAppPageCacheabilityEvaluationResponse(response: Response, options: FinalizeAppPageCacheabilityEvaluationOptions): Response;
+export declare function finalizeAppPageHtmlCacheResponse(response: Response, options: FinalizeAppPageHtmlCacheResponseOptions): Response;
+export declare function finalizeAppPageRscCacheResponse(response: Response, options: ScheduleAppPageRscCacheWriteOptions): Response;
+export declare function scheduleAppPageRscCacheWrite(options: ScheduleAppPageRscCacheWriteOptions): boolean;
+//#endregion