vinext 1.0.0-beta.9 → 1.0.0

package/dist/server/app-elements-wire.d.ts

@@ -3,22 +3,23 @@ import { CacheEntryReuseProof } from "./cache-proof.js";
 import { ClientReuseManifestSkipDisposition } from "./client-reuse-manifest.js";
 import { BfcacheSegmentIdentity } from "./bfcache-identity.js";
 import { compareStrings } from "../utils/compare.js";
+import { AppElementsWireElementKey } from "./app-elements-wire-key.js";
 import { ReactNode } from "react";
 //#region src/server/app-elements-wire.d.ts
-declare const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
-declare const APP_CACHE_ENTRY_REUSE_PROOF_KEY = "__cacheEntryReuseProof";
-declare const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
-declare const APP_INTERCEPTION_KEY = "__interception";
-declare const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
-declare const APP_LAYOUT_IDS_KEY = "__layoutIds";
-declare const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
-declare const APP_ROUTE_KEY = "__route";
-declare const APP_ROOT_LAYOUT_KEY = "__rootLayout";
-declare const APP_SKIPPED_LAYOUT_IDS_KEY = "__skippedLayoutIds";
-declare const APP_SOURCE_PAGE_SEGMENTS_KEY = "__srcPage";
-declare const APP_SLOT_BINDINGS_KEY = "__slotBindings";
+export declare const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
+export declare const APP_CACHE_ENTRY_REUSE_PROOF_KEY = "__cacheEntryReuseProof";
+export declare const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
+export declare const APP_INTERCEPTION_KEY = "__interception";
+export declare const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
+export declare const APP_LAYOUT_IDS_KEY = "__layoutIds";
+export declare const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
+export declare const APP_ROUTE_KEY = "__route";
+export declare const APP_ROOT_LAYOUT_KEY = "__rootLayout";
+export declare const APP_SKIPPED_LAYOUT_IDS_KEY = "__skippedLayoutIds";
+export declare const APP_SOURCE_PAGE_SEGMENTS_KEY = "__srcPage";
+export declare const APP_SLOT_BINDINGS_KEY = "__slotBindings";
 /** Opaque per-segment identities derived at the server route-graph boundary. */
-declare const APP_BFCACHE_SEGMENT_IDENTITIES_KEY = "__bfcacheSegmentIdentities";
+export declare const APP_BFCACHE_SEGMENT_IDENTITIES_KEY = "__bfcacheSegmentIdentities";
 /**
  * Static sibling segment names for the matched route, surfaced so the client
  * router can determine if a cached prefetch of a dynamic route can be reused
@@ -27,11 +28,11 @@ declare const APP_BFCACHE_SEGMENT_IDENTITIES_KEY = "__bfcacheSegmentIdentities";
  * Mirrors Next.js's `staticSiblings` tuple element on the loader-tree dynamic
  * segments (issue cloudflare/vinext#1525).
  */
-declare const APP_STATIC_SIBLINGS_KEY = "__staticSiblings";
-declare const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
-declare const UNMATCHED_SLOT: unique symbol;
+export declare const APP_STATIC_SIBLINGS_KEY = "__staticSiblings";
+export declare const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
+export declare const UNMATCHED_SLOT: unique symbol;
 type AppElementsSlotBindingState = "active" | "default" | "unmatched";
-type AppElementsSlotBinding = Readonly<{
+export type AppElementsSlotBinding = Readonly<{
   activeRouteId?: string | null;
   interceptionId?: string | null;
   interceptionSourceMatchedUrl?: string | null;
@@ -39,21 +40,21 @@ type AppElementsSlotBinding = Readonly<{
   slotId: string;
   state: AppElementsSlotBindingState;
 }>;
-type AppElementsInterception = Readonly<{
+export type AppElementsInterception = Readonly<{
   sourceMatchedUrl: string;
   sourceRouteId: string;
   slotId: string;
   targetMatchedUrl: string;
   targetRouteId: string;
 }>;
-declare const compareAppElementsSlotIds: typeof compareStrings;
-declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
+export declare const compareAppElementsSlotIds: typeof compareStrings;
+export declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
   layoutIds?: readonly string[];
 }): readonly AppElementsSlotBinding[];
-type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
+export type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
 type AppWireElementValue = ReactNode | string | null | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | readonly string[] | readonly AppElementsSlotBinding[];
-type AppElements = Readonly<Record<string, AppElementValue>>;
-type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
+export type AppElements = Readonly<Record<string, AppElementValue>>;
+export type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
 /**
  * Per-layout static/dynamic flags. `"s"` = static (skippable on next nav);
  * `"d"` = dynamic (must always render).
@@ -71,8 +72,8 @@ type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
  *   4. PARSE   — AppElementsWire.readMetadata extracts layoutFlags from the
  *                wire payload on the client side.
  */
-type LayoutFlags = Readonly<Record<string, "s" | "d">>;
-type AppElementsBfcacheSegmentIdentities = Readonly<Record<string, BfcacheSegmentIdentity>>;
+export type LayoutFlags = Readonly<Record<string, "s" | "d">>;
+export type AppElementsBfcacheSegmentIdentities = Readonly<Record<string, BfcacheSegmentIdentity>>;
 type AppElementsMetadata = {
   artifactCompatibility: ArtifactCompatibilityEnvelope;
   cacheEntryReuseProof?: CacheEntryReuseProof;
@@ -88,25 +89,6 @@ type AppElementsMetadata = {
   slotBindings: readonly AppElementsSlotBinding[];
   sourcePage: string | null;
 };
-type AppElementsWireElementKey = {
-  kind: "layout";
-  treePath: string;
-} | {
-  interceptionContext: string | null;
-  kind: "page";
-  path: string;
-} | {
-  interceptionContext: string | null;
-  kind: "route";
-  path: string;
-} | {
-  kind: "slot";
-  name: string;
-  treePath: string;
-} | {
-  kind: "template";
-  treePath: string;
-};
 type AppElementsWireMetadataInput = {
   dynamicStaleTimeSeconds?: number;
   interception?: AppElementsInterception | null;
@@ -135,7 +117,7 @@ type AppElementsWireMetadataEntries = Readonly<{
  * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements
  * which only carry render-time values.
  */
-type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | number | readonly string[] | readonly AppElementsSlotBinding[]>>;
+export type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | AppElementsBfcacheSegmentIdentities | ArtifactCompatibilityEnvelope | CacheEntryReuseProof | AppElementsInterception | number | readonly string[] | readonly AppElementsSlotBinding[]>>;
 type AppElementsWireKeys = {
   readonly artifactCompatibility: typeof APP_ARTIFACT_COMPATIBILITY_KEY;
   readonly cacheEntryReuseProof: typeof APP_CACHE_ENTRY_REUSE_PROOF_KEY;
@@ -177,7 +159,7 @@ type AppElementsWireCodec = {
     [APP_LAYOUT_FLAGS_KEY]: LayoutFlags;
   };
 };
-declare function normalizeAppElements(elements: AppWireElements): AppElements;
+export declare function normalizeAppElements(elements: AppWireElements): AppElements;
 /**
  * Type predicate for a plain (non-null, non-array) record of app payload values.
  * Used to distinguish the App Router payload object from bare React elements at
@@ -187,11 +169,11 @@ declare function normalizeAppElements(elements: AppWireElements): AppElements;
  * to React's canonical `isValidElement` so we don't depend on React's internal
  * `$$typeof` marker scheme.
  */
-declare function isAppElementsRecord(value: unknown): value is Readonly<Record<string, unknown>>;
-declare function withLayoutFlags<T extends Record<string, unknown>>(elements: T, layoutFlags: LayoutFlags): T & {
+export declare function isAppElementsRecord(value: unknown): value is Readonly<Record<string, unknown>>;
+export declare function withLayoutFlags<T extends Record<string, unknown>>(elements: T, layoutFlags: LayoutFlags): T & {
   [APP_LAYOUT_FLAGS_KEY]: LayoutFlags;
 };
-declare function buildOutgoingAppPayload(input: {
+export declare function buildOutgoingAppPayload(input: {
   element: ReactNode | AppElements;
   artifactCompatibility?: ArtifactCompatibilityEnvelope;
   cacheEntryReuseProof?: CacheEntryReuseProof;
@@ -199,7 +181,6 @@ declare function buildOutgoingAppPayload(input: {
   layoutFlags: LayoutFlags;
   skipDisposition?: ClientReuseManifestSkipDisposition;
 }): ReactNode | AppOutgoingElements;
-declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
-declare const AppElementsWire: AppElementsWireCodec;
-//#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsBfcacheSegmentIdentities, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
+export declare const AppElementsWire: AppElementsWireCodec;
+//#endregion

package/dist/server/app-elements-wire.js

@@ -1,6 +1,7 @@
-import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
-import { compareStrings } from "../utils/compare.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { compareStrings } from "../utils/compare.js";
+import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
+import { createAppElementsWireSlotId, isAppElementsWireSlotId, parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
 import { createArtifactCompatibilityEnvelope, parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { releaseAppElementRenderDependency } from "./app-render-dependency.js";
 import { isValidElement } from "react";
@@ -98,85 +99,13 @@ function createAppPayloadLayoutId(treePath) {
 function createAppPayloadTemplateId(treePath) {
 	return `template:${treePath}`;
 }
-function createAppPayloadSlotId(slotName, treePath) {
-	return `slot:${slotName}:${treePath}`;
-}
 function createAppPayloadCacheKey(rscUrl, interceptionContext) {
 	return appendInterceptionContext(rscUrl, interceptionContext);
 }
-function parsePathWithInterception(input) {
-	const separatorIndex = input.indexOf(APP_INTERCEPTION_SEPARATOR);
-	const path = separatorIndex === -1 ? input : input.slice(0, separatorIndex);
-	if (!path.startsWith("/")) return null;
-	return {
-		interceptionContext: separatorIndex === -1 ? null : input.slice(separatorIndex + 1),
-		path
-	};
-}
-/**
-* AppElements tree paths are absolute route-tree paths on the wire.
-* Bare segment names are not valid layout/template/slot tree identities.
-*/
-function parseTreePath(input) {
-	return input.startsWith("/") ? input : null;
-}
-function parseAppElementsWireElementKey(key) {
-	if (key.startsWith("route:")) {
-		const parsed = parsePathWithInterception(key.slice(6));
-		if (!parsed) return null;
-		return {
-			interceptionContext: parsed.interceptionContext,
-			kind: "route",
-			path: parsed.path
-		};
-	}
-	if (key.startsWith("page:")) {
-		const parsed = parsePathWithInterception(key.slice(5));
-		if (!parsed) return null;
-		return {
-			interceptionContext: parsed.interceptionContext,
-			kind: "page",
-			path: parsed.path
-		};
-	}
-	if (key.startsWith("layout:")) {
-		const treePath = parseTreePath(key.slice(7));
-		return treePath ? {
-			kind: "layout",
-			treePath
-		} : null;
-	}
-	if (key.startsWith("template:")) {
-		const treePath = parseTreePath(key.slice(9));
-		return treePath ? {
-			kind: "template",
-			treePath
-		} : null;
-	}
-	if (key.startsWith("slot:")) {
-		const body = key.slice(5);
-		const separatorIndex = body.indexOf(":");
-		if (separatorIndex <= 0) return null;
-		const name = body.slice(0, separatorIndex);
-		const treePath = parseTreePath(body.slice(separatorIndex + 1));
-		return treePath ? {
-			kind: "slot",
-			name,
-			treePath
-		} : null;
-	}
-	return null;
-}
 function isAppElementsWireBfcacheIdentityId(key) {
 	const kind = parseAppElementsWireElementKey(key)?.kind;
 	return kind === "page" || kind === "layout" || kind === "template" || kind === "slot";
 }
-function isAppElementsWireSlotId(key) {
-	if (!key.startsWith("slot:")) return false;
-	const body = key.slice(5);
-	const separatorIndex = body.indexOf(":");
-	return separatorIndex > 0 && body.charCodeAt(separatorIndex + 1) === 47;
-}
 function isSourcePageSegments(value) {
 	return Array.isArray(value) && value.length > 0 && value.every((segment) => typeof segment === "string" && segment.length > 0 && !segment.includes("/"));
 }
@@ -473,7 +402,7 @@ const AppElementsWire = {
 	encodeOutgoingPayload: buildOutgoingAppPayload,
 	encodePageId: createAppPayloadPageId,
 	encodeRouteId: createAppPayloadRouteId,
-	encodeSlotId: createAppPayloadSlotId,
+	encodeSlotId: createAppElementsWireSlotId,
 	encodeTemplateId: createAppPayloadTemplateId,
 	isSlotId: isAppElementsWireSlotId,
 	parseElementKey: parseAppElementsWireElementKey,

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

@@ -1,8 +1,8 @@
 import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsBfcacheSegmentIdentities, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 //#region src/server/app-elements.d.ts
-declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
-declare function getMountedSlotIds(elements: AppElements): string[];
-declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
-declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
+export declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
+export declare function getMountedSlotIds(elements: AppElements): string[];
+export declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
+export declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsBfcacheSegmentIdentities, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsBfcacheSegmentIdentities, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };

package/dist/server/app-elements.js

@@ -1,5 +1,5 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 //#region src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 function getMountedSlotIds(elements) {

package/dist/server/app-fallback-renderer.d.ts

@@ -9,6 +9,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { ApplyAppPageFileBasedMetadata } from "./app-page-head.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 { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { ReactNode } from "react";
 //#region src/server/app-fallback-renderer.d.ts
@@ -32,7 +33,7 @@ type AppFallbackRendererFontProviders = {
 type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> = {
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
   clearRequestContext: () => void;
-  createRscOnErrorHandler: (request: Request, pathname: string, routePath: string) => AppPageBoundaryOnError;
+  createRscOnErrorHandler: (request: Request, pathname: string, routePath: string, overrides?: AppRenderErrorContextOverrides) => AppPageBoundaryOnError;
   fontProviders: AppFallbackRendererFontProviders;
   getAndClearPendingCookies?: () => string[];
   getNavigationContext: () => NavigationContext | null;
@@ -100,6 +101,5 @@ type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   }, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;
   renderNotFound: (route: AppPageBoundaryRoute<TModule> | null, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;
 };
-declare function createAppFallbackRenderer<TModule extends AppPageModule>(options: AppFallbackRendererOptions<TModule>): AppFallbackRenderer<TModule>;
-//#endregion
-export { createAppFallbackRenderer };
+export declare function createAppFallbackRenderer<TModule extends AppPageModule>(options: AppFallbackRendererOptions<TModule>): AppFallbackRenderer<TModule>;
+//#endregion

package/dist/server/app-fallback-renderer.js

@@ -35,8 +35,8 @@ function createAppFallbackRenderer(options) {
 					boundaryModule: globalNotFoundModule ?? null,
 					buildFontLinkHeader: fontProviders.buildFontLinkHeader,
 					clearRequestContext,
-					createRscOnErrorHandler(pathname, routePath) {
-						return buildRscOnErrorHandler(request, pathname, routePath);
+					createRscOnErrorHandler(pathname, routePath, overrides) {
+						return buildRscOnErrorHandler(request, pathname, routePath, overrides);
 					},
 					getFontLinks: fontProviders.getFontLinks,
 					getFontPreloads: fontProviders.getFontPreloads,
@@ -76,8 +76,8 @@ function createAppFallbackRenderer(options) {
 				boundaryModule: opts?.boundaryModule ?? null,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
 				clearRequestContext,
-				createRscOnErrorHandler(pathname, routePath) {
-					return buildRscOnErrorHandler(request, pathname, routePath);
+				createRscOnErrorHandler(pathname, routePath, overrides) {
+					return buildRscOnErrorHandler(request, pathname, routePath, overrides);
 				},
 				getFontLinks: fontProviders.getFontLinks,
 				getFontPreloads: fontProviders.getFontPreloads,
@@ -121,8 +121,8 @@ function createAppFallbackRenderer(options) {
 				trailingSlash,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
 				clearRequestContext,
-				createRscOnErrorHandler(pathname, routePath) {
-					return buildRscOnErrorHandler(request, pathname, routePath);
+				createRscOnErrorHandler(pathname, routePath, overrides) {
+					return buildRscOnErrorHandler(request, pathname, routePath, overrides);
 				},
 				error,
 				errorOrigin,

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

@@ -0,0 +1,15 @@
+import { FrameworkSpan } from "./framework-tracer.js";
+//#region src/server/app-fetch-tracing.d.ts
+export declare function createAppFetchSpanDescriptor(input: string | URL | Request, init?: RequestInit): {
+  readonly attributes: {
+    readonly "http.method": string;
+    readonly "http.url": string;
+    readonly "net.peer.name": string | undefined;
+    readonly "net.peer.port": string | undefined;
+  };
+  readonly kind: "client";
+  readonly name: string;
+  readonly type: "AppRender.fetch";
+};
+export declare function traceAppFetch(input: string | URL | Request, init: RequestInit | undefined, callback: (span?: FrameworkSpan) => Promise<Response>): Promise<Response>;
+//#endregion

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

@@ -0,0 +1,38 @@
+import { frameworkTracer } from "./tracer.js";
+//#region src/server/app-fetch-tracing.ts
+function createAppFetchSpanDescriptor(input, init) {
+	let url;
+	try {
+		url = new URL(input instanceof Request ? input.url : input);
+		url.username = "";
+		url.password = "";
+	} catch {}
+	const fetchUrl = url?.href ?? "";
+	const method = init?.method?.toUpperCase() || "GET";
+	const name = [
+		"fetch",
+		method,
+		fetchUrl
+	].filter(Boolean).join(" ");
+	return {
+		attributes: {
+			"http.method": method,
+			"http.url": fetchUrl,
+			"net.peer.name": url?.hostname,
+			"net.peer.port": url?.port || void 0
+		},
+		kind: "client",
+		name,
+		type: "AppRender.fetch"
+	};
+}
+function traceAppFetch(input, init, callback) {
+	if (process.env.NEXT_OTEL_FETCH_DISABLED === "1") return callback();
+	return frameworkTracer.trace(createAppFetchSpanDescriptor(input, init), async (span) => {
+		const response = await callback(span);
+		span.setAttribute("http.status_code", response.status);
+		return response;
+	});
+}
+//#endregion
+export { createAppFetchSpanDescriptor, traceAppFetch };

package/dist/server/app-history-state.d.ts

@@ -3,8 +3,8 @@ import { TraverseDirection } from "./navigation-planner.js";
 type HistoryStateRecord = {
   [key: string]: unknown;
 };
-type BfcacheIdMap = Readonly<Record<string, string>>;
-type HistoryTraversalIntent = {
+export type BfcacheIdMap = Readonly<Record<string, string>>;
+export type HistoryTraversalIntent = {
   direction: TraverseDirection;
   historyState: unknown;
   targetHistoryIndex: number | null;
@@ -18,7 +18,7 @@ type HistoryStateSnapshotRestoreDecision<TState> = {
   reason: "guarded" | "missing-history-index" | "missing-snapshot" | "stale-bfcache-version";
   targetHistoryIndex: number | null;
 };
-declare class HistoryStateSnapshotCache<TState> {
+export declare class HistoryStateSnapshotCache<TState> {
   #private;
   constructor(options: {
     maxEntries: number;
@@ -35,7 +35,7 @@ declare class HistoryStateSnapshotCache<TState> {
     historyState: unknown;
   }): HistoryStateSnapshotRestoreDecision<TState>;
 }
-declare class RestorableClientStateController<TState> {
+export declare class RestorableClientStateController<TState> {
   #private;
   constructor(options: {
     initialHistoryState: unknown;
@@ -53,16 +53,16 @@ declare class RestorableClientStateController<TState> {
   }): void;
   resolveHistoryStateSnapshotRestore(historyState: unknown): HistoryStateSnapshotRestoreDecision<TState>;
 }
-declare function createHistoryStateWithPreviousNextUrl(state: unknown, previousNextUrl: string | null): HistoryStateRecord | null;
-declare function createHistoryStateWithNavigationMetadata(state: unknown, metadata: {
+export declare function createHistoryStateWithPreviousNextUrl(state: unknown, previousNextUrl: string | null): HistoryStateRecord | null;
+export declare function createHistoryStateWithNavigationMetadata(state: unknown, metadata: {
   activeRoutePaths?: readonly string[] | null;
   bfcacheIds?: BfcacheIdMap | null;
   bfcacheVersion?: number | null;
   previousNextUrl: string | null;
   traversalIndex?: number | null;
 }): HistoryStateRecord | null;
-declare function createExternalHistoryStatePreservingMetadata(callerState: unknown, currentHistoryState: unknown): unknown;
-declare function isExternalHistoryState(state: unknown): boolean;
+export declare function createExternalHistoryStatePreservingMetadata(callerState: unknown, currentHistoryState: unknown): unknown;
+export declare function isExternalHistoryState(state: unknown): boolean;
 /**
  * Mirrors Next.js' `data?.__NA` guard in its patched History API. Passing a
  * previously captured App Router history entry back to pushState/replaceState
@@ -70,22 +70,22 @@ declare function isExternalHistoryState(state: unknown): boolean;
  * entries always carry a traversal index after bootstrap; externally patched
  * entries are distinguished by their explicit external marker.
  */
-declare function isAppOwnedHistoryState(state: unknown): boolean;
-declare function createAppOwnedHistoryState(state: unknown): unknown;
-declare function createHistoryStateWithTreeSnapshotId(state: unknown, treeSnapshotId: number | null): unknown;
-declare function createHistoryStateWithTreeSnapshotClaim(state: unknown, claimed: boolean): unknown;
-declare function isHistoryStateTreeSnapshotClaimed(state: unknown): boolean;
-declare function clearHistoryStateTreeSnapshotId(state: unknown): unknown;
-declare function readHistoryStateTreeSnapshotId(state: unknown): number | null;
-declare function readHistoryStateActiveRoutePaths(state: unknown): readonly string[] | null;
-declare function resolveActiveRoutePaths(slotBindings: readonly {
+export declare function isAppOwnedHistoryState(state: unknown): boolean;
+export declare function createAppOwnedHistoryState(state: unknown): unknown;
+export declare function createHistoryStateWithTreeSnapshotId(state: unknown, treeSnapshotId: number | null): unknown;
+export declare function createHistoryStateWithTreeSnapshotClaim(state: unknown, claimed: boolean): unknown;
+export declare function isHistoryStateTreeSnapshotClaimed(state: unknown): boolean;
+export declare function clearHistoryStateTreeSnapshotId(state: unknown): unknown;
+export declare function readHistoryStateTreeSnapshotId(state: unknown): number | null;
+export declare function readHistoryStateActiveRoutePaths(state: unknown): readonly string[] | null;
+export declare function resolveActiveRoutePaths(slotBindings: readonly {
   activeRouteId?: string | null;
   state: string;
 }[]): string[];
-declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
-declare function isBfcacheSegmentId(id: string): boolean;
-declare function readHistoryStateBfcacheIds(state: unknown): BfcacheIdMap | null;
-declare function readHistoryStateBfcacheVersion(state: unknown): number | null;
+export declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
+export declare function isBfcacheSegmentId(id: string): boolean;
+export declare function readHistoryStateBfcacheIds(state: unknown): BfcacheIdMap | null;
+export declare function readHistoryStateBfcacheVersion(state: unknown): number | null;
 /**
  * Whether a history entry's stored bfcache version matches the document's
  * current version. A missing/invalid stored version (null) is NEVER current:
@@ -95,12 +95,11 @@ declare function readHistoryStateBfcacheVersion(state: unknown): number | null;
  * carry an explicit version, so the legitimate first-document path (0 === 0)
  * still matches.
  */
-declare function isHistoryStateBfcacheVersionCurrent(state: unknown, currentVersion: number): boolean;
-declare function createHashOnlyHistoryStatePreservingNavigationMetadata(state: unknown): unknown;
-declare function readHistoryStateTraversalIndex(state: unknown): number | null;
-declare function resolveHistoryTraversalIntent(options: {
+export declare function isHistoryStateBfcacheVersionCurrent(state: unknown, currentVersion: number): boolean;
+export declare function createHashOnlyHistoryStatePreservingNavigationMetadata(state: unknown): unknown;
+export declare function readHistoryStateTraversalIndex(state: unknown): number | null;
+export declare function resolveHistoryTraversalIntent(options: {
   currentHistoryIndex: number | null;
   historyState: unknown;
 }): HistoryTraversalIntent;
-//#endregion
-export { BfcacheIdMap, HistoryStateSnapshotCache, HistoryTraversalIntent, RestorableClientStateController, clearHistoryStateTreeSnapshotId, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotClaim, createHistoryStateWithTreeSnapshotId, isAppOwnedHistoryState, isBfcacheSegmentId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, isHistoryStateTreeSnapshotClaimed, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, readHistoryStateTreeSnapshotId, resolveActiveRoutePaths, resolveHistoryTraversalIntent };
+//#endregion

package/dist/server/app-history-state.js

@@ -134,19 +134,27 @@ function createHistoryStateWithPreviousNextUrl(state, previousNextUrl) {
 function createHistoryStateWithNavigationMetadata(state, metadata) {
 	const nextState = cloneHistoryState(state);
 	const bfcacheIdsWereCleared = metadata.bfcacheIds !== void 0 && (metadata.bfcacheIds === null || Object.keys(metadata.bfcacheIds).length === 0);
-	if (metadata.activeRoutePaths !== void 0) if (metadata.activeRoutePaths === null || metadata.activeRoutePaths.length === 0) delete nextState[VINEXT_ACTIVE_ROUTE_PATHS_HISTORY_STATE_KEY];
-	else nextState[VINEXT_ACTIVE_ROUTE_PATHS_HISTORY_STATE_KEY] = [...new Set(metadata.activeRoutePaths)];
+	if (metadata.activeRoutePaths !== void 0) {
+		if (metadata.activeRoutePaths === null || metadata.activeRoutePaths.length === 0) delete nextState[VINEXT_ACTIVE_ROUTE_PATHS_HISTORY_STATE_KEY];
+		else nextState[VINEXT_ACTIVE_ROUTE_PATHS_HISTORY_STATE_KEY] = [...new Set(metadata.activeRoutePaths)];
+	}
 	if (metadata.previousNextUrl === null) delete nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];
 	else nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY] = metadata.previousNextUrl;
-	if (metadata.traversalIndex !== void 0) if (isNonNegativeSafeInteger(metadata.traversalIndex)) nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY] = metadata.traversalIndex;
-	else delete nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY];
-	if (metadata.bfcacheIds !== void 0) if (bfcacheIdsWereCleared) {
-		delete nextState[VINEXT_BFCACHE_IDS_HISTORY_STATE_KEY];
-		delete nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY];
-	} else nextState[VINEXT_BFCACHE_IDS_HISTORY_STATE_KEY] = { ...metadata.bfcacheIds };
-	if (metadata.bfcacheVersion !== void 0) if (bfcacheIdsWereCleared) delete nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY];
-	else if (isNonNegativeSafeInteger(metadata.bfcacheVersion)) nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY] = metadata.bfcacheVersion;
-	else delete nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY];
+	if (metadata.traversalIndex !== void 0) {
+		if (isNonNegativeSafeInteger(metadata.traversalIndex)) nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY] = metadata.traversalIndex;
+		else delete nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY];
+	}
+	if (metadata.bfcacheIds !== void 0) {
+		if (bfcacheIdsWereCleared) {
+			delete nextState[VINEXT_BFCACHE_IDS_HISTORY_STATE_KEY];
+			delete nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY];
+		} else nextState[VINEXT_BFCACHE_IDS_HISTORY_STATE_KEY] = { ...metadata.bfcacheIds };
+	}
+	if (metadata.bfcacheVersion !== void 0) {
+		if (bfcacheIdsWereCleared) delete nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY];
+		else if (isNonNegativeSafeInteger(metadata.bfcacheVersion)) nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY] = metadata.bfcacheVersion;
+		else delete nextState[VINEXT_BFCACHE_VERSION_HISTORY_STATE_KEY];
+	}
 	return Object.keys(nextState).length > 0 ? nextState : null;
 }
 function createExternalHistoryStatePreservingMetadata(callerState, currentHistoryState) {

package/dist/server/app-hook-warning-suppression.d.ts

@@ -1,5 +1,4 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/server/app-hook-warning-suppression.d.ts
-declare const suppressHookWarningAls: AsyncLocalStorage<boolean>;
-//#endregion
-export { suppressHookWarningAls };
+export declare const suppressHookWarningAls: AsyncLocalStorage<boolean>;
+//#endregion

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