vinext 0.0.47 → 0.0.49

package/dist/server/app-browser-navigation-controller.d.ts

@@ -1,6 +1,6 @@
 import { ClientNavigationRenderSnapshot, commitClientNavigationState } from "../shims/navigation.js";
-import { AppElements } from "./app-elements.js";
-import { AppRouterState } from "./app-browser-state.js";
+import { AppElements } from "./app-elements-wire.js";
+import { AppRouterState, OperationLane } from "./app-browser-state.js";
 import { Dispatch, ReactNode } from "react";
 
 //#region src/server/app-browser-navigation-controller.d.ts
@@ -10,6 +10,7 @@ type PendingBrowserRouterState = {
   resolve: (state: AppRouterState) => void;
   settled: boolean;
 };
+type NavigationPayloadOutcome = "committed" | "no-commit" | "hard-navigate";
 type BrowserNavigationCommitEffectFactory = (options: {
   href: string;
   historyUpdateMode: HistoryUpdateMode | undefined;
@@ -38,17 +39,18 @@ type BrowserNavigationController = {
     historyUpdateMode: HistoryUpdateMode | undefined;
     navigationSnapshot: ClientNavigationRenderSnapshot;
     nextElements: Promise<AppElements>;
+    operationLane: OperationLane;
     params: Record<string, string | string[]>;
     pendingRouterState: PendingBrowserRouterState | null;
     previousNextUrl: string | null;
     targetHref: string;
     navId: number;
     useTransition?: boolean;
-  }): Promise<void>;
+  }): Promise<NavigationPayloadOutcome>;
   commitSameUrlNavigatePayload(nextElements: Promise<AppElements>, navigationSnapshot: ClientNavigationRenderSnapshot, returnValue?: {
     ok: boolean;
     data: unknown;
-  }): Promise<unknown>;
+  }, actionInitiationState?: AppRouterState): Promise<unknown>;
   hmrReplaceTree(nextElements: Promise<AppElements>, navigationSnapshot: ClientNavigationRenderSnapshot): Promise<void>;
   /**
    * Force-drain the queued pre-paint effect for the given renderId without
@@ -69,5 +71,5 @@ type BrowserNavigationController = {
 };
 declare function createAppBrowserNavigationController(deps?: BrowserNavigationControllerDeps): BrowserNavigationController;
 //#endregion
-export { HistoryUpdateMode, PendingBrowserRouterState, createAppBrowserNavigationController };
+export { HistoryUpdateMode, NavigationPayloadOutcome, PendingBrowserRouterState, createAppBrowserNavigationController };
 //# sourceMappingURL=app-browser-navigation-controller.d.ts.map

package/dist/server/app-browser-navigation-controller.js

@@ -1,5 +1,6 @@
 import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState } from "../shims/navigation.js";
-import { createPendingNavigationCommit, resolveAndClassifyNavigationCommit, resolvePendingNavigationCommitDisposition, routerReducer } from "./app-browser-state.js";
+import { createPendingNavigationCommit } from "./app-browser-state.js";
+import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useLayoutEffect } from "react";
 //#region src/server/app-browser-navigation-controller.ts
 function createAppBrowserNavigationController(deps = {}) {
@@ -80,10 +81,10 @@ function createAppBrowserNavigationController(deps = {}) {
 		settlePendingBrowserRouterState(pending);
 		if (isCurrentNavigation(navId)) clearPendingPathname(navId);
 	}
-	function resolvePendingBrowserRouterState(pending, action) {
+	function resolvePendingBrowserRouterState(pending, commit) {
 		if (!pending || pending.settled) return;
 		pending.settled = true;
-		pending.resolve(routerReducer(getBrowserRouterState(), action));
+		pending.resolve(applyApprovedVisibleCommit(getBrowserRouterState(), commit));
 		if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
 	}
 	function queuePrePaintNavigationEffect(renderId, effect) {
@@ -128,11 +129,12 @@ function createAppBrowserNavigationController(deps = {}) {
 			currentState: getBrowserRouterState(),
 			nextElements,
 			navigationSnapshot,
+			operationLane: "hmr",
 			renderId: allocateRenderId(),
 			type: "replace"
 		});
 		if (!hasBrowserRouterState()) return;
-		dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "replace", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
+		dispatchApprovedVisibleCommit(approveHmrVisibleCommit(pending), null, false);
 	}
 	function NavigationCommitSignal({ renderId, children }) {
 		useLayoutEffect(() => {
@@ -147,25 +149,14 @@ function createAppBrowserNavigationController(deps = {}) {
 		}, [renderId]);
 		return children;
 	}
-	function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType, interceptionContext, layoutFlags, previousNextUrl, routeId, rootLayoutTreePath, pendingRouterState, useTransitionMode) {
+	function dispatchApprovedVisibleCommit(commit, pendingRouterState, useTransitionMode) {
 		const setter = getBrowserRouterStateSetter();
-		const action = {
-			elements,
-			interceptionContext,
-			layoutFlags,
-			navigationSnapshot,
-			previousNextUrl,
-			renderId,
-			rootLayoutTreePath,
-			routeId,
-			type: actionType
-		};
 		const applyAction = () => {
 			if (pendingRouterState) {
-				resolvePendingBrowserRouterState(pendingRouterState, action);
+				resolvePendingBrowserRouterState(pendingRouterState, commit);
 				return;
 			}
-			setter(routerReducer(getBrowserRouterState(), action));
+			setter(applyApprovedVisibleCommit(getBrowserRouterState(), commit));
 		};
 		if (useTransitionMode) startTransition(applyAction);
 		else applyAction();
@@ -179,43 +170,45 @@ function createAppBrowserNavigationController(deps = {}) {
 		});
 		let snapshotActivated = false;
 		try {
-			const currentState = getBrowserRouterState();
 			const pending = await createPendingNavigationCommit({
-				currentState,
+				currentState: getBrowserRouterState(),
 				nextElements: options.nextElements,
 				navigationSnapshot: options.navigationSnapshot,
+				operationLane: options.operationLane,
 				previousNextUrl: options.previousNextUrl,
 				renderId,
 				type: options.actionType
 			});
-			const disposition = resolvePendingNavigationCommitDisposition({
+			const approval = approvePendingNavigationCommit({
 				activeNavigationId,
-				currentRootLayoutTreePath: currentState.rootLayoutTreePath,
-				nextRootLayoutTreePath: pending.rootLayoutTreePath,
+				currentState: getBrowserRouterState(),
+				pending,
 				startedNavigationId: options.navId
 			});
-			if (disposition === "skip") {
+			if (approval.decision.disposition === "no-commit") {
 				settlePendingBrowserRouterState(options.pendingRouterState);
 				pendingNavigationCommits.delete(renderId);
 				resolveCommitted?.();
-				return;
+				return "no-commit";
 			}
-			if (disposition === "hard-navigate") {
+			if (approval.decision.disposition === "hard-navigate") {
 				settlePendingBrowserRouterState(options.pendingRouterState);
 				pendingNavigationCommits.delete(renderId);
 				window.location.assign(options.targetHref);
-				return;
+				return "hard-navigate";
 			}
+			const approvedCommit = approval.approvedCommit;
+			if (approvedCommit === null) throw new Error("[vinext] Commit decision did not approve a visible commit");
 			queuePrePaintNavigationEffect(renderId, options.createNavigationCommitEffect({
 				href: options.targetHref,
 				historyUpdateMode: options.historyUpdateMode,
 				navId: options.navId,
 				params: options.params,
-				previousNextUrl: pending.previousNextUrl
+				previousNextUrl: approvedCommit.previousNextUrl
 			}));
 			activateNavigationSnapshot();
 			snapshotActivated = true;
-			dispatchBrowserTree(pending.action.elements, options.navigationSnapshot, renderId, options.actionType, pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, options.pendingRouterState, options.useTransition ?? true);
+			dispatchApprovedVisibleCommit(approvedCommit, options.pendingRouterState, options.useTransition ?? true);
 		} catch (error) {
 			pendingNavigationPrePaintEffects.delete(renderId);
 			pendingNavigationCommits.delete(renderId);
@@ -224,25 +217,40 @@ function createAppBrowserNavigationController(deps = {}) {
 			resolveCommitted?.();
 			throw error;
 		}
-		return committed;
+		return committed.then(() => "committed");
 	}
-	async function commitSameUrlNavigatePayload(nextElements, navigationSnapshot, returnValue) {
-		const currentState = getBrowserRouterState();
+	async function commitSameUrlNavigatePayload(nextElements, navigationSnapshot, returnValue, actionInitiationState) {
+		const currentState = actionInitiationState ?? getBrowserRouterState();
 		const startedNavigationId = activeNavigationId;
-		const { disposition, pending } = await resolveAndClassifyNavigationCommit({
+		const { approvedCommit, decision, pending, trace: _navigationTrace } = await resolveAndClassifyNavigationCommit({
 			activeNavigationId,
 			currentState,
+			getActiveNavigationId: () => activeNavigationId,
+			getCurrentStateForApproval: getBrowserRouterState,
 			navigationSnapshot,
 			nextElements,
 			renderId: allocateRenderId(),
+			operationLane: "server-action",
 			startedNavigationId,
 			type: "navigate"
 		});
-		if (disposition === "hard-navigate") {
+		if (decision.disposition === "hard-navigate") {
 			window.location.assign(window.location.href);
 			return;
 		}
-		if (disposition === "dispatch") dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "navigate", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
+		if (approvedCommit) {
+			const latestApproval = approvePendingNavigationCommit({
+				activeNavigationId,
+				currentState: getBrowserRouterState(),
+				pending,
+				startedNavigationId
+			});
+			if (latestApproval.decision.disposition === "hard-navigate") {
+				window.location.assign(window.location.href);
+				return;
+			}
+			if (latestApproval.approvedCommit) dispatchApprovedVisibleCommit(latestApproval.approvedCommit, null, false);
+		}
 		if (returnValue) {
 			if (!returnValue.ok) throw returnValue.data;
 			return returnValue.data;

package/dist/server/app-browser-navigation-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-browser-navigation-controller.js","names":[],"sources":["../../src/server/app-browser-navigation-controller.ts"],"sourcesContent":["import { startTransition, useLayoutEffect, type Dispatch, type ReactNode } from \"react\";\nimport {\n  activateNavigationSnapshot,\n  clearPendingPathname,\n  commitClientNavigationState,\n} from \"vinext/shims/navigation\";\nimport type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport {\n  createPendingNavigationCommit,\n  resolveAndClassifyNavigationCommit,\n  resolvePendingNavigationCommitDisposition,\n  routerReducer,\n  type AppRouterAction,\n  type AppRouterState,\n} from \"./app-browser-state.js\";\nimport type { AppElements, LayoutFlags } from \"./app-elements.js\";\n\nexport type HistoryUpdateMode = \"push\" | \"replace\";\n\nexport type PendingBrowserRouterState = {\n  promise: Promise<AppRouterState>;\n  resolve: (state: AppRouterState) => void;\n  settled: boolean;\n};\n\ntype BrowserNavigationCommitEffectFactory = (options: {\n  href: string;\n  historyUpdateMode: HistoryUpdateMode | undefined;\n  navId: number;\n  params: Record<string, string | string[]>;\n  previousNextUrl: string | null;\n}) => () => void;\n\ntype BrowserRouterStateRef = {\n  current: AppRouterState;\n};\n\ntype BrowserNavigationControllerDeps = {\n  commitClientNavigationState?: typeof commitClientNavigationState;\n};\n\ntype BrowserNavigationController = {\n  beginNavigation(): number;\n  hasBrowserRouterState(): boolean;\n  getBrowserRouterState(): AppRouterState;\n  isCurrentNavigation(navId: number): boolean;\n  waitForBrowserRouterStateReady(): Promise<void>;\n  attachBrowserRouterState(\n    setter: Dispatch<AppRouterState | Promise<AppRouterState>>,\n    stateRef: BrowserRouterStateRef,\n  ): () => void;\n  beginPendingBrowserRouterState(): PendingBrowserRouterState;\n  finalizeNavigation(navId: number, pending: PendingBrowserRouterState | null | undefined): void;\n  renderNavigationPayload(options: {\n    actionType: \"navigate\" | \"replace\" | \"traverse\";\n    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;\n    historyUpdateMode: HistoryUpdateMode | undefined;\n    navigationSnapshot: ClientNavigationRenderSnapshot;\n    nextElements: Promise<AppElements>;\n    params: Record<string, string | string[]>;\n    pendingRouterState: PendingBrowserRouterState | null;\n    previousNextUrl: string | null;\n    targetHref: string;\n    navId: number;\n    useTransition?: boolean;\n  }): Promise<void>;\n  commitSameUrlNavigatePayload(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    returnValue?: { ok: boolean; data: unknown },\n  ): Promise<unknown>;\n  hmrReplaceTree(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n  ): Promise<void>;\n  /**\n   * Force-drain the queued pre-paint effect for the given renderId without\n   * waiting for NavigationCommitSignal to commit. Used by the dev recovery\n   * boundary in app-browser-entry.ts: when a render error replaces\n   * NavigationCommitSignal with the boundary's null fallback, its\n   * useLayoutEffect never fires, so the URL update for the in-flight\n   * navigation would otherwise be lost.\n   */\n  drainPrePaintEffects(renderId: number): void;\n  NavigationCommitSignal(\n    this: void,\n    {\n      renderId,\n      children,\n    }: {\n      renderId: number;\n      children?: ReactNode;\n    },\n  ): ReactNode;\n};\n\nexport function createAppBrowserNavigationController(\n  deps: BrowserNavigationControllerDeps = {},\n): BrowserNavigationController {\n  const commitClientNavigationStateImpl =\n    deps.commitClientNavigationState ?? commitClientNavigationState;\n\n  // These are plain module-level variables (inside the controller closure),\n  // unlike ClientNavigationState which uses Symbol.for to survive multiple\n  // Vite module instances. The browser entry is loaded exactly once (via the\n  // RSC plugin's generated bootstrap), so the controller running in a single\n  // module instance is safe. If that assumption ever changes, these should be\n  // migrated to a Symbol.for-backed global.\n  //\n  // The most severe consequence of multiple instances would be Map fragmentation:\n  // pendingNavigationCommits and pendingNavigationPrePaintEffects would split\n  // across instances, so drainPrePaintEffects in one instance could never drain\n  // effects queued by the other, permanently leaking navigationSnapshotActiveCount\n  // and causing hooks to prefer stale snapshot values indefinitely.\n  let nextNavigationRenderId = 0;\n  let activeNavigationId = 0;\n  const pendingNavigationCommits = new Map<number, () => void>();\n  const pendingNavigationPrePaintEffects = new Map<number, () => void>();\n\n  let setBrowserRouterState: Dispatch<AppRouterState | Promise<AppRouterState>> | null = null;\n  let browserRouterStateRef: BrowserRouterStateRef | null = null;\n  let activePendingBrowserRouterState: PendingBrowserRouterState | null = null;\n  let resolveBrowserRouterStateReady: (() => void) | null = null;\n  let browserRouterStateReadyPromise: Promise<void> | null = null;\n  let browserRouterStateHasCommitted = false;\n\n  function getBrowserRouterStateSetter(): Dispatch<AppRouterState | Promise<AppRouterState>> {\n    if (!setBrowserRouterState) {\n      throw new Error(\"[vinext] Browser router state setter is not initialized\");\n    }\n    return setBrowserRouterState;\n  }\n\n  function getBrowserRouterState(): AppRouterState {\n    if (!browserRouterStateRef) {\n      throw new Error(\"[vinext] Browser router state is not initialized\");\n    }\n    return browserRouterStateRef.current;\n  }\n\n  function waitForBrowserRouterStateReady(): Promise<void> {\n    if (browserRouterStateRef || browserRouterStateHasCommitted) {\n      return Promise.resolve();\n    }\n\n    if (!browserRouterStateReadyPromise) {\n      browserRouterStateReadyPromise = new Promise((resolve) => {\n        resolveBrowserRouterStateReady = resolve;\n      });\n    }\n\n    return browserRouterStateReadyPromise;\n  }\n\n  function markBrowserRouterStateReady(): void {\n    browserRouterStateHasCommitted = true;\n    const resolveReady = resolveBrowserRouterStateReady;\n    resolveBrowserRouterStateReady = null;\n    browserRouterStateReadyPromise = null;\n    resolveReady?.();\n  }\n\n  function beginNavigation(): number {\n    activeNavigationId += 1;\n    return activeNavigationId;\n  }\n\n  function allocateRenderId(): number {\n    nextNavigationRenderId += 1;\n    return nextNavigationRenderId;\n  }\n\n  function hasBrowserRouterState(): boolean {\n    return browserRouterStateRef !== null;\n  }\n\n  function isCurrentNavigation(navId: number): boolean {\n    return navId === activeNavigationId;\n  }\n\n  function beginPendingBrowserRouterState(): PendingBrowserRouterState {\n    const setter = getBrowserRouterStateSetter();\n\n    if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {\n      activePendingBrowserRouterState.settled = true;\n      activePendingBrowserRouterState.resolve(getBrowserRouterState());\n    }\n\n    let resolvePending: ((state: AppRouterState) => void) | undefined;\n    const promise = new Promise<AppRouterState>((resolve) => {\n      resolvePending = resolve;\n    });\n\n    if (!resolvePending) {\n      throw new Error(\"[vinext] Failed to initialize browser router promise\");\n    }\n\n    const pending: PendingBrowserRouterState = {\n      promise,\n      resolve: resolvePending,\n      settled: false,\n    };\n\n    activePendingBrowserRouterState = pending;\n    setter(promise);\n\n    return pending;\n  }\n\n  function settlePendingBrowserRouterState(\n    pending: PendingBrowserRouterState | null | undefined,\n  ): void {\n    if (!pending || pending.settled) return;\n\n    pending.settled = true;\n    pending.resolve(getBrowserRouterState());\n\n    if (activePendingBrowserRouterState === pending) {\n      activePendingBrowserRouterState = null;\n    }\n  }\n\n  function finalizeNavigation(\n    navId: number,\n    pending: PendingBrowserRouterState | null | undefined,\n  ): void {\n    settlePendingBrowserRouterState(pending);\n\n    if (isCurrentNavigation(navId)) {\n      clearPendingPathname(navId);\n    }\n  }\n\n  function resolvePendingBrowserRouterState(\n    pending: PendingBrowserRouterState | null | undefined,\n    action: AppRouterAction,\n  ): void {\n    if (!pending || pending.settled) return;\n\n    pending.settled = true;\n    pending.resolve(routerReducer(getBrowserRouterState(), action));\n\n    if (activePendingBrowserRouterState === pending) {\n      activePendingBrowserRouterState = null;\n    }\n  }\n\n  function queuePrePaintNavigationEffect(renderId: number, effect: (() => void) | null): void {\n    if (!effect) {\n      return;\n    }\n    pendingNavigationPrePaintEffects.set(renderId, effect);\n  }\n\n  /**\n   * Run all queued pre-paint effects for renderIds up to and including the\n   * given renderId. When React supersedes a startTransition update (rapid\n   * clicks on same-route links), the superseded NavigationCommitSignal never\n   * mounts, so its pre-paint effect never fires. By draining all effects\n   * <= the committed renderId here, the winning transition cleans up after\n   * any superseded ones, keeping the counter balanced.\n   *\n   * Invariant: each superseded navigation gets a commitClientNavigationState()\n   * to balance the activateNavigationSnapshot() from its renderNavigationPayload call.\n   */\n  function drainPrePaintEffects(upToRenderId: number): void {\n    for (const [id, effect] of pendingNavigationPrePaintEffects) {\n      if (id > upToRenderId) {\n        continue;\n      }\n\n      pendingNavigationPrePaintEffects.delete(id);\n      if (id === upToRenderId) {\n        effect();\n      } else {\n        // Superseded navigations still need to balance the snapshot counter.\n        commitClientNavigationStateImpl(undefined, { releaseSnapshot: true });\n      }\n    }\n  }\n\n  /**\n   * Resolve all pending navigation commits with renderId <= the committed renderId.\n   * Note: Map iteration handles concurrent deletion safely — entries are visited in\n   * insertion order and deletion doesn't affect the iterator's view of remaining entries.\n   * This pattern is also used in drainPrePaintEffects with the same semantics.\n   */\n  function resolveCommittedNavigations(renderId: number): void {\n    for (const [pendingId, resolve] of pendingNavigationCommits) {\n      if (pendingId > renderId) {\n        continue;\n      }\n\n      pendingNavigationCommits.delete(pendingId);\n      resolve();\n    }\n  }\n\n  async function hmrReplaceTree(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n  ): Promise<void> {\n    if (!hasBrowserRouterState()) return;\n\n    const currentState = getBrowserRouterState();\n    const renderId = allocateRenderId();\n    const pending = await createPendingNavigationCommit({\n      currentState,\n      nextElements,\n      navigationSnapshot,\n      renderId,\n      type: \"replace\",\n    });\n\n    // createPendingNavigationCommit awaits the new RSC payload. While\n    // suspended, the prior broken render can unmount BrowserRoot. Re-check\n    // before dispatching so a racing unmount doesn't surface as an\n    // initialized-setter error.\n    if (!hasBrowserRouterState()) return;\n\n    dispatchBrowserTree(\n      pending.action.elements,\n      navigationSnapshot,\n      pending.action.renderId,\n      \"replace\",\n      pending.interceptionContext,\n      pending.action.layoutFlags,\n      pending.previousNextUrl,\n      pending.routeId,\n      pending.rootLayoutTreePath,\n      null,\n      false,\n    );\n  }\n\n  function NavigationCommitSignal(\n    this: void,\n    {\n      renderId,\n      children,\n    }: {\n      renderId: number;\n      children?: ReactNode;\n    },\n  ): ReactNode {\n    useLayoutEffect(() => {\n      drainPrePaintEffects(renderId);\n\n      const frame = requestAnimationFrame(() => {\n        resolveCommittedNavigations(renderId);\n      });\n\n      return () => {\n        cancelAnimationFrame(frame);\n        // Resolve pending commits to prevent callers from hanging if React\n        // unmounts this component without committing (e.g., error boundary).\n        resolveCommittedNavigations(renderId);\n      };\n    }, [renderId]);\n\n    return children;\n  }\n\n  function dispatchBrowserTree(\n    elements: AppElements,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    renderId: number,\n    actionType: \"navigate\" | \"replace\" | \"traverse\",\n    interceptionContext: string | null,\n    layoutFlags: LayoutFlags,\n    previousNextUrl: string | null,\n    routeId: string,\n    rootLayoutTreePath: string | null,\n    pendingRouterState: PendingBrowserRouterState | null,\n    useTransitionMode: boolean,\n  ): void {\n    const setter = getBrowserRouterStateSetter();\n    const action: AppRouterAction = {\n      elements,\n      interceptionContext,\n      layoutFlags,\n      navigationSnapshot,\n      previousNextUrl,\n      renderId,\n      rootLayoutTreePath,\n      routeId,\n      type: actionType,\n    };\n\n    const applyAction = () => {\n      if (pendingRouterState) {\n        // The programmatic navigation is already running inside React.startTransition\n        // (from router.push/replace/refresh), so resolving the deferred promise is\n        // sufficient — no additional startTransition wrapper is needed below.\n        resolvePendingBrowserRouterState(pendingRouterState, action);\n        return;\n      }\n\n      setter(routerReducer(getBrowserRouterState(), action));\n    };\n\n    if (useTransitionMode) {\n      startTransition(applyAction);\n    } else {\n      applyAction();\n    }\n  }\n\n  async function renderNavigationPayload(options: {\n    actionType: \"navigate\" | \"replace\" | \"traverse\";\n    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;\n    historyUpdateMode: HistoryUpdateMode | undefined;\n    navigationSnapshot: ClientNavigationRenderSnapshot;\n    nextElements: Promise<AppElements>;\n    params: Record<string, string | string[]>;\n    pendingRouterState: PendingBrowserRouterState | null;\n    previousNextUrl: string | null;\n    targetHref: string;\n    navId: number;\n    useTransition?: boolean;\n  }): Promise<void> {\n    const renderId = allocateRenderId();\n    let resolveCommitted: (() => void) | undefined;\n    const committed = new Promise<void>((resolve) => {\n      resolveCommitted = resolve;\n      pendingNavigationCommits.set(renderId, resolve);\n    });\n\n    let snapshotActivated = false;\n    try {\n      const currentState = getBrowserRouterState();\n      const pending = await createPendingNavigationCommit({\n        currentState,\n        nextElements: options.nextElements,\n        navigationSnapshot: options.navigationSnapshot,\n        previousNextUrl: options.previousNextUrl,\n        renderId,\n        type: options.actionType,\n      });\n\n      const disposition = resolvePendingNavigationCommitDisposition({\n        activeNavigationId,\n        currentRootLayoutTreePath: currentState.rootLayoutTreePath,\n        nextRootLayoutTreePath: pending.rootLayoutTreePath,\n        startedNavigationId: options.navId,\n      });\n\n      if (disposition === \"skip\") {\n        settlePendingBrowserRouterState(options.pendingRouterState);\n        pendingNavigationCommits.delete(renderId);\n        resolveCommitted?.();\n        return;\n      }\n\n      if (disposition === \"hard-navigate\") {\n        settlePendingBrowserRouterState(options.pendingRouterState);\n        pendingNavigationCommits.delete(renderId);\n        window.location.assign(options.targetHref);\n        return;\n      }\n\n      queuePrePaintNavigationEffect(\n        renderId,\n        options.createNavigationCommitEffect({\n          href: options.targetHref,\n          historyUpdateMode: options.historyUpdateMode,\n          navId: options.navId,\n          params: options.params,\n          previousNextUrl: pending.previousNextUrl,\n        }),\n      );\n      activateNavigationSnapshot();\n      snapshotActivated = true;\n      dispatchBrowserTree(\n        pending.action.elements,\n        options.navigationSnapshot,\n        renderId,\n        options.actionType,\n        pending.interceptionContext,\n        pending.action.layoutFlags,\n        pending.previousNextUrl,\n        pending.routeId,\n        pending.rootLayoutTreePath,\n        options.pendingRouterState,\n        options.useTransition ?? true,\n      );\n    } catch (error) {\n      pendingNavigationPrePaintEffects.delete(renderId);\n      pendingNavigationCommits.delete(renderId);\n      if (snapshotActivated) {\n        commitClientNavigationStateImpl(options.navId);\n      }\n      settlePendingBrowserRouterState(options.pendingRouterState);\n      resolveCommitted?.();\n      throw error;\n    }\n\n    return committed;\n  }\n\n  async function commitSameUrlNavigatePayload(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    returnValue?: { ok: boolean; data: unknown },\n  ): Promise<unknown> {\n    const currentState = getBrowserRouterState();\n    const startedNavigationId = activeNavigationId;\n    // Known limitation: if a same-URL navigation fully commits while this\n    // server action is awaiting resolveAndClassifyNavigationCommit(), the action\n    // can still dispatch its older payload afterward. The old pre-2c code had\n    // the same race, and Next.js has similar behavior. Tightening this would\n    // need a stronger commit-version gate than activeNavigationId alone.\n    const { disposition, pending } = await resolveAndClassifyNavigationCommit({\n      activeNavigationId,\n      currentState,\n      navigationSnapshot,\n      nextElements,\n      renderId: allocateRenderId(),\n      startedNavigationId,\n      type: \"navigate\",\n    });\n\n    if (disposition === \"hard-navigate\") {\n      window.location.assign(window.location.href);\n      return undefined;\n    }\n\n    if (disposition === \"dispatch\") {\n      dispatchBrowserTree(\n        pending.action.elements,\n        navigationSnapshot,\n        pending.action.renderId,\n        \"navigate\",\n        pending.interceptionContext,\n        pending.action.layoutFlags,\n        pending.previousNextUrl,\n        pending.routeId,\n        pending.rootLayoutTreePath,\n        null,\n        false,\n      );\n    }\n\n    // Same-URL server actions still return their action value even if the UI\n    // update was skipped due to a superseding navigation. That preserves the\n    // existing caller contract; a future Phase 2 router state model could make\n    // skipped UI updates observable to the caller without conflating them here.\n    if (returnValue) {\n      if (!returnValue.ok) {\n        throw returnValue.data;\n      }\n      return returnValue.data;\n    }\n\n    return undefined;\n  }\n\n  function attachBrowserRouterState(\n    setter: Dispatch<AppRouterState | Promise<AppRouterState>>,\n    stateRef: BrowserRouterStateRef,\n  ): () => void {\n    setBrowserRouterState = setter;\n    browserRouterStateRef = stateRef;\n    markBrowserRouterStateReady();\n\n    return () => {\n      if (setBrowserRouterState === setter) {\n        setBrowserRouterState = null;\n      }\n      if (browserRouterStateRef === stateRef) {\n        browserRouterStateRef = null;\n        browserRouterStateHasCommitted = false;\n      }\n    };\n  }\n\n  return {\n    beginNavigation,\n    hasBrowserRouterState,\n    getBrowserRouterState,\n    isCurrentNavigation,\n    waitForBrowserRouterStateReady,\n    attachBrowserRouterState,\n    beginPendingBrowserRouterState,\n    finalizeNavigation,\n    renderNavigationPayload,\n    commitSameUrlNavigatePayload,\n    hmrReplaceTree,\n    drainPrePaintEffects,\n    NavigationCommitSignal,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-browser-navigation-controller.js","names":[],"sources":["../../src/server/app-browser-navigation-controller.ts"],"sourcesContent":["import { startTransition, useLayoutEffect, type Dispatch, type ReactNode } from \"react\";\nimport {\n  activateNavigationSnapshot,\n  clearPendingPathname,\n  commitClientNavigationState,\n} from \"vinext/shims/navigation\";\nimport type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport {\n  createPendingNavigationCommit,\n  type AppRouterState,\n  type OperationLane,\n} from \"./app-browser-state.js\";\nimport {\n  applyApprovedVisibleCommit,\n  approveHmrVisibleCommit,\n  approvePendingNavigationCommit,\n  resolveAndClassifyNavigationCommit,\n  type ApprovedVisibleCommit,\n} from \"./app-browser-visible-commit.js\";\nimport type { AppElements } from \"./app-elements.js\";\n\nexport type HistoryUpdateMode = \"push\" | \"replace\";\n\nexport type PendingBrowserRouterState = {\n  promise: Promise<AppRouterState>;\n  resolve: (state: AppRouterState) => void;\n  settled: boolean;\n};\nexport type NavigationPayloadOutcome = \"committed\" | \"no-commit\" | \"hard-navigate\";\n\ntype BrowserNavigationCommitEffectFactory = (options: {\n  href: string;\n  historyUpdateMode: HistoryUpdateMode | undefined;\n  navId: number;\n  params: Record<string, string | string[]>;\n  previousNextUrl: string | null;\n}) => () => void;\n\ntype BrowserRouterStateRef = {\n  current: AppRouterState;\n};\n\ntype BrowserNavigationControllerDeps = {\n  commitClientNavigationState?: typeof commitClientNavigationState;\n};\n\ntype BrowserNavigationController = {\n  beginNavigation(): number;\n  hasBrowserRouterState(): boolean;\n  getBrowserRouterState(): AppRouterState;\n  isCurrentNavigation(navId: number): boolean;\n  waitForBrowserRouterStateReady(): Promise<void>;\n  attachBrowserRouterState(\n    setter: Dispatch<AppRouterState | Promise<AppRouterState>>,\n    stateRef: BrowserRouterStateRef,\n  ): () => void;\n  beginPendingBrowserRouterState(): PendingBrowserRouterState;\n  finalizeNavigation(navId: number, pending: PendingBrowserRouterState | null | undefined): void;\n  renderNavigationPayload(options: {\n    actionType: \"navigate\" | \"replace\" | \"traverse\";\n    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;\n    historyUpdateMode: HistoryUpdateMode | undefined;\n    navigationSnapshot: ClientNavigationRenderSnapshot;\n    nextElements: Promise<AppElements>;\n    operationLane: OperationLane;\n    params: Record<string, string | string[]>;\n    pendingRouterState: PendingBrowserRouterState | null;\n    previousNextUrl: string | null;\n    targetHref: string;\n    navId: number;\n    useTransition?: boolean;\n  }): Promise<NavigationPayloadOutcome>;\n  commitSameUrlNavigatePayload(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    returnValue?: { ok: boolean; data: unknown },\n    actionInitiationState?: AppRouterState,\n  ): Promise<unknown>;\n  hmrReplaceTree(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n  ): Promise<void>;\n  /**\n   * Force-drain the queued pre-paint effect for the given renderId without\n   * waiting for NavigationCommitSignal to commit. Used by the dev recovery\n   * boundary in app-browser-entry.ts: when a render error replaces\n   * NavigationCommitSignal with the boundary's null fallback, its\n   * useLayoutEffect never fires, so the URL update for the in-flight\n   * navigation would otherwise be lost.\n   */\n  drainPrePaintEffects(renderId: number): void;\n  NavigationCommitSignal(\n    this: void,\n    {\n      renderId,\n      children,\n    }: {\n      renderId: number;\n      children?: ReactNode;\n    },\n  ): ReactNode;\n};\n\nexport function createAppBrowserNavigationController(\n  deps: BrowserNavigationControllerDeps = {},\n): BrowserNavigationController {\n  const commitClientNavigationStateImpl =\n    deps.commitClientNavigationState ?? commitClientNavigationState;\n\n  // These are plain module-level variables (inside the controller closure),\n  // unlike ClientNavigationState which uses Symbol.for to survive multiple\n  // Vite module instances. The browser entry is loaded exactly once (via the\n  // RSC plugin's generated bootstrap), so the controller running in a single\n  // module instance is safe. If that assumption ever changes, these should be\n  // migrated to a Symbol.for-backed global.\n  //\n  // The most severe consequence of multiple instances would be Map fragmentation:\n  // pendingNavigationCommits and pendingNavigationPrePaintEffects would split\n  // across instances, so drainPrePaintEffects in one instance could never drain\n  // effects queued by the other, permanently leaking navigationSnapshotActiveCount\n  // and causing hooks to prefer stale snapshot values indefinitely.\n  let nextNavigationRenderId = 0;\n  let activeNavigationId = 0;\n  const pendingNavigationCommits = new Map<number, () => void>();\n  const pendingNavigationPrePaintEffects = new Map<number, () => void>();\n\n  let setBrowserRouterState: Dispatch<AppRouterState | Promise<AppRouterState>> | null = null;\n  let browserRouterStateRef: BrowserRouterStateRef | null = null;\n  let activePendingBrowserRouterState: PendingBrowserRouterState | null = null;\n  let resolveBrowserRouterStateReady: (() => void) | null = null;\n  let browserRouterStateReadyPromise: Promise<void> | null = null;\n  let browserRouterStateHasCommitted = false;\n\n  function getBrowserRouterStateSetter(): Dispatch<AppRouterState | Promise<AppRouterState>> {\n    if (!setBrowserRouterState) {\n      throw new Error(\"[vinext] Browser router state setter is not initialized\");\n    }\n    return setBrowserRouterState;\n  }\n\n  function getBrowserRouterState(): AppRouterState {\n    if (!browserRouterStateRef) {\n      throw new Error(\"[vinext] Browser router state is not initialized\");\n    }\n    return browserRouterStateRef.current;\n  }\n\n  function waitForBrowserRouterStateReady(): Promise<void> {\n    if (browserRouterStateRef || browserRouterStateHasCommitted) {\n      return Promise.resolve();\n    }\n\n    if (!browserRouterStateReadyPromise) {\n      browserRouterStateReadyPromise = new Promise((resolve) => {\n        resolveBrowserRouterStateReady = resolve;\n      });\n    }\n\n    return browserRouterStateReadyPromise;\n  }\n\n  function markBrowserRouterStateReady(): void {\n    browserRouterStateHasCommitted = true;\n    const resolveReady = resolveBrowserRouterStateReady;\n    resolveBrowserRouterStateReady = null;\n    browserRouterStateReadyPromise = null;\n    resolveReady?.();\n  }\n\n  function beginNavigation(): number {\n    activeNavigationId += 1;\n    return activeNavigationId;\n  }\n\n  function allocateRenderId(): number {\n    nextNavigationRenderId += 1;\n    return nextNavigationRenderId;\n  }\n\n  function hasBrowserRouterState(): boolean {\n    return browserRouterStateRef !== null;\n  }\n\n  function isCurrentNavigation(navId: number): boolean {\n    return navId === activeNavigationId;\n  }\n\n  function beginPendingBrowserRouterState(): PendingBrowserRouterState {\n    const setter = getBrowserRouterStateSetter();\n\n    if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {\n      activePendingBrowserRouterState.settled = true;\n      activePendingBrowserRouterState.resolve(getBrowserRouterState());\n    }\n\n    let resolvePending: ((state: AppRouterState) => void) | undefined;\n    const promise = new Promise<AppRouterState>((resolve) => {\n      resolvePending = resolve;\n    });\n\n    if (!resolvePending) {\n      throw new Error(\"[vinext] Failed to initialize browser router promise\");\n    }\n\n    const pending: PendingBrowserRouterState = {\n      promise,\n      resolve: resolvePending,\n      settled: false,\n    };\n\n    activePendingBrowserRouterState = pending;\n    setter(promise);\n\n    return pending;\n  }\n\n  function settlePendingBrowserRouterState(\n    pending: PendingBrowserRouterState | null | undefined,\n  ): void {\n    if (!pending || pending.settled) return;\n\n    pending.settled = true;\n    pending.resolve(getBrowserRouterState());\n\n    if (activePendingBrowserRouterState === pending) {\n      activePendingBrowserRouterState = null;\n    }\n  }\n\n  function finalizeNavigation(\n    navId: number,\n    pending: PendingBrowserRouterState | null | undefined,\n  ): void {\n    settlePendingBrowserRouterState(pending);\n\n    if (isCurrentNavigation(navId)) {\n      clearPendingPathname(navId);\n    }\n  }\n\n  function resolvePendingBrowserRouterState(\n    pending: PendingBrowserRouterState | null | undefined,\n    commit: ApprovedVisibleCommit,\n  ): void {\n    if (!pending || pending.settled) return;\n\n    pending.settled = true;\n    pending.resolve(applyApprovedVisibleCommit(getBrowserRouterState(), commit));\n\n    if (activePendingBrowserRouterState === pending) {\n      activePendingBrowserRouterState = null;\n    }\n  }\n\n  function queuePrePaintNavigationEffect(renderId: number, effect: (() => void) | null): void {\n    if (!effect) {\n      return;\n    }\n    pendingNavigationPrePaintEffects.set(renderId, effect);\n  }\n\n  /**\n   * Run all queued pre-paint effects for renderIds up to and including the\n   * given renderId. When React supersedes a startTransition update (rapid\n   * clicks on same-route links), the superseded NavigationCommitSignal never\n   * mounts, so its pre-paint effect never fires. By draining all effects\n   * <= the committed renderId here, the winning transition cleans up after\n   * any superseded ones, keeping the counter balanced.\n   *\n   * Invariant: each superseded navigation gets a commitClientNavigationState()\n   * to balance the activateNavigationSnapshot() from its renderNavigationPayload call.\n   */\n  function drainPrePaintEffects(upToRenderId: number): void {\n    for (const [id, effect] of pendingNavigationPrePaintEffects) {\n      if (id > upToRenderId) {\n        continue;\n      }\n\n      pendingNavigationPrePaintEffects.delete(id);\n      if (id === upToRenderId) {\n        effect();\n      } else {\n        // Superseded navigations still need to balance the snapshot counter.\n        commitClientNavigationStateImpl(undefined, { releaseSnapshot: true });\n      }\n    }\n  }\n\n  /**\n   * Resolve all pending navigation commits with renderId <= the committed renderId.\n   * Note: Map iteration handles concurrent deletion safely — entries are visited in\n   * insertion order and deletion doesn't affect the iterator's view of remaining entries.\n   * This pattern is also used in drainPrePaintEffects with the same semantics.\n   */\n  function resolveCommittedNavigations(renderId: number): void {\n    for (const [pendingId, resolve] of pendingNavigationCommits) {\n      if (pendingId > renderId) {\n        continue;\n      }\n\n      pendingNavigationCommits.delete(pendingId);\n      resolve();\n    }\n  }\n\n  async function hmrReplaceTree(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n  ): Promise<void> {\n    if (!hasBrowserRouterState()) return;\n\n    const currentState = getBrowserRouterState();\n    const renderId = allocateRenderId();\n    const pending = await createPendingNavigationCommit({\n      currentState,\n      nextElements,\n      navigationSnapshot,\n      operationLane: \"hmr\",\n      renderId,\n      type: \"replace\",\n    });\n\n    // createPendingNavigationCommit awaits the new RSC payload. While\n    // suspended, the prior broken render can unmount BrowserRoot. Re-check\n    // before dispatching so a racing unmount doesn't surface as an\n    // initialized-setter error.\n    if (!hasBrowserRouterState()) return;\n\n    dispatchApprovedVisibleCommit(approveHmrVisibleCommit(pending), null, false);\n  }\n\n  function NavigationCommitSignal(\n    this: void,\n    {\n      renderId,\n      children,\n    }: {\n      renderId: number;\n      children?: ReactNode;\n    },\n  ): ReactNode {\n    useLayoutEffect(() => {\n      drainPrePaintEffects(renderId);\n\n      const frame = requestAnimationFrame(() => {\n        resolveCommittedNavigations(renderId);\n      });\n\n      return () => {\n        cancelAnimationFrame(frame);\n        // Resolve pending commits to prevent callers from hanging if React\n        // unmounts this component without committing (e.g., error boundary).\n        resolveCommittedNavigations(renderId);\n      };\n    }, [renderId]);\n\n    return children;\n  }\n\n  function dispatchApprovedVisibleCommit(\n    commit: ApprovedVisibleCommit,\n    pendingRouterState: PendingBrowserRouterState | null,\n    useTransitionMode: boolean,\n  ): void {\n    const setter = getBrowserRouterStateSetter();\n\n    const applyAction = () => {\n      if (pendingRouterState) {\n        // The programmatic navigation is already running inside React.startTransition\n        // (from router.push/replace/refresh), so resolving the deferred promise is\n        // sufficient — no additional startTransition wrapper is needed below.\n        resolvePendingBrowserRouterState(pendingRouterState, commit);\n        return;\n      }\n\n      setter(applyApprovedVisibleCommit(getBrowserRouterState(), commit));\n    };\n\n    if (useTransitionMode) {\n      startTransition(applyAction);\n    } else {\n      applyAction();\n    }\n  }\n\n  async function renderNavigationPayload(options: {\n    actionType: \"navigate\" | \"replace\" | \"traverse\";\n    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;\n    historyUpdateMode: HistoryUpdateMode | undefined;\n    navigationSnapshot: ClientNavigationRenderSnapshot;\n    nextElements: Promise<AppElements>;\n    operationLane: OperationLane;\n    params: Record<string, string | string[]>;\n    pendingRouterState: PendingBrowserRouterState | null;\n    previousNextUrl: string | null;\n    targetHref: string;\n    navId: number;\n    useTransition?: boolean;\n  }): Promise<NavigationPayloadOutcome> {\n    const renderId = allocateRenderId();\n    let resolveCommitted: (() => void) | undefined;\n    const committed = new Promise<void>((resolve) => {\n      resolveCommitted = resolve;\n      pendingNavigationCommits.set(renderId, resolve);\n    });\n\n    let snapshotActivated = false;\n    try {\n      const startedState = getBrowserRouterState();\n      const pending = await createPendingNavigationCommit({\n        currentState: startedState,\n        nextElements: options.nextElements,\n        navigationSnapshot: options.navigationSnapshot,\n        operationLane: options.operationLane,\n        previousNextUrl: options.previousNextUrl,\n        renderId,\n        type: options.actionType,\n      });\n\n      const approval = approvePendingNavigationCommit({\n        activeNavigationId,\n        currentState: getBrowserRouterState(),\n        pending,\n        startedNavigationId: options.navId,\n      });\n\n      if (approval.decision.disposition === \"no-commit\") {\n        settlePendingBrowserRouterState(options.pendingRouterState);\n        pendingNavigationCommits.delete(renderId);\n        resolveCommitted?.();\n        return \"no-commit\";\n      }\n\n      if (approval.decision.disposition === \"hard-navigate\") {\n        settlePendingBrowserRouterState(options.pendingRouterState);\n        pendingNavigationCommits.delete(renderId);\n        window.location.assign(options.targetHref);\n        return \"hard-navigate\";\n      }\n\n      const approvedCommit = approval.approvedCommit;\n      if (approvedCommit === null) {\n        throw new Error(\"[vinext] Commit decision did not approve a visible commit\");\n      }\n\n      queuePrePaintNavigationEffect(\n        renderId,\n        options.createNavigationCommitEffect({\n          href: options.targetHref,\n          historyUpdateMode: options.historyUpdateMode,\n          navId: options.navId,\n          params: options.params,\n          previousNextUrl: approvedCommit.previousNextUrl,\n        }),\n      );\n      activateNavigationSnapshot();\n      snapshotActivated = true;\n      dispatchApprovedVisibleCommit(\n        approvedCommit,\n        options.pendingRouterState,\n        options.useTransition ?? true,\n      );\n    } catch (error) {\n      pendingNavigationPrePaintEffects.delete(renderId);\n      pendingNavigationCommits.delete(renderId);\n      if (snapshotActivated) {\n        commitClientNavigationStateImpl(options.navId);\n      }\n      settlePendingBrowserRouterState(options.pendingRouterState);\n      resolveCommitted?.();\n      throw error;\n    }\n\n    return committed.then(() => \"committed\");\n  }\n\n  async function commitSameUrlNavigatePayload(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    returnValue?: { ok: boolean; data: unknown },\n    actionInitiationState?: AppRouterState,\n  ): Promise<unknown> {\n    const currentState = actionInitiationState ?? getBrowserRouterState();\n    const startedNavigationId = activeNavigationId;\n    const {\n      approvedCommit,\n      decision,\n      pending,\n      // Intentionally retained as #726-OPS-01 trace-shell scaffolding. The\n      // same-URL action path can consume this trace once later lifecycle gates\n      // need an observable commit explanation.\n      trace: _navigationTrace,\n    } = await resolveAndClassifyNavigationCommit({\n      activeNavigationId,\n      currentState,\n      getActiveNavigationId: () => activeNavigationId,\n      getCurrentStateForApproval: getBrowserRouterState,\n      navigationSnapshot,\n      nextElements,\n      renderId: allocateRenderId(),\n      operationLane: \"server-action\",\n      startedNavigationId,\n      type: \"navigate\",\n    });\n\n    if (decision.disposition === \"hard-navigate\") {\n      window.location.assign(window.location.href);\n      return undefined;\n    }\n\n    if (approvedCommit) {\n      // The helper approval and this continuation are separated by a microtask\n      // boundary, so re-check lifecycle authority before mutating visible UI.\n      const latestApproval = approvePendingNavigationCommit({\n        activeNavigationId,\n        currentState: getBrowserRouterState(),\n        pending,\n        startedNavigationId,\n      });\n\n      if (latestApproval.decision.disposition === \"hard-navigate\") {\n        window.location.assign(window.location.href);\n        return undefined;\n      }\n\n      if (latestApproval.approvedCommit) {\n        dispatchApprovedVisibleCommit(latestApproval.approvedCommit, null, false);\n      }\n    }\n\n    // Same-URL server actions still return their action value even if the UI\n    // update was skipped due to a superseding navigation. That preserves the\n    // existing caller contract; a future Phase 2 router state model could make\n    // skipped UI updates observable to the caller without conflating them here.\n    if (returnValue) {\n      if (!returnValue.ok) {\n        throw returnValue.data;\n      }\n      return returnValue.data;\n    }\n\n    return undefined;\n  }\n\n  function attachBrowserRouterState(\n    setter: Dispatch<AppRouterState | Promise<AppRouterState>>,\n    stateRef: BrowserRouterStateRef,\n  ): () => void {\n    setBrowserRouterState = setter;\n    browserRouterStateRef = stateRef;\n    markBrowserRouterStateReady();\n\n    return () => {\n      if (setBrowserRouterState === setter) {\n        setBrowserRouterState = null;\n      }\n      if (browserRouterStateRef === stateRef) {\n        browserRouterStateRef = null;\n        browserRouterStateHasCommitted = false;\n      }\n    };\n  }\n\n  return {\n    beginNavigation,\n    hasBrowserRouterState,\n    getBrowserRouterState,\n    isCurrentNavigation,\n    waitForBrowserRouterStateReady,\n    attachBrowserRouterState,\n    beginPendingBrowserRouterState,\n    finalizeNavigation,\n    renderNavigationPayload,\n    commitSameUrlNavigatePayload,\n    hmrReplaceTree,\n    drainPrePaintEffects,\n    NavigationCommitSignal,\n  };\n}\n"],"mappings":"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"}

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

@@ -1,11 +1,27 @@
 import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
-import { AppElements, LayoutFlags } from "./app-elements.js";
+import { AppElements, LayoutFlags } from "./app-elements-wire.js";
+import { NavigationTrace } from "./navigation-trace.js";
 
 //#region src/server/app-browser-state.d.ts
 type HistoryStateRecord = {
   [key: string]: unknown;
 };
+type OperationLane = "navigation" | "refresh" | "traverse" | "server-action" | "hmr";
+type OperationRecordBase = {
+  id: number;
+  lane: OperationLane;
+  startedVisibleCommitVersion: number;
+};
+type PendingOperationRecord = OperationRecordBase & {
+  state: "pending";
+};
+type CommittedOperationRecord = OperationRecordBase & {
+  state: "committed";
+  visibleCommitVersion: number;
+};
+type OperationRecord = PendingOperationRecord | CommittedOperationRecord;
 type AppRouterState = {
+  activeOperation: OperationRecord | null;
   elements: AppElements;
   interceptionContext: string | null;
   layoutFlags: LayoutFlags;
@@ -14,12 +30,14 @@ type AppRouterState = {
   navigationSnapshot: ClientNavigationRenderSnapshot;
   rootLayoutTreePath: string | null;
   routeId: string;
+  visibleCommitVersion: number;
 };
 type AppRouterAction = {
   elements: AppElements;
   interceptionContext: string | null;
   layoutFlags: LayoutFlags;
   navigationSnapshot: ClientNavigationRenderSnapshot;
+  operation: PendingOperationRecord;
   previousNextUrl: string | null;
   renderId: number;
   rootLayoutTreePath: string | null;
@@ -34,9 +52,9 @@ type PendingNavigationCommit = {
   routeId: string;
 };
 type PendingNavigationCommitDisposition = "dispatch" | "hard-navigate" | "skip";
-type ClassifiedPendingNavigationCommit = {
+type PendingNavigationCommitDispositionDecision = {
   disposition: PendingNavigationCommitDisposition;
-  pending: PendingNavigationCommit;
+  trace: NavigationTrace;
 };
 declare function createHistoryStateWithPreviousNextUrl(state: unknown, previousNextUrl: string | null): HistoryStateRecord | null;
 declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
@@ -62,32 +80,32 @@ type ResolveServerActionRequestStateResult = {
  * `findIntercept` lookup.
  */
 declare function resolveServerActionRequestState(options: ResolveServerActionRequestStateOptions): ResolveServerActionRequestStateResult;
-declare function routerReducer(state: AppRouterState, action: AppRouterAction): AppRouterState;
 declare function shouldHardNavigate(currentRootLayoutTreePath: string | null, nextRootLayoutTreePath: string | null): boolean;
 declare function resolvePendingNavigationCommitDisposition(options: {
   activeNavigationId: number;
+  currentVisibleCommitVersion: number;
   currentRootLayoutTreePath: string | null;
   nextRootLayoutTreePath: string | null;
   startedNavigationId: number;
+  startedVisibleCommitVersion: number;
 }): PendingNavigationCommitDisposition;
+declare function resolvePendingNavigationCommitDispositionDecision(options: {
+  activeNavigationId: number;
+  currentVisibleCommitVersion: number;
+  currentRootLayoutTreePath: string | null;
+  nextRootLayoutTreePath: string | null;
+  startedNavigationId: number;
+  startedVisibleCommitVersion: number;
+}): PendingNavigationCommitDispositionDecision;
 declare function createPendingNavigationCommit(options: {
   currentState: AppRouterState;
   nextElements: Promise<AppElements>;
   navigationSnapshot: ClientNavigationRenderSnapshot;
+  operationLane: OperationLane;
   previousNextUrl?: string | null;
   renderId: number;
   type: "navigate" | "replace" | "traverse";
 }): Promise<PendingNavigationCommit>;
-declare function resolveAndClassifyNavigationCommit(options: {
-  activeNavigationId: number;
-  currentState: AppRouterState;
-  navigationSnapshot: ClientNavigationRenderSnapshot;
-  nextElements: Promise<AppElements>;
-  previousNextUrl?: string | null;
-  renderId: number;
-  startedNavigationId: number;
-  type: "navigate" | "replace" | "traverse";
-}): Promise<ClassifiedPendingNavigationCommit>;
 //#endregion
-export { AppRouterAction, AppRouterState, createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveAndClassifyNavigationCommit, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolveServerActionRequestState, routerReducer, shouldHardNavigate };
+export { AppRouterAction, AppRouterState, CommittedOperationRecord, OperationLane, OperationRecord, PendingNavigationCommit, PendingOperationRecord, createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState, shouldHardNavigate };
 //# sourceMappingURL=app-browser-state.d.ts.map

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

@@ -1,6 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
-import { getMountedSlotIdsHeader, readAppElementsMetadata } from "./app-elements.js";
-import { mergeElements } from "../shims/slot.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import { getMountedSlotIdsHeader } from "./app-elements.js";
+import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
+import { NavigationTraceReasonCodes, createNavigationTrace } from "./navigation-trace.js";
 //#region src/server/app-browser-state.ts
 const VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = "__vinext_previousNextUrl";
 function cloneHistoryState(state) {
@@ -19,6 +21,14 @@ 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,
+		lane: options.lane,
+		startedVisibleCommitVersion: options.startedVisibleCommitVersion,
+		state: "pending"
+	};
+}
 function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl, basePath = "") {
 	if (previousNextUrl === null) return null;
 	return stripBasePath(new URL(previousNextUrl, "http://localhost").pathname, basePath);
@@ -35,59 +45,56 @@ function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl, basePath
 * `findIntercept` lookup.
 */
 function resolveServerActionRequestState(options) {
-	const headers = new Headers({
-		Accept: "text/x-component",
-		"x-rsc-action": options.actionId
-	});
+	const headers = createRscRequestHeaders();
+	headers.set("x-rsc-action", options.actionId);
 	const interceptionContext = resolveInterceptionContextFromPreviousNextUrl(options.previousNextUrl, options.basePath);
 	if (interceptionContext !== null) headers.set("X-Vinext-Interception-Context", interceptionContext);
 	const mountedSlotsHeader = getMountedSlotIdsHeader(options.elements);
 	if (mountedSlotsHeader !== null) headers.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
 	return { headers };
 }
-function routerReducer(state, action) {
-	switch (action.type) {
-		case "traverse":
-		case "navigate": return {
-			elements: mergeElements(state.elements, action.elements, action.type === "traverse"),
-			interceptionContext: action.interceptionContext,
-			layoutFlags: {
-				...state.layoutFlags,
-				...action.layoutFlags
-			},
-			navigationSnapshot: action.navigationSnapshot,
-			previousNextUrl: action.previousNextUrl,
-			renderId: action.renderId,
-			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId
-		};
-		case "replace": return {
-			elements: action.elements,
-			interceptionContext: action.interceptionContext,
-			layoutFlags: action.layoutFlags,
-			navigationSnapshot: action.navigationSnapshot,
-			previousNextUrl: action.previousNextUrl,
-			renderId: action.renderId,
-			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId
-		};
-		default: {
-			const _exhaustive = action.type;
-			throw new Error("[vinext] Unknown router action: " + String(_exhaustive));
-		}
-	}
-}
 function shouldHardNavigate(currentRootLayoutTreePath, nextRootLayoutTreePath) {
 	return currentRootLayoutTreePath !== null && nextRootLayoutTreePath !== null && currentRootLayoutTreePath !== nextRootLayoutTreePath;
 }
 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 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
+	};
+	return {
+		disposition,
+		trace: createNavigationTrace(getPendingNavigationCommitDispositionTraceCode({
+			currentRootLayoutTreePath: options.currentRootLayoutTreePath,
+			disposition,
+			nextRootLayoutTreePath: options.nextRootLayoutTreePath
+		}), traceFields)
+	};
+}
+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));
+		}
+	}
+}
 async function createPendingNavigationCommit(options) {
 	const elements = await options.nextElements;
-	const metadata = readAppElementsMetadata(elements);
+	const metadata = AppElementsWire.readMetadata(elements);
 	const previousNextUrl = options.previousNextUrl !== void 0 ? options.previousNextUrl : options.currentState.previousNextUrl;
 	return {
 		action: {
@@ -95,6 +102,11 @@ async function createPendingNavigationCommit(options) {
 			interceptionContext: metadata.interceptionContext,
 			layoutFlags: metadata.layoutFlags,
 			navigationSnapshot: options.navigationSnapshot,
+			operation: createOperationRecord({
+				id: options.renderId,
+				lane: options.operationLane,
+				startedVisibleCommitVersion: options.currentState.visibleCommitVersion
+			}),
 			previousNextUrl,
 			renderId: options.renderId,
 			rootLayoutTreePath: metadata.rootLayoutTreePath,
@@ -107,26 +119,7 @@ async function createPendingNavigationCommit(options) {
 		routeId: metadata.routeId
 	};
 }
-async function resolveAndClassifyNavigationCommit(options) {
-	const pending = await createPendingNavigationCommit({
-		currentState: options.currentState,
-		nextElements: options.nextElements,
-		navigationSnapshot: options.navigationSnapshot,
-		previousNextUrl: options.previousNextUrl,
-		renderId: options.renderId,
-		type: options.type
-	});
-	return {
-		disposition: resolvePendingNavigationCommitDisposition({
-			activeNavigationId: options.activeNavigationId,
-			currentRootLayoutTreePath: options.currentState.rootLayoutTreePath,
-			nextRootLayoutTreePath: pending.rootLayoutTreePath,
-			startedNavigationId: options.startedNavigationId
-		}),
-		pending
-	};
-}
 //#endregion
-export { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveAndClassifyNavigationCommit, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolveServerActionRequestState, routerReducer, shouldHardNavigate };
+export { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState, shouldHardNavigate };
 
 //# sourceMappingURL=app-browser-state.js.map