@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-6L6DQR5W.mjs → chunk-4KU5Q7C2.mjs}

@@ -1,12 +1,10 @@
 import {
   collectSSGPages,
-  createRouteSlotContainerId,
   generateFarmTypeArtifacts,
   matchSSGPage,
-  parseRouteSlotFile,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-O3DTUAX2.mjs";
+} from "./chunk-2G2NNLE2.mjs";
 import {
   collectSchemaExtensions,
   declareSchemaTables,
@@ -17,26 +15,42 @@ import {
 } from "./chunk-ZMSZZXOR.mjs";
 import {
   FARM_API_CATALOG_PATH,
+  FARM_APP_MANIFEST_PATH,
+  classifyFarmDocumentPrefix,
+  composeFarmFullDocument,
   createDefaultErrorMarkup,
+  createFarmAiCatalogResponse,
   createFarmApiCatalogResponse,
+  createFarmAppManifestResponse,
   createFarmMetadataRouteResponse,
   createFarmThemeDocumentParts,
   createLateNotFoundRecovery,
   createLateRedirectRecovery,
+  createRouteDirectoryPattern,
+  extractFarmFullDocument,
+  formatRouteSegment,
   getDefaultErrorStatusText,
+  getRouteDirectoryDepth,
+  getRouteGroupScope,
+  isInRouteGroupScope,
+  listFarmMCPLlmsTxtLinks,
+  removeFarmDocumentTitles,
   renderFarmLocaleAlternateLinks,
   resolveDefaultErrorStatus,
-  resolveFarmApiCatalogInput
-} from "./chunk-TEN4FIZU.mjs";
+  resolveFarmApiCatalogInput,
+  resolveFarmAppManifestInput,
+  routeBoundaryCoversDirectory,
+  stripRouteGroups
+} from "./chunk-6ETPZTJI.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
 import {
   createFarmMetadataImageResponse
-} from "./chunk-YQVSHTMR.mjs";
+} from "./chunk-CP6X4AEU.mjs";
 import {
   createFarmImageHandler
-} from "./chunk-F6XEGFHO.mjs";
+} from "./chunk-HUMR6LSU.mjs";
 import {
   FARM_ISLAND_REPLAYABLE_SELECTOR,
   isFarmIslandStrategy
@@ -46,15 +60,16 @@ import {
 } from "./chunk-PNGWZFUQ.mjs";
 import {
   farmEnvironmentFunctionsPlugin
-} from "./chunk-ZSH2Y4LN.mjs";
+} from "./chunk-E5GNDG5F.mjs";
 import {
   _setDefaultFarmThemeConfig,
   getTheme
-} from "./chunk-WBIH66JK.mjs";
+} from "./chunk-2ELDTQRN.mjs";
 import {
   generateFarmDocsAdapterClientRuntime,
-  getFarmDocsAdapterConfigModule
-} from "./chunk-VVBO3QH7.mjs";
+  getFarmDocsAdapterConfigModule,
+  isSecretDocsConfigKey
+} from "./chunk-ENLZ4R3Y.mjs";
 import {
   resolveFarmDocsFontAssets,
   toFarmDocsPublicFontAssets
@@ -108,7 +123,7 @@ import {
   resolveFarmLlmsTxtConfig,
   resolveFarmPerformanceConfig,
   resolveFarmSecurityConfig
-} from "./chunk-6VYZOPOT.mjs";
+} from "./chunk-UJD4PHYB.mjs";
 import {
   getPublicFarmImageConfig,
   resolveFarmImageConfig
@@ -118,7 +133,7 @@ import {
 } from "./chunk-YHOCRI4H.mjs";
 import {
   resolveServerActionsConfig
-} from "./chunk-QCFFHV5H.mjs";
+} from "./chunk-SMHH4VDG.mjs";
 import {
   createBundledEnv,
   getResolvedEnv
@@ -126,12 +141,12 @@ import {
 import {
   createFarmMarkdownRouteModuleFromFile,
   loadFarmMdxComponents
-} from "./chunk-5LJCOSKT.mjs";
+} from "./chunk-YULD7ICZ.mjs";
 import {
   createFarmMarkdownSourceResponse,
   isFarmMarkdownPageFile,
   normalizeFarmMarkdownRoutePath
-} from "./chunk-7QOCTYBS.mjs";
+} from "./chunk-4JHOT46A.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
@@ -145,10 +160,10 @@ import {
   getFarmMarkdownMirrorPath,
   resolveMarkdownConfig,
   resolveMarkdownMirrorTarget
-} from "./chunk-JBC2FKRW.mjs";
+} from "./chunk-WWIKMBRN.mjs";
 import {
   resolveWorkflowsConfig
-} from "./chunk-3ATMYLLJ.mjs";
+} from "./chunk-6WCPV6G2.mjs";
 import {
   initStorage
 } from "./chunk-UWPLULNK.mjs";
@@ -168,16 +183,20 @@ import {
   getRegisteredIntegrationAPIManifest,
   isFarmIntegrationProviderComponentReference,
   matchIntegrationRoute
-} from "./chunk-JLCQGPXE.mjs";
+} from "./chunk-HMIJDL7S.mjs";
 import {
   MiddlewareManager
-} from "./chunk-VUMAE7NC.mjs";
+} from "./chunk-6TJOML4E.mjs";
+import {
+  createRouteSlotContainerId,
+  parseRouteSlotFile
+} from "./chunk-RHAZ22ZN.mjs";
 import {
   _clearCurrentMiddlewareContext,
   _clearCurrentMiddlewareData,
   _runWithMiddlewareContext,
   _runWithMiddlewareData
-} from "./chunk-NRVGEI5I.mjs";
+} from "./chunk-2NNMOPDN.mjs";
 import {
   _runWithAPIRequestRuntime
 } from "./chunk-R3DS7A2T.mjs";
@@ -186,17 +205,17 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteManager
-} from "./chunk-BXFWA23T.mjs";
+} from "./chunk-22LTEMGQ.mjs";
 import {
   findProgrammaticRouteFiles,
   loadProgrammaticRouteManifests
-} from "./chunk-LNZ7JZUS.mjs";
+} from "./chunk-UDNPLXW7.mjs";
 import {
   _runWithFarmI18nRequest,
   _setDefaultFarmI18nRuntime,
   createFarmI18nRuntime,
   getFarmI18nClientSnapshot
-} from "./chunk-JNGIWIY6.mjs";
+} from "./chunk-NPC7VWJE.mjs";
 import {
   VERCEL_OG_INSTALL_HINT,
   formatOptionalPeerInstallHint,
@@ -205,10 +224,10 @@ import {
 } from "./chunk-YOZYCI6Z.mjs";
 import {
   isFarmAPIPathname
-} from "./chunk-X7WVQMIB.mjs";
+} from "./chunk-G5RT7EXW.mjs";
 import {
-  resolveFarmAPIServerBasePath
-} from "./chunk-I6XDAKWQ.mjs";
+  registerFarmMCPServer
+} from "./chunk-ZLAT2CWY.mjs";
 import {
   createProgrammaticRouteModuleId,
   getProgrammaticRouteSearchClientOptions,
@@ -228,11 +247,12 @@ import {
   configureFarmCache,
   getFarmDataCache,
   normalizeRevalidatePath
-} from "./chunk-IV6CQY7O.mjs";
+} from "./chunk-MSSFIQGM.mjs";
 import {
   clearRequestContext,
   copyRequestContext,
   createFarmNodeRequestAbortSignal,
+  createFarmNodeRequestBodyStream,
   createFarmRequestBodyErrorResponse,
   deleteRequestContext,
   getRequestContext,
@@ -242,7 +262,7 @@ import {
   readNodeRequestBody,
   resolveFarmServerConfig,
   setRequestContext
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-Y7RKTKYI.mjs";
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
@@ -255,7 +275,7 @@ import {
   isFarmI18nCatalogFile,
   resolveFarmI18nConfig,
   resolveFarmI18nMessagePath
-} from "./chunk-YMCXWPWK.mjs";
+} from "./chunk-BCMSYSN2.mjs";
 import {
   fileExists,
   globFiles,
@@ -274,6 +294,9 @@ import {
 import {
   searchParamsToObject
 } from "./chunk-QVKYGNVM.mjs";
+import {
+  resolveFarmAPIServerBasePath
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   configureFarmObservability,
   emitFarmEvent,
@@ -285,7 +308,7 @@ import {
 } from "./chunk-Z2RZJZIZ.mjs";
 import {
   FARM_VERSION
-} from "./chunk-VA62MHFV.mjs";
+} from "./chunk-3PXS2MHU.mjs";
 import {
   resolveFarmTrailingSlashRedirect,
   setFarmTrailingSlashPreference
@@ -297,14 +320,16 @@ import {
 import {
   createFarmLocaleCookie,
   getFarmLocaleVaryHeaders
-} from "./chunk-IXUY2F5U.mjs";
+} from "./chunk-GCXWJJKH.mjs";
 import {
   addMetadataImageReference,
   addMetadataMarkdownAlternate,
   mergeMetadata,
+  mergeModuleViewport,
   renderMetadataHead,
+  renderViewportHead,
   resolveFarmNotFoundMetadata
-} from "./chunk-QZCT2CQ4.mjs";
+} from "./chunk-CXEN47J3.mjs";
 import {
   FARM_DEPLOYMENT_ID_HEADER,
   createFarmDeploymentCookie,
@@ -321,7 +346,7 @@ import {
 } from "./chunk-CNOQY6Z7.mjs";
 import {
   FARM_CONFIG_REWRITES_PLUGIN_NAME
-} from "./chunk-2AKFKCHA.mjs";
+} from "./chunk-W7LF2J2S.mjs";
 import {
   appendFarmRedirectQuery
 } from "./chunk-BRYHOB4X.mjs";
@@ -331,10 +356,14 @@ import {
   isFarmRedirectError
 } from "./chunk-CBBLJMR5.mjs";
 import {
+  _getRequestReadCount,
   _runWithCurrentRequest,
   createWebRequestFromFarmRequest,
   resolveFarmRequestURL
-} from "./chunk-BSPQVJ4A.mjs";
+} from "./chunk-FDR64H6B.mjs";
+import {
+  _resolveCurrentRequest
+} from "./chunk-IZY3V5XW.mjs";
 import {
   localizeFarmHref,
   localizeFarmPathname,
@@ -743,6 +772,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);
@@ -764,7 +813,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");
@@ -818,6 +867,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,
@@ -1305,6 +1358,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 {
@@ -1771,14 +1828,14 @@ function createFarmRouteRenderPlan(input = {}) {
   const layoutShouldHydrate = input.layoutShouldHydrate === true;
   const hydration = pageShouldHydrate ? layoutShouldHydrate ? "route-and-layout-islands" : "route-island" : layoutShouldHydrate ? "layout-island" : "none";
   const rendering = input.rendering;
-  const cache = rendering?.ssg ? typeof rendering.revalidate === "number" && rendering.revalidate > 0 ? { mode: "revalidate", revalidate: rendering.revalidate } : { mode: "static" } : { mode: "dynamic" };
+  const cache2 = rendering?.ssg ? typeof rendering.revalidate === "number" && rendering.revalidate > 0 ? { mode: "revalidate", revalidate: rendering.revalidate } : { mode: "static" } : { mode: "dynamic" };
   return {
     version: 1,
     output: "html",
     navigation: "html-fragment",
     hydration,
     islandStrategy: hydration === "none" ? null : input.islandStrategy ?? "load",
-    cache
+    cache: cache2
   };
 }
 __name(createFarmRouteRenderPlan, "createFarmRouteRenderPlan");
@@ -1886,6 +1943,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");
 }
@@ -1963,8 +2024,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(
@@ -1999,7 +2060,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,
@@ -2030,7 +2091,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);
@@ -2097,16 +2158,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);
@@ -2274,15 +2338,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;
@@ -2301,10 +2365,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,
@@ -2316,6 +2381,7 @@ var _RouteManager = class _RouteManager {
             modulePath: toUrlPath(boundary.modulePath)
           }))
         } : {},
+        ...usesFarmServerTree(metadata) ? { serverTree: true } : {},
         renderPlan: createFarmRouteRenderPlan({
           pageShouldHydrate: metadata.shouldHydrate,
           layoutShouldHydrate,
@@ -2474,13 +2540,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);
@@ -2561,6 +2621,7 @@ var _RouteManager = class _RouteManager {
           markdownSourcePath: path3.join(appDir, markdownFile)
         } : {},
         pattern,
+        ...getPageDirectoryField(group.route, pattern),
         source: "file",
         sourceRoot: source.root
       });
@@ -2573,7 +2634,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(
@@ -2595,6 +2656,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) {
@@ -2610,6 +2672,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)
@@ -2691,13 +2754,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(
@@ -2737,17 +2801,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()) {
@@ -2777,6 +2850,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,
@@ -2790,6 +2864,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,
@@ -2808,12 +2883,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;
       }
     }
@@ -2928,6 +3011,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)) {
@@ -3045,112 +3133,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";
 
@@ -3784,15 +3766,15 @@ __name(readFontOptions, "readFontOptions");
 function evaluateStaticObject(code, id, node) {
   const result = {};
   const properties = Array.isArray(node.properties) ? node.properties : [];
-  for (const property of properties) {
-    if (!isAstNode(property) || property.type !== "Property" || property.computed === true) {
+  for (const property2 of properties) {
+    if (!isAstNode(property2) || property2.type !== "Property" || property2.computed === true) {
       throw fontError(id, "font options do not support spreads or computed properties");
     }
-    const key = readPropertyName(property.key);
-    if (!key || !isAstNode(property.value)) {
+    const key = readPropertyName(property2.key);
+    if (!key || !isAstNode(property2.value)) {
       throw fontError(id, "font options must use static property names and values");
     }
-    result[key] = evaluateStaticValue(code, id, property.value);
+    result[key] = evaluateStaticValue(code, id, property2.value);
   }
   return result;
 }
@@ -4058,8 +4040,8 @@ function normalizePublicFontPath(source, moduleId) {
 }
 __name(normalizePublicFontPath, "normalizePublicFontPath");
 function isPathInside(parent, child) {
-  const relative3 = path6.relative(parent, child);
-  return relative3 === "" || !relative3.startsWith("..") && !path6.isAbsolute(relative3);
+  const relative4 = path6.relative(parent, child);
+  return relative4 === "" || !relative4.startsWith("..") && !path6.isAbsolute(relative4);
 }
 __name(isPathInside, "isPathInside");
 function normalizeBasePath(value) {
@@ -4513,8 +4495,8 @@ function redactErrorText(value) {
 }
 __name(redactErrorText, "redactErrorText");
 function isPathInsideRoot(root, filePath) {
-  const relative3 = path8.relative(root, filePath);
-  return relative3 === "" || !relative3.startsWith("..") && !path8.isAbsolute(relative3);
+  const relative4 = path8.relative(root, filePath);
+  return relative4 === "" || !relative4.startsWith("..") && !path8.isAbsolute(relative4);
 }
 __name(isPathInsideRoot, "isPathInsideRoot");
 function normalizeStackPath(value) {
@@ -4733,7 +4715,7 @@ __name(toMiddlewareMap, "toMiddlewareMap");
 function requestOwnHttpsServer(request2, address) {
   const url = new URL(request2.url);
   const hostname = url.hostname.replace(/^\[|\]$/g, "");
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const outgoing = https.request(
       {
         host: address.host,
@@ -4755,7 +4737,7 @@ function requestOwnHttpsServer(request2, address) {
         const status = incoming.statusCode ?? 502;
         const hasBody = ![204, 205, 304].includes(status);
         if (!hasBody) incoming.resume();
-        resolve5(
+        resolve6(
           new Response(hasBody ? Readable.toWeb(incoming) : null, {
             status,
             headers
@@ -4951,7 +4933,7 @@ var _ServerRenderer = class _ServerRenderer {
     const streaming = getFarmRendererStreamingCapabilitiesForRuntime(this.config.renderer, "node");
     const renderToPipeableStream = streaming.node ? this.rendererRuntime.renderToPipeableStream : void 0;
     if (renderToPipeableStream) {
-      return await new Promise((resolve5, reject) => {
+      return await new Promise((resolve6, reject) => {
         const chunks = [];
         let started = false;
         const writable = new Writable({
@@ -4960,7 +4942,7 @@ var _ServerRenderer = class _ServerRenderer {
             callback();
           }
         });
-        writable.once("finish", () => resolve5(Buffer.concat(chunks).toString("utf8")));
+        writable.once("finish", () => resolve6(Buffer.concat(chunks).toString("utf8")));
         writable.once("error", reject);
         const stream = renderToPipeableStream(element, {
           onShellReady() {
@@ -5019,7 +5001,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,
@@ -5036,7 +5018,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(
@@ -5451,8 +5435,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, {
@@ -5485,6 +5469,7 @@ var _ServerRenderer = class _ServerRenderer {
       const programmaticRouteComponents = routeModule.__farmRouteComponents;
       let PageComponent = routeModule.default;
       let pageProps;
+      let routeStateRejected = false;
       try {
         pageProps = await parseRouteModuleProps(routeModule, {
           props: rawPageProps,
@@ -5493,6 +5478,7 @@ var _ServerRenderer = class _ServerRenderer {
         });
       } catch (error) {
         if (isFarmRedirectError(error)) throw error;
+        routeStateRejected = true;
         const routeStateProps = {
           ...rawPageProps,
           search: searchParamsObject,
@@ -5571,6 +5557,9 @@ var _ServerRenderer = class _ServerRenderer {
           key: pprCacheKey
         });
       }
+      const outerRequest = _resolveCurrentRequest();
+      const countRequestReads = /* @__PURE__ */ __name(() => (outerRequest ? _getRequestReadCount(outerRequest) : 0) + _getRequestReadCount(currentRequest), "countRequestReads");
+      const requestReadsBeforeRender = countRequestReads();
       let LoadingFallbackComponent = null;
       if (loadingBoundaryEntry) {
         const loadingModule = await this.routeManager.loadRouteModule(
@@ -5746,7 +5735,8 @@ var _ServerRenderer = class _ServerRenderer {
         layoutModules,
         routeModule,
         pageProps,
-        pathname
+        pathname,
+        skipGeneratedRouteMetadata: routeStateRejected
       });
       req.__FARM_METADATA__ = mergedMetadata;
       const middlewareDataForContext = middlewareMap;
@@ -5773,7 +5763,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,
@@ -5787,7 +5777,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
@@ -5851,7 +5841,22 @@ var _ServerRenderer = class _ServerRenderer {
                   type: "ppr.suspense.holeDetected",
                   route: pathname
                 }) : void 0,
-                onComplete: pprShellOptions && req.method !== "HEAD" ? (html) => this.cachePPRShell(pprShellOptions, html) : void 0
+                onComplete: pprShellOptions && req.method !== "HEAD" ? (html) => {
+                  if (countRequestReads() !== requestReadsBeforeRender) {
+                    emitFarmEvent({
+                      type: "ppr.shell.bypass",
+                      route: pathname,
+                      reason: "request-read"
+                    });
+                    emitFarmEvent({
+                      type: "cache.bypass",
+                      route: pathname,
+                      reason: "request-read"
+                    });
+                    return;
+                  }
+                  return this.cachePPRShell(pprShellOptions, html);
+                } : void 0
               }
             );
             if (pprRefreshRoute) {
@@ -6023,14 +6028,22 @@ var _ServerRenderer = class _ServerRenderer {
           })
         );
       }
+      metadata = await mergeModuleViewport(metadata, layoutModule, {
+        params: options.pageProps.params
+      });
     }
     metadata = mergeMetadata(metadata, options.routeModule.metadata);
-    if (typeof options.routeModule.generateMetadata === "function") {
+    if (!options.skipGeneratedRouteMetadata && typeof options.routeModule.generateMetadata === "function") {
       metadata = mergeMetadata(
         metadata,
         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,
@@ -6248,7 +6261,20 @@ 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
+            )
+          )
+        })
+      }),
       ...options.full ? { markdown: this.createDevMarkdownReader(options.req) } : {}
     };
   }
@@ -6510,7 +6536,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
@@ -6536,6 +6563,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"] : [],
@@ -6563,7 +6591,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 ? `
@@ -6642,7 +6670,7 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
     if (!renderToPipeableStream || fullDocumentRoutes.has(fullDocumentRouteKey) || await this.rootLayoutRendersDocument()) {
       return this.renderBufferedSSR(element, req, res, clearMiddlewareData, options);
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const streamStartTime = Date.now();
       const observabilityRoute = options.observabilityRoute || req.__FARM_ROUTE__ || req.url || "/";
       const deploymentId = this.getDeploymentId();
@@ -6748,7 +6776,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
@@ -6797,7 +6826,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}
@@ -6922,7 +6951,7 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
               route: observabilityRoute,
               durationMs: Date.now() - streamStartTime
             });
-            resolve5();
+            resolve6();
           }, "finishStream");
           res.write(securedShell);
           if (typeof res.flush === "function") {
@@ -7172,12 +7201,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"] : [],
@@ -7204,7 +7235,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}
@@ -7470,9 +7501,9 @@ __name(isVitePluginHook, "isVitePluginHook");
 function withVite5TransformContext(handler) {
   return function(...args) {
     const context = new Proxy(this, {
-      get(target, property, receiver) {
-        if (property === "environment") return void 0;
-        return Reflect.get(target, property, receiver);
+      get(target, property2, receiver) {
+        if (property2 === "environment") return void 0;
+        return Reflect.get(target, property2, receiver);
       }
     });
     return handler.apply(context, args);
@@ -7632,8 +7663,8 @@ __name(validateSchemaSteps, "validateSchemaSteps");
 var _FarmPluginOptionsError = class _FarmPluginOptionsError extends TypeError {
   constructor(issues) {
     const lines = issues.map((issue) => {
-      const path18 = formatIssuePath(issue.path);
-      return `  - ${path18 ? `${path18}: ` : ""}${issue.message}`;
+      const path22 = formatIssuePath(issue.path);
+      return `  - ${path22 ? `${path22}: ` : ""}${issue.message}`;
     });
     super(`Invalid plugin options:
 ${lines.join("\n")}`);
@@ -7643,9 +7674,9 @@ ${lines.join("\n")}`);
 };
 __name(_FarmPluginOptionsError, "FarmPluginOptionsError");
 var FarmPluginOptionsError = _FarmPluginOptionsError;
-function formatIssuePath(path18) {
-  if (!path18?.length) return "";
-  return path18.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(".");
@@ -7881,23 +7912,23 @@ var _PluginManager = class _PluginManager {
             `Farm plugin "${plugin.name}" runtime.endpoints must contain endpoint objects`
           );
         }
-        const path18 = 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 ${path18} requires a handler`
+            `Farm plugin "${plugin.name}" runtime endpoint ${path22} requires a handler`
           );
         }
-        const owner = owners.get(path18);
+        const owner = owners.get(path22);
         if (owner) {
           throw new Error(
-            `Farm plugin runtime endpoint ${path18} from "${plugin.name}" conflicts with "${owner}"`
+            `Farm plugin runtime endpoint ${path22} from "${plugin.name}" conflicts with "${owner}"`
           );
         }
-        owners.set(path18, plugin.name);
-        endpoints.push({ plugin, endpoint, path: path18 });
+        owners.set(path22, plugin.name);
+        endpoints.push({ plugin, endpoint, path: path22 });
       }
     }
     this.runtimeEndpoints = endpoints;
@@ -8870,8 +8901,8 @@ __name(isArrayIndex, "isArrayIndex");
 import fs7 from "fs";
 import path13 from "path";
 var ADAPTER_EXTENSIONS = ["ts", "tsx", "js", "jsx", "mts", "mjs"];
-function resolveFarmClientCacheAdapterEntry(root, cache) {
-  const client = cache?.client;
+function resolveFarmClientCacheAdapterEntry(root, cache2) {
+  const client = cache2?.client;
   const adapter = client?.adapter;
   if (adapter === void 0) return void 0;
   if (typeof adapter !== "string" || adapter.trim().length === 0) {
@@ -8913,6 +8944,233 @@ function generateClientCachePersistenceCode(entry) {
 }
 __name(generateClientCachePersistenceCode, "generateClientCachePersistenceCode");
 
+// src/app-manifest-packages.ts
+import fs8 from "fs";
+import path14 from "path";
+var FARM_PACKAGE = /^@(?:farm\.js|farming-labs)\/[a-z0-9._-]+$/;
+function resolveFarmAppPackages(root) {
+  let manifest;
+  try {
+    manifest = JSON.parse(fs8.readFileSync(path14.join(root, "package.json"), "utf8"));
+  } catch {
+    return {};
+  }
+  const names = new Set(
+    [
+      ...Object.keys(manifest.dependencies ?? {}),
+      ...Object.keys(manifest.devDependencies ?? {})
+    ].filter((name) => FARM_PACKAGE.test(name))
+  );
+  const versions = {};
+  for (const name of [...names].sort()) {
+    for (let dir = root; ; ) {
+      try {
+        const { version } = JSON.parse(
+          fs8.readFileSync(path14.join(dir, "node_modules", name, "package.json"), "utf8")
+        );
+        if (typeof version === "string" && /^[0-9A-Za-z.+-]{1,64}$/.test(version))
+          versions[name] = version;
+        break;
+      } catch {
+        const parent = path14.dirname(dir);
+        if (parent === dir) break;
+        dir = parent;
+      }
+    }
+  }
+  return versions;
+}
+__name(resolveFarmAppPackages, "resolveFarmAppPackages");
+
+// src/app-manifest-webmcp.ts
+import fs9 from "fs";
+import { createRequire as createRequire2 } from "module";
+import path15 from "path";
+import fg from "fast-glob";
+var WEBMCP_CLIENT = "@farm.js/webmcp/client";
+var DEFINERS = /* @__PURE__ */ new Set(["defineWebMCPTool", "registerWebMCPTool", "registerWebMCPTools"]);
+var HINTS = ["readOnlyHint", "destructiveHint", "idempotentHint", "openWorldHint"];
+var MAX_TOOLS = 500;
+var MAX_SCHEMA_BYTES = 64 * 1024;
+var NOT_STATIC = /* @__PURE__ */ Symbol("not static");
+var LANGS = {
+  ts: "ts",
+  mts: "ts",
+  cts: "ts",
+  tsx: "tsx",
+  js: "jsx",
+  mjs: "jsx",
+  cjs: "jsx",
+  jsx: "jsx"
+};
+var parseAst;
+function staticValue(node) {
+  if (!node) return NOT_STATIC;
+  switch (node.type) {
+    case "Literal":
+      return node.regex || typeof node.value === "bigint" ? NOT_STATIC : node.value;
+    case "TemplateLiteral":
+      return node.expressions.length ? NOT_STATIC : node.quasis[0].value.cooked;
+    case "UnaryExpression":
+      if (node.operator === "-" && node.argument.type === "Literal" && typeof node.argument.value === "number")
+        return -node.argument.value;
+      return NOT_STATIC;
+    case "ArrayExpression": {
+      const items = [];
+      for (const element of node.elements) {
+        const value = staticValue(element);
+        if (value === NOT_STATIC) return NOT_STATIC;
+        items.push(value);
+      }
+      return items;
+    }
+    case "ObjectExpression": {
+      const object = {};
+      for (const property2 of node.properties) {
+        if (property2.type !== "Property" || property2.computed || property2.kind !== "init")
+          return NOT_STATIC;
+        const key = property2.key.type === "Identifier" ? property2.key.name : staticValue(property2.key);
+        if (typeof key !== "string" || key === "__proto__") return NOT_STATIC;
+        const value = staticValue(property2.value);
+        if (value === NOT_STATIC) return NOT_STATIC;
+        object[key] = value;
+      }
+      return object;
+    }
+    case "TSAsExpression":
+    case "TSSatisfiesExpression":
+    case "TSNonNullExpression":
+    case "ParenthesizedExpression":
+      return staticValue(node.expression);
+    default:
+      return NOT_STATIC;
+  }
+}
+__name(staticValue, "staticValue");
+function property(object, name) {
+  return object.properties.find(
+    (entry) => entry.type === "Property" && !entry.computed && (entry.key.name === name || entry.key.value === name)
+  )?.value;
+}
+__name(property, "property");
+function toolFromObject(object) {
+  const name = staticValue(property(object, "name"));
+  if (typeof name !== "string" || !/^[A-Za-z0-9_.-]{1,128}$/.test(name)) return null;
+  const text = /* @__PURE__ */ __name((key) => {
+    const value = staticValue(property(object, key));
+    return typeof value === "string" && value.length <= 2e3 ? value : void 0;
+  }, "text");
+  const annotations = staticValue(property(object, "annotations"));
+  const hints = annotations && typeof annotations === "object" && !Array.isArray(annotations) ? Object.fromEntries(
+    HINTS.filter(
+      (hint) => typeof annotations[hint] === "boolean"
+    ).map((hint) => [hint, annotations[hint]])
+  ) : {};
+  const schemaNode = property(object, "inputSchema");
+  const schema = staticValue(schemaNode);
+  const literal = schema !== NOT_STATIC && schema !== null && typeof schema === "object" && !Array.isArray(schema) && Buffer.byteLength(JSON.stringify(schema)) <= MAX_SCHEMA_BYTES;
+  const title = text("title");
+  const description = text("description");
+  return {
+    name,
+    ...title ? { title } : {},
+    ...description ? { description } : {},
+    ...hints,
+    ...literal ? { inputSchema: schema } : {},
+    inputSchemaSource: literal ? "literal" : schemaNode ? "computed" : "none"
+  };
+}
+__name(toolFromObject, "toolFromObject");
+function findFarmWebMCPTools(code, filename = "module.tsx") {
+  if (!code.includes(WEBMCP_CLIENT)) return [];
+  const lang = LANGS[path15.extname(filename).slice(1)] ?? "tsx";
+  parseAst ?? (parseAst = createRequire2(typeof __filename === "string" ? __filename : import.meta.url)(
+    "rolldown/parseAst"
+  ).parseAst);
+  let program;
+  try {
+    program = parseAst(code, { lang });
+  } catch {
+    return [];
+  }
+  const locals = /* @__PURE__ */ new Map();
+  for (const statement of program.body) {
+    if (statement.type !== "ImportDeclaration" || statement.source.value !== WEBMCP_CLIENT)
+      continue;
+    for (const specifier of statement.specifiers) {
+      const imported = specifier.imported?.name ?? specifier.imported?.value;
+      if (specifier.type === "ImportSpecifier" && DEFINERS.has(imported))
+        locals.set(specifier.local.name, imported);
+    }
+  }
+  if (!locals.size) return [];
+  const found = [];
+  const visit = /* @__PURE__ */ __name((node) => {
+    if (!node || typeof node !== "object") return;
+    if (Array.isArray(node)) return node.forEach(visit);
+    const current = node;
+    if (current.type === "CallExpression" && current.callee.type === "Identifier") {
+      const definer = locals.get(current.callee.name);
+      const [argument] = current.arguments;
+      if (definer && argument) {
+        const objects = definer === "registerWebMCPTools" ? argument.type === "ArrayExpression" ? argument.elements.filter(
+          (element) => element?.type === "ObjectExpression"
+        ) : [] : argument.type === "ObjectExpression" ? [argument] : [];
+        for (const object of objects) {
+          const tool = toolFromObject(object);
+          if (tool) found.push({ start: object.start, tool });
+        }
+      }
+    }
+    for (const [key, value] of Object.entries(current))
+      if (key !== "type" && value && typeof value === "object") visit(value);
+  }, "visit");
+  visit(program.body);
+  return found.sort((a, b) => a.start - b.start).map(({ tool }) => tool);
+}
+__name(findFarmWebMCPTools, "findFarmWebMCPTools");
+var cache = /* @__PURE__ */ new Map();
+function collectFarmWebMCPTools(root, srcDir = "src") {
+  const base = path15.resolve(root, srcDir);
+  let files;
+  try {
+    files = fg.sync("**/*.{ts,tsx,js,jsx,mts,mjs,cts,cjs}", {
+      cwd: base,
+      absolute: true,
+      ignore: ["**/node_modules/**", "**/*.d.ts", "**/*.{test,spec}.*", "**/__tests__/**"]
+    });
+  } catch {
+    return [];
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const tools = [];
+  for (const file of files.sort()) {
+    let mtimeMs;
+    try {
+      mtimeMs = fs9.statSync(file).mtimeMs;
+    } catch {
+      continue;
+    }
+    let entry = cache.get(file);
+    if (!entry || entry.mtimeMs !== mtimeMs) {
+      let code = "";
+      try {
+        code = fs9.readFileSync(file, "utf8");
+      } catch {
+      }
+      entry = { mtimeMs, tools: findFarmWebMCPTools(code, file) };
+      cache.set(file, entry);
+    }
+    for (const tool of entry.tools) {
+      if (seen.has(tool.name) || tools.length >= MAX_TOOLS) continue;
+      seen.add(tool.name);
+      tools.push(tool);
+    }
+  }
+  return tools;
+}
+__name(collectFarmWebMCPTools, "collectFarmWebMCPTools");
+
 // src/document-layout-client.ts
 var FARM_LAYOUT_ELEMENT_CLIENT_SOURCE = String.raw`
 const farmLayoutComponentKeys = new WeakMap();
@@ -8979,14 +9237,136 @@ function createFarmLayoutElement(Component, pattern, children, params) {
 }
 `;
 
+// src/dev-preview-guard.ts
+import { promises as fsp } from "fs";
+import * as path16 from "path";
+var FARM_PREVIEW_REQUEST_HEADER = "x-farm-preview";
+function isFarmPreviewTunnelRequest(headers) {
+  return headers[FARM_PREVIEW_REQUEST_HEADER] !== void 0;
+}
+__name(isFarmPreviewTunnelRequest, "isFarmPreviewTunnelRequest");
+var VITE_DEFAULT_FS_DENY = [
+  ".env",
+  ".env.*",
+  "*.{crt,pem,key,p12,pfx,cer,der}",
+  ".npmrc",
+  ".yarnrc.yml",
+  "**/.git/**"
+];
+function getFarmDevFsDeny(userDeny, options) {
+  const deny = ["**/.farm/**"];
+  const root = path16.resolve(options.root || process.cwd());
+  const distDir = options.distDir ? path16.resolve(root, options.distDir) : void 0;
+  const relativeDistDir = distDir ? path16.relative(root, distDir) : "";
+  if (distDir && relativeDistDir && relativeDistDir !== ".farm" && relativeDistDir !== ".." && !relativeDistDir.startsWith(`..${path16.sep}`) && !/[*?[\]{}()!+@]/.test(distDir)) {
+    deny.push(`${distDir.replace(/\\/g, "/")}/**`);
+  }
+  return userDeny ? deny : [...VITE_DEFAULT_FS_DENY, ...deny];
+}
+__name(getFarmDevFsDeny, "getFarmDevFsDeny");
+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"];
+function createFarmDevPreviewGuard(server, options) {
+  return /* @__PURE__ */ __name(async function farmDevPreviewGuard(req, res, next) {
+    if (!isFarmPreviewTunnelRequest(req.headers)) return next();
+    try {
+      if (await isAllowedPreviewRequest(server, options, req)) return next();
+    } catch {
+    }
+    res.statusCode = 403;
+    res.setHeader("Content-Type", "text/plain; charset=utf-8");
+    res.setHeader("Cache-Control", "no-store");
+    res.end("This development file is not available through farm preview.");
+  }, "farmDevPreviewGuard");
+}
+__name(createFarmDevPreviewGuard, "createFarmDevPreviewGuard");
+async function isAllowedPreviewRequest(server, options, req) {
+  const rawUrl = req.url || "/";
+  const queryIndex = rawUrl.indexOf("?");
+  const rawPath = queryIndex === -1 ? rawUrl : rawUrl.slice(0, queryIndex);
+  const query = new URLSearchParams(queryIndex === -1 ? "" : rawUrl.slice(queryIndex + 1));
+  let pathname = decodeURI(rawPath);
+  const base = (server.config.base || "/").replace(/\/$/, "");
+  if (base.startsWith("/") && (pathname === base || pathname.startsWith(`${base}/`))) {
+    pathname = pathname.slice(base.length) || "/";
+  }
+  const url = `${pathname}${queryIndex === -1 ? "" : rawUrl.slice(queryIndex)}`;
+  if (DEVELOPER_ONLY_PREFIXES.some((prefix) => pathname.startsWith(prefix))) return false;
+  if (INTERNAL_PREFIXES.some((prefix) => pathname.startsWith(prefix))) return true;
+  const method = (req.method || "GET").toUpperCase();
+  if (method !== "GET" && method !== "HEAD") return true;
+  const file = await resolveRequestedFile(server, pathname);
+  if (!file) return true;
+  const client = server.environments?.client;
+  const inClientGraph = /* @__PURE__ */ __name(async () => Boolean(await client?.moduleGraph.getModuleByUrl(url)), "inClientGraph");
+  if (SOURCE_QUERY_FLAGS.some((flag) => query.has(flag))) return inClientGraph();
+  if (await inClientGraph()) return true;
+  if (file.split(path16.sep).includes("node_modules")) return true;
+  if (server.config.publicDir && isInside(await realpathOr(server.config.publicDir), file)) {
+    return true;
+  }
+  const isModuleOrAsset = MODULE_EXTENSION.test(file) || ASSET_EXTENSION.test(file) || query.has("import");
+  if (!isModuleOrAsset) return false;
+  for (const source of options.getSourceRoots()) {
+    const sourceRoot = await realpathOr(source.root);
+    const sourceDir = await realpathOr(path16.resolve(source.root, source.srcDir));
+    if (sourceRoot === sourceDir && path16.dirname(file) === sourceDir) continue;
+    if (isInside(sourceDir, file)) return true;
+  }
+  return false;
+}
+__name(isAllowedPreviewRequest, "isAllowedPreviewRequest");
+async function resolveRequestedFile(server, pathname) {
+  let candidate;
+  if (pathname.startsWith("/@fs/")) {
+    candidate = pathname.slice("/@fs".length);
+    if (/^\/[A-Za-z]:/.test(candidate)) candidate = candidate.slice(1);
+  } else {
+    let id = pathname;
+    if (id.startsWith("/@id/")) {
+      id = id.slice("/@id/".length).replace(/^__x00__/, "\0");
+      if (id.startsWith("\0")) return void 0;
+    }
+    const resolved = await server.environments?.client?.pluginContainer.resolveId(id, void 0);
+    const resolvedId = resolved?.id.replace(/[?#].*$/, "");
+    if (resolvedId && path16.isAbsolute(resolvedId)) candidate = resolvedId;
+    else if (resolvedId?.startsWith("\0")) return void 0;
+    else if (id.startsWith("/")) candidate = path16.join(server.config.root, id);
+  }
+  if (!candidate) return void 0;
+  try {
+    const real = await fsp.realpath(candidate);
+    return (await fsp.stat(real)).isFile() ? real : void 0;
+  } catch {
+    return void 0;
+  }
+}
+__name(resolveRequestedFile, "resolveRequestedFile");
+async function realpathOr(directory) {
+  try {
+    return await fsp.realpath(directory);
+  } catch {
+    return path16.resolve(directory);
+  }
+}
+__name(realpathOr, "realpathOr");
+function isInside(directory, file) {
+  const relative4 = path16.relative(directory, file);
+  return relative4 !== "" && relative4 !== ".." && !relative4.startsWith(`..${path16.sep}`) && !path16.isAbsolute(relative4);
+}
+__name(isInside, "isInside");
+
 // src/vite.ts
-import * as fs9 from "fs";
-import * as path17 from "path";
+import * as fs11 from "fs";
+import * as path21 from "path";
 import { pathToFileURL as pathToFileURL3 } from "url";
 
 // src/dev-static.ts
-import * as fs8 from "fs";
-import * as path14 from "path";
+import * as fs10 from "fs";
+import * as path17 from "path";
 function shouldBypassFarmRouterForDottedPath(pathname, routeManager, baseDirs, generatedPaths = []) {
   if (!pathname.includes(".") || pathname.endsWith(".html")) return false;
   const matchesAppRoute = Boolean(
@@ -9033,11 +9413,11 @@ function devServableFileExists(pathname, baseDirs) {
   if (!relativePathname) return false;
   for (const baseDir of baseDirs) {
     if (typeof baseDir !== "string" || baseDir.length === 0) continue;
-    const resolvedBase = path14.resolve(baseDir);
-    const candidate = path14.resolve(resolvedBase, relativePathname);
-    if (!candidate.startsWith(resolvedBase + path14.sep)) continue;
+    const resolvedBase = path17.resolve(baseDir);
+    const candidate = path17.resolve(resolvedBase, relativePathname);
+    if (!candidate.startsWith(resolvedBase + path17.sep)) continue;
     try {
-      if (fs8.existsSync(candidate) && fs8.statSync(candidate).isFile()) {
+      if (fs10.existsSync(candidate) && fs10.statSync(candidate).isFile()) {
         return true;
       }
     } catch {
@@ -9146,13 +9526,13 @@ function readProcessEnvKey(node) {
   if (!object || object.type !== "MemberExpression" || object.object?.type !== "Identifier" || object.object.name !== "process" || object.property?.name !== "env") {
     return void 0;
   }
-  const property = node.property;
-  if (!property) return void 0;
-  if (!node.computed && property.type === "Identifier") {
-    return property.name;
+  const property2 = node.property;
+  if (!property2) return void 0;
+  if (!node.computed && property2.type === "Identifier") {
+    return property2.name;
   }
-  if (node.computed && property.type === "Literal") {
-    const value = property.value;
+  if (node.computed && property2.type === "Literal") {
+    const value = property2.value;
     return typeof value === "string" ? value : void 0;
   }
   return void 0;
@@ -9182,7 +9562,7 @@ __name(formatClientBoundaryWarning, "formatClientBoundaryWarning");
 
 // src/image-vite.ts
 import { readFile as readFile3 } from "fs/promises";
-import path15 from "path";
+import path18 from "path";
 import { imageSize as imageSize2 } from "image-size";
 var FARM_IMAGE_ID_PREFIX = "\0farm:image:";
 var STATIC_IMAGE_RE = /\.(?:avif|gif|jpe?g|png|webp)$/i;
@@ -9250,7 +9630,7 @@ async function createBlurDataURL(bytes) {
 __name(createBlurDataURL, "createBlurDataURL");
 
 // src/server/vite-config.ts
-import path16 from "path";
+import path19 from "path";
 var FARM_CLIENT_ENTRY_PATTERN = "**/{page,layout,loading,error,not-found,default}.{js,jsx,ts,tsx}";
 var FARM_CLIENT_OPTIMIZE_DEPS_INCLUDE = [
   "react",
@@ -9274,9 +9654,9 @@ function getFarmClientOptimizeDepsInclude(renderer) {
 }
 __name(getFarmClientOptimizeDepsInclude, "getFarmClientOptimizeDepsInclude");
 function createFarmClientOptimizeDepsEntries(projectRoot, appDirectories) {
-  const resolvedProjectRoot = path16.resolve(projectRoot);
+  const resolvedProjectRoot = path19.resolve(projectRoot);
   return appDirectories.map((appDirectory) => {
-    const relativeAppDirectory = path16.relative(resolvedProjectRoot, path16.resolve(appDirectory)).replace(/\\/g, "/");
+    const relativeAppDirectory = path19.relative(resolvedProjectRoot, path19.resolve(appDirectory)).replace(/\\/g, "/");
     const prefix = relativeAppDirectory || ".";
     return `${prefix}/${FARM_CLIENT_ENTRY_PATTERN}`;
   });
@@ -9300,7 +9680,7 @@ function createFarmClientOptimizeDepsConfig(entries, renderer) {
 __name(createFarmClientOptimizeDepsConfig, "createFarmClientOptimizeDepsConfig");
 function createFarmSourceAlias(projectRoot, srcDir = "src") {
   return {
-    "@": path16.resolve(projectRoot, srcDir)
+    "@": path19.resolve(projectRoot, srcDir)
   };
 }
 __name(createFarmSourceAlias, "createFarmSourceAlias");
@@ -9431,6 +9811,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 = "/") {
@@ -9550,7 +10011,7 @@ function loadFarmWorkflowsDevRuntime() {
 }
 __name(loadFarmWorkflowsDevRuntime, "loadFarmWorkflowsDevRuntime");
 function loadFarmDevtoolsSnapshotRuntime() {
-  return import("./devtools-BPBCYOU6.mjs");
+  return import("./devtools-EE5RIBTH.mjs");
 }
 __name(loadFarmDevtoolsSnapshotRuntime, "loadFarmDevtoolsSnapshotRuntime");
 function loadFarmDevtoolsUIRuntime() {
@@ -9961,11 +10422,11 @@ function isPotentialProgrammaticRouteSourceFile(normalizedFile, srcDirSlug) {
 }
 __name(isPotentialProgrammaticRouteSourceFile, "isPotentialProgrammaticRouteSourceFile");
 function fileContainsProgrammaticPageRoute(file) {
-  if (!fs9.existsSync(file)) {
+  if (!fs11.existsSync(file)) {
     return false;
   }
   try {
-    return scanProgrammaticPagePaths(fs9.readFileSync(file, "utf8")).length > 0;
+    return scanProgrammaticPagePaths(fs11.readFileSync(file, "utf8")).length > 0;
   } catch {
     return false;
   }
@@ -9973,7 +10434,7 @@ function fileContainsProgrammaticPageRoute(file) {
 __name(fileContainsProgrammaticPageRoute, "fileContainsProgrammaticPageRoute");
 function rewriteEarlySsrRelativeImports(options) {
   const cleanId = options.id.split("?", 1)[0];
-  if (!path17.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
+  if (!path21.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
     return null;
   }
   const replacements = [];
@@ -9993,7 +10454,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 = path17.resolve(path17.dirname(cleanId), sourcePath);
+    const resolvedPath = path21.resolve(path21.dirname(cleanId), sourcePath);
     replacements.push({
       start: source.start,
       end: source.end,
@@ -10111,8 +10572,8 @@ __name(isFarmModuleAstNode, "isFarmModuleAstNode");
 function isFarmConfigFile(file, root) {
   const normalized = file.replace(/\\/g, "/");
   const rootSlug = root.replace(/\\/g, "/").replace(/\/+$/, "");
-  const relative3 = normalized.startsWith(`${rootSlug}/`) ? normalized.slice(rootSlug.length + 1) : normalized;
-  return FARM_CONFIG_FILENAMES.has(relative3);
+  const relative4 = normalized.startsWith(`${rootSlug}/`) ? normalized.slice(rootSlug.length + 1) : normalized;
+  return FARM_CONFIG_FILENAMES.has(relative4);
 }
 __name(isFarmConfigFile, "isFarmConfigFile");
 var warnedClientBoundaryIds = /* @__PURE__ */ new Set();
@@ -10161,6 +10622,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 = [
@@ -10189,13 +10655,12 @@ function farmPlugin(options = {}, initialPluginManager) {
         resolve: {
           alias: { ...layerAliases, ...sourceAlias }
         },
-        ...layerRoots.length ? {
-          server: {
-            fs: {
-              allow: [path17.resolve(options.root || process.cwd()), ...layerRoots]
-            }
+        server: {
+          fs: {
+            ...layerRoots.length ? { allow: [path21.resolve(options.root || process.cwd()), ...layerRoots] } : {},
+            deny: getFarmDevFsDeny(userConfig.server?.fs?.deny, options)
           }
-        } : {}
+        }
       };
     },
     async configResolved(config) {
@@ -10212,6 +10677,11 @@ function farmPlugin(options = {}, initialPluginManager) {
       }
     },
     async configureServer(viteServer) {
+      viteServer.middlewares.use(
+        createFarmDevPreviewGuard(viteServer, {
+          getSourceRoots: /* @__PURE__ */ __name(() => getFarmSourceRoots(farmApp?.getConfig() ?? options), "getSourceRoots")
+        })
+      );
       if (typeof fontImports.configureServer === "function") {
         await fontImports.configureServer.call(this, viteServer);
       }
@@ -10233,6 +10703,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       );
       await farmApp.initialize();
       const farmConfig = farmApp.getConfig();
+      let farmAppPackages;
       if (farmConfig.agent?.noindexPreviews) {
         server.middlewares.use((_req, res, next) => {
           if (isFarmPreviewDeploymentEnvironment(process.env)) {
@@ -10262,7 +10733,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         });
       }
       const sourceRoots = getFarmSourceRoots(farmConfig);
-      server.watcher.add(sourceRoots.map((source) => path17.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(
@@ -10277,7 +10748,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         ...farmDocsDevRuntime?.getFarmDocsRouteTypeEntries(farmConfig.docs) ?? []
       ], "getExtraRouteTypes");
       const appDirSlugs = sourceRoots.map(
-        (source) => path17.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 {
@@ -10318,7 +10789,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       }, "generateTypeArtifacts");
       await generateTypeArtifacts("startup");
       const srcDirSlugs = sourceRoots.map(
-        (source) => path17.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))
@@ -10457,7 +10928,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       await apiRouteManager.discoverRoutes();
       let discoveredWorkflows = [];
       const hasWorkflowDirectory = workflowConfig.enabled && workflowConfig.dirs.some(
-        (dir) => fs9.existsSync(path17.isAbsolute(dir) ? dir : path17.join(farmConfig.root, dir))
+        (dir) => fs11.existsSync(path21.isAbsolute(dir) ? dir : path21.join(farmConfig.root, dir))
       );
       if (hasWorkflowDirectory) {
         const { createFarmWorkflowRequestHandler, discoverFarmWorkflows } = await loadFarmWorkflowsDevRuntime();
@@ -10491,7 +10962,8 @@ function farmPlugin(options = {}, initialPluginManager) {
         server,
         farmConfig.middleware,
         farmConfig.i18n,
-        farmConfig.server
+        farmConfig.server,
+        apiServerBasePath
       );
       await middlewareManager.discover();
       if (pm) {
@@ -10534,6 +11006,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,
@@ -10553,7 +11026,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,
@@ -10671,7 +11152,8 @@ window.__FARM_MANIFEST__ = ${inlineValue({
       const farmDocsAPIHandler = farmDocsDevRuntime && !farmDocsDevRuntime.hasFarmDocsRuntimeAdapter(farmConfig.docs) ? farmDocsDevRuntime.createFarmDocsAPIHandler({
         rootDir: farmConfig.root,
         srcDir: farmConfig.srcDir,
-        docs: farmConfig.docs
+        docs: farmConfig.docs,
+        diagnostics: true
       }) : null;
       const farmDocsFontAssets = new Map(
         farmDocsFontAssetList.map(({ url, sourcePath }) => [url, sourcePath])
@@ -10739,12 +11221,12 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             }
           }
           const farmDocsFontPath = farmDocsFontAssets.get(requestPathname);
-          if ((requestMethod === "GET" || requestMethod === "HEAD") && farmDocsFontPath && fs9.existsSync(farmDocsFontPath)) {
+          if ((requestMethod === "GET" || requestMethod === "HEAD") && farmDocsFontPath && fs11.existsSync(farmDocsFontPath)) {
             res.statusCode = 200;
             res.setHeader("Content-Type", "font/woff2");
             res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
             if (requestMethod === "HEAD") res.end();
-            else fs9.createReadStream(farmDocsFontPath).pipe(res);
+            else fs11.createReadStream(farmDocsFontPath).pipe(res);
             return;
           }
           if (requestMethod === "GET" && (requestPathname === FARM_DEVTOOLS_PATH || requestPathname === `${FARM_DEVTOOLS_PATH}.json`)) {
@@ -10846,6 +11328,23 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             const docsHandler = openAPIManager.getDocsRouteHandler(parsedRequestUrl.origin);
             return docsHandler(req, res);
           }
+          if (stripFarmBasePath(requestPathname, farmConfig.basePath) === FARM_APP_MANIFEST_PATH) {
+            farmAppPackages ?? (farmAppPackages = resolveFarmAppPackages(farmConfig.root ?? process.cwd()));
+            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) : []
+              }),
+              { development: true }
+            );
+            if (manifest) {
+              await sendWebResponse(res, manifest);
+              return;
+            }
+          }
           if (options.agent?.apiCatalog && stripFarmBasePath(requestPathname, farmConfig.basePath) === FARM_API_CATALOG_PATH) {
             if (await runAppMiddlewareForContentRoute()) return;
             await sendWebResponse(
@@ -10860,6 +11359,23 @@ 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 }
+            );
+            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) {
@@ -10877,7 +11393,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(
@@ -10900,10 +11417,16 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                 return null;
               }
               return {
-                source: await fs9.promises.readFile(sourcePath, "utf8"),
+                source: await fs11.promises.readFile(sourcePath, "utf8"),
                 filePath: sourcePath
               };
-            }, "resolveSource")
+            }, "resolveSource"),
+            // The anonymous check goes through this server, so its guards and
+            // middleware see the page's own path, as in production.
+            renderPage: /* @__PURE__ */ __name(async (request2) => fetch(request2, {
+              redirect: "manual",
+              signal: res.destroyed ? AbortSignal.abort() : createFarmNodeRequestAbortSignal(req, res)
+            }), "renderPage")
           });
           if (markdownSourceResponse) {
             if (await runAppMiddlewareForContentRoute()) return;
@@ -11391,7 +11914,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);
@@ -11445,6 +11971,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") {
@@ -11453,6 +11982,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                     await routeModule.generateMetadata(routeProps)
                   );
                 }
+                mergedMetadata = await mergeModuleViewport(mergedMetadata, routeModule, routeProps);
                 mergedMetadata = addMetadataMarkdownAlternate(
                   mergedMetadata,
                   getFarmMarkdownAlternatePath(farmApp.getConfig().md, targetRequestUrl.pathname)
@@ -11484,6 +12014,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,
@@ -11536,13 +12067,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
                     })
                   )
                 );
@@ -11893,6 +12426,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,
@@ -11905,9 +12439,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],
@@ -11931,6 +12467,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) {
@@ -11987,7 +12530,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(path17.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({
@@ -12067,6 +12610,7 @@ if (import.meta.hot) {
       });
     },
     async closeBundle() {
+      if (!isBuild) releaseDocsMCPServers();
       if (!farmApp || !isBuild) return;
       try {
         const routeManager = farmApp.getRouteManager();
@@ -12078,8 +12622,8 @@ if (import.meta.hot) {
         }
         logger.info(`Found ${ssgPages.length} SSG pages, ${ssrRoutes.length} SSR routes`);
         logger.info("Pre-rendering SSG pages...");
-        const outDir = path17.join(server?.config.root || process.cwd(), options.outDir || "dist");
-        const clientDir = path17.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"));
@@ -12131,9 +12675,9 @@ if (import.meta.hot) {
   <script type="module" src="/assets/client.js"></script>
 </body>
 </html>`;
-              const outputPath = page.urlPath === "/" ? path17.join(clientDir, "index.html") : path17.join(clientDir, page.urlPath + ".html");
-              fs9.mkdirSync(path17.dirname(outputPath), { recursive: true });
-              fs9.writeFileSync(outputPath, fullHtml);
+              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}`);
             });
@@ -12141,8 +12685,8 @@ if (import.meta.hot) {
             logger.error(`  \u2717 ${page.urlPath}: ${error}`);
           }
         }
-        const manifestPath = path17.join(outDir, "__ssg_manifest.json");
-        fs9.writeFileSync(
+        const manifestPath = path21.join(outDir, "__ssg_manifest.json");
+        fs11.writeFileSync(
           manifestPath,
           JSON.stringify(
             ssgPages.map((p) => ({
@@ -12185,9 +12729,9 @@ if (import.meta.hot) {
         server2.ws.send({ type: "full-reload", path: "*" });
         return [];
       }
-      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path17.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 ${path17.basename(file)}`);
+        logUpdate("PAGE", `updated ${path21.basename(file)}`);
         for (const mod of modules) {
           server2.moduleGraph.invalidateModule(mod);
         }
@@ -12318,10 +12862,10 @@ function createPageDataMiddlewareRequest(req, target) {
 __name(createPageDataMiddlewareRequest, "createPageDataMiddlewareRequest");
 function resolveDevelopmentRoot(farmRoot, viteRoot) {
   if (!farmRoot) return viteRoot;
-  if (path17.resolve(farmRoot) === path17.resolve(viteRoot)) return farmRoot;
+  if (path21.resolve(farmRoot) === path21.resolve(viteRoot)) return farmRoot;
   try {
-    if (fs9.realpathSync(farmRoot) === fs9.realpathSync(viteRoot)) {
-      return path17.resolve(viteRoot);
+    if (fs11.realpathSync(farmRoot) === fs11.realpathSync(viteRoot)) {
+      return path21.resolve(viteRoot);
     }
   } catch {
   }
@@ -12686,7 +13230,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
@@ -12708,14 +13253,28 @@ 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}
 import { installChunkErrorRecovery, SPARouter } from '@farm.js/core/client'
 import { createClientPluginManager } from '@farm.js/core/plugin/client'
 import { isFarmRouteActive } from '@farm.js/core/router'
-import { replayFarmQueuedInteraction, scheduleFarmIslandHydration, searchParamsToObject, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from '@farm.js/core/internal/client-runtime'
+import { isFarmBlockedNavigationURL, replayFarmQueuedInteraction, scheduleFarmIslandHydration, searchParamsToObject, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from '@farm.js/core/internal/client-runtime'
 import { reviveDeferredData } from '@farm.js/core/deferred'
 import {
   createFarmDeploymentMismatchError,
@@ -12849,14 +13408,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 ======
@@ -12886,6 +13460,7 @@ class LegacyManifestSPARouter {
   async navigate(href, options = {}) {
     const { replace = false, scroll = true } = options;
     const url = new URL(href, window.location.origin);
+    if (isFarmBlockedNavigationURL(url)) return;
     const pathname = url.pathname;
     const search = url.search;
     const fullPath = pathname + search;
@@ -13615,6 +14190,12 @@ async function tryHydrateImportedPage(
       return false;
     }
 
+    if (PageComponent.__farmServerProps === true && existingProps?.__farmRoutePropsResolved !== true) {
+      // This route's guard and data run only on the server, and it did not
+      // resolve them (it rendered error or notFound UI): keep its HTML.
+      return false;
+    }
+
     currentPageComponent = PageComponent;
     currentPageProps = await buildRouteComponentProps(
       pageModule,
@@ -13631,14 +14212,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;
 
@@ -13824,6 +14414,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
     : [];
@@ -13840,6 +14432,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, {
@@ -13880,7 +14486,7 @@ async function renderPage(pageData) {
         params,
         layouts,
         false,
-        pageData.props,
+        pageProps,
         null,
         {
           pageShouldHydrate,
@@ -13926,7 +14532,7 @@ async function renderPage(pageData) {
               params,
               layouts,
               true,
-              pageData.props,
+              pageProps,
               hydrationController.signal,
               {
                 pageShouldHydrate,
@@ -14040,17 +14646,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;
 
@@ -14243,7 +14852,7 @@ function generateClientManifest(bundle) {
 __name(generateClientManifest, "generateClientManifest");
 async function defineConfig(config = {}) {
   const tailwindVitePlugin = await loadTailwindVitePlugin();
-  const appRoot = path17.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(
       ({ resolveFarmLayers }) => resolveFarmLayers(config, {
@@ -14466,10 +15075,10 @@ export {
   resolveFarmIsolatedClientHydrationMode,
   getClientModuleMetadata,
   getClientModuleHydrationPlan,
+  usesFarmServerTree,
   createMarkdownPageHydrationPlanner,
   enforceFarmIsolatedHydrationRouteBudget,
   RouteManager,
-  HOISTED_HEAD_ELEMENT,
   resolveFarmNotFoundComponentPath,
   farmFontImportsPlugin,
   mergeFarmFontCss,
@@ -14487,12 +15096,15 @@ export {
   generateFarmClientPluginEntryCode,
   resolveFarmClientCacheAdapterEntry,
   generateClientCachePersistenceCode,
+  resolveFarmAppPackages,
+  collectFarmWebMCPTools,
   FARM_LAYOUT_ELEMENT_CLIENT_SOURCE,
   createFarmClientOptimizeDepsEntries,
   createFarmClientOptimizeDepsConfig,
   createFarmSourceAlias,
   mergeFarmViteConfig,
   mergeFarmProductionViteConfig,
+  farmDocsClientConfigPlugin,
   createFarmThemeCssPlugin,
   farmI18nClientBridgePlugin,
   farmServerOnlyEntriesPlugin,