vinext 0.0.50 → 0.0.51

package/dist/server/app-browser-stream.d.ts

@@ -1,4 +1,5 @@
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
+import { RscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
 import { ReactFormState } from "react-dom/client";
 
 //#region src/server/app-browser-stream.d.ts
@@ -7,13 +8,13 @@ type NavigationSnapshot = {
   searchParams: [string, string][];
 };
 type LegacyRscEmbedData = {
-  rsc: string[];
+  rsc: RscEmbeddedChunk[];
   params?: Record<string, string | string[]>;
   nav?: NavigationSnapshot;
 };
 type VinextBrowserGlobals = {
   __VINEXT_RSC__?: LegacyRscEmbedData;
-  __VINEXT_RSC_CHUNKS__?: string[];
+  __VINEXT_RSC_CHUNKS__?: RscEmbeddedChunk[];
   __VINEXT_RSC_DONE__?: boolean;
   [RSC_FORM_STATE_GLOBAL]?: ReactFormState;
   __VINEXT_RSC_PARAMS__?: Record<string, string | string[]>;
@@ -21,9 +22,9 @@ type VinextBrowserGlobals = {
 };
 declare function getVinextBrowserGlobal(): typeof globalThis & VinextBrowserGlobals;
 /**
- * Convert embedded text chunks back to a ReadableStream of Uint8Array chunks.
+ * Convert embedded chunks back to a ReadableStream of Uint8Array chunks.
  */
-declare function chunksToReadableStream(chunks: readonly string[]): ReadableStream<Uint8Array>;
+declare function chunksToReadableStream(chunks: readonly RscEmbeddedChunk[]): ReadableStream<Uint8Array>;
 /**
  * Create a ReadableStream from progressively-embedded RSC chunks.
  *

package/dist/server/app-browser-stream.js

@@ -1,3 +1,4 @@
+import { decodeRscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
 //#region src/server/app-browser-stream.ts
 function getVinextBrowserGlobal() {
 	return globalThis;
@@ -6,12 +7,11 @@ function createUnexpectedRscStreamCloseError() {
 	return /* @__PURE__ */ new Error("The connection to the page was unexpectedly closed, possibly due to the stop button being clicked, loss of Wi-Fi, or an unstable internet connection.");
 }
 /**
-* Convert embedded text chunks back to a ReadableStream of Uint8Array chunks.
+* Convert embedded chunks back to a ReadableStream of Uint8Array chunks.
 */
 function chunksToReadableStream(chunks) {
-	const encoder = new TextEncoder();
 	return new ReadableStream({ start(controller) {
-		for (const chunk of chunks) controller.enqueue(encoder.encode(chunk));
+		for (const chunk of chunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
 		controller.close();
 	} });
 }
@@ -23,11 +23,10 @@ function chunksToReadableStream(chunks) {
 * instead of polling with setTimeout.
 */
 function createProgressiveRscStream() {
-	const encoder = new TextEncoder();
 	return new ReadableStream({ start(controller) {
 		const vinext = getVinextBrowserGlobal();
 		const initialChunks = vinext.__VINEXT_RSC_CHUNKS__ ?? [];
-		for (const chunk of initialChunks) controller.enqueue(encoder.encode(chunk));
+		for (const chunk of initialChunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
 		if (vinext.__VINEXT_RSC_DONE__) {
 			controller.close();
 			return;
@@ -57,7 +56,7 @@ function createProgressiveRscStream() {
 		arr.push = function(...chunks) {
 			const length = Array.prototype.push.apply(this, chunks);
 			if (closed) return length;
-			for (const chunk of chunks) controller.enqueue(encoder.encode(chunk));
+			for (const chunk of chunks) controller.enqueue(decodeRscEmbeddedChunk(chunk));
 			if (vinext.__VINEXT_RSC_DONE__) closeOnce();
 			return length;
 		};

package/dist/server/app-browser-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-browser-stream.js","names":[],"sources":["../../src/server/app-browser-stream.ts"],"sourcesContent":["import type { ReactFormState } from \"react-dom/client\";\nimport { RSC_FORM_STATE_GLOBAL } from \"./app-browser-hydration.js\";\n\ntype NavigationSnapshot = {\n  pathname: string;\n  searchParams: [string, string][];\n};\n\ntype LegacyRscEmbedData = {\n  rsc: string[];\n  params?: Record<string, string | string[]>;\n  nav?: NavigationSnapshot;\n};\n\ntype VinextBrowserGlobals = {\n  __VINEXT_RSC__?: LegacyRscEmbedData;\n  __VINEXT_RSC_CHUNKS__?: string[];\n  __VINEXT_RSC_DONE__?: boolean;\n  [RSC_FORM_STATE_GLOBAL]?: ReactFormState;\n  __VINEXT_RSC_PARAMS__?: Record<string, string | string[]>;\n  __VINEXT_RSC_NAV__?: NavigationSnapshot;\n};\n\nexport function getVinextBrowserGlobal(): typeof globalThis & VinextBrowserGlobals {\n  return globalThis as typeof globalThis & VinextBrowserGlobals;\n}\n\nfunction createUnexpectedRscStreamCloseError(): Error {\n  return new Error(\n    \"The connection to the page was unexpectedly closed, possibly due to the stop button being clicked, loss of Wi-Fi, or an unstable internet connection.\",\n  );\n}\n\n/**\n * Convert embedded text chunks back to a ReadableStream of Uint8Array chunks.\n */\nexport function chunksToReadableStream(chunks: readonly string[]): ReadableStream<Uint8Array> {\n  const encoder = new TextEncoder();\n  return new ReadableStream<Uint8Array>({\n    start(controller) {\n      for (const chunk of chunks) {\n        controller.enqueue(encoder.encode(chunk));\n      }\n      controller.close();\n    },\n  });\n}\n\n/**\n * Create a ReadableStream from progressively-embedded RSC chunks.\n *\n * The server pushes chunks into `__VINEXT_RSC_CHUNKS__` via inline <script>\n * tags. We monkey-patch `push()` so new chunks stream to React immediately\n * instead of polling with setTimeout.\n */\nexport function createProgressiveRscStream(): ReadableStream<Uint8Array> {\n  const encoder = new TextEncoder();\n\n  return new ReadableStream<Uint8Array>({\n    start(controller) {\n      const vinext = getVinextBrowserGlobal();\n      const initialChunks = vinext.__VINEXT_RSC_CHUNKS__ ?? [];\n\n      for (const chunk of initialChunks) {\n        controller.enqueue(encoder.encode(chunk));\n      }\n\n      if (vinext.__VINEXT_RSC_DONE__) {\n        controller.close();\n        return;\n      }\n\n      let closed = false;\n      let cancelDocumentCompletionCheck: (() => void) | undefined;\n      const cancelPendingDocumentCompletionCheck = () => {\n        const cancel = cancelDocumentCompletionCheck;\n        cancelDocumentCompletionCheck = undefined;\n        cancel?.();\n      };\n      const closeOnce = () => {\n        if (!closed) {\n          closed = true;\n          cancelPendingDocumentCompletionCheck();\n          controller.close();\n        }\n      };\n      const errorOnce = () => {\n        if (!closed) {\n          closed = true;\n          cancelPendingDocumentCompletionCheck();\n          controller.error(createUnexpectedRscStreamCloseError());\n        }\n      };\n\n      const arr = (vinext.__VINEXT_RSC_CHUNKS__ ??= []);\n      arr.push = function (...chunks: string[]): number {\n        const length = Array.prototype.push.apply(this, chunks);\n\n        if (closed) return length;\n\n        for (const chunk of chunks) {\n          controller.enqueue(encoder.encode(chunk));\n        }\n\n        if (vinext.__VINEXT_RSC_DONE__) {\n          closeOnce();\n        }\n\n        return length;\n      };\n\n      if (typeof document !== \"undefined\") {\n        if (document.readyState === \"loading\") {\n          document.addEventListener(\"DOMContentLoaded\", errorOnce);\n          cancelDocumentCompletionCheck = () =>\n            document.removeEventListener(\"DOMContentLoaded\", errorOnce);\n        } else {\n          const timeoutId = setTimeout(errorOnce);\n          cancelDocumentCompletionCheck = () => clearTimeout(timeoutId);\n        }\n      }\n    },\n  });\n}\n"],"mappings":";AAuBA,SAAgB,yBAAmE;CACjF,OAAO;;AAGT,SAAS,sCAA6C;CACpD,uBAAO,IAAI,MACT,wJACD;;;;;AAMH,SAAgB,uBAAuB,QAAuD;CAC5F,MAAM,UAAU,IAAI,aAAa;CACjC,OAAO,IAAI,eAA2B,EACpC,MAAM,YAAY;EAChB,KAAK,MAAM,SAAS,QAClB,WAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;EAE3C,WAAW,OAAO;IAErB,CAAC;;;;;;;;;AAUJ,SAAgB,6BAAyD;CACvE,MAAM,UAAU,IAAI,aAAa;CAEjC,OAAO,IAAI,eAA2B,EACpC,MAAM,YAAY;EAChB,MAAM,SAAS,wBAAwB;EACvC,MAAM,gBAAgB,OAAO,yBAAyB,EAAE;EAExD,KAAK,MAAM,SAAS,eAClB,WAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;EAG3C,IAAI,OAAO,qBAAqB;GAC9B,WAAW,OAAO;GAClB;;EAGF,IAAI,SAAS;EACb,IAAI;EACJ,MAAM,6CAA6C;GACjD,MAAM,SAAS;GACf,gCAAgC,KAAA;GAChC,UAAU;;EAEZ,MAAM,kBAAkB;GACtB,IAAI,CAAC,QAAQ;IACX,SAAS;IACT,sCAAsC;IACtC,WAAW,OAAO;;;EAGtB,MAAM,kBAAkB;GACtB,IAAI,CAAC,QAAQ;IACX,SAAS;IACT,sCAAsC;IACtC,WAAW,MAAM,qCAAqC,CAAC;;;EAI3D,MAAM,MAAO,OAAO,0BAA0B,EAAE;EAChD,IAAI,OAAO,SAAU,GAAG,QAA0B;GAChD,MAAM,SAAS,MAAM,UAAU,KAAK,MAAM,MAAM,OAAO;GAEvD,IAAI,QAAQ,OAAO;GAEnB,KAAK,MAAM,SAAS,QAClB,WAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;GAG3C,IAAI,OAAO,qBACT,WAAW;GAGb,OAAO;;EAGT,IAAI,OAAO,aAAa,aACtB,IAAI,SAAS,eAAe,WAAW;GACrC,SAAS,iBAAiB,oBAAoB,UAAU;GACxD,sCACE,SAAS,oBAAoB,oBAAoB,UAAU;SACxD;GACL,MAAM,YAAY,WAAW,UAAU;GACvC,sCAAsC,aAAa,UAAU;;IAIpE,CAAC"}
+{"version":3,"file":"app-browser-stream.js","names":[],"sources":["../../src/server/app-browser-stream.ts"],"sourcesContent":["import type { ReactFormState } from \"react-dom/client\";\nimport { RSC_FORM_STATE_GLOBAL } from \"./app-browser-hydration.js\";\nimport { decodeRscEmbeddedChunk, type RscEmbeddedChunk } from \"./app-rsc-embedded-chunks.js\";\n\ntype NavigationSnapshot = {\n  pathname: string;\n  searchParams: [string, string][];\n};\n\ntype LegacyRscEmbedData = {\n  rsc: RscEmbeddedChunk[];\n  params?: Record<string, string | string[]>;\n  nav?: NavigationSnapshot;\n};\n\ntype VinextBrowserGlobals = {\n  __VINEXT_RSC__?: LegacyRscEmbedData;\n  __VINEXT_RSC_CHUNKS__?: RscEmbeddedChunk[];\n  __VINEXT_RSC_DONE__?: boolean;\n  [RSC_FORM_STATE_GLOBAL]?: ReactFormState;\n  __VINEXT_RSC_PARAMS__?: Record<string, string | string[]>;\n  __VINEXT_RSC_NAV__?: NavigationSnapshot;\n};\n\nexport function getVinextBrowserGlobal(): typeof globalThis & VinextBrowserGlobals {\n  return globalThis as typeof globalThis & VinextBrowserGlobals;\n}\n\nfunction createUnexpectedRscStreamCloseError(): Error {\n  return new Error(\n    \"The connection to the page was unexpectedly closed, possibly due to the stop button being clicked, loss of Wi-Fi, or an unstable internet connection.\",\n  );\n}\n\n/**\n * Convert embedded chunks back to a ReadableStream of Uint8Array chunks.\n */\nexport function chunksToReadableStream(\n  chunks: readonly RscEmbeddedChunk[],\n): ReadableStream<Uint8Array> {\n  return new ReadableStream<Uint8Array>({\n    start(controller) {\n      for (const chunk of chunks) {\n        controller.enqueue(decodeRscEmbeddedChunk(chunk));\n      }\n      controller.close();\n    },\n  });\n}\n\n/**\n * Create a ReadableStream from progressively-embedded RSC chunks.\n *\n * The server pushes chunks into `__VINEXT_RSC_CHUNKS__` via inline <script>\n * tags. We monkey-patch `push()` so new chunks stream to React immediately\n * instead of polling with setTimeout.\n */\nexport function createProgressiveRscStream(): ReadableStream<Uint8Array> {\n  return new ReadableStream<Uint8Array>({\n    start(controller) {\n      const vinext = getVinextBrowserGlobal();\n      const initialChunks = vinext.__VINEXT_RSC_CHUNKS__ ?? [];\n\n      for (const chunk of initialChunks) {\n        controller.enqueue(decodeRscEmbeddedChunk(chunk));\n      }\n\n      if (vinext.__VINEXT_RSC_DONE__) {\n        controller.close();\n        return;\n      }\n\n      let closed = false;\n      let cancelDocumentCompletionCheck: (() => void) | undefined;\n      const cancelPendingDocumentCompletionCheck = () => {\n        const cancel = cancelDocumentCompletionCheck;\n        cancelDocumentCompletionCheck = undefined;\n        cancel?.();\n      };\n      const closeOnce = () => {\n        if (!closed) {\n          closed = true;\n          cancelPendingDocumentCompletionCheck();\n          controller.close();\n        }\n      };\n      const errorOnce = () => {\n        if (!closed) {\n          closed = true;\n          cancelPendingDocumentCompletionCheck();\n          controller.error(createUnexpectedRscStreamCloseError());\n        }\n      };\n\n      const arr = (vinext.__VINEXT_RSC_CHUNKS__ ??= []);\n      arr.push = function (...chunks: RscEmbeddedChunk[]): number {\n        const length = Array.prototype.push.apply(this, chunks);\n\n        if (closed) return length;\n\n        for (const chunk of chunks) {\n          controller.enqueue(decodeRscEmbeddedChunk(chunk));\n        }\n\n        if (vinext.__VINEXT_RSC_DONE__) {\n          closeOnce();\n        }\n\n        return length;\n      };\n\n      if (typeof document !== \"undefined\") {\n        if (document.readyState === \"loading\") {\n          document.addEventListener(\"DOMContentLoaded\", errorOnce);\n          cancelDocumentCompletionCheck = () =>\n            document.removeEventListener(\"DOMContentLoaded\", errorOnce);\n        } else {\n          const timeoutId = setTimeout(errorOnce);\n          cancelDocumentCompletionCheck = () => clearTimeout(timeoutId);\n        }\n      }\n    },\n  });\n}\n"],"mappings":";;AAwBA,SAAgB,yBAAmE;CACjF,OAAO;;AAGT,SAAS,sCAA6C;CACpD,uBAAO,IAAI,MACT,wJACD;;;;;AAMH,SAAgB,uBACd,QAC4B;CAC5B,OAAO,IAAI,eAA2B,EACpC,MAAM,YAAY;EAChB,KAAK,MAAM,SAAS,QAClB,WAAW,QAAQ,uBAAuB,MAAM,CAAC;EAEnD,WAAW,OAAO;IAErB,CAAC;;;;;;;;;AAUJ,SAAgB,6BAAyD;CACvE,OAAO,IAAI,eAA2B,EACpC,MAAM,YAAY;EAChB,MAAM,SAAS,wBAAwB;EACvC,MAAM,gBAAgB,OAAO,yBAAyB,EAAE;EAExD,KAAK,MAAM,SAAS,eAClB,WAAW,QAAQ,uBAAuB,MAAM,CAAC;EAGnD,IAAI,OAAO,qBAAqB;GAC9B,WAAW,OAAO;GAClB;;EAGF,IAAI,SAAS;EACb,IAAI;EACJ,MAAM,6CAA6C;GACjD,MAAM,SAAS;GACf,gCAAgC,KAAA;GAChC,UAAU;;EAEZ,MAAM,kBAAkB;GACtB,IAAI,CAAC,QAAQ;IACX,SAAS;IACT,sCAAsC;IACtC,WAAW,OAAO;;;EAGtB,MAAM,kBAAkB;GACtB,IAAI,CAAC,QAAQ;IACX,SAAS;IACT,sCAAsC;IACtC,WAAW,MAAM,qCAAqC,CAAC;;;EAI3D,MAAM,MAAO,OAAO,0BAA0B,EAAE;EAChD,IAAI,OAAO,SAAU,GAAG,QAAoC;GAC1D,MAAM,SAAS,MAAM,UAAU,KAAK,MAAM,MAAM,OAAO;GAEvD,IAAI,QAAQ,OAAO;GAEnB,KAAK,MAAM,SAAS,QAClB,WAAW,QAAQ,uBAAuB,MAAM,CAAC;GAGnD,IAAI,OAAO,qBACT,WAAW;GAGb,OAAO;;EAGT,IAAI,OAAO,aAAa,aACtB,IAAI,SAAS,eAAe,WAAW;GACrC,SAAS,iBAAiB,oBAAoB,UAAU;GACxD,sCACE,SAAS,oBAAoB,oBAAoB,UAAU;SACxD;GACL,MAAM,YAAY,WAAW,UAAU;GACvC,sCAAsC,aAAa,UAAU;;IAIpE,CAAC"}

package/dist/server/app-browser-visible-commit.d.ts

@@ -1,3 +1,4 @@
+import { RouteManifest } from "../routing/app-route-graph.js";
 import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { AppElements } from "./app-elements-wire.js";
 import { NavigationTrace } from "./navigation-trace.js";
@@ -9,6 +10,7 @@ type VisibleCommitDecision = {
   disposition: "commit";
   preserveAbsentSlots: boolean;
   preserveElementIds: readonly string[];
+  preservePreviousSlotIds: readonly string[];
   trace: NavigationTrace;
 };
 type HardNavigateCommitDecision = {
@@ -25,6 +27,7 @@ type ApprovedVisibleCommit = {
   readonly [approvedVisibleCommitBrand]: true;
   readonly action: AppRouterAction;
   readonly decision: VisibleCommitDecision;
+  readonly interception: AppRouterAction["interception"];
   readonly interceptionContext: string | null;
   readonly previousNextUrl: string | null;
   readonly rootLayoutTreePath: string | null;
@@ -51,6 +54,7 @@ declare function approvePendingNavigationCommit(options: {
   activeNavigationId: number;
   currentState: AppRouterState;
   pending: PendingNavigationCommit;
+  routeManifest?: RouteManifest | null;
   startedNavigationId: number;
   targetHref: string;
 }): CommitApproval;
@@ -64,6 +68,7 @@ declare function resolveAndClassifyNavigationCommit(options: {
   operationLane: OperationLane;
   previousNextUrl?: string | null;
   renderId: number;
+  routeManifest?: RouteManifest | null;
   startedNavigationId: number;
   targetHref: string;
   type: "navigate" | "replace" | "traverse";

package/dist/server/app-browser-visible-commit.js

@@ -1,3 +1,5 @@
+import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
 import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
@@ -27,6 +29,28 @@ function commitVisibleRouterState(state, nextState, operation) {
 		visibleCommitVersion
 	};
 }
+function mergeSlotBindings(previousBindings, nextBindings, layoutIds, preservePreviousSlotIds) {
+	if (preservePreviousSlotIds.length === 0) return nextBindings;
+	const preservedSlotIds = new Set(preservePreviousSlotIds);
+	const previousBindingsBySlotId = /* @__PURE__ */ new Map();
+	for (const binding of previousBindings) {
+		if (!preservedSlotIds.has(binding.slotId)) continue;
+		previousBindingsBySlotId.set(binding.slotId, binding);
+	}
+	const mergedBindings = [];
+	const seenSlotIds = /* @__PURE__ */ new Set();
+	for (const binding of nextBindings) {
+		const previousBinding = previousBindingsBySlotId.get(binding.slotId);
+		mergedBindings.push(previousBinding ?? binding);
+		seenSlotIds.add(binding.slotId);
+	}
+	for (const slotId of preservePreviousSlotIds) {
+		if (seenSlotIds.has(slotId)) continue;
+		const previousBinding = previousBindingsBySlotId.get(slotId);
+		if (previousBinding) mergedBindings.push(previousBinding);
+	}
+	return normalizeAppElementsSlotBindings(mergedBindings, { layoutIds });
+}
 function reduceApprovedVisibleCommitState(state, commit) {
 	const { action } = commit;
 	switch (action.type) {
@@ -35,8 +59,10 @@ function reduceApprovedVisibleCommitState(state, commit) {
 			elements: mergeElements(state.elements, action.elements, {
 				clearAbsentSlots: action.type === "traverse",
 				preserveAbsentSlots: commit.decision.preserveAbsentSlots,
-				preserveElementIds: commit.decision.preserveElementIds
+				preserveElementIds: commit.decision.preserveElementIds,
+				preservePreviousSlotIds: commit.decision.preservePreviousSlotIds
 			}),
+			interception: action.interception,
 			interceptionContext: action.interceptionContext,
 			layoutFlags: mergeLayoutFlags(state.layoutFlags, action.layoutFlags, commit.decision.preserveElementIds),
 			layoutIds: action.layoutIds,
@@ -44,10 +70,12 @@ function reduceApprovedVisibleCommitState(state, commit) {
 			previousNextUrl: action.previousNextUrl,
 			renderId: action.renderId,
 			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId
+			routeId: action.routeId,
+			slotBindings: mergeSlotBindings(state.slotBindings, action.slotBindings, action.layoutIds, commit.decision.preservePreviousSlotIds)
 		}, action.operation);
 		case "replace": return commitVisibleRouterState(state, {
 			elements: action.elements,
+			interception: action.interception,
 			interceptionContext: action.interceptionContext,
 			layoutFlags: action.layoutFlags,
 			layoutIds: action.layoutIds,
@@ -55,7 +83,8 @@ function reduceApprovedVisibleCommitState(state, commit) {
 			previousNextUrl: action.previousNextUrl,
 			renderId: action.renderId,
 			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId
+			routeId: action.routeId,
+			slotBindings: action.slotBindings
 		}, action.operation);
 		default: {
 			const _exhaustive = action.type;
@@ -74,15 +103,16 @@ function resolvePendingNavigationCommitDecision(options) {
 			disposition: "hard-navigate",
 			trace: decision.trace
 		};
-		case "dispatch": return createVisibleCommitDecision(decision.trace, decision.preserveElementIds, decision.preserveAbsentSlots);
+		case "dispatch": return createVisibleCommitDecision(decision.trace, decision.preserveElementIds, decision.preserveAbsentSlots, decision.preservePreviousSlotIds);
 		default: throw new Error("[vinext] Unknown navigation commit disposition: " + String(decision));
 	}
 }
-function createVisibleCommitDecision(trace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent), preserveElementIds = [], preserveAbsentSlots = false) {
+function createVisibleCommitDecision(trace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent), preserveElementIds = [], preserveAbsentSlots = false, preservePreviousSlotIds = []) {
 	return {
 		disposition: "commit",
 		preserveAbsentSlots,
 		preserveElementIds: [...preserveElementIds],
+		preservePreviousSlotIds: [...preservePreviousSlotIds],
 		trace
 	};
 }
@@ -100,6 +130,7 @@ function createApprovedVisibleCommit(options) {
 		[approvedVisibleCommitBrand]: true,
 		action: options.pending.action,
 		decision: options.decision,
+		interception: options.pending.interception,
 		interceptionContext: options.pending.interceptionContext,
 		previousNextUrl: options.pending.previousNextUrl,
 		rootLayoutTreePath: options.pending.rootLayoutTreePath,
@@ -147,6 +178,7 @@ function approvePendingNavigationCommit(options) {
 		activeNavigationId: options.activeNavigationId,
 		currentState: options.currentState,
 		pending: options.pending,
+		routeManifest: options.routeManifest ?? null,
 		startedNavigationId: options.startedNavigationId,
 		targetHref: options.targetHref
 	}), options.pending);
@@ -181,6 +213,7 @@ async function resolveAndClassifyNavigationCommit(options) {
 		activeNavigationId: options.getActiveNavigationId?.() ?? options.activeNavigationId,
 		currentState: approvalState,
 		pending,
+		routeManifest: options.routeManifest ?? null,
 		startedNavigationId: options.startedNavigationId,
 		targetHref: options.targetHref
 	});

package/dist/server/app-browser-visible-commit.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-browser-visible-commit.js","names":["_exhaustive"],"sources":["../../src/server/app-browser-visible-commit.ts"],"sourcesContent":["import type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport { mergeElements } from \"vinext/shims/slot\";\nimport type { AppElements } from \"./app-elements.js\";\nimport {\n  createPendingNavigationCommit,\n  resolvePendingNavigationCommitDispositionDecision,\n  type AppRouterAction,\n  type AppRouterState,\n  type CommittedOperationRecord,\n  type OperationLane,\n  type PendingNavigationCommit,\n  type PendingOperationRecord,\n} from \"./app-browser-state.js\";\nimport {\n  NavigationTraceReasonCodes,\n  NavigationTraceTransactionCodes,\n  createNavigationTrace,\n  prependNavigationTraceEntry,\n  type NavigationTrace,\n  type NavigationTraceFields,\n  type NavigationTraceTransactionCode,\n} from \"./navigation-trace.js\";\n\ntype VisibleCommitDecision = {\n  disposition: \"commit\";\n  preserveAbsentSlots: boolean;\n  preserveElementIds: readonly string[];\n  trace: NavigationTrace;\n};\ntype HardNavigateCommitDecision = {\n  disposition: \"hard-navigate\";\n  trace: NavigationTrace;\n};\ntype NoCommitDecision = {\n  disposition: \"no-commit\";\n  trace: NavigationTrace;\n};\ntype CommitDecision = VisibleCommitDecision | HardNavigateCommitDecision | NoCommitDecision;\nconst approvedVisibleCommitBrand: unique symbol = Symbol(\"ApprovedVisibleCommit\");\nexport type ApprovedVisibleCommit = {\n  readonly [approvedVisibleCommitBrand]: true;\n  readonly action: AppRouterAction;\n  readonly decision: VisibleCommitDecision;\n  readonly interceptionContext: string | null;\n  readonly previousNextUrl: string | null;\n  readonly rootLayoutTreePath: string | null;\n  readonly routeId: string;\n};\ntype VisibleCommitApproval = {\n  approvedCommit: ApprovedVisibleCommit;\n  decision: VisibleCommitDecision;\n};\ntype NonVisibleCommitApproval = {\n  approvedCommit: null;\n  decision: HardNavigateCommitDecision | NoCommitDecision;\n};\ntype CommitApproval = VisibleCommitApproval | NonVisibleCommitApproval;\ntype ClassifiedPendingNavigationCommit = {\n  approvedCommit: ApprovedVisibleCommit | null;\n  decision: CommitDecision;\n  pending: PendingNavigationCommit;\n  trace: NavigationTrace;\n};\n\nexport function applyApprovedVisibleCommit(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  assertApprovedVisibleCommit(commit);\n  return reduceApprovedVisibleCommitState(state, commit);\n}\n\nfunction assertApprovedVisibleCommit(commit: ApprovedVisibleCommit): void {\n  if (commit[approvedVisibleCommitBrand] !== true) {\n    throw new Error(\"[vinext] Visible router state mutation requires ApprovedVisibleCommit\");\n  }\n}\n\nfunction commitOperationRecord(\n  operation: PendingOperationRecord,\n  visibleCommitVersion: number,\n): CommittedOperationRecord {\n  return {\n    id: operation.id,\n    lane: operation.lane,\n    startedVisibleCommitVersion: operation.startedVisibleCommitVersion,\n    state: \"committed\",\n    visibleCommitVersion,\n  };\n}\n\nfunction commitVisibleRouterState(\n  state: AppRouterState,\n  nextState: Omit<AppRouterState, \"activeOperation\" | \"visibleCommitVersion\">,\n  operation: PendingOperationRecord,\n): AppRouterState {\n  // Single owner for visibleCommitVersion: only an ApprovedVisibleCommit may\n  // advance it, and every accepted visible mutation advances it exactly once.\n  const visibleCommitVersion = state.visibleCommitVersion + 1;\n  return {\n    ...nextState,\n    activeOperation: commitOperationRecord(operation, visibleCommitVersion),\n    visibleCommitVersion,\n  };\n}\n\nfunction reduceApprovedVisibleCommitState(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  const { action } = commit;\n  switch (action.type) {\n    case \"traverse\":\n    case \"navigate\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: mergeElements(state.elements, action.elements, {\n            clearAbsentSlots: action.type === \"traverse\",\n            preserveAbsentSlots: commit.decision.preserveAbsentSlots,\n            preserveElementIds: commit.decision.preserveElementIds,\n          }),\n          interceptionContext: action.interceptionContext,\n          layoutFlags: mergeLayoutFlags(\n            state.layoutFlags,\n            action.layoutFlags,\n            commit.decision.preserveElementIds,\n          ),\n          layoutIds: action.layoutIds,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n        },\n        action.operation,\n      );\n    case \"replace\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: action.elements,\n          interceptionContext: action.interceptionContext,\n          layoutFlags: action.layoutFlags,\n          layoutIds: action.layoutIds,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n        },\n        action.operation,\n      );\n    default: {\n      const _exhaustive: never = action.type;\n      throw new Error(\"[vinext] Unknown router action: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction resolvePendingNavigationCommitDecision(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  startedNavigationId: number;\n  targetHref: string;\n}): CommitDecision {\n  const decision = resolvePendingNavigationCommitDispositionDecision(options);\n\n  switch (decision.disposition) {\n    case \"skip\":\n      return { disposition: \"no-commit\", trace: decision.trace };\n    case \"hard-navigate\":\n      return { disposition: \"hard-navigate\", trace: decision.trace };\n    case \"dispatch\":\n      return createVisibleCommitDecision(\n        decision.trace,\n        decision.preserveElementIds,\n        decision.preserveAbsentSlots,\n      );\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown navigation commit disposition: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction createVisibleCommitDecision(\n  trace: NavigationTrace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent),\n  preserveElementIds: readonly string[] = [],\n  preserveAbsentSlots: boolean = false,\n): VisibleCommitDecision {\n  return {\n    disposition: \"commit\",\n    preserveAbsentSlots,\n    preserveElementIds: [...preserveElementIds],\n    trace,\n  };\n}\n\nfunction mergeLayoutFlags(\n  previousFlags: AppRouterState[\"layoutFlags\"],\n  nextFlags: AppRouterState[\"layoutFlags\"],\n  preserveElementIds: readonly string[],\n): AppRouterState[\"layoutFlags\"] {\n  const merged: Record<string, \"s\" | \"d\"> = { ...nextFlags };\n  for (const id of preserveElementIds) {\n    if (Object.hasOwn(merged, id)) continue;\n    const value = previousFlags[id];\n    if (value) merged[id] = value;\n  }\n  return merged;\n}\n\nfunction createApprovedVisibleCommit(options: {\n  decision: VisibleCommitDecision;\n  pending: PendingNavigationCommit;\n}): ApprovedVisibleCommit {\n  return {\n    [approvedVisibleCommitBrand]: true,\n    action: options.pending.action,\n    decision: options.decision,\n    interceptionContext: options.pending.interceptionContext,\n    previousNextUrl: options.pending.previousNextUrl,\n    rootLayoutTreePath: options.pending.rootLayoutTreePath,\n    routeId: options.pending.routeId,\n  };\n}\n\nfunction createCommitTransactionFields(pending: PendingNavigationCommit): NavigationTraceFields {\n  return {\n    operationLane: pending.action.operation.lane,\n    pendingOperationId: pending.action.operation.id,\n    startedVisibleCommitVersion: pending.action.operation.startedVisibleCommitVersion,\n  };\n}\n\nfunction prependCommitTransactionTrace(\n  trace: NavigationTrace,\n  code: NavigationTraceTransactionCode,\n  pending: PendingNavigationCommit,\n): NavigationTrace {\n  return prependNavigationTraceEntry(trace, code, createCommitTransactionFields(pending));\n}\n\nfunction addCommitTransactionTrace(\n  decision: CommitDecision,\n  pending: PendingNavigationCommit,\n): CommitDecision {\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.visibleCommit,\n          pending,\n        ),\n      };\n    case \"hard-navigate\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.hardNavigate,\n          pending,\n        ),\n      };\n    case \"no-commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.noCommit,\n          pending,\n        ),\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport function approveHmrVisibleCommit(pending: PendingNavigationCommit): ApprovedVisibleCommit {\n  if (pending.action.operation.lane !== \"hmr\") {\n    throw new Error(\"[vinext] HMR visible commit approval requires an HMR pending operation\");\n  }\n\n  const decision = addCommitTransactionTrace(createVisibleCommitDecision(), pending);\n  // This guard is a type narrowing assertion: createVisibleCommitDecision()\n  // structurally produces a commit decision, and addCommitTransactionTrace()\n  // must preserve that disposition while adding operator trace context.\n  if (decision.disposition !== \"commit\") {\n    throw new Error(\"[vinext] HMR visible commit approval did not produce a commit decision\");\n  }\n\n  return createApprovedVisibleCommit({\n    decision,\n    pending,\n  });\n}\n\nexport function approvePendingNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  startedNavigationId: number;\n  targetHref: string;\n}): CommitApproval {\n  const decision = addCommitTransactionTrace(\n    resolvePendingNavigationCommitDecision({\n      activeNavigationId: options.activeNavigationId,\n      currentState: options.currentState,\n      pending: options.pending,\n      startedNavigationId: options.startedNavigationId,\n      targetHref: options.targetHref,\n    }),\n    options.pending,\n  );\n\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        approvedCommit: createApprovedVisibleCommit({\n          decision,\n          pending: options.pending,\n        }),\n        decision,\n      };\n    case \"hard-navigate\":\n    case \"no-commit\":\n      return {\n        approvedCommit: null,\n        decision,\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport async function resolveAndClassifyNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  // When provided, these getters are called after awaiting nextElements so\n  // approval uses the latest lifecycle authority instead of the call snapshot.\n  getActiveNavigationId?: () => number;\n  getCurrentStateForApproval?: () => AppRouterState;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  nextElements: Promise<AppElements>;\n  operationLane: OperationLane;\n  previousNextUrl?: string | null;\n  renderId: number;\n  startedNavigationId: number;\n  targetHref: string;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n}): Promise<ClassifiedPendingNavigationCommit> {\n  const pending = await createPendingNavigationCommit({\n    currentState: options.currentState,\n    nextElements: options.nextElements,\n    navigationSnapshot: options.navigationSnapshot,\n    operationLane: options.operationLane,\n    previousNextUrl: options.previousNextUrl,\n    renderId: options.renderId,\n    type: options.type,\n  });\n\n  const approvalState = options.getCurrentStateForApproval?.() ?? options.currentState;\n  const approval = approvePendingNavigationCommit({\n    activeNavigationId: options.getActiveNavigationId?.() ?? options.activeNavigationId,\n    currentState: approvalState,\n    pending,\n    startedNavigationId: options.startedNavigationId,\n    targetHref: options.targetHref,\n  });\n\n  return {\n    approvedCommit: approval.approvedCommit,\n    decision: approval.decision,\n    pending,\n    trace: approval.decision.trace,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-browser-visible-commit.js","names":["_exhaustive"],"sources":["../../src/server/app-browser-visible-commit.ts"],"sourcesContent":["import type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport type { RouteManifest } from \"../routing/app-route-graph.js\";\nimport { mergeElements } from \"vinext/shims/slot\";\nimport {\n  normalizeAppElementsSlotBindings,\n  type AppElements,\n  type AppElementsSlotBinding,\n} from \"./app-elements.js\";\nimport {\n  createPendingNavigationCommit,\n  resolvePendingNavigationCommitDispositionDecision,\n  type AppRouterAction,\n  type AppRouterState,\n  type CommittedOperationRecord,\n  type OperationLane,\n  type PendingNavigationCommit,\n  type PendingOperationRecord,\n} from \"./app-browser-state.js\";\nimport {\n  NavigationTraceReasonCodes,\n  NavigationTraceTransactionCodes,\n  createNavigationTrace,\n  prependNavigationTraceEntry,\n  type NavigationTrace,\n  type NavigationTraceFields,\n  type NavigationTraceTransactionCode,\n} from \"./navigation-trace.js\";\n\ntype VisibleCommitDecision = {\n  disposition: \"commit\";\n  preserveAbsentSlots: boolean;\n  preserveElementIds: readonly string[];\n  preservePreviousSlotIds: readonly string[];\n  trace: NavigationTrace;\n};\ntype HardNavigateCommitDecision = {\n  disposition: \"hard-navigate\";\n  trace: NavigationTrace;\n};\ntype NoCommitDecision = {\n  disposition: \"no-commit\";\n  trace: NavigationTrace;\n};\ntype CommitDecision = VisibleCommitDecision | HardNavigateCommitDecision | NoCommitDecision;\nconst approvedVisibleCommitBrand: unique symbol = Symbol(\"ApprovedVisibleCommit\");\nexport type ApprovedVisibleCommit = {\n  readonly [approvedVisibleCommitBrand]: true;\n  readonly action: AppRouterAction;\n  readonly decision: VisibleCommitDecision;\n  readonly interception: AppRouterAction[\"interception\"];\n  readonly interceptionContext: string | null;\n  readonly previousNextUrl: string | null;\n  readonly rootLayoutTreePath: string | null;\n  readonly routeId: string;\n};\ntype VisibleCommitApproval = {\n  approvedCommit: ApprovedVisibleCommit;\n  decision: VisibleCommitDecision;\n};\ntype NonVisibleCommitApproval = {\n  approvedCommit: null;\n  decision: HardNavigateCommitDecision | NoCommitDecision;\n};\ntype CommitApproval = VisibleCommitApproval | NonVisibleCommitApproval;\ntype ClassifiedPendingNavigationCommit = {\n  approvedCommit: ApprovedVisibleCommit | null;\n  decision: CommitDecision;\n  pending: PendingNavigationCommit;\n  trace: NavigationTrace;\n};\n\nexport function applyApprovedVisibleCommit(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  assertApprovedVisibleCommit(commit);\n  return reduceApprovedVisibleCommitState(state, commit);\n}\n\nfunction assertApprovedVisibleCommit(commit: ApprovedVisibleCommit): void {\n  if (commit[approvedVisibleCommitBrand] !== true) {\n    throw new Error(\"[vinext] Visible router state mutation requires ApprovedVisibleCommit\");\n  }\n}\n\nfunction commitOperationRecord(\n  operation: PendingOperationRecord,\n  visibleCommitVersion: number,\n): CommittedOperationRecord {\n  return {\n    id: operation.id,\n    lane: operation.lane,\n    startedVisibleCommitVersion: operation.startedVisibleCommitVersion,\n    state: \"committed\",\n    visibleCommitVersion,\n  };\n}\n\nfunction commitVisibleRouterState(\n  state: AppRouterState,\n  nextState: Omit<AppRouterState, \"activeOperation\" | \"visibleCommitVersion\">,\n  operation: PendingOperationRecord,\n): AppRouterState {\n  // Single owner for visibleCommitVersion: only an ApprovedVisibleCommit may\n  // advance it, and every accepted visible mutation advances it exactly once.\n  const visibleCommitVersion = state.visibleCommitVersion + 1;\n  return {\n    ...nextState,\n    activeOperation: commitOperationRecord(operation, visibleCommitVersion),\n    visibleCommitVersion,\n  };\n}\n\nfunction mergeSlotBindings(\n  previousBindings: readonly AppElementsSlotBinding[],\n  nextBindings: readonly AppElementsSlotBinding[],\n  layoutIds: readonly string[],\n  preservePreviousSlotIds: readonly string[],\n): readonly AppElementsSlotBinding[] {\n  if (preservePreviousSlotIds.length === 0) return nextBindings;\n\n  const preservedSlotIds = new Set(preservePreviousSlotIds);\n  const previousBindingsBySlotId = new Map<string, AppElementsSlotBinding>();\n  for (const binding of previousBindings) {\n    if (!preservedSlotIds.has(binding.slotId)) continue;\n    previousBindingsBySlotId.set(binding.slotId, binding);\n  }\n\n  const mergedBindings: AppElementsSlotBinding[] = [];\n  const seenSlotIds = new Set<string>();\n  for (const binding of nextBindings) {\n    const previousBinding = previousBindingsBySlotId.get(binding.slotId);\n    mergedBindings.push(previousBinding ?? binding);\n    seenSlotIds.add(binding.slotId);\n  }\n  for (const slotId of preservePreviousSlotIds) {\n    if (seenSlotIds.has(slotId)) continue;\n    const previousBinding = previousBindingsBySlotId.get(slotId);\n    if (previousBinding) mergedBindings.push(previousBinding);\n  }\n  return normalizeAppElementsSlotBindings(mergedBindings, { layoutIds });\n}\n\nfunction reduceApprovedVisibleCommitState(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  const { action } = commit;\n  switch (action.type) {\n    case \"traverse\":\n    case \"navigate\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: mergeElements(state.elements, action.elements, {\n            clearAbsentSlots: action.type === \"traverse\",\n            preserveAbsentSlots: commit.decision.preserveAbsentSlots,\n            preserveElementIds: commit.decision.preserveElementIds,\n            preservePreviousSlotIds: commit.decision.preservePreviousSlotIds,\n          }),\n          interception: action.interception,\n          interceptionContext: action.interceptionContext,\n          layoutFlags: mergeLayoutFlags(\n            state.layoutFlags,\n            action.layoutFlags,\n            commit.decision.preserveElementIds,\n          ),\n          layoutIds: action.layoutIds,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n          slotBindings: mergeSlotBindings(\n            state.slotBindings,\n            action.slotBindings,\n            action.layoutIds,\n            commit.decision.preservePreviousSlotIds,\n          ),\n        },\n        action.operation,\n      );\n    case \"replace\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: action.elements,\n          interception: action.interception,\n          interceptionContext: action.interceptionContext,\n          layoutFlags: action.layoutFlags,\n          layoutIds: action.layoutIds,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n          slotBindings: action.slotBindings,\n        },\n        action.operation,\n      );\n    default: {\n      const _exhaustive: never = action.type;\n      throw new Error(\"[vinext] Unknown router action: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction resolvePendingNavigationCommitDecision(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref: string;\n}): CommitDecision {\n  const decision = resolvePendingNavigationCommitDispositionDecision(options);\n\n  switch (decision.disposition) {\n    case \"skip\":\n      return { disposition: \"no-commit\", trace: decision.trace };\n    case \"hard-navigate\":\n      return { disposition: \"hard-navigate\", trace: decision.trace };\n    case \"dispatch\":\n      return createVisibleCommitDecision(\n        decision.trace,\n        decision.preserveElementIds,\n        decision.preserveAbsentSlots,\n        decision.preservePreviousSlotIds,\n      );\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown navigation commit disposition: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction createVisibleCommitDecision(\n  trace: NavigationTrace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent),\n  preserveElementIds: readonly string[] = [],\n  preserveAbsentSlots: boolean = false,\n  preservePreviousSlotIds: readonly string[] = [],\n): VisibleCommitDecision {\n  return {\n    disposition: \"commit\",\n    preserveAbsentSlots,\n    preserveElementIds: [...preserveElementIds],\n    preservePreviousSlotIds: [...preservePreviousSlotIds],\n    trace,\n  };\n}\n\nfunction mergeLayoutFlags(\n  previousFlags: AppRouterState[\"layoutFlags\"],\n  nextFlags: AppRouterState[\"layoutFlags\"],\n  preserveElementIds: readonly string[],\n): AppRouterState[\"layoutFlags\"] {\n  const merged: Record<string, \"s\" | \"d\"> = { ...nextFlags };\n  for (const id of preserveElementIds) {\n    if (Object.hasOwn(merged, id)) continue;\n    const value = previousFlags[id];\n    if (value) merged[id] = value;\n  }\n  return merged;\n}\n\nfunction createApprovedVisibleCommit(options: {\n  decision: VisibleCommitDecision;\n  pending: PendingNavigationCommit;\n}): ApprovedVisibleCommit {\n  return {\n    [approvedVisibleCommitBrand]: true,\n    action: options.pending.action,\n    decision: options.decision,\n    interception: options.pending.interception,\n    interceptionContext: options.pending.interceptionContext,\n    previousNextUrl: options.pending.previousNextUrl,\n    rootLayoutTreePath: options.pending.rootLayoutTreePath,\n    routeId: options.pending.routeId,\n  };\n}\n\nfunction createCommitTransactionFields(pending: PendingNavigationCommit): NavigationTraceFields {\n  return {\n    operationLane: pending.action.operation.lane,\n    pendingOperationId: pending.action.operation.id,\n    startedVisibleCommitVersion: pending.action.operation.startedVisibleCommitVersion,\n  };\n}\n\nfunction prependCommitTransactionTrace(\n  trace: NavigationTrace,\n  code: NavigationTraceTransactionCode,\n  pending: PendingNavigationCommit,\n): NavigationTrace {\n  return prependNavigationTraceEntry(trace, code, createCommitTransactionFields(pending));\n}\n\nfunction addCommitTransactionTrace(\n  decision: CommitDecision,\n  pending: PendingNavigationCommit,\n): CommitDecision {\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.visibleCommit,\n          pending,\n        ),\n      };\n    case \"hard-navigate\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.hardNavigate,\n          pending,\n        ),\n      };\n    case \"no-commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.noCommit,\n          pending,\n        ),\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport function approveHmrVisibleCommit(pending: PendingNavigationCommit): ApprovedVisibleCommit {\n  if (pending.action.operation.lane !== \"hmr\") {\n    throw new Error(\"[vinext] HMR visible commit approval requires an HMR pending operation\");\n  }\n\n  const decision = addCommitTransactionTrace(createVisibleCommitDecision(), pending);\n  // This guard is a type narrowing assertion: createVisibleCommitDecision()\n  // structurally produces a commit decision, and addCommitTransactionTrace()\n  // must preserve that disposition while adding operator trace context.\n  if (decision.disposition !== \"commit\") {\n    throw new Error(\"[vinext] HMR visible commit approval did not produce a commit decision\");\n  }\n\n  return createApprovedVisibleCommit({\n    decision,\n    pending,\n  });\n}\n\nexport function approvePendingNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref: string;\n}): CommitApproval {\n  const decision = addCommitTransactionTrace(\n    resolvePendingNavigationCommitDecision({\n      activeNavigationId: options.activeNavigationId,\n      currentState: options.currentState,\n      pending: options.pending,\n      routeManifest: options.routeManifest ?? null,\n      startedNavigationId: options.startedNavigationId,\n      targetHref: options.targetHref,\n    }),\n    options.pending,\n  );\n\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        approvedCommit: createApprovedVisibleCommit({\n          decision,\n          pending: options.pending,\n        }),\n        decision,\n      };\n    case \"hard-navigate\":\n    case \"no-commit\":\n      return {\n        approvedCommit: null,\n        decision,\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport async function resolveAndClassifyNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  // When provided, these getters are called after awaiting nextElements so\n  // approval uses the latest lifecycle authority instead of the call snapshot.\n  getActiveNavigationId?: () => number;\n  getCurrentStateForApproval?: () => AppRouterState;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  nextElements: Promise<AppElements>;\n  operationLane: OperationLane;\n  previousNextUrl?: string | null;\n  renderId: number;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref: string;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n}): Promise<ClassifiedPendingNavigationCommit> {\n  const pending = await createPendingNavigationCommit({\n    currentState: options.currentState,\n    nextElements: options.nextElements,\n    navigationSnapshot: options.navigationSnapshot,\n    operationLane: options.operationLane,\n    previousNextUrl: options.previousNextUrl,\n    renderId: options.renderId,\n    type: options.type,\n  });\n\n  const approvalState = options.getCurrentStateForApproval?.() ?? options.currentState;\n  const approval = approvePendingNavigationCommit({\n    activeNavigationId: options.getActiveNavigationId?.() ?? options.activeNavigationId,\n    currentState: approvalState,\n    pending,\n    routeManifest: options.routeManifest ?? null,\n    startedNavigationId: options.startedNavigationId,\n    targetHref: options.targetHref,\n  });\n\n  return {\n    approvedCommit: approval.approvedCommit,\n    decision: approval.decision,\n    pending,\n    trace: approval.decision.trace,\n  };\n}\n"],"mappings":"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"}

package/dist/server/app-elements-wire.d.ts

@@ -1,17 +1,38 @@
+import { RenderObservation } from "./cache-proof.js";
 import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { ReactNode } from "react";
 
 //#region src/server/app-elements-wire.d.ts
 declare const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
+declare const APP_INTERCEPTION_KEY = "__interception";
 declare const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
 declare const APP_LAYOUT_IDS_KEY = "__layoutIds";
 declare const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
+declare const APP_RENDER_OBSERVATION_KEY = "__renderObservation";
 declare const APP_ROUTE_KEY = "__route";
 declare const APP_ROOT_LAYOUT_KEY = "__rootLayout";
+declare const APP_SLOT_BINDINGS_KEY = "__slotBindings";
 declare const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
 declare const UNMATCHED_SLOT: unique symbol;
-type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null;
-type AppWireElementValue = ReactNode | string | null;
+type AppElementsSlotBindingState = "active" | "default" | "unmatched";
+type AppElementsSlotBinding = Readonly<{
+  ownerLayoutId: string | null;
+  slotId: string;
+  state: AppElementsSlotBindingState;
+}>;
+type AppElementsInterception = Readonly<{
+  sourceMatchedUrl: string;
+  sourceRouteId: string;
+  slotId: string;
+  targetMatchedUrl: string;
+  targetRouteId: string;
+}>;
+declare function compareAppElementsSlotIds(left: string, right: string): number;
+declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
+  layoutIds?: readonly string[];
+}): readonly AppElementsSlotBinding[];
+type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null | LayoutFlags | ArtifactCompatibilityEnvelope | AppElementsInterception | readonly AppElementsSlotBinding[];
+type AppWireElementValue = ReactNode | string | null | LayoutFlags | ArtifactCompatibilityEnvelope | AppElementsInterception | readonly AppElementsSlotBinding[];
 type AppElements = Readonly<Record<string, AppElementValue>>;
 type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
 /**
@@ -34,11 +55,13 @@ type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
 type LayoutFlags = Readonly<Record<string, "s" | "d">>;
 type AppElementsMetadata = {
   artifactCompatibility: ArtifactCompatibilityEnvelope;
+  interception: AppElementsInterception | null;
   interceptionContext: string | null;
   layoutIds: readonly string[];
   layoutFlags: LayoutFlags;
   routeId: string;
   rootLayoutTreePath: string | null;
+  slotBindings: readonly AppElementsSlotBinding[];
 };
 type AppElementsWireElementKey = {
   kind: "layout";
@@ -60,16 +83,20 @@ type AppElementsWireElementKey = {
   treePath: string;
 };
 type AppElementsWireMetadataInput = {
+  interception?: AppElementsInterception | null;
   interceptionContext: string | null;
   layoutIds?: readonly string[];
   routeId: string;
   rootLayoutTreePath: string | null;
+  slotBindings?: readonly AppElementsSlotBinding[];
 };
 type AppElementsWireMetadataEntries = Readonly<{
   [APP_ROUTE_KEY]: string;
+  [APP_INTERCEPTION_KEY]?: AppElementsInterception;
   [APP_INTERCEPTION_CONTEXT_KEY]: string | null;
   [APP_LAYOUT_IDS_KEY]: readonly string[];
   [APP_ROOT_LAYOUT_KEY]: string | null;
+  [APP_SLOT_BINDINGS_KEY]?: readonly AppElementsSlotBinding[];
 }>;
 /**
  * The outgoing wire payload shape. Includes ReactNode values for the
@@ -77,14 +104,17 @@ type AppElementsWireMetadataEntries = Readonly<{
  * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements
  * which only carry render-time values.
  */
-type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | ArtifactCompatibilityEnvelope>>;
+type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | ArtifactCompatibilityEnvelope | AppElementsInterception | RenderObservation | readonly AppElementsSlotBinding[]>>;
 type AppElementsWireKeys = {
   readonly artifactCompatibility: typeof APP_ARTIFACT_COMPATIBILITY_KEY;
+  readonly interception: typeof APP_INTERCEPTION_KEY;
   readonly interceptionContext: typeof APP_INTERCEPTION_CONTEXT_KEY;
   readonly layoutIds: typeof APP_LAYOUT_IDS_KEY;
   readonly layoutFlags: typeof APP_LAYOUT_FLAGS_KEY;
+  readonly renderObservation: typeof APP_RENDER_OBSERVATION_KEY;
   readonly rootLayout: typeof APP_ROOT_LAYOUT_KEY;
   readonly route: typeof APP_ROUTE_KEY;
+  readonly slotBindings: typeof APP_SLOT_BINDINGS_KEY;
 };
 type AppElementsWireCodec = {
   readonly keys: AppElementsWireKeys;
@@ -94,9 +124,10 @@ type AppElementsWireCodec = {
   encodeCacheKey(rscUrl: string, interceptionContext: string | null): string;
   encodeLayoutId(treePath: string): string;
   encodeOutgoingPayload(input: {
-    element: ReactNode | Readonly<Record<string, ReactNode>>;
+    element: ReactNode | Readonly<Record<string, ReactNode | AppElementsInterception | readonly AppElementsSlotBinding[]>>;
     artifactCompatibility?: ArtifactCompatibilityEnvelope;
     layoutFlags: LayoutFlags;
+    renderObservation?: RenderObservation;
   }): ReactNode | AppOutgoingElements;
   encodePageId(routePath: string, interceptionContext: string | null): string;
   encodeRouteId(routePath: string, interceptionContext: string | null): string;
@@ -124,12 +155,13 @@ declare function withLayoutFlags<T extends Record<string, unknown>>(elements: T,
   [APP_LAYOUT_FLAGS_KEY]: LayoutFlags;
 };
 declare function buildOutgoingAppPayload(input: {
-  element: ReactNode | Readonly<Record<string, ReactNode>>;
+  element: ReactNode | Readonly<Record<string, ReactNode | AppElementsInterception | readonly AppElementsSlotBinding[]>>;
   artifactCompatibility?: ArtifactCompatibilityEnvelope;
   layoutFlags: LayoutFlags;
+  renderObservation?: RenderObservation;
 }): ReactNode | AppOutgoingElements;
 declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 declare const AppElementsWire: AppElementsWireCodec;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsSlotBindingState, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
 //# sourceMappingURL=app-elements-wire.d.ts.map