@rangojs/router 0.26.6 → 0.28.0

package/dist/types/router/segment-resolution/resolution-pass.d.ts

@@ -0,0 +1,93 @@
+/**
+ * ResolutionPass: what one walk over a matched chain reads.
+ *
+ * Every function of the segment walker (revalidation.ts, intercept-resolution.ts)
+ * resolves against the same request: the handler context, the segments the
+ * client holds, the previous and next location, the action, the staleness and
+ * the router's deps. They take this one object instead of threading the same
+ * ten values through each signature in a fixed order, where two adjacent
+ * `URL`s or `Record<string, string>`s could swap without a type error.
+ *
+ * A full match (a document, the background re-render of a route record, a
+ * build-time prerender) is a FRESH pass: see FRESH below.
+ */
+import type { HandlerContext } from "../../types.js";
+import type { ActionContext, SegmentResolutionDeps } from "../types.js";
+/**
+ * The segment ids the client holds, the set resolution works on (match-api.ts
+ * may delete a route's id from the listed set to force a render). Empty on a
+ * full refetch.
+ */
+export type ClientHeld = ReadonlySet<string>;
+/**
+ * The client of a full match: it holds nothing and asks for nothing to be
+ * kept. Compared by identity (`pass.client === FRESH`), never by size: a
+ * partial request whose client holds nothing (NOTHING_HELD, an empty
+ * `_rsc_segments`) still asks the revalidate() rules. On a FRESH pass every
+ * segment is new without a decision, trace entry or `revalidation.decision`
+ * event, and the walker takes the full match's branches (revalidation.ts,
+ * each marked FRESH).
+ */
+export declare const FRESH: ClientHeld;
+/**
+ * A pass without the router's deps: what match middleware knows about the
+ * request. createSegmentWrappers (segment-wrappers.ts) binds the deps.
+ */
+export interface ResolutionPassInput<TEnv = any> {
+    readonly context: HandlerContext<any, TEnv>;
+    readonly client: ClientHeld;
+    /** The matched route's params, stamped on every segment the walk emits. */
+    readonly params: Record<string, string>;
+    readonly prevParams: Record<string, string>;
+    /** Undefined only on a build-time FRESH pass (freshPassInput). */
+    readonly request: Request | undefined;
+    readonly prevUrl: URL;
+    readonly nextUrl: URL;
+    readonly routeKey: string;
+    readonly actionContext?: ActionContext;
+    readonly stale?: boolean;
+    /**
+     * No loader is started and no loader segment is emitted: build time
+     * (prerender-match.ts) and the background re-render of a route record
+     * (background-revalidation.ts), whose records never hold loaders.
+     * resolveOwnerLoaders registers each loader instead: in the re-render a
+     * handler's read starts it as its declaration; at build time a read
+     * throws (setupBuildUse).
+     */
+    readonly skipLoaders?: boolean;
+    /**
+     * A render error rethrows instead of rendering the error boundary, and a
+     * streamed handler's rejection is not recovered. Build time only, so a
+     * failure (or `throw new Skip()`) reaches the build instead of being baked
+     * into a frozen 200 (issue #587).
+     */
+    readonly throwOnError?: boolean;
+    /**
+     * The request is a navigation, though the pass is FRESH: the background
+     * re-render of a record a navigation read stale or wrote
+     * (background-revalidation.ts). An entry's error reports isPartial, as the
+     * navigation's own pass does.
+     */
+    readonly partialRequest?: boolean;
+}
+export interface ResolutionPass<TEnv = any> extends ResolutionPassInput<TEnv> {
+    readonly deps: SegmentResolutionDeps<TEnv>;
+}
+/**
+ * The input of a full match's pass (FRESH). At build time the prerender
+ * context's `request` is a throwing getter (handler-context.ts
+ * createPrerenderContext): the pass carries undefined instead.
+ */
+export declare function freshPassInput<TEnv>(context: HandlerContext<any, TEnv>, routeKey: string, params: Record<string, string>, options?: {
+    skipLoaders?: boolean;
+    throwOnError?: boolean;
+    partialRequest?: boolean;
+}): ResolutionPassInput<TEnv>;
+/**
+ * The input of a pass whose client holds nothing: every segment is new and
+ * renders. The background re-render of an intercept (background-revalidation.ts)
+ * resolves with it.
+ */
+export declare function heldNothingPassInput<TEnv>(context: HandlerContext<any, TEnv>, routeKey: string, params: Record<string, string>, options?: {
+    skipLoaders?: boolean;
+}): ResolutionPassInput<TEnv>;

package/dist/types/router/segment-resolution/revalidation.d.ts

@@ -1,13 +1,20 @@
 /**
- * Revalidation Path Segment Resolution
+ * The segment walker.
  *
- * Functions for resolving segments during partial (revalidation) requests.
- * Mirrors the fresh path but adds revalidation awareness: only re-resolves
- * segments whose revalidate() predicate returns true.
+ * Resolves a matched chain's segments (loaders, layouts, routes, parallels,
+ * orphan layouts, error boundaries) in handler-first order. A partial request
+ * re-resolves only what the client lacks and what a held segment's
+ * revalidate() rules ask for. A full match (a document, the background
+ * re-render of a route record, a build-time prerender) walks the same code
+ * with `pass.client === FRESH` (resolution-pass.ts): every segment is new,
+ * and the branches marked FRESH keep what the full match has always done
+ * differently.
  */
 import { type EntryData, type LoaderEntry } from "../../server/context";
 import type { HandlerContext, ResolvedSegment, ShouldRevalidateFn } from "../../types";
-import type { SegmentResolutionDeps, SegmentRevalidationResult, ActionContext } from "../types.js";
+import type { SegmentRevalidationResult } from "../types.js";
+import type { InterceptResult } from "../router-context.js";
+import { type ResolutionPass } from "./resolution-pass.js";
 /**
  * A deferred loader something started in this request (a handler that awaits
  * it with ctx.use(), or another loader) ran in the prefetch whatever its flag
@@ -37,23 +44,37 @@ export interface LoaderOwner {
      * False for an intercept: never a document.
      */
     readonly bakeLane: boolean;
+    /**
+     * The owner declares loading(false). A FRESH pass then settles every loader
+     * before the handler runs (resolveOwnerLoaders). Unset for an intercept.
+     */
+    readonly loadingDisabled?: boolean;
     readonly traceSource: "loader" | "intercept-loader";
 }
 /** A route entry as a LoaderOwner, under `shortCodeOverride` when inherited. */
 export declare function ownerOf(entry: EntryData, shortCodeOverride?: string): LoaderOwner;
 /**
- * The partial lane's one loader funnel: each loader is a segment, run when
- * the client lacks it, asked its revalidate() when held, kept outright in a
- * fill (fillSends), deferred in a prefetch that defers it (defersLoader).
+ * The walker's one loader funnel: each loader is a segment, run when the
+ * client lacks it, asked its revalidate() when held, kept outright in a fill
+ * (fillSends), deferred in a prefetch that defers it (defersLoader).
+ *
+ * Loaders run lazily via ctx.use() and are memoized, so they run in
+ * parallel. A FRESH pass kicks every loader off without an await, in the
+ * tick the call starts: a reader's ctx.use(Loader) finds the binding only if
+ * it registered first (docs/design/handle-push-ownership.md).
  */
-export declare function resolveOwnerLoaders<TEnv>(owner: LoaderOwner, ctx: HandlerContext<any, TEnv>, belongsToRoute: boolean, clientSegmentIds: ReadonlySet<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, deps: SegmentResolutionDeps<TEnv>, actionContext?: ActionContext, stale?: boolean): Promise<{
+export declare function resolveOwnerLoaders<TEnv>(pass: ResolutionPass<TEnv>, owner: LoaderOwner, belongsToRoute: boolean): Promise<{
     segments: ResolvedSegment[];
     matchedIds: string[];
 }>;
 /**
- * Resolve only loader segments for all entries with revalidation logic.
+ * Resolve only loader segments for all entries: a cache() or prerender HIT
+ * serves the cached non-loader segments, and loaders are never cached. Under
+ * an intercept the route's entry, and on an intercept's fill an entry the
+ * client lacks, are skipped as resolveAllSegments skips them, after the ppr
+ * header latch below has read the chain's leaf.
  */
-export declare function resolveLoadersOnlyWithRevalidation<TEnv>(entries: EntryData[], context: HandlerContext<any, TEnv>, clientSegmentIds: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, deps: SegmentResolutionDeps<TEnv>, actionContext?: ActionContext, stale?: boolean): Promise<{
+export declare function resolveLoadersOnly<TEnv>(pass: ResolutionPass<TEnv>, entries: EntryData[], walk?: Pick<RevalidatingWalkOptions, "interceptResult">): Promise<{
     segments: ResolvedSegment[];
     matchedIds: string[];
 }>;
@@ -65,9 +86,9 @@ export declare function buildEntryRevalidateMap(entries: EntryData[]): Map<strin
     revalidate: ShouldRevalidateFn<any, any>[];
 }>;
 /**
- * Resolve parallel segments with revalidation.
+ * Resolve an entry's parallel slots: each slot's segment and its loaders.
  */
-export declare function resolveParallelSegmentsWithRevalidation<TEnv>(entry: EntryData, params: Record<string, string>, context: HandlerContext<any, TEnv>, belongsToRoute: boolean, clientSegmentIds: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, deps: SegmentResolutionDeps<TEnv>, actionContext?: ActionContext, stale?: boolean, options?: {
+export declare function resolveParallelSegments<TEnv>(pass: ResolutionPass<TEnv>, entry: EntryData, belongsToRoute: boolean, options?: {
     /**
      * Seed for an unknown parent-chain slot (slot not in clientSegmentIds) when
      * there are no deciding revalidate fns. "type-derived" (default, main path):
@@ -85,43 +106,73 @@ export declare function resolveParallelSegmentsWithRevalidation<TEnv>(entry: Ent
      * to it: loader sub-ids are filtered out and slots are re-grouped by parent).
      */
     loaderOrder?: "after" | "before";
-    /** Matched chain entry being resolved; see ResolveSegmentOptions.boundaryEntry. */
+    /**
+     * The matched chain entry being resolved: where the sync path catches a
+     * handler error, so a streamed slot handler (or a slot owned by a
+     * routeless layout) recovers into the same boundary. Defaults to `entry`.
+     */
     boundaryEntry?: EntryData;
 }): Promise<SegmentRevalidationResult>;
 /**
- * Resolve entry handler (layout, cache, or route) with revalidation.
+ * Resolve a chain entry's handler (layout, cache, or route) into its segment.
  */
-export declare function resolveEntryHandlerWithRevalidation<TEnv>(entry: Exclude<EntryData, {
+export declare function resolveEntryHandler<TEnv>(pass: ResolutionPass<TEnv>, entry: Exclude<EntryData, {
     type: "parallel";
-}>, params: Record<string, string>, context: HandlerContext<any, TEnv>, belongsToRoute: boolean, clientSegmentIds: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, deps: SegmentResolutionDeps<TEnv>, actionContext?: ActionContext, stale?: boolean): Promise<{
+}>, belongsToRoute: boolean): Promise<{
     segment: ResolvedSegment;
     matchedId: string;
 }>;
 /**
- * Resolve segments with revalidation awareness (for partial rendering).
+ * Resolve one chain entry's segments: its loaders, its handler, its orphan
+ * layouts and its parallels, handler first.
  */
-export declare function resolveSegmentWithRevalidation<TEnv>(entry: Exclude<EntryData, {
+export declare function resolveSegment<TEnv>(pass: ResolutionPass<TEnv>, entry: Exclude<EntryData, {
     type: "parallel";
-}>, routeKey: string, params: Record<string, string>, context: HandlerContext<any, TEnv>, clientSegmentIds: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, deps: SegmentResolutionDeps<TEnv>, actionContext?: ActionContext, stale?: boolean, 
-/** The matched route's full chain; see ResolveSegmentOptions.chain (fresh.ts). */
+}>, 
+/** The matched route's full chain; see RevalidatingWalkOptions.chain. */
 chain?: readonly EntryData[]): Promise<SegmentRevalidationResult>;
 /**
- * Resolve orphan layout with revalidation.
+ * Resolve an orphan layout: its loaders, its handler, its slots and the
+ * routeless entries nested in it.
  */
-export declare function resolveOrphanLayoutWithRevalidation<TEnv>(orphan: EntryData, params: Record<string, string>, context: HandlerContext<any, TEnv>, clientSegmentIds: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, belongsToRoute: boolean, deps: SegmentResolutionDeps<TEnv>, actionContext?: ActionContext, stale?: boolean, 
+export declare function resolveOrphanLayout<TEnv>(pass: ResolutionPass<TEnv>, orphan: EntryData, belongsToRoute: boolean, 
 /** Parent route entry — its loaders are inherited so parallel slots can access them. */
 parentRouteEntry?: EntryData, 
-/** Matched chain entry being resolved (see ResolveSegmentOptions.boundaryEntry); defaults to parentRouteEntry. */
+/**
+ * Matched chain entry being resolved (see
+ * resolveParallelSegments's boundaryEntry); defaults to
+ * parentRouteEntry.
+ */
 boundaryEntry?: EntryData | undefined): Promise<SegmentRevalidationResult>;
+/** What resolveAllSegments needs beyond its pass. */
+export interface RevalidatingWalkOptions {
+    /**
+     * The intercept the request resolves: the route's entry (its handler and
+     * loaders) is skipped and only its id is matched. None on a full match.
+     */
+    readonly interceptResult?: InterceptResult | null;
+    /** For the intercept skip's debug log. */
+    readonly localRouteName?: string;
+    /** Where an entry's error boundary reports (resolveWithErrorBoundary). */
+    readonly pathname: string;
+    /**
+     * The matched route's full entry chain. Defaults to `entries`;
+     * withCacheLookup passes it when it resolves only the entries above a
+     * cache() boundary. An orphan list can hold an entry of the chain: a bare
+     * cache() marker sits in its layout's layout[] (it wraps that layout's
+     * routes) and is the parent of the routes after it. For those routes it
+     * resolves once, as a chain entry, below the cache() header latch (issue
+     * #918: resolved twice on a MISS, once and discarded on a HIT).
+     */
+    readonly chain?: readonly EntryData[];
+}
 /**
- * Resolve all segments for a route with revalidation logic (for matchPartial).
+ * Resolve all segments for a route: a partial match (matchPartial), a full
+ * match with a FRESH pass, or the FRESH pass of an intercept record's
+ * background re-render (rerenderAndCacheRoute). A thrown action's pass is cut
+ * at its error boundary (ActionContext.boundary).
  */
-export declare function resolveAllSegmentsWithRevalidation<TEnv>(entries: EntryData[], routeKey: string, params: Record<string, string>, context: HandlerContext<any, TEnv>, clientSegmentSet: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, actionContext: ActionContext | undefined, interceptResult: {
-    intercept: any;
-    entry: EntryData;
-} | null, localRouteName: string, pathname: string, deps: SegmentResolutionDeps<TEnv>, stale?: boolean, 
-/** The matched route's full chain; see ResolveSegmentOptions.chain (fresh.ts). */
-chain?: readonly EntryData[]): Promise<{
+export declare function resolveAllSegments<TEnv>(pass: ResolutionPass<TEnv>, entries: EntryData[], walk: RevalidatingWalkOptions): Promise<{
     segments: ResolvedSegment[];
     matchedIds: string[];
 }>;

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

@@ -1,3 +1,2 @@
 export { handleHandlerResult, warnOnStreamedResponse, buildLoaderErrorContext, } from "./segment-resolution/helpers.js";
-export { resolveLoaders, type ResolveSegmentOptions, resolveSegment, resolveOrphanLayout, resolveParallelEntry, resolveAllSegments, resolveLoadersOnly, } from "./segment-resolution/fresh.js";
-export { resolveLoadersOnlyWithRevalidation, buildEntryRevalidateMap, resolveParallelSegmentsWithRevalidation, resolveEntryHandlerWithRevalidation, resolveSegmentWithRevalidation, resolveOrphanLayoutWithRevalidation, resolveAllSegmentsWithRevalidation, } from "./segment-resolution/revalidation.js";
+export { resolveLoadersOnly, buildEntryRevalidateMap, resolveParallelSegments, resolveEntryHandler, resolveSegment, resolveOrphanLayout, resolveAllSegments, } from "./segment-resolution/revalidation.js";

package/dist/types/router/segment-wrappers.d.ts

@@ -1,51 +1,14 @@
-import type { EntryData, InterceptEntry } from "../server/context";
-import type { HandlerContext, ResolvedSegment, ShouldRevalidateFn } from "../types";
 import type { SegmentResolutionDeps } from "./types.js";
-import type { ResolveSegmentOptions } from "./segment-resolution.js";
-import type { RevalidationContext } from "./router-context.js";
-import type { InterceptSelectorContext } from "../server/context";
-export interface SegmentWrappers<TEnv = any> {
-    resolveAllSegments: (entries: EntryData[], routeKey: string, params: Record<string, string>, context: HandlerContext<any, TEnv>, loaderPromises: Map<string, Promise<any>>, options?: ResolveSegmentOptions) => Promise<ResolvedSegment[]>;
-    resolveLoadersOnly: (entries: EntryData[], context: HandlerContext<any, TEnv>) => Promise<ResolvedSegment[]>;
-    resolveLoadersOnlyWithRevalidation: (entries: EntryData[], context: HandlerContext<any, TEnv>, clientSegmentIds: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, routeKey: string, actionContext?: {
-        actionId?: string;
-        actionUrl?: URL;
-        actionResult?: any;
-        formData?: FormData;
-    }, stale?: boolean) => Promise<{
-        segments: ResolvedSegment[];
-        matchedIds: string[];
-    }>;
-    buildEntryRevalidateMap: (entries: EntryData[]) => Map<string, {
-        entry: EntryData;
-        revalidate: ShouldRevalidateFn<any, any>[];
-    }>;
-    resolveAllSegmentsWithRevalidation: (entries: EntryData[], routeKey: string, params: Record<string, string>, context: HandlerContext<any, TEnv>, clientSegmentSet: Set<string>, prevParams: Record<string, string>, request: Request, prevUrl: URL, nextUrl: URL, actionContext: {
-        actionId?: string;
-        actionUrl?: URL;
-        actionResult?: any;
-        formData?: FormData;
-    } | undefined, interceptResult: {
-        intercept: InterceptEntry;
-        entry: EntryData;
-    } | null, localRouteName: string, pathname: string, stale?: boolean, chain?: readonly EntryData[]) => Promise<{
-        segments: ResolvedSegment[];
-        matchedIds: string[];
-    }>;
-    findInterceptForRoute: (targetRouteKey: string, fromEntry: EntryData | null, selectorContext?: InterceptSelectorContext | null, isAction?: boolean) => {
-        intercept: InterceptEntry;
-        entry: EntryData;
-    } | null;
-    resolveInterceptEntry: (interceptEntry: InterceptEntry, parentEntry: EntryData, params: Record<string, string>, context: HandlerContext<any, TEnv>, belongsToRoute?: boolean, revalidationContext?: any, options?: {
-        background?: boolean;
-    }) => Promise<ResolvedSegment[]>;
-    resolveInterceptLoadersOnly: (interceptEntry: InterceptEntry, parentEntry: EntryData, context: HandlerContext<any, TEnv>, belongsToRoute: boolean, revalidationContext: RevalidationContext) => Promise<ResolvedSegment[]>;
-}
+import type { RouterContext } from "./router-context.js";
+import { findInterceptForRoute as _findInterceptForRoute } from "./intercept-resolution.js";
+/** The resolvers RouterContext exposes, with the router's deps bound. */
+export type SegmentWrappers<TEnv = any> = Pick<RouterContext<TEnv>, "resolveAllSegments" | "resolveInterceptEntry"> & Required<Pick<RouterContext<TEnv>, "resolveLoadersOnly" | "buildEntryRevalidateMap" | "resolveInterceptLoadersOnly">> & {
+    /** Its own signature: a null selector context, isAction defaulting to false. */
+    findInterceptForRoute: typeof _findInterceptForRoute;
+};
 /**
- * Create thin wrapper functions that bind segmentDeps to extracted
- * segment resolution and intercept resolution functions.
- *
- * These maintain the same signatures as the original inline functions
- * so that RouterContext and call sites don't need to change.
+ * Bind the router's segment deps into the extracted segment and intercept
+ * resolvers. Each gets a ResolutionPass: the caller's request-side input with
+ * the deps added here, once per call.
  */
-export declare function createSegmentWrappers<TEnv = any>(segmentDeps: SegmentResolutionDeps<TEnv>): SegmentWrappers<TEnv>;
+export declare function createSegmentWrappers<TEnv = any>(deps: SegmentResolutionDeps<TEnv>): SegmentWrappers<TEnv>;

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

@@ -208,6 +208,8 @@ export declare function safeEmit(sink: TelemetrySink, event: TelemetryEvent): vo
  * Generated IDs use format "t-{base36}" to distinguish from header values.
  */
 export declare function getRequestId(request: Request): string;
+/** Make `id` the id getRequestId returns for `request`. */
+export declare function setRequestId(request: Request, id: string): void;
 /**
  * Built-in console sink that logs events in a structured format.
  * Designed as the default sink for development / debugging.

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

@@ -15,6 +15,16 @@ export type ActionContext = {
     actionUrl?: URL;
     actionResult?: any;
     formData?: FormData;
+    /**
+     * A thrown action's error segment (matchError), set on the action's
+     * revalidation (rsc/server-action.ts matchBoundaryRevalidation). The walk
+     * (resolveAllSegments) resolves every entry above the segment's outlet as on
+     * a success, emits the segment in the outlet's place and stops, so nothing
+     * at or below the outlet runs. The pass skips the prerender store
+     * (cache-lookup.ts): the evicted handler is under the cut. No revalidate()
+     * predicate sees it.
+     */
+    boundary?: ResolvedSegment;
 };
 export interface SegmentResolutionDeps<TEnv = any> {
     wrapLoaderPromise: <T>(promise: Promise<T>, entry: EntryData, segmentId: string, pathname: string, errorContext?: {

package/dist/types/rsc/full-payload.d.ts

@@ -32,7 +32,7 @@ export declare function buildFullPayload(m: MatchResult, ctx: HandlerContext<any
  * visitor's URL. Any other render that shows the visitor's URL marks
  * `_payloadVisitorLocation`, and the document cache does not store it.
  */
-export declare function renderedLocation(reqCtx: Pick<RequestContext<any>, "_variables" | "_shellCaptureRun" | "_shellCaptureForVisitor" | "_documentCacheRender" | "_payloadVisitorLocation" | "res"> | undefined, url: URL): URL;
+export declare function renderedLocation(reqCtx: Pick<RequestContext<any>, "_variables" | "_shellCaptureState" | "_documentCacheRender" | "_payloadVisitorLocation" | "res"> | undefined, url: URL): URL;
 /**
  * A payload's `pathname` (renderedLocation) and, when middleware rewrote the
  * request, `rewriteTarget`: the path and search the route rendered (the
@@ -63,4 +63,4 @@ export declare function payloadLocation(reqCtx: Parameters<typeof renderedLocati
  * default it marks `_payloadVisitorTheme`, and the document cache does not
  * store the response.
  */
-export declare function payloadInitialTheme(reqCtx: Pick<RequestContext<any>, "_themeConfig" | "_shellCaptureRun" | "_readTheme" | "_documentCacheRender" | "_payloadVisitorTheme" | "res">): Theme | undefined;
+export declare function payloadInitialTheme(reqCtx: Pick<RequestContext<any>, "_themeConfig" | "_shellCaptureState" | "_readTheme" | "_documentCacheRender" | "_payloadVisitorTheme" | "res">): Theme | undefined;

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

@@ -6,11 +6,14 @@
  * RSC rendering) so they can be standalone modules without closure coupling.
  */
 import type { RangoInternal } from "../router/router-interfaces.js";
-import type { ErrorPhase } from "../types.js";
-import type { InvokeOnErrorContext } from "../router/error-handling.js";
 import type { RSCDependencies, LoadSSRModule } from "./types.js";
 import type { SSRStreamMode } from "../router/router-options.js";
-export interface HandlerContext<TEnv = unknown> {
+import type { RequestStageContext } from "./request-stages.js";
+/**
+ * Extends what the request stages (rsc/request-stages.ts) call back into, so
+ * the handler hands this one bundle to them as well.
+ */
+export interface HandlerContext<TEnv = unknown> extends RequestStageContext<TEnv> {
     router: RangoInternal<TEnv, any>;
     /**
      * The router's DOCUMENT version (router-versions.ts): payload metadata, the
@@ -26,9 +29,6 @@ export interface HandlerContext<TEnv = unknown> {
     decodeAction: RSCDependencies["decodeAction"];
     decodeFormState: RSCDependencies["decodeFormState"];
     loadSSRModule: LoadSSRModule;
-    callOnError: (error: unknown, phase: ErrorPhase, context: InvokeOnErrorContext<TEnv>) => void;
-    getRequiredRouteMap: () => Record<string, string>;
-    createRedirectFlightResponse: (redirectUrl: string, locationState?: Record<string, unknown>, external?: boolean) => Response;
     /**
      * Resolve the SSR stream mode for a given request.
      * Returns "stream" when no resolveStreaming callback is configured.

package/dist/types/rsc/json-route-result.d.ts

@@ -1,10 +1,6 @@
 /**
- * Shared serialization for `json()` response-route results.
- *
- * Kept in its own lightweight module (depends only on `errors.js`) so the
- * `dispatch()` testing primitive can import it WITHOUT dragging in
- * `response-route-handler.ts`'s heavy runtime graph, which transitively reaches
- * a Vite virtual module and breaks a plain (non-Vite) vitest import.
+ * Serialization for `json()` response-route results (depends only on
+ * `errors.js`).
  */
 /**
  * Serialize a `json()` response-route result, rejecting a nested unresolved
@@ -13,8 +9,8 @@
  * the RSC pipeline awaits nested promises but this path does not. Throwing
  * `RESPONSE_NOT_SERIALIZABLE` makes the failure loud.
  *
- * Shared by the production response-route handler and the `dispatch()` testing
- * primitive so a `dispatch` json test of a forgotten await fails exactly where
- * production 500s, instead of going green.
+ * The `dispatch()` testing primitive runs the same response-route handler, so
+ * a `dispatch` json test of a forgotten await fails exactly where production
+ * 500s, instead of going green.
  */
 export declare function stringifyJsonRouteResult(result: unknown): string;

package/dist/types/rsc/request-stages.d.ts

@@ -0,0 +1,203 @@
+/**
+ * Request stages
+ *
+ * The stages a request runs through before and after rendering: classify,
+ * guard, the global middleware passes, the response route, and the
+ * response's finalization. The RSC handler (rsc/handler.ts createRSCHandler)
+ * runs them all around its Flight executor. The dispatch testing primitive
+ * (testing/dispatch.ts) runs classify, the terminal plans, the passes, the
+ * response route and the finalization, and throws where a plan would render
+ * a component. Sharing them keeps dispatch's responses identical to
+ * production's; a hand-kept mirror drifted once (#1128).
+ *
+ * No import of @vitejs/plugin-rsc on this graph: dispatch loads it in a
+ * plain Vitest project, where plugin-rsc's entries cannot load (they import
+ * Vite virtuals). testing/__tests__/testing-module-graph.test.ts pins it.
+ */
+import type { MiddlewareEntry } from "../router/middleware-types.js";
+import { type RequestContext } from "../server/request-context.js";
+import { type RewritePassesOptions, type RewritePassesResult } from "./rewrite-passes.js";
+import { type ResponseRouteMatch } from "./response-route-handler.js";
+import type { ErrorPhase } from "../types.js";
+import type { OnErrorCallback } from "../types/error-types.js";
+import { type InvokeOnErrorContext } from "../router/error-handling.js";
+import type { OriginCheckPhase } from "./origin-guard.js";
+import { type OnTimeoutCallback, type ResolvedTimeouts, type TimeoutPhase } from "../router/timeout.js";
+import { type TelemetrySink } from "../router/telemetry.js";
+import { type ClassifyRequestDeps, type ExecutableRequestPlan, type RequestPlan, type ResponseRoutePlan } from "../router/request-classification.js";
+/**
+ * The router members the stages read. The handler's `RangoInternal` carries
+ * them; dispatch reads them off the router a test passes.
+ */
+export interface StageRouter<TEnv = unknown> {
+    readonly basename: string | undefined;
+    readonly middleware: MiddlewareEntry<TEnv>[];
+    readonly onError?: OnErrorCallback<TEnv>;
+    readonly telemetry?: TelemetrySink;
+    readonly timeouts?: ResolvedTimeouts;
+    readonly onTimeout?: OnTimeoutCallback<TEnv>;
+}
+/** Report an error through the router's onError. */
+export type ReportError<TEnv = unknown> = (error: unknown, phase: ErrorPhase, context: InvokeOnErrorContext<TEnv>) => void;
+/**
+ * What the stages call back into. The handler's context bundle
+ * (rsc/handler-context.ts HandlerContext) extends it.
+ */
+export interface RequestStageContext<TEnv = unknown> {
+    router: StageRouter<TEnv>;
+    callOnError: ReportError<TEnv>;
+    getRequiredRouteMap: () => Record<string, string>;
+    /**
+     * The redirect a partial or action request receives: a Flight payload in
+     * the handler (fetch() would follow a raw 3xx to HTML). dispatch has no
+     * Flight runtime and answers 204 + X-RSC-Redirect.
+     */
+    createRedirectFlightResponse: (redirectUrl: string, locationState?: Record<string, unknown>, external?: boolean) => Response;
+    /**
+     * Reports a response-route handler's own throw; absent, it goes to
+     * callOnError with phase "handler". dispatch passes a no-op: it does not
+     * report that throw (its documented boundary, testing/dispatch.ts).
+     */
+    reportResponseRouteError?: (error: unknown, context: InvokeOnErrorContext<TEnv>) => void;
+}
+/** What classify and the terminal plans read beyond the stage context. */
+export interface ClassifyContext<TEnv = unknown> {
+    router: {
+        readonly id: string;
+        readonly findMatch: ClassifyRequestDeps<TEnv>["findMatch"];
+    };
+    /** The router's DOCUMENT version: the `_rsc_v` reload check. */
+    version: string;
+}
+/**
+ * Per-request error reporter that deduplicates via the ALS request context.
+ *
+ * Uses the same _reportedErrors WeakSet as the router layer so errors
+ * that propagate across layers are only reported once per request.
+ */
+export declare function createErrorReporter<TEnv>(router: {
+    readonly onError?: OnErrorCallback<TEnv>;
+}): ReportError<TEnv>;
+/**
+ * Wire background error reporting so "use cache" and other subsystems can
+ * surface non-fatal errors through the router's onError callback.
+ */
+export declare function reportBackgroundErrors<TEnv>(reqCtx: RequestContext<TEnv>, request: Request, url: URL, callOnError: ReportError<TEnv>): void;
+/**
+ * Classify a request into its plan. classifyRequest throws
+ * RouteNotFoundError for an unknown route; that falls through to a
+ * full-render plan with no matched route, so the render path renders the
+ * 404 page (match()/matchPartial() re-throw and the render's catch renders
+ * it).
+ */
+export declare function classify<TEnv>(request: Request, url: URL, ctx: ClassifyContext<TEnv>): Promise<RequestPlan<TEnv>>;
+/** The plan classify answers an unknown route with (the render path's 404). */
+export declare function isUnmatchedPlan(plan: RequestPlan<any>): boolean;
+/**
+ * Record a plan's route on the request context: its params and name, and the
+ * classified snapshot match()/matchPartial() reuse instead of resolving the
+ * route again. Runs inside the global chain, so global middleware sees the
+ * route after next(). A redirect has none.
+ */
+export declare function recordPlanRoute<TEnv>(plan: ExecutableRequestPlan<TEnv>): void;
+/**
+ * The checks between classification and execution that need no await.
+ * Returns the response of a terminal plan (a partial request's redirect, a
+ * version or app-switch reload), null to go on. Throws for a rewritten
+ * action whose target is not a page route.
+ *
+ * Synchronous, and the origin guard is a separate step: the caller awaits
+ * checkRequestOrigin only for the modes ORIGIN_CHECK_PHASE_BY_MODE gates, so
+ * a full, partial or response plan reaches execution without an added
+ * microtask (rsc/__tests__/request-microtasks.rsc-test.tsx).
+ */
+export declare function terminalPlanResponse<TEnv>(plan: RequestPlan<TEnv>, url: URL, ctx: RequestStageContext<TEnv> & ClassifyContext<TEnv>): Response | null;
+/**
+ * The origin guard's rejection: reports it through onError and telemetry,
+ * and returns the response checkRequestOrigin rejected the request with. The
+ * caller awaits checkRequestOrigin itself, for the modes
+ * ORIGIN_CHECK_PHASE_BY_MODE gates (action, loader, PE form), so the guard
+ * adds no microtask over that await.
+ */
+export declare function originRejectedResponse<TEnv>(rejection: Response, phase: OriginCheckPhase, request: Request, env: TEnv, url: URL, ctx: RequestStageContext<TEnv>): Response;
+export interface RequestPassesOptions<TEnv> {
+    ctx: RequestStageContext<TEnv>;
+    reqCtx: RequestContext<TEnv>;
+    /** The visitor's request and raw URL: the first pass. */
+    request: Request;
+    url: URL;
+    env: TEnv;
+    variables: Record<string, any>;
+    /** The visitor's global middleware, when the caller matched it already. */
+    firstPassMiddleware?: Array<{
+        entry: MiddlewareEntry<TEnv>;
+        params: Record<string, string>;
+    }>;
+    /** Runs before a pass's global chain; dispatch matches the pass there. */
+    beforePass?: (request: Request, url: URL, index: number) => Promise<void>;
+    /** The core handler a pass's global chain wraps. */
+    core: (request: Request, url: URL) => Promise<Response>;
+    onHop?: RewritePassesOptions["onHop"];
+    refuse?: RewritePassesOptions["refuse"];
+}
+export interface RequestPassesResult extends RewritePassesResult {
+    /** Whether the last pass ran a global middleware chain. */
+    hasMiddleware: boolean;
+}
+/**
+ * One pass per URL: the global middleware chain matched on the pass's path,
+ * wrapping the core handler. A `throw rewrite()` from global or route
+ * middleware unwinds the pass, and the next one runs the same request as
+ * the target from the top, as a direct visit would (rsc/rewrite-passes.ts).
+ */
+export declare function runRequestPasses<TEnv>(opts: RequestPassesOptions<TEnv>): Promise<RequestPassesResult>;
+/**
+ * The flat match handleResponseRoute takes, with params at the top level,
+ * built from a response-route plan.
+ */
+export declare function responseRouteMatch(plan: ResponseRoutePlan<any>): ResponseRouteMatch;
+export interface ServeResponseRouteOptions<TEnv> {
+    match: ResponseRouteMatch;
+    /** The matched route's key, for the timeout report. */
+    routeKey: string | undefined;
+    /** The pass's request, raw URL and env. */
+    request: Request;
+    url: URL;
+    env: TEnv;
+    variables: Record<string, any>;
+    /**
+     * Receives the handler's work when the deadline wins. The handler leaves
+     * it running; dispatch cancels its body.
+     */
+    abandon?: (work: Promise<Response>) => void;
+}
+/**
+ * A response route: its handler (rsc/response-route-handler.ts) under the
+ * renderStartMs deadline, which starts here, inside the global chain, so
+ * global middleware time never counts toward it.
+ */
+export declare function serveResponseRoute<TEnv>(ctx: RequestStageContext<TEnv>, opts: ServeResponseRouteOptions<TEnv>): Promise<Response>;
+/**
+ * Handle a timeout by reporting the error, emitting telemetry,
+ * and returning either the custom onTimeout response or a default 504.
+ */
+export declare function timeoutResponse<TEnv>(ctx: RequestStageContext<TEnv>, request: Request, env: TEnv, url: URL, phase: TimeoutPhase, durationMs: number, routeKey?: string, actionId?: string): Promise<Response>;
+export interface FinalizeRequestOptions<TEnv> {
+    ctx: RequestStageContext<TEnv>;
+    reqCtx: RequestContext<TEnv>;
+    /** The visitor's request, raw URL and env. */
+    request: Request;
+    url: URL;
+    env: TEnv;
+    /** runRequestPasses' result. */
+    hasMiddleware: boolean;
+    rewrittenTo?: string;
+    /** Runs on the response before the open-redirect guard. */
+    beforeGuard?: (response: Response) => void;
+}
+/**
+ * The response the global chain returned, made ready to leave: a partial or
+ * action request's redirect converted, onResponse callbacks drained, the
+ * rewrite header, the open-redirect guard and the stream-idle watchdog.
+ */
+export declare function finalizeRequestResponse<TEnv>(downstream: Response, opts: FinalizeRequestOptions<TEnv>): Response;