@farm.js/core 0.1.42 → 0.1.44

package/dist/{chunk-375K2ZVU.mjs → chunk-ERA5RP3L.mjs}

@@ -11,13 +11,13 @@ import {
 import {
   generateNativeMCPPluginSource,
   layoutsCanCoverSamePage
-} from "./chunk-IVQY6UTY.mjs";
+} from "./chunk-XUHIRBXY.mjs";
 import {
   assertFarmDocsAdapterServesNoGuardedPages,
   compileFarmDocsAdapterEdgeManifest,
   createFarmDocsAPIHandler,
   hasFarmDocsRuntimeAdapter
-} from "./chunk-2JZHQDUY.mjs";
+} from "./chunk-OYZGFRPA.mjs";
 import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsHandler,
@@ -45,7 +45,7 @@ import {
   getDeployTargetForPreset,
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-NU25TRIO.mjs";
+} from "./chunk-WWYXIECF.mjs";
 import {
   resolveFarmInstrumentationFile
 } from "./chunk-ZZSRYEYU.mjs";
@@ -72,7 +72,6 @@ import {
   getClientModuleHydrationPlan,
   getClientModuleMetadata,
   getFarmClientHydrationPlanOptions,
-  loadTailwindVitePlugin,
   mergeFarmFontCss,
   mergeFarmProductionViteConfig,
   mergeFarmViteConfig,
@@ -83,15 +82,18 @@ import {
   resolveFarmIsolatedClientHydrationMode,
   resolveFarmNotFoundComponentPath,
   usesFarmServerTree
-} from "./chunk-QTEJGB5A.mjs";
+} from "./chunk-QGFKXYC7.mjs";
 import {
   PluginManager
 } from "./chunk-FGH3ZXTP.mjs";
+import {
+  loadTailwindVitePlugin
+} from "./chunk-S34OBRMZ.mjs";
 import {
   generateFarmTypeArtifacts,
   readRouteRenderingDirectiveFromFile,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-35WS7P2V.mjs";
+} from "./chunk-26CXZR6L.mjs";
 import {
   FARM_API_CATALOG_PATH,
   FARM_APP_MANIFEST_LEGACY_PATH,
@@ -107,15 +109,15 @@ import {
   resolveFarmAppManifestInput,
   routeBoundaryCoversDirectory,
   stripRouteGroups
-} from "./chunk-PIZXONIS.mjs";
+} from "./chunk-YFLBG2W3.mjs";
+import {
+  farmPluginMayAffectRuntimePath
+} from "./chunk-Y5RG6B7S.mjs";
 import {
   FARM_DEFAULT_MCP_PATH,
   createFarmDefaultMCPServer,
   farmConfigMountsMCP
 } from "./chunk-4ZZNPK25.mjs";
-import {
-  farmPluginMayAffectRuntimePath
-} from "./chunk-Y5RG6B7S.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
@@ -130,6 +132,9 @@ import {
   resolveFarmDocsFontAssets,
   toFarmDocsPublicFontAssets
 } from "./chunk-TVGP4BBZ.mjs";
+import {
+  resolveFarmServerComponentsMode
+} from "./chunk-M3BXTWJM.mjs";
 import {
   routeRulesToNitroRouteRules
 } from "./chunk-GHFS7RUB.mjs";
@@ -155,6 +160,9 @@ import {
   mergeScheduledTasks,
   prepareFarmCronForNitro
 } from "./chunk-YHOCRI4H.mjs";
+import {
+  resolveServerActionsConfig
+} from "./chunk-WMHG64DA.mjs";
 import {
   createBundledEnv
 } from "./chunk-4OOBRCJX.mjs";
@@ -176,10 +184,12 @@ import {
   _collectFarmStorageModules
 } from "./chunk-JGHCKIRI.mjs";
 import {
-  FARM_INTEGRATION_API_BASE_PATH_KEY,
   getFarmIntegrationPluginServerRuntime,
   getIntegrationProviders
-} from "./chunk-AX7S67YV.mjs";
+} from "./chunk-37VKVISD.mjs";
+import {
+  FARM_INTEGRATION_API_BASE_PATH_KEY
+} from "./chunk-GZWHCWLB.mjs";
 import {
   appendMiddlewareDirectory,
   appendMiddlewareRoutePath,
@@ -214,7 +224,7 @@ import {
 } from "./chunk-BTHHUD7Q.mjs";
 import {
   FARM_VERSION
-} from "./chunk-U2UC7UGP.mjs";
+} from "./chunk-R4J2UOV4.mjs";
 import {
   getFarmPresetRuntime
 } from "./chunk-2A3EQHXX.mjs";
@@ -232,6 +242,9 @@ import {
 import path10 from "path";
 import { existsSync as existsSync3 } from "fs";
 
+// src/nitro/universal-build.ts
+import { randomBytes } from "crypto";
+
 // src/nitro/client-css-href.ts
 import path from "path";
 var FARM_CLIENT_CSS_HREF_PLACEHOLDER = "/__farm_client_css_href__";
@@ -1998,7 +2011,7 @@ async function validateClientBuildOutput(root, srcDir, outputDir) {
 }
 __name(validateClientBuildOutput, "validateClientBuildOutput");
 function getCachedClientModuleHydrationPlan(modulePath, root, mode, cache, options = {}) {
-  const key = `${path9.resolve(root)}\0${mode}\0${options.asyncOwnerIslands === true}\0${path9.resolve(modulePath)}`;
+  const key = `${path9.resolve(root)}\0${mode}\0${options.asyncOwnerIslands === true}\0${options.serverOwners === true}\0${path9.resolve(modulePath)}`;
   let plan = cache.get(key);
   if (!plan) {
     plan = getClientModuleHydrationPlan(modulePath, root, mode, options);
@@ -2025,7 +2038,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   const unsupportedIntegrationProvider = integrationProviders.find(
     (provider) => provider.supportsIsolatedHydration !== true
   );
-  if (config.experimental?.isolatedClientHydration === "enabled" && config.experimental?.serverComponents !== true && unsupportedIntegrationProvider) {
+  if (config.experimental?.isolatedClientHydration === "enabled" && resolveFarmServerComponentsMode(config.experimental?.serverComponents) !== "rsc" && unsupportedIntegrationProvider) {
     logger.warn(
       `[Farm.js] isolated hydration kept route-wide because integration provider "${unsupportedIntegrationProvider.name}" does not declare supportsIsolatedHydration: true.`
     );
@@ -2033,7 +2046,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   const isolatedMode = resolveFarmIsolatedClientHydrationMode(
     config.experimental?.isolatedClientHydration,
     {
-      serverComponents: config.experimental?.serverComponents === true,
+      serverComponents: resolveFarmServerComponentsMode(config.experimental?.serverComponents) === "rsc",
       hasUnsupportedIntegrationProvider: Boolean(unsupportedIntegrationProvider)
     }
   );
@@ -2041,6 +2054,10 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     config.renderer,
     Boolean(unsupportedIntegrationProvider)
   );
+  const pagePlanOptions = {
+    ...planOptions,
+    serverOwners: resolveFarmServerComponentsMode(config.experimental?.serverComponents) === "islands"
+  };
   const clientLayouts = layoutRoutes.map((layout) => {
     try {
       const metadata = getCachedClientModuleHydrationPlan(
@@ -2108,7 +2125,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
       root,
       isolatedMode,
       hydrationPlanCache,
-      planOptions
+      pagePlanOptions
     )
   }));
   enforceFarmIsolatedHydrationRouteBudget(
@@ -2259,7 +2276,8 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     getIntegrationProviders(config.integrations),
     config.basePath,
     generateClientCachePersistenceCode(resolveFarmClientCacheAdapterEntry(root, config.cache)),
-    adapterOwnsDocsRuntime ? getFarmDocsAdapterConfigModule(config.docs) : void 0
+    adapterOwnsDocsRuntime ? getFarmDocsAdapterConfigModule(config.docs) : void 0,
+    resolveFarmServerComponentsMode(config.experimental?.serverComponents) === "islands"
   );
   await fs4.writeFile(clientEntryPath, clientHydrationCode);
   const hasScopedPostcssConfig = hasProjectPostcssConfig(root);
@@ -2974,13 +2992,17 @@ function generateUniversalRouterStateProperties() {
 
   clearPrefetchedPath: function(url) {
     const interceptionPrefix = url + "\\nintercept:";
+    const partialPrefix = url + "\\npartial:";
+    const matches = function(key) {
+      return key === url || key.startsWith(interceptionPrefix) || key.startsWith(partialPrefix);
+    };
     for (const key of this.prefetchCache.keys()) {
-      if (key === url || key.startsWith(interceptionPrefix)) {
+      if (matches(key)) {
         this.prefetchCache.delete(key);
       }
     }
     for (const [key, pending] of this.pendingPrefetches) {
-      if (key === url || key.startsWith(interceptionPrefix)) {
+      if (matches(key)) {
         pending.valid = false;
         this.pendingPrefetches.delete(key);
       }
@@ -2994,9 +3016,18 @@ function generateUniversalRouterStateProperties() {
     this.pendingPrefetches.clear();
   },
 
-  fetchPrefetchedDocument: async function(url, interceptFrom, fresh, recover, signal, cacheResult = true) {
+  // Islands mode: a partial response (layouts kept, or only the page's payload) suits the page
+  // that asked for it, so the cache keys it by what that page told the server.
+  prefetchRequest: function(url, interceptFrom, layoutChain = true) {
+    const base = interceptFrom ? url + "\\nintercept:" + interceptFrom : url;
+    const partial = layoutChain && this.partialNavigationHeaders ? this.partialNavigationHeaders() : {};
+    const identity = Object.keys(partial).length ? JSON.stringify(partial) : "";
+    return { cacheKey: identity ? base + "\\npartial:" + identity : base, headers: partial };
+  },
+
+  fetchPrefetchedDocument: async function(url, interceptFrom, fresh, recover, signal, cacheResult = true, layoutChain = true) {
     signal?.throwIfAborted();
-    const cacheKey = interceptFrom ? url + "\\nintercept:" + interceptFrom : url;
+    const { cacheKey, headers: partialHeaders } = this.prefetchRequest(url, interceptFrom, layoutChain);
     if (fresh) this.clearPrefetchedPath(url);
     const cached = fresh ? undefined : this.readFreshPrefetch(cacheKey);
     if (cached !== undefined) return cached;
@@ -3028,6 +3059,10 @@ function generateUniversalRouterStateProperties() {
       const response = await fetchFarmNavigationDocument(url, {
         "Accept": "text/html",
         ...(interceptFrom ? { "X-Farm-Intercept-From": interceptFrom } : {}),
+        // Islands mode: the server leaves out island values this browser holds, and the
+        // layouts it shows.
+        ...getFarmIslandValueHeaders(),
+        ...partialHeaders,
       }, recover, signal);
       if (!response.ok) throw new Error("Failed to fetch page");
       const html = await response.text();
@@ -3185,6 +3220,25 @@ function generateUniversalRouterStateProperties() {
 `.trim();
 }
 __name(generateUniversalRouterStateProperties, "generateUniversalRouterStateProperties");
+var FARM_SEGMENT_NAVIGATION_SERVER_RUNTIME = `
+function getFarmLayoutKey(pattern, params) {
+  return pattern.replace(/\\[\\[?\\.\\.\\.([^\\]]+)\\]?\\]|\\[([^\\]]+)\\]/g, function(match, rest, name) {
+    const value = params ? params[rest || name] : undefined;
+    if (Array.isArray(value)) return value.map(encodeURIComponent).join("/");
+    return value === undefined ? "" : encodeURIComponent(String(value));
+  });
+}
+
+function countFarmKeptLayouts(request, layouts, params) {
+  const chain = parseFarmLayoutChainHeader(request.headers.get("f-layouts"));
+  if (chain.length === 0) return 0;
+  const keys = layouts.map(function(layout) { return getFarmLayoutKey(layout.pattern, params); });
+  if (chain[0] === keys[0]) return getSharedLayoutPrefixLength(chain, keys);
+  // A root layout that renders the document itself leaves no boundary in the page, so the
+  // browser's chain starts at the next layout.
+  return keys.length > 1 ? 1 + getSharedLayoutPrefixLength(chain, keys.slice(1)) : 0;
+}
+`;
 function generateClientHydrationEntry(clientPages, layoutRoutes, clientRouteSlots, root, srcDir, docsSearchEnabled, docsSearchModuleId, docsEntryPath, docsAdapterReact, i18nConfig = {
   enabled: false,
   basePath: "/",
@@ -3203,7 +3257,7 @@ function generateClientHydrationEntry(clientPages, layoutRoutes, clientRouteSlot
     secure: false
   },
   direction: {}
-}, plugins = [], renderer = REACT_RENDERER, publicRuntimeConfig = void 0, trailingSlash = false, integrationProviders = [], basePath = "/", clientCachePersistence = { imports: "", init: "" }, docsConfigModule) {
+}, plugins = [], renderer = REACT_RENDERER, publicRuntimeConfig = void 0, trailingSlash = false, integrationProviders = [], basePath = "/", clientCachePersistence = { imports: "", init: "" }, docsConfigModule, islandValues = false) {
   const toImportPath = /* @__PURE__ */ __name((targetPath) => targetPath.replace(/\\/g, "/"), "toImportPath");
   const clientPluginEntry = generateFarmClientPluginEntryCode(
     plugins,
@@ -3292,7 +3346,7 @@ function isFarmDocsPath() {
 // Farm.js Client Runtime (no client components)
 ${cssImport}
 ${layoutImports}
-import { createClientCancellation, createClientPluginManager, getHashTargetElement, installChunkErrorRecovery, isFarmBlockedNavigationURL, isFarmExternalNavigationURL, reconcileFarmDocumentHead, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
+import { createClientCancellation, createClientPluginManager, getFarmIslandValueHeaders, getHashTargetElement, installChunkErrorRecovery, isFarmBlockedNavigationURL, isFarmExternalNavigationURL, reconcileFarmDocumentHead, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
 import { createFarmDeploymentMismatchError, createFarmDeploymentRequestHeaders, isFarmDeploymentMismatchResponse } from "@farm.js/core/deployment";
 ${clientPluginEntry.imports}
 ${clientCachePersistence.imports}
@@ -3591,7 +3645,7 @@ document.addEventListener("click", function(e) {
   });
   const isolatedHydrationEnabled = isolatedBoundaryModules.size > 0;
   const serverTreeEnabled = isolatedHydrationEnabled && clientPages.some((page) => page.serverTree);
-  const isolatedHydrationImport = isolatedHydrationEnabled ? `import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph } from "@farm.js/core/internal/isolated-boundary";${serverTreeEnabled ? '\nimport { createFarmServerTreeElement } from "@farm.js/core/internal/server-tree";' : ""}` : "";
+  const isolatedHydrationImport = isolatedHydrationEnabled ? `${islandValues ? 'import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph, createFarmServerTreeElement } from "@farm.js/core/internal/islands-runtime";' : 'import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph } from "@farm.js/core/internal/isolated-boundary";'}${serverTreeEnabled && !islandValues ? '\nimport { createFarmServerTreeElement } from "@farm.js/core/internal/server-tree";' : ""}` : "";
   const isolatedHydrationRuntime = isolatedHydrationEnabled ? `const farmIsolatedBoundaryLoaders = {
 ${Array.from(isolatedBoundaryModules.entries()).map(
     ([reference, modulePath]) => `  ${JSON.stringify(reference)}: () => import(${JSON.stringify(modulePath)}),`
@@ -3657,7 +3711,7 @@ ${layoutImports}
 ${rendererClientImports}
 ${isolatedHydrationImport}
 ${providerClientCode.imports}
-import { createClientCancellation, createClientPluginManager, getHashTargetElement, installChunkErrorRecovery, isFarmBlockedNavigationURL, isFarmExternalNavigationURL, reconcileFarmDocumentHead, scheduleFarmIslandHydration, searchParamsToObject, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
+import { createClientCancellation, createClientPluginManager, getFarmIslandValueHeaders, getHashTargetElement, installChunkErrorRecovery, isFarmBlockedNavigationURL, isFarmExternalNavigationURL, reconcileFarmDocumentHead, scheduleFarmIslandHydration, searchParamsToObject, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
 import { createFarmDeploymentMismatchError, createFarmDeploymentRequestHeaders, isFarmDeploymentMismatchResponse } from "@farm.js/core/deployment";
 import { createFarmRouter, isFarmRouteActive, matchFarmRoute } from "@farm.js/core/router";
 ${clientPluginEntry.imports}
@@ -3834,6 +3888,10 @@ async function createMatchedHydrationRoute(matched, pathname, searchParams, serv
     const serverPage = document.getElementById("__farm_page__");
     const pageSource = typeof serverHtml === "string" ? serverHtml : serverPage;
     const serverTree = pageSource ? await createFarmServerTreePageElement(pageSource, pathname) : null;
+    // A payload-only page (islands mode) has no HTML to fall back to: fetch the whole document.
+    if (!serverTree && typeof serverHtml === "string" && serverHtml.includes('<script type="f/tree" partial')) {
+      return null;
+    }
     pageElement = serverTree
       ? createLayoutPageBoundary(matched.route, serverTree)
       : createLayoutPageBoundary(
@@ -4161,7 +4219,7 @@ async function hydrate() {
     });
     ${isolatedHydrationEnabled ? `const isolatedHydration =
       !hasHydratableLayout(pathname) &&
-      document.querySelector('farm-client-boundary[data-farm-client-boundary]')
+      document.querySelector('f-island[src]')
         ? hydrateFarmIsolatedClientBoundaries(document, hydrationController.signal)
         : Promise.resolve();
     await Promise.all([pageHydration, isolatedHydration]);` : "await pageHydration;"}
@@ -4172,20 +4230,41 @@ async function hydrate() {
   }
 }
 
+// A layout boundary is the same layout when its key matches: islands mode keys it by pattern and
+// params, so a layout whose params change renders again. Other modes compare patterns.
+function getLayoutIdentity(boundary) {
+  return boundary.getAttribute("data-farm-layout-key") || boundary.getAttribute("data-farm-layout-pattern");
+}
+
 function findLayoutBoundary(root, pattern) {
   const boundaries = root?.querySelectorAll?.('[data-farm-layout-boundary="true"]') || [];
   for (const boundary of boundaries) {
-    if (boundary.getAttribute("data-farm-layout-pattern") === pattern) return boundary;
+    if (getLayoutIdentity(boundary) === pattern) return boundary;
   }
   return null;
 }
 
 function getLayoutPatterns(root) {
   return Array.from(root?.querySelectorAll?.('[data-farm-layout-boundary="true"]') || [])
-    .map(function(element) { return element.getAttribute("data-farm-layout-pattern"); })
+    .map(getLayoutIdentity)
     .filter(Boolean);
 }
 
+${islandValues ? `// A segment response leaves out the layouts the browser said it shows. It fits this page only if
+// the page still shows each of them, at the same depth.
+function fitsSegmentResponse(currentRoot, nextRoot) {
+  const nextBoundaries = Array.from(nextRoot.querySelectorAll('[data-farm-layout-boundary="true"]'));
+  const lastKept = nextBoundaries.map(function(boundary) {
+    return boundary.getAttribute("data-farm-layout-kept") === "true";
+  }).lastIndexOf(true);
+  if (lastKept === -1) return true;
+  const current = getLayoutPatterns(currentRoot);
+  for (let index = 0; index <= lastKept; index++) {
+    if (current[index] !== getLayoutIdentity(nextBoundaries[index])) return false;
+  }
+  return true;
+}` : ""}
+
 function activateNavigationScripts(root) {
   for (const script of Array.from(root?.querySelectorAll?.("script") || [])) {
     const freshScript = document.createElement("script");
@@ -4197,7 +4276,7 @@ function activateNavigationScripts(root) {
   }
 }
 
-function replaceSharedLayoutBoundary(currentRoot, nextRoot) {
+function replaceSharedLayoutBoundary(currentRoot, nextRoot, refresh = false) {
   const currentPatterns = getLayoutPatterns(currentRoot);
   const nextPatterns = getLayoutPatterns(nextRoot);
   let sharedCount = 0;
@@ -4218,7 +4297,9 @@ function replaceSharedLayoutBoundary(currentRoot, nextRoot) {
     : nextRoot.querySelector("#__farm_page__");
 
   if (!currentTarget || !nextTarget) return false;
-  ${isolatedHydrationEnabled ? "disposeFarmIsolatedClientBoundaries(currentTarget);" : ""}
+  ${isolatedHydrationEnabled ? `${islandValues ? `// A refresh keeps the islands still on the page, with their state and new props.
+  if (refresh) farmIsolatedHydrationRuntime.carryOver(currentTarget, nextTarget);
+  ` : ""}disposeFarmIsolatedClientBoundaries(currentTarget);` : ""}
   currentTarget.replaceWith(nextTarget);
   activateNavigationScripts(nextTarget);
   if (nextTreeRoot && nextTreeRoot !== nextTarget) nextTreeRoot.remove();
@@ -4239,7 +4320,17 @@ function replaceSharedLayoutBoundary(currentRoot, nextRoot) {
 const spaRouter = {
 ${generateUniversalRouterStateProperties()}
   prefetchCache: new Map(),
-  
+${islandValues ? `  // Islands mode: navigations name the layouts on screen, and say when this page renders the
+  // next one in its own React root; the server leaves out what the browser keeps or rebuilds.
+  partialNavigationHeaders: function() {
+    const root = document.getElementById("root") || document.body;
+    const layouts = getLayoutPatterns(root);
+    return {
+      ...(layouts.length ? { "F-Layouts": JSON.stringify(layouts) } : {}),
+      ...(reactRoot && reactRootContainer === root ? { "F-Render": "tree" } : {}),
+    };
+  },
+` : ""}  
   navigate: async function(href, options = {}) {
     const url = new URL(href, window.location.href);
     if (isFarmBlockedNavigationURL(url)) return;
@@ -4294,6 +4385,8 @@ ${generateUniversalRouterStateProperties()}
     cancelPendingPageHydration();
     this.saveScrollPosition(window.location.pathname + window.location.search);
     const navigation = this.startNavigation(from, url, action);
+    // A refresh keeps the islands still on the page (islands mode).
+    navigation.refresh = options.refresh === true;
     let clientNavigation;
 
     try {
@@ -4396,26 +4489,48 @@ ${generateUniversalRouterStateProperties()}
           this.currentPath = to;
         });
       } else {
+        // A refresh renders every layout again; other navigations keep the ones on screen.
         const html = await this.fetchPage(
           url.pathname + url.search,
           undefined,
           options.refresh === true,
           true,
           navigation.controller.signal,
+          options.refresh !== true,
         );
         if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
         await farmClientRuntime.markNavigationLoaded(clientNavigation, html);
         if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
         await this.runViewTransition(options.viewTransition, async () => {
           if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
-          const swapped = await this.swapContent(
+          let swapped = await this.swapContent(
             html,
             url.pathname + url.search,
             navigation,
             clientNavigation,
           );
           if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
-          if (!swapped) {
+          if (swapped === "segment-mismatch") {
+            // The page changed since this segment was requested (a prefetch, a later
+            // navigation): fetch the whole document instead.
+            const documentHtml = await this.fetchPage(
+              url.pathname + url.search,
+              undefined,
+              true,
+              true,
+              navigation.controller.signal,
+              false,
+            );
+            if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
+            swapped = await this.swapContent(
+              documentHtml,
+              url.pathname + url.search,
+              navigation,
+              clientNavigation,
+            );
+            if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
+          }
+          if (!swapped || swapped === "segment-mismatch") {
             throw new Error("Farm could not swap the target document");
           }
           this.writeHistoryEntry(action, url.pathname + url.search, options.state, url);
@@ -4465,8 +4580,8 @@ ${generateUniversalRouterStateProperties()}
     });
   },
   
-  fetchPage: async function(url, interceptFrom, fresh = false, recover = true, signal) {
-    return this.fetchPrefetchedDocument(url, interceptFrom, fresh, recover, signal);
+  fetchPage: async function(url, interceptFrom, fresh = false, recover = true, signal, layoutChain = true) {
+    return this.fetchPrefetchedDocument(url, interceptFrom, fresh, recover, signal, true, layoutChain);
   },
   
   swapContent: async function(html, targetPath, navigation, clientNavigation) {
@@ -4487,6 +4602,14 @@ ${generateUniversalRouterStateProperties()}
     // whole document (and remounting every isolated client boundary).
     const newRoot = doc.getElementById("root") || doc.body;
     const currentRoot = document.getElementById("root") || document.body;
+    ${islandValues ? `const isSegment = Boolean(newRoot?.querySelector('[data-farm-layout-kept="true"]'));
+    // A segment needs this page's kept layouts in place, outside a React-owned root.
+    if (
+      isSegment &&
+      (!currentRoot || reactRootContainer === currentRoot || !fitsSegmentResponse(currentRoot, newRoot))
+    ) {
+      return "segment-mismatch";
+    }` : ""}
     if (!newRoot || !currentRoot) {
       if (!isNavigationCurrent()) return false;
       return this.swapDocument(doc);
@@ -4517,13 +4640,16 @@ ${generateUniversalRouterStateProperties()}
       }
     }
 
+    ${islandValues ? `// A payload-only page renders only in a React root that rebuilds it.
+    if (nextPage?.querySelector('script[type="f/tree"][partial]')) return "segment-mismatch";` : ""}
     const rootWasReactOwned = reactRootContainer === currentRoot;
     resetReactRoot();
     resetRouteSlotRoots();
     const replacedSharedBoundary = rootWasReactOwned
       ? null
-      : replaceSharedLayoutBoundary(currentRoot, newRoot);
+      : replaceSharedLayoutBoundary(currentRoot, newRoot, navigation?.refresh === true);
     let isolatedHydrationScope = replacedSharedBoundary || currentRoot;
+    ${islandValues ? 'if (!replacedSharedBoundary && isSegment) return "segment-mismatch";' : ""}
     if (!replacedSharedBoundary) {
       ${isolatedHydrationEnabled ? "disposeFarmIsolatedClientBoundaries(currentRoot);" : ""}
       currentRoot.innerHTML = newRoot.innerHTML;
@@ -4606,7 +4732,7 @@ ${generateUniversalRouterStateProperties()}
     // navigation (double fetch per prefetched link) and sent
     // X-Farm-Intercept-From, which bypasses the shared cache server-side.
     const pathname = url.pathname + url.search;
-    if (this.readFreshPrefetch(pathname) !== undefined) return;
+    if (this.readFreshPrefetch(this.prefetchRequest(pathname).cacheKey) !== undefined) return;
     
     return this.fetchPage(pathname, undefined, false, false)
       .catch(function(error) {
@@ -5478,6 +5604,7 @@ ReactDOMServer.configureApp(__farmAppSetup);`;
 }
 __name(generateFarmRendererAppSetupServerCode, "generateFarmRendererAppSetupServerCode");
 function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlots, errorRoutes, metadataImageRoutes, applicationMetadataRoutes, middlewareRoutes, redirectRoutes, configuredRewriteRoutes, configuredHeaderRoutes, openAPIReference, notFoundPath, instrumentationPath, config, farmDocsPrecompiledManifest, configModulePath, hasServerRuntimeIntegrations, hasRuntimeIntegrationConfig, hasConfiguredRuntimePlugins, hasServerRuntimePlugins, preset, i18nCatalogs, isolatedClientBoundaryModules, hydrationPlanCache) {
+  const farmIslandsMode = resolveFarmServerComponentsMode(config.experimental?.serverComponents) === "islands";
   const hasCompressionRuntime = config.compress && resolveFarmInstrumentationRuntime(preset) === "nodejs";
   const servesAgentRobotsTxt = Boolean(config.agent?.crawlers?.enabled) && !applicationMetadataRoutes.some(
     (metadata) => metadata.kind === "robots" && metadata.pattern === "/"
@@ -5501,7 +5628,7 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   );
   const hasReactSyncRender = isReactRenderer(config.renderer);
   const rendererServerImports = isReactRenderer(config.renderer) ? `import * as React from "react";
-import * as ReactDOMServer from "react-dom/server";${hasIsolatedClientGraphRuntime ? '\nimport { isolateFarmServerPageGraph, wrapFarmIsolatedClientGraph } from "@farm.js/core/internal/isolated-boundary";\nimport { renderFarmServerTreePage } from "@farm.js/core/internal/server-tree";' : ""}` : `import React, * as ReactDOMServer from ${JSON.stringify(config.renderer.server)};${generateFarmRendererAppSetupServerCode(config)}`;
+import * as ReactDOMServer from "react-dom/server";${hasIsolatedClientGraphRuntime ? farmIslandsMode ? '\nimport { isolateFarmServerPageGraph, wrapFarmIsolatedClientGraph, renderFarmServerTreePage } from "@farm.js/core/internal/islands-runtime";' : '\nimport { isolateFarmServerPageGraph, wrapFarmIsolatedClientGraph } from "@farm.js/core/internal/isolated-boundary";\nimport { renderFarmServerTreePage } from "@farm.js/core/internal/server-tree";' : ""}` : `import React, * as ReactDOMServer from ${JSON.stringify(config.renderer.server)};${generateFarmRendererAppSetupServerCode(config)}`;
   const routeClientGraphServerRuntime = hasIsolatedClientGraphRuntime ? `function wrapFarmRouteClientGraph(element) {
   return wrapFarmIsolatedClientGraph(React, element);
 }
@@ -5514,13 +5641,16 @@ function isolateFarmRouteServerPage(element) {
 
 // An async page below a hydrating layout renders as a serialized tree the browser rebuilds in
 // the layout's React root, so its client components read the layout's context.
-function renderFarmRouteServerTree(element) {
-  return renderFarmServerTreePage(React, element, { isolate: isolateFarmRouteServerPage });
+function renderFarmRouteServerTree(element, extra) {
+  return renderFarmServerTreePage(React, element, {
+    isolate: isolateFarmRouteServerPage,${farmIslandsMode ? "\n    values: true," : ""}
+    ...extra,
+  });
 }` : `function wrapFarmRouteClientGraph(element) { return element; }
 
 function isolateFarmRouteServerPage(element) { return element; }
 
-function renderFarmRouteServerTree(element) { return element; }`;
+function renderFarmRouteServerTree(element, extra) { return element; }`;
   const hasGeneratedMetadataImages = metadataImageRoutes.some(
     (image) => image.sourceType === "module"
   );
@@ -5558,7 +5688,7 @@ function renderFarmRouteServerTree(element) { return element; }`;
   const isolatedHydrationMode = resolveFarmIsolatedClientHydrationMode(
     config.experimental?.isolatedClientHydration,
     {
-      serverComponents: config.experimental?.serverComponents === true,
+      serverComponents: resolveFarmServerComponentsMode(config.experimental?.serverComponents) === "rsc",
       hasUnsupportedIntegrationProvider: Boolean(unsupportedIntegrationProvider)
     }
   );
@@ -5566,6 +5696,10 @@ function renderFarmRouteServerTree(element) { return element; }`;
     config.renderer,
     Boolean(unsupportedIntegrationProvider)
   );
+  const pageHydrationPlanOptions = {
+    ...hydrationPlanOptions,
+    serverOwners: resolveFarmServerComponentsMode(config.experimental?.serverComponents) === "islands"
+  };
   const layoutHydrationPlans = layoutRoutes.map((layout) => ({
     ...layout,
     hydration: getCachedClientModuleHydrationPlan(
@@ -5590,7 +5724,7 @@ function renderFarmRouteServerTree(element) { return element; }`;
         config.root,
         isolatedHydrationMode,
         hydrationPlanCache,
-        hydrationPlanOptions
+        pageHydrationPlanOptions
       )
     ])
   );
@@ -5876,7 +6010,14 @@ function renderFarmRouteServerTree(element) { return element; }`;
   withFarmRouteContext,
   createLateNotFoundRecovery,
   createLateRedirectRecovery,${hasFarmServerStorageConfig(config.storage) ? "\n  _registerFarmStorageModules,\n  disposeFarmStorage,\n  initFarmStorage," : ""}
-} from "@farm.js/core/internal/production-runtime";`;
+} from "@farm.js/core/internal/production-runtime";${farmIslandsMode ? `
+import { getSharedLayoutPrefixLength, handleFarmFormActionRequest, ignoreFarmHeldValues, installFarmIslandValues, parseFarmLayoutChainHeader } from "@farm.js/core/internal/production-runtime";
+import { installFarmIslandsServer } from "@farm.js/core/internal/islands-server";
+installFarmIslandsServer();
+const farmFormActionsConfig = ${JSON.stringify(resolveServerActionsConfig(config.serverActions))};
+installFarmIslandValues();
+${islandsActionKeyCode()}
+${FARM_SEGMENT_NAVIGATION_SERVER_RUNTIME}` : ""}`;
   const productionSiteTelemetryImport = config.telemetry ? `import { createFarmProductionSiteReporter } from "@farm.js/core/internal/product-telemetry-runtime";` : "";
   const metadataImageRuntimeImport = hasGeneratedMetadataImages ? `import { createFarmMetadataImageResponse } from "@farm.js/core/internal/metadata-image-runtime";` : "";
   const pluginRuntimeImport = hasPluginRuntime ? `import { PluginManager } from "@farm.js/core/plugin";` : "";
@@ -7029,7 +7170,7 @@ const farmClientEntryPreloadTags = farmClientModulePreloads
   : "";
 // The client modules a document's markup loads: its islands' boundaries and the
 // client references of its server tree.
-const FARM_CLIENT_MODULE_REFERENCE_PATTERN = /data-farm-client-boundary="([^"]+)"|"r":"(\\/[^"]+)"/g;
+const FARM_CLIENT_MODULE_REFERENCE_PATTERN = /<f-island src="([^"]+)"|"r":"(\\/[^"]+)"/g;
 
 function renderFarmClientModulePreload(index) {
   return '\\n  <link rel="modulepreload" href="/' +
@@ -8601,6 +8742,11 @@ ${hasServerRuntimeIntegrations ? `
   // Handle page routes (SSR)
   emitFarmEvent({ type: "render.start", route: pathname, pathname });
   const matchedRoute = matchPageRoute(routePathname);
+  ${farmIslandsMode ? `// Islands mode: a form or client component posting a server action to this page.
+  if (matchedRoute && request.method === "POST") {
+    const actionResponse = await handleFarmFormActionRequest(request, farmFormActionsConfig);
+    if (actionResponse) return applyProductionMiddlewareHeaders(actionResponse, middlewareHeaders);
+  }` : ""}
   if (matchedRoute) {
     const trailingSlashLocation = resolveFarmTrailingSlashRedirect(
       url,
@@ -8619,6 +8765,21 @@ ${hasServerRuntimeIntegrations ? `
     emitFarmEvent({ type: "route.matched", pathname, route: route.pattern, params });
     
     try {
+      ${farmIslandsMode ? `// Islands mode: the layouts the navigating browser keeps, decided before the shell cache
+      // so a PPR route caches each segment under its own key. A static page, a layout that
+      // hydrates as a root, or a route slot always renders whole.
+      const farmSegmentLayouts = getApplicableLayouts(
+        routePathname,
+        route.directory || route.pattern,
+      );
+      const farmKeptLayoutCount =
+        resolveRouteRenderingView(route).ssg ||
+        farmSegmentLayouts.some((layout) => layout.shouldHydrate === true) ||
+        matchRouteSlots(routePathname, request.headers.get("x-farm-intercept-from")).length > 0
+          ? 0
+          : countFarmKeptLayouts(request, farmSegmentLayouts, params);
+      // The root layout always renders, so keeping one layout keeps nothing.
+      const farmKeptLayouts = farmKeptLayoutCount > 1 ? farmKeptLayoutCount : 0;` : `const farmKeptLayouts = 0;`}
       const pprConfig = resolvePPRConfig(route);
       const pprBypassReason = pprConfig.enabled
         ? getPPRShellBypassReason(request, middlewareData, middlewareContext)
@@ -8631,7 +8792,7 @@ ${hasServerRuntimeIntegrations ? `
             farmLocaleResolution && farmI18nConfig.routing !== "none"
               ? resolveFarmI18nAlternateOrigin(request)
               : ""
-          )
+          ) + (farmKeptLayouts ? ":segment:" + farmKeptLayouts : "")
         : null;
       if (pprConfig.enabled && pprBypassReason) {
         emitFarmEvent({ type: "ppr.shell.bypass", route: pathname, reason: pprBypassReason });
@@ -8658,6 +8819,10 @@ ${hasServerRuntimeIntegrations ? `
               "x-farm-preload-buffered": getFarmBufferedPreloadMarker(cachedPPRShell),
               ...(farmFontPreloadHeader ? { "Link": farmFontPreloadHeader } : {}),
               ...getPPRHeaders("hit", pprConfig),
+              // A segment is one navigation's answer, never a CDN entry: some CDNs ignore Vary.
+              ...(farmKeptLayouts
+                ? { "Cache-Control": "private, no-store", "Vary": "F-Layouts" }
+                : {}),
             },
           }), middlewareHeaders), cachedPPRShell);
         }
@@ -8884,6 +9049,21 @@ ${hasServerRuntimeIntegrations ? `
           };
         });
         
+        ${farmIslandsMode ? `// Islands mode: a route a shared cache may store (a PPR shell, a static page) renders
+        // whole for every request, so a cache hit stays a hit. Other routes leave out what the
+        // navigating browser keeps: the layouts it shows and the values it holds.
+        const farmSharedCacheableRoute = Boolean(getRouteSharedCacheControl(route, pprCanCache));
+        if (farmSharedCacheableRoute) ignoreFarmHeldValues();
+        const farmLayoutKeyOf = getFarmLayoutKey;
+        // A navigation the browser renders in its layout's React root rebuilds a server-tree page
+        // from its payload, so the page's rendered HTML would go unused.
+        const farmPayloadOnlyNavigation =
+          !farmSharedCacheableRoute &&
+          shouldHydrateLayout &&
+          route.serverTree === true &&
+          !route.shouldHydrate &&
+          request.headers.get("f-render") === "tree";` : `const farmLayoutKeyOf = null;
+        const farmPayloadOnlyNavigation = false;`}
         const renderPageElement = async () => {
             // First, render the page content
             let pageElement;
@@ -8910,7 +9090,10 @@ ${hasServerRuntimeIntegrations ? `
               pageElement = wrapFarmRouteClientGraph(pageElement);
             } else if (shouldHydrateLayout && !route.shouldHydrate) {
               pageElement = route.serverTree
-                ? await renderFarmRouteServerTree(pageElement)
+                ? await renderFarmRouteServerTree(
+                    pageElement,
+                    farmPayloadOnlyNavigation ? { payloadOnly: true } : undefined,
+                  )
                 : isolateFarmRouteServerPage(pageElement);
             }
 
@@ -8935,6 +9118,22 @@ ${hasServerRuntimeIntegrations ? `
             for (let i = applicableLayouts.length - 1; i >= 0; i--) {
               const layout = applicableLayouts[i];
               const LayoutComponent = layout.module.default;
+              // Islands mode: a layout the browser keeps sends only its boundary, so the client
+              // knows where the rest goes. The root layout always renders: it may own the document.
+              if (LayoutComponent && i > 0 && i < farmKeptLayouts) {
+                wrappedElement = React.createElement(
+                  "div",
+                  {
+                    "data-farm-layout-boundary": "true",
+                    "data-farm-layout-pattern": layout.pattern,
+                    "data-farm-layout-key": farmLayoutKeyOf(layout.pattern, params),
+                    "data-farm-layout-kept": "true",
+                    style: { display: "contents" },
+                  },
+                  wrappedElement,
+                );
+                continue;
+              }
               if (LayoutComponent) {
                 const slotProps = {};
                 for (const slot of renderedRouteSlots) {
@@ -8961,6 +9160,9 @@ ${hasServerRuntimeIntegrations ? `
                   {
                     "data-farm-layout-boundary": "true",
                     "data-farm-layout-pattern": layout.pattern,
+                    "data-farm-layout-key": farmLayoutKeyOf
+                      ? farmLayoutKeyOf(layout.pattern, params)
+                      : undefined,
                     style: { display: "contents" },
                   },
                   wrappedElement,
@@ -9071,7 +9273,7 @@ ${hasServerRuntimeIntegrations ? `
           farmLocaleResolution,
         );
         const hasRequestScopedRender = Boolean(
-          pageStatus >= 400 ||
+          pageStatus >= 400 ||${farmIslandsMode ? "\n          farmKeptLayouts > 0 ||\n          farmPayloadOnlyNavigation ||" : ""}
           renderReadRequest ||
           request.headers.get("x-farm-intercept-from") ||
           hasPrivateRequestHeaders ||
@@ -9091,7 +9293,12 @@ ${hasServerRuntimeIntegrations ? `
         if (renderedPage.stream || hasRequestScopedRender || !sharedCacheControl) {
           responseHeaders["Cache-Control"] = "private, no-store";
         }
-        const farmI18nSnapshot = getFarmI18nSnapshot();
+        const farmI18nSnapshot = getFarmI18nSnapshot();${farmIslandsMode ? `
+        // Islands mode: a navigation that names the values it holds, or the layouts it shows,
+        // gets HTML without them.
+        responseHeaders["Vary"] = farmSharedCacheableRoute
+          ? "F-Layouts"
+          : "F-Values, F-Layouts, F-Render";` : ""}
         let html = renderedPage.html;
         
         // Check if the layout already rendered a full HTML document
@@ -11003,6 +11210,12 @@ async function copyPrismaClientForVercel(root, nitroFuncDir, fs4) {
   await writeNitroOutputPackage(nitroFuncDir, functionPackage, fs4);
 }
 __name(copyPrismaClientForVercel, "copyPrismaClientForVercel");
+function islandsActionKeyCode() {
+  const key = randomBytes(32).toString("base64url");
+  return `import { setBuildDefaults as __farmIslxBuildDefaults } from "@farm.js/core/internal/islx-server";
+__farmIslxBuildDefaults({ key: ${JSON.stringify(key)} });`;
+}
+__name(islandsActionKeyCode, "islandsActionKeyCode");
 
 // src/build/project-module-runner.ts
 async function createFarmProjectModuleSsrEnvironment() {