vinext 0.0.49 → 0.0.50

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  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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"}
+{"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\";\ntype HardNavigationMode = \"assign\" | \"replace\";\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  performHardNavigation?: (href: string, mode?: HardNavigationMode) => boolean;\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  }): 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\nconst HARD_NAVIGATION_LOOP_GUARD_KEY = \"__vinext_hard_navigation_target__\";\n\nfunction normalizeBrowserHref(href: string): string {\n  try {\n    return new URL(href, window.location.href).href;\n  } catch {\n    return href;\n  }\n}\n\nfunction readHardNavigationLoopGuard(): string | null {\n  try {\n    return window.sessionStorage.getItem(HARD_NAVIGATION_LOOP_GUARD_KEY);\n  } catch {\n    return null;\n  }\n}\n\nfunction writeHardNavigationLoopGuard(targetHref: string): boolean {\n  try {\n    window.sessionStorage.setItem(HARD_NAVIGATION_LOOP_GUARD_KEY, targetHref);\n    return window.sessionStorage.getItem(HARD_NAVIGATION_LOOP_GUARD_KEY) === targetHref;\n  } catch {\n    return false;\n  }\n}\n\nexport function clearHardNavigationLoopGuard(): void {\n  try {\n    window.sessionStorage.removeItem(HARD_NAVIGATION_LOOP_GUARD_KEY);\n  } catch {}\n}\n\nfunction performHardNavigationWithLoopGuard(\n  href: string,\n  mode: HardNavigationMode = \"assign\",\n): boolean {\n  const targetHref = normalizeBrowserHref(href);\n  const currentHref = normalizeBrowserHref(window.location.href);\n\n  if (readHardNavigationLoopGuard() === targetHref && currentHref === targetHref) {\n    clearHardNavigationLoopGuard();\n    console.error(\n      `[vinext] Prevented repeated hard navigation to ${targetHref}; ` +\n        \"leaving the current document in place to avoid a reload loop.\",\n    );\n    return false;\n  }\n\n  const guardPersisted = writeHardNavigationLoopGuard(targetHref);\n  if (!guardPersisted && currentHref === targetHref) {\n    console.error(\n      `[vinext] Hard navigation to ${targetHref} requires a reload-loop guard, ` +\n        \"but sessionStorage is unavailable; leaving the current document in place.\",\n    );\n    return false;\n  }\n  // If storage is unavailable but the target is a different URL, the browser\n  // can still make forward progress. Only same-target reloads need a persisted\n  // guard because they can re-enter this exact recovery path indefinitely.\n\n  if (mode === \"replace\") {\n    window.location.replace(href);\n  } else {\n    window.location.assign(href);\n  }\n  return true;\n}\n\nexport function createAppBrowserNavigationController(\n  deps: BrowserNavigationControllerDeps = {},\n): BrowserNavigationController {\n  const commitClientNavigationStateImpl =\n    deps.commitClientNavigationState ?? commitClientNavigationState;\n  const performHardNavigation = deps.performHardNavigation ?? performHardNavigationWithLoopGuard;\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    dispatchSynchronousVisibleCommit(approveHmrVisibleCommit(pending));\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  ): void {\n    const setter = getBrowserRouterStateSetter();\n\n    if (pendingRouterState) {\n      // The programmatic navigation is already running inside React.startTransition\n      // (from router.push/replace/refresh/Link), so resolving the deferred promise\n      // is sufficient.\n      resolvePendingBrowserRouterState(pendingRouterState, commit);\n      return;\n    }\n\n    startTransition(() => {\n      setter(applyApprovedVisibleCommit(getBrowserRouterState(), commit));\n    });\n  }\n\n  function dispatchSynchronousVisibleCommit(commit: ApprovedVisibleCommit): void {\n    const setter = getBrowserRouterStateSetter();\n    setter(applyApprovedVisibleCommit(getBrowserRouterState(), commit));\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  }): 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        targetHref: options.targetHref,\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        return performHardNavigation(options.targetHref) ? \"hard-navigate\" : \"no-commit\";\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(approvedCommit, options.pendingRouterState);\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      targetHref: window.location.href,\n      type: \"navigate\",\n    });\n\n    if (decision.disposition === \"hard-navigate\") {\n      // Same-URL action hard navigations do not expose a navigation outcome to\n      // callers. If the loop guard blocks, the degraded state is still the\n      // existing return contract: no visible commit and no action value.\n      performHardNavigation(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        targetHref: window.location.href,\n      });\n\n      if (latestApproval.decision.disposition === \"hard-navigate\") {\n        // See the same-URL hard-navigation note above. The guard result is\n        // deliberately not surfaced through the server-action return channel.\n        performHardNavigation(window.location.href);\n        return undefined;\n      }\n\n      if (latestApproval.approvedCommit) {\n        dispatchSynchronousVisibleCommit(latestApproval.approvedCommit);\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,12 +1,12 @@
 import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { AppElements, LayoutFlags } from "./app-elements-wire.js";
 import { NavigationTrace } from "./navigation-trace.js";
+import { OperationLane } from "./navigation-planner.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;
@@ -25,6 +25,7 @@ type AppRouterState = {
   elements: AppElements;
   interceptionContext: string | null;
   layoutFlags: LayoutFlags;
+  layoutIds: readonly string[];
   previousNextUrl: string | null;
   renderId: number;
   navigationSnapshot: ClientNavigationRenderSnapshot;
@@ -36,6 +37,7 @@ type AppRouterAction = {
   elements: AppElements;
   interceptionContext: string | null;
   layoutFlags: LayoutFlags;
+  layoutIds: readonly string[];
   navigationSnapshot: ClientNavigationRenderSnapshot;
   operation: PendingOperationRecord;
   previousNextUrl: string | null;
@@ -52,10 +54,18 @@ type PendingNavigationCommit = {
   routeId: string;
 };
 type PendingNavigationCommitDisposition = "dispatch" | "hard-navigate" | "skip";
-type PendingNavigationCommitDispositionDecision = {
-  disposition: PendingNavigationCommitDisposition;
+type DispatchPendingNavigationCommitDispositionDecision = {
+  disposition: "dispatch";
+  preserveAbsentSlots: boolean;
+  preserveElementIds: readonly string[];
   trace: NavigationTrace;
 };
+type NonDispatchPendingNavigationCommitDispositionDecision = {
+  disposition: Exclude<PendingNavigationCommitDisposition, "dispatch">;
+  preserveElementIds: readonly [];
+  trace: NavigationTrace;
+};
+type PendingNavigationCommitDispositionDecision = DispatchPendingNavigationCommitDispositionDecision | NonDispatchPendingNavigationCommitDispositionDecision;
 declare function createHistoryStateWithPreviousNextUrl(state: unknown, previousNextUrl: string | null): HistoryStateRecord | null;
 declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
 declare function resolveInterceptionContextFromPreviousNextUrl(previousNextUrl: string | null, basePath?: string): string | null;
@@ -80,22 +90,12 @@ type ResolveServerActionRequestStateResult = {
  * `findIntercept` lookup.
  */
 declare function resolveServerActionRequestState(options: ResolveServerActionRequestStateOptions): ResolveServerActionRequestStateResult;
-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;
+  currentState: AppRouterState;
+  pending: PendingNavigationCommit;
   startedNavigationId: number;
-  startedVisibleCommitVersion: number;
+  targetHref?: string;
 }): PendingNavigationCommitDispositionDecision;
 declare function createPendingNavigationCommit(options: {
   currentState: AppRouterState;
@@ -107,5 +107,5 @@ declare function createPendingNavigationCommit(options: {
   type: "navigate" | "replace" | "traverse";
 }): Promise<PendingNavigationCommit>;
 //#endregion
-export { AppRouterAction, AppRouterState, CommittedOperationRecord, OperationLane, OperationRecord, PendingNavigationCommit, PendingOperationRecord, createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState, shouldHardNavigate };
+export { AppRouterAction, AppRouterState, CommittedOperationRecord, type OperationLane, OperationRecord, PendingNavigationCommit, PendingOperationRecord, createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState };
 //# sourceMappingURL=app-browser-state.d.ts.map

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

@@ -1,8 +1,10 @@
 import { stripBasePath } from "../utils/base-path.js";
+import { RSC_ACTION_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { getMountedSlotIdsHeader } from "./app-elements.js";
+import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.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) {
@@ -46,50 +48,133 @@ 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,
+		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) {
+	return {
+		displayUrl: createNavigationSnapshotUrl(state.navigationSnapshot),
+		layoutIds: state.layoutIds,
+		matchedUrl: state.navigationSnapshot.pathname,
+		mountedParallelSlots: createMountedParallelSlotSnapshots(state.elements),
+		rootBoundaryId: state.rootLayoutTreePath,
+		routeId: state.routeId
+	};
+}
+function createPendingRouteSnapshot(pending) {
+	return {
+		displayUrl: createNavigationSnapshotUrl(pending.action.navigationSnapshot),
+		layoutIds: pending.action.layoutIds,
+		matchedUrl: pending.action.navigationSnapshot.pathname,
+		mountedParallelSlots: createMountedParallelSlotSnapshots(pending.action.elements),
+		rootBoundaryId: pending.rootLayoutTreePath,
+		routeId: pending.routeId
 	};
+}
+function createPendingNavigationOperationToken(options) {
 	return {
-		disposition,
-		trace: createNavigationTrace(getPendingNavigationCommitDispositionTraceCode({
-			currentRootLayoutTreePath: options.currentRootLayoutTreePath,
-			disposition,
-			nextRootLayoutTreePath: options.nextRootLayoutTreePath
-		}), traceFields)
+		baseVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion,
+		deploymentVersion: null,
+		graphVersion: null,
+		lane: options.pending.action.operation.lane,
+		operationId: options.pending.action.operation.id,
+		targetSnapshotFingerprint: createRootBoundarySnapshotFingerprint(options.targetSnapshot)
 	};
 }
-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 createRootBoundarySnapshotFingerprint(snapshot) {
+	return `${snapshot.routeId}|root:${snapshot.rootBoundaryId ?? "unknown"}`;
+}
+function planPendingRootBoundaryFlightResponse(options) {
+	const targetSnapshot = createPendingRouteSnapshot(options.pending);
+	const token = createPendingNavigationOperationToken({
+		pending: options.pending,
+		targetSnapshot
+	});
+	return navigationPlanner.plan({
+		routeManifest: null,
+		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,
+			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) {
@@ -100,6 +185,7 @@ async function createPendingNavigationCommit(options) {
 		action: {
 			elements,
 			interceptionContext: metadata.interceptionContext,
+			layoutIds: metadata.layoutIds,
 			layoutFlags: metadata.layoutFlags,
 			navigationSnapshot: options.navigationSnapshot,
 			operation: createOperationRecord({
@@ -120,6 +206,6 @@ async function createPendingNavigationCommit(options) {
 	};
 }
 //#endregion
-export { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolvePendingNavigationCommitDispositionDecision, resolveServerActionRequestState, shouldHardNavigate };
+export { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, 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":";;;;;;AAgBA,MAAM,6CAA6C;AAiEnD,SAAS,kBAAkB,OAAoC;AAC7D,KAAI,CAAC,SAAS,OAAO,UAAU,SAC7B,QAAO,EAAE;CAGX,MAAM,YAAgC,EAAE;AACxC,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,CAC9C,WAAU,OAAO;AAEnB,QAAO;;AAGT,SAAgB,sCACd,OACA,iBAC2B;CAC3B,MAAM,YAAY,kBAAkB,MAAM;AAE1C,KAAI,oBAAoB,KACtB,QAAO,UAAU;KAEjB,WAAU,8CAA8C;AAG1D,QAAO,OAAO,KAAK,UAAU,CAAC,SAAS,IAAI,YAAY;;AAGzD,SAAgB,gCAAgC,OAA+B;CAC7E,MAAM,QAAQ,kBAAkB,MAAM,CAAC;AACvC,QAAO,OAAO,UAAU,WAAW,QAAQ;;AAG7C,SAAS,sBAAsB,SAIJ;AACzB,QAAO;EACL,IAAI,QAAQ;EACZ,MAAM,QAAQ;EACd,6BAA6B,QAAQ;EACrC,OAAO;EACR;;AAGH,SAAgB,8CACd,iBACA,WAAmB,IACJ;AACf,KAAI,oBAAoB,KACtB,QAAO;AAIT,QAAO,cADW,IAAI,IAAI,iBAAiB,mBAAmB,CAC/B,UAAU,SAAS;;;;;;;;;;;;;AAyBpD,SAAgB,gCACd,SACuC;CACvC,MAAM,UAAU,yBAAyB;AACzC,SAAQ,IAAI,gBAAgB,QAAQ,SAAS;CAE7C,MAAM,sBAAsB,8CAC1B,QAAQ,iBACR,QAAQ,SACT;AACD,KAAI,wBAAwB,KAC1B,SAAQ,IAAI,iCAAiC,oBAAoB;CAGnE,MAAM,qBAAqB,wBAAwB,QAAQ,SAAS;AACpE,KAAI,uBAAuB,KACzB,SAAQ,IAAI,0BAA0B,mBAAmB;AAG3D,QAAO,EAAE,SAAS;;AAGpB,SAAgB,mBACd,2BACA,wBACS;AAIT,QACE,8BAA8B,QAC9B,2BAA2B,QAC3B,8BAA8B;;AAIlC,SAAgB,0CAA0C,SAOnB;AACrC,KAAI,QAAQ,wBAAwB,QAAQ,mBAC1C,QAAO;AAGT,KAAI,QAAQ,gCAAgC,QAAQ,4BAClD,QAAO;AAGT,KAAI,mBAAmB,QAAQ,2BAA2B,QAAQ,uBAAuB,CACvF,QAAO;AAGT,QAAO;;AAGT,SAAgB,kDAAkD,SAOnB;CAC7C,MAAM,cAAc,0CAA0C,QAAQ;CACtE,MAAM,cAAc;EAClB,oBAAoB,QAAQ;EAC5B,2BAA2B,QAAQ;EACnC,6BAA6B,QAAQ;EACrC,wBAAwB,QAAQ;EAChC,qBAAqB,QAAQ;EAC7B,6BAA6B,QAAQ;EACtC;AAED,QAAO;EACL;EACA,OAAO,sBACL,+CAA+C;GAC7C,2BAA2B,QAAQ;GACnC;GACA,wBAAwB,QAAQ;GACjC,CAAC,EACF,YACD;EACF;;AAGH,SAAS,+CAA+C,SAI1B;AAC5B,SAAQ,QAAQ,aAAhB;EACE,KAAK,OACH,QAAO,2BAA2B;EACpC,KAAK,gBACH,QAAO,2BAA2B;EACpC,KAAK,WACH,QAAO,QAAQ,8BAA8B,QAAQ,QAAQ,2BAA2B,OACpF,2BAA2B,sBAC3B,2BAA2B;EACjC,SAAS;GACP,MAAM,cAAqB,QAAQ;AACnC,SAAM,IAAI,MAAM,qDAAqD,OAAO,YAAY,CAAC;;;;AAK/F,eAAsB,8BAA8B,SAQf;CACnC,MAAM,WAAW,MAAM,QAAQ;CAC/B,MAAM,WAAW,gBAAgB,aAAa,SAAS;CACvD,MAAM,kBACJ,QAAQ,oBAAoB,KAAA,IACxB,QAAQ,kBACR,QAAQ,aAAa;AAE3B,QAAO;EACL,QAAQ;GACN;GACA,qBAAqB,SAAS;GAC9B,aAAa,SAAS;GACtB,oBAAoB,QAAQ;GAC5B,WAAW,sBAAsB;IAC/B,IAAI,QAAQ;IACZ,MAAM,QAAQ;IACd,6BAA6B,QAAQ,aAAa;IACnD,CAAC;GACF;GACA,UAAU,QAAQ;GAClB,oBAAoB,SAAS;GAC7B,SAAS,SAAS;GAClB,MAAM,QAAQ;GACf;EAED,qBAAqB,SAAS;EAC9B;EACA,oBAAoB,SAAS;EAC7B,SAAS,SAAS;EACnB"}
+{"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 {\n  AppElementsWire,\n  getMountedSlotIds,\n  getMountedSlotIdsHeader,\n  type AppElements,\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\";\n\nconst VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = \"__vinext_previousNextUrl\";\n\ntype HistoryStateRecord = {\n  [key: string]: unknown;\n};\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  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  visibleCommitVersion: number;\n};\n\nexport type AppRouterAction = {\n  elements: AppElements;\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  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 DispatchPendingNavigationCommitDispositionDecision = {\n  disposition: \"dispatch\";\n  preserveAbsentSlots: boolean;\n  preserveElementIds: 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;\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(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  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      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  return {\n    displayUrl,\n    layoutIds: state.layoutIds,\n    // `displayUrl` preserves the browser-visible query string for decisions and\n    // traces. `matchedUrl` stays path-only because route matching has already\n    // consumed query params before AppElements metadata reaches this boundary.\n    matchedUrl: state.navigationSnapshot.pathname,\n    mountedParallelSlots: createMountedParallelSlotSnapshots(state.elements),\n    rootBoundaryId: state.rootLayoutTreePath,\n    routeId: state.routeId,\n  };\n}\n\nfunction createPendingRouteSnapshot(pending: PendingNavigationCommit): RouteSnapshotV0 {\n  const displayUrl = createNavigationSnapshotUrl(pending.action.navigationSnapshot);\n  return {\n    displayUrl,\n    layoutIds: pending.action.layoutIds,\n    // See createVisibleRouteSnapshot: matchedUrl intentionally models the route\n    // identity, not the address bar URL.\n    matchedUrl: pending.action.navigationSnapshot.pathname,\n    mountedParallelSlots: createMountedParallelSlotSnapshots(pending.action.elements),\n    rootBoundaryId: pending.rootLayoutTreePath,\n    routeId: pending.routeId,\n  };\n}\n\nfunction createPendingNavigationOperationToken(options: {\n  pending: PendingNavigationCommit;\n  targetSnapshot: RouteSnapshotV0;\n}): OperationToken {\n  return {\n    baseVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion,\n    deploymentVersion: null,\n    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  targetHref?: string;\n  traceFields: NavigationTraceFields;\n}): NavigationDecisionV0 {\n  const targetSnapshot = createPendingRouteSnapshot(options.pending);\n  const token = createPendingNavigationOperationToken({\n    pending: options.pending,\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  // The planner owns the root-boundary decision; later #726 route-graph work\n  // should replace these client-visible snapshots with the read model called\n  // out in routing/app-router.ts instead of adding more local topology checks.\n  return navigationPlanner.plan({\n    routeManifest: null,\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        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  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      layoutIds: metadata.layoutIds,\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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"}

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

@@ -1,3 +1,6 @@
+import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
+import { ReactFormState } from "react-dom/client";
+
 //#region src/server/app-browser-stream.d.ts
 type NavigationSnapshot = {
   pathname: string;
@@ -12,6 +15,7 @@ type VinextBrowserGlobals = {
   __VINEXT_RSC__?: LegacyRscEmbedData;
   __VINEXT_RSC_CHUNKS__?: string[];
   __VINEXT_RSC_DONE__?: boolean;
+  [RSC_FORM_STATE_GLOBAL]?: ReactFormState;
   __VINEXT_RSC_PARAMS__?: Record<string, string | string[]>;
   __VINEXT_RSC_NAV__?: NavigationSnapshot;
 };

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

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

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

@@ -1,11 +1,14 @@
 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[];
   trace: NavigationTrace;
 };
 type HardNavigateCommitDecision = {
@@ -49,6 +52,7 @@ declare function approvePendingNavigationCommit(options: {
   currentState: AppRouterState;
   pending: PendingNavigationCommit;
   startedNavigationId: number;
+  targetHref: string;
 }): CommitApproval;
 declare function resolveAndClassifyNavigationCommit(options: {
   activeNavigationId: number;
@@ -61,6 +65,7 @@ declare function resolveAndClassifyNavigationCommit(options: {
   previousNextUrl?: string | null;
   renderId: number;
   startedNavigationId: number;
+  targetHref: string;
   type: "navigate" | "replace" | "traverse";
 }): Promise<ClassifiedPendingNavigationCommit>;
 //#endregion