vinext 0.0.49 → 0.0.50

package/dist/server/app-rsc-response-finalizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-rsc-response-finalizer.js","names":[],"sources":["../../src/server/app-rsc-response-finalizer.ts"],"sourcesContent":["import type { NextHeader } from \"../config/next-config.js\";\nimport type { RequestContext } from \"../config/config-matchers.js\";\nimport { applyConfigHeadersToResponse } from \"./request-pipeline.js\";\nimport { stripBasePath } from \"../utils/base-path.js\";\nimport { normalizePath } from \"./normalize-path.js\";\nimport { normalizePathnameForRouteMatch } from \"../routing/utils.js\";\n\ntype FinalizeAppRscResponseOptions = {\n  basePath: string;\n  configHeaders: NextHeader[];\n  /**\n   * Original pre-middleware request context.\n   * Next.js evaluates config header has/missing conditions against the\n   * unmodified incoming request, so callers must pass the snapshot taken\n   * before middleware runs.\n   */\n  requestContext: RequestContext;\n};\n\n/**\n * Apply next.config.js response headers to an App Router response.\n *\n * Called once per request in the outer handler() wrapper, after all route\n * handling, so that every response path (page, route handler, server action,\n * metadata, not-found) gets headers applied consistently.\n *\n * Skips 3xx redirect responses. Response.redirect() creates immutable\n * headers that throw on mutation, and Next.js does not apply config headers\n * to redirects regardless.\n */\nexport function finalizeAppRscResponse(\n  response: Response,\n  request: Request,\n  options: FinalizeAppRscResponseOptions,\n): Response {\n  // 3xx responses: Response.redirect() headers are immutable (throws on write),\n  // and Next.js deliberately excludes config headers from redirect responses.\n  if (response.status >= 300 && response.status < 400) {\n    return response;\n  }\n\n  if (!options.configHeaders.length) {\n    return response;\n  }\n\n  const url = new URL(request.url);\n  let pathname: string;\n  try {\n    pathname = normalizePath(normalizePathnameForRouteMatch(url.pathname));\n  } catch {\n    // Malformed percent-encoding. The request reached this point only because\n    // normalizePathnameForRouteMatchStrict ran earlier and returned 400 for\n    // truly-malformed paths. This catch exists as a safety net for edge cases;\n    // keep the historical raw-path fallback rather than crashing the response.\n    pathname = url.pathname;\n  }\n\n  // Config header sources are defined without basePath prefix. Strip basePath\n  // at a segment boundary (not a string prefix) so /app2/page with basePath\n  // /app is not incorrectly treated as /app with suffix /2/page.\n  pathname = stripBasePath(pathname, options.basePath);\n\n  applyConfigHeadersToResponse(response.headers, {\n    configHeaders: options.configHeaders,\n    pathname,\n    requestContext: options.requestContext,\n  });\n\n  return response;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA8BA,SAAgB,uBACd,UACA,SACA,SACU;AAGV,KAAI,SAAS,UAAU,OAAO,SAAS,SAAS,IAC9C,QAAO;AAGT,KAAI,CAAC,QAAQ,cAAc,OACzB,QAAO;CAGT,MAAM,MAAM,IAAI,IAAI,QAAQ,IAAI;CAChC,IAAI;AACJ,KAAI;AACF,aAAW,cAAc,+BAA+B,IAAI,SAAS,CAAC;SAChE;AAKN,aAAW,IAAI;;AAMjB,YAAW,cAAc,UAAU,QAAQ,SAAS;AAEpD,8BAA6B,SAAS,SAAS;EAC7C,eAAe,QAAQ;EACvB;EACA,gBAAgB,QAAQ;EACzB,CAAC;AAEF,QAAO"}
+{"version":3,"file":"app-rsc-response-finalizer.js","names":[],"sources":["../../src/server/app-rsc-response-finalizer.ts"],"sourcesContent":["import type { NextHeader } from \"../config/next-config.js\";\nimport type { RequestContext } from \"../config/config-matchers.js\";\nimport { VINEXT_STATIC_FILE_HEADER } from \"./headers.js\";\nimport { applyConfigHeadersToResponse } from \"./request-pipeline.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { mergeVaryHeader } from \"./middleware-response-headers.js\";\nimport { stripBasePath } from \"../utils/base-path.js\";\nimport { normalizePath } from \"./normalize-path.js\";\nimport { normalizePathnameForRouteMatch } from \"../routing/utils.js\";\n\ntype FinalizeAppRscResponseOptions = {\n  basePath: string;\n  configHeaders: NextHeader[];\n  /**\n   * Original pre-middleware request context.\n   * Next.js evaluates config header has/missing conditions against the\n   * unmodified incoming request, so callers must pass the snapshot taken\n   * before middleware runs.\n   */\n  requestContext: RequestContext;\n};\n\n/**\n * Apply App Router response finalization that must happen outside individual\n * route dispatchers.\n *\n * Called once per request in the outer handler() wrapper, after all route\n * handling, so that every response path (page, route handler, server action,\n * metadata, not-found) gets headers applied consistently.\n *\n * Skips 3xx redirect responses. Response.redirect() creates immutable\n * headers that throw on mutation, and Next.js does not apply config headers\n * to redirects regardless.\n */\nexport function finalizeAppRscResponse(\n  response: Response,\n  request: Request,\n  options: FinalizeAppRscResponseOptions,\n): Response {\n  // 3xx responses: Response.redirect() headers are immutable (throws on write),\n  // and Next.js deliberately excludes config headers from redirect responses.\n  if (response.status >= 300 && response.status < 400) {\n    return response;\n  }\n\n  if (!response.headers.has(VINEXT_STATIC_FILE_HEADER)) {\n    mergeVaryHeader(response.headers, VINEXT_RSC_VARY_HEADER);\n  }\n\n  if (!options.configHeaders.length) {\n    return response;\n  }\n\n  const url = new URL(request.url);\n  let pathname: string;\n  try {\n    pathname = normalizePath(normalizePathnameForRouteMatch(url.pathname));\n  } catch {\n    // Malformed percent-encoding. The request reached this point only because\n    // normalizePathnameForRouteMatchStrict ran earlier and returned 400 for\n    // truly-malformed paths. This catch exists as a safety net for edge cases;\n    // keep the historical raw-path fallback rather than crashing the response.\n    pathname = url.pathname;\n  }\n\n  // Config header sources are defined without basePath prefix. Strip basePath\n  // at a segment boundary (not a string prefix) so /app2/page with basePath\n  // /app is not incorrectly treated as /app with suffix /2/page.\n  pathname = stripBasePath(pathname, options.basePath);\n\n  applyConfigHeadersToResponse(response.headers, {\n    configHeaders: options.configHeaders,\n    pathname,\n    requestContext: options.requestContext,\n  });\n\n  return response;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAkCA,SAAgB,uBACd,UACA,SACA,SACU;CAGV,IAAI,SAAS,UAAU,OAAO,SAAS,SAAS,KAC9C,OAAO;CAGT,IAAI,CAAC,SAAS,QAAQ,IAAA,uBAA8B,EAClD,gBAAgB,SAAS,SAAS,uBAAuB;CAG3D,IAAI,CAAC,QAAQ,cAAc,QACzB,OAAO;CAGT,MAAM,MAAM,IAAI,IAAI,QAAQ,IAAI;CAChC,IAAI;CACJ,IAAI;EACF,WAAW,cAAc,+BAA+B,IAAI,SAAS,CAAC;SAChE;EAKN,WAAW,IAAI;;CAMjB,WAAW,cAAc,UAAU,QAAQ,SAAS;CAEpD,6BAA6B,SAAS,SAAS;EAC7C,eAAe,QAAQ;EACvB;EACA,gBAAgB,QAAQ;EACzB,CAAC;CAEF,OAAO"}

package/dist/server/app-rsc-route-matching.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-rsc-route-matching.js","names":[],"sources":["../../src/server/app-rsc-route-matching.ts"],"sourcesContent":["import { buildRouteTrie, trieMatch } from \"../routing/route-trie.js\";\nimport { matchRoutePattern, type RoutePatternParams } from \"../routing/route-pattern.js\";\nimport { normalizePathnameForRouteMatch } from \"../routing/utils.js\";\n\ntype AppRscRouteParams = RoutePatternParams;\n\ntype AppRscInterceptForMatching = {\n  targetPattern: string;\n  interceptLayouts: readonly unknown[];\n  page: unknown;\n  params: readonly string[];\n};\n\ntype AppRscSlotForMatching = {\n  intercepts?: readonly AppRscInterceptForMatching[];\n};\n\ntype AppRscRouteForMatching = {\n  patternParts: string[];\n  slots?: Record<string, AppRscSlotForMatching>;\n};\n\ntype AppRscInterceptMatch = AppRscInterceptLookupEntry & {\n  matchedParams: AppRscRouteParams;\n};\n\ntype AppRscInterceptLookupEntry = {\n  sourceRouteIndex: number;\n  slotKey: string;\n  targetPattern: string;\n  targetPatternParts: string[];\n  interceptLayouts: readonly unknown[];\n  page: unknown;\n  params: readonly string[];\n};\n\nfunction createRouteParams(): AppRscRouteParams {\n  return Object.create(null);\n}\n\nfunction appRscPathnameParts(pathname: string): string[] {\n  const pathOnly = pathname.split(\"?\")[0];\n  const normalized = pathOnly === \"/\" ? \"/\" : pathOnly.replace(/\\/$/, \"\");\n  return normalizePathnameForRouteMatch(normalized).split(\"/\").filter(Boolean);\n}\n\nexport function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(\n  routes: Route[],\n): {\n  matchRoute(url: string): { route: Route; params: AppRscRouteParams } | null;\n  findIntercept(pathname: string, sourcePathname?: string | null): AppRscInterceptMatch | null;\n} {\n  const routeTrie = buildRouteTrie(routes);\n  const interceptLookup = createInterceptLookup(routes);\n\n  return {\n    matchRoute(url) {\n      return trieMatch(routeTrie, appRscPathnameParts(url));\n    },\n    findIntercept(pathname, sourcePathname = null) {\n      const urlParts = appRscPathnameParts(pathname);\n      for (const entry of interceptLookup) {\n        const params = matchAppRscRoutePattern(urlParts, entry.targetPatternParts);\n        if (params !== null) {\n          let sourceParams = createRouteParams();\n          if (sourcePathname !== null) {\n            const sourceRoute = routes[entry.sourceRouteIndex];\n            const sourceParts = appRscPathnameParts(sourcePathname);\n            const matchedSourceParams = sourceRoute\n              ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts)\n              : null;\n            if (matchedSourceParams !== null) {\n              sourceParams = matchedSourceParams;\n            }\n          }\n          return { ...entry, matchedParams: mergeMatchedParams(sourceParams, params) };\n        }\n      }\n      return null;\n    },\n  };\n}\n\nfunction createInterceptLookup<Route extends AppRscRouteForMatching>(\n  routes: Route[],\n): AppRscInterceptLookupEntry[] {\n  const interceptLookup: AppRscInterceptLookupEntry[] = [];\n  for (let routeIndex = 0; routeIndex < routes.length; routeIndex++) {\n    const route = routes[routeIndex];\n    if (!route.slots) continue;\n    for (const [slotKey, slotModule] of Object.entries(route.slots)) {\n      if (!slotModule.intercepts) continue;\n      for (const intercept of slotModule.intercepts) {\n        interceptLookup.push({\n          sourceRouteIndex: routeIndex,\n          slotKey,\n          targetPattern: intercept.targetPattern,\n          targetPatternParts: intercept.targetPattern.split(\"/\").filter(Boolean),\n          interceptLayouts: intercept.interceptLayouts,\n          page: intercept.page,\n          params: intercept.params,\n        });\n      }\n    }\n  }\n  return interceptLookup;\n}\n\nexport function matchAppRscRoutePattern(\n  urlParts: string[],\n  patternParts: string[],\n): AppRscRouteParams | null {\n  return matchRoutePattern(urlParts, patternParts);\n}\n\nfunction mergeMatchedParams(\n  sourceParams: AppRscRouteParams,\n  targetParams: AppRscRouteParams,\n): AppRscRouteParams {\n  return Object.assign(createRouteParams(), sourceParams, targetParams);\n}\n"],"mappings":";;;;AAoCA,SAAS,oBAAuC;AAC9C,QAAO,OAAO,OAAO,KAAK;;AAG5B,SAAS,oBAAoB,UAA4B;CACvD,MAAM,WAAW,SAAS,MAAM,IAAI,CAAC;AAErC,QAAO,+BADY,aAAa,MAAM,MAAM,SAAS,QAAQ,OAAO,GAAG,CACtB,CAAC,MAAM,IAAI,CAAC,OAAO,QAAQ;;AAG9E,SAAgB,yBACd,QAIA;CACA,MAAM,YAAY,eAAe,OAAO;CACxC,MAAM,kBAAkB,sBAAsB,OAAO;AAErD,QAAO;EACL,WAAW,KAAK;AACd,UAAO,UAAU,WAAW,oBAAoB,IAAI,CAAC;;EAEvD,cAAc,UAAU,iBAAiB,MAAM;GAC7C,MAAM,WAAW,oBAAoB,SAAS;AAC9C,QAAK,MAAM,SAAS,iBAAiB;IACnC,MAAM,SAAS,wBAAwB,UAAU,MAAM,mBAAmB;AAC1E,QAAI,WAAW,MAAM;KACnB,IAAI,eAAe,mBAAmB;AACtC,SAAI,mBAAmB,MAAM;MAC3B,MAAM,cAAc,OAAO,MAAM;MACjC,MAAM,cAAc,oBAAoB,eAAe;MACvD,MAAM,sBAAsB,cACxB,wBAAwB,aAAa,YAAY,aAAa,GAC9D;AACJ,UAAI,wBAAwB,KAC1B,gBAAe;;AAGnB,YAAO;MAAE,GAAG;MAAO,eAAe,mBAAmB,cAAc,OAAO;MAAE;;;AAGhF,UAAO;;EAEV;;AAGH,SAAS,sBACP,QAC8B;CAC9B,MAAM,kBAAgD,EAAE;AACxD,MAAK,IAAI,aAAa,GAAG,aAAa,OAAO,QAAQ,cAAc;EACjE,MAAM,QAAQ,OAAO;AACrB,MAAI,CAAC,MAAM,MAAO;AAClB,OAAK,MAAM,CAAC,SAAS,eAAe,OAAO,QAAQ,MAAM,MAAM,EAAE;AAC/D,OAAI,CAAC,WAAW,WAAY;AAC5B,QAAK,MAAM,aAAa,WAAW,WACjC,iBAAgB,KAAK;IACnB,kBAAkB;IAClB;IACA,eAAe,UAAU;IACzB,oBAAoB,UAAU,cAAc,MAAM,IAAI,CAAC,OAAO,QAAQ;IACtE,kBAAkB,UAAU;IAC5B,MAAM,UAAU;IAChB,QAAQ,UAAU;IACnB,CAAC;;;AAIR,QAAO;;AAGT,SAAgB,wBACd,UACA,cAC0B;AAC1B,QAAO,kBAAkB,UAAU,aAAa;;AAGlD,SAAS,mBACP,cACA,cACmB;AACnB,QAAO,OAAO,OAAO,mBAAmB,EAAE,cAAc,aAAa"}
+{"version":3,"file":"app-rsc-route-matching.js","names":[],"sources":["../../src/server/app-rsc-route-matching.ts"],"sourcesContent":["import { buildRouteTrie, trieMatch } from \"../routing/route-trie.js\";\nimport { matchRoutePattern, type RoutePatternParams } from \"../routing/route-pattern.js\";\nimport { normalizePathnameForRouteMatch } from \"../routing/utils.js\";\n\ntype AppRscRouteParams = RoutePatternParams;\n\ntype AppRscInterceptForMatching = {\n  targetPattern: string;\n  interceptLayouts: readonly unknown[];\n  page: unknown;\n  params: readonly string[];\n};\n\ntype AppRscSlotForMatching = {\n  intercepts?: readonly AppRscInterceptForMatching[];\n};\n\ntype AppRscRouteForMatching = {\n  patternParts: string[];\n  slots?: Record<string, AppRscSlotForMatching>;\n};\n\ntype AppRscInterceptMatch = AppRscInterceptLookupEntry & {\n  matchedParams: AppRscRouteParams;\n};\n\ntype AppRscInterceptLookupEntry = {\n  sourceRouteIndex: number;\n  slotKey: string;\n  targetPattern: string;\n  targetPatternParts: string[];\n  interceptLayouts: readonly unknown[];\n  page: unknown;\n  params: readonly string[];\n};\n\nfunction createRouteParams(): AppRscRouteParams {\n  return Object.create(null);\n}\n\nfunction appRscPathnameParts(pathname: string): string[] {\n  const pathOnly = pathname.split(\"?\")[0];\n  const normalized = pathOnly === \"/\" ? \"/\" : pathOnly.replace(/\\/$/, \"\");\n  return normalizePathnameForRouteMatch(normalized).split(\"/\").filter(Boolean);\n}\n\nexport function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(\n  routes: Route[],\n): {\n  matchRoute(url: string): { route: Route; params: AppRscRouteParams } | null;\n  findIntercept(pathname: string, sourcePathname?: string | null): AppRscInterceptMatch | null;\n} {\n  const routeTrie = buildRouteTrie(routes);\n  const interceptLookup = createInterceptLookup(routes);\n\n  return {\n    matchRoute(url) {\n      return trieMatch(routeTrie, appRscPathnameParts(url));\n    },\n    findIntercept(pathname, sourcePathname = null) {\n      const urlParts = appRscPathnameParts(pathname);\n      for (const entry of interceptLookup) {\n        const params = matchAppRscRoutePattern(urlParts, entry.targetPatternParts);\n        if (params !== null) {\n          let sourceParams = createRouteParams();\n          if (sourcePathname !== null) {\n            const sourceRoute = routes[entry.sourceRouteIndex];\n            const sourceParts = appRscPathnameParts(sourcePathname);\n            const matchedSourceParams = sourceRoute\n              ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts)\n              : null;\n            if (matchedSourceParams !== null) {\n              sourceParams = matchedSourceParams;\n            }\n          }\n          return { ...entry, matchedParams: mergeMatchedParams(sourceParams, params) };\n        }\n      }\n      return null;\n    },\n  };\n}\n\nfunction createInterceptLookup<Route extends AppRscRouteForMatching>(\n  routes: Route[],\n): AppRscInterceptLookupEntry[] {\n  const interceptLookup: AppRscInterceptLookupEntry[] = [];\n  for (let routeIndex = 0; routeIndex < routes.length; routeIndex++) {\n    const route = routes[routeIndex];\n    if (!route.slots) continue;\n    for (const [slotKey, slotModule] of Object.entries(route.slots)) {\n      if (!slotModule.intercepts) continue;\n      for (const intercept of slotModule.intercepts) {\n        interceptLookup.push({\n          sourceRouteIndex: routeIndex,\n          slotKey,\n          targetPattern: intercept.targetPattern,\n          targetPatternParts: intercept.targetPattern.split(\"/\").filter(Boolean),\n          interceptLayouts: intercept.interceptLayouts,\n          page: intercept.page,\n          params: intercept.params,\n        });\n      }\n    }\n  }\n  return interceptLookup;\n}\n\nexport function matchAppRscRoutePattern(\n  urlParts: string[],\n  patternParts: string[],\n): AppRscRouteParams | null {\n  return matchRoutePattern(urlParts, patternParts);\n}\n\nfunction mergeMatchedParams(\n  sourceParams: AppRscRouteParams,\n  targetParams: AppRscRouteParams,\n): AppRscRouteParams {\n  return Object.assign(createRouteParams(), sourceParams, targetParams);\n}\n"],"mappings":";;;;AAoCA,SAAS,oBAAuC;CAC9C,OAAO,OAAO,OAAO,KAAK;;AAG5B,SAAS,oBAAoB,UAA4B;CACvD,MAAM,WAAW,SAAS,MAAM,IAAI,CAAC;CAErC,OAAO,+BADY,aAAa,MAAM,MAAM,SAAS,QAAQ,OAAO,GAAG,CACtB,CAAC,MAAM,IAAI,CAAC,OAAO,QAAQ;;AAG9E,SAAgB,yBACd,QAIA;CACA,MAAM,YAAY,eAAe,OAAO;CACxC,MAAM,kBAAkB,sBAAsB,OAAO;CAErD,OAAO;EACL,WAAW,KAAK;GACd,OAAO,UAAU,WAAW,oBAAoB,IAAI,CAAC;;EAEvD,cAAc,UAAU,iBAAiB,MAAM;GAC7C,MAAM,WAAW,oBAAoB,SAAS;GAC9C,KAAK,MAAM,SAAS,iBAAiB;IACnC,MAAM,SAAS,wBAAwB,UAAU,MAAM,mBAAmB;IAC1E,IAAI,WAAW,MAAM;KACnB,IAAI,eAAe,mBAAmB;KACtC,IAAI,mBAAmB,MAAM;MAC3B,MAAM,cAAc,OAAO,MAAM;MACjC,MAAM,cAAc,oBAAoB,eAAe;MACvD,MAAM,sBAAsB,cACxB,wBAAwB,aAAa,YAAY,aAAa,GAC9D;MACJ,IAAI,wBAAwB,MAC1B,eAAe;;KAGnB,OAAO;MAAE,GAAG;MAAO,eAAe,mBAAmB,cAAc,OAAO;MAAE;;;GAGhF,OAAO;;EAEV;;AAGH,SAAS,sBACP,QAC8B;CAC9B,MAAM,kBAAgD,EAAE;CACxD,KAAK,IAAI,aAAa,GAAG,aAAa,OAAO,QAAQ,cAAc;EACjE,MAAM,QAAQ,OAAO;EACrB,IAAI,CAAC,MAAM,OAAO;EAClB,KAAK,MAAM,CAAC,SAAS,eAAe,OAAO,QAAQ,MAAM,MAAM,EAAE;GAC/D,IAAI,CAAC,WAAW,YAAY;GAC5B,KAAK,MAAM,aAAa,WAAW,YACjC,gBAAgB,KAAK;IACnB,kBAAkB;IAClB;IACA,eAAe,UAAU;IACzB,oBAAoB,UAAU,cAAc,MAAM,IAAI,CAAC,OAAO,QAAQ;IACtE,kBAAkB,UAAU;IAC5B,MAAM,UAAU;IAChB,QAAQ,UAAU;IACnB,CAAC;;;CAIR,OAAO;;AAGT,SAAgB,wBACd,UACA,cAC0B;CAC1B,OAAO,kBAAkB,UAAU,aAAa;;AAGlD,SAAS,mBACP,cACA,cACmB;CACnB,OAAO,OAAO,OAAO,mBAAmB,EAAE,cAAc,aAAa"}

package/dist/server/app-segment-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-segment-config.js","names":[],"sources":["../../src/server/app-segment-config.ts"],"sourcesContent":["import type { FetchCacheMode } from \"vinext/shims/fetch-cache\";\n\ntype AppRouteSegmentDynamic = \"auto\" | \"error\" | \"force-dynamic\" | \"force-static\";\n\ntype AppRouteSegmentConfigModule = {\n  dynamic?: unknown;\n  dynamicParams?: unknown;\n  fetchCache?: unknown;\n  revalidate?: unknown;\n};\n\ntype EffectiveAppPageSegmentConfig = {\n  dynamicConfig?: AppRouteSegmentDynamic;\n  dynamicParamsConfig?: boolean;\n  fetchCache?: FetchCacheMode;\n  revalidateSeconds: number | null;\n};\n\ntype ResolveAppPageSegmentConfigOptions = {\n  layouts?: readonly (AppRouteSegmentConfigModule | null | undefined)[];\n  page?: AppRouteSegmentConfigModule | null;\n};\n\nconst DYNAMIC_VALUES = new Set<unknown>([\"auto\", \"error\", \"force-dynamic\", \"force-static\"]);\nconst FETCH_CACHE_VALUES = new Set<unknown>([\n  \"auto\",\n  \"default-cache\",\n  \"default-no-store\",\n  \"force-cache\",\n  \"force-no-store\",\n  \"only-cache\",\n  \"only-no-store\",\n]);\n\nfunction isRouteSegmentDynamic(value: unknown): value is AppRouteSegmentDynamic {\n  return DYNAMIC_VALUES.has(value);\n}\n\nfunction isRouteSegmentFetchCache(value: unknown): value is FetchCacheMode {\n  return FETCH_CACHE_VALUES.has(value);\n}\n\nfunction resolveRevalidateSeconds(current: number | null, value: unknown): number | null {\n  // revalidate = false means \"cache indefinitely\" in Next.js segment config.\n  // Represent it as Infinity so downstream code can distinguish \"never\n  // revalidate\" (Infinity) from \"no config / unset\" (null).\n  if (value === false) {\n    if (current === null) return Infinity;\n    // Shortest-wins: any finite interval is shorter than Infinity.\n    return current === Infinity ? Infinity : current;\n  }\n\n  if (typeof value !== \"number\") {\n    return current;\n  }\n\n  if (current === null) {\n    return value;\n  }\n\n  return value < current ? value : current;\n}\n\nfunction isCacheFetchCacheMode(value: FetchCacheMode): boolean {\n  return value === \"default-cache\" || value === \"force-cache\" || value === \"only-cache\";\n}\n\nfunction describeFetchCacheConflict(value: FetchCacheMode): string {\n  return `Route segment config has incompatible fetchCache values including \"${value}\".`;\n}\n\n/**\n * Resolve the route segment config that applies to an App page route.\n *\n * Next.js collects config from every segment in the loader tree and reduces it\n * into the effective route config. The generated vinext entry already knows\n * the concrete layout/page modules for a route, so it should only describe\n * those modules and delegate the behavior to this helper.\n */\nexport function resolveAppPageSegmentConfig(\n  options: ResolveAppPageSegmentConfigOptions,\n): EffectiveAppPageSegmentConfig {\n  const segments = [...(options.layouts ?? []), options.page];\n  // Reduction strategies differ by field:\n  // - dynamic: child segments override parents.\n  // - dynamicParams: false is sticky across the route tree.\n  // - fetchCache: force/only modes take route-level precedence and reject conflicts.\n  // - revalidate: the shortest numeric interval wins.\n  const config: EffectiveAppPageSegmentConfig = {\n    revalidateSeconds: null,\n  };\n  let hasForceCache = false;\n  let hasForceNoStore = false;\n  let hasOnlyCache = false;\n  let hasOnlyNoStore = false;\n  let hasParentDefaultNoStore = false;\n\n  for (const segment of segments) {\n    if (!segment) continue;\n\n    if (isRouteSegmentDynamic(segment.dynamic)) {\n      config.dynamicConfig = segment.dynamic;\n    }\n\n    if (segment.dynamicParams === false) {\n      config.dynamicParamsConfig = false;\n    } else if (segment.dynamicParams === true && config.dynamicParamsConfig !== false) {\n      config.dynamicParamsConfig = true;\n    }\n\n    if (isRouteSegmentFetchCache(segment.fetchCache)) {\n      const fetchCache = segment.fetchCache;\n\n      if (hasParentDefaultNoStore && (fetchCache === \"auto\" || isCacheFetchCacheMode(fetchCache))) {\n        throw new Error(describeFetchCacheConflict(fetchCache));\n      }\n\n      if (fetchCache === \"force-cache\") hasForceCache = true;\n      if (fetchCache === \"force-no-store\") hasForceNoStore = true;\n      if (fetchCache === \"only-cache\") hasOnlyCache = true;\n      if (fetchCache === \"only-no-store\") hasOnlyNoStore = true;\n\n      const hasCacheEnforcer = hasForceCache || hasOnlyCache;\n      const hasNoStoreEnforcer = hasForceNoStore || hasOnlyNoStore;\n      if (hasCacheEnforcer && hasNoStoreEnforcer) {\n        throw new Error(describeFetchCacheConflict(fetchCache));\n      }\n\n      if (fetchCache === \"default-no-store\") {\n        hasParentDefaultNoStore = true;\n      }\n\n      if (hasForceCache) {\n        config.fetchCache = \"force-cache\";\n      } else if (hasForceNoStore) {\n        config.fetchCache = \"force-no-store\";\n      } else if (hasOnlyCache) {\n        config.fetchCache = \"only-cache\";\n      } else if (hasOnlyNoStore) {\n        config.fetchCache = \"only-no-store\";\n      } else {\n        config.fetchCache = fetchCache;\n      }\n    }\n\n    config.revalidateSeconds = resolveRevalidateSeconds(\n      config.revalidateSeconds,\n      segment.revalidate,\n    );\n  }\n\n  if (config.dynamicConfig === \"force-dynamic\") {\n    config.revalidateSeconds = 0;\n  }\n\n  // Top-level dynamic modes supply fetchCache defaults unless a segment does.\n  if (config.fetchCache === undefined) {\n    if (config.dynamicConfig === \"force-dynamic\") {\n      config.fetchCache = \"force-no-store\";\n    } else if (config.dynamicConfig === \"error\") {\n      config.fetchCache = \"only-cache\";\n    }\n  }\n\n  // Static-only dynamic modes change the default, but explicit dynamicParams wins.\n  if (\n    config.dynamicParamsConfig === undefined &&\n    (config.dynamicConfig === \"error\" || config.dynamicConfig === \"force-static\")\n  ) {\n    config.dynamicParamsConfig = false;\n  }\n\n  return config;\n}\n\nexport function resolveAppPageFetchCacheMode(\n  options: ResolveAppPageSegmentConfigOptions,\n): FetchCacheMode | null {\n  return resolveAppPageSegmentConfig(options).fetchCache ?? null;\n}\n"],"mappings":";AAuBA,MAAM,iBAAiB,IAAI,IAAa;CAAC;CAAQ;CAAS;CAAiB;CAAe,CAAC;AAC3F,MAAM,qBAAqB,IAAI,IAAa;CAC1C;CACA;CACA;CACA;CACA;CACA;CACA;CACD,CAAC;AAEF,SAAS,sBAAsB,OAAiD;AAC9E,QAAO,eAAe,IAAI,MAAM;;AAGlC,SAAS,yBAAyB,OAAyC;AACzE,QAAO,mBAAmB,IAAI,MAAM;;AAGtC,SAAS,yBAAyB,SAAwB,OAA+B;AAIvF,KAAI,UAAU,OAAO;AACnB,MAAI,YAAY,KAAM,QAAO;AAE7B,SAAO,YAAY,WAAW,WAAW;;AAG3C,KAAI,OAAO,UAAU,SACnB,QAAO;AAGT,KAAI,YAAY,KACd,QAAO;AAGT,QAAO,QAAQ,UAAU,QAAQ;;AAGnC,SAAS,sBAAsB,OAAgC;AAC7D,QAAO,UAAU,mBAAmB,UAAU,iBAAiB,UAAU;;AAG3E,SAAS,2BAA2B,OAA+B;AACjE,QAAO,sEAAsE,MAAM;;;;;;;;;;AAWrF,SAAgB,4BACd,SAC+B;CAC/B,MAAM,WAAW,CAAC,GAAI,QAAQ,WAAW,EAAE,EAAG,QAAQ,KAAK;CAM3D,MAAM,SAAwC,EAC5C,mBAAmB,MACpB;CACD,IAAI,gBAAgB;CACpB,IAAI,kBAAkB;CACtB,IAAI,eAAe;CACnB,IAAI,iBAAiB;CACrB,IAAI,0BAA0B;AAE9B,MAAK,MAAM,WAAW,UAAU;AAC9B,MAAI,CAAC,QAAS;AAEd,MAAI,sBAAsB,QAAQ,QAAQ,CACxC,QAAO,gBAAgB,QAAQ;AAGjC,MAAI,QAAQ,kBAAkB,MAC5B,QAAO,sBAAsB;WACpB,QAAQ,kBAAkB,QAAQ,OAAO,wBAAwB,MAC1E,QAAO,sBAAsB;AAG/B,MAAI,yBAAyB,QAAQ,WAAW,EAAE;GAChD,MAAM,aAAa,QAAQ;AAE3B,OAAI,4BAA4B,eAAe,UAAU,sBAAsB,WAAW,EACxF,OAAM,IAAI,MAAM,2BAA2B,WAAW,CAAC;AAGzD,OAAI,eAAe,cAAe,iBAAgB;AAClD,OAAI,eAAe,iBAAkB,mBAAkB;AACvD,OAAI,eAAe,aAAc,gBAAe;AAChD,OAAI,eAAe,gBAAiB,kBAAiB;AAIrD,QAFyB,iBAAiB,kBACf,mBAAmB,gBAE5C,OAAM,IAAI,MAAM,2BAA2B,WAAW,CAAC;AAGzD,OAAI,eAAe,mBACjB,2BAA0B;AAG5B,OAAI,cACF,QAAO,aAAa;YACX,gBACT,QAAO,aAAa;YACX,aACT,QAAO,aAAa;YACX,eACT,QAAO,aAAa;OAEpB,QAAO,aAAa;;AAIxB,SAAO,oBAAoB,yBACzB,OAAO,mBACP,QAAQ,WACT;;AAGH,KAAI,OAAO,kBAAkB,gBAC3B,QAAO,oBAAoB;AAI7B,KAAI,OAAO,eAAe,KAAA;MACpB,OAAO,kBAAkB,gBAC3B,QAAO,aAAa;WACX,OAAO,kBAAkB,QAClC,QAAO,aAAa;;AAKxB,KACE,OAAO,wBAAwB,KAAA,MAC9B,OAAO,kBAAkB,WAAW,OAAO,kBAAkB,gBAE9D,QAAO,sBAAsB;AAG/B,QAAO;;AAGT,SAAgB,6BACd,SACuB;AACvB,QAAO,4BAA4B,QAAQ,CAAC,cAAc"}
+{"version":3,"file":"app-segment-config.js","names":[],"sources":["../../src/server/app-segment-config.ts"],"sourcesContent":["import type { FetchCacheMode } from \"vinext/shims/fetch-cache\";\n\ntype AppRouteSegmentDynamic = \"auto\" | \"error\" | \"force-dynamic\" | \"force-static\";\n\ntype AppRouteSegmentConfigModule = {\n  dynamic?: unknown;\n  dynamicParams?: unknown;\n  fetchCache?: unknown;\n  revalidate?: unknown;\n};\n\ntype EffectiveAppPageSegmentConfig = {\n  dynamicConfig?: AppRouteSegmentDynamic;\n  dynamicParamsConfig?: boolean;\n  fetchCache?: FetchCacheMode;\n  revalidateSeconds: number | null;\n};\n\ntype ResolveAppPageSegmentConfigOptions = {\n  layouts?: readonly (AppRouteSegmentConfigModule | null | undefined)[];\n  page?: AppRouteSegmentConfigModule | null;\n};\n\nconst DYNAMIC_VALUES = new Set<unknown>([\"auto\", \"error\", \"force-dynamic\", \"force-static\"]);\nconst FETCH_CACHE_VALUES = new Set<unknown>([\n  \"auto\",\n  \"default-cache\",\n  \"default-no-store\",\n  \"force-cache\",\n  \"force-no-store\",\n  \"only-cache\",\n  \"only-no-store\",\n]);\n\nfunction isRouteSegmentDynamic(value: unknown): value is AppRouteSegmentDynamic {\n  return DYNAMIC_VALUES.has(value);\n}\n\nfunction isRouteSegmentFetchCache(value: unknown): value is FetchCacheMode {\n  return FETCH_CACHE_VALUES.has(value);\n}\n\nfunction resolveRevalidateSeconds(current: number | null, value: unknown): number | null {\n  // revalidate = false means \"cache indefinitely\" in Next.js segment config.\n  // Represent it as Infinity so downstream code can distinguish \"never\n  // revalidate\" (Infinity) from \"no config / unset\" (null).\n  if (value === false) {\n    if (current === null) return Infinity;\n    // Shortest-wins: any finite interval is shorter than Infinity.\n    return current === Infinity ? Infinity : current;\n  }\n\n  if (typeof value !== \"number\") {\n    return current;\n  }\n\n  if (current === null) {\n    return value;\n  }\n\n  return value < current ? value : current;\n}\n\nfunction isCacheFetchCacheMode(value: FetchCacheMode): boolean {\n  return value === \"default-cache\" || value === \"force-cache\" || value === \"only-cache\";\n}\n\nfunction describeFetchCacheConflict(value: FetchCacheMode): string {\n  return `Route segment config has incompatible fetchCache values including \"${value}\".`;\n}\n\n/**\n * Resolve the route segment config that applies to an App page route.\n *\n * Next.js collects config from every segment in the loader tree and reduces it\n * into the effective route config. The generated vinext entry already knows\n * the concrete layout/page modules for a route, so it should only describe\n * those modules and delegate the behavior to this helper.\n */\nexport function resolveAppPageSegmentConfig(\n  options: ResolveAppPageSegmentConfigOptions,\n): EffectiveAppPageSegmentConfig {\n  const segments = [...(options.layouts ?? []), options.page];\n  // Reduction strategies differ by field:\n  // - dynamic: child segments override parents.\n  // - dynamicParams: false is sticky across the route tree.\n  // - fetchCache: force/only modes take route-level precedence and reject conflicts.\n  // - revalidate: the shortest numeric interval wins.\n  const config: EffectiveAppPageSegmentConfig = {\n    revalidateSeconds: null,\n  };\n  let hasForceCache = false;\n  let hasForceNoStore = false;\n  let hasOnlyCache = false;\n  let hasOnlyNoStore = false;\n  let hasParentDefaultNoStore = false;\n\n  for (const segment of segments) {\n    if (!segment) continue;\n\n    if (isRouteSegmentDynamic(segment.dynamic)) {\n      config.dynamicConfig = segment.dynamic;\n    }\n\n    if (segment.dynamicParams === false) {\n      config.dynamicParamsConfig = false;\n    } else if (segment.dynamicParams === true && config.dynamicParamsConfig !== false) {\n      config.dynamicParamsConfig = true;\n    }\n\n    if (isRouteSegmentFetchCache(segment.fetchCache)) {\n      const fetchCache = segment.fetchCache;\n\n      if (hasParentDefaultNoStore && (fetchCache === \"auto\" || isCacheFetchCacheMode(fetchCache))) {\n        throw new Error(describeFetchCacheConflict(fetchCache));\n      }\n\n      if (fetchCache === \"force-cache\") hasForceCache = true;\n      if (fetchCache === \"force-no-store\") hasForceNoStore = true;\n      if (fetchCache === \"only-cache\") hasOnlyCache = true;\n      if (fetchCache === \"only-no-store\") hasOnlyNoStore = true;\n\n      const hasCacheEnforcer = hasForceCache || hasOnlyCache;\n      const hasNoStoreEnforcer = hasForceNoStore || hasOnlyNoStore;\n      if (hasCacheEnforcer && hasNoStoreEnforcer) {\n        throw new Error(describeFetchCacheConflict(fetchCache));\n      }\n\n      if (fetchCache === \"default-no-store\") {\n        hasParentDefaultNoStore = true;\n      }\n\n      if (hasForceCache) {\n        config.fetchCache = \"force-cache\";\n      } else if (hasForceNoStore) {\n        config.fetchCache = \"force-no-store\";\n      } else if (hasOnlyCache) {\n        config.fetchCache = \"only-cache\";\n      } else if (hasOnlyNoStore) {\n        config.fetchCache = \"only-no-store\";\n      } else {\n        config.fetchCache = fetchCache;\n      }\n    }\n\n    config.revalidateSeconds = resolveRevalidateSeconds(\n      config.revalidateSeconds,\n      segment.revalidate,\n    );\n  }\n\n  if (config.dynamicConfig === \"force-dynamic\") {\n    config.revalidateSeconds = 0;\n  }\n\n  // Top-level dynamic modes supply fetchCache defaults unless a segment does.\n  if (config.fetchCache === undefined) {\n    if (config.dynamicConfig === \"force-dynamic\") {\n      config.fetchCache = \"force-no-store\";\n    } else if (config.dynamicConfig === \"error\") {\n      config.fetchCache = \"only-cache\";\n    }\n  }\n\n  // Static-only dynamic modes change the default, but explicit dynamicParams wins.\n  if (\n    config.dynamicParamsConfig === undefined &&\n    (config.dynamicConfig === \"error\" || config.dynamicConfig === \"force-static\")\n  ) {\n    config.dynamicParamsConfig = false;\n  }\n\n  return config;\n}\n\nexport function resolveAppPageFetchCacheMode(\n  options: ResolveAppPageSegmentConfigOptions,\n): FetchCacheMode | null {\n  return resolveAppPageSegmentConfig(options).fetchCache ?? null;\n}\n"],"mappings":";AAuBA,MAAM,iBAAiB,IAAI,IAAa;CAAC;CAAQ;CAAS;CAAiB;CAAe,CAAC;AAC3F,MAAM,qBAAqB,IAAI,IAAa;CAC1C;CACA;CACA;CACA;CACA;CACA;CACA;CACD,CAAC;AAEF,SAAS,sBAAsB,OAAiD;CAC9E,OAAO,eAAe,IAAI,MAAM;;AAGlC,SAAS,yBAAyB,OAAyC;CACzE,OAAO,mBAAmB,IAAI,MAAM;;AAGtC,SAAS,yBAAyB,SAAwB,OAA+B;CAIvF,IAAI,UAAU,OAAO;EACnB,IAAI,YAAY,MAAM,OAAO;EAE7B,OAAO,YAAY,WAAW,WAAW;;CAG3C,IAAI,OAAO,UAAU,UACnB,OAAO;CAGT,IAAI,YAAY,MACd,OAAO;CAGT,OAAO,QAAQ,UAAU,QAAQ;;AAGnC,SAAS,sBAAsB,OAAgC;CAC7D,OAAO,UAAU,mBAAmB,UAAU,iBAAiB,UAAU;;AAG3E,SAAS,2BAA2B,OAA+B;CACjE,OAAO,sEAAsE,MAAM;;;;;;;;;;AAWrF,SAAgB,4BACd,SAC+B;CAC/B,MAAM,WAAW,CAAC,GAAI,QAAQ,WAAW,EAAE,EAAG,QAAQ,KAAK;CAM3D,MAAM,SAAwC,EAC5C,mBAAmB,MACpB;CACD,IAAI,gBAAgB;CACpB,IAAI,kBAAkB;CACtB,IAAI,eAAe;CACnB,IAAI,iBAAiB;CACrB,IAAI,0BAA0B;CAE9B,KAAK,MAAM,WAAW,UAAU;EAC9B,IAAI,CAAC,SAAS;EAEd,IAAI,sBAAsB,QAAQ,QAAQ,EACxC,OAAO,gBAAgB,QAAQ;EAGjC,IAAI,QAAQ,kBAAkB,OAC5B,OAAO,sBAAsB;OACxB,IAAI,QAAQ,kBAAkB,QAAQ,OAAO,wBAAwB,OAC1E,OAAO,sBAAsB;EAG/B,IAAI,yBAAyB,QAAQ,WAAW,EAAE;GAChD,MAAM,aAAa,QAAQ;GAE3B,IAAI,4BAA4B,eAAe,UAAU,sBAAsB,WAAW,GACxF,MAAM,IAAI,MAAM,2BAA2B,WAAW,CAAC;GAGzD,IAAI,eAAe,eAAe,gBAAgB;GAClD,IAAI,eAAe,kBAAkB,kBAAkB;GACvD,IAAI,eAAe,cAAc,eAAe;GAChD,IAAI,eAAe,iBAAiB,iBAAiB;GAIrD,KAFyB,iBAAiB,kBACf,mBAAmB,iBAE5C,MAAM,IAAI,MAAM,2BAA2B,WAAW,CAAC;GAGzD,IAAI,eAAe,oBACjB,0BAA0B;GAG5B,IAAI,eACF,OAAO,aAAa;QACf,IAAI,iBACT,OAAO,aAAa;QACf,IAAI,cACT,OAAO,aAAa;QACf,IAAI,gBACT,OAAO,aAAa;QAEpB,OAAO,aAAa;;EAIxB,OAAO,oBAAoB,yBACzB,OAAO,mBACP,QAAQ,WACT;;CAGH,IAAI,OAAO,kBAAkB,iBAC3B,OAAO,oBAAoB;CAI7B,IAAI,OAAO,eAAe,KAAA;MACpB,OAAO,kBAAkB,iBAC3B,OAAO,aAAa;OACf,IAAI,OAAO,kBAAkB,SAClC,OAAO,aAAa;;CAKxB,IACE,OAAO,wBAAwB,KAAA,MAC9B,OAAO,kBAAkB,WAAW,OAAO,kBAAkB,iBAE9D,OAAO,sBAAsB;CAG/B,OAAO;;AAGT,SAAgB,6BACd,SACuB;CACvB,OAAO,4BAA4B,QAAQ,CAAC,cAAc"}

package/dist/server/app-server-action-execution.d.ts

@@ -1,5 +1,7 @@
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { FetchCacheMode } from "../shims/fetch-cache.js";
 import { HeadersAccessPhase } from "../shims/headers.js";
+import { ReactFormState } from "react-dom/client";
 
 //#region src/server/app-server-action-execution.d.ts
 type AppPageParams = Record<string, string | string[]>;
@@ -13,6 +15,7 @@ type AppServerActionErrorReporter = (error: Error, request: {
   routeType: "action";
 }) => void;
 type AppServerActionDecoder = (body: FormData) => Promise<unknown>;
+type AppServerActionFormStateDecoder = (actionResult: unknown, body: FormData) => Promise<ReactFormState | undefined>;
 type ReadFormDataWithLimit = (request: Request, maxBytes: number) => Promise<FormData>;
 type ReadBodyWithLimit = (request: Request, maxBytes: number) => Promise<string>;
 type AppServerActionReturnValue = {
@@ -25,6 +28,10 @@ type AppServerActionReturnValue = {
 type AppServerActionRoute = {
   pattern: string;
 };
+type ProgressiveServerActionResult = {
+  formState: ReactFormState | null;
+  kind: "form-state";
+};
 type AppServerActionMatch<TRoute extends AppServerActionRoute> = {
   params: AppPageParams;
   route: TRoute;
@@ -44,10 +51,16 @@ type BuildServerActionPageElementOptions<TRoute extends AppServerActionRoute, TI
   request: Request;
   route: TRoute;
   searchParams: URLSearchParams;
+  renderMode: AppRscRenderMode;
 };
 type AppServerActionRscModel<TElement> = {
+  /**
+   * Omitted when the action did not invalidate page data. This mirrors Next.js'
+   * empty Flight payload for non-revalidating fetch actions: the client resolves
+   * the action value without committing a visible router update.
+   */
+  root?: TElement;
   returnValue: AppServerActionReturnValue;
-  root: TElement;
 };
 type RenderServerActionRscStreamOptions<TTemporaryReferences> = {
   onError: (error: unknown) => unknown;
@@ -63,6 +76,7 @@ type HandleProgressiveServerActionRequestOptions = {
   clearRequestContext: () => void;
   contentType: string;
   decodeAction: AppServerActionDecoder;
+  decodeFormState: AppServerActionFormStateDecoder;
   getAndClearPendingCookies: () => string[];
   getDraftModeCookieHeader: () => string | null | undefined;
   maxActionBodySize: number;
@@ -115,7 +129,7 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
 declare function readActionBodyWithLimit(request: Request, maxBytes: number): Promise<string>;
 declare function readActionFormDataWithLimit(request: Request, maxBytes: number): Promise<FormData>;
 declare function isProgressiveServerActionRequest(request: Pick<Request, "method">, contentType: string, actionId: string | null): boolean;
-declare function handleProgressiveServerActionRequest(options: HandleProgressiveServerActionRequestOptions): Promise<Response | null>;
+declare function handleProgressiveServerActionRequest(options: HandleProgressiveServerActionRequestOptions): Promise<Response | ProgressiveServerActionResult | null>;
 declare function handleServerActionRscRequest<TElement, TRoute extends AppServerActionRoute, TInterceptOpts, TTemporaryReferences, TPage = unknown>(options: HandleServerActionRscRequestOptions<TElement, TRoute, TInterceptOpts, TTemporaryReferences, TPage>): Promise<Response | null>;
 //#endregion
 export { HandleProgressiveServerActionRequestOptions, HandleServerActionRscRequestOptions, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };

package/dist/server/app-server-action-execution.js

@@ -1,10 +1,13 @@
+import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER } from "./headers.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
+import { getAndClearActionRevalidationKind } from "../shims/cache.js";
+import { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI } from "./app-rsc-render-mode.js";
 import { setCurrentFetchCacheMode } from "../shims/fetch-cache.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
+import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
-import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 //#region src/server/app-server-action-execution.ts
@@ -13,6 +16,17 @@ import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 * Function.prototype.apply when decoding hostile action payloads.
 */
 const SERVER_ACTION_ARGS_LIMIT = 1e3;
+const ACTION_DID_NOT_REVALIDATE = 0;
+const ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC = 1;
+function setActionRevalidatedHeader(headers, kind) {
+	if (kind === ACTION_DID_NOT_REVALIDATE) return;
+	headers.set(ACTION_REVALIDATED_HEADER, JSON.stringify(kind));
+}
+function resolveActionRevalidationKind(hasModifiedCookies) {
+	const revalidationKind = getAndClearActionRevalidationKind();
+	if (hasModifiedCookies) return ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC;
+	return revalidationKind;
+}
 function isRequestBodyTooLarge(error) {
 	return error instanceof Error && error.message === "Request body too large";
 }
@@ -82,13 +96,16 @@ function getActionRedirect(error) {
 	if (!redirect) return null;
 	return {
 		status: redirect.status,
-		type: redirect.type,
+		type: redirect.type ?? "push",
 		url: redirect.url
 	};
 }
-function isActionHttpFallback(error) {
+function getActionHttpFallbackStatus(error) {
 	const digest = getNextErrorDigest(error);
-	return digest !== null && parseNextHttpErrorDigest(digest) !== null;
+	if (!digest) return null;
+	const httpError = parseNextHttpErrorDigest(digest);
+	if (!httpError || !Number.isInteger(httpError.status)) return null;
+	return httpError.status;
 }
 function createServerActionErrorResponse(error, options) {
 	options.getAndClearPendingCookies();
@@ -139,26 +156,35 @@ async function handleProgressiveServerActionRequest(options) {
 			return payloadResponse;
 		}
 		const action = await options.decodeAction(body);
-		if (typeof action !== "function") return null;
+		if (!isAppServerActionFunction(action)) return null;
 		let actionControlResponse = null;
+		let actionResult;
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
-			await action();
+			actionResult = await action();
 		} catch (error) {
 			actionControlResponse = getActionControlResponse(error);
 			if (!actionControlResponse) throw error;
 		} finally {
 			options.setHeadersAccessPhase(previousHeadersPhase);
 		}
-		if (!actionControlResponse) return null;
+		if (!actionControlResponse) {
+			getAndClearActionRevalidationKind();
+			return {
+				kind: "form-state",
+				formState: await options.decodeFormState(actionResult, body) ?? null
+			};
+		}
 		const actionPendingCookies = options.getAndClearPendingCookies();
 		const actionDraftCookie = options.getDraftModeCookieHeader();
+		const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
 		options.clearRequestContext();
 		const headers = new Headers();
 		if (actionControlResponse.kind === "redirect") headers.set("Location", new URL(actionControlResponse.url, options.request.url).toString());
 		mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders);
 		for (const cookie of actionPendingCookies) headers.append("Set-Cookie", cookie);
 		if (actionDraftCookie) headers.append("Set-Cookie", actionDraftCookie);
+		setActionRevalidatedHeader(headers, actionRevalidationKind);
 		return new Response(null, {
 			status: actionControlResponse.kind === "redirect" ? 303 : actionControlResponse.statusCode,
 			headers
@@ -168,6 +194,7 @@ async function handleProgressiveServerActionRequest(options) {
 			clearRequestContext: options.clearRequestContext,
 			getAndClearPendingCookies: options.getAndClearPendingCookies
 		});
+		getAndClearActionRevalidationKind();
 		options.getAndClearPendingCookies();
 		console.error("[vinext] Server action error:", error);
 		options.reportRequestError(normalizeError(error), {
@@ -225,6 +252,7 @@ async function handleServerActionRscRequest(options) {
 		const args = await options.decodeReply(body, { temporaryReferences });
 		let returnValue;
 		let actionRedirect = null;
+		let actionStatus = 200;
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
 			try {
@@ -239,16 +267,21 @@ async function handleServerActionRscRequest(options) {
 					ok: true,
 					data: void 0
 				};
-				else if (isActionHttpFallback(error)) returnValue = {
-					ok: false,
-					data: error
-				};
 				else {
-					console.error("[vinext] Server action error:", error);
-					returnValue = {
-						ok: false,
-						data: options.sanitizeErrorForClient(error)
-					};
+					const httpFallbackStatus = getActionHttpFallbackStatus(error);
+					if (httpFallbackStatus !== null) {
+						actionStatus = httpFallbackStatus;
+						returnValue = {
+							ok: false,
+							data: error
+						};
+					} else {
+						console.error("[vinext] Server action error:", error);
+						returnValue = {
+							ok: false,
+							data: options.sanitizeErrorForClient(error)
+						};
+					}
 				}
 			}
 		} finally {
@@ -257,22 +290,44 @@ async function handleServerActionRscRequest(options) {
 		if (actionRedirect) {
 			const actionPendingCookies = options.getAndClearPendingCookies();
 			const actionDraftCookie = options.getDraftModeCookieHeader();
+			const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
 			options.clearRequestContext();
 			const redirectHeaders = new Headers({
 				"Content-Type": "text/x-component; charset=utf-8",
 				Vary: VINEXT_RSC_VARY_HEADER
 			});
 			mergeMiddlewareResponseHeaders(redirectHeaders, options.middlewareHeaders);
-			redirectHeaders.set("x-action-redirect", actionRedirect.url);
-			redirectHeaders.set("x-action-redirect-type", actionRedirect.type);
-			redirectHeaders.set("x-action-redirect-status", String(actionRedirect.status));
+			redirectHeaders.set(ACTION_REDIRECT_HEADER, actionRedirect.url);
+			redirectHeaders.set(ACTION_REDIRECT_TYPE_HEADER, actionRedirect.type);
+			redirectHeaders.set(ACTION_REDIRECT_STATUS_HEADER, String(actionRedirect.status));
 			for (const cookie of actionPendingCookies) redirectHeaders.append("Set-Cookie", cookie);
 			if (actionDraftCookie) redirectHeaders.append("Set-Cookie", actionDraftCookie);
+			setActionRevalidatedHeader(redirectHeaders, actionRevalidationKind);
 			return new Response("", {
 				status: 200,
 				headers: redirectHeaders
 			});
 		}
+		const actionPendingCookies = options.getAndClearPendingCookies();
+		const actionDraftCookie = options.getDraftModeCookieHeader();
+		const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
+		if (actionRevalidationKind === ACTION_DID_NOT_REVALIDATE) {
+			const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.cleanPathname);
+			const rscStream = await options.renderToReadableStream({ returnValue }, {
+				temporaryReferences,
+				onError: onRenderError
+			});
+			options.clearRequestContext();
+			const actionHeaders = new Headers({
+				"Content-Type": "text/x-component; charset=utf-8",
+				Vary: VINEXT_RSC_VARY_HEADER
+			});
+			mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);
+			return new Response(rscStream, {
+				status: options.middlewareStatus ?? actionStatus,
+				headers: actionHeaders
+			});
+		}
 		const match = options.matchRoute(options.cleanPathname);
 		let element;
 		let errorPattern = match ? match.route.pattern : options.cleanPathname;
@@ -302,7 +357,8 @@ async function handleServerActionRscRequest(options) {
 				params: actionRerenderTarget.params,
 				request: options.request,
 				route: actionRerenderTarget.route,
-				searchParams: options.searchParams
+				searchParams: options.searchParams,
+				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI
 			});
 			errorPattern = actionRerenderTarget.route.pattern;
 		} else {
@@ -317,15 +373,14 @@ async function handleServerActionRscRequest(options) {
 			temporaryReferences,
 			onError: onRenderError
 		});
-		const actionPendingCookies = options.getAndClearPendingCookies();
-		const actionDraftCookie = options.getDraftModeCookieHeader();
 		const actionHeaders = new Headers({
 			"Content-Type": "text/x-component; charset=utf-8",
 			Vary: VINEXT_RSC_VARY_HEADER
 		});
 		mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);
+		setActionRevalidatedHeader(actionHeaders, actionRevalidationKind);
 		const actionResponse = new Response(rscStream, {
-			status: options.middlewareStatus ?? 200,
+			status: options.middlewareStatus ?? actionStatus,
 			headers: actionHeaders
 		});
 		if (actionPendingCookies.length > 0 || actionDraftCookie) {
@@ -334,6 +389,7 @@ async function handleServerActionRscRequest(options) {
 		}
 		return actionResponse;
 	} catch (error) {
+		getAndClearActionRevalidationKind();
 		return createServerActionErrorResponse(error, {
 			cleanPathname: options.cleanPathname,
 			clearRequestContext: options.clearRequestContext,

package/dist/server/app-server-action-execution.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-server-action-execution.js","names":[],"sources":["../../src/server/app-server-action-execution.ts"],"sourcesContent":["import type { HeadersAccessPhase } from \"vinext/shims/headers\";\nimport { type FetchCacheMode, setCurrentFetchCacheMode } from \"vinext/shims/fetch-cache\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { resolveAppPageActionRerenderTarget } from \"./app-page-request.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport {\n  getNextErrorDigest,\n  parseNextHttpErrorDigest,\n  parseNextRedirectDigest,\n} from \"./next-error-digest.js\";\nimport { validateCsrfOrigin, validateServerActionPayload } from \"./request-pipeline.js\";\nimport { readStreamAsTextWithLimit } from \"../utils/text-stream.js\";\nimport {\n  createServerActionNotFoundResponse,\n  getServerActionNotFoundMessage,\n  isServerActionNotFoundError,\n} from \"./server-action-not-found.js\";\nimport { internalServerErrorResponse, payloadTooLargeResponse } from \"./http-error-responses.js\";\n\ntype AppPageParams = Record<string, string | string[]>;\n\ntype AppServerActionErrorReporter = (\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  route: { routerKind: \"App Router\"; routePath: string; routeType: \"action\" },\n) => void;\n\ntype AppServerActionDecoder = (body: FormData) => Promise<unknown>;\n\ntype ReadFormDataWithLimit = (request: Request, maxBytes: number) => Promise<FormData>;\n\ntype ReadBodyWithLimit = (request: Request, maxBytes: number) => Promise<string>;\n\ntype AppServerActionFunction = (...args: unknown[]) => unknown;\n\ntype AppServerActionReturnValue =\n  | {\n      data: unknown;\n      ok: true;\n    }\n  | {\n      data: unknown;\n      ok: false;\n    };\n\ntype AppServerActionRedirect = {\n  status: number;\n  type: string;\n  url: string;\n};\n\ntype AppServerActionRoute = {\n  pattern: string;\n};\n\ntype AppServerActionMatch<TRoute extends AppServerActionRoute> = {\n  params: AppPageParams;\n  route: TRoute;\n};\n\ntype AppServerActionIntercept<TPage = unknown> = {\n  matchedParams: AppPageParams;\n  page: TPage;\n  slotKey: string;\n  sourceRouteIndex: number;\n};\n\ntype BuildServerActionPageElementOptions<TRoute extends AppServerActionRoute, TInterceptOpts> = {\n  cleanPathname: string;\n  interceptOpts: TInterceptOpts | undefined;\n  isRscRequest: boolean;\n  mountedSlotsHeader: string | null;\n  params: AppPageParams;\n  request: Request;\n  route: TRoute;\n  searchParams: URLSearchParams;\n};\n\ntype AppServerActionRscModel<TElement> = {\n  returnValue: AppServerActionReturnValue;\n  root: TElement;\n};\n\ntype RenderServerActionRscStreamOptions<TTemporaryReferences> = {\n  onError: (error: unknown) => unknown;\n  temporaryReferences: TTemporaryReferences;\n};\n\ntype DecodeServerActionReplyOptions<TTemporaryReferences> = {\n  temporaryReferences: TTemporaryReferences;\n};\n\nexport type HandleProgressiveServerActionRequestOptions = {\n  actionId: string | null;\n  allowedOrigins: string[];\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  contentType: string;\n  decodeAction: AppServerActionDecoder;\n  getAndClearPendingCookies: () => string[];\n  getDraftModeCookieHeader: () => string | null | undefined;\n  maxActionBodySize: number;\n  middlewareHeaders: Headers | null;\n  readFormDataWithLimit: ReadFormDataWithLimit;\n  reportRequestError: AppServerActionErrorReporter;\n  request: Request;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n};\n\nexport type HandleServerActionRscRequestOptions<\n  TElement,\n  TRoute extends AppServerActionRoute,\n  TInterceptOpts,\n  TTemporaryReferences,\n  TPage = unknown,\n> = {\n  actionId: string | null;\n  allowedOrigins: string[];\n  buildPageElement: (\n    options: BuildServerActionPageElementOptions<TRoute, TInterceptOpts>,\n  ) => TElement;\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  contentType: string;\n  createNotFoundElement: (routeId: string) => TElement;\n  createPayloadRouteId: (pathname: string, interceptionContext: string | null) => string;\n  createRscOnErrorHandler: (\n    request: Request,\n    pathname: string,\n    pattern: string,\n  ) => (error: unknown) => unknown;\n  createTemporaryReferenceSet: () => TTemporaryReferences;\n  decodeReply: (\n    body: string | FormData,\n    options: DecodeServerActionReplyOptions<TTemporaryReferences>,\n  ) => Promise<unknown[]> | unknown[];\n  findIntercept: (pathname: string) => AppServerActionIntercept<TPage> | null;\n  getAndClearPendingCookies: () => string[];\n  getDraftModeCookieHeader: () => string | null | undefined;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  loadServerAction: (actionId: string) => Promise<unknown>;\n  matchRoute: (pathname: string) => AppServerActionMatch<TRoute> | null;\n  maxActionBodySize: number;\n  middlewareHeaders: Headers | null;\n  middlewareStatus: number | null | undefined;\n  mountedSlotsHeader: string | null;\n  readBodyWithLimit: ReadBodyWithLimit;\n  readFormDataWithLimit: ReadFormDataWithLimit;\n  renderToReadableStream: (\n    model: AppServerActionRscModel<TElement>,\n    options: RenderServerActionRscStreamOptions<TTemporaryReferences>,\n  ) => BodyInit | null | Promise<BodyInit | null>;\n  reportRequestError: AppServerActionErrorReporter;\n  resolveRouteFetchCacheMode?: (route: TRoute) => FetchCacheMode | null;\n  request: Request;\n  sanitizeErrorForClient: (error: unknown) => unknown;\n  searchParams: URLSearchParams;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n  setNavigationContext: (context: {\n    params: AppPageParams;\n    pathname: string;\n    searchParams: URLSearchParams;\n  }) => void;\n  toInterceptOpts: (intercept: AppServerActionIntercept<TPage>) => TInterceptOpts;\n};\n\ntype ActionControlResponse =\n  | {\n      kind: \"redirect\";\n      url: string;\n    }\n  | {\n      kind: \"status\";\n      statusCode: number;\n    };\n\n/**\n * Matches Next.js' server action argument cap to prevent stack overflow in\n * Function.prototype.apply when decoding hostile action payloads.\n */\nconst SERVER_ACTION_ARGS_LIMIT = 1000;\n\nfunction isRequestBodyTooLarge(error: unknown): boolean {\n  return error instanceof Error && error.message === \"Request body too large\";\n}\n\nfunction isAppServerActionFunction(action: unknown): action is AppServerActionFunction {\n  return typeof action === \"function\";\n}\n\nfunction normalizeError(error: unknown): Error {\n  return error instanceof Error ? error : new Error(String(error));\n}\n\nfunction getServerActionFailureMessage(error: unknown): string {\n  return error instanceof Error && error.message ? error.message : String(error);\n}\n\nfunction validateServerActionArgs(args: readonly unknown[]): void {\n  if (args.length > SERVER_ACTION_ARGS_LIMIT) {\n    throw new Error(\n      `Server Action arguments list is too long (${args.length}). Maximum allowed is ${SERVER_ACTION_ARGS_LIMIT}.`,\n    );\n  }\n}\n\nexport async function readActionBodyWithLimit(request: Request, maxBytes: number): Promise<string> {\n  if (!request.body) return \"\";\n  return readStreamAsTextWithLimit(request.body, maxBytes, () => {\n    throw new Error(\"Request body too large\");\n  });\n}\n\nexport async function readActionFormDataWithLimit(\n  request: Request,\n  maxBytes: number,\n): Promise<FormData> {\n  if (!request.body) return new FormData();\n\n  const reader = request.body.getReader();\n  const chunks: Uint8Array[] = [];\n  let totalSize = 0;\n\n  for (;;) {\n    const result = await reader.read();\n    if (result.done) break;\n\n    totalSize += result.value.byteLength;\n    if (totalSize > maxBytes) {\n      await reader.cancel();\n      throw new Error(\"Request body too large\");\n    }\n    chunks.push(result.value);\n  }\n\n  const combined = new Uint8Array(totalSize);\n  let offset = 0;\n  for (const chunk of chunks) {\n    combined.set(chunk, offset);\n    offset += chunk.byteLength;\n  }\n\n  return new Response(combined, {\n    headers: { \"Content-Type\": request.headers.get(\"content-type\") || \"\" },\n  }).formData();\n}\n\nfunction getActionControlResponse(error: unknown): ActionControlResponse | null {\n  const digest = getNextErrorDigest(error);\n  if (!digest) return null;\n\n  const redirect = parseNextRedirectDigest(digest);\n  if (redirect) {\n    return {\n      kind: \"redirect\",\n      url: redirect.url,\n    };\n  }\n\n  const httpError = parseNextHttpErrorDigest(digest);\n  if (httpError) {\n    if (!Number.isInteger(httpError.status)) {\n      return null;\n    }\n\n    return {\n      kind: \"status\",\n      statusCode: httpError.status,\n    };\n  }\n\n  return null;\n}\n\nfunction getActionRedirect(error: unknown): AppServerActionRedirect | null {\n  const digest = getNextErrorDigest(error);\n  if (!digest) return null;\n\n  const redirect = parseNextRedirectDigest(digest);\n  if (!redirect) return null;\n\n  return {\n    status: redirect.status,\n    type: redirect.type,\n    url: redirect.url,\n  };\n}\n\nfunction isActionHttpFallback(error: unknown): boolean {\n  const digest = getNextErrorDigest(error);\n  return digest !== null && parseNextHttpErrorDigest(digest) !== null;\n}\n\nfunction createServerActionErrorResponse(\n  error: unknown,\n  options: {\n    cleanPathname: string;\n    clearRequestContext: () => void;\n    getAndClearPendingCookies: () => string[];\n    reportRequestError: AppServerActionErrorReporter;\n    request: Request;\n  },\n): Response {\n  options.getAndClearPendingCookies();\n  console.error(\"[vinext] Server action error:\", error);\n  options.reportRequestError(\n    normalizeError(error),\n    {\n      path: options.cleanPathname,\n      method: options.request.method,\n      headers: Object.fromEntries(options.request.headers.entries()),\n    },\n    { routerKind: \"App Router\", routePath: options.cleanPathname, routeType: \"action\" },\n  );\n  options.clearRequestContext();\n  return internalServerErrorResponse(\n    process.env.NODE_ENV === \"production\"\n      ? undefined\n      : \"Server action failed: \" + getServerActionFailureMessage(error),\n  );\n}\n\nfunction createActionNotFoundResponse(\n  actionId: string | null,\n  options: {\n    clearRequestContext: () => void;\n    getAndClearPendingCookies: () => string[];\n  },\n): Response {\n  options.getAndClearPendingCookies();\n  console.warn(getServerActionNotFoundMessage(actionId));\n  options.clearRequestContext();\n  return createServerActionNotFoundResponse();\n}\n\nexport function isProgressiveServerActionRequest(\n  request: Pick<Request, \"method\">,\n  contentType: string,\n  actionId: string | null,\n): boolean {\n  return (\n    request.method.toUpperCase() === \"POST\" &&\n    contentType.startsWith(\"multipart/form-data\") &&\n    !actionId\n  );\n}\n\nexport async function handleProgressiveServerActionRequest(\n  options: HandleProgressiveServerActionRequestOptions,\n): Promise<Response | null> {\n  if (!isProgressiveServerActionRequest(options.request, options.contentType, options.actionId)) {\n    return null;\n  }\n\n  const csrfResponse = validateCsrfOrigin(options.request, options.allowedOrigins);\n  if (csrfResponse) {\n    return csrfResponse;\n  }\n\n  const contentLength = parseInt(options.request.headers.get(\"content-length\") || \"0\", 10);\n  if (contentLength > options.maxActionBodySize) {\n    options.clearRequestContext();\n    return payloadTooLargeResponse();\n  }\n\n  try {\n    let body: FormData;\n    try {\n      // Progressive submissions can still fall through to a regular page render when\n      // the multipart body is not an action payload. Read a clone so that fallback\n      // code can still consume the original request body.\n      body = await options.readFormDataWithLimit(\n        options.request.clone(),\n        options.maxActionBodySize,\n      );\n    } catch (error) {\n      if (isRequestBodyTooLarge(error)) {\n        options.clearRequestContext();\n        return payloadTooLargeResponse();\n      }\n      throw error;\n    }\n\n    const payloadResponse = await validateServerActionPayload(body);\n    if (payloadResponse) {\n      options.clearRequestContext();\n      return payloadResponse;\n    }\n\n    const action = await options.decodeAction(body);\n    if (typeof action !== \"function\") {\n      return null;\n    }\n\n    let actionControlResponse: ActionControlResponse | null = null;\n    const previousHeadersPhase = options.setHeadersAccessPhase(\"action\");\n    try {\n      await action();\n    } catch (error) {\n      actionControlResponse = getActionControlResponse(error);\n      if (!actionControlResponse) {\n        throw error;\n      }\n    } finally {\n      options.setHeadersAccessPhase(previousHeadersPhase);\n    }\n\n    if (!actionControlResponse) {\n      // Next.js decodes form state and re-renders after a successful MPA action.\n      // vinext currently supports the redirect/error status cases; successful\n      // non-redirect actions intentionally fall through to the page render.\n      return null;\n    }\n\n    const actionPendingCookies = options.getAndClearPendingCookies();\n    const actionDraftCookie = options.getDraftModeCookieHeader();\n    options.clearRequestContext();\n\n    const headers = new Headers();\n    if (actionControlResponse.kind === \"redirect\") {\n      headers.set(\"Location\", new URL(actionControlResponse.url, options.request.url).toString());\n    }\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders);\n    for (const cookie of actionPendingCookies) {\n      headers.append(\"Set-Cookie\", cookie);\n    }\n    if (actionDraftCookie) {\n      headers.append(\"Set-Cookie\", actionDraftCookie);\n    }\n\n    return new Response(null, {\n      status: actionControlResponse.kind === \"redirect\" ? 303 : actionControlResponse.statusCode,\n      headers,\n    });\n  } catch (error) {\n    if (isServerActionNotFoundError(error, null)) {\n      return createActionNotFoundResponse(null, {\n        clearRequestContext: options.clearRequestContext,\n        getAndClearPendingCookies: options.getAndClearPendingCookies,\n      });\n    }\n\n    options.getAndClearPendingCookies();\n    // Next.js rethrows generic MPA action errors into its page render path.\n    // vinext does not yet implement that form-state render path, so unexpected\n    // action failures remain request failures here.\n    console.error(\"[vinext] Server action error:\", error);\n    options.reportRequestError(\n      normalizeError(error),\n      {\n        path: options.cleanPathname,\n        method: options.request.method,\n        headers: Object.fromEntries(options.request.headers.entries()),\n      },\n      { routerKind: \"App Router\", routePath: options.cleanPathname, routeType: \"action\" },\n    );\n    options.clearRequestContext();\n    return internalServerErrorResponse(\n      process.env.NODE_ENV === \"production\"\n        ? undefined\n        : \"Server action failed: \" + getServerActionFailureMessage(error),\n    );\n  }\n}\n\nexport async function handleServerActionRscRequest<\n  TElement,\n  TRoute extends AppServerActionRoute,\n  TInterceptOpts,\n  TTemporaryReferences,\n  TPage = unknown,\n>(\n  options: HandleServerActionRscRequestOptions<\n    TElement,\n    TRoute,\n    TInterceptOpts,\n    TTemporaryReferences,\n    TPage\n  >,\n): Promise<Response | null> {\n  if (options.request.method.toUpperCase() !== \"POST\" || !options.actionId) {\n    return null;\n  }\n\n  const csrfResponse = validateCsrfOrigin(options.request, options.allowedOrigins);\n  if (csrfResponse) return csrfResponse;\n\n  const contentLength = parseInt(options.request.headers.get(\"content-length\") || \"0\", 10);\n  if (contentLength > options.maxActionBodySize) {\n    options.clearRequestContext();\n    return payloadTooLargeResponse();\n  }\n\n  try {\n    let body: string | FormData;\n    try {\n      body = options.contentType.startsWith(\"multipart/form-data\")\n        ? await options.readFormDataWithLimit(options.request, options.maxActionBodySize)\n        : await options.readBodyWithLimit(options.request, options.maxActionBodySize);\n    } catch (error) {\n      if (isRequestBodyTooLarge(error)) {\n        options.clearRequestContext();\n        return payloadTooLargeResponse();\n      }\n      throw error;\n    }\n\n    const payloadResponse = await validateServerActionPayload(body);\n    if (payloadResponse) {\n      options.clearRequestContext();\n      return payloadResponse;\n    }\n\n    let action: unknown;\n    try {\n      action = await options.loadServerAction(options.actionId);\n    } catch (error) {\n      if (isServerActionNotFoundError(error, options.actionId)) {\n        return createActionNotFoundResponse(options.actionId, {\n          clearRequestContext: options.clearRequestContext,\n          getAndClearPendingCookies: options.getAndClearPendingCookies,\n        });\n      }\n\n      throw error;\n    }\n\n    if (!isAppServerActionFunction(action)) {\n      return createActionNotFoundResponse(options.actionId, {\n        clearRequestContext: options.clearRequestContext,\n        getAndClearPendingCookies: options.getAndClearPendingCookies,\n      });\n    }\n\n    const temporaryReferences = options.createTemporaryReferenceSet();\n    const args = await options.decodeReply(body, { temporaryReferences });\n    let returnValue: AppServerActionReturnValue;\n    let actionRedirect: AppServerActionRedirect | null = null;\n    const previousHeadersPhase = options.setHeadersAccessPhase(\"action\");\n    try {\n      try {\n        validateServerActionArgs(args);\n        const data = await action.apply(null, args);\n        returnValue = { ok: true, data };\n      } catch (error) {\n        actionRedirect = getActionRedirect(error);\n        if (actionRedirect) {\n          returnValue = { ok: true, data: undefined };\n        } else if (isActionHttpFallback(error)) {\n          returnValue = { ok: false, data: error };\n        } else {\n          console.error(\"[vinext] Server action error:\", error);\n          returnValue = { ok: false, data: options.sanitizeErrorForClient(error) };\n        }\n      }\n    } finally {\n      options.setHeadersAccessPhase(previousHeadersPhase);\n    }\n\n    if (actionRedirect) {\n      const actionPendingCookies = options.getAndClearPendingCookies();\n      const actionDraftCookie = options.getDraftModeCookieHeader();\n      options.clearRequestContext();\n      const redirectHeaders = new Headers({\n        \"Content-Type\": \"text/x-component; charset=utf-8\",\n        Vary: VINEXT_RSC_VARY_HEADER,\n      });\n      mergeMiddlewareResponseHeaders(redirectHeaders, options.middlewareHeaders);\n      redirectHeaders.set(\"x-action-redirect\", actionRedirect.url);\n      redirectHeaders.set(\"x-action-redirect-type\", actionRedirect.type);\n      redirectHeaders.set(\"x-action-redirect-status\", String(actionRedirect.status));\n      for (const cookie of actionPendingCookies) {\n        redirectHeaders.append(\"Set-Cookie\", cookie);\n      }\n      if (actionDraftCookie) redirectHeaders.append(\"Set-Cookie\", actionDraftCookie);\n      return new Response(\"\", { status: 200, headers: redirectHeaders });\n    }\n\n    const match = options.matchRoute(options.cleanPathname);\n    let element: TElement;\n    let errorPattern = match ? match.route.pattern : options.cleanPathname;\n    if (match) {\n      const { route: actionRoute, params: actionParams } = match;\n      const actionRerenderTarget = resolveAppPageActionRerenderTarget({\n        cleanPathname: options.cleanPathname,\n        currentParams: actionParams,\n        currentRoute: actionRoute,\n        findIntercept: options.findIntercept,\n        getRouteParamNames: options.getRouteParamNames,\n        getSourceRoute: options.getSourceRoute,\n        isRscRequest: options.isRscRequest,\n        toInterceptOpts: options.toInterceptOpts,\n      });\n\n      options.setNavigationContext({\n        pathname: options.cleanPathname,\n        searchParams: options.searchParams,\n        params: actionRerenderTarget.navigationParams,\n      });\n      setCurrentFetchCacheMode(\n        options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null,\n      );\n      element = options.buildPageElement({\n        cleanPathname: options.cleanPathname,\n        interceptOpts: actionRerenderTarget.interceptOpts,\n        isRscRequest: options.isRscRequest,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        params: actionRerenderTarget.params,\n        request: options.request,\n        route: actionRerenderTarget.route,\n        searchParams: options.searchParams,\n      });\n      errorPattern = actionRerenderTarget.route.pattern;\n    } else {\n      const actionRouteId = options.createPayloadRouteId(options.cleanPathname, null);\n      element = options.createNotFoundElement(actionRouteId);\n    }\n\n    const onRenderError = options.createRscOnErrorHandler(\n      options.request,\n      options.cleanPathname,\n      errorPattern,\n    );\n    const rscStream = await options.renderToReadableStream(\n      { root: element, returnValue },\n      { temporaryReferences, onError: onRenderError },\n    );\n\n    const actionPendingCookies = options.getAndClearPendingCookies();\n    const actionDraftCookie = options.getDraftModeCookieHeader();\n\n    const actionHeaders = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: VINEXT_RSC_VARY_HEADER,\n    });\n    mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);\n    const actionResponse = new Response(rscStream, {\n      status: options.middlewareStatus ?? 200,\n      headers: actionHeaders,\n    });\n    if (actionPendingCookies.length > 0 || actionDraftCookie) {\n      for (const cookie of actionPendingCookies) {\n        actionResponse.headers.append(\"Set-Cookie\", cookie);\n      }\n      if (actionDraftCookie) actionResponse.headers.append(\"Set-Cookie\", actionDraftCookie);\n    }\n    return actionResponse;\n  } catch (error) {\n    return createServerActionErrorResponse(error, {\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      getAndClearPendingCookies: options.getAndClearPendingCookies,\n      reportRequestError: options.reportRequestError,\n      request: options.request,\n    });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-server-action-execution.js","names":[],"sources":["../../src/server/app-server-action-execution.ts"],"sourcesContent":["import { getAndClearActionRevalidationKind, type ActionRevalidationKind } from \"vinext/shims/cache\";\nimport type { HeadersAccessPhase } from \"vinext/shims/headers\";\nimport { type FetchCacheMode, setCurrentFetchCacheMode } from \"vinext/shims/fetch-cache\";\nimport type { ReactFormState } from \"react-dom/client\";\nimport {\n  ACTION_REDIRECT_HEADER,\n  ACTION_REDIRECT_STATUS_HEADER,\n  ACTION_REDIRECT_TYPE_HEADER,\n  ACTION_REVALIDATED_HEADER,\n} from \"./headers.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { resolveAppPageActionRerenderTarget } from \"./app-page-request.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport {\n  APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,\n  type AppRscRenderMode,\n} from \"./app-rsc-render-mode.js\";\nimport {\n  getNextErrorDigest,\n  parseNextHttpErrorDigest,\n  parseNextRedirectDigest,\n} from \"./next-error-digest.js\";\nimport { validateCsrfOrigin, validateServerActionPayload } from \"./request-pipeline.js\";\nimport { readStreamAsTextWithLimit } from \"../utils/text-stream.js\";\nimport {\n  createServerActionNotFoundResponse,\n  getServerActionNotFoundMessage,\n  isServerActionNotFoundError,\n} from \"./server-action-not-found.js\";\nimport { internalServerErrorResponse, payloadTooLargeResponse } from \"./http-error-responses.js\";\n\ntype AppPageParams = Record<string, string | string[]>;\n\ntype AppServerActionErrorReporter = (\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  route: { routerKind: \"App Router\"; routePath: string; routeType: \"action\" },\n) => void;\n\ntype AppServerActionDecoder = (body: FormData) => Promise<unknown>;\ntype AppServerActionFormStateDecoder = (\n  actionResult: unknown,\n  body: FormData,\n) => Promise<ReactFormState | undefined>;\n\ntype ReadFormDataWithLimit = (request: Request, maxBytes: number) => Promise<FormData>;\n\ntype ReadBodyWithLimit = (request: Request, maxBytes: number) => Promise<string>;\n\ntype AppServerActionFunction = (...args: unknown[]) => unknown;\n\ntype AppServerActionReturnValue =\n  | {\n      data: unknown;\n      ok: true;\n    }\n  | {\n      data: unknown;\n      ok: false;\n    };\n\ntype AppServerActionRedirect = {\n  status: number;\n  type: string;\n  url: string;\n};\n\ntype AppServerActionRoute = {\n  pattern: string;\n};\n\ntype ProgressiveServerActionResult = {\n  formState: ReactFormState | null;\n  kind: \"form-state\";\n};\n\ntype AppServerActionMatch<TRoute extends AppServerActionRoute> = {\n  params: AppPageParams;\n  route: TRoute;\n};\n\ntype AppServerActionIntercept<TPage = unknown> = {\n  matchedParams: AppPageParams;\n  page: TPage;\n  slotKey: string;\n  sourceRouteIndex: number;\n};\n\ntype BuildServerActionPageElementOptions<TRoute extends AppServerActionRoute, TInterceptOpts> = {\n  cleanPathname: string;\n  interceptOpts: TInterceptOpts | undefined;\n  isRscRequest: boolean;\n  mountedSlotsHeader: string | null;\n  params: AppPageParams;\n  request: Request;\n  route: TRoute;\n  searchParams: URLSearchParams;\n  renderMode: AppRscRenderMode;\n};\n\ntype AppServerActionRscModel<TElement> = {\n  /**\n   * Omitted when the action did not invalidate page data. This mirrors Next.js'\n   * empty Flight payload for non-revalidating fetch actions: the client resolves\n   * the action value without committing a visible router update.\n   */\n  root?: TElement;\n  returnValue: AppServerActionReturnValue;\n};\n\ntype RenderServerActionRscStreamOptions<TTemporaryReferences> = {\n  onError: (error: unknown) => unknown;\n  temporaryReferences: TTemporaryReferences;\n};\n\ntype DecodeServerActionReplyOptions<TTemporaryReferences> = {\n  temporaryReferences: TTemporaryReferences;\n};\n\nexport type HandleProgressiveServerActionRequestOptions = {\n  actionId: string | null;\n  allowedOrigins: string[];\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  contentType: string;\n  decodeAction: AppServerActionDecoder;\n  decodeFormState: AppServerActionFormStateDecoder;\n  getAndClearPendingCookies: () => string[];\n  getDraftModeCookieHeader: () => string | null | undefined;\n  maxActionBodySize: number;\n  middlewareHeaders: Headers | null;\n  readFormDataWithLimit: ReadFormDataWithLimit;\n  reportRequestError: AppServerActionErrorReporter;\n  request: Request;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n};\n\nexport type HandleServerActionRscRequestOptions<\n  TElement,\n  TRoute extends AppServerActionRoute,\n  TInterceptOpts,\n  TTemporaryReferences,\n  TPage = unknown,\n> = {\n  actionId: string | null;\n  allowedOrigins: string[];\n  buildPageElement: (\n    options: BuildServerActionPageElementOptions<TRoute, TInterceptOpts>,\n  ) => TElement;\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  contentType: string;\n  createNotFoundElement: (routeId: string) => TElement;\n  createPayloadRouteId: (pathname: string, interceptionContext: string | null) => string;\n  createRscOnErrorHandler: (\n    request: Request,\n    pathname: string,\n    pattern: string,\n  ) => (error: unknown) => unknown;\n  createTemporaryReferenceSet: () => TTemporaryReferences;\n  decodeReply: (\n    body: string | FormData,\n    options: DecodeServerActionReplyOptions<TTemporaryReferences>,\n  ) => Promise<unknown[]> | unknown[];\n  findIntercept: (pathname: string) => AppServerActionIntercept<TPage> | null;\n  getAndClearPendingCookies: () => string[];\n  getDraftModeCookieHeader: () => string | null | undefined;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  loadServerAction: (actionId: string) => Promise<unknown>;\n  matchRoute: (pathname: string) => AppServerActionMatch<TRoute> | null;\n  maxActionBodySize: number;\n  middlewareHeaders: Headers | null;\n  middlewareStatus: number | null | undefined;\n  mountedSlotsHeader: string | null;\n  readBodyWithLimit: ReadBodyWithLimit;\n  readFormDataWithLimit: ReadFormDataWithLimit;\n  renderToReadableStream: (\n    model: AppServerActionRscModel<TElement>,\n    options: RenderServerActionRscStreamOptions<TTemporaryReferences>,\n  ) => BodyInit | null | Promise<BodyInit | null>;\n  reportRequestError: AppServerActionErrorReporter;\n  resolveRouteFetchCacheMode?: (route: TRoute) => FetchCacheMode | null;\n  request: Request;\n  sanitizeErrorForClient: (error: unknown) => unknown;\n  searchParams: URLSearchParams;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n  setNavigationContext: (context: {\n    params: AppPageParams;\n    pathname: string;\n    searchParams: URLSearchParams;\n  }) => void;\n  toInterceptOpts: (intercept: AppServerActionIntercept<TPage>) => TInterceptOpts;\n};\n\ntype ActionControlResponse =\n  | {\n      kind: \"redirect\";\n      url: string;\n    }\n  | {\n      kind: \"status\";\n      statusCode: number;\n    };\n\n/**\n * Matches Next.js' server action argument cap to prevent stack overflow in\n * Function.prototype.apply when decoding hostile action payloads.\n */\nconst SERVER_ACTION_ARGS_LIMIT = 1000;\nconst ACTION_DID_NOT_REVALIDATE = 0 satisfies ActionRevalidationKind;\nconst ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC = 1 satisfies ActionRevalidationKind;\n\nfunction setActionRevalidatedHeader(headers: Headers, kind: ActionRevalidationKind): void {\n  if (kind === ACTION_DID_NOT_REVALIDATE) return;\n  headers.set(ACTION_REVALIDATED_HEADER, JSON.stringify(kind));\n}\n\nfunction resolveActionRevalidationKind(hasModifiedCookies: boolean): ActionRevalidationKind {\n  const revalidationKind = getAndClearActionRevalidationKind();\n  // Cookie mutations are a hard override to STATIC_AND_DYNAMIC: any cookie\n  // change can invalidate downstream cached payloads regardless of what\n  // (if anything) the action explicitly revalidated, so we always emit the\n  // strongest kind. STATIC_AND_DYNAMIC is also the lowest numeric value, so\n  // this matches the max-precedence semantics in markActionRevalidation.\n  if (hasModifiedCookies) return ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC;\n  return revalidationKind;\n}\n\nfunction isRequestBodyTooLarge(error: unknown): boolean {\n  return error instanceof Error && error.message === \"Request body too large\";\n}\n\nfunction isAppServerActionFunction(action: unknown): action is AppServerActionFunction {\n  return typeof action === \"function\";\n}\n\nfunction normalizeError(error: unknown): Error {\n  return error instanceof Error ? error : new Error(String(error));\n}\n\nfunction getServerActionFailureMessage(error: unknown): string {\n  return error instanceof Error && error.message ? error.message : String(error);\n}\n\nfunction validateServerActionArgs(args: readonly unknown[]): void {\n  if (args.length > SERVER_ACTION_ARGS_LIMIT) {\n    throw new Error(\n      `Server Action arguments list is too long (${args.length}). Maximum allowed is ${SERVER_ACTION_ARGS_LIMIT}.`,\n    );\n  }\n}\n\nexport async function readActionBodyWithLimit(request: Request, maxBytes: number): Promise<string> {\n  if (!request.body) return \"\";\n  return readStreamAsTextWithLimit(request.body, maxBytes, () => {\n    throw new Error(\"Request body too large\");\n  });\n}\n\nexport async function readActionFormDataWithLimit(\n  request: Request,\n  maxBytes: number,\n): Promise<FormData> {\n  if (!request.body) return new FormData();\n\n  const reader = request.body.getReader();\n  const chunks: Uint8Array[] = [];\n  let totalSize = 0;\n\n  for (;;) {\n    const result = await reader.read();\n    if (result.done) break;\n\n    totalSize += result.value.byteLength;\n    if (totalSize > maxBytes) {\n      await reader.cancel();\n      throw new Error(\"Request body too large\");\n    }\n    chunks.push(result.value);\n  }\n\n  const combined = new Uint8Array(totalSize);\n  let offset = 0;\n  for (const chunk of chunks) {\n    combined.set(chunk, offset);\n    offset += chunk.byteLength;\n  }\n\n  return new Response(combined, {\n    headers: { \"Content-Type\": request.headers.get(\"content-type\") || \"\" },\n  }).formData();\n}\n\nfunction getActionControlResponse(error: unknown): ActionControlResponse | null {\n  const digest = getNextErrorDigest(error);\n  if (!digest) return null;\n\n  const redirect = parseNextRedirectDigest(digest);\n  if (redirect) {\n    return {\n      kind: \"redirect\",\n      url: redirect.url,\n    };\n  }\n\n  const httpError = parseNextHttpErrorDigest(digest);\n  if (httpError) {\n    if (!Number.isInteger(httpError.status)) {\n      return null;\n    }\n\n    return {\n      kind: \"status\",\n      statusCode: httpError.status,\n    };\n  }\n\n  return null;\n}\n\nfunction getActionRedirect(error: unknown): AppServerActionRedirect | null {\n  const digest = getNextErrorDigest(error);\n  if (!digest) return null;\n\n  const redirect = parseNextRedirectDigest(digest);\n  if (!redirect) return null;\n\n  return {\n    status: redirect.status,\n    type: redirect.type ?? \"push\",\n    url: redirect.url,\n  };\n}\n\nfunction getActionHttpFallbackStatus(error: unknown): number | null {\n  const digest = getNextErrorDigest(error);\n  if (!digest) return null;\n\n  const httpError = parseNextHttpErrorDigest(digest);\n  if (!httpError || !Number.isInteger(httpError.status)) return null;\n\n  return httpError.status;\n}\n\nfunction createServerActionErrorResponse(\n  error: unknown,\n  options: {\n    cleanPathname: string;\n    clearRequestContext: () => void;\n    getAndClearPendingCookies: () => string[];\n    reportRequestError: AppServerActionErrorReporter;\n    request: Request;\n  },\n): Response {\n  options.getAndClearPendingCookies();\n  console.error(\"[vinext] Server action error:\", error);\n  options.reportRequestError(\n    normalizeError(error),\n    {\n      path: options.cleanPathname,\n      method: options.request.method,\n      headers: Object.fromEntries(options.request.headers.entries()),\n    },\n    { routerKind: \"App Router\", routePath: options.cleanPathname, routeType: \"action\" },\n  );\n  options.clearRequestContext();\n  return internalServerErrorResponse(\n    process.env.NODE_ENV === \"production\"\n      ? undefined\n      : \"Server action failed: \" + getServerActionFailureMessage(error),\n  );\n}\n\nfunction createActionNotFoundResponse(\n  actionId: string | null,\n  options: {\n    clearRequestContext: () => void;\n    getAndClearPendingCookies: () => string[];\n  },\n): Response {\n  options.getAndClearPendingCookies();\n  console.warn(getServerActionNotFoundMessage(actionId));\n  options.clearRequestContext();\n  return createServerActionNotFoundResponse();\n}\n\nexport function isProgressiveServerActionRequest(\n  request: Pick<Request, \"method\">,\n  contentType: string,\n  actionId: string | null,\n): boolean {\n  return (\n    request.method.toUpperCase() === \"POST\" &&\n    contentType.startsWith(\"multipart/form-data\") &&\n    !actionId\n  );\n}\n\nexport async function handleProgressiveServerActionRequest(\n  options: HandleProgressiveServerActionRequestOptions,\n): Promise<Response | ProgressiveServerActionResult | null> {\n  if (!isProgressiveServerActionRequest(options.request, options.contentType, options.actionId)) {\n    return null;\n  }\n\n  const csrfResponse = validateCsrfOrigin(options.request, options.allowedOrigins);\n  if (csrfResponse) {\n    return csrfResponse;\n  }\n\n  const contentLength = parseInt(options.request.headers.get(\"content-length\") || \"0\", 10);\n  if (contentLength > options.maxActionBodySize) {\n    options.clearRequestContext();\n    return payloadTooLargeResponse();\n  }\n\n  try {\n    let body: FormData;\n    try {\n      // Progressive submissions can still fall through to a regular page render when\n      // the multipart body is not an action payload. Read a clone so that fallback\n      // code can still consume the original request body.\n      body = await options.readFormDataWithLimit(\n        options.request.clone(),\n        options.maxActionBodySize,\n      );\n    } catch (error) {\n      if (isRequestBodyTooLarge(error)) {\n        options.clearRequestContext();\n        return payloadTooLargeResponse();\n      }\n      throw error;\n    }\n\n    const payloadResponse = await validateServerActionPayload(body);\n    if (payloadResponse) {\n      options.clearRequestContext();\n      return payloadResponse;\n    }\n\n    const action = await options.decodeAction(body);\n    if (!isAppServerActionFunction(action)) {\n      return null;\n    }\n\n    let actionControlResponse: ActionControlResponse | null = null;\n    let actionResult: unknown;\n    const previousHeadersPhase = options.setHeadersAccessPhase(\"action\");\n    try {\n      actionResult = await action();\n    } catch (error) {\n      actionControlResponse = getActionControlResponse(error);\n      if (!actionControlResponse) {\n        throw error;\n      }\n    } finally {\n      options.setHeadersAccessPhase(previousHeadersPhase);\n    }\n\n    if (!actionControlResponse) {\n      getAndClearActionRevalidationKind();\n      const formState = await options.decodeFormState(actionResult, body);\n      return { kind: \"form-state\", formState: formState ?? null };\n    }\n\n    const actionPendingCookies = options.getAndClearPendingCookies();\n    const actionDraftCookie = options.getDraftModeCookieHeader();\n    const actionRevalidationKind = resolveActionRevalidationKind(\n      actionPendingCookies.length > 0 || Boolean(actionDraftCookie),\n    );\n    options.clearRequestContext();\n\n    const headers = new Headers();\n    if (actionControlResponse.kind === \"redirect\") {\n      headers.set(\"Location\", new URL(actionControlResponse.url, options.request.url).toString());\n    }\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders);\n    for (const cookie of actionPendingCookies) {\n      headers.append(\"Set-Cookie\", cookie);\n    }\n    if (actionDraftCookie) {\n      headers.append(\"Set-Cookie\", actionDraftCookie);\n    }\n    setActionRevalidatedHeader(headers, actionRevalidationKind);\n\n    return new Response(null, {\n      status: actionControlResponse.kind === \"redirect\" ? 303 : actionControlResponse.statusCode,\n      headers,\n    });\n  } catch (error) {\n    if (isServerActionNotFoundError(error, null)) {\n      return createActionNotFoundResponse(null, {\n        clearRequestContext: options.clearRequestContext,\n        getAndClearPendingCookies: options.getAndClearPendingCookies,\n      });\n    }\n\n    getAndClearActionRevalidationKind();\n    options.getAndClearPendingCookies();\n    // Next.js rethrows generic MPA action errors into its page render path.\n    // vinext does not yet implement that form-state render path, so unexpected\n    // action failures remain request failures here.\n    console.error(\"[vinext] Server action error:\", error);\n    options.reportRequestError(\n      normalizeError(error),\n      {\n        path: options.cleanPathname,\n        method: options.request.method,\n        headers: Object.fromEntries(options.request.headers.entries()),\n      },\n      { routerKind: \"App Router\", routePath: options.cleanPathname, routeType: \"action\" },\n    );\n    options.clearRequestContext();\n    return internalServerErrorResponse(\n      process.env.NODE_ENV === \"production\"\n        ? undefined\n        : \"Server action failed: \" + getServerActionFailureMessage(error),\n    );\n  }\n}\n\nexport async function handleServerActionRscRequest<\n  TElement,\n  TRoute extends AppServerActionRoute,\n  TInterceptOpts,\n  TTemporaryReferences,\n  TPage = unknown,\n>(\n  options: HandleServerActionRscRequestOptions<\n    TElement,\n    TRoute,\n    TInterceptOpts,\n    TTemporaryReferences,\n    TPage\n  >,\n): Promise<Response | null> {\n  if (options.request.method.toUpperCase() !== \"POST\" || !options.actionId) {\n    return null;\n  }\n\n  const csrfResponse = validateCsrfOrigin(options.request, options.allowedOrigins);\n  if (csrfResponse) return csrfResponse;\n\n  const contentLength = parseInt(options.request.headers.get(\"content-length\") || \"0\", 10);\n  if (contentLength > options.maxActionBodySize) {\n    options.clearRequestContext();\n    return payloadTooLargeResponse();\n  }\n\n  try {\n    let body: string | FormData;\n    try {\n      body = options.contentType.startsWith(\"multipart/form-data\")\n        ? await options.readFormDataWithLimit(options.request, options.maxActionBodySize)\n        : await options.readBodyWithLimit(options.request, options.maxActionBodySize);\n    } catch (error) {\n      if (isRequestBodyTooLarge(error)) {\n        options.clearRequestContext();\n        return payloadTooLargeResponse();\n      }\n      throw error;\n    }\n\n    const payloadResponse = await validateServerActionPayload(body);\n    if (payloadResponse) {\n      options.clearRequestContext();\n      return payloadResponse;\n    }\n\n    let action: unknown;\n    try {\n      action = await options.loadServerAction(options.actionId);\n    } catch (error) {\n      if (isServerActionNotFoundError(error, options.actionId)) {\n        return createActionNotFoundResponse(options.actionId, {\n          clearRequestContext: options.clearRequestContext,\n          getAndClearPendingCookies: options.getAndClearPendingCookies,\n        });\n      }\n\n      throw error;\n    }\n\n    if (!isAppServerActionFunction(action)) {\n      return createActionNotFoundResponse(options.actionId, {\n        clearRequestContext: options.clearRequestContext,\n        getAndClearPendingCookies: options.getAndClearPendingCookies,\n      });\n    }\n\n    const temporaryReferences = options.createTemporaryReferenceSet();\n    const args = await options.decodeReply(body, { temporaryReferences });\n    let returnValue: AppServerActionReturnValue;\n    let actionRedirect: AppServerActionRedirect | null = null;\n    let actionStatus = 200;\n    const previousHeadersPhase = options.setHeadersAccessPhase(\"action\");\n    try {\n      try {\n        validateServerActionArgs(args);\n        const data = await action.apply(null, args);\n        returnValue = { ok: true, data };\n      } catch (error) {\n        actionRedirect = getActionRedirect(error);\n        if (actionRedirect) {\n          returnValue = { ok: true, data: undefined };\n        } else {\n          const httpFallbackStatus = getActionHttpFallbackStatus(error);\n          if (httpFallbackStatus !== null) {\n            actionStatus = httpFallbackStatus;\n            returnValue = { ok: false, data: error };\n          } else {\n            console.error(\"[vinext] Server action error:\", error);\n            returnValue = { ok: false, data: options.sanitizeErrorForClient(error) };\n          }\n        }\n      }\n    } finally {\n      options.setHeadersAccessPhase(previousHeadersPhase);\n    }\n\n    if (actionRedirect) {\n      const actionPendingCookies = options.getAndClearPendingCookies();\n      const actionDraftCookie = options.getDraftModeCookieHeader();\n      const actionRevalidationKind = resolveActionRevalidationKind(\n        actionPendingCookies.length > 0 || Boolean(actionDraftCookie),\n      );\n      options.clearRequestContext();\n      const redirectHeaders = new Headers({\n        \"Content-Type\": \"text/x-component; charset=utf-8\",\n        Vary: VINEXT_RSC_VARY_HEADER,\n      });\n      mergeMiddlewareResponseHeaders(redirectHeaders, options.middlewareHeaders);\n      redirectHeaders.set(ACTION_REDIRECT_HEADER, actionRedirect.url);\n      redirectHeaders.set(ACTION_REDIRECT_TYPE_HEADER, actionRedirect.type);\n      redirectHeaders.set(ACTION_REDIRECT_STATUS_HEADER, String(actionRedirect.status));\n      for (const cookie of actionPendingCookies) {\n        redirectHeaders.append(\"Set-Cookie\", cookie);\n      }\n      if (actionDraftCookie) redirectHeaders.append(\"Set-Cookie\", actionDraftCookie);\n      setActionRevalidatedHeader(redirectHeaders, actionRevalidationKind);\n      return new Response(\"\", { status: 200, headers: redirectHeaders });\n    }\n\n    const actionPendingCookies = options.getAndClearPendingCookies();\n    const actionDraftCookie = options.getDraftModeCookieHeader();\n    const actionRevalidationKind = resolveActionRevalidationKind(\n      actionPendingCookies.length > 0 || Boolean(actionDraftCookie),\n    );\n\n    const shouldSkipPageRendering = actionRevalidationKind === ACTION_DID_NOT_REVALIDATE;\n    if (shouldSkipPageRendering) {\n      const onRenderError = options.createRscOnErrorHandler(\n        options.request,\n        options.cleanPathname,\n        options.cleanPathname,\n      );\n      const rscStream = await options.renderToReadableStream(\n        { returnValue },\n        { temporaryReferences, onError: onRenderError },\n      );\n\n      options.clearRequestContext();\n\n      const actionHeaders = new Headers({\n        \"Content-Type\": \"text/x-component; charset=utf-8\",\n        Vary: VINEXT_RSC_VARY_HEADER,\n      });\n      mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);\n\n      return new Response(rscStream, {\n        status: options.middlewareStatus ?? actionStatus,\n        headers: actionHeaders,\n      });\n    }\n\n    const match = options.matchRoute(options.cleanPathname);\n    let element: TElement;\n    let errorPattern = match ? match.route.pattern : options.cleanPathname;\n    if (match) {\n      const { route: actionRoute, params: actionParams } = match;\n      const actionRerenderTarget = resolveAppPageActionRerenderTarget({\n        cleanPathname: options.cleanPathname,\n        currentParams: actionParams,\n        currentRoute: actionRoute,\n        findIntercept: options.findIntercept,\n        getRouteParamNames: options.getRouteParamNames,\n        getSourceRoute: options.getSourceRoute,\n        isRscRequest: options.isRscRequest,\n        toInterceptOpts: options.toInterceptOpts,\n      });\n\n      options.setNavigationContext({\n        pathname: options.cleanPathname,\n        searchParams: options.searchParams,\n        params: actionRerenderTarget.navigationParams,\n      });\n      setCurrentFetchCacheMode(\n        options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null,\n      );\n      element = options.buildPageElement({\n        cleanPathname: options.cleanPathname,\n        interceptOpts: actionRerenderTarget.interceptOpts,\n        isRscRequest: options.isRscRequest,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        params: actionRerenderTarget.params,\n        request: options.request,\n        route: actionRerenderTarget.route,\n        searchParams: options.searchParams,\n        renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,\n      });\n      errorPattern = actionRerenderTarget.route.pattern;\n    } else {\n      const actionRouteId = options.createPayloadRouteId(options.cleanPathname, null);\n      element = options.createNotFoundElement(actionRouteId);\n    }\n\n    const onRenderError = options.createRscOnErrorHandler(\n      options.request,\n      options.cleanPathname,\n      errorPattern,\n    );\n    const rscStream = await options.renderToReadableStream(\n      { root: element, returnValue },\n      { temporaryReferences, onError: onRenderError },\n    );\n\n    const actionHeaders = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: VINEXT_RSC_VARY_HEADER,\n    });\n    mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);\n    setActionRevalidatedHeader(actionHeaders, actionRevalidationKind);\n    const actionResponse = new Response(rscStream, {\n      status: options.middlewareStatus ?? actionStatus,\n      headers: actionHeaders,\n    });\n    if (actionPendingCookies.length > 0 || actionDraftCookie) {\n      for (const cookie of actionPendingCookies) {\n        actionResponse.headers.append(\"Set-Cookie\", cookie);\n      }\n      if (actionDraftCookie) actionResponse.headers.append(\"Set-Cookie\", actionDraftCookie);\n    }\n    return actionResponse;\n  } catch (error) {\n    getAndClearActionRevalidationKind();\n    return createServerActionErrorResponse(error, {\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      getAndClearPendingCookies: options.getAndClearPendingCookies,\n      reportRequestError: options.reportRequestError,\n      request: options.request,\n    });\n  }\n}\n"],"mappings":"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"}

package/dist/server/app-ssr-entry.d.ts

@@ -1,4 +1,5 @@
 import { NavigationContext } from "../shims/navigation.js";
+import { ReactFormState } from "react-dom/client";
 
 //#region src/server/app-ssr-entry.d.ts
 type FontPreload = {
@@ -19,6 +20,11 @@ declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: Na
   capturedRscDataRef?: {
     value: Promise<ArrayBuffer> | null;
   };
+  formState?: ReactFormState | null;
+  /** When true, wait for the full React tree (including Suspense boundaries)
+   *  to resolve before returning the HTML stream. Used for static prerender
+   *  and ISR cache writes to avoid caching fallback content. */
+  waitForAllReady?: boolean;
 }): Promise<ReadableStream<Uint8Array>>;
 declare const _default: {
   fetch(request: Request): Promise<Response>;

package/dist/server/app-ssr-entry.js

@@ -7,6 +7,7 @@ import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
 import { ElementsContext, Slot } from "../shims/slot.js";
+import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { deferUntilStreamConsumed } from "./app-page-stream.js";
 import { createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
@@ -58,11 +59,14 @@ function extractModulePreloadHtml(bootstrapScriptContent, nonce) {
 	if (!match?.[1]) return "";
 	return `<link rel="modulepreload"${createNonceAttribute(nonce)} href="${escapeHtmlAttr(match[1])}" />\n`;
 }
-function buildHeadInjectionHtml(navContext, bootstrapScriptContent, insertedHTML, fontHTML, scriptNonce) {
-	return createInlineScriptTag("self.__VINEXT_RSC_PARAMS__=" + safeJsonStringify(navContext?.params ?? {}), scriptNonce) + createInlineScriptTag("self.__VINEXT_RSC_NAV__=" + safeJsonStringify({
+function buildHeadInjectionHtml(navContext, bootstrapScriptContent, formState, insertedHTML, fontHTML, scriptNonce) {
+	const paramsScript = createInlineScriptTag("self.__VINEXT_RSC_PARAMS__=" + safeJsonStringify(navContext?.params ?? {}), scriptNonce);
+	const navScript = createInlineScriptTag("self.__VINEXT_RSC_NAV__=" + safeJsonStringify({
 		pathname: navContext?.pathname ?? "/",
 		searchParams: navContext?.searchParams ? [...navContext.searchParams.entries()] : []
-	}), scriptNonce) + extractModulePreloadHtml(bootstrapScriptContent, scriptNonce) + insertedHTML + fontHTML;
+	}), scriptNonce);
+	const formStateScript = formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce);
+	return paramsScript + navScript + formStateScript + extractModulePreloadHtml(bootstrapScriptContent, scriptNonce) + insertedHTML + fontHTML;
 }
 async function handleSsr(rscStream, navContext, fontData, options) {
 	return runWithNavigationContext(async () => {
@@ -98,19 +102,21 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 			const bootstrapScriptContent = await import.meta.viteRsc.loadBootstrapScriptContent("index");
 			const htmlStream = await renderToReadableStream(ssrRoot, {
 				bootstrapScriptContent,
+				formState: options?.formState ?? null,
 				nonce: options?.scriptNonce,
 				onError(error) {
 					if (error && typeof error === "object" && "digest" in error) return String(error.digest);
 					if (process.env.NODE_ENV === "production" && error) return ssrErrorDigest(getErrorMessage(error) + (error instanceof Error ? error.stack ?? "" : ""));
 				}
 			});
+			if (options?.waitForAllReady === true) await htmlStream.allReady;
 			const fontHTML = renderFontHtml(fontData, options?.scriptNonce);
 			let didInjectHeadHTML = false;
 			const getInsertedHTML = () => {
 				const insertedHTML = renderInsertedHtml(renderServerInsertedHTML());
 				if (didInjectHeadHTML) return insertedHTML;
 				didInjectHeadHTML = true;
-				return buildHeadInjectionHtml(navContext, bootstrapScriptContent, insertedHTML, fontHTML, options?.scriptNonce);
+				return buildHeadInjectionHtml(navContext, bootstrapScriptContent, options?.formState ?? null, insertedHTML, fontHTML, options?.scriptNonce);
 			};
 			return deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML)), cleanup);
 		} catch (error) {