@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-WG2KHOMN.mjs → chunk-QAU5JD57.mjs}

@@ -10,7 +10,7 @@ import {
 import {
   compileFarmDocsAdapterEdgeManifest,
   createFarmDocsAPIHandler
-} from "./chunk-UAFSBWNT.mjs";
+} from "./chunk-SOMHP6GF.mjs";
 import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsHandler,
@@ -20,7 +20,7 @@ import {
   loadFarmDocsPage,
   resolveFarmDocsContentDir,
   toFarmDocsMarkdownPage
-} from "./chunk-AHAJGAYD.mjs";
+} from "./chunk-PDOCJ6RY.mjs";
 import {
   generateFarmDocsSearchClientRuntime,
   isFarmDocsSearchEnabled,
@@ -28,7 +28,7 @@ import {
 } from "./chunk-UP4CW6WP.mjs";
 import {
   FARM_PRERENDER_ENV
-} from "./chunk-MM5D6VLP.mjs";
+} from "./chunk-3KZS4SUS.mjs";
 import {
   loadFarmDocsEngine
 } from "./chunk-2VQKKQ6D.mjs";
@@ -37,7 +37,7 @@ import {
   getDeployTargetForPreset,
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-FJZ3DQLK.mjs";
+} from "./chunk-6DU6UFUE.mjs";
 import {
   resolveFarmInstrumentationFile
 } from "./chunk-ZZSRYEYU.mjs";
@@ -47,15 +47,16 @@ import {
 import {
   DEFAULT_NOT_FOUND_STYLES,
   FARM_LAYOUT_ELEMENT_CLIENT_SOURCE,
-  HOISTED_HEAD_ELEMENT,
   PluginManager,
   SHARP_INSTALL_HINT,
+  collectFarmWebMCPTools,
   createFarmApp,
   createFarmSourceAlias,
   createFarmThemeCssPlugin,
   createMarkdownPageHydrationPlanner,
   describeSuppressedAsyncHydration,
   enforceFarmIsolatedHydrationRouteBudget,
+  farmDocsClientConfigPlugin,
   farmFontImportsPlugin,
   farmPluginMayAffectRuntimePath,
   generateClientCachePersistenceCode,
@@ -69,31 +70,40 @@ import {
   mergeFarmFontCss,
   mergeFarmProductionViteConfig,
   mergeFarmViteConfig,
+  resolveFarmAppPackages,
   resolveFarmClientCacheAdapterEntry,
   resolveFarmImageProviderForRuntime,
   resolveFarmIsolatedClientHydrationMode,
-  resolveFarmNotFoundComponentPath
-} from "./chunk-6L6DQR5W.mjs";
+  resolveFarmNotFoundComponentPath,
+  usesFarmServerTree
+} from "./chunk-4KU5Q7C2.mjs";
 import {
   findRequestBoundSourceBlockers,
   generateFarmTypeArtifacts,
   parseRouteRenderingDirective,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-O3DTUAX2.mjs";
+} from "./chunk-2G2NNLE2.mjs";
 import {
   FARM_API_CATALOG_PATH,
-  resolveFarmApiCatalogInput
-} from "./chunk-TEN4FIZU.mjs";
+  FARM_APP_MANIFEST_PATH,
+  HOISTED_HEAD_ELEMENT,
+  getRouteDirectoryDepth,
+  getRouteGroupScope,
+  resolveFarmApiCatalogInput,
+  resolveFarmAppManifestInput,
+  routeBoundaryCoversDirectory,
+  stripRouteGroups
+} from "./chunk-6ETPZTJI.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
 import {
   farmEnvironmentFunctionsPlugin
-} from "./chunk-ZSH2Y4LN.mjs";
+} from "./chunk-E5GNDG5F.mjs";
 import {
   generateFarmDocsAdapterClientRuntime,
   getFarmDocsAdapterConfigModule
-} from "./chunk-VVBO3QH7.mjs";
+} from "./chunk-ENLZ4R3Y.mjs";
 import {
   resolveFarmDocsFontAssets,
   toFarmDocsPublicFontAssets
@@ -115,7 +125,7 @@ import {
 } from "./chunk-DAATZTKJ.mjs";
 import {
   applyFarmCspHashesToHtml
-} from "./chunk-6VYZOPOT.mjs";
+} from "./chunk-UJD4PHYB.mjs";
 import {
   applyFarmCronVercelCrons,
   createFarmCronCloudflareConfig,
@@ -127,38 +137,41 @@ import {
 } from "./chunk-4OOBRCJX.mjs";
 import {
   isFarmMarkdownPageFile
-} from "./chunk-7QOCTYBS.mjs";
+} from "./chunk-4JHOT46A.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
 } from "./chunk-FA2W42OV.mjs";
 import {
   getFarmMarkdownAlternatePath
-} from "./chunk-JBC2FKRW.mjs";
+} from "./chunk-WWIKMBRN.mjs";
 import {
   applyFarmWorkflowVercelCrons,
   prepareFarmWorkflowsForNitro
-} from "./chunk-3ATMYLLJ.mjs";
+} from "./chunk-6WCPV6G2.mjs";
 import {
   getFarmIntegrationPluginServerRuntime,
   getIntegrationProviders
-} from "./chunk-JLCQGPXE.mjs";
+} from "./chunk-HMIJDL7S.mjs";
 import {
-  appendMiddlewareRoutePath
-} from "./chunk-VUMAE7NC.mjs";
+  appendMiddlewareDirectory,
+  appendMiddlewareRoutePath,
+  compareMiddlewareRouteLocations
+} from "./chunk-6TJOML4E.mjs";
+import {
+  compileMiddlewareConfig,
+  matchesCompiledMiddlewareConfig,
+  matchesMiddlewareRoute
+} from "./chunk-JG6DJF5A.mjs";
 import {
   APIRouteManager
-} from "./chunk-BXFWA23T.mjs";
+} from "./chunk-22LTEMGQ.mjs";
 import {
   readFarmI18nCatalogs
-} from "./chunk-FV45CKBC.mjs";
+} from "./chunk-QCFBDFRS.mjs";
 import {
   VERCEL_OG_INSTALL_HINT
 } from "./chunk-YOZYCI6Z.mjs";
-import {
-  resolveFarmAPIServerBasePath,
-  resolveFarmAPIServerRoutePath
-} from "./chunk-I6XDAKWQ.mjs";
 import {
   createFarmRouteRuntimeKey,
   getFarmRouteRuntimeConfig,
@@ -173,6 +186,10 @@ import {
   toPosixPath,
   toViteModuleId
 } from "./chunk-KI3MESHB.mjs";
+import {
+  resolveFarmAPIServerBasePath,
+  resolveFarmAPIServerRoutePath
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   getFarmPresetRuntime
 } from "./chunk-2A3EQHXX.mjs";
@@ -184,8 +201,8 @@ import {
 } from "./chunk-LPEX4YW6.mjs";
 
 // src/build/index.ts
-import path6 from "path";
-import { existsSync as existsSync2 } from "fs";
+import path7 from "path";
+import { existsSync as existsSync3 } from "fs";
 
 // src/nitro/client-css-href.ts
 import path from "path";
@@ -239,8 +256,8 @@ __name(resolveHashedClientJsSrc, "resolveHashedClientJsSrc");
 
 // src/nitro/universal-build.ts
 import os from "os";
-import path5 from "path";
-import { constants as fsConstants, existsSync, readFileSync, realpathSync } from "fs";
+import path6 from "path";
+import { constants as fsConstants, existsSync as existsSync2, readFileSync, realpathSync } from "fs";
 import { fileURLToPath } from "url";
 import { builtinModules, createRequire } from "module";
 import { isDeepStrictEqual } from "util";
@@ -707,6 +724,47 @@ function buildFarmVercelRoutes(options) {
 }
 __name(buildFarmVercelRoutes, "buildFarmVercelRoutes");
 
+// src/nitro/netlify-entry.ts
+import { existsSync } from "fs";
+import path5 from "path";
+function resolveNitroNetlifyEntry(nitroRuntimeEntry) {
+  const entry = path5.join(
+    path5.dirname(nitroRuntimeEntry),
+    "..",
+    "presets",
+    "netlify",
+    "runtime",
+    "netlify.mjs"
+  );
+  if (!existsSync(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(path5.sep).join("/");
+}
+__name(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();
+}
+__name(createFarmNetlifyEntry, "createFarmNetlifyEntry");
+
 // src/nitro/node-server-entry.ts
 function createFarmNodeServerEntry(options) {
   const serverConfig = JSON.stringify(options.server);
@@ -984,18 +1042,18 @@ function preloadFarmNitroBuilder() {
 }
 __name(preloadFarmNitroBuilder, "preloadFarmNitroBuilder");
 var _filename = typeof import.meta.url !== "undefined" ? fileURLToPath(import.meta.url) : "";
-var _dirname = path5.dirname(_filename);
+var _dirname = path6.dirname(_filename);
 function findFarmCoreRoot(from) {
-  let dir = path5.dirname(from);
-  while (dir !== path5.dirname(dir)) {
-    const manifest = path5.join(dir, "package.json");
-    if (existsSync(manifest)) {
+  let dir = path6.dirname(from);
+  while (dir !== path6.dirname(dir)) {
+    const manifest = path6.join(dir, "package.json");
+    if (existsSync2(manifest)) {
       try {
         if (JSON.parse(readFileSync(manifest, "utf8")).name === "@farm.js/core") return dir;
       } catch {
       }
     }
-    dir = path5.dirname(dir);
+    dir = path6.dirname(dir);
   }
   return null;
 }
@@ -1007,16 +1065,16 @@ function toModulePath(file) {
 }
 __name(toModulePath, "toModulePath");
 function findInstalledPackageDir(name, from) {
-  for (let dir = from; ; dir = path5.dirname(dir)) {
-    const candidate = path5.join(dir, "node_modules", name);
-    if (existsSync(path5.join(candidate, "package.json"))) {
+  for (let dir = from; ; dir = path6.dirname(dir)) {
+    const candidate = path6.join(dir, "node_modules", name);
+    if (existsSync2(path6.join(candidate, "package.json"))) {
       try {
         return realpathSync(candidate);
       } catch {
         return null;
       }
     }
-    if (dir === path5.dirname(dir)) return null;
+    if (dir === path6.dirname(dir)) return null;
   }
 }
 __name(findInstalledPackageDir, "findInstalledPackageDir");
@@ -1028,7 +1086,7 @@ function collectFarmDependencyDirs(root) {
     seen.add(dir);
     let manifest;
     try {
-      manifest = JSON.parse(readFileSync(path5.join(dir, "package.json"), "utf8"));
+      manifest = JSON.parse(readFileSync(path6.join(dir, "package.json"), "utf8"));
     } catch {
       return;
     }
@@ -1039,7 +1097,7 @@ function collectFarmDependencyDirs(root) {
   if (farmCoreRoot) visit(realpathSync(farmCoreRoot));
   queue.push({ name: "@farm.js/core", from: root });
   try {
-    const manifest = JSON.parse(readFileSync(path5.join(root, "package.json"), "utf8"));
+    const manifest = JSON.parse(readFileSync(path6.join(root, "package.json"), "utf8"));
     for (const field of ["dependencies", "devDependencies"]) {
       for (const name of Object.keys(manifest[field] ?? {})) {
         if (name.startsWith("@farm.js/")) queue.push({ name, from: root });
@@ -1106,15 +1164,15 @@ var FARM_SSR_PACKAGE_IMPORT = "#farm-ssr-entry";
 var FARM_SSR_OUTPUT_DIR = "farm-ssr";
 var FARM_CLIENT_BUILD_TARGET = ["es2020", "edge88", "firefox78", "chrome87", "safari14"];
 function resolveNitroRuntimeDependency(root, specifier) {
-  return createRequire(resolveNitroPackageEntry(root)).resolve(specifier).split(path5.sep).join("/");
+  return createRequire(resolveNitroPackageEntry(root)).resolve(specifier).split(path6.sep).join("/");
 }
 __name(resolveNitroRuntimeDependency, "resolveNitroRuntimeDependency");
 function resolveNitroInternalRuntimeAliases(root) {
-  const runtimeDir = path5.dirname(resolveNitroPackageEntry(root));
+  const runtimeDir = path6.dirname(resolveNitroPackageEntry(root));
   return Object.fromEntries(
     ["app", "error/hooks", "runtime-config", "shutdown", "task"].map((moduleName) => [
       `#nitro/runtime/${moduleName}`,
-      path5.join(runtimeDir, "internal", `${moduleName}.mjs`).split(path5.sep).join("/")
+      path6.join(runtimeDir, "internal", `${moduleName}.mjs`).split(path6.sep).join("/")
     ])
   );
 }
@@ -1125,7 +1183,7 @@ function createPrerenderRuntimeResolverPlugin(root, resolveNitroEntry = resolveN
     name: "farm-prerender-runtime-resolver",
     async resolveId(id, _importer, options) {
       if (options.custom?.farmPrerenderRuntimeResolve) return null;
-      if (id.startsWith("\0") || id.startsWith(".") || id.startsWith("#") || id.startsWith("virtual:") || path5.isAbsolute(id) || NODE_BUILTIN_MODULES.has(id)) {
+      if (id.startsWith("\0") || id.startsWith(".") || id.startsWith("#") || id.startsWith("virtual:") || path6.isAbsolute(id) || NODE_BUILTIN_MODULES.has(id)) {
         return null;
       }
       if (nitroEntry === void 0) {
@@ -1146,7 +1204,7 @@ function createPrerenderRuntimeResolverPlugin(root, resolveNitroEntry = resolveN
 }
 __name(createPrerenderRuntimeResolverPlugin, "createPrerenderRuntimeResolverPlugin");
 function resolveNitroPackageEntry(root) {
-  const projectRequire = createRequire(path5.join(root, "package.json"));
+  const projectRequire = createRequire(path6.join(root, "package.json"));
   let runtimeRequire = projectRequire;
   try {
     runtimeRequire = createRequire(projectRequire.resolve("@farm.js/core"));
@@ -1221,7 +1279,7 @@ function createFarmReactWebServerAlias(hasEdgeBuild) {
 __name(createFarmReactWebServerAlias, "createFarmReactWebServerAlias");
 function hasReactDomEdgeServerBuild(root) {
   try {
-    createRequire(path5.join(root, "package.json")).resolve("react-dom/server.edge");
+    createRequire(path6.join(root, "package.json")).resolve("react-dom/server.edge");
     return true;
   } catch {
     return false;
@@ -1279,7 +1337,7 @@ function createMetadataImageWasmPlugin() {
         return null;
       }
       const requestPath = source.slice(0, -"?module".length);
-      const resolvedPath = path5.isAbsolute(requestPath) ? requestPath : path5.resolve(path5.dirname(importer.split("?", 1)[0]), requestPath);
+      const resolvedPath = path6.isAbsolute(requestPath) ? requestPath : path6.resolve(path6.dirname(importer.split("?", 1)[0]), requestPath);
       return `${FARM_METADATA_IMAGE_WASM_PREFIX}${resolvedPath}`;
     },
     load(id) {
@@ -1305,11 +1363,11 @@ function collectSSRExternalPackages(ssrBundle) {
     for (const importId of [...output.imports, ...output.dynamicImports]) {
       const normalizedImportId = importId.replace(/\\/g, "/");
       const normalizedId = normalizedImportId.replace(/^\.\//, "");
-      const resolvedRelativeId = normalizedImportId.startsWith("./") || normalizedImportId.startsWith("../") ? path5.posix.normalize(path5.posix.join(path5.posix.dirname(fileName), normalizedImportId)) : null;
+      const resolvedRelativeId = normalizedImportId.startsWith("./") || normalizedImportId.startsWith("../") ? path6.posix.normalize(path6.posix.join(path6.posix.dirname(fileName), normalizedImportId)) : null;
       if (emittedFiles.has(normalizedId) || resolvedRelativeId !== null && emittedFiles.has(resolvedRelativeId) || NODE_BUILTIN_MODULES.has(importId) || importId.startsWith("node:")) {
         continue;
       }
-      if (path5.isAbsolute(importId) || /^[A-Za-z]:[\\/]/.test(importId) || importId.startsWith("#") || importId.startsWith("\0")) {
+      if (path6.isAbsolute(importId) || /^[A-Za-z]:[\\/]/.test(importId) || importId.startsWith("#") || importId.startsWith("\0")) {
         externalPackages.add(importId);
         continue;
       }
@@ -1322,15 +1380,15 @@ function collectSSRExternalPackages(ssrBundle) {
 }
 __name(collectSSRExternalPackages, "collectSSRExternalPackages");
 function createExternalSSRBundlePlugin(nitroEntryPath, ssrOutputDir, ssrEntryFile) {
-  const resolvedNitroEntry = path5.resolve(nitroEntryPath);
-  const resolvedSSREntry = path5.resolve(ssrOutputDir, ssrEntryFile);
+  const resolvedNitroEntry = path6.resolve(nitroEntryPath);
+  const resolvedSSREntry = path6.resolve(ssrOutputDir, ssrEntryFile);
   return {
     name: "farm-externalize-prebuilt-ssr",
     resolveId(source, importer) {
-      if (!importer || path5.resolve(importer) !== resolvedNitroEntry) {
+      if (!importer || path6.resolve(importer) !== resolvedNitroEntry) {
         return null;
       }
-      const resolvedImport = path5.resolve(path5.dirname(importer), source);
+      const resolvedImport = path6.resolve(path6.dirname(importer), source);
       if (resolvedImport !== resolvedSSREntry) return null;
       return { id: FARM_SSR_PACKAGE_IMPORT, external: true };
     }
@@ -1344,6 +1402,11 @@ function hasRollupPlugins(plugins) {
   return Boolean(plugins);
 }
 __name(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;
+}
+__name(hasFarmServerCacheConfig, "hasFarmServerCacheConfig");
 function hasFarmRuntimeConfigModule(config, configModulePath) {
   return Boolean(configModulePath || (config.layers || []).some((layer) => layer.configFile));
 }
@@ -1453,14 +1516,14 @@ function resolveBuildDocsContentDir(config, root) {
   if (!config.docs?.enabled) return null;
   const configuredContentDir = config.docs.contentDir || config.docs.config.contentDir;
   if (typeof configuredContentDir === "string" && configuredContentDir.trim()) {
-    const contentDir = path5.isAbsolute(configuredContentDir) ? configuredContentDir : path5.join(root, configuredContentDir);
-    return existsSync(contentDir) ? contentDir : null;
+    const contentDir = path6.isAbsolute(configuredContentDir) ? configuredContentDir : path6.join(root, configuredContentDir);
+    return existsSync2(contentDir) ? contentDir : null;
   }
   const entryDir = config.docs.config.entry || trimSlashes(config.docs.entry) || "docs";
-  const appDocsDir = path5.join(root, config.srcDir || "src", "app", entryDir);
-  if (existsSync(appDocsDir)) return appDocsDir;
-  const rootDocsDir = path5.join(root, entryDir);
-  return existsSync(rootDocsDir) ? rootDocsDir : null;
+  const appDocsDir = path6.join(root, config.srcDir || "src", "app", entryDir);
+  if (existsSync2(appDocsDir)) return appDocsDir;
+  const rootDocsDir = path6.join(root, entryDir);
+  return existsSync2(rootDocsDir) ? rootDocsDir : null;
 }
 __name(resolveBuildDocsContentDir, "resolveBuildDocsContentDir");
 function hasProjectPostcssConfig(root) {
@@ -1477,7 +1540,7 @@ function hasProjectPostcssConfig(root) {
     ".postcssrc.mjs",
     ".postcssrc.ts"
   ];
-  const projectRequire = createRequire(path5.join(root, "package.json"));
+  const projectRequire = createRequire(path6.join(root, "package.json"));
   return candidates.some((file) => {
     try {
       projectRequire.resolve(`./${file}`);
@@ -1501,7 +1564,7 @@ async function findFarmConfigPath(root) {
     "config.mjs"
   ];
   for (const candidate of candidates) {
-    const resolvedPath = path5.join(root, candidate);
+    const resolvedPath = path6.join(root, candidate);
     try {
       await fs.access(resolvedPath);
       return resolvedPath;
@@ -1543,7 +1606,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 });
@@ -1556,30 +1619,31 @@ async function discoverMiddlewareRoutes(appDir) {
     if (middlewareFile) {
       discovered.push({
         path: routePath,
-        filePath: path5.join(dir, middlewareFile.name)
+        directory,
+        filePath: path6.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 = appendMiddlewareRoutePath(routePath, entry.name);
-      await walk(path5.join(dir, entry.name), childRoutePath, discovered);
+      await walk(
+        path6.join(dir, entry.name),
+        appendMiddlewareRoutePath(routePath, entry.name),
+        appendMiddlewareDirectory(directory, entry.name),
+        discovered
+      );
     }
   }
   __name(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(compareMiddlewareRouteLocations).map(({ path: routePath, filePath }) => ({ path: routePath, filePath }));
 }
 __name(discoverMiddlewareRoutes, "discoverMiddlewareRoutes");
 function assertFarmDocsRuntimeSupported(config, preset) {
@@ -1619,6 +1683,7 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
       const markdownSourcePath = entry.markdownSourcePath || (isFarmMarkdownPageFile(entry.modulePath) ? entry.modulePath : void 0);
       pageRoutes.push({
         pattern,
+        ...entry.directory ? { directory: entry.directory } : {},
         modulePath: entry.modulePath,
         ...markdownSourcePath ? {
           source: readFileSync(markdownSourcePath, "utf8"),
@@ -1631,6 +1696,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,
@@ -1641,7 +1707,7 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
     logger.info(`\u{1F4CB} Found ${pageRoutes.length} page routes`);
     const fs = await import("fs/promises");
     const layoutRoutes = [];
-    const appDir = path5.join(root, srcDir, "app");
+    const appDir = path6.join(root, srcDir, "app");
     async function findLayoutsForClient(dir, routePrefix = "/") {
       try {
         const entries = await fs.readdir(dir, { withFileTypes: true });
@@ -1649,11 +1715,11 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
           if (entry.isFile() && entry.name.match(/^layout\.(tsx?|jsx?|vue|svelte)$/)) {
             layoutRoutes.push({
               pattern: routePrefix,
-              modulePath: path5.join(dir, entry.name)
+              modulePath: path6.join(dir, entry.name)
             });
           } else if (entry.isDirectory() && !entry.name.startsWith(".") && !entry.name.startsWith("_")) {
             const childPrefix = routePrefix === "/" ? `/${entry.name}` : `${routePrefix}/${entry.name}`;
-            await findLayoutsForClient(path5.join(dir, entry.name), childPrefix);
+            await findLayoutsForClient(path6.join(dir, entry.name), childPrefix);
           }
         }
       } catch {
@@ -1670,7 +1736,7 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
     logger.info(`\u{1F4CB} Found ${pageRoutes.length} page routes and ${layoutRoutes.length} layouts`);
     const isolatedClientBoundaryModules = routeManager.getIsolatedClientBoundaryModules(root);
     const hydrationPlanCache = /* @__PURE__ */ new Map();
-    const clientOutputDir = path5.join(root, distDir, "client");
+    const clientOutputDir = path6.join(root, distDir, "client");
     const [productionViteResult] = await productionViteResultPromise;
     if (productionViteResult.status === "rejected") {
       await routeRuntimeManifestResultPromise;
@@ -1779,10 +1845,10 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
       lifecyclePluginManager
     );
     const runtimeManifestPath = await writeFarmRouteRuntimeManifest(
-      path5.join(root, distDir),
+      path6.join(root, distDir),
       routeRuntimeManifest
     );
-    logger.info(`\u{1F4CB} Route runtime manifest: ${path5.relative(root, runtimeManifestPath)}`);
+    logger.info(`\u{1F4CB} Route runtime manifest: ${path6.relative(root, runtimeManifestPath)}`);
   } catch (error) {
     if (lifecyclePluginManager) {
       await lifecyclePluginManager.runHookParallel("onError", {
@@ -1809,8 +1875,8 @@ async function writeSSRAssetsToClient(bundle, outputDir) {
       await mergeBuiltFontCss(outputDir, output.source);
       continue;
     }
-    const filePath = path5.join(outputDir, fileName);
-    await fs.mkdir(path5.dirname(filePath), { recursive: true });
+    const filePath = path6.join(outputDir, fileName);
+    await fs.mkdir(path6.dirname(filePath), { recursive: true });
     await fs.writeFile(filePath, output.source);
   }
 }
@@ -1819,8 +1885,8 @@ async function copyFarmDocsFontAssetsToClient(root, outputDir) {
   const fs = await import("fs/promises");
   await Promise.all(
     resolveFarmDocsFontAssets(root).map(async ({ sourcePath, url }) => {
-      const targetPath = path5.join(outputDir, url.replace(/^\/+/, ""));
-      await fs.mkdir(path5.dirname(targetPath), { recursive: true });
+      const targetPath = path6.join(outputDir, url.replace(/^\/+/, ""));
+      await fs.mkdir(path6.dirname(targetPath), { recursive: true });
       await fs.copyFile(sourcePath, targetPath);
     })
   );
@@ -1828,7 +1894,7 @@ async function copyFarmDocsFontAssetsToClient(root, outputDir) {
 __name(copyFarmDocsFontAssetsToClient, "copyFarmDocsFontAssetsToClient");
 async function mergeBuiltFontCss(outputDir, fontCssSource) {
   const fs = await import("fs/promises");
-  const fontCssPath = path5.join(outputDir, "farm-fonts.css");
+  const fontCssPath = path6.join(outputDir, "farm-fonts.css");
   let fontCss = fontCssSource;
   if (fontCss === void 0) {
     try {
@@ -1837,7 +1903,7 @@ async function mergeBuiltFontCss(outputDir, fontCssSource) {
       return;
     }
   }
-  const clientCssPath = path5.join(outputDir, "farm-client.css");
+  const clientCssPath = path6.join(outputDir, "farm-client.css");
   let clientCss = "";
   try {
     clientCss = await fs.readFile(clientCssPath, "utf8");
@@ -1859,7 +1925,7 @@ var IncompleteClientBuildOutputError = _IncompleteClientBuildOutputError;
 async function validateClientBuildOutput(root, srcDir, outputDir) {
   const fs = await import("fs/promises");
   const fingerprinted = await findFingerprintedClientEntry(outputDir);
-  const clientEntryPath = path5.join(outputDir, fingerprinted ?? "farm-client.js");
+  const clientEntryPath = path6.join(outputDir, fingerprinted ?? "farm-client.js");
   let clientEntrySize = 0;
   try {
     const clientEntry = await fs.stat(clientEntryPath);
@@ -1869,8 +1935,8 @@ async function validateClientBuildOutput(root, srcDir, outputDir) {
   if (clientEntrySize === 0) {
     throw new IncompleteClientBuildOutputError("farm-client.js is missing or empty");
   }
-  const clientCssPath = path5.join(outputDir, "farm-client.css");
-  const globalsCssPath = path5.join(root, srcDir, "app", "globals.css");
+  const clientCssPath = path6.join(outputDir, "farm-client.css");
+  const globalsCssPath = path6.join(root, srcDir, "app", "globals.css");
   let expectsCss = false;
   try {
     const globalsCss = await fs.readFile(globalsCssPath, "utf8");
@@ -1892,7 +1958,7 @@ async function validateClientBuildOutput(root, srcDir, outputDir) {
 }
 __name(validateClientBuildOutput, "validateClientBuildOutput");
 function getCachedClientModuleHydrationPlan(modulePath, root, mode, cache, options = {}) {
-  const key = `${path5.resolve(root)}\0${mode}\0${options.asyncOwnerIslands === true}\0${path5.resolve(modulePath)}`;
+  const key = `${path6.resolve(root)}\0${mode}\0${options.asyncOwnerIslands === true}\0${path6.resolve(modulePath)}`;
   let plan = cache.get(key);
   if (!plan) {
     plan = getClientModuleHydrationPlan(modulePath, root, mode, options);
@@ -1978,7 +2044,8 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
       };
     }
   });
-  const layoutAppliesToRoute = /* @__PURE__ */ __name((layoutPattern, routePattern) => layoutPattern === "/" || routePattern === layoutPattern || routePattern.startsWith(`${layoutPattern}/`), "layoutAppliesToRoute");
+  const layoutAppliesToRoute = routeBoundaryCoversDirectory;
+  const routeDirectory = /* @__PURE__ */ __name((route) => route.directory ?? route.pattern, "routeDirectory");
   const adapterOwnsDocsRuntime = Boolean(
     isReactRenderer(config.renderer) && config.docs?.enabled && config.docs.adapter?.server && config.docs.adapter.react
   );
@@ -2012,8 +2079,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: getRouteDirectoryDepth(routeDirectory(route)),
         metadata
       })),
       ...syntheticDocsPatterns.map((pattern) => ({
@@ -2034,7 +2101,7 @@ 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) {
       logger.warn(`\u26A0\uFE0F  ${describeSuppressedAsyncHydration(layout.pattern, layout.fallbackReason)}`);
     }
@@ -2056,7 +2123,7 @@ 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) {
         logger.warn(
@@ -2083,7 +2150,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.
+          ...usesFarmServerTree(metadata) && applicableClientLayouts.some((layout) => layout.shouldHydrate) ? { serverTree: true } : {}
         });
         logger.info(`\u{1F4F1} Found hydratable route: ${route.pattern} -> ${route.modulePath}`);
       }
@@ -2128,10 +2197,10 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   logger.info(
     `\u{1F4F1} Total hydratable routes detected: ${clientPages.length} pages, ${clientLayouts.filter((layout) => layout.shouldHydrate || layout.hasIsolatedClientBoundaries).length} layouts, and ${clientRouteSlots.length} slots`
   );
-  const clientEntryRoot = path5.join(root, ".farm", "tmp");
+  const clientEntryRoot = path6.join(root, ".farm", "tmp");
   await fs.mkdir(clientEntryRoot, { recursive: true });
-  const clientEntryDir = await fs.mkdtemp(path5.join(clientEntryRoot, "client-entry-"));
-  const clientEntryPath = path5.join(clientEntryDir, "farm-client-entry.tsx");
+  const clientEntryDir = await fs.mkdtemp(path6.join(clientEntryRoot, "client-entry-"));
+  const clientEntryPath = path6.join(clientEntryDir, "farm-client-entry.tsx");
   const clientHydrationCode = generateClientHydrationEntry(
     clientPages,
     clientLayouts,
@@ -2163,7 +2232,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
   if (hasScopedPostcssConfig) {
     logger.info("\u{1F4E6} Using project PostCSS/Tailwind configuration");
   } else {
-    const postcssConfigPath = path5.join(clientEntryDir, "postcss.config.cjs");
+    const postcssConfigPath = path6.join(clientEntryDir, "postcss.config.cjs");
     await fs.writeFile(postcssConfigPath, "module.exports = { plugins: [] };\n");
     postcssSearchPath = clientEntryDir;
     tailwindVitePlugin = await loadTailwindVitePlugin({
@@ -2240,6 +2309,9 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
         ...rendererVitePlugins,
         ...config.vite.plugins || [],
         farmServerOnlyEntriesPlugin(),
+        farmDocsClientConfigPlugin(
+          adapterOwnsDocsRuntime ? getFarmDocsAdapterConfigModule(config.docs) : void 0
+        ),
         // Plugin to redirect @farm.js/core imports to client-only exports
         {
           name: "farm-client-only-imports",
@@ -2322,12 +2394,12 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
 __name(buildClient, "buildClient");
 function toBakedMarkdownSourcePath(root, filePath) {
   if (!filePath) return "";
-  if (!path5.isAbsolute(filePath)) return filePath.split(path5.sep).join("/");
-  const relative = path5.relative(root, filePath);
-  if (!relative || relative.startsWith("..") || path5.isAbsolute(relative)) {
-    return path5.basename(filePath);
+  if (!path6.isAbsolute(filePath)) return filePath.split(path6.sep).join("/");
+  const relative = path6.relative(root, filePath);
+  if (!relative || relative.startsWith("..") || path6.isAbsolute(relative)) {
+    return path6.basename(filePath);
   }
-  return relative.split(path5.sep).join("/");
+  return relative.split(path6.sep).join("/");
 }
 __name(toBakedMarkdownSourcePath, "toBakedMarkdownSourcePath");
 function generateUniversalRouterStateRuntime() {
@@ -3084,8 +3156,8 @@ __farmConfigureApp(__farmAppSetup);` : `import React, { createRoot, hydrateRoot
     root,
     renderer.componentExtensions ?? []
   );
-  const globalsCssPath = path5.join(root, srcDir, "app", "globals.css");
-  const cssImport = existsSync(globalsCssPath) ? `import ${JSON.stringify(toImportPath(globalsCssPath))};` : "";
+  const globalsCssPath = path6.join(root, srcDir, "app", "globals.css");
+  const cssImport = existsSync2(globalsCssPath) ? `import ${JSON.stringify(toImportPath(globalsCssPath))};` : "";
   const layoutImportStatements = [];
   const layoutRegistrations = [];
   layoutRoutes.forEach((layout, index) => {
@@ -3093,8 +3165,10 @@ __farmConfigureApp(__farmAppSetup);` : `import React, { createRoot, hydrateRoot
     if (!layout.hasIsolatedClientBoundaries) {
       layoutImportStatements.push(`import Layout${index} from "${relativePath}";`);
     }
+    const groupScope = getRouteGroupScope(layout.pattern);
+    const groupFields = groupScope ? `, urlPattern: ${JSON.stringify(stripRouteGroups(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");
@@ -3151,7 +3225,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}
@@ -3175,6 +3249,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);
@@ -3438,7 +3513,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)},
@@ -3447,20 +3523,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,
 });
@@ -3474,7 +3552,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; }`;
@@ -3498,7 +3590,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}
@@ -3541,11 +3633,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)
@@ -3614,7 +3719,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;
@@ -3622,22 +3737,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;
@@ -3701,6 +3837,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 [];
@@ -3897,6 +4059,8 @@ async function hydrate() {
           matched,
           pathname,
           searchParams,
+          undefined,
+          window.__FARM_PROPS__,
         );
         if (!routeState) return;
         const shouldHydrate = !isHydrated && Boolean(container.innerHTML.trim());
@@ -4011,6 +4175,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);
@@ -4243,6 +4408,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);
     
@@ -4273,6 +4439,7 @@ ${generateUniversalRouterStateProperties()}
         newPathname,
         searchParams,
         nextPage ? nextPage.innerHTML : "",
+        nextPageProps,
       );
       if (!isNavigationCurrent()) return false;
       if (routeState) {
@@ -4308,6 +4475,8 @@ ${generateUniversalRouterStateProperties()}
         matched,
         newPathname,
         searchParams,
+        undefined,
+        nextPageProps,
       );
       if (!isNavigationCurrent()) return false;
       if (routeState) {
@@ -4474,9 +4643,9 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
     buildLifetime: rendererBuildLifetime
   });
   if (!hasScopedPostcssConfig) {
-    postcssConfigDir = await fs.mkdtemp(path5.join(os.tmpdir(), "farm-postcss-"));
+    postcssConfigDir = await fs.mkdtemp(path6.join(os.tmpdir(), "farm-postcss-"));
     await fs.writeFile(
-      path5.join(postcssConfigDir, "postcss.config.cjs"),
+      path6.join(postcssConfigDir, "postcss.config.cjs"),
       "module.exports = { plugins: [] };\n"
     );
     tailwindVitePlugin = await loadTailwindVitePlugin({
@@ -4601,7 +4770,8 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
   const hasRouteContextConfig = hasCustomFarmRouteContext(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(
@@ -5191,6 +5361,7 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   const servesAgentRobotsTxt = Boolean(config.agent?.crawlers?.enabled) && !applicationMetadataRoutes.some(
     (metadata) => metadata.kind === "robots" && metadata.pattern === "/"
   );
+  const servesAiCatalog = config.agent?.aiCatalog !== false;
   const hasPluginRuntime = hasRuntimeIntegrationConfig || hasServerRuntimePlugins;
   const hasInfraAnalyticsRuntime = config.analytics !== false && resolveFarmInstrumentationRuntime(preset) === "nodejs";
   const hasPrecompiledDocs = Boolean(farmDocsPrecompiledManifest);
@@ -5205,7 +5376,7 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   );
   const hasReactSyncRender = isReactRenderer(config.renderer);
   const rendererServerImports = isReactRenderer(config.renderer) ? `import * as React from "react";
-import * as ReactDOMServer from "react-dom/server";${hasIsolatedClientGraphRuntime ? '\nimport { isolateFarmServerPageGraph, wrapFarmIsolatedClientGraph } from "@farm.js/core/internal/isolated-boundary";' : ""}` : `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);
 }
@@ -5214,9 +5385,17 @@ 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"
   );
@@ -5262,7 +5441,6 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     config.renderer,
     Boolean(unsupportedIntegrationProvider)
   );
-  const layoutAppliesToRoute = /* @__PURE__ */ __name((layoutPattern, routePattern) => layoutPattern === "/" || routePattern === layoutPattern || routePattern.startsWith(`${layoutPattern}/`), "layoutAppliesToRoute");
   const layoutHydrationPlans = layoutRoutes.map((layout) => ({
     ...layout,
     hydration: getCachedClientModuleHydrationPlan(
@@ -5298,11 +5476,12 @@ function isolateFarmRouteServerPage(element) { return element; }`;
       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: route.directory ?? route.pattern,
+      depth: getRouteDirectoryDepth(route.directory ?? route.pattern),
       metadata: pageHydrationPlans.get(route.modulePath)
     })),
-    layoutAppliesToRoute
+    routeBoundaryCoversDirectory
   );
   const providerServerImports = [
     providerServerModules.hasClerkProvider ? `import { ClerkProvider as FarmClerkProvider } from "@clerk/react";` : "",
@@ -5335,7 +5514,8 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     if (isFarmMarkdownPageFile(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(route.source ?? "")},
       filePath: ${JSON.stringify(toBakedMarkdownSourcePath(config.root, route.modulePath))},
@@ -5358,10 +5538,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)},${usesFarmServerTree(clientMetadata) ? "\n    serverTree: true," : ""}${renderingDirective ? `
     rendering: ${JSON.stringify(renderingDirective)},` : ""}
     ${route.source !== void 0 ? `markdownSource: {
       source: ${JSON.stringify(route.source)},
@@ -5402,7 +5583,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)},
@@ -5417,9 +5599,12 @@ function isolateFarmRouteServerPage(element) { return element; }`;
     errorImports.push(
       `import * as ${varName} from ${toVirtualEntryImportSpecifier(errorRoute.modulePath)};`
     );
+    const groupScope = getRouteGroupScope(errorRoute.pattern);
     errorRegistrations.push(`
   {
-    pattern: ${JSON.stringify(errorRoute.pattern)},
+    pattern: ${JSON.stringify(stripRouteGroups(errorRoute.pattern))},${groupScope ? `
+    groupScope: ${JSON.stringify(groupScope)},
+    directoryDepth: ${getRouteDirectoryDepth(errorRoute.pattern)},` : ""}
     module: ${varName},
   }`);
   });
@@ -5475,6 +5660,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,
@@ -5496,13 +5682,18 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   createDefaultErrorMarkup,
   createFarmInstrumentationLifecycle,
   createFarmLayoutSelector,
+  isInFarmRouteGroupScope,
   createFarmCacheKey,
   createFarmMetadataRouteResponse,
   createFarmAgentRobots,
+  createFarmAiCatalogResponse,
   createFarmApiCatalogResponse,
+  createFarmAppManifestResponse,
   collectFarmLlmsTxtPages,
   createFarmDefaultLlmsTxt,
   createFarmLlmsMarkdownReader,
+  listFarmMCPLlmsTxtLinks,
+  registerFarmMCPServer,
   renderFarmLlmsFullTxt,
   createFarmLlmsFullRenderer,
   createFarmThemeDocumentParts,
@@ -5523,6 +5714,9 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   mergeRouteRenderingDirectiveConfig,
   manageFarmLinkHeaderPreloads,
   mergeMetadata,
+  mergeModuleViewport,
+  ensureFarmDocumentMeta,
+  renderViewportHead,
   matchesFarmIfNoneMatch,
   normalizeRevalidatePath,
   reportFarmPreloadWarnings,
@@ -5568,9 +5762,9 @@ import * as farmDocsConfigModule from ${toVirtualEntryImportSpecifier(docsConfig
 import { dirname as farmDocsDirname, join as farmDocsJoin } from "node:path";
 import { fileURLToPath as farmDocsFileURLToPath } from "node:url";` : "";
   const markdownHandlerImport = config.md?.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 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 config.mdx?.components === "string" ? path5.isAbsolute(config.mdx.components) ? config.mdx.components : path5.join(config.root, config.mdx.components) : null;
+  const mdxComponentsPath = typeof config.mdx?.components === "string" ? path6.isAbsolute(config.mdx.components) ? config.mdx.components : path6.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(
@@ -5998,6 +6192,8 @@ const farmDocsHandler = ${config.docs?.enabled ? hasPrecompiledDocs ? "farmDocsP
       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)},
@@ -6014,10 +6210,17 @@ const farmDocsAPIHandler = ${config.docs?.enabled ? hasPrecompiledDocs ? "farmDo
 
 // 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)} })` : ""};
+]${apiRoutes.length > 0 ? `, configuredPlugins, ${JSON.stringify(apiRoutes.map(({ path: path8, methods }) => ({ path: path8, methods })))}, { bodySizeLimit: ${JSON.stringify(config.server.bodySizeLimit)} })` : ""};
 const farmLocalAPIBasePath = ${JSON.stringify(resolveFarmAPIServerBasePath(config.api))};
 const farmOpenAPIReference = ${JSON.stringify(openAPIReference)};
 ${config.agent?.apiCatalog ? `const farmApiCatalogInput = ${JSON.stringify(resolveFarmApiCatalogInput(config))};
+` : ""}${config.analytics !== false ? `const farmAppManifestInput = ${JSON.stringify(
+    resolveFarmAppManifestInput(config, {
+      build: config.deploymentId,
+      packages: resolveFarmAppPackages(config.root),
+      webmcpTools: config.plugins.some(({ name }) => name === "farm:webmcp") ? collectFarmWebMCPTools(config.root, config.srcDir) : []
+    })
+  )};
 ` : ""}
 function isFarmLocalAPIPathname(pathname) {
   return farmLocalAPIBasePath !== "/" &&
@@ -6043,7 +6246,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(",")}
 ];
@@ -6086,9 +6289,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);
 }
 
@@ -6689,6 +6895,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;
@@ -6698,9 +6905,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 };
     }
   }
 
@@ -6924,6 +7140,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.
@@ -7030,6 +7250,7 @@ const farmMiddlewareRunner = ${hasMiddlewareRuntime ? `createProductionMiddlewar
   modules: fileMiddlewareModules,
   i18n: farmI18nConfig,
   server: farmServerConfig,
+  apiBasePath: farmLocalAPIBasePath,
 })` : "null"};
 
 ${apiHandlerCode}
@@ -7272,11 +7493,18 @@ 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;
@@ -7450,6 +7678,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;
@@ -7631,6 +7865,20 @@ async function handleFarmRequestInContext(
   const middlewareHeaders = ${hasServerRuntimeIntegrations ? "withFarmIntegrationSetCookies(undefined, farmIntegrationSetCookies)" : "undefined"};
   `}
 
+  ${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);
+  }
+  ` : ""}
+
   ${config.docs?.enabled ? `
   // Docs responses are served after app middleware so route guards and
   // middleware headers apply to the docs engine like any other page content.
@@ -7662,7 +7910,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,
@@ -7670,9 +7919,12 @@ 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);
   }
   ` : ""}
 
@@ -7775,6 +8027,17 @@ async function handleFarmRequestInContext(
     return applyProductionMiddlewareHeaders(applicationMetadataResponse, middlewareHeaders);
   }
   ` : ""}
+  ${config.analytics !== false ? `
+  // /.well-known/farmjs: the app's manifest, only for a request Farm Infra signed.
+  if (normalizeRuntimePath(routePathname) === ${JSON.stringify(FARM_APP_MANIFEST_PATH)}) {
+    const farmAppManifest = await createFarmAppManifestResponse(request, farmAppManifestInput, {
+      development: false,
+    });
+    if (farmAppManifest) {
+      return applyProductionMiddlewareHeaders(farmAppManifest, middlewareHeaders);
+    }
+  }
+  ` : ""}
   ${config.agent?.apiCatalog ? `
   // agent.apiCatalog: list the OpenAPI and MCP surfaces at the RFC 9727 path.
   if (normalizeRuntimePath(routePathname) === ${JSON.stringify(FARM_API_CATALOG_PATH)}) {
@@ -7913,13 +8176,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,
       );
@@ -7972,6 +8241,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
@@ -8006,6 +8279,7 @@ async function handleFarmRequestInContext(
         } catch (routeStateError) {
           if (isFarmRedirectError(routeStateError)) throw routeStateError;
 
+          routeStateRejected = true;
           const routeComponents = route.module.__farmRouteComponents;
           const routeStateProps = {
             ...rawPageProps,
@@ -8095,7 +8369,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,
@@ -8145,7 +8421,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(
@@ -8172,7 +8450,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",
                     {
@@ -8217,7 +8495,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({
@@ -8239,14 +8517,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");
@@ -8275,10 +8561,22 @@ async function handleFarmRequestInContext(
           getFarmMarkdownAlternatePath(farmMarkdownConfig, pathname),
         );` : ""}
 
+        // 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(config.agent?.jsonLd ?? false)} });
         const title = renderedMetadata.title;
         const metaTags = renderedMetadata.tags;
         const hasFavicon = renderedMetadata.hasFavicon;
+        const viewportTags = renderedMetadata.viewport;
 
         const hasPrivateRequestHeaders = hasPrivateFarmRequestHeaders(
           request,
@@ -8286,6 +8584,7 @@ async function handleFarmRequestInContext(
         );
         const hasRequestScopedRender = Boolean(
           pageStatus >= 400 ||
+          renderReadRequest ||
           request.headers.get("x-farm-intercept-from") ||
           hasPrivateRequestHeaders ||
           hasConfiguredRouteContext ||
@@ -8329,7 +8628,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' +
@@ -8460,6 +8759,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;
@@ -8470,7 +8772,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__">
@@ -8720,7 +9022,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--) {
@@ -8764,6 +9067,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;
       }
@@ -8772,7 +9076,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}
@@ -9037,23 +9341,20 @@ function configMiddlewareMayHandlePath(config, pathname) {
   if (!hasFarmMiddlewareConfig(config)) return false;
   const entries = Array.isArray(config) ? config : [config];
   return entries.some((entry) => {
-    if (entry.exclude?.some((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 = compileMiddlewareConfig({ matcher: matchers, exclude: entry.exclude });
+    return matchesCompiledMiddlewareConfig(pathname, compiled, {}).matched;
   });
 }
 __name(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) => matchesMiddlewareRoute(pathname, route).matched);
 }
 __name(appMiddlewareMayHandlePath, "appMiddlewareMayHandlePath");
 function routePatternSpecificity(pattern) {
@@ -9120,8 +9421,8 @@ async function buildNitroUniversal(config, routeManager, apiRouteManager, server
   const isVercel = preset === "vercel" || preset === "vercel-edge";
   const isCloudflareWorker = preset === "cloudflare-module";
   const outputDir = resolveDeployOutputPath(root, config.deploy.outputDir);
-  const runtimeServerOutputDir = isVercel ? path5.join(outputDir, "functions", "__nitro.func") : path5.join(outputDir, "server");
-  const ssrOutputDir = path5.join(root, distDir, "ssr");
+  const runtimeServerOutputDir = isVercel ? path6.join(outputDir, "functions", "__nitro.func") : path6.join(outputDir, "server");
+  const ssrOutputDir = path6.join(root, distDir, "ssr");
   const imageRuntime = resolveImageRuntime(config, preset);
   const hasGeneratedMetadataImages = Array.from(routeManager.getMetadataImages().values()).some(
     (image) => image.sourceType === "module"
@@ -9205,11 +9506,11 @@ async function buildNitroUniversal(config, routeManager, apiRouteManager, server
   }
   await fs.mkdir(ssrOutputDir, { recursive: true });
   for (const [fileName, output] of Object.entries(ssrBundle)) {
-    const filePath = path5.join(ssrOutputDir, fileName);
-    await fs.mkdir(path5.dirname(filePath), { recursive: true });
+    const filePath = path6.join(ssrOutputDir, fileName);
+    await fs.mkdir(path6.dirname(filePath), { recursive: true });
     await fs.writeFile(filePath, output.type === "chunk" ? output.code : output.source);
   }
-  const nitroEntryPath = path5.join(ssrOutputDir, "nitro-entry.mjs");
+  const nitroEntryPath = path6.join(ssrOutputDir, "nitro-entry.mjs");
   const nodeAdapterModule = preset === "node-server" ? resolveNitroRuntimeDependency(root, "srvx/node") : null;
   const nitroEntryCode = `
 // Farm.js Nitro Entry
@@ -9362,18 +9663,27 @@ function toFarmNodeResponse(request, response) {
 }` : ""}
   `.trim();
   await fs.writeFile(nitroEntryPath, nitroEntryCode);
-  const farmNodeServerEntryPath = preset === "node-server" ? path5.join(ssrOutputDir, "farm-node-server-entry.mjs") : null;
+  const farmNodeServerEntryPath = preset === "node-server" ? path6.join(ssrOutputDir, "farm-node-server-entry.mjs") : null;
   if (farmNodeServerEntryPath && nodeAdapterModule) {
     await fs.writeFile(
       farmNodeServerEntryPath,
       createFarmNodeServerEntry({
-        nitroEntryFile: path5.basename(nitroEntryPath),
+        nitroEntryFile: path6.basename(nitroEntryPath),
         nodeAdapterModule,
         server: config.server,
         websocketAdapterModule: resolveNitroRuntimeDependency(root, "crossws/adapters/node")
       })
     );
   }
+  const farmNetlifyEntryPath = preset === "netlify" ? path6.join(ssrOutputDir, "farm-netlify-entry.mjs") : null;
+  if (farmNetlifyEntryPath) {
+    await fs.writeFile(
+      farmNetlifyEntryPath,
+      createFarmNetlifyEntry({
+        nitroNetlifyEntry: resolveNitroNetlifyEntry(resolveNitroPackageEntry(root))
+      })
+    );
+  }
   const prebuiltSSRPlugin = createExternalSSRBundlePlugin(
     nitroEntryPath,
     ssrOutputDir,
@@ -9399,6 +9709,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/`,
@@ -9406,7 +9717,7 @@ function toFarmNodeResponse(request, response) {
     // `src` directory), as Nitro handlers outside Farm's aliases.
     serverDir: false,
     serverEntry: false,
-    buildDir: path5.join(root, distDir, ".nitro"),
+    buildDir: path6.join(root, distDir, ".nitro"),
     alias: resolveNitroInternalRuntimeAliases(root),
     compatibilityDate: "2024-12-01",
     output: resolveFarmNitroOutputConfig(preset, outputDir),
@@ -9482,7 +9793,7 @@ function toFarmNodeResponse(request, response) {
   if (pluginManager) {
     nitroConfig = await pluginManager.runHookSerial("beforeNitroBuild", nitroConfig);
   }
-  const expectedServerDir = path5.join(outputDir, "server");
+  const expectedServerDir = path6.join(outputDir, "server");
   const customRollupKeys = Object.keys(nitroConfig.rollupConfig || {}).filter(
     (key) => key !== "external" && key !== "plugins"
   );
@@ -9495,9 +9806,9 @@ function toFarmNodeResponse(request, response) {
     snapshotSSRRebundleOptions(nitroConfig)
   );
   const requestedBuilder = 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 && nitroConfig.rollupConfig?.external === nitroRollupExternal && !hasRollupPlugins(nitroConfig.rollupConfig?.plugins) && customRollupKeys.length === 0 && path5.resolve(nitroConfig.output?.serverDir || "") === path5.resolve(expectedServerDir) && Boolean(
+  const canReusePrebuiltSSR = isPrebuiltSSRCandidate && nitroConfig.preset === "node-server" && (requestedBuilder === void 0 || requestedBuilder === "rollup" || requestedBuilder === "rolldown") && nitroConfig.sourcemap === false && !hasCustomOxcOptions && !hasLateBuildMutationConfig && !hasUnsupportedSSRRebundleOverrides && nitroConfig.rollupConfig?.external === nitroRollupExternal && !hasRollupPlugins(nitroConfig.rollupConfig?.plugins) && customRollupKeys.length === 0 && path6.resolve(nitroConfig.output?.serverDir || "") === path6.resolve(expectedServerDir) && Boolean(
     nitroConfig.handlers?.some(
-      (handler) => path5.resolve(handler?.handler || "") === nitroEntryPath
+      (handler) => path6.resolve(handler?.handler || "") === nitroEntryPath
     )
   );
   const selectRolldownBuilder = canReusePrebuiltSSR && requestedBuilder === void 0 && await canUseRolldownBuilder();
@@ -9558,7 +9869,7 @@ function toFarmNodeResponse(request, response) {
       nitroInstance.routing.sync();
     });
   }
-  if (farmNodeServerEntryPath) {
+  if (farmNodeServerEntryPath || farmNetlifyEntryPath) {
     nitroInstance.hooks.hook("prerender:config", (prerendererConfig) => {
       delete prerendererConfig.entry;
     });
@@ -9584,10 +9895,10 @@ function toFarmNodeResponse(request, response) {
         });
       }
       prerenderer.hooks.hook("compiled", async () => {
-        const prerenderServerDir = path5.join(outputDir, "server");
+        const prerenderServerDir = path6.join(outputDir, "server");
         await copyPrebuiltSSRBundle(
           ssrBundle,
-          path5.join(prerenderServerDir, FARM_SSR_OUTPUT_DIR),
+          path6.join(prerenderServerDir, FARM_SSR_OUTPUT_DIR),
           null,
           fs
         );
@@ -9660,7 +9971,7 @@ function toFarmNodeResponse(request, response) {
   const copyResults = await Promise.allSettled([
     prebuiltSSRFilesResult.value ? writeSSRBundleFiles(
       prebuiltSSRFilesResult.value,
-      path5.join(outputDir, "server", FARM_SSR_OUTPUT_DIR),
+      path6.join(outputDir, "server", FARM_SSR_OUTPUT_DIR),
       fs
     ) : Promise.resolve(),
     runtimeCopyPromise
@@ -9670,7 +9981,7 @@ function toFarmNodeResponse(request, response) {
   );
   if (failedCopy) throw failedCopy.reason;
   if (canReusePrebuiltSSR) {
-    await registerPrebuiltSSRPackageImport(path5.join(outputDir, "server"), ssrEntryFile, fs);
+    await registerPrebuiltSSRPackageImport(path6.join(outputDir, "server"), ssrEntryFile, fs);
     logger.info("\u26A1 Reused Farm's prebuilt SSR bundle for the Node output");
   }
   if (useRolldownBuilder) {
@@ -9695,11 +10006,11 @@ function resolveFarmNitroOutputConfig(preset, outputDir) {
   return {
     dir: outputDir,
     ...preset === "node-server" ? {
-      serverDir: path5.join(outputDir, "server"),
-      publicDir: path5.join(outputDir, "public")
+      serverDir: path6.join(outputDir, "server"),
+      publicDir: path6.join(outputDir, "public")
     } : isVercel ? {
-      serverDir: path5.join(outputDir, "functions", "__nitro.func"),
-      publicDir: path5.join(outputDir, "static")
+      serverDir: path6.join(outputDir, "functions", "__nitro.func"),
+      publicDir: path6.join(outputDir, "static")
     } : {}
   };
 }
@@ -9717,8 +10028,8 @@ async function writeSSRBundleFiles(files, targetDir, fs) {
   await fs.rm(targetDir, { recursive: true, force: true });
   await Promise.all(
     files.map(async ({ fileName, contents }) => {
-      const targetPath = path5.join(targetDir, fileName);
-      await fs.mkdir(path5.dirname(targetPath), { recursive: true });
+      const targetPath = path6.join(targetDir, fileName);
+      await fs.mkdir(path6.dirname(targetPath), { recursive: true });
       await fs.writeFile(targetPath, contents);
     })
   );
@@ -9729,7 +10040,7 @@ async function copyPrebuiltSSRBundle(ssrBundle, targetDir, minifyOptions, fs) {
 }
 __name(copyPrebuiltSSRBundle, "copyPrebuiltSSRBundle");
 async function registerPrebuiltSSRPackageImport(serverDir, ssrEntryFile, fs) {
-  const packagePath = path5.join(serverDir, "package.json");
+  const packagePath = path6.join(serverDir, "package.json");
   const packageJSON = await fs.readFile(packagePath, "utf8").then((contents) => JSON.parse(contents)).catch((error) => {
     if (error.code === "ENOENT") return { type: "module" };
     throw error;
@@ -9760,18 +10071,18 @@ async function moveVercelOutputPath(src, dest, fs) {
 }
 __name(moveVercelOutputPath, "moveVercelOutputPath");
 async function postProcessVercelOutput(root, outputDir, fs, config, farmWorkflows, routeRuntimeManifest) {
-  const serverDir = path5.join(outputDir, "server");
-  const functionsDir = path5.join(outputDir, "functions");
-  const nitroFuncDir = path5.join(functionsDir, "__nitro.func");
-  const staticDir = path5.join(outputDir, "static");
-  const publicDir = path5.join(outputDir, "public");
+  const serverDir = path6.join(outputDir, "server");
+  const functionsDir = path6.join(outputDir, "functions");
+  const nitroFuncDir = path6.join(functionsDir, "__nitro.func");
+  const staticDir = path6.join(outputDir, "static");
+  const publicDir = path6.join(outputDir, "public");
   await fs.mkdir(nitroFuncDir, { recursive: true });
   const serverContents = await fs.readdir(serverDir).catch((error) => {
     if (error.code === "ENOENT") return [];
     throw error;
   });
   for (const file of serverContents) {
-    await moveVercelOutputPath(path5.join(serverDir, file), path5.join(nitroFuncDir, file), fs);
+    await moveVercelOutputPath(path6.join(serverDir, file), path6.join(nitroFuncDir, file), fs);
   }
   if (serverContents.length > 0) await fs.rm(serverDir, { recursive: true, force: true });
   try {
@@ -9781,7 +10092,7 @@ async function postProcessVercelOutput(root, outputDir, fs, config, farmWorkflow
   }
   await copyFarmDocsContentForVercel(config, root, nitroFuncDir, fs);
   await copyPrismaClientForVercel(root, nitroFuncDir, fs);
-  const configPath = path5.join(outputDir, "config.json");
+  const configPath = path6.join(outputDir, "config.json");
   const configContent = await fs.readFile(configPath, "utf-8");
   const vercelConfig = JSON.parse(configContent);
   const runtimeRoutes = await createFarmVercelRouteRuntimeFunctions(
@@ -9809,22 +10120,22 @@ __name(postProcessVercelOutput, "postProcessVercelOutput");
 async function copyFarmDocsContentForVercel(config, root, nitroFuncDir, fs) {
   const docsContentDir = resolveBuildDocsContentDir(config, root);
   if (!docsContentDir) return;
-  const bundledContentDir = path5.join(nitroFuncDir, "farm-docs-content");
+  const bundledContentDir = path6.join(nitroFuncDir, "farm-docs-content");
   const lastModifiedManifest = createFarmDocsLastModifiedManifest(docsContentDir, {
     fallback: "now"
   });
   await fs.rm(bundledContentDir, { recursive: true, force: true });
-  await fs.mkdir(path5.dirname(bundledContentDir), { recursive: true });
+  await fs.mkdir(path6.dirname(bundledContentDir), { recursive: true });
   await fs.cp(docsContentDir, bundledContentDir, {
     recursive: true,
     force: true
   });
   await fs.writeFile(
-    path5.join(bundledContentDir, FARM_DOCS_LAST_MODIFIED_MANIFEST),
+    path6.join(bundledContentDir, FARM_DOCS_LAST_MODIFIED_MANIFEST),
     `${JSON.stringify(lastModifiedManifest, null, 2)}
 `
   );
-  logger.info(`\u{1F4DA} Bundled docs content for Vercel: ${path5.relative(root, docsContentDir)}`);
+  logger.info(`\u{1F4DA} Bundled docs content for Vercel: ${path6.relative(root, docsContentDir)}`);
 }
 __name(copyFarmDocsContentForVercel, "copyFarmDocsContentForVercel");
 function resolveServerFunctionPlatform(preset) {
@@ -9845,7 +10156,7 @@ function platformFieldAllows(field, value) {
 __name(platformFieldAllows, "platformFieldAllows");
 async function stageSharpRuntime(config, root, distDir, fs, preset) {
   const functionPlatform = resolveServerFunctionPlatform(preset);
-  const projectRequire = createRequire(path5.join(root, "package.json"));
+  const projectRequire = createRequire(path6.join(root, "package.json"));
   let sharpRequire = projectRequire;
   if (!resolvePackageJson(projectRequire, "sharp")) {
     try {
@@ -9855,10 +10166,10 @@ async function stageSharpRuntime(config, root, distDir, fs, preset) {
   }
   const copiedPackages = /* @__PURE__ */ new Map();
   const packageCopies = /* @__PURE__ */ new Map();
-  const stageRoot = path5.join(root, distDir, "tmp");
+  const stageRoot = path6.join(root, distDir, "tmp");
   await fs.mkdir(stageRoot, { recursive: true });
-  const stageDir = await fs.mkdtemp(path5.join(stageRoot, "sharp-runtime-"));
-  const targetNodeModules = path5.join(stageDir, "node_modules");
+  const stageDir = await fs.mkdtemp(path6.join(stageRoot, "sharp-runtime-"));
+  const targetNodeModules = path6.join(stageDir, "node_modules");
   function copyPackage(packageName, parentRequire) {
     const activeCopy = packageCopies.get(packageName);
     if (activeCopy) return activeCopy;
@@ -9872,10 +10183,10 @@ async function stageSharpRuntime(config, root, distDir, fs, preset) {
     if (!packageJsonPath) return;
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, "utf8"));
     if (functionPlatform && !packageSupportsPlatform(packageJson, functionPlatform)) return;
-    const packageDir = path5.dirname(packageJsonPath);
-    const targetDir = path5.join(targetNodeModules, ...packageName.split("/"));
+    const packageDir = path6.dirname(packageJsonPath);
+    const targetDir = path6.join(targetNodeModules, ...packageName.split("/"));
     copiedPackages.set(packageName, String(packageJson.version || "*"));
-    await fs.mkdir(path5.dirname(targetDir), { recursive: true });
+    await fs.mkdir(path6.dirname(targetDir), { recursive: true });
     const packageRequire = createRequire(packageJsonPath);
     const dependencies = {
       ...packageJson.dependencies,
@@ -9912,8 +10223,8 @@ async function stageSharpRuntime(config, root, distDir, fs, preset) {
 }
 __name(stageSharpRuntime, "stageSharpRuntime");
 async function installStagedSharpRuntime(staged, nitroFuncDir, fs) {
-  const stagedNodeModules = path5.join(staged.stageDir, "node_modules");
-  const targetNodeModules = path5.join(nitroFuncDir, "node_modules");
+  const stagedNodeModules = path6.join(staged.stageDir, "node_modules");
+  const targetNodeModules = path6.join(nitroFuncDir, "node_modules");
   try {
     await mergeStagedDirectory(stagedNodeModules, targetNodeModules, fs);
     const functionPackage = await readNitroOutputPackage(nitroFuncDir, fs);
@@ -9943,8 +10254,8 @@ async function mergeStagedDirectory(sourceDir, targetDir, fs) {
   const entries = await fs.readdir(sourceDir, { withFileTypes: true });
   await settleAllOrThrow(
     entries.map(async (entry) => {
-      const sourcePath = path5.join(sourceDir, entry.name);
-      const targetPath = path5.join(targetDir, entry.name);
+      const sourcePath = path6.join(sourceDir, entry.name);
+      const targetPath = path6.join(targetDir, entry.name);
       try {
         await fs.rename(sourcePath, targetPath);
         return;
@@ -9972,14 +10283,14 @@ __name(mergeStagedDirectory, "mergeStagedDirectory");
 function assertMetadataImageRuntimeInstalled(root, metadataImageRoutes) {
   const generated = metadataImageRoutes.find((image) => image.sourceType === "module");
   if (!generated || resolveMetadataImageRuntimePackageJson(root)) return;
-  const file = generated.modulePath ? toPosixPath(path5.relative(root, generated.modulePath)) : "";
+  const file = generated.modulePath ? toPosixPath(path6.relative(root, generated.modulePath)) : "";
   throw new Error(
     `${file || "A generated metadata image"} renders with @vercel/og, which is not installed. ${VERCEL_OG_INSTALL_HINT}`
   );
 }
 __name(assertMetadataImageRuntimeInstalled, "assertMetadataImageRuntimeInstalled");
 function resolveMetadataImageRuntimePackageJson(root) {
-  const projectRequire = createRequire(path5.join(root, "package.json"));
+  const projectRequire = createRequire(path6.join(root, "package.json"));
   const packageJsonPath = resolvePackageJson(projectRequire, "@vercel/og");
   if (packageJsonPath) return packageJsonPath;
   try {
@@ -9993,9 +10304,9 @@ async function copyMetadataImageRuntime(root, nitroFuncDir, fs) {
   const packageJsonPath = resolveMetadataImageRuntimePackageJson(root);
   if (!packageJsonPath) return;
   const packageJson = JSON.parse(await fs.readFile(packageJsonPath, "utf8"));
-  const packageDir = path5.dirname(packageJsonPath);
-  const targetDir = path5.join(nitroFuncDir, "node_modules", "@vercel", "og");
-  await fs.mkdir(path5.dirname(targetDir), { recursive: true });
+  const packageDir = path6.dirname(packageJsonPath);
+  const targetDir = path6.join(nitroFuncDir, "node_modules", "@vercel", "og");
+  await fs.mkdir(path6.dirname(targetDir), { recursive: true });
   await fs.cp(packageDir, targetDir, {
     recursive: true,
     force: true,
@@ -10012,7 +10323,7 @@ async function copyMetadataImageRuntime(root, nitroFuncDir, fs) {
 }
 __name(copyMetadataImageRuntime, "copyMetadataImageRuntime");
 async function readNitroOutputPackage(outputDir, fs) {
-  const packagePath = path5.join(outputDir, "package.json");
+  const packagePath = path6.join(outputDir, "package.json");
   return fs.readFile(packagePath, "utf8").then((contents) => JSON.parse(contents)).catch((error) => {
     if (error.code === "ENOENT") return {};
     throw error;
@@ -10022,7 +10333,7 @@ __name(readNitroOutputPackage, "readNitroOutputPackage");
 async function writeNitroOutputPackage(outputDir, packageJson, fs) {
   await fs.mkdir(outputDir, { recursive: true });
   await fs.writeFile(
-    path5.join(outputDir, "package.json"),
+    path6.join(outputDir, "package.json"),
     `${JSON.stringify(packageJson, null, 2)}
 `
   );
@@ -10039,18 +10350,18 @@ function resolvePackageJson(parentRequire, packageName) {
     }
   }
   try {
-    let directory = path5.dirname(metadataModule ?? parentRequire.resolve(packageName));
-    while (directory !== path5.dirname(directory)) {
-      const candidate = path5.join(directory, "package.json");
-      if (existsSync(candidate)) {
+    let directory = path6.dirname(metadataModule ?? parentRequire.resolve(packageName));
+    while (directory !== path6.dirname(directory)) {
+      const candidate = path6.join(directory, "package.json");
+      if (existsSync2(candidate)) {
         try {
           const manifest = JSON.parse(readFileSync(candidate, "utf8"));
           if (manifest.name === packageName) return candidate;
         } catch {
         }
       }
-      if (path5.basename(directory) === "node_modules") break;
-      directory = path5.dirname(directory);
+      if (path6.basename(directory) === "node_modules") break;
+      directory = path6.dirname(directory);
     }
   } catch {
   }
@@ -10058,23 +10369,23 @@ function resolvePackageJson(parentRequire, packageName) {
 }
 __name(resolvePackageJson, "resolvePackageJson");
 async function copyPrismaClientForVercel(root, nitroFuncDir, fs) {
-  const projectRequire = createRequire(path5.join(root, "package.json"));
+  const projectRequire = createRequire(path6.join(root, "package.json"));
   let prismaClientDir;
   try {
-    prismaClientDir = path5.dirname(projectRequire.resolve("@prisma/client/default.js"));
+    prismaClientDir = path6.dirname(projectRequire.resolve("@prisma/client/default.js"));
   } catch {
     return;
   }
-  const generatedClientDir = path5.join(prismaClientDir, "..", "..", ".prisma", "client");
+  const generatedClientDir = path6.join(prismaClientDir, "..", "..", ".prisma", "client");
   try {
     await fs.access(generatedClientDir);
   } catch {
     return;
   }
-  const targetNodeModules = path5.join(nitroFuncDir, "node_modules");
-  const targetPrismaScopeDir = path5.join(targetNodeModules, "@prisma");
-  const targetGeneratedDir = path5.join(targetNodeModules, ".prisma", "client");
-  const targetClientDir = path5.join(targetPrismaScopeDir, "client");
+  const targetNodeModules = path6.join(nitroFuncDir, "node_modules");
+  const targetPrismaScopeDir = path6.join(targetNodeModules, "@prisma");
+  const targetGeneratedDir = path6.join(targetNodeModules, ".prisma", "client");
+  const targetClientDir = path6.join(targetPrismaScopeDir, "client");
   await fs.mkdir(targetPrismaScopeDir, { recursive: true });
   await fs.cp(prismaClientDir, targetClientDir, {
     recursive: true,
@@ -10084,7 +10395,7 @@ async function copyPrismaClientForVercel(root, nitroFuncDir, fs) {
     recursive: true,
     force: true
   });
-  const clientPackagePath = path5.join(prismaClientDir, "package.json");
+  const clientPackagePath = path6.join(prismaClientDir, "package.json");
   const [functionPackage, clientPackageContent] = await Promise.all([
     readNitroOutputPackage(nitroFuncDir, fs),
     fs.readFile(clientPackagePath, "utf-8")
@@ -10243,9 +10554,9 @@ async function buildWithProductionNodeEnv(inputConfig, options) {
     } else {
       const { build: legacyViteBuild } = await import("vite");
       logger.info("\u{1F4E6} Building client bundle...");
-      await buildClient2(legacyViteBuild, config, root, srcDir, path6.join(root, distDir, "client"));
+      await buildClient2(legacyViteBuild, config, root, srcDir, path7.join(root, distDir, "client"));
       logger.info("\u{1F4E6} Building SSR bundle...");
-      await buildSSR(legacyViteBuild, config, root, srcDir, path6.join(root, distDir, "server"));
+      await buildSSR(legacyViteBuild, config, root, srcDir, path7.join(root, distDir, "server"));
       logger.info(`\u{1F680} Building server with Nitro (preset: ${preset})...`);
       await buildNitro(
         config,
@@ -10425,17 +10736,17 @@ async function buildSSR(viteBuild, config, root, srcDir, outputDir) {
 }
 __name(buildSSR, "buildSSR");
 function resolveLegacyPageEntry(config, root, srcDir) {
-  const appDir = path6.join(root, srcDir, "app");
+  const appDir = path7.join(root, srcDir, "app");
   for (const extension of getFarmRendererComponentExtensions(config.renderer)) {
-    const candidate = path6.join(appDir, `page${extension}`);
-    if (existsSync2(candidate)) return candidate;
+    const candidate = path7.join(appDir, `page${extension}`);
+    if (existsSync3(candidate)) return candidate;
   }
-  return path6.join(appDir, "page.tsx");
+  return path7.join(appDir, "page.tsx");
 }
 __name(resolveLegacyPageEntry, "resolveLegacyPageEntry");
 async function buildNitro(config, routeManager, apiRouteManager, serverRenderer, preset, root, distDir, pluginManager) {
   const [{ createNitroConfig }, { createNitro, build: nitroBuild }] = await Promise.all([
-    import("./nitro-NAKCRVHX.mjs"),
+    import("./nitro-MXRDCXWZ.mjs"),
     import("nitro/builder")
   ]);
   let nitroConfig = await createNitroConfig(
@@ -10449,18 +10760,18 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
     nitroConfig = await pluginManager.runHookSerial("beforeNitroBuild", nitroConfig);
   }
   const outputDir = resolveDeployOutputPath(root, config.deploy.outputDir);
-  const serverOutputDir = path6.join(outputDir, "server");
-  const publicOutputDir = path6.join(outputDir, "public");
+  const serverOutputDir = path7.join(outputDir, "server");
+  const publicOutputDir = path7.join(outputDir, "public");
   const { mkdir, cp } = await import("fs/promises");
   await mkdir(serverOutputDir, { recursive: true });
   await mkdir(publicOutputDir, { recursive: true });
-  const clientDir = path6.join(root, distDir, "client");
+  const clientDir = path7.join(root, distDir, "client");
   try {
     await mkdir(publicOutputDir, { recursive: true });
     await cp(clientDir, publicOutputDir, { recursive: true });
     logger.info("\u{1F4E6} Copied client assets to public directory");
-    const manifestPath = path6.join(publicOutputDir, "farm-client-manifest.json");
-    const assetsDir = path6.join(publicOutputDir, "assets");
+    const manifestPath = path7.join(publicOutputDir, "farm-client-manifest.json");
+    const assetsDir = path7.join(publicOutputDir, "assets");
     const manifestExists = await import("fs/promises").then(
       (fs) => fs.access(manifestPath).then(() => true).catch(() => false)
     );
@@ -10476,8 +10787,8 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
     logger.error(`\u274C Failed to copy client assets: ${error}`);
     throw error;
   }
-  const serverDir = path6.join(root, distDir, "server");
-  const nitroServerDir = path6.join(root, distDir, ".nitro", "server", "farm");
+  const serverDir = path7.join(root, distDir, "server");
+  const nitroServerDir = path7.join(root, distDir, ".nitro", "server", "farm");
   try {
     await mkdir(nitroServerDir, { recursive: true });
     await cp(serverDir, nitroServerDir, { recursive: true });
@@ -10486,7 +10797,7 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
     logger.warn(`Could not copy SSR bundles: ${error}`);
   }
   const nitro = await createNitro(nitroConfig);
-  const registryPath = path6.join(root, distDir, ".nitro", "server", "farm-registry.ts");
+  const registryPath = path7.join(root, distDir, ".nitro", "server", "farm-registry.ts");
   try {
     const { farmRegistry } = await import(
       /* @vite-ignore */
@@ -10503,7 +10814,7 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
     }
     farmRegistry.routePaths = routePaths;
     try {
-      const clientManifestPath = path6.join(root, distDir, "client", "farm-client-manifest.json");
+      const clientManifestPath = path7.join(root, distDir, "client", "farm-client-manifest.json");
       const { readFile } = await import("fs/promises");
       const manifestContent = await readFile(clientManifestPath, "utf-8");
       farmRegistry.clientManifest = JSON.parse(manifestContent);