@farm.js/core 0.1.34 → 0.1.35

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

@@ -10,7 +10,7 @@ import {
 import {
   compileFarmDocsAdapterEdgeManifest,
   createFarmDocsAPIHandler
-} from "./chunk-U4PTAHW3.mjs";
+} from "./chunk-SOMHP6GF.mjs";
 import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsHandler,
@@ -20,7 +20,7 @@ import {
   loadFarmDocsPage,
   resolveFarmDocsContentDir,
   toFarmDocsMarkdownPage
-} from "./chunk-O27L4YAA.mjs";
+} from "./chunk-PDOCJ6RY.mjs";
 import {
   generateFarmDocsSearchClientRuntime,
   isFarmDocsSearchEnabled,
@@ -37,7 +37,7 @@ import {
   getDeployTargetForPreset,
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-ZKP7C2B6.mjs";
+} from "./chunk-6DU6UFUE.mjs";
 import {
   resolveFarmInstrumentationFile
 } from "./chunk-ZZSRYEYU.mjs";
@@ -47,7 +47,6 @@ import {
 import {
   DEFAULT_NOT_FOUND_STYLES,
   FARM_LAYOUT_ELEMENT_CLIENT_SOURCE,
-  HOISTED_HEAD_ELEMENT,
   PluginManager,
   SHARP_INSTALL_HINT,
   collectFarmWebMCPTools,
@@ -57,6 +56,7 @@ import {
   createMarkdownPageHydrationPlanner,
   describeSuppressedAsyncHydration,
   enforceFarmIsolatedHydrationRouteBudget,
+  farmDocsClientConfigPlugin,
   farmFontImportsPlugin,
   farmPluginMayAffectRuntimePath,
   generateClientCachePersistenceCode,
@@ -74,20 +74,26 @@ import {
   resolveFarmClientCacheAdapterEntry,
   resolveFarmImageProviderForRuntime,
   resolveFarmIsolatedClientHydrationMode,
-  resolveFarmNotFoundComponentPath
-} from "./chunk-XV5DJTBX.mjs";
+  resolveFarmNotFoundComponentPath,
+  usesFarmServerTree
+} from "./chunk-4KU5Q7C2.mjs";
 import {
   findRequestBoundSourceBlockers,
   generateFarmTypeArtifacts,
   parseRouteRenderingDirective,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-AQZFOP7S.mjs";
+} from "./chunk-2G2NNLE2.mjs";
 import {
   FARM_API_CATALOG_PATH,
   FARM_APP_MANIFEST_PATH,
+  HOISTED_HEAD_ELEMENT,
+  getRouteDirectoryDepth,
+  getRouteGroupScope,
   resolveFarmApiCatalogInput,
-  resolveFarmAppManifestInput
-} from "./chunk-GOABMOX3.mjs";
+  resolveFarmAppManifestInput,
+  routeBoundaryCoversDirectory,
+  stripRouteGroups
+} from "./chunk-6ETPZTJI.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
@@ -97,7 +103,7 @@ import {
 import {
   generateFarmDocsAdapterClientRuntime,
   getFarmDocsAdapterConfigModule
-} from "./chunk-VVBO3QH7.mjs";
+} from "./chunk-ENLZ4R3Y.mjs";
 import {
   resolveFarmDocsFontAssets,
   toFarmDocsPublicFontAssets
@@ -119,7 +125,7 @@ import {
 } from "./chunk-DAATZTKJ.mjs";
 import {
   applyFarmCspHashesToHtml
-} from "./chunk-NGVORZVZ.mjs";
+} from "./chunk-UJD4PHYB.mjs";
 import {
   applyFarmCronVercelCrons,
   createFarmCronCloudflareConfig,
@@ -131,27 +137,27 @@ import {
 } from "./chunk-4OOBRCJX.mjs";
 import {
   isFarmMarkdownPageFile
-} from "./chunk-AGC75XAE.mjs";
+} from "./chunk-4JHOT46A.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
 } from "./chunk-FA2W42OV.mjs";
 import {
   getFarmMarkdownAlternatePath
-} from "./chunk-ZUSJDQ2Q.mjs";
+} from "./chunk-WWIKMBRN.mjs";
 import {
   applyFarmWorkflowVercelCrons,
   prepareFarmWorkflowsForNitro
-} from "./chunk-3ATMYLLJ.mjs";
+} from "./chunk-6WCPV6G2.mjs";
 import {
   getFarmIntegrationPluginServerRuntime,
   getIntegrationProviders
-} from "./chunk-GNSDTTWZ.mjs";
+} from "./chunk-HMIJDL7S.mjs";
 import {
   appendMiddlewareDirectory,
   appendMiddlewareRoutePath,
   compareMiddlewareRouteLocations
-} from "./chunk-7Y6ZNFPX.mjs";
+} from "./chunk-6TJOML4E.mjs";
 import {
   compileMiddlewareConfig,
   matchesCompiledMiddlewareConfig,
@@ -159,7 +165,7 @@ import {
 } from "./chunk-JG6DJF5A.mjs";
 import {
   APIRouteManager
-} from "./chunk-LMJ7VRHZ.mjs";
+} from "./chunk-22LTEMGQ.mjs";
 import {
   readFarmI18nCatalogs
 } from "./chunk-QCFBDFRS.mjs";
@@ -1618,7 +1624,7 @@ async function discoverMiddlewareRoutes(appDir) {
       });
     }
     for (const entry of entries) {
-      if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name.startsWith("_")) {
+      if (!entry.isDirectory() || entry.name.startsWith(".")) {
         continue;
       }
       await walk(
@@ -1677,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"),
@@ -1689,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,
@@ -2036,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
   );
@@ -2070,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) => ({
@@ -2092,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)}`);
     }
@@ -2114,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(
@@ -2141,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}`);
       }
@@ -2298,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",
@@ -3151,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");
@@ -3497,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)},
@@ -3506,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,
 });
@@ -3533,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; }`;
@@ -3600,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)
@@ -3673,6 +3719,16 @@ async function loadRouteComponent(route) {
   return route.Component;
 }
 
+// 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;
@@ -3686,12 +3742,8 @@ async function createMatchedHydrationRoute(matched, pathname, searchParams, serv
     // rejected guard, deferred data) its server-rendered HTML is kept.
     if (Component.__farmServerProps === true) {
       if (!serverProps || serverProps.__farmRoutePropsResolved !== true) return null;
-      const middleware = serverProps.middleware;
       const props = {
-        ...serverProps,
-        ...(middleware && middleware.data && !(middleware.data instanceof Map)
-          ? { middleware: { ...middleware, data: new Map(Object.entries(middleware.data)) } }
-          : {}),
+        ...reviveServerPageProps(serverProps),
         searchParams: Promise.resolve(serverProps.search ?? searchParams),
       };
       pageElement = React.createElement(Component, props);
@@ -3702,16 +3754,26 @@ async function createMatchedHydrationRoute(matched, pathname, searchParams, serv
       );
       return null;
     } else {
-      const props = { params: params, searchParams: Promise.resolve(searchParams) };
+      // 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);
     }
   } 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;
@@ -5299,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);
@@ -5313,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);
 }
@@ -5322,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"
   );
@@ -5370,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(
@@ -5406,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";` : "",
@@ -5443,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))},
@@ -5466,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)},
@@ -5510,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)},
@@ -5525,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},
   }`);
   });
@@ -5605,14 +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,
@@ -5633,6 +5714,9 @@ function isolateFarmRouteServerPage(element) { return element; }`;
   mergeRouteRenderingDirectiveConfig,
   manageFarmLinkHeaderPreloads,
   mergeMetadata,
+  mergeModuleViewport,
+  ensureFarmDocumentMeta,
+  renderViewportHead,
   matchesFarmIfNoneMatch,
   normalizeRevalidatePath,
   reportFarmPreloadWarnings,
@@ -6108,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)},
@@ -6160,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(",")}
 ];
@@ -6809,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;
@@ -6818,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 };
     }
   }
 
@@ -7044,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.
@@ -7393,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;
@@ -7758,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.
@@ -8064,7 +8185,10 @@ async function handleFarmRequestInContext(
       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,
       );
@@ -8297,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(
@@ -8324,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",
                     {
@@ -8391,6 +8517,9 @@ async function handleFarmRequestInContext(
               await layout.module.generateMetadata({ params: pageProps.params }),
             );
           }
+          mergedMetadata = await mergeModuleViewport(mergedMetadata, layout.module, {
+            params: pageProps.params,
+          });
         }
         mergedMetadata = mergeMetadata(mergedMetadata, pageMetadata);
         if (!routeStateRejected && typeof route.module.generateMetadata === "function") {
@@ -8399,6 +8528,11 @@ async function handleFarmRequestInContext(
             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");
@@ -8442,6 +8576,7 @@ async function handleFarmRequestInContext(
         const title = renderedMetadata.title;
         const metaTags = renderedMetadata.tags;
         const hasFavicon = renderedMetadata.hasFavicon;
+        const viewportTags = renderedMetadata.viewport;
 
         const hasPrivateRequestHeaders = hasPrivateFarmRequestHeaders(
           request,
@@ -8493,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' +
@@ -8624,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;
@@ -8634,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__">
@@ -8884,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--) {
@@ -8928,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;
       }
@@ -8936,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}
@@ -10606,7 +10746,7 @@ function resolveLegacyPageEntry(config, root, srcDir) {
 __name(resolveLegacyPageEntry, "resolveLegacyPageEntry");
 async function buildNitro(config, routeManager, apiRouteManager, serverRenderer, preset, root, distDir, pluginManager) {
   const [{ createNitroConfig }, { createNitro, build: nitroBuild }] = await Promise.all([
-    import("./nitro-4XGPNIK4.mjs"),
+    import("./nitro-MXRDCXWZ.mjs"),
     import("nitro/builder")
   ]);
   let nitroConfig = await createNitroConfig(