@farm.js/plugin 0.1.0-beta.93 → 0.1.0-beta.94

package/dist/index.d.ts

@@ -39,5 +39,5 @@
  * })
  * ```
  */
-export declare const version = "0.1.0-beta.93";
+export declare const version = "0.1.0-beta.94";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -39,7 +39,7 @@
  * })
  * ```
  */
-export const version = "0.1.0-beta.93";
+export const version = "0.1.0-beta.94";
 // Note: Import plugins from their respective subpaths:
 // - @farm.js/plugin/rsc
 // - @farm.js/plugin/middleware

package/dist/rsc/dev-response.d.ts

@@ -0,0 +1,3 @@
+import type { ServerResponse } from "node:http";
+export declare function sendRscDevelopmentResponse(res: ServerResponse, response: Response): Promise<void>;
+//# sourceMappingURL=dev-response.d.ts.map

package/dist/rsc/dev-response.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-response.d.ts","sourceRoot":"","sources":["../../src/rsc/dev-response.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGhD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/dist/rsc/dev-response.js

@@ -0,0 +1,10 @@
+import { sendWebResponse } from "@farm.js/core/server";
+export async function sendRscDevelopmentResponse(res, response) {
+    const headers = new Headers(response.headers);
+    headers.delete("transfer-encoding");
+    await sendWebResponse(res, new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers,
+    }));
+}

package/dist/rsc/entries/error-fallback.d.ts

@@ -0,0 +1,3 @@
+/** Client-owned reset callbacks must not be serialized from the RSC server. */
+export declare function generateErrorFallbackEntry(): string;
+//# sourceMappingURL=error-fallback.d.ts.map

package/dist/rsc/entries/error-fallback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error-fallback.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/error-fallback.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,wBAAgB,0BAA0B,IAAI,MAAM,CAUnD"}

package/dist/rsc/entries/error-fallback.js

@@ -0,0 +1,12 @@
+/** Client-owned reset callbacks must not be serialized from the RSC server. */
+export function generateErrorFallbackEntry() {
+    return `"use client";
+import React from 'react';
+
+export default function ServerErrorFallback({ Fallback, message, fallbackProps }) {
+  const error = new Error(message);
+  const reset = () => window.location.reload();
+  return React.createElement(Fallback, { ...fallbackProps, error, reset });
+}
+`;
+}

package/dist/rsc/entries/rsc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAw7B1D"}
+{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA06B1D"}

package/dist/rsc/entries/rsc.js

@@ -25,6 +25,8 @@ export function generateRscEntry(ctx) {
     const debugLog = `// Debug disabled`;
     let code = `
 import React from 'react';
+import ServerErrorFallback from '/.farm/rsc-entries/error-fallback.tsx';
+import { registerAPIRouteShape } from '@farm.js/core/api/runtime';
 import {
   renderToReadableStream,
 `;
@@ -49,11 +51,24 @@ import {
   applyProductionMiddlewareHeaders,
   createProductionMiddlewareRunner,
 } from '@farm.js/core/middleware';
-import { invokeAPIRouteEndpoint, matchAPIRoute } from '@farm.js/core/api/runtime';
+import {
+  getAllowedAPIRouteMethods,
+  invokeAPIRouteEndpoint,
+  isFarmAPIPathname,
+  matchAPIRouteAtBasePath,
+} from '@farm.js/core/api/runtime';
 import { _runWithAfterRequest } from '@farm.js/core/after';
 import { _runWithCurrentRequest, searchParamsToObject } from '@farm.js/core/internal/production-runtime';
+import { getFarmRedirectError, isFarmNotFoundError } from '@farm.js/core/internal/production-runtime';
+import {
+  parseRoutePath,
+  matchFarmPageRoute,
+  compareRouteSpecificity,
+  getRoutePatternSpecificity,
+} from '@farm.js/core/internal/production-runtime';
 
 const farmDeploymentId = ${JSON.stringify(ctx.deploymentId)};
+const farmApiBasePath = ${JSON.stringify(ctx.apiBasePath ?? "/api")};
 `;
     if (ctx.actionsEnabled) {
         code += `import {
@@ -76,6 +91,9 @@ function debug(...args) {
 }
 
 function applyActionResponseHeaders(headers, request) {
+  // The same page URL serves HTML or Flight depending on Accept.
+  const vary = (headers.get('vary') || '').split(',').map(value => value.trim().toLowerCase());
+  if (!vary.includes('*') && !vary.includes('accept')) headers.append('vary', 'Accept');
   headers.set('x-farm-deployment-id', farmDeploymentId);
   const accept = request.headers.get('accept') || '';
   if (request.method === 'GET' && !accept.includes('text/x-component')) {
@@ -165,20 +183,30 @@ const routeDefinitionModules = collectRouteModuleEntries([${routeSourceRoots
         .map((root, index) => `{ name: ${JSON.stringify(root.name)}, base: ${JSON.stringify(root.sourceGlob)}, modules: routeDefinitionModules${index} }`)
         .join(", ")}]);
 
-const apiRouteMethods = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'];
+const apiRouteMethods = ['GET', 'HEAD', 'QUERY', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'];
 const apiRouteMap = new Map();
+const apiRouteShapes = new Map();
 
-function registerApiEndpoint(routePath, filePath, method, endpoint) {
+function registerApiEndpoint(routePath, filePath, method, endpoint, sourceIndex) {
   if (!routePath || typeof endpoint !== 'function') return;
+  const replacedPath = registerAPIRouteShape(apiRouteShapes, routePath, filePath, sourceIndex);
+  if (replacedPath) apiRouteMap.delete(replacedPath);
   const normalizedMethod = String(method || 'GET').toUpperCase();
   let route = apiRouteMap.get(routePath);
   if (!route) {
-    route = { path: routePath, methods: [], handlers: {}, files: {} };
+    route = { path: routePath, methods: [], handlers: {}, files: {}, sources: {} };
     apiRouteMap.set(routePath, route);
   }
+  if (route.sources[normalizedMethod] === sourceIndex) {
+    throw new Error(
+      'Duplicate API route for ' + normalizedMethod + ' ' + routePath + ': ' +
+      route.files[normalizedMethod] + ' conflicts with ' + filePath
+    );
+  }
   if (!route.methods.includes(normalizedMethod)) route.methods.push(normalizedMethod);
   route.handlers[normalizedMethod] = endpoint;
   route.files[normalizedMethod] = filePath;
+  route.sources[normalizedMethod] = sourceIndex;
 }
 
 function getProgrammaticApiRoutes(routeModule) {
@@ -206,7 +234,7 @@ function registerApiRouteSources(fileModules, definitionModules, sourceCount) {
       const routePath = relativePath.replace(/\\/route\\.[tj]sx?$/i, '') || '/api';
       for (const method of apiRouteMethods) {
         if (typeof routeModule?.[method] === 'function') {
-          registerApiEndpoint(routePath, filePath, method, routeModule[method]);
+          registerApiEndpoint(routePath, filePath, method, routeModule[method], sourceIndex);
         }
       }
     }
@@ -216,13 +244,13 @@ function registerApiRouteSources(fileModules, definitionModules, sourceCount) {
       const { filePath, module: routeModule } = entry;
       for (const endpoint of Object.values(routeModule)) {
         if (typeof endpoint === 'function' && endpoint.__path) {
-          registerApiEndpoint(endpoint.__path, filePath, endpoint.__method || 'GET', endpoint);
+          registerApiEndpoint(endpoint.__path, filePath, endpoint.__method || 'GET', endpoint, sourceIndex);
         }
       }
 
       for (const route of getProgrammaticApiRoutes(routeModule)) {
         for (const [method, endpoint] of Object.entries(route.methods || {})) {
-          registerApiEndpoint(route.path, filePath, method, endpoint);
+          registerApiEndpoint(route.path, filePath, method, endpoint, sourceIndex);
         }
       }
     }
@@ -233,15 +261,19 @@ registerApiRouteSources(apiRouteModules, routeDefinitionModules, ${routeSourceRo
 
 async function handleAPIRequest(request) {
   const url = new URL(request.url);
-  const match = matchAPIRoute(apiRouteMap, url.pathname);
+  const match = matchAPIRouteAtBasePath(apiRouteMap, url.pathname, farmApiBasePath);
   if (!match) return null;
 
   const method = request.method.toUpperCase();
-  const endpoint = match.route.handlers[method];
+  const endpoint = match.route.handlers[method] ??
+    (method === 'HEAD' ? match.route.handlers.GET : undefined);
   if (!endpoint) {
     return new Response(JSON.stringify({ error: 'Method Not Allowed' }), {
       status: 405,
-      headers: { 'Content-Type': 'application/json' },
+      headers: {
+        'Allow': getAllowedAPIRouteMethods(match.route).join(', '),
+        'Content-Type': 'application/json',
+      },
     });
   }
 
@@ -272,57 +304,6 @@ debug('Discovered errors:', Object.keys(errors));
 debug('Discovered middlewares:', Object.keys(middlewares));
 debug('Discovered API routes:', Array.from(apiRouteMap.keys()));
 
-/**
- * Convert loading/error file path to route pattern (segment the boundary applies to).
- * Inlined to avoid runtime dependency on plugin package; logic is simple and covered by e2e.
- */
-function boundaryPathToRoute(filePath, globVal, kind) {
-  const re = kind === 'loading' ? /\\/loading\\.[tj]sx?$/i : /\\/error\\.[tj]sx?$/i;
-  let route = filePath.replace(globVal, '').replace(re, '').replace(/\\\\/g, '/') || '/';
-  route = route.replace(/\\[([^\\]]+)\\]/g, ':$1');
-  return route;
-}
-function getMatchingLoading(pathname, globVal) {
-  const normalized = pathname.replace(/\\/$/, '') || '/';
-  const pathParts = normalized.split('/').filter(Boolean);
-  let best = null, bestLength = -1;
-  for (const filePath of Object.keys(loadings)) {
-    const pattern = boundaryPathToRoute(filePath, globVal, 'loading');
-    const patternParts = pattern === '/' ? [] : pattern.split('/').filter(Boolean);
-    if (patternParts.length > pathParts.length) continue;
-    let matches = true;
-    for (let i = 0; i < patternParts.length; i++) {
-      const p = patternParts[i], seg = pathParts[i];
-      if (!seg || (p.startsWith(':') && p !== ':...') || p === ':...') continue;
-      if (!p.startsWith(':') && p !== seg) { matches = false; break; }
-    }
-    if (matches && patternParts.length > bestLength && loadings[filePath]?.default) {
-      best = loadings[filePath].default; bestLength = patternParts.length;
-    }
-  }
-  return best;
-}
-function getMatchingError(pathname, globVal) {
-  const normalized = pathname.replace(/\\/$/, '') || '/';
-  const pathParts = normalized.split('/').filter(Boolean);
-  let best = null, bestLength = -1;
-  for (const filePath of Object.keys(errors)) {
-    const pattern = boundaryPathToRoute(filePath, globVal, 'error');
-    const patternParts = pattern === '/' ? [] : pattern.split('/').filter(Boolean);
-    if (patternParts.length > pathParts.length) continue;
-    let matches = true;
-    for (let i = 0; i < patternParts.length; i++) {
-      const p = patternParts[i], seg = pathParts[i];
-      if (!seg || (p.startsWith(':') && p !== ':...') || p === ':...') continue;
-      if (!p.startsWith(':') && p !== seg) { matches = false; break; }
-    }
-    if (matches && patternParts.length > bestLength && errors[filePath]?.default) {
-      best = errors[filePath].default; bestLength = patternParts.length;
-    }
-  }
-  return best;
-}
-
 /**
  * Convert middleware file path to route path
  * e.g., '/src/middleware.ts' -> '/'
@@ -345,7 +326,7 @@ async function executeMiddleware(request) {
 /**
  * Convert file path to route pattern
  * e.g., '/src/about/page.tsx' -> '/about'
- * e.g., '/src/blog/[slug]/page.tsx' -> '/blog/:slug'
+ * e.g., '/blog/[slug]/page.tsx' -> '/blog/[slug]'
  */
 function filePathToRoute(filePath) {
   let route = filePath
@@ -353,9 +334,6 @@ function filePathToRoute(filePath) {
     .replace(/\\/page\\.[tj]sx?$/, '')
     .replace(/\\/page$/, '') || '/';
   
-  // Convert [param] to :param for matching
-  route = route.replace(/\\[([^\\]]+)\\]/g, ':$1');
-  
   return route;
 }
 
@@ -385,52 +363,14 @@ const RouteErrorBoundary = React.Component
       return children;
     };
 
-/**
- * Match a URL pathname to a route pattern
- * Supports dynamic segments like :id and catch-all like *
- */
-function matchPath(pattern, pathname) {
-  const patternParts = pattern.split('/').filter(Boolean);
-  const pathParts = pathname.split('/').filter(Boolean);
-  
-  // Special case for root
-  if (pattern === '/' && pathname === '/') {
-    return { params: {} };
-  }
-  
-  if (patternParts.length !== pathParts.length) {
-    // Check for catch-all
-    const lastPattern = patternParts[patternParts.length - 1];
-    if (!lastPattern?.startsWith(':...')) {
-      return null;
-    }
-  }
-  
-  const params = {};
-  
-  for (let i = 0; i < patternParts.length; i++) {
-    const patternPart = patternParts[i];
-    const pathPart = pathParts[i];
-    
-    if (patternPart.startsWith(':...')) {
-      // Catch-all segment
-      const paramName = patternPart.slice(4);
-      params[paramName] = pathParts.slice(i).join('/');
-      return { params };
-    }
-    
-    if (patternPart.startsWith(':')) {
-      // Dynamic segment
-      const paramName = patternPart.slice(1);
-      params[paramName] = pathPart;
-    } else if (patternPart !== pathPart) {
-      // Static segment mismatch
-      return null;
-    }
-  }
-  
-  return { params };
-}
+// Parse and rank once per entry initialization, not on every request. Use the
+// same validation, decoding and specificity rules as Farm's ordinary router.
+const pageRoutes = Object.entries(pages).map(([filePath, module]) => ({
+  filePath,
+  module,
+  segments: parseRoutePath(filePath).segments,
+  specificity: getRoutePatternSpecificity(filePathToRoute(filePath)),
+})).sort((left, right) => compareRouteSpecificity(left.specificity, right.specificity));
 
 /**
  * Simple file-based router
@@ -439,17 +379,16 @@ function matchPath(pattern, pathname) {
 function matchRoute(pathname) {
   const normalized = pathname.replace(/\\/$/, '') || '/';
   
-  for (const filePath of Object.keys(pages)) {
-    const pattern = filePathToRoute(filePath);
-    const match = matchPath(pattern, normalized);
+  for (const { filePath, module, segments } of pageRoutes) {
+    const match = matchFarmPageRoute(normalized, segments);
     
-    if (match) {
-      debug('Matched route:', pattern, 'for path:', normalized);
+    if (match.matches) {
+      debug('Matched route:', filePath, 'for path:', normalized);
       return {
-        Page: pages[filePath].default,
+        Page: module.default,
         pattern: filePath,
         params: match.params,
-        pageMetadata: pages[filePath].metadata,
+        pageMetadata: module.metadata,
       };
     }
   }
@@ -468,14 +407,14 @@ function mergeDocumentMetadata(...sources) {
 }
 
 /**
- * Find every applicable layout module from root to the page directory.
- * Rendering still uses the nearest layout, while document metadata inherits
- * through the complete root -> nested layouts -> page chain.
+ * Find modules along the selected page's actual file ancestry, root to leaf.
+ * Keep route groups and catch-all folders; matching URL prefixes can pick
+ * boundaries from a sibling page that the router did not select.
  */
-function getLayoutModules(pageFilePath) {
+function getRouteModules(pageFilePath, modules, kind) {
   const tryKeys = (...keys) => {
     for (const k of keys) {
-      if (layouts[k]?.default) return layouts[k];
+      if (modules[k]?.default) return modules[k];
     }
     return null;
   };
@@ -487,26 +426,41 @@ function getLayoutModules(pageFilePath) {
   for (let depth = 0; depth <= parts.length; depth++) {
     const relativeDir = parts.slice(0, depth).join('/');
     const absoluteDir = relativeDir ? '/' + relativeDir : '';
-    let matchedLayout = null;
+    let matchedModule = null;
     for (const ext of extensions) {
-      matchedLayout = tryKeys(
-        absoluteDir + '/layout.' + ext,
-        relativeDir ? relativeDir + '/layout.' + ext : 'layout.' + ext,
+      matchedModule = tryKeys(
+        absoluteDir + '/' + kind + '.' + ext,
+        relativeDir ? relativeDir + '/' + kind + '.' + ext : kind + '.' + ext,
       );
-      if (matchedLayout) break;
+      if (matchedModule) break;
     }
-    if (matchedLayout && !matches.includes(matchedLayout)) matches.push(matchedLayout);
+    if (matchedModule) matches.push(matchedModule);
   }
 
   return matches;
 }
 
+function getLayoutModules(pageFilePath) {
+  return getRouteModules(pageFilePath, layouts, 'layout');
+}
+
+function getMatchingBoundary(pageFilePath, modules, kind) {
+  // Before page selection (for example, middleware failure), only the root
+  // boundary applies. Do not guess a route from a partially processed URL.
+  const matches = getRouteModules(pageFilePath ?? '/page.tsx', modules, kind);
+  return matches.at(-1)?.default ?? null;
+}
+
 /**
  * Main request handler - entry point for both dev and production (Nitro).
  * Exported as { fetch: handler } for the RSC/Nitro contract (see vite-plugin-rsc-deploy-example).
  */
 async function handleFarmRequest(request) {
   let url = new URL(request.url);
+  let matchedPage = null;
+  let errorData = new Map();
+  let errorContext = new Map();
+  let errorHeaders = new Headers();
   try {
   debug('Handling request:', request.method, url.pathname);
 
@@ -515,9 +469,9 @@ async function handleFarmRequest(request) {
     return createFarmDeploymentMismatchResponse(deploymentMismatch);
   }
 
-  const initialApiMatch = matchAPIRoute(apiRouteMap, url.pathname);
+  const initialApiMatch = matchAPIRouteAtBasePath(apiRouteMap, url.pathname, farmApiBasePath);
   const isInitialApiRequest = Boolean(initialApiMatch) ||
-    url.pathname === '/api' || url.pathname.startsWith('/api/');
+    isFarmAPIPathname(url.pathname, farmApiBasePath) || isFarmAPIPathname(url.pathname);
 
   ${ctx.actionsEnabled
         ? `if (request.method === 'POST' && !isInitialApiRequest) {
@@ -553,6 +507,9 @@ async function handleFarmRequest(request) {
   const middlewareData = Object.fromEntries(middlewareResult.data);
   const middlewareContext = middlewareResult.context;
   const middlewareHeaders = new Headers(middlewareResult.headers);
+  errorData = middlewareResult.data;
+  errorContext = middlewareContext;
+  errorHeaders = middlewareHeaders;
   if (middlewareResult.data.size || middlewareContext.size) {
     middlewareHeaders.set('cache-control', 'private, no-store');
   }
@@ -568,7 +525,7 @@ async function handleFarmRequest(request) {
   if (apiResponse) {
     return applyProductionMiddlewareHeaders(apiResponse, middlewareHeaders);
   }
-  if (url.pathname === '/api' || url.pathname.startsWith('/api/')) {
+  if (isFarmAPIPathname(url.pathname, farmApiBasePath) || isFarmAPIPathname(url.pathname)) {
     return applyProductionMiddlewareHeaders(new Response(
       JSON.stringify({ error: 'API route not found', pathname: url.pathname }),
       { status: 404, headers: { 'Content-Type': 'application/json' } },
@@ -699,6 +656,7 @@ async function handleFarmRequest(request) {
     code += `
   // Match the URL to a page component
   const matched = matchRoute(url.pathname);
+  matchedPage = matched;
   
   if (!matched) {
     debug('404 - No route found for:', url.pathname);
@@ -707,8 +665,6 @@ async function handleFarmRequest(request) {
   
   const { Page, pattern, params, pageMetadata } = matched;
   const LayoutModules = getLayoutModules(pattern);
-  const LayoutModule = LayoutModules[LayoutModules.length - 1];
-  const Layout = LayoutModule?.default || (function PassThrough({ children }) { return children; });
   const metadata = mergeDocumentMetadata(
     ...LayoutModules.map((layoutModule) => layoutModule.metadata),
     pageMetadata,
@@ -731,23 +687,25 @@ async function handleFarmRequest(request) {
   // Helper to create elements without JSX
   const h = React.createElement;
   
-  // Render page content - handle async components
+  // Render page content - only native async functions need direct awaiting.
+  // Synchronous components must retain React's hook dispatcher. Source text
+  // containing the word async does not change how a component executes.
   let pageContent;
-  if (Page.constructor.name === 'AsyncFunction' || Page.toString().includes('async')) {
+  if (Page.constructor.name === 'AsyncFunction') {
     pageContent = await Page(pageProps);
   } else {
     pageContent = h(Page, pageProps);
   }
   
   // Route-level loading boundary: wrap in Suspense so async content shows fallback
-  const LoadingComponent = getMatchingLoading(url.pathname, glob);
+  const LoadingComponent = getMatchingBoundary(pattern, loadings, 'loading');
   if (LoadingComponent) {
     const loadingFallback = h(LoadingComponent, { params, path: url.pathname });
     pageContent = h(React.Suspense, { fallback: loadingFallback }, pageContent);
   }
   
   // Route-level error boundary (Next.js error.tsx): catches render errors in this segment
-  const ErrorComponent = getMatchingError(url.pathname, glob);
+  const ErrorComponent = getMatchingBoundary(pattern, errors, 'error');
   if (ErrorComponent) {
     pageContent = h(RouteErrorBoundary, {
       Fallback: ErrorComponent,
@@ -756,12 +714,16 @@ async function handleFarmRequest(request) {
     });
   }
   
-  // Render layout
-  let layoutContent;
-  if (Layout.constructor.name === 'AsyncFunction' || Layout.toString().includes('async')) {
-    layoutContent = await Layout({ children: pageContent });
-  } else {
-    layoutContent = h(Layout, null, pageContent);
+  // Render layouts inside out so every ancestor wraps its descendants.
+  let layoutContent = pageContent;
+  for (let index = LayoutModules.length - 1; index >= 0; index--) {
+    const Layout = LayoutModules[index].default;
+    const layoutProps = { params: pageProps.params, children: layoutContent };
+    if (Layout.constructor.name === 'AsyncFunction') {
+      layoutContent = await Layout(layoutProps);
+    } else {
+      layoutContent = h(Layout, layoutProps);
+    }
   }
   
   // Single wrapper so #root has exactly one child (avoids duplicate block / "two pages" in DOM).
@@ -861,6 +823,9 @@ async function handleFarmRequest(request) {
     )
   );
   } catch (err) {
+    const redirect = getFarmRedirectError(err);
+    if (redirect) return new Response(null, { status: redirect.status, headers: { location: redirect.url, 'cache-control': 'no-store' } });
+    if (isFarmNotFoundError(err)) return new Response('Not Found', { status: 404, headers: { 'cache-control': 'no-store' } });
     console.error('[RSC] Handler error:', err);
     if (request.method === 'POST') {
       if (request.signal.aborted) {
@@ -875,50 +840,71 @@ async function handleFarmRequest(request) {
         },
       });
     }
-    // If route has error.tsx, render it (Next.js-style: SSR error goes to route error boundary)
+    // Render outside the failed page/layout tree, but retain request context.
     const pathname = url.pathname.replace(/\\/$/, '') || '/';
-    const ErrorComponent = getMatchingError(pathname, glob);
+    const ErrorComponent = getMatchingBoundary(matchedPage?.pattern, errors, 'error');
     if (ErrorComponent) {
       try {
-        const matched = matchRoute(pathname);
-        const layoutPattern = matched ? matched.pattern : null;
-        const LayoutModules = matched ? getLayoutModules(layoutPattern) : [];
-        const Layout = LayoutModules[LayoutModules.length - 1]?.default;
-        const LayoutComp = Layout || (function PassThrough({ children }) { return children; });
-        const errParams = matched ? matched.params : {};
-        const errSearchParams = searchParamsToObject(url.searchParams);
-        const errorElement = h(ErrorComponent, {
-          error: err,
-          reset: () => {},
-          params: errParams,
-          path: pathname,
-          searchParams: errSearchParams,
-        });
-        const layoutContent = LayoutComp.constructor.name === 'AsyncFunction' || LayoutComp.toString().includes('async')
-          ? await LayoutComp({ children: errorElement })
-          : h(LayoutComp, null, errorElement);
-        const rootInner = h('div', { 'data-farm-root': 'true' }, layoutContent);
-        const doc = h('html', null,
-          h('head', null,
-            h('meta', { charSet: 'utf-8' }),
-            h('meta', { name: 'viewport', content: 'width=device-width, initial-scale=1' }),
-            h('link', { rel: 'icon', href: 'data:,' }),
-            h('title', null, 'Error'),
-            h('link', { rel: 'stylesheet', href: globalsCssPath, as: 'style', precedence: 'default' })
-          ),
-          h('body', null, h('div', { id: 'root' }, rootInner))
+        return await _runWithCurrentRequest(request, () =>
+          _runWithMiddlewareData(errorData, () =>
+            _runWithMiddlewareContext(errorContext, async () => {
+              const h = React.createElement;
+              const errSearchParams = searchParamsToObject(url.searchParams);
+              const fallbackProps = {
+                params: matchedPage?.params || {},
+                path: pathname,
+                search: url.search,
+                searchParams: errSearchParams,
+                middlewareData: Object.fromEntries(errorData),
+              };
+              // Preserve the original failure in logs, not production payloads.
+              const message = ${ctx.development === true ? "true" : "false"} && err instanceof Error
+                ? err.message : 'Internal Server Error';
+              const isClientBoundary = ErrorComponent.$$typeof === Symbol.for('react.client.reference');
+              const errorElement = isClientBoundary
+                ? h(ServerErrorFallback, { Fallback: ErrorComponent, message, fallbackProps })
+                : h(ErrorComponent, { ...fallbackProps, error: new Error(message), reset: () => {} });
+              const rootInner = h('div', { 'data-farm-root': 'true' }, errorElement);
+              const payload = {
+                root: h('html', null,
+                  h('head', null, h('meta', { charSet: 'utf-8' }), h('title', null, 'Error')),
+                  h('body', null, h('div', { id: 'root' }, rootInner))),
+                rootContent: rootInner,
+                metadata: { title: 'Error' },
+              };
+              const rscStream = renderToReadableStream(payload);
+              const headers = new Headers(errorHeaders);
+              headers.set('cache-control', 'private, no-store');
+              headers.set('x-content-type-options', 'nosniff');
+              applyActionResponseHeaders(headers, request);
+              if ((request.headers.get('accept') || '').includes('text/x-component')) {
+                headers.set('content-type', 'text/x-component');
+                return new Response(rscStream, { status: 500, headers });
+              }
+              let ssr;
+              if (typeof import.meta.viteRsc?.loadModule === 'function') {
+                ssr = await import.meta.viteRsc.loadModule('ssr', 'index');
+              } else if (typeof globalThis.__VITE_RSC_LOAD_SSR__ === 'function') {
+                ssr = await globalThis.__VITE_RSC_LOAD_SSR__();
+              }
+              if (!ssr) {
+                void rscStream.cancel().catch(() => {});
+                throw new Error('SSR environment unavailable');
+              }
+              const html = await ssr.renderHTML({ payload, rscStream });
+              headers.set('content-type', 'text/html; charset=utf-8');
+              return new Response(html, { status: 500, headers });
+            })
+          )
         );
-        const renderToString = (await import('react-dom/server')).renderToString;
-        const html = '<!DOCTYPE html>' + renderToString(doc);
-        return new Response(html, { status: 500, headers: { 'Content-Type': 'text/html; charset=utf-8' } });
-      } catch (e) {
-        console.error('[RSC] Error boundary render failed:', e);
+      } catch (fallbackError) {
+        console.error('[RSC] Error boundary render failed:', fallbackError);
       }
     }
     const message = 'Internal Server Error';
     return new Response(JSON.stringify({ error: true, url: request.url, status: 500, message }), {
       status: 500,
-      headers: { 'Content-Type': 'application/json' },
+      headers: { 'Content-Type': 'application/json', 'Cache-Control': 'private, no-store' },
     });
   }
 }

package/dist/rsc/entries/ssr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA6O1D"}
+{"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA+M1D"}

package/dist/rsc/entries/ssr.js

@@ -40,43 +40,57 @@ const cssLinkTag = resolvedCssHref
   ? '<link rel="stylesheet" href="' + escapeHtmlAttribute(resolvedCssHref) + '" as="style" data-precedence="default">'
   : '';
 
-function injectIntoHeadStream(tag) {
+// Work on bytes: chunk boundaries need not align with UTF-8 code points.
+function injectBeforeStream(markerText, tag) {
   const encoder = new TextEncoder();
-  const decoder = new TextDecoder();
-  const marker = '</head>';
-  let buffer = '';
+  const marker = encoder.encode(markerText);
+  const insertion = encoder.encode(tag);
+  let buffer = new Uint8Array(0);
   let injected = false;
 
   return new TransformStream({
     transform(chunk, controller) {
-      const str = typeof chunk === "string" ? chunk : decoder.decode(chunk);
+      const bytes = typeof chunk === 'string' ? encoder.encode(chunk) : chunk;
       if (injected || !tag) {
-        controller.enqueue(typeof chunk === "string" ? encoder.encode(str) : chunk);
+        controller.enqueue(bytes);
         return;
       }
 
-      buffer += str;
-      const index = buffer.indexOf(marker);
+      const pending = new Uint8Array(buffer.length + bytes.length);
+      pending.set(buffer);
+      pending.set(bytes, buffer.length);
+      let index = -1;
+      outer: for (let i = 0; i <= pending.length - marker.length; i++) {
+        for (let j = 0; j < marker.length; j++) {
+          if (pending[i + j] !== marker[j]) continue outer;
+        }
+        index = i;
+        break;
+      }
       if (index >= 0) {
-        const before = buffer.slice(0, index);
-        const after = buffer.slice(index + marker.length);
-        controller.enqueue(encoder.encode(before + tag + marker + after));
-        buffer = '';
+        if (index) controller.enqueue(pending.subarray(0, index));
+        controller.enqueue(insertion);
+        controller.enqueue(pending.subarray(index));
+        buffer = new Uint8Array(0);
         injected = true;
         return;
       }
 
-      if (buffer.length > marker.length) {
-        controller.enqueue(encoder.encode(buffer.slice(0, buffer.length - marker.length)));
-        buffer = buffer.slice(-marker.length);
-      }
+      // Retain only a possible marker prefix, never the whole response.
+      const emitLength = Math.max(0, pending.length - marker.length + 1);
+      if (emitLength) controller.enqueue(pending.subarray(0, emitLength));
+      buffer = pending.slice(emitLength);
     },
     flush(controller) {
-      if (buffer) controller.enqueue(encoder.encode(buffer));
+      if (buffer.length) controller.enqueue(buffer);
     },
   });
 }
 
+function injectIntoHeadStream(tag) {
+  return injectBeforeStream('</head>', tag);
+}
+
 /** Collect Node stream (from renderToPipeableStream) into a single string. Supports Suspense. */
 function pipeableStreamToString(stream) {
   return new Promise((resolve, reject) => {
@@ -125,13 +139,19 @@ export async function renderHTML(firstArg, options = {}) {
   if (!bootstrap && PROD_BOOTSTRAP !== "__FARM_BOOTSTRAP_SCRIPT__") bootstrap = PROD_BOOTSTRAP;
   
   // Use renderToPipeableStream so Suspense streams: fallback (loading.tsx) first, then resolved content.
-  const { pipe } = renderToPipeableStream(React.createElement(Root), {
-    ...(bootstrap && { bootstrapScriptContent: bootstrap }),
-    formState: options.formState,
-  });
   const { PassThrough, Readable } = await import('stream');
   const passThrough = new PassThrough();
-  pipe(passThrough);
+  // Do not commit an empty response when the shell cannot render. Reject back
+  // to the request handler so it can render error.tsx through RSC and SSR.
+  await new Promise((resolve, reject) => {
+    const { pipe } = renderToPipeableStream(React.createElement(Root), {
+      ...(bootstrap && { bootstrapScriptContent: bootstrap }),
+      formState: options.formState,
+      onShellReady() { pipe(passThrough); resolve(); },
+      onShellError: reject,
+      onError(error) { console.error('[RSC] SSR render error:', error); },
+    });
+  });
 
   const CLIENT_ENTRY_HREF = "__FARM_CLIENT_ENTRY_HREF__";
   const PLACEHOLDER_STR = "__FARM_CLIENT_ENTRY_HREF__";
@@ -141,34 +161,7 @@ export async function renderHTML(firstArg, options = {}) {
   if (hasPayload) {
     // Stream HTML to the client while preserving the RSC payload for hydration.
     debug('Streaming HTML (loading fallback then content)');
-    const BODY_HTML_END = '</body></html>';
-    const TAG_LEN = BODY_HTML_END.length;
-    const encoder = new TextEncoder();
-    let streamBuf = '';
-    const streamingClientScriptInjector = new TransformStream({
-      transform(chunk, controller) {
-        const str = typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk);
-        if (!injectClientScriptInStream || !clientScriptTag) {
-          controller.enqueue(typeof chunk === "string" ? encoder.encode(str) : chunk);
-          return;
-        }
-        streamBuf += str;
-        while (streamBuf.length > TAG_LEN) {
-          const tail = streamBuf.slice(-TAG_LEN);
-          if (tail === BODY_HTML_END) {
-            const before = streamBuf.slice(0, streamBuf.length - TAG_LEN);
-            controller.enqueue(encoder.encode(before + clientScriptTag + BODY_HTML_END));
-            streamBuf = '';
-            return;
-          }
-          controller.enqueue(encoder.encode(streamBuf.slice(0, streamBuf.length - TAG_LEN)));
-          streamBuf = streamBuf.slice(-TAG_LEN);
-        }
-      },
-      flush(controller) {
-        if (streamBuf) controller.enqueue(encoder.encode(streamBuf));
-      }
-    });
+    const streamingClientScriptInjector = injectBeforeStream('</body></html>', clientScriptTag);
     const webStream = typeof Readable.toWeb === 'function'
       ? Readable.toWeb(passThrough)
       : new ReadableStream({
@@ -207,30 +200,7 @@ export async function renderHTML(firstArg, options = {}) {
       controller.close();
     }
   });
-  let clientBuffer = "";
-  let clientScriptInjected = false;
-  const injectClientScriptStream = new TransformStream({
-    transform(chunk, controller) {
-      const str = typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk);
-      if (!injectClientScriptInStream || clientScriptInjected) {
-        controller.enqueue(chunk);
-        return;
-      }
-      clientBuffer += str;
-      if (clientBuffer.includes("</body></html>")) {
-        const href = (typeof CLIENT_ENTRY_HREF === "string" && CLIENT_ENTRY_HREF.length > 0 && CLIENT_ENTRY_HREF.indexOf(PLACEHOLDER_STR) < 0) ? CLIENT_ENTRY_HREF : "";
-        const out = href ? clientBuffer.replace("</body></html>", '<script type="module" src="' + href + '"></script></body></html>') : clientBuffer;
-        controller.enqueue(new TextEncoder().encode(out));
-        clientBuffer = "";
-        clientScriptInjected = true;
-      }
-    },
-    flush(controller) {
-      if (clientBuffer) {
-        controller.enqueue(new TextEncoder().encode(clientBuffer));
-      }
-    }
-  });
+  const injectClientScriptStream = injectBeforeStream('</body></html>', clientScriptTag);
 
   let out = streamFromHtml.pipeThrough(injectRSCPayload(s2));
   out = out.pipeThrough(injectClientScriptStream);

package/dist/rsc/index.d.ts

@@ -24,6 +24,8 @@
 import { type Plugin, type UserConfig } from "vite";
 import type { FarmRscPluginOptions, EntryContext } from "./types.js";
 import type { FarmServerActionsConfig } from "@farm.js/core/server-action-security";
+import type { FarmAPIConfig } from "@farm.js/core/api";
+import type { FarmServerConfig } from "@farm.js/core/internal/production-runtime";
 import type { FarmLayerEntry, ResolvedFarmLayer } from "@farm.js/core/server";
 export type { FarmRscPluginOptions, EntryContext };
 export { buildRscNitro, waitForRscManifest, waitForRscOutputs } from "./nitro-build.js";
@@ -36,6 +38,8 @@ export interface FarmRscConfig {
     layers?: readonly ResolvedFarmLayer[];
     outDir?: string;
     basePath?: string;
+    api?: FarmAPIConfig;
+    server?: FarmServerConfig;
     port?: number;
     experimental?: {
         /**

package/dist/rsc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAiC9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAiDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAkqC5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAmD9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAuDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAksC5E"}

package/dist/rsc/index.js

@@ -26,12 +26,14 @@ import { init as initModuleLexer, parse as parseModuleImports } from "es-module-
 import { farmEnvironmentFunctionsPlugin } from "@farm.js/core/environment/vite";
 import { generateRscEntry } from "./entries/rsc.js";
 import { generateSsrEntry } from "./entries/ssr.js";
+import { generateErrorFallbackEntry } from "./entries/error-fallback.js";
 import { generateClientEntry, serverFnTransportErrorClientRuntime } from "./entries/client.js";
 import { transformFarmRouteActionClients } from "./route-action-transform.js";
 import { transformFarmServerFns } from "./server-fn-transform.js";
 import { transformAutomaticOptimizedBoundaries } from "./automatic-optimized-boundary.js";
 import { resolveRscBuildOutputPath } from "./build-paths.js";
 import { assertRscPackageCompatibility } from "./compatibility.js";
+import { sendRscDevelopmentResponse } from "./dev-response.js";
 import fs from "fs/promises";
 import path from "path";
 import { devServableFileExists } from "../dev-static.js";
@@ -40,10 +42,13 @@ import { createRequire } from "node:module";
 // Use API and middleware plugins from @farm.js/core (require so CJS build resolves when ESM .mjs is missing)
 const require_ = createRequire(import.meta.url);
 const { farmApiPlugin, farmMiddlewarePlugin } = require_("@farm.js/core");
-const { resolveServerActionsConfig } = require_("@farm.js/core/server-action-security");
+const { resolveServerActionsConfig, validateServerActionRequest, createServerActionRequestErrorResponse, } = require_("@farm.js/core/server-action-security");
 const { normalizeFarmDeploymentId } = require_("@farm.js/core/deployment");
 const { getFarmLayerAliases, getFarmSourceRoots, resolveFarmLayers } = require_("@farm.js/core/server");
-const { searchParamsToObject } = require_("@farm.js/core/internal/production-runtime");
+const { searchParamsToObject, readNodeRequestBody, resolveFarmServerConfig, createFarmRequestBodyErrorResponse, } = require_("@farm.js/core/internal/production-runtime");
+const { isFarmAPIPathname } = require_("@farm.js/core/api/runtime");
+const { resolveFarmAPIConfig, resolveFarmAPIServerBasePath } = require_("@farm.js/core/api");
+const { getResolvedEnv } = require_("@farm.js/core/env");
 export { buildRscNitro, waitForRscManifest, waitForRscOutputs } from "./nitro-build.js";
 import { registerRscNitroRuntimePackage } from "./nitro-build.js";
 export { default as nitro } from "./vite-plugin-nitro.js";
@@ -66,11 +71,13 @@ export function defineConfig(config = {}) {
         layers: config.layers,
         outDir: config.outDir ?? "dist",
         basePath: config.basePath ?? "/",
+        api: config.api,
         serverActions: config.serverActions,
         deploymentId: config.deploymentId,
         generateBuildId: config.generateBuildId,
         // Vite server configuration
         server: {
+            ...config.server,
             port,
             strictPort: false,
         },
@@ -83,7 +90,11 @@ export function defineConfig(config = {}) {
         },
         plugins: [
             farmMiddlewarePlugin({ srcDir: config.srcDir ?? "src", debug }),
-            farmApiPlugin({ srcDir: config.srcDir ?? "src", debug }),
+            farmApiPlugin({
+                srcDir: config.srcDir ?? "src",
+                debug,
+                bodySizeLimit: config.server?.bodySizeLimit,
+            }),
             farmRsc({
                 debug,
                 encryptActions: config.encryptActions,
@@ -375,6 +386,7 @@ export default function farmRsc(options = {}) {
     let rscEnabled = false;
     let actionsEnabled = false;
     let optimizedBoundaryEnabled = false;
+    let bodySizeLimit = resolveFarmServerConfig(undefined).bodySizeLimit;
     // Context passed to entry generators
     let entryContext;
     /** Set in config when RSC enabled; used by build plugin to run Nitro after client writeBundle. */
@@ -474,6 +486,7 @@ export default function farmRsc(options = {}) {
                 // Check if user enabled RSC in their config
                 rscEnabled = c.experimental?.serverComponents === true;
                 actionsEnabled = c.experimental?.serverActions === true;
+                bodySizeLimit = resolveFarmServerConfig(c.server).bodySizeLimit;
                 optimizedBoundaryEnabled = c.experimental?.optimizedBoundary === true;
                 logInfo(`RSC enabled: ${rscEnabled}`);
                 logInfo(`Actions enabled: ${actionsEnabled}`);
@@ -498,6 +511,11 @@ export default function farmRsc(options = {}) {
                     Object.assign(c, layerResolution.config);
                 }
                 // Read user's directory configuration
+                const api = await resolveFarmAPIConfig(c.api, {
+                    root,
+                    mode: env.command === "build" ? "production" : "development",
+                    env: getResolvedEnv(),
+                });
                 const srcDir = c.srcDir ?? "src";
                 const outDir = c.outDir ?? "dist";
                 const deploymentId = normalizeFarmDeploymentId(options.deploymentId ||
@@ -538,6 +556,7 @@ export default function farmRsc(options = {}) {
                     srcDir,
                     outDir,
                     basePath: c.basePath ?? "/",
+                    apiBasePath: resolveFarmAPIServerBasePath(api),
                     routesDir: options.routesDir,
                     globalCssPath,
                     routeRoots,
@@ -549,6 +568,7 @@ export default function farmRsc(options = {}) {
                     }),
                     deploymentId,
                     debug,
+                    development: env.command === "serve",
                 };
                 logInfo(`srcDir: ${entryContext.srcDir}, outDir: ${entryContext.outDir}`);
                 // Write real entry files so @vitejs/plugin-rsc can use file-based entries.
@@ -559,6 +579,7 @@ export default function farmRsc(options = {}) {
                 await fs.writeFile(entryRscPath, generateRscEntry(entryContext));
                 await fs.writeFile(entrySsrPath, generateSsrEntry(entryContext));
                 await fs.writeFile(entryClientPath, generateClientEntry(entryContext));
+                await fs.writeFile(path.join(entriesDir, "error-fallback.tsx"), generateErrorFallbackEntry());
                 logInfo(`Wrote RSC entries to ${entriesDir}`);
                 // User must add rsc({ entries: { rsc, ssr, client } }) to config.plugins so the RSC plugin
                 // runs for every environment and client build can resolve virtual:vite-rsc/client-references.
@@ -585,6 +606,9 @@ export default function farmRsc(options = {}) {
                 return {
                     appType: "custom",
                     builder: { sharedConfigBuild: true },
+                    define: {
+                        __FARM_API_BASE_URL__: JSON.stringify(api.baseURL),
+                    },
                     ssr: {
                         external: [
                             "react",
@@ -1000,19 +1024,26 @@ if (document.readyState === 'loading') {
                             globalThis.__FARM_VITE_RSC_LOAD_BOOTSTRAP__ = async () => bootstrapPrefix +
                                 `import("/@react-refresh").then(m=>{m.default.injectIntoGlobalHook(window);window.$RefreshReg$=()=>{};window.$RefreshSig$=()=>type=>type;window.__vite_plugin_react_preamble_installed__=true;return import("/@vite/client");}).then(()=>import(${JSON.stringify(clientEntryUrl)}));`;
                             const base = `http://${req.headers.host || "localhost:3000"}`;
+                            const requestUrl = new URL(url, base);
+                            const isAction = actionsEnabled &&
+                                method === "POST" &&
+                                !isFarmAPIPathname(requestUrl.pathname, entryContext.apiBasePath) &&
+                                !isFarmAPIPathname(requestUrl.pathname);
+                            if (isAction) {
+                                validateServerActionRequest(new Request(requestUrl, {
+                                    method,
+                                    headers: req.headers,
+                                }), entryContext.serverActions);
+                            }
                             let body;
-                            if (method === "POST") {
-                                const chunks = [];
-                                for await (const chunk of req)
-                                    chunks.push(chunk);
-                                body = Buffer.concat(chunks);
-                                // Keep as buffer so request.formData() / request.text() in RSC handler work (multipart must not be UTF-8 decoded)
+                            if (method !== "GET" && method !== "HEAD") {
+                                body = await readNodeRequestBody(req, isAction ? entryContext.serverActions.bodySizeLimit : bodySizeLimit);
                             }
-                            const request = new Request(new URL(url, base), {
+                            const request = new Request(requestUrl, {
                                 method,
                                 headers: req.headers,
-                                body: method === "POST" && body && body.length > 0
-                                    ? body
+                                body: body && body.length > 0
+                                    ? body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength)
                                     : undefined,
                             });
                             // Load the RSC entry in the "rsc" environment so @vitejs/plugin-rsc transforms run with this.environment.name === "rsc".
@@ -1046,32 +1077,24 @@ if (document.readyState === 'loading') {
                             if (!rscEntry?.default?.fetch)
                                 throw new Error("[Farm.js] Could not load RSC entry in rsc environment");
                             const response = await rscEntry.default.fetch(request);
-                            res.statusCode = response.status;
-                            response.headers.forEach((value, key) => {
-                                if (key.toLowerCase() !== "transfer-encoding")
-                                    res.setHeader(key, value);
-                            });
-                            if (response.body) {
-                                const reader = response.body.getReader();
-                                const pump = async () => {
-                                    while (true) {
-                                        const { done, value } = await reader.read();
-                                        if (done)
-                                            break;
-                                        res.write(Buffer.from(value));
-                                    }
-                                    res.end();
-                                };
-                                await pump();
-                            }
-                            else {
-                                res.end();
-                            }
+                            await sendRscDevelopmentResponse(res, response);
                             const duration = Date.now() - startTime;
                             logResponse(method, pathname, response.status, duration);
                             return;
                         }
                         catch (rscError) {
+                            const rejection = createFarmRequestBodyErrorResponse(rscError) ??
+                                createServerActionRequestErrorResponse(rscError);
+                            if (rejection && !res.headersSent && !res.writableEnded && !res.destroyed) {
+                                await sendRscDevelopmentResponse(res, rejection);
+                                return;
+                            }
+                            if (res.headersSent || res.writableEnded || res.destroyed) {
+                                console.error("[Farm.js] RSC dev response error:", rscError);
+                                if (!res.destroyed)
+                                    res.destroy(rscError instanceof Error ? rscError : new Error(String(rscError)));
+                                return;
+                            }
                             // RSC pipeline failed; fall back to legacy SSR for GET only
                             if (method !== "GET") {
                                 const duration = Date.now() - startTime;

package/dist/rsc/nitro-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA+DD,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8MhF"}
+{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA0ED,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8MhF"}

package/dist/rsc/nitro-build.js

@@ -219,9 +219,20 @@ function createRscRequest(event) {
   return new Request(event.req, { signal: controller.signal });
 }
 
-export default defineEventHandler((event) => handler(createRscRequest(event), {
-  waitUntil: (promise) => event.waitUntil(promise),
-}));
+export default defineEventHandler(async (event) => {
+  const response = await handler(createRscRequest(event), {
+    waitUntil: (promise) => event.waitUntil(promise),
+  });
+  // H3's prepared headers override Response headers. Keep both the runtime's
+  // fields (e.g. Accept-Encoding from static middleware) and the app's fields.
+  const vary = [event.res.headers.get('vary'), response.headers.get('vary')]
+    .filter(Boolean).join(',').split(',').map(value => value.trim()).filter(Boolean);
+  if (vary.length) {
+    const fields = new Map(vary.map(value => [value.toLowerCase(), value]));
+    event.res.headers.set('vary', fields.has('*') ? '*' : [...fields.values()].join(', '));
+  }
+  return response;
+});
 `.trim();
     const entryPath = path.join(buildDir, "rsc-entry.mjs");
     mkdirSync(buildDir, { recursive: true });

package/dist/rsc/types.d.ts

@@ -54,6 +54,8 @@ export interface EntryContext {
     outDir: string;
     /** Base URL path, e.g. '/' */
     basePath: string;
+    /** Resolved same-origin mount for canonical /api routes. */
+    apiBasePath?: string;
     /** Route files subdirectory within srcDir */
     routesDir?: string;
     /** Root-relative Vite URL for an existing global stylesheet. */
@@ -72,6 +74,8 @@ export interface EntryContext {
     deploymentId: string;
     /** Whether debug mode is enabled */
     debug: boolean;
+    /** True only for the Vite serve command, never for a production build. */
+    development?: boolean;
 }
 /**
  * Matched route information from the file-based router.

package/dist/rsc/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/rsc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,yDAAyD;IACzD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,2CAA2C;QAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IAEjB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,uFAAuF;IACvF,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IAEH,yCAAyC;IACzC,cAAc,EAAE,OAAO,CAAC;IAExB,wDAAwD;IACxD,aAAa,EAAE,+BAA+B,CAAC;IAE/C,8EAA8E;IAC9E,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAE/B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,0DAA0D;IAC1D,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC;IAEzB,wFAAwF;IACxF,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAEjC,yEAAyE;IACzE,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QACZ,EAAE,EAAE,OAAO,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;KACf,CAAC;IAEF,6CAA6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB,QAAQ,CAAC,OAAO,EAAE;YAChB,qCAAqC;YACrC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAEhC,6CAA6C;YAC7C,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhE,kDAAkD;YAClD,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC5D,CAAC;KACH;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/rsc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,yDAAyD;IACzD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,2CAA2C;QAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IAEjB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,uFAAuF;IACvF,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IAEH,yCAAyC;IACzC,cAAc,EAAE,OAAO,CAAC;IAExB,wDAAwD;IACxD,aAAa,EAAE,+BAA+B,CAAC;IAE/C,8EAA8E;IAC9E,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,KAAK,EAAE,OAAO,CAAC;IAEf,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAE/B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,0DAA0D;IAC1D,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC;IAEzB,wFAAwF;IACxF,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAEjC,yEAAyE;IACzE,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QACZ,EAAE,EAAE,OAAO,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;KACf,CAAC;IAEF,6CAA6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB,QAAQ,CAAC,OAAO,EAAE;YAChB,qCAAqC;YACrC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAEhC,6CAA6C;YAC7C,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhE,kDAAkD;YAClD,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC5D,CAAC;KACH;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.93",
+  "version": "0.1.0-beta.94",
   "description": "Official plugins for Farm.js framework",
   "license": "MIT",
   "author": "Farm.js Team",
@@ -61,7 +61,7 @@
     "nitro": "3.0.1-alpha.0",
     "picocolors": "^1.0.0",
     "rsc-html-stream": "^0.0.4",
-    "@farm.js/core": "0.1.0-beta.93"
+    "@farm.js/core": "0.1.0-beta.94"
   },
   "devDependencies": {
     "@types/node": "^20.19.21",
@@ -82,7 +82,7 @@
     "react-dom": "19.2.8",
     "react-server-dom-webpack": "19.2.8",
     "vite": ">=6.0.0",
-    "@farm.js/core": "0.1.0-beta.93"
+    "@farm.js/core": "0.1.0-beta.94"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {