vinext 0.0.46 → 0.0.47

package/dist/routing/app-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-router.js","names":[],"sources":["../../src/routing/app-router.ts"],"sourcesContent":["/**\n * App Router file-system routing.\n *\n * Scans the app/ directory following Next.js App Router conventions:\n * - app/page.tsx -> /\n * - app/about/page.tsx -> /about\n * - app/blog/[slug]/page.tsx -> /blog/:slug\n * - app/[...catchAll]/page.tsx -> /:catchAll+\n * - app/route.ts -> / (API route)\n * - app/(group)/page.tsx -> / (route groups are transparent)\n * - Layouts: app/layout.tsx wraps all children\n * - Loading: app/loading.tsx -> Suspense fallback\n * - Error: app/error.tsx -> ErrorBoundary\n * - Not Found: app/not-found.tsx\n */\nimport path from \"node:path\";\nimport fs from \"node:fs\";\nimport { compareRoutes, decodeRouteSegment, normalizePathnameForRouteMatch } from \"./utils.js\";\nimport {\n  createValidFileMatcher,\n  scanWithExtensions,\n  type ValidFileMatcher,\n} from \"./file-matcher.js\";\nimport { validateRoutePatterns } from \"./route-validation.js\";\nimport { buildRouteTrie, trieMatch, type TrieNode } from \"./route-trie.js\";\n\nexport type InterceptingRoute = {\n  /** The interception convention: \".\" | \"..\" | \"../..\" | \"...\" */\n  convention: string;\n  /** The URL pattern this intercepts (e.g. \"/photos/:id\") */\n  targetPattern: string;\n  /** Absolute path to the intercepting page component */\n  pagePath: string;\n  /** Absolute layout paths inside the intercepting route tree, outermost to innermost */\n  layoutPaths: string[];\n  /** Parameter names for dynamic segments */\n  params: string[];\n};\n\nexport type ParallelSlot = {\n  /** Stable slot identity (name + owning directory), used for route serialization keys. */\n  key: string;\n  /** Slot name (e.g. \"team\" from @team) */\n  name: string;\n  /** Absolute path to the @slot directory that owns this slot. Internal routing metadata. */\n  ownerDir: string;\n  /** Absolute path to the slot's page component */\n  pagePath: string | null;\n  /** Absolute path to the slot's default.tsx fallback */\n  defaultPath: string | null;\n  /** Absolute path to the slot's layout component (wraps slot content) */\n  layoutPath: string | null;\n  /** Absolute path to the slot's loading component */\n  loadingPath: string | null;\n  /** Absolute path to the slot's error component */\n  errorPath: string | null;\n  /** Intercepting routes within this slot */\n  interceptingRoutes: InterceptingRoute[];\n  /**\n   * The layout index (0-based, in route.layouts[]) that this slot belongs to.\n   * Slots are passed as props to the layout at their directory level, not\n   * necessarily the innermost layout. -1 means \"innermost\" (legacy default).\n   */\n  layoutIndex: number;\n  /**\n   * Filesystem segments from the slot's root directory to its active page.\n   * Used at render time to compute segments for useSelectedLayoutSegment(slotName).\n   * For a page at the slot root (@team/page.tsx), this is [].\n   * For a sub-page (@team/members/page.tsx), this is [\"members\"].\n   * null when the slot has no active page (showing default.tsx fallback).\n   */\n  routeSegments: string[] | null;\n};\n\nexport type AppRoute = {\n  /** URL pattern, e.g. \"/\" or \"/about\" or \"/blog/:slug\" */\n  pattern: string;\n  /** Absolute file path to the page component */\n  pagePath: string | null;\n  /** Absolute file path to the route handler (route.ts) */\n  routePath: string | null;\n  /** Ordered list of layout files from root to leaf */\n  layouts: string[];\n  /** Ordered list of all discovered template files from root to leaf (not necessarily aligned 1:1 with layouts) */\n  templates: string[];\n  /** Parallel route slots (from @slot directories at the route's directory level) */\n  parallelSlots: ParallelSlot[];\n  /** Loading component path */\n  loadingPath: string | null;\n  /** Error component path (leaf directory only) */\n  errorPath: string | null;\n  /**\n   * Per-layout error boundary paths, aligned with the layouts array.\n   * Each entry is the error.tsx at the same directory level as the\n   * corresponding layout (or null if that level has no error.tsx).\n   * Used to interleave ErrorBoundary components with layouts so that\n   * ancestor error boundaries catch errors from descendant segments.\n   */\n  layoutErrorPaths: (string | null)[];\n  /** Not-found component path (nearest, walking up from page dir) */\n  notFoundPath: string | null;\n  /**\n   * Not-found component paths per layout level (aligned with layouts array).\n   * Each entry is the not-found.tsx at that layout's directory, or null.\n   * Used to create per-layout NotFoundBoundary so that notFound() thrown from\n   * a layout is caught by the parent layout's boundary (matching Next.js behavior).\n   */\n  notFoundPaths: (string | null)[];\n  /**\n   * Forbidden component paths per layout level (aligned with layouts array).\n   * Each entry is the forbidden.tsx at that layout's directory, or null.\n   * Used to create per-layout ForbiddenBoundary.\n   */\n  forbiddenPaths: (string | null)[];\n  /** Forbidden component path (403) at the route's directory level */\n  forbiddenPath: string | null;\n  /** Unauthorized component path (401) at the route's directory level */\n  unauthorizedPath: string | null;\n  /** Unauthorized component paths per layout level (aligned with layouts array). */\n  unauthorizedPaths: (string | null)[];\n  /**\n   * Filesystem segments from app/ root to the route's directory.\n   * Includes route groups and dynamic segments (as template strings like \"[id]\").\n   * Used at render time to compute the child segments for useSelectedLayoutSegments().\n   */\n  routeSegments: string[];\n  /** Tree position (directory depth from app/ root) for each template. */\n  templateTreePositions?: number[];\n  /**\n   * Tree position (directory depth from app/ root) for each layout.\n   * Used to slice routeSegments and determine which segments are below each layout.\n   * For example, root layout = 0, a layout at app/blog/ = 1, app/blog/(group)/ = 2.\n   * Unlike the old layoutSegmentDepths, this counts ALL directory levels including\n   * route groups and parallel slots.\n   */\n  layoutTreePositions: number[];\n  /** Whether this is a dynamic route */\n  isDynamic: boolean;\n  /** Parameter names for dynamic segments */\n  params: string[];\n  /** Dynamic parameter names captured by the route's root layout. */\n  rootParamNames?: string[];\n  /** Pre-split pattern segments (computed once at scan time, reused per request) */\n  patternParts: string[];\n};\n\n// Cache for app routes\nlet cachedRoutes: AppRoute[] | null = null;\nlet cachedAppDir: string | null = null;\nlet cachedPageExtensionsKey: string | null = null;\n\nexport function invalidateAppRouteCache(): void {\n  cachedRoutes = null;\n  cachedAppDir = null;\n  cachedPageExtensionsKey = null;\n}\n\nfunction hasParallelSlotDirectory(dir: string): boolean {\n  try {\n    return fs\n      .readdirSync(dir, { withFileTypes: true })\n      .some((entry) => entry.isDirectory() && entry.name.startsWith(\"@\"));\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Scan the app/ directory and return a list of routes.\n */\nexport async function appRouter(\n  appDir: string,\n  pageExtensions?: readonly string[],\n  matcher?: ValidFileMatcher,\n): Promise<AppRoute[]> {\n  matcher ??= createValidFileMatcher(pageExtensions);\n  const pageExtensionsKey = JSON.stringify(matcher.extensions);\n  if (cachedRoutes && cachedAppDir === appDir && cachedPageExtensionsKey === pageExtensionsKey) {\n    return cachedRoutes;\n  }\n\n  // Find all page.tsx and route.ts files, excluding @slot directories\n  // (slot pages are not standalone routes — they're rendered as props of their parent layout)\n  // and _private folders (Next.js convention for colocated non-route files).\n  const routes: AppRoute[] = [];\n\n  const excludeDir = (name: string) => name.startsWith(\"@\") || name.startsWith(\"_\");\n\n  // Process page files in a single pass\n  // Use function form of exclude for Node < 22.14 compatibility (string arrays require >= 22.14)\n  for await (const file of scanWithExtensions(\"**/page\", appDir, matcher.extensions, excludeDir)) {\n    const route = fileToAppRoute(file, appDir, \"page\", matcher);\n    if (route) routes.push(route);\n  }\n\n  // Process route handler files (API routes) in a single pass\n  for await (const file of scanWithExtensions(\"**/route\", appDir, matcher.extensions, excludeDir)) {\n    const route = fileToAppRoute(file, appDir, \"route\", matcher);\n    if (route) routes.push(route);\n  }\n\n  // Layouts with parallel slot pages are valid route entries even when the\n  // segment has no children page. Next.js uses this for modal/feed patterns\n  // like app/user/[id]/layout + @feed/page + @modal/default.\n  const routePatterns = new Set(routes.map((route) => route.pattern));\n  for await (const file of scanWithExtensions(\n    \"**/layout\",\n    appDir,\n    matcher.extensions,\n    excludeDir,\n  )) {\n    const dir = path.dirname(file);\n    const routeDir = dir === \".\" ? appDir : path.join(appDir, dir);\n    if (!hasParallelSlotDirectory(routeDir)) continue;\n    if (discoverParallelSlots(routeDir, appDir, matcher).length === 0) continue;\n\n    const route = directoryToAppRoute(dir, appDir, matcher, null, null);\n    if (!route || routePatterns.has(route.pattern)) continue;\n\n    routes.push(route);\n    routePatterns.add(route.pattern);\n  }\n\n  // Discover sub-routes created by nested pages within parallel slots.\n  // In Next.js, pages nested inside @slot directories create additional URL routes.\n  // For example, @audience/demographics/page.tsx at app/parallel-routes/ creates\n  // a route at /parallel-routes/demographics.\n  const slotSubRoutes = discoverSlotSubRoutes(routes, appDir, matcher);\n  routes.push(...slotSubRoutes);\n\n  validatePageRouteConflicts(routes, appDir);\n  validateRoutePatterns(routes.map((route) => route.pattern));\n  const interceptTargetPatterns = [\n    ...new Set(\n      routes.flatMap((route) =>\n        route.parallelSlots.flatMap((slot) =>\n          slot.interceptingRoutes.map((intercept) => intercept.targetPattern),\n        ),\n      ),\n    ),\n  ];\n  validateRoutePatterns(interceptTargetPatterns);\n\n  // Sort: static routes first, then dynamic, then catch-all\n  routes.sort(compareRoutes);\n\n  cachedRoutes = routes;\n  cachedAppDir = appDir;\n  cachedPageExtensionsKey = pageExtensionsKey;\n  return routes;\n}\n\nfunction validatePageRouteConflicts(routes: AppRoute[], appDir: string): void {\n  const byPattern = new Map<string, { pagePath: string | null; routePath: string | null }>();\n\n  // validateRoutePatterns() would also reject page/route pairs because they\n  // share a URL pattern. Keep this pass first so the error names both files.\n  for (const route of routes) {\n    const entry = byPattern.get(route.pattern);\n    if (!entry) {\n      byPattern.set(route.pattern, {\n        pagePath: route.pagePath,\n        routePath: route.routePath,\n      });\n      continue;\n    }\n\n    if (!entry.pagePath && route.pagePath) {\n      entry.pagePath = route.pagePath;\n    }\n    if (!entry.routePath && route.routePath) {\n      entry.routePath = route.routePath;\n    }\n  }\n\n  for (const [pattern, entry] of byPattern) {\n    if (!entry.pagePath || !entry.routePath) continue;\n\n    throw new Error(\n      `Conflicting route and page at ${pattern}: route at ${formatAppFilePath(\n        entry.routePath,\n        appDir,\n      )} and page at ${formatAppFilePath(entry.pagePath, appDir)}`,\n    );\n  }\n}\n\nfunction formatAppFilePath(filePath: string, appDir: string): string {\n  const relativePath = path.relative(appDir, filePath).replace(/\\\\/g, \"/\");\n  const parsedPath = path.parse(relativePath);\n  const withoutExtension = path.join(parsedPath.dir, parsedPath.name).replace(/\\\\/g, \"/\");\n  return withoutExtension.startsWith(\"/\") ? withoutExtension : `/${withoutExtension}`;\n}\n\n/**\n * Discover sub-routes created by nested pages within parallel slots.\n *\n * In Next.js, pages nested inside @slot directories create additional URL routes.\n * For example, given:\n *   app/parallel-routes/@audience/demographics/page.tsx\n * This creates a route at /parallel-routes/demographics where:\n * - children slot → parent's default.tsx\n * - @audience slot → @audience/demographics/page.tsx (matched)\n * - other slots → their default.tsx (fallback)\n */\nfunction discoverSlotSubRoutes(\n  routes: AppRoute[],\n  _appDir: string,\n  matcher: ValidFileMatcher,\n): AppRoute[] {\n  const syntheticRoutes: AppRoute[] = [];\n\n  // O(1) lookup for existing routes by pattern — avoids O(n) routes.find() per sub-path per parent.\n  // Updated as new synthetic routes are pushed so that later parents can see earlier synthetic entries.\n  const routesByPattern = new Map<string, AppRoute>(routes.map((r) => [r.pattern, r]));\n\n  const applySlotSubPages = (\n    route: AppRoute,\n    slotPages: Map<string, string>,\n    rawSegments: string[],\n  ): void => {\n    route.parallelSlots = route.parallelSlots.map((slot) => {\n      const subPage = slotPages.get(slot.key);\n      if (subPage !== undefined) {\n        return { ...slot, pagePath: subPage, routeSegments: rawSegments };\n      }\n      return slot;\n    });\n  };\n\n  for (const parentRoute of routes) {\n    if (parentRoute.parallelSlots.length === 0) continue;\n    if (!parentRoute.pagePath) continue;\n\n    const parentPageDir = path.dirname(parentRoute.pagePath);\n\n    // Collect sub-paths from all slots.\n    // Map: normalized visible sub-path -> slot pages, raw filesystem segments (for routeSegments),\n    // and the pre-computed convertedSubRoute (to avoid a redundant re-conversion in the merge loop).\n    const subPathMap = new Map<\n      string,\n      {\n        // Raw filesystem segments (with route groups, @slots, etc.) used for routeSegments so\n        // that useSelectedLayoutSegments() sees the correct segment list at runtime.\n        rawSegments: string[];\n        // Pre-computed URL parts, params, isDynamic from convertSegmentsToRouteParts.\n        converted: { urlSegments: string[]; params: string[]; isDynamic: boolean };\n        slotPages: Map<string, string>;\n      }\n    >();\n\n    for (const slot of parentRoute.parallelSlots) {\n      // Only scan sub-pages from slots owned by this route directory.\n      // Inherited slots with the same name live in different owner dirs.\n      if (path.dirname(slot.ownerDir) !== parentPageDir) {\n        continue;\n      }\n      const slotDir = slot.ownerDir;\n      if (!fs.existsSync(slotDir)) continue;\n\n      const subPages = findSlotSubPages(slotDir, matcher);\n      for (const { relativePath, pagePath } of subPages) {\n        const subSegments = relativePath.split(path.sep);\n        const convertedSubRoute = convertSegmentsToRouteParts(subSegments);\n        if (!convertedSubRoute) continue;\n\n        const { urlSegments } = convertedSubRoute;\n        const normalizedSubPath = urlSegments.join(\"/\");\n        let subPathEntry = subPathMap.get(normalizedSubPath);\n\n        if (!subPathEntry) {\n          subPathEntry = {\n            rawSegments: subSegments,\n            converted: convertedSubRoute,\n            slotPages: new Map(),\n          };\n          subPathMap.set(normalizedSubPath, subPathEntry);\n        }\n\n        const existingSlotPage = subPathEntry.slotPages.get(slot.key);\n        if (existingSlotPage) {\n          const pattern = joinRoutePattern(parentRoute.pattern, normalizedSubPath);\n          throw new Error(\n            `You cannot have two routes that resolve to the same path (\"${pattern}\").`,\n          );\n        }\n\n        subPathEntry.slotPages.set(slot.key, pagePath);\n      }\n    }\n\n    if (subPathMap.size === 0) continue;\n\n    // Find the default.tsx for the children slot at the parent directory\n    const childrenDefault = findFile(parentPageDir, \"default\", matcher);\n    if (!childrenDefault) continue;\n\n    for (const { rawSegments, converted: convertedSubRoute, slotPages } of subPathMap.values()) {\n      const {\n        urlSegments: urlParts,\n        params: subParams,\n        isDynamic: subIsDynamic,\n      } = convertedSubRoute;\n\n      const subUrlPath = urlParts.join(\"/\");\n      const pattern = joinRoutePattern(parentRoute.pattern, subUrlPath);\n\n      const existingRoute = routesByPattern.get(pattern);\n      if (existingRoute) {\n        if (existingRoute.routePath && !existingRoute.pagePath) {\n          throw new Error(\n            `You cannot have two routes that resolve to the same path (\"${pattern}\").`,\n          );\n        }\n        applySlotSubPages(existingRoute, slotPages, rawSegments);\n        continue;\n      }\n\n      // Build parallel slots for this sub-route: matching slots get the sub-page,\n      // non-matching slots get null pagePath (rendering falls back to defaultPath)\n      const subSlots: ParallelSlot[] = parentRoute.parallelSlots.map((slot) => {\n        const subPage = slotPages.get(slot.key);\n        return {\n          ...slot,\n          pagePath: subPage || null,\n          routeSegments: subPage ? rawSegments : null,\n        };\n      });\n\n      const newRoute: AppRoute = {\n        pattern,\n        pagePath: childrenDefault, // children slot uses parent's default.tsx as page\n        routePath: null,\n        layouts: parentRoute.layouts,\n        templates: parentRoute.templates,\n        parallelSlots: subSlots,\n        loadingPath: parentRoute.loadingPath,\n        errorPath: parentRoute.errorPath,\n        layoutErrorPaths: parentRoute.layoutErrorPaths,\n        notFoundPath: parentRoute.notFoundPath,\n        notFoundPaths: parentRoute.notFoundPaths,\n        forbiddenPaths: parentRoute.forbiddenPaths,\n        forbiddenPath: parentRoute.forbiddenPath,\n        unauthorizedPath: parentRoute.unauthorizedPath,\n        unauthorizedPaths: parentRoute.unauthorizedPaths,\n        routeSegments: [...parentRoute.routeSegments, ...rawSegments],\n        templateTreePositions: parentRoute.templateTreePositions,\n        layoutTreePositions: parentRoute.layoutTreePositions,\n        isDynamic: parentRoute.isDynamic || subIsDynamic,\n        params: [...parentRoute.params, ...subParams],\n        rootParamNames: parentRoute.rootParamNames,\n        patternParts: [...parentRoute.patternParts, ...urlParts],\n      };\n      syntheticRoutes.push(newRoute);\n      routesByPattern.set(pattern, newRoute);\n    }\n  }\n\n  return syntheticRoutes;\n}\n\n/**\n * Find all page files in subdirectories of a parallel slot directory.\n * Returns relative paths (from the slot dir) and absolute page paths.\n * Skips the root page.tsx (already handled as the slot's main page)\n * and intercepting route directories.\n */\nfunction findSlotSubPages(\n  slotDir: string,\n  matcher: ValidFileMatcher,\n): Array<{ relativePath: string; pagePath: string }> {\n  const results: Array<{ relativePath: string; pagePath: string }> = [];\n\n  function scan(dir: string): void {\n    if (!fs.existsSync(dir)) return;\n    const entries = fs.readdirSync(dir, { withFileTypes: true });\n    for (const entry of entries) {\n      if (!entry.isDirectory()) continue;\n      // Skip intercepting route directories\n      if (matchInterceptConvention(entry.name)) continue;\n      // Skip private folders (prefixed with _)\n      if (entry.name.startsWith(\"_\")) continue;\n\n      const subDir = path.join(dir, entry.name);\n      const page = findFile(subDir, \"page\", matcher);\n      if (page) {\n        const relativePath = path.relative(slotDir, subDir);\n        results.push({ relativePath, pagePath: page });\n      }\n      // Continue scanning deeper for nested sub-pages\n      scan(subDir);\n    }\n  }\n\n  scan(slotDir);\n  return results;\n}\n\n/**\n * Convert a file path relative to app/ into an AppRoute.\n */\nfunction fileToAppRoute(\n  file: string,\n  appDir: string,\n  type: \"page\" | \"route\",\n  matcher: ValidFileMatcher,\n): AppRoute | null {\n  // Remove the filename (page.tsx or route.ts)\n  const dir = path.dirname(file);\n  return directoryToAppRoute(\n    dir,\n    appDir,\n    matcher,\n    type === \"page\" ? path.join(appDir, file) : null,\n    type === \"route\" ? path.join(appDir, file) : null,\n  );\n}\n\nfunction directoryToAppRoute(\n  dir: string,\n  appDir: string,\n  matcher: ValidFileMatcher,\n  pagePath: string | null,\n  routePath: string | null,\n): AppRoute | null {\n  const segments = dir === \".\" ? [] : dir.split(path.sep);\n\n  const params: string[] = [];\n  let isDynamic = false;\n\n  const convertedRoute = convertSegmentsToRouteParts(segments);\n  if (!convertedRoute) return null;\n\n  const { urlSegments, params: routeParams, isDynamic: routeIsDynamic } = convertedRoute;\n  params.push(...routeParams);\n  isDynamic = routeIsDynamic;\n\n  const pattern = \"/\" + urlSegments.join(\"/\");\n\n  // Discover layouts and templates from root to leaf\n  const layouts = discoverLayouts(segments, appDir, matcher);\n  const templates = discoverTemplates(segments, appDir, matcher);\n  const templateTreePositions = computeLayoutTreePositions(appDir, templates);\n\n  // Compute the tree position (directory depth) for each layout.\n  const layoutTreePositions = computeLayoutTreePositions(appDir, layouts);\n\n  // Discover per-layout error boundaries (aligned with layouts array).\n  // In Next.js, each segment independently wraps its children with an ErrorBoundary.\n  // This array enables interleaving error boundaries with layouts in the rendering.\n  const layoutErrorPaths = discoverLayoutAlignedErrors(segments, appDir, matcher);\n\n  // Discover loading, error in the route's directory\n  const routeDir = dir === \".\" ? appDir : path.join(appDir, dir);\n  const loadingPath = findFile(routeDir, \"loading\", matcher);\n  const errorPath = findFile(routeDir, \"error\", matcher);\n\n  // Discover not-found/forbidden/unauthorized: walk from route directory up to root (nearest wins).\n  const notFoundPath = discoverBoundaryFile(segments, appDir, \"not-found\", matcher);\n  const forbiddenPath = discoverBoundaryFile(segments, appDir, \"forbidden\", matcher);\n  const unauthorizedPath = discoverBoundaryFile(segments, appDir, \"unauthorized\", matcher);\n\n  // Discover per-layout not-found files (one per layout directory).\n  // These are used for per-layout NotFoundBoundary to match Next.js behavior where\n  // notFound() thrown from a layout is caught by the parent layout's boundary.\n  const notFoundPaths = discoverBoundaryFilePerLayout(layouts, \"not-found\", matcher);\n  const forbiddenPaths = discoverBoundaryFilePerLayout(layouts, \"forbidden\", matcher);\n  const unauthorizedPaths = discoverBoundaryFilePerLayout(layouts, \"unauthorized\", matcher);\n\n  // Discover parallel slots (@team, @analytics, etc.).\n  // Slots at the route's own directory use page.tsx; slots at ancestor directories\n  // (inherited from parent layouts) use default.tsx as fallback.\n  const parallelSlots = discoverInheritedParallelSlots(segments, appDir, routeDir, matcher);\n\n  return {\n    pattern: pattern === \"/\" ? \"/\" : pattern,\n    pagePath,\n    routePath,\n    layouts,\n    templates,\n    parallelSlots,\n    loadingPath,\n    errorPath,\n    layoutErrorPaths,\n    notFoundPath,\n    notFoundPaths,\n    forbiddenPaths,\n    forbiddenPath,\n    unauthorizedPath,\n    unauthorizedPaths,\n    routeSegments: segments,\n    templateTreePositions,\n    layoutTreePositions,\n    isDynamic,\n    params,\n    rootParamNames: computeRootParamNames(segments, layoutTreePositions),\n    patternParts: urlSegments,\n  };\n}\n\nfunction dynamicParamNameFromSegment(segment: string): string | null {\n  if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\")) return segment.slice(5, -2);\n  if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) return segment.slice(4, -1);\n  if (segment.startsWith(\"[\") && segment.endsWith(\"]\")) return segment.slice(1, -1);\n  return null;\n}\n\nexport function computeRootParamNames(\n  routeSegments: readonly string[],\n  layoutTreePositions: readonly number[],\n): string[] {\n  const rootLayoutPosition = layoutTreePositions[0];\n  if (rootLayoutPosition == null || rootLayoutPosition <= 0) return [];\n\n  const names: string[] = [];\n  for (const segment of routeSegments.slice(0, rootLayoutPosition)) {\n    const name = dynamicParamNameFromSegment(segment);\n    if (name && !names.includes(name)) names.push(name);\n  }\n  return names;\n}\n\n/**\n * Compute the tree position (directory depth from app root) for each layout.\n * Root layout = 0, a layout at app/blog/ = 1, app/blog/(group)/ = 2.\n * Counts ALL directory levels including route groups and parallel slots.\n */\nfunction computeLayoutTreePositions(appDir: string, layouts: string[]): number[] {\n  return layouts.map((layoutPath) => {\n    const layoutDir = path.dirname(layoutPath);\n    if (layoutDir === appDir) return 0;\n    const relative = path.relative(appDir, layoutDir);\n    return relative.split(path.sep).length;\n  });\n}\n\n/**\n * Discover all layout files from root to the given directory.\n * Each level of the directory tree may have a layout.tsx.\n */\nfunction discoverLayouts(segments: string[], appDir: string, matcher: ValidFileMatcher): string[] {\n  const layouts: string[] = [];\n\n  // Check root layout\n  const rootLayout = findFile(appDir, \"layout\", matcher);\n  if (rootLayout) layouts.push(rootLayout);\n\n  // Check each directory level\n  let currentDir = appDir;\n  for (const segment of segments) {\n    currentDir = path.join(currentDir, segment);\n    const layout = findFile(currentDir, \"layout\", matcher);\n    if (layout) layouts.push(layout);\n  }\n\n  return layouts;\n}\n\n/**\n * Discover all template files from root to the given directory.\n * Each level of the directory tree may have a template.tsx.\n * Templates are like layouts but re-mount on navigation.\n */\nfunction discoverTemplates(\n  segments: string[],\n  appDir: string,\n  matcher: ValidFileMatcher,\n): string[] {\n  const templates: string[] = [];\n\n  // Check root template\n  const rootTemplate = findFile(appDir, \"template\", matcher);\n  if (rootTemplate) templates.push(rootTemplate);\n\n  // Check each directory level\n  let currentDir = appDir;\n  for (const segment of segments) {\n    currentDir = path.join(currentDir, segment);\n    const template = findFile(currentDir, \"template\", matcher);\n    if (template) templates.push(template);\n  }\n\n  return templates;\n}\n\n/**\n * Discover error.tsx files aligned with the layouts array.\n * Walks the same directory levels as discoverLayouts and, for each level\n * that contributes a layout entry, checks whether error.tsx also exists.\n * Returns an array of the same length as discoverLayouts() would return,\n * with the error path (or null) at each corresponding layout level.\n *\n * This enables interleaving ErrorBoundary components with layouts in the\n * rendering tree, matching Next.js behavior where each segment independently\n * wraps its children with an error boundary.\n */\nfunction discoverLayoutAlignedErrors(\n  segments: string[],\n  appDir: string,\n  matcher: ValidFileMatcher,\n): (string | null)[] {\n  const errors: (string | null)[] = [];\n\n  // Root level (only if root has a layout — matching discoverLayouts logic)\n  const rootLayout = findFile(appDir, \"layout\", matcher);\n  if (rootLayout) {\n    errors.push(findFile(appDir, \"error\", matcher));\n  }\n\n  // Check each directory level\n  let currentDir = appDir;\n  for (const segment of segments) {\n    currentDir = path.join(currentDir, segment);\n    const layout = findFile(currentDir, \"layout\", matcher);\n    if (layout) {\n      errors.push(findFile(currentDir, \"error\", matcher));\n    }\n  }\n\n  return errors;\n}\n\n/**\n * Discover the nearest boundary file (not-found, forbidden, unauthorized)\n * by walking from the route's directory up to the app root.\n * Returns the first (closest) file found, or null.\n */\nfunction discoverBoundaryFile(\n  segments: string[],\n  appDir: string,\n  fileName: string,\n  matcher: ValidFileMatcher,\n): string | null {\n  // Build all directory paths from leaf to root\n  const dirs: string[] = [];\n  let dir = appDir;\n  dirs.push(dir);\n  for (const segment of segments) {\n    dir = path.join(dir, segment);\n    dirs.push(dir);\n  }\n\n  // Walk from leaf (last) to root (first)\n  for (let i = dirs.length - 1; i >= 0; i--) {\n    const f = findFile(dirs[i], fileName, matcher);\n    if (f) return f;\n  }\n  return null;\n}\n\n/**\n * Discover boundary files (not-found, forbidden, unauthorized) at each layout directory.\n * Returns an array aligned with the layouts array, where each entry is the boundary\n * file at that layout's directory, or null if none exists there.\n *\n * This is used for per-layout error boundaries. In Next.js, each layout level\n * has its own boundary that wraps the layout's children. When notFound() is thrown\n * from a layout, it propagates up to the parent layout's boundary.\n */\nfunction discoverBoundaryFilePerLayout(\n  layouts: string[],\n  fileName: string,\n  matcher: ValidFileMatcher,\n): (string | null)[] {\n  return layouts.map((layoutPath) => {\n    const layoutDir = path.dirname(layoutPath);\n    return findFile(layoutDir, fileName, matcher);\n  });\n}\n\n/**\n * Discover parallel slots inherited from ancestor directories.\n *\n * In Next.js, parallel slots belong to the layout that defines them. When a\n * child route is rendered, its parent layout's slots must still be present.\n * If the child doesn't have matching content in a slot, the slot's default.tsx\n * is rendered instead.\n *\n * Walk from appDir through each segment to the route's directory. At each level\n * that has @slot dirs, collect them. Slots at the route's own directory level\n * use page.tsx; slots at ancestor levels use default.tsx only.\n */\nfunction discoverInheritedParallelSlots(\n  segments: string[],\n  appDir: string,\n  routeDir: string,\n  matcher: ValidFileMatcher,\n): ParallelSlot[] {\n  const slotMap = new Map<string, ParallelSlot>();\n\n  // Walk from appDir through each segment, tracking layout indices.\n  // layoutIndex tracks which position in the route's layouts[] array corresponds\n  // to a given directory. Only directories with a layout.tsx file increment.\n  let currentDir = appDir;\n  const dirsToCheck: { dir: string; layoutIdx: number }[] = [];\n  let layoutIdx = findFile(appDir, \"layout\", matcher) ? 0 : -1;\n  dirsToCheck.push({ dir: appDir, layoutIdx });\n\n  for (const segment of segments) {\n    currentDir = path.join(currentDir, segment);\n    if (findFile(currentDir, \"layout\", matcher)) {\n      layoutIdx++;\n    }\n    dirsToCheck.push({ dir: currentDir, layoutIdx });\n  }\n\n  const routeHasLayout = layoutIdx >= 0;\n\n  for (const { dir, layoutIdx: lvlLayoutIdx } of dirsToCheck) {\n    // Once a route has a root layout below app/, slots discovered before that\n    // layout are above the root and cannot be owned by any layout in this route.\n    // Layout-less routes keep their legacy slot metadata here; validation is separate.\n    if (lvlLayoutIdx < 0 && routeHasLayout) continue;\n\n    const isOwnDir = dir === routeDir;\n    const slotLayoutIdx = Math.max(lvlLayoutIdx, 0);\n    const slotsAtLevel = discoverParallelSlots(dir, appDir, matcher);\n\n    for (const slot of slotsAtLevel) {\n      if (isOwnDir) {\n        // At the route's own directory: use page.tsx (normal behavior)\n        slot.layoutIndex = slotLayoutIdx;\n        slotMap.set(slot.key, slot);\n      } else {\n        // At an ancestor directory: use default.tsx as the page, not page.tsx\n        // (the slot's page.tsx is for the parent route, not this child route)\n        const inheritedSlot: ParallelSlot = {\n          ...slot,\n          pagePath: null, // Don't use ancestor's page.tsx\n          layoutIndex: slotLayoutIdx,\n          routeSegments: null,\n          // defaultPath, loadingPath, errorPath, interceptingRoutes remain\n        };\n        slotMap.set(slot.key, inheritedSlot);\n      }\n    }\n  }\n\n  return Array.from(slotMap.values());\n}\n\n/**\n * Discover parallel route slots (@team, @analytics, etc.) in a directory.\n * Returns a ParallelSlot for each @-prefixed subdirectory that has a page or default component.\n */\nfunction discoverParallelSlots(\n  dir: string,\n  appDir: string,\n  matcher: ValidFileMatcher,\n): ParallelSlot[] {\n  if (!fs.existsSync(dir)) return [];\n\n  const entries = fs.readdirSync(dir, { withFileTypes: true });\n  const slots: ParallelSlot[] = [];\n\n  for (const entry of entries) {\n    if (!entry.isDirectory() || !entry.name.startsWith(\"@\")) continue;\n\n    const slotName = entry.name.slice(1); // \"@team\" -> \"team\"\n    const slotDir = path.join(dir, entry.name);\n\n    const pagePath = findFile(slotDir, \"page\", matcher);\n    const defaultPath = findFile(slotDir, \"default\", matcher);\n    const interceptingRoutes = discoverInterceptingRoutes(slotDir, dir, appDir, matcher);\n\n    // Only include slots that have at least a page, default, or intercepting route\n    if (!pagePath && !defaultPath && interceptingRoutes.length === 0) continue;\n\n    slots.push({\n      key: `${slotName}@${path.relative(appDir, slotDir).replace(/\\\\/g, \"/\")}`,\n      name: slotName,\n      ownerDir: slotDir,\n      pagePath,\n      defaultPath,\n      layoutPath: findFile(slotDir, \"layout\", matcher),\n      loadingPath: findFile(slotDir, \"loading\", matcher),\n      errorPath: findFile(slotDir, \"error\", matcher),\n      interceptingRoutes,\n      layoutIndex: -1, // Will be set by discoverInheritedParallelSlots\n      routeSegments: pagePath ? [] : null,\n    });\n  }\n\n  return slots;\n}\n\n/**\n * The interception convention prefix patterns.\n * (.) — same level, (..) — one level up, (..)(..)\" — two levels up, (...) — root\n */\nconst INTERCEPT_PATTERNS = [\n  { prefix: \"(...)\", convention: \"...\" },\n  { prefix: \"(..)(..)\", convention: \"../..\" },\n  { prefix: \"(..)\", convention: \"..\" },\n  { prefix: \"(.)\", convention: \".\" },\n] as const;\n\n/**\n * Discover intercepting routes inside a parallel slot directory.\n *\n * Intercepting routes use conventions like (.)photo, (..)feed, (...), etc.\n * They intercept navigation to another route and render within the slot instead.\n *\n * @param slotDir - The parallel slot directory (e.g. app/feed/@modal)\n * @param routeDir - The directory of the route that owns this slot (e.g. app/feed)\n * @param appDir - The root app directory\n */\nfunction discoverInterceptingRoutes(\n  slotDir: string,\n  routeDir: string,\n  appDir: string,\n  matcher: ValidFileMatcher,\n): InterceptingRoute[] {\n  if (!fs.existsSync(slotDir)) return [];\n\n  const results: InterceptingRoute[] = [];\n\n  // Recursively scan for page files inside intercepting directories\n  scanForInterceptingPages(slotDir, routeDir, appDir, results, matcher);\n\n  return results;\n}\n\n/**\n * Recursively scan a directory tree for page.tsx files that are inside\n * intercepting route directories.\n */\nfunction scanForInterceptingPages(\n  currentDir: string,\n  routeDir: string,\n  appDir: string,\n  results: InterceptingRoute[],\n  matcher: ValidFileMatcher,\n): void {\n  if (!fs.existsSync(currentDir)) return;\n\n  const entries = fs.readdirSync(currentDir, { withFileTypes: true });\n\n  for (const entry of entries) {\n    if (!entry.isDirectory()) continue;\n    // Skip private folders (prefixed with _)\n    if (entry.name.startsWith(\"_\")) continue;\n\n    // Check if this directory name starts with an interception convention\n    const interceptMatch = matchInterceptConvention(entry.name);\n\n    if (interceptMatch) {\n      // This directory is the start of an intercepting route\n      // e.g. \"(.)photos\" means intercept same-level \"photos\" route\n      const restOfName = entry.name.slice(interceptMatch.prefix.length);\n      const interceptDir = path.join(currentDir, entry.name);\n\n      // Find page files within this intercepting directory tree\n      collectInterceptingPages(\n        interceptDir,\n        interceptDir,\n        interceptMatch.convention,\n        restOfName,\n        routeDir,\n        appDir,\n        results,\n        matcher,\n      );\n    } else {\n      // Regular subdirectory — keep scanning for intercepting dirs\n      scanForInterceptingPages(\n        path.join(currentDir, entry.name),\n        routeDir,\n        appDir,\n        results,\n        matcher,\n      );\n    }\n  }\n}\n\n/**\n * Match a directory name against interception convention prefixes.\n */\nfunction matchInterceptConvention(name: string): { prefix: string; convention: string } | null {\n  for (const pattern of INTERCEPT_PATTERNS) {\n    if (name.startsWith(pattern.prefix)) {\n      return pattern;\n    }\n  }\n  return null;\n}\n\n/**\n * Collect page.tsx files inside an intercepting route directory tree\n * and compute their target URL patterns.\n */\nfunction collectInterceptingPages(\n  currentDir: string,\n  interceptRoot: string,\n  convention: string,\n  interceptSegment: string,\n  routeDir: string,\n  appDir: string,\n  results: InterceptingRoute[],\n  matcher: ValidFileMatcher,\n  parentLayoutPaths: readonly string[] = [],\n): void {\n  const currentLayoutPath = findFile(currentDir, \"layout\", matcher);\n  const layoutPaths = currentLayoutPath\n    ? [...parentLayoutPaths, currentLayoutPath]\n    : parentLayoutPaths;\n\n  // Check for page.tsx in current directory\n  const page = findFile(currentDir, \"page\", matcher);\n  if (page) {\n    const targetPattern = computeInterceptTarget(\n      convention,\n      interceptSegment,\n      currentDir,\n      interceptRoot,\n      routeDir,\n      appDir,\n    );\n    if (targetPattern) {\n      results.push({\n        convention,\n        layoutPaths: [...layoutPaths],\n        targetPattern: targetPattern.pattern,\n        pagePath: page,\n        params: targetPattern.params,\n      });\n    }\n  }\n\n  // Recurse into subdirectories for nested intercepting routes\n  if (!fs.existsSync(currentDir)) return;\n  const entries = fs.readdirSync(currentDir, { withFileTypes: true });\n  for (const entry of entries) {\n    if (!entry.isDirectory()) continue;\n    // Skip private folders (prefixed with _)\n    if (entry.name.startsWith(\"_\")) continue;\n    collectInterceptingPages(\n      path.join(currentDir, entry.name),\n      interceptRoot,\n      convention,\n      interceptSegment,\n      routeDir,\n      appDir,\n      results,\n      matcher,\n      layoutPaths,\n    );\n  }\n}\n\n/**\n * Check whether a path segment is invisible in the URL (route groups, parallel slots, \".\").\n *\n * Used by computeInterceptTarget, convertSegmentsToRouteParts, and\n * hasRemainingVisibleSegments — keep this the single source of truth.\n */\nfunction isInvisibleSegment(segment: string): boolean {\n  if (segment === \".\") return true;\n  if (segment.startsWith(\"(\") && segment.endsWith(\")\")) return true;\n  if (segment.startsWith(\"@\")) return true;\n  return false;\n}\n\n/**\n * Compute the target URL pattern for an intercepting route.\n *\n * Interception conventions (..), (..)(..)\" climb by *visible route segments*\n * (not filesystem directories). Route groups like (marketing) and parallel\n * slots like @modal are invisible and must be skipped when counting levels.\n *\n * - (.) same level: resolve relative to routeDir\n * - (..) one level up: climb 1 visible segment\n * - (..)(..) two levels up: climb 2 visible segments\n * - (...) root: resolve from appDir\n */\nfunction computeInterceptTarget(\n  convention: string,\n  interceptSegment: string,\n  currentDir: string,\n  interceptRoot: string,\n  routeDir: string,\n  appDir: string,\n): { pattern: string; params: string[] } | null {\n  // Determine the base segments for target resolution.\n  // We work on route segments (not filesystem paths) so that route groups\n  // and parallel slots are properly skipped when climbing.\n  const routeSegments = path.relative(appDir, routeDir).split(path.sep).filter(Boolean);\n\n  let baseParts: string[];\n  switch (convention) {\n    case \".\":\n      baseParts = routeSegments;\n      break;\n    case \"..\":\n    case \"../..\": {\n      const levelsToClimb = convention === \"..\" ? 1 : 2;\n      let climbed = 0;\n      let cutIndex = routeSegments.length;\n      while (cutIndex > 0 && climbed < levelsToClimb) {\n        cutIndex--;\n        if (!isInvisibleSegment(routeSegments[cutIndex])) {\n          climbed++;\n        }\n      }\n      if (climbed < levelsToClimb) {\n        const interceptionRoute = formatInterceptionRoutePath(\n          routeSegments,\n          convention,\n          interceptSegment,\n          path.relative(interceptRoot, currentDir).split(path.sep).filter(Boolean),\n        );\n        if (convention === \"..\") {\n          throw new Error(\n            `Invalid interception route: ${interceptionRoute}. Cannot use (..) marker at the root level, use (.) instead.`,\n          );\n        }\n        throw new Error(\n          `Invalid interception route: ${interceptionRoute}. Cannot use (..)(..) marker at the root level or one level up.`,\n        );\n      }\n      baseParts = routeSegments.slice(0, cutIndex);\n      break;\n    }\n    case \"...\":\n      baseParts = [];\n      break;\n    default:\n      return null;\n  }\n\n  // Add the intercept segment and any nested path segments\n  const nestedParts = path.relative(interceptRoot, currentDir).split(path.sep).filter(Boolean);\n  const allSegments = [...baseParts, interceptSegment, ...nestedParts];\n\n  const convertedTarget = convertSegmentsToRouteParts(allSegments);\n  if (!convertedTarget) return null;\n\n  const { urlSegments, params } = convertedTarget;\n\n  const pattern = \"/\" + urlSegments.join(\"/\");\n  return { pattern: pattern === \"/\" ? \"/\" : pattern, params };\n}\n\nfunction formatInterceptionRoutePath(\n  routeSegments: string[],\n  convention: string,\n  interceptSegment: string,\n  nestedParts: string[],\n): string {\n  const marker = markerForInterceptionConvention(convention);\n  const convertedRoute = convertSegmentsToRouteParts(routeSegments);\n  const prefix = convertedRoute\n    ? convertedRoute.urlSegments\n    : routeSegments.filter((segment) => !isInvisibleSegment(segment));\n  const routePath = [...prefix, `${marker}${interceptSegment}`, ...nestedParts]\n    .filter(Boolean)\n    .join(\"/\");\n  return routePath ? `/${routePath}` : \"/\";\n}\n\nfunction markerForInterceptionConvention(convention: string): string {\n  switch (convention) {\n    case \".\":\n      return \"(.)\";\n    case \"..\":\n      return \"(..)\";\n    case \"../..\":\n      return \"(..)(..)\";\n    case \"...\":\n      return \"(...)\";\n    default:\n      return \"\";\n  }\n}\n\n/**\n * Find a file by name (without extension) in a directory.\n * Checks configured pageExtensions.\n */\nfunction findFile(dir: string, name: string, matcher: ValidFileMatcher): string | null {\n  for (const ext of matcher.dottedExtensions) {\n    const filePath = path.join(dir, name + ext);\n    if (fs.existsSync(filePath)) return filePath;\n  }\n  return null;\n}\n\n/**\n * Convert filesystem path segments to URL route parts, skipping invisible segments\n * (route groups, @slots, \".\") and converting dynamic segment syntax to Express-style\n * patterns (e.g. \"[id]\" → \":id\", \"[...slug]\" → \":slug+\").\n */\nfunction convertSegmentsToRouteParts(\n  segments: string[],\n): { urlSegments: string[]; params: string[]; isDynamic: boolean } | null {\n  const urlSegments: string[] = [];\n  const params: string[] = [];\n  let isDynamic = false;\n\n  for (let i = 0; i < segments.length; i++) {\n    const segment = segments[i];\n\n    if (isInvisibleSegment(segment)) continue;\n\n    // Catch-all segments are only valid in terminal URL position.\n    const catchAllMatch = segment.match(/^\\[\\.\\.\\.([\\w-]+)\\]$/);\n    if (catchAllMatch) {\n      if (hasRemainingVisibleSegments(segments, i + 1)) return null;\n      isDynamic = true;\n      params.push(catchAllMatch[1]);\n      urlSegments.push(`:${catchAllMatch[1]}+`);\n      continue;\n    }\n\n    const optionalCatchAllMatch = segment.match(/^\\[\\[\\.\\.\\.([\\w-]+)\\]\\]$/);\n    if (optionalCatchAllMatch) {\n      if (hasRemainingVisibleSegments(segments, i + 1)) return null;\n      isDynamic = true;\n      params.push(optionalCatchAllMatch[1]);\n      urlSegments.push(`:${optionalCatchAllMatch[1]}*`);\n      continue;\n    }\n\n    const dynamicMatch = segment.match(/^\\[([\\w-]+)\\]$/);\n    if (dynamicMatch) {\n      isDynamic = true;\n      params.push(dynamicMatch[1]);\n      urlSegments.push(`:${dynamicMatch[1]}`);\n      continue;\n    }\n\n    urlSegments.push(decodeRouteSegment(segment));\n  }\n\n  return { urlSegments, params, isDynamic };\n}\n\nfunction hasRemainingVisibleSegments(segments: string[], startIndex: number): boolean {\n  for (let i = startIndex; i < segments.length; i++) {\n    if (!isInvisibleSegment(segments[i])) return true;\n  }\n  return false;\n}\n\n// Trie cache — keyed by route array identity (same array = same trie)\nconst appTrieCache = new WeakMap<AppRoute[], TrieNode<AppRoute>>();\n\nfunction getOrBuildAppTrie(routes: AppRoute[]): TrieNode<AppRoute> {\n  let trie = appTrieCache.get(routes);\n  if (!trie) {\n    trie = buildRouteTrie(routes);\n    appTrieCache.set(routes, trie);\n  }\n  return trie;\n}\n\nfunction joinRoutePattern(basePattern: string, subPath: string): string {\n  if (!subPath) return basePattern;\n  return basePattern === \"/\" ? `/${subPath}` : `${basePattern}/${subPath}`;\n}\n\n/**\n * Match a URL against App Router routes.\n */\nexport function matchAppRoute(\n  url: string,\n  routes: AppRoute[],\n): { route: AppRoute; params: Record<string, string | string[]> } | null {\n  const pathname = url.split(\"?\")[0];\n  let normalizedUrl = pathname === \"/\" ? \"/\" : pathname.replace(/\\/$/, \"\");\n  normalizedUrl = normalizePathnameForRouteMatch(normalizedUrl);\n\n  // Split URL once, look up via trie\n  const urlParts = normalizedUrl.split(\"/\").filter(Boolean);\n  const trie = getOrBuildAppTrie(routes);\n  return trieMatch(trie, urlParts);\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-router.js","names":[],"sources":["../../src/routing/app-router.ts"],"sourcesContent":["/**\n * App Router file-system routing.\n *\n * Scans the app/ directory following Next.js App Router conventions:\n * - app/page.tsx -> /\n * - app/about/page.tsx -> /about\n * - app/blog/[slug]/page.tsx -> /blog/:slug\n * - app/[...catchAll]/page.tsx -> /:catchAll+\n * - app/route.ts -> / (API route)\n * - app/(group)/page.tsx -> / (route groups are transparent)\n * - Layouts: app/layout.tsx wraps all children\n * - Loading: app/loading.tsx -> Suspense fallback\n * - Error: app/error.tsx -> ErrorBoundary\n * - Not Found: app/not-found.tsx\n */\nimport { normalizePathnameForRouteMatch } from \"./utils.js\";\nimport { createValidFileMatcher, type ValidFileMatcher } from \"./file-matcher.js\";\nimport { buildRouteTrie, trieMatch, type TrieNode } from \"./route-trie.js\";\nimport { buildAppRouteGraph, type AppRoute } from \"./app-route-graph.js\";\nexport type { AppRoute } from \"./app-route-graph.js\";\nexport { computeRootParamNames } from \"./app-route-graph.js\";\n\n// Cache for app routes\nlet cachedRoutes: AppRoute[] | null = null;\nlet cachedAppDir: string | null = null;\nlet cachedPageExtensionsKey: string | null = null;\n\nexport function invalidateAppRouteCache(): void {\n  cachedRoutes = null;\n  cachedAppDir = null;\n  cachedPageExtensionsKey = null;\n}\n\n/**\n * Scan the app/ directory and return a list of routes.\n */\nexport async function appRouter(\n  appDir: string,\n  pageExtensions?: readonly string[],\n  matcher?: ValidFileMatcher,\n): Promise<AppRoute[]> {\n  matcher ??= createValidFileMatcher(pageExtensions);\n  const pageExtensionsKey = JSON.stringify(matcher.extensions);\n  if (cachedRoutes && cachedAppDir === appDir && cachedPageExtensionsKey === pageExtensionsKey) {\n    return cachedRoutes;\n  }\n\n  const graph = await buildAppRouteGraph(appDir, matcher);\n  cachedRoutes = graph.routes;\n  cachedAppDir = appDir;\n  cachedPageExtensionsKey = pageExtensionsKey;\n  return graph.routes;\n}\n\n// Trie cache — keyed by route array identity (same array = same trie)\nconst appTrieCache = new WeakMap<AppRoute[], TrieNode<AppRoute>>();\n\nfunction getOrBuildAppTrie(routes: AppRoute[]): TrieNode<AppRoute> {\n  let trie = appTrieCache.get(routes);\n  if (!trie) {\n    trie = buildRouteTrie(routes);\n    appTrieCache.set(routes, trie);\n  }\n  return trie;\n}\n\n/**\n * Match a URL against App Router routes.\n */\nexport function matchAppRoute(\n  url: string,\n  routes: AppRoute[],\n): { route: AppRoute; params: Record<string, string | string[]> } | null {\n  const pathname = url.split(\"?\")[0];\n  let normalizedUrl = pathname === \"/\" ? \"/\" : pathname.replace(/\\/$/, \"\");\n  normalizedUrl = normalizePathnameForRouteMatch(normalizedUrl);\n\n  // Split URL once, look up via trie\n  const urlParts = normalizedUrl.split(\"/\").filter(Boolean);\n  const trie = getOrBuildAppTrie(routes);\n  return trieMatch(trie, urlParts);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAuBA,IAAI,eAAkC;AACtC,IAAI,eAA8B;AAClC,IAAI,0BAAyC;AAE7C,SAAgB,0BAAgC;AAC9C,gBAAe;AACf,gBAAe;AACf,2BAA0B;;;;;AAM5B,eAAsB,UACpB,QACA,gBACA,SACqB;AACrB,aAAY,uBAAuB,eAAe;CAClD,MAAM,oBAAoB,KAAK,UAAU,QAAQ,WAAW;AAC5D,KAAI,gBAAgB,iBAAiB,UAAU,4BAA4B,kBACzE,QAAO;CAGT,MAAM,QAAQ,MAAM,mBAAmB,QAAQ,QAAQ;AACvD,gBAAe,MAAM;AACrB,gBAAe;AACf,2BAA0B;AAC1B,QAAO,MAAM;;AAIf,MAAM,+BAAe,IAAI,SAAyC;AAElE,SAAS,kBAAkB,QAAwC;CACjE,IAAI,OAAO,aAAa,IAAI,OAAO;AACnC,KAAI,CAAC,MAAM;AACT,SAAO,eAAe,OAAO;AAC7B,eAAa,IAAI,QAAQ,KAAK;;AAEhC,QAAO;;;;;AAMT,SAAgB,cACd,KACA,QACuE;CACvE,MAAM,WAAW,IAAI,MAAM,IAAI,CAAC;CAChC,IAAI,gBAAgB,aAAa,MAAM,MAAM,SAAS,QAAQ,OAAO,GAAG;AACxE,iBAAgB,+BAA+B,cAAc;CAG7D,MAAM,WAAW,cAAc,MAAM,IAAI,CAAC,OAAO,QAAQ;AAEzD,QAAO,UADM,kBAAkB,OAAO,EACf,SAAS"}

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

@@ -2,14 +2,18 @@ import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-saf
 import { stripBasePath } from "../utils/base-path.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import { createAppPayloadCacheKey, getMountedSlotIdsHeader, normalizeAppElements, readAppElementsMetadata, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
-import { __basePath, activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, consumePrefetchResponse, createClientNavigationRenderSnapshot, getClientNavigationRenderContext, getClientNavigationState, getCurrentInterceptionContext, getCurrentNextUrl, getPrefetchCache, getPrefetchedUrls, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, toRscUrl } from "../shims/navigation.js";
+import { __basePath, commitClientNavigationState, consumePrefetchResponse, createClientNavigationRenderSnapshot, getClientNavigationRenderContext, getClientNavigationState, getCurrentInterceptionContext, getCurrentNextUrl, getPrefetchCache, getPrefetchedUrls, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, toRscUrl } from "../shims/navigation.js";
+import { DevRecoveryBoundary } from "../shims/error-boundary.js";
 import { ElementsContext, Slot } from "../shims/slot.js";
 import "../client/instrumentation-client.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
-import { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveAndClassifyNavigationCommit, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolveServerActionRequestState, routerReducer } from "./app-browser-state.js";
-import { devOnCaughtError } from "./app-browser-error.js";
+import { createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
+import { createAppBrowserNavigationController } from "./app-browser-navigation-controller.js";
+import { createOnUncaughtError } from "./app-browser-error.js";
+import { dismissOverlay } from "./dev-error-overlay-store.js";
+import { devOnCaughtError, devOnUncaughtError, installDevErrorOverlay } from "./dev-error-overlay.js";
 import { getServerActionNotFoundClientMessage, isServerActionNotFoundResponse } from "./server-action-not-found.js";
-import { createElement, startTransition, use, useLayoutEffect, useRef, useState } from "react";
+import { createElement, use, useLayoutEffect, useRef, useState } from "react";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-entry.ts
@@ -19,76 +23,29 @@ function toActionType(kind) {
 const MAX_VISITED_RESPONSE_CACHE_SIZE = 50;
 const VISITED_RESPONSE_CACHE_TTL = 5 * 6e4;
 const MAX_TRAVERSAL_CACHE_TTL = 30 * 6e4;
-let nextNavigationRenderId = 0;
-let activeNavigationId = 0;
-const pendingNavigationCommits = /* @__PURE__ */ new Map();
-const pendingNavigationPrePaintEffects = /* @__PURE__ */ new Map();
+const browserNavigationController = createAppBrowserNavigationController();
+const NavigationCommitSignal = browserNavigationController.NavigationCommitSignal;
 function isRouterStatePromise(value) {
 	return value instanceof Promise;
 }
-let setBrowserRouterState = null;
-let browserRouterStateRef = null;
-let activePendingBrowserRouterState = null;
 let latestClientParams = {};
 const visitedResponseCache = /* @__PURE__ */ new Map();
-let resolveBrowserRouterStateReady = null;
-let browserRouterStateReadyPromise = null;
-let browserRouterStateHasCommitted = false;
+let browserRouterStateHasEverCommitted = false;
+let pendingNavigationRecoveryHref = null;
 function isServerActionResult(value) {
 	return !!value && typeof value === "object" && "root" in value;
 }
-function getBrowserRouterStateSetter() {
-	if (!setBrowserRouterState) throw new Error("[vinext] Browser router state setter is not initialized");
-	return setBrowserRouterState;
-}
 function getBrowserRouterState() {
-	if (!browserRouterStateRef) throw new Error("[vinext] Browser router state is not initialized");
-	return browserRouterStateRef.current;
+	return browserNavigationController.getBrowserRouterState();
 }
-function waitForBrowserRouterStateReady() {
-	if (browserRouterStateRef || browserRouterStateHasCommitted) return Promise.resolve();
-	if (!browserRouterStateReadyPromise) browserRouterStateReadyPromise = new Promise((resolve) => {
-		resolveBrowserRouterStateReady = resolve;
-	});
-	return browserRouterStateReadyPromise;
+function hasBrowserRouterState() {
+	return browserNavigationController.hasBrowserRouterState();
 }
-function markBrowserRouterStateReady() {
-	browserRouterStateHasCommitted = true;
-	const resolveReady = resolveBrowserRouterStateReady;
-	resolveBrowserRouterStateReady = null;
-	browserRouterStateReadyPromise = null;
-	resolveReady?.();
+function waitForBrowserRouterStateReady() {
+	return browserNavigationController.waitForBrowserRouterStateReady();
 }
 function beginPendingBrowserRouterState() {
-	const setter = getBrowserRouterStateSetter();
-	if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {
-		activePendingBrowserRouterState.settled = true;
-		activePendingBrowserRouterState.resolve(getBrowserRouterState());
-	}
-	let resolve;
-	const promise = new Promise((resolvePromise) => {
-		resolve = resolvePromise;
-	});
-	const pending = {
-		promise,
-		resolve,
-		settled: false
-	};
-	activePendingBrowserRouterState = pending;
-	setter(promise);
-	return pending;
-}
-function settlePendingBrowserRouterState(pending) {
-	if (!pending || pending.settled) return;
-	pending.settled = true;
-	pending.resolve(getBrowserRouterState());
-	if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
-}
-function resolvePendingBrowserRouterState(pending, action) {
-	if (!pending || pending.settled) return;
-	pending.settled = true;
-	pending.resolve(routerReducer(getBrowserRouterState(), action));
-	if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
+	return browserNavigationController.beginPendingBrowserRouterState();
 }
 function applyClientParams(params) {
 	latestClientParams = params;
@@ -109,31 +66,10 @@ function clearClientNavigationCaches() {
 	clearVisitedResponseCache();
 	clearPrefetchState();
 }
-function queuePrePaintNavigationEffect(renderId, effect) {
-	if (!effect) return;
-	pendingNavigationPrePaintEffects.set(renderId, effect);
-}
-/**
-* Run all queued pre-paint effects for renderIds up to and including the
-* given renderId. When React supersedes a startTransition update (rapid
-* clicks on same-route links), the superseded NavigationCommitSignal never
-* mounts, so its pre-paint effect never fires. By draining all effects
-* <= the committed renderId here, the winning transition cleans up after
-* any superseded ones, keeping the counter balanced.
-*
-* Invariant: each superseded navigation gets a commitClientNavigationState()
-* to balance the activateNavigationSnapshot() from its renderNavigationPayload call.
-*/
-function drainPrePaintEffects(upToRenderId) {
-	for (const [id, effect] of pendingNavigationPrePaintEffects) if (id <= upToRenderId) {
-		pendingNavigationPrePaintEffects.delete(id);
-		if (id === upToRenderId) effect();
-		else commitClientNavigationState(void 0, { releaseSnapshot: true });
-	}
-}
-function createNavigationCommitEffect(href, historyUpdateMode, navId, params, previousNextUrl) {
+function createNavigationCommitEffect(options) {
+	const { href, historyUpdateMode, navId, params, previousNextUrl } = options;
 	return () => {
-		if (navId !== activeNavigationId) {
+		if (!browserNavigationController.isCurrentNavigation(navId)) {
 			commitClientNavigationState(void 0, { releaseSnapshot: true });
 			return;
 		}
@@ -142,9 +78,37 @@ function createNavigationCommitEffect(href, historyUpdateMode, navId, params, pr
 		const historyState = createHistoryStateWithPreviousNextUrl(historyUpdateMode === "replace" ? window.history.state : null, previousNextUrl);
 		if (historyUpdateMode === "replace" && window.location.href !== targetHref) replaceHistoryStateWithoutNotify(historyState, "", href);
 		else if (historyUpdateMode === "push" && window.location.href !== targetHref) pushHistoryStateWithoutNotify(historyState, "", href);
+		pendingNavigationRecoveryHref = null;
 		commitClientNavigationState(navId);
 	};
 }
+async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, useTransition = true, actionType = "navigate") {
+	try {
+		return await browserNavigationController.renderNavigationPayload({
+			actionType,
+			createNavigationCommitEffect: (options) => {
+				pendingNavigationRecoveryHref = options.href;
+				return createNavigationCommitEffect(options);
+			},
+			historyUpdateMode,
+			navigationSnapshot,
+			nextElements: payload,
+			params,
+			pendingRouterState,
+			previousNextUrl,
+			targetHref,
+			navId,
+			useTransition
+		});
+	} catch (error) {
+		pendingNavigationRecoveryHref = null;
+		throw error;
+	}
+}
+async function commitSameUrlNavigatePayload(nextElements, returnValue) {
+	const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
+	return browserNavigationController.commitSameUrlNavigatePayload(nextElements, navigationSnapshot, returnValue);
+}
 function evictVisitedResponseCacheIfNeeded() {
 	while (visitedResponseCache.size >= MAX_VISITED_RESPONSE_CACHE_SIZE) {
 		const oldest = visitedResponseCache.keys().next().value;
@@ -222,57 +186,12 @@ function createRscRequestHeaders(interceptionContext) {
 	if (interceptionContext !== null) headers.set("X-Vinext-Interception-Context", interceptionContext);
 	return headers;
 }
-/**
-* Resolve all pending navigation commits with renderId <= the committed renderId.
-* Note: Map iteration handles concurrent deletion safely — entries are visited in
-* insertion order and deletion doesn't affect the iterator's view of remaining entries.
-* This pattern is also used in drainPrePaintEffects with the same semantics.
-*/
-function resolveCommittedNavigations(renderId) {
-	for (const [pendingId, resolve] of pendingNavigationCommits) if (pendingId <= renderId) {
-		pendingNavigationCommits.delete(pendingId);
-		resolve();
-	}
-}
-function NavigationCommitSignal({ renderId, children }) {
-	useLayoutEffect(() => {
-		drainPrePaintEffects(renderId);
-		const frame = requestAnimationFrame(() => {
-			resolveCommittedNavigations(renderId);
-		});
-		return () => {
-			cancelAnimationFrame(frame);
-			resolveCommittedNavigations(renderId);
-		};
-	}, [renderId]);
-	return children;
+function handleDevRecoveryBoundaryCatch(resetKey) {
+	browserNavigationController.drainPrePaintEffects(resetKey);
 }
 function normalizeAppElementsPromise(payload) {
 	return Promise.resolve(payload).then((elements) => normalizeAppElements(elements));
 }
-async function commitSameUrlNavigatePayload(nextElements, returnValue) {
-	const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
-	const currentState = getBrowserRouterState();
-	const startedNavigationId = activeNavigationId;
-	const { disposition, pending } = await resolveAndClassifyNavigationCommit({
-		activeNavigationId,
-		currentState,
-		navigationSnapshot,
-		nextElements,
-		renderId: ++nextNavigationRenderId,
-		startedNavigationId,
-		type: "navigate"
-	});
-	if (disposition === "hard-navigate") {
-		window.location.assign(window.location.href);
-		return;
-	}
-	if (disposition === "dispatch") dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "navigate", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
-	if (returnValue) {
-		if (!returnValue.ok) throw returnValue.data;
-		return returnValue.data;
-	}
-}
 function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	const resolvedElements = use(initialElements);
 	const initialMetadata = readAppElementsMetadata(resolvedElements);
@@ -290,15 +209,10 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 	const stateRef = useRef(treeState);
 	stateRef.current = treeState;
 	useLayoutEffect(() => {
-		setBrowserRouterState = setTreeStateValue;
-		browserRouterStateRef = stateRef;
-		markBrowserRouterStateReady();
+		const detach = browserNavigationController.attachBrowserRouterState(setTreeStateValue, stateRef);
+		browserRouterStateHasEverCommitted = true;
 		return () => {
-			if (setBrowserRouterState === setTreeStateValue) setBrowserRouterState = null;
-			if (browserRouterStateRef === stateRef) {
-				browserRouterStateRef = null;
-				browserRouterStateHasCommitted = false;
-			}
+			detach();
 			setMountedSlotsHeader(null);
 		};
 	}, [setTreeStateValue]);
@@ -309,84 +223,15 @@ function BrowserRoot({ initialElements, initialNavigationSnapshot }) {
 		if (treeState.renderId !== 0) return;
 		replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(window.history.state, treeState.previousNextUrl), "", window.location.href);
 	}, [treeState.previousNextUrl, treeState.renderId]);
-	const committedTree = createElement(NavigationCommitSignal, { renderId: treeState.renderId }, createElement(ElementsContext.Provider, { value: treeState.elements }, createElement(Slot, { id: treeState.routeId })));
+	const innerTree = createElement(NavigationCommitSignal, { renderId: treeState.renderId }, createElement(ElementsContext.Provider, { value: treeState.elements }, createElement(Slot, { id: treeState.routeId })));
+	const committedTree = import.meta.env.DEV ? createElement(DevRecoveryBoundary, {
+		resetKey: treeState.renderId,
+		onCatch: handleDevRecoveryBoundaryCatch
+	}, innerTree) : innerTree;
 	const ClientNavigationRenderContext = getClientNavigationRenderContext();
 	if (!ClientNavigationRenderContext) return committedTree;
 	return createElement(ClientNavigationRenderContext.Provider, { value: treeState.navigationSnapshot }, committedTree);
 }
-function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType, interceptionContext, layoutFlags, previousNextUrl, routeId, rootLayoutTreePath, pendingRouterState, useTransitionMode) {
-	const setter = getBrowserRouterStateSetter();
-	const action = {
-		elements,
-		interceptionContext,
-		layoutFlags,
-		navigationSnapshot,
-		previousNextUrl,
-		renderId,
-		rootLayoutTreePath,
-		routeId,
-		type: actionType
-	};
-	const applyAction = () => {
-		if (pendingRouterState) {
-			resolvePendingBrowserRouterState(pendingRouterState, action);
-			return;
-		}
-		setter(routerReducer(getBrowserRouterState(), action));
-	};
-	if (useTransitionMode) startTransition(applyAction);
-	else applyAction();
-}
-async function renderNavigationPayload(payload, navigationSnapshot, targetHref, navId, historyUpdateMode, params, previousNextUrl, pendingRouterState, useTransition = true, actionType = "navigate") {
-	const renderId = ++nextNavigationRenderId;
-	const committed = new Promise((resolve) => {
-		pendingNavigationCommits.set(renderId, resolve);
-	});
-	let snapshotActivated = false;
-	try {
-		const currentState = getBrowserRouterState();
-		const pending = await createPendingNavigationCommit({
-			currentState,
-			nextElements: payload,
-			navigationSnapshot,
-			previousNextUrl,
-			renderId,
-			type: actionType
-		});
-		const disposition = resolvePendingNavigationCommitDisposition({
-			activeNavigationId,
-			currentRootLayoutTreePath: currentState.rootLayoutTreePath,
-			nextRootLayoutTreePath: pending.rootLayoutTreePath,
-			startedNavigationId: navId
-		});
-		if (disposition === "skip") {
-			settlePendingBrowserRouterState(pendingRouterState);
-			const resolve = pendingNavigationCommits.get(renderId);
-			pendingNavigationCommits.delete(renderId);
-			resolve?.();
-			return;
-		}
-		if (disposition === "hard-navigate") {
-			settlePendingBrowserRouterState(pendingRouterState);
-			pendingNavigationCommits.delete(renderId);
-			window.location.assign(targetHref);
-			return;
-		}
-		queuePrePaintNavigationEffect(renderId, createNavigationCommitEffect(targetHref, historyUpdateMode, navId, params, pending.previousNextUrl));
-		activateNavigationSnapshot();
-		snapshotActivated = true;
-		dispatchBrowserTree(pending.action.elements, navigationSnapshot, renderId, actionType, pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, pendingRouterState, useTransition);
-	} catch (error) {
-		pendingNavigationPrePaintEffects.delete(renderId);
-		const resolve = pendingNavigationCommits.get(renderId);
-		pendingNavigationCommits.delete(renderId);
-		if (snapshotActivated) commitClientNavigationState(navId);
-		settlePendingBrowserRouterState(pendingRouterState);
-		resolve?.();
-		throw error;
-	}
-	return committed;
-}
 function restoreHydrationNavigationContext(pathname, searchParams, params) {
 	setNavigationContext({
 		pathname,
@@ -540,27 +385,31 @@ async function main() {
 	bootstrapHydration(rscStream);
 }
 function bootstrapHydration(rscStream) {
+	if (import.meta.env.DEV) installDevErrorOverlay();
 	const root = normalizeAppElementsPromise(createFromReadableStream(rscStream));
 	const initialNavigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
 	replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(window.history.state, null), "", window.location.href);
+	const onUncaughtError = import.meta.env.DEV ? devOnUncaughtError : createOnUncaughtError(() => pendingNavigationRecoveryHref);
 	window.__VINEXT_RSC_ROOT__ = hydrateRoot(document, createElement(BrowserRoot, {
 		initialElements: root,
 		initialNavigationSnapshot
-	}), import.meta.env.DEV ? { onCaughtError: devOnCaughtError } : void 0);
+	}), import.meta.env.DEV ? {
+		onCaughtError: devOnCaughtError,
+		onUncaughtError
+	} : { onUncaughtError });
 	window.__VINEXT_HYDRATED_AT = performance.now();
 	window.__VINEXT_RSC_NAVIGATE__ = async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false) {
-		let _snapshotPending = false;
 		let pendingRouterState = null;
-		const navId = ++activeNavigationId;
+		const navId = browserNavigationController.beginNavigation();
 		let currentHref = href;
 		let currentHistoryMode = historyUpdateMode;
 		let currentPrevNextUrl = previousNextUrlOverride;
 		let redirectCount = redirectDepth;
 		try {
-			if (programmaticTransition && browserRouterStateRef) pendingRouterState = beginPendingBrowserRouterState();
+			if (programmaticTransition && hasBrowserRouterState()) pendingRouterState = beginPendingBrowserRouterState();
 			else {
 				await waitForBrowserRouterStateReady();
-				if (navId !== activeNavigationId) return;
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				if (programmaticTransition) pendingRouterState = beginPendingBrowserRouterState();
 			}
 			while (true) {
@@ -582,17 +431,12 @@ function bootstrapHydration(rscStream) {
 				const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
 				const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
 				if (cachedRoute) {
-					if (navId !== activeNavigationId) return;
+					if (!browserNavigationController.isCurrentNavigation(navId)) return;
 					const cachedParams = cachedRoute.params;
 					const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
 					const cachedPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
-					if (navId !== activeNavigationId) return;
-					_snapshotPending = true;
-					try {
-						await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
-					} finally {
-						_snapshotPending = false;
-					}
+					if (!browserNavigationController.isCurrentNavigation(navId)) return;
+					await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
 					return;
 				}
 				let navResponse;
@@ -612,7 +456,7 @@ function bootstrapHydration(rscStream) {
 						credentials: "include"
 					});
 				}
-				if (navId !== activeNavigationId) return;
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				const isRscResponse = (navResponse.headers.get("content-type") ?? "").startsWith("text/x-component");
 				if (!navResponse.ok || !isRscResponse || !navResponse.body) {
 					const responseUrl = navResponseUrl ?? navResponse.url;
@@ -646,30 +490,20 @@ function bootstrapHydration(rscStream) {
 				} catch {}
 				const navigationSnapshot = createClientNavigationRenderSnapshot(currentHref, navParams);
 				const responseSnapshot = await snapshotRscResponse(navResponse);
-				if (navId !== activeNavigationId) return;
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				const rscPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
-				if (navId !== activeNavigationId) return;
-				_snapshotPending = true;
-				try {
-					await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
-				} finally {
-					_snapshotPending = false;
-				}
-				if (navId !== activeNavigationId) return;
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
+				await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
+				if (!browserNavigationController.isCurrentNavigation(navId)) return;
 				storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, readAppElementsMetadata(await rscPayload).interceptionContext), responseSnapshot, navParams);
 				return;
 			}
 		} catch (error) {
-			if (_snapshotPending) {
-				_snapshotPending = false;
-				commitClientNavigationState(navId);
-			}
-			if (navId !== activeNavigationId) return;
+			if (!browserNavigationController.isCurrentNavigation(navId)) return;
 			if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
 			window.location.href = currentHref;
 		} finally {
-			settlePendingBrowserRouterState(pendingRouterState);
-			if (navId === activeNavigationId) clearPendingPathname(navId);
+			browserNavigationController.finalizeNavigation(navId, pendingRouterState);
 		}
 	};
 	if ("scrollRestoration" in history) history.scrollRestoration = "manual";
@@ -684,16 +518,16 @@ function bootstrapHydration(rscStream) {
 	});
 	if (import.meta.hot) import.meta.hot.on("rsc:update", async () => {
 		try {
+			if (browserRouterStateHasEverCommitted && !browserNavigationController.hasBrowserRouterState()) {
+				window.location.reload();
+				return;
+			}
+			await waitForBrowserRouterStateReady();
+			if (!browserNavigationController.hasBrowserRouterState()) return;
 			clearClientNavigationCaches();
 			const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
-			const pending = await createPendingNavigationCommit({
-				currentState: getBrowserRouterState(),
-				nextElements: normalizeAppElementsPromise(createFromFetch(fetch(toRscUrl(window.location.pathname + window.location.search)))),
-				navigationSnapshot,
-				renderId: ++nextNavigationRenderId,
-				type: "replace"
-			});
-			dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "replace", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
+			dismissOverlay();
+			await browserNavigationController.hmrReplaceTree(normalizeAppElementsPromise(createFromFetch(fetch(toRscUrl(window.location.pathname + window.location.search)))), navigationSnapshot);
 		} catch (error) {
 			console.error("[vinext] RSC HMR error:", error);
 		}