vinext 1.0.0-beta.9 → 1.0.0

package/dist/server/app-server-action-execution.js

@@ -1,10 +1,11 @@
-import { splitPathSegments } from "../routing/utils.js";
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
-import { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, VINEXT_RSC_VARY_HEADER } from "./headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { splitPathSegments } from "../routing/utils.js";
+import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
+import { NEXT_ROUTER_STATE_TREE_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
+import { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { attachRequestCfMetadata, validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
@@ -12,12 +13,12 @@ import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { _drainPendingRevalidations, getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
 import { setCurrentFetchCacheMode, setCurrentFetchRevalidate, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, createRscRequestUrl, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { buildAppPageTags } from "./implicit-tags.js";
-import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
@@ -69,16 +70,19 @@ function parseBoundProgressiveActionReference(body, referencePrefix) {
 	};
 }
 function prepareActionPageRerenderContext(options) {
-	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") setHeadersContext(createStaticGenerationHeadersContext({
-		draftModeEnabled: isDraftModeRequest(createActionRerenderRequest({
+	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") {
+		const rerenderRequest = createActionRerenderRequest({
 			draftModeCookie: options.draftModeCookie,
 			request: options.request
-		}), options.draftModeSecret),
-		draftModeSecret: options.draftModeSecret,
-		dynamicConfig: options.dynamicConfig,
-		routeKind: "page",
-		routePattern: options.routePattern
-	}));
+		});
+		setHeadersContext(createStaticGenerationHeadersContext({
+			draftModeEnabled: isDraftModeRequest(rerenderRequest, options.draftModeSecret),
+			draftModeSecret: options.draftModeSecret,
+			dynamicConfig: options.dynamicConfig,
+			routeKind: "page",
+			routePattern: options.routePattern
+		}));
+	}
 	return options.dynamicConfig === "force-static" ? new URLSearchParams() : options.searchParams;
 }
 function createActionRerenderRequest(options) {
@@ -320,8 +324,30 @@ function dedupePendingCookies(cookies) {
 function isAppServerActionFunction(action) {
 	return typeof action === "function";
 }
-function normalizeError(error) {
-	return error instanceof Error ? error : new Error(String(error));
+function normalizeDevServerReferenceId(id) {
+	const exportSeparator = id.indexOf("#");
+	if (exportSeparator === -1) return id;
+	const moduleId = id.slice(0, exportSeparator);
+	const cacheTag = moduleId.indexOf("$$cache=");
+	return (cacheTag === -1 ? moduleId : moduleId.slice(0, cacheTag)) + id.slice(exportSeparator);
+}
+function requiresRegisteredServerReferenceMatch(actionId) {
+	const exportSeparator = actionId.indexOf("#");
+	if (exportSeparator === -1) return true;
+	return !/^[0-9a-f]{12}$/.test(actionId.slice(0, exportSeparator));
+}
+function matchesRegisteredServerReference(action, actionId) {
+	const registeredId = Reflect.get(action, "$$id");
+	if (typeof registeredId !== "string") return false;
+	const normalizedRegisteredId = normalizeDevServerReferenceId(registeredId);
+	const normalizedActionId = normalizeDevServerReferenceId(actionId);
+	if (normalizedRegisteredId === normalizedActionId) return true;
+	const registeredSeparator = normalizedRegisteredId.indexOf("#");
+	const actionSeparator = normalizedActionId.indexOf("#");
+	if (registeredSeparator === -1 || actionSeparator === -1) return false;
+	if (normalizedRegisteredId.slice(0, registeredSeparator) !== normalizedActionId.slice(0, actionSeparator)) return false;
+	const registeredExport = normalizedRegisteredId.slice(registeredSeparator + 1);
+	return !/^\$\$vinext_cache_[0-9a-f]{64}$/.test(registeredExport);
 }
 function getServerActionFailureMessage(error) {
 	return error instanceof Error && error.message ? error.message : String(error);
@@ -457,14 +483,16 @@ function getActionHttpFallbackStatus(error) {
 function createServerActionErrorResponse(error, options) {
 	options.getAndClearPendingCookies();
 	console.error("[vinext] Server action error:", error);
-	options.reportRequestError(normalizeError(error), {
+	options.reportRequestError(error, {
 		path: options.cleanPathname,
 		method: options.request.method,
 		headers: Object.fromEntries(options.request.headers.entries())
 	}, {
 		routerKind: "App Router",
-		routePath: options.cleanPathname,
-		routeType: "action"
+		routePath: options.routePattern,
+		routeType: "action",
+		renderSource: "react-server-components-payload",
+		revalidateReason: void 0
 	});
 	options.clearRequestContext();
 	return internalServerErrorResponse(process.env.NODE_ENV === "production" ? void 0 : "Server action failed: " + getServerActionFailureMessage(error));
@@ -539,6 +567,10 @@ async function handleProgressiveServerActionRequest(options) {
 			});
 			return null;
 		}
+		if (directActionId && requiresRegisteredServerReferenceMatch(directActionId) && !matchesRegisteredServerReference(action, directActionId)) return createActionNotFoundResponse(directActionId, {
+			clearRequestContext: options.clearRequestContext,
+			getAndClearPendingCookies: options.getAndClearPendingCookies
+		});
 		const decodedActionId = Reflect.get(action, "$$id");
 		if (typeof decodedActionId === "string" && decodedActionId !== directActionId && options.forwardAction) {
 			const forwardResponse = await options.forwardAction(decodedActionId);
@@ -561,14 +593,16 @@ async function handleProgressiveServerActionRequest(options) {
 				actionFailed = true;
 				if (!(getActionHttpFallbackStatus(error) !== null || isServerActionNotFoundError(error, null))) {
 					console.error("[vinext] Server action error:", error);
-					options.reportRequestError(normalizeError(error), {
+					options.reportRequestError(error, {
 						path: options.cleanPathname,
 						method: options.request.method,
 						headers: Object.fromEntries(options.request.headers.entries())
 					}, {
 						routerKind: "App Router",
-						routePath: options.cleanPathname,
-						routeType: "action"
+						routePath: options.routePattern,
+						routeType: "action",
+						renderSource: "react-server-components-payload",
+						revalidateReason: void 0
 					});
 				}
 			}
@@ -622,14 +656,16 @@ async function handleProgressiveServerActionRequest(options) {
 		getAndClearActionRevalidationKind();
 		options.getAndClearPendingCookies();
 		console.error("[vinext] Server action payload parsing error:", error);
-		options.reportRequestError(normalizeError(error), {
+		options.reportRequestError(error, {
 			path: options.cleanPathname,
 			method: options.request.method,
 			headers: Object.fromEntries(options.request.headers.entries())
 		}, {
 			routerKind: "App Router",
-			routePath: options.cleanPathname,
-			routeType: "action"
+			routePath: options.routePattern,
+			routeType: "action",
+			renderSource: "react-server-components-payload",
+			revalidateReason: void 0
 		});
 		options.clearRequestContext();
 		return internalServerErrorResponse(process.env.NODE_ENV === "production" ? void 0 : "Server action parsing failed: " + getServerActionFailureMessage(error));
@@ -651,14 +687,16 @@ async function handleProgressiveServerActionRequest(options) {
 async function renderFetchActionBodyExceededResponse(options) {
 	const error = createBodyExceededError(options.maxActionBodySizeLabel);
 	console.error("[vinext] Server action error:", error);
-	options.reportRequestError(normalizeError(error), {
+	options.reportRequestError(error, {
 		path: options.cleanPathname,
 		method: options.request.method,
 		headers: Object.fromEntries(options.request.headers.entries())
 	}, {
 		routerKind: "App Router",
-		routePath: options.cleanPathname,
-		routeType: "action"
+		routePath: options.currentRouteMatch?.route.pattern ?? options.cleanPathname,
+		routeType: "action",
+		renderSource: "react-server-components-payload",
+		revalidateReason: void 0
 	});
 	getAndClearActionRevalidationKind();
 	options.getAndClearPendingCookies();
@@ -667,7 +705,10 @@ async function renderFetchActionBodyExceededResponse(options) {
 		data: options.sanitizeErrorForClient(error)
 	};
 	const temporaryReferences = options.createTemporaryReferenceSet();
-	const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.cleanPathname);
+	const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.currentRouteMatch?.route.pattern ?? options.cleanPathname, {
+		renderSource: "react-server-components-payload",
+		routeType: "action"
+	});
 	const rscStream = await options.renderToReadableStream({ returnValue }, {
 		temporaryReferences,
 		onError: onRenderError
@@ -705,7 +746,7 @@ async function handleServerActionRscRequest(options) {
 				});
 				throw error;
 			}
-			if (!isAppServerActionFunction(loadedAction)) return createActionNotFoundResponse(options.actionId, {
+			if (!isAppServerActionFunction(loadedAction) || requiresRegisteredServerReferenceMatch(options.actionId) && !matchesRegisteredServerReference(loadedAction, options.actionId)) return createActionNotFoundResponse(options.actionId, {
 				clearRequestContext: options.clearRequestContext,
 				getAndClearPendingCookies: options.getAndClearPendingCookies
 			});
@@ -735,7 +776,7 @@ async function handleServerActionRscRequest(options) {
 				});
 				throw error;
 			}
-			if (!isAppServerActionFunction(loadedAction)) return createActionNotFoundResponse(options.actionId, {
+			if (!isAppServerActionFunction(loadedAction) || requiresRegisteredServerReferenceMatch(options.actionId) && !matchesRegisteredServerReference(loadedAction, options.actionId)) return createActionNotFoundResponse(options.actionId, {
 				clearRequestContext: options.clearRequestContext,
 				getAndClearPendingCookies: options.getAndClearPendingCookies
 			});
@@ -867,7 +908,10 @@ async function handleServerActionRscRequest(options) {
 		const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
 		const isHttpFallback = actionStatus === 401 || actionStatus === 403 || actionStatus === 404;
 		if (!isHttpFallback && (actionWasForwarded || actionRevalidationKind === ACTION_DID_NOT_REVALIDATE)) {
-			const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.cleanPathname);
+			const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.currentRouteMatch?.route.pattern ?? options.cleanPathname, {
+				renderSource: "react-server-components-payload",
+				routeType: "action"
+			});
 			const rscStream = await options.renderToReadableStream({ returnValue }, {
 				temporaryReferences,
 				onError: onRenderError
@@ -891,6 +935,7 @@ async function handleServerActionRscRequest(options) {
 		const match = options.currentRouteMatch;
 		let element;
 		let errorPattern = match ? match.route.pattern : options.cleanPathname;
+		let renderedPathAndSearch = null;
 		const actionRerenderIsRscRequest = true;
 		if (match) {
 			const { route: actionRoute, params: actionParams } = match;
@@ -920,6 +965,8 @@ async function handleServerActionRscRequest(options) {
 				searchParams: actionRerenderSearchParams,
 				params: resolvedActionNavigationParams
 			});
+			const renderedSearch = options.searchParams.toString();
+			renderedPathAndSearch = renderedSearch ? `${options.cleanPathname}?${renderedSearch}` : options.cleanPathname;
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null);
 			setCurrentFetchRevalidate(options.resolveRouteRevalidateSeconds?.(actionRerenderTarget.route) ?? null);
 			setCurrentForceDynamicFetchDefault(actionRerenderDynamicConfig === "force-dynamic");
@@ -934,6 +981,7 @@ async function handleServerActionRscRequest(options) {
 				route: actionRerenderTarget.route,
 				searchParams: actionRerenderSearchParams,
 				renderMode: APP_RSC_RENDER_MODE_NAVIGATION,
+				isForceStatic: actionRerenderDynamicConfig === "force-static",
 				observeMetadataSearchParamsAccess: actionRerenderDynamicConfig !== "force-static",
 				observePageSearchParamsAccess: actionRerenderDynamicConfig !== "force-static"
 			});
@@ -943,7 +991,10 @@ async function handleServerActionRscRequest(options) {
 			const actionRouteId = options.createPayloadRouteId(options.cleanPathname, null);
 			element = options.createNotFoundElement(actionRouteId);
 		}
-		const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, errorPattern);
+		const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, errorPattern, {
+			renderSource: "react-server-components-payload",
+			routeType: "action"
+		});
 		const renderActionRerender = () => options.renderToReadableStream({
 			root: element,
 			returnValue
@@ -960,6 +1011,7 @@ async function handleServerActionRscRequest(options) {
 		mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);
 		applyRscCompatibilityIdHeader(actionHeaders);
 		setActionRevalidatedHeader(actionHeaders, actionRevalidationKind);
+		if (renderedPathAndSearch !== null) actionHeaders.set(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, encodeURIComponent(renderedPathAndSearch));
 		const actionResponse = createServerActionRscResponse(rscStream, {
 			status: options.middlewareStatus ?? actionStatus,
 			headers: actionHeaders
@@ -976,7 +1028,8 @@ async function handleServerActionRscRequest(options) {
 			clearRequestContext: options.clearRequestContext,
 			getAndClearPendingCookies: options.getAndClearPendingCookies,
 			reportRequestError: options.reportRequestError,
-			request: options.request
+			request: options.request,
+			routePattern: options.currentRouteMatch?.route.pattern ?? options.cleanPathname
 		});
 	}
 }

package/dist/server/app-ssr-entry.d.ts

@@ -5,16 +5,16 @@ import { AppSsrRenderResult } from "./app-page-stream.js";
 import "../shims/navigation-server.js";
 import { ReactFormState } from "react-dom/client";
 //#region src/server/app-ssr-entry.d.ts
-type FontPreload = {
+export type FontPreload = {
   href: string;
   type: string;
 };
-type FontData = {
+export type FontData = {
   links?: string[];
   styles?: string[];
   preloads?: FontPreload[];
 };
-declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: NavigationContext | null, fontData?: FontData, options?: {
+export declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: NavigationContext | null, fontData?: FontData, options?: {
   scriptNonce?: string;
   /** Pre-split side stream for embed+capture fusion. When provided,
    *  rscStream is fed directly to createFromReadableStream (no internal tee).
@@ -33,6 +33,8 @@ declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: Na
    * SSR head. Undefined or empty disables emission entirely.
    */
   clientTraceMetadata?: readonly string[];
+  /** Private marker used to identify only this render's injected trace tags. */
+  clientTraceMetadataMarker?: string;
   /**
    * Maximum total length (in characters) of the preload `Link` header React
    * emits during SSR. `0` disables emission. From `reactMaxHeadersLength` in
@@ -42,6 +44,8 @@ declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: Na
   rootParams?: RootParams;
   /** Dev-only: original server error to surface in the browser overlay. */
   initialDevServerError?: unknown;
+  /** Report an SSR/Fizz render failure through instrumentation. */
+  onSsrError?: (error: unknown) => unknown;
   /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
   mirrorNextFlight?: boolean;
   /** When true, wait for the full React tree (including Suspense boundaries)
@@ -52,6 +56,12 @@ declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: Na
   isStaticGeneration?: boolean;
   /** `dynamic = "force-static"` suppresses the useSearchParams bailout. */
   isForceStatic?: boolean;
+  /**
+   * Production render that may be stored under a query-free key. SSR
+   * `useSearchParams()` waits on a per-request gate, and the navigation
+   * payload leaves the query for the browser to read.
+   */
+  isCacheCandidate?: boolean;
   fallbackToErrorDocumentOnShellError?: boolean;
   dynamicStaleTimeSeconds?: number;
   getInitialNavigationCacheMetadata?: () => InitialNavigationCacheMetadata;
@@ -60,4 +70,4 @@ declare const _default: {
   fetch(request: Request): Promise<Response>;
 };
 //#endregion
-export { FontData, FontPreload, _default as default, handleSsr };
+export { _default as default };

package/dist/server/app-ssr-entry.js

@@ -4,24 +4,29 @@ import { isOpenRedirectShaped } from "./open-redirect.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
+import { onRenderDynamicLatched } from "../shims/headers.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
-import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
+import { getClientTraceMetadataHTML, markClientTraceMetadataBlock } from "./client-trace-metadata.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
 import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation-server.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot } from "../shims/slot.js";
+import { getNextErrorDigest } from "./next-error-digest.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
-import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
-import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
+import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-observation.js";
+import { isAppRenderAbortError } from "./app-rsc-errors.js";
+import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
 import { runWithNavigationContext } from "../shims/navigation-state.js";
+import { startCandidateSearchParamsGate } from "./app-ssr-search-params-gate.js";
 import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
@@ -151,7 +156,7 @@ function extractBootstrapModuleUrl(bootstrapScriptContent) {
 }
 function buildModulePreloadHtml(bootstrapModuleUrl, nonce) {
 	if (!bootstrapModuleUrl) return "";
-	return `<link rel="modulepreload"${createNonceAttribute(nonce)} href="${escapeHtmlAttr(bootstrapModuleUrl)}" />\n`;
+	return `<link rel="modulepreload"${createNonceAttribute(nonce)} href="${escapeHtmlAttr(bootstrapModuleUrl)}" crossorigin="${pagesClientAssets.crossOrigin ?? ""}" />\n`;
 }
 function buildHeadInjectionHtml(navContext, bootstrapModuleUrl, formState, insertedHTML, fontHTML, dynamicStaleTimeSeconds, searchParamsFromBrowser, scriptNonce) {
 	const navPayload = {
@@ -166,19 +171,33 @@ function requireNavigationContext(navContext) {
 }
 async function handleSsr(rscStream, navContext, fontData, options) {
 	return runWithNavigationContext(async () => {
+		const assetCrossOrigin = pagesClientAssets.crossOrigin ?? "";
+		const searchParamsGate = options?.isCacheCandidate === true && options.isStaticGeneration !== true && options.isForceStatic !== true ? startCandidateSearchParamsGate() : null;
+		let rendersDynamic = false;
+		const stopWatchingDynamic = searchParamsGate ? onRenderDynamicLatched(() => {
+			rendersDynamic = true;
+		}) : null;
+		const requiredNavigationContext = requireNavigationContext(navContext);
 		const ssrNavigationContext = {
-			...requireNavigationContext(navContext),
+			...requiredNavigationContext,
 			isStaticGeneration: options?.isStaticGeneration,
-			isForceStatic: options?.isForceStatic
+			isForceStatic: options?.isForceStatic,
+			searchParamsGate: searchParamsGate?.gate,
+			getClientPageSearchParams: createClientPageSsrSearchParamsSource(requiredNavigationContext.searchParams, {
+				isForceStatic: options?.isForceStatic,
+				isPprFallbackShell: options?.pprFallbackShellSignal !== void 0
+			})
 		};
 		await clientReferencePreloader.preload();
 		setNavigationContext(ssrNavigationContext);
 		clearServerInsertedHTML();
 		const cleanup = () => {
+			stopWatchingDynamic?.();
 			setNavigationContext(null);
 			clearServerInsertedHTML();
 		};
-		return runWithRootParamsScope(options?.rootParams ?? {}, async () => {
+		const rootParams = options?.rootParams ?? {};
+		return runWithRootParamsScope(rootParams, async () => {
 			try {
 				let ssrStream;
 				let rscEmbed;
@@ -199,10 +218,12 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 						getInitialNavigationCacheMetadata: options?.getInitialNavigationCacheMetadata
 					});
 				}
+				if (searchParamsGate) ssrStream = searchParamsGate.settleWhenConsumed(ssrStream);
 				let flightRoot = null;
 				function VinextFlightRoot() {
 					for (const moduleUrl of pagesClientAssets.appBootstrapPreinitModules ?? []) preinitModule(moduleUrl, {
 						as: "script",
+						crossOrigin: assetCrossOrigin,
 						nonce: options?.scriptNonce
 					});
 					if (!flightRoot) flightRoot = createFromReadableStream(ssrStream);
@@ -224,7 +245,8 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const registerBeforeInteractiveInlineScript = (script) => {
 					beforeInteractiveInlineScripts.push(script);
 				};
-				const ssrRoot = withScriptNonce(createElement(BeforeInteractiveContext.Provider, { value: registerBeforeInteractiveInlineScript }, ssrTree), options?.scriptNonce);
+				const treeWithBeforeInteractive = createElement(BeforeInteractiveContext.Provider, { value: registerBeforeInteractiveInlineScript }, ssrTree);
+				const ssrRoot = withScriptNonce(treeWithBeforeInteractive, options?.scriptNonce);
 				const bootstrapModuleUrl = extractBootstrapModuleUrl(await import.meta.viteRsc.loadBootstrapScriptContent("index"));
 				const errorMetaRenderer = createSsrErrorMetaRenderer({ basePath: options?.basePath });
 				const pprFallbackShellSignal = options?.pprFallbackShellSignal;
@@ -232,7 +254,10 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const maxHeadersLength = options?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 				const captureHeaders = maxHeadersLength > 0;
 				const renderOptions = {
-					bootstrapModules: bootstrapModuleUrl ? [bootstrapModuleUrl] : void 0,
+					bootstrapModules: bootstrapModuleUrl ? [{
+						src: bootstrapModuleUrl,
+						crossOrigin: assetCrossOrigin
+					}] : void 0,
 					formState: options?.formState ?? null,
 					nonce: options?.scriptNonce,
 					onHeaders: captureHeaders ? (headers) => {
@@ -242,12 +267,17 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					maxHeadersLength: captureHeaders ? maxHeadersLength : void 0,
 					onError(error) {
 						if (pprFallbackShellSignal && isPprFallbackShellAbortError(error)) return;
+						if (isAppRenderAbortError(error)) return void 0;
 						errorMetaRenderer.capture(error);
-						if (error && typeof error === "object" && "digest" in error) return String(error.digest);
+						const instrumentationDigest = options?.onSsrError?.(error);
+						if (typeof instrumentationDigest === "string") return instrumentationDigest;
+						const existingDigest = getNextErrorDigest(error);
+						if (existingDigest !== null) return existingDigest;
 						if (process.env.NODE_ENV === "production" && error) return ssrErrorDigest(getErrorMessage(error) + (error instanceof Error ? error.stack ?? "" : ""));
 					}
 				};
 				let htmlStream;
+				let renderComplete = Promise.resolve();
 				let shellErrorRecovered = false;
 				let shouldDelayInitialHtmlPull = false;
 				if (pprFallbackShellSignal) {
@@ -263,6 +293,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					let streamingHtmlStream;
 					try {
 						streamingHtmlStream = await renderToReadableStream(ssrRoot, { ...renderOptions });
+						renderComplete = streamingHtmlStream.allReady;
 						if (options?.waitForAllReady === true) await streamingHtmlStream.allReady;
 						else shouldDelayInitialHtmlPull = true;
 						htmlStream = streamingHtmlStream;
@@ -281,23 +312,38 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const fontHTML = renderFontHtml(fontData, options?.scriptNonce, { includeStyles: !mergeFontStylesIntoInlineCss });
 				let traceMetaHTML = null;
 				const getTraceMetaHTML = () => {
-					if (traceMetaHTML === null) traceMetaHTML = getClientTraceMetadataHTML(options?.clientTraceMetadata);
+					if (traceMetaHTML === null) traceMetaHTML = markClientTraceMetadataBlock(getClientTraceMetadataHTML(options?.clientTraceMetadata, options?.isStaticGeneration), options?.clientTraceMetadataMarker);
 					return traceMetaHTML;
 				};
 				let didInjectHeadHTML = false;
+				let headHidQuery = false;
+				let didSendRenderedSearch = false;
+				const getRenderedSearchHTML = () => {
+					if (!headHidQuery || !rendersDynamic || didSendRenderedSearch) return "";
+					didSendRenderedSearch = true;
+					const search = ssrNavigationContext.searchParams.toString();
+					return createInlineScriptTag(createNavigationRuntimeRenderedSearchScript(search ? `?${search}` : ""), options?.scriptNonce);
+				};
 				const getInsertedHTML = () => {
 					const insertedHTML = renderInsertedHtml(renderServerInsertedHTML());
 					const errorMetaHTML = errorMetaRenderer.flush();
 					const initialDevServerErrorHTML = createInitialDevServerErrorScript(options?.initialDevServerError, options?.scriptNonce);
-					if (didInjectHeadHTML) return insertedHTML + errorMetaHTML;
+					if (didInjectHeadHTML) return insertedHTML + errorMetaHTML + getRenderedSearchHTML();
 					didInjectHeadHTML = true;
-					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.dynamicStaleTimeSeconds, options?.isStaticGeneration === true ? options.isForceStatic !== true : void 0, options?.scriptNonce);
+					const hidesQuery = searchParamsGate !== null && searchParamsGate.gate.decision !== "real";
+					headHidQuery = hidesQuery;
+					const isSearchParamsFromBrowser = hidesQuery || (options?.isStaticGeneration === true ? options.isForceStatic !== true : void 0);
+					return buildHeadInjectionHtml(hidesQuery ? {
+						...ssrNavigationContext,
+						searchParams: new URLSearchParams()
+					} : ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.dynamicStaleTimeSeconds, isSearchParamsFromBrowser, options?.scriptNonce);
 				};
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
 				if (shouldDelayInitialHtmlPull) await waitAtLeastOneReactRenderTask();
 				return {
 					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup),
 					metadataReady: Promise.resolve(),
+					renderComplete,
 					capturedRscData: options?.capturedRscDataRef?.value ?? null,
 					shellErrorRecovered,
 					linkHeader: reactLinkHeader
@@ -310,7 +356,8 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 	});
 }
 var app_ssr_entry_default = { async fetch(request) {
-	if (isOpenRedirectShaped(new URL(request.url).pathname)) return notFoundResponse();
+	const url = new URL(request.url);
+	if (isOpenRedirectShaped(url.pathname)) return notFoundResponse();
 	const result = await (await import.meta.viteRsc.loadModule("rsc", "index")).default(request);
 	if (result instanceof Response) return result;
 	if (result == null) return notFoundResponse();

package/dist/server/app-ssr-error-meta.d.ts

@@ -7,7 +7,6 @@ type SsrErrorMetaRenderer = {
   capture: (error: unknown) => void;
   flush: () => string;
 };
-declare function renderSsrErrorMetaTags(errors: readonly unknown[], options?: SsrErrorMetaRenderOptions): string;
-declare function createSsrErrorMetaRenderer(options?: SsrErrorMetaRenderOptions): SsrErrorMetaRenderer;
-//#endregion
-export { createSsrErrorMetaRenderer, renderSsrErrorMetaTags };
+export declare function renderSsrErrorMetaTags(errors: readonly unknown[], options?: SsrErrorMetaRenderOptions): string;
+export declare function createSsrErrorMetaRenderer(options?: SsrErrorMetaRenderOptions): SsrErrorMetaRenderer;
+//#endregion

package/dist/server/app-ssr-error-meta.js

@@ -8,7 +8,8 @@ function prefixRedirectLocation(location, basePath) {
 	const hashIndex = location.indexOf("#");
 	const queryIndex = location.indexOf("?");
 	const pathnameEnd = queryIndex === -1 ? hashIndex === -1 ? location.length : hashIndex : hashIndex === -1 ? queryIndex : Math.min(queryIndex, hashIndex);
-	return addBasePathToPathname(location.slice(0, pathnameEnd), basePath) + location.slice(pathnameEnd);
+	const pathname = location.slice(0, pathnameEnd);
+	return addBasePathToPathname(pathname, basePath) + location.slice(pathnameEnd);
 }
 function renderSsrErrorMetaTag(error, options) {
 	const digest = getNextErrorDigest(error);

package/dist/server/app-ssr-router-instance.d.ts

@@ -1,5 +1,4 @@
 import { AppRouterInstance } from "../shims/internal/app-router-context.js";
 //#region src/server/app-ssr-router-instance.d.ts
-declare const ssrAppRouterInstance: AppRouterInstance;
-//#endregion
-export { ssrAppRouterInstance };
+export declare const ssrAppRouterInstance: AppRouterInstance;
+//#endregion

package/dist/server/app-ssr-search-params-gate.d.ts

@@ -0,0 +1,20 @@
+import { SearchParamsGate } from "../shims/search-params-gate.js";
+//#region src/server/app-ssr-search-params-gate.d.ts
+type CandidateSearchParamsGate = {
+  gate: SearchParamsGate;
+  /**
+   * Wrap the Flight stream SSR reads. The gate settles once SSR has read it to
+   * the end, and opens if it is cancelled or fails.
+   */
+  settleWhenConsumed: (flightStream: ReadableStream<Uint8Array>) => ReadableStream<Uint8Array>;
+};
+/**
+ * Start the SSR `useSearchParams()` gate of a cache-candidate render.
+ *
+ * The gate opens with real values as soon as the render uses a dynamic API,
+ * including before this call. Otherwise it bails out when the render settles:
+ * the RSC stream has ended and SSR has read the whole Flight response, so no
+ * server component can mark the render dynamic any more.
+ */
+export declare function startCandidateSearchParamsGate(): CandidateSearchParamsGate;
+//#endregion

package/dist/server/app-ssr-search-params-gate.js

@@ -0,0 +1,54 @@
+import { isRenderDynamicLatched, markDynamicUsage, onRenderDynamicLatched } from "../shims/headers.js";
+import { createSearchParamsGate } from "../shims/search-params-gate.js";
+//#region src/server/app-ssr-search-params-gate.ts
+/**
+* Start the SSR `useSearchParams()` gate of a cache-candidate render.
+*
+* The gate opens with real values as soon as the render uses a dynamic API,
+* including before this call. Otherwise it bails out when the render settles:
+* the RSC stream has ended and SSR has read the whole Flight response, so no
+* server component can mark the render dynamic any more.
+*/
+function startCandidateSearchParamsGate() {
+	const controller = createSearchParamsGate({ onOpen: markDynamicUsage });
+	const unsubscribe = onRenderDynamicLatched(() => controller.open());
+	if (isRenderDynamicLatched()) controller.open();
+	let finished = false;
+	const finish = (endedNormally) => {
+		if (finished) return;
+		finished = true;
+		unsubscribe();
+		if (endedNormally) controller.settle();
+		else controller.open();
+	};
+	return {
+		gate: controller.gate,
+		settleWhenConsumed: (flightStream) => {
+			const reader = flightStream.getReader();
+			return new ReadableStream({
+				async pull(streamController) {
+					let result;
+					try {
+						result = await reader.read();
+					} catch (error) {
+						finish(false);
+						streamController.error(error);
+						return;
+					}
+					if (result.done) {
+						streamController.close();
+						finish(true);
+						return;
+					}
+					streamController.enqueue(result.value);
+				},
+				cancel(reason) {
+					finish(false);
+					return reader.cancel(reason);
+				}
+			});
+		}
+	};
+}
+//#endregion
+export { startCandidateSearchParamsGate };