vinext 1.0.0 → 1.1.0

package/dist/shims/headers.js

@@ -1,11 +1,11 @@
-import { getOrCreateAls } from "./internal/als-registry.js";
-import { ensureRenderDynamicLatch, getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
+import { ensureRenderDynamicLatch, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
+import { createRenderDynamicLatch, getHeadersAccessPhase, getHeadersShimState, headersShimAls, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
 //#region src/shims/headers.ts
 /**
 * next/headers shim
@@ -16,26 +16,6 @@ import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
 * In Next.js 15+, cookies() and headers() return Promises (async).
 * We support both the sync (legacy) and async patterns.
 */
-function createRenderDynamicLatch() {
-	return {
-		dynamic: false,
-		listeners: /* @__PURE__ */ new Set()
-	};
-}
-const _FALLBACK_KEY = Symbol.for("vinext.nextHeadersShim.fallback");
-const _g = globalThis;
-const _als = getOrCreateAls("vinext.nextHeadersShim.als");
-const _fallbackState = _g[_FALLBACK_KEY] ??= {
-	headersContext: null,
-	dynamicUsageDetected: false,
-	renderDynamicLatch: createRenderDynamicLatch(),
-	renderRequestApiUsage: /* @__PURE__ */ new Set(),
-	connectionProbe: null,
-	invalidDynamicUsageError: null,
-	pendingSetCookies: [],
-	draftModeCookieHeader: null,
-	phase: "render"
-};
 function splitMiddlewareSetCookieHeader(value) {
 	const cookies = [];
 	let start = 0;
@@ -103,72 +83,6 @@ function mergeMiddlewareSetCookies(ctx, rawHeader) {
 	}
 	return merged;
 }
-function _getState() {
-	if (isInsideUnifiedScope()) return getRequestContext();
-	return _als.getStore() ?? _fallbackState;
-}
-/**
-* Dynamic usage flag — set when a component calls connection(), cookies(),
-* headers(), or noStore() during rendering. When true, ISR caching is
-* bypassed and the response gets Cache-Control: no-store.
-*/
-/**
-* Mark the current render as requiring dynamic (uncached) rendering.
-* Called by connection(), cookies(), headers(), and noStore().
-*/
-function markDynamicUsage() {
-	const state = _getState();
-	if (state.headersContext?.forceStatic) return;
-	state.dynamicUsageDetected = true;
-	const latches = [ensureRenderDynamicLatch(state)];
-	forEachConnectionProbeTarget(state, (target) => {
-		target.dynamicUsageDetected = true;
-		latches.push(ensureRenderDynamicLatch(target));
-	});
-	for (const latch of latches) latchRenderDynamic(latch);
-}
-function latchRenderDynamic(latch) {
-	if (latch.dynamic) return;
-	latch.dynamic = true;
-	const listeners = [...latch.listeners];
-	latch.listeners.clear();
-	for (const listener of listeners) try {
-		listener();
-	} catch (error) {
-		console.error(error);
-	}
-}
-/** Whether the current render has used a dynamic API at any point so far. */
-function isRenderDynamicLatched() {
-	return ensureRenderDynamicLatch(_getState()).dynamic;
-}
-/**
-* Call `listener` once when the current render first uses a dynamic API.
-* Returns an unsubscribe function. The listener never runs if the render is
-* already latched; check `isRenderDynamicLatched()` first.
-*/
-function onRenderDynamicLatched(listener) {
-	const latch = ensureRenderDynamicLatch(_getState());
-	if (latch.dynamic) return () => {};
-	latch.listeners.add(listener);
-	return () => {
-		latch.listeners.delete(listener);
-	};
-}
-function forEachConnectionProbeTarget(state, visit) {
-	let target = state.connectionProbe?.dynamicUsageTarget ?? null;
-	const seen = /* @__PURE__ */ new Set([state]);
-	while (target && !seen.has(target)) {
-		seen.add(target);
-		visit(target);
-		target = target.connectionProbe?.dynamicUsageTarget ?? null;
-	}
-}
-function propagateInvalidDynamicUsageError(state, error) {
-	forEachConnectionProbeTarget(state, (target) => {
-		if (target.invalidDynamicUsageError == null) target.invalidDynamicUsageError = error;
-	});
-}
 /**
 * Measure dynamic usage in a child async scope without clearing the parent.
 * Concurrent work that already belongs to the request (such as deferred
@@ -192,23 +106,59 @@ async function runWithIsolatedDynamicUsage(fn) {
 			return runInChildState(childState);
 		});
 	}
-	const parentState = _getState();
+	const parentState = getHeadersShimState();
 	const childState = {
 		...parentState,
 		renderDynamicLatch: ensureRenderDynamicLatch(parentState),
 		dynamicUsageDetected: false
 	};
-	return await _als.run(childState, () => runInChildState(childState));
+	return await headersShimAls.run(childState, () => runInChildState(childState));
 }
-function markRenderRequestApiUsage(kind) {
-	_getState().renderRequestApiUsage.add(kind);
-}
-function throwIfStaticGenerationAccessError() {
-	const accessError = _getState().headersContext?.accessError;
-	if (accessError) throw accessError;
+/**
+* Run a pre-render probe without letting its dynamic API usage classify the
+* request. Next.js has no probe: only the render decides whether a page is
+* dynamic, and the render runs the probed layouts and page again. Returns the
+* probe's own usage and cacheLife for a caller whose probe response replaces
+* the render.
+*/
+async function runWithDetachedDynamicUsage(fn) {
+	const runInChildState = async (childState, cacheLifeSink) => {
+		return {
+			result: await fn(),
+			cacheLife: cacheLifeSink?.cacheLife ?? null,
+			dynamicDetected: childState.dynamicUsageDetected || childState.renderDynamicLatch.dynamic
+		};
+	};
+	if (isInsideUnifiedScope()) {
+		let childState = null;
+		const cacheLifeSink = { cacheLife: null };
+		return await runWithUnifiedStateMutation((context) => {
+			context.cacheLifeSink = cacheLifeSink;
+			context.dynamicUsageDetected = false;
+			context.renderDynamicLatch = createRenderDynamicLatch();
+			context.renderRequestApiUsage = /* @__PURE__ */ new Set();
+			context.requestCache = /* @__PURE__ */ new WeakMap();
+			context.cacheableFetchUrls = /* @__PURE__ */ new Set();
+			context.currentRequestTags = [];
+			context.dynamicFetchUrls = /* @__PURE__ */ new Set();
+			context.requestScopedCacheLife = null;
+			context.unstableCacheObservations = /* @__PURE__ */ new Map();
+			childState = context;
+		}, () => {
+			if (!childState) throw new Error("Dynamic usage scope was not initialized");
+			return runInChildState(childState, cacheLifeSink);
+		});
+	}
+	const childState = {
+		...getHeadersShimState(),
+		dynamicUsageDetected: false,
+		renderDynamicLatch: createRenderDynamicLatch(),
+		renderRequestApiUsage: /* @__PURE__ */ new Set()
+	};
+	return await headersShimAls.run(childState, () => runInChildState(childState, null));
 }
 async function runWithConnectionProbe(fn) {
-	const parentState = _getState();
+	const parentState = getHeadersShimState();
 	const parentInvalidDynamicUsageError = parentState.invalidDynamicUsageError;
 	let interruptProbe = () => {};
 	const interrupted = new Promise((resolve) => {
@@ -222,8 +172,7 @@ async function runWithConnectionProbe(fn) {
 			if (probe.interrupted) return;
 			probe.interrupted = true;
 			interruptProbe();
-		},
-		pending: new Promise(() => {})
+		}
 	};
 	const runInChildState = async (childState) => {
 		try {
@@ -234,6 +183,7 @@ async function runWithConnectionProbe(fn) {
 			return await Promise.race([completed, interrupted]);
 		} finally {
 			probe.active = false;
+			interruptProbe();
 			childState.connectionProbe = parentState.connectionProbe ?? probe;
 			if (childState.dynamicUsageDetected) parentState.dynamicUsageDetected = true;
 			if (childState.invalidDynamicUsageError !== parentInvalidDynamicUsageError && parentState.invalidDynamicUsageError === parentInvalidDynamicUsageError) parentState.invalidDynamicUsageError = childState.invalidDynamicUsageError;
@@ -254,79 +204,23 @@ async function runWithConnectionProbe(fn) {
 		renderDynamicLatch: ensureRenderDynamicLatch(parentState),
 		connectionProbe: probe
 	};
-	return await _als.run(childState, () => runInChildState(childState));
+	return await headersShimAls.run(childState, () => runInChildState(childState));
 }
 function suspendConnectionProbe() {
-	const probe = _getState().connectionProbe;
+	const probe = getHeadersShimState().connectionProbe;
 	if (!probe?.active) return null;
 	probe.interrupt();
-	return probe.pending;
+	return new Promise(() => {});
 }
 function peekRenderRequestApiUsage() {
-	return [..._getState().renderRequestApiUsage].sort();
+	return [...getHeadersShimState().renderRequestApiUsage].sort();
 }
 function consumeRenderRequestApiUsage() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const observed = [...state.renderRequestApiUsage].sort();
 	state.renderRequestApiUsage = /* @__PURE__ */ new Set();
 	return observed;
 }
-/** Symbol used by cache-runtime.ts to store the "use cache" ALS on globalThis */
-const _USE_CACHE_ALS_KEY = Symbol.for("vinext.cacheRuntime.contextAls");
-/** Symbol used by cache.ts to store the unstable_cache ALS on globalThis */
-const _UNSTABLE_CACHE_ALS_KEY = Symbol.for("vinext.unstableCache.als");
-function _getGlobalCacheScopeStore(key) {
-	const value = Reflect.get(globalThis, key);
-	if (!value || typeof value !== "object") return null;
-	const getStore = Reflect.get(value, "getStore");
-	if (typeof getStore !== "function") return null;
-	return getStore.call(value);
-}
-function _getUseCacheGuardContext() {
-	const store = _getGlobalCacheScopeStore(_USE_CACHE_ALS_KEY);
-	if (!store || typeof store !== "object") return null;
-	return store;
-}
-function _isInsidePublicUseCache() {
-	const ctx = _getUseCacheGuardContext();
-	return ctx !== null && ctx.variant !== "private";
-}
-function _isInsideUnstableCache() {
-	return _getGlobalCacheScopeStore(_UNSTABLE_CACHE_ALS_KEY) === true;
-}
-/** Whether work is executing inside a cache boundary that owns its reuse. */
-function isInsideAnyCacheScope() {
-	return _getUseCacheGuardContext() !== null || _isInsideUnstableCache();
-}
-/**
-* Throw if the current execution is inside a "use cache" or unstable_cache()
-* scope. Called by dynamic request APIs (headers, cookies, connection) to
-* prevent request-specific data from being frozen into cached results.
-*
-* @param apiName - The name of the API being called (e.g. "connection()")
-*/
-function throwIfInsideCacheScope(apiName) {
-	if (_isInsidePublicUseCache()) {
-		const error = /* @__PURE__ */ new Error(`\`${apiName}\` cannot be called inside "use cache". If you need this data inside a cached function, call \`${apiName}\` outside and pass the required data as an argument.`);
-		try {
-			const cacheCtx = _getUseCacheGuardContext();
-			if (cacheCtx) cacheCtx.invalidDynamicUsageError = error;
-			const ctx = getRequestContext();
-			if (ctx) ctx.invalidDynamicUsageError = error;
-			propagateInvalidDynamicUsageError(_getState(), error);
-		} catch {}
-		throw error;
-	}
-	if (_isInsideUnstableCache()) {
-		const error = /* @__PURE__ */ new Error(`\`${apiName}\` cannot be called inside a function cached with \`unstable_cache()\`. If you need this data inside a cached function, call \`${apiName}\` outside and pass the required data as an argument.`);
-		try {
-			const ctx = getRequestContext();
-			if (ctx) ctx.invalidDynamicUsageError = error;
-			propagateInvalidDynamicUsageError(_getState(), error);
-		} catch {}
-		throw error;
-	}
-}
 /**
 * Check, consume, and return any invalid dynamic usage error recorded during
 * the render (e.g. cookies() called inside "use cache"). This error persists
@@ -337,7 +231,7 @@ function throwIfInsideCacheScope(apiName) {
 * https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689
 */
 function consumeInvalidDynamicUsageError() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const err = state.invalidDynamicUsageError;
 	state.invalidDynamicUsageError = null;
 	return err;
@@ -347,7 +241,7 @@ function consumeInvalidDynamicUsageError() {
 * Called by the server after rendering to decide on caching.
 */
 function consumeDynamicUsage() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const used = state.dynamicUsageDetected;
 	state.dynamicUsageDetected = false;
 	return used;
@@ -360,7 +254,7 @@ function consumeDynamicUsage() {
 * that leave no other observable trace.
 */
 function peekDynamicUsage() {
-	return _getState().dynamicUsageDetected;
+	return getHeadersShimState().dynamicUsageDetected;
 }
 function _setStatePhase(state, phase) {
 	const previous = state.phase;
@@ -369,14 +263,11 @@ function _setStatePhase(state, phase) {
 	return previous;
 }
 function _areCookiesMutableInCurrentPhase() {
-	const phase = _getState().phase;
+	const phase = getHeadersShimState().phase;
 	return phase === "action" || phase === "route-handler";
 }
 function setHeadersAccessPhase(phase) {
-	return _setStatePhase(_getState(), phase);
-}
-function getHeadersAccessPhase() {
-	return _getState().phase;
+	return _setStatePhase(getHeadersShimState(), phase);
 }
 /**
 * Set the headers/cookies context for the current RSC render.
@@ -393,7 +284,7 @@ function getHeadersAccessPhase() {
 * request context for afterFiles/fallback rewrite has/missing evaluation.
 */
 function getHeadersContext() {
-	return _getState().headersContext;
+	return getHeadersShimState().headersContext;
 }
 /** Serialize the effective request-cookie view, including middleware Set-Cookie overlays. */
 function getEffectiveRequestCookieHeader() {
@@ -418,7 +309,7 @@ function hasEffectiveRequestCookieChanges(cookieHeader) {
 * that split view without changing the request Headers object.
 */
 function applyEffectiveRequestCookieHeader(cookieHeader) {
-	const context = _getState().headersContext;
+	const context = getHeadersShimState().headersContext;
 	if (!context) return;
 	rebuildCookiesFromHeader(context, cookieHeader);
 	context.readonlyCookies = void 0;
@@ -426,7 +317,7 @@ function applyEffectiveRequestCookieHeader(cookieHeader) {
 }
 /** Restore a middleware draft-mode transition inside a staged render scope. */
 function restoreDraftModeTransition(cookieHeader) {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const context = state.headersContext;
 	if (!context) return;
 	const entry = setCookieNameValue(cookieHeader);
@@ -437,8 +328,12 @@ function restoreDraftModeTransition(cookieHeader) {
 	context.draftModeEnabled = entry.value === validateDraftModeSecret(context.draftModeSecret ?? "");
 	state.draftModeCookieHeader = cookieHeader;
 }
+/** Replace request API inputs while retaining dynamic usage and pending mutations. */
+function replaceHeadersContext(ctx) {
+	getHeadersShimState().headersContext = ctx;
+}
 function setHeadersContext(ctx) {
-	const state = _getState();
+	const state = getHeadersShimState();
 	if (ctx !== null) {
 		state.headersContext = ctx;
 		state.dynamicUsageDetected = false;
@@ -474,7 +369,7 @@ function runWithHeadersContext(ctx, fn) {
 		draftModeCookieHeader: null,
 		phase: "render"
 	};
-	return _als.run(state, fn);
+	return headersShimAls.run(state, fn);
 }
 /**
 * Apply middleware-forwarded request headers to the current headers context.
@@ -496,7 +391,7 @@ function runWithHeadersContext(ctx, fn) {
 * middleware-modified view.
 */
 function applyMiddlewareRequestHeaders(middlewareResponseHeaders) {
-	const state = _getState();
+	const state = getHeadersShimState();
 	if (!state.headersContext) return;
 	const ctx = state.headersContext;
 	const previousCookieHeader = ctx.headers.get("cookie");
@@ -700,7 +595,7 @@ function headers() {
 	} catch (error) {
 		return _decorateRejectedRequestApiPromise(error);
 	}
-	const state = _getState();
+	const state = getHeadersShimState();
 	if (!state.headersContext) return _decorateRejectedRequestApiPromise(/* @__PURE__ */ new Error("headers() can only be called from a Server Component, Route Handler, or Server Action. Make sure you're not calling it from a Client Component."));
 	if (state.headersContext.accessError) return _decorateRejectedRequestApiPromise(state.headersContext.accessError);
 	markDynamicUsage();
@@ -720,7 +615,7 @@ function cookiesImpl() {
 	} catch (error) {
 		return _decorateRejectedRequestApiPromise(error);
 	}
-	const state = _getState();
+	const state = getHeadersShimState();
 	if (!state.headersContext) return _decorateRejectedRequestApiPromise(/* @__PURE__ */ new Error("cookies() can only be called from a Server Component, Route Handler, or Server Action."));
 	if (state.headersContext.accessError) return _decorateRejectedRequestApiPromise(state.headersContext.accessError);
 	markDynamicUsage();
@@ -738,7 +633,7 @@ function cookies() {
 * Called by the framework after rendering to attach headers to the response.
 */
 function getAndClearPendingCookies() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const cookies = state.pendingSetCookies;
 	state.pendingSetCookies = [];
 	return cookies;
@@ -748,8 +643,12 @@ const DRAFT_MODE_COOKIE = "__prerender_bypass";
 * Get any Set-Cookie header generated by draftMode().enable()/disable().
 * Called by the framework after rendering to attach the header to the response.
 */
+/** Check a pending draft transition without consuming its outgoing cookie. */
+function hasDraftModeCookieHeader() {
+	return getHeadersShimState().draftModeCookieHeader !== null;
+}
 function getDraftModeCookieHeader() {
-	const state = _getState();
+	const state = getHeadersShimState();
 	const header = state.draftModeCookieHeader;
 	state.draftModeCookieHeader = null;
 	return header;
@@ -780,7 +679,7 @@ function isDraftModeRequest(request, draftModeSecret) {
 * callers fall back to an explicitly supplied request when needed.
 */
 function getActiveDraftModeState() {
-	const context = _getState().headersContext;
+	const context = getHeadersShimState().headersContext;
 	if (!context) return null;
 	if (context.draftModeEnabled !== void 0) return context.draftModeEnabled;
 	const secret = context.draftModeSecret;
@@ -820,7 +719,7 @@ function requireActiveDraftModeContext(state, expectedContext, expression) {
 */
 async function draftMode() {
 	markRenderRequestApiUsage("draftMode");
-	const state = _getState();
+	const state = getHeadersShimState();
 	const context = state.headersContext;
 	if (!context) throw createDraftModeScopeError("draftMode()");
 	const secret = ensureContextDraftModeSecret(context);
@@ -908,7 +807,7 @@ var RequestCookies = class {
 		});
 		const serialized = serializeMutableCookie(responseCookie);
 		this[APPLY_RESPONSE_COOKIE](responseCookie);
-		_getState().pendingSetCookies.push(serialized);
+		getHeadersShimState().pendingSetCookies.push(serialized);
 		return this;
 	}
 	delete(nameOrOptions) {
@@ -922,7 +821,7 @@ var RequestCookies = class {
 		});
 		const serialized = serializeMutableCookie(responseCookie);
 		this[APPLY_RESPONSE_COOKIE](responseCookie);
-		_getState().pendingSetCookies.push(serialized);
+		getHeadersShimState().pendingSetCookies.push(serialized);
 		return this;
 	}
 	get size() {
@@ -978,4 +877,4 @@ function serializeMutableCookie(cookie) {
 	});
 }
 //#endregion
-export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, restoreDraftModeTransition, runWithConnectionProbe, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasDraftModeCookieHeader, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, replaceHeadersContext, restoreDraftModeTransition, runWithConnectionProbe, runWithDetachedDynamicUsage, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/internal/app-page-props-cache-key.d.ts

@@ -5,8 +5,6 @@
  * props before a server component is invoked.
  */
 export declare const APP_PAGE_USE_CACHE_MARKER = "$$isPage";
-export declare function markAppPagePropsForUseCache<T extends object>(props: T): T;
-export declare function isMarkedAppPagePropsObject(value: object): boolean;
 /**
  * Whether `fn` is a transformed `"use cache"` function, including a bound
  * one. Like Next.js's `isUseCacheFunction`, this survives `.bind()`: React's
@@ -23,6 +21,8 @@ export declare function isUseCacheFunctionReference(fn: unknown): boolean;
  * module, or bound.
  */
 export declare function withUseCachePageMarker<T extends Record<string, unknown>>(fn: unknown, props: T): T;
+/** Layout components and their metadata resolvers retain framework params too. */
+export declare function withUseCacheLayoutMarker<T extends Record<string, unknown>>(fn: unknown, props: T): T;
 /**
  * Whether `value` is page props carrying the `$$isPage` marker. Only plain
  * objects qualify: the framework always passes a plain props object, and
@@ -30,4 +30,7 @@ export declare function withUseCachePageMarker<T extends Record<string, unknown>
  * observed as a param access.
  */
 export declare function hasUseCachePageMarker(value: unknown): value is Record<string, unknown>;
+export declare function hasUseCacheLayoutMarker(value: unknown): value is Record<string, unknown>;
+/** Remove only this invocation's marker before Flight keys and decodes props. */
+export declare function withoutUseCacheSegmentMarker(props: Record<string, unknown>, isPage: boolean): Record<string, unknown>;
 //#endregion

package/dist/shims/internal/app-page-props-cache-key.js

@@ -1,5 +1,4 @@
 //#region src/shims/internal/app-page-props-cache-key.ts
-const APP_PAGE_PROPS_CACHE_KEY_MARKER = Symbol.for("vinext.appPagePropsCacheKeyMarker");
 const USE_CACHE_FUNCTION_SYMBOL = Symbol.for("vinext.useCacheFunction");
 const SERVER_REFERENCE_TAG = Symbol.for("react.server.reference");
 /**
@@ -15,18 +14,8 @@ const USE_CACHE_SERVER_REFERENCE_ID_RE = /#\$\$vinext_cache_[0-9a-f]{64}$/;
 * props before a server component is invoked.
 */
 const APP_PAGE_USE_CACHE_MARKER = "$$isPage";
-function markAppPagePropsForUseCache(props) {
-	Object.defineProperty(props, APP_PAGE_PROPS_CACHE_KEY_MARKER, {
-		configurable: false,
-		enumerable: false,
-		value: true,
-		writable: false
-	});
-	return props;
-}
-function isMarkedAppPagePropsObject(value) {
-	return Reflect.get(value, APP_PAGE_PROPS_CACHE_KEY_MARKER) === true;
-}
+/** Layout marker, matching Next.js's `$$isLayout` prop (create-component-tree.tsx). */
+const APP_LAYOUT_USE_CACHE_MARKER = "$$isLayout";
 /**
 * Whether `fn` is a transformed `"use cache"` function, including a bound
 * one. Like Next.js's `isUseCacheFunction`, this survives `.bind()`: React's
@@ -53,6 +42,13 @@ function withUseCachePageMarker(fn, props) {
 		[APP_PAGE_USE_CACHE_MARKER]: true
 	} : props;
 }
+/** Layout components and their metadata resolvers retain framework params too. */
+function withUseCacheLayoutMarker(fn, props) {
+	return isUseCacheFunctionReference(fn) ? {
+		...props,
+		[APP_LAYOUT_USE_CACHE_MARKER]: true
+	} : props;
+}
 /**
 * Whether `value` is page props carrying the `$$isPage` marker. Only plain
 * objects qualify: the framework always passes a plain props object, and
@@ -60,9 +56,22 @@ function withUseCachePageMarker(fn, props) {
 * observed as a param access.
 */
 function hasUseCachePageMarker(value) {
+	return hasUseCacheSegmentMarker(value, APP_PAGE_USE_CACHE_MARKER);
+}
+function hasUseCacheLayoutMarker(value) {
+	return hasUseCacheSegmentMarker(value, APP_LAYOUT_USE_CACHE_MARKER);
+}
+/** Remove only this invocation's marker before Flight keys and decodes props. */
+function withoutUseCacheSegmentMarker(props, isPage) {
+	const marker = isPage ? APP_PAGE_USE_CACHE_MARKER : APP_LAYOUT_USE_CACHE_MARKER;
+	if (props[marker] !== true) return props;
+	const { [marker]: _marker, ...segmentProps } = props;
+	return segmentProps;
+}
+function hasUseCacheSegmentMarker(value, marker) {
 	if (value === null || typeof value !== "object") return false;
 	const prototype = Object.getPrototypeOf(value);
-	return (prototype === Object.prototype || prototype === null) && value["$$isPage"] === true;
+	return (prototype === Object.prototype || prototype === null) && value[marker] === true;
 }
 //#endregion
-export { APP_PAGE_USE_CACHE_MARKER, hasUseCachePageMarker, isMarkedAppPagePropsObject, isUseCacheFunctionReference, markAppPagePropsForUseCache, withUseCachePageMarker };
+export { APP_PAGE_USE_CACHE_MARKER, hasUseCacheLayoutMarker, hasUseCachePageMarker, isUseCacheFunctionReference, withUseCacheLayoutMarker, withUseCachePageMarker, withoutUseCacheSegmentMarker };

package/dist/shims/internal/cache-context-accessor.d.ts

@@ -0,0 +1,16 @@
+import { CacheLifeConfig } from "../cache-request-state.js";
+//#region src/shims/internal/cache-context-accessor.d.ts
+type CacheContextLike = {
+  tags: string[];
+  lifeConfigs: CacheLifeConfig[];
+  variant: string;
+  readRootParamNames?: Set<string>;
+  hasExplicitRevalidate: boolean;
+  hasExplicitExpire: boolean;
+  dynamicNestedCacheError: Error | undefined;
+};
+export declare function _registerCacheContextAccessor(fn: () => CacheContextLike | null): void;
+export declare function getRegisteredCacheContext(): CacheContextLike | null;
+/** Record a root-param dependency on the active public `"use cache"` scope. */
+export declare function _recordUseCacheRootParamRead(name: string): void;
+//#endregion

package/dist/shims/internal/cache-context-accessor.js

@@ -0,0 +1,15 @@
+//#region src/shims/internal/cache-context-accessor.ts
+let getCacheContext = null;
+function _registerCacheContextAccessor(fn) {
+	getCacheContext = fn;
+}
+function getRegisteredCacheContext() {
+	return getCacheContext?.() ?? null;
+}
+/** Record a root-param dependency on the active public `"use cache"` scope. */
+function _recordUseCacheRootParamRead(name) {
+	const context = getRegisteredCacheContext();
+	if (context && context.variant !== "private") context.readRootParamNames?.add(name);
+}
+//#endregion
+export { _recordUseCacheRootParamRead, _registerCacheContextAccessor, getRegisteredCacheContext };

package/dist/shims/internal/headers-state.d.ts

@@ -0,0 +1,73 @@
+import { RenderRequestApiKind } from "../../server/cache-proof.js";
+import { HeadersContext } from "../headers.js";
+//#region src/shims/internal/headers-state.d.ts
+export type HeadersAccessPhase = "render" | "action" | "route-handler";
+/**
+ * Whether the current render has used a dynamic API. Unlike
+ * `dynamicUsageDetected`, nothing clears it, and one object is shared by every
+ * child scope of the request, so usage inside isolated scopes (such as the
+ * layout probe) stays visible to later readers.
+ */
+export type RenderDynamicLatch = {
+  dynamic: boolean;
+  listeners: Set<() => void>;
+};
+export declare function createRenderDynamicLatch(): RenderDynamicLatch;
+export type VinextHeadersShimState = {
+  headersContext: HeadersContext | null;
+  dynamicUsageDetected: boolean;
+  renderDynamicLatch: RenderDynamicLatch;
+  renderRequestApiUsage: Set<RenderRequestApiKind>;
+  connectionProbe: ConnectionProbeState | null;
+  /** Error recorded by throwIfInsideCacheScope for dev diagnostics, persists even if caught by user code. */
+  invalidDynamicUsageError: unknown;
+  pendingSetCookies: string[];
+  draftModeCookieHeader: string | null;
+  phase: HeadersAccessPhase;
+};
+export type ConnectionProbeState = {
+  active: boolean;
+  dynamicUsageTarget: VinextHeadersShimState;
+  interrupted: boolean;
+  interrupt: () => void;
+};
+export type ConnectionProbeResult<T> = {
+  completed: true;
+  result: T;
+} | {
+  completed: false;
+};
+export declare const headersShimAls: import("node:async_hooks").AsyncLocalStorage<VinextHeadersShimState>;
+export declare function getHeadersShimState(): VinextHeadersShimState;
+/**
+ * Dynamic usage flag — set when a component calls connection(), cookies(),
+ * headers(), or noStore() during rendering. When true, ISR caching is
+ * bypassed and the response gets Cache-Control: no-store.
+ */
+/**
+ * Mark the current render as requiring dynamic (uncached) rendering.
+ * Called by connection(), cookies(), headers(), and noStore().
+ */
+export declare function markDynamicUsage(): void;
+/** Whether the current render has used a dynamic API at any point so far. */
+export declare function isRenderDynamicLatched(): boolean;
+/**
+ * Call `listener` once when the current render first uses a dynamic API.
+ * Returns an unsubscribe function. The listener never runs if the render is
+ * already latched; check `isRenderDynamicLatched()` first.
+ */
+export declare function onRenderDynamicLatched(listener: () => void): () => void;
+export declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
+export declare function throwIfStaticGenerationAccessError(): void;
+/** Whether work is executing inside a cache boundary that owns its reuse. */
+export declare function isInsideAnyCacheScope(): boolean;
+/**
+ * Throw if the current execution is inside a "use cache" or unstable_cache()
+ * scope. Called by dynamic request APIs (headers, cookies, connection) to
+ * prevent request-specific data from being frozen into cached results.
+ *
+ * @param apiName - The name of the API being called (e.g. "connection()")
+ */
+export declare function throwIfInsideCacheScope(apiName: string): void;
+export declare function getHeadersAccessPhase(): HeadersAccessPhase;
+//#endregion