vinext 1.3.1 → 1.4.1

package/dist/server/app-rsc-cache-busting.d.ts

@@ -1,5 +1,5 @@
-import { VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { AppRscStateFingerprintInput } from "./app-rsc-state-fingerprint.js";
 //#region src/server/app-rsc-cache-busting.d.ts
 /**
@@ -13,10 +13,10 @@ export declare const VINEXT_RSC_BUILD_ID_HEADER = "X-Vinext-RSC-Build-Id";
 export declare const VINEXT_RSC_COMPATIBILITY_ID_HEADER = "X-Vinext-RSC-Compatibility-Id";
 export declare const VINEXT_RSC_CONTENT_TYPE = "text/x-component";
 type CreateRscRequestHeadersOptions = {
-  clientReuseManifestHeader?: string | null;
   interceptionContext?: string | null;
   interceptionId?: string | null;
   mountedSlotsHeader?: string | null;
+  mountedLayoutsHeader?: string | null;
   includePrefetchHeader?: boolean;
   renderMode?: AppRscRenderMode;
   fetchPriority?: "auto" | "high" | "low";
@@ -68,11 +68,6 @@ export declare function stripRscCacheBustingSearchParam(url: URL): void;
  * are dropped. Other requests keep no `_rsc`, because it selects nothing there.
  */
 export declare function keepOnlyValidatedRscCacheBustingSearchParam(url: URL, isRscRequest: boolean): void;
-/**
- * Remove a trailing `.rsc` suffix from a pathname. Returns the pathname
- * unchanged when the suffix is absent.
- */
-export declare function stripRscSuffix(pathname: string): string;
 export declare function createCanonicalRscRequestHeaders(deploymentId?: string | null | undefined): Headers;
 /** Headers for the deterministic loading-boundary prefetch representation. */
 export declare function createCanonicalLoadingShellRscRequestHeaders(deploymentId?: string | null | undefined): Headers;
@@ -96,13 +91,18 @@ export declare function canonicalizeLoadingShellRscRequestHeaders(headers: Heade
  * appended to the base instead of resolved against it.
  */
 export declare function parseRscRequestPath(href: string): URL;
+/**
+ * A pathname as the start of a path-absolute reference. One that begins with
+ * "//" would serialize as a protocol-relative URL naming another host, so it
+ * keeps a "/." prefix, as the WHATWG URL serializer does. URL resolution drops
+ * the dot segment, so the reference still targets the same pathname on the
+ * origin it is resolved against.
+ */
+export declare function toPathAbsolutePathname(pathname: string): string;
 /**
  * Serialize the path-absolute reference callers fetch against the app origin.
- * A pathname that begins with "//" would serialize as a protocol-relative URL
- * and send the request to another host, so it keeps a "/." prefix, as the
- * WHATWG URL serializer does. URL resolution drops the dot segment, so the
- * request still targets the same pathname on the app origin, as Next.js's
- * full-URL fetch does.
+ * A "//" pathname keeps its "/." prefix so the request still targets the same
+ * pathname on the app origin, as Next.js's full-URL fetch does.
  */
 export declare function formatRscRequestPath(url: URL): string;
 export declare function createRscRequestUrl(href: string, headers: Headers): Promise<string>;

package/dist/server/app-rsc-cache-busting.js

@@ -1,5 +1,5 @@
 import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERCEPTION_ID_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_STATE_FINGERPRINT_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
-import { NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER } from "./headers.js";
+import { NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_MOUNTED_LAYOUTS_HEADER } from "./headers.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { applyDeploymentIdHeader, getDeploymentId } from "../utils/deployment-id.js";
@@ -22,8 +22,10 @@ function encodeBase64Url(bytes) {
 	for (const byte of bytes) binary += String.fromCharCode(byte);
 	return btoa(binary).replaceAll("+", "-").replaceAll("/", "_").replace(/=+$/, "");
 }
-function normalizeHeaderValue(value) {
-	return value ?? "0";
+function serializeHeaderValue(value) {
+	if (value === null) return "0";
+	if (value === "0") return "\\0";
+	return value.replaceAll("\\", "\\\\").replaceAll(",", "\\,");
 }
 function normalizeCompatibilityId(value) {
 	return value && value.length > 0 ? value : null;
@@ -57,9 +59,9 @@ function resolveHardNavigationTargetFromRscResponse(responseUrl, currentHref, or
 	const parsed = new URL(responseUrl, origin);
 	stripRscCacheBustingSearchParam(parsed);
 	const origUrl = new URL(currentHref, origin);
-	let pathname = stripRscSuffix(parsed.pathname);
+	let pathname = parsed.pathname;
 	if (origUrl.pathname.length > 1 && origUrl.pathname.endsWith("/") && !pathname.endsWith("/")) pathname += "/";
-	let hardNavigationTarget = pathname + parsed.search;
+	let hardNavigationTarget = toPathAbsolutePathname(pathname) + parsed.search;
 	if (origUrl.hash) hardNavigationTarget += origUrl.hash;
 	return hardNavigationTarget;
 }
@@ -74,21 +76,21 @@ function normalizeRenderModeHeaderValue(value) {
 	const renderMode = parseAppRscRenderMode(value);
 	return renderMode === "navigation" ? null : renderMode;
 }
-function createCacheBustingInput(headers, options = {}) {
+function createCacheBustingInput(headers) {
 	const values = [
 		headers.get(NEXT_ROUTER_PREFETCH_HEADER),
 		headers.get(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER),
 		headers.get(NEXT_ROUTER_STATE_TREE_HEADER),
 		headers.get(NEXT_URL_HEADER),
 		headers.get(VINEXT_INTERCEPTION_CONTEXT_HEADER),
-		...options.includeInterceptionIdHeader === false ? [] : [headers.get(VINEXT_INTERCEPTION_ID_HEADER)],
+		headers.get(VINEXT_INTERCEPTION_ID_HEADER),
 		headers.get(VINEXT_MOUNTED_SLOTS_HEADER),
-		...options.includeRenderModeHeader === false ? [] : [normalizeRenderModeHeaderValue(headers.get(VINEXT_RSC_RENDER_MODE_HEADER))]
+		normalizeRenderModeHeaderValue(headers.get(VINEXT_RSC_RENDER_MODE_HEADER))
 	];
 	const stateFingerprint = headers.get(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-	if (options.includeStateFingerprintHeader !== false && stateFingerprint !== null) values.push(stateFingerprint);
+	if (stateFingerprint !== null) values.push(stateFingerprint);
 	if (values.every((value) => value === null)) return null;
-	return values.map(normalizeHeaderValue).join(",");
+	return values.map(serializeHeaderValue).join(",");
 }
 async function sha256CacheBustingHash(input) {
 	const subtle = globalThis.crypto?.subtle;
@@ -147,13 +149,6 @@ function keepOnlyValidatedRscCacheBustingSearchParam(url, isRscRequest) {
 	url.search = "";
 	if (hash !== null) setRscCacheBustingSearchParam(url, hash);
 }
-/**
-* Remove a trailing `.rsc` suffix from a pathname. Returns the pathname
-* unchanged when the suffix is absent.
-*/
-function stripRscSuffix(pathname) {
-	return pathname.endsWith(".rsc") ? pathname.slice(0, -4) : pathname;
-}
 function createCanonicalRscRequestHeaders(deploymentId = getDeploymentId()) {
 	const headers = new Headers({
 		Accept: VINEXT_RSC_CONTENT_TYPE,
@@ -183,7 +178,7 @@ function createRscRequestHeaders(options = {}) {
 	if (options.interceptionContext !== void 0 && options.interceptionContext !== null) headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, options.interceptionContext);
 	if (options.interceptionId !== void 0 && options.interceptionId !== null) headers.set(VINEXT_INTERCEPTION_ID_HEADER, options.interceptionId);
 	if (options.mountedSlotsHeader !== void 0 && options.mountedSlotsHeader !== null) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
-	if (options.clientReuseManifestHeader !== void 0 && options.clientReuseManifestHeader !== null) headers.set(VINEXT_CLIENT_REUSE_MANIFEST_HEADER, options.clientReuseManifestHeader);
+	if (options.mountedLayoutsHeader !== void 0 && options.mountedLayoutsHeader !== null) headers.set(VINEXT_MOUNTED_LAYOUTS_HEADER, options.mountedLayoutsHeader);
 	const renderMode = options.renderMode ?? "navigation";
 	if (renderMode !== "navigation") headers.set(VINEXT_RSC_RENDER_MODE_HEADER, renderMode);
 	return headers;
@@ -199,8 +194,8 @@ function canonicalizePrewarmableRscRequestHeaders(headers) {
 	headers.delete(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER);
 	headers.delete(NEXT_ROUTER_STATE_TREE_HEADER);
 	headers.delete(NEXT_URL_HEADER);
+	headers.delete(VINEXT_MOUNTED_LAYOUTS_HEADER);
 	headers.delete(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-	headers.delete(VINEXT_CLIENT_REUSE_MANIFEST_HEADER);
 	return true;
 }
 /**
@@ -214,8 +209,8 @@ function canonicalizeLoadingShellRscRequestHeaders(headers) {
 	headers.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "1");
 	headers.delete(NEXT_ROUTER_STATE_TREE_HEADER);
 	headers.delete(NEXT_URL_HEADER);
+	headers.delete(VINEXT_MOUNTED_LAYOUTS_HEADER);
 	headers.delete(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-	headers.delete(VINEXT_CLIENT_REUSE_MANIFEST_HEADER);
 	return true;
 }
 const RSC_REQUEST_URL_BASE = "http://vinext.local";
@@ -232,15 +227,22 @@ function parseRscRequestPath(href) {
 	return new URL(beforeHash, RSC_REQUEST_URL_BASE);
 }
 /**
+* A pathname as the start of a path-absolute reference. One that begins with
+* "//" would serialize as a protocol-relative URL naming another host, so it
+* keeps a "/." prefix, as the WHATWG URL serializer does. URL resolution drops
+* the dot segment, so the reference still targets the same pathname on the
+* origin it is resolved against.
+*/
+function toPathAbsolutePathname(pathname) {
+	return pathname.startsWith("//") ? `/.${pathname}` : pathname;
+}
+/**
 * Serialize the path-absolute reference callers fetch against the app origin.
-* A pathname that begins with "//" would serialize as a protocol-relative URL
-* and send the request to another host, so it keeps a "/." prefix, as the
-* WHATWG URL serializer does. URL resolution drops the dot segment, so the
-* request still targets the same pathname on the app origin, as Next.js's
-* full-URL fetch does.
+* A "//" pathname keeps its "/." prefix so the request still targets the same
+* pathname on the app origin, as Next.js's full-URL fetch does.
 */
 function formatRscRequestPath(url) {
-	return `${url.pathname.startsWith("//") ? `/.${url.pathname}` : url.pathname}${url.search}`;
+	return `${toPathAbsolutePathname(url.pathname)}${url.search}`;
 }
 async function createRscRequestUrl(href, headers) {
 	const url = parseRscRequestPath(href);
@@ -275,55 +277,12 @@ async function resolveInvalidRscCacheBustingRequest(options) {
 	const url = new URL(options.request.url);
 	const actualHash = url.searchParams.get(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 	const expectedHash = await computeRscCacheBustingSearchParam(options.request.headers);
-	if (actualHash === null && expectedHash === "" && url.pathname.endsWith(".rsc")) return null;
-	const acceptedHashes = /* @__PURE__ */ new Set([expectedHash]);
-	if (actualHash !== null && actualHash !== expectedHash) {
-		acceptedHashes.add(computeLegacyRscCacheBustingSearchParam(options.request.headers));
-		const compatibilityInputs = [];
-		const hasInterceptionId = options.request.headers.has(VINEXT_INTERCEPTION_ID_HEADER);
-		const hasStateFingerprint = options.request.headers.has(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-		const hasNormalRenderMode = normalizeRenderModeHeaderValue(options.request.headers.get(VINEXT_RSC_RENDER_MODE_HEADER)) === null;
-		if (!hasInterceptionId) compatibilityInputs.push({ includeInterceptionIdHeader: false });
-		if (hasStateFingerprint) {
-			compatibilityInputs.push({ includeStateFingerprintHeader: false });
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeStateFingerprintHeader: false
-			});
-		}
-		if (hasNormalRenderMode) {
-			compatibilityInputs.push({ includeRenderModeHeader: false });
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeRenderModeHeader: false
-			});
-		}
-		if (hasStateFingerprint && hasNormalRenderMode) {
-			compatibilityInputs.push({
-				includeRenderModeHeader: false,
-				includeStateFingerprintHeader: false
-			});
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeRenderModeHeader: false,
-				includeStateFingerprintHeader: false
-			});
-		}
-		for (const compatibilityOptions of compatibilityInputs) {
-			const input = createCacheBustingInput(options.request.headers, compatibilityOptions);
-			if (input === null) acceptedHashes.add("");
-			else {
-				acceptedHashes.add(await sha256CacheBustingHash(input));
-				acceptedHashes.add(fnv1a64(input));
-			}
-		}
-	}
-	if (actualHash !== null && acceptedHashes.has(actualHash)) return null;
+	if (actualHash !== null && (actualHash === expectedHash || actualHash === computeLegacyRscCacheBustingSearchParam(options.request.headers))) return null;
 	setRscCacheBustingSearchParam(url, expectedHash);
 	return new Response(null, {
 		status: 307,
-		headers: { Location: `${url.pathname}${url.search}` }
+		headers: { Location: formatRscRequestPath(url) }
 	});
 }
 //#endregion
-export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };
+export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, toPathAbsolutePathname };

package/dist/server/app-rsc-error-handler.d.ts

@@ -20,7 +20,8 @@ export type AppRenderErrorContextOverrides = {
  * the incoming Web `Request`, wires it into a `createRscOnErrorHandler` call,
  * and binds the configured `reportRequestError` reporter.
  *
- * Pure factory: takes all deps explicitly — no closure over module-level state.
+ * Takes all deps explicitly. The only module-level state is the set of errors
+ * each request already logged, keyed weakly by its `Request`.
  */
 export declare function createAppRscOnErrorHandler(reportRequestError: ReportRequestError, request: Request, pathname: string, routePath: string, overrides?: AppRenderErrorContextOverrides): (error: unknown) => string | undefined;
 //#endregion

package/dist/server/app-rsc-error-handler.js

@@ -3,12 +3,14 @@ import "./app-rsc-vary.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
 import { createRscOnErrorHandler } from "./app-rsc-errors.js";
 //#region src/server/app-rsc-error-handler.ts
+const loggedErrorsByRequest = /* @__PURE__ */ new WeakMap();
 /**
 * Build a per-request RSC error handler that extracts request metadata from
 * the incoming Web `Request`, wires it into a `createRscOnErrorHandler` call,
 * and binds the configured `reportRequestError` reporter.
 *
-* Pure factory: takes all deps explicitly — no closure over module-level state.
+* Takes all deps explicitly. The only module-level state is the set of errors
+* each request already logged, keyed weakly by its `Request`.
 */
 function createAppRscOnErrorHandler(reportRequestError, request, pathname, routePath, overrides) {
 	const requestHeaders = Object.fromEntries(request.headers.entries());
@@ -21,12 +23,18 @@ function createAppRscOnErrorHandler(reportRequestError, request, pathname, route
 		routerKind: "App Router",
 		routePath: routePath || pathname,
 		routeType: overrides?.routeType ?? "render",
-		renderSource: overrides?.renderSource ?? (request.headers.get("RSC") === "1" || new URL(request.url).pathname.endsWith(".rsc") ? "react-server-components-payload" : "react-server-components"),
+		renderSource: overrides?.renderSource ?? (request.headers.get("RSC") === "1" ? "react-server-components-payload" : "react-server-components"),
 		revalidateReason: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? "on-demand" : overrides?.revalidateReason
 	};
+	let loggedErrors = loggedErrorsByRequest.get(request);
+	if (!loggedErrors) {
+		loggedErrors = /* @__PURE__ */ new WeakSet();
+		loggedErrorsByRequest.set(request, loggedErrors);
+	}
 	return createRscOnErrorHandler({
 		attachDigest: errorContext.renderSource !== "server-rendering",
 		errorContext,
+		loggedErrors,
 		reportRequestError(error, info, context) {
 			reportRequestError(error, info, context);
 		},

package/dist/server/app-rsc-errors.d.ts

@@ -15,6 +15,14 @@ type RscErrorReporter = (error: unknown, requestInfo: RscRequestInfo, errorConte
 type CreateRscOnErrorHandlerOptions = {
   attachDigest?: boolean;
   errorContext: RscErrorContext | null;
+  /**
+   * The errors this request already logged, shared by its handlers so an error
+   * reaching more than one, such as in the RSC and then the SSR pass, is logged
+   * once. Like Next.js, a digest alone does not mean an error was logged: user
+   * code can set its own. Request-scoped, as a failed module evaluation throws
+   * the same error on every request. Defaults to this handler's own.
+   */
+  loggedErrors?: WeakSet<object>;
   nodeEnv?: string;
   reportRequestError: RscErrorReporter;
   requestInfo: RscRequestInfo | null;

package/dist/server/app-rsc-errors.js

@@ -1,4 +1,6 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
+import { logRequestError } from "./request-error-log.js";
+import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 import { isAppRenderAbortError } from "./app-render-abort-error.js";
 import { getProperError } from "./proper-error.js";
@@ -63,6 +65,13 @@ function sanitizeErrorForClient(error, nodeEnv = process.env.NODE_ENV) {
 }
 function createRscOnErrorHandler(options) {
 	let loggedPrerenderErrors;
+	const loggedErrors = options.loggedErrors ?? /* @__PURE__ */ new WeakSet();
+	const wasLogged = (error) => {
+		if (typeof error !== "object" && typeof error !== "function" || error === null) return false;
+		if (loggedErrors.has(error)) return true;
+		loggedErrors.add(error);
+		return false;
+	};
 	return (error) => {
 		const nodeEnv = options.nodeEnv ?? process.env.NODE_ENV;
 		const reportableError = error && typeof error === "object" && ORIGINAL_SERVER_ERROR in error ? Reflect.get(error, ORIGINAL_SERVER_ERROR) : error;
@@ -80,6 +89,7 @@ function createRscOnErrorHandler(options) {
 		if (!hasDigest(properError) && (properError !== reportableError || options.attachDigest !== false)) try {
 			Object.assign(properError, { digest });
 		} catch {}
+		if (nodeEnv !== "production") rewriteClientHookError(properError);
 		if (options.requestInfo && options.errorContext) options.reportRequestError(properError, options.requestInfo, options.errorContext);
 		if (process.env.VINEXT_PRERENDER === "1" && error) {
 			if (!loggedPrerenderErrors?.has(reportableError)) {
@@ -87,7 +97,7 @@ function createRscOnErrorHandler(options) {
 				const route = options.requestInfo?.path ?? options.errorContext?.routePath ?? "<unknown>";
 				console.error(`[vinext] Error prerendering route ${JSON.stringify(route)}:`, reportableError);
 			}
-		} else if (nodeEnv !== "production" && !thrownHasDigest) console.error("[vinext] Server render error:", properError);
+		} else if (!(reportableError !== error && thrownHasDigest) && !wasLogged(reportableError)) logRequestError("[vinext] Server render error:", properError);
 		return digest;
 	};
 }

package/dist/server/app-rsc-handler.d.ts

@@ -1,14 +1,13 @@
 import { VinextCacheabilityProbeMode } from "./multi-stage.js";
 import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ImageConfig } from "./image-optimization.js";
 import { ExecutionContextLike } from "../shims/request-context.js";
 import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
-import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPagePprFallbackCacheShell } from "./app-ppr-fallback-shell.js";
-import { AppPrerenderRootParamNamesMap, AppPrerenderStaticParamsMap } from "./app-prerender-endpoints.js";
 import { PagesRouteDataKind } from "./pages-route-data-kind.js";
+import { AppPrerenderRootParamNamesMap, AppPrerenderStaticParamsMap } from "./app-prerender-endpoints.js";
 import { TrustedPrerenderState } from "./prerender-route-params.js";
 import { AppRouteTreePrefetchRoute, PrefetchInliningConfig } from "./app-route-tree-prefetch.js";
 import { DispatchAppWorkerResponseStage, RenderAppWorkerResponseStageLocally } from "./app-worker-stages.js";
@@ -52,7 +51,6 @@ type AppRscRouteMatch<TRoute> = {
 type DispatchMatchedPageOptions<TRoute> = {
   bypassInterceptionContextCache: boolean;
   cachePathname: string;
-  clientReuseManifest: ClientReuseManifestParseResult;
   cleanPathname: string;
   displayPathname: string;
   formState: ReactFormState | null;
@@ -170,7 +168,7 @@ type RenderPagesFallbackOptions = {
       pattern: string;
     };
   } | null;
-  dispatchPagesResponseStage?: (request: Request, resourceKind: "api" | "page", dataKind?: PagesRouteDataKind, hasRequestAwareDocument?: boolean) => Promise<Response>;
+  dispatchPagesResponseStage?: (request: Request, resourceKind: "api" | "page", dataKind?: PagesRouteDataKind, hasRequestAwareDocument?: boolean, runsInitialProps?: boolean) => Promise<Response>;
   isDataRequest?: boolean;
   isRscRequest: boolean;
   initialResponseHeaders?: Headers;
@@ -179,6 +177,8 @@ type RenderPagesFallbackOptions = {
   pathname?: string;
   pagesDataRequest?: Request | null;
   request: Request;
+  /** The shared cache entry answers every host; a request-time render is not stored. */
+  sharedAcrossHosts?: boolean;
   url: URL;
 };
 type NavigationContextValue = {