@farm.js/core 0.1.34 → 0.1.36

package/dist/{chunk-XV5DJTBX.mjs → chunk-276VJSM6.mjs}

@@ -4,7 +4,7 @@ import {
   matchSSGPage,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-AQZFOP7S.mjs";
+} from "./chunk-4GLOOWKE.mjs";
 import {
   collectSchemaExtensions,
   declareSchemaTables,
@@ -15,29 +15,51 @@ import {
 } from "./chunk-ZMSZZXOR.mjs";
 import {
   FARM_API_CATALOG_PATH,
-  FARM_APP_MANIFEST_PATH,
+  FARM_INFRA_SIGNATURE_HEADER,
+  classifyFarmDocumentPrefix,
+  composeFarmFullDocument,
   createDefaultErrorMarkup,
+  createFarmAiCatalogResponse,
   createFarmApiCatalogResponse,
   createFarmAppManifestResponse,
   createFarmMetadataRouteResponse,
   createFarmThemeDocumentParts,
   createLateNotFoundRecovery,
   createLateRedirectRecovery,
+  createRouteDirectoryPattern,
+  extractFarmFullDocument,
+  formatRouteSegment,
   getDefaultErrorStatusText,
+  getRouteDirectoryDepth,
+  getRouteGroupScope,
+  isFarmAppManifestPath,
+  isInRouteGroupScope,
+  listFarmMCPLlmsTxtLinks,
+  removeFarmDocumentTitles,
   renderFarmLocaleAlternateLinks,
   resolveDefaultErrorStatus,
   resolveFarmApiCatalogInput,
-  resolveFarmAppManifestInput
-} from "./chunk-GOABMOX3.mjs";
+  resolveFarmAppManifestInput,
+  routeBoundaryCoversDirectory,
+  stripRouteGroups
+} from "./chunk-LSZAVSGY.mjs";
+import {
+  FARM_DEFAULT_MCP_PATH,
+  collectFarmDefaultMCPPages,
+  createFarmDefaultMCPServer,
+  farmConfigMountsMCP,
+  isFarmDefaultMCPPathname,
+  resolveFarmDefaultMCPServer
+} from "./chunk-UH6QN5NL.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
 import {
   createFarmMetadataImageResponse
-} from "./chunk-YQVSHTMR.mjs";
+} from "./chunk-AJQTP4OO.mjs";
 import {
   createFarmImageHandler
-} from "./chunk-PXKIEXZD.mjs";
+} from "./chunk-F5QO4FNE.mjs";
 import {
   FARM_ISLAND_REPLAYABLE_SELECTOR,
   isFarmIslandStrategy
@@ -54,8 +76,9 @@ import {
 } from "./chunk-2ELDTQRN.mjs";
 import {
   generateFarmDocsAdapterClientRuntime,
-  getFarmDocsAdapterConfigModule
-} from "./chunk-VVBO3QH7.mjs";
+  getFarmDocsAdapterConfigModule,
+  isSecretDocsConfigKey
+} from "./chunk-ENLZ4R3Y.mjs";
 import {
   resolveFarmDocsFontAssets,
   toFarmDocsPublicFontAssets
@@ -79,7 +102,7 @@ import {
   getFarmAppDirectories,
   getFarmLayerAliases,
   getFarmSourceRoots
-} from "./chunk-JHWOVJ3M.mjs";
+} from "./chunk-BUGNQIHC.mjs";
 import {
   REACT_RENDERER,
   assertFarmRendererStreamingRuntime,
@@ -97,19 +120,23 @@ import {
 import {
   FARM_PREVIEW_ROBOTS_TAG,
   addFarmCspNonceToScriptTags,
-  collectFarmLlmsTxtPages,
   createFarmAgentRobots,
   createFarmCspNonce,
   createFarmCspNonceRewriter,
-  createFarmDefaultLlmsTxt,
-  createFarmLlmsMarkdownReader,
+  createFarmDefaultSitemap,
   getFarmSecurityHeader,
-  renderFarmLlmsFullTxt,
   resolveFarmAgentCrawlers,
-  resolveFarmLlmsTxtConfig,
+  resolveFarmAgentSitemap,
   resolveFarmPerformanceConfig,
   resolveFarmSecurityConfig
-} from "./chunk-NGVORZVZ.mjs";
+} from "./chunk-4E5WBPEG.mjs";
+import {
+  collectFarmLlmsTxtPages,
+  createFarmDefaultLlmsTxt,
+  createFarmLlmsMarkdownReader,
+  renderFarmLlmsFullTxt,
+  resolveFarmLlmsTxtConfig
+} from "./chunk-DTSROJ5J.mjs";
 import {
   getPublicFarmImageConfig,
   resolveFarmImageConfig
@@ -119,7 +146,7 @@ import {
 } from "./chunk-YHOCRI4H.mjs";
 import {
   resolveServerActionsConfig
-} from "./chunk-QCFFHV5H.mjs";
+} from "./chunk-4WVJLURN.mjs";
 import {
   createBundledEnv,
   getResolvedEnv
@@ -127,12 +154,12 @@ import {
 import {
   createFarmMarkdownRouteModuleFromFile,
   loadFarmMdxComponents
-} from "./chunk-3VSKDFAT.mjs";
+} from "./chunk-WZ77PUAM.mjs";
 import {
   createFarmMarkdownSourceResponse,
   isFarmMarkdownPageFile,
   normalizeFarmMarkdownRoutePath
-} from "./chunk-AGC75XAE.mjs";
+} from "./chunk-4WCZJQUO.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
@@ -146,10 +173,10 @@ import {
   getFarmMarkdownMirrorPath,
   resolveMarkdownConfig,
   resolveMarkdownMirrorTarget
-} from "./chunk-ZUSJDQ2Q.mjs";
+} from "./chunk-WWIKMBRN.mjs";
 import {
   resolveWorkflowsConfig
-} from "./chunk-3ATMYLLJ.mjs";
+} from "./chunk-Q2KB32T4.mjs";
 import {
   initStorage
 } from "./chunk-UWPLULNK.mjs";
@@ -169,14 +196,14 @@ import {
   getRegisteredIntegrationAPIManifest,
   isFarmIntegrationProviderComponentReference,
   matchIntegrationRoute
-} from "./chunk-GNSDTTWZ.mjs";
+} from "./chunk-MKYBIIAQ.mjs";
 import {
   MiddlewareManager
-} from "./chunk-7Y6ZNFPX.mjs";
+} from "./chunk-BPOF5U4N.mjs";
 import {
   createRouteSlotContainerId,
   parseRouteSlotFile
-} from "./chunk-UBO4SGH4.mjs";
+} from "./chunk-RHAZ22ZN.mjs";
 import {
   _clearCurrentMiddlewareContext,
   _clearCurrentMiddlewareData,
@@ -191,7 +218,7 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteManager
-} from "./chunk-LMJ7VRHZ.mjs";
+} from "./chunk-T4OGRVNS.mjs";
 import {
   findProgrammaticRouteFiles,
   loadProgrammaticRouteManifests
@@ -210,7 +237,10 @@ import {
 } from "./chunk-YOZYCI6Z.mjs";
 import {
   isFarmAPIPathname
-} from "./chunk-657WJNRY.mjs";
+} from "./chunk-O6I6VWKK.mjs";
+import {
+  registerFarmMCPServer
+} from "./chunk-ZLAT2CWY.mjs";
 import {
   createProgrammaticRouteModuleId,
   getProgrammaticRouteSearchClientOptions,
@@ -235,6 +265,7 @@ import {
   clearRequestContext,
   copyRequestContext,
   createFarmNodeRequestAbortSignal,
+  createFarmNodeRequestBodyStream,
   createFarmRequestBodyErrorResponse,
   deleteRequestContext,
   getRequestContext,
@@ -244,15 +275,16 @@ import {
   readNodeRequestBody,
   resolveFarmServerConfig,
   setRequestContext
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-ZMMBIVQM.mjs";
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
 import {
   invalidateFailedFarmDevModules,
+  invalidateFarmDevDependents,
   loadFarmDevModule,
   toFileModuleUrl
-} from "./chunk-43FMW62B.mjs";
+} from "./chunk-KMTGADN3.mjs";
 import {
   isFarmI18nCatalogFile,
   resolveFarmI18nConfig,
@@ -276,9 +308,6 @@ import {
 import {
   searchParamsToObject
 } from "./chunk-QVKYGNVM.mjs";
-import {
-  resolveFarmAPIServerBasePath
-} from "./chunk-BTHHUD7Q.mjs";
 import {
   configureFarmObservability,
   emitFarmEvent,
@@ -288,9 +317,12 @@ import {
   applyWebResponseHeaders,
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
+import {
+  resolveFarmAPIServerBasePath
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   FARM_VERSION
-} from "./chunk-X242HVD5.mjs";
+} from "./chunk-OO7GXVSR.mjs";
 import {
   resolveFarmTrailingSlashRedirect,
   setFarmTrailingSlashPreference
@@ -307,9 +339,11 @@ import {
   addMetadataImageReference,
   addMetadataMarkdownAlternate,
   mergeMetadata,
+  mergeModuleViewport,
   renderMetadataHead,
+  renderViewportHead,
   resolveFarmNotFoundMetadata
-} from "./chunk-QZCT2CQ4.mjs";
+} from "./chunk-CXEN47J3.mjs";
 import {
   FARM_DEPLOYMENT_ID_HEADER,
   createFarmDeploymentCookie,
@@ -339,6 +373,7 @@ import {
   _getRequestReadCount,
   _runWithCurrentRequest,
   createWebRequestFromFarmRequest,
+  getCurrentRequestOrNull,
   resolveFarmRequestURL
 } from "./chunk-FDR64H6B.mjs";
 import {
@@ -752,6 +787,26 @@ function parseClientModuleMetadata(content, inspectIslandExport) {
   };
 }
 __name(parseClientModuleMetadata, "parseClientModuleMetadata");
+var DEFAULT_REEXPORT = /export\s*\{\s*default(?:\s+as\s+default)?\s*\}\s*from\s*(["'])([^"']+)\1/;
+function resolveDefaultReexport(ownerPath, content, root) {
+  const match = content ? DEFAULT_REEXPORT.exec(content) : null;
+  if (!match) return null;
+  const imported = resolveImportedModule(ownerPath, match[2], root);
+  return imported.local ? imported.path : null;
+}
+__name(resolveDefaultReexport, "resolveDefaultReexport");
+function resolveOwnerSourcePath(resolvedPath, root) {
+  const seen = /* @__PURE__ */ new Set();
+  let current = resolvedPath;
+  while (current && !seen.has(current)) {
+    seen.add(current);
+    const target = resolveDefaultReexport(current, readIfExists(current), root);
+    if (!target) return current;
+    current = target;
+  }
+  return current;
+}
+__name(resolveOwnerSourcePath, "resolveOwnerSourcePath");
 function getClientModuleMetadata(modulePath, root) {
   const resolvedPath = resolveModuleSourcePath(modulePath, root);
   return inspectClientModuleMetadata(resolvedPath, root, /* @__PURE__ */ new Set(), true);
@@ -773,7 +828,7 @@ function getClientModuleHydrationPlan(modulePath, root, mode = "off", options =
   }), "emptyPlan");
   const asyncOwner = metadata.suppressedAsyncHydration === true && options.asyncOwnerIslands === true;
   if (mode === "off" && !asyncOwner) return emptyPlan();
-  const resolvedPath = resolveModuleSourcePath(modulePath, root);
+  const resolvedPath = resolveOwnerSourcePath(resolveModuleSourcePath(modulePath, root), root);
   const content = readIfExists(resolvedPath ?? "");
   const parsed = parseClientModuleMetadata(content, true);
   if (!resolvedPath) return emptyPlan("the owner source could not be resolved");
@@ -785,6 +840,7 @@ function getClientModuleHydrationPlan(modulePath, root, mode = "off", options =
   }
   const inspection = collectIsolatedClientBoundaries(resolvedPath, root, {
     allowDynamicCardinality: asyncOwner,
+    allowElementProps: asyncOwner,
     staticPackageBoundaries: asyncOwner
   });
   if (inspection.boundaries.length === 0) {
@@ -827,6 +883,10 @@ function getClientModuleHydrationPlan(modulePath, root, mode = "off", options =
   return plan;
 }
 __name(getClientModuleHydrationPlan, "getClientModuleHydrationPlan");
+function usesFarmServerTree(plan) {
+  return plan?.asyncOwnerIslands === true && plan.isolatedBoundaries.length > 0 && plan.isolatedBoundaries.every((boundary) => boundary.islandStrategy === "load");
+}
+__name(usesFarmServerTree, "usesFarmServerTree");
 function getMarkdownPageHydrationPlan(componentsModulePath, root, mode = "off", options = {}) {
   const plan = {
     isClientComponent: false,
@@ -1278,7 +1338,7 @@ function collectIsolatedClientBoundaries(ownerPath, root, options = {}) {
           fallbackReason = `the client boundary imported from ${specifier} renders inside <${container}>, where the HTML parser relocates its hydration marker`;
           return 0;
         }
-        if (passesElementValuedProps(content, localBindings)) {
+        if (!options.allowElementProps && passesElementValuedProps(content, localBindings)) {
           fallbackReason = `the client boundary imported from ${specifier} receives React elements, which cannot cross the boundary as serialized props`;
           return 0;
         }
@@ -1314,6 +1374,10 @@ function inspectClientModuleMetadata(resolvedPath, root, visited, inspectIslandE
   }
   visited.add(resolvedPath);
   const content = readIfExists(resolvedPath);
+  if (inspectIslandExport) {
+    const target = resolveDefaultReexport(resolvedPath, content, root);
+    if (target) return inspectClientModuleMetadata(target, root, visited, true);
+  }
   const parsed = parseClientModuleMetadata(content, inspectIslandExport);
   if (parsed.isClientComponent) {
     return {
@@ -1323,10 +1387,12 @@ function inspectClientModuleMetadata(resolvedPath, root, visited, inspectIslandE
     };
   }
   let importsClientBoundary = false;
+  let importsAsyncOwner = false;
   let importedIslandStrategy = null;
   for (const specifier of getImportSpecifiers(content)) {
     const imported = resolveImportedModule(resolvedPath, specifier, root);
     const importedMetadata = imported.local ? inspectClientModuleMetadata(imported.path, root, visited, false) : inspectPackageClientBoundary(imported.path, root, visited);
+    if (importedMetadata.suppressedAsyncHydration) importsAsyncOwner = true;
     if (importedMetadata.isClientComponent || importedMetadata.shouldHydrate) {
       importsClientBoundary = true;
       if (importedIslandStrategy === null) {
@@ -1337,7 +1403,7 @@ function inspectClientModuleMetadata(resolvedPath, root, visited, inspectIslandE
     }
   }
   const shouldHydrate = parsed.hasHydrateExport || importsClientBoundary;
-  if (shouldHydrate && hasAsyncDefaultExport(content)) {
+  if (shouldHydrate && hasAsyncDefaultExport(content) || importsAsyncOwner) {
     return {
       isClientComponent: false,
       shouldHydrate: false,
@@ -1895,6 +1961,10 @@ async function readAltText(filePath) {
 __name(readAltText, "readAltText");
 
 // src/routing/route-manager.ts
+function getRouteEntryDirectory(entry) {
+  return entry.directory ?? entry.pattern;
+}
+__name(getRouteEntryDirectory, "getRouteEntryDirectory");
 function shouldSuggestStaticRenderingForI18n(i18n) {
   return !i18n || i18n.routing === "prefix-always" || i18n.routing === "prefix-except-default" && i18n.detection.every((signal) => signal === "url");
 }
@@ -1972,8 +2042,8 @@ var _RouteManager = class _RouteManager {
       )
     );
     this.orderedLayouts = Array.from(this.layouts.values()).sort(
-      (left, right) => left.route.segments.length - right.route.segments.length
-    );
+      (left, right) => getRouteDirectoryDepth(left.pattern) - getRouteDirectoryDepth(right.pattern)
+    ).map((entry) => ({ entry, groupScope: getRouteGroupScope(entry.pattern) }));
     for (const slot of this.routeSlots.values()) {
       if (!this.routeSlotOwnerSegments.has(slot.ownerPattern)) {
         this.routeSlotOwnerSegments.set(
@@ -2008,7 +2078,7 @@ var _RouteManager = class _RouteManager {
         break;
       }
     }
-    const layouts = this.findMatchingLayouts(normalizedPath, pathParts);
+    const layouts = this.findMatchingLayouts(pathParts, matchedRoute);
     const slots = this.findMatchingRouteSlots(normalizedPath, pathParts, options.interceptFrom);
     return {
       route: matchedRoute,
@@ -2039,7 +2109,7 @@ var _RouteManager = class _RouteManager {
       throw new Error(`Cannot resolve runtime configuration for unknown route "${pattern}"`);
     }
     const inherited = resolveFarmRouteRuleRuntimeConfig(pattern, this.config.routeRules);
-    const layouts = this.findMatchingLayouts(pattern);
+    const layouts = this.findMatchingLayouts(splitRoutePath(pattern), routeEntry);
     const layoutConfigs = [];
     for (const layout of layouts) {
       const layoutModule = await this.loadLayoutModule(layout.modulePath);
@@ -2106,16 +2176,19 @@ var _RouteManager = class _RouteManager {
     return null;
   }
   /**
-   * Return the nearest matching loading boundary for a pathname.
+   * Return the nearest matching loading boundary for a pathname. Pass the page
+   * `matchRoute` selected when it is known (`null` for none); otherwise the page is
+   * matched only if a boundary inside a route group needs it.
    */
-  getMatchingLoading(pathname) {
-    return this.findNearestBoundary(this.toRoutePathname(pathname), this.loadings);
+  getMatchingLoading(pathname, route) {
+    return this.findNearestBoundary(this.toRoutePathname(pathname), this.loadings, route);
   }
   /**
-   * Return the nearest matching error boundary for a pathname.
+   * Return the nearest matching error boundary for a pathname. `route` works as it
+   * does for `getMatchingLoading`.
    */
-  getMatchingError(pathname) {
-    return this.findNearestBoundary(this.toRoutePathname(pathname), this.errors);
+  getMatchingError(pathname, route) {
+    return this.findNearestBoundary(this.toRoutePathname(pathname), this.errors, route);
   }
   matchMetadataImage(pathname) {
     const routePathname = this.toRoutePathname(pathname);
@@ -2283,15 +2356,15 @@ var _RouteManager = class _RouteManager {
     enforceFarmIsolatedHydrationRouteBudget(
       layoutEntries.map(({ entry, metadata }) => ({
         pattern: entry.pattern,
-        depth: entry.route.segments.length,
+        depth: getRouteDirectoryDepth(entry.pattern),
         metadata
       })),
       routeEntries.map(({ entry, metadata }) => ({
-        pattern: entry.pattern,
-        depth: entry.route.segments.length,
+        pattern: getRouteEntryDirectory(entry),
+        depth: getRouteDirectoryDepth(getRouteEntryDirectory(entry)),
         metadata
       })),
-      (layoutPattern, routePattern) => layoutPattern === "/" || routePattern === layoutPattern || routePattern.startsWith(`${layoutPattern.replace(/\/$/, "")}/`)
+      routeBoundaryCoversDirectory
     );
     for (const { entry, metadata } of [...layoutEntries, ...routeEntries]) {
       if (!metadata.costGuardExceeded) continue;
@@ -2310,10 +2383,11 @@ var _RouteManager = class _RouteManager {
     const routes = routeEntries.map(({ entry, metadata }) => {
       const programmaticPage = this.programmaticPages.get(entry.modulePath);
       const layoutShouldHydrate = layoutEntries.some(
-        ({ entry: layout, metadata: layoutMetadata }) => layoutMetadata.shouldHydrate && (layout.pattern === "/" || entry.pattern === layout.pattern || entry.pattern.startsWith(`${layout.pattern.replace(/\/$/, "")}/`))
+        ({ entry: layout, metadata: layoutMetadata }) => layoutMetadata.shouldHydrate && routeBoundaryCoversDirectory(layout.pattern, getRouteEntryDirectory(entry))
       );
       return {
         pattern: entry.pattern,
+        ...entry.directory ? { directory: entry.directory } : {},
         modulePath: toUrlPath(entry.modulePath),
         shouldHydrate: metadata.shouldHydrate,
         isClientComponent: metadata.isClientComponent,
@@ -2325,6 +2399,7 @@ var _RouteManager = class _RouteManager {
             modulePath: toUrlPath(boundary.modulePath)
           }))
         } : {},
+        ...usesFarmServerTree(metadata) ? { serverTree: true } : {},
         renderPlan: createFarmRouteRenderPlan({
           pageShouldHydrate: metadata.shouldHydrate,
           layoutShouldHydrate,
@@ -2483,13 +2558,7 @@ var _RouteManager = class _RouteManager {
    */
   createRoutePattern(route) {
     if (route.segments.length === 0) return "/";
-    return "/" + route.segments.map((segment) => {
-      if (!segment.isDynamic) return segment.segment;
-      if (segment.isCatchAll) {
-        return segment.isOptional ? `[[...${segment.segment}]]` : `[...${segment.segment}]`;
-      }
-      return `[${segment.segment}]`;
-    }).join("/");
+    return "/" + route.segments.map(formatRouteSegment).join("/");
   }
   registerPageRoute(entry) {
     assertUniqueRouteParameters(entry.pattern);
@@ -2570,6 +2639,7 @@ var _RouteManager = class _RouteManager {
           markdownSourcePath: path3.join(appDir, markdownFile)
         } : {},
         pattern,
+        ...getPageDirectoryField(group.route, pattern),
         source: "file",
         sourceRoot: source.root
       });
@@ -2582,7 +2652,7 @@ var _RouteManager = class _RouteManager {
       for (const file of files) {
         const route = parseRoutePath(file);
         const modulePath = path3.join(appDir, file);
-        const pattern = this.createRoutePattern(route);
+        const pattern = createRouteDirectoryPattern(route);
         const existing = target.get(pattern);
         if (existing?.sourceRoot === source.root) {
           throw new Error(
@@ -2604,6 +2674,7 @@ var _RouteManager = class _RouteManager {
       const modulePath = path3.join(appDir, file);
       const pattern = this.createRoutePattern(slot.route);
       const ownerPattern = this.createRoutePattern(slot.ownerRoute);
+      const ownerDirectory = createRouteDirectoryPattern(slot.ownerRoute);
       const key = `${ownerPattern}:${slot.name}:${slot.interception ? "intercept" : "slot"}:${slot.fallback ? "default" : pattern}`;
       const existing = this.routeSlots.get(key);
       if (existing?.sourceRoot === source.root) {
@@ -2619,6 +2690,7 @@ var _RouteManager = class _RouteManager {
         sourceRoot: source.root,
         name: slot.name,
         ownerPattern,
+        ...ownerDirectory === ownerPattern ? {} : { ownerDirectory },
         interception: slot.interception,
         fallback: slot.fallback,
         containerId: createRouteSlotContainerId(slot.name, ownerPattern)
@@ -2700,13 +2772,14 @@ var _RouteManager = class _RouteManager {
             route,
             modulePath,
             pattern,
+            ...getPageDirectoryField(route, pattern),
             source: "programmatic",
             sourceRoot: source.root
           });
         }
         if (definition.kind === "layout") {
           const route = parseProgrammaticRoutePath(definition.path, "layout");
-          const pattern = this.createRoutePattern(route);
+          const pattern = createRouteDirectoryPattern(route);
           const existing = this.layouts.get(pattern);
           if (existing?.sourceRoot === source.root) {
             throw new Error(
@@ -2746,17 +2819,26 @@ var _RouteManager = class _RouteManager {
     );
   }
   /**
-   * Find all layouts that should wrap a given path
+   * Find all layouts that should wrap a given path. A layout inside a route group
+   * wraps only the pages in that group, so it needs the selected page.
    */
-  findMatchingLayouts(pathname, pathnameParts = splitRoutePath(pathname)) {
+  findMatchingLayouts(pathnameParts, route) {
     const matchingLayouts = [];
-    for (const layoutEntry of this.orderedLayouts) {
-      if (matchRoutePrefixParts(pathnameParts, layoutEntry.route.segments)) {
-        matchingLayouts.push(layoutEntry);
+    for (const { entry, groupScope } of this.orderedLayouts) {
+      if (!matchRoutePrefixParts(pathnameParts, entry.route.segments)) continue;
+      if (groupScope !== null && !isInRouteGroupScope(route && getRouteEntryDirectory(route), groupScope)) {
+        continue;
       }
+      matchingLayouts.push(entry);
     }
     return matchingLayouts;
   }
+  matchPageRoute(pathnameParts) {
+    for (const routeEntry of this.routes.values()) {
+      if (matchRouteParts(pathnameParts, routeEntry.route.segments).matches) return routeEntry;
+    }
+    return null;
+  }
   findMatchingRouteSlots(pathname, pathnameParts, interceptFrom) {
     const groups = /* @__PURE__ */ new Map();
     for (const entry of this.routeSlots.values()) {
@@ -2786,6 +2868,7 @@ var _RouteManager = class _RouteManager {
         matches.push({
           name: selected.entry.name,
           ownerPattern: selected.entry.ownerPattern,
+          ...selected.entry.ownerDirectory ? { ownerDirectory: selected.entry.ownerDirectory } : {},
           containerId: selected.entry.containerId,
           interception: selected.entry.interception,
           fallback: false,
@@ -2799,6 +2882,7 @@ var _RouteManager = class _RouteManager {
         matches.push({
           name: fallback.name,
           ownerPattern: fallback.ownerPattern,
+          ...fallback.ownerDirectory ? { ownerDirectory: fallback.ownerDirectory } : {},
           containerId: fallback.containerId,
           interception: false,
           fallback: true,
@@ -2817,12 +2901,20 @@ var _RouteManager = class _RouteManager {
     const patternSegments = this.routeSlotOwnerSegments.get(pattern) ?? parseRoutePath(`${pattern}/page.tsx`).segments;
     return matchRoutePrefixParts(pathnameParts, patternSegments);
   }
-  findNearestBoundary(pathname, boundaries) {
+  findNearestBoundary(pathname, boundaries, route) {
     const normalizedPath = pathname === "/" ? "/" : pathname.replace(/\/$/, "");
     let bestMatch = null;
+    let page = route;
     for (const boundaryEntry of boundaries.values()) {
       if (!matchRoutePrefix(normalizedPath, boundaryEntry.route.segments)) continue;
-      if (!bestMatch || boundaryEntry.route.segments.length > bestMatch.route.segments.length) {
+      const groupScope = getRouteGroupScope(boundaryEntry.pattern);
+      if (groupScope !== null) {
+        if (page === void 0) page = this.matchPageRoute(splitRoutePath(normalizedPath));
+        if (!isInRouteGroupScope(page && getRouteEntryDirectory(page), groupScope)) continue;
+      }
+      const depth = boundaryEntry.route.segments.length;
+      const bestDepth = bestMatch?.route.segments.length ?? -1;
+      if (!bestMatch || depth > bestDepth || depth === bestDepth && getRouteDirectoryDepth(boundaryEntry.pattern) > getRouteDirectoryDepth(bestMatch.pattern)) {
         bestMatch = boundaryEntry;
       }
     }
@@ -2937,6 +3029,11 @@ var _RouteManager = class _RouteManager {
 };
 __name(_RouteManager, "RouteManager");
 var RouteManager = _RouteManager;
+function getPageDirectoryField(route, pattern) {
+  const directory = createRouteDirectoryPattern(route);
+  return directory === pattern ? {} : { directory };
+}
+__name(getPageDirectoryField, "getPageDirectoryField");
 function interpolateRedirectDestination(destination, params) {
   let result = destination;
   for (const [key, value] of Object.entries(params)) {
@@ -3054,112 +3151,6 @@ function collectDevStylesheetUrls(modules, alreadyLinked = ALREADY_LINKED) {
 }
 __name(collectDevStylesheetUrls, "collectDevStylesheetUrls");
 
-// src/server/full-document.ts
-var CONTENTS_WRAPPER = /^<div\b[^>]*style="display\s*:\s*contents"[^>]*>/i;
-var HOISTED_HEAD_ELEMENT = /^(?:<(?:meta|link|base)\b[^>]*>|<title\b[^>]*>[\s\S]*?<\/title>|<script\b[^>]*\basync\b[^>]*><\/script>|<style\b[^>]*\bdata-precedence\b[^>]*>[\s\S]*?<\/style>)/i;
-function peelDocumentPrefix(markup) {
-  let inner = markup.replace(/^\s+/, "");
-  let hoisted = "";
-  let match;
-  while (match = CONTENTS_WRAPPER.exec(inner) ?? HOISTED_HEAD_ELEMENT.exec(inner)) {
-    if (!/^<div/i.test(match[0])) hoisted += match[0];
-    inner = inner.slice(match[0].length).replace(/^\s+/, "");
-  }
-  return { inner, hoisted };
-}
-__name(peelDocumentPrefix, "peelDocumentPrefix");
-function restoreHoistedHead(document, hoisted) {
-  if (!hoisted) return document;
-  if (/<head[\s>]/i.test(document)) {
-    return document.replace(/<head\b[^>]*>/i, (open) => open + hoisted);
-  }
-  return document.replace(/<html\b[^>]*>/i, (open) => `${open}<head>${hoisted}</head>`);
-}
-__name(restoreHoistedHead, "restoreHoistedHead");
-function extractFarmFullDocument(markup) {
-  const { inner, hoisted } = peelDocumentPrefix(markup);
-  if (!/^<!doctype/i.test(inner) && !/^<html[\s>]/i.test(inner)) return null;
-  const start = markup.search(/<!doctype|<html[\s>]/i);
-  const lower = markup.toLowerCase();
-  let closeIndex = lower.lastIndexOf("</html>");
-  if (lower.length !== markup.length) {
-    closeIndex = -1;
-    const closing = /<\/html>/gi;
-    let match;
-    while (match = closing.exec(markup)) closeIndex = match.index;
-  }
-  if (start < 0 || closeIndex < 0) return null;
-  const closeEnd = closeIndex + "</html>".length;
-  let document = markup.slice(start, closeEnd);
-  const streamedTail = markup.slice(closeEnd).replace(/^(?:\s*<\/div>)+/i, "").trim();
-  if (streamedTail) {
-    document = document.replace(/<\/body>/i, () => `${streamedTail}</body>`);
-  }
-  return restoreHoistedHead(document, hoisted);
-}
-__name(extractFarmFullDocument, "extractFarmFullDocument");
-function classifyFarmDocumentPrefix(markup) {
-  const { inner } = peelDocumentPrefix(markup);
-  if (/^<!doctype/i.test(inner) || /^<html[\s>]/i.test(inner)) return "document";
-  return inner === "" ? "pending" : "fragment";
-}
-__name(classifyFarmDocumentPrefix, "classifyFarmDocumentPrefix");
-function ensureFarmDocumentHead(markup) {
-  if (/<head[\s>]/i.test(markup)) return markup;
-  return markup.replace(/<html([^>]*)>/i, (_match, attributes) => {
-    return `<html${attributes}><head></head>`;
-  });
-}
-__name(ensureFarmDocumentHead, "ensureFarmDocumentHead");
-function ensureFarmDocumentRoot(markup) {
-  if (/\sid=["']root["']/i.test(markup)) return markup;
-  return markup.replace(
-    /<body\b([^>]*)>/i,
-    (_match, attributes) => `<body${attributes}><div id="root">`
-  ).replace(/<\/body>/i, () => "</div></body>");
-}
-__name(ensureFarmDocumentRoot, "ensureFarmDocumentRoot");
-function hasFarmDocumentIcon(markup) {
-  return /<link\b[^>]*\brel=["']?(?:shortcut )?icon\b/i.test(markup);
-}
-__name(hasFarmDocumentIcon, "hasFarmDocumentIcon");
-function removeFarmDocumentTitles(markup) {
-  return markup.replace(/<title\b[^>]*>[\s\S]*?<\/title>\s*/gi, "");
-}
-__name(removeFarmDocumentTitles, "removeFarmDocumentTitles");
-function composeFarmFullDocument(documentHtml, assets) {
-  let html = ensureFarmDocumentHead(documentHtml);
-  if (assets.htmlAttributes) {
-    html = html.replace(/<html\b([^>]*)>/i, (_match, attrs) => {
-      let nextAttributes = attrs;
-      for (const name of assets.replaceHtmlAttributes ?? []) {
-        const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        nextAttributes = nextAttributes.replace(
-          new RegExp("\\s+" + escapedName + `=(?:"[^"]*"|'[^']*'|[^\\s>]+)`, "gi"),
-          ""
-        );
-      }
-      return `<html${nextAttributes}${assets.htmlAttributes}>`;
-    });
-  }
-  html = ensureFarmDocumentRoot(html);
-  const headAssets = [
-    assets.fallbackIcon && !hasFarmDocumentIcon(html) ? '<link rel="icon" href="data:,">' : "",
-    assets.headAssets
-  ].filter(Boolean).join("\n  ");
-  if (headAssets) {
-    html = html.replace(/<\/head>/i, () => `  ${headAssets}
-</head>`);
-  }
-  if (assets.bodyFooter) {
-    html = html.replace(/<\/body>/i, () => `  ${assets.bodyFooter}
-</body>`);
-  }
-  return /^\s*<!doctype/i.test(html) ? html : `<!DOCTYPE html>
-${html}`;
-}
-__name(composeFarmFullDocument, "composeFarmFullDocument");
-
 // src/server/renderer.ts
 import { Readable, Writable } from "stream";
 
@@ -4831,6 +4822,16 @@ function createRouteStateProps(input) {
   };
 }
 __name(createRouteStateProps, "createRouteStateProps");
+function readAppPackageIdentity(root) {
+  try {
+    return JSON.parse(
+      fs5.readFileSync(path9.join(root || process.cwd(), "package.json"), "utf8")
+    );
+  } catch {
+    return {};
+  }
+}
+__name(readAppPackageIdentity, "readAppPackageIdentity");
 var _ServerRenderer = class _ServerRenderer {
   constructor(config, routeManager, i18nRuntime, viteServer) {
     this.ssgManifest = [];
@@ -5028,7 +5029,7 @@ var _ServerRenderer = class _ServerRenderer {
     if (input.pageShouldHydrate && !input.layoutShouldHydrate) {
       element = this.wrapClientGraph(element);
     } else if (input.layoutShouldHydrate && !input.pageShouldHydrate && this.rendererRuntime.isolateServerPageGraph) {
-      element = this.rendererRuntime.isolateServerPageGraph(element);
+      element = input.serverTree && this.rendererRuntime.renderServerTreePage ? await this.rendererRuntime.renderServerTreePage(element) : this.rendererRuntime.isolateServerPageGraph(element);
     }
     element = this.createPageBoundary(element, {
       pageShouldHydrate: input.pageShouldHydrate,
@@ -5045,7 +5046,9 @@ var _ServerRenderer = class _ServerRenderer {
       if (!LayoutComponent) continue;
       const slotProps = {};
       for (const slot of input.slots || []) {
-        if (slot.ownerPattern !== layout.pattern || !slot.module.default) continue;
+        if ((slot.ownerDirectory ?? slot.ownerPattern) !== layout.pattern || !slot.module.default) {
+          continue;
+        }
         let slotElement = this.rendererRuntime.createElement(slot.module.default, slot.props);
         slotElement = this.wrapClientGraph(slotElement);
         slotProps[slot.name] = this.rendererRuntime.createElement(
@@ -5412,6 +5415,11 @@ var _ServerRenderer = class _ServerRenderer {
         completeRender(res.statusCode || 200, pathname);
         return;
       }
+      if (pathname === "/sitemap.xml" && this.getAgentSitemap().enabled) {
+        await this.renderGeneratedSitemap(req, res);
+        completeRender(res.statusCode || 200, pathname);
+        return;
+      }
       const metadataImageMatch = this.routeManager.matchMetadataImage(pathname);
       if (metadataImageMatch) {
         await this.renderMetadataImage(req, res, {
@@ -5449,6 +5457,11 @@ var _ServerRenderer = class _ServerRenderer {
       layouts = match.layouts;
       routeSlots = match.slots ?? [];
       if (!route) {
+        if (isFarmDefaultMCPPathname(pathname) && this.getDefaultMCPServer()) {
+          await this.renderDefaultMCP(req, res);
+          completeRender(res.statusCode || 200, pathname);
+          return;
+        }
         emitFarmEvent({ type: "route.notFound", pathname });
         await this.render404(req, res);
         completeRender(404);
@@ -5460,8 +5473,8 @@ var _ServerRenderer = class _ServerRenderer {
         route: route.pattern,
         params
       });
-      const loadingBoundaryEntry = this.routeManager.getMatchingLoading(pathname);
-      errorBoundaryEntry = this.routeManager.getMatchingError(pathname);
+      const loadingBoundaryEntry = this.routeManager.getMatchingLoading(pathname, route);
+      errorBoundaryEntry = this.routeManager.getMatchingError(pathname, route);
       middlewareMap = toMiddlewareMap(req.__FARM_MIDDLEWARE_DATA__);
       middlewareContext = toMiddlewareMap(req.__FARM_MIDDLEWARE_CONTEXT__);
       pluginExposedContext = getRequestContextSnapshot(req, {
@@ -5788,7 +5801,7 @@ var _ServerRenderer = class _ServerRenderer {
             if ((isClientComponent || shouldHydrate) && !shouldHydrateLayout) {
               pageElement = this.wrapClientGraph(pageElement);
             } else if (shouldHydrateLayout && !(isClientComponent || shouldHydrate) && this.rendererRuntime.isolateServerPageGraph) {
-              pageElement = this.rendererRuntime.isolateServerPageGraph(pageElement);
+              pageElement = routeManifestEntry?.serverTree === true && this.rendererRuntime.renderServerTreePage ? await this.rendererRuntime.renderServerTreePage(pageElement) : this.rendererRuntime.isolateServerPageGraph(pageElement);
             }
             pageElement = this.createPageBoundary(pageElement, {
               pageShouldHydrate: isClientComponent || shouldHydrate,
@@ -5802,7 +5815,7 @@ var _ServerRenderer = class _ServerRenderer {
               const LayoutComponent = layoutModule.default;
               const slotProps = {};
               for (const slot of renderedRouteSlots) {
-                if (slot.ownerPattern !== layoutEntry.pattern) continue;
+                if ((slot.ownerDirectory ?? slot.ownerPattern) !== layoutEntry.pattern) continue;
                 let slotElement = this.rendererRuntime.createElement(
                   slot.module.default,
                   slot.props
@@ -6053,6 +6066,9 @@ var _ServerRenderer = class _ServerRenderer {
           })
         );
       }
+      metadata = await mergeModuleViewport(metadata, layoutModule, {
+        params: options.pageProps.params
+      });
     }
     metadata = mergeMetadata(metadata, options.routeModule.metadata);
     if (!options.skipGeneratedRouteMetadata && typeof options.routeModule.generateMetadata === "function") {
@@ -6061,6 +6077,11 @@ var _ServerRenderer = class _ServerRenderer {
         await options.routeModule.generateMetadata(options.pageProps)
       );
     }
+    metadata = await mergeModuleViewport(
+      metadata,
+      options.skipGeneratedRouteMetadata ? { viewport: options.routeModule.viewport } : options.routeModule,
+      options.pageProps
+    );
     if (!metadata.manifest) {
       const manifestMatch = this.routeManager.getMatchingMetadataRoute(
         options.pathname,
@@ -6225,7 +6246,7 @@ var _ServerRenderer = class _ServerRenderer {
   /** `/robots.txt` from `agent.crawlers` when no robots.ts owns it. */
   async renderGeneratedRobotsTxt(req, res) {
     try {
-      const sitemapPath = this.routeManager.matchMetadataRoute("/sitemap.xml")?.metadata.kind === "sitemap" ? "/sitemap.xml" : void 0;
+      const sitemapPath = this.routeManager.matchMetadataRoute("/sitemap.xml")?.metadata.kind === "sitemap" || this.getAgentSitemap().enabled ? "/sitemap.xml" : void 0;
       const rootLayout = this.routeManager.getLayouts().get("/");
       const rootMetadata = sitemapPath && rootLayout ? (await this.routeManager.loadLayoutModule(rootLayout.modulePath)).metadata : void 0;
       const robots = createFarmAgentRobots({
@@ -6249,6 +6270,112 @@ var _ServerRenderer = class _ServerRenderer {
       );
     }
   }
+  getAgentSitemap() {
+    return resolveFarmAgentSitemap(this.config.agent?.sitemap);
+  }
+  /** `/sitemap.xml` from `agent.sitemap` when no sitemap.ts owns it. */
+  async renderGeneratedSitemap(req, res) {
+    try {
+      const request2 = createWebRequestFromFarmRequest(req, {
+        trustProxy: this.config.server?.trustProxy
+      });
+      const sources = await Promise.all(
+        [...this.routeManager.getRoutes()].filter(([pattern]) => !pattern.includes("[")).map(async ([pattern, route]) => {
+          const [module, stat] = await Promise.all([
+            this.routeManager.loadRouteModule(route.modulePath).catch((error) => {
+              logger.warn(`Could not read metadata for ${pattern} in sitemap.xml: ${error}`);
+              return void 0;
+            }),
+            fs5.promises.stat(route.modulePath).catch(() => void 0)
+          ]);
+          return { pattern, module, lastModified: stat?.mtime.toISOString() };
+        })
+      );
+      const rootLayout = this.routeManager.getLayouts().get("/");
+      const rootMetadata = rootLayout ? (await this.routeManager.loadLayoutModule(rootLayout.modulePath)).metadata : void 0;
+      const sitemap = createFarmDefaultSitemap(sources, {
+        origin: new URL(request2.url).origin,
+        config: this.getAgentSitemap(),
+        metadataBase: rootMetadata?.metadataBase,
+        basePath: this.config.basePath
+      });
+      await sendWebResponse(
+        res,
+        createFarmMetadataRouteResponse("sitemap", sitemap, {}, { method: req.method })
+      );
+    } catch (error) {
+      logger.error(`Generated sitemap.xml failed: ${error}`);
+      await sendWebResponse(
+        res,
+        new Response("Internal Server Error", {
+          status: 500,
+          headers: { "Content-Type": "text/plain; charset=utf-8" }
+        })
+      );
+    }
+  }
+  /** Lets the default MCP server see the app's API routes, which the dev server owns. */
+  setAPIRouteLookup(exists) {
+    this.apiRouteExists = exists;
+  }
+  /**
+   * The default read-only MCP server (`agent.mcp`), or undefined when the app has an MCP
+   * server of its own: a route that answers /mcp, an API route at /api/mcp, `@farm.js/mcp`,
+   * or a registered server such as the docs engine's. Production applies the same rules.
+   */
+  getDefaultMCPServer() {
+    if (this.config.agent?.mcp !== true || farmConfigMountsMCP(this.config)) return void 0;
+    if (this.apiRouteExists?.("/api/mcp")) return void 0;
+    if (this.routeManager.matchRoute(FARM_DEFAULT_MCP_PATH).route) return void 0;
+    this.defaultMCPServer ?? (this.defaultMCPServer = createFarmDefaultMCPServer(
+      readAppPackageIdentity(this.config.root),
+      FARM_VERSION
+    ));
+    return resolveFarmDefaultMCPServer(this.defaultMCPServer);
+  }
+  async renderDefaultMCP(req, res) {
+    const server = this.getDefaultMCPServer();
+    const request2 = getCurrentRequestOrNull() ?? createWebRequestFromFarmRequest(req, { trustProxy: this.config.server?.trustProxy });
+    try {
+      const { handleFarmDefaultMCPRequest } = await import("./agent-mcp-handler-LPJ2CADR.mjs");
+      const origin = new URL(request2.url).origin;
+      const response = await handleFarmDefaultMCPRequest(request2, {
+        server,
+        basePath: this.config.basePath,
+        listPages: /* @__PURE__ */ __name(async () => {
+          const sources = await Promise.all(
+            [...this.routeManager.getRoutes()].filter(([pattern]) => !pattern.includes("[")).map(async ([pattern, route]) => ({
+              pattern,
+              // The page itself surfaces a load error. Without its module a guard cannot
+              // be ruled out, so the page is left out.
+              module: await this.routeManager.loadRouteModule(route.modulePath).catch(() => ({ __farmRouteGuard: true }))
+            }))
+          );
+          return collectFarmDefaultMCPPages(sources, {
+            origin,
+            basePath: this.config.basePath,
+            markdown: resolveMarkdownConfig(this.config.md)
+          });
+        }, "listPages"),
+        // Pages are read through this server's own socket, with no cookies, as llms-full.txt does.
+        readMarkdown: this.createDevMarkdownReader(req)
+      });
+      await sendWebResponse(res, response);
+    } catch (error) {
+      logger.error(`Default MCP server failed: ${error}`);
+      await sendWebResponse(
+        res,
+        new Response(
+          JSON.stringify({
+            jsonrpc: "2.0",
+            id: null,
+            error: { code: -32603, message: "Internal error." }
+          }),
+          { status: 500, headers: { "Content-Type": "application/json" } }
+        )
+      );
+    }
+  }
   /** Same inputs the production server gives llms.txt: static pages and root metadata. */
   async createLlmsTxtContext(request2, options = {}) {
     const config = resolveFarmLlmsTxtConfig(this.config.agent?.llmsTxt);
@@ -6278,7 +6405,21 @@ var _ServerRenderer = class _ServerRenderer {
     });
     return {
       pages,
-      defaults: createFarmDefaultLlmsTxt({ origin, pages, config, rootMetadata }),
+      defaults: createFarmDefaultLlmsTxt({
+        origin,
+        pages,
+        config,
+        rootMetadata,
+        mcp: this.config.agent?.aiCatalog === false ? [] : listFarmMCPLlmsTxtLinks(origin, {
+          basePath: this.config.basePath,
+          apiServerBasePath: resolveFarmAPIServerBasePath(
+            normalizeFarmAPIConfig(
+              this.config.api
+            )
+          ),
+          defaultMCP: /* @__PURE__ */ __name(() => this.getDefaultMCPServer(), "defaultMCP")
+        })
+      }),
       ...options.full ? { markdown: this.createDevMarkdownReader(options.req) } : {}
     };
   }
@@ -6540,7 +6681,8 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
         title,
         tags: metaTags,
         hasFavicon,
-        hasExplicitTitle
+        hasExplicitTitle,
+        viewport: viewportTags
       } = renderMetadataHead(req.__FARM_METADATA__, {
         pathname: getFarmMetadataPathname(req),
         jsonLd: this.config.agent?.jsonLd
@@ -6566,6 +6708,7 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
         const effectiveRendererHead = hasExplicitTitle ? removeFarmDocumentTitles(rendererHead) : rendererHead;
         html = composeFarmFullDocument(documentHtml, {
           fallbackIcon: !hasFavicon,
+          viewport: viewportTags,
           htmlAttributes: `${i18nSnapshot ? ` lang="${escapeHtmlAttribute2(i18nSnapshot.locale)}" dir="${escapeHtmlAttribute2(i18nSnapshot.direction)}"` : ""}${themeDocument.attributes}`,
           replaceHtmlAttributes: [
             ...i18nSnapshot ? ["lang", "dir"] : [],
@@ -6593,7 +6736,7 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
 <head>
   ${themeDocument.head}
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  ${viewportTags}
   <meta name="farm-deployment-id" content="${escapeHtmlAttribute2(deploymentId)}">
   ${hasFavicon ? "" : '<link rel="icon" href="data:,">'}
   ${documentTitleTag}${metaTags}${alternateTags}${rendererHead ? `
@@ -6778,7 +6921,8 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
       const {
         title,
         tags: metaTags,
-        hasFavicon
+        hasFavicon,
+        viewport: viewportTags
       } = renderMetadataHead(req.__FARM_METADATA__, {
         pathname: getFarmMetadataPathname(req),
         jsonLd: this.config.agent?.jsonLd
@@ -6827,7 +6971,7 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
 <head>
   ${themeDocument.head}
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  ${viewportTags}
   <meta name="farm-deployment-id" content="${escapeHtmlAttribute2(deploymentId)}">
   ${hasFavicon ? "" : '<link rel="icon" href="data:,">'}
   <title>${title}</title>${metaTags}${i18nAlternateTags}
@@ -7202,12 +7346,14 @@ ${i18nSnapshot ? `window.__FARM_I18N__ = ${serializeInlineValue(i18nSnapshot)};`
       getTheme()
     );
     const rendererHydrationScript = this.rendererRuntime.generateHydrationScript?.() || "";
+    const viewportTags = renderViewportHead(alternates.metadata?.viewport);
     const fullDocument = extractFarmFullDocument(content);
     if (fullDocument) {
       return composeFarmFullDocument(
         metadataHead ? removeFarmDocumentTitles(fullDocument) : fullDocument,
         {
           fallbackIcon: !metadataHead,
+          viewport: viewportTags,
           htmlAttributes: `${i18nSnapshot ? ` lang="${escapeHtmlAttribute2(i18nSnapshot.locale)}" dir="${escapeHtmlAttribute2(i18nSnapshot.direction)}"` : ""}${themeDocument.attributes}`,
           replaceHtmlAttributes: [
             ...i18nSnapshot ? ["lang", "dir"] : [],
@@ -7234,7 +7380,7 @@ ${i18nSnapshot ? `window.__FARM_I18N__ = ${serializeInlineValue(i18nSnapshot)};`
 <head>
   ${themeDocument.head}
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  ${viewportTags}
   <meta name="farm-deployment-id" content="${escapeHtmlAttribute2(this.getDeploymentId())}">
   ${metadataHead ?? '<link rel="icon" href="data:,">\n  <title>Farm.js App</title>'}${alternateLinks}
   ${fontHead}
@@ -7662,8 +7808,8 @@ __name(validateSchemaSteps, "validateSchemaSteps");
 var _FarmPluginOptionsError = class _FarmPluginOptionsError extends TypeError {
   constructor(issues) {
     const lines = issues.map((issue) => {
-      const path21 = formatIssuePath(issue.path);
-      return `  - ${path21 ? `${path21}: ` : ""}${issue.message}`;
+      const path22 = formatIssuePath(issue.path);
+      return `  - ${path22 ? `${path22}: ` : ""}${issue.message}`;
     });
     super(`Invalid plugin options:
 ${lines.join("\n")}`);
@@ -7673,9 +7819,9 @@ ${lines.join("\n")}`);
 };
 __name(_FarmPluginOptionsError, "FarmPluginOptionsError");
 var FarmPluginOptionsError = _FarmPluginOptionsError;
-function formatIssuePath(path21) {
-  if (!path21?.length) return "";
-  return path21.map((segment) => {
+function formatIssuePath(path22) {
+  if (!path22?.length) return "";
+  return path22.map((segment) => {
     const key = typeof segment === "object" && segment !== null ? segment.key : segment;
     return typeof key === "symbol" ? key.toString() : String(key);
   }).join(".");
@@ -7911,23 +8057,23 @@ var _PluginManager = class _PluginManager {
             `Farm plugin "${plugin.name}" runtime.endpoints must contain endpoint objects`
           );
         }
-        const path21 = normalizeFarmPluginRuntimeEndpointPath(
+        const path22 = normalizeFarmPluginRuntimeEndpointPath(
           endpoint.path,
           `Farm plugin "${plugin.name}" runtime endpoint`
         );
         if (typeof endpoint.handler !== "function") {
           throw new TypeError(
-            `Farm plugin "${plugin.name}" runtime endpoint ${path21} requires a handler`
+            `Farm plugin "${plugin.name}" runtime endpoint ${path22} requires a handler`
           );
         }
-        const owner = owners.get(path21);
+        const owner = owners.get(path22);
         if (owner) {
           throw new Error(
-            `Farm plugin runtime endpoint ${path21} from "${plugin.name}" conflicts with "${owner}"`
+            `Farm plugin runtime endpoint ${path22} from "${plugin.name}" conflicts with "${owner}"`
           );
         }
-        owners.set(path21, plugin.name);
-        endpoints.push({ plugin, endpoint, path: path21 });
+        owners.set(path22, plugin.name);
+        endpoints.push({ plugin, endpoint, path: path22 });
       }
     }
     this.runtimeEndpoints = endpoints;
@@ -9267,7 +9413,7 @@ var SOURCE_QUERY_FLAGS = ["raw", "inline", "url"];
 var MODULE_EXTENSION = /\.(?:[cm]?[jt]sx?|vue|svelte|astro|mdx?|css|scss|sass|less|styl|stylus|pcss|postcss|sss)$/i;
 var ASSET_EXTENSION = /\.(?:apng|bmp|png|jpe?g|jfif|pjpeg|pjp|gif|svg|ico|webp|avif|cur|jxl|mp4|webm|ogg|mp3|wav|flac|aac|opus|mov|m4a|vtt|woff2?|eot|ttf|otf|webmanifest|pdf|txt|wasm)$/i;
 var INTERNAL_PREFIXES = ["/@vite/", "/@farm/", "/@react-refresh", "/__vite_ping"];
-var DEVELOPER_ONLY_PREFIXES = ["/__farm/devtools", "/__open-in-editor"];
+var DEVELOPER_ONLY_PREFIXES = ["/__farm/devtools", "/__open-in-editor", "/__mf_runner__"];
 function createFarmDevPreviewGuard(server, options) {
   return /* @__PURE__ */ __name(async function farmDevPreviewGuard(req, res, next) {
     if (!isFarmPreviewTunnelRequest(req.headers)) return next();
@@ -9360,7 +9506,7 @@ __name(isInside, "isInside");
 
 // src/vite.ts
 import * as fs11 from "fs";
-import * as path20 from "path";
+import * as path21 from "path";
 import { pathToFileURL as pathToFileURL3 } from "url";
 
 // src/dev-static.ts
@@ -9810,6 +9956,87 @@ function mergeFarmProductionViteConfig(farmConfig, userConfig = {}) {
 }
 __name(mergeFarmProductionViteConfig, "mergeFarmProductionViteConfig");
 
+// src/docs/client-config.ts
+import { realpathSync } from "fs";
+import { createRequire as createRequire3 } from "module";
+import path20 from "path";
+var parseAst2;
+function propertyKeyName(property2) {
+  if (property2.computed) return void 0;
+  const key = property2.key;
+  if (key.type === "Identifier") return key.name;
+  if (key.type === "Literal" && typeof key.value === "string") return key.value;
+  return void 0;
+}
+__name(propertyKeyName, "propertyKeyName");
+function redactFarmDocsClientConfig(code, filename) {
+  parseAst2 ?? (parseAst2 = createRequire3(typeof __filename === "string" ? __filename : import.meta.url)(
+    "rolldown/parseAst"
+  ).parseAst);
+  const extension = path20.extname(filename);
+  const program = parseAst2(code, {
+    lang: extension === ".tsx" || extension === ".jsx" ? "tsx" : "ts"
+  });
+  const edits = [];
+  const visit = /* @__PURE__ */ __name((node) => {
+    if (Array.isArray(node)) {
+      for (const child of node) visit(child);
+      return;
+    }
+    if (!node || typeof node !== "object") return;
+    const current = node;
+    if (current.type === "Property") {
+      const name = propertyKeyName(current);
+      const valueType = current.value?.type;
+      const credential = name !== void 0 && (name.toLowerCase() === "headers" || isSecretDocsConfigKey(name) && valueType !== "ObjectExpression" && valueType !== "ArrayExpression");
+      if (name && credential) {
+        edits.push(
+          current.shorthand || current.method || current.kind !== "init" ? { start: current.start, end: current.end, text: `${JSON.stringify(name)}: undefined` } : {
+            start: current.value.start,
+            end: current.value.end,
+            text: "undefined"
+          }
+        );
+        return;
+      }
+    }
+    for (const [key, value] of Object.entries(current)) {
+      if (key !== "start" && key !== "end" && value && typeof value === "object") visit(value);
+    }
+  }, "visit");
+  visit(program);
+  if (edits.length === 0) return null;
+  let redacted = code;
+  for (const edit of edits.sort((left, right) => right.start - left.start)) {
+    redacted = redacted.slice(0, edit.start) + edit.text + redacted.slice(edit.end);
+  }
+  return redacted;
+}
+__name(redactFarmDocsClientConfig, "redactFarmDocsClientConfig");
+function isFarmDocsClientConfigModule(id, configModule) {
+  if (!configModule) return false;
+  const file = id.split("?")[0].replace(/\\/g, "/");
+  if (file === configModule) return true;
+  try {
+    return file === realpathSync(configModule).replace(/\\/g, "/");
+  } catch {
+    return false;
+  }
+}
+__name(isFarmDocsClientConfigModule, "isFarmDocsClientConfigModule");
+function farmDocsClientConfigPlugin(configModule) {
+  return {
+    name: "farm:docs-client-config",
+    enforce: "pre",
+    transform(code, id, options) {
+      if (options?.ssr || !isFarmDocsClientConfigModule(id, configModule)) return null;
+      const redacted = redactFarmDocsClientConfig(code, id.split("?")[0]);
+      return redacted === null ? null : { code: redacted, map: null };
+    }
+  };
+}
+__name(farmDocsClientConfigPlugin, "farmDocsClientConfigPlugin");
+
 // src/theme/vite.ts
 var FARM_DARK_VARIANT = '@custom-variant dark (&:where([data-theme="dark"], [data-theme="dark"] *));';
 function createFarmThemeCssPlugin(input, basePath = "/") {
@@ -9884,7 +10111,12 @@ function farmLlmsTxtGeneratedPaths(config) {
 __name(farmLlmsTxtGeneratedPaths, "farmLlmsTxtGeneratedPaths");
 function farmAgentGeneratedPaths(config) {
   const crawlers = resolveFarmAgentCrawlers(config.agent?.crawlers);
-  return [...farmLlmsTxtGeneratedPaths(config), ...crawlers.enabled ? ["/robots.txt"] : []];
+  const sitemap = resolveFarmAgentSitemap(config.agent?.sitemap);
+  return [
+    ...farmLlmsTxtGeneratedPaths(config),
+    ...sitemap.enabled ? ["/sitemap.xml"] : [],
+    ...crawlers.enabled ? ["/robots.txt"] : []
+  ];
 }
 __name(farmAgentGeneratedPaths, "farmAgentGeneratedPaths");
 var ALL_TYPE_ARTIFACTS = {
@@ -9929,7 +10161,7 @@ function loadFarmWorkflowsDevRuntime() {
 }
 __name(loadFarmWorkflowsDevRuntime, "loadFarmWorkflowsDevRuntime");
 function loadFarmDevtoolsSnapshotRuntime() {
-  return import("./devtools-RNXCTS4R.mjs");
+  return import("./devtools-ERIKFEXX.mjs");
 }
 __name(loadFarmDevtoolsSnapshotRuntime, "loadFarmDevtoolsSnapshotRuntime");
 function loadFarmDevtoolsUIRuntime() {
@@ -10352,7 +10584,7 @@ function fileContainsProgrammaticPageRoute(file) {
 __name(fileContainsProgrammaticPageRoute, "fileContainsProgrammaticPageRoute");
 function rewriteEarlySsrRelativeImports(options) {
   const cleanId = options.id.split("?", 1)[0];
-  if (!path20.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
+  if (!path21.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
     return null;
   }
   const replacements = [];
@@ -10372,7 +10604,7 @@ function rewriteEarlySsrRelativeImports(options) {
     const suffixIndex = source.value.search(/[?#]/);
     const sourcePath = suffixIndex === -1 ? source.value : source.value.slice(0, suffixIndex);
     const suffix = suffixIndex === -1 ? "" : source.value.slice(suffixIndex);
-    const resolvedPath = path20.resolve(path20.dirname(cleanId), sourcePath);
+    const resolvedPath = path21.resolve(path21.dirname(cleanId), sourcePath);
     replacements.push({
       start: source.start,
       end: source.end,
@@ -10540,6 +10772,11 @@ function farmPlugin(options = {}, initialPluginManager) {
   let refreshRouteDiscovery = null;
   let workflowHandler = null;
   let isBuild = false;
+  const docsMCPServerDisposers = /* @__PURE__ */ new Set();
+  const releaseDocsMCPServers = /* @__PURE__ */ __name(() => {
+    for (const dispose of docsMCPServerDisposers) dispose();
+    docsMCPServerDisposers.clear();
+  }, "releaseDocsMCPServers");
   const logUpdate = /* @__PURE__ */ __name((tag, message) => {
     const pc = createCliColors();
     const log = [
@@ -10570,7 +10807,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         },
         server: {
           fs: {
-            ...layerRoots.length ? { allow: [path20.resolve(options.root || process.cwd()), ...layerRoots] } : {},
+            ...layerRoots.length ? { allow: [path21.resolve(options.root || process.cwd()), ...layerRoots] } : {},
             deny: getFarmDevFsDeny(userConfig.server?.fs?.deny, options)
           }
         }
@@ -10646,7 +10883,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         });
       }
       const sourceRoots = getFarmSourceRoots(farmConfig);
-      server.watcher.add(sourceRoots.map((source) => path20.join(source.root, source.srcDir)));
+      server.watcher.add(sourceRoots.map((source) => path21.join(source.root, source.srcDir)));
       if (farmConfig.i18n.enabled) {
         server.watcher.add(
           farmConfig.i18n.locales.map(
@@ -10661,7 +10898,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         ...farmDocsDevRuntime?.getFarmDocsRouteTypeEntries(farmConfig.docs) ?? []
       ], "getExtraRouteTypes");
       const appDirSlugs = sourceRoots.map(
-        (source) => path20.join(source.root, source.srcDir, "app").replace(/\\/g, "/")
+        (source) => path21.join(source.root, source.srcDir, "app").replace(/\\/g, "/")
       );
       const generateTypeArtifacts = /* @__PURE__ */ __name(async (reason, selection = ALL_TYPE_ARTIFACTS, log = false) => {
         try {
@@ -10702,7 +10939,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       }, "generateTypeArtifacts");
       await generateTypeArtifacts("startup");
       const srcDirSlugs = sourceRoots.map(
-        (source) => path20.join(source.root, source.srcDir).replace(/\\/g, "/")
+        (source) => path21.join(source.root, source.srcDir).replace(/\\/g, "/")
       );
       const layerConfigFiles = new Set(
         farmConfig.layers.map((layer) => layer.configFile?.replace(/\\/g, "/")).filter((file) => Boolean(file))
@@ -10836,12 +11073,20 @@ function farmPlugin(options = {}, initialPluginManager) {
         plugins: farmConfig.plugins,
         i18n: farmApp.getI18nRuntime(),
         bodySizeLimit: serverConfig.bodySizeLimit,
-        basePath: apiServerBasePath
+        basePath: apiServerBasePath,
+        // A plugin calling an app endpoint (an MCP tool, say) goes back through this server,
+        // so the endpoint's middleware and integration guards run for it, as in production.
+        dispatch: /* @__PURE__ */ __name((request2) => {
+          const url = new URL(request2.url);
+          url.pathname = applyFarmBasePath(url.pathname, farmConfig.basePath);
+          return fetch(new Request(url, request2), { redirect: "manual" });
+        }, "dispatch")
       });
       await apiRouteManager.discoverRoutes();
+      farmApp.getServerRenderer().setAPIRouteLookup((routePath) => apiRouteManager.getRoutes().has(routePath));
       let discoveredWorkflows = [];
       const hasWorkflowDirectory = workflowConfig.enabled && workflowConfig.dirs.some(
-        (dir) => fs11.existsSync(path20.isAbsolute(dir) ? dir : path20.join(farmConfig.root, dir))
+        (dir) => fs11.existsSync(path21.isAbsolute(dir) ? dir : path21.join(farmConfig.root, dir))
       );
       if (hasWorkflowDirectory) {
         const { createFarmWorkflowRequestHandler, discoverFarmWorkflows } = await loadFarmWorkflowsDevRuntime();
@@ -10919,6 +11164,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         );
         return resolveFarmLayoutFonts(layoutModules);
       }, "resolveDocsLayoutFonts");
+      releaseDocsMCPServers();
       const farmDocsHandler = farmDocsDevRuntime ? farmDocsDevRuntime.hasFarmDocsRuntimeAdapter(farmConfig.docs) ? await farmDocsDevRuntime.createFarmDocsAdapterHandler(farmConfig.docs, {
         root: farmConfig.root,
         srcDir: farmConfig.srcDir,
@@ -10938,7 +11184,15 @@ function farmPlugin(options = {}, initialPluginManager) {
             );
           }
           return loadFarmDevModule(server, resolved?.id ?? specifier);
-        }, "loadModule")
+        }, "loadModule"),
+        registerMCPServer: /* @__PURE__ */ __name((mcpServer) => {
+          const dispose = registerFarmMCPServer(mcpServer);
+          docsMCPServerDisposers.add(dispose);
+          return () => {
+            docsMCPServerDisposers.delete(dispose);
+            dispose();
+          };
+        }, "registerMCPServer")
       }) : farmDocsDevRuntime.createFarmDocsHandler(farmConfig.docs, {
         root: farmConfig.root,
         srcDir: farmConfig.srcDir,
@@ -11232,22 +11486,30 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             const docsHandler = openAPIManager.getDocsRouteHandler(parsedRequestUrl.origin);
             return docsHandler(req, res);
           }
-          if (stripFarmBasePath(requestPathname, farmConfig.basePath) === FARM_APP_MANIFEST_PATH) {
+          if (options.agent?.manifest !== false && isFarmAppManifestPath(stripFarmBasePath(requestPathname, farmConfig.basePath))) {
+            if (await runAppMiddlewareForContentRoute()) return;
             farmAppPackages ?? (farmAppPackages = resolveFarmAppPackages(farmConfig.root ?? process.cwd()));
+            const header = /* @__PURE__ */ __name((name) => String(req.headers[name] ?? ""), "header");
             const manifest = await createFarmAppManifestResponse(
-              new Request(parsedRequestUrl, { method: requestMethod }),
-              resolveFarmAppManifestInput(farmConfig, {
-                build: "development",
-                packages: farmAppPackages,
-                // Read again on each request; unchanged files come from a cache.
-                webmcpTools: farmConfig.plugins?.some(({ name }) => name === "farm:webmcp") ? collectFarmWebMCPTools(farmConfig.root ?? process.cwd(), farmConfig.srcDir) : []
+              new Request(parsedRequestUrl, {
+                method: requestMethod,
+                headers: {
+                  "if-none-match": header("if-none-match"),
+                  [FARM_INFRA_SIGNATURE_HEADER]: header(FARM_INFRA_SIGNATURE_HEADER)
+                }
               }),
-              { development: true }
+              {
+                ...resolveFarmAppManifestInput(farmConfig, {
+                  build: "development",
+                  packages: farmAppPackages,
+                  // Read again on each request; unchanged files come from a cache.
+                  webmcpTools: farmConfig.plugins?.some(({ name }) => name === "farm:webmcp") ? collectFarmWebMCPTools(farmConfig.root ?? process.cwd(), farmConfig.srcDir) : []
+                }),
+                defaultMCP: /* @__PURE__ */ __name(() => farmApp.getServerRenderer().getDefaultMCPServer(), "defaultMCP")
+              }
             );
-            if (manifest) {
-              await sendWebResponse(res, manifest);
-              return;
-            }
+            await sendWebResponse(res, manifest);
+            return;
           }
           if (options.agent?.apiCatalog && stripFarmBasePath(requestPathname, farmConfig.basePath) === FARM_API_CATALOG_PATH) {
             if (await runAppMiddlewareForContentRoute()) return;
@@ -11263,6 +11525,27 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             );
             return;
           }
+          if (options.agent?.aiCatalog !== false) {
+            const aiCatalog = createFarmAiCatalogResponse(
+              new Request(parsedRequestUrl, {
+                method: requestMethod,
+                headers: {
+                  "user-agent": String(req.headers["user-agent"] ?? ""),
+                  "if-none-match": String(req.headers["if-none-match"] ?? "")
+                }
+              }),
+              {
+                basePath: farmConfig.basePath,
+                apiServerBasePath,
+                defaultMCP: /* @__PURE__ */ __name(() => farmApp.getServerRenderer().getDefaultMCPServer(), "defaultMCP")
+              }
+            );
+            if (aiCatalog) {
+              if (await runAppMiddlewareForContentRoute()) return;
+              await sendWebResponse(res, aiCatalog);
+              return;
+            }
+          }
           const docsHeaders = new Headers();
           for (const [key, value] of Object.entries(req.headers)) {
             if (value) {
@@ -11280,7 +11563,8 @@ window.__FARM_MANIFEST__ = ${inlineValue({
               method: requestMethod,
               headers: docsHeaders
             });
-            const docsResponse = await farmDocsHandler(docsRequest.clone());
+            const docsBodyInit = requestMethod === "GET" || requestMethod === "HEAD" ? {} : { body: createFarmNodeRequestBodyStream(req), duplex: "half" };
+            const docsResponse = await farmDocsHandler(new Request(docsRequest, docsBodyInit));
             if (docsResponse) {
               if (await runAppMiddlewareForContentRoute()) return;
               await sendWebResponse(
@@ -11800,7 +12084,10 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                   return;
                 }
                 const routeModule = await routeManager3.loadRouteModule(route.modulePath);
-                const loadingBoundary = routeManager3.getMatchingLoading(targetRequestUrl.pathname);
+                const loadingBoundary = routeManager3.getMatchingLoading(
+                  targetRequestUrl.pathname,
+                  route
+                );
                 const loadingModule = loadingBoundary ? await routeManager3.loadRouteModule(loadingBoundary.modulePath) : null;
                 const navigationManifest = routeManager3.generateClientManifest(server.config.root);
                 const moduleMetadata = navigationManifest.routes.find((entry) => entry.pattern === route.pattern) ?? getClientModuleMetadata(route.modulePath, server.config.root);
@@ -11854,6 +12141,9 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                       await layoutModule.generateMetadata({ params: routeProps.params })
                     );
                   }
+                  mergedMetadata = await mergeModuleViewport(mergedMetadata, layoutModule, {
+                    params: routeProps.params
+                  });
                 }
                 mergedMetadata = mergeMetadata(mergedMetadata, routeModule.metadata);
                 if (typeof routeModule.generateMetadata === "function") {
@@ -11862,6 +12152,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                     await routeModule.generateMetadata(routeProps)
                   );
                 }
+                mergedMetadata = await mergeModuleViewport(mergedMetadata, routeModule, routeProps);
                 mergedMetadata = addMetadataMarkdownAlternate(
                   mergedMetadata,
                   getFarmMarkdownAlternatePath(farmApp.getConfig().md, targetRequestUrl.pathname)
@@ -11893,6 +12184,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                     return {
                       name: slot.name,
                       ownerPattern: slot.ownerPattern,
+                      ...slot.ownerDirectory ? { ownerDirectory: slot.ownerDirectory } : {},
                       containerId: slot.containerId,
                       interception: slot.interception,
                       fallback: slot.fallback,
@@ -11945,13 +12237,15 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                       slots: routeSlots.map((slot) => ({
                         name: slot.name,
                         ownerPattern: slot.ownerPattern,
+                        ownerDirectory: slot.ownerDirectory,
                         containerId: slot.containerId,
                         module: slot.renderModule,
                         props: slot.props
                       })),
                       pageShouldHydrate: shouldHydrate,
                       layoutShouldHydrate: shouldHydrateLayout,
-                      islandStrategy: hydrationIslandStrategy
+                      islandStrategy: hydrationIslandStrategy,
+                      serverTree: "serverTree" in moduleMetadata && moduleMetadata.serverTree === true
                     })
                   )
                 );
@@ -12302,6 +12596,7 @@ export const getManifest = () => ({
           fullManifest.routes[route.pattern] = {
             modulePath: route.modulePath,
             pattern: route.pattern,
+            ...route.directory ? { directory: route.directory } : {},
             segments: route.segments,
             search: route.search,
             isClientComponent: route.isClientComponent,
@@ -12314,9 +12609,11 @@ export const getManifest = () => ({
           };
         }
         for (const layout of manifest.layouts) {
+          const groupScope = getRouteGroupScope(layout.pattern);
           fullManifest.layouts[layout.pattern] = {
             modulePath: layout.modulePath,
             pattern: layout.pattern,
+            ...groupScope ? { urlPattern: stripRouteGroups(layout.pattern), groupScope } : {},
             shouldHydrate: layout.shouldHydrate,
             islandStrategy: layout.islandStrategy,
             preloads: [layout.modulePath],
@@ -12340,6 +12637,13 @@ export const manifest = getManifest();
       }
     },
     async transform(code, id, transformOptions) {
+      if (!transformOptions?.ssr) {
+        const docsConfigModule = getFarmDocsAdapterConfigModule(farmApp?.getConfig()?.docs);
+        if (isFarmDocsClientConfigModule(id, docsConfigModule)) {
+          const redacted = redactFarmDocsClientConfig(code, id.split("?")[0]);
+          if (redacted !== null) return { code: redacted, map: null };
+        }
+      }
       if (!transformOptions?.ssr) {
         const currentConfig = farmApp?.getConfig() ?? options;
         if (currentConfig.experimental?.serverActions !== true || !serverFnTransformActive) {
@@ -12396,7 +12700,7 @@ export const manifest = getManifest();
         const root = currentConfig.root || server?.config.root || process.cwd();
         const cleanId = id.split("?", 1)[0];
         const selectedIsolatedModules = options.isolatedClientBoundaryModules ?? farmApp?.getRouteManager().getIsolatedClientBoundaryModules(root);
-        const selectedForIsolatedHydration = selectedIsolatedModules?.has(path20.resolve(cleanId)) === true;
+        const selectedForIsolatedHydration = selectedIsolatedModules?.has(path21.resolve(cleanId)) === true;
         if (isReactRenderer(resolveFarmRenderer(currentConfig.renderer)) && selectedForIsolatedHydration && isIsolatableClientBoundarySource(clientBoundarySource)) {
           isolatedModuleReference = toViteModuleId(cleanId, root);
           const transformedBoundary = transformIsolatedClientBoundaryModule({
@@ -12476,6 +12780,7 @@ if (import.meta.hot) {
       });
     },
     async closeBundle() {
+      if (!isBuild) releaseDocsMCPServers();
       if (!farmApp || !isBuild) return;
       try {
         const routeManager = farmApp.getRouteManager();
@@ -12487,8 +12792,8 @@ if (import.meta.hot) {
         }
         logger.info(`Found ${ssgPages.length} SSG pages, ${ssrRoutes.length} SSR routes`);
         logger.info("Pre-rendering SSG pages...");
-        const outDir = path20.join(server?.config.root || process.cwd(), options.outDir || "dist");
-        const clientDir = path20.join(outDir, "client");
+        const outDir = path21.join(server?.config.root || process.cwd(), options.outDir || "dist");
+        const clientDir = path21.join(outDir, "client");
         for (const page of ssgPages) {
           try {
             const staticRequest = new Request(new URL(page.urlPath, "http://farm.static"));
@@ -12540,8 +12845,8 @@ if (import.meta.hot) {
   <script type="module" src="/assets/client.js"></script>
 </body>
 </html>`;
-              const outputPath = page.urlPath === "/" ? path20.join(clientDir, "index.html") : path20.join(clientDir, page.urlPath + ".html");
-              fs11.mkdirSync(path20.dirname(outputPath), { recursive: true });
+              const outputPath = page.urlPath === "/" ? path21.join(clientDir, "index.html") : path21.join(clientDir, page.urlPath + ".html");
+              fs11.mkdirSync(path21.dirname(outputPath), { recursive: true });
               fs11.writeFileSync(outputPath, fullHtml);
               const revalidateInfo = page.revalidate ? ` (revalidate: ${page.revalidate}s)` : "";
               logger.success(`  \u2713 ${page.urlPath}${revalidateInfo}`);
@@ -12550,7 +12855,7 @@ if (import.meta.hot) {
             logger.error(`  \u2717 ${page.urlPath}: ${error}`);
           }
         }
-        const manifestPath = path20.join(outDir, "__ssg_manifest.json");
+        const manifestPath = path21.join(outDir, "__ssg_manifest.json");
         fs11.writeFileSync(
           manifestPath,
           JSON.stringify(
@@ -12594,9 +12899,9 @@ if (import.meta.hot) {
         server2.ws.send({ type: "full-reload", path: "*" });
         return [];
       }
-      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path20.join(source.root, source.srcDir).replace(/\\/g, "/")).find((sourceRoot) => normalizedFile.startsWith(`${sourceRoot}/`)) || null : null;
+      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path21.join(source.root, source.srcDir).replace(/\\/g, "/")).find((sourceRoot) => normalizedFile.startsWith(`${sourceRoot}/`)) || null : null;
       if (currentSrcRoot && normalizedFile.startsWith(`${currentSrcRoot}/`) && isProgrammaticRoutesFileName(normalizedFile)) {
-        logUpdate("PAGE", `updated ${path20.basename(file)}`);
+        logUpdate("PAGE", `updated ${path21.basename(file)}`);
         for (const mod of modules) {
           server2.moduleGraph.invalidateModule(mod);
         }
@@ -12620,6 +12925,9 @@ if (import.meta.hot) {
         });
         return [];
       }
+      if (apiRouteManager && invalidateFarmDevDependents(server2, file, apiRouteManager.getSourceFiles()).length > 0) {
+        await refreshRouteDiscovery?.(`updated ${file}`);
+      }
       const isolatedHydrationMode = currentFarmConfig?.experimental?.isolatedClientHydration;
       const planRouteManager = farmApp?.getRouteManager();
       const isHydrationPlanSource = currentSrcRoot !== null && normalizedFile.startsWith(`${currentSrcRoot}/`) && /\.[cm]?[jt]sx?$/.test(normalizedFile);
@@ -12727,10 +13035,10 @@ function createPageDataMiddlewareRequest(req, target) {
 __name(createPageDataMiddlewareRequest, "createPageDataMiddlewareRequest");
 function resolveDevelopmentRoot(farmRoot, viteRoot) {
   if (!farmRoot) return viteRoot;
-  if (path20.resolve(farmRoot) === path20.resolve(viteRoot)) return farmRoot;
+  if (path21.resolve(farmRoot) === path21.resolve(viteRoot)) return farmRoot;
   try {
     if (fs11.realpathSync(farmRoot) === fs11.realpathSync(viteRoot)) {
-      return path20.resolve(viteRoot);
+      return path21.resolve(viteRoot);
     }
   } catch {
   }
@@ -13095,7 +13403,8 @@ function generateClientCode(integrationProviders = [], documentNavigationMatcher
 import { hydrateRoot, createRoot } from 'react-dom/client'` : appSetupPath ? `import React, { hydrateRoot, createRoot, configureApp as __farmConfigureApp } from ${JSON.stringify(renderer.client)}
 import __farmAppSetup from ${JSON.stringify(toViteModuleId(appSetupPath, root))}
 __farmConfigureApp(__farmAppSetup)` : `import React, { hydrateRoot, createRoot } from ${JSON.stringify(renderer.client)}`;
-  const isolatedHydrationImport = isolatedHydrationEnabled ? `import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph } from '@farm.js/core/internal/isolated-boundary'` : "";
+  const isolatedHydrationImport = isolatedHydrationEnabled ? `import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph } from '@farm.js/core/internal/isolated-boundary'
+import { createFarmServerTreeElement } from '@farm.js/core/internal/server-tree'` : "";
   const docsAdapterImportBlock = generateFarmDocsAdapterClientRuntime(
     docsAdapterReact,
     docsConfigModule
@@ -13117,7 +13426,21 @@ function disposeFarmIsolatedClientBoundaries(scope) {
 
 async function hydrateFarmIsolatedClientBoundaries(scope = document, signal) {
   await farmIsolatedHydrationRuntime.hydrate(scope, signal);
-}` : "";
+}
+
+// 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: (reference) => import(/* @vite-ignore */ reference),
+      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; }`;
   return `
 ${rendererClientImports}
 ${isolatedHydrationImport}
@@ -13258,14 +13581,29 @@ function findLayouts(pathname) {
   const manifest = getManifest();
   const layouts = Object.values(manifest.layouts);
   const matchingLayouts = [];
+  let directory;
   
   for (const layout of layouts) {
-    if (layout.pattern === '/' || isFarmRouteActive(layout.pattern, pathname, { exact: false })) {
-      matchingLayouts.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, pathname, { exact: false })) continue;
+    if (layout.groupScope) {
+      if (directory === undefined) {
+        const route = findRoute(pathname)?.route;
+        directory = route ? route.directory || route.pattern : null;
+      }
+      if (
+        typeof directory !== 'string' ||
+        (directory !== layout.groupScope && !directory.startsWith(layout.groupScope + '/'))
+      ) continue;
     }
+    matchingLayouts.push(layout);
   }
   
-  return matchingLayouts.sort((a, b) => a.pattern.length - b.pattern.length);
+  return matchingLayouts.sort(
+    (a, b) => a.pattern.split('/').filter(Boolean).length - b.pattern.split('/').filter(Boolean).length,
+  );
 }
 
 // ====== SPA ROUTER ======
@@ -14047,14 +14385,23 @@ async function tryHydrateImportedPage(
   } else if (layoutShouldHydrate) {
     currentPageProps = existingProps || { params };
     const serverPage = document.getElementById('__farm_page__');
-    pageElement = createLayoutPageBoundary(
-      false,
-      islandStrategy,
-      null,
-      typeof hydrationOptions.serverHtml === 'string'
-        ? hydrationOptions.serverHtml
-        : serverPage ? serverPage.innerHTML : '',
-    );
+    const pageSource = typeof hydrationOptions.serverHtml === 'string'
+      ? hydrationOptions.serverHtml
+      : serverPage;
+    const serverTree = pageSource
+      ? await createFarmServerTreePageElement(pageSource, window.location.pathname)
+      : null;
+    if (signal?.aborted || !container?.isConnected) return false;
+    pageElement = serverTree
+      ? createLayoutPageBoundary(false, islandStrategy, serverTree)
+      : createLayoutPageBoundary(
+          false,
+          islandStrategy,
+          null,
+          typeof hydrationOptions.serverHtml === 'string'
+            ? hydrationOptions.serverHtml
+            : serverPage ? serverPage.innerHTML : '',
+        );
   }
   if (signal?.aborted || !container?.isConnected || !pageElement) return false;
 
@@ -14240,6 +14587,8 @@ async function renderPage(pageData) {
     loadingModulePath: pageData.loadingModulePath,
   };
   const params = pageData.props?.params || {};
+  // Page data carries middleware data as JSON, the way a full load embeds it.
+  const pageProps = pageData.props ? normalizeServerProps(pageData.props) : pageData.props;
   const nextLayoutPatterns = Array.isArray(pageData.fragment?.layoutPatterns)
     ? pageData.fragment.layoutPatterns
     : [];
@@ -14256,6 +14605,20 @@ async function renderPage(pageData) {
     let fragmentHtml = pageData.fragment?.html;
     let layoutPatterns = nextLayoutPatterns;
 
+    // The fragment leaves out the layouts both routes share. When React owns the
+    // current layouts and will not keep rendering them, the swap below replaces the
+    // whole container, so a fragment without its outer layouts would drop them.
+    // Load the complete route for that swap instead.
+    if (
+      typeof fragmentHtml === 'string' &&
+      activeLayoutShouldHydrate &&
+      !(route.layoutShouldHydrate && (appRoot || reactRoot)) &&
+      nextLayoutPatterns.length > 0 &&
+      !findLayoutBoundary(parseNavigationFragment(fragmentHtml), nextLayoutPatterns[0])
+    ) {
+      fragmentHtml = undefined;
+    }
+
     if (typeof fragmentHtml !== 'string') {
       const deploymentId = window.__FARM_DEPLOYMENT_ID__;
       const response = await fetch(path, {
@@ -14296,7 +14659,7 @@ async function renderPage(pageData) {
         params,
         layouts,
         false,
-        pageData.props,
+        pageProps,
         null,
         {
           pageShouldHydrate,
@@ -14342,7 +14705,7 @@ async function renderPage(pageData) {
               params,
               layouts,
               true,
-              pageData.props,
+              pageProps,
               hydrationController.signal,
               {
                 pageShouldHydrate,
@@ -14456,17 +14819,20 @@ async function hydrate() {
       return
     }
 
-    // Get props - either from server-injected props or by matching the current URL
-    if (!pageProps || !pageProps.params || Object.keys(pageProps.params).length === 0) {
-      // Extract params from URL using manifest route matching (fallback)
+    // Use the server-injected props. A document that carries no params (a route
+    // without any, or generated HTML) takes them from the current URL, keeping
+    // what the server rendered with, such as middleware data.
+    if (!pageProps.params || Object.keys(pageProps.params).length === 0) {
       const pathname = window.location.pathname;
       const foundRoute = findRoute(pathname);
-      pageProps = normalizeServerProps({
-        params: foundRoute?.params || {},
-        search: getCurrentSearchParams(),
-        searchParams: getCurrentSearchParams(),
+      const search = getCurrentSearchParams();
+      pageProps = {
+        search,
+        searchParams: search,
         path: pathname,
-      });
+        ...pageProps,
+        params: foundRoute?.params || {},
+      };
     }
     currentPageProps = pageProps;
 
@@ -14659,9 +15025,9 @@ function generateClientManifest(bundle) {
 __name(generateClientManifest, "generateClientManifest");
 async function defineConfig(config = {}) {
   const tailwindVitePlugin = await loadTailwindVitePlugin();
-  const appRoot = path20.resolve(config.root || process.cwd());
+  const appRoot = path21.resolve(config.root || process.cwd());
   if (config.extends?.length) {
-    const { config: layeredConfig } = await import("./layers-BRQF5ETU.mjs").then(
+    const { config: layeredConfig } = await import("./layers-UTB43B7A.mjs").then(
       ({ resolveFarmLayers }) => resolveFarmLayers(config, {
         root: appRoot,
         mode: process.env.NODE_ENV === "production" ? "production" : "development"
@@ -14882,10 +15248,10 @@ export {
   resolveFarmIsolatedClientHydrationMode,
   getClientModuleMetadata,
   getClientModuleHydrationPlan,
+  usesFarmServerTree,
   createMarkdownPageHydrationPlanner,
   enforceFarmIsolatedHydrationRouteBudget,
   RouteManager,
-  HOISTED_HEAD_ELEMENT,
   resolveFarmNotFoundComponentPath,
   farmFontImportsPlugin,
   mergeFarmFontCss,
@@ -14911,6 +15277,7 @@ export {
   createFarmSourceAlias,
   mergeFarmViteConfig,
   mergeFarmProductionViteConfig,
+  farmDocsClientConfigPlugin,
   createFarmThemeCssPlugin,
   farmI18nClientBridgePlugin,
   farmServerOnlyEntriesPlugin,