@rangojs/router 0.26.6 → 0.28.0

package/dist/types/server/request-context.d.ts

@@ -29,6 +29,7 @@ import type { RenderMode, RenderPhase } from "../router/timeout.js";
 import type { LocationStateEntry } from "../browser/react/location-state-shared.js";
 import type { RoutineTrace } from "../rsc/routine-plan.js";
 import type { ActionContinuation } from "../rsc/server-action.js";
+import type { ShellCaptureState } from "../rsc/shell-capture.js";
 import type { FormActionOutcome } from "../rsc/progressive-enhancement.js";
 import { type ExecutionStart } from "../cache/invalidation-order.js";
 export interface RenderForegroundCursor {
@@ -182,8 +183,8 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
     method: string;
     /**
      * @internal Handle store for tracking handle data across segments.
-     * Readonly: a background render that needs its own store derives a context
-     * (rerenderAndCacheRoute, shell-capture.ts) instead of swapping this field,
+     * Readonly: a render that needs its own store derives a render pass
+     * (deriveRenderPass, server/render-pass.ts) instead of swapping this field,
      * which the foreground still reads while it produces the page.
      */
     readonly _handleStore: HandleStore;
@@ -233,52 +234,13 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      */
     _searchParamsFilter?: import("../cache/search-params-filter.js").SearchParamsFilter;
     /**
-     * @internal PPR shell-capture ACTIVE marker. True ONLY inside the background
-     * capture task's derived request context (built by shell-capture.ts). This is
-     * the switch every capture-specific behavior reads: loader masking
-     * (loader-mask.ts isShellCaptureActive / fresh.ts emitStreaming) and the
-     * identity-read capture guard (server/context.ts guardIdentityRead). The
-     * foreground render never sets it, so the
-     * served response is byte-identical to axis 1. The capture descriptor itself
-     * (key/ttl/swr/tags/store) is NOT threaded through the request context — the
-     * integrated PPR serve path (rsc/shell-serve.ts + rsc-rendering.ts) builds it
-     * locally and passes it to scheduleShellCapture directly.
-     */
-    _shellCaptureRun?: boolean;
-    /**
-     * @internal Set beside `_shellCaptureRun` when the shell is keyed by the
-     * visitor's URL (`rewrite(...).shell("visitor")`): the capture renders the
-     * visitor's location and `ctx.rewrittenFrom`; the theme stays the default.
-     */
-    _shellCaptureForVisitor?: boolean;
-    /**
-     * @internal Bake-lane loader containers collected DURING a shell capture:
-     * segment-key -> the loader's (pre-wrap) result promise. Populated by
-     * resolveLoaderData for bake-lane loaders (lane rule: see its JSDoc in
-     * loader-cache.ts). Drained by captureAndStoreShell after the shell
-     * quiesces: settled containers are promise-elided, Flight-serialized, and
-     * pinned into the snapshot's loader family; a REJECTED container refuses
-     * the capture (error UI must never bake into the shared shell). Own
-     * property of the capture's derived context only.
-     */
-    _shellCaptureLoaderRecords?: Map<string, Promise<unknown>>;
-    /**
-     * @internal Set on a capture's derived context when a loader pushed a
-     * value the record cannot keep (masked nested promises, a pushed promise
-     * that settled to one, a live-lane loader's push, or a push outside a
-     * loader body): the loader records then carry `runs: 1`, so a HIT still
-     * runs their bodies for those pushes.
-     */
-    _shellCaptureUnrecordedLoaderPush?: true;
-    /**
-     * @internal The lane of each loader the capture's matched route registers
-     * (loader-cache.ts routeLoaderLanes), set by createMatchContextForFull
-     * before any loader runs. The capture's push funnel credits a push made
-     * under a live-lane loader's body, at any depth, to that loader
-     * (shell-capture.ts deriveShellCaptureContext). Own property of the
-     * capture's derived context only.
-     */
-    _shellCaptureLoaderLanes?: ReadonlyMap<string, "live" | "bake">;
+     * @internal A PPR shell capture's own state (rsc/shell-capture.ts
+     * ShellCaptureState): created by RENDER_PASS_FIELDS["shell-capture"]
+     * (server/render-pass.ts) on the capture's derived context. The foreground
+     * render and every background re-render never have one, so
+     * `_shellCaptureState?.run` is the capture switch.
+     */
+    _shellCaptureState?: ShellCaptureState;
     /**
      * @internal Record keys resolved for this request (CacheScope
      * resolveKeyFrom): by the scope's `key()` (one result) or its store's
@@ -295,9 +257,9 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
     _shellKey?: string;
     /**
      * @internal The request carried the forced-MISS reload marker
-     * (shell-serve.ts SHELL_MISS_PARAM). The handler strips the marker from the
-     * request on entry and sets this; the shell gate renders the request like a
-     * cache miss.
+     * (`WIRE.shellMiss`). The handler strips the marker from the request on
+     * entry (shell-serve.ts withoutShellMissMarker) and sets this; the shell
+     * gate renders the request like a cache miss.
      */
     _shellForcedMiss?: true;
     /**
@@ -314,16 +276,6 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      * runtime has no AsyncLocalStorage.snapshot.
      */
     _runAtRequestEntry?: <T>(fn: () => T) => T;
-    /**
-     * @internal The freshness window of the route cache() records this
-     * request read or wrote (cache-scope.ts noteRouteRecordWindow), as ms
-     * timestamps: `freshUntil` is the record's `expiresAt`, `staleUntil` adds
-     * its scope's swr. The narrowest record wins. A shell capture caps its
-     * entry's ttl and ttl+swr to it (shell-capture.ts capShellWindow), so a
-     * shell is never fresher, or served longer, than the route cache() entry
-     * it replayed or wrote.
-     */
-    _routeRecordWindow?: RouteRecordWindow;
     /**
      * @internal Loader-family snapshot seed for a shell HIT's tail render:
      * loader id -> the capture's elided container (already Flight-deserialized
@@ -445,30 +397,6 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      * it as an own property for exactly that reason.
      */
     _shellFragmentPayload?: boolean;
-    /**
-     * @internal Set by the capture guard (server/context.ts
-     * guardIdentityRead) when it throws DURING a capture render: the read
-     * ("cookies()", "headers()", `ctx.get() for a non-cacheable variable`,
-     * "ctx.theme") and the fix the
-     * refusal warning gives for it. Load-bearing for the
-     * bake lane: a guard throw inside an executing loader is swallowed by
-     * wrapLoaderPromise into per-loader error UI, which would otherwise bake
-     * silently into the shared shell — the capture checks this flag after the
-     * render and refuses instead. Deterministic, so the capture does not retry.
-     */
-    _shellCaptureGuardTripped?: {
-        surface: string;
-        fix: string;
-    };
-    /**
-     * @internal The loader $$id whose BODY was executing when the capture guard
-     * tripped (read off the loader-body ALS scope at trip time), or undefined
-     * when the read came from handler/render code. Only used to make the
-     * once-per-key refusal warning name the real source — the old text
-     * hardcoded "a bake-lane loader", which misattributed handler-land reads
-     * and sent users debugging the wrong lane (issue #672, secondary).
-     */
-    _shellCaptureGuardTrippedLoaderId?: string;
     /**
      * @internal Handler-owned registry of explicit per-scope stores from
      * cache({ store }). Created once per createRSCHandler() and threaded into
@@ -732,8 +660,8 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      * (loader(Def, { ssr: false })): segment resolution awaits these
      * before returning, so the render barrier cannot resolve until they settle.
      * rendered() checks this set to fail fast — a flagged loader awaiting the
-     * barrier is a guaranteed cycle, not a race. Registered by resolveLoaders
-     * (fresh.ts) before loader kickoff; only ever populated on document renders
+     * barrier is a guaranteed cycle, not a race. Registered by resolveOwnerLoaders
+     * before loader kickoff; only ever populated on document renders
      * (the flag is stamped per-isSSR at DSL evaluation).
      */
     _awaitBeforeFlushLoaderIds?: Set<string>;
@@ -811,6 +739,12 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      * keeping phases that began before the opt-in at their true (non-negative) offset.
      */
     _handlerStart?: number;
+    /**
+     * @internal Handler-level Server-Timing entries (rsc/handler.ts): the
+     * bootstrap timings, then the core handler's classify. A stale document
+     * cache entry's re-run has its own (render-pass.ts).
+     */
+    _handlerTiming?: string[];
     /** @internal Resolved platform phase-span tracing for this request (Cloudflare or OTel) */
     _tracing?: ResolvedTracing;
     /** @internal Router basename for this request (used by redirect()) */
@@ -846,27 +780,13 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      */
     _cacheSignal?: import("../router/telemetry.js").CacheSegmentSignal[];
 }
-/**
- * @internal The freshness window of a route cache() record, as ms
- * timestamps: fresh until `freshUntil` (its `expiresAt`), stale until
- * `staleUntil` (plus its scope's swr). `ttl`, `swr` and `written` describe
- * the record that sets `staleUntil`: its cache() config, and whether this
- * request wrote it (cacheRoute) rather than read it.
- */
-export interface RouteRecordWindow {
-    freshUntil: number;
-    staleUntil: number;
-    ttl: number;
-    swr: number;
-    written: boolean;
-}
 /**
  * Public view of RequestContext, without internal methods and fields.
  *
  * This is the type exported to library consumers. Internal code should
  * use the full RequestContext interface directly.
  */
-export type PublicRequestContext<TEnv = DefaultEnv, TParams = Record<string, string>> = Omit<RequestContext<TEnv, TParams>, "cookie" | "cookies" | "_readCookie" | "_readCookies" | "setCookie" | "deleteCookie" | "_handleStore" | "_transitionWhenRefs" | "_pprReplayPostMatchReason" | "_cacheStore" | "_prerender" | "_onDemandProducer" | "_searchParamsFilter" | "_shellCaptureRun" | "_shellCaptureForVisitor" | "_shellImplicitCache" | "_shellLoaderSeed" | "_shellCaptureLoaderRecords" | "_shellCaptureUnrecordedLoaderPush" | "_shellCaptureLoaderLanes" | "_resolvedCacheKeys" | "_shellKey" | "_shellForcedMiss" | "_prerenderWarm" | "_runAtRequestEntry" | "_routeRecordWindow" | "_shellFragmentPayload" | "_shellCaptureGuardTripped" | "_shellCaptureGuardTrippedLoaderId" | "_explicitTaggedStores" | "_requestTags" | "_recordTagOwners" | "_recordLoaderTags" | "_cacheProfiles" | "_onResponseCallbacks" | "_pendingBackgroundTasks" | "_themeConfig" | "_readTheme" | "_documentCacheRender" | "_payloadVisitorTheme" | "_payloadDeferred" | "_requestKind" | "_payloadVisitorLocation" | "_locationState" | "_routeName" | "_prevRouteKey" | "_visitorMoved" | "_inActionRevalidation" | "_actionRan" | "_reportedErrors" | "_printedErrors" | "_renderErrors" | "_recoveredHandlerErrors" | "_renderBarrier" | "_resolveRenderBarrier" | "_renderBarrierSegmentOrder" | "_treeHasStreaming" | "_renderBarrierWaiters" | "_handlerLoaderDeps" | "_awaitBeforeFlushLoaderIds" | "_renderBarrierHandleSnapshot" | "_renderBarrierGuardClosed" | "_reportBackgroundError" | "_debugPerformance" | "_metricsStore" | "_renderForeground" | "_activeRoutine" | "_renderDiagnosticsEnabled" | "_handlerStart" | "_tracing" | "_basename" | "_routerId" | "_versions" | "_setStatus" | "_rotateStateCookie" | "_setKeepCacheDirective" | "_freshReads" | "_setFreshReadsCookie" | "_requestRoot" | "_requestStart" | "_responseSent" | "_variables" | "_classifiedRoute" | "_requestMode" | "_cacheSignal" | "_dynamic" | "res">;
+export type PublicRequestContext<TEnv = DefaultEnv, TParams = Record<string, string>> = Omit<RequestContext<TEnv, TParams>, "cookie" | "cookies" | "_readCookie" | "_readCookies" | "setCookie" | "deleteCookie" | "_handleStore" | "_transitionWhenRefs" | "_pprReplayPostMatchReason" | "_cacheStore" | "_prerender" | "_onDemandProducer" | "_searchParamsFilter" | "_shellCaptureState" | "_shellImplicitCache" | "_shellLoaderSeed" | "_resolvedCacheKeys" | "_shellKey" | "_shellForcedMiss" | "_prerenderWarm" | "_runAtRequestEntry" | "_shellFragmentPayload" | "_explicitTaggedStores" | "_requestTags" | "_recordTagOwners" | "_recordLoaderTags" | "_cacheProfiles" | "_onResponseCallbacks" | "_pendingBackgroundTasks" | "_themeConfig" | "_readTheme" | "_documentCacheRender" | "_payloadVisitorTheme" | "_payloadDeferred" | "_requestKind" | "_payloadVisitorLocation" | "_locationState" | "_routeName" | "_prevRouteKey" | "_visitorMoved" | "_inActionRevalidation" | "_actionRan" | "_reportedErrors" | "_printedErrors" | "_renderErrors" | "_recoveredHandlerErrors" | "_renderBarrier" | "_resolveRenderBarrier" | "_renderBarrierSegmentOrder" | "_treeHasStreaming" | "_renderBarrierWaiters" | "_handlerLoaderDeps" | "_awaitBeforeFlushLoaderIds" | "_renderBarrierHandleSnapshot" | "_renderBarrierGuardClosed" | "_reportBackgroundError" | "_debugPerformance" | "_metricsStore" | "_renderForeground" | "_activeRoutine" | "_renderDiagnosticsEnabled" | "_handlerStart" | "_handlerTiming" | "_tracing" | "_basename" | "_routerId" | "_versions" | "_setStatus" | "_rotateStateCookie" | "_setKeepCacheDirective" | "_freshReads" | "_setFreshReadsCookie" | "_requestRoot" | "_requestStart" | "_responseSent" | "_variables" | "_classifiedRoute" | "_requestMode" | "_cacheSignal" | "_dynamic" | "res">;
 /**
  * Marker for a waitUntil-scheduled fn whose task promise must NOT enter
  * _pendingBackgroundTasks. Used by the PPR shell capture for its own task:
@@ -1004,8 +924,8 @@ export declare function rebaseRequestContext(ctx: RequestContext<any>, request:
 /**
  * Wire a fresh render barrier onto `ctx`, closure-bound to THIS ctx and THIS
  * handle store. Called by createRequestContext for every fresh context, and by
- * deriveShellCaptureContext (rsc/shell-capture.ts) for the PPR capture's
- * derived context.
+ * deriveRenderPass (server/render-pass.ts) for a derived pass whose
+ * RENDER_PASS_FIELDS row owns its barrier (the PPR capture and the HIT tail).
  *
  * The derived-context call is load-bearing (issue #684, plan 009): the capture
  * context is `Object.create(reqCtx)`, so without its own wiring every

package/dist/types/server/rewrite-trail.d.ts

@@ -25,12 +25,12 @@ export declare function recordRewriteHop(reqCtx: TrailContext, from: URL, to: UR
 export declare function recordRewriteShell(reqCtx: TrailContext, audience: RewriteShell | undefined): void;
 /** The last hop's `rewrite(...).shell()` choice; undefined: none. */
 export declare function rewriteShellAudience(reqCtx: TrailContext | undefined): RewriteShell | undefined;
-type AudienceContext = Pick<RequestContext<any>, "_shellCaptureRun" | "_documentCacheRender" | "res">;
+type AudienceContext = Pick<RequestContext<any>, "_shellCaptureState" | "_documentCacheRender" | "res">;
 /**
  * A render other visitors may be served: a PPR shell capture, or a render
  * the document cache stores (its response opted in before next()). It shows
  * no visitor theme, and no visitor URL unless it is a visitor-keyed shell
- * capture (`_shellCaptureForVisitor`).
+ * capture (`_shellCaptureState.forVisitor`).
  */
 export declare function rendersForSharedAudience(reqCtx: AudienceContext): boolean;
 /**

package/dist/types/testing/dispatch.d.ts

@@ -2,9 +2,12 @@
  * dispatch — in-process request -> Response for unit/integration tests,
  * WITHOUT the Flight RSC runtime.
  *
- * dispatch runs the router's real matching and middleware execution so that
- * redirects, 404s, response routes (path.json / path.text / path.html / ...),
- * and middleware short-circuits behave exactly as in production. It deliberately
+ * dispatch runs the production handler's request stages
+ * (rsc/request-stages.ts: classify, the terminal plans, the global middleware
+ * passes, the response route and the response's finalization) so that
+ * redirects, 404s, reloads, response routes (path.json / path.text /
+ * path.html / ...), and middleware short-circuits behave exactly as in
+ * production. It deliberately
  * does NOT render React Server Components: there is no Flight stream, no SSR,
  * and no DOM. Hit an RSC (component) route and dispatch throws a clear error
  * directing you to renderToFlightString/renderServerTree/renderHandler or an e2e test.
@@ -17,19 +20,20 @@
  *   so a global auth middleware can 401/redirect them and middleware-set
  *   cookies/headers merge onto the 308/404 the way createResponseWithMergedHeaders
  *   merges them in production.
- * - Response routes (non-RSC)                         -> serialized Response
+ * - Response routes (non-RSC), served by production's handleResponseRoute
+ *   (rsc/response-route-handler.ts)                  -> serialized Response
  *   - json:           JSON.stringify(result) (bare value) with application/json
  *   - text/html/xml/md: String(result) with the mapped MIME type
- *   - handler returning or throwing a Response:         re-wrapped like
- *     handleResponseRoute (stub headers/cookies merged, Set-Cookie preserved,
- *     WebSocket upgrade passed through without reconstruction)
+ *   - handler returning or throwing a Response:         re-wrapped (stub
+ *     headers/cookies merged, Set-Cookie preserved, WebSocket upgrade passed
+ *     through without reconstruction)
  *   - handler throwing a non-Response error:            typed 500 / RouterError
- *     status, matching handleResponseRoute (RFC 9457 problem+json body with
- *     application/problem+json for json routes, text/plain message otherwise)
+ *     status (RFC 9457 problem+json body with application/problem+json for
+ *     json routes, text/plain message otherwise)
  *   - content-negotiated route:                         Vary: Accept appended
  *   - cached response route (cache({...})):             getResponse/putResponse
- *     hit/SWR/tag write, resolved from the matched entry tree exactly as
- *     handleResponseRoute does. The write is scheduled via ctx.waitUntil
+ *     hit/SWR/tag write, resolved from the matched entry tree. The write is
+ *     scheduled via ctx.waitUntil
  *     (a microtask without an executionContext), so a HIT-asserting test must
  *     flush microtasks between the seeding dispatch and the asserting one.
  * - Global middleware (router.use(...)) AND route-level middleware, with full
@@ -38,10 +42,17 @@
  *   global middleware runs first (so an auth gate can still 401/redirect),
  *   then — if it passes through — an X-RSC-Reload is returned. Route-level
  *   middleware is skipped on a partial, exactly as production skips it.
- * - A middleware redirect (3xx + Location) on a partial/action request
- *   (?_rsc_partial / ?_rsc_action): converted to a 204 + X-RSC-Redirect via the
- *   real interceptRedirectForPartial, so fetch() does not auto-follow the 3xx —
+ * - A global middleware redirect (3xx + Location) on a partial/action request
+ *   (?_rsc_partial / ?_rsc_action), and a findMatch() redirect on a partial
+ *   request: a 204 + X-RSC-Redirect, so fetch() does not auto-follow the 3xx —
  *   identical to production's no-location-state path.
+ * - The terminal plans production answers inside the global chain
+ *   (terminalPlanResponse): a `_rsc_v` version mismatch and a `_rsc_rid` app
+ *   switch reload (X-RSC-Reload), and an action (?_rsc_action) a rewrite moved
+ *   to a target that is not a page route throws production's error.
+ * - Route params and name are set inside the global chain, after classify, by
+ *   the stage production's executeRequest runs (recordPlanRoute): global
+ *   middleware sees them after next(), not before it.
  * - The open-redirect guard (rsc/redirect-guard.ts) on full (browser-followed)
  *   redirects: a cross-origin Location is rewritten to the basename root unless
  *   redirect(url, { external: true }) opted out, mirroring production's single
@@ -60,7 +71,9 @@
  *   after finalizeResponse (segmentCount 0 / cacheHit false — dispatch renders no
  *   RSC segments and holds no match-cache state), and a thrown non-Response error
  *   emits request.error with phase "routing". All three carry the same requestId
- *   (getRequestId). Emission is gated entirely on a configured sink; with none,
+ *   (getRequestId), as does a response-route timeout on a rewritten pass
+ *   (runRequestPasses carries the id to each pass's request, as in
+ *   production). Emission is gated entirely on a configured sink; with none,
  *   dispatch does zero new work and stays byte-identical for existing callers.
  *   Lets a consumer unit-test their sink wiring in-process instead of only at e2e.
  * - Response-route `renderStartMs` timeouts and `onTimeout`: dispatch races the
@@ -96,9 +109,13 @@
  *   request.start/end/error lifecycle above; cover cache/loader telemetry with an
  *   e2e test driving a real RSC request.
  *
- * dispatch reuses router.previewMatch(), which itself runs content negotiation
- * and resolves route middleware from the matched entry tree, so dispatch's
- * route-middleware collection is exactly the router's, not a re-implementation.
+ * Each pass is classified with the handler's classify stage
+ * (router/request-classification.ts classifyRequest), which runs content
+ * negotiation and resolves route middleware from the matched entry tree, so
+ * dispatch's route-middleware collection is exactly the router's, not a
+ * re-implementation. The origin guard is not run: it gates only the action,
+ * loader and PE-form plans, which classify gives a component route only, and
+ * dispatch throws on those before the pass's middleware.
  */
 import type { Rango } from "../router/router-interfaces.js";
 /**

package/dist/types/testing/serve-shell-request.d.ts

@@ -76,6 +76,12 @@ export interface ServeShellRequestOptions<TEnv = any> {
      * that source. `rewriteTarget` sends the `metadata.rewriteTarget` the page at
      * `from` carried when middleware rewrote it (`_rsc_rt`), as the browser
      * does: the server then diffs against the route that rendered that page.
+     * `stale: true` sends a stale request (`_rsc_stale`), as the browser sends
+     * it: every `revalidate()` sees `stale: true` (see `revalidate()`'s `stale`)
+     * and segments take an action's revalidation defaults; it renders live, as
+     * an action does, so neither the route cache nor the document cache answers
+     * or stores it, and a `ppr` route's `replayStatus` is
+     * `{ outcome: "BYPASS", reason: "stale" }`.
      */
     partial?: true | {
         from?: string;
@@ -84,6 +90,7 @@ export interface ServeShellRequestOptions<TEnv = any> {
         prefetch?: boolean;
         fill?: boolean;
         interceptSource?: string;
+        stale?: boolean;
     };
     /**
      * POST this form as a submit before hydration: the no-JS request the

package/dist/types/types/cache-types.d.ts

@@ -130,9 +130,12 @@ export interface CacheOptions<TEnv = unknown> {
      */
     condition?: (ctx: import("../server/request-context.js").RequestContext<TEnv>) => boolean;
     /**
-     * Custom cache key function - FULL OVERRIDE.
-     * Bypasses default key generation AND store's keyGenerator. The result is
-     * stored namespaced (`key:` plus its URI encoding), so no value it returns
+     * Custom cache key function. Replaces the URL part of the default key
+     * (host, path, params, search) AND bypasses the store's keyGenerator. The
+     * request kind stays: a document request, a navigation and each intercept
+     * navigation keep their own record under one result, so the result decides
+     * which requests of one kind share a record. It is stored namespaced
+     * (`key:` plus its URI encoding, then the kind), so no value it returns
      * names another route's record; a nested cache() keys its records within
      * this partition.
      *

package/dist/types/types/error-types.d.ts

@@ -69,7 +69,15 @@ export interface OnErrorContext<TEnv = any> {
     env?: TEnv;
     /** Duration from request start to error (milliseconds) */
     duration?: number;
-    /** Whether this is a partial/navigation request */
+    /**
+     * Whether this is a partial/navigation request, on an error the segment
+     * walk catches (a handler that throws, a DSL loader that rejects): `true`
+     * for a navigation, unset for a document. An error in the background
+     * re-render of a `cache()` record (a stale HIT's refresh, the write of a
+     * navigation that kept a layout mounted) reports the request that started
+     * it. A streamed (`loading()`) handler's rejection does not carry it, in
+     * either render; the `routing` phase reports `false`.
+     */
     isPartial?: boolean;
     /** Whether an error boundary caught the error */
     handledByBoundary?: boolean;

package/dist/types/types/handler-context.d.ts

@@ -342,7 +342,7 @@ export type InternalHandlerContext<TParams = {}, TEnv = DefaultEnv, TSearch exte
     _reverseScope?: import("../server/context.js").ReverseScope;
     /**
      * @internal The on-demand overlay holds a "removed" marker for this request
-     * (tryPrerenderLookup, cache-lookup.ts); gateOnDemandProducer reads it. On
+     * (readPrerenderSource, cache-lookup.ts); gateOnDemandProducer reads it. On
      * this context, not the request's: withCacheLookup documents that the
      * request ALS can be lost mid-pipeline on workerd.
      */
@@ -390,6 +390,14 @@ export type InternalHandlerContext<TParams = {}, TEnv = DefaultEnv, TSearch exte
      * request is a fill. See router/segment-resolution/prefetch-deferral.ts.
      */
     _prefetchDeferral?: import("../router/segment-resolution/prefetch-deferral.js").PrefetchDeferral;
+    /**
+     * @internal DSL loaders registered and not started, by `$$id`: a prefetch
+     * deferred them, or a pass that skips loaders (`skipLoaders`) did not run
+     * them. A reader's ctx.use() starts one through its registration
+     * (registerDeferredLoader, startDeferredLoader in
+     * router/segment-resolution/prefetch-deferral.ts).
+     */
+    _deferredLoaders?: Map<string, import("../router/segment-resolution/prefetch-deferral.js").DeferredLoader>;
     /**
      * @internal Whether a loader was started in this request: a run of it (a
      * handler's or another loader's ctx.use()) or its cache() binding. A
@@ -510,10 +518,10 @@ export type IsActionFn = (...actions: ActionRef[]) => boolean;
  * ```ts
  * import * as CartActions from "./actions/cart";
  *
- * // Idiom A — "mine, else defer": re-render on my actions, otherwise return
- * // undefined so the segment's default decision still applies (and downstream
- * // revalidators get a say).
- * revalidate((ctx) => ctx.isAction(CartActions) || undefined)
+ * // Idiom A — "mine, else defer": re-render on my actions and on Back after
+ * // an action, otherwise return undefined so the segment's default decision
+ * // still applies (and downstream revalidators get a say).
+ * revalidate((ctx) => ctx.isAction(CartActions) || ctx.stale || undefined)
  *
  * // Idiom B — "mine only": re-render on my actions and suppress everything
  * // else (isAction returns a raw boolean, so an unrelated action yields false).
@@ -629,8 +637,11 @@ export type ShouldRevalidateFn<TParams = GenericParams, TEnv = any> = (args: {
      */
     toRouteName?: DefaultRouteName;
     /**
-     * `true` when the browser signals that data may be stale — typically because
-     * a server action was executed in this or another tab (`_rsc_stale` header).
+     * `true` on a revalidation of a page the browser marked stale (the
+     * `_rsc_stale` query param): Back/Forward onto a history entry after a
+     * server action in this or another tab, or while one is in flight. A request
+     * that holds no segments (the follow-up after an action, `refresh()`) is
+     * marked stale too, but there every segment renders and no predicate runs.
      *
      * This is NOT segment cache staleness (loaders are never segment-cached).
      * Use this to decide whether loader data should be re-fetched after an

package/dist/types/types/segments.d.ts

@@ -151,7 +151,7 @@ export interface ResolvedSegment {
     loaderData?: any;
     /**
      * True when this loader was awaited before first flush
-     * (loader(Def, { ssr: false })). Stamped by resolveLoaders (fresh.ts) on
+     * (loader(Def, { ssr: false })). Stamped by resolveOwnerLoaders on
      * document AND shell-capture renders — capture bakes flagged loaders and
      * awaits the same lane. Feeds segment-system's settled-value delivery and
      * the dev SSR suspension warning (ssr-suspension-warning.ts).

package/dist/types/vite/discovery/build-discovery-phase.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Build discovery phase: the discovery plugin's buildStart, buildApp (post)
+ * and buildEnd hooks.
+ *
+ * buildStart discovers routers through a temp RSC server and writes the
+ * generated route types. When PPR shell candidates exist, it defers closing
+ * that server, and releasing the buildEnv, as a PAIR: the buildApp post hook
+ * releases them after the shell capture (success), buildEnd after an
+ * environment build failure (abort).
+ */
+import type { Rolldown, ViteBuilder } from "vite";
+import type { DiscoveryState } from "./state.js";
+/**
+ * buildStart. Build mode: create a temporary Vite dev server to access the
+ * RSC environment's module runner, then discover routers and generate
+ * manifests. The manifest data is stored for the virtual module's load hook.
+ */
+export declare function buildDiscoveryPhase(s: DiscoveryState, context: Rolldown.PluginContext): Promise<void>;
+/**
+ * buildApp (post). Post-build phases, after EVERY environment bundle is
+ * written.
+ *
+ * 1. Cache versions (router-versions-phase.ts): hashes the server output as
+ *    postprocessBundle left it and writes the per-router table into the
+ *    built version module. First, because phase 2 stamps its entries with
+ *    these versions and reads the same RSC out dir.
+ * 2. PPR shell capture (producer B, #699): the shell prelude embeds built
+ *    client asset URLs (bootstrap entry), which do not exist at buildStart.
+ *    The kept temp server and the buildEnv were deferred AS A PAIR in
+ *    buildStart's finally; this finally is the pair's success-path owner
+ *    (buildEndPhase owns the aborted-build path) — the phase itself is a pure
+ *    producer and tears down only the globals it installs.
+ */
+export declare function postBuildPhase(s: DiscoveryState, builder: ViteBuilder): Promise<void>;
+/**
+ * buildEnd. An environment build failure aborts the builder before the
+ * buildApp post hook — never leak the kept temp server (open handles hang
+ * the CLI) or the deferred buildEnv (a live miniflare proxy).
+ */
+export declare function buildEndPhase(s: DiscoveryState, error: Error | undefined): Promise<void>;

package/dist/types/vite/discovery/build-env.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Build-time env (rango({ buildEnv })): resolution of the option and the
+ * lifetime of the resolved bindings on DiscoveryState. Acquired by dev
+ * discovery (dev-server-phase.ts) and build discovery
+ * (build-discovery-phase.ts).
+ */
+import type { BuildEnvOption, BuildEnvFactoryContext, BuildEnvResult } from "../plugin-types.js";
+import type { DiscoveryState } from "./state.js";
+/**
+ * Resolve the buildEnv option into a concrete { env, dispose? } result.
+ * Handles all four input shapes: false, "auto", factory, plain object.
+ */
+export declare function resolveBuildEnv(option: BuildEnvOption | undefined, factoryCtx: BuildEnvFactoryContext): Promise<BuildEnvResult | null>;
+/**
+ * Acquire build-time env bindings and store on discovery state.
+ * Returns true if env was acquired, false if buildEnv is disabled.
+ */
+export declare function acquireBuildEnv(s: DiscoveryState, command: "serve" | "build", mode: string): Promise<boolean>;
+/**
+ * Release build-time env resources and clear state.
+ */
+export declare function releaseBuildEnv(s: DiscoveryState): Promise<void>;

package/dist/types/vite/discovery/bundle-scan-phase.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Bundle scan phase: the discovery plugin's generateBundle hook.
+ *
+ * Records the inputs of the per-router cache versions (build-versions.ts) for
+ * every environment and, during the RSC build, the RSC entry filename and the
+ * chunks holding Prerender/Static handler exports. closeBundle
+ * (bundle-postprocess.ts) uses them for handler code eviction and prerender
+ * data injection.
+ */
+import type { Rolldown } from "vite";
+import type { DiscoveryState } from "./state.js";
+export declare function bundleScanPhase(s: DiscoveryState, context: Rolldown.PluginContext, bundle: any): void;

package/dist/types/vite/discovery/dev-prerender-cache.d.ts

@@ -34,8 +34,9 @@ export interface DevPrerenderPayloadBodies {
     /** `intercept != 1` response: the route's own segments + handles. */
     main: string;
     /**
-     * `intercept=1` response: main + intercept segments with the MERGED handle
-     * string. Falls back to `main` byte-for-byte when the route has no
+     * `intercept=1` response: the build's intercept variant
+     * (interceptVariantSegments, prerender/store.ts) with the producer's handle
+     * string for it. Falls back to `main` byte-for-byte when the route has no
      * intercept segments — mirroring the endpoint's historical behavior.
      */
     intercept: string;

package/dist/types/vite/discovery/dev-server-phase.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Dev server phase: the discovery plugin's configureServer hook.
+ *
+ * Runs dev discovery (the Node RSC runner, or a temp Node server under
+ * Cloudflare, whose RSC env has no runner), serves the dev /__rsc_prerender
+ * and /__rsc_shell endpoints, and watches route files to regenerate the
+ * generated route types and re-run runtime discovery on HMR.
+ */
+import type { ViteDevServer } from "vite";
+import { type DiscoveryState } from "./state.js";
+/** The slice of a Vite environment module graph the route-file watcher reads. */
+interface ModulesByFileGraph {
+    getModulesByFile(file: string): ReadonlySet<unknown> | undefined;
+}
+/**
+ * Whether the dev route-file watcher ignores `file`: it sits in a directory
+ * every discovery scan skips (isInSkippedScanDir) and the RSC graph has not
+ * loaded it. See docs/manifests.md, "A reload no file of the app asked for".
+ */
+export declare function isFileOutsideApp(root: string, file: string, rscGraph: ModulesByFileGraph | undefined): boolean;
+/**
+ * configureServer. Dev mode: discover routers and populate manifest in
+ * memory. Skipped in build mode (buildDiscoveryPhase handles it).
+ */
+export declare function devServerPhase(s: DiscoveryState, server: ViteDevServer): void;
+export {};

package/dist/types/vite/discovery/discovery-errors.d.ts

@@ -95,7 +95,7 @@ export interface DiscoveryFailureReport {
  *   - a transient artifact of a Vite dependency re-optimization racing with boot
  *     discovery (a module read before the entry import resolves to the
  *     pre-optimize copy of the runner graph while createRouter() populated the
- *     post-optimize copy — see router-discovery.ts).
+ *     post-optimize copy — see dev-server-phase.ts).
  *
  * We can only tell them apart when the caller observed the dep optimizer's
  * `browserHash` change across the discovery attempt (`reoptimizeObserved`): a

package/dist/types/vite/discovery/state.d.ts

@@ -117,6 +117,9 @@ export interface DiscoveryState {
     resolvedEntryPath: string | undefined;
     projectRoot: string;
     isBuildMode: boolean;
+    /** Vite's resolved command and mode (configResolved), for resolveBuildEnv. */
+    viteCommand: "serve" | "build";
+    viteMode: string;
     userResolveAlias: any;
     /**
      * Data-only slice of the user's resolved config (resolve.* incl. native
@@ -199,6 +202,15 @@ export interface DiscoveryState {
     devDiscoveryEpoch?: number;
     devServerOrigin: string | null;
     devServer: any;
+    /**
+     * Dev: the pending transition({ when }) definition error, re-sent as the
+     * Vite error overlay until a discovery succeeds (dev-server-phase.ts).
+     */
+    transitionWhenOverlay: {
+        message: string;
+        stack: string;
+        plugin: string;
+    } | null;
     selfWrittenGenFiles: Map<string, {
         at: number;
         hash: string;

package/dist/types/vite/plugins/version-plugin.d.ts

@@ -10,7 +10,7 @@ import { type Plugin } from "vite";
  * Build: exports a placeholder for the per-router versions table. The module
  * holds nothing that varies between builds; the table is written into the
  * built chunk after the server output is hashed (the buildApp post hook in
- * router-discovery.ts). See docs/design/per-app-cache-version.md.
+ * discovery/build-discovery-phase.ts). See docs/design/per-app-cache-version.md.
  * @internal
  */
 export declare function createVersionPlugin(): Plugin;

package/dist/types/vite/plugins/virtual-entries.d.ts

@@ -47,7 +47,7 @@ export declare function getVirtualVersionContent(version: string): string;
 /**
  * Free identifier the production version module ships in place of the table.
  * The versions are hashes of the built server code, so they cannot be part of
- * it: the buildApp post hook (router-discovery.ts) replaces this token in the
+ * it: the buildApp post hook (discovery/build-discovery-phase.ts) replaces this token in the
  * written chunk once the hashes are final (runRouterVersionsPhase,
  * discovery/router-versions-phase.ts). An unreplaced token throws a ReferenceError
  * when the module evaluates, so a build that skipped the step cannot serve