vinext 0.0.50 → 0.0.52

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

@@ -1,12 +1,19 @@
-import { VINEXT_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
+import { VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
-import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
-import { readStreamAsText } from "../utils/text-stream.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { buildCachedRevalidateCacheControl } from "./cache-control.js";
+import { readStreamAsText } from "../utils/text-stream.js";
+import { createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 //#region src/server/app-page-cache.ts
 const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
+function recordAppPageCacheOutcome(recordCacheOutcome, input) {
+	try {
+		recordCacheOutcome?.(input);
+	} catch {}
+}
 function buildAppPageCacheTags(pathname, extraTags) {
 	const tags = [
 		pathname,
@@ -33,9 +40,9 @@ function buildAppPageCachedHeaders(options) {
 	const headers = new Headers({
 		"Cache-Control": options.cacheControl,
 		"Content-Type": options.contentType,
-		Vary: VINEXT_RSC_VARY_HEADER,
-		[VINEXT_CACHE_HEADER]: options.cacheState
+		Vary: VINEXT_RSC_VARY_HEADER
 	});
+	setCacheStateHeaders(headers, options.cacheState);
 	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 	return headers;
@@ -65,10 +72,11 @@ function buildAppPageCachedResponse(cachedValue, options) {
 		const rscHeaders = buildAppPageCachedHeaders({
 			cacheControl,
 			cacheState: options.cacheState,
-			contentType: "text/x-component; charset=utf-8",
+			contentType: VINEXT_RSC_CONTENT_TYPE,
 			middlewareHeaders: options.middlewareHeaders,
 			mountedSlotsHeader: options.mountedSlotsHeader
 		});
+		applyRscCompatibilityIdHeader(rscHeaders);
 		return new Response(cachedValue.rscData, {
 			status,
 			headers: rscHeaders
@@ -88,9 +96,20 @@ function buildAppPageCachedResponse(cachedValue, options) {
 }
 async function readAppPageCacheResponse(options) {
 	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode) : options.isrHtmlKey(options.cleanPathname);
+	const artifact = options.isRscRequest ? "rsc" : "html";
 	try {
 		const cached = await options.isrGet(isrKey);
 		const cachedValue = getCachedAppPageValue(cached);
+		if (cached && !cachedValue) {
+			recordAppPageCacheOutcome(options.recordCacheOutcome, {
+				artifact,
+				cacheKey: isrKey,
+				outcome: "miss",
+				reason: "non-app-page-entry"
+			});
+			options.isrDebug?.("MISS (non app-page cache entry)", options.cleanPathname);
+			return null;
+		}
 		if (cachedValue && !cached?.isStale) {
 			const hitResponse = buildAppPageCachedResponse(cachedValue, {
 				cacheState: "HIT",
@@ -103,10 +122,22 @@ async function readAppPageCacheResponse(options) {
 				revalidateSeconds: options.revalidateSeconds
 			});
 			if (hitResponse) {
+				recordAppPageCacheOutcome(options.recordCacheOutcome, {
+					artifact,
+					cacheKey: isrKey,
+					outcome: "hit",
+					reason: "served"
+				});
 				options.isrDebug?.(options.isRscRequest ? "HIT (RSC)" : "HIT (HTML)", options.cleanPathname);
 				options.clearRequestContext();
 				return hitResponse;
 			}
+			recordAppPageCacheOutcome(options.recordCacheOutcome, {
+				artifact,
+				cacheKey: isrKey,
+				outcome: "miss",
+				reason: "empty-entry"
+			});
 			options.isrDebug?.("MISS (empty cached entry)", options.cleanPathname);
 		}
 		if (cached?.isStale && cachedValue) {
@@ -115,8 +146,8 @@ async function readAppPageCacheResponse(options) {
 				const revalidatedPage = await options.renderFreshPageForCache();
 				const revalidateSeconds = revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;
 				const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;
-				const writes = [options.isrSet(options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode), buildAppPageCacheValue("", revalidatedPage.rscData, 200), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
-				if (!options.isRscRequest) writes.push(options.isrSet(options.isrHtmlKey(options.cleanPathname), buildAppPageCacheValue(revalidatedPage.html, void 0, 200), revalidateSeconds, revalidatedPage.tags, expireSeconds));
+				const writes = [options.isrSet(options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
+				if (!options.isRscRequest) writes.push(options.isrSet(options.isrHtmlKey(options.cleanPathname), buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds));
 				await Promise.all(writes);
 				options.isrDebug?.("regen complete", options.cleanPathname);
 			});
@@ -131,14 +162,40 @@ async function readAppPageCacheResponse(options) {
 				revalidateSeconds: options.revalidateSeconds
 			});
 			if (staleResponse) {
+				recordAppPageCacheOutcome(options.recordCacheOutcome, {
+					artifact,
+					cacheKey: isrKey,
+					outcome: "stale",
+					reason: "served"
+				});
 				options.isrDebug?.(options.isRscRequest ? "STALE (RSC)" : "STALE (HTML)", options.cleanPathname);
 				options.clearRequestContext();
 				return staleResponse;
 			}
+			recordAppPageCacheOutcome(options.recordCacheOutcome, {
+				artifact,
+				cacheKey: isrKey,
+				outcome: "miss",
+				reason: "stale-empty-entry"
+			});
 			options.isrDebug?.("STALE MISS (empty stale entry)", options.cleanPathname);
 		}
-		if (!cached) options.isrDebug?.("MISS (no cache entry)", options.cleanPathname);
+		if (!cached) {
+			recordAppPageCacheOutcome(options.recordCacheOutcome, {
+				artifact,
+				cacheKey: isrKey,
+				outcome: "miss",
+				reason: "no-entry"
+			});
+			options.isrDebug?.("MISS (no cache entry)", options.cleanPathname);
+		}
 	} catch (isrReadError) {
+		recordAppPageCacheOutcome(options.recordCacheOutcome, {
+			artifact,
+			cacheKey: isrKey,
+			outcome: "miss",
+			reason: "read-error"
+		});
 		console.error("[vinext] ISR cache read error:", isrReadError);
 	}
 	return null;
@@ -151,7 +208,7 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 	const clientHeaders = new Headers(response.headers);
 	if (options.preserveClientResponseHeaders !== true) {
 		clientHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
-		clientHeaders.set(VINEXT_CACHE_HEADER, "MISS");
+		setCacheStateHeaders(clientHeaders, "MISS");
 	}
 	const cachePromise = (async () => {
 		try {
@@ -170,8 +227,17 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 				return;
 			}
 			const pageTags = options.getPageTags();
-			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
-			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
+			const observationState = options.consumeRenderObservationState?.() ?? createEmptyAppPageRenderObservationState();
+			const htmlRenderObservation = options.createHtmlRenderObservation?.({
+				cacheTags: pageTags,
+				state: observationState
+			});
+			const rscRenderObservation = options.createRscRenderObservation?.({
+				cacheTags: pageTags,
+				state: observationState
+			});
+			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200, htmlRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
+			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200, rscRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
 			await Promise.all(writes);
 			options.isrDebug?.("HTML cache written", htmlKey);
 		} catch (cacheError) {
@@ -190,7 +256,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	if (options.preserveClientResponseHeaders === true) return response;
 	const clientHeaders = new Headers(response.headers);
 	clientHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
-	clientHeaders.set(VINEXT_CACHE_HEADER, "MISS");
+	setCacheStateHeaders(clientHeaders, "MISS");
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -217,7 +283,13 @@ function scheduleAppPageRscCacheWrite(options) {
 				options.isrDebug?.("RSC cache write skipped (no cache policy)", rscKey);
 				return;
 			}
-			await options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200), cachePolicy.revalidateSeconds, options.getPageTags(), cachePolicy.expireSeconds);
+			const pageTags = options.getPageTags();
+			const observationState = options.consumeRenderObservationState?.() ?? createEmptyAppPageRenderObservationState();
+			const rscRenderObservation = options.createRscRenderObservation?.({
+				cacheTags: pageTags,
+				state: observationState
+			});
+			await options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200, rscRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds);
 			options.isrDebug?.("RSC cache written", rscKey);
 		} catch (cacheError) {
 			console.error("[vinext] ISR RSC cache write error:", cacheError);

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-cache.js","names":[],"sources":["../../src/server/app-page-cache.ts"],"sourcesContent":["import type { CachedAppPageValue, CacheControlMetadata } from \"vinext/shims/cache\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { buildCachedRevalidateCacheControl } from \"./cache-control.js\";\nimport { VINEXT_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from \"./headers.js\";\nimport { buildAppPageCacheValue, type ISRCacheEntry } from \"./isr-cache.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { readStreamAsText } from \"../utils/text-stream.js\";\nimport { encodeCacheTag } from \"../utils/encode-cache-tag.js\";\nimport type { AppRscRenderMode } from \"./app-rsc-render-mode.js\";\n\ntype AppPageDebugLogger = (event: string, detail: string) => void;\ntype AppPageCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype AppPageCacheSetter = (\n  key: string,\n  data: CachedAppPageValue,\n  revalidateSeconds: number,\n  tags: string[],\n  expireSeconds?: number,\n) => Promise<void>;\ntype AppPageBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype AppPageRequestCacheLife = {\n  revalidate?: number;\n  expire?: number;\n};\n\ntype AppPageCacheRenderResult = {\n  cacheControl?: CacheControlMetadata;\n  html: string;\n  rscData: ArrayBuffer;\n  tags: string[];\n};\n\ntype BuildAppPageCachedResponseOptions = {\n  cacheControl?: CacheControlMetadata;\n  cacheState: \"HIT\" | \"STALE\";\n  expireSeconds?: number;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  middlewareStatus?: number | null;\n  mountedSlotsHeader?: string | null;\n  revalidateSeconds: number;\n};\n\ntype ReadAppPageCacheResponseOptions = {\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  isRscRequest: boolean;\n  isrDebug?: AppPageDebugLogger;\n  isrGet: AppPageCacheGetter;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (\n    pathname: string,\n    mountedSlotsHeader?: string | null,\n    renderMode?: AppRscRenderMode,\n  ) => string;\n  isrSet: AppPageCacheSetter;\n  middlewareHeaders?: Headers | null;\n  middlewareStatus?: number | null;\n  mountedSlotsHeader?: string | null;\n  renderMode?: AppRscRenderMode;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  renderFreshPageForCache: () => Promise<AppPageCacheRenderResult>;\n  scheduleBackgroundRegeneration: AppPageBackgroundRegenerator;\n};\n\ntype FinalizeAppPageHtmlCacheResponseOptions = {\n  capturedDynamicUsageBeforeContextCleanup?: () => boolean;\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (\n    pathname: string,\n    mountedSlotsHeader?: string | null,\n    renderMode?: AppRscRenderMode,\n  ) => string;\n  isrSet: AppPageCacheSetter;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\ntype ScheduleAppPageRscCacheWriteOptions = {\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  dynamicUsedDuringBuild: boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrRscKey: (\n    pathname: string,\n    mountedSlotsHeader?: string | null,\n    renderMode?: AppRscRenderMode,\n  ) => string;\n  isrSet: AppPageCacheSetter;\n  mountedSlotsHeader?: string | null;\n  renderMode?: AppRscRenderMode;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\nconst NO_STORE_CACHE_CONTROL = \"no-store, must-revalidate\";\n\nexport function buildAppPageCacheTags(pathname: string, extraTags: readonly string[]): string[] {\n  const tags = [pathname, `_N_T_${pathname}`, \"_N_T_/layout\"];\n  const segments = pathname.split(\"/\");\n  let built = \"\";\n  for (let index = 1; index < segments.length; index++) {\n    const segment = segments[index];\n    if (segment) {\n      built += `/${segment}`;\n      tags.push(`_N_T_${built}/layout`);\n    }\n  }\n\n  tags.push(`_N_T_${built}/page`);\n  for (const tag of extraTags) {\n    if (!tags.includes(tag)) {\n      tags.push(tag);\n    }\n  }\n  // Canonicalise to ASCII-safe form so path-derived tags from non-ASCII\n  // pathnames match what `revalidatePath`/`revalidateTag` produce after\n  // their own encoding pass.\n  return tags.map(encodeCacheTag);\n}\n\nfunction buildAppPageCacheControl(\n  cacheState: BuildAppPageCachedResponseOptions[\"cacheState\"],\n  revalidateSeconds: number,\n  expireSeconds?: number,\n): string {\n  return buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expireSeconds);\n}\n\nfunction buildAppPageCachedHeaders(options: {\n  cacheControl: string;\n  cacheState: BuildAppPageCachedResponseOptions[\"cacheState\"];\n  contentType: string;\n  middlewareHeaders?: Headers | null;\n  mountedSlotsHeader?: string | null;\n}): Headers {\n  const headers = new Headers({\n    \"Cache-Control\": options.cacheControl,\n    \"Content-Type\": options.contentType,\n    Vary: VINEXT_RSC_VARY_HEADER,\n    [VINEXT_CACHE_HEADER]: options.cacheState,\n  });\n\n  if (options.mountedSlotsHeader) {\n    headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n  return headers;\n}\n\nfunction getCachedAppPageValue(entry: ISRCacheEntry | null): CachedAppPageValue | null {\n  return entry?.value.value && entry.value.value.kind === \"APP_PAGE\" ? entry.value.value : null;\n}\n\nfunction resolveAppPageCacheWritePolicy(options: {\n  expireSeconds?: number;\n  requestCacheLife?: AppPageRequestCacheLife | null;\n  revalidateSeconds: number | null;\n}): { expireSeconds?: number; revalidateSeconds: number } | null {\n  let revalidateSeconds = options.revalidateSeconds;\n  let expireSeconds = options.expireSeconds;\n  const requestCacheLife = options.requestCacheLife;\n\n  if (requestCacheLife?.revalidate !== undefined) {\n    revalidateSeconds =\n      revalidateSeconds === null\n        ? requestCacheLife.revalidate\n        : Math.min(revalidateSeconds, requestCacheLife.revalidate);\n  }\n  if (requestCacheLife?.expire !== undefined) {\n    expireSeconds = requestCacheLife.expire;\n  }\n\n  if (revalidateSeconds === null || revalidateSeconds <= 0 || !Number.isFinite(revalidateSeconds)) {\n    return null;\n  }\n\n  return { expireSeconds, revalidateSeconds };\n}\n\nexport function buildAppPageCachedResponse(\n  cachedValue: CachedAppPageValue,\n  options: BuildAppPageCachedResponseOptions,\n): Response | null {\n  // Preserve the legacy fallback semantics from the generated entry: invalid\n  // falsy statuses still fall back to 200 rather than being forwarded through.\n  const status = options.middlewareStatus ?? (cachedValue.status || 200);\n  const revalidateSeconds = options.cacheControl?.revalidate ?? options.revalidateSeconds;\n  const expireSeconds =\n    options.cacheControl === undefined\n      ? undefined\n      : (options.cacheControl.expire ?? options.expireSeconds);\n  const cacheControl = buildAppPageCacheControl(\n    options.cacheState,\n    revalidateSeconds,\n    expireSeconds,\n  );\n  if (options.isRscRequest) {\n    if (!cachedValue.rscData) {\n      return null;\n    }\n\n    const rscHeaders = buildAppPageCachedHeaders({\n      cacheControl,\n      cacheState: options.cacheState,\n      contentType: \"text/x-component; charset=utf-8\",\n      middlewareHeaders: options.middlewareHeaders,\n      mountedSlotsHeader: options.mountedSlotsHeader,\n    });\n\n    return new Response(cachedValue.rscData, {\n      status,\n      headers: rscHeaders,\n    });\n  }\n\n  if (typeof cachedValue.html !== \"string\" || cachedValue.html.length === 0) {\n    return null;\n  }\n\n  const htmlHeaders = buildAppPageCachedHeaders({\n    cacheControl,\n    cacheState: options.cacheState,\n    contentType: \"text/html; charset=utf-8\",\n    middlewareHeaders: options.middlewareHeaders,\n  });\n\n  return new Response(cachedValue.html, {\n    status,\n    headers: htmlHeaders,\n  });\n}\n\nexport async function readAppPageCacheResponse(\n  options: ReadAppPageCacheResponseOptions,\n): Promise<Response | null> {\n  const isrKey = options.isRscRequest\n    ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode)\n    : options.isrHtmlKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(isrKey);\n    const cachedValue = getCachedAppPageValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      const hitResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"HIT\",\n        cacheControl: cached?.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        middlewareHeaders: options.middlewareHeaders,\n        middlewareStatus: options.middlewareStatus,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (hitResponse) {\n        options.isrDebug?.(\n          options.isRscRequest ? \"HIT (RSC)\" : \"HIT (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return hitResponse;\n      }\n\n      options.isrDebug?.(\"MISS (empty cached entry)\", options.cleanPathname);\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const regenerationKey = options.isRscRequest\n        ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode)\n        : options.isrHtmlKey(options.cleanPathname);\n\n      // Preserve the legacy behavior from the inline generator: stale entries\n      // still trigger background regeneration even if this request cannot use\n      // the stale payload and will fall through to a fresh render.\n      options.scheduleBackgroundRegeneration(regenerationKey, async () => {\n        const revalidatedPage = await options.renderFreshPageForCache();\n        const revalidateSeconds =\n          revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;\n        const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;\n        const writes = [\n          options.isrSet(\n            options.isrRscKey(\n              options.cleanPathname,\n              options.mountedSlotsHeader,\n              options.renderMode,\n            ),\n            buildAppPageCacheValue(\"\", revalidatedPage.rscData, 200),\n            revalidateSeconds,\n            revalidatedPage.tags,\n            expireSeconds,\n          ),\n        ];\n\n        if (!options.isRscRequest) {\n          // HTML cache is slot-state-independent (canonical), so only refresh it\n          // during HTML-triggered regens. RSC-triggered regens only update the\n          // requesting client's RSC slot variant; a stale HTML cache entry will\n          // be regenerated independently by the next full-page HTML request.\n          writes.push(\n            options.isrSet(\n              options.isrHtmlKey(options.cleanPathname),\n              buildAppPageCacheValue(revalidatedPage.html, undefined, 200),\n              revalidateSeconds,\n              revalidatedPage.tags,\n              expireSeconds,\n            ),\n          );\n        }\n\n        await Promise.all(writes);\n        options.isrDebug?.(\"regen complete\", options.cleanPathname);\n      });\n\n      const staleResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"STALE\",\n        cacheControl: cached.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        middlewareHeaders: options.middlewareHeaders,\n        middlewareStatus: options.middlewareStatus,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (staleResponse) {\n        options.isrDebug?.(\n          options.isRscRequest ? \"STALE (RSC)\" : \"STALE (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return staleResponse;\n      }\n\n      options.isrDebug?.(\"STALE MISS (empty stale entry)\", options.cleanPathname);\n    }\n\n    if (!cached) {\n      options.isrDebug?.(\"MISS (no cache entry)\", options.cleanPathname);\n    }\n  } catch (isrReadError) {\n    console.error(\"[vinext] ISR cache read error:\", isrReadError);\n  }\n\n  return null;\n}\n\nexport function finalizeAppPageHtmlCacheResponse(\n  response: Response,\n  options: FinalizeAppPageHtmlCacheResponseOptions,\n): Response {\n  if (!response.body) {\n    return response;\n  }\n\n  const [streamForClient, streamForCache] = response.body.tee();\n  const htmlKey = options.isrHtmlKey(options.cleanPathname);\n  const rscKey = options.isrRscKey(options.cleanPathname, null);\n  const clientHeaders = new Headers(response.headers);\n  if (options.preserveClientResponseHeaders !== true) {\n    // HTML Server Components can access request APIs while the stream is being\n    // consumed. Until that late dynamic check finishes, downstream shared caches\n    // must not cache a response whose ISR policy was known before streaming.\n    clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n    clientHeaders.set(VINEXT_CACHE_HEADER, \"MISS\");\n  }\n\n  const cachePromise = (async () => {\n    try {\n      const cachedHtml = await readStreamAsText(streamForCache);\n\n      if (\n        options.capturedDynamicUsageBeforeContextCleanup?.() === true ||\n        options.consumeDynamicUsage()\n      ) {\n        options.isrDebug?.(\"HTML cache write skipped (dynamic usage during render)\", htmlKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"HTML cache write skipped (no cache policy)\", htmlKey);\n        return;\n      }\n\n      const pageTags = options.getPageTags();\n      const writes = [\n        options.isrSet(\n          htmlKey,\n          buildAppPageCacheValue(cachedHtml, undefined, 200),\n          cachePolicy.revalidateSeconds,\n          pageTags,\n          cachePolicy.expireSeconds,\n        ),\n      ];\n\n      if (options.capturedRscDataPromise) {\n        writes.push(\n          options.capturedRscDataPromise.then((rscData) =>\n            options.isrSet(\n              rscKey,\n              buildAppPageCacheValue(\"\", rscData, 200),\n              cachePolicy.revalidateSeconds,\n              pageTags,\n              cachePolicy.expireSeconds,\n            ),\n          ),\n        );\n      }\n\n      await Promise.all(writes);\n      options.isrDebug?.(\"HTML cache written\", htmlKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n\n  return new Response(streamForClient, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function finalizeAppPageRscCacheResponse(\n  response: Response,\n  options: ScheduleAppPageRscCacheWriteOptions,\n): Response {\n  const didSchedule = scheduleAppPageRscCacheWrite(options);\n  if (!didSchedule) {\n    return response;\n  }\n\n  if (options.preserveClientResponseHeaders === true) {\n    return response;\n  }\n\n  const clientHeaders = new Headers(response.headers);\n  // RSC payloads are also streamed lazily. Until the captured stream proves no\n  // late request API was used, the client-facing MISS response must not enter a\n  // shared cache when the ISR policy was known before streaming.\n  clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n  clientHeaders.set(VINEXT_CACHE_HEADER, \"MISS\");\n\n  return new Response(response.body, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function scheduleAppPageRscCacheWrite(\n  options: ScheduleAppPageRscCacheWriteOptions,\n): boolean {\n  const capturedRscDataPromise = options.capturedRscDataPromise;\n  if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) {\n    return false;\n  }\n\n  const rscKey = options.isrRscKey(\n    options.cleanPathname,\n    options.mountedSlotsHeader,\n    options.renderMode,\n  );\n  const cachePromise = (async () => {\n    try {\n      const rscData = await capturedRscDataPromise;\n\n      // Two-phase dynamic detection:\n      // 1. dynamicUsedDuringBuild catches searchParams-driven opt-in before the\n      //    RSC response is sent.\n      // 2. consumeDynamicUsage() here catches APIs that fire while the RSC\n      //    stream is consumed (headers(), cookies(), noStore()).\n      if (options.consumeDynamicUsage()) {\n        options.isrDebug?.(\"RSC cache write skipped (dynamic usage during render)\", rscKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"RSC cache write skipped (no cache policy)\", rscKey);\n        return;\n      }\n\n      await options.isrSet(\n        rscKey,\n        buildAppPageCacheValue(\"\", rscData, 200),\n        cachePolicy.revalidateSeconds,\n        options.getPageTags(),\n        cachePolicy.expireSeconds,\n      );\n      options.isrDebug?.(\"RSC cache written\", rscKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR RSC cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n  return true;\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-cache.js","names":[],"sources":["../../src/server/app-page-cache.ts"],"sourcesContent":["import type { CachedAppPageValue, CacheControlMetadata } from \"vinext/shims/cache\";\nimport {\n  VINEXT_RSC_CONTENT_TYPE,\n  VINEXT_RSC_VARY_HEADER,\n  applyRscCompatibilityIdHeader,\n} from \"./app-rsc-cache-busting.js\";\nimport { buildCachedRevalidateCacheControl } from \"./cache-control.js\";\nimport { VINEXT_MOUNTED_SLOTS_HEADER } from \"./headers.js\";\nimport { setCacheStateHeaders } from \"./cache-headers.js\";\nimport { buildAppPageCacheValue, type ISRCacheEntry } from \"./isr-cache.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { readStreamAsText } from \"../utils/text-stream.js\";\nimport { encodeCacheTag } from \"../utils/encode-cache-tag.js\";\nimport type { AppRscRenderMode } from \"./app-rsc-render-mode.js\";\nimport {\n  createEmptyAppPageRenderObservationState,\n  type AppPageRenderObservationState,\n} from \"./app-page-render-observation.js\";\nimport type { RenderObservation } from \"./cache-proof.js\";\n\ntype AppPageDebugLogger = (event: string, detail: string) => void;\ntype AppPageCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype AppPageCacheSetter = (\n  key: string,\n  data: CachedAppPageValue,\n  revalidateSeconds: number,\n  tags: string[],\n  expireSeconds?: number,\n) => Promise<void>;\ntype AppPageBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype AppPageRequestCacheLife = {\n  revalidate?: number;\n  expire?: number;\n};\nexport type AppPageCacheOutcomeMetric = Readonly<{\n  artifact: \"html\" | \"rsc\";\n  /**\n   * Internal cache lookup key for debugging and tests. Runtime telemetry sinks should hash or\n   * redact this value before export to avoid high-cardinality or user-derived labels.\n   */\n  cacheKey: string;\n  outcome: \"hit\" | \"miss\" | \"stale\";\n  reason:\n    | \"empty-entry\"\n    | \"no-entry\"\n    | \"non-app-page-entry\"\n    | \"read-error\"\n    | \"served\"\n    | \"stale-empty-entry\";\n}>;\ntype AppPageCacheOutcomeRecorder = (metric: AppPageCacheOutcomeMetric) => void;\n\ntype BuildAppPageCacheRenderObservation = (input: {\n  cacheTags: readonly string[];\n  state: AppPageRenderObservationState;\n}) => RenderObservation;\n\ntype AppPageCacheRenderResult = {\n  cacheControl?: CacheControlMetadata;\n  html: string;\n  htmlRenderObservation?: RenderObservation;\n  rscData: ArrayBuffer;\n  rscRenderObservation?: RenderObservation;\n  tags: string[];\n};\n\ntype BuildAppPageCachedResponseOptions = {\n  cacheControl?: CacheControlMetadata;\n  cacheState: \"HIT\" | \"STALE\";\n  expireSeconds?: number;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  middlewareStatus?: number | null;\n  mountedSlotsHeader?: string | null;\n  revalidateSeconds: number;\n};\n\ntype ReadAppPageCacheResponseOptions = {\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  isRscRequest: boolean;\n  isrDebug?: AppPageDebugLogger;\n  isrGet: AppPageCacheGetter;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (\n    pathname: string,\n    mountedSlotsHeader?: string | null,\n    renderMode?: AppRscRenderMode,\n  ) => string;\n  isrSet: AppPageCacheSetter;\n  middlewareHeaders?: Headers | null;\n  middlewareStatus?: number | null;\n  mountedSlotsHeader?: string | null;\n  recordCacheOutcome?: AppPageCacheOutcomeRecorder;\n  renderMode?: AppRscRenderMode;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  renderFreshPageForCache: () => Promise<AppPageCacheRenderResult>;\n  scheduleBackgroundRegeneration: AppPageBackgroundRegenerator;\n};\n\ntype FinalizeAppPageHtmlCacheResponseOptions = {\n  capturedDynamicUsageBeforeContextCleanup?: () => boolean;\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  consumeRenderObservationState?: () => AppPageRenderObservationState;\n  createHtmlRenderObservation?: BuildAppPageCacheRenderObservation;\n  createRscRenderObservation?: BuildAppPageCacheRenderObservation;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (\n    pathname: string,\n    mountedSlotsHeader?: string | null,\n    renderMode?: AppRscRenderMode,\n  ) => string;\n  isrSet: AppPageCacheSetter;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\ntype ScheduleAppPageRscCacheWriteOptions = {\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  consumeRenderObservationState?: () => AppPageRenderObservationState;\n  createRscRenderObservation?: BuildAppPageCacheRenderObservation;\n  dynamicUsedDuringBuild: boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrRscKey: (\n    pathname: string,\n    mountedSlotsHeader?: string | null,\n    renderMode?: AppRscRenderMode,\n  ) => string;\n  isrSet: AppPageCacheSetter;\n  mountedSlotsHeader?: string | null;\n  renderMode?: AppRscRenderMode;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\nconst NO_STORE_CACHE_CONTROL = \"no-store, must-revalidate\";\n\nfunction recordAppPageCacheOutcome(\n  recordCacheOutcome: AppPageCacheOutcomeRecorder | undefined,\n  input: AppPageCacheOutcomeMetric,\n): void {\n  try {\n    recordCacheOutcome?.(input);\n  } catch {\n    // Metrics are observational only; telemetry failures must not alter cache serving behavior.\n  }\n}\n\nexport function buildAppPageCacheTags(pathname: string, extraTags: readonly string[]): string[] {\n  const tags = [pathname, `_N_T_${pathname}`, \"_N_T_/layout\"];\n  const segments = pathname.split(\"/\");\n  let built = \"\";\n  for (let index = 1; index < segments.length; index++) {\n    const segment = segments[index];\n    if (segment) {\n      built += `/${segment}`;\n      tags.push(`_N_T_${built}/layout`);\n    }\n  }\n\n  tags.push(`_N_T_${built}/page`);\n  for (const tag of extraTags) {\n    if (!tags.includes(tag)) {\n      tags.push(tag);\n    }\n  }\n  // Canonicalise to ASCII-safe form so path-derived tags from non-ASCII\n  // pathnames match what `revalidatePath`/`revalidateTag` produce after\n  // their own encoding pass.\n  return tags.map(encodeCacheTag);\n}\n\nfunction buildAppPageCacheControl(\n  cacheState: BuildAppPageCachedResponseOptions[\"cacheState\"],\n  revalidateSeconds: number,\n  expireSeconds?: number,\n): string {\n  return buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expireSeconds);\n}\n\nfunction buildAppPageCachedHeaders(options: {\n  cacheControl: string;\n  cacheState: BuildAppPageCachedResponseOptions[\"cacheState\"];\n  contentType: string;\n  middlewareHeaders?: Headers | null;\n  mountedSlotsHeader?: string | null;\n}): Headers {\n  const headers = new Headers({\n    \"Cache-Control\": options.cacheControl,\n    \"Content-Type\": options.contentType,\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n  setCacheStateHeaders(headers, options.cacheState);\n\n  if (options.mountedSlotsHeader) {\n    headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n  return headers;\n}\n\nfunction getCachedAppPageValue(entry: ISRCacheEntry | null): CachedAppPageValue | null {\n  return entry?.value.value && entry.value.value.kind === \"APP_PAGE\" ? entry.value.value : null;\n}\n\nfunction resolveAppPageCacheWritePolicy(options: {\n  expireSeconds?: number;\n  requestCacheLife?: AppPageRequestCacheLife | null;\n  revalidateSeconds: number | null;\n}): { expireSeconds?: number; revalidateSeconds: number } | null {\n  let revalidateSeconds = options.revalidateSeconds;\n  let expireSeconds = options.expireSeconds;\n  const requestCacheLife = options.requestCacheLife;\n\n  if (requestCacheLife?.revalidate !== undefined) {\n    revalidateSeconds =\n      revalidateSeconds === null\n        ? requestCacheLife.revalidate\n        : Math.min(revalidateSeconds, requestCacheLife.revalidate);\n  }\n  if (requestCacheLife?.expire !== undefined) {\n    expireSeconds = requestCacheLife.expire;\n  }\n\n  if (revalidateSeconds === null || revalidateSeconds <= 0 || !Number.isFinite(revalidateSeconds)) {\n    return null;\n  }\n\n  return { expireSeconds, revalidateSeconds };\n}\n\nexport function buildAppPageCachedResponse(\n  cachedValue: CachedAppPageValue,\n  options: BuildAppPageCachedResponseOptions,\n): Response | null {\n  // Preserve the legacy fallback semantics from the generated entry: invalid\n  // falsy statuses still fall back to 200 rather than being forwarded through.\n  const status = options.middlewareStatus ?? (cachedValue.status || 200);\n  const revalidateSeconds = options.cacheControl?.revalidate ?? options.revalidateSeconds;\n  const expireSeconds =\n    options.cacheControl === undefined\n      ? undefined\n      : (options.cacheControl.expire ?? options.expireSeconds);\n  const cacheControl = buildAppPageCacheControl(\n    options.cacheState,\n    revalidateSeconds,\n    expireSeconds,\n  );\n  if (options.isRscRequest) {\n    if (!cachedValue.rscData) {\n      return null;\n    }\n\n    const rscHeaders = buildAppPageCachedHeaders({\n      cacheControl,\n      cacheState: options.cacheState,\n      contentType: VINEXT_RSC_CONTENT_TYPE,\n      middlewareHeaders: options.middlewareHeaders,\n      mountedSlotsHeader: options.mountedSlotsHeader,\n    });\n    applyRscCompatibilityIdHeader(rscHeaders);\n\n    return new Response(cachedValue.rscData, {\n      status,\n      headers: rscHeaders,\n    });\n  }\n\n  if (typeof cachedValue.html !== \"string\" || cachedValue.html.length === 0) {\n    return null;\n  }\n\n  const htmlHeaders = buildAppPageCachedHeaders({\n    cacheControl,\n    cacheState: options.cacheState,\n    contentType: \"text/html; charset=utf-8\",\n    middlewareHeaders: options.middlewareHeaders,\n  });\n\n  return new Response(cachedValue.html, {\n    status,\n    headers: htmlHeaders,\n  });\n}\n\nexport async function readAppPageCacheResponse(\n  options: ReadAppPageCacheResponseOptions,\n): Promise<Response | null> {\n  const isrKey = options.isRscRequest\n    ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode)\n    : options.isrHtmlKey(options.cleanPathname);\n  const artifact = options.isRscRequest ? \"rsc\" : \"html\";\n\n  try {\n    const cached = await options.isrGet(isrKey);\n    const cachedValue = getCachedAppPageValue(cached);\n\n    if (cached && !cachedValue) {\n      recordAppPageCacheOutcome(options.recordCacheOutcome, {\n        artifact,\n        cacheKey: isrKey,\n        outcome: \"miss\",\n        reason: \"non-app-page-entry\",\n      });\n      options.isrDebug?.(\"MISS (non app-page cache entry)\", options.cleanPathname);\n      return null;\n    }\n\n    if (cachedValue && !cached?.isStale) {\n      const hitResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"HIT\",\n        cacheControl: cached?.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        middlewareHeaders: options.middlewareHeaders,\n        middlewareStatus: options.middlewareStatus,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (hitResponse) {\n        recordAppPageCacheOutcome(options.recordCacheOutcome, {\n          artifact,\n          cacheKey: isrKey,\n          outcome: \"hit\",\n          reason: \"served\",\n        });\n        options.isrDebug?.(\n          options.isRscRequest ? \"HIT (RSC)\" : \"HIT (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return hitResponse;\n      }\n\n      recordAppPageCacheOutcome(options.recordCacheOutcome, {\n        artifact,\n        cacheKey: isrKey,\n        outcome: \"miss\",\n        reason: \"empty-entry\",\n      });\n      options.isrDebug?.(\"MISS (empty cached entry)\", options.cleanPathname);\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const regenerationKey = options.isRscRequest\n        ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode)\n        : options.isrHtmlKey(options.cleanPathname);\n\n      // Preserve the legacy behavior from the inline generator: stale entries\n      // still trigger background regeneration even if this request cannot use\n      // the stale payload and will fall through to a fresh render.\n      options.scheduleBackgroundRegeneration(regenerationKey, async () => {\n        const revalidatedPage = await options.renderFreshPageForCache();\n        const revalidateSeconds =\n          revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;\n        const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;\n        const writes = [\n          options.isrSet(\n            options.isrRscKey(\n              options.cleanPathname,\n              options.mountedSlotsHeader,\n              options.renderMode,\n            ),\n            buildAppPageCacheValue(\n              \"\",\n              revalidatedPage.rscData,\n              200,\n              revalidatedPage.rscRenderObservation,\n            ),\n            revalidateSeconds,\n            revalidatedPage.tags,\n            expireSeconds,\n          ),\n        ];\n\n        if (!options.isRscRequest) {\n          // HTML cache is slot-state-independent (canonical), so only refresh it\n          // during HTML-triggered regens. RSC-triggered regens only update the\n          // requesting client's RSC slot variant; a stale HTML cache entry will\n          // be regenerated independently by the next full-page HTML request.\n          writes.push(\n            options.isrSet(\n              options.isrHtmlKey(options.cleanPathname),\n              buildAppPageCacheValue(\n                revalidatedPage.html,\n                undefined,\n                200,\n                revalidatedPage.htmlRenderObservation,\n              ),\n              revalidateSeconds,\n              revalidatedPage.tags,\n              expireSeconds,\n            ),\n          );\n        }\n\n        await Promise.all(writes);\n        options.isrDebug?.(\"regen complete\", options.cleanPathname);\n      });\n\n      const staleResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"STALE\",\n        cacheControl: cached.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        middlewareHeaders: options.middlewareHeaders,\n        middlewareStatus: options.middlewareStatus,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (staleResponse) {\n        recordAppPageCacheOutcome(options.recordCacheOutcome, {\n          artifact,\n          cacheKey: isrKey,\n          outcome: \"stale\",\n          reason: \"served\",\n        });\n        options.isrDebug?.(\n          options.isRscRequest ? \"STALE (RSC)\" : \"STALE (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return staleResponse;\n      }\n\n      recordAppPageCacheOutcome(options.recordCacheOutcome, {\n        artifact,\n        cacheKey: isrKey,\n        outcome: \"miss\",\n        reason: \"stale-empty-entry\",\n      });\n      options.isrDebug?.(\"STALE MISS (empty stale entry)\", options.cleanPathname);\n    }\n\n    if (!cached) {\n      recordAppPageCacheOutcome(options.recordCacheOutcome, {\n        artifact,\n        cacheKey: isrKey,\n        outcome: \"miss\",\n        reason: \"no-entry\",\n      });\n      options.isrDebug?.(\"MISS (no cache entry)\", options.cleanPathname);\n    }\n  } catch (isrReadError) {\n    recordAppPageCacheOutcome(options.recordCacheOutcome, {\n      artifact,\n      cacheKey: isrKey,\n      outcome: \"miss\",\n      reason: \"read-error\",\n    });\n    console.error(\"[vinext] ISR cache read error:\", isrReadError);\n  }\n\n  return null;\n}\n\nexport function finalizeAppPageHtmlCacheResponse(\n  response: Response,\n  options: FinalizeAppPageHtmlCacheResponseOptions,\n): Response {\n  if (!response.body) {\n    return response;\n  }\n\n  const [streamForClient, streamForCache] = response.body.tee();\n  const htmlKey = options.isrHtmlKey(options.cleanPathname);\n  const rscKey = options.isrRscKey(options.cleanPathname, null);\n  const clientHeaders = new Headers(response.headers);\n  if (options.preserveClientResponseHeaders !== true) {\n    // HTML Server Components can access request APIs while the stream is being\n    // consumed. Until that late dynamic check finishes, downstream shared caches\n    // must not cache a response whose ISR policy was known before streaming.\n    clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n    setCacheStateHeaders(clientHeaders, \"MISS\");\n  }\n\n  const cachePromise = (async () => {\n    try {\n      const cachedHtml = await readStreamAsText(streamForCache);\n\n      if (\n        options.capturedDynamicUsageBeforeContextCleanup?.() === true ||\n        options.consumeDynamicUsage()\n      ) {\n        options.isrDebug?.(\"HTML cache write skipped (dynamic usage during render)\", htmlKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"HTML cache write skipped (no cache policy)\", htmlKey);\n        return;\n      }\n\n      const pageTags = options.getPageTags();\n      // This continuation is scheduled while the request ALS scope is active.\n      // It intentionally consumes observation state only after the HTML stream\n      // drains, so late Server Component request API usage is included.\n      // Consume once: HTML and captured RSC artifacts come from the same render\n      // pass, so both cache artifacts share the same observation snapshot.\n      const observationState =\n        options.consumeRenderObservationState?.() ?? createEmptyAppPageRenderObservationState();\n      const htmlRenderObservation = options.createHtmlRenderObservation?.({\n        cacheTags: pageTags,\n        state: observationState,\n      });\n      const rscRenderObservation = options.createRscRenderObservation?.({\n        cacheTags: pageTags,\n        state: observationState,\n      });\n      const writes = [\n        options.isrSet(\n          htmlKey,\n          buildAppPageCacheValue(cachedHtml, undefined, 200, htmlRenderObservation),\n          cachePolicy.revalidateSeconds,\n          pageTags,\n          cachePolicy.expireSeconds,\n        ),\n      ];\n\n      if (options.capturedRscDataPromise) {\n        writes.push(\n          options.capturedRscDataPromise.then((rscData) =>\n            options.isrSet(\n              rscKey,\n              buildAppPageCacheValue(\"\", rscData, 200, rscRenderObservation),\n              cachePolicy.revalidateSeconds,\n              pageTags,\n              cachePolicy.expireSeconds,\n            ),\n          ),\n        );\n      }\n\n      await Promise.all(writes);\n      options.isrDebug?.(\"HTML cache written\", htmlKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n\n  return new Response(streamForClient, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function finalizeAppPageRscCacheResponse(\n  response: Response,\n  options: ScheduleAppPageRscCacheWriteOptions,\n): Response {\n  const didSchedule = scheduleAppPageRscCacheWrite(options);\n  if (!didSchedule) {\n    return response;\n  }\n\n  if (options.preserveClientResponseHeaders === true) {\n    return response;\n  }\n\n  const clientHeaders = new Headers(response.headers);\n  // RSC payloads are also streamed lazily. Until the captured stream proves no\n  // late request API was used, the client-facing MISS response must not enter a\n  // shared cache when the ISR policy was known before streaming.\n  clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n  setCacheStateHeaders(clientHeaders, \"MISS\");\n\n  return new Response(response.body, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function scheduleAppPageRscCacheWrite(\n  options: ScheduleAppPageRscCacheWriteOptions,\n): boolean {\n  const capturedRscDataPromise = options.capturedRscDataPromise;\n  if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) {\n    return false;\n  }\n\n  const rscKey = options.isrRscKey(\n    options.cleanPathname,\n    options.mountedSlotsHeader,\n    options.renderMode,\n  );\n  const cachePromise = (async () => {\n    try {\n      const rscData = await capturedRscDataPromise;\n\n      // Two-phase dynamic detection:\n      // 1. dynamicUsedDuringBuild catches searchParams-driven opt-in before the\n      //    RSC response is sent.\n      // 2. consumeDynamicUsage() here catches APIs that fire while the RSC\n      //    stream is consumed (headers(), cookies(), noStore()).\n      if (options.consumeDynamicUsage()) {\n        options.isrDebug?.(\"RSC cache write skipped (dynamic usage during render)\", rscKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"RSC cache write skipped (no cache policy)\", rscKey);\n        return;\n      }\n\n      const pageTags = options.getPageTags();\n      // This continuation is scheduled while the request ALS scope is active.\n      // It intentionally consumes observation state only after the captured RSC\n      // stream resolves, so late Server Component request API usage is included.\n      const observationState =\n        options.consumeRenderObservationState?.() ?? createEmptyAppPageRenderObservationState();\n      const rscRenderObservation = options.createRscRenderObservation?.({\n        cacheTags: pageTags,\n        state: observationState,\n      });\n      await options.isrSet(\n        rscKey,\n        buildAppPageCacheValue(\"\", rscData, 200, rscRenderObservation),\n        cachePolicy.revalidateSeconds,\n        pageTags,\n        cachePolicy.expireSeconds,\n      );\n      options.isrDebug?.(\"RSC cache written\", rscKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR RSC cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n  return true;\n}\n"],"mappings":"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"}

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

@@ -3,6 +3,7 @@ import { CachedAppPageValue } from "../shims/cache.js";
 import { AppOutgoingElements } from "./app-elements-wire.js";
 import { AppPageFontPreload, LayoutClassificationOptions } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
+import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ISRCacheEntry } from "./isr-cache.js";
@@ -29,6 +30,7 @@ type AppPageDispatchIntercept<TPage = unknown> = {
   interceptLayouts?: readonly AppPageModule[] | null;
   matchedParams: AppPageParams;
   page: TPage;
+  slotId?: string | null;
   slotKey: string;
   sourceRouteIndex: number;
 };
@@ -37,7 +39,9 @@ type AppPageDispatchInterceptOptions<TPage = unknown> = {
   interceptLayouts?: readonly AppPageModule[] | null;
   interceptPage: TPage;
   interceptParams: AppPageParams;
+  interceptSlotId?: string | null;
   interceptSlotKey: string;
+  interceptSourceMatchedUrl?: string | null;
 };
 type AppPageModule = {
   default?: unknown;
@@ -70,6 +74,8 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   fetchCache?: FetchCacheMode | null;
   findIntercept: (pathname: string) => AppPageDispatchIntercept | null;
   formState?: ReactFormState | null;
+  actionError?: unknown;
+  actionFailed?: boolean;
   generateStaticParams?: ValidateAppPageDynamicParamsOptions["generateStaticParams"];
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
@@ -93,6 +99,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   middlewareContext: AppPageMiddlewareContext;
   mountedSlotsHeader?: string | null;
   params: AppPageParams;
+  rootParams?: RootParams;
   probeLayoutAt: (layoutIndex: number) => unknown;
   probePage: () => unknown;
   expireSeconds?: number;

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

@@ -1,24 +1,26 @@
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, isDraftModeRequest, markDynamicUsage, setHeadersContext } from "../shims/headers.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, getAndClearPendingCookies, getDraftModeCookieHeader, isDraftModeRequest, markDynamicUsage, peekRenderRequestApiUsage, setHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _peekRequestScopedCacheLife } from "../shims/cache.js";
 import { shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
-import { ensureFetchPatch, getCollectedFetchTags, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
+import { consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { createAppPageTreePath } from "./app-page-route-wiring.js";
-import { readStreamAsText } from "../utils/text-stream.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import { buildAppPageSpecialErrorResponse, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { resolveAppPageParentHttpAccessBoundaryModule } from "./app-page-boundary.js";
+import { readStreamAsText } from "../utils/text-stream.js";
+import { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope } from "./app-page-render-observation.js";
 import { readAppPageCacheResponse } from "./app-page-cache.js";
-import { buildAppPageSpecialErrorResponse, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { resolveAppPageMethodResponse } from "./app-page-method.js";
 import { buildAppPageElement, resolveAppPageIntercept, validateAppPageDynamicParams } from "./app-page-request.js";
 import "./app-page-response.js";
 import { renderAppPageLifecycle } from "./app-page-render.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
+import React from "react";
 //#region src/server/app-page-dispatch.ts
 function shouldReadAppPageCache(options) {
 	return options.isProduction && !options.isProgressiveActionRender && !options.isDraftMode && !options.isForceDynamic && (options.isRscRequest || !options.scriptNonce) && (options.revalidateSeconds === null || options.revalidateSeconds > 0);
@@ -57,7 +59,9 @@ function toInterceptOptions(interceptionContext, intercept) {
 		interceptLayouts: intercept.interceptLayouts,
 		interceptPage: intercept.page,
 		interceptParams: intercept.matchedParams,
-		interceptSlotKey: intercept.slotKey
+		interceptSlotId: intercept.slotId ?? null,
+		interceptSlotKey: intercept.slotKey,
+		interceptSourceMatchedUrl: interceptionContext
 	};
 }
 async function dispatchAppPage(options) {
@@ -143,17 +147,57 @@ async function dispatchAppPageInner(options) {
 					links: options.getFontLinks(),
 					styles: options.getFontStyles(),
 					preloads: options.getFontPreloads()
-				}, revalidatedRscCapture.sideStream ? {
-					sideStream: revalidatedRscCapture.sideStream,
-					capturedRscDataRef: revalidatedCapturedRscRef
-				} : void 0));
+				}, {
+					basePath: options.basePath,
+					rootParams: options.rootParams,
+					...revalidatedRscCapture.sideStream ? {
+						sideStream: revalidatedRscCapture.sideStream,
+						capturedRscDataRef: revalidatedCapturedRscRef
+					} : {}
+				}));
 				const rscData = await getCapturedRscDataPromise(revalidatedCapturedRscRef.value);
 				const cacheLife = _consumeRequestScopedCacheLife();
 				options.clearRequestContext();
+				const tags = buildAppPageTags(options.cleanPathname, getCollectedFetchTags(), route.routeSegments);
+				const observationState = {
+					dynamicFetches: consumeDynamicFetchObservations(),
+					requestApis: consumeRenderRequestApiUsage()
+				};
 				return {
 					html,
+					htmlRenderObservation: createAppPageRenderObservation({
+						boundaryOutcome: { kind: "success" },
+						cacheability: "public",
+						cacheTags: tags,
+						cleanPathname: options.cleanPathname,
+						completeness: "complete",
+						output: createAppPageHtmlOutputScope({
+							element: revalidatedElement,
+							renderEpoch: null,
+							rootBoundaryId: null,
+							routePattern: route.pattern
+						}),
+						params: options.params,
+						state: observationState
+					}),
 					rscData,
-					tags: buildAppPageTags(options.cleanPathname, getCollectedFetchTags(), route.routeSegments),
+					rscRenderObservation: createAppPageRenderObservation({
+						boundaryOutcome: { kind: "success" },
+						cacheability: "public",
+						cacheTags: tags,
+						cleanPathname: options.cleanPathname,
+						completeness: "complete",
+						output: createAppPageRscOutputScope({
+							element: revalidatedElement,
+							mountedSlotsHeader: options.mountedSlotsHeader,
+							renderEpoch: null,
+							rootBoundaryId: null,
+							routePattern: route.pattern
+						}),
+						params: options.params,
+						state: observationState
+					}),
+					tags,
 					cacheControl: typeof cacheLife?.revalidate === "number" ? {
 						revalidate: cacheLife.revalidate,
 						expire: cacheLife.expire
@@ -199,10 +243,11 @@ async function dispatchAppPageInner(options) {
 			const interceptOnError = options.createRscOnErrorHandler(options.cleanPathname, sourceRoute.pattern);
 			const interceptStream = options.renderToReadableStream(interceptElement, { onError: interceptOnError });
 			const interceptHeaders = new Headers({
-				"Content-Type": "text/x-component; charset=utf-8",
+				"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 				Vary: VINEXT_RSC_VARY_HEADER
 			});
 			mergeMiddlewareResponseHeaders(interceptHeaders, options.middlewareContext.headers);
+			applyRscCompatibilityIdHeader(interceptHeaders);
 			return new Response(interceptStream, {
 				status: options.middlewareContext.status ?? 200,
 				headers: interceptHeaders
@@ -217,6 +262,7 @@ async function dispatchAppPageInner(options) {
 	if (interceptResult.response) return interceptResult.response;
 	const pageBuildResult = await buildAppPageElement({
 		buildPageElement() {
+			if (options.actionFailed) throw options.actionError;
 			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, options.searchParams);
 		},
 		renderErrorBoundaryPage(buildError) {
@@ -229,10 +275,17 @@ async function dispatchAppPageInner(options) {
 	});
 	if (pageBuildResult.response) return pageBuildResult.response;
 	return renderAppPageLifecycle({
+		basePath: options.basePath,
 		cleanPathname: options.cleanPathname,
 		clearRequestContext: options.clearRequestContext,
 		consumeDynamicUsage,
 		consumeInvalidDynamicUsageError,
+		consumeRenderObservationState() {
+			return {
+				dynamicFetches: consumeDynamicFetchObservations(),
+				requestApis: consumeRenderRequestApiUsage()
+			};
+		},
 		createRscOnErrorHandler(pathname, routePath) {
 			return options.createRscOnErrorHandler(pathname, routePath);
 		},
@@ -271,6 +324,13 @@ async function dispatchAppPageInner(options) {
 		loadSsrHandler: options.loadSsrHandler,
 		middlewareContext: options.middlewareContext,
 		params: options.params,
+		rootParams: options.rootParams,
+		peekRenderObservationState() {
+			return {
+				dynamicFetches: peekDynamicFetchObservations(),
+				requestApis: peekRenderRequestApiUsage()
+			};
+		},
 		probeLayoutAt(layoutIndex) {
 			return options.probeLayoutAt(layoutIndex);
 		},
@@ -322,9 +382,32 @@ async function dispatchAppPageInner(options) {
 		}
 	});
 }
+/**
+* Builds an RSC flight payload that encodes a redirect as a React error chunk.
+* We render a tiny element that immediately throws an `Error` whose `digest`
+* is the canonical `NEXT_REDIRECT;...` string. `renderToReadableStream`'s
+* `onError` returns that digest, react-server-dom-webpack serializes the
+* error into the stream, and the client's `RedirectErrorBoundary` decodes it
+* via `getURLFromRedirectError` / `getRedirectTypeFromError`.
+*
+* The thrown error's digest matches Next.js's well-known router error format,
+* so neither vinext's RSC error handler nor Next.js's reporter logs it as a
+* "real" server error. Mirrors `app-render.tsx generateDynamicFlightRenderResult`
+* where a redirect thrown during RSC rendering propagates through
+* `renderToFlightStream`'s `onError` callback into the flight payload.
+*/
+function buildRscRedirectFlightStream(options, digest) {
+	const throwingElement = React.createElement(function NextRedirectFlightThrower() {
+		const err = /* @__PURE__ */ new Error("NEXT_REDIRECT");
+		err.digest = digest;
+		throw err;
+	});
+	return options.renderToReadableStream(throwingElement, { onError: () => digest });
+}
 async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
 		isRscRequest: options.isRscRequest,
@@ -353,6 +436,7 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 async function renderPageSpecialError(options, specialError) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
 		isRscRequest: options.isRscRequest,