vinext 0.0.49 → 0.0.51

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

@@ -44,18 +44,15 @@ function wrapRenderedBoundaryElement(options) {
 		skipLayoutWrapping: options.skipLayoutWrapping
 	});
 }
-function resolveAppPageBoundaryRootLayoutTreePath(route) {
-	if (route?.layouts) {
-		const rootLayoutEntry = createAppPageLayoutEntries({
-			errors: route.errors,
-			layoutTreePositions: route.layoutTreePositions,
-			layouts: route.layouts,
-			notFounds: null,
-			routeSegments: route.routeSegments
-		})[0];
-		if (rootLayoutEntry) return rootLayoutEntry.treePath;
-	}
-	return null;
+function createAppPageBoundaryLayoutEntries(route, layoutModules) {
+	if (!route || layoutModules.length === 0) return [];
+	return createAppPageLayoutEntries({
+		errors: route.errors,
+		layoutTreePositions: route.layoutTreePositions,
+		layouts: layoutModules,
+		notFounds: null,
+		routeSegments: route.routeSegments
+	});
 }
 function resolveHttpAccessFallbackHeadRouteSegments(route, layoutModules) {
 	if (!route?.routeSegments) return;
@@ -71,10 +68,12 @@ function resolveHttpAccessFallbackHeadLayoutTreePositions(route, layoutModules)
 }
 function createAppPageBoundaryRscPayload(options) {
 	const routeId = AppElementsWire.encodeRouteId(options.pathname, null);
+	const layoutEntries = createAppPageBoundaryLayoutEntries(options.route, options.layoutModules);
 	return {
 		...AppElementsWire.createMetadataEntries({
 			interceptionContext: null,
-			rootLayoutTreePath: resolveAppPageBoundaryRootLayoutTreePath(options.route),
+			layoutIds: layoutEntries.map((entry) => entry.id),
+			rootLayoutTreePath: layoutEntries[0]?.treePath ?? null,
 			routeId
 		}),
 		[routeId]: options.element
@@ -107,6 +106,7 @@ async function renderAppPageBoundaryElementResponse(options) {
 		},
 		element: createAppPageBoundaryRscPayload({
 			element: options.element,
+			layoutModules: options.layoutModules,
 			pathname,
 			route: options.route
 		}),
@@ -129,13 +129,15 @@ async function renderAppPageHttpAccessFallback(options) {
 	});
 	if (!boundaryComponent) return null;
 	const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
+	const pathname = new URL(options.requestUrl).pathname;
 	const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);
 	const { metadata, viewport } = await resolveAppPageHead({
+		basePath: options.basePath ?? "",
 		layoutModules,
 		layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
 		metadataRoutes: options.metadataRoutes,
 		params: options.matchedParams,
-		routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,
+		routePath: options.route?.pattern ?? pathname,
 		routeSegments
 	});
 	const headElements = [createElement("meta", {
@@ -148,12 +150,14 @@ async function renderAppPageHttpAccessFallback(options) {
 	})];
 	if (metadata) headElements.push(createElement(MetadataHead, {
 		key: "metadata",
-		metadata
+		metadata,
+		pathname
 	}));
 	headElements.push(createElement(ViewportHead, {
 		key: "viewport",
 		viewport
 	}));
+	const skipLayoutWrapping = options.skipLayoutWrapping ?? false;
 	const element = wrapRenderedBoundaryElement({
 		element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),
 		globalErrorModule: options.globalErrorModule,
@@ -164,13 +168,14 @@ async function renderAppPageHttpAccessFallback(options) {
 		makeThenableParams: options.makeThenableParams,
 		matchedParams: options.matchedParams,
 		resolveChildSegments: options.resolveChildSegments,
-		routeSegments: options.route?.routeSegments
+		routeSegments: options.route?.routeSegments,
+		skipLayoutWrapping
 	});
 	return renderAppPageBoundaryElementResponse({
 		...options,
 		element,
-		layoutModules,
-		route: options.route,
+		layoutModules: skipLayoutWrapping ? [] : layoutModules,
+		route: skipLayoutWrapping ? null : options.route,
 		routePattern: options.route?.pattern,
 		status: options.statusCode
 	});
@@ -178,6 +183,7 @@ async function renderAppPageHttpAccessFallback(options) {
 async function renderAppPageErrorBoundary(options) {
 	const errorBoundary = resolveAppPageErrorBoundary({
 		getDefaultExport,
+		errorModules: options.route?.errorPaths,
 		globalErrorModule: options.globalErrorModule,
 		layoutErrorModules: options.route?.errors,
 		pageErrorModule: options.route?.error
@@ -195,6 +201,7 @@ async function renderAppPageErrorBoundary(options) {
 	})];
 	if (!errorBoundary.isGlobalError) try {
 		const { metadata, viewport } = await resolveAppPageHead({
+			basePath: options.basePath ?? "",
 			fallbackOnFileMetadataError: true,
 			layoutModules,
 			layoutTreePositions: options.route?.layoutTreePositions,
@@ -205,7 +212,8 @@ async function renderAppPageErrorBoundary(options) {
 		});
 		if (metadata) headElements.push(createElement(MetadataHead, {
 			key: "metadata",
-			metadata
+			metadata,
+			pathname
 		}));
 		headElements.push(createElement(ViewportHead, {
 			key: "viewport",

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"vinext/shims/client-hook-error\";\nimport { ErrorBoundary } from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead } from \"vinext/shims/metadata\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport { resolveAppPageHead } from \"./app-page-head.js\";\nimport {\n  renderAppPageBoundaryResponse,\n  resolveAppPageErrorBoundary,\n  resolveAppPageHttpAccessBoundaryComponent,\n  wrapAppPageBoundaryElement,\n  type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n  createAppPageFontData,\n  renderAppPageHtmlResponse,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport { AppElementsWire, type AppElements } from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n  element: ReactNode;\n  pathname: string;\n  route?: AppPageBoundaryRoute<TModule> | null;\n};\n\nexport type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n  error?: TModule | null;\n  errors?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts?: readonly (TModule | null | undefined)[];\n  notFound?: TModule | null;\n  params?: AppPageParams;\n  pattern?: string;\n  routeSegments?: readonly string[];\n  unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  isRscRequest: boolean;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  middlewareContext: AppPageMiddlewareContext;\n  metadataRoutes: MetadataFileRoute[];\n  renderToReadableStream: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  requestUrl: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootLayouts: readonly (TModule | null | undefined)[];\n  scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n  boundaryComponent?: AppPageComponent | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  matchedParams: AppPageParams;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n  error: unknown;\n  matchedParams?: AppPageParams | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n  options: Pick<\n    AppPageBoundaryRenderCommonOptions<TModule>,\n    \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n  > & {\n    element: ReactNode;\n    includeGlobalErrorBoundary: boolean;\n    layoutModules: readonly (TModule | null | undefined)[];\n    layoutTreePositions?: readonly number[] | null;\n    matchedParams: AppPageParams;\n    routeSegments?: readonly string[];\n    skipLayoutWrapping?: boolean;\n  },\n): ReactNode {\n  return wrapAppPageBoundaryElement({\n    element: options.element,\n    getDefaultExport,\n    globalErrorComponent: getDefaultExport(options.globalErrorModule),\n    includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n    isRscRequest: options.isRscRequest,\n    layoutModules: options.layoutModules,\n    layoutTreePositions: options.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    renderErrorBoundary(GlobalErrorComponent, children) {\n      return createElement(ErrorBoundary, {\n        fallback: GlobalErrorComponent,\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n      });\n    },\n    renderLayout(LayoutComponent, children, asyncParams) {\n      return createElement(LayoutComponent as AppPageComponent, {\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n        params: asyncParams,\n      });\n    },\n    renderLayoutSegmentProvider(segmentMap, children) {\n      return createElement(\n        // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n        LayoutSegmentProvider as ComponentType<any>,\n        { segmentMap },\n        children,\n      );\n    },\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.routeSegments ?? [],\n    skipLayoutWrapping: options.skipLayoutWrapping,\n  });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n  if (route?.layouts) {\n    const rootLayoutEntry = createAppPageLayoutEntries({\n      errors: route.errors,\n      layoutTreePositions: route.layoutTreePositions,\n      layouts: route.layouts,\n      notFounds: null,\n      routeSegments: route.routeSegments,\n    })[0];\n\n    if (rootLayoutEntry) {\n      return rootLayoutEntry.treePath;\n    }\n  }\n\n  // Without route tree metadata we cannot derive a canonical root layout tree path.\n  // Returning null keeps boundary payloads soft-navigation compatible.\n  return null;\n}\n\nfunction resolveHttpAccessFallbackHeadRouteSegments<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly string[] | undefined {\n  if (!route?.routeSegments) {\n    return undefined;\n  }\n\n  if (!route.layouts || layoutModules.length >= route.layouts.length) {\n    return route.routeSegments;\n  }\n\n  const lastIncludedLayoutIndex = layoutModules.length - 1;\n  if (lastIncludedLayoutIndex < 0) {\n    return [];\n  }\n\n  const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;\n  return route.routeSegments.slice(0, segmentCount);\n}\n\nfunction resolveHttpAccessFallbackHeadLayoutTreePositions<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly number[] | null | undefined {\n  if (!route?.layouts || layoutModules.length >= route.layouts.length) {\n    return route?.layoutTreePositions;\n  }\n\n  return route.layoutTreePositions?.slice(0, layoutModules.length);\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n  options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n  const routeId = AppElementsWire.encodeRouteId(options.pathname, null);\n\n  return {\n    ...AppElementsWire.createMetadataEntries({\n      interceptionContext: null,\n      rootLayoutTreePath: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n      routeId,\n    }),\n    [routeId]: options.element,\n  };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n  options: AppPageBoundaryRenderCommonOptions<TModule> & {\n    element: ReactNode;\n    layoutModules: readonly (TModule | null | undefined)[];\n    route?: AppPageBoundaryRoute<TModule> | null;\n    routePattern?: string;\n    status: number;\n  },\n): Promise<Response> {\n  const pathname = new URL(options.requestUrl).pathname;\n  const payload = createAppPageBoundaryRscPayload({\n    element: options.element,\n    pathname,\n    route: options.route,\n  });\n\n  return renderAppPageBoundaryResponse({\n    async createHtmlResponse(rscStream, responseStatus) {\n      const fontData = createAppPageFontData({\n        getLinks: options.getFontLinks,\n        getPreloads: options.getFontPreloads,\n        getStyles: options.getFontStyles,\n      });\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlResponse({\n        clearRequestContext: options.clearRequestContext,\n        fontData,\n        fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n        middlewareHeaders: options.middlewareContext.headers,\n        navigationContext: options.getNavigationContext(),\n        rscStream,\n        scriptNonce: options.scriptNonce,\n        ssrHandler,\n        status: responseStatus,\n      });\n    },\n    createRscOnErrorHandler() {\n      return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n    },\n    element: payload,\n    isRscRequest: options.isRscRequest,\n    middlewareHeaders: options.middlewareContext.headers,\n    renderToReadableStream: options.renderToReadableStream,\n    status: options.status,\n  });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n  options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n  const boundaryComponent =\n    options.boundaryComponent ??\n    resolveAppPageHttpAccessBoundaryComponent({\n      getDefaultExport,\n      rootForbiddenModule: options.rootForbiddenModule,\n      rootNotFoundModule: options.rootNotFoundModule,\n      rootUnauthorizedModule: options.rootUnauthorizedModule,\n      routeForbiddenModule: options.route?.forbidden,\n      routeNotFoundModule: options.route?.notFound,\n      routeUnauthorizedModule: options.route?.unauthorized,\n      statusCode: options.statusCode,\n    });\n  if (!boundaryComponent) {\n    return null;\n  }\n\n  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n  const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);\n  const { metadata, viewport } = await resolveAppPageHead({\n    layoutModules,\n    layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(\n      options.route,\n      layoutModules,\n    ),\n    metadataRoutes: options.metadataRoutes,\n    params: options.matchedParams,\n    routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,\n    routeSegments,\n  });\n\n  const headElements: ReactNode[] = [\n    createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n    createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n  ];\n  if (metadata) {\n    headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n  }\n  headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: true,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: options.statusCode,\n  });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n  options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n  const errorBoundary = resolveAppPageErrorBoundary({\n    getDefaultExport,\n    globalErrorModule: options.globalErrorModule,\n    layoutErrorModules: options.route?.errors,\n    pageErrorModule: options.route?.error,\n  });\n  if (!errorBoundary.component) {\n    return null;\n  }\n\n  const rawError =\n    options.error instanceof Error ? options.error : new Error(String(options.error));\n  rewriteClientHookError(rawError);\n  const errorObject = options.sanitizeErrorForClient(rawError);\n  const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n  const layoutModules = options.route?.layouts ?? options.rootLayouts;\n  const pathname = new URL(options.requestUrl).pathname;\n\n  const headElements: ReactNode[] = [createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" })];\n  if (!errorBoundary.isGlobalError) {\n    try {\n      const { metadata, viewport } = await resolveAppPageHead({\n        fallbackOnFileMetadataError: true,\n        layoutModules,\n        layoutTreePositions: options.route?.layoutTreePositions,\n        metadataRoutes: options.metadataRoutes,\n        params: matchedParams,\n        routePath: options.route?.pattern ?? pathname,\n        routeSegments: options.route?.routeSegments,\n      });\n      if (metadata) {\n        headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n      }\n      headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n    } catch (error) {\n      console.error(\n        `[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`,\n        error,\n      );\n    }\n  }\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(\n      Fragment,\n      null,\n      ...headElements,\n      createElement(errorBoundary.component, {\n        error: errorObject,\n      }),\n    ),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping: errorBoundary.isGlobalError,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: 200,\n  });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n  /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n  const match = error.message.match(_clientHookPattern);\n  if (match) {\n    error.message = buildClientHookErrorMessage(`${match[1]}()`);\n  }\n}\n"],"mappings":";;;;;;;;;;;;AAoGA,SAAS,iBACP,QACyB;AACzB,QAAO,QAAQ,WAAW;;AAG5B,SAAS,4BACP,SAYW;AACX,QAAO,2BAA2B;EAChC,SAAS,QAAQ;EACjB;EACA,sBAAsB,iBAAiB,QAAQ,kBAAkB;EACjE,4BAA4B,QAAQ;EACpC,cAAc,QAAQ;EACtB,eAAe,QAAQ;EACvB,qBAAqB,QAAQ;EAC7B,oBAAoB,QAAQ;EAC5B,eAAe,QAAQ;EACvB,oBAAoB,sBAAsB,UAAU;AAClD,UAAO,cAAc,eAAe;IAClC,UAAU;IAEV;IACD,CAAC;;EAEJ,aAAa,iBAAiB,UAAU,aAAa;AACnD,UAAO,cAAc,iBAAqC;IAExD;IACA,QAAQ;IACT,CAAC;;EAEJ,4BAA4B,YAAY,UAAU;AAChD,UAAO,cAEL,uBACA,EAAE,YAAY,EACd,SACD;;EAEH,sBAAsB,QAAQ;EAC9B,eAAe,QAAQ,iBAAiB,EAAE;EAC1C,oBAAoB,QAAQ;EAC7B,CAAC;;AAGJ,SAAS,yCACP,OACe;AACf,KAAI,OAAO,SAAS;EAClB,MAAM,kBAAkB,2BAA2B;GACjD,QAAQ,MAAM;GACd,qBAAqB,MAAM;GAC3B,SAAS,MAAM;GACf,WAAW;GACX,eAAe,MAAM;GACtB,CAAC,CAAC;AAEH,MAAI,gBACF,QAAO,gBAAgB;;AAM3B,QAAO;;AAGT,SAAS,2CACP,OACA,eAC+B;AAC/B,KAAI,CAAC,OAAO,cACV;AAGF,KAAI,CAAC,MAAM,WAAW,cAAc,UAAU,MAAM,QAAQ,OAC1D,QAAO,MAAM;CAGf,MAAM,0BAA0B,cAAc,SAAS;AACvD,KAAI,0BAA0B,EAC5B,QAAO,EAAE;CAGX,MAAM,eAAe,MAAM,sBAAsB,4BAA4B;AAC7E,QAAO,MAAM,cAAc,MAAM,GAAG,aAAa;;AAGnD,SAAS,iDACP,OACA,eACsC;AACtC,KAAI,CAAC,OAAO,WAAW,cAAc,UAAU,MAAM,QAAQ,OAC3D,QAAO,OAAO;AAGhB,QAAO,MAAM,qBAAqB,MAAM,GAAG,cAAc,OAAO;;AAGlE,SAAS,gCACP,SACa;CACb,MAAM,UAAU,gBAAgB,cAAc,QAAQ,UAAU,KAAK;AAErE,QAAO;EACL,GAAG,gBAAgB,sBAAsB;GACvC,qBAAqB;GACrB,oBAAoB,yCAAyC,QAAQ,MAAM;GAC3E;GACD,CAAC;GACD,UAAU,QAAQ;EACpB;;AAGH,eAAe,qCACb,SAOmB;CACnB,MAAM,WAAW,IAAI,IAAI,QAAQ,WAAW,CAAC;AAO7C,QAAO,8BAA8B;EACnC,MAAM,mBAAmB,WAAW,gBAAgB;GAClD,MAAM,WAAW,sBAAsB;IACrC,UAAU,QAAQ;IAClB,aAAa,QAAQ;IACrB,WAAW,QAAQ;IACpB,CAAC;GACF,MAAM,aAAa,MAAM,QAAQ,gBAAgB;AACjD,UAAO,0BAA0B;IAC/B,qBAAqB,QAAQ;IAC7B;IACA,gBAAgB,QAAQ,oBAAoB,SAAS,SAAS;IAC9D,mBAAmB,QAAQ,kBAAkB;IAC7C,mBAAmB,QAAQ,sBAAsB;IACjD;IACA,aAAa,QAAQ;IACrB;IACA,QAAQ;IACT,CAAC;;EAEJ,0BAA0B;AACxB,UAAO,QAAQ,wBAAwB,UAAU,QAAQ,gBAAgB,SAAS;;EAEpF,SA7Bc,gCAAgC;GAC9C,SAAS,QAAQ;GACjB;GACA,OAAO,QAAQ;GAChB,CAAC;EA0BA,cAAc,QAAQ;EACtB,mBAAmB,QAAQ,kBAAkB;EAC7C,wBAAwB,QAAQ;EAChC,QAAQ,QAAQ;EACjB,CAAC;;AAGJ,eAAsB,gCACpB,SAC0B;CAC1B,MAAM,oBACJ,QAAQ,qBACR,0CAA0C;EACxC;EACA,qBAAqB,QAAQ;EAC7B,oBAAoB,QAAQ;EAC5B,wBAAwB,QAAQ;EAChC,sBAAsB,QAAQ,OAAO;EACrC,qBAAqB,QAAQ,OAAO;EACpC,yBAAyB,QAAQ,OAAO;EACxC,YAAY,QAAQ;EACrB,CAAC;AACJ,KAAI,CAAC,kBACH,QAAO;CAGT,MAAM,gBAAgB,QAAQ,iBAAiB,QAAQ,OAAO,WAAW,QAAQ;CACjF,MAAM,gBAAgB,2CAA2C,QAAQ,OAAO,cAAc;CAC9F,MAAM,EAAE,UAAU,aAAa,MAAM,mBAAmB;EACtD;EACA,qBAAqB,iDACnB,QAAQ,OACR,cACD;EACD,gBAAgB,QAAQ;EACxB,QAAQ,QAAQ;EAChB,WAAW,QAAQ,OAAO,WAAW,IAAI,IAAI,QAAQ,WAAW,CAAC;EACjE;EACD,CAAC;CAEF,MAAM,eAA4B,CAChC,cAAc,QAAQ;EAAE,SAAS;EAAS,KAAK;EAAW,CAAC,EAC3D,cAAc,QAAQ;EAAE,SAAS;EAAW,KAAK;EAAU,MAAM;EAAU,CAAC,CAC7E;AACD,KAAI,SACF,cAAa,KAAK,cAAc,cAAc;EAAE,KAAK;EAAY;EAAU,CAAC,CAAC;AAE/E,cAAa,KAAK,cAAc,cAAc;EAAE,KAAK;EAAY;EAAU,CAAC,CAAC;CAE7E,MAAM,UAAU,4BAA4B;EAC1C,SAAS,cAAc,UAAU,MAAM,GAAG,cAAc,cAAc,kBAAkB,CAAC;EACzF,mBAAmB,QAAQ;EAC3B,4BAA4B;EAC5B,cAAc,QAAQ;EACtB;EACA,qBAAqB,QAAQ,OAAO;EACpC,oBAAoB,QAAQ;EAC5B,eAAe,QAAQ;EACvB,sBAAsB,QAAQ;EAC9B,eAAe,QAAQ,OAAO;EAC/B,CAAC;AAEF,QAAO,qCAAqC;EAC1C,GAAG;EACH;EACA;EACA,OAAO,QAAQ;EACf,cAAc,QAAQ,OAAO;EAC7B,QAAQ,QAAQ;EACjB,CAAC;;AAGJ,eAAsB,2BACpB,SAC0B;CAC1B,MAAM,gBAAgB,4BAA4B;EAChD;EACA,mBAAmB,QAAQ;EAC3B,oBAAoB,QAAQ,OAAO;EACnC,iBAAiB,QAAQ,OAAO;EACjC,CAAC;AACF,KAAI,CAAC,cAAc,UACjB,QAAO;CAGT,MAAM,WACJ,QAAQ,iBAAiB,QAAQ,QAAQ,QAAQ,IAAI,MAAM,OAAO,QAAQ,MAAM,CAAC;AACnF,wBAAuB,SAAS;CAChC,MAAM,cAAc,QAAQ,uBAAuB,SAAS;CAC5D,MAAM,gBAAgB,QAAQ,iBAAiB,QAAQ,OAAO,UAAU,EAAE;CAC1E,MAAM,gBAAgB,QAAQ,OAAO,WAAW,QAAQ;CACxD,MAAM,WAAW,IAAI,IAAI,QAAQ,WAAW,CAAC;CAE7C,MAAM,eAA4B,CAAC,cAAc,QAAQ;EAAE,SAAS;EAAS,KAAK;EAAW,CAAC,CAAC;AAC/F,KAAI,CAAC,cAAc,cACjB,KAAI;EACF,MAAM,EAAE,UAAU,aAAa,MAAM,mBAAmB;GACtD,6BAA6B;GAC7B;GACA,qBAAqB,QAAQ,OAAO;GACpC,gBAAgB,QAAQ;GACxB,QAAQ;GACR,WAAW,QAAQ,OAAO,WAAW;GACrC,eAAe,QAAQ,OAAO;GAC/B,CAAC;AACF,MAAI,SACF,cAAa,KAAK,cAAc,cAAc;GAAE,KAAK;GAAY;GAAU,CAAC,CAAC;AAE/E,eAAa,KAAK,cAAc,cAAc;GAAE,KAAK;GAAY;GAAU,CAAC,CAAC;UACtE,OAAO;AACd,UAAQ,MACN,+DAA+D,QAAQ,OAAO,WAAW,SAAS,IAClG,MACD;;CAIL,MAAM,UAAU,4BAA4B;EAC1C,SAAS,cACP,UACA,MACA,GAAG,cACH,cAAc,cAAc,WAAW,EACrC,OAAO,aACR,CAAC,CACH;EACD,mBAAmB,QAAQ;EAC3B,4BAA4B,CAAC,cAAc;EAC3C,cAAc,QAAQ;EACtB;EACA,qBAAqB,QAAQ,OAAO;EACpC,oBAAoB,QAAQ;EAC5B;EACA,sBAAsB,QAAQ;EAC9B,eAAe,QAAQ,OAAO;EAC9B,oBAAoB,cAAc;EACnC,CAAC;AAEF,QAAO,qCAAqC;EAC1C,GAAG;EACH;EACA;EACA,OAAO,QAAQ;EACf,cAAc,QAAQ,OAAO;EAC7B,QAAQ;EACT,CAAC;;AAOJ,MAAM,qBACJ;AAEF,SAAS,uBAAuB,OAAoB;CAClD,MAAM,QAAQ,MAAM,QAAQ,MAAM,mBAAmB;AACrD,KAAI,MACF,OAAM,UAAU,4BAA4B,GAAG,MAAM,GAAG,IAAI"}
+{"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"vinext/shims/client-hook-error\";\nimport { ErrorBoundary } from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead } from \"vinext/shims/metadata\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport { resolveAppPageHead } from \"./app-page-head.js\";\nimport {\n  renderAppPageBoundaryResponse,\n  resolveAppPageErrorBoundary,\n  resolveAppPageHttpAccessBoundaryComponent,\n  wrapAppPageBoundaryElement,\n  type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n  createAppPageFontData,\n  renderAppPageHtmlResponse,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport { AppElementsWire, type AppElements } from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n  element: ReactNode;\n  layoutModules: readonly (TModule | null | undefined)[];\n  pathname: string;\n  route?: AppPageBoundaryRoute<TModule> | null;\n};\n\ntype AppPageBoundaryLayoutEntry = {\n  id: string;\n  treePath: string;\n};\n\nexport type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n  error?: TModule | null;\n  errorPaths?: readonly TModule[] | null;\n  errors?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts?: readonly (TModule | null | undefined)[];\n  notFound?: TModule | null;\n  params?: AppPageParams;\n  pattern?: string;\n  routeSegments?: readonly string[];\n  unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  isRscRequest: boolean;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  middlewareContext: AppPageMiddlewareContext;\n  metadataRoutes: MetadataFileRoute[];\n  /** Configured next.config `basePath`, threaded into file-based metadata href emission. */\n  basePath?: string;\n  renderToReadableStream: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  requestUrl: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootLayouts: readonly (TModule | null | undefined)[];\n  scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n  boundaryComponent?: AppPageComponent | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  matchedParams: AppPageParams;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  /**\n   * When true, the resolved boundary is rendered without wrapping it in the\n   * route's layouts. Used by `global-not-found.tsx`, which provides its own\n   * `<html>`/`<body>` and intentionally replaces the root layout.\n   * Mirrors Next.js's `createNotFoundLoaderTree` behavior for `hasGlobalNotFound`.\n   * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/app-render.tsx#L495-L520\n   */\n  skipLayoutWrapping?: boolean;\n  statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n  error: unknown;\n  matchedParams?: AppPageParams | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n  options: Pick<\n    AppPageBoundaryRenderCommonOptions<TModule>,\n    \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n  > & {\n    element: ReactNode;\n    includeGlobalErrorBoundary: boolean;\n    layoutModules: readonly (TModule | null | undefined)[];\n    layoutTreePositions?: readonly number[] | null;\n    matchedParams: AppPageParams;\n    routeSegments?: readonly string[];\n    skipLayoutWrapping?: boolean;\n  },\n): ReactNode {\n  return wrapAppPageBoundaryElement({\n    element: options.element,\n    getDefaultExport,\n    globalErrorComponent: getDefaultExport(options.globalErrorModule),\n    includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n    isRscRequest: options.isRscRequest,\n    layoutModules: options.layoutModules,\n    layoutTreePositions: options.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    renderErrorBoundary(GlobalErrorComponent, children) {\n      return createElement(ErrorBoundary, {\n        fallback: GlobalErrorComponent,\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n      });\n    },\n    renderLayout(LayoutComponent, children, asyncParams) {\n      return createElement(LayoutComponent as AppPageComponent, {\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n        params: asyncParams,\n      });\n    },\n    renderLayoutSegmentProvider(segmentMap, children) {\n      return createElement(\n        // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n        LayoutSegmentProvider as ComponentType<any>,\n        { segmentMap },\n        children,\n      );\n    },\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.routeSegments ?? [],\n    skipLayoutWrapping: options.skipLayoutWrapping,\n  });\n}\n\nfunction createAppPageBoundaryLayoutEntries<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly AppPageBoundaryLayoutEntry[] {\n  if (!route || layoutModules.length === 0) return [];\n\n  return createAppPageLayoutEntries({\n    errors: route.errors,\n    layoutTreePositions: route.layoutTreePositions,\n    layouts: layoutModules,\n    notFounds: null,\n    routeSegments: route.routeSegments,\n  });\n}\n\nfunction resolveHttpAccessFallbackHeadRouteSegments<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly string[] | undefined {\n  if (!route?.routeSegments) {\n    return undefined;\n  }\n\n  if (!route.layouts || layoutModules.length >= route.layouts.length) {\n    return route.routeSegments;\n  }\n\n  const lastIncludedLayoutIndex = layoutModules.length - 1;\n  if (lastIncludedLayoutIndex < 0) {\n    return [];\n  }\n\n  const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;\n  return route.routeSegments.slice(0, segmentCount);\n}\n\nfunction resolveHttpAccessFallbackHeadLayoutTreePositions<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly number[] | null | undefined {\n  if (!route?.layouts || layoutModules.length >= route.layouts.length) {\n    return route?.layoutTreePositions;\n  }\n\n  return route.layoutTreePositions?.slice(0, layoutModules.length);\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n  options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n  const routeId = AppElementsWire.encodeRouteId(options.pathname, null);\n  const layoutEntries = createAppPageBoundaryLayoutEntries(options.route, options.layoutModules);\n\n  return {\n    ...AppElementsWire.createMetadataEntries({\n      interceptionContext: null,\n      layoutIds: layoutEntries.map((entry) => entry.id),\n      rootLayoutTreePath: layoutEntries[0]?.treePath ?? null,\n      routeId,\n    }),\n    [routeId]: options.element,\n  };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n  options: AppPageBoundaryRenderCommonOptions<TModule> & {\n    element: ReactNode;\n    layoutModules: readonly (TModule | null | undefined)[];\n    route?: AppPageBoundaryRoute<TModule> | null;\n    routePattern?: string;\n    status: number;\n  },\n): Promise<Response> {\n  const pathname = new URL(options.requestUrl).pathname;\n  const payload = createAppPageBoundaryRscPayload({\n    element: options.element,\n    layoutModules: options.layoutModules,\n    pathname,\n    route: options.route,\n  });\n\n  return renderAppPageBoundaryResponse({\n    async createHtmlResponse(rscStream, responseStatus) {\n      const fontData = createAppPageFontData({\n        getLinks: options.getFontLinks,\n        getPreloads: options.getFontPreloads,\n        getStyles: options.getFontStyles,\n      });\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlResponse({\n        clearRequestContext: options.clearRequestContext,\n        fontData,\n        fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n        middlewareHeaders: options.middlewareContext.headers,\n        navigationContext: options.getNavigationContext(),\n        rscStream,\n        scriptNonce: options.scriptNonce,\n        ssrHandler,\n        status: responseStatus,\n      });\n    },\n    createRscOnErrorHandler() {\n      return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n    },\n    element: payload,\n    isRscRequest: options.isRscRequest,\n    middlewareHeaders: options.middlewareContext.headers,\n    renderToReadableStream: options.renderToReadableStream,\n    status: options.status,\n  });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n  options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n  const boundaryComponent =\n    options.boundaryComponent ??\n    resolveAppPageHttpAccessBoundaryComponent({\n      getDefaultExport,\n      rootForbiddenModule: options.rootForbiddenModule,\n      rootNotFoundModule: options.rootNotFoundModule,\n      rootUnauthorizedModule: options.rootUnauthorizedModule,\n      routeForbiddenModule: options.route?.forbidden,\n      routeNotFoundModule: options.route?.notFound,\n      routeUnauthorizedModule: options.route?.unauthorized,\n      statusCode: options.statusCode,\n    });\n  if (!boundaryComponent) {\n    return null;\n  }\n\n  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n  const pathname = new URL(options.requestUrl).pathname;\n  const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);\n  const { metadata, viewport } = await resolveAppPageHead({\n    basePath: options.basePath ?? \"\",\n    layoutModules,\n    layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(\n      options.route,\n      layoutModules,\n    ),\n    metadataRoutes: options.metadataRoutes,\n    params: options.matchedParams,\n    routePath: options.route?.pattern ?? pathname,\n    routeSegments,\n  });\n\n  const headElements: ReactNode[] = [\n    createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n    createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n  ];\n  if (metadata) {\n    headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata, pathname }));\n  }\n  headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n  const skipLayoutWrapping = options.skipLayoutWrapping ?? false;\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: true,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    // When global-not-found owns the document, no layouts should contribute to\n    // the RSC payload's layout entries either — otherwise the SSR pipeline\n    // would expect a root-layout tree path that doesn't exist in the markup.\n    element,\n    layoutModules: skipLayoutWrapping ? [] : layoutModules,\n    route: skipLayoutWrapping ? null : options.route,\n    routePattern: options.route?.pattern,\n    status: options.statusCode,\n  });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n  options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n  const errorBoundary = resolveAppPageErrorBoundary({\n    getDefaultExport,\n    errorModules: options.route?.errorPaths,\n    globalErrorModule: options.globalErrorModule,\n    layoutErrorModules: options.route?.errors,\n    pageErrorModule: options.route?.error,\n  });\n  if (!errorBoundary.component) {\n    return null;\n  }\n\n  const rawError =\n    options.error instanceof Error ? options.error : new Error(String(options.error));\n  rewriteClientHookError(rawError);\n  const errorObject = options.sanitizeErrorForClient(rawError);\n  const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n  const layoutModules = options.route?.layouts ?? options.rootLayouts;\n  const pathname = new URL(options.requestUrl).pathname;\n\n  const headElements: ReactNode[] = [createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" })];\n  if (!errorBoundary.isGlobalError) {\n    try {\n      const { metadata, viewport } = await resolveAppPageHead({\n        basePath: options.basePath ?? \"\",\n        fallbackOnFileMetadataError: true,\n        layoutModules,\n        layoutTreePositions: options.route?.layoutTreePositions,\n        metadataRoutes: options.metadataRoutes,\n        params: matchedParams,\n        routePath: options.route?.pattern ?? pathname,\n        routeSegments: options.route?.routeSegments,\n      });\n      if (metadata) {\n        headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata, pathname }));\n      }\n      headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n    } catch (error) {\n      console.error(\n        `[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`,\n        error,\n      );\n    }\n  }\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(\n      Fragment,\n      null,\n      ...headElements,\n      createElement(errorBoundary.component, {\n        error: errorObject,\n      }),\n    ),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping: errorBoundary.isGlobalError,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: 200,\n  });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n  /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n  const match = error.message.match(_clientHookPattern);\n  if (match) {\n    error.message = buildClientHookErrorMessage(`${match[1]}()`);\n  }\n}\n"],"mappings":"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"}

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

@@ -23,6 +23,7 @@ type ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {
 type ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {
   getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;
   globalErrorModule?: TModule | null;
+  errorModules?: readonly (TModule | null | undefined)[] | null;
   layoutErrorModules?: readonly (TModule | null | undefined)[] | null;
   pageErrorModule?: TModule | null;
 };

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

@@ -1,4 +1,5 @@
-import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
+import { runWithFetchDedupe } from "../shims/fetch-cache.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-boundary.ts
@@ -31,10 +32,11 @@ function resolveAppPageErrorBoundary(options) {
 		component: pageErrorComponent,
 		isGlobalError: false
 	};
-	if (options.layoutErrorModules) for (let index = options.layoutErrorModules.length - 1; index >= 0; index--) {
-		const layoutErrorComponent = options.getDefaultExport(options.layoutErrorModules[index]);
-		if (layoutErrorComponent) return {
-			component: layoutErrorComponent,
+	const segmentErrorModules = options.errorModules ?? options.layoutErrorModules;
+	if (segmentErrorModules) for (let index = segmentErrorModules.length - 1; index >= 0; index--) {
+		const segmentErrorComponent = options.getDefaultExport(segmentErrorModules[index]);
+		if (segmentErrorComponent) return {
+			component: segmentErrorComponent,
 			isGlobalError: false
 		};
 	}
@@ -61,13 +63,14 @@ function wrapAppPageBoundaryElement(options) {
 	return element;
 }
 async function renderAppPageBoundaryResponse(options) {
-	const rscStream = options.renderToReadableStream(options.element, { onError: options.createRscOnErrorHandler() });
+	const rscStream = runWithFetchDedupe(() => options.renderToReadableStream(options.element, { onError: options.createRscOnErrorHandler() }));
 	if (options.isRscRequest) {
 		const headers = new Headers({
-			"Content-Type": "text/x-component; charset=utf-8",
+			"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 			Vary: VINEXT_RSC_VARY_HEADER
 		});
 		mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
+		applyRscCompatibilityIdHeader(headers);
 		return new Response(rscStream, {
 			status: options.status,
 			headers

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-boundary.js","names":[],"sources":["../../src/server/app-page-boundary.ts"],"sourcesContent":["import { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\nexport type AppPageParams = Record<string, string | string[]>;\n\ntype ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModule?: TModule | null;\n  routeNotFoundModule?: TModule | null;\n  routeUnauthorizedModule?: TModule | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {\n  layoutIndex: number;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;\n  routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;\n  routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  globalErrorModule?: TModule | null;\n  layoutErrorModules?: readonly (TModule | null | undefined)[] | null;\n  pageErrorModule?: TModule | null;\n};\n\ntype ResolveAppPageErrorBoundaryResult<TComponent> = {\n  component: TComponent | null;\n  isGlobalError: boolean;\n};\n\ntype WrapAppPageBoundaryElementOptions<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n> = {\n  element: TElement;\n  getDefaultExport: (\n    module: TLayoutModule | null | undefined,\n  ) => TLayoutComponent | null | undefined;\n  globalErrorComponent?: TGlobalErrorComponent | null;\n  includeGlobalErrorBoundary: boolean;\n  isRscRequest: boolean;\n  layoutModules: readonly (TLayoutModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  renderErrorBoundary: (component: TGlobalErrorComponent, children: TElement) => TElement;\n  renderLayout: (component: TLayoutComponent, children: TElement, params: unknown) => TElement;\n  renderLayoutSegmentProvider?: (\n    segmentMap: { children: TChildSegments },\n    children: TElement,\n  ) => TElement;\n  resolveChildSegments?: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => TChildSegments;\n  routeSegments?: readonly string[];\n  skipLayoutWrapping?: boolean;\n};\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype RenderAppPageBoundaryResponseOptions<TElement> = {\n  createHtmlResponse: (rscStream: ReadableStream<Uint8Array>, status: number) => Promise<Response>;\n  createRscOnErrorHandler: () => AppPageBoundaryOnError;\n  element: TElement;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  renderToReadableStream: (\n    element: TElement,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  status: number;\n};\n\nexport function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(\n  options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>,\n): TComponent | null {\n  let boundaryModule: TModule | null | undefined;\n\n  if (options.statusCode === 403) {\n    boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;\n  } else {\n    boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;\n  }\n\n  return options.getDefaultExport(boundaryModule) ?? null;\n}\n\nexport function resolveAppPageParentHttpAccessBoundaryModule<TModule>(\n  options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>,\n): TModule | null {\n  let routeModules = options.routeNotFoundModules;\n  let rootModule = options.rootNotFoundModule;\n\n  if (options.statusCode === 403) {\n    routeModules = options.routeForbiddenModules;\n    rootModule = options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    routeModules = options.routeUnauthorizedModules;\n    rootModule = options.rootUnauthorizedModule;\n  }\n\n  if (routeModules) {\n    for (let index = options.layoutIndex - 1; index >= 0; index--) {\n      const module = routeModules[index];\n      if (module) {\n        return module;\n      }\n    }\n  }\n\n  return rootModule ?? null;\n}\n\nexport function resolveAppPageErrorBoundary<TModule, TComponent>(\n  options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>,\n): ResolveAppPageErrorBoundaryResult<TComponent> {\n  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);\n  if (pageErrorComponent) {\n    return {\n      component: pageErrorComponent,\n      isGlobalError: false,\n    };\n  }\n\n  if (options.layoutErrorModules) {\n    for (let index = options.layoutErrorModules.length - 1; index >= 0; index--) {\n      const layoutErrorComponent = options.getDefaultExport(options.layoutErrorModules[index]);\n      if (layoutErrorComponent) {\n        return {\n          component: layoutErrorComponent,\n          isGlobalError: false,\n        };\n      }\n    }\n  }\n\n  const globalErrorComponent = options.getDefaultExport(options.globalErrorModule);\n  return {\n    component: globalErrorComponent ?? null,\n    isGlobalError: Boolean(globalErrorComponent),\n  };\n}\n\nexport function wrapAppPageBoundaryElement<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n>(\n  options: WrapAppPageBoundaryElementOptions<\n    TElement,\n    TLayoutModule,\n    TLayoutComponent,\n    TChildSegments,\n    TGlobalErrorComponent\n  >,\n): TElement {\n  let element = options.element;\n\n  if (!options.skipLayoutWrapping) {\n    for (let index = options.layoutModules.length - 1; index >= 0; index--) {\n      const layoutComponent = options.getDefaultExport(options.layoutModules[index]);\n      if (!layoutComponent) {\n        continue;\n      }\n\n      const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;\n      const asyncParams = options.makeThenableParams(\n        resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams),\n      );\n      element = options.renderLayout(layoutComponent, element, asyncParams);\n\n      if (\n        options.isRscRequest &&\n        options.renderLayoutSegmentProvider &&\n        options.resolveChildSegments\n      ) {\n        const childSegments = options.resolveChildSegments(\n          options.routeSegments ?? [],\n          treePosition,\n          options.matchedParams,\n        );\n        element = options.renderLayoutSegmentProvider({ children: childSegments }, element);\n      }\n    }\n  }\n\n  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) {\n    element = options.renderErrorBoundary(options.globalErrorComponent, element);\n  }\n\n  return element;\n}\n\nexport async function renderAppPageBoundaryResponse<TElement>(\n  options: RenderAppPageBoundaryResponseOptions<TElement>,\n): Promise<Response> {\n  const rscStream = options.renderToReadableStream(options.element, {\n    onError: options.createRscOnErrorHandler(),\n  });\n\n  if (options.isRscRequest) {\n    // Do NOT clear request-scoped context here. RSC responses are consumed lazily\n    // by the client, so headers()/cookies() and async server components still need\n    // their ALS-backed state while the stream is being read.\n    const headers = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: VINEXT_RSC_VARY_HEADER,\n    });\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n    return new Response(rscStream, {\n      status: options.status,\n      headers,\n    });\n  }\n\n  return options.createHtmlResponse(rscStream, options.status);\n}\n"],"mappings":";;;;AA4FA,SAAgB,0CACd,SACmB;CACnB,IAAI;AAEJ,KAAI,QAAQ,eAAe,IACzB,kBAAiB,QAAQ,wBAAwB,QAAQ;UAChD,QAAQ,eAAe,IAChC,kBAAiB,QAAQ,2BAA2B,QAAQ;KAE5D,kBAAiB,QAAQ,uBAAuB,QAAQ;AAG1D,QAAO,QAAQ,iBAAiB,eAAe,IAAI;;AAGrD,SAAgB,6CACd,SACgB;CAChB,IAAI,eAAe,QAAQ;CAC3B,IAAI,aAAa,QAAQ;AAEzB,KAAI,QAAQ,eAAe,KAAK;AAC9B,iBAAe,QAAQ;AACvB,eAAa,QAAQ;YACZ,QAAQ,eAAe,KAAK;AACrC,iBAAe,QAAQ;AACvB,eAAa,QAAQ;;AAGvB,KAAI,aACF,MAAK,IAAI,QAAQ,QAAQ,cAAc,GAAG,SAAS,GAAG,SAAS;EAC7D,MAAM,SAAS,aAAa;AAC5B,MAAI,OACF,QAAO;;AAKb,QAAO,cAAc;;AAGvB,SAAgB,4BACd,SAC+C;CAC/C,MAAM,qBAAqB,QAAQ,iBAAiB,QAAQ,gBAAgB;AAC5E,KAAI,mBACF,QAAO;EACL,WAAW;EACX,eAAe;EAChB;AAGH,KAAI,QAAQ,mBACV,MAAK,IAAI,QAAQ,QAAQ,mBAAmB,SAAS,GAAG,SAAS,GAAG,SAAS;EAC3E,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,mBAAmB,OAAO;AACxF,MAAI,qBACF,QAAO;GACL,WAAW;GACX,eAAe;GAChB;;CAKP,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,kBAAkB;AAChF,QAAO;EACL,WAAW,wBAAwB;EACnC,eAAe,QAAQ,qBAAqB;EAC7C;;AAGH,SAAgB,2BAOd,SAOU;CACV,IAAI,UAAU,QAAQ;AAEtB,KAAI,CAAC,QAAQ,mBACX,MAAK,IAAI,QAAQ,QAAQ,cAAc,SAAS,GAAG,SAAS,GAAG,SAAS;EACtE,MAAM,kBAAkB,QAAQ,iBAAiB,QAAQ,cAAc,OAAO;AAC9E,MAAI,CAAC,gBACH;EAGF,MAAM,eAAe,QAAQ,sBAAsB,QAAQ,oBAAoB,SAAS;EACxF,MAAM,cAAc,QAAQ,mBAC1B,4BAA4B,QAAQ,eAAe,cAAc,QAAQ,cAAc,CACxF;AACD,YAAU,QAAQ,aAAa,iBAAiB,SAAS,YAAY;AAErE,MACE,QAAQ,gBACR,QAAQ,+BACR,QAAQ,sBACR;GACA,MAAM,gBAAgB,QAAQ,qBAC5B,QAAQ,iBAAiB,EAAE,EAC3B,cACA,QAAQ,cACT;AACD,aAAU,QAAQ,4BAA4B,EAAE,UAAU,eAAe,EAAE,QAAQ;;;AAKzF,KAAI,QAAQ,gBAAgB,QAAQ,8BAA8B,QAAQ,qBACxE,WAAU,QAAQ,oBAAoB,QAAQ,sBAAsB,QAAQ;AAG9E,QAAO;;AAGT,eAAsB,8BACpB,SACmB;CACnB,MAAM,YAAY,QAAQ,uBAAuB,QAAQ,SAAS,EAChE,SAAS,QAAQ,yBAAyB,EAC3C,CAAC;AAEF,KAAI,QAAQ,cAAc;EAIxB,MAAM,UAAU,IAAI,QAAQ;GAC1B,gBAAgB;GAChB,MAAM;GACP,CAAC;AACF,iCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,SAAO,IAAI,SAAS,WAAW;GAC7B,QAAQ,QAAQ;GAChB;GACD,CAAC;;AAGJ,QAAO,QAAQ,mBAAmB,WAAW,QAAQ,OAAO"}
+{"version":3,"file":"app-page-boundary.js","names":[],"sources":["../../src/server/app-page-boundary.ts"],"sourcesContent":["import { runWithFetchDedupe } from \"vinext/shims/fetch-cache\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport {\n  VINEXT_RSC_CONTENT_TYPE,\n  VINEXT_RSC_VARY_HEADER,\n  applyRscCompatibilityIdHeader,\n} from \"./app-rsc-cache-busting.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\nexport type AppPageParams = Record<string, string | string[]>;\n\ntype ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModule?: TModule | null;\n  routeNotFoundModule?: TModule | null;\n  routeUnauthorizedModule?: TModule | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {\n  layoutIndex: number;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;\n  routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;\n  routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  globalErrorModule?: TModule | null;\n  errorModules?: readonly (TModule | null | undefined)[] | null;\n  layoutErrorModules?: readonly (TModule | null | undefined)[] | null;\n  pageErrorModule?: TModule | null;\n};\n\ntype ResolveAppPageErrorBoundaryResult<TComponent> = {\n  component: TComponent | null;\n  isGlobalError: boolean;\n};\n\ntype WrapAppPageBoundaryElementOptions<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n> = {\n  element: TElement;\n  getDefaultExport: (\n    module: TLayoutModule | null | undefined,\n  ) => TLayoutComponent | null | undefined;\n  globalErrorComponent?: TGlobalErrorComponent | null;\n  includeGlobalErrorBoundary: boolean;\n  isRscRequest: boolean;\n  layoutModules: readonly (TLayoutModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  renderErrorBoundary: (component: TGlobalErrorComponent, children: TElement) => TElement;\n  renderLayout: (component: TLayoutComponent, children: TElement, params: unknown) => TElement;\n  renderLayoutSegmentProvider?: (\n    segmentMap: { children: TChildSegments },\n    children: TElement,\n  ) => TElement;\n  resolveChildSegments?: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => TChildSegments;\n  routeSegments?: readonly string[];\n  skipLayoutWrapping?: boolean;\n};\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype RenderAppPageBoundaryResponseOptions<TElement> = {\n  createHtmlResponse: (rscStream: ReadableStream<Uint8Array>, status: number) => Promise<Response>;\n  createRscOnErrorHandler: () => AppPageBoundaryOnError;\n  element: TElement;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  renderToReadableStream: (\n    element: TElement,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  status: number;\n};\n\nexport function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(\n  options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>,\n): TComponent | null {\n  let boundaryModule: TModule | null | undefined;\n\n  if (options.statusCode === 403) {\n    boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;\n  } else {\n    boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;\n  }\n\n  return options.getDefaultExport(boundaryModule) ?? null;\n}\n\nexport function resolveAppPageParentHttpAccessBoundaryModule<TModule>(\n  options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>,\n): TModule | null {\n  let routeModules = options.routeNotFoundModules;\n  let rootModule = options.rootNotFoundModule;\n\n  if (options.statusCode === 403) {\n    routeModules = options.routeForbiddenModules;\n    rootModule = options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    routeModules = options.routeUnauthorizedModules;\n    rootModule = options.rootUnauthorizedModule;\n  }\n\n  if (routeModules) {\n    for (let index = options.layoutIndex - 1; index >= 0; index--) {\n      const module = routeModules[index];\n      if (module) {\n        return module;\n      }\n    }\n  }\n\n  return rootModule ?? null;\n}\n\nexport function resolveAppPageErrorBoundary<TModule, TComponent>(\n  options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>,\n): ResolveAppPageErrorBoundaryResult<TComponent> {\n  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);\n  if (pageErrorComponent) {\n    return {\n      component: pageErrorComponent,\n      isGlobalError: false,\n    };\n  }\n\n  const segmentErrorModules = options.errorModules ?? options.layoutErrorModules;\n  if (segmentErrorModules) {\n    for (let index = segmentErrorModules.length - 1; index >= 0; index--) {\n      const segmentErrorComponent = options.getDefaultExport(segmentErrorModules[index]);\n      if (segmentErrorComponent) {\n        return {\n          component: segmentErrorComponent,\n          isGlobalError: false,\n        };\n      }\n    }\n  }\n\n  const globalErrorComponent = options.getDefaultExport(options.globalErrorModule);\n  return {\n    component: globalErrorComponent ?? null,\n    isGlobalError: Boolean(globalErrorComponent),\n  };\n}\n\nexport function wrapAppPageBoundaryElement<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n>(\n  options: WrapAppPageBoundaryElementOptions<\n    TElement,\n    TLayoutModule,\n    TLayoutComponent,\n    TChildSegments,\n    TGlobalErrorComponent\n  >,\n): TElement {\n  let element = options.element;\n\n  if (!options.skipLayoutWrapping) {\n    for (let index = options.layoutModules.length - 1; index >= 0; index--) {\n      const layoutComponent = options.getDefaultExport(options.layoutModules[index]);\n      if (!layoutComponent) {\n        continue;\n      }\n\n      const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;\n      const asyncParams = options.makeThenableParams(\n        resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams),\n      );\n      element = options.renderLayout(layoutComponent, element, asyncParams);\n\n      if (\n        options.isRscRequest &&\n        options.renderLayoutSegmentProvider &&\n        options.resolveChildSegments\n      ) {\n        const childSegments = options.resolveChildSegments(\n          options.routeSegments ?? [],\n          treePosition,\n          options.matchedParams,\n        );\n        element = options.renderLayoutSegmentProvider({ children: childSegments }, element);\n      }\n    }\n  }\n\n  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) {\n    element = options.renderErrorBoundary(options.globalErrorComponent, element);\n  }\n\n  return element;\n}\n\nexport async function renderAppPageBoundaryResponse<TElement>(\n  options: RenderAppPageBoundaryResponseOptions<TElement>,\n): Promise<Response> {\n  // Defensive wrap for standalone callers; idempotent under dispatchAppPage.\n  // The async stream consumption that follows relies on the surrounding\n  // runWithRequestContext to keep ALS state alive after this synchronous call\n  // returns. See app-page-render.ts for the same pattern.\n  const rscStream = runWithFetchDedupe(() =>\n    options.renderToReadableStream(options.element, {\n      onError: options.createRscOnErrorHandler(),\n    }),\n  );\n\n  if (options.isRscRequest) {\n    // Do NOT clear request-scoped context here. RSC responses are consumed lazily\n    // by the client, so headers()/cookies() and async server components still need\n    // their ALS-backed state while the stream is being read.\n    const headers = new Headers({\n      \"Content-Type\": VINEXT_RSC_CONTENT_TYPE,\n      Vary: VINEXT_RSC_VARY_HEADER,\n    });\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n    applyRscCompatibilityIdHeader(headers);\n\n    return new Response(rscStream, {\n      status: options.status,\n      headers,\n    });\n  }\n\n  return options.createHtmlResponse(rscStream, options.status);\n}\n"],"mappings":";;;;;AAkGA,SAAgB,0CACd,SACmB;CACnB,IAAI;CAEJ,IAAI,QAAQ,eAAe,KACzB,iBAAiB,QAAQ,wBAAwB,QAAQ;MACpD,IAAI,QAAQ,eAAe,KAChC,iBAAiB,QAAQ,2BAA2B,QAAQ;MAE5D,iBAAiB,QAAQ,uBAAuB,QAAQ;CAG1D,OAAO,QAAQ,iBAAiB,eAAe,IAAI;;AAGrD,SAAgB,6CACd,SACgB;CAChB,IAAI,eAAe,QAAQ;CAC3B,IAAI,aAAa,QAAQ;CAEzB,IAAI,QAAQ,eAAe,KAAK;EAC9B,eAAe,QAAQ;EACvB,aAAa,QAAQ;QAChB,IAAI,QAAQ,eAAe,KAAK;EACrC,eAAe,QAAQ;EACvB,aAAa,QAAQ;;CAGvB,IAAI,cACF,KAAK,IAAI,QAAQ,QAAQ,cAAc,GAAG,SAAS,GAAG,SAAS;EAC7D,MAAM,SAAS,aAAa;EAC5B,IAAI,QACF,OAAO;;CAKb,OAAO,cAAc;;AAGvB,SAAgB,4BACd,SAC+C;CAC/C,MAAM,qBAAqB,QAAQ,iBAAiB,QAAQ,gBAAgB;CAC5E,IAAI,oBACF,OAAO;EACL,WAAW;EACX,eAAe;EAChB;CAGH,MAAM,sBAAsB,QAAQ,gBAAgB,QAAQ;CAC5D,IAAI,qBACF,KAAK,IAAI,QAAQ,oBAAoB,SAAS,GAAG,SAAS,GAAG,SAAS;EACpE,MAAM,wBAAwB,QAAQ,iBAAiB,oBAAoB,OAAO;EAClF,IAAI,uBACF,OAAO;GACL,WAAW;GACX,eAAe;GAChB;;CAKP,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,kBAAkB;CAChF,OAAO;EACL,WAAW,wBAAwB;EACnC,eAAe,QAAQ,qBAAqB;EAC7C;;AAGH,SAAgB,2BAOd,SAOU;CACV,IAAI,UAAU,QAAQ;CAEtB,IAAI,CAAC,QAAQ,oBACX,KAAK,IAAI,QAAQ,QAAQ,cAAc,SAAS,GAAG,SAAS,GAAG,SAAS;EACtE,MAAM,kBAAkB,QAAQ,iBAAiB,QAAQ,cAAc,OAAO;EAC9E,IAAI,CAAC,iBACH;EAGF,MAAM,eAAe,QAAQ,sBAAsB,QAAQ,oBAAoB,SAAS;EACxF,MAAM,cAAc,QAAQ,mBAC1B,4BAA4B,QAAQ,eAAe,cAAc,QAAQ,cAAc,CACxF;EACD,UAAU,QAAQ,aAAa,iBAAiB,SAAS,YAAY;EAErE,IACE,QAAQ,gBACR,QAAQ,+BACR,QAAQ,sBACR;GACA,MAAM,gBAAgB,QAAQ,qBAC5B,QAAQ,iBAAiB,EAAE,EAC3B,cACA,QAAQ,cACT;GACD,UAAU,QAAQ,4BAA4B,EAAE,UAAU,eAAe,EAAE,QAAQ;;;CAKzF,IAAI,QAAQ,gBAAgB,QAAQ,8BAA8B,QAAQ,sBACxE,UAAU,QAAQ,oBAAoB,QAAQ,sBAAsB,QAAQ;CAG9E,OAAO;;AAGT,eAAsB,8BACpB,SACmB;CAKnB,MAAM,YAAY,yBAChB,QAAQ,uBAAuB,QAAQ,SAAS,EAC9C,SAAS,QAAQ,yBAAyB,EAC3C,CAAC,CACH;CAED,IAAI,QAAQ,cAAc;EAIxB,MAAM,UAAU,IAAI,QAAQ;GAC1B,gBAAgB;GAChB,MAAM;GACP,CAAC;EACF,+BAA+B,SAAS,QAAQ,qBAAqB,KAAK;EAC1E,8BAA8B,QAAQ;EAEtC,OAAO,IAAI,SAAS,WAAW;GAC7B,QAAQ,QAAQ;GAChB;GACD,CAAC;;CAGJ,OAAO,QAAQ,mBAAmB,WAAW,QAAQ,OAAO"}

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

@@ -1,5 +1,8 @@
+import { RenderObservation } from "./cache-proof.js";
 import { CacheControlMetadata, CachedAppPageValue } from "../shims/cache.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ISRCacheEntry } from "./isr-cache.js";
+import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 
 //#region src/server/app-page-cache.d.ts
 type AppPageDebugLogger = (event: string, detail: string) => void;
@@ -10,10 +13,16 @@ type AppPageRequestCacheLife = {
   revalidate?: number;
   expire?: number;
 };
+type BuildAppPageCacheRenderObservation = (input: {
+  cacheTags: readonly string[];
+  state: AppPageRenderObservationState;
+}) => RenderObservation;
 type AppPageCacheRenderResult = {
   cacheControl?: CacheControlMetadata;
   html: string;
+  htmlRenderObservation?: RenderObservation;
   rscData: ArrayBuffer;
+  rscRenderObservation?: RenderObservation;
   tags: string[];
 };
 type BuildAppPageCachedResponseOptions = {
@@ -21,6 +30,8 @@ type BuildAppPageCachedResponseOptions = {
   cacheState: "HIT" | "STALE";
   expireSeconds?: number;
   isRscRequest: boolean;
+  middlewareHeaders?: Headers | null;
+  middlewareStatus?: number | null;
   mountedSlotsHeader?: string | null;
   revalidateSeconds: number;
 };
@@ -31,9 +42,12 @@ type ReadAppPageCacheResponseOptions = {
   isrDebug?: AppPageDebugLogger;
   isrGet: AppPageCacheGetter;
   isrHtmlKey: (pathname: string) => string;
-  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;
+  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null, renderMode?: AppRscRenderMode) => string;
   isrSet: AppPageCacheSetter;
+  middlewareHeaders?: Headers | null;
+  middlewareStatus?: number | null;
   mountedSlotsHeader?: string | null;
+  renderMode?: AppRscRenderMode;
   expireSeconds?: number;
   revalidateSeconds: number;
   renderFreshPageForCache: () => Promise<AppPageCacheRenderResult>;
@@ -44,11 +58,14 @@ type FinalizeAppPageHtmlCacheResponseOptions = {
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
   consumeDynamicUsage: () => boolean;
+  consumeRenderObservationState?: () => AppPageRenderObservationState;
+  createHtmlRenderObservation?: BuildAppPageCacheRenderObservation;
+  createRscRenderObservation?: BuildAppPageCacheRenderObservation;
   getPageTags: () => string[];
   getRequestCacheLife?: () => AppPageRequestCacheLife | null;
   isrDebug?: AppPageDebugLogger;
   isrHtmlKey: (pathname: string) => string;
-  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;
+  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null, renderMode?: AppRscRenderMode) => string;
   isrSet: AppPageCacheSetter;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;
@@ -59,13 +76,16 @@ type ScheduleAppPageRscCacheWriteOptions = {
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
   consumeDynamicUsage: () => boolean;
+  consumeRenderObservationState?: () => AppPageRenderObservationState;
+  createRscRenderObservation?: BuildAppPageCacheRenderObservation;
   dynamicUsedDuringBuild: boolean;
   getPageTags: () => string[];
   getRequestCacheLife?: () => AppPageRequestCacheLife | null;
   isrDebug?: AppPageDebugLogger;
-  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;
+  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null, renderMode?: AppRscRenderMode) => string;
   isrSet: AppPageCacheSetter;
   mountedSlotsHeader?: string | null;
+  renderMode?: AppRscRenderMode;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;
   revalidateSeconds: number | null;

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

@@ -1,7 +1,11 @@
+import { VINEXT_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
+import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
-import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
+import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { buildCachedRevalidateCacheControl } from "./cache-control.js";
 import { readStreamAsText } from "../utils/text-stream.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";
 function buildAppPageCacheTags(pathname, extraTags) {
@@ -21,11 +25,22 @@ function buildAppPageCacheTags(pathname, extraTags) {
 	}
 	tags.push(`_N_T_${built}/page`);
 	for (const tag of extraTags) if (!tags.includes(tag)) tags.push(tag);
-	return tags;
+	return tags.map(encodeCacheTag);
 }
 function buildAppPageCacheControl(cacheState, revalidateSeconds, expireSeconds) {
 	return buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expireSeconds);
 }
+function buildAppPageCachedHeaders(options) {
+	const headers = new Headers({
+		"Cache-Control": options.cacheControl,
+		"Content-Type": options.contentType,
+		Vary: VINEXT_RSC_VARY_HEADER,
+		[VINEXT_CACHE_HEADER]: options.cacheState
+	});
+	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
+	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
+	return headers;
+}
 function getCachedAppPageValue(entry) {
 	return entry?.value.value && entry.value.value.kind === "APP_PAGE" ? entry.value.value : null;
 }
@@ -42,37 +57,39 @@ function resolveAppPageCacheWritePolicy(options) {
 	};
 }
 function buildAppPageCachedResponse(cachedValue, options) {
-	const status = cachedValue.status || 200;
+	const status = options.middlewareStatus ?? (cachedValue.status || 200);
 	const revalidateSeconds = options.cacheControl?.revalidate ?? options.revalidateSeconds;
 	const expireSeconds = options.cacheControl === void 0 ? void 0 : options.cacheControl.expire ?? options.expireSeconds;
-	const headers = {
-		"Cache-Control": buildAppPageCacheControl(options.cacheState, revalidateSeconds, expireSeconds),
-		Vary: VINEXT_RSC_VARY_HEADER,
-		"X-Vinext-Cache": options.cacheState
-	};
+	const cacheControl = buildAppPageCacheControl(options.cacheState, revalidateSeconds, expireSeconds);
 	if (options.isRscRequest) {
 		if (!cachedValue.rscData) return null;
-		const rscHeaders = {
-			"Content-Type": "text/x-component; charset=utf-8",
-			...headers
-		};
-		if (options.mountedSlotsHeader) rscHeaders["X-Vinext-Mounted-Slots"] = options.mountedSlotsHeader;
+		const rscHeaders = buildAppPageCachedHeaders({
+			cacheControl,
+			cacheState: options.cacheState,
+			contentType: VINEXT_RSC_CONTENT_TYPE,
+			middlewareHeaders: options.middlewareHeaders,
+			mountedSlotsHeader: options.mountedSlotsHeader
+		});
+		applyRscCompatibilityIdHeader(rscHeaders);
 		return new Response(cachedValue.rscData, {
 			status,
 			headers: rscHeaders
 		});
 	}
 	if (typeof cachedValue.html !== "string" || cachedValue.html.length === 0) return null;
+	const htmlHeaders = buildAppPageCachedHeaders({
+		cacheControl,
+		cacheState: options.cacheState,
+		contentType: "text/html; charset=utf-8",
+		middlewareHeaders: options.middlewareHeaders
+	});
 	return new Response(cachedValue.html, {
 		status,
-		headers: {
-			"Content-Type": "text/html; charset=utf-8",
-			...headers
-		}
+		headers: htmlHeaders
 	});
 }
 async function readAppPageCacheResponse(options) {
-	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader) : options.isrHtmlKey(options.cleanPathname);
+	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode) : options.isrHtmlKey(options.cleanPathname);
 	try {
 		const cached = await options.isrGet(isrKey);
 		const cachedValue = getCachedAppPageValue(cached);
@@ -82,6 +99,8 @@ async function readAppPageCacheResponse(options) {
 				cacheControl: cached?.value.cacheControl,
 				expireSeconds: options.expireSeconds,
 				isRscRequest: options.isRscRequest,
+				middlewareHeaders: options.middlewareHeaders,
+				middlewareStatus: options.middlewareStatus,
 				mountedSlotsHeader: options.mountedSlotsHeader,
 				revalidateSeconds: options.revalidateSeconds
 			});
@@ -93,13 +112,13 @@ async function readAppPageCacheResponse(options) {
 			options.isrDebug?.("MISS (empty cached entry)", options.cleanPathname);
 		}
 		if (cached?.isStale && cachedValue) {
-			const regenerationKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader) : options.isrHtmlKey(options.cleanPathname);
+			const regenerationKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode) : options.isrHtmlKey(options.cleanPathname);
 			options.scheduleBackgroundRegeneration(regenerationKey, async () => {
 				const revalidatedPage = await options.renderFreshPageForCache();
 				const revalidateSeconds = revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;
 				const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;
-				const writes = [options.isrSet(options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader), buildAppPageCacheValue("", revalidatedPage.rscData, 200), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
-				if (!options.isRscRequest) writes.push(options.isrSet(options.isrHtmlKey(options.cleanPathname), buildAppPageCacheValue(revalidatedPage.html, void 0, 200), revalidateSeconds, revalidatedPage.tags, expireSeconds));
+				const writes = [options.isrSet(options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
+				if (!options.isRscRequest) writes.push(options.isrSet(options.isrHtmlKey(options.cleanPathname), buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds));
 				await Promise.all(writes);
 				options.isrDebug?.("regen complete", options.cleanPathname);
 			});
@@ -108,6 +127,8 @@ async function readAppPageCacheResponse(options) {
 				cacheControl: cached.value.cacheControl,
 				expireSeconds: options.expireSeconds,
 				isRscRequest: options.isRscRequest,
+				middlewareHeaders: options.middlewareHeaders,
+				middlewareStatus: options.middlewareStatus,
 				mountedSlotsHeader: options.mountedSlotsHeader,
 				revalidateSeconds: options.revalidateSeconds
 			});
@@ -132,7 +153,7 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 	const clientHeaders = new Headers(response.headers);
 	if (options.preserveClientResponseHeaders !== true) {
 		clientHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
-		clientHeaders.set("X-Vinext-Cache", "MISS");
+		clientHeaders.set(VINEXT_CACHE_HEADER, "MISS");
 	}
 	const cachePromise = (async () => {
 		try {
@@ -151,8 +172,17 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 				return;
 			}
 			const pageTags = options.getPageTags();
-			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
-			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
+			const observationState = options.consumeRenderObservationState?.() ?? createEmptyAppPageRenderObservationState();
+			const htmlRenderObservation = options.createHtmlRenderObservation?.({
+				cacheTags: pageTags,
+				state: observationState
+			});
+			const rscRenderObservation = options.createRscRenderObservation?.({
+				cacheTags: pageTags,
+				state: observationState
+			});
+			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200, htmlRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
+			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200, rscRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
 			await Promise.all(writes);
 			options.isrDebug?.("HTML cache written", htmlKey);
 		} catch (cacheError) {
@@ -171,7 +201,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	if (options.preserveClientResponseHeaders === true) return response;
 	const clientHeaders = new Headers(response.headers);
 	clientHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
-	clientHeaders.set("X-Vinext-Cache", "MISS");
+	clientHeaders.set(VINEXT_CACHE_HEADER, "MISS");
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -181,7 +211,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 function scheduleAppPageRscCacheWrite(options) {
 	const capturedRscDataPromise = options.capturedRscDataPromise;
 	if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) return false;
-	const rscKey = options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader);
+	const rscKey = options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode);
 	const cachePromise = (async () => {
 		try {
 			const rscData = await capturedRscDataPromise;
@@ -198,7 +228,13 @@ function scheduleAppPageRscCacheWrite(options) {
 				options.isrDebug?.("RSC cache write skipped (no cache policy)", rscKey);
 				return;
 			}
-			await options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200), cachePolicy.revalidateSeconds, options.getPageTags(), cachePolicy.expireSeconds);
+			const pageTags = options.getPageTags();
+			const observationState = options.consumeRenderObservationState?.() ?? createEmptyAppPageRenderObservationState();
+			const rscRenderObservation = options.createRscRenderObservation?.({
+				cacheTags: pageTags,
+				state: observationState
+			});
+			await options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200, rscRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds);
 			options.isrDebug?.("RSC cache written", rscKey);
 		} catch (cacheError) {
 			console.error("[vinext] ISR RSC cache write error:", cacheError);