@rangojs/router 0.26.6 → 0.28.0

package/dist/types/router/match-middleware/cache-lookup.d.ts

@@ -1,99 +1,48 @@
 /**
  * Cache Lookup Middleware
  *
- * First middleware in the pipeline. Checks cache before segment resolution.
+ * First middleware in the pipeline. Before segment resolution runs, it serves
+ * a stored match from the first source that answers:
  *
- * FLOW DIAGRAM
- * ============
- *
- *   source (empty)
- *         |
- *         v
- *   +---------------------+
- *   | Is action request?  |──yes──> yield* source (pass through)
- *   +---------------------+
- *         | no
- *         v
- *   +---------------------+
- *   | Cache enabled?      |──no───> yield* source (pass through)
- *   +---------------------+
- *         | yes
- *         v
- *   +---------------------+
- *   | Lookup cache        |
- *   | (pathname, params)  |
- *   +---------------------+
- *         |
- *   +-----+-----+
- *   |           |
- *  miss        hit
- *   |           |
- *   v           v
- * yield*    Set state.cacheHit = true
- * source    Set state.shouldRevalidate
- *   |           |
- *   |           v
- *   |    +---------------------------+
- *   |    | For each cached segment:  |
- *   |    |  - Apply revalidation     |
- *   |    |  - Set component = null   |
- *   |    |    if client has it       |
- *   |    +---------------------------+
- *   |           |
- *   |           v
- *   |    +---------------------------+
- *   |    | Resolve fresh loaders     |  <-- Loaders are NEVER cached
- *   |    | (always fresh data)       |
- *   |    +---------------------------+
- *   |           |
- *   |           v
- *   |    yield cached segments
- *   |    yield fresh loader segments
- *   |           |
- *   +-----------+
- *         |
- *         v
- *      next middleware
+ *   1. Prerender: the writable on-demand overlay, then the bundled build
+ *      manifest. A live render (an action or a stale partial) reads them too
+ *      when the route has no live handler (not a Passthrough).
+ *   2. The dev Static store (`__PRERENDER_DEV_URL`, isStaticPrerender entries).
+ *   3. The route's cache() record (the segment cache). An action or a stale
+ *      partial renders live (rendersLive) and reads no record.
  *
+ * Every source serves through serveStoredSegments: pre-rendering is caching
+ * at build time, so a prerender entry is a cache hit through the same segment
+ * path. When no source answers, the request passes through to
+ * segment-resolution.
  *
- * CACHE BEHAVIOR
- * ==============
+ * A STORED HIT
+ * ============
  *
- * Cache HIT:
  *   - state.cacheHit = true signals downstream middleware to skip
- *   - Cached segments have their components nullified if client already has them
- *   - Loaders are always re-resolved for fresh data
- *   - state.shouldRevalidate triggers background SWR if cache was stale
- *
- * Cache MISS:
- *   - Passes through to segment-resolution middleware
- *   - No segments yielded from this middleware
- *
- * Loaders:
- *   - NEVER cached in the segment cache
- *   - Always resolved fresh on every request
- *   - Ensures data freshness even with cached UI components
- *   - Segment cache staleness does NOT propagate to loader revalidation;
+ *   - A segment the client already holds and keeps has its component nullified
+ *   - Loaders are always re-resolved fresh: never cached or pre-rendered.
+ *     Segment cache staleness does NOT propagate to loader revalidation;
  *     loaders use their own revalidation rules (actionId, user-defined)
+ *   - A cache() record sets state.shouldRevalidate, which triggers background
+ *     SWR when the record was stale
  *
+ * REVALIDATION RULES (cache() record)
+ * ===================================
  *
- * REVALIDATION RULES
- * ==================
- *
- * Each cached segment is evaluated against its revalidation rules:
+ * Each record segment the client holds is evaluated against its rules:
  *
- *   1. No rules defined -> use default (skip if client has segment)
+ *   1. No rules defined -> re-render the route's own segments when the search
+ *      or the route params changed; otherwise skip (nullify component)
  *   2. Rules return false -> skip re-render (nullify component)
  *   3. Rules return true -> re-render (keep component)
  *
- * Revalidation context includes:
- *   - Previous/next URL and params
- *   - Request object
- *   - Action context (if POST)
+ * Revalidation context includes the previous/next URL and params, the request
+ * and the action context (if POST).
  */
 import type { ResolvedSegment } from "../../types.js";
 import { type EntryData } from "../../server/context.js";
-import type { MatchContext, MatchPipelineState } from "../match-context.js";
+import { type MatchContext, type MatchPipelineState } from "../match-context.js";
 import type { PrerenderStore } from "../../prerender/store.js";
 import type { PrerenderTargetObject, ResolvedPrerender } from "../../prerender/on-demand.js";
 import { type RequestContext } from "../../server/request-context.js";
@@ -112,7 +61,7 @@ export declare function setPrerenderStoreForTests(store: PrerenderStore | null |
  * misses the store and renders live, and replay — including its heal
  * capture — must stay available for it (withCacheStore records the doc
  * record on that path; state.cacheSource is not "prerender"). The store
- * memoizes per routeKey/paramHash, so this probe and tryPrerenderLookup's
+ * memoizes per routeKey/paramHash, so this probe and readPrerenderSource's
  * subsequent get() share one underlying load.
  */
 export declare function prerenderEntryExists(routeKey: string | undefined, params: Record<string, string>, pathname: string, entries: EntryData[]): Promise<boolean>;
@@ -127,14 +76,13 @@ export type GeneratorMiddleware<T> = (source: AsyncGenerator<T>) => AsyncGenerat
 /**
  * Creates cache lookup middleware
  *
- * Checks cache for segments. If cache hit:
- * - Applies revalidation to determine which segments need re-rendering
- * - Resolves loaders fresh (loaders are NOT cached by design)
- * - Sets state.cacheHit = true
- * - Sets state.shouldRevalidate if SWR needed
- * - Yields cached segments + fresh loader segments
+ * The middleware is serveStoredSegments. It serves a stored match when one
+ * answers, in this order: the prerender overlay and build store (Prerender
+ * and on-demand routes), the dev Static store, then the route's cache()
+ * record. It yields the stored segments and the loaders resolved fresh and
+ * sets state.cacheHit (and state.shouldRevalidate for a cache() record, for
+ * background SWR).
  *
- * If cache miss:
- * - Passes through to next middleware
+ * If nothing answers, passes through to the next middleware.
  */
 export declare function withCacheLookup<TEnv>(ctx: MatchContext<TEnv>, state: MatchPipelineState): GeneratorMiddleware<ResolvedSegment>;

package/dist/types/router/match-middleware/cache-store.d.ts

@@ -19,7 +19,7 @@
  *   +---------------------+
  *   | Should skip cache?  |
  *   | - !cacheScope       |──yes──> return
- *   | - isAction          |
+ *   | - rendersLive       |
  *   | - cacheHit          |
  *   | - method !== GET    |
  *   +---------------------+
@@ -101,7 +101,7 @@
  *   - Non-GET request (only GET requests are cacheable)
  */
 import type { ResolvedSegment } from "../../types.js";
-import type { MatchContext, MatchPipelineState } from "../match-context.js";
+import { type MatchContext, type MatchPipelineState } from "../match-context.js";
 import type { GeneratorMiddleware } from "./cache-lookup.js";
 /**
  * Creates cache store middleware

package/dist/types/router/match-middleware/segment-resolution.d.ts

@@ -29,15 +29,16 @@
  *  yes          no
  *   |           |
  *   v           v
- * resolveAll  resolveAllWithRevalidation
- * Segments    Segments
- *   |           |
+ * FRESH pass  partial pass
  *   |           | (compares with prev state)
  *   |           | (handles null components)
  *   |           |
  *   +-----------+
  *         |
  *         v
+ *   resolveAllSegments()
+ *         |
+ *         v
  *   +---------------------------+
  *   | Update state:             |
  *   |  - state.segments         |
@@ -54,13 +55,14 @@
  * RESOLUTION MODES
  * ================
  *
+ * Both use resolveAllSegments().
+ *
  * Full Match (document request):
- *   - Uses resolveAllSegments()
- *   - No revalidation logic (nothing to compare against)
+ *   - A FRESH pass (freshPassInput): no revalidation logic (nothing to
+ *     compare against)
  *   - Simple resolution of all route entries
  *
  * Partial Match (navigation):
- *   - Uses resolveAllSegmentsWithRevalidation()
  *   - Compares current vs previous params/URL
  *   - Sets component = null for segments client already has
  *   - Respects custom revalidation rules

package/dist/types/router/prerender-match.d.ts

@@ -1,12 +1,23 @@
 import type { RouterContext } from "./router-context.js";
-import type { ResolveSegmentOptions } from "./segment-resolution.js";
-import type { EntryData } from "../server/context";
 import type { PartialPrerenderProps } from "../urls/pattern-types.js";
-import type { HandlerContext, ResolvedSegment } from "../types";
 import type { SerializedSegmentData } from "../cache/types.js";
 import type { RouteMatchResult } from "./pattern-matching.js";
 import type { RouterVersions } from "../router-versions.js";
 import type { OnDemandRouteConfig } from "../prerender/on-demand.js";
+/**
+ * An intercept a navigation can select over the route that the build does
+ * not bake: its HIT misses (selectInterceptVariant) and it renders live,
+ * with the request instead of BuildContext.
+ * - `same-slot`: another intercept on its layout fills the same slot.
+ * - `handler-response` / `layout-response`: its handler or layout returned a
+ *   Response for this URL.
+ * - `local-name`: it targets the route's localRouteName, which the build
+ *   never bakes.
+ */
+export interface LiveIntercept {
+    slot: string;
+    reason: "same-slot" | "handler-response" | "layout-response" | "local-name";
+}
 export interface PrerenderMatchDeps<TEnv = any> {
     /** Owning router id; scopes bake-time root-scope/search-schema lookups the
      *  same way reqCtx._routerId does at runtime (issue #762). */
@@ -21,7 +32,7 @@ export interface PrerenderMatchDeps<TEnv = any> {
     findMatch: (pathname: string) => RouteMatchResult<TEnv> | null | Promise<RouteMatchResult<TEnv> | null>;
     buildRouterContext: () => RouterContext<TEnv>;
     mergedRouteMap: Record<string, string>;
-    resolveAllSegments: (entries: EntryData[], routeKey: string, params: Record<string, string>, context: HandlerContext<any, TEnv>, loaderPromises: Map<string, Promise<any>>, options?: ResolveSegmentOptions) => Promise<ResolvedSegment[]>;
+    resolveAllSegments: RouterContext<TEnv>["resolveAllSegments"];
 }
 /**
  * Build-time pre-render match. Resolves segments with a BuildContext
@@ -46,9 +57,13 @@ onDemand?: boolean): Promise<{
     routeName: string;
     params: Record<string, string>;
     interceptSegments?: SerializedSegmentData[];
-    /** RSC-encoded MERGED (main + intercept) handle map for the intercept artifact;
-     *  the sinks store it as-is (no longer merge raw records). */
+    /** RSC-encoded handle map for the intercept artifact: the intercept's
+     *  pushes and those of the main segments the intercepted route does not
+     *  own; the sinks store it as-is. */
     interceptHandles?: string;
+    /** The intercepts the intercept variant does not hold, for the build's
+     *  warning (warnLiveIntercepts). */
+    liveIntercepts?: LiveIntercept[];
     passthrough?: true;
     /** On-demand only: the render hit `notFound()` and nothing else failed. */
     notFound?: true;

package/dist/types/router/preview-match.d.ts

@@ -1,22 +1,17 @@
-import type { EntryData } from "../server/context";
 import type { RouteMatchResult } from "./pattern-matching.js";
 import type { MiddlewareFn } from "./middleware.js";
 export interface PreviewMatchDeps<TEnv = any> {
     findMatch: (pathname: string) => RouteMatchResult<TEnv> | null | Promise<RouteMatchResult<TEnv> | null>;
 }
 /**
- * Preview match - returns route middleware without segment resolution.
- * Also returns responseType and handler for response routes (non-RSC short-circuit).
+ * Preview match - returns the route, its params and route middleware without
+ * segment resolution (a content-negotiated variant's, when one wins).
  */
 export declare function previewMatch<TEnv = any>(request: Request, _context: TEnv, deps: PreviewMatchDeps<TEnv>): Promise<{
     routeMiddleware?: Array<{
         handler: MiddlewareFn;
         params: Record<string, string>;
     }>;
-    responseType?: string;
-    handler?: Function;
     params?: Record<string, string>;
-    negotiated?: boolean;
-    manifestEntry?: EntryData;
     routeKey?: string;
 } | null>;

package/dist/types/router/request-classification.d.ts

@@ -61,6 +61,11 @@ interface FullRenderPlan<TEnv = any> {
     mode: "full-render";
     route: RouteSnapshot<TEnv>;
     negotiated: boolean;
+    /**
+     * No route matched: the render path renders the 404 (match() re-throws
+     * RouteNotFoundError). Set by rsc/request-stages.ts classify.
+     */
+    unmatched?: true;
 }
 interface PartialRenderPlan<TEnv = any> {
     mode: "partial-render";

package/dist/types/router/revalidation.d.ts

@@ -40,8 +40,13 @@ export interface EvaluateRevalidationOptions<TEnv> {
     context: HandlerContext<any, TEnv>;
     /** Action context if triggered by action */
     actionContext?: ActionContext;
-    /** If true, this is a stale cache revalidation request */
+    /** The browser's `_rsc_stale` signal: seeds the action defaults. */
     stale?: boolean;
+    /**
+     * The route-cache entry is past its TTL (SWR). Predicates see it as `stale`;
+     * it never seeds the action defaults.
+     */
+    cacheStale?: boolean;
     /** Trace source hint for the revalidation trace */
     traceSource?: RevalidationTraceEntry["source"];
     /**

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

@@ -3,25 +3,9 @@ import type { EntryData, InterceptEntry, InterceptSelectorContext, MetricsStore
 import type { HandlerContext, ResolvedSegment, ShouldRevalidateFn } from "../types.js";
 import type { RouteMatchResult } from "./pattern-matching.js";
 import type { TelemetrySink } from "./telemetry.js";
-import type { ResolveSegmentOptions } from "./segment-resolution.js";
-/**
- * Revalidation context passed to segment resolution
- */
-export interface RevalidationContext {
-    clientSegmentIds: ReadonlySet<string>;
-    prevParams: Record<string, string>;
-    request: Request;
-    prevUrl: URL;
-    nextUrl: URL;
-    routeKey: string;
-    actionContext?: {
-        actionId?: string;
-        actionUrl?: URL;
-        actionResult?: any;
-        formData?: FormData;
-    };
-    stale?: boolean;
-}
+import type { EvaluateRevalidationOptions } from "./revalidation.js";
+import type { ResolutionPassInput } from "./segment-resolution/resolution-pass.js";
+import type { RevalidatingWalkOptions } from "./segment-resolution/revalidation.js";
 /**
  * Result from intercept lookup
  */
@@ -50,59 +34,21 @@ export interface RouterContext<TEnv = any> {
     getMetricsStore: () => MetricsStore | undefined;
     createCacheScope: (cacheConfig: any, parent: CacheScope | null) => CacheScope | null;
     findInterceptForRoute: (routeKey: string, parentEntry: EntryData | null, selectorContext: InterceptSelectorContext, isAction: boolean) => InterceptResult | null;
-    resolveAllSegmentsWithRevalidation: (entries: EntryData[], routeKey: string, params: Record<string, string>, handlerContext: HandlerContext<any, TEnv>, clientSegmentSet: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, actionContext: any | undefined, interceptResult: InterceptResult | null, localRouteName: string, pathname: string, stale?: boolean, 
-    /** The matched route's full chain when `entries` is part of it (ResolveSegmentOptions.chain). */
-    chain?: readonly EntryData[]) => Promise<{
+    /** The segment walker; a full match passes freshPassInput (FRESH). */
+    resolveAllSegments: (pass: ResolutionPassInput<TEnv>, entries: EntryData[], walk: RevalidatingWalkOptions) => Promise<{
         segments: ResolvedSegment[];
         matchedIds: string[];
     }>;
-    resolveAllSegmentsWithRevalidationGenerator?: (entries: EntryData[], routeKey: string, params: Record<string, string>, handlerContext: HandlerContext<any, TEnv>, clientSegmentSet: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, loaderPromises: Map<string, Promise<any>>, actionContext?: any) => AsyncGenerator<ResolvedSegment | {
-        __type: "id";
-        id: string;
-    }>;
-    resolveInterceptEntry: (intercept: InterceptEntry, entry: EntryData, params: Record<string, string>, handlerContext: HandlerContext<any, TEnv>, belongsToRoute: boolean, revalidationContext?: RevalidationContext, options?: {
+    resolveInterceptEntry: (pass: ResolutionPassInput<TEnv>, intercept: InterceptEntry, entry: EntryData, belongsToRoute: boolean, options?: {
         background?: boolean;
     }) => Promise<ResolvedSegment[]>;
-    collectWithMarkers?: <T>(gen: AsyncGenerator<T | {
-        __type: "id";
-        id: string;
-    }>) => Promise<{
-        items: T[];
-        matchedIds: string[];
-    }>;
-    evaluateRevalidation: (params: {
-        segment: ResolvedSegment;
-        prevParams: Record<string, string>;
-        getPrevSegment: (() => Promise<ResolvedSegment | undefined>) | null;
-        request: Request;
-        prevUrl: URL;
-        nextUrl: URL;
-        revalidations: Array<{
-            name: string;
-            fn: any;
-        }>;
-        routeKey: string;
-        context: HandlerContext<any, TEnv>;
-        actionContext?: any;
-        stale?: boolean;
-        traceSource?: "segment-resolution" | "cache-hit" | "loader" | "parallel" | "orphan-layout" | "route-handler" | "layout-handler" | "intercept-loader";
-    }) => Promise<boolean>;
+    evaluateRevalidation: (params: EvaluateRevalidationOptions<TEnv>) => Promise<boolean>;
     getRequestContext: () => {
         waitUntil: (fn: () => Promise<void>) => void;
         _handleStore?: any;
     } | undefined;
-    resolveAllSegments: (entries: EntryData[], routeKey: string, params: Record<string, string>, handlerContext: HandlerContext<any, TEnv>, loaderPromises: Map<string, Promise<any>>, options?: ResolveSegmentOptions) => Promise<ResolvedSegment[]>;
-    resolveAllSegmentsGenerator?: (entries: EntryData[], routeKey: string, params: Record<string, string>, handlerContext: HandlerContext<any, TEnv>, loaderPromises: Map<string, Promise<any>>) => AsyncGenerator<ResolvedSegment | {
-        __type: "id";
-        id: string;
-    }>;
-    collectSegmentsFromGenerator?: <T>(gen: AsyncGenerator<T | {
-        __type: "id";
-        id: string;
-    }>) => Promise<T[]>;
     createHandleStore: () => any;
-    resolveLoadersOnly?: (entries: EntryData[], handlerContext: HandlerContext<any, TEnv>) => Promise<ResolvedSegment[]>;
-    resolveLoadersOnlyWithRevalidation?: (entries: EntryData[], handlerContext: HandlerContext<any, TEnv>, clientSegmentSet: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, actionContext?: any, stale?: boolean) => Promise<{
+    resolveLoadersOnly?: (pass: ResolutionPassInput<TEnv>, entries: EntryData[], walk?: Pick<RevalidatingWalkOptions, "interceptResult">) => Promise<{
         segments: ResolvedSegment[];
         matchedIds: string[];
     }>;
@@ -111,7 +57,7 @@ export interface RouterContext<TEnv = any> {
     }>;
     telemetry?: TelemetrySink;
     requestId?: string;
-    resolveInterceptLoadersOnly?: (intercept: InterceptEntry, entry: EntryData, handlerContext: HandlerContext<any, TEnv>, belongsToRoute: boolean, revalidationContext: RevalidationContext) => Promise<ResolvedSegment[]>;
+    resolveInterceptLoadersOnly?: (pass: ResolutionPassInput<TEnv>, intercept: InterceptEntry, entry: EntryData, belongsToRoute: boolean) => Promise<ResolvedSegment[]>;
 }
 /**
  * Get router dependencies from AsyncLocalStorage context

package/dist/types/router/router-interfaces.d.ts

@@ -4,7 +4,6 @@ import type { ReverseFunction } from "../reverse.js";
 import type { UrlPatterns } from "../urls.js";
 import type { ClientUrlPatterns } from "../client-urls/types.js";
 import type { UrlBuilder, EnvCompatible } from "../urls/pattern-types.js";
-import type { EntryData } from "../server/context";
 import type { ErrorInfo, MatchResult } from "../types";
 import type { NonceProvider } from "../rsc/types.js";
 import type { ShellCaptureDebug } from "../rsc/shell-capture.js";
@@ -12,6 +11,7 @@ import type { ExecutionContext } from "../server/request-context.js";
 import type { SerializedSegmentData } from "../cache/types.js";
 import type { MiddlewareEntry, MiddlewareFn } from "./middleware.js";
 import type { RouteMatchResult } from "./pattern-matching.js";
+import type { LiveIntercept } from "./prerender-match.js";
 import type { ExtractParams } from "../types/route-config.js";
 import { RSC_ROUTER_BRAND } from "./router-registry.js";
 import type { RangoOptions, RootLayoutProps } from "./router-options.js";
@@ -19,6 +19,7 @@ import type { DefaultVars } from "../types/global-namespace.js";
 import type { ResolvedTimeouts, OnTimeoutCallback } from "./timeout.js";
 import type { ResolvedTracing } from "./tracing.js";
 import type { TelemetrySink } from "./telemetry.js";
+import type { ActionContext } from "./types.js";
 /**
  * Options passed to router.fetch(), router.match(), and other request entrypoints.
  * All entrypoints use this same shape for consistency.
@@ -425,8 +426,10 @@ export interface RangoInternal<TEnv = any, TRoutes extends Record<string, unknow
         routeName: string;
         params: Record<string, string>;
         interceptSegments?: SerializedSegmentData[];
-        /** RSC-encoded MERGED (main + intercept) handle map for the intercept artifact. */
+        /** RSC-encoded handle map for the intercept artifact (see matchForPrerender). */
         interceptHandles?: string;
+        /** The intercepts the intercept artifact does not hold (see matchForPrerender). */
+        liveIntercepts?: LiveIntercept[];
         passthrough?: true;
     } | null>;
     /**
@@ -438,27 +441,18 @@ export interface RangoInternal<TEnv = any, TRoutes extends Record<string, unknow
         handles: string;
     } | null>;
     /**
-     * Preview match - returns route middleware without segment resolution.
-     * Also returns responseType and handler for response routes (non-RSC short-circuit).
+     * Preview match - returns the route, its params and route middleware
+     * without segment resolution.
      */
     previewMatch(request: Request, input?: RouterRequestInput<TEnv>): Promise<{
         routeMiddleware?: Array<{
             handler: import("./middleware.js").MiddlewareFn;
             params: Record<string, string>;
         }>;
-        responseType?: string;
-        handler?: Function;
         params?: Record<string, string>;
-        negotiated?: boolean;
-        manifestEntry?: EntryData;
         routeKey?: string;
     } | null>;
-    matchPartial(request: Request, input?: RouterRequestInput<TEnv>, actionContext?: {
-        actionId?: string;
-        actionUrl?: URL;
-        actionResult?: any;
-        formData?: FormData;
-    }): Promise<MatchResult | null>;
+    matchPartial(request: Request, input?: RouterRequestInput<TEnv>, actionContext?: ActionContext): Promise<MatchResult | null>;
     /**
      * Match an error to the nearest error boundary and return error segments
      *

package/dist/types/router/segment-resolution/loader-cache.d.ts

@@ -94,8 +94,8 @@ export declare function loaderPins(entries: readonly EntryData[], reqCtx: Reques
  * PPR loader lane rule — the canonical source statement; other sites point
  * here (consumer docs: skills/ppr/SKILL.md "The loader lane rule";
  * docs/design/loader-container-bake.md). This is the single funnel every
- * loader segment path routes through (fresh resolveLoaders, cache-hit
- * resolveLoadersOnly, revalidation resolveLoadersOnlyWithRevalidation, and
+ * loader segment path routes through (resolveOwnerLoaders: the full match's
+ * FRESH pass, cache-hit and revalidation resolveLoadersOnly, and
  * intercept loaders in intercept-resolution.ts, which pass no bake key and
  * never run under a shell capture), so the lane is decided here, per LOADER,
  * never by the entry's loading():
@@ -109,7 +109,7 @@ export declare function loaderPins(entries: readonly EntryData[], reqCtx: Reques
  *   plain objects, arrays and JSX props are masked (mask-nested.ts) and stay
  *   live holes at the consumer's own Suspense — per-request material must be
  *   promise-shaped (the #692 cross-session scar). The masked container
- *   registers on `_shellCaptureLoaderRecords`: it holds the capture gate
+ *   registers on `_shellCaptureState.loaderRecords`: it holds the capture gate
  *   (bounded by `ppr.captureTimeout`) and pins into the snapshot's loader
  *   family, and on a HIT the recorded container is overlaid onto the fresh
  *   run (below) so the payload matches the frozen prelude outside the holes.

package/dist/types/router/segment-resolution/loader-mask.d.ts

@@ -7,16 +7,16 @@
  * consuming Suspense subtree postpones as a hole, and the serve pass runs them
  * fresh into it.
  *
- * Capture mode is signalled by `requestCtx._shellCaptureRun`, set to true ONLY on
+ * Capture mode is signalled by `requestCtx._shellCaptureState.run`, set ONLY on
  * the derived request context of the background capture task (shell-capture.ts);
- * the foreground render never sets it. This module is the single home for the
+ * the foreground render never has it. This module is the single home for the
  * mask so every loader execution site gates the same way (loader-cache.ts
- * `resolveLoaderData`, fresh.ts `resolveLoaders`).
+ * `resolveLoaderData`, revalidation.ts `resolveOwnerLoaders`).
  */
 import { type RequestContext } from "../../server/request-context.js";
 /**
  * True when the current render is the active PPR shell capture and route loaders
- * must be masked rather than executed. Reads `_shellCaptureRun` off the ALS
+ * must be masked rather than executed. Reads `_shellCaptureState` off the ALS
  * request context (the capture task re-establishes its derived context via
  * runWithRequestContext), so it is accurate at the loader resolution sites, which
  * run synchronously inside the pipeline's context frame.

package/dist/types/router/segment-resolution/prefetch-deferral.d.ts

@@ -93,14 +93,6 @@ export interface PrefetchDeferral {
      * a navigation to the page lists.
      */
     below?: true;
-    /**
-     * The loaders this prefetch deferred, by `$$id` (registerDeferredLoader).
-     * A deferred loader runs only if something reads it: a handler's or another
-     * loader's ctx.use() starts it through its registration
-     * (startDeferredLoader), and revalidation.ts deliverStartedLoaders delivers
-     * what was started by the end of resolution.
-     */
-    deferredLoaders?: Map<string, DeferredLoader>;
 }
 /**
  * How a request may use the route's cache() record, decided once per match
@@ -126,7 +118,14 @@ export interface RecordUse {
      */
     readonly refresh: boolean;
 }
-/** A loader this prefetch deferred: PrefetchDeferral.deferredLoaders. */
+/**
+ * A DSL loader registered and not started (InternalHandlerContext
+ * ._deferredLoaders): a prefetch deferred it, or a pass that skips loaders
+ * (`skipLoaders`) did not run it. It runs only if something reads it: a
+ * handler's or another loader's ctx.use() starts it through its registration
+ * (startDeferredLoader), and revalidation.ts deliverStartedLoaders delivers
+ * what a prefetch started by the end of resolution.
+ */
 export interface DeferredLoader {
     /**
      * The segment that registers it. Its run files its handle pushes there,
@@ -212,17 +211,20 @@ export declare function interceptFillSkips(match: {
 /** PrefetchDeferral.record, or all of it open when the match has no plan. */
 export declare function recordUse(ctx: HandlerContext<any, any> | undefined): RecordUse;
 /**
- * Register a loader this prefetch deferred, with the segment that registers
- * it and how to start it there (PrefetchDeferral.deferredLoaders). The first
+ * Register a loader resolution does not start, with the segment that
+ * registers it and how to start it there (DeferredLoader). The first
  * registration wins, as the loader's one run per request does.
  */
 export declare function registerDeferredLoader(ctx: HandlerContext<any, any>, loaderId: string, owner: string, start: () => Promise<unknown>): void;
 /**
- * A reader asks for a loader this prefetch deferred and nothing has started:
- * start it through its registration and return the run, or undefined when
- * the read takes the ordinary path. Without this the reader ran the loader
- * bare, without its cache() binding, and the segment delivered afterwards
- * read the binding: two values on one page and an extra run on a HIT.
+ * A reader asks for a registered loader (registerDeferredLoader) and nothing
+ * has started it: start it through its registration and return the run, or
+ * undefined when the read takes the ordinary path. Without this the reader
+ * ran the loader bare, as a handler-invoked loader: in a prefetch without its
+ * cache() binding, so the segment delivered afterwards read the binding (two
+ * values on one page, an extra run on a HIT); in a route record's background
+ * re-render outside its DSL scope, so the record kept its handle pushes and
+ * every HIT showed them twice.
  *
  * A started cache() binding of the loader (`_loaderCacheOverrides`) is never
  * redirected here: the read is that binding's own MISS execution, and
@@ -231,8 +233,8 @@ export declare function registerDeferredLoader(ctx: HandlerContext<any, any>, lo
 export declare function startDeferredLoader(ctx: HandlerContext<any, any>, loaderId: string): Promise<unknown> | undefined;
 /**
  * The segment a run of `loaderId` files its handle pushes under: the one
- * that registers it when this prefetch deferred it, else the segment being
- * resolved.
+ * that registers it when it is registered (registerDeferredLoader), else the
+ * segment being resolved.
  */
 export declare function loaderOwner(ctx: HandlerContext<any, any>, loaderId: string): string | undefined;
 /**