@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-IFI5FXEZ.cjs → chunk-PFQKNERH.cjs}

@@ -10,7 +10,7 @@ var _chunkXD32KALFcjs = require('./chunk-XD32KALF.cjs');
 
 
 
-var _chunkMXDTKXO6cjs = require('./chunk-MXDTKXO6.cjs');
+var _chunk3UH7MRCPcjs = require('./chunk-3UH7MRCP.cjs');
 
 
 
@@ -20,7 +20,7 @@ var _chunkMXDTKXO6cjs = require('./chunk-MXDTKXO6.cjs');
 
 
 
-var _chunk2FXWWUE5cjs = require('./chunk-2FXWWUE5.cjs');
+var _chunkVZJR7UTGcjs = require('./chunk-VZJR7UTG.cjs');
 
 
 
@@ -28,7 +28,7 @@ var _chunk2FXWWUE5cjs = require('./chunk-2FXWWUE5.cjs');
 var _chunkMWWVKDW3cjs = require('./chunk-MWWVKDW3.cjs');
 
 
-var _chunkND224OE2cjs = require('./chunk-ND224OE2.cjs');
+var _chunkTKSCR644cjs = require('./chunk-TKSCR644.cjs');
 
 
 var _chunkIK6LVLKCcjs = require('./chunk-IK6LVLKC.cjs');
@@ -37,7 +37,7 @@ var _chunkIK6LVLKCcjs = require('./chunk-IK6LVLKC.cjs');
 
 
 
-var _chunkDFLLARUKcjs = require('./chunk-DFLLARUK.cjs');
+var _chunkF7JZENPFcjs = require('./chunk-F7JZENPF.cjs');
 
 
 var _chunkKCMTCM6Icjs = require('./chunk-KCMTCM6I.cjs');
@@ -73,27 +73,37 @@ var _chunk2SJ4RQ6Pcjs = require('./chunk-2SJ4RQ6P.cjs');
 
 
 
-var _chunkIMB4PIARcjs = require('./chunk-IMB4PIAR.cjs');
 
 
 
+var _chunkICUQICNCcjs = require('./chunk-ICUQICNC.cjs');
 
 
-var _chunkCTV2TTNPcjs = require('./chunk-CTV2TTNP.cjs');
 
 
 
-var _chunkYVGAEAA5cjs = require('./chunk-YVGAEAA5.cjs');
+var _chunk3BHT4WMPcjs = require('./chunk-3BHT4WMP.cjs');
+
+
+
+
+
+
+
+
+
+
+var _chunkIPXLADVOcjs = require('./chunk-IPXLADVO.cjs');
 
 
 var _chunkCXP5U3RWcjs = require('./chunk-CXP5U3RW.cjs');
 
 
-var _chunk22GUSVNJcjs = require('./chunk-22GUSVNJ.cjs');
+var _chunk3SDFA7UFcjs = require('./chunk-3SDFA7UF.cjs');
 
 
 
-var _chunk75WGQVQAcjs = require('./chunk-75WGQVQA.cjs');
+var _chunkHITLGIAOcjs = require('./chunk-HITLGIAO.cjs');
 
 
 
@@ -115,7 +125,7 @@ var _chunkVPTDD5XFcjs = require('./chunk-VPTDD5XF.cjs');
 var _chunkPSV6XKPOcjs = require('./chunk-PSV6XKPO.cjs');
 
 
-var _chunkCUMINO7Zcjs = require('./chunk-CUMINO7Z.cjs');
+var _chunkRU3M2FIKcjs = require('./chunk-RU3M2FIK.cjs');
 
 
 
@@ -127,38 +137,41 @@ var _chunk6EXBPJ24cjs = require('./chunk-6EXBPJ24.cjs');
 var _chunkVEKFLAQMcjs = require('./chunk-VEKFLAQM.cjs');
 
 
-var _chunkX7KZBF63cjs = require('./chunk-X7KZBF63.cjs');
+var _chunkEFCQPQMGcjs = require('./chunk-EFCQPQMG.cjs');
 
 
 
 var _chunkOHY2ZWUGcjs = require('./chunk-OHY2ZWUG.cjs');
 
 
-var _chunkKJ2TIHZZcjs = require('./chunk-KJ2TIHZZ.cjs');
+var _chunkEUV4YR3Vcjs = require('./chunk-EUV4YR3V.cjs');
 
 
 
-var _chunkMPEYMSCFcjs = require('./chunk-MPEYMSCF.cjs');
+var _chunkVFQT3LAOcjs = require('./chunk-VFQT3LAO.cjs');
 
 
 
-var _chunkZ5HIWVDPcjs = require('./chunk-Z5HIWVDP.cjs');
+var _chunkFTFYRMQQcjs = require('./chunk-FTFYRMQQ.cjs');
 
 
-var _chunkZHVYQL3Hcjs = require('./chunk-ZHVYQL3H.cjs');
 
 
-var _chunkEXLKRR4Ucjs = require('./chunk-EXLKRR4U.cjs');
+var _chunkULAWS2PAcjs = require('./chunk-ULAWS2PA.cjs');
 
 
-var _chunkIQXFRNY2cjs = require('./chunk-IQXFRNY2.cjs');
 
 
-var _chunkLYLEZIG3cjs = require('./chunk-LYLEZIG3.cjs');
+var _chunkZ2HLU4IXcjs = require('./chunk-Z2HLU4IX.cjs');
+
 
+var _chunkXBML5KMGcjs = require('./chunk-XBML5KMG.cjs');
 
 
-var _chunkWPYFSQKKcjs = require('./chunk-WPYFSQKK.cjs');
+var _chunkUFDAAQFXcjs = require('./chunk-UFDAAQFX.cjs');
+
+
+var _chunkLYLEZIG3cjs = require('./chunk-LYLEZIG3.cjs');
 
 
 
@@ -175,6 +188,10 @@ var _chunkSOR334EBcjs = require('./chunk-SOR334EB.cjs');
 var _chunk5QIKR7RRcjs = require('./chunk-5QIKR7RR.cjs');
 
 
+
+var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
+
+
 var _chunkC5GUTBZKcjs = require('./chunk-C5GUTBZK.cjs');
 
 
@@ -282,7 +299,7 @@ function getDocsTitle(docs) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, getDocsTitle, "getDocsTitle");
 function loadPages(contentDir, docs) {
-  return _chunk2FXWWUE5cjs.discoverFarmDocsPages.call(void 0, contentDir, docs).map((page) => _chunk2FXWWUE5cjs.loadFarmDocsPage.call(void 0, contentDir, docs, page.slug)).filter((page) => Boolean(page)).sort((a, b) => a.href.localeCompare(b.href));
+  return _chunkVZJR7UTGcjs.discoverFarmDocsPages.call(void 0, contentDir, docs).map((page) => _chunkVZJR7UTGcjs.loadFarmDocsPage.call(void 0, contentDir, docs, page.slug)).filter((page) => Boolean(page)).sort((a, b) => a.href.localeCompare(b.href));
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, loadPages, "loadPages");
 function findSocialImagePath(html) {
@@ -303,14 +320,14 @@ async function addHandlerRoute(routes, pathname, handler, absolutePaths) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, addHandlerRoute, "addHandlerRoute");
 async function compileFarmDocsManifest(docs, options) {
-  const contentDir = _chunk2FXWWUE5cjs.resolveFarmDocsContentDir.call(void 0, docs, options);
+  const contentDir = _chunkVZJR7UTGcjs.resolveFarmDocsContentDir.call(void 0, docs, options);
   const pages = loadPages(contentDir, docs);
   const absolutePaths = [
     _path2.default.resolve(options.root),
     _path2.default.resolve(contentDir),
     docs.configPath || ""
   ];
-  const handler = _chunk2FXWWUE5cjs.createFarmDocsHandler.call(void 0, docs, {
+  const handler = _chunkVZJR7UTGcjs.createFarmDocsHandler.call(void 0, docs, {
     root: options.root,
     srcDir: options.srcDir,
     clientEntry: options.clientEntry,
@@ -318,7 +335,7 @@ async function compileFarmDocsManifest(docs, options) {
     fontStylesheetHref: options.fontStylesheetHref,
     globalStylesheetHref: options.globalStylesheetHref
   });
-  const apiHandler = _chunkMXDTKXO6cjs.createFarmDocsAPIHandler.call(void 0, {
+  const apiHandler = _chunk3UH7MRCPcjs.createFarmDocsAPIHandler.call(void 0, {
     rootDir: options.root,
     srcDir: options.srcDir,
     docs
@@ -410,7 +427,7 @@ async function compileFarmDocsManifest(docs, options) {
       post: await compileResponse(postResponse, absolutePaths),
       search: {
         pages: pages.map((page) => ({
-          ..._chunk2FXWWUE5cjs.toFarmDocsMarkdownPage.call(void 0, page),
+          ..._chunkVZJR7UTGcjs.toFarmDocsMarkdownPage.call(void 0, page),
           sourcePath: `farm-docs:${page.slug || "index"}`
         })),
         search: _nullishCoalesce(searchConfig, () => ( true)),
@@ -430,7 +447,7 @@ async function createFarmRouteRuntimeManifest(options) {
   const routes = [];
   for (const [pattern, entry] of options.routeManager.getRoutes()) {
     const routeModule = await options.routeManager.loadRouteModule(entry.modulePath);
-    const rendering = await _chunkCTV2TTNPcjs.resolveRouteRenderingConfigFromFile.call(void 0, routeModule, entry.modulePath);
+    const rendering = await _chunk3BHT4WMPcjs.resolveRouteRenderingConfigFromFile.call(void 0, routeModule, entry.modulePath);
     const runtimeConfig = await options.routeManager.resolveRouteRuntimeConfig(pattern);
     routes.push({
       kind: "page",
@@ -441,9 +458,9 @@ async function createFarmRouteRuntimeManifest(options) {
     });
   }
   for (const [pattern, route] of options.apiRouteManager.getRoutes()) {
-    const publicPattern = _chunkWPYFSQKKcjs.resolveFarmAPIServerRoutePath.call(void 0, 
+    const publicPattern = _chunkKNBBQHO2cjs.resolveFarmAPIServerRoutePath.call(void 0, 
       pattern,
-      _chunkWPYFSQKKcjs.resolveFarmAPIServerBasePath.call(void 0, options.config.api)
+      _chunkKNBBQHO2cjs.resolveFarmAPIServerBasePath.call(void 0, options.config.api)
     );
     const inherited = _chunkSOR334EBcjs.resolveFarmRouteRuleRuntimeConfig.call(void 0, publicPattern, options.config.routeRules);
     const own = _chunkSOR334EBcjs.normalizeFarmRouteRuntimeConfig.call(void 0, 
@@ -708,6 +725,47 @@ function buildFarmVercelRoutes(options) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, buildFarmVercelRoutes, "buildFarmVercelRoutes");
 
+// src/nitro/netlify-entry.ts
+
+
+function resolveNitroNetlifyEntry(nitroRuntimeEntry) {
+  const entry = _path2.default.join(
+    _path2.default.dirname(nitroRuntimeEntry),
+    "..",
+    "presets",
+    "netlify",
+    "runtime",
+    "netlify.mjs"
+  );
+  if (!_fs.existsSync.call(void 0, entry)) {
+    throw new Error(
+      `[Farm.js] Could not find Nitro's Netlify function entry at ${entry}. Farm wraps it so private responses are never cached by Netlify's CDN; reinstall dependencies or report the installed Nitro version.`
+    );
+  }
+  return entry.split(_path2.default.sep).join("/");
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, resolveNitroNetlifyEntry, "resolveNitroNetlifyEntry");
+function createFarmNetlifyEntry(options) {
+  return `
+import nitroNetlifyHandler from ${JSON.stringify(options.nitroNetlifyEntry)};
+
+const PRIVATE_CACHE_DIRECTIVE = /(?:^|,)\\s*(?:private|no-store)\\s*(?:[,=]|$)/i;
+
+export default async function farmNetlifyHandler(request, context) {
+  const response = await nitroNetlifyHandler(request, context);
+  if (
+    response &&
+    response.headers.has("netlify-cdn-cache-control") &&
+    PRIVATE_CACHE_DIRECTIVE.test(response.headers.get("cache-control") || "")
+  ) {
+    response.headers.delete("netlify-cdn-cache-control");
+  }
+  return response;
+}
+`.trim();
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, createFarmNetlifyEntry, "createFarmNetlifyEntry");
+
 // src/nitro/node-server-entry.ts
 function createFarmNodeServerEntry(options) {
   const serverConfig = JSON.stringify(options.server);
@@ -1345,6 +1403,11 @@ function hasRollupPlugins(plugins) {
   return Boolean(plugins);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, hasRollupPlugins, "hasRollupPlugins");
+function hasFarmServerCacheConfig(cache) {
+  if (!cache || typeof cache !== "object") return false;
+  return cache.adapter !== void 0 || cache.namespace !== void 0 || cache.maxEntries !== void 0 || cache.lease !== void 0;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, hasFarmServerCacheConfig, "hasFarmServerCacheConfig");
 function hasFarmRuntimeConfigModule(config, configModulePath) {
   return Boolean(configModulePath || (config.layers || []).some((layer) => layer.configFile));
 }
@@ -1523,7 +1586,7 @@ function hasFarmMiddlewareConfig(config) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, hasFarmMiddlewareConfig, "hasFarmMiddlewareConfig");
 function hasFarmServerRuntimePlugins(config) {
   return (config.plugins || []).some((plugin) => {
-    if (_chunkZ5HIWVDPcjs.getFarmIntegrationPluginServerRuntime.call(void 0, plugin) === false) return false;
+    if (_chunkFTFYRMQQcjs.getFarmIntegrationPluginServerRuntime.call(void 0, plugin) === false) return false;
     return Boolean(
       plugin.setup || plugin.init || plugin.ready || plugin.shutdown || plugin.runtime || plugin.router || plugin.render || plugin.beforeRouteMatch || plugin.afterRouteMatch || plugin.beforeRender || plugin.afterRender || plugin.onError || plugin.transformHTML
     );
@@ -1536,7 +1599,7 @@ function hasFarmPluginRoutes(config) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, hasFarmPluginRoutes, "hasFarmPluginRoutes");
 function farmServerRuntimePluginsMayHandlePath(config, pathname) {
   return (config.plugins || []).some(
-    (plugin) => _chunkZ5HIWVDPcjs.getFarmIntegrationPluginServerRuntime.call(void 0, plugin) !== false && _chunkIMB4PIARcjs.farmPluginMayAffectRuntimePath.call(void 0, plugin, pathname)
+    (plugin) => _chunkFTFYRMQQcjs.getFarmIntegrationPluginServerRuntime.call(void 0, plugin) !== false && _chunkICUQICNCcjs.farmPluginMayAffectRuntimePath.call(void 0, plugin, pathname)
   );
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, farmServerRuntimePluginsMayHandlePath, "farmServerRuntimePluginsMayHandlePath");
@@ -1544,7 +1607,7 @@ async function discoverMiddlewareRoutes(appDir) {
   const fs = await import("fs/promises");
   const appDirs = Array.isArray(appDir) ? [...appDir] : [appDir];
   const routes = /* @__PURE__ */ new Map();
-  async function walk(dir, routePath, discovered) {
+  async function walk(dir, routePath, directory, discovered) {
     let entries;
     try {
       entries = await fs.readdir(dir, { withFileTypes: true });
@@ -1557,30 +1620,31 @@ async function discoverMiddlewareRoutes(appDir) {
     if (middlewareFile) {
       discovered.push({
         path: routePath,
+        directory,
         filePath: _path2.default.join(dir, middlewareFile.name)
       });
     }
     for (const entry of entries) {
-      if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name.startsWith("_")) {
+      if (!entry.isDirectory() || entry.name.startsWith(".")) {
         continue;
       }
-      const childRoutePath = _chunkZHVYQL3Hcjs.appendMiddlewareRoutePath.call(void 0, routePath, entry.name);
-      await walk(_path2.default.join(dir, entry.name), childRoutePath, discovered);
+      await walk(
+        _path2.default.join(dir, entry.name),
+        _chunkULAWS2PAcjs.appendMiddlewareRoutePath.call(void 0, routePath, entry.name),
+        _chunkULAWS2PAcjs.appendMiddlewareDirectory.call(void 0, directory, entry.name),
+        discovered
+      );
     }
   }
   _chunkS3JO3N4Hcjs.__name.call(void 0, walk, "walk");
   for (const sourceAppDir of appDirs) {
     const discovered = [];
-    await walk(sourceAppDir, "/", discovered);
+    await walk(sourceAppDir, "/", "", discovered);
     for (const route of discovered) {
-      routes.set(route.path, route);
+      routes.set(route.directory, route);
     }
   }
-  return Array.from(routes.values()).sort((a, b) => {
-    const depthA = a.path.split("/").filter(Boolean).length;
-    const depthB = b.path.split("/").filter(Boolean).length;
-    return depthA - depthB || a.path.localeCompare(b.path);
-  });
+  return Array.from(routes.values()).sort(_chunkULAWS2PAcjs.compareMiddlewareRouteLocations).map(({ path: routePath, filePath }) => ({ path: routePath, filePath }));
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, discoverMiddlewareRoutes, "discoverMiddlewareRoutes");
 function assertFarmDocsRuntimeSupported(config, preset) {
@@ -1598,7 +1662,7 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
   assertFarmDocsRuntimeSupported(config, preset);
   const srcDir = config.srcDir || "src";
   const distDir = config.distDir || ".farm";
-  const deployOutputDir = _chunkDFLLARUKcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir);
+  const deployOutputDir = _chunkF7JZENPFcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir);
   const lifecyclePluginManager = options.pluginManager;
   const productionViteResultPromise = Promise.allSettled([
     Promise.resolve(_nullishCoalesce(options.productionVite, () => ( _chunkA6WIQH5Zcjs.loadFarmProductionVite.call(void 0, ))))
@@ -1617,9 +1681,10 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
     const routeRuntimeManifestResultPromise = Promise.allSettled([routeRuntimeManifestPromise]);
     const pageRoutes = [];
     for (const [pattern, entry] of routeManager.getRoutes()) {
-      const markdownSourcePath = entry.markdownSourcePath || (_chunkX7KZBF63cjs.isFarmMarkdownPageFile.call(void 0, entry.modulePath) ? entry.modulePath : void 0);
+      const markdownSourcePath = entry.markdownSourcePath || (_chunkEFCQPQMGcjs.isFarmMarkdownPageFile.call(void 0, entry.modulePath) ? entry.modulePath : void 0);
       pageRoutes.push({
         pattern,
+        ...entry.directory ? { directory: entry.directory } : {},
         modulePath: entry.modulePath,
         ...markdownSourcePath ? {
           source: _fs.readFileSync.call(void 0, markdownSourcePath, "utf8"),
@@ -1632,6 +1697,7 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
       (entry) => ({
         name: entry.name,
         ownerPattern: entry.ownerPattern,
+        ...entry.ownerDirectory ? { ownerDirectory: entry.ownerDirectory } : {},
         pattern: entry.pattern,
         modulePath: entry.modulePath,
         containerId: entry.containerId,
@@ -1846,7 +1912,7 @@ async function mergeBuiltFontCss(outputDir, fontCssSource) {
   }
   const normalizedFontCss = typeof fontCss === "string" ? fontCss : Buffer.from(fontCss).toString("utf8");
   await fs.writeFile(fontCssPath, normalizedFontCss);
-  await fs.writeFile(clientCssPath, _chunkIMB4PIARcjs.mergeFarmFontCss.call(void 0, clientCss, normalizedFontCss));
+  await fs.writeFile(clientCssPath, _chunkICUQICNCcjs.mergeFarmFontCss.call(void 0, clientCss, normalizedFontCss));
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, mergeBuiltFontCss, "mergeBuiltFontCss");
 var _IncompleteClientBuildOutputError = class _IncompleteClientBuildOutputError extends Error {
@@ -1896,7 +1962,7 @@ function getCachedClientModuleHydrationPlan(modulePath, root, mode, cache, optio
   const key = `${_path2.default.resolve(root)}\0${mode}\0${options.asyncOwnerIslands === true}\0${_path2.default.resolve(modulePath)}`;
   let plan = cache.get(key);
   if (!plan) {
-    plan = _chunkIMB4PIARcjs.getClientModuleHydrationPlan.call(void 0, modulePath, root, mode, options);
+    plan = _chunkICUQICNCcjs.getClientModuleHydrationPlan.call(void 0, modulePath, root, mode, options);
     cache.set(key, plan);
   }
   return { ...plan, isolatedBoundaries: [...plan.isolatedBoundaries] };
@@ -1914,7 +1980,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   });
   pluginManager.addPlugins(config.plugins || []);
   const clientPages = [];
-  const integrationProviders = _chunkZ5HIWVDPcjs.getIntegrationProviders.call(void 0, config.integrations).filter(
+  const integrationProviders = _chunkFTFYRMQQcjs.getIntegrationProviders.call(void 0, config.integrations).filter(
     (provider) => provider.component || provider.type === "clerk"
   );
   const unsupportedIntegrationProvider = integrationProviders.find(
@@ -1925,14 +1991,14 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
       `[Farm.js] isolated hydration kept route-wide because integration provider "${unsupportedIntegrationProvider.name}" does not declare supportsIsolatedHydration: true.`
     );
   }
-  const isolatedMode = _chunkIMB4PIARcjs.resolveFarmIsolatedClientHydrationMode.call(void 0, 
+  const isolatedMode = _chunkICUQICNCcjs.resolveFarmIsolatedClientHydrationMode.call(void 0, 
     _optionalChain([config, 'access', _35 => _35.experimental, 'optionalAccess', _36 => _36.isolatedClientHydration]),
     {
       serverComponents: _optionalChain([config, 'access', _37 => _37.experimental, 'optionalAccess', _38 => _38.serverComponents]) === true,
       hasUnsupportedIntegrationProvider: Boolean(unsupportedIntegrationProvider)
     }
   );
-  const planOptions = _chunkIMB4PIARcjs.getFarmClientHydrationPlanOptions.call(void 0, 
+  const planOptions = _chunkICUQICNCcjs.getFarmClientHydrationPlanOptions.call(void 0, 
     config.renderer,
     Boolean(unsupportedIntegrationProvider)
   );
@@ -1979,7 +2045,8 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
       };
     }
   });
-  const layoutAppliesToRoute = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (layoutPattern, routePattern) => layoutPattern === "/" || routePattern === layoutPattern || routePattern.startsWith(`${layoutPattern}/`), "layoutAppliesToRoute");
+  const layoutAppliesToRoute = _chunkIPXLADVOcjs.routeBoundaryCoversDirectory;
+  const routeDirectory = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (route) => _nullishCoalesce(route.directory, () => ( route.pattern)), "routeDirectory");
   const adapterOwnsDocsRuntime = Boolean(
     _chunkPSV6XKPOcjs.isReactRenderer.call(void 0, config.renderer) && _optionalChain([config, 'access', _39 => _39.docs, 'optionalAccess', _40 => _40.enabled]) && _optionalChain([config, 'access', _41 => _41.docs, 'access', _42 => _42.adapter, 'optionalAccess', _43 => _43.server]) && config.docs.adapter.react
   );
@@ -1989,7 +2056,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   ), "isAdapterDocsRoute");
   const syntheticDocsEntry = _optionalChain([config, 'access', _46 => _46.docs, 'optionalAccess', _47 => _47.enabled]) && !adapterOwnsDocsRuntime ? adapterDocsEntry : null;
   const syntheticDocsPatterns = syntheticDocsEntry ? syntheticDocsEntry === "/" ? ["/", "/[...slug]"] : [syntheticDocsEntry, `${syntheticDocsEntry}/[...slug]`] : [];
-  const markdownPagePlan = _chunkIMB4PIARcjs.createMarkdownPageHydrationPlanner.call(void 0, 
+  const markdownPagePlan = _chunkICUQICNCcjs.createMarkdownPageHydrationPlanner.call(void 0, 
     _chunkOHY2ZWUGcjs.resolveFarmMdxComponentsModulePath.call(void 0, _chunkOHY2ZWUGcjs.resolveMdxConfig.call(void 0, config.mdx), root),
     root,
     isolatedMode,
@@ -1997,7 +2064,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   );
   const routePlans = pageRoutes.map((route) => ({
     route,
-    metadata: _chunkX7KZBF63cjs.isFarmMarkdownPageFile.call(void 0, route.modulePath) ? markdownPagePlan() : getCachedClientModuleHydrationPlan(
+    metadata: _chunkEFCQPQMGcjs.isFarmMarkdownPageFile.call(void 0, route.modulePath) ? markdownPagePlan() : getCachedClientModuleHydrationPlan(
       route.modulePath,
       root,
       isolatedMode,
@@ -2005,7 +2072,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
       planOptions
     )
   }));
-  _chunkIMB4PIARcjs.enforceFarmIsolatedHydrationRouteBudget.call(void 0, 
+  _chunkICUQICNCcjs.enforceFarmIsolatedHydrationRouteBudget.call(void 0, 
     clientLayouts.map((layout) => ({
       pattern: layout.pattern,
       depth: layout.pattern.split("/").filter(Boolean).length,
@@ -2013,8 +2080,8 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     })),
     [
       ...routePlans.map(({ route, metadata }) => ({
-        pattern: route.pattern,
-        depth: route.pattern.split("/").filter(Boolean).length,
+        pattern: routeDirectory(route),
+        depth: _chunkIPXLADVOcjs.getRouteDirectoryDepth.call(void 0, routeDirectory(route)),
         metadata
       })),
       ...syntheticDocsPatterns.map((pattern) => ({
@@ -2035,9 +2102,9 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     layoutAppliesToRoute
   );
   for (const layout of clientLayouts) {
-    const matchesBuiltRoute = pageRoutes.some((route) => layoutAppliesToRoute(layout.pattern, route.pattern)) || Boolean(adapterDocsEntry && layoutAppliesToRoute(layout.pattern, adapterDocsEntry));
+    const matchesBuiltRoute = pageRoutes.some((route) => layoutAppliesToRoute(layout.pattern, routeDirectory(route))) || Boolean(adapterDocsEntry && layoutAppliesToRoute(layout.pattern, adapterDocsEntry));
     if (matchesBuiltRoute && layout.suppressedAsyncHydration) {
-      _chunk5QIKR7RRcjs.logger.warn(`\u26A0\uFE0F  ${_chunkIMB4PIARcjs.describeSuppressedAsyncHydration.call(void 0, layout.pattern, layout.fallbackReason)}`);
+      _chunk5QIKR7RRcjs.logger.warn(`\u26A0\uFE0F  ${_chunkICUQICNCcjs.describeSuppressedAsyncHydration.call(void 0, layout.pattern, layout.fallbackReason)}`);
     }
   }
   if (isolatedMode === "analyze") {
@@ -2057,11 +2124,11 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     if (isAdapterDocsRoute(route.pattern)) continue;
     try {
       const applicableClientLayouts = clientLayouts.filter(
-        (layout) => (layout.shouldHydrate || layout.hasIsolatedClientBoundaries) && layoutAppliesToRoute(layout.pattern, route.pattern)
+        (layout) => (layout.shouldHydrate || layout.hasIsolatedClientBoundaries) && layoutAppliesToRoute(layout.pattern, routeDirectory(route))
       );
       if (metadata.suppressedAsyncHydration) {
         _chunk5QIKR7RRcjs.logger.warn(
-          `\u26A0\uFE0F  ${_chunkIMB4PIARcjs.describeSuppressedAsyncHydration.call(void 0, route.pattern, metadata.fallbackReason)}`
+          `\u26A0\uFE0F  ${_chunkICUQICNCcjs.describeSuppressedAsyncHydration.call(void 0, route.pattern, metadata.fallbackReason)}`
         );
       }
       if (metadata.shouldHydrate || metadata.hasIsolatedClientBoundaries || applicableClientLayouts.length > 0) {
@@ -2084,7 +2151,9 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
           isolatedBoundaries: [
             ...metadata.hasIsolatedClientBoundaries ? metadata.isolatedBoundaries : [],
             ...applicableClientLayouts.filter((layout) => layout.hasIsolatedClientBoundaries).flatMap((layout) => layout.isolatedBoundaries)
-          ]
+          ],
+          // The server renders a server tree only below a hydrating layout.
+          ..._chunkICUQICNCcjs.usesFarmServerTree.call(void 0, metadata) && applicableClientLayouts.some((layout) => layout.shouldHydrate) ? { serverTree: true } : {}
         });
         _chunk5QIKR7RRcjs.logger.info(`\u{1F4F1} Found hydratable route: ${route.pattern} -> ${route.modulePath}`);
       }
@@ -2120,7 +2189,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   }
   const clientRouteSlots = routeSlots.filter((slot) => {
     try {
-      return _chunkIMB4PIARcjs.getClientModuleMetadata.call(void 0, slot.modulePath, root).shouldHydrate;
+      return _chunkICUQICNCcjs.getClientModuleMetadata.call(void 0, slot.modulePath, root).shouldHydrate;
     } catch (error) {
       _chunk5QIKR7RRcjs.logger.warn(`\u26A0\uFE0F  Could not inspect route slot ${slot.modulePath}: ${error}`);
       return false;
@@ -2148,10 +2217,10 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     config.renderer,
     config.publicRuntimeConfig,
     config.trailingSlash,
-    _chunkZ5HIWVDPcjs.getIntegrationProviders.call(void 0, config.integrations),
+    _chunkFTFYRMQQcjs.getIntegrationProviders.call(void 0, config.integrations),
     config.basePath,
-    _chunkIMB4PIARcjs.generateClientCachePersistenceCode.call(void 0, _chunkIMB4PIARcjs.resolveFarmClientCacheAdapterEntry.call(void 0, root, config.cache)),
-    adapterOwnsDocsRuntime ? _chunk75WGQVQAcjs.getFarmDocsAdapterConfigModule.call(void 0, config.docs) : void 0
+    _chunkICUQICNCcjs.generateClientCachePersistenceCode.call(void 0, _chunkICUQICNCcjs.resolveFarmClientCacheAdapterEntry.call(void 0, root, config.cache)),
+    adapterOwnsDocsRuntime ? _chunkHITLGIAOcjs.getFarmDocsAdapterConfigModule.call(void 0, config.docs) : void 0
   );
   await fs.writeFile(clientEntryPath, clientHydrationCode);
   const hasScopedPostcssConfig = hasProjectPostcssConfig(root);
@@ -2167,7 +2236,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     const postcssConfigPath = _path2.default.join(clientEntryDir, "postcss.config.cjs");
     await fs.writeFile(postcssConfigPath, "module.exports = { plugins: [] };\n");
     postcssSearchPath = clientEntryDir;
-    tailwindVitePlugin = await _chunkIMB4PIARcjs.loadTailwindVitePlugin.call(void 0, {
+    tailwindVitePlugin = await _chunkICUQICNCcjs.loadTailwindVitePlugin.call(void 0, {
       builder: productionVite.builder,
       announce: true
     });
@@ -2236,11 +2305,14 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
         }
       },
       plugins: [
-        _chunkIMB4PIARcjs.createFarmThemeCssPlugin.call(void 0, config.theme, config.basePath),
+        _chunkICUQICNCcjs.createFarmThemeCssPlugin.call(void 0, config.theme, config.basePath),
         ...tailwindVitePlugin ? [tailwindVitePlugin] : [],
         ...rendererVitePlugins,
         ...config.vite.plugins || [],
         farmServerOnlyEntriesPlugin(),
+        _chunkICUQICNCcjs.farmDocsClientConfigPlugin.call(void 0, 
+          adapterOwnsDocsRuntime ? _chunkHITLGIAOcjs.getFarmDocsAdapterConfigModule.call(void 0, config.docs) : void 0
+        ),
         // Plugin to redirect @farm.js/core imports to client-only exports
         {
           name: "farm-client-only-imports",
@@ -2289,7 +2361,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
           }
         },
         farmPlugin({ ...config, isolatedClientBoundaryModules }, pluginManager),
-        _chunk22GUSVNJcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
+        _chunk3SDFA7UFcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
       ],
       mode: "production",
       css: postcssSearchPath ? {
@@ -2297,7 +2369,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
       } : void 0,
       // Ensure React is bundled for client
       resolve: {
-        alias: _chunkIMB4PIARcjs.createFarmSourceAlias.call(void 0, root, config.srcDir),
+        alias: _chunkICUQICNCcjs.createFarmSourceAlias.call(void 0, root, config.srcDir),
         dedupe: [...config.renderer.dedupe || []]
       },
       // Optimize dependencies - exclude server-side code from client bundle
@@ -2310,7 +2382,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
         ]
       }
     };
-    await viteBuild(_chunkIMB4PIARcjs.mergeFarmProductionViteConfig.call(void 0, clientViteConfig, config.vite));
+    await viteBuild(_chunkICUQICNCcjs.mergeFarmProductionViteConfig.call(void 0, clientViteConfig, config.vite));
     await mergeBuiltFontCss(outputDir);
     await validateClientBuildOutput(root, srcDir, outputDir);
   } finally {
@@ -3069,7 +3141,7 @@ function generateClientHydrationEntry(clientPages, layoutRoutes, clientRouteSlot
   direction: {}
 }, plugins = [], renderer = _chunkPSV6XKPOcjs.REACT_RENDERER, publicRuntimeConfig = void 0, trailingSlash = false, integrationProviders = [], basePath = "/", clientCachePersistence = { imports: "", init: "" }, docsConfigModule) {
   const toImportPath = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (targetPath) => targetPath.replace(/\\/g, "/"), "toImportPath");
-  const clientPluginEntry = _chunkIMB4PIARcjs.generateFarmClientPluginEntryCode.call(void 0, 
+  const clientPluginEntry = _chunkICUQICNCcjs.generateFarmClientPluginEntryCode.call(void 0, 
     plugins,
     root,
     srcDir,
@@ -3080,7 +3152,7 @@ function generateClientHydrationEntry(clientPages, layoutRoutes, clientRouteSlot
 import { createRoot, hydrateRoot } from "react-dom/client";` : appSetupPath ? `import React, { createRoot, hydrateRoot, configureApp as __farmConfigureApp } from ${JSON.stringify(renderer.client)};
 import __farmAppSetup from ${JSON.stringify(_chunk5QIKR7RRcjs.toPosixPath.call(void 0, appSetupPath))};
 __farmConfigureApp(__farmAppSetup);` : `import React, { createRoot, hydrateRoot } from ${JSON.stringify(renderer.client)};`;
-  const providerClientCode = _chunkIMB4PIARcjs.generateFarmIntegrationProviderClientCode.call(void 0, 
+  const providerClientCode = _chunkICUQICNCcjs.generateFarmIntegrationProviderClientCode.call(void 0, 
     integrationProviders,
     root,
     _nullishCoalesce(renderer.componentExtensions, () => ( []))
@@ -3094,8 +3166,10 @@ __farmConfigureApp(__farmAppSetup);` : `import React, { createRoot, hydrateRoot
     if (!layout.hasIsolatedClientBoundaries) {
       layoutImportStatements.push(`import Layout${index} from "${relativePath}";`);
     }
+    const groupScope = _chunkIPXLADVOcjs.getRouteGroupScope.call(void 0, layout.pattern);
+    const groupFields = groupScope ? `, urlPattern: ${JSON.stringify(_chunkIPXLADVOcjs.stripRouteGroups.call(void 0, layout.pattern))}, groupScope: ${JSON.stringify(groupScope)}` : "";
     layoutRegistrations.push(
-      `  { pattern: ${JSON.stringify(layout.pattern)}, Component: ${layout.hasIsolatedClientBoundaries ? "null" : `Layout${index}`}, shouldHydrate: ${JSON.stringify(layout.shouldHydrate)}, islandStrategy: ${JSON.stringify(layout.islandStrategy)} }`
+      `  { pattern: ${JSON.stringify(layout.pattern)}${groupFields}, Component: ${layout.hasIsolatedClientBoundaries ? "null" : `Layout${index}`}, shouldHydrate: ${JSON.stringify(layout.shouldHydrate)}, islandStrategy: ${JSON.stringify(layout.islandStrategy)} }`
     );
   });
   const layoutImports = layoutImportStatements.join("\n");
@@ -3143,7 +3217,7 @@ function isFarmDocsPath() {
   return false;
 }
 `;
-  const docsAdapterRuntime = _chunk75WGQVQAcjs.generateFarmDocsAdapterClientRuntime.call(void 0, 
+  const docsAdapterRuntime = _chunkHITLGIAOcjs.generateFarmDocsAdapterClientRuntime.call(void 0, 
     docsAdapterReact,
     docsConfigModule
   );
@@ -3152,7 +3226,7 @@ function isFarmDocsPath() {
 // Farm.js Client Runtime (no client components)
 ${cssImport}
 ${layoutImports}
-import { createClientCancellation, createClientPluginManager, getHashTargetElement, installChunkErrorRecovery, isFarmExternalNavigationURL, reconcileFarmDocumentHead, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
+import { createClientCancellation, createClientPluginManager, 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}
@@ -3176,6 +3250,7 @@ ${generateUniversalRouterStateProperties()}
   
   navigate: async function(href, options = {}) {
     const url = new URL(href, window.location.href);
+    if (isFarmBlockedNavigationURL(url)) return;
     if (isFarmExternalNavigationURL(url, window.location.origin)) {
       this.cancelActiveNavigation();
       if (options.replace || options.action === "replace") window.location.replace(href);
@@ -3439,7 +3514,8 @@ document.addEventListener("click", function(e) {
     }
     const load = page.pageShouldHydrate ? `() => import(${JSON.stringify(toImportPath(page.modulePath))}).then((module) => module.default)` : "null";
     routeEntries.push(`  {
-    pattern: ${JSON.stringify(page.pattern)},
+    pattern: ${JSON.stringify(page.pattern)},${page.directory ? `
+    directory: ${JSON.stringify(page.directory)},` : ""}
     pageShouldHydrate: ${JSON.stringify(page.pageShouldHydrate)},
     ${page.hasIsolatedClientBoundaries ? "hasIsolatedClientBoundaries: true," : ""}
     islandStrategy: ${JSON.stringify(page.islandStrategy)},
@@ -3448,20 +3524,22 @@ document.addEventListener("click", function(e) {
   }`);
   });
   const isolatedHydrationEnabled = isolatedBoundaryModules.size > 0;
-  const isolatedHydrationImport = isolatedHydrationEnabled ? `import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph } from "@farm.js/core/internal/isolated-boundary";` : "";
+  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 isolatedHydrationRuntime = isolatedHydrationEnabled ? `const farmIsolatedBoundaryLoaders = {
 ${Array.from(isolatedBoundaryModules.entries()).map(
     ([reference, modulePath]) => `  ${JSON.stringify(reference)}: () => import(${JSON.stringify(modulePath)}),`
   ).join("\n")}
 };
+async function loadFarmIsolatedBoundary(reference) {
+  const loader = farmIsolatedBoundaryLoaders[reference];
+  if (!loader) throw new Error("isolated client boundary loader was not found: " + reference);
+  return loader();
+}
 const farmIsolatedHydrationRuntime = createFarmIsolatedHydrationRuntime({
   ReactRuntime: React,
   hydrateRoot,
-  load: async function(reference) {
-    const loader = farmIsolatedBoundaryLoaders[reference];
-    if (!loader) throw new Error("isolated client boundary loader was not found: " + reference);
-    return loader();
-  },
+  load: loadFarmIsolatedBoundary,
   schedule: scheduleFarmIslandHydration,
   wrap: wrapWithIntegrationProviders,
 });
@@ -3475,7 +3553,21 @@ function disposeFarmIsolatedClientBoundaries(scope) {
 
 async function hydrateFarmIsolatedClientBoundaries(scope = document, signal) {
   await farmIsolatedHydrationRuntime.hydrate(scope, signal);
-}` : "";
+}
+${serverTreeEnabled ? `
+// A server-tree page (an async page below a hydrating layout) rebuilds in the layout's root.
+async function createFarmServerTreePageElement(source, pathname) {
+  try {
+    return await createFarmServerTreeElement(React, source, {
+      load: loadFarmIsolatedBoundary,
+      ServerHtml: FarmServerPage,
+      key: pathname,
+    });
+  } catch (error) {
+    console.warn("[Farm.js] Could not rebuild the server tree of " + pathname + "; its server HTML was kept.", error);
+    return null;
+  }
+}` : "async function createFarmServerTreePageElement() { return null; }"}` : `async function createFarmServerTreePageElement() { return null; }`;
   const routeClientGraphRuntime = isolatedHydrationEnabled ? `function wrapFarmRouteClientGraph(element) {
   return wrapFarmIsolatedClientGraph(React, element);
 }` : `function wrapFarmRouteClientGraph(element) { return element; }`;
@@ -3499,7 +3591,7 @@ ${layoutImports}
 ${rendererClientImports}
 ${isolatedHydrationImport}
 ${providerClientCode.imports}
-import { createClientCancellation, createClientPluginManager, getHashTargetElement, installChunkErrorRecovery, isFarmExternalNavigationURL, reconcileFarmDocumentHead, scheduleFarmIslandHydration, searchParamsToObject, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
+import { createClientCancellation, createClientPluginManager, 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}
@@ -3542,11 +3634,24 @@ ${layoutRegistrations.join(",\n")}
 function getApplicableLayouts(pathname) {
   const applicable = [];
   const normalizedPath = getFarmRoutePathname(pathname).replace(/\\/$/, '') || '/';
+  let directory;
   
   for (const layout of layoutRoutes) {
-    if (layout.pattern === '/' || isFarmRouteActive(layout.pattern, normalizedPath, { exact: false })) {
-      applicable.push(layout);
+    // Route groups add no URL segment: match the layout's URL, then keep a
+    // grouped layout to the pages inside its group directory.
+    const urlPattern = layout.urlPattern || layout.pattern;
+    if (urlPattern !== '/' && !isFarmRouteActive(urlPattern, normalizedPath, { exact: false })) continue;
+    if (layout.groupScope) {
+      if (directory === undefined) {
+        const matched = matchRoute(pathname);
+        directory = matched ? matched.route.directory || matched.route.pattern : null;
+      }
+      if (
+        typeof directory !== 'string' ||
+        (directory !== layout.groupScope && !directory.startsWith(layout.groupScope + '/'))
+      ) continue;
     }
+    applicable.push(layout);
   }
   
   // Sort by depth (root first)
@@ -3565,7 +3670,7 @@ function hasHydratableLayout(pathname) {
   });
 }
 
-${_chunkIMB4PIARcjs.FARM_LAYOUT_ELEMENT_CLIENT_SOURCE}
+${_chunkICUQICNCcjs.FARM_LAYOUT_ELEMENT_CLIENT_SOURCE}
 // Wrap a page element with applicable layouts
 function wrapWithLayouts(pageElement, pathname, params) {
   const layouts = getApplicableLayouts(pathname);
@@ -3615,7 +3720,17 @@ async function loadRouteComponent(route) {
   return route.Component;
 }
 
-async function createMatchedHydrationRoute(matched, pathname, searchParams, serverHtml) {
+// The props the server rendered this document with, as the page receives them:
+// middleware data arrives as a plain object and is a Map again here.
+function reviveServerPageProps(serverProps) {
+  if (!serverProps || typeof serverProps !== "object") return {};
+  const middleware = serverProps.middleware;
+  return middleware && middleware.data && !(middleware.data instanceof Map)
+    ? { ...serverProps, middleware: { ...middleware, data: new Map(Object.entries(middleware.data)) } }
+    : serverProps;
+}
+
+async function createMatchedHydrationRoute(matched, pathname, searchParams, serverHtml, serverProps) {
   const hydrateLayouts = hasHydratableLayout(pathname);
   const params = matched.params;
   let pageElement = null;
@@ -3623,22 +3738,43 @@ async function createMatchedHydrationRoute(matched, pathname, searchParams, serv
   if (matched.route.pageShouldHydrate) {
     const Component = await loadRouteComponent(matched.route);
     if (!Component) return null;
-    if (typeof Component === "function" && Component.constructor && Component.constructor.name === "AsyncFunction") {
+    // A programmatic page whose guard and data run only on the server renders
+    // from the props the server resolved for this document. Without them (a
+    // rejected guard, deferred data) its server-rendered HTML is kept.
+    if (Component.__farmServerProps === true) {
+      if (!serverProps || serverProps.__farmRoutePropsResolved !== true) return null;
+      const props = {
+        ...reviveServerPageProps(serverProps),
+        searchParams: Promise.resolve(serverProps.search ?? searchParams),
+      };
+      pageElement = React.createElement(Component, props);
+    } else if (typeof Component === "function" && Component.constructor && Component.constructor.name === "AsyncFunction") {
       console.warn(
         "[Farm.js] Skipping hydration for " + pathname +
         ": async server components cannot run in the browser. Server-rendered HTML is preserved."
       );
       return null;
+    } else {
+      // Keep what the server rendered with, such as middleware data, so the
+      // first render matches the HTML. A navigation passes the fetched document's props.
+      const props = {
+        ...reviveServerPageProps(serverProps),
+        params: params,
+        searchParams: Promise.resolve(searchParams),
+      };
+      pageElement = React.createElement(Component, props);
     }
-    const props = { params: params, searchParams: Promise.resolve(searchParams) };
-    pageElement = React.createElement(Component, props);
   } else if (hydrateLayouts) {
     const serverPage = document.getElementById("__farm_page__");
-    pageElement = createLayoutPageBoundary(
-      matched.route,
-      null,
-      typeof serverHtml === "string" ? serverHtml : serverPage ? serverPage.innerHTML : "",
-    );
+    const pageSource = typeof serverHtml === "string" ? serverHtml : serverPage;
+    const serverTree = pageSource ? await createFarmServerTreePageElement(pageSource, pathname) : null;
+    pageElement = serverTree
+      ? createLayoutPageBoundary(matched.route, serverTree)
+      : createLayoutPageBoundary(
+          matched.route,
+          null,
+          typeof serverHtml === "string" ? serverHtml : serverPage ? serverPage.innerHTML : "",
+        );
   }
 
   if (!pageElement) return null;
@@ -3702,6 +3838,32 @@ function findClientRouteSlot(slot) {
   });
 }
 
+/**
+ * The page props a fetched document embeds in its bootstrap script, which a
+ * client navigation does not execute. The JSON ends at the first statement
+ * boundary where it parses, so the separator inside a string cannot cut it.
+ */
+function readPagePropsPayload(doc) {
+  const prefix = "window.__FARM_PROPS__=";
+  const separator = ";window.__FARM_INTEGRATION_API_MANIFEST__=";
+  for (const script of doc.querySelectorAll("script:not([src])")) {
+    const source = script.textContent || "";
+    if (!source.startsWith(prefix)) continue;
+    for (
+      let end = source.indexOf(separator, prefix.length);
+      end !== -1;
+      end = source.indexOf(separator, end + 1)
+    ) {
+      try {
+        return JSON.parse(source.slice(prefix.length, end));
+      } catch {
+        // The separator was inside a string value; try the next one.
+      }
+    }
+  }
+  return undefined;
+}
+
 function readRouteSlotPayload(doc) {
   const script = doc.getElementById("__farm_route_slots_data__");
   if (!script?.textContent) return [];
@@ -3898,6 +4060,8 @@ async function hydrate() {
           matched,
           pathname,
           searchParams,
+          undefined,
+          window.__FARM_PROPS__,
         );
         if (!routeState) return;
         const shouldHydrate = !isHydrated && Boolean(container.innerHTML.trim());
@@ -4012,6 +4176,7 @@ ${generateUniversalRouterStateProperties()}
   
   navigate: async function(href, options = {}) {
     const url = new URL(href, window.location.href);
+    if (isFarmBlockedNavigationURL(url)) return;
     if (isFarmExternalNavigationURL(url, window.location.origin)) {
       this.cancelActiveNavigation();
       if (options.replace || options.action === "replace") window.location.replace(href);
@@ -4244,6 +4409,7 @@ ${generateUniversalRouterStateProperties()}
     if (isFarmLocaleDocumentChange(doc)) return false;
     if (doc.getElementById("nd-docs-layout")) return false;
     const nextRouteSlots = readRouteSlotPayload(doc);
+    const nextPageProps = readPagePropsPayload(doc);
     const isNavigationCurrent = () =>
       this.isCurrentNavigation(navigation, clientNavigation);
     
@@ -4274,6 +4440,7 @@ ${generateUniversalRouterStateProperties()}
         newPathname,
         searchParams,
         nextPage ? nextPage.innerHTML : "",
+        nextPageProps,
       );
       if (!isNavigationCurrent()) return false;
       if (routeState) {
@@ -4309,6 +4476,8 @@ ${generateUniversalRouterStateProperties()}
         matched,
         newPathname,
         searchParams,
+        undefined,
+        nextPageProps,
       );
       if (!isNavigationCurrent()) return false;
       if (routeState) {
@@ -4480,7 +4649,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
       _path2.default.join(postcssConfigDir, "postcss.config.cjs"),
       "module.exports = { plugins: [] };\n"
     );
-    tailwindVitePlugin = await _chunkIMB4PIARcjs.loadTailwindVitePlugin.call(void 0, {
+    tailwindVitePlugin = await _chunkICUQICNCcjs.loadTailwindVitePlugin.call(void 0, {
       builder: productionVite.builder,
       label: "for SSR"
     });
@@ -4554,7 +4723,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
       modulePath: entry.modulePath
     })
   );
-  const i18nCatalogs = config.i18n.enabled ? (await _chunkIQXFRNY2cjs.readFarmI18nCatalogs.call(void 0, config.i18n)).catalogs : {};
+  const i18nCatalogs = config.i18n.enabled ? (await _chunkUFDAAQFXcjs.readFarmI18nCatalogs.call(void 0, config.i18n)).catalogs : {};
   const appDirs = _chunkVPTDD5XFcjs.getFarmAppDirectories.call(void 0, config);
   let openAPIReference = null;
   if (config.openapi.enabled && config.openapi.route) {
@@ -4576,7 +4745,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
   }
   const middlewareRoutes = await discoverMiddlewareRoutes(appDirs);
   const instrumentationPath = _chunkKCMTCM6Icjs.resolveFarmInstrumentationFile.call(void 0, root, config.srcDir || "src");
-  const notFoundPath = _chunkIMB4PIARcjs.resolveFarmNotFoundComponentPath.call(void 0, config, appDirs);
+  const notFoundPath = _chunkICUQICNCcjs.resolveFarmNotFoundComponentPath.call(void 0, config, appDirs);
   if (notFoundPath) _chunk5QIKR7RRcjs.logger.info(`\u{1F4CB} Found custom 404 page: ${notFoundPath}`);
   layoutRoutes.sort((a, b) => {
     const depthA = a.pattern.split("/").filter(Boolean).length;
@@ -4593,22 +4762,23 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
   const hasServerRuntimeIntegrations = configuredIntegrationValues.some(
     (integration) => typeof integration === "object" && integration !== null && (!("serverRuntime" in integration) || integration.serverRuntime !== false)
   );
-  const hasIntegrationProviders = _chunkZ5HIWVDPcjs.getIntegrationProviders.call(void 0, config.integrations).some(
+  const hasIntegrationProviders = _chunkFTFYRMQQcjs.getIntegrationProviders.call(void 0, config.integrations).some(
     (provider) => provider.component || provider.type === "clerk"
   );
   const hasObservabilityHandler = !!config.observability && typeof config.observability === "object" && "onEvent" in config.observability;
   const hasMdxComponentConfig = Boolean(_optionalChain([config, 'access', _56 => _56.mdx, 'optionalAccess', _57 => _57.components]));
   const hasMiddlewareConfig = hasFarmMiddlewareConfig(config.middleware);
-  const hasRouteContextConfig = _chunkDFLLARUKcjs.hasCustomFarmRouteContext.call(void 0, config);
+  const hasRouteContextConfig = _chunkF7JZENPFcjs.hasCustomFarmRouteContext.call(void 0, config);
   const hasServerRuntimePlugins = hasFarmServerRuntimePlugins(config);
   const hasPluginRoutes = hasFarmPluginRoutes(config);
-  const configModulePath = hasServerRuntimeIntegrations || hasObservabilityHandler || hasMdxComponentConfig || hasMiddlewareConfig || hasRouteContextConfig || hasServerRuntimePlugins || hasPluginRoutes || hasIntegrationProviders ? await findFarmConfigPath(root) : null;
+  const hasServerCacheConfig = hasFarmServerCacheConfig(config.cache);
+  const configModulePath = hasServerRuntimeIntegrations || hasObservabilityHandler || hasMdxComponentConfig || hasMiddlewareConfig || hasRouteContextConfig || hasServerRuntimePlugins || hasPluginRoutes || hasServerCacheConfig || hasIntegrationProviders ? await findFarmConfigPath(root) : null;
   const hasRuntimeConfigModule = hasFarmRuntimeConfigModule(config, configModulePath);
   const hasRuntimeIntegrationConfig = hasRuntimeConfigModule && hasAnyConfiguredIntegrations;
   const hasConfiguredRuntimePlugins = Boolean(
     hasRuntimeConfigModule && (config.plugins || []).length > 0
   );
-  const farmDocsPrecompiledManifest = _optionalChain([config, 'access', _58 => _58.docs, 'optionalAccess', _59 => _59.enabled]) && _chunkC5GUTBZKcjs.getFarmPresetRuntime.call(void 0, preset) === "edge" ? _optionalChain([config, 'access', _60 => _60.docs, 'access', _61 => _61.adapter, 'optionalAccess', _62 => _62.server]) ? await _chunkMXDTKXO6cjs.compileFarmDocsAdapterEdgeManifest.call(void 0, config.docs, {
+  const farmDocsPrecompiledManifest = _optionalChain([config, 'access', _58 => _58.docs, 'optionalAccess', _59 => _59.enabled]) && _chunkC5GUTBZKcjs.getFarmPresetRuntime.call(void 0, preset) === "edge" ? _optionalChain([config, 'access', _60 => _60.docs, 'access', _61 => _61.adapter, 'optionalAccess', _62 => _62.server]) ? await _chunk3UH7MRCPcjs.compileFarmDocsAdapterEdgeManifest.call(void 0, config.docs, {
     root,
     srcDir: config.srcDir,
     clientEntry: FARM_CLIENT_JS_SRC_PLACEHOLDER,
@@ -4758,7 +4928,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
         __FARM_PUBLIC_ENV__: JSON.stringify(_optionalChain([config, 'access', _68 => _68.env, 'optionalAccess', _69 => _69.public]) || {})
       },
       plugins: [
-        _chunkIMB4PIARcjs.createFarmThemeCssPlugin.call(void 0, config.theme, config.basePath),
+        _chunkICUQICNCcjs.createFarmThemeCssPlugin.call(void 0, config.theme, config.basePath),
         ...tailwindVitePlugin ? [tailwindVitePlugin] : [],
         ...rendererVitePlugins,
         ...config.vite.plugins || [],
@@ -4766,7 +4936,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
         { ...createReactProductionModePlugin(), enforce: "pre" },
         farmServerOnlyEntriesPlugin(),
         farmPlugin({ ...config, isolatedClientBoundaryModules }, pluginManager),
-        _chunk22GUSVNJcjs.farmEnvironmentFunctionsPlugin.call(void 0, ),
+        _chunk3SDFA7UFcjs.farmEnvironmentFunctionsPlugin.call(void 0, ),
         {
           name: "farm-virtual-ssr-entry",
           resolveId(id) {
@@ -4805,7 +4975,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
       resolve: {
         alias: [
           ...shouldAliasReactServerToWebBuild(config.renderer, preset) ? [createFarmReactWebServerAlias(hasReactDomEdgeServerBuild(root))] : [],
-          ...Object.entries(_chunkIMB4PIARcjs.createFarmSourceAlias.call(void 0, root, config.srcDir)).map(
+          ...Object.entries(_chunkICUQICNCcjs.createFarmSourceAlias.call(void 0, root, config.srcDir)).map(
             ([find, replacement]) => ({ find, replacement })
           )
         ],
@@ -4813,7 +4983,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
         dedupe: [...config.renderer.dedupe || []]
       }
     };
-    await viteBuild(_chunkIMB4PIARcjs.mergeFarmProductionViteConfig.call(void 0, serverViteConfig, config.vite));
+    await viteBuild(_chunkICUQICNCcjs.mergeFarmProductionViteConfig.call(void 0, serverViteConfig, config.vite));
   } finally {
     if (postcssConfigDir) {
       try {
@@ -4999,8 +5169,8 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, generateConfiguredResponseHeadersRuntimeSo
 function parseRouteRenderingDirectiveFromDisk(modulePath) {
   try {
     const source = _fs.readFileSync.call(void 0, modulePath, "utf8");
-    const directive = _chunkCTV2TTNPcjs.parseRouteRenderingDirective.call(void 0, source);
-    if (_chunkCTV2TTNPcjs.findRequestBoundSourceBlockers.call(void 0, source).length === 0) return directive;
+    const directive = _chunk3BHT4WMPcjs.parseRouteRenderingDirective.call(void 0, source);
+    if (_chunk3BHT4WMPcjs.findRequestBoundSourceBlockers.call(void 0, source).length === 0) return directive;
     return { ..._nullishCoalesce(directive, () => ( { ssg: false, ppr: false, directive: "" })), requestBound: true };
   } catch (e22) {
     return void 0;
@@ -5192,11 +5362,12 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   const servesAgentRobotsTxt = Boolean(_optionalChain([config, 'access', _76 => _76.agent, 'optionalAccess', _77 => _77.crawlers, 'optionalAccess', _78 => _78.enabled])) && !applicationMetadataRoutes.some(
     (metadata) => metadata.kind === "robots" && metadata.pattern === "/"
   );
+  const servesAiCatalog = _optionalChain([config, 'access', _79 => _79.agent, 'optionalAccess', _80 => _80.aiCatalog]) !== false;
   const hasPluginRuntime = hasRuntimeIntegrationConfig || hasServerRuntimePlugins;
   const hasInfraAnalyticsRuntime = config.analytics !== false && _chunk2SJ4RQ6Pcjs.resolveFarmInstrumentationRuntime.call(void 0, preset) === "nodejs";
   const hasPrecompiledDocs = Boolean(farmDocsPrecompiledManifest);
   const adapterOwnsDocsRuntime = Boolean(
-    _chunkPSV6XKPOcjs.isReactRenderer.call(void 0, config.renderer) && _optionalChain([config, 'access', _79 => _79.docs, 'optionalAccess', _80 => _80.enabled]) && _optionalChain([config, 'access', _81 => _81.docs, 'access', _82 => _82.adapter, 'optionalAccess', _83 => _83.server]) && config.docs.adapter.react
+    _chunkPSV6XKPOcjs.isReactRenderer.call(void 0, config.renderer) && _optionalChain([config, 'access', _81 => _81.docs, 'optionalAccess', _82 => _82.enabled]) && _optionalChain([config, 'access', _83 => _83.docs, 'access', _84 => _84.adapter, 'optionalAccess', _85 => _85.server]) && config.docs.adapter.react
   );
   const docsConfigModulePath = adapterOwnsDocsRuntime && !hasPrecompiledDocs && config.docs.configPath && !config.docs.configPath.endsWith(".json") ? config.docs.configPath : void 0;
   const hasIsolatedClientGraphRuntime = _chunkPSV6XKPOcjs.isReactRenderer.call(void 0, config.renderer) && isolatedClientBoundaryModules.size > 0;
@@ -5206,7 +5377,7 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   );
   const hasReactSyncRender = _chunkPSV6XKPOcjs.isReactRenderer.call(void 0, config.renderer);
   const rendererServerImports = _chunkPSV6XKPOcjs.isReactRenderer.call(void 0, 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";' : ""}` : `import React, * as ReactDOMServer from ${JSON.stringify(config.renderer.server)};${generateFarmRendererAppSetupServerCode(config)}`;
+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)}`;
   const routeClientGraphServerRuntime = hasIsolatedClientGraphRuntime ? `function wrapFarmRouteClientGraph(element) {
   return wrapFarmIsolatedClientGraph(React, element);
 }
@@ -5215,15 +5386,23 @@ import * as ReactDOMServer from "react-dom/server";${hasIsolatedClientGraphRunti
 // components render as their own islands instead of joining the layout's React tree.
 function isolateFarmRouteServerPage(element) {
   return isolateFarmServerPageGraph(React, 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 wrapFarmRouteClientGraph(element) { return element; }
 
-function isolateFarmRouteServerPage(element) { return element; }`;
+function isolateFarmRouteServerPage(element) { return element; }
+
+function renderFarmRouteServerTree(element) { return element; }`;
   const hasGeneratedMetadataImages = metadataImageRoutes.some(
     (image) => image.sourceType === "module"
   );
   const hasMiddlewareRuntime = middlewareRoutes.length > 0 || hasFarmMiddlewareConfig(config.middleware);
-  const farmDocsFontAssets = _optionalChain([config, 'access', _84 => _84.docs, 'optionalAccess', _85 => _85.enabled]) ? _chunkHREOKQWTcjs.toFarmDocsPublicFontAssets.call(void 0, _chunkHREOKQWTcjs.resolveFarmDocsFontAssets.call(void 0, config.root)) : [];
-  const integrationProviders = _chunkZ5HIWVDPcjs.getIntegrationProviders.call(void 0, config.integrations);
+  const farmDocsFontAssets = _optionalChain([config, 'access', _86 => _86.docs, 'optionalAccess', _87 => _87.enabled]) ? _chunkHREOKQWTcjs.toFarmDocsPublicFontAssets.call(void 0, _chunkHREOKQWTcjs.resolveFarmDocsFontAssets.call(void 0, config.root)) : [];
+  const integrationProviders = _chunkFTFYRMQQcjs.getIntegrationProviders.call(void 0, config.integrations);
   const renderedIntegrationProviders = integrationProviders.filter(
     (provider) => provider.component || provider.type === "clerk"
   );
@@ -5232,16 +5411,16 @@ function isolateFarmRouteServerPage(element) { return element; }`;
       `Integration provider components are not supported by the "${config.renderer.name}" renderer.`
     );
   }
-  const providerServerModules = _chunkIMB4PIARcjs.generateFarmIntegrationProviderServerModules.call(void 0, 
+  const providerServerModules = _chunkICUQICNCcjs.generateFarmIntegrationProviderServerModules.call(void 0, 
     renderedIntegrationProviders,
     config.root,
     _nullishCoalesce(config.renderer.componentExtensions, () => ( []))
   );
   const resolvedIntegrationProviderFallback = Object.fromEntries(
     Object.entries(config.integrations).flatMap(([name, integration]) => {
-      const configuredProviders = _optionalChain([integration, 'optionalAccess', _86 => _86.providers]);
+      const configuredProviders = _optionalChain([integration, 'optionalAccess', _88 => _88.providers]);
       const providers = Array.isArray(configuredProviders) ? configuredProviders : [];
-      if (providers.some((provider) => typeof _optionalChain([provider, 'optionalAccess', _87 => _87.component]) === "function")) {
+      if (providers.some((provider) => typeof _optionalChain([provider, 'optionalAccess', _89 => _89.component]) === "function")) {
         throw new Error(
           `Integration provider components in production must use an importable component reference, for example component: { module: "@/components/provider" }.`
         );
@@ -5252,18 +5431,17 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   const unsupportedIntegrationProvider = renderedIntegrationProviders.find(
     (provider) => provider.supportsIsolatedHydration !== true
   );
-  const isolatedHydrationMode = _chunkIMB4PIARcjs.resolveFarmIsolatedClientHydrationMode.call(void 0, 
-    _optionalChain([config, 'access', _88 => _88.experimental, 'optionalAccess', _89 => _89.isolatedClientHydration]),
+  const isolatedHydrationMode = _chunkICUQICNCcjs.resolveFarmIsolatedClientHydrationMode.call(void 0, 
+    _optionalChain([config, 'access', _90 => _90.experimental, 'optionalAccess', _91 => _91.isolatedClientHydration]),
     {
-      serverComponents: _optionalChain([config, 'access', _90 => _90.experimental, 'optionalAccess', _91 => _91.serverComponents]) === true,
+      serverComponents: _optionalChain([config, 'access', _92 => _92.experimental, 'optionalAccess', _93 => _93.serverComponents]) === true,
       hasUnsupportedIntegrationProvider: Boolean(unsupportedIntegrationProvider)
     }
   );
-  const hydrationPlanOptions = _chunkIMB4PIARcjs.getFarmClientHydrationPlanOptions.call(void 0, 
+  const hydrationPlanOptions = _chunkICUQICNCcjs.getFarmClientHydrationPlanOptions.call(void 0, 
     config.renderer,
     Boolean(unsupportedIntegrationProvider)
   );
-  const layoutAppliesToRoute = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (layoutPattern, routePattern) => layoutPattern === "/" || routePattern === layoutPattern || routePattern.startsWith(`${layoutPattern}/`), "layoutAppliesToRoute");
   const layoutHydrationPlans = layoutRoutes.map((layout) => ({
     ...layout,
     hydration: getCachedClientModuleHydrationPlan(
@@ -5274,7 +5452,7 @@ function isolateFarmRouteServerPage(element) { return element; }`;
       hydrationPlanOptions
     )
   }));
-  const markdownPagePlan = _chunkIMB4PIARcjs.createMarkdownPageHydrationPlanner.call(void 0, 
+  const markdownPagePlan = _chunkICUQICNCcjs.createMarkdownPageHydrationPlanner.call(void 0, 
     _chunkOHY2ZWUGcjs.resolveFarmMdxComponentsModulePath.call(void 0, _chunkOHY2ZWUGcjs.resolveMdxConfig.call(void 0, config.mdx), config.root),
     config.root,
     isolatedHydrationMode,
@@ -5283,7 +5461,7 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   const pageHydrationPlans = new Map(
     pageRoutes.map((route) => [
       route.modulePath,
-      _chunkX7KZBF63cjs.isFarmMarkdownPageFile.call(void 0, route.modulePath) ? markdownPagePlan() : getCachedClientModuleHydrationPlan(
+      _chunkEFCQPQMGcjs.isFarmMarkdownPageFile.call(void 0, route.modulePath) ? markdownPagePlan() : getCachedClientModuleHydrationPlan(
         route.modulePath,
         config.root,
         isolatedHydrationMode,
@@ -5292,18 +5470,19 @@ function isolateFarmRouteServerPage(element) { return element; }`;
       )
     ])
   );
-  _chunkIMB4PIARcjs.enforceFarmIsolatedHydrationRouteBudget.call(void 0, 
+  _chunkICUQICNCcjs.enforceFarmIsolatedHydrationRouteBudget.call(void 0, 
     layoutHydrationPlans.map((layout) => ({
       pattern: layout.pattern,
       depth: layout.pattern.split("/").filter(Boolean).length,
       metadata: layout.hydration
     })),
     pageRoutes.map((route) => ({
-      pattern: route.pattern,
-      depth: route.pattern.split("/").filter(Boolean).length,
+      // Compared by directory so a grouped layout applies only inside its group.
+      pattern: _nullishCoalesce(route.directory, () => ( route.pattern)),
+      depth: _chunkIPXLADVOcjs.getRouteDirectoryDepth.call(void 0, _nullishCoalesce(route.directory, () => ( route.pattern))),
       metadata: pageHydrationPlans.get(route.modulePath)
     })),
-    layoutAppliesToRoute
+    _chunkIPXLADVOcjs.routeBoundaryCoversDirectory
   );
   const providerServerImports = [
     providerServerModules.hasClerkProvider ? `import { ClerkProvider as FarmClerkProvider } from "@clerk/react";` : "",
@@ -5320,7 +5499,7 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     apiRegistrations.push(`
   {
     path: ${JSON.stringify(route.path)},
-    methods: ${JSON.stringify(route.methods.filter((method) => !_optionalChain([route, 'access', _92 => _92.pluginMethods, 'optionalAccess', _93 => _93.includes, 'call', _94 => _94(method)])))},
+    methods: ${JSON.stringify(route.methods.filter((method) => !_optionalChain([route, 'access', _94 => _94.pluginMethods, 'optionalAccess', _95 => _95.includes, 'call', _96 => _96(method)])))},
     endpoints: ${varName},
   }`);
   });
@@ -5333,10 +5512,11 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   }).map(({ route }) => route);
   orderedPageRoutes.forEach((route, index) => {
     const varName = `pageRoute${index}`;
-    if (_chunkX7KZBF63cjs.isFarmMarkdownPageFile.call(void 0, route.modulePath)) {
+    if (_chunkEFCQPQMGcjs.isFarmMarkdownPageFile.call(void 0, route.modulePath)) {
       pageRegistrations.push(`
   {
-    pattern: ${JSON.stringify(route.pattern)},
+    pattern: ${JSON.stringify(route.pattern)},${route.directory ? `
+    directory: ${JSON.stringify(route.directory)},` : ""}
     module: createFarmMarkdownRouteModule({
       source: ${JSON.stringify(_nullishCoalesce(route.source, () => ( "")))},
       filePath: ${JSON.stringify(toBakedMarkdownSourcePath(config.root, route.modulePath))},
@@ -5359,10 +5539,11 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     const renderingDirective = parseRouteRenderingDirectiveFromDisk(route.modulePath);
     pageRegistrations.push(`
   {
-    pattern: ${JSON.stringify(route.pattern)},
+    pattern: ${JSON.stringify(route.pattern)},${route.directory ? `
+    directory: ${JSON.stringify(route.directory)},` : ""}
     module: ${varName},
     shouldHydrate: ${JSON.stringify(clientMetadata.shouldHydrate)},
-    islandStrategy: ${JSON.stringify(clientMetadata.islandStrategy)},${renderingDirective ? `
+    islandStrategy: ${JSON.stringify(clientMetadata.islandStrategy)},${_chunkICUQICNCcjs.usesFarmServerTree.call(void 0, clientMetadata) ? "\n    serverTree: true," : ""}${renderingDirective ? `
     rendering: ${JSON.stringify(renderingDirective)},` : ""}
     ${route.source !== void 0 ? `markdownSource: {
       source: ${JSON.stringify(route.source)},
@@ -5403,7 +5584,8 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     routeSlotRegistrations.push(`
   {
     name: ${JSON.stringify(slot.name)},
-    ownerPattern: ${JSON.stringify(slot.ownerPattern)},
+    ownerPattern: ${JSON.stringify(slot.ownerPattern)},${slot.ownerDirectory ? `
+    ownerDirectory: ${JSON.stringify(slot.ownerDirectory)},` : ""}
     pattern: ${JSON.stringify(slot.pattern)},
     containerId: ${JSON.stringify(slot.containerId)},
     interception: ${JSON.stringify(slot.interception)},
@@ -5418,9 +5600,12 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     errorImports.push(
       `import * as ${varName} from ${toVirtualEntryImportSpecifier(errorRoute.modulePath)};`
     );
+    const groupScope = _chunkIPXLADVOcjs.getRouteGroupScope.call(void 0, errorRoute.pattern);
     errorRegistrations.push(`
   {
-    pattern: ${JSON.stringify(errorRoute.pattern)},
+    pattern: ${JSON.stringify(_chunkIPXLADVOcjs.stripRouteGroups.call(void 0, errorRoute.pattern))},${groupScope ? `
+    groupScope: ${JSON.stringify(groupScope)},
+    directoryDepth: ${_chunkIPXLADVOcjs.getRouteDirectoryDepth.call(void 0, errorRoute.pattern)},` : ""}
     module: ${varName},
   }`);
   });
@@ -5476,6 +5661,7 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   const notFoundImport = notFoundPath ? `import * as CustomNotFound from ${toVirtualEntryImportSpecifier(notFoundPath)};` : "";
   const apiRouteHelpersImport = apiRoutes.length > 0 ? `import { mergePluginAPIRoutes, getAllowedAPIRouteMethods, invokeAPIRouteEndpoint, createStaticAPIRouteMatcherAtBasePath, resolveAPIRouteEndpoint } from "@farm.js/core/api/runtime";` : "";
   const productionRuntimeImport = `import {
+  _getRequestReadCount,
   _runWithAfterRequest,
   _runWithCurrentRequest,
   _runWithAPIRequestRuntime,
@@ -5497,13 +5683,18 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   createDefaultErrorMarkup,
   createFarmInstrumentationLifecycle,
   createFarmLayoutSelector,
+  isInFarmRouteGroupScope,
   createFarmCacheKey,
   createFarmMetadataRouteResponse,
   createFarmAgentRobots,
+  createFarmAiCatalogResponse,
   createFarmApiCatalogResponse,
+  createFarmAppManifestResponse,
   collectFarmLlmsTxtPages,
   createFarmDefaultLlmsTxt,
   createFarmLlmsMarkdownReader,
+  listFarmMCPLlmsTxtLinks,
+  registerFarmMCPServer,
   renderFarmLlmsFullTxt,
   createFarmLlmsFullRenderer,
   createFarmThemeDocumentParts,
@@ -5524,6 +5715,9 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   mergeRouteRenderingDirectiveConfig,
   manageFarmLinkHeaderPreloads,
   mergeMetadata,
+  mergeModuleViewport,
+  ensureFarmDocumentMeta,
+  renderViewportHead,
   matchesFarmIfNoneMatch,
   normalizeRevalidatePath,
   reportFarmPreloadWarnings,
@@ -5553,25 +5747,25 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   const infraAnalyticsImport = hasInfraAnalyticsRuntime ? `import { ${hasPluginRuntime ? "createFarmInfraAnalyticsPlugin" : "createFarmInfraAnalyticsRecorder"} } from "@farm.js/core/internal/infra-analytics-runtime";` : "";
   const compressionRuntimeImport = hasCompressionRuntime ? `import { compressFarmResponse${hasPluginRuntime ? ", createCompressionPlugin" : ""} } from "@farm.js/core/internal/compression-runtime";` : "";
   const i18nServerImport = config.i18n.enabled ? `import { _runWithFarmI18nRequest, _setDefaultFarmI18nRuntime, createFarmI18nRuntime, getFarmI18nClientSnapshot } from "@farm.js/core/i18n/server";` : "";
-  const docsHandlerImport = _optionalChain([config, 'access', _95 => _95.docs, 'optionalAccess', _96 => _96.enabled]) ? hasPrecompiledDocs ? `import { createFarmDocsPrecompiledRuntime } from "@farm.js/core/internal/docs-precompiled-runtime";
+  const docsHandlerImport = _optionalChain([config, 'access', _97 => _97.docs, 'optionalAccess', _98 => _98.enabled]) ? hasPrecompiledDocs ? `import { createFarmDocsPrecompiledRuntime } from "@farm.js/core/internal/docs-precompiled-runtime";
 const isFarmDocsAPIRequest = (requestOrPathname) => {
   const pathname = typeof requestOrPathname === "string"
     ? requestOrPathname
     : new URL(requestOrPathname.url).pathname;
-  const apiPath = ${JSON.stringify(_optionalChain([farmDocsPrecompiledManifest, 'optionalAccess', _97 => _97.apiPath]) || "/api/docs")};
+  const apiPath = ${JSON.stringify(_optionalChain([farmDocsPrecompiledManifest, 'optionalAccess', _99 => _99.apiPath]) || "/api/docs")};
   return pathname === apiPath || pathname.startsWith(apiPath + "/");
 };` : adapterOwnsDocsRuntime ? `import { isFarmDocsAPIRequest } from "@farm.js/core/docs";
 import { createFarmDocsRuntimeHandler as createFarmDocsAdapterRuntimeHandler } from ${JSON.stringify(config.docs.adapter.server)};
 import * as FarmDocsAdapterReact from ${JSON.stringify(config.docs.adapter.react)};${docsConfigModulePath ? `
 import * as farmDocsConfigModule from ${toVirtualEntryImportSpecifier(docsConfigModulePath)};` : ""}` : `import { createFarmDocsAPIHandler, createFarmDocsHandler, isFarmDocsAPIRequest } from "@farm.js/core/docs";` : "";
-  const docsFontImport = _optionalChain([config, 'access', _98 => _98.docs, 'optionalAccess', _99 => _99.enabled]) && !hasPrecompiledDocs ? `import { resolveFarmLayoutFonts } from "@farm.js/core/font";` : "";
-  const docsRuntimeImport = _optionalChain([config, 'access', _100 => _100.docs, 'optionalAccess', _101 => _101.enabled]) && !hasPrecompiledDocs ? `import { existsSync as farmDocsExistsSync } from "node:fs";
+  const docsFontImport = _optionalChain([config, 'access', _100 => _100.docs, 'optionalAccess', _101 => _101.enabled]) && !hasPrecompiledDocs ? `import { resolveFarmLayoutFonts } from "@farm.js/core/font";` : "";
+  const docsRuntimeImport = _optionalChain([config, 'access', _102 => _102.docs, 'optionalAccess', _103 => _103.enabled]) && !hasPrecompiledDocs ? `import { existsSync as farmDocsExistsSync } from "node:fs";
 import { dirname as farmDocsDirname, join as farmDocsJoin } from "node:path";
 import { fileURLToPath as farmDocsFileURLToPath } from "node:url";` : "";
-  const markdownHandlerImport = _optionalChain([config, 'access', _102 => _102.md, 'optionalAccess', _103 => _103.enabled]) ? `import { applyMarkdownNegotiationHeaders, createMarkdownMirrorResponse, getFarmMarkdownAlternatePath } from "@farm.js/core/markdown";` : "";
-  const appMarkdownImport = hasMarkdownPages ? `import { createFarmMarkdownRouteModule, createFarmMarkdownSourceResponse } from "@farm.js/core/internal/app-markdown-runtime";` : "const createFarmMarkdownSourceResponse = null;";
+  const markdownHandlerImport = _optionalChain([config, 'access', _104 => _104.md, 'optionalAccess', _105 => _105.enabled]) ? `import { applyMarkdownNegotiationHeaders, createMarkdownMirrorResponse, getFarmMarkdownAlternatePath } from "@farm.js/core/markdown";` : "";
+  const appMarkdownImport = hasMarkdownPages ? `import { createFarmMarkdownRouteModule, createFarmMarkdownSourceResponse, isFarmMarkdownPublicSourceResponse } from "@farm.js/core/internal/app-markdown-runtime";` : "const createFarmMarkdownSourceResponse = null;\nconst isFarmMarkdownPublicSourceResponse = null;";
   const markdownErrorImport = `import { FARM_MARKDOWN_CONTENT_TYPE, createFarmMarkdownErrorBody, farmRequestWantsMarkdown } from "@farm.js/core/markdown";`;
-  const mdxComponentsPath = typeof _optionalChain([config, 'access', _104 => _104.mdx, 'optionalAccess', _105 => _105.components]) === "string" ? _path2.default.isAbsolute(config.mdx.components) ? config.mdx.components : _path2.default.join(config.root, config.mdx.components) : null;
+  const mdxComponentsPath = typeof _optionalChain([config, 'access', _106 => _106.mdx, 'optionalAccess', _107 => _107.components]) === "string" ? _path2.default.isAbsolute(config.mdx.components) ? config.mdx.components : _path2.default.join(config.root, config.mdx.components) : null;
   const mdxComponentsImport = mdxComponentsPath ? `import * as FarmMdxComponentsModule from ${toVirtualEntryImportSpecifier(mdxComponentsPath)};` : "";
   const layerConfigPaths = (config.layers || []).map((layer) => layer.configFile).filter((configFile) => Boolean(configFile)).filter((configFile) => configFile !== configModulePath);
   const layerConfigImports = layerConfigPaths.map(
@@ -5776,7 +5970,7 @@ const farmResolvedRuntimeConfig = Object.assign({}, ...farmRuntimeConfigs);
 
 function FarmDefault404Page() {
   return React.createElement(React.Fragment, null,
-    React.createElement("style", null, ${JSON.stringify(_chunkIMB4PIARcjs.DEFAULT_NOT_FOUND_STYLES)}),
+    React.createElement("style", null, ${JSON.stringify(_chunkICUQICNCcjs.DEFAULT_NOT_FOUND_STYLES)}),
     React.createElement("main", {
       className: "farm-default-not-found",
       "aria-labelledby": "farm-default-not-found-title",
@@ -5904,14 +6098,14 @@ const farmImageHandler = ${imageRuntime === "none" ? "null" : imageRuntime === "
   onError(error) { console.error("[Farm Image]", error); },
 })`};
 const farmMarkdownConfig = ${JSON.stringify(config.md)};
-const farmLlmsTxtConfig = ${JSON.stringify(_nullishCoalesce(_optionalChain([config, 'access', _106 => _106.agent, 'optionalAccess', _107 => _107.llmsTxt]), () => ( { enabled: false, include: [], exclude: [] })))};
-${_optionalChain([config, 'access', _108 => _108.agent, 'optionalAccess', _109 => _109.llmsTxt, 'optionalAccess', _110 => _110.enabled]) ? "const farmLlmsFullRenderer = createFarmLlmsFullRenderer({ revalidate: farmLlmsTxtConfig.revalidate });\n" : ""}${servesAgentRobotsTxt ? `const farmAgentCrawlers = ${JSON.stringify(config.agent.crawlers)};` : ""}
+const farmLlmsTxtConfig = ${JSON.stringify(_nullishCoalesce(_optionalChain([config, 'access', _108 => _108.agent, 'optionalAccess', _109 => _109.llmsTxt]), () => ( { enabled: false, include: [], exclude: [] })))};
+${_optionalChain([config, 'access', _110 => _110.agent, 'optionalAccess', _111 => _111.llmsTxt, 'optionalAccess', _112 => _112.enabled]) ? "const farmLlmsFullRenderer = createFarmLlmsFullRenderer({ revalidate: farmLlmsTxtConfig.revalidate });\n" : ""}${servesAgentRobotsTxt ? `const farmAgentCrawlers = ${JSON.stringify(config.agent.crawlers)};` : ""}
 const farmMdxConfig = ${JSON.stringify({
     ...config.mdx,
-    components: typeof _optionalChain([config, 'access', _111 => _111.mdx, 'optionalAccess', _112 => _112.components]) === "string" ? config.mdx.components : void 0
+    components: typeof _optionalChain([config, 'access', _113 => _113.mdx, 'optionalAccess', _114 => _114.components]) === "string" ? config.mdx.components : void 0
   })};
 const configuredFarmMdxComponents = farmUserConfig?.mdx?.components;
-${_optionalChain([config, 'access', _113 => _113.agent, 'optionalAccess', _114 => _114.noindexPreviews]) ? `// agent.noindexPreviews: the runtime environment decides, falling back to the
+${_optionalChain([config, 'access', _115 => _115.agent, 'optionalAccess', _116 => _116.noindexPreviews]) ? `// agent.noindexPreviews: the runtime environment decides, falling back to the
 // environment this was built in, since Netlify exposes its deploy context only
 // to the build.
 const farmNoindexPreview = resolveFarmPreviewDeployment(
@@ -5959,7 +6153,7 @@ export const farmProductionLifecycle = createFarmProductionLifecycle({
 });
 const farmI18nRuntime = ${config.i18n.enabled ? `createFarmI18nRuntime(farmI18nConfig, ${JSON.stringify(i18nCatalogs)})` : "null"};
 ${config.i18n.enabled ? "_setDefaultFarmI18nRuntime(farmI18nRuntime);" : ""}
-const farmDocsBundledContentDir = ${_optionalChain([config, 'access', _115 => _115.docs, 'optionalAccess', _116 => _116.enabled]) && !hasPrecompiledDocs ? `(() => {
+const farmDocsBundledContentDir = ${_optionalChain([config, 'access', _117 => _117.docs, 'optionalAccess', _118 => _118.enabled]) && !hasPrecompiledDocs ? `(() => {
   try {
     const currentDir = farmDocsDirname(farmDocsFileURLToPath(import.meta.url));
     const candidates = [
@@ -5980,7 +6174,7 @@ globalThis.__FARM_DOCS_RUNTIME_CONFIG__ = {
   docs: farmDocsResolvedConfig,
 };
 const farmDocsPrecompiledRuntime = ${hasPrecompiledDocs ? `createFarmDocsPrecompiledRuntime(${JSON.stringify(farmDocsPrecompiledManifest)})` : "null"};
-const farmDocsHandler = ${_optionalChain([config, 'access', _117 => _117.docs, 'optionalAccess', _118 => _118.enabled]) ? hasPrecompiledDocs ? "farmDocsPrecompiledRuntime.handleDocsRequest" : adapterOwnsDocsRuntime ? `createFarmDocsAdapterRuntimeHandler({
+const farmDocsHandler = ${_optionalChain([config, 'access', _119 => _119.docs, 'optionalAccess', _120 => _120.enabled]) ? hasPrecompiledDocs ? "farmDocsPrecompiledRuntime.handleDocsRequest" : adapterOwnsDocsRuntime ? `createFarmDocsAdapterRuntimeHandler({
   ${docsConfigModulePath ? "...(farmDocsConfigModule.default || farmDocsConfigModule),\n  ...farmDocsResolvedConfig.configOverrides," : "...farmDocsResolvedConfig.config,"}
   entry: farmDocsResolvedConfig.config?.entry || String(farmDocsResolvedConfig.entry || "/docs").replace(/^\\/+|\\/+$/g, "") || "docs",
   docsPath: farmDocsResolvedConfig.entry,
@@ -5999,6 +6193,8 @@ const farmDocsHandler = ${_optionalChain([config, 'access', _117 => _117.docs, '
       getApplicableLayouts(getFarmRoutePathname(pathname)).map((layout) => layout.module),
     ),
   loadReactModule: async () => FarmDocsAdapterReact,
+  // Lists the docs MCP endpoint in /.well-known/ai-catalog.json for the server's lifetime.
+  registerMCPServer: registerFarmMCPServer,
 })` : `createFarmDocsHandler(farmDocsResolvedConfig, {
   root: farmDocsRuntimeRoot,
   srcDir: ${JSON.stringify(config.srcDir)},
@@ -6011,14 +6207,21 @@ const farmDocsHandler = ${_optionalChain([config, 'access', _117 => _117.docs, '
   fontStylesheetHref: "/farm-fonts.css",
   globalStylesheetHref: "/assets/globals.css",
 })` : "null"};
-const farmDocsAPIHandler = ${_optionalChain([config, 'access', _119 => _119.docs, 'optionalAccess', _120 => _120.enabled]) ? hasPrecompiledDocs ? "farmDocsPrecompiledRuntime.handleAPIRequest" : adapterOwnsDocsRuntime ? "null" : `createFarmDocsAPIHandler({ rootDir: farmDocsRuntimeRoot, srcDir: ${JSON.stringify(config.srcDir)}, docs: farmDocsResolvedConfig })` : "null"};
+const farmDocsAPIHandler = ${_optionalChain([config, 'access', _121 => _121.docs, 'optionalAccess', _122 => _122.enabled]) ? hasPrecompiledDocs ? "farmDocsPrecompiledRuntime.handleAPIRequest" : adapterOwnsDocsRuntime ? "null" : `createFarmDocsAPIHandler({ rootDir: farmDocsRuntimeRoot, srcDir: ${JSON.stringify(config.srcDir)}, docs: farmDocsResolvedConfig })` : "null"};
 
 // API routes bundled at build time
 const apiRoutes = ${apiRoutes.length > 0 ? "mergePluginAPIRoutes(" : ""}[${apiRegistrations.join(",")}
-]${apiRoutes.length > 0 ? `, configuredPlugins, ${JSON.stringify(apiRoutes.map(({ path: path7, methods }) => ({ path: path7, methods })))}, { bodySizeLimit: ${JSON.stringify(config.server.bodySizeLimit)} })` : ""};
-const farmLocalAPIBasePath = ${JSON.stringify(_chunkWPYFSQKKcjs.resolveFarmAPIServerBasePath.call(void 0, config.api))};
+]${apiRoutes.length > 0 ? `, configuredPlugins, ${JSON.stringify(apiRoutes.map(({ path: path8, methods }) => ({ path: path8, methods })))}, { bodySizeLimit: ${JSON.stringify(config.server.bodySizeLimit)} })` : ""};
+const farmLocalAPIBasePath = ${JSON.stringify(_chunkKNBBQHO2cjs.resolveFarmAPIServerBasePath.call(void 0, config.api))};
 const farmOpenAPIReference = ${JSON.stringify(openAPIReference)};
-${_optionalChain([config, 'access', _121 => _121.agent, 'optionalAccess', _122 => _122.apiCatalog]) ? `const farmApiCatalogInput = ${JSON.stringify(_chunkYVGAEAA5cjs.resolveFarmApiCatalogInput.call(void 0, config))};
+${_optionalChain([config, 'access', _123 => _123.agent, 'optionalAccess', _124 => _124.apiCatalog]) ? `const farmApiCatalogInput = ${JSON.stringify(_chunkIPXLADVOcjs.resolveFarmApiCatalogInput.call(void 0, config))};
+` : ""}${config.analytics !== false ? `const farmAppManifestInput = ${JSON.stringify(
+    _chunkIPXLADVOcjs.resolveFarmAppManifestInput.call(void 0, config, {
+      build: config.deploymentId,
+      packages: _chunkICUQICNCcjs.resolveFarmAppPackages.call(void 0, config.root),
+      webmcpTools: config.plugins.some(({ name }) => name === "farm:webmcp") ? _chunkICUQICNCcjs.collectFarmWebMCPTools.call(void 0, config.root, config.srcDir) : []
+    })
+  )};
 ` : ""}
 function isFarmLocalAPIPathname(pathname) {
   return farmLocalAPIBasePath !== "/" &&
@@ -6044,7 +6247,7 @@ for (const route of pageRoutes) {
 // Layout routes bundled at build time (sorted by depth, root first)
 const layoutRoutes = [${layoutRegistrations.join(",")}
 ];
-const selectApplicableLayouts = createFarmLayoutSelector(layoutRoutes);
+const selectApplicableLayouts = createFarmLayoutSelector(layoutRoutes, getMatchedPageDirectory);
 
 const routeSlots = [${routeSlotRegistrations.join(",")}
 ];
@@ -6087,9 +6290,12 @@ function getFarmI18nSnapshot() {
   return ${config.i18n.enabled ? "getFarmI18nClientSnapshot()" : "undefined"};
 }
 
+// The locale step strips farmI18nConfig.basePath itself. Stripping it first as
+// well removed it twice, so /console/console/secret served /secret while
+// middleware and integration guards, which strip it once, saw /console/secret.
 function getFarmRoutePathname(pathname) {
   return farmI18nRuntime
-    ? stripFarmLocaleFromPathname(stripFarmBasePath(pathname), farmI18nConfig)
+    ? stripFarmLocaleFromPathname(pathname, farmI18nConfig)
     : stripFarmBasePath(pathname);
 }
 
@@ -6458,7 +6664,7 @@ function peelFarmDocumentPrefix(markup) {
   let inner = markup.replace(/^\\s+/, "");
   let hoisted = "";
   const wrapper = /^<div\\b[^>]*style=["']display\\s*:\\s*contents["'][^>]*>/i;
-  const hoistable = /${_chunkIMB4PIARcjs.HOISTED_HEAD_ELEMENT.source}/i;
+  const hoistable = /${_chunkIPXLADVOcjs.HOISTED_HEAD_ELEMENT.source}/i;
   let match;
   while ((match = wrapper.exec(inner) || hoistable.exec(inner))) {
     if (!/^<div/i.test(match[0])) hoisted += match[0];
@@ -6690,6 +6896,7 @@ ${generateRuntimePathMatcherSource()}
 function getMatchingErrorBoundary(pathname) {
   const pathSegments = splitRuntimePath(pathname);
   let bestMatch = null;
+  let directory;
 
   for (const errorRoute of errorRoutes) {
     const patternDepth = splitRuntimePath(errorRoute.pattern).length;
@@ -6699,9 +6906,18 @@ function getMatchingErrorBoundary(pathname) {
       : "/" + pathSegments.slice(0, patternDepth).join("/");
     const params = matchRuntimePathPattern(errorRoute.pattern, candidatePath);
     if (params === null) continue;
+    if (errorRoute.groupScope) {
+      if (directory === undefined) directory = getMatchedPageDirectory(pathname);
+      if (!isInFarmRouteGroupScope(directory, errorRoute.groupScope)) continue;
+    }
 
-    if (!bestMatch || patternDepth > bestMatch.depth) {
-      bestMatch = { route: errorRoute, params, depth: patternDepth };
+    const directoryDepth = errorRoute.directoryDepth ?? patternDepth;
+    if (
+      !bestMatch ||
+      patternDepth > bestMatch.depth ||
+      (patternDepth === bestMatch.depth && directoryDepth > bestMatch.directoryDepth)
+    ) {
+      bestMatch = { route: errorRoute, params, depth: patternDepth, directoryDepth };
     }
   }
 
@@ -6925,6 +7141,10 @@ function createFarmLlmsTxtContext(request, full) {
       pages,
       config: farmLlmsTxtConfig,
       rootMetadata: rootLayout && rootLayout.module && rootLayout.module.metadata,
+      ${servesAiCatalog ? `mcp: listFarmMCPLlmsTxtLinks(origin, {
+        basePath: ${JSON.stringify(config.basePath)},
+        apiServerBasePath: farmLocalAPIBasePath,
+      }),` : ""}
     }),
     // llms-full.txt reads each page's .md mirror through this same handler,
     // with a fresh request so the caller's cookies never shape its content.
@@ -7031,6 +7251,7 @@ const farmMiddlewareRunner = ${hasMiddlewareRuntime ? `createProductionMiddlewar
   modules: fileMiddlewareModules,
   i18n: farmI18nConfig,
   server: farmServerConfig,
+  apiBasePath: farmLocalAPIBasePath,
 })` : "null"};
 
 ${apiHandlerCode}
@@ -7167,7 +7388,7 @@ function hasLocalRequestRoute(request, routePathname) {
   if (${imageRuntime === "none" ? "false" : `pathname === ${JSON.stringify(config.images.path)}`}) {
     return true;
   }
-  ${_optionalChain([config, 'access', _123 => _123.docs, 'optionalAccess', _124 => _124.enabled]) ? `const docsPath = normalizeRuntimePath(farmDocsResolvedConfig?.entry || "/docs");
+  ${_optionalChain([config, 'access', _125 => _125.docs, 'optionalAccess', _126 => _126.enabled]) ? `const docsPath = normalizeRuntimePath(farmDocsResolvedConfig?.entry || "/docs");
   if (
     isFarmDocsAPIRequest(pathname) ||
     docsPath === "/" ||
@@ -7193,7 +7414,7 @@ function getFarmPluginRequestOptions(request) {
       route: { ...route, pattern: normalizeRuntimePath(farmOpenAPIReference.route) },
     };
   }
-  const isDocsAPIRequest = ${_optionalChain([config, 'access', _125 => _125.docs, 'optionalAccess', _126 => _126.enabled]) ? "isFarmDocsAPIRequest(pathname)" : "false"};
+  const isDocsAPIRequest = ${_optionalChain([config, 'access', _127 => _127.docs, 'optionalAccess', _128 => _128.enabled]) ? "isFarmDocsAPIRequest(pathname)" : "false"};
   const integrationMatch = ${hasServerRuntimeIntegrations ? `matchIntegrationRoute(serverRuntimeIntegrations, {
     pathname,
     method: request.method,
@@ -7273,17 +7494,24 @@ function getFarmPluginRequestOptions(request) {
   return { kind: "request", route };
 }
 
+/** The directory of the page a pathname selects, or null; route groups confine layouts to it. */
+function getMatchedPageDirectory(pathname) {
+  const match = matchPageRoute(pathname);
+  return match ? match.route.directory || match.route.pattern : null;
+}
+
 /**
- * Get applicable layouts for a page path (from root to most specific)
+ * Get applicable layouts for a page path (from root to most specific). Pass the
+ * selected page's directory when it is known, or null when no page applies.
  */
-function getApplicableLayouts(pathname) {
-  const applicable = selectApplicableLayouts(pathname);
+function getApplicableLayouts(pathname, directory) {
+  const applicable = selectApplicableLayouts(pathname, directory);
   // buildSSRInMemory already emits these immutable descriptors in stable depth
   // order. Filtering preserves that order, including equal-depth ties.
   return applicable;
 }
 
-${_optionalChain([config, 'access', _127 => _127.docs, 'optionalAccess', _128 => _128.enabled]) ? `async function wrapFarmDocsResponseWithLayouts(request, response) {
+${_optionalChain([config, 'access', _129 => _129.docs, 'optionalAccess', _130 => _130.enabled]) ? `async function wrapFarmDocsResponseWithLayouts(request, response) {
   if (request.method === "HEAD") return response;
   if (response.headers.get("x-farm-docs-adapter")) return response;
 
@@ -7390,7 +7618,7 @@ ${_optionalChain([config, 'access', _127 => _127.docs, 'optionalAccess', _128 =>
 }` : ""}
 
 const pprShellCache = getFarmDataCache();
-const experimentalPPREnabled = ${JSON.stringify(_optionalChain([config, 'access', _129 => _129.experimental, 'optionalAccess', _130 => _130.ppr]) === true)};
+const experimentalPPREnabled = ${JSON.stringify(_optionalChain([config, 'access', _131 => _131.experimental, 'optionalAccess', _132 => _132.ppr]) === true)};
 
 function resolveRouteRenderingView(route) {
   // The same merge development uses: baked directive config under the
@@ -7451,6 +7679,12 @@ function getPPRHeaders(status, config) {
   return headers;
 }
 
+function hasFarmUnserializableRouteData(data) {
+  const isPromise = (value) => Boolean(value) && typeof value.then === "function";
+  if (isPromise(data)) return true;
+  return Boolean(data) && typeof data === "object" && Object.values(data).some(isPromise);
+}
+
 function getRouteSharedCacheControl(route, pprCanCache) {
   if (!route || !route.module) {
     return null;
@@ -7513,7 +7747,7 @@ async function handleFarmRequest(request, adapterContext) {
     },
     { redirect: !isFarmLocalAPIPathname(requestUrl.pathname) }
   )` : "handleFarmRequestInContext(request, null, false, Date.now(), adapterContext, requestUrl)"};
-  ${_optionalChain([config, 'access', _131 => _131.md, 'optionalAccess', _132 => _132.enabled]) ? `const pathname = getFarmRoutePathname(requestUrl.pathname);
+  ${_optionalChain([config, 'access', _133 => _133.md, 'optionalAccess', _134 => _134.enabled]) ? `const pathname = getFarmRoutePathname(requestUrl.pathname);
   if (matchPageRoute(pathname)) {
     // The Link header advertises the public .md URL, like the head alternate.
     return applyMarkdownNegotiationHeaders(response, {
@@ -7632,7 +7866,21 @@ async function handleFarmRequestInContext(
   const middlewareHeaders = ${hasServerRuntimeIntegrations ? "withFarmIntegrationSetCookies(undefined, farmIntegrationSetCookies)" : "undefined"};
   `}
 
-  ${_optionalChain([config, 'access', _133 => _133.docs, 'optionalAccess', _134 => _134.enabled]) ? `
+  ${servesAiCatalog ? `
+  // agent.aiCatalog: the AI catalog of MCP servers and each server's card. Cards
+  // live below the MCP endpoint, so this answers before the docs runtime and the
+  // API routes, as in dev.
+  const farmAiCatalogResponse = createFarmAiCatalogResponse(
+    request,
+    { basePath: ${JSON.stringify(config.basePath)}, apiServerBasePath: farmLocalAPIBasePath },
+    url,
+  );
+  if (farmAiCatalogResponse) {
+    return applyProductionMiddlewareHeaders(farmAiCatalogResponse, middlewareHeaders);
+  }
+  ` : ""}
+
+  ${_optionalChain([config, 'access', _135 => _135.docs, 'optionalAccess', _136 => _136.enabled]) ? `
   // Docs responses are served after app middleware so route guards and
   // middleware headers apply to the docs engine like any other page content.
   // An app's own llms.txt, llms-full.txt, sitemap.xml, and robots.txt take
@@ -7663,7 +7911,8 @@ async function handleFarmRequestInContext(
 
   ${hasMarkdownPages ? `
   // The raw markdown source of a page route is the page's content in another
-  // representation; middleware guarding the route must run before serving it.
+  // representation; it is only served for a page an anonymous visitor may open,
+  // which renderPage asks the app with the page's own path.
   const markdownSourceResponse = await createFarmMarkdownSourceResponse?.({
     request: cloneFarmRequestWithContext(request),
     config: farmMdxConfig,
@@ -7671,13 +7920,16 @@ async function handleFarmRequestInContext(
       const match = matchPageRoute(getFarmRoutePathname(targetPathname));
       return match?.route?.markdownSource || null;
     },
+    renderPage: (targetRequest) => handleFarmRequest(targetRequest, adapterContext),
   });
   if (markdownSourceResponse) {
-    return applyProductionMiddlewareHeaders(markdownSourceResponse, middlewareHeaders);
+    return isFarmMarkdownPublicSourceResponse(markdownSourceResponse)
+      ? markdownSourceResponse
+      : applyProductionMiddlewareHeaders(markdownSourceResponse, middlewareHeaders);
   }
   ` : ""}
 
-  ${_optionalChain([config, 'access', _135 => _135.md, 'optionalAccess', _136 => _136.enabled]) ? `
+  ${_optionalChain([config, 'access', _137 => _137.md, 'optionalAccess', _138 => _138.enabled]) ? `
   if (farmMarkdownConfig?.enabled) {
     const markdownResponse = await createMarkdownMirrorResponse({
       // The mirror helper only reads metadata and creates its own GET request.
@@ -7776,9 +8028,20 @@ async function handleFarmRequestInContext(
     return applyProductionMiddlewareHeaders(applicationMetadataResponse, middlewareHeaders);
   }
   ` : ""}
-  ${_optionalChain([config, 'access', _137 => _137.agent, 'optionalAccess', _138 => _138.apiCatalog]) ? `
+  ${config.analytics !== false ? `
+  // /.well-known/farmjs: the app's manifest, only for a request Farm Infra signed.
+  if (normalizeRuntimePath(routePathname) === ${JSON.stringify(_chunkIPXLADVOcjs.FARM_APP_MANIFEST_PATH)}) {
+    const farmAppManifest = await createFarmAppManifestResponse(request, farmAppManifestInput, {
+      development: false,
+    });
+    if (farmAppManifest) {
+      return applyProductionMiddlewareHeaders(farmAppManifest, middlewareHeaders);
+    }
+  }
+  ` : ""}
+  ${_optionalChain([config, 'access', _139 => _139.agent, 'optionalAccess', _140 => _140.apiCatalog]) ? `
   // agent.apiCatalog: list the OpenAPI and MCP surfaces at the RFC 9727 path.
-  if (normalizeRuntimePath(routePathname) === ${JSON.stringify(_chunkYVGAEAA5cjs.FARM_API_CATALOG_PATH)}) {
+  if (normalizeRuntimePath(routePathname) === ${JSON.stringify(_chunkIPXLADVOcjs.FARM_API_CATALOG_PATH)}) {
     return applyProductionMiddlewareHeaders(
       createFarmApiCatalogResponse(request.method, farmApiCatalogInput, request),
       middlewareHeaders,
@@ -7794,11 +8057,11 @@ async function handleFarmRequestInContext(
     );
   }
   ` : ""}
-  ${_optionalChain([config, 'access', _139 => _139.agent, 'optionalAccess', _140 => _140.llmsTxt, 'optionalAccess', _141 => _141.enabled]) ? `
+  ${_optionalChain([config, 'access', _141 => _141.agent, 'optionalAccess', _142 => _142.llmsTxt, 'optionalAccess', _143 => _143.enabled]) ? `
   // agent.llmsTxt with no llms.ts or llms-full.ts: serve the generated files.
   const farmGeneratedLlmsKind = normalizeRuntimePath(routePathname) === "/llms.txt"
     ? "llms"
-    : ${_optionalChain([config, 'access', _142 => _142.agent, 'optionalAccess', _143 => _143.llmsTxt, 'optionalAccess', _144 => _144.full]) ? `normalizeRuntimePath(routePathname) === "/llms-full.txt" ? "llms-full" : ` : ""}null;
+    : ${_optionalChain([config, 'access', _144 => _144.agent, 'optionalAccess', _145 => _145.llmsTxt, 'optionalAccess', _146 => _146.full]) ? `normalizeRuntimePath(routePathname) === "/llms-full.txt" ? "llms-full" : ` : ""}null;
   if (farmGeneratedLlmsKind) {
     const llmsContext = createFarmLlmsTxtContext(request, farmGeneratedLlmsKind === "llms-full");
     const llmsOrigin = new URL(request.url).origin;
@@ -7833,7 +8096,7 @@ async function handleFarmRequestInContext(
   }
   ` : ""}
 
-  ${_optionalChain([config, 'access', _145 => _145.docs, 'optionalAccess', _146 => _146.enabled]) ? `if (farmDocsAPIHandler && isFarmDocsAPIRequest(pathname)) {
+  ${_optionalChain([config, 'access', _147 => _147.docs, 'optionalAccess', _148 => _148.enabled]) ? `if (farmDocsAPIHandler && isFarmDocsAPIRequest(pathname)) {
     const docsAPIResponse = await farmDocsAPIHandler(cloneFarmRequestWithContext(request));
     if (docsAPIResponse) {
       return applyProductionMiddlewareHeaders(docsAPIResponse, middlewareHeaders);
@@ -7914,13 +8177,19 @@ async function handleFarmRequestInContext(
         emitFarmEvent({ type: "ppr.shell.miss", route: pathname, key: pprCacheKey });
       }
 
+      // Reads from here on belong to the page render, not to middleware.
+      const requestReadsBeforeRender = _getRequestReadCount();
+
       // Get the page component and metadata
       let PageComponent = route.module.default;
       let pageStatus = 200;
       const pageMetadata = route.module.metadata || {};
       
       // Get applicable layouts for this page
-      const applicableLayouts = getApplicableLayouts(routePathname);
+      const applicableLayouts = getApplicableLayouts(
+        routePathname,
+        route.directory || route.pattern,
+      );
       const shouldHydrateLayout = applicableLayouts.some(
         (layout) => layout.shouldHydrate === true,
       );
@@ -7973,6 +8242,10 @@ async function handleFarmRequestInContext(
           });
         }
         let pageProps;
+        // A rejected guard or loader renders the route's notFound/error
+        // component, and the route's generateMetadata must not run for it:
+        // it would describe the resource the caller was refused.
+        let routeStateRejected = false;
         try {
           // Resolve top-level route state before starting the HTTP stream so
           // redirects, notFound(), and failures keep their real status. Route
@@ -8007,6 +8280,7 @@ async function handleFarmRequestInContext(
         } catch (routeStateError) {
           if (isFarmRedirectError(routeStateError)) throw routeStateError;
 
+          routeStateRejected = true;
           const routeComponents = route.module.__farmRouteComponents;
           const routeStateProps = {
             ...rawPageProps,
@@ -8096,7 +8370,9 @@ async function handleFarmRequestInContext(
           ...(pageProps.__farmCanonicalPath
             ? { __farmCanonicalPath: pageProps.__farmCanonicalPath }
             : {}),
-          ...(pageProps.__farmRoutePropsResolved
+          // Deferred values do not survive JSON, so the browser cannot render
+          // a page from these props while one is still in flight.
+          ...(pageProps.__farmRoutePropsResolved && !hasFarmUnserializableRouteData(pageProps.data)
             ? { __farmRoutePropsResolved: true }
             : {}),
           path: pathname,
@@ -8146,7 +8422,9 @@ async function handleFarmRequestInContext(
             if (route.shouldHydrate && !shouldHydrateLayout) {
               pageElement = wrapFarmRouteClientGraph(pageElement);
             } else if (shouldHydrateLayout && !route.shouldHydrate) {
-              pageElement = isolateFarmRouteServerPage(pageElement);
+              pageElement = route.serverTree
+                ? await renderFarmRouteServerTree(pageElement)
+                : isolateFarmRouteServerPage(pageElement);
             }
 
             pageElement = React.createElement(
@@ -8173,7 +8451,7 @@ async function handleFarmRequestInContext(
               if (LayoutComponent) {
                 const slotProps = {};
                 for (const slot of renderedRouteSlots) {
-                  if (slot.ownerPattern !== layout.pattern) continue;
+                  if ((slot.ownerDirectory || slot.ownerPattern) !== layout.pattern) continue;
                   slotProps[slot.name] = React.createElement(
                     "div",
                     {
@@ -8218,7 +8496,7 @@ async function handleFarmRequestInContext(
         // the request's resolved Suspense content. Until the production runtime
         // can persist and resume the partial shell itself, buffer streamed PPR
         // responses for late status errors but do not cache their dynamic HTML.
-        const shouldCachePPRShell = Boolean(pprCacheKey && !renderedPage.stream);
+        let shouldCachePPRShell = Boolean(pprCacheKey && !renderedPage.stream);
         if (!shouldCachePPRShell && pprCacheKey) {
           pprCanCache = false;
           emitFarmEvent({
@@ -8240,14 +8518,22 @@ async function handleFarmRequestInContext(
               await layout.module.generateMetadata({ params: pageProps.params }),
             );
           }
+          mergedMetadata = await mergeModuleViewport(mergedMetadata, layout.module, {
+            params: pageProps.params,
+          });
         }
         mergedMetadata = mergeMetadata(mergedMetadata, pageMetadata);
-        if (typeof route.module.generateMetadata === "function") {
+        if (!routeStateRejected && typeof route.module.generateMetadata === "function") {
           mergedMetadata = mergeMetadata(
             mergedMetadata,
             await route.module.generateMetadata(pageProps),
           );
         }
+        mergedMetadata = await mergeModuleViewport(
+          mergedMetadata,
+          routeStateRejected ? { viewport: route.module.viewport } : route.module,
+          pageProps,
+        );
 
         if (!mergedMetadata.manifest) {
           const manifestMatch = getMatchingApplicationMetadataRoute(routePathname, "manifest");
@@ -8268,7 +8554,7 @@ async function handleFarmRequestInContext(
             );
           }
         }
-        ${_optionalChain([config, 'access', _147 => _147.md, 'optionalAccess', _148 => _148.enabled]) ? `
+        ${_optionalChain([config, 'access', _149 => _149.md, 'optionalAccess', _150 => _150.enabled]) ? `
         // Advertise the Markdown mirror in the head as well as the Link header,
         // using the public path the .md request will be resolved against.
         mergedMetadata = addMetadataMarkdownAlternate(
@@ -8276,10 +8562,22 @@ async function handleFarmRequestInContext(
           getFarmMarkdownAlternatePath(farmMarkdownConfig, pathname),
         );` : ""}
 
-        const renderedMetadata = renderMetadataHead(mergedMetadata, { pathname, jsonLd: ${JSON.stringify(_nullishCoalesce(_optionalChain([config, 'access', _149 => _149.agent, 'optionalAccess', _150 => _150.jsonLd]), () => ( false)))} });
+        // headers(), cookies(), or getCurrentRequest() read during the render,
+        // in the page, a layout, metadata, or anything they import, makes this
+        // HTML one visitor's: never a shared PPR shell or CDN response.
+        const renderReadRequest = _getRequestReadCount() !== requestReadsBeforeRender;
+        if (renderReadRequest && shouldCachePPRShell) {
+          shouldCachePPRShell = false;
+          pprCanCache = false;
+          emitFarmEvent({ type: "ppr.shell.bypass", route: pathname, reason: "request-read" });
+          emitFarmEvent({ type: "cache.bypass", route: pathname, reason: "request-read" });
+        }
+
+        const renderedMetadata = renderMetadataHead(mergedMetadata, { pathname, jsonLd: ${JSON.stringify(_nullishCoalesce(_optionalChain([config, 'access', _151 => _151.agent, 'optionalAccess', _152 => _152.jsonLd]), () => ( false)))} });
         const title = renderedMetadata.title;
         const metaTags = renderedMetadata.tags;
         const hasFavicon = renderedMetadata.hasFavicon;
+        const viewportTags = renderedMetadata.viewport;
 
         const hasPrivateRequestHeaders = hasPrivateFarmRequestHeaders(
           request,
@@ -8287,6 +8585,7 @@ async function handleFarmRequestInContext(
         );
         const hasRequestScopedRender = Boolean(
           pageStatus >= 400 ||
+          renderReadRequest ||
           request.headers.get("x-farm-intercept-from") ||
           hasPrivateRequestHeaders ||
           hasConfiguredRouteContext ||
@@ -8330,7 +8629,7 @@ async function handleFarmRequestInContext(
           const streamPrefix = '<!DOCTYPE html>\\n<html lang="en">\\n<head>\\n' +
             farmThemeDocument.head + '\\n' +
             '  <meta charset="utf-8">\\n' +
-            '  <meta name="viewport" content="width=device-width, initial-scale=1">\\n' +
+            '  ' + viewportTags + '\\n' +
             (hasFavicon ? '' : '  <link rel="icon" href="data:,">\\n') +
             '  <title>' + title + '</title>' + metaTags + '\\n' +
             '  <link rel="stylesheet" href="/__farm_client_css_href__">\\n' +
@@ -8461,6 +8760,9 @@ async function handleFarmRequestInContext(
                 '  <script type="module" src="/__farm_client_js_src__"></script>\\n</body>',
             );
           
+          // Last, so the charset (and the viewport, unless the layout wrote one) open the head.
+          fullHtml = ensureFarmDocumentMeta(fullHtml, viewportTags);
+
           // Add DOCTYPE if not present
           if (!fullHtml.trim().startsWith('<!DOCTYPE')) {
             fullHtml = '<!DOCTYPE html>\\n' + fullHtml;
@@ -8471,7 +8773,7 @@ async function handleFarmRequestInContext(
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  \${viewportTags}
   \${hasFavicon ? "" : '<link rel="icon" href="data:,">'}
   \${suppressDefaultTitle ? "" : "<title>" + title + "</title>"}\${metaTags}\${rendererHead ? "\\n  " + rendererHead : ""}
   <link rel="stylesheet" href="/__farm_client_css_href__">
@@ -8721,7 +9023,8 @@ async function handleFarmRequestInContext(
   try {
     // Wrap 404 page with root layout if available
     let notFoundElement = createFarmNotFoundElement(pathname);
-    const applicableLayouts = getApplicableLayouts("/");
+    // No page matched, so a layout inside a route group cannot apply.
+    const applicableLayouts = getApplicableLayouts("/", null);
     
     // Wrap with layouts (from innermost to outermost)
     for (let i = applicableLayouts.length - 1; i >= 0; i--) {
@@ -8765,6 +9068,7 @@ async function handleFarmRequestInContext(
           () => '  ' + renderFarmClientBootstrapScript() + '\\n' +
             '  <script type="module" src="/__farm_client_js_src__"></script>\\n</body>',
         );
+      fullHtml = ensureFarmDocumentMeta(fullHtml, notFoundMetadata.viewport);
       if (!fullHtml.trim().startsWith('<!DOCTYPE')) {
         fullHtml = '<!DOCTYPE html>\\n' + fullHtml;
       }
@@ -8773,7 +9077,7 @@ async function handleFarmRequestInContext(
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  \${notFoundMetadata.viewport}
   \${notFoundMetadata.hasFavicon ? "" : '<link rel="icon" href="data:,">'}
   <link rel="stylesheet" href="/__farm_client_css_href__">
   <title>\${notFoundMetadata.title}</title>\${notFoundMetadata.tags}
@@ -8891,11 +9195,11 @@ ${generatePreloadResponseRuntimeSource()}
 
 // Export as Web Standard fetch API
 export async function fetch(request, context) {
-  ${_optionalChain([config, 'access', _151 => _151.agent, 'optionalAccess', _152 => _152.noindexPreviews]) ? "const response = await" : "return"} _runWithAPIRequestRuntime({
+  ${_optionalChain([config, 'access', _153 => _153.agent, 'optionalAccess', _154 => _154.noindexPreviews]) ? "const response = await" : "return"} _runWithAPIRequestRuntime({
     basePath: farmLocalAPIBasePath,
     dispatch: async (localRequest) =>
       (await handleAPIRequest(localRequest)) ?? Response.json({ error: "Not Found" }, { status: 404 }),
-  }, () => handleFarmFetch(request, context));${_optionalChain([config, 'access', _153 => _153.agent, 'optionalAccess', _154 => _154.noindexPreviews]) ? `
+  }, () => handleFarmFetch(request, context));${_optionalChain([config, 'access', _155 => _155.agent, 'optionalAccess', _156 => _156.noindexPreviews]) ? `
   // Keep every response of a preview deployment out of search indexes.
   return farmNoindexPreview ? applyFarmPreviewRobotsTag(response) : response;` : ""}
 }
@@ -9038,23 +9342,20 @@ function configMiddlewareMayHandlePath(config, pathname) {
   if (!hasFarmMiddlewareConfig(config)) return false;
   const entries = Array.isArray(config) ? config : [config];
   return entries.some((entry) => {
-    if (_optionalChain([entry, 'access', _155 => _155.exclude, 'optionalAccess', _156 => _156.some, 'call', _157 => _157((pattern) => middlewarePatternMatches(pattern, pathname))])) {
-      return false;
-    }
-    if (!entry.matcher) return true;
-    const matchers = Array.isArray(entry.matcher) ? entry.matcher : [entry.matcher];
-    return matchers.some((matcher) => {
-      if (typeof matcher === "function") return true;
-      return (typeof matcher === "string" || matcher instanceof RegExp) && middlewarePatternMatches(matcher, pathname);
-    });
+    if (!entry.matcher && !entry.exclude) return true;
+    const matchers = entry.matcher ? (Array.isArray(entry.matcher) ? entry.matcher : [entry.matcher]).map(
+      (matcher) => (
+        // A request-aware matcher cannot be proven safe at build time.
+        typeof matcher === "function" ? () => true : matcher
+      )
+    ) : void 0;
+    const compiled = _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, { matcher: matchers, exclude: entry.exclude });
+    return _chunkZ2HLU4IXcjs.matchesCompiledMiddlewareConfig.call(void 0, pathname, compiled, {}).matched;
   });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, configMiddlewareMayHandlePath, "configMiddlewareMayHandlePath");
 function appMiddlewareMayHandlePath(middlewareRoutes, pathname) {
-  return middlewareRoutes.some((route) => {
-    if (route.path === "/") return true;
-    return middlewarePatternMatches(route.path, pathname) || middlewarePatternMatches(`${route.path}/**`, pathname);
-  });
+  return middlewareRoutes.some((route) => _chunkZ2HLU4IXcjs.matchesMiddlewareRoute.call(void 0, pathname, route).matched);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, appMiddlewareMayHandlePath, "appMiddlewareMayHandlePath");
 function routePatternSpecificity(pattern) {
@@ -9094,11 +9395,11 @@ function getPhysicalPrerenderBypassReason(options) {
   }
   if (appMiddlewareMayHandlePath(middlewareRoutes, pathname)) return "app middleware";
   if (configMiddlewareMayHandlePath(config.middleware, pathname)) return "configured middleware";
-  if (_chunkDFLLARUKcjs.hasCustomFarmRouteContext.call(void 0, config)) return "request context";
+  if (_chunkF7JZENPFcjs.hasCustomFarmRouteContext.call(void 0, config)) return "request context";
   if (farmServerRuntimePluginsMayHandlePath(config, pathname)) return "server runtime plugin";
   const manifestEntry = getManifestPageEntry(routeRuntimeManifest, pathname);
-  if (_optionalChain([manifestEntry, 'optionalAccess', _158 => _158.rendering]) === "dynamic") return "dynamic runtime manifest";
-  if (manifestEntry && (manifestEntry.runtime !== "auto" || Boolean(_optionalChain([manifestEntry, 'access', _159 => _159.regions, 'optionalAccess', _160 => _160.length])) || manifestEntry.maxDuration !== void 0)) {
+  if (_optionalChain([manifestEntry, 'optionalAccess', _157 => _157.rendering]) === "dynamic") return "dynamic runtime manifest";
+  if (manifestEntry && (manifestEntry.runtime !== "auto" || Boolean(_optionalChain([manifestEntry, 'access', _158 => _158.regions, 'optionalAccess', _159 => _159.length])) || manifestEntry.maxDuration !== void 0)) {
     return "route runtime controls";
   }
   const routeRule = getEffectiveRouteRule(config, pathname);
@@ -9120,7 +9421,7 @@ async function buildNitroUniversal(config, routeManager, apiRouteManager, server
   const nitroBuilder = nitroBuilderResult.value;
   const isVercel = preset === "vercel" || preset === "vercel-edge";
   const isCloudflareWorker = preset === "cloudflare-module";
-  const outputDir = _chunkDFLLARUKcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir);
+  const outputDir = _chunkF7JZENPFcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir);
   const runtimeServerOutputDir = isVercel ? _path2.default.join(outputDir, "functions", "__nitro.func") : _path2.default.join(outputDir, "server");
   const ssrOutputDir = _path2.default.join(root, distDir, "ssr");
   const imageRuntime = resolveImageRuntime(config, preset);
@@ -9144,7 +9445,7 @@ async function buildNitroUniversal(config, routeManager, apiRouteManager, server
   const ssgCollectionPromise = routeManager.collectSSGPages();
   const middlewareRoutesPromise = discoverMiddlewareRoutes(_chunkVPTDD5XFcjs.getFarmAppDirectories.call(void 0, config));
   const configuredResponseRoutesPromise = Promise.all([config.redirects(), config.rewrites()]);
-  const farmWorkflows = await _chunkMPEYMSCFcjs.prepareFarmWorkflowsForNitro.call(void 0, config);
+  const farmWorkflows = await _chunkVFQT3LAOcjs.prepareFarmWorkflowsForNitro.call(void 0, config);
   const farmCron = await _chunk6EXBPJ24cjs.prepareFarmCronForNitro.call(void 0, config);
   const [{ ssg: ssgPages }, middlewareRoutes, [configuredRedirects, configuredRewrites]] = await Promise.all([
     ssgCollectionPromise,
@@ -9375,6 +9676,15 @@ function toFarmNodeResponse(request, response) {
       })
     );
   }
+  const farmNetlifyEntryPath = preset === "netlify" ? _path2.default.join(ssrOutputDir, "farm-netlify-entry.mjs") : null;
+  if (farmNetlifyEntryPath) {
+    await fs.writeFile(
+      farmNetlifyEntryPath,
+      createFarmNetlifyEntry({
+        nitroNetlifyEntry: resolveNitroNetlifyEntry(resolveNitroPackageEntry(root))
+      })
+    );
+  }
   const prebuiltSSRPlugin = createExternalSSRBundlePlugin(
     nitroEntryPath,
     ssrOutputDir,
@@ -9400,6 +9710,7 @@ function toFarmNodeResponse(request, response) {
   let nitroConfig = {
     preset,
     ...farmNodeServerEntryPath ? { entry: farmNodeServerEntryPath } : {},
+    ...farmNetlifyEntryPath ? { entry: farmNetlifyEntryPath } : {},
     rootDir: root,
     // Farm registers every handler, task, and plugin explicitly. Scanning the
     // project root would bundle an app's own `middleware/`, `api/`, `routes/`,
@@ -9496,20 +9807,20 @@ function toFarmNodeResponse(request, response) {
     snapshotSSRRebundleOptions(nitroConfig)
   );
   const requestedBuilder = _nullishCoalesce(nitroConfig.builder, () => ( process.env.NITRO_BUILDER));
-  const canReusePrebuiltSSR = isPrebuiltSSRCandidate && nitroConfig.preset === "node-server" && (requestedBuilder === void 0 || requestedBuilder === "rollup" || requestedBuilder === "rolldown") && nitroConfig.sourcemap === false && !hasCustomOxcOptions && !hasLateBuildMutationConfig && !hasUnsupportedSSRRebundleOverrides && _optionalChain([nitroConfig, 'access', _161 => _161.rollupConfig, 'optionalAccess', _162 => _162.external]) === nitroRollupExternal && !hasRollupPlugins(_optionalChain([nitroConfig, 'access', _163 => _163.rollupConfig, 'optionalAccess', _164 => _164.plugins])) && customRollupKeys.length === 0 && _path2.default.resolve(_optionalChain([nitroConfig, 'access', _165 => _165.output, 'optionalAccess', _166 => _166.serverDir]) || "") === _path2.default.resolve(expectedServerDir) && Boolean(
-    _optionalChain([nitroConfig, 'access', _167 => _167.handlers, 'optionalAccess', _168 => _168.some, 'call', _169 => _169(
-      (handler) => _path2.default.resolve(_optionalChain([handler, 'optionalAccess', _170 => _170.handler]) || "") === nitroEntryPath
+  const canReusePrebuiltSSR = isPrebuiltSSRCandidate && nitroConfig.preset === "node-server" && (requestedBuilder === void 0 || requestedBuilder === "rollup" || requestedBuilder === "rolldown") && nitroConfig.sourcemap === false && !hasCustomOxcOptions && !hasLateBuildMutationConfig && !hasUnsupportedSSRRebundleOverrides && _optionalChain([nitroConfig, 'access', _160 => _160.rollupConfig, 'optionalAccess', _161 => _161.external]) === nitroRollupExternal && !hasRollupPlugins(_optionalChain([nitroConfig, 'access', _162 => _162.rollupConfig, 'optionalAccess', _163 => _163.plugins])) && customRollupKeys.length === 0 && _path2.default.resolve(_optionalChain([nitroConfig, 'access', _164 => _164.output, 'optionalAccess', _165 => _165.serverDir]) || "") === _path2.default.resolve(expectedServerDir) && Boolean(
+    _optionalChain([nitroConfig, 'access', _166 => _166.handlers, 'optionalAccess', _167 => _167.some, 'call', _168 => _168(
+      (handler) => _path2.default.resolve(_optionalChain([handler, 'optionalAccess', _169 => _169.handler]) || "") === nitroEntryPath
     )])
   );
   const selectRolldownBuilder = canReusePrebuiltSSR && requestedBuilder === void 0 && await canUseRolldownBuilder();
   if (selectRolldownBuilder) nitroConfig.builder = "rolldown";
   const useRolldownBuilder = canReusePrebuiltSSR && (_nullishCoalesce(nitroConfig.builder, () => ( process.env.NITRO_BUILDER))) === "rolldown";
   const shouldMinify = nitroConfig.minify !== false;
-  const keepServerNames = !(_optionalChain([config, 'access', _171 => _171.docs, 'optionalAccess', _172 => _172.enabled]) && _optionalChain([config, 'access', _173 => _173.docs, 'access', _174 => _174.adapter, 'optionalAccess', _175 => _175.server]));
+  const keepServerNames = !(_optionalChain([config, 'access', _170 => _170.docs, 'optionalAccess', _171 => _171.enabled]) && _optionalChain([config, 'access', _172 => _172.docs, 'access', _173 => _173.adapter, 'optionalAccess', _174 => _174.server]));
   const useFarmServerMinifier = shouldMinify && nitroConfig.sourcemap === false && !hasCustomOxcOptions && !hasLateBuildMutationConfig;
   const serverChunkMinifier = useFarmServerMinifier ? createServerChunkMinifyPlugin({ keepNames: keepServerNames, target: "esnext" }) : null;
   if (canReusePrebuiltSSR) {
-    const configuredRollupPlugins = _optionalChain([nitroConfig, 'access', _176 => _176.rollupConfig, 'optionalAccess', _177 => _177.plugins]);
+    const configuredRollupPlugins = _optionalChain([nitroConfig, 'access', _175 => _175.rollupConfig, 'optionalAccess', _176 => _176.plugins]);
     nitroConfig.rollupConfig = {
       ...nitroConfig.rollupConfig,
       plugins: [
@@ -9520,10 +9831,10 @@ function toFarmNodeResponse(request, response) {
   }
   nitroConfig.minify = useFarmServerMinifier ? false : shouldMinify;
   const nitroInstance = await nitroBuilder.createNitro(nitroConfig);
-  if (_optionalChain([config, 'access', _178 => _178.md, 'optionalAccess', _179 => _179.enabled])) {
+  if (_optionalChain([config, 'access', _177 => _177.md, 'optionalAccess', _178 => _178.enabled])) {
     nitroInstance.hooks.hook("prerender:generate", (route) => {
-      if (!route.contents || !_optionalChain([route, 'access', _180 => _180.contentType, 'optionalAccess', _181 => _181.toLowerCase, 'call', _182 => _182(), 'access', _183 => _183.includes, 'call', _184 => _184("html")])) return;
-      const alternatePath = _chunkKJ2TIHZZcjs.getFarmMarkdownAlternatePath.call(void 0, config.md, route.route);
+      if (!route.contents || !_optionalChain([route, 'access', _179 => _179.contentType, 'optionalAccess', _180 => _180.toLowerCase, 'call', _181 => _181(), 'access', _182 => _182.includes, 'call', _183 => _183("html")])) return;
+      const alternatePath = _chunkEUV4YR3Vcjs.getFarmMarkdownAlternatePath.call(void 0, config.md, route.route);
       if (!alternatePath) return;
       const routeRule = nitroInstance.options.routeRules[route.route] || {};
       const alternate = `<${alternatePath}>; rel="alternate"; type="text/markdown"`;
@@ -9543,8 +9854,8 @@ function toFarmNodeResponse(request, response) {
   }
   if (config.security.csp && config.security.csp.nonce) {
     nitroInstance.hooks.hook("prerender:generate", async (route) => {
-      if (!route.contents || !_optionalChain([route, 'access', _185 => _185.contentType, 'optionalAccess', _186 => _186.toLowerCase, 'call', _187 => _187(), 'access', _188 => _188.includes, 'call', _189 => _189("html")])) return;
-      const staticCsp = await _chunkCUMINO7Zcjs.applyFarmCspHashesToHtml.call(void 0, route.contents, config.security);
+      if (!route.contents || !_optionalChain([route, 'access', _184 => _184.contentType, 'optionalAccess', _185 => _185.toLowerCase, 'call', _186 => _186(), 'access', _187 => _187.includes, 'call', _188 => _188("html")])) return;
+      const staticCsp = await _chunkRU3M2FIKcjs.applyFarmCspHashesToHtml.call(void 0, route.contents, config.security);
       if (!staticCsp) return;
       route.contents = staticCsp.html;
       const routeRule = nitroInstance.options.routeRules[route.route] || {};
@@ -9559,7 +9870,7 @@ function toFarmNodeResponse(request, response) {
       nitroInstance.routing.sync();
     });
   }
-  if (farmNodeServerEntryPath) {
+  if (farmNodeServerEntryPath || farmNetlifyEntryPath) {
     nitroInstance.hooks.hook("prerender:config", (prerendererConfig) => {
       delete prerendererConfig.entry;
     });
@@ -9614,13 +9925,13 @@ function toFarmNodeResponse(request, response) {
   }
   if (prerenderRoutes.length > 0) {
     _chunk5QIKR7RRcjs.logger.info(`\u{1F4C4} Pre-rendering ${prerenderRoutes.length} SSG page(s)`);
-    const previousPrerender = process.env[_chunkND224OE2cjs.FARM_PRERENDER_ENV];
-    process.env[_chunkND224OE2cjs.FARM_PRERENDER_ENV] = "1";
+    const previousPrerender = process.env[_chunkTKSCR644cjs.FARM_PRERENDER_ENV];
+    process.env[_chunkTKSCR644cjs.FARM_PRERENDER_ENV] = "1";
     try {
       await nitroBuilder.prerender(nitroInstance);
     } finally {
-      if (previousPrerender === void 0) delete process.env[_chunkND224OE2cjs.FARM_PRERENDER_ENV];
-      else process.env[_chunkND224OE2cjs.FARM_PRERENDER_ENV] = previousPrerender;
+      if (previousPrerender === void 0) delete process.env[_chunkTKSCR644cjs.FARM_PRERENDER_ENV];
+      else process.env[_chunkTKSCR644cjs.FARM_PRERENDER_ENV] = previousPrerender;
     }
   }
   const sharpRuntimeStagePromise = imageRuntime === "node" ? stageSharpRuntime(config, root, distDir, fs, preset) : Promise.resolve(null);
@@ -9751,7 +10062,7 @@ async function moveVercelOutputPath(src, dest, fs) {
     await fs.rename(src, dest);
     return;
   } catch (error) {
-    const code = _optionalChain([error, 'optionalAccess', _190 => _190.code]);
+    const code = _optionalChain([error, 'optionalAccess', _189 => _189.code]);
     if (code !== "EPERM" && code !== "EACCES" && code !== "EXDEV" && code !== "ENOTEMPTY") {
       throw error;
     }
@@ -9778,7 +10089,7 @@ async function postProcessVercelOutput(root, outputDir, fs, config, farmWorkflow
   try {
     await moveVercelOutputPath(publicDir, staticDir, fs);
   } catch (error) {
-    if (_optionalChain([error, 'optionalAccess', _191 => _191.code]) !== "ENOENT") throw error;
+    if (_optionalChain([error, 'optionalAccess', _190 => _190.code]) !== "ENOENT") throw error;
   }
   await copyFarmDocsContentForVercel(config, root, nitroFuncDir, fs);
   await copyPrismaClientForVercel(root, nitroFuncDir, fs);
@@ -9795,7 +10106,7 @@ async function postProcessVercelOutput(root, outputDir, fs, config, farmWorkflow
     presetRoutes: Array.isArray(vercelConfig.routes) ? vercelConfig.routes : [],
     runtimeRoutes
   });
-  const vercelConfigWithWorkflowCrons = _chunkMPEYMSCFcjs.applyFarmWorkflowVercelCrons.call(void 0, 
+  const vercelConfigWithWorkflowCrons = _chunkVFQT3LAOcjs.applyFarmWorkflowVercelCrons.call(void 0, 
     vercelConfig,
     farmWorkflows.workflows
   );
@@ -9811,7 +10122,7 @@ async function copyFarmDocsContentForVercel(config, root, nitroFuncDir, fs) {
   const docsContentDir = resolveBuildDocsContentDir(config, root);
   if (!docsContentDir) return;
   const bundledContentDir = _path2.default.join(nitroFuncDir, "farm-docs-content");
-  const lastModifiedManifest = _chunk2FXWWUE5cjs.createFarmDocsLastModifiedManifest.call(void 0, docsContentDir, {
+  const lastModifiedManifest = _chunkVZJR7UTGcjs.createFarmDocsLastModifiedManifest.call(void 0, docsContentDir, {
     fallback: "now"
   });
   await fs.rm(bundledContentDir, { recursive: true, force: true });
@@ -9821,7 +10132,7 @@ async function copyFarmDocsContentForVercel(config, root, nitroFuncDir, fs) {
     force: true
   });
   await fs.writeFile(
-    _path2.default.join(bundledContentDir, _chunk2FXWWUE5cjs.FARM_DOCS_LAST_MODIFIED_MANIFEST),
+    _path2.default.join(bundledContentDir, _chunkVZJR7UTGcjs.FARM_DOCS_LAST_MODIFIED_MANIFEST),
     `${JSON.stringify(lastModifiedManifest, null, 2)}
 `
   );
@@ -9898,7 +10209,7 @@ async function stageSharpRuntime(config, root, distDir, fs, preset) {
   try {
     await copyPackage("sharp", sharpRequire);
     if (!copiedPackages.has("sharp")) {
-      throw new Error(`Farm image optimization requires sharp. ${_chunkIMB4PIARcjs.SHARP_INSTALL_HINT}`);
+      throw new Error(`Farm image optimization requires sharp. ${_chunkICUQICNCcjs.SHARP_INSTALL_HINT}`);
     }
   } catch (error) {
     await fs.rm(stageDir, { recursive: true, force: true });
@@ -10112,7 +10423,7 @@ function createBuildTargetBaseline(config) {
     preset,
     distDir,
     outputDir,
-    outputWasDerived: outputDir === _chunkDFLLARUKcjs.getDefaultDeployOutputDir.call(void 0, config.deploy.target, preset, distDir)
+    outputWasDerived: outputDir === _chunkF7JZENPFcjs.getDefaultDeployOutputDir.call(void 0, config.deploy.target, preset, distDir)
   };
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createBuildTargetBaseline, "createBuildTargetBaseline");
@@ -10122,8 +10433,8 @@ function resolveBuildTargets(config, options, baseline) {
   const distDir = config.distDir || ".farm";
   const outputWasReplaced = config.deploy.outputDir !== baseline.outputDir;
   const shouldRefreshDerivedOutput = baseline.outputWasDerived && !outputWasReplaced && (preset !== baseline.preset || distDir !== baseline.distDir);
-  const deployTarget = preset === config.deploy.preset ? config.deploy.target : _chunkDFLLARUKcjs.getDeployTargetForPreset.call(void 0, preset);
-  const outputDir = shouldRefreshDerivedOutput ? _chunkDFLLARUKcjs.getDefaultDeployOutputDir.call(void 0, deployTarget, preset, distDir) : config.deploy.outputDir;
+  const deployTarget = preset === config.deploy.preset ? config.deploy.target : _chunkF7JZENPFcjs.getDeployTargetForPreset.call(void 0, preset);
+  const outputDir = shouldRefreshDerivedOutput ? _chunkF7JZENPFcjs.getDefaultDeployOutputDir.call(void 0, deployTarget, preset, distDir) : config.deploy.outputDir;
   return {
     root,
     preset,
@@ -10131,7 +10442,7 @@ function resolveBuildTargets(config, options, baseline) {
     distDir,
     deployTarget,
     outputDir,
-    deployOutputDir: _chunkDFLLARUKcjs.resolveDeployOutputPath.call(void 0, root, outputDir)
+    deployOutputDir: _chunkF7JZENPFcjs.resolveDeployOutputPath.call(void 0, root, outputDir)
   };
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveBuildTargets, "resolveBuildTargets");
@@ -10140,7 +10451,7 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
   const targetBaseline = createBuildTargetBaseline(config);
   let targets;
   const productionViteResultPromise = options.universal === false ? void 0 : Promise.allSettled([Promise.resolve(_nullishCoalesce(options.productionVite, () => ( _chunkA6WIQH5Zcjs.loadFarmProductionVite.call(void 0, ))))]);
-  const pluginManager = new (0, _chunkIMB4PIARcjs.PluginManager)({
+  const pluginManager = new (0, _chunkICUQICNCcjs.PluginManager)({
     config,
     isDev: false,
     isProd: true
@@ -10169,12 +10480,12 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
     };
     config = {
       ...config,
-      images: _chunkIMB4PIARcjs.resolveFarmImageProviderForRuntime.call(void 0, config.images, {
+      images: _chunkICUQICNCcjs.resolveFarmImageProviderForRuntime.call(void 0, config.images, {
         root: targets.root,
         preset: targets.preset
       })
     };
-    if (_optionalChain([config, 'access', _192 => _192.docs, 'optionalAccess', _193 => _193.enabled])) await _chunkIK6LVLKCcjs.loadFarmDocsEngine.call(void 0, );
+    if (_optionalChain([config, 'access', _191 => _191.docs, 'optionalAccess', _192 => _192.enabled])) await _chunkIK6LVLKCcjs.loadFarmDocsEngine.call(void 0, );
     pluginManager.updateContext({ config });
     const { root, preset, srcDir, distDir, deployOutputDir } = targets;
     _chunk5QIKR7RRcjs.logger.info(`\u{1F69C} Building Farm.js application with preset: ${preset}...`);
@@ -10188,8 +10499,8 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
     });
     _chunk5QIKR7RRcjs.logger.info("\u{1F50D} Discovering routes and API endpoints...");
     const productionViteResult = productionViteResultPromise ? (await productionViteResultPromise)[0] : void 0;
-    if (_optionalChain([productionViteResult, 'optionalAccess', _194 => _194.status]) === "rejected") throw productionViteResult.reason;
-    const productionVite = _optionalChain([productionViteResult, 'optionalAccess', _195 => _195.value]);
+    if (_optionalChain([productionViteResult, 'optionalAccess', _193 => _193.status]) === "rejected") throw productionViteResult.reason;
+    const productionVite = _optionalChain([productionViteResult, 'optionalAccess', _194 => _194.value]);
     const createViteServer = productionVite ? productionVite.createServer : (await import("vite")).createServer;
     projectModuleServer = await createProjectModuleServer(
       createViteServer,
@@ -10197,18 +10508,18 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
       root,
       rendererBuild.signal
     );
-    const farmApp = _chunkIMB4PIARcjs.createFarmApp.call(void 0, config, projectModuleServer);
+    const farmApp = _chunkICUQICNCcjs.createFarmApp.call(void 0, config, projectModuleServer);
     await farmApp.initialize();
     const routeManager = farmApp.getRouteManager();
     const serverRenderer = farmApp.getServerRenderer();
-    const typeArtifacts = _chunkCTV2TTNPcjs.generateFarmTypeArtifacts.call(void 0, {
+    const typeArtifacts = _chunk3BHT4WMPcjs.generateFarmTypeArtifacts.call(void 0, {
       root,
       srcDir,
       layers: config.layers,
       plugins: config.plugins,
       extraRoutes: [
-        ..._optionalChain([config, 'access', _196 => _196.openapi, 'optionalAccess', _197 => _197.enabled]) && config.openapi.route ? [config.openapi.route] : [],
-        ..._chunk2FXWWUE5cjs.getFarmDocsRouteTypeEntries.call(void 0, config.docs)
+        ..._optionalChain([config, 'access', _195 => _195.openapi, 'optionalAccess', _196 => _196.enabled]) && config.openapi.route ? [config.openapi.route] : [],
+        ..._chunkVZJR7UTGcjs.getFarmDocsRouteTypeEntries.call(void 0, config.docs)
       ],
       suppressLintOnLink: config.suppressLintOnLink,
       componentExtensions: config.renderer.componentExtensions,
@@ -10217,7 +10528,7 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
       const message = error instanceof Error ? error.message : String(error);
       _chunk5QIKR7RRcjs.logger.warn(`Route type generation failed (farm.d.ts may be stale): ${message}`);
     });
-    const apiRouteManager = new (0, _chunkEXLKRR4Ucjs.APIRouteManager)(
+    const apiRouteManager = new (0, _chunkXBML5KMGcjs.APIRouteManager)(
       _chunkVPTDD5XFcjs.getFarmAppDirectories.call(void 0, config),
       projectModuleServer,
       {
@@ -10225,7 +10536,7 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
         plugins: config.plugins,
         i18n: farmApp.getI18nRuntime(),
         bodySizeLimit: config.server.bodySizeLimit,
-        basePath: _chunkWPYFSQKKcjs.resolveFarmAPIServerBasePath.call(void 0, config.api)
+        basePath: _chunkKNBBQHO2cjs.resolveFarmAPIServerBasePath.call(void 0, config.api)
       }
     );
     const [, apiDiscovery] = await Promise.allSettled([
@@ -10292,7 +10603,7 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
     throw error;
   } finally {
     try {
-      await _optionalChain([projectModuleServer, 'optionalAccess', _198 => _198.close, 'call', _199 => _199()]);
+      await _optionalChain([projectModuleServer, 'optionalAccess', _197 => _197.close, 'call', _198 => _198()]);
     } finally {
       rendererBuild.abort();
     }
@@ -10304,7 +10615,7 @@ async function createProjectModuleServer(createViteServer, config, root, buildLi
     ssr: true,
     buildLifetime
   });
-  const viteConfig = _chunkIMB4PIARcjs.mergeFarmViteConfig.call(void 0, 
+  const viteConfig = _chunkICUQICNCcjs.mergeFarmViteConfig.call(void 0, 
     {
       root,
       appType: "custom",
@@ -10316,19 +10627,19 @@ async function createProjectModuleServer(createViteServer, config, root, buildLi
       },
       plugins: [
         ...rendererVitePlugins,
-        _chunkIMB4PIARcjs.farmFontImportsPlugin.call(void 0, {
+        _chunkICUQICNCcjs.farmFontImportsPlugin.call(void 0, {
           root,
           basePath: config.basePath,
           publicDir: config.publicDir
         }),
-        _chunk22GUSVNJcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
+        _chunk3SDFA7UFcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
       ],
       server: {
         middlewareMode: true,
         hmr: false
       },
       resolve: {
-        alias: _chunkIMB4PIARcjs.createFarmSourceAlias.call(void 0, root, config.srcDir),
+        alias: _chunkICUQICNCcjs.createFarmSourceAlias.call(void 0, root, config.srcDir),
         dedupe: [...config.renderer.dedupe || []]
       },
       optimizeDeps: {
@@ -10385,7 +10696,7 @@ async function buildClient2(viteBuild, config, root, srcDir, outputDir) {
       farmI18nClientBridgePlugin(),
       farmServerOnlyEntriesPlugin(),
       farmPlugin(config, pluginManager),
-      _chunk22GUSVNJcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
+      _chunk3SDFA7UFcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
     ],
     mode: "production"
   });
@@ -10414,12 +10725,12 @@ async function buildSSR(viteBuild, config, root, srcDir, outputDir) {
     define: {
       __FARM_API_BASE_URL__: JSON.stringify(config.api.baseURL),
       __FARM_ENV__: JSON.stringify(_chunkVEKFLAQMcjs.createBundledEnv.call(void 0, config.env)),
-      __FARM_PUBLIC_ENV__: JSON.stringify(_optionalChain([config, 'access', _200 => _200.env, 'optionalAccess', _201 => _201.public]) || {})
+      __FARM_PUBLIC_ENV__: JSON.stringify(_optionalChain([config, 'access', _199 => _199.env, 'optionalAccess', _200 => _200.public]) || {})
     },
     plugins: [
       farmI18nClientBridgePlugin(),
       farmPlugin(config, pluginManager),
-      _chunk22GUSVNJcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
+      _chunk3SDFA7UFcjs.farmEnvironmentFunctionsPlugin.call(void 0, )
     ],
     mode: "production"
   });
@@ -10436,7 +10747,7 @@ function resolveLegacyPageEntry(config, root, srcDir) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveLegacyPageEntry, "resolveLegacyPageEntry");
 async function buildNitro(config, routeManager, apiRouteManager, serverRenderer, preset, root, distDir, pluginManager) {
   const [{ createNitroConfig }, { createNitro, build: nitroBuild }] = await Promise.all([
-    import("./nitro-VYDZGYFY.cjs"),
+    import("./nitro-OVPLKPE2.cjs"),
     import("nitro/builder")
   ]);
   let nitroConfig = await createNitroConfig(
@@ -10449,7 +10760,7 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
   if (pluginManager) {
     nitroConfig = await pluginManager.runHookSerial("beforeNitroBuild", nitroConfig);
   }
-  const outputDir = _chunkDFLLARUKcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir);
+  const outputDir = _chunkF7JZENPFcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir);
   const serverOutputDir = _path2.default.join(outputDir, "server");
   const publicOutputDir = _path2.default.join(outputDir, "public");
   const { mkdir, cp } = await import("fs/promises");
@@ -10520,7 +10831,7 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
       root,
       preset,
       distDir,
-      outputDir: _chunkDFLLARUKcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir)
+      outputDir: _chunkF7JZENPFcjs.resolveDeployOutputPath.call(void 0, root, config.deploy.outputDir)
     });
   }
 }