@timber-js/app 0.2.0-alpha.184 → 0.2.0-alpha.186

package/dist/server/internal.js

@@ -1,11 +1,15 @@
-import { a as classifyMetadataRoute, i as METADATA_ROUTE_CONVENTIONS, o as getMetadataRouteAutoLink, r as canonicalize, s as getMetadataRouteServePath } from "../_chunks/canonicalize-DQHyFClh.js";
-import { n as classifyUrlSegment } from "../_chunks/segment-classify-Byy425ng.js";
-import { $ as timingAls, A as setMatchedSegmentPath, C as applyRequestHeaderOverlay, D as getSegmentParams, E as getSearchParams, F as getSetCookieHeaders, G as replaceTraceId, H as getOtelTraceId, I as getWaitUntil, J as withSpan, K as runWithTraceId, L as isDebug, M as setSegmentParams, N as getCookie, O as markResponseFlushed, V as generateTraceId, W as getTraceId, Y as earlyHintsSenderAls, Z as requestContextAls, _ as RedirectSignal, a as logProxyError, c as logRequestReceived, d as logSwrRefetchFailed, f as logWaitUntilRejected, g as DenySignal, h as swallow, i as logMiddlewareShortCircuit, j as setMutableCookieContext, k as runWithRequestContext, l as logRouteError, m as setLogger, n as logCacheMiss, o as logRenderError, p as logWaitUntilUnsupported, q as setSpanAttribute, r as logMiddlewareError, s as logRequestCompleted, t as getLogger, u as logSlowRequest, v as RenderError, w as getHeader } from "../_chunks/logger-AWfuX-KJ.js";
-import { i as coerce, t as executeAction } from "../_chunks/actions-O_LsyCE4.js";
-import { a as getManifestEntry, b as wasInvalidatedSince, c as lookupPrebuiltPayload, d as checkVersionSkew, i as storeOverlayEntry, l as setPrebuiltPayloadSource, n as lookupOverlay, o as hasPrebuiltPayloadSource, r as overlayKey, s as isParamIndependent, u as applyReloadHeaders, v as currentInvalidationEpoch, x as createSingleflight, y as lastInvalidationEpochFor } from "../_chunks/cache-api-B-lhk9p4.js";
-import "../client/error-boundary.js";
+import { a as canonicalize, c as getMetadataRouteAutoLink, l as getMetadataRouteServePath, o as METADATA_ROUTE_CONVENTIONS, s as classifyMetadataRoute, t as computeSegmentTreePaths } from "../_chunks/segment-keys-BawYuNFO.js";
+import { n as classifyUrlSegment, r as effectiveUrlSegment } from "../_chunks/segment-classify-C539Pa2O.js";
+import { $ as timingAls, A as setMatchedSegmentPath, C as applyRequestHeaderOverlay, D as getSegmentParams, E as getSearchParams, F as getSetCookieHeaders, G as replaceTraceId, H as getOtelTraceId, I as getWaitUntil, J as withSpan, K as runWithTraceId, L as isDebug, M as setSegmentParams, N as getCookie, O as markResponseFlushed, V as generateTraceId, W as getTraceId, Y as earlyHintsSenderAls, Z as requestContextAls, _ as RedirectSignal, a as logProxyError, c as logRequestReceived, d as logSwrRefetchFailed, f as logWaitUntilRejected, g as DenySignal, h as swallow, i as logMiddlewareShortCircuit, j as setMutableCookieContext, k as runWithRequestContext, l as logRouteError, m as setLogger, n as logCacheMiss, o as logRenderError, p as logWaitUntilUnsupported, q as setSpanAttribute, r as logMiddlewareError, s as logRequestCompleted, t as getLogger, u as logSlowRequest, v as RenderError, w as getHeader } from "../_chunks/logger-N7e5auP0.js";
+import { i as isRscCacheKeyShape, n as RSC_KEY_PARAM, s as rscCacheKey, t as RSC_KEY_HEADERS } from "../_chunks/rsc-cache-key-DD0fl_-s.js";
+import { i as collectRouteModulepreloads, n as collectRouteCss, r as collectRouteFonts } from "../_chunks/build-manifest-DWppEdLB.js";
+import { i as coerce, t as executeAction } from "../_chunks/actions-C-Rw9vPc.js";
+import { a as getManifestEntry, b as wasInvalidatedSince, c as lookupPrebuiltPayload, d as checkVersionSkew, i as storeOverlayEntry, l as setPrebuiltPayloadSource, n as lookupOverlay, o as hasPrebuiltPayloadSource, r as overlayKey, s as isParamIndependent, u as applyReloadHeaders, v as currentInvalidationEpoch, x as createSingleflight, y as lastInvalidationEpochFor } from "../_chunks/cache-api-Cd0VZ_Pd.js";
+import "../_chunks/error-boundary-DpYRI_I1.js";
 import { n as toBracketKey } from "../_chunks/resolve-schema-Dz3fcFUo.js";
+import { t as normalizeParamValue } from "../_chunks/param-value-C8TNYchQ.js";
 import "../_chunks/segment-context-ZDnXDkbz.js";
+import { n as rscErrorEnvelope } from "../_chunks/rsc-error-envelope-tT5PJs4q.js";
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import React, { createElement, useContext } from "react";
@@ -209,38 +213,6 @@ function hasOnRequestError() {
 //#endregion
 //#region src/server/pipeline-helpers.ts
 /**
-* Only __proto__ needs stripping — it has a language-level setter that
-* changes the prototype chain of spread copies. constructor and prototype
-* are harmless own properties on null-prototype objects.
-*/
-var DANGEROUS_KEYS = /* @__PURE__ */ new Set(["__proto__"]);
-/**
-* Deep-walk a value returned by a segment param codec, producing a
-* sanitized copy where every plain object is null-prototype and
-* dangerous keys (__proto__, constructor, prototype) are stripped at
-* every depth.
-*
-* Non-plain objects (Date, Map, class instances, etc.) are returned
-* as-is — they cannot be poisoned by `{...x}` spread and may carry
-* author-intended prototype methods.
-*
-* Arrays are walked element-wise.
-*
-* Performance: URL params are bounded by URL length (~8 KB). Realistic
-* trees are <1 KB. The recursive walk is sub-microsecond.
-*
-* See TIM-655, TIM-855, TIM-873, design/13-security.md
-*/
-function sanitizeParamValue(value) {
-	if (value === null || typeof value !== "object") return value;
-	if (Array.isArray(value)) return value.map(sanitizeParamValue);
-	const proto = Object.getPrototypeOf(value);
-	if (proto !== Object.prototype && proto !== null) return value;
-	const out = Object.create(null);
-	for (const key of Object.keys(value)) if (!DANGEROUS_KEYS.has(key)) out[key] = sanitizeParamValue(value[key]);
-	return out;
-}
-/**
 * Build a proxy resolver closure from the declared source. Called exactly
 * once at `createPipeline` setup time, so the hot path sees only the branch
 * that corresponds to this pipeline's configured variant.
@@ -1163,165 +1135,6 @@ async function loadModule(loader) {
 		throw new ModuleLoadError(loader.filePath, error);
 	}
 }
-/** Reverse index: status code → legacy file name. Built once at module load. */
-var STATUS_TO_LEGACY_FILE = Object.fromEntries(Object.entries({
-	"not-found": 404,
-	"forbidden": 403,
-	"unauthorized": 401
-}).map(([name, status]) => [status, name]));
-/**
-* Look up `{statusStr}` then `{categoryKey}` (e.g. "4xx" / "5xx") in a
-* status-file group on a single segment. Shared by all three fallback
-* chains — the only structural difference between component 4xx,
-* component 5xx, and JSON resolution is *which* group is searched and
-* how the per-segment loop is layered around it.
-*/
-function lookupInGroup(group, statusStr, categoryKey, segmentIndex, status) {
-	if (!group) return null;
-	const exact = group[statusStr];
-	if (exact) return {
-		file: exact,
-		status,
-		kind: "exact",
-		segmentIndex
-	};
-	const category = group[categoryKey];
-	if (category) return {
-		file: category,
-		status,
-		kind: "category",
-		segmentIndex
-	};
-	return null;
-}
-/**
-* Look up the legacy convention file (`not-found.tsx` / `forbidden.tsx` /
-* `unauthorized.tsx`) for `status` on a single segment. Returns null if
-* `status` has no legacy mapping or the file isn't present.
-*/
-function lookupLegacy(group, status, segmentIndex) {
-	if (!group) return null;
-	const name = STATUS_TO_LEGACY_FILE[status];
-	if (!name) return null;
-	const file = group[name];
-	return file ? {
-		file,
-		status,
-		kind: "legacy",
-		segmentIndex
-	} : null;
-}
-/**
-* Resolve the status-code file to render for a given HTTP status code.
-*
-* Walks the segment chain from leaf to root following the fallback chain
-* defined in design/10-error-handling.md. Returns null if no file is found
-* (caller should render the framework default).
-*
-* @param status - The HTTP status code (4xx or 5xx).
-* @param segments - The matched segment chain from root (index 0) to leaf (last).
-* @param format - The response format family ('component' or 'json'). Defaults to 'component'.
-*/
-function resolveStatusFile(status, segments, format = "component") {
-	if (status < 400 || status > 599) return null;
-	if (format === "json") return resolveJson(status, segments);
-	if (status <= 499) return resolve4xx(status, segments);
-	return resolve5xx(status, segments);
-}
-/**
-* 4xx component fallback chain — three separate full passes leaf→root.
-*
-* The passes must be separate (not interleaved per-segment) so that a
-* root-level `404.tsx` beats a leaf-level `error.tsx`. The 5xx chain
-* inverts this and is per-segment: a leaf's `error.tsx` beats a root's
-* `5xx.tsx`. This asymmetry is the only reason these two functions exist
-* separately.
-*
-*   Pass 1 — {status}.tsx → 4xx.tsx           (statusFiles)
-*   Pass 2 — not-found / forbidden / unauthorized (legacyStatusFiles)
-*   Pass 3 — error.tsx                         (error)
-*/
-function resolve4xx(status, segments) {
-	const statusStr = String(status);
-	for (let i = segments.length - 1; i >= 0; i--) {
-		const r = lookupInGroup(segments[i].statusFiles, statusStr, "4xx", i, status);
-		if (r) return r;
-	}
-	for (let i = segments.length - 1; i >= 0; i--) {
-		const r = lookupLegacy(segments[i].legacyStatusFiles, status, i);
-		if (r) return r;
-	}
-	for (let i = segments.length - 1; i >= 0; i--) {
-		const errorFile = segments[i].error;
-		if (errorFile) return {
-			file: errorFile,
-			status,
-			kind: "error",
-			segmentIndex: i
-		};
-	}
-	return null;
-}
-/**
-* 5xx component fallback chain — single pass, per-segment leaf→root.
-*
-* At each segment: {status}.tsx → 5xx.tsx → error.tsx. A leaf's
-* `error.tsx` therefore beats a root's `5xx.tsx`, which is the
-* intentional inverse of the 4xx chain.
-*/
-function resolve5xx(status, segments) {
-	const statusStr = String(status);
-	for (let i = segments.length - 1; i >= 0; i--) {
-		const segment = segments[i];
-		const r = lookupInGroup(segment.statusFiles, statusStr, "5xx", i, status);
-		if (r) return r;
-		if (segment.error) return {
-			file: segment.error,
-			status,
-			kind: "error",
-			segmentIndex: i
-		};
-	}
-	return null;
-}
-/**
-* JSON fallback chain (for both 4xx and 5xx) — single pass leaf→root.
-*
-* At each segment: {status}.json → {category}.json. No legacy compat,
-* no error.tsx — the JSON chain terminates at the category catch-all
-* and the caller falls back to a bare-JSON framework default.
-*/
-function resolveJson(status, segments) {
-	const statusStr = String(status);
-	const categoryKey = status >= 500 ? "5xx" : "4xx";
-	for (let i = segments.length - 1; i >= 0; i--) {
-		const r = lookupInGroup(segments[i].jsonStatusFiles, statusStr, categoryKey, i, status);
-		if (r) return r;
-	}
-	return null;
-}
-/**
-* Resolve the denial file for a parallel route slot.
-*
-* Slot denial is graceful degradation — no HTTP status on the wire.
-* Fallback chain: denied.tsx → default.tsx → null.
-*
-* @param slotNode - The segment node for the slot (segmentType === 'slot').
-*/
-function resolveSlotDenied(slotNode) {
-	const slotName = slotNode.segmentName.replace(/^@/, "");
-	if (slotNode.denied) return {
-		file: slotNode.denied,
-		slotName,
-		kind: "denied"
-	};
-	if (slotNode.default) return {
-		file: slotNode.default,
-		slotName,
-		kind: "default"
-	};
-	return null;
-}
 //#endregion
 //#region src/server/deny-boundary.ts
 /**
@@ -1371,7 +1184,7 @@ function renderMatchingDenyPage(chain, status, data) {
 * Build the element for a matched deny chain entry with the props contract
 * the file's convention documents:
 *
-* - Status-code and legacy files: { status, dangerouslyPassData }
+* - Status-code files: { status, dangerouslyPassData }
 * - error.tsx (TSX): { error, digest, reset } via ErrorReconstituter, plus
 *   { status, dangerouslyPassData } for dual-shape implementations. Without
 *   the Error prop, any error.tsx written per the docs (reading
@@ -1925,20 +1738,23 @@ async function coerceSegmentParams(match) {
 	for (const key of Object.keys(match.segmentParams)) if (key !== "__proto__") mergeTarget[key] = match.segmentParams[key];
 	match.segmentParams = mergeTarget;
 	if (globalCodecs) {
-		for (const segment of match.segments) {
+		for (const node of match.segments) {
+			const segment = effectiveUrlSegment(node);
 			if (!segment.paramName) continue;
 			const bracketKey = toBracketKey(segment.segmentType, segment.paramName);
 			const codec = globalCodecs[bracketKey];
 			if (!codec) continue;
 			const key = segment.paramName;
 			if (!(key in mergeTarget)) continue;
+			let parsed;
 			try {
-				mergeTarget[key] = sanitizeParamValue(codec.parse(mergeTarget[key]));
+				parsed = codec.parse(mergeTarget[key]);
 			} catch (err) {
 				const message = err instanceof Error ? err.message : String(err);
 				if (isDebug()) console.warn(`[timber] Global schema codec rejected value for param "${key}"\n  Error: ${message}\n  Raw value: ${JSON.stringify(mergeTarget[key])}\n  Hint: check the codec in app/schema.ts for key '${bracketKey}'.`);
 				throw new ParamCoercionError(message);
 			}
+			mergeTarget[key] = normalizeParamValue(parsed, key);
 		}
 		return;
 	}
@@ -1954,9 +1770,9 @@ async function coerceSegmentParams(match) {
 		}
 		const segmentParamsDef = mod.segmentParams;
 		if (!segmentParamsDef || typeof segmentParamsDef.parse !== "function") continue;
+		let coerced;
 		try {
-			const coerced = segmentParamsDef.parse(match.segmentParams);
-			for (const key of Object.keys(coerced)) if (key !== "__proto__") mergeTarget[key] = sanitizeParamValue(coerced[key]);
+			coerced = segmentParamsDef.parse(match.segmentParams);
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			if (isDebug()) {
@@ -1965,7 +1781,127 @@ async function coerceSegmentParams(match) {
 			}
 			throw new ParamCoercionError(message);
 		}
+		for (const key of Object.keys(coerced)) {
+			if (key === "__proto__") continue;
+			mergeTarget[key] = normalizeParamValue(coerced[key], key);
+		}
+	}
+}
+//#endregion
+//#region src/server/pipeline-interception.ts
+/**
+* Interception route matching for the request pipeline.
+*
+* Matches target URLs against interception rewrites to support the
+* modal route pattern (soft navigation intercepts).
+*
+* Extracted from pipeline.ts to keep files under 500 lines.
+*
+* See design/07-routing.md §"Intercepting Routes"
+*/
+/**
+* Check if an intercepting route applies for this soft navigation.
+*
+* Two conditions must hold:
+*
+* 1. The **target** pathname matches the rewrite's intercepted pattern.
+* 2. The **source** route — the page the user is navigating FROM, per the
+*    validated X-Timber-URL header — renders the segment that owns the slot
+*    holding the intercepting page (`interceptingScope`). Only then does that
+*    slot exist in the rendered tree, so only then can the intercepting page
+*    render.
+*
+* Condition 2 replaced a URL-prefix check (TIM-1279). A prefix cannot
+* distinguish a route-group-scoped interception from a genuinely root-level
+* one — route groups are invisible in `urlPath`, so both collapse to "/" and
+* the guard degenerates to always-true. Tree paths carry group identity.
+* The scope check also subsumes the old segment-boundary rule: a source route
+* under /feed-private has no "/feed" in its chain.
+*
+* A third condition lives with the caller, which owns route matching, and it
+* applies to the `'slot'` shape only: the route produced by re-matching
+* `interceptingPrefix` must pass through the scope too. Conditions 1–2 are
+* about the route the user is leaving; the slot has to exist in the tree that
+* actually renders. The `'children'` shape resolves its owner from the scope
+* directly rather than from a pathname, so it satisfies that by construction.
+*
+* `resolveSourceScopes` is a thunk so its inputs are only resolved when some
+* rewrite's pattern actually matches the target — the common case is no match
+* at all. It returns the two client-supplied answers to "what is on screen?"
+* as **separate sets, most authoritative first**: the tree paths the client
+* says it has mounted, then those of the route the departing URL matches. It
+* returns null only when neither yields anything, which is not a soft
+* navigation this can reason about.
+*
+* They are two sets rather than one union because ranking needs a chain
+* (TIM-1318). Each channel describes a single rendered chain, so within one the
+* scopes are strictly nested and the deepest is the innermost owner. Unioned
+* they are not: once a modal is open the address bar holds the *intercepted*
+* URL, so the second channel describes the canonical branch — possibly an
+* exclusive route group the client never mounted — and a deeper scope from
+* there would outrank the owner actually on screen. Trying the mounted channel
+* to exhaustion first keeps the fallback the union was there to provide while
+* ranking only within one chain.
+*
+* Returns the winning build-time rewrite, or null. Only build-time values ever
+* reach the renderer: the client-supplied header selects a rewrite but never
+* becomes a rendered route or pathname.
+*
+* The **first** matching rewrite wins, and the caller does not fall back to the
+* next one when the winner fails to resolve. That is deliberate and pre-dates
+* the two shapes: a rewrite that matched the target and the scope described the
+* author's intent, and quietly rendering some other author's interception
+* instead would be harder to explain than rendering the canonical route.
+*
+* "First" is meaningful because the list arrives **deepest scope first** —
+* `collectInterceptionRewrites` sorts it at build time, so the deepest owner a
+* single chain passes through wins and nothing here has to score (TIM-1318).
+* Tree-walk order used to decide it, which meant renaming a route group flipped
+* which modal opened. The precondition is a property of the manifest this reads
+* rather than something it can re-derive, so it is asserted at its source:
+* `tests/interception.test.ts` §"rewrite order is decided by scope depth".
+*/
+function findInterceptionMatch(targetPathname, resolveSourceScopes, rewrites) {
+	const candidates = rewrites.filter((rewrite) => pathnameMatchesPattern(targetPathname, rewrite.interceptedPattern));
+	if (candidates.length === 0) return null;
+	const scopes = resolveSourceScopes();
+	if (!scopes) return null;
+	for (const scope of scopes) for (const rewrite of candidates) if (scope.has(rewrite.interceptingScope)) return rewrite;
+	return null;
+}
+/**
+* Check if a pathname matches a URL pattern with dynamic segments.
+*
+* Supports [param] (single segment) and [...param] (one or more segments).
+* Static segments must match exactly.
+*/
+function pathnameMatchesPattern(pathname, pattern) {
+	const pathParts = pathname === "/" ? [] : pathname.slice(1).split("/");
+	const patternParts = pattern === "/" ? [] : pattern.slice(1).split("/");
+	let pi = 0;
+	for (let i = 0; i < patternParts.length; i++) {
+		const seg = classifyUrlSegment(patternParts[i]);
+		switch (seg.kind) {
+			case "catch-all": return pi < pathParts.length;
+			case "optional-catch-all": return true;
+			case "dynamic": {
+				if (pi >= pathParts.length) return false;
+				const prefix = seg.prefix ?? "";
+				const suffix = seg.suffix ?? "";
+				const pathPart = pathParts[pi];
+				if (prefix || suffix) {
+					if (pathPart.length <= prefix.length + suffix.length || prefix && !pathPart.startsWith(prefix) || suffix && !pathPart.endsWith(suffix)) return false;
+				}
+				pi++;
+				continue;
+			}
+			case "static":
+				if (pi >= pathParts.length || pathParts[pi] !== seg.value) return false;
+				pi++;
+				continue;
+		}
 	}
+	return pi === pathParts.length;
 }
 //#endregion
 //#region src/client/segment-update-context.ts
@@ -2024,6 +1960,51 @@ getOrCreateContext();
 * See design/13-security.md §"State tree manipulation".
 */
 //#endregion
+//#region src/server/state-tree-diff.ts
+/**
+* State Tree Diffing — Server-side parsing and diffing of X-Timber-State-Tree.
+*
+* The client sends X-Timber-State-Tree on navigation requests, listing
+* the sync segments it has cached. The server diffs this against the
+* target route's segments to skip re-rendering unchanged sync layouts.
+*
+* This is a performance optimization only — NOT a security boundary.
+* All access.ts files run regardless of the state tree content.
+* A fabricated state tree can only cause extra rendering work or stale
+* layouts — never auth bypass.
+*
+* See design/19-client-navigation.md §"X-Timber-State-Tree Header"
+* See design/13-security.md §"State tree manipulation"
+*/
+/**
+* Parse the X-Timber-State-Tree header from a request.
+*
+* Returns a Set of segment paths the client has cached (with an
+* additional `slots` property for cached slot paths), or null if
+* the header is missing, malformed, or empty. Parsing happens before
+* renderToReadableStream — not inside the React render pass.
+*
+* @returns ClientStateTree with segments and slots, or null if no valid state tree
+*/
+function parseClientStateTree(req) {
+	const header = req.headers.get("X-Timber-State-Tree");
+	if (!header) return null;
+	try {
+		const parsed = JSON.parse(header);
+		const hasSegments = Array.isArray(parsed.segments) && parsed.segments.length > 0;
+		const hasSlots = Array.isArray(parsed.slots) && parsed.slots.length > 0;
+		const hasTreePaths = Array.isArray(parsed.treePaths) && parsed.treePaths.length > 0;
+		if (!hasSegments && !hasSlots && !hasTreePaths) return null;
+		const result = new Set(hasSegments ? parsed.segments : []);
+		result.slots = hasSlots ? new Set(parsed.slots) : null;
+		result.treePaths = hasTreePaths ? new Set(parsed.treePaths) : null;
+		return result;
+	} catch (err) {
+		swallow(err, "malformed X-Timber-State-Tree header");
+		return null;
+	}
+}
+//#endregion
 //#region src/server/route-element-builder.ts
 /**
 * Thrown when a defineSegmentParams codec's parse() fails.
@@ -2101,78 +2082,6 @@ function escapeXml(str) {
 	return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 }
 //#endregion
-//#region src/server/pipeline-interception.ts
-/**
-* Interception route matching for the request pipeline.
-*
-* Matches target URLs against interception rewrites to support the
-* modal route pattern (soft navigation intercepts).
-*
-* Extracted from pipeline.ts to keep files under 500 lines.
-*
-* See design/07-routing.md §"Intercepting Routes"
-*/
-/**
-* Check if a pathname starts with a prefix on a segment boundary.
-*
-* Prevents /feed from matching /feed-private — the prefix must be
-* followed by '/' or be an exact match.
-*/
-function hasSegmentPrefix(pathname, prefix) {
-	if (prefix === "/") return true;
-	if (!pathname.startsWith(prefix)) return false;
-	return pathname.length === prefix.length || pathname[prefix.length] === "/";
-}
-/**
-* Check if an intercepting route applies for this soft navigation.
-*
-* Matches the target pathname against interception rewrites, constrained
-* by the source URL (X-Timber-URL header — where the user navigates FROM).
-*
-* Returns the source pathname to re-match if interception applies, or null.
-*/
-function findInterceptionMatch(targetPathname, sourceUrl, rewrites) {
-	for (const rewrite of rewrites) {
-		if (!hasSegmentPrefix(sourceUrl, rewrite.interceptingPrefix)) continue;
-		if (pathnameMatchesPattern(targetPathname, rewrite.interceptedPattern)) return { sourcePathname: rewrite.interceptingPrefix };
-	}
-	return null;
-}
-/**
-* Check if a pathname matches a URL pattern with dynamic segments.
-*
-* Supports [param] (single segment) and [...param] (one or more segments).
-* Static segments must match exactly.
-*/
-function pathnameMatchesPattern(pathname, pattern) {
-	const pathParts = pathname === "/" ? [] : pathname.slice(1).split("/");
-	const patternParts = pattern === "/" ? [] : pattern.slice(1).split("/");
-	let pi = 0;
-	for (let i = 0; i < patternParts.length; i++) {
-		const seg = classifyUrlSegment(patternParts[i]);
-		switch (seg.kind) {
-			case "catch-all": return pi < pathParts.length;
-			case "optional-catch-all": return true;
-			case "dynamic": {
-				if (pi >= pathParts.length) return false;
-				const prefix = seg.prefix ?? "";
-				const suffix = seg.suffix ?? "";
-				const pathPart = pathParts[pi];
-				if (prefix || suffix) {
-					if (pathPart.length <= prefix.length + suffix.length || prefix && !pathPart.startsWith(prefix) || suffix && !pathPart.endsWith(suffix)) return false;
-				}
-				pi++;
-				continue;
-			}
-			case "static":
-				if (pi >= pathParts.length || pathParts[pi] !== seg.value) return false;
-				pi++;
-				continue;
-		}
-	}
-	return pi === pathParts.length;
-}
-//#endregion
 //#region src/server/pipeline-outcome.ts
 /**
 * Pipeline outcome translator — converts a `PhaseOutcome` (the value
@@ -2187,16 +2096,7 @@ function pathnameMatchesPattern(pathname, pattern) {
 */
 function rscErrorResponse(isRsc, status, headers) {
 	if (!isRsc) return new Response(null, { status });
-	const h = headers ?? new Headers();
-	h.set("X-Timber-Error", "1");
-	h.set("content-type", "application/json; charset=utf-8");
-	return new Response(JSON.stringify({
-		error: true,
-		status
-	}), {
-		status,
-		headers: h
-	});
+	return rscErrorEnvelope(status, headers);
 }
 /**
 * Terminal outcome handler — converts a `PhaseOutcome` into a final
@@ -2243,7 +2143,7 @@ async function outcomeToResponse(config, outcome, ctx) {
 				await fireOnRequestError(denyRenderError, ctx.req, "render");
 				if (config.onPipelineError && denyRenderError instanceof Error) config.onPipelineError(denyRenderError, "render");
 			}
-			if (isDebug()) console.warn(`[timber] DenySignal(${outcome.signal.status}) from ${outcome.phase} phase — no renderDenyFallback configured, returning bare ${outcome.signal.status} response\n  Request: ${ctx.method} ${ctx.path}\n  Add a not-found.tsx or error.tsx to render a custom deny page.`);
+			if (isDebug()) console.warn(`[timber] DenySignal(${outcome.signal.status}) from ${outcome.phase} phase — no renderDenyFallback configured, returning bare ${outcome.signal.status} response\n  Request: ${ctx.method} ${ctx.path}\n  Add a status-code file (e.g. 404.tsx) or error.tsx to render a custom deny page.`);
 			return new Response(null, {
 				status: outcome.signal.status,
 				headers
@@ -2493,15 +2393,6 @@ async function handleRequest(config, req, method, path, pathIsCanonical) {
 			}
 			const handlerResult = await mod.default();
 			if (handlerResult instanceof Response) {
-				if (method === "HEAD") {
-					const headHeaders = new Headers(handlerResult.headers);
-					if (handlerResult.ok && !headHeaders.has("Cache-Control")) headHeaders.set("Cache-Control", "public, max-age=14400, must-revalidate");
-					return new Response(null, {
-						status: handlerResult.status,
-						statusText: handlerResult.statusText,
-						headers: headHeaders
-					});
-				}
 				const res = cloneWithMutableHeaders(handlerResult);
 				if (res.ok && !res.headers.has("Cache-Control")) res.headers.set("Cache-Control", "public, max-age=14400, must-revalidate");
 				return res;
@@ -2563,10 +2454,19 @@ async function handleRequest(config, req, method, path, pathIsCanonical) {
 		const rawSourceUrl = req.headers.get("X-Timber-URL");
 		const validatedSourceUrl = rawSourceUrl ? validateInterceptionHeader(rawSourceUrl, stripTrailingSlash) : null;
 		if (validatedSourceUrl) {
-			const intercepted = findInterceptionMatch(canonicalPathname, validatedSourceUrl, config.interceptionRewrites);
-			if (intercepted) {
-				const sourceMatch = config.matchRoute(intercepted.sourcePathname);
-				if (sourceMatch) {
+			const resolveSourceScopes = () => {
+				const mounted = new Set(parseClientStateTree(req)?.treePaths ?? []);
+				const sourceRoute = config.matchRoute(validatedSourceUrl);
+				const scopes = [mounted, new Set(sourceRoute ? computeSegmentTreePaths(sourceRoute.segments) : [])].filter((scope) => scope.size > 0);
+				return scopes.length > 0 ? scopes : null;
+			};
+			const rewrite = findInterceptionMatch(canonicalPathname, resolveSourceScopes, config.interceptionRewrites);
+			if (rewrite?.mode === "children") {
+				const interceptedMatch = config.matchInterceptedRoute?.(canonicalPathname, rewrite.interceptingScope);
+				if (interceptedMatch) match = interceptedMatch;
+			} else if (rewrite) {
+				const sourceMatch = config.matchRoute(rewrite.interceptingPrefix);
+				if (sourceMatch !== null && computeSegmentTreePaths(sourceMatch.segments).includes(rewrite.interceptingScope)) {
 					match = sourceMatch;
 					interception = { targetPathname: canonicalPathname };
 				}
@@ -2625,6 +2525,194 @@ async function handleRequest(config, req, method, path, pathIsCanonical) {
 	});
 }
 //#endregion
+//#region src/server/rsc-cache-key-guard.ts
+/**
+* Origin-side binding of the `_rsc` cache key to the request that produced
+* the response (TIM-1268).
+*
+* The key is deterministic, and deliberately so — that is what makes RSC
+* payloads cacheable. But deterministic also means *predictable*: anyone can
+* compute the key another client will request. Without this guard, a caller
+* could request `/about?_rsc=<victim's key>` while sending its own
+* `X-Timber-State-Tree`, and a shared cache that keys by URL — the exact
+* environment this feature targets — would store that variant under the
+* victim's key. Every subsequent legitimate navigation would then be served
+* a payload rendered for someone else's segment tree or deployment.
+*
+* The guard is a *storability* rule, not a rejection: if the claimed key
+* does not match the key derived from the received headers, the response
+* loses its shared-cache directives. Mismatched requests are still served
+* normally, they just cannot be stored for anyone else.
+*
+* Why not Next.js's 307 self-correction: a redirect is cacheable in its own
+* right, costs a round trip on every legitimate miss, and would make the
+* server's behaviour depend on a parameter it otherwise never reads. This
+* rule closes the same hole by making the poisoned entry unstorable at the
+* source, in the response the developer already has to opt into sharing.
+*
+* See design/19-client-navigation.md §"The `_rsc` cache key".
+*/
+/**
+* Legacy shared-cache control fields that predate RFC 9213 and so do not
+* follow the `<target>-Cache-Control` naming pattern — the one part of this
+* rule that cannot be matched by shape. `X-Accel-Expires` is nginx
+* `proxy_cache`, which gives it precedence over `Cache-Control`.
+*
+* A closed historical set, unlike the vendor `*-Cache-Control` names, which
+* keep being minted and are handled by pattern below.
+*/
+var LEGACY_CDN_CACHE_HEADERS = [
+	"Surrogate-Control",
+	"Edge-Control",
+	"X-Accel-Expires"
+];
+/**
+* Whether a response header overrides `Cache-Control` at a shared cache.
+*
+* Matched by *shape*, not by vendor name. RFC 9213 defines targeted fields
+* as `<target>-Cache-Control`, and every CDN spells its own: `CDN-`,
+* `Cloudflare-CDN-`, `Netlify-CDN-`, `Vercel-CDN-`, and whichever ships
+* next. A vendor list here is a denylist with an unbounded tail — it was
+* extended twice during review, each time by one name, which is the signal
+* that enumeration is the wrong shape. The suffix rule is total.
+*
+* `Cache-Control` itself does not match (no `-` prefix) and is replaced
+* separately.
+*/
+function isSharedCacheOverride(name) {
+	const lowered = name.toLowerCase();
+	return lowered.endsWith("-cache-control") || LEGACY_CDN_CACHE_HEADERS.some((legacy) => legacy.toLowerCase() === lowered);
+}
+/**
+* Whether the request's `_rsc` parameter matches the key derived from its
+* own headers.
+*
+* Requests without the parameter are not claiming a key at all, so they are
+* left alone — the bare document URL is the developer's declared territory
+* (see design/32-response-caching.md, TIM-1264). Neither is a parameter
+* whose value could not be one of our digests: `_rsc` is not reserved, and
+* an application that already uses it for its own search state
+* (`/search?_rsc=foo`) must not have its cache policy silently revoked by a
+* guard that mistook that for a forgery.
+*/
+async function hasValidRscCacheKey(req) {
+	if (!req.url.includes("?")) return true;
+	let values;
+	try {
+		values = new URL(req.url).searchParams.getAll(RSC_KEY_PARAM);
+	} catch {
+		return false;
+	}
+	const claims = values.filter(isRscCacheKeyShape);
+	if (claims.length === 0) return true;
+	const expected = await rscCacheKey((name) => req.headers.get(name));
+	if (expected === null) return false;
+	return claims.every((claim) => claim === expected);
+}
+/**
+* Media type of a Flight payload. Also spelled in `rsc-entry/helpers.ts`,
+* `deny-renderer.ts`, `action-handler.ts`, and `client/rsc-fetch.ts` — that
+* duplication predates this module and is tracked separately.
+*/
+var RSC_MEDIA_TYPE = "text/x-component";
+/**
+* Ensure a Flight payload can never be interpreted as a document.
+*
+* Applied here, at the pipeline's single exit, rather than where each
+* payload response is built. Six places build one — the success path, three
+* in `deny-renderer.ts`, the action paths — and hardening them one at a time
+* is how you end up hardening five of six. The response is Flight if it says
+* it is; that is the only test that covers every producer, including ones
+* added later.
+*
+* Matters because the payload URL is observable and, on a shared-cache hit,
+* the origin is never consulted — so a top-level navigation can be handed
+* these bytes with no request-time check available. See design/13-security.md
+* #36c.
+*/
+function hardenRscPayloadResponse(response) {
+	const contentType = response.headers.get("content-type");
+	if (!contentType) return;
+	if (contentType.split(";")[0].trim().toLowerCase() !== RSC_MEDIA_TYPE) return;
+	response.headers.set("X-Content-Type-Options", "nosniff");
+}
+/**
+* Make a response unstorable by any shared cache when its request claimed an
+* `_rsc` key that does not match its own headers.
+*
+* The end state is unconditional and therefore statable: **a mismatched
+* response is never stored by any cache.** Every targeted cache-control
+* field is removed and `Cache-Control` is replaced outright, rather than
+* downgrading only when a shared directive is spotted. Conditional variants
+* of this were tried and were wrong twice over — they missed the CDN-
+* specific headers, and leaving `Cache-Control` alone when it looked
+* harmless lets a CDN apply heuristic caching to a response that has none.
+*
+* The cost is that a mismatched request loses developer-chosen *browser*
+* caching too. That is a request no timber client ever makes.
+*
+* Purge tags (`Surrogate-Key`, `Cache-Tag`) are deliberately left alone:
+* they address stored entries, and this response is not stored.
+*
+* Mutates `response.headers` in place; the pipeline guarantees mutable
+* headers at this point (see TIM-866).
+*/
+async function enforceRscCacheKey(req, response) {
+	if (await hasValidRscCacheKey(req)) return;
+	const overrides = [];
+	for (const name of response.headers.keys()) if (isSharedCacheOverride(name)) overrides.push(name);
+	for (const name of overrides) response.headers.delete(name);
+	response.headers.set("Cache-Control", "private, no-store");
+}
+//#endregion
+//#region src/server/head-response.ts
+/**
+* HEAD body stripping — RFC 9110 §9.3.2.
+*
+* "The HEAD method is identical to GET except that the server MUST NOT send
+* content in the response." The headers, however, must be the ones the
+* corresponding GET would have produced — which is why timber renders the
+* route in full and discards the body here rather than short-circuiting the
+* render. Content-Type, Content-Length, Set-Cookie, cache directives and
+* everything else ride through untouched.
+*
+* Node's `ServerResponse` happens to discard writes for HEAD, so the wire is
+* usually correct even without this. That is a property of one adapter, not of
+* the `Response` object: static generation, the Cloudflare and Nitro adapters,
+* tests, and anything calling the pipeline handler as a function all observe
+* the `Response` directly and saw the full body before TIM-1324.
+*
+* The pipeline applies this at its single exit so every response shape is
+* covered — page render, API route, metadata route, deny page, error page,
+* proxy short-circuit. The two unit-level producers that are also reachable as
+* standalone functions (`handleRouteRequest`, `handleApiRoute`) call it too, so
+* each honours HEAD on its own; they share this implementation rather than
+* repeating it, and applying it twice is a no-op.
+*/
+/**
+* Return a bodyless copy of `response` when `method` is HEAD.
+*
+* A no-op for every other method and for responses that already carry no body
+* (204, 304, redirects), so callers do not need to pre-check either.
+*
+* The discarded stream is cancelled: an SSR render that reached this point has
+* a live producer attached, and dropping the reference without cancelling
+* leaks it for the lifetime of the render (design/13-security.md A4).
+*/
+function stripHeadBody(response, method) {
+	if (method.toUpperCase() !== "HEAD") return response;
+	const body = response.body;
+	if (body === null) return response;
+	try {
+		body.cancel().catch(() => {});
+	} catch {}
+	return new Response(null, {
+		status: response.status,
+		statusText: response.statusText,
+		headers: response.headers
+	});
+}
+//#endregion
 //#region src/server/pipeline.ts
 /**
 * Create the request handler from a pipeline configuration.
@@ -2688,12 +2776,14 @@ function createPipeline(config) {
 						});
 						else result = await innerHandler();
 						await setSpanAttribute("http.response.status_code", result.status);
-						const varyTokens = ["Accept"];
-						if (config.interceptionRewrites?.length) varyTokens.push("X-Timber-URL");
+						const varyTokens = [...RSC_KEY_HEADERS];
 						const existingVary = result.headers.get("Vary");
 						const existingTokens = existingVary ? existingVary.toLowerCase().split(",").map((t) => t.trim()) : [];
 						const newTokens = varyTokens.filter((t) => !existingTokens.includes(t.toLowerCase()));
 						if (newTokens.length > 0) result.headers.set("Vary", existingVary ? `${existingVary}, ${newTokens.join(", ")}` : newTokens.join(", "));
+						await enforceRscCacheKey(canonicalReq, result);
+						hardenRscPayloadResponse(result);
+						result = stripHeadBody(result, method);
 						if (serverTiming === "detailed") {
 							const timingHeader = getServerTimingHeader();
 							if (timingHeader) result.headers.set("Server-Timing", timingHeader);
@@ -2735,68 +2825,6 @@ function createPipeline(config) {
 	return pipelineFn;
 }
 //#endregion
-//#region src/server/build-manifest.ts
-/**
-* Collect all CSS files needed for a matched route's segment chain.
-*
-* Walks segments root → leaf, collecting CSS for each layout and page.
-* Deduplicates while preserving order (root layout CSS first).
-*/
-function collectRouteCss(segments, manifest) {
-	const seen = /* @__PURE__ */ new Set();
-	const result = [];
-	for (const segment of segments) for (const file of [segment.layout, segment.page]) {
-		if (!file) continue;
-		const cssFiles = manifest.css[file.filePath];
-		if (!cssFiles) continue;
-		for (const url of cssFiles) if (!seen.has(url)) {
-			seen.add(url);
-			result.push(url);
-		}
-	}
-	return result;
-}
-/**
-* Collect all font entries needed for a matched route's segment chain.
-*
-* Walks segments root → leaf, collecting fonts for each layout and page.
-* Deduplicates by href while preserving order.
-*/
-function collectRouteFonts(segments, manifest) {
-	const seen = /* @__PURE__ */ new Set();
-	const result = [];
-	for (const segment of segments) for (const file of [segment.layout, segment.page]) {
-		if (!file) continue;
-		const fonts = manifest.fonts[file.filePath];
-		if (!fonts) continue;
-		for (const entry of fonts) if (!seen.has(entry.href)) {
-			seen.add(entry.href);
-			result.push(entry);
-		}
-	}
-	return result;
-}
-/**
-* Collect modulepreload URLs for a matched route's segment chain.
-*
-* Walks segments root → leaf, collecting transitive JS dependencies
-* for each layout and page. Deduplicates across segments.
-*/
-function collectRouteModulepreloads(segments, manifest) {
-	const seen = /* @__PURE__ */ new Set();
-	const result = [];
-	for (const segment of segments) for (const file of [segment.layout, segment.page]) {
-		if (!file) continue;
-		const preloads = manifest.modulepreload[file.filePath];
-		if (!preloads) continue;
-		for (const url of preloads) if (!seen.has(url)) {
-			seen.add(url);
-			result.push(url);
-		}
-	}
-	return result;
-}
-//#endregion
 //#region src/server/early-hints.ts
 /**
 * 103 Early Hints utilities.
@@ -3122,6 +3150,139 @@ async function wrapWithErrorBoundaries(segment, element, loadModule, createEleme
 	return element;
 }
 //#endregion
+//#region src/server/status-code-resolver.ts
+/**
+* Look up `{statusStr}` then `{categoryKey}` (e.g. "4xx" / "5xx") in a
+* status-file group on a single segment. Shared by all three fallback
+* chains — the only structural difference between component 4xx,
+* component 5xx, and JSON resolution is *which* group is searched and
+* how the per-segment loop is layered around it.
+*/
+function lookupInGroup(group, statusStr, categoryKey, segmentIndex, status) {
+	if (!group) return null;
+	const exact = group[statusStr];
+	if (exact) return {
+		file: exact,
+		status,
+		kind: "exact",
+		segmentIndex
+	};
+	const category = group[categoryKey];
+	if (category) return {
+		file: category,
+		status,
+		kind: "category",
+		segmentIndex
+	};
+	return null;
+}
+/**
+* Resolve the status-code file to render for a given HTTP status code.
+*
+* Walks the segment chain from leaf to root following the fallback chain
+* defined in design/10-error-handling.md. Returns null if no file is found
+* (caller should render the framework default).
+*
+* @param status - The HTTP status code (4xx or 5xx).
+* @param segments - The matched segment chain from root (index 0) to leaf (last).
+* @param format - The response format family ('component' or 'json'). Defaults to 'component'.
+*/
+function resolveStatusFile(status, segments, format = "component") {
+	if (status < 400 || status > 599) return null;
+	if (format === "json") return resolveJson(status, segments);
+	if (status <= 499) return resolve4xx(status, segments);
+	return resolve5xx(status, segments);
+}
+/**
+* 4xx component fallback chain — two separate full passes leaf→root.
+*
+* The passes must be separate (not interleaved per-segment) so that a
+* root-level `404.tsx` beats a leaf-level `error.tsx`. The 5xx chain
+* inverts this and is per-segment: a leaf's `error.tsx` beats a root's
+* `5xx.tsx`. This asymmetry is the only reason these two functions exist
+* separately.
+*
+*   Pass 1 — {status}.tsx → 4xx.tsx           (statusFiles)
+*   Pass 2 — error.tsx                         (error)
+*/
+function resolve4xx(status, segments) {
+	const statusStr = String(status);
+	for (let i = segments.length - 1; i >= 0; i--) {
+		const r = lookupInGroup(segments[i].statusFiles, statusStr, "4xx", i, status);
+		if (r) return r;
+	}
+	for (let i = segments.length - 1; i >= 0; i--) {
+		const errorFile = segments[i].error;
+		if (errorFile) return {
+			file: errorFile,
+			status,
+			kind: "error",
+			segmentIndex: i
+		};
+	}
+	return null;
+}
+/**
+* 5xx component fallback chain — single pass, per-segment leaf→root.
+*
+* At each segment: {status}.tsx → 5xx.tsx → error.tsx. A leaf's
+* `error.tsx` therefore beats a root's `5xx.tsx`, which is the
+* intentional inverse of the 4xx chain.
+*/
+function resolve5xx(status, segments) {
+	const statusStr = String(status);
+	for (let i = segments.length - 1; i >= 0; i--) {
+		const segment = segments[i];
+		const r = lookupInGroup(segment.statusFiles, statusStr, "5xx", i, status);
+		if (r) return r;
+		if (segment.error) return {
+			file: segment.error,
+			status,
+			kind: "error",
+			segmentIndex: i
+		};
+	}
+	return null;
+}
+/**
+* JSON fallback chain (for both 4xx and 5xx) — single pass leaf→root.
+*
+* At each segment: {status}.json → {category}.json. No legacy compat,
+* no error.tsx — the JSON chain terminates at the category catch-all
+* and the caller falls back to a bare-JSON framework default.
+*/
+function resolveJson(status, segments) {
+	const statusStr = String(status);
+	const categoryKey = status >= 500 ? "5xx" : "4xx";
+	for (let i = segments.length - 1; i >= 0; i--) {
+		const r = lookupInGroup(segments[i].jsonStatusFiles, statusStr, categoryKey, i, status);
+		if (r) return r;
+	}
+	return null;
+}
+/**
+* Resolve the denial file for a parallel route slot.
+*
+* Slot denial is graceful degradation — no HTTP status on the wire.
+* Fallback chain: denied.tsx → default.tsx → null.
+*
+* @param slotNode - The segment node for the slot (segmentType === 'slot').
+*/
+function resolveSlotDenied(slotNode) {
+	const slotName = slotNode.segmentName.replace(/^@/, "");
+	if (slotNode.denied) return {
+		file: slotNode.denied,
+		slotName,
+		kind: "denied"
+	};
+	if (slotNode.default) return {
+		file: slotNode.default,
+		slotName,
+		kind: "default"
+	};
+	return null;
+}
+//#endregion
 //#region src/server/csrf.ts
 /** HTTP methods that are considered safe (no mutation). */
 var SAFE_METHODS = /* @__PURE__ */ new Set([
@@ -3303,14 +3464,8 @@ async function handleRouteRequest(mod, ctx) {
 		});
 	}
 	if (method === "HEAD") {
-		if (mod.HEAD) return runHandler(mod.HEAD, ctx);
-		if (mod.GET) {
-			const res = await runHandler(mod.GET, ctx);
-			return new Response(null, {
-				status: res.status,
-				headers: res.headers
-			});
-		}
+		if (mod.HEAD) return stripHeadBody(await runHandler(mod.HEAD, ctx), method);
+		if (mod.GET) return stripHeadBody(await runHandler(mod.GET, ctx), method);
 	}
 	const handler = mod[method];
 	if (!handler) return new Response(null, {
@@ -3537,11 +3692,11 @@ var registry = /* @__PURE__ */ new Map();
 */
 function resolveKeyParams(store) {
 	const main = store.segmentParams ?? {};
-	const map = store.slotParamsMap;
-	if (!map || map.size === 0) return main;
+	const slots = store.slotParams;
+	if (!slots || Object.keys(slots).length === 0) return main;
 	const mainCanonical = tryCanonicalize({ ...main });
 	if (mainCanonical === null) return null;
-	for (const slotParams of map.values()) {
+	for (const slotParams of Object.values(slots)) {
 		const merged = tryCanonicalize({
 			...main,
 			...slotParams