@evoscientist/webui 0.2.5 → 0.2.6

package/dist/node_modules/next/dist/client/components/segment-cache/navigation.js

@@ -36,6 +36,7 @@ _export(exports, {
         return navigateToKnownRoute;
     }
 });
+const _approutertypes = require("../../../shared/lib/app-router-types");
 const _fetchserverresponse = require("../router-reducer/fetch-server-response");
 const _pprnavigations = require("../router-reducer/ppr-navigations");
 const _createhreffromurl = require("../router-reducer/create-href-from-url");
@@ -50,29 +51,41 @@ const _routerreducertypes = require("../router-reducer/router-reducer-types");
 const _computechangedpath = require("../router-reducer/compute-changed-path");
 const _javascripturl = require("../../lib/javascript-url");
 const _bfcache = require("./bfcache");
+const _instantmessages = require("../../../shared/lib/instant-messages");
+const _matchsegments = require("../match-segments");
+const _segment = require("../../../shared/lib/segment");
 function navigate(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType) {
+    let navigationLock = null;
     // Instant Navigation Testing API: when the lock is active, ensure a
     // prefetch task has been initiated before proceeding with the navigation.
     // This guarantees that segment data requests are at least pending, even
     // for routes that already have a cached route tree. Without this, the
-    // static shell might be incomplete because some segments were never
+    // shell might be incomplete because some segments were never
     // requested.
     if (process.env.__NEXT_EXPOSE_TESTING_API) {
         const { isNavigationLocked } = require('./navigation-testing-lock');
         if (isNavigationLocked()) {
-            return ensurePrefetchThenNavigate(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType);
+            // Signal that a new locked navigation is starting. This force-resolves the
+            // previous locked navigation's withheld data (so a reused shared segment
+            // no longer carries a pending deferred rsc) and returns this navigation's
+            // own withheld-data gate.
+            navigationLock = (0, _pprnavigations.beginLockedNavigation)();
+            return ensurePrefetchThenNavigate(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType, navigationLock);
         }
     }
-    return navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType);
+    return navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType, navigationLock, // An unlocked navigation is bound to the shared map.
+    _cache.segmentCacheMap);
 }
-function navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType) {
+function navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType, navigationLock, // The segment cache map this navigation is bound to: a locked navigation's
+// driving-task map, or the shared map. See `segmentCacheMap` in cache.ts.
+map) {
     const now = Date.now();
     const href = url.href;
     const cacheKey = (0, _cachekey.createCacheKey)(href, nextUrl);
     const route = (0, _cache.readRouteCacheEntry)(now, cacheKey);
     if (route !== null && route.status === _cache.EntryStatus.Fulfilled) {
         // We have a matching prefetch.
-        return navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, route);
+        return navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, route, navigationLock, map);
     }
     // There was no matching route tree in the cache. Let's see if we can
     // construct an "optimistic" route tree using the deprecated search-params
@@ -90,7 +103,7 @@ function navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCach
             const optimisticRoute = (0, _cache.deprecated_requestOptimisticRouteCacheEntry)(now, url, nextUrl);
             if (optimisticRoute !== null) {
                 // We have an optimistic route tree. Proceed with the normal flow.
-                return navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, optimisticRoute);
+                return navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, optimisticRoute, navigationLock, map);
             }
         }
     }
@@ -99,12 +112,14 @@ function navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCach
     //
     // TODO: If this is a gesture navigation, instead of performing a
     // dynamic request, we should do a runtime prefetch.
-    return navigateToUnknownRoute(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType).catch(()=>{
+    return navigateToUnknownRoute(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, navigationLock, map).catch(()=>{
         // If the navigation fails, return the current state
         return state;
     });
 }
-function navigateToKnownRoute(now, state, url, canonicalUrl, navigationSeed, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, debugInfo, // The route cache entry used for this navigation, if it came from route
+function navigateToKnownRoute(now, state, url, canonicalUrl, navigationSeed, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, // The segment cache map this navigation is bound to: a locked navigation's
+// driving-task map, or the shared map. See `segmentCacheMap` in cache.ts.
+map, debugInfo, // The route cache entry used for this navigation, if it came from route
 // prediction. Passed through so it can be marked as having a dynamic rewrite
 // if the server returns a different pathname (indicating dynamic rewrite
 // behavior).
@@ -115,9 +130,49 @@ function navigateToKnownRoute(now, state, url, canonicalUrl, navigationSeed, cur
 // In these cases, if a mismatch occurs, we still mark the route as having a
 // dynamic rewrite by traversing the known route tree (see
 // dispatchRetryDueToTreeMismatch).
-routeCacheEntry) {
+routeCacheEntry, signal) {
     // A version of navigate() that accepts the target route tree as an argument
     // rather than reading it from the prefetch cache.
+    if (process.env.NODE_ENV !== 'production' && process.env.__NEXT_CACHE_COMPONENTS) {
+        // Warn when navigating via a `<Link prefetch={true}>` to a route that has
+        // not opted into Partial Prefetching. Such a link does a legacy "full"
+        // prefetch that includes the route's dynamic data, defeating the
+        // static/dynamic split that Cache Components provides.
+        //
+        // This runs at navigation time (rather than prefetch time) so that, in dev
+        // where we don't prefetch, the warning only appears when you actually
+        // navigate to the route — existing apps with many `prefetch={true}` links
+        // aren't flooded with warnings the moment they enable Cache Components.
+        //
+        // The warning is suppressed if any segment on the target route exports
+        // `instant = false`, which is the explicit API for opting a route out of
+        // this validation.
+        const link = (0, _links.getLinkForCurrentNavigation)();
+        if (link !== null && link.fetchStrategy === _types.FetchStrategy.Full && (navigationSeed.routeTree.prefetchHints & (_approutertypes.PrefetchHint.SubtreeHasPartialPrefetching | _approutertypes.PrefetchHint.SubtreeHasInstantFalse)) === 0) {
+            const error = (0, _instantmessages.createLinkPrefetchPartialError)(url.pathname);
+            const ownerStack = 'ownerStack' in link ? link.ownerStack : undefined;
+            if (ownerStack === undefined) {
+                console.error('' + 'Cannot associate the "prefetch={true}" warning with a specific <Link> making it harder to find the cause of the following warning. ' + 'This is a bug in Next.js.');
+            } else if (ownerStack !== null) {
+                // Replace the (useless) stack captured at the throw site — which
+                // points into router internals — with the Owner Stack captured when
+                // the <Link> rendered. That way the dev overlay associates this
+                // warning with the JSX that created the link, not with
+                // navigation.ts.
+                error.stack = `${error.name}: ${error.message}${ownerStack}`;
+            }
+            console.error(error);
+        }
+    }
+    // Instant Navigation Testing API: when the lock is held, restrict segment
+    // reads to shell entries if the target route would only have prefetched
+    // its shell.
+    let restrictToShell = false;
+    if (process.env.__NEXT_EXPOSE_TESTING_API) {
+        const { shouldRestrictNavigationToShell } = require('./navigation-testing-lock');
+        const link = (0, _links.getLinkForCurrentNavigation)();
+        restrictToShell = shouldRestrictNavigationToShell(navigationSeed.routeTree.prefetchHints, link !== null ? link.fetchStrategy : _types.FetchStrategy.PPR);
+    }
     const accumulation = {
         separateRefreshUrls: null,
         scrollRef: null
@@ -141,17 +196,17 @@ routeCacheEntry) {
     // data. If the page segment is fully static and prefetched, the request is
     // skipped. (This is also how refresh() works.)
     const isSamePageNavigation = url.href === currentUrl.href;
-    const task = (0, _pprnavigations.startPPRNavigation)(now, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, navigationSeed.routeTree, navigationSeed.metadataVaryPath, freshnessPolicy, navigationSeed.data, navigationSeed.head, navigationSeed.dynamicStaleAt, isSamePageNavigation, accumulation);
+    const task = (0, _pprnavigations.startPPRNavigation)(now, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, navigationSeed.routeTree, navigationSeed.metadataVaryPath, freshnessPolicy, navigationSeed.data, navigationSeed.head, navigationSeed.dynamicStaleAt, isSamePageNavigation, accumulation, map, restrictToShell);
     if (task !== null) {
         if (freshnessPolicy !== _pprnavigations.FreshnessPolicy.Gesture) {
-            (0, _pprnavigations.spawnDynamicRequests)(task, url, nextUrl, freshnessPolicy, accumulation, routeCacheEntry, navigateType);
+            (0, _pprnavigations.spawnDynamicRequests)(task, url, nextUrl, freshnessPolicy, accumulation, routeCacheEntry, navigateType, navigationLock, map, signal);
         }
         return completeSoftNavigation(state, url, nextUrl, task.route, task.node, navigationSeed.renderedSearch, canonicalUrl, navigateType, scrollBehavior, accumulation.scrollRef, debugInfo);
     }
     // Could not perform a SPA navigation. Revert to a full-page (MPA) navigation.
     return completeHardNavigation(state, url, navigateType);
 }
-function navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, route) {
+function navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, route, navigationLock, map) {
     const routeTree = route.tree;
     const canonicalUrl = route.canonicalUrl + url.hash;
     const renderedSearch = route.renderedSearch;
@@ -161,9 +216,12 @@ function navigateUsingPrefetchedRouteTree(now, state, url, currentUrl, currentRe
         metadataVaryPath: route.metadata.varyPath,
         data: null,
         head: null,
-        dynamicStaleAt: (0, _bfcache.computeDynamicStaleAt)(now, _bfcache.UnknownDynamicStaleTime)
+        dynamicStaleAt: (0, _bfcache.computeDynamicStaleAt)(now, _bfcache.UnknownDynamicStaleTime),
+        // Not derived from a server response; no base to diverge from.
+        treeDivergedFromBase: false
     };
-    return navigateToKnownRoute(now, state, url, canonicalUrl, prefetchSeed, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, null, route);
+    return navigateToKnownRoute(now, state, url, canonicalUrl, prefetchSeed, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, map, null, route, // Not an HMR refresh, so there's no request generation to cancel.
+    undefined);
 }
 // Used to request all the dynamic data for a route, rather than just a subset,
 // e.g. during a refresh or a revalidation. Typically this gets constructed
@@ -176,7 +234,7 @@ const DynamicRequestTreeForEntireRoute = [
     null,
     'refetch'
 ];
-async function navigateToUnknownRoute(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType) {
+async function navigateToUnknownRoute(now, state, url, currentUrl, currentRenderedSearch, nextUrl, currentCacheNode, currentFlightRouterState, freshnessPolicy, scrollBehavior, navigateType, navigationLock, map) {
     // Runs when a navigation happens but there's no cached prefetch we can use.
     // Don't bother to wait for a prefetch response; go straight to a full
     // navigation that contains both static and dynamic data in a single stream.
@@ -227,15 +285,21 @@ async function navigateToUnknownRoute(now, state, url, currentUrl, currentRender
     // retrying after a tree mismatch (see dispatchRetryDueToTreeMismatch).
     const metadataVaryPath = navigationSeed.metadataVaryPath;
     if (metadataVaryPath !== null) {
-        (0, _optimisticroutes.discoverKnownRoute)(now, url.pathname, nextUrl, null, navigationSeed.routeTree, metadataVaryPath, couldBeIntercepted, (0, _createhreffromurl.createHrefFromUrl)(canonicalUrl), supportsPerSegmentPrefetching, false // hasDynamicRewrite - not a retry, rewrite detection happens during traversal
+        (0, _optimisticroutes.discoverKnownRoute)(now, url.pathname, url.search, nextUrl, null, navigationSeed.routeTree, metadataVaryPath, couldBeIntercepted, // Store a hashless canonical URL: the entry is shared across hashes, and
+        // a later same-route hash nav appends `url.hash` to it.
+        (0, _createhreffromurl.createHrefFromUrl)(canonicalUrl, false), supportsPerSegmentPrefetching, false // hasDynamicRewrite - not a retry, rewrite detection happens during traversal
         );
         if (staticStageData !== null) {
             const { response: staticStageResponse, isResponsePartial } = staticStageData;
             // Write the static stage of the response into the segment cache so that
             // subsequent navigations can serve cached static segments instantly.
-            (0, _cache.getStaleAt)(now, staticStageResponse.s).then((staleAt)=>{
+            (0, _cache.resolveStaleAt)(now, staticStageResponse.s).then((staleAt)=>{
                 const buildId = responseHeaders.get(_constants.NEXT_NAV_DEPLOYMENT_ID_HEADER) ?? staticStageResponse.b;
-                (0, _cache.writeStaticStageResponseIntoCache)(now, staticStageResponse.f, buildId, staticStageResponse.h, staleAt, currentFlightRouterState, renderedSearch, isResponsePartial);
+                // TODO: Implement Shell extraction as part of Cached Navigations.
+                // Intentionally holding off on doing this until we decide how the
+                // Cached Navigations behavior should work in combination with App
+                // Shells.
+                (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, staticStageResponse.f, buildId, staticStageResponse.h, staticStageResponse.r ?? null, staleAt, currentFlightRouterState, renderedSearch, isResponsePartial, map);
             }).catch(()=>{
             // The static stage processing failed. Not fatal — the navigation
             // completed normally, we just won't write into the cache.
@@ -244,7 +308,7 @@ async function navigateToUnknownRoute(now, state, url, currentUrl, currentRender
         if (runtimePrefetchStream !== null) {
             (0, _cache.processRuntimePrefetchStream)(now, runtimePrefetchStream, currentFlightRouterState, renderedSearch).then((processed)=>{
                 if (processed !== null) {
-                    (0, _cache.writeDynamicRenderResponseIntoCache)(now, _types.FetchStrategy.PPRRuntime, processed.flightDatas, processed.buildId, processed.isResponsePartial, processed.headVaryParams, processed.staleAt, processed.navigationSeed, null);
+                    (0, _cache.writeDynamicRenderResponseIntoCache)(now, _types.FetchStrategy.PPRRuntime, processed.flightDatas, processed.buildId, processed.isResponsePartial, processed.headVaryParams, processed.rootVaryParamsIterable, processed.staleAt, processed.navigationSeed, null, map);
                 }
             }).catch(()=>{
             // The runtime prefetch cache write failed. Not fatal — the
@@ -252,11 +316,26 @@ async function navigateToUnknownRoute(now, state, url, currentUrl, currentRender
             });
         }
     }
-    return navigateToKnownRoute(now, state, url, (0, _createhreffromurl.createHrefFromUrl)(canonicalUrl), navigationSeed, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, debugInfo, // Unknown route navigations don't use route prediction - the route tree
+    // In the streaming dev render, this single response's seed content may still
+    // be streaming when we build the tree below. An unknown-route navigation
+    // places that content inline (it has no prior cache entry, so the server
+    // sends a full seed rather than the dynamic-only delta a known route gets),
+    // and that inline content is not gated like a known route's deferred RSCs. So
+    // React could read a still-pending chunk and flash a Suspense fallback
+    // (wanted on a cold cache, but not on a warm one). Wait for the shell to
+    // flush (`revealAfter`) first, so the inline seed content is decoded by the
+    // time React reads it, the same way the known-route path gates its deferred
+    // RSCs. `revealAfter` is null outside the streaming dev render. On a cache
+    // miss it resolves early, so the cold-cache fallback is still shown.
+    if (result.revealAfter !== null) {
+        await result.revealAfter;
+    }
+    return navigateToKnownRoute(now, state, url, (0, _createhreffromurl.createHrefFromUrl)(canonicalUrl), navigationSeed, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, map, debugInfo, // Unknown route navigations don't use route prediction - the route tree
     // came directly from the server. If a mismatch occurs during dynamic data
     // fetch, the retry handler will traverse the known route tree to mark the
     // entry as having a dynamic rewrite.
-    null);
+    null, // Not an HMR refresh, so there's no request generation to cancel.
+    undefined);
 }
 function completeHardNavigation(state, url, navigateType) {
     if ((0, _javascripturl.isJavaScriptURLString)(url.href)) {
@@ -443,8 +522,16 @@ function convertServerPatchToFullTree(now, currentTree, flightData, renderedSear
     let baseTree = currentTree;
     let baseData = null;
     let head = null;
+    // Whether any patch rendered a segment whose identity differs from the base
+    // (request) tree at the same position. See NavigationSeed.treeDivergedFromBase.
+    // Compared against the original `currentTree`, not the progressively-merged
+    // `baseTree`, so each patch is checked against what was actually requested.
+    let treeDivergedFromBase = false;
     if (flightData !== null) {
         for (const { segmentPath, tree: treePatch, seedData: dataPatch, head: headPatch } of flightData){
+            if (!treeDivergedFromBase) {
+                treeDivergedFromBase = didServerPatchDivergeFromBase(currentTree, segmentPath, treePatch);
+            }
             const result = convertServerPatchToFullTreeImpl(baseTree, baseData, treePatch, dataPatch, segmentPath, renderedSearch, 0);
             baseTree = result.tree;
             baseData = result.data;
@@ -460,7 +547,8 @@ function convertServerPatchToFullTree(now, currentTree, flightData, renderedSear
     // only. The RouteTree type will become the main type used for dealing with
     // routes on the client, and we'll store it in the state directly.
     const acc = {
-        metadataVaryPath: null
+        metadataVaryPath: null,
+        treeDivergedFromBase: false
     };
     const routeTree = (0, _cache.convertRootFlightRouterStateToRouteTree)(finalFlightRouterState, renderedSearch, acc);
     return {
@@ -469,9 +557,80 @@ function convertServerPatchToFullTree(now, currentTree, flightData, renderedSear
         data: baseData,
         renderedSearch,
         head,
-        dynamicStaleAt: (0, _bfcache.computeDynamicStaleAt)(now, dynamicStaleTimeSeconds)
+        dynamicStaleAt: (0, _bfcache.computeDynamicStaleAt)(now, dynamicStaleTimeSeconds),
+        treeDivergedFromBase
     };
 }
+// Whether a server patch's rendered tree diverges in segment identity from the
+// base (request) tree it was applied to. Mirrors the comparison performed while
+// decoding a server response in newer versions of the client (see
+// NavigationSeed.treeDivergedFromBase). Divergence means the server rendered a
+// different route than the one we requested — e.g. a URL rewrite that behaves
+// dynamically — so a prefetch built from the base tree can never be fulfilled.
+//
+// The base-tree descent mirrors convertServerPatchToFullTreeImpl: segmentPath
+// is a repeating [parallelRouteKey, segment, ...] pattern; segmentPath[i] keys
+// into the children, segmentPath[i + 1] is the server's segment at that
+// position.
+function didServerPatchDivergeFromBase(currentTree, segmentPath, treePatch) {
+    let baseNode = currentTree;
+    for(let i = 0; i + 1 < segmentPath.length; i += 2){
+        const parallelRouteKey = segmentPath[i];
+        const serverSegment = segmentPath[i + 1];
+        const childBase = baseNode[1][parallelRouteKey];
+        if (childBase === undefined) {
+            // The base tree doesn't have this branch. Unless the server merely
+            // filled it with a default, the trees have different structures.
+            return serverSegment !== _segment.DEFAULT_SEGMENT_KEY;
+        }
+        if (segmentIdentityDivergesFromBase(serverSegment, childBase[0])) {
+            return true;
+        }
+        baseNode = childBase;
+    }
+    return detectTreeDivergenceFromBase(treePatch, baseNode);
+}
+// Recursively compares a server-rendered subtree against the base subtree at
+// the same position. Inactive parallel route branches — which carry a refresh
+// state in the base — are expected to differ and are skipped.
+function detectTreeDivergenceFromBase(serverNode, baseNode) {
+    if (segmentIdentityDivergesFromBase(serverNode[0], baseNode[0])) {
+        return true;
+    }
+    const serverChildren = serverNode[1];
+    const baseChildren = baseNode[1];
+    for(const parallelRouteKey in serverChildren){
+        const childServer = serverChildren[parallelRouteKey];
+        const childBase = baseChildren[parallelRouteKey];
+        if (childBase === undefined) {
+            // A slot the base tree doesn't have. Unless the server merely filled it
+            // with a default, the trees have different structures.
+            if (childServer[0] !== _segment.DEFAULT_SEGMENT_KEY) {
+                return true;
+            }
+        } else if ((childBase[2] ?? null) !== null) {
+        // The base branch carries a refresh state: an inactive parallel route
+        // reused from a different route (e.g. a "default" slot). The server's
+        // answer is expected to differ, so skip the branch.
+        } else if (detectTreeDivergenceFromBase(childServer, childBase)) {
+            return true;
+        }
+    }
+    return false;
+}
+// Whether two segments at the same position claim different identities. Page
+// segments match modulo embedded search params (validated separately, see
+// getRenderedSearch), and a default filled in by the server is not a claim
+// about the position's identity.
+function segmentIdentityDivergesFromBase(serverSegment, baseSegment) {
+    if (typeof serverSegment === 'string' && typeof baseSegment === 'string' && serverSegment.startsWith(_segment.PAGE_SEGMENT_KEY) && baseSegment.startsWith(_segment.PAGE_SEGMENT_KEY)) {
+        return false;
+    }
+    if (serverSegment === _segment.DEFAULT_SEGMENT_KEY) {
+        return false;
+    }
+    return !(0, _matchsegments.matchSegment)(baseSegment, serverSegment);
+}
 function convertServerPatchToFullTreeImpl(baseRouterState, baseData, treePatch, dataPatch, segmentPath, renderedSearch, index) {
     if (index === segmentPath.length) {
         // We reached the part of the tree that we need to patch.
@@ -540,8 +699,18 @@ function convertServerPatchToFullTreeImpl(baseRouterState, baseData, treePatch,
     if (3 in baseRouterState) {
         clonedTree[3] = baseRouterState[3];
     }
-    if (4 in baseRouterState) {
-        clonedTree[4] = baseRouterState[4];
+    // Recompute the propagated "subtree" prefetch hints for this segment. Mirrors
+    // the propagation done on the server in
+    // createFlightRouterStateFromLoaderTree.
+    let prefetchHints = (baseRouterState[4] ?? 0) & ~_approutertypes.SubtreePrefetchHints;
+    for(const parallelRouteKey in newTreeChildren){
+        const childHints = newTreeChildren[parallelRouteKey][4];
+        if (childHints !== undefined) {
+            prefetchHints = (0, _approutertypes.propagateSubtreeBits)(prefetchHints, childHints);
+        }
+    }
+    if (prefetchHints !== 0) {
+        clonedTree[4] = prefetchHints;
     }
     // Clone the CacheNodeSeedData tree.
     const isEmptySeedDataPartial = true;
@@ -564,27 +733,34 @@ function convertServerPatchToFullTreeImpl(baseRouterState, baseData, treePatch,
  * tree is already cached.
  *
  * After the prefetch completes, delegates to the normal navigation flow.
- */ async function ensurePrefetchThenNavigate(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType) {
+ */ async function ensurePrefetchThenNavigate(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType, navigationLock) {
     const link = (0, _links.getLinkForCurrentNavigation)();
     const fetchStrategy = link !== null ? link.fetchStrategy : _types.FetchStrategy.PPR;
-    // Transition the cookie to captured-SPA immediately, before waiting
-    // for the prefetch. This ensures the devtools panel can update its UI
-    // right away, even if the prefetch takes time (e.g. dev compilation).
-    // The "to" tree starts as null and is filled in after the prefetch
-    // resolves and the navigation produces a new router state.
-    const { transitionToCapturedSPA, updateCapturedSPAToTree } = require('./navigation-testing-lock');
-    transitionToCapturedSPA(currentFlightRouterState, null);
     const cacheKey = (0, _cachekey.createCacheKey)(url.href, nextUrl);
-    await new Promise((resolve)=>{
-        (0, _scheduler.schedulePrefetchTask)(cacheKey, currentFlightRouterState, fetchStrategy, _types.PrefetchPriority.Default, null, resolve // _onComplete callback
-        );
-    });
+    // Create this navigation's "wait for prefetch to fulfill" state and schedule
+    // the prefetch as a locked-navigation prefetch. The prefetch's promise
+    // resolves when the task completes — after every segment response the task
+    // cares about has settled — so the navigation below reads present data
+    // rather than a still-in-flight entry.
+    const { beginNavigationLockPrefetch } = require('./navigation-testing-lock');
+    const navigationLockPrefetch = beginNavigationLockPrefetch();
+    const prefetchTask = (0, _scheduler.schedulePrefetchTask)(cacheKey, currentFlightRouterState, fetchStrategy, _types.PrefetchPriority.Default, null, navigationLockPrefetch);
+    if (navigationLockPrefetch !== null) {
+        await navigationLockPrefetch.promise;
+    }
     // Prefetch is complete. Proceed with the normal navigation flow, which
-    // will now find the route in the cache.
-    const result = await navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType);
-    // Update the cookie with the resolved "to" tree so the devtools
-    // panel can display both routes immediately.
-    updateCapturedSPAToTree(currentFlightRouterState, result.tree);
+    // will now find the route in the cache. The navigation inherits the map of
+    // the prefetch task that drives it: the task was scheduled inside the lock
+    // scope, so this is the scope's private map, and the navigation reads only
+    // data fetched under the lock.
+    const result = await navigateImpl(state, url, currentUrl, currentRenderedSearch, currentCacheNode, currentFlightRouterState, nextUrl, freshnessPolicy, scrollBehavior, navigateType, navigationLock, prefetchTask.segmentCacheMap);
+    // Only transition to captured-SPA once the navigation is known to be an SPA.
+    // If the result is an MPA navigation, leave the cookie pending and let the new
+    // document load transition it to captured-MPA.
+    if (!result.pushRef.mpaNavigation) {
+        const { updateCapturedSPAToTree } = require('./navigation-testing-lock');
+        updateCapturedSPAToTree(currentFlightRouterState, result.tree);
+    }
     return result;
 }