vinext 1.0.0 → 1.0.1

package/dist/shims/error.js

@@ -13,9 +13,9 @@ import React from "react";
 * Used by apps that import `import Error from 'next/error'` for
 * custom error handling in getServerSideProps or API routes.
 *
-* Also re-exports the unstable App Router error-boundary HOC
-* (`unstable_catchError`) and its `ErrorInfo` type, mirroring
-* `next/error`'s public surface.
+* Also exports the App Router error-boundary HOC (`catchError`, plus its
+* former unstable name) and its `ErrorInfo` type, mirroring `next/error`'s
+* public surface.
 */
 const statusCodes = {
 	400: "Bad Request",
@@ -83,7 +83,7 @@ var ErrorComponent = class extends React.Component {
 const _CatchErrorAppRouterContext = AppRouterContext ?? React.createContext(null);
 var _CatchError = class extends React.Component {
 	static contextType = _CatchErrorAppRouterContext;
-	static displayName = "unstable_catchError(Next.CatchError)";
+	static displayName = "catchError(Next.CatchError)";
 	constructor(props) {
 		super(props);
 		this.state = {
@@ -108,19 +108,24 @@ var _CatchError = class extends React.Component {
 	reset = () => {
 		this.setState({ error: null });
 	};
-	unstable_retry = () => {
-		if (this.props.isPagesRouter) throw new Error("`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.");
+	retry = () => {
+		if (this.props.isPagesRouter) throw new Error("`retry()` can only be used in the App Router. Use `reset()` in the Pages Router.");
 		React.startTransition(() => {
 			this.context?.refresh();
 			this.reset();
 		});
 	};
+	unstable_retry = () => {
+		if (this.props.isPagesRouter) throw new Error("`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.");
+		this.retry();
+	};
 	render() {
 		if (this.state.error) {
 			const Fallback = this.props.fallback;
 			const errorInfo = {
-				error: this.state.error.thrownValue instanceof Error ? this.state.error.thrownValue : new Error(String(this.state.error.thrownValue)),
+				error: this.state.error.thrownValue,
 				reset: this.reset,
+				retry: this.retry,
 				unstable_retry: this.unstable_retry
 			};
 			return React.createElement(Fallback, {
@@ -139,7 +144,7 @@ var _CatchError = class extends React.Component {
 * Ported from Next.js:
 *   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/catch-error.tsx
 */
-function unstable_catchError(fallback) {
+function createCatchError(fallback) {
 	const Fallback = ({ props, errorInfo }) => fallback(props, errorInfo);
 	Fallback.displayName = fallback.name || "CatchErrorFallback";
 	function CatchErrorBoundary(allProps) {
@@ -154,8 +159,10 @@ function unstable_catchError(fallback) {
 			props: forwardedProps
 		}, children);
 	}
-	CatchErrorBoundary.displayName = `unstable_catchError(${fallback.name || "CatchErrorFallback"})`;
+	CatchErrorBoundary.displayName = `catchError(${fallback.name || "CatchErrorFallback"})`;
 	return CatchErrorBoundary;
 }
+const catchError = createCatchError;
+const unstable_catchError = createCatchError;
 //#endregion
-export { ErrorComponent as default, unstable_catchError };
+export { catchError, ErrorComponent as default, unstable_catchError };

package/dist/shims/error.react-server.d.ts

@@ -1,8 +1,6 @@
+import { ErrorInfo } from "./error.js";
 //#region src/shims/error.react-server.d.ts
-export type ErrorInfo = {
-  error: unknown;
-  reset: () => void;
-  unstable_retry: () => void;
-};
 export declare function unstable_catchError(): never;
-//#endregion
+export declare function catchError(): never;
+//#endregion
+export type { ErrorInfo };

package/dist/shims/error.react-server.js

@@ -2,5 +2,8 @@
 function unstable_catchError() {
 	throw new Error("`unstable_catchError` can only be used in Client Components.");
 }
+function catchError() {
+	throw new Error("`catchError` can only be used in Client Components.");
+}
 //#endregion
-export { unstable_catchError };
+export { catchError, unstable_catchError };

package/dist/shims/fetch-cache.js

@@ -4,7 +4,8 @@ import { getRequestExecutionContext } from "./request-context.js";
 import { getDataCacheHandler } from "./cache-handler.js";
 import { encodeCacheTags } from "../utils/encode-cache-tag.js";
 import { traceAppFetch } from "../server/app-fetch-tracing.js";
-import { getHeadersContext, isInsideAnyCacheScope, markDynamicUsage } from "./headers.js";
+import { isInsideAnyCacheScope, markDynamicUsage } from "./internal/headers-state.js";
+import { getHeadersContext } from "./headers.js";
 import { _hasPendingRevalidatedTag, _setRequestScopedCacheLife } from "./cache-request-state.js";
 import { Buffer } from "node:buffer";
 //#region src/shims/fetch-cache.ts
@@ -688,11 +689,12 @@ function createPatchedFetch() {
 			recordDynamicFetchObservation(input);
 			return recordFetchOutcome(await dedupeFetch(input, cleanInit), "skip", "auto no cache");
 		}
+		const tags = encodeCacheTags(nextOpts?.tags ?? []);
 		let revalidateSeconds;
 		if (cacheDirective === "force-cache") revalidateSeconds = nextOpts?.revalidate && typeof nextOpts.revalidate === "number" ? nextOpts.revalidate : ONE_YEAR_SECONDS;
 		else if (nextOpts?.revalidate === false) revalidateSeconds = ONE_YEAR_SECONDS;
 		else if (typeof nextOpts?.revalidate === "number" && nextOpts.revalidate > 0) revalidateSeconds = nextOpts.revalidate;
-		else if (nextOpts?.tags && nextOpts.tags.length > 0) {
+		else if (tags.length > 0) {
 			const routeRevalidate = _getState().currentFetchRevalidate;
 			if (routeRevalidate === 0) {
 				const cleanInit = stripNextFromInit(init, cacheDirective);
@@ -712,7 +714,6 @@ function createPatchedFetch() {
 			recordFiniteFetchRevalidate(nextOpts.revalidate);
 		}
 		const reqTags = _getState().currentRequestTags;
-		const tags = encodeCacheTags(nextOpts?.tags ?? []);
 		if (tags.length > 0) {
 			for (const tag of tags) if (!reqTags.includes(tag)) reqTags.push(tag);
 		}

package/dist/shims/headers.d.ts

@@ -1,4 +1,5 @@
 import { RenderRequestApiKind } from "../server/cache-proof.js";
+import { ConnectionProbeResult, HeadersAccessPhase, RenderDynamicLatch, VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
 import { ReadonlyRequestCookies } from "@vinext/types/next/upstream/dist/server/web/spec-extension/adapters/request-cookies";
 import { ResponseCookie } from "@vinext/types/next/upstream/dist/compiled/@edge-runtime/cookies/index";
 //#region src/shims/headers.d.ts
@@ -16,61 +17,6 @@ export type HeadersContext = {
 type HeadersContextFromRequestOptions = {
   draftModeSecret?: string;
 };
-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;
-};
-type ConnectionProbeState = {
-  active: boolean;
-  dynamicUsageTarget: VinextHeadersShimState;
-  interrupted: boolean;
-  interrupt: () => void;
-  pending: Promise<never>;
-};
-type ConnectionProbeResult<T> = {
-  completed: true;
-  result: T;
-} | {
-  completed: false;
-};
-/**
- * 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;
 /**
  * Measure dynamic usage in a child async scope without clearing the parent.
  * Concurrent work that already belongs to the request (such as deferred
@@ -81,22 +27,10 @@ export declare function runWithIsolatedDynamicUsage<T>(fn: () => T | Promise<T>)
   result: T;
   dynamicDetected: boolean;
 }>;
-export declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
-export declare function throwIfStaticGenerationAccessError(): void;
 export declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
 export declare function suspendConnectionProbe(): Promise<never> | null;
 export declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
 export declare function consumeRenderRequestApiUsage(): RenderRequestApiKind[];
-/** 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;
 /**
  * Check, consume, and return any invalid dynamic usage error recorded during
  * the render (e.g. cookies() called inside "use cache"). This error persists
@@ -121,7 +55,6 @@ export declare function consumeDynamicUsage(): boolean;
  */
 export declare function peekDynamicUsage(): boolean;
 export declare function setHeadersAccessPhase(phase: HeadersAccessPhase): HeadersAccessPhase;
-export declare function getHeadersAccessPhase(): HeadersAccessPhase;
 /**
  * Set the headers/cookies context for the current RSC render.
  * Called by the framework's RSC entry before rendering each request.
@@ -151,6 +84,8 @@ export declare function hasEffectiveRequestCookieChanges(cookieHeader: string |
 export declare function applyEffectiveRequestCookieHeader(cookieHeader: string): void;
 /** Restore a middleware draft-mode transition inside a staged render scope. */
 export declare function restoreDraftModeTransition(cookieHeader: string): void;
+/** Replace request API inputs while retaining dynamic usage and pending mutations. */
+export declare function replaceHeadersContext(ctx: HeadersContext): void;
 export declare function setHeadersContext(ctx: HeadersContext | null): void;
 /**
  * Run a function with headers context, ensuring the context propagates
@@ -224,6 +159,8 @@ export declare function getAndClearPendingCookies(): string[];
  * 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. */
+export declare function hasDraftModeCookieHeader(): boolean;
 export declare function getDraftModeCookieHeader(): string | null;
 export declare function isDraftModeRequest(request: Request, draftModeSecret: string): boolean;
 /**
@@ -288,4 +225,4 @@ declare class RequestCookies {
   [SYNCHRONIZE_REQUEST_COOKIES](): void;
 }
 //#endregion
-export type { RequestCookies };
+export { type HeadersAccessPhase, type RenderDynamicLatch, type RequestCookies, type VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

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,16 @@ 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));
-}
-function markRenderRequestApiUsage(kind) {
-	_getState().renderRequestApiUsage.add(kind);
-}
-function throwIfStaticGenerationAccessError() {
-	const accessError = _getState().headersContext?.accessError;
-	if (accessError) throw accessError;
+	return await headersShimAls.run(childState, () => runInChildState(childState));
 }
 async function runWithConnectionProbe(fn) {
-	const parentState = _getState();
+	const parentState = getHeadersShimState();
 	const parentInvalidDynamicUsageError = parentState.invalidDynamicUsageError;
 	let interruptProbe = () => {};
 	const interrupted = new Promise((resolve) => {
@@ -254,79 +161,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;
 }
 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 +188,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 +198,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 +211,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 +220,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 +241,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 +266,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 +274,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 +285,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 +326,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 +348,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 +552,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 +572,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 +590,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 +600,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 +636,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 +676,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 +764,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 +778,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 +834,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, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

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