vinext 0.0.49 → 0.0.51

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

@@ -1,26 +1,14 @@
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { RSC_ACTION_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
+import { normalizePath } from "./normalize-path.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { getMountedSlotIdsHeader } from "./app-elements.js";
+import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
+import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
-import { NavigationTraceReasonCodes, createNavigationTrace } from "./navigation-trace.js";
+import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
+import { navigationPlanner } from "./navigation-planner.js";
 //#region src/server/app-browser-state.ts
-const VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = "__vinext_previousNextUrl";
-function cloneHistoryState(state) {
-	if (!state || typeof state !== "object") return {};
-	const nextState = {};
-	for (const [key, value] of Object.entries(state)) nextState[key] = value;
-	return nextState;
-}
-function createHistoryStateWithPreviousNextUrl(state, previousNextUrl) {
-	const nextState = cloneHistoryState(state);
-	if (previousNextUrl === null) delete nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];
-	else nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY] = previousNextUrl;
-	return Object.keys(nextState).length > 0 ? nextState : null;
-}
-function readHistoryStatePreviousNextUrl(state) {
-	const value = cloneHistoryState(state)[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];
-	return typeof value === "string" ? value : null;
-}
 function createOperationRecord(options) {
 	return {
 		id: options.id,
@@ -29,6 +17,15 @@ function createOperationRecord(options) {
 		state: "pending"
 	};
 }
+function normalizeNavigationSnapshotMatchedUrl(pathname) {
+	return normalizePath(normalizePathnameForRouteMatch(pathname));
+}
+function createRouteSnapshotRouteId(options) {
+	if (options.interception !== null) return options.routeId;
+	const parsed = AppElementsWire.parseElementKey(options.routeId);
+	if (parsed?.kind !== "route" || parsed.interceptionContext === null) return options.routeId;
+	return AppElementsWire.encodeRouteId(parsed.path, null);
+}
 function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl, basePath = "") {
 	if (previousNextUrl === null) return null;
 	return stripBasePath(new URL(previousNextUrl, "http://localhost").pathname, basePath);
@@ -46,61 +43,167 @@ function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl, basePath
 */
 function resolveServerActionRequestState(options) {
 	const headers = createRscRequestHeaders();
-	headers.set("x-rsc-action", options.actionId);
+	headers.set(RSC_ACTION_HEADER, options.actionId);
 	const interceptionContext = resolveInterceptionContextFromPreviousNextUrl(options.previousNextUrl, options.basePath);
-	if (interceptionContext !== null) headers.set("X-Vinext-Interception-Context", interceptionContext);
+	if (interceptionContext !== null) headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, interceptionContext);
 	const mountedSlotsHeader = getMountedSlotIdsHeader(options.elements);
-	if (mountedSlotsHeader !== null) headers.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
+	if (mountedSlotsHeader !== null) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
 	return { headers };
 }
-function shouldHardNavigate(currentRootLayoutTreePath, nextRootLayoutTreePath) {
-	return currentRootLayoutTreePath !== null && nextRootLayoutTreePath !== null && currentRootLayoutTreePath !== nextRootLayoutTreePath;
+function resolvePendingNavigationCommitDispositionDecision(options) {
+	const traceFields = createPendingNavigationTraceFields(options);
+	if (options.startedNavigationId !== options.activeNavigationId || options.pending.action.operation.startedVisibleCommitVersion !== options.currentState.visibleCommitVersion) return {
+		disposition: "skip",
+		preserveElementIds: [],
+		trace: createNavigationTrace(NavigationTraceReasonCodes.staleOperation, traceFields)
+	};
+	return mapNavigationDecisionToPendingDisposition(planPendingRootBoundaryFlightResponse({
+		currentState: options.currentState,
+		pending: options.pending,
+		routeManifest: options.routeManifest ?? null,
+		targetHref: options.targetHref,
+		traceFields
+	}));
+}
+function createPendingNavigationTraceFields(options) {
+	return {
+		...createNavigationLifecycleTraceFields({
+			activeNavigationId: options.activeNavigationId,
+			currentRootLayoutTreePath: options.currentState.rootLayoutTreePath,
+			currentVisibleCommitVersion: options.currentState.visibleCommitVersion,
+			nextRootLayoutTreePath: options.pending.rootLayoutTreePath,
+			startedNavigationId: options.startedNavigationId,
+			startedVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion
+		}),
+		...options.targetHref !== void 0 ? { targetHref: options.targetHref } : {}
+	};
 }
-function resolvePendingNavigationCommitDisposition(options) {
-	if (options.startedNavigationId !== options.activeNavigationId) return "skip";
-	if (options.startedVisibleCommitVersion !== options.currentVisibleCommitVersion) return "skip";
-	if (shouldHardNavigate(options.currentRootLayoutTreePath, options.nextRootLayoutTreePath)) return "hard-navigate";
-	return "dispatch";
+function createNavigationSnapshotUrl(snapshot) {
+	const query = snapshot.searchParams.toString();
+	return query === "" ? snapshot.pathname : `${snapshot.pathname}?${query}`;
 }
-function resolvePendingNavigationCommitDispositionDecision(options) {
-	const disposition = resolvePendingNavigationCommitDisposition(options);
-	const traceFields = {
-		activeNavigationId: options.activeNavigationId,
-		currentRootLayoutTreePath: options.currentRootLayoutTreePath,
-		currentVisibleCommitVersion: options.currentVisibleCommitVersion,
-		nextRootLayoutTreePath: options.nextRootLayoutTreePath,
-		startedNavigationId: options.startedNavigationId,
-		startedVisibleCommitVersion: options.startedVisibleCommitVersion
+function createMountedParallelSlotSnapshots(elements) {
+	const snapshots = [];
+	for (const slotId of getMountedSlotIds(elements)) {
+		const parsed = AppElementsWire.parseElementKey(slotId);
+		if (parsed?.kind !== "slot") continue;
+		snapshots.push({
+			ownerLayoutId: AppElementsWire.encodeLayoutId(parsed.treePath),
+			slotId
+		});
+	}
+	return snapshots;
+}
+function createVisibleRouteSnapshot(state) {
+	const displayUrl = createNavigationSnapshotUrl(state.navigationSnapshot);
+	const matchedUrl = normalizeNavigationSnapshotMatchedUrl(state.navigationSnapshot.pathname);
+	return {
+		displayUrl,
+		interception: state.interception,
+		interceptionContext: state.interceptionContext,
+		layoutIds: state.layoutIds,
+		matchedUrl,
+		mountedParallelSlots: createMountedParallelSlotSnapshots(state.elements),
+		rootBoundaryId: state.rootLayoutTreePath,
+		routeId: createRouteSnapshotRouteId({
+			interception: state.interception,
+			routeId: state.routeId
+		}),
+		slotBindings: state.slotBindings
 	};
+}
+function createPendingRouteSnapshot(pending) {
+	const displayUrl = createNavigationSnapshotUrl(pending.action.navigationSnapshot);
+	const matchedUrl = normalizeNavigationSnapshotMatchedUrl(pending.action.navigationSnapshot.pathname);
 	return {
-		disposition,
-		trace: createNavigationTrace(getPendingNavigationCommitDispositionTraceCode({
-			currentRootLayoutTreePath: options.currentRootLayoutTreePath,
-			disposition,
-			nextRootLayoutTreePath: options.nextRootLayoutTreePath
-		}), traceFields)
+		displayUrl,
+		interception: pending.action.interception,
+		interceptionContext: pending.action.interceptionContext,
+		layoutIds: pending.action.layoutIds,
+		matchedUrl,
+		mountedParallelSlots: createMountedParallelSlotSnapshots(pending.action.elements),
+		rootBoundaryId: pending.rootLayoutTreePath,
+		routeId: createRouteSnapshotRouteId({
+			interception: pending.action.interception,
+			routeId: pending.routeId
+		}),
+		slotBindings: pending.action.slotBindings
 	};
 }
-function getPendingNavigationCommitDispositionTraceCode(options) {
-	switch (options.disposition) {
-		case "skip": return NavigationTraceReasonCodes.staleOperation;
-		case "hard-navigate": return NavigationTraceReasonCodes.rootBoundaryChanged;
-		case "dispatch": return options.currentRootLayoutTreePath === null || options.nextRootLayoutTreePath === null ? NavigationTraceReasonCodes.rootBoundaryUnknown : NavigationTraceReasonCodes.commitCurrent;
-		default: {
-			const _exhaustive = options.disposition;
-			throw new Error("[vinext] Unknown navigation commit disposition: " + String(_exhaustive));
+function createPendingNavigationOperationToken(options) {
+	return {
+		baseVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion,
+		deploymentVersion: null,
+		graphVersion: options.routeManifest?.graphVersion ?? null,
+		lane: options.pending.action.operation.lane,
+		operationId: options.pending.action.operation.id,
+		targetSnapshotFingerprint: createRootBoundarySnapshotFingerprint(options.targetSnapshot)
+	};
+}
+function createRootBoundarySnapshotFingerprint(snapshot) {
+	return `${snapshot.routeId}|root:${snapshot.rootBoundaryId ?? "unknown"}`;
+}
+function planPendingRootBoundaryFlightResponse(options) {
+	const targetSnapshot = createPendingRouteSnapshot(options.pending);
+	const token = createPendingNavigationOperationToken({
+		pending: options.pending,
+		routeManifest: options.routeManifest,
+		targetSnapshot
+	});
+	return navigationPlanner.plan({
+		routeManifest: options.routeManifest,
+		state: {
+			nextOperationToken: token,
+			traceFields: options.traceFields,
+			visibleCommitVersion: options.currentState.visibleCommitVersion,
+			visibleSnapshot: createVisibleRouteSnapshot(options.currentState)
+		},
+		event: {
+			kind: "flightResponseArrived",
+			result: {
+				href: options.targetHref ?? targetSnapshot.displayUrl,
+				targetSnapshot
+			},
+			token
 		}
+	});
+}
+function mapNavigationDecisionToPendingDisposition(decision) {
+	switch (decision.kind) {
+		case "proposeCommit": return {
+			disposition: "dispatch",
+			preserveAbsentSlots: decision.proposal.preserveAbsentSlots,
+			preserveElementIds: decision.proposal.preserveElementIds,
+			preservePreviousSlotIds: decision.proposal.preservePreviousSlotIds,
+			trace: decision.trace
+		};
+		case "hardNavigate": return {
+			disposition: "hard-navigate",
+			preserveElementIds: [],
+			trace: decision.trace
+		};
+		case "noCommit": return {
+			disposition: "skip",
+			preserveElementIds: [],
+			trace: decision.trace
+		};
+		case "requestWork": throw new Error(`[vinext] Root-boundary commit planning returned requestWork (${decision.work.kind}); flightResponseArrived should never request work`);
+		default: throw new Error("[vinext] Unknown navigation decision: " + String(decision));
 	}
 }
 async function createPendingNavigationCommit(options) {
 	const elements = await options.nextElements;
 	const metadata = AppElementsWire.readMetadata(elements);
-	const previousNextUrl = options.previousNextUrl !== void 0 ? options.previousNextUrl : options.currentState.previousNextUrl;
+	const requestedPreviousNextUrl = options.previousNextUrl !== void 0 ? options.previousNextUrl : options.currentState.previousNextUrl;
+	const previousNextUrl = metadata.interception === null ? null : requestedPreviousNextUrl;
 	return {
 		action: {
 			elements,
+			interception: metadata.interception,
 			interceptionContext: metadata.interceptionContext,
+			layoutIds: metadata.layoutIds,
 			layoutFlags: metadata.layoutFlags,
+			slotBindings: metadata.slotBindings,
 			navigationSnapshot: options.navigationSnapshot,
 			operation: createOperationRecord({
 				id: options.renderId,
@@ -113,6 +216,7 @@ async function createPendingNavigationCommit(options) {
 			routeId: metadata.routeId,
 			type: options.type
 		},
+		interception: metadata.interception,
 		interceptionContext: metadata.interceptionContext,
 		previousNextUrl,
 		rootLayoutTreePath: metadata.rootLayoutTreePath,
@@ -120,6 +224,6 @@ async function createPendingNavigationCommit(options) {
 	};
 }
 //#endregion
-export { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState, shouldHardNavigate };
+export { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState };
 
 //# sourceMappingURL=app-browser-state.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"app-browser-state.js","names":[],"sources":["../../src/server/app-browser-state.ts"],"sourcesContent":["import { stripBasePath } from \"../utils/base-path.js\";\nimport {\n  AppElementsWire,\n  getMountedSlotIdsHeader,\n  type AppElements,\n  type LayoutFlags,\n} from \"./app-elements.js\";\nimport { createRscRequestHeaders } from \"./app-rsc-cache-busting.js\";\nimport {\n  NavigationTraceReasonCodes,\n  createNavigationTrace,\n  type NavigationTrace,\n  type NavigationTraceReasonCode,\n} from \"./navigation-trace.js\";\nimport type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\n\nconst VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = \"__vinext_previousNextUrl\";\n\ntype HistoryStateRecord = {\n  [key: string]: unknown;\n};\n\nexport type OperationLane = \"navigation\" | \"refresh\" | \"traverse\" | \"server-action\" | \"hmr\";\n\ntype OperationRecordBase = {\n  id: number;\n  lane: OperationLane;\n  startedVisibleCommitVersion: number;\n};\n\nexport type PendingOperationRecord = OperationRecordBase & {\n  state: \"pending\";\n};\n\nexport type CommittedOperationRecord = OperationRecordBase & {\n  state: \"committed\";\n  visibleCommitVersion: number;\n};\n\nexport type OperationRecord = PendingOperationRecord | CommittedOperationRecord;\n\nexport type AppRouterState = {\n  activeOperation: OperationRecord | null;\n  elements: AppElements;\n  interceptionContext: string | null;\n  layoutFlags: LayoutFlags;\n  previousNextUrl: string | null;\n  renderId: number;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  rootLayoutTreePath: string | null;\n  routeId: string;\n  visibleCommitVersion: number;\n};\n\nexport type AppRouterAction = {\n  elements: AppElements;\n  interceptionContext: string | null;\n  layoutFlags: LayoutFlags;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  operation: PendingOperationRecord;\n  previousNextUrl: string | null;\n  renderId: number;\n  rootLayoutTreePath: string | null;\n  routeId: string;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n};\n\nexport type PendingNavigationCommit = {\n  action: AppRouterAction;\n  interceptionContext: string | null;\n  previousNextUrl: string | null;\n  rootLayoutTreePath: string | null;\n  routeId: string;\n};\n\ntype PendingNavigationCommitDisposition = \"dispatch\" | \"hard-navigate\" | \"skip\";\ntype PendingNavigationCommitDispositionDecision = {\n  disposition: PendingNavigationCommitDisposition;\n  trace: NavigationTrace;\n};\n\nfunction cloneHistoryState(state: unknown): HistoryStateRecord {\n  if (!state || typeof state !== \"object\") {\n    return {};\n  }\n\n  const nextState: HistoryStateRecord = {};\n  for (const [key, value] of Object.entries(state)) {\n    nextState[key] = value;\n  }\n  return nextState;\n}\n\nexport function createHistoryStateWithPreviousNextUrl(\n  state: unknown,\n  previousNextUrl: string | null,\n): HistoryStateRecord | null {\n  const nextState = cloneHistoryState(state);\n\n  if (previousNextUrl === null) {\n    delete nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];\n  } else {\n    nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY] = previousNextUrl;\n  }\n\n  return Object.keys(nextState).length > 0 ? nextState : null;\n}\n\nexport function readHistoryStatePreviousNextUrl(state: unknown): string | null {\n  const value = cloneHistoryState(state)[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];\n  return typeof value === \"string\" ? value : null;\n}\n\nfunction createOperationRecord(options: {\n  id: number;\n  lane: OperationLane;\n  startedVisibleCommitVersion: number;\n}): PendingOperationRecord {\n  return {\n    id: options.id,\n    lane: options.lane,\n    startedVisibleCommitVersion: options.startedVisibleCommitVersion,\n    state: \"pending\",\n  };\n}\n\nexport function resolveInterceptionContextFromPreviousNextUrl(\n  previousNextUrl: string | null,\n  basePath: string = \"\",\n): string | null {\n  if (previousNextUrl === null) {\n    return null;\n  }\n\n  const parsedUrl = new URL(previousNextUrl, \"http://localhost\");\n  return stripBasePath(parsedUrl.pathname, basePath);\n}\n\ntype ResolveServerActionRequestStateOptions = {\n  actionId: string;\n  basePath: string;\n  elements: AppElements;\n  previousNextUrl: string | null;\n};\n\ntype ResolveServerActionRequestStateResult = {\n  headers: Headers;\n};\n\n/**\n * Pure: builds the fetch Headers for a server-action POST. Carries the same\n * interception-context and mounted-slots headers the refresh path already\n * sends, so the server-action re-render can rebuild the intercepted tree\n * instead of replacing it with the direct route.\n *\n * Next.js sends `Next-URL: state.previousNextUrl || state.nextUrl` on action\n * POSTs when `hasInterceptionRouteInCurrentTree(state.tree)`. Vinext's\n * X-Vinext-Interception-Context is the equivalent signal for the server-side\n * `findIntercept` lookup.\n */\nexport function resolveServerActionRequestState(\n  options: ResolveServerActionRequestStateOptions,\n): ResolveServerActionRequestStateResult {\n  const headers = createRscRequestHeaders();\n  headers.set(\"x-rsc-action\", options.actionId);\n\n  const interceptionContext = resolveInterceptionContextFromPreviousNextUrl(\n    options.previousNextUrl,\n    options.basePath,\n  );\n  if (interceptionContext !== null) {\n    headers.set(\"X-Vinext-Interception-Context\", interceptionContext);\n  }\n\n  const mountedSlotsHeader = getMountedSlotIdsHeader(options.elements);\n  if (mountedSlotsHeader !== null) {\n    headers.set(\"X-Vinext-Mounted-Slots\", mountedSlotsHeader);\n  }\n\n  return { headers };\n}\n\nexport function shouldHardNavigate(\n  currentRootLayoutTreePath: string | null,\n  nextRootLayoutTreePath: string | null,\n): boolean {\n  // `null` means the payload could not identify an enclosing root layout\n  // boundary. Treat that as soft-navigation compatible so fallback payloads\n  // do not force a hard reload purely because metadata is absent.\n  return (\n    currentRootLayoutTreePath !== null &&\n    nextRootLayoutTreePath !== null &&\n    currentRootLayoutTreePath !== nextRootLayoutTreePath\n  );\n}\n\nexport function resolvePendingNavigationCommitDisposition(options: {\n  activeNavigationId: number;\n  currentVisibleCommitVersion: number;\n  currentRootLayoutTreePath: string | null;\n  nextRootLayoutTreePath: string | null;\n  startedNavigationId: number;\n  startedVisibleCommitVersion: number;\n}): PendingNavigationCommitDisposition {\n  if (options.startedNavigationId !== options.activeNavigationId) {\n    return \"skip\";\n  }\n\n  if (options.startedVisibleCommitVersion !== options.currentVisibleCommitVersion) {\n    return \"skip\";\n  }\n\n  if (shouldHardNavigate(options.currentRootLayoutTreePath, options.nextRootLayoutTreePath)) {\n    return \"hard-navigate\";\n  }\n\n  return \"dispatch\";\n}\n\nexport function resolvePendingNavigationCommitDispositionDecision(options: {\n  activeNavigationId: number;\n  currentVisibleCommitVersion: number;\n  currentRootLayoutTreePath: string | null;\n  nextRootLayoutTreePath: string | null;\n  startedNavigationId: number;\n  startedVisibleCommitVersion: number;\n}): PendingNavigationCommitDispositionDecision {\n  const disposition = resolvePendingNavigationCommitDisposition(options);\n  const traceFields = {\n    activeNavigationId: options.activeNavigationId,\n    currentRootLayoutTreePath: options.currentRootLayoutTreePath,\n    currentVisibleCommitVersion: options.currentVisibleCommitVersion,\n    nextRootLayoutTreePath: options.nextRootLayoutTreePath,\n    startedNavigationId: options.startedNavigationId,\n    startedVisibleCommitVersion: options.startedVisibleCommitVersion,\n  };\n\n  return {\n    disposition,\n    trace: createNavigationTrace(\n      getPendingNavigationCommitDispositionTraceCode({\n        currentRootLayoutTreePath: options.currentRootLayoutTreePath,\n        disposition,\n        nextRootLayoutTreePath: options.nextRootLayoutTreePath,\n      }),\n      traceFields,\n    ),\n  };\n}\n\nfunction getPendingNavigationCommitDispositionTraceCode(options: {\n  currentRootLayoutTreePath: string | null;\n  disposition: PendingNavigationCommitDisposition;\n  nextRootLayoutTreePath: string | null;\n}): NavigationTraceReasonCode {\n  switch (options.disposition) {\n    case \"skip\":\n      return NavigationTraceReasonCodes.staleOperation;\n    case \"hard-navigate\":\n      return NavigationTraceReasonCodes.rootBoundaryChanged;\n    case \"dispatch\":\n      return options.currentRootLayoutTreePath === null || options.nextRootLayoutTreePath === null\n        ? NavigationTraceReasonCodes.rootBoundaryUnknown\n        : NavigationTraceReasonCodes.commitCurrent;\n    default: {\n      const _exhaustive: never = options.disposition;\n      throw new Error(\"[vinext] Unknown navigation commit disposition: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport async function createPendingNavigationCommit(options: {\n  currentState: AppRouterState;\n  nextElements: Promise<AppElements>;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  operationLane: OperationLane;\n  previousNextUrl?: string | null;\n  renderId: number;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n}): Promise<PendingNavigationCommit> {\n  const elements = await options.nextElements;\n  const metadata = AppElementsWire.readMetadata(elements);\n  const previousNextUrl =\n    options.previousNextUrl !== undefined\n      ? options.previousNextUrl\n      : options.currentState.previousNextUrl;\n\n  return {\n    action: {\n      elements,\n      interceptionContext: metadata.interceptionContext,\n      layoutFlags: metadata.layoutFlags,\n      navigationSnapshot: options.navigationSnapshot,\n      operation: createOperationRecord({\n        id: options.renderId,\n        lane: options.operationLane,\n        startedVisibleCommitVersion: options.currentState.visibleCommitVersion,\n      }),\n      previousNextUrl,\n      renderId: options.renderId,\n      rootLayoutTreePath: metadata.rootLayoutTreePath,\n      routeId: metadata.routeId,\n      type: options.type,\n    },\n    // Convenience aliases — always equal action.interceptionContext / action.rootLayoutTreePath / action.routeId.\n    interceptionContext: metadata.interceptionContext,\n    previousNextUrl,\n    rootLayoutTreePath: metadata.rootLayoutTreePath,\n    routeId: metadata.routeId,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-browser-state.js","names":["_exhaustive"],"sources":["../../src/server/app-browser-state.ts"],"sourcesContent":["import { stripBasePath } from \"../utils/base-path.js\";\nimport type { RouteManifest } from \"../routing/app-route-graph.js\";\nimport {\n  AppElementsWire,\n  getMountedSlotIds,\n  getMountedSlotIdsHeader,\n  type AppElements,\n  type AppElementsInterception,\n  type AppElementsSlotBinding,\n  type LayoutFlags,\n} from \"./app-elements.js\";\nimport { createRscRequestHeaders } from \"./app-rsc-cache-busting.js\";\nimport {\n  RSC_ACTION_HEADER,\n  VINEXT_INTERCEPTION_CONTEXT_HEADER,\n  VINEXT_MOUNTED_SLOTS_HEADER,\n} from \"./headers.js\";\nimport {\n  NavigationTraceReasonCodes,\n  createNavigationLifecycleTraceFields,\n  createNavigationTrace,\n  type NavigationTrace,\n  type NavigationTraceFields,\n} from \"./navigation-trace.js\";\nimport {\n  navigationPlanner,\n  type MountedParallelSlotSnapshotV0,\n  type NavigationDecisionV0,\n  type OperationLane,\n  type OperationToken,\n  type RouteSnapshotV0,\n} from \"./navigation-planner.js\";\nimport type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport { normalizePathnameForRouteMatch } from \"../routing/utils.js\";\nimport { normalizePath } from \"./normalize-path.js\";\nexport {\n  createHistoryStateWithNavigationMetadata,\n  createHistoryStateWithPreviousNextUrl,\n  readHistoryStatePreviousNextUrl,\n  readHistoryStateTraversalIndex,\n  resolveHistoryTraversalIntent,\n  type HistoryTraversalIntent,\n} from \"./app-history-state.js\";\n\nexport type { OperationLane } from \"./navigation-planner.js\";\n\ntype OperationRecordBase = {\n  id: number;\n  lane: OperationLane;\n  startedVisibleCommitVersion: number;\n};\n\nexport type PendingOperationRecord = OperationRecordBase & {\n  state: \"pending\";\n};\n\nexport type CommittedOperationRecord = OperationRecordBase & {\n  state: \"committed\";\n  visibleCommitVersion: number;\n};\n\nexport type OperationRecord = PendingOperationRecord | CommittedOperationRecord;\n\nexport type AppRouterState = {\n  activeOperation: OperationRecord | null;\n  elements: AppElements;\n  interception: AppElementsInterception | null;\n  interceptionContext: string | null;\n  layoutFlags: LayoutFlags;\n  layoutIds: readonly string[];\n  previousNextUrl: string | null;\n  renderId: number;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  rootLayoutTreePath: string | null;\n  routeId: string;\n  slotBindings: readonly AppElementsSlotBinding[];\n  visibleCommitVersion: number;\n};\n\nexport type AppRouterAction = {\n  elements: AppElements;\n  interception: AppElementsInterception | null;\n  interceptionContext: string | null;\n  layoutFlags: LayoutFlags;\n  layoutIds: readonly string[];\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  operation: PendingOperationRecord;\n  previousNextUrl: string | null;\n  renderId: number;\n  rootLayoutTreePath: string | null;\n  routeId: string;\n  slotBindings: readonly AppElementsSlotBinding[];\n  type: \"navigate\" | \"replace\" | \"traverse\";\n};\n\nexport type PendingNavigationCommit = {\n  action: AppRouterAction;\n  interception: AppElementsInterception | null;\n  interceptionContext: string | null;\n  previousNextUrl: string | null;\n  rootLayoutTreePath: string | null;\n  routeId: string;\n};\n\ntype PendingNavigationCommitDisposition = \"dispatch\" | \"hard-navigate\" | \"skip\";\ntype DispatchPendingNavigationCommitDispositionDecision = {\n  disposition: \"dispatch\";\n  preserveAbsentSlots: boolean;\n  preserveElementIds: readonly string[];\n  preservePreviousSlotIds: readonly string[];\n  trace: NavigationTrace;\n};\ntype NonDispatchPendingNavigationCommitDispositionDecision = {\n  disposition: Exclude<PendingNavigationCommitDisposition, \"dispatch\">;\n  preserveElementIds: readonly [];\n  trace: NavigationTrace;\n};\ntype PendingNavigationCommitDispositionDecision =\n  | DispatchPendingNavigationCommitDispositionDecision\n  | NonDispatchPendingNavigationCommitDispositionDecision;\nfunction createOperationRecord(options: {\n  id: number;\n  lane: OperationLane;\n  startedVisibleCommitVersion: number;\n}): PendingOperationRecord {\n  return {\n    id: options.id,\n    lane: options.lane,\n    startedVisibleCommitVersion: options.startedVisibleCommitVersion,\n    state: \"pending\",\n  };\n}\n\nfunction normalizeNavigationSnapshotMatchedUrl(pathname: string): string {\n  return normalizePath(normalizePathnameForRouteMatch(pathname));\n}\n\nfunction createRouteSnapshotRouteId(options: {\n  interception: AppElementsInterception | null;\n  routeId: string;\n}): string {\n  if (options.interception !== null) return options.routeId;\n\n  const parsed = AppElementsWire.parseElementKey(options.routeId);\n  if (parsed?.kind !== \"route\" || parsed.interceptionContext === null) {\n    return options.routeId;\n  }\n\n  // A context suffix keeps AppElements render keys partitioned, but without\n  // explicit interception proof it is not semantic route authority.\n  return AppElementsWire.encodeRouteId(parsed.path, null);\n}\n\nexport function resolveInterceptionContextFromPreviousNextUrl(\n  previousNextUrl: string | null,\n  basePath: string = \"\",\n): string | null {\n  if (previousNextUrl === null) {\n    return null;\n  }\n\n  const parsedUrl = new URL(previousNextUrl, \"http://localhost\");\n  return stripBasePath(parsedUrl.pathname, basePath);\n}\n\ntype ResolveServerActionRequestStateOptions = {\n  actionId: string;\n  basePath: string;\n  elements: AppElements;\n  previousNextUrl: string | null;\n};\n\ntype ResolveServerActionRequestStateResult = {\n  headers: Headers;\n};\n\n/**\n * Pure: builds the fetch Headers for a server-action POST. Carries the same\n * interception-context and mounted-slots headers the refresh path already\n * sends, so the server-action re-render can rebuild the intercepted tree\n * instead of replacing it with the direct route.\n *\n * Next.js sends `Next-URL: state.previousNextUrl || state.nextUrl` on action\n * POSTs when `hasInterceptionRouteInCurrentTree(state.tree)`. Vinext's\n * X-Vinext-Interception-Context is the equivalent signal for the server-side\n * `findIntercept` lookup.\n */\nexport function resolveServerActionRequestState(\n  options: ResolveServerActionRequestStateOptions,\n): ResolveServerActionRequestStateResult {\n  const headers = createRscRequestHeaders();\n  headers.set(RSC_ACTION_HEADER, options.actionId);\n\n  const interceptionContext = resolveInterceptionContextFromPreviousNextUrl(\n    options.previousNextUrl,\n    options.basePath,\n  );\n  if (interceptionContext !== null) {\n    headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, interceptionContext);\n  }\n\n  const mountedSlotsHeader = getMountedSlotIdsHeader(options.elements);\n  if (mountedSlotsHeader !== null) {\n    headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);\n  }\n\n  return { headers };\n}\n\nexport function resolvePendingNavigationCommitDispositionDecision(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref?: string;\n}): PendingNavigationCommitDispositionDecision {\n  const traceFields = createPendingNavigationTraceFields(options);\n\n  if (\n    options.startedNavigationId !== options.activeNavigationId ||\n    options.pending.action.operation.startedVisibleCommitVersion !==\n      options.currentState.visibleCommitVersion\n  ) {\n    return {\n      disposition: \"skip\",\n      preserveElementIds: [],\n      trace: createNavigationTrace(NavigationTraceReasonCodes.staleOperation, traceFields),\n    };\n  }\n\n  return mapNavigationDecisionToPendingDisposition(\n    planPendingRootBoundaryFlightResponse({\n      currentState: options.currentState,\n      pending: options.pending,\n      routeManifest: options.routeManifest ?? null,\n      targetHref: options.targetHref,\n      traceFields,\n    }),\n  );\n}\n\nfunction createPendingNavigationTraceFields(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  startedNavigationId: number;\n  targetHref?: string;\n}): NavigationTraceFields {\n  return {\n    ...createNavigationLifecycleTraceFields({\n      activeNavigationId: options.activeNavigationId,\n      currentRootLayoutTreePath: options.currentState.rootLayoutTreePath,\n      currentVisibleCommitVersion: options.currentState.visibleCommitVersion,\n      nextRootLayoutTreePath: options.pending.rootLayoutTreePath,\n      startedNavigationId: options.startedNavigationId,\n      startedVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion,\n    }),\n    ...(options.targetHref !== undefined ? { targetHref: options.targetHref } : {}),\n  };\n}\n\nfunction createNavigationSnapshotUrl(snapshot: ClientNavigationRenderSnapshot): string {\n  const query = snapshot.searchParams.toString();\n  return query === \"\" ? snapshot.pathname : `${snapshot.pathname}?${query}`;\n}\n\nfunction createMountedParallelSlotSnapshots(\n  elements: AppElements,\n): readonly MountedParallelSlotSnapshotV0[] {\n  const snapshots: MountedParallelSlotSnapshotV0[] = [];\n  for (const slotId of getMountedSlotIds(elements)) {\n    const parsed = AppElementsWire.parseElementKey(slotId);\n    if (parsed?.kind !== \"slot\") continue;\n    snapshots.push({\n      ownerLayoutId: AppElementsWire.encodeLayoutId(parsed.treePath),\n      slotId,\n    });\n  }\n  return snapshots;\n}\n\nfunction createVisibleRouteSnapshot(state: AppRouterState): RouteSnapshotV0 {\n  const displayUrl = createNavigationSnapshotUrl(state.navigationSnapshot);\n  const matchedUrl = normalizeNavigationSnapshotMatchedUrl(state.navigationSnapshot.pathname);\n  return {\n    displayUrl,\n    interception: state.interception,\n    interceptionContext: state.interceptionContext,\n    layoutIds: state.layoutIds,\n    // `displayUrl` preserves the browser-visible URL for decisions and traces.\n    // `matchedUrl` uses the route-state canonical pathname, matching the\n    // server's segment-decoded representation without changing user-facing\n    // navigation state such as usePathname().\n    matchedUrl,\n    mountedParallelSlots: createMountedParallelSlotSnapshots(state.elements),\n    rootBoundaryId: state.rootLayoutTreePath,\n    routeId: createRouteSnapshotRouteId({\n      interception: state.interception,\n      routeId: state.routeId,\n    }),\n    slotBindings: state.slotBindings,\n  };\n}\n\nfunction createPendingRouteSnapshot(pending: PendingNavigationCommit): RouteSnapshotV0 {\n  const displayUrl = createNavigationSnapshotUrl(pending.action.navigationSnapshot);\n  const matchedUrl = normalizeNavigationSnapshotMatchedUrl(\n    pending.action.navigationSnapshot.pathname,\n  );\n  return {\n    displayUrl,\n    interception: pending.action.interception,\n    interceptionContext: pending.action.interceptionContext,\n    layoutIds: pending.action.layoutIds,\n    // See createVisibleRouteSnapshot: matchedUrl intentionally models the route\n    // identity, not the address bar URL.\n    matchedUrl,\n    mountedParallelSlots: createMountedParallelSlotSnapshots(pending.action.elements),\n    rootBoundaryId: pending.rootLayoutTreePath,\n    routeId: createRouteSnapshotRouteId({\n      interception: pending.action.interception,\n      routeId: pending.routeId,\n    }),\n    slotBindings: pending.action.slotBindings,\n  };\n}\n\nfunction createPendingNavigationOperationToken(options: {\n  pending: PendingNavigationCommit;\n  routeManifest: RouteManifest | null;\n  targetSnapshot: RouteSnapshotV0;\n}): OperationToken {\n  return {\n    baseVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion,\n    deploymentVersion: null,\n    graphVersion: options.routeManifest?.graphVersion ?? null,\n    lane: options.pending.action.operation.lane,\n    operationId: options.pending.action.operation.id,\n    targetSnapshotFingerprint: createRootBoundarySnapshotFingerprint(options.targetSnapshot),\n  };\n}\n\nfunction createRootBoundarySnapshotFingerprint(snapshot: RouteSnapshotV0): string {\n  return `${snapshot.routeId}|root:${snapshot.rootBoundaryId ?? \"unknown\"}`;\n}\n\nfunction planPendingRootBoundaryFlightResponse(options: {\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  routeManifest: RouteManifest | null;\n  targetHref?: string;\n  traceFields: NavigationTraceFields;\n}): NavigationDecisionV0 {\n  const targetSnapshot = createPendingRouteSnapshot(options.pending);\n  const token = createPendingNavigationOperationToken({\n    pending: options.pending,\n    routeManifest: options.routeManifest,\n    targetSnapshot,\n  });\n\n  // #726-CORE-07/08 keeps the browser state layer as the lifecycle gate and\n  // only translates committed AppElements metadata into planner snapshots.\n  // RouteManifest now supplies graph-owned route topology while snapshots\n  // continue to carry runtime state such as visible slot content.\n  return navigationPlanner.plan({\n    routeManifest: options.routeManifest,\n    state: {\n      nextOperationToken: token,\n      traceFields: options.traceFields,\n      visibleCommitVersion: options.currentState.visibleCommitVersion,\n      visibleSnapshot: createVisibleRouteSnapshot(options.currentState),\n    },\n    event: {\n      kind: \"flightResponseArrived\",\n      result: {\n        // Approval call sites must pass the executor's targetHref so the\n        // planner trace and future hard-nav executor agree with the browser\n        // URL. The fallback remains for lower-level tests and direct disposition\n        // callers that exercise only snapshot-derived planner semantics.\n        href: options.targetHref ?? targetSnapshot.displayUrl,\n        targetSnapshot,\n      },\n      token,\n    },\n  });\n}\n\nfunction mapNavigationDecisionToPendingDisposition(\n  decision: NavigationDecisionV0,\n): PendingNavigationCommitDispositionDecision {\n  switch (decision.kind) {\n    case \"proposeCommit\":\n      return {\n        disposition: \"dispatch\",\n        preserveAbsentSlots: decision.proposal.preserveAbsentSlots,\n        preserveElementIds: decision.proposal.preserveElementIds,\n        preservePreviousSlotIds: decision.proposal.preservePreviousSlotIds,\n        trace: decision.trace,\n      };\n    case \"hardNavigate\":\n      return { disposition: \"hard-navigate\", preserveElementIds: [], trace: decision.trace };\n    case \"noCommit\":\n      return { disposition: \"skip\", preserveElementIds: [], trace: decision.trace };\n    case \"requestWork\":\n      throw new Error(\n        `[vinext] Root-boundary commit planning returned requestWork (${decision.work.kind}); flightResponseArrived should never request work`,\n      );\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown navigation decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport async function createPendingNavigationCommit(options: {\n  currentState: AppRouterState;\n  nextElements: Promise<AppElements>;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  operationLane: OperationLane;\n  // Advisory: non-intercepted responses clear this even when callers pass the\n  // current visible previousNextUrl.\n  previousNextUrl?: string | null;\n  renderId: number;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n}): Promise<PendingNavigationCommit> {\n  const elements = await options.nextElements;\n  const metadata = AppElementsWire.readMetadata(elements);\n  const requestedPreviousNextUrl =\n    options.previousNextUrl !== undefined\n      ? options.previousNextUrl\n      : options.currentState.previousNextUrl;\n  const previousNextUrl = metadata.interception === null ? null : requestedPreviousNextUrl;\n\n  return {\n    action: {\n      elements,\n      interception: metadata.interception,\n      interceptionContext: metadata.interceptionContext,\n      layoutIds: metadata.layoutIds,\n      layoutFlags: metadata.layoutFlags,\n      slotBindings: metadata.slotBindings,\n      navigationSnapshot: options.navigationSnapshot,\n      operation: createOperationRecord({\n        id: options.renderId,\n        lane: options.operationLane,\n        startedVisibleCommitVersion: options.currentState.visibleCommitVersion,\n      }),\n      previousNextUrl,\n      renderId: options.renderId,\n      rootLayoutTreePath: metadata.rootLayoutTreePath,\n      routeId: metadata.routeId,\n      type: options.type,\n    },\n    // Convenience aliases — always equal action.interceptionContext / action.rootLayoutTreePath / action.routeId.\n    interception: metadata.interception,\n    interceptionContext: metadata.interceptionContext,\n    previousNextUrl,\n    rootLayoutTreePath: metadata.rootLayoutTreePath,\n    routeId: metadata.routeId,\n  };\n}\n"],"mappings":"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"}

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

@@ -1,25 +1,30 @@
+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
 type NavigationSnapshot = {
   pathname: string;
   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[]>;
   __VINEXT_RSC_NAV__?: NavigationSnapshot;
 };
 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,14 +1,17 @@
+import { decodeRscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
 //#region src/server/app-browser-stream.ts
 function getVinextBrowserGlobal() {
 	return globalThis;
 }
+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();
 	} });
 }
@@ -20,32 +23,50 @@ 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;
 		}
 		let closed = false;
+		let cancelDocumentCompletionCheck;
+		const cancelPendingDocumentCompletionCheck = () => {
+			const cancel = cancelDocumentCompletionCheck;
+			cancelDocumentCompletionCheck = void 0;
+			cancel?.();
+		};
 		const closeOnce = () => {
 			if (!closed) {
 				closed = true;
+				cancelPendingDocumentCompletionCheck();
 				controller.close();
 			}
 		};
+		const errorOnce = () => {
+			if (!closed) {
+				closed = true;
+				cancelPendingDocumentCompletionCheck();
+				controller.error(createUnexpectedRscStreamCloseError());
+			}
+		};
 		const arr = vinext.__VINEXT_RSC_CHUNKS__ ??= [];
 		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;
 		};
-		if (typeof document !== "undefined") if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", closeOnce);
-		else closeOnce();
+		if (typeof document !== "undefined") if (document.readyState === "loading") {
+			document.addEventListener("DOMContentLoaded", errorOnce);
+			cancelDocumentCompletionCheck = () => document.removeEventListener("DOMContentLoaded", errorOnce);
+		} else {
+			const timeoutId = setTimeout(errorOnce);
+			cancelDocumentCompletionCheck = () => clearTimeout(timeoutId);
+		}
 	} });
 }
 //#endregion

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":["type 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  __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\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      const closeOnce = () => {\n        if (!closed) {\n          closed = true;\n          controller.close();\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\", closeOnce);\n        } else {\n          closeOnce();\n        }\n      }\n    },\n  });\n}\n"],"mappings":";AAmBA,SAAgB,yBAAmE;AACjF,QAAO;;;;;AAMT,SAAgB,uBAAuB,QAAuD;CAC5F,MAAM,UAAU,IAAI,aAAa;AACjC,QAAO,IAAI,eAA2B,EACpC,MAAM,YAAY;AAChB,OAAK,MAAM,SAAS,OAClB,YAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;AAE3C,aAAW,OAAO;IAErB,CAAC;;;;;;;;;AAUJ,SAAgB,6BAAyD;CACvE,MAAM,UAAU,IAAI,aAAa;AAEjC,QAAO,IAAI,eAA2B,EACpC,MAAM,YAAY;EAChB,MAAM,SAAS,wBAAwB;EACvC,MAAM,gBAAgB,OAAO,yBAAyB,EAAE;AAExD,OAAK,MAAM,SAAS,cAClB,YAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;AAG3C,MAAI,OAAO,qBAAqB;AAC9B,cAAW,OAAO;AAClB;;EAGF,IAAI,SAAS;EACb,MAAM,kBAAkB;AACtB,OAAI,CAAC,QAAQ;AACX,aAAS;AACT,eAAW,OAAO;;;EAItB,MAAM,MAAO,OAAO,0BAA0B,EAAE;AAChD,MAAI,OAAO,SAAU,GAAG,QAA0B;GAChD,MAAM,SAAS,MAAM,UAAU,KAAK,MAAM,MAAM,OAAO;AAEvD,OAAI,OAAQ,QAAO;AAEnB,QAAK,MAAM,SAAS,OAClB,YAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;AAG3C,OAAI,OAAO,oBACT,YAAW;AAGb,UAAO;;AAGT,MAAI,OAAO,aAAa,YACtB,KAAI,SAAS,eAAe,UAC1B,UAAS,iBAAiB,oBAAoB,UAAU;MAExD,YAAW;IAIlB,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,11 +1,16 @@
+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";
-import { AppRouterAction, AppRouterState, OperationLane, PendingNavigationCommit } from "./app-browser-state.js";
+import { OperationLane } from "./navigation-planner.js";
+import { AppRouterAction, AppRouterState, PendingNavigationCommit } from "./app-browser-state.js";
 
 //#region src/server/app-browser-visible-commit.d.ts
 type VisibleCommitDecision = {
   disposition: "commit";
+  preserveAbsentSlots: boolean;
+  preserveElementIds: readonly string[];
+  preservePreviousSlotIds: readonly string[];
   trace: NavigationTrace;
 };
 type HardNavigateCommitDecision = {
@@ -22,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;
@@ -48,7 +54,9 @@ declare function approvePendingNavigationCommit(options: {
   activeNavigationId: number;
   currentState: AppRouterState;
   pending: PendingNavigationCommit;
+  routeManifest?: RouteManifest | null;
   startedNavigationId: number;
+  targetHref: string;
 }): CommitApproval;
 declare function resolveAndClassifyNavigationCommit(options: {
   activeNavigationId: number;
@@ -60,7 +68,9 @@ declare function resolveAndClassifyNavigationCommit(options: {
   operationLane: OperationLane;
   previousNextUrl?: string | null;
   renderId: number;
+  routeManifest?: RouteManifest | null;
   startedNavigationId: number;
+  targetHref: string;
   type: "navigate" | "replace" | "traverse";
 }): Promise<ClassifiedPendingNavigationCommit>;
 //#endregion