vinext 0.0.50 → 0.0.52

package/dist/server/app-rsc-response-finalizer.d.ts

@@ -1,10 +1,17 @@
-import { NextHeader } from "../config/next-config.js";
+import { NextHeader, NextI18nConfig } from "../config/next-config.js";
 import { RequestContext } from "../config/config-matchers.js";
 
 //#region src/server/app-rsc-response-finalizer.d.ts
 type FinalizeAppRscResponseOptions = {
   basePath: string;
   configHeaders: NextHeader[];
+  /**
+   * i18n config used to splice the default locale into unprefixed paths
+   * before config header matching, so locale-aware `has`/`missing` rules
+   * with `:locale` placeholders or `locale: false` overrides still match
+   * default-locale URLs (issue #1336, item 4).
+   */
+  i18nConfig: NextI18nConfig | null;
   /**
    * Original pre-middleware request context.
    * Next.js evaluates config header has/missing conditions against the

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

@@ -1,9 +1,10 @@
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
-import { stripBasePath } from "../utils/base-path.js";
+import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { applyConfigHeadersToResponse } from "./request-pipeline.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
+import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
 //#region src/server/app-rsc-response-finalizer.ts
 /**
@@ -29,11 +30,17 @@ function finalizeAppRscResponse(response, request, options) {
 	} catch {
 		pathname = url.pathname;
 	}
+	const hadBasePath = !options.basePath || hasBasePath(pathname, options.basePath);
 	pathname = stripBasePath(pathname, options.basePath);
+	const matchPathname = options.i18nConfig ? normalizeDefaultLocalePathname(pathname, options.i18nConfig, { hostname: url.hostname }) : pathname;
 	applyConfigHeadersToResponse(response.headers, {
 		configHeaders: options.configHeaders,
-		pathname,
-		requestContext: options.requestContext
+		pathname: matchPathname,
+		requestContext: options.requestContext,
+		basePathState: {
+			basePath: options.basePath,
+			hadBasePath
+		}
 	});
 	return response;
 }

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 { 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"}
+{"version":3,"file":"app-rsc-response-finalizer.js","names":[],"sources":["../../src/server/app-rsc-response-finalizer.ts"],"sourcesContent":["import type { NextHeader, NextI18nConfig } 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 { hasBasePath, stripBasePath } from \"../utils/base-path.js\";\nimport { normalizePath } from \"./normalize-path.js\";\nimport { normalizePathnameForRouteMatch } from \"../routing/utils.js\";\nimport { normalizeDefaultLocalePathname } from \"./pages-i18n.js\";\n\ntype FinalizeAppRscResponseOptions = {\n  basePath: string;\n  configHeaders: NextHeader[];\n  /**\n   * i18n config used to splice the default locale into unprefixed paths\n   * before config header matching, so locale-aware `has`/`missing` rules\n   * with `:locale` placeholders or `locale: false` overrides still match\n   * default-locale URLs (issue #1336, item 4).\n   */\n  i18nConfig: NextI18nConfig | null;\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  const hadBasePath = !options.basePath || hasBasePath(pathname, options.basePath);\n  pathname = stripBasePath(pathname, options.basePath);\n\n  // Default-locale path normalisation (issue #1336, item 4). Splice in the\n  // (domain-aware) default locale on unprefixed paths so locale-aware\n  // `has`/`missing` rules with `:locale` placeholders or `locale: false`\n  // overrides still match default-locale URLs. Mirrors the call sites in\n  // `prod-server.ts`, `deploy.ts`, and `app-rsc-handler.ts`.\n  const matchPathname = options.i18nConfig\n    ? normalizeDefaultLocalePathname(pathname, options.i18nConfig, { hostname: url.hostname })\n    : pathname;\n\n  applyConfigHeadersToResponse(response.headers, {\n    configHeaders: options.configHeaders,\n    pathname: matchPathname,\n    requestContext: options.requestContext,\n    basePathState: { basePath: options.basePath, hadBasePath },\n  });\n\n  return response;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA0CA,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,MAAM,cAAc,CAAC,QAAQ,YAAY,YAAY,UAAU,QAAQ,SAAS;CAChF,WAAW,cAAc,UAAU,QAAQ,SAAS;CAOpD,MAAM,gBAAgB,QAAQ,aAC1B,+BAA+B,UAAU,QAAQ,YAAY,EAAE,UAAU,IAAI,UAAU,CAAC,GACxF;CAEJ,6BAA6B,SAAS,SAAS;EAC7C,eAAe,QAAQ;EACvB,UAAU;EACV,gBAAgB,QAAQ;EACxB,eAAe;GAAE,UAAU,QAAQ;GAAU;GAAa;EAC3D,CAAC;CAEF,OAAO"}

package/dist/server/app-rsc-route-matching.d.ts

@@ -4,11 +4,31 @@ import { RoutePatternParams } from "../routing/route-pattern.js";
 type AppRscRouteParams = RoutePatternParams;
 type AppRscInterceptForMatching = {
   targetPattern: string;
+  /**
+   * URL pattern of the *intercepting route* (the path that owns the slot,
+   * with route groups and `@slot` segments stripped). Mirrors Next.js'
+   * `interceptingRoute` from `extractInterceptionRouteInformation`.
+   *
+   * Next.js implements interception as a rewrite that fires only when the
+   * `Next-URL` header matches `^<sourceMatchPattern>(?:/.*)?$`. vinext's
+   * matcher enforces the same constraint at `findIntercept`: an intercept
+   * whose `targetPattern` matches the request URL is only valid when the
+   * provided source pathname (X-Vinext-Interception-Context / Next-URL)
+   * matches this pattern, with descendants allowed.
+   *
+   * Optional for backwards compat: when absent or empty, the matcher falls
+   * back to the legacy behavior of matching by target alone (still gated on
+   * a non-null source pathname).
+   *
+   * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/generate-interception-routes-rewrites.ts
+   */
+  sourceMatchPattern?: string;
   interceptLayouts: readonly unknown[];
   page: unknown;
   params: readonly string[];
 };
 type AppRscSlotForMatching = {
+  id?: string | null;
   intercepts?: readonly AppRscInterceptForMatching[];
 };
 type AppRscRouteForMatching = {
@@ -23,9 +43,12 @@ type AppRscInterceptLookupEntry = {
   slotKey: string;
   targetPattern: string;
   targetPatternParts: string[];
+  sourceMatchPattern: string | null;
+  sourceMatchPatternParts: string[] | null;
   interceptLayouts: readonly unknown[];
   page: unknown;
   params: readonly string[];
+  slotId: string | null;
 };
 declare function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(routes: Route[]): {
   matchRoute(url: string): {

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

@@ -1,13 +1,13 @@
-import { normalizePathnameForRouteMatch } from "../routing/utils.js";
+import { splitPathnameForRouteMatch } from "../routing/utils.js";
 import { buildRouteTrie, trieMatch } from "../routing/route-trie.js";
-import { matchRoutePattern } from "../routing/route-pattern.js";
+import { matchRoutePattern, matchRoutePatternPrefix } from "../routing/route-pattern.js";
 //#region src/server/app-rsc-route-matching.ts
 function createRouteParams() {
 	return Object.create(null);
 }
 function appRscPathnameParts(pathname) {
 	const pathOnly = pathname.split("?")[0];
-	return normalizePathnameForRouteMatch(pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "")).split("/").filter(Boolean);
+	return splitPathnameForRouteMatch(pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, ""));
 }
 function createAppRscRouteMatcher(routes) {
 	const routeTrie = buildRouteTrie(routes);
@@ -17,27 +17,42 @@ function createAppRscRouteMatcher(routes) {
 			return trieMatch(routeTrie, appRscPathnameParts(url));
 		},
 		findIntercept(pathname, sourcePathname = null) {
+			if (sourcePathname === null) return null;
 			const urlParts = appRscPathnameParts(pathname);
+			const sourceParts = appRscPathnameParts(sourcePathname);
 			for (const entry of interceptLookup) {
+				if (!matchInterceptSource(sourceParts, entry)) continue;
 				const params = matchAppRscRoutePattern(urlParts, entry.targetPatternParts);
-				if (params !== null) {
-					let sourceParams = createRouteParams();
-					if (sourcePathname !== null) {
-						const sourceRoute = routes[entry.sourceRouteIndex];
-						const sourceParts = appRscPathnameParts(sourcePathname);
-						const matchedSourceParams = sourceRoute ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts) : null;
-						if (matchedSourceParams !== null) sourceParams = matchedSourceParams;
-					}
-					return {
-						...entry,
-						matchedParams: mergeMatchedParams(sourceParams, params)
-					};
-				}
+				if (params === null) continue;
+				const sourceRoute = routes[entry.sourceRouteIndex];
+				const matchedSourceParams = sourceRoute ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts) : null;
+				if (matchedSourceParams === null && entry.sourceMatchPatternParts === null) continue;
+				const sourceParams = matchedSourceParams ?? createRouteParams();
+				return {
+					...entry,
+					matchedParams: mergeMatchedParams(sourceParams, params)
+				};
 			}
 			return null;
 		}
 	};
 }
+/**
+* Check whether the request's source pathname (Next-URL / interception
+* context) satisfies the intercept entry's intercepting-route pattern, with
+* descendants allowed. Mirrors the header regex shape Next.js emits for the
+* generated interception rewrite: `^<pattern>(?:/.*)?$`.
+*
+* When the entry has no declared `sourceMatchPatternParts`, fall back to the
+* legacy behavior of accepting any source (we still require the source to be
+* non-null at the caller — see `findIntercept`).
+*/
+function matchInterceptSource(sourceParts, entry) {
+	const patternParts = entry.sourceMatchPatternParts;
+	if (!patternParts) return true;
+	if (patternParts.length === 0) return true;
+	return matchRoutePatternPrefix(sourceParts, patternParts);
+}
 function createInterceptLookup(routes) {
 	const interceptLookup = [];
 	for (let routeIndex = 0; routeIndex < routes.length; routeIndex++) {
@@ -45,15 +60,22 @@ function createInterceptLookup(routes) {
 		if (!route.slots) continue;
 		for (const [slotKey, slotModule] of Object.entries(route.slots)) {
 			if (!slotModule.intercepts) continue;
-			for (const intercept of slotModule.intercepts) interceptLookup.push({
-				sourceRouteIndex: routeIndex,
-				slotKey,
-				targetPattern: intercept.targetPattern,
-				targetPatternParts: intercept.targetPattern.split("/").filter(Boolean),
-				interceptLayouts: intercept.interceptLayouts,
-				page: intercept.page,
-				params: intercept.params
-			});
+			for (const intercept of slotModule.intercepts) {
+				const sourceMatchPattern = intercept.sourceMatchPattern ?? null;
+				const sourceMatchPatternParts = sourceMatchPattern ? sourceMatchPattern.split("/").filter(Boolean) : null;
+				interceptLookup.push({
+					sourceRouteIndex: routeIndex,
+					slotKey,
+					slotId: typeof slotModule.id === "string" ? slotModule.id : null,
+					targetPattern: intercept.targetPattern,
+					targetPatternParts: intercept.targetPattern.split("/").filter(Boolean),
+					sourceMatchPattern,
+					sourceMatchPatternParts,
+					interceptLayouts: intercept.interceptLayouts,
+					page: intercept.page,
+					params: intercept.params
+				});
+			}
 		}
 	}
 	return interceptLookup;

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;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"}
+{"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 {\n  matchRoutePattern,\n  matchRoutePatternPrefix,\n  type RoutePatternParams,\n} from \"../routing/route-pattern.js\";\nimport { splitPathnameForRouteMatch } from \"../routing/utils.js\";\n\ntype AppRscRouteParams = RoutePatternParams;\n\ntype AppRscInterceptForMatching = {\n  targetPattern: string;\n  /**\n   * URL pattern of the *intercepting route* (the path that owns the slot,\n   * with route groups and `@slot` segments stripped). Mirrors Next.js'\n   * `interceptingRoute` from `extractInterceptionRouteInformation`.\n   *\n   * Next.js implements interception as a rewrite that fires only when the\n   * `Next-URL` header matches `^<sourceMatchPattern>(?:/.*)?$`. vinext's\n   * matcher enforces the same constraint at `findIntercept`: an intercept\n   * whose `targetPattern` matches the request URL is only valid when the\n   * provided source pathname (X-Vinext-Interception-Context / Next-URL)\n   * matches this pattern, with descendants allowed.\n   *\n   * Optional for backwards compat: when absent or empty, the matcher falls\n   * back to the legacy behavior of matching by target alone (still gated on\n   * a non-null source pathname).\n   *\n   * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/generate-interception-routes-rewrites.ts\n   */\n  sourceMatchPattern?: string;\n  interceptLayouts: readonly unknown[];\n  page: unknown;\n  params: readonly string[];\n};\n\ntype AppRscSlotForMatching = {\n  id?: string | null;\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  sourceMatchPattern: string | null;\n  sourceMatchPatternParts: string[] | null;\n  interceptLayouts: readonly unknown[];\n  page: unknown;\n  params: readonly string[];\n  slotId: string | null;\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 splitPathnameForRouteMatch(normalized);\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      // Mirror Next.js' rewrite semantics: interception only fires when the\n      // Next-URL header is present AND matches the intercepting route's regex\n      // (with descendants allowed). Without a source pathname there is no\n      // header for the rewrite to gate on, so we render the direct route.\n      // https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/generate-interception-routes-rewrites.ts\n      if (sourcePathname === null) return null;\n\n      const urlParts = appRscPathnameParts(pathname);\n      const sourceParts = appRscPathnameParts(sourcePathname);\n\n      for (const entry of interceptLookup) {\n        // Primary gate: when the intercept declares a `sourceMatchPattern`\n        // (the intercepting route's path, descendants allowed), require the\n        // request's source pathname to satisfy it. This mirrors Next.js'\n        // `^<interceptingRoute>(?:/.*)?$` header regex precisely and is the\n        // authoritative gate when the manifest carries the pattern.\n        if (!matchInterceptSource(sourceParts, entry)) continue;\n\n        const params = matchAppRscRoutePattern(urlParts, entry.targetPatternParts);\n        if (params === null) continue;\n\n        const sourceRoute = routes[entry.sourceRouteIndex];\n        const matchedSourceParams = sourceRoute\n          ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts)\n          : null;\n\n        // Secondary gate (from #1249): when the entry has no\n        // `sourceMatchPatternParts` declared (older manifest shapes), reject\n        // sources that don't match the slot owner's route pattern exactly.\n        // This is the safety net that keeps unrelated sources from pulling\n        // in a modal they have no slot for. When `sourceMatchPatternParts`\n        // *is* declared, `matchInterceptSource` above has already approved\n        // the source (including descendants), so a stricter exact-match\n        // check on the slot-owner route here would defeat the descendant\n        // semantics — fall back to empty params instead.\n        if (matchedSourceParams === null && entry.sourceMatchPatternParts === null) {\n          continue;\n        }\n        const sourceParams = matchedSourceParams ?? createRouteParams();\n        return { ...entry, matchedParams: mergeMatchedParams(sourceParams, params) };\n      }\n      return null;\n    },\n  };\n}\n\n/**\n * Check whether the request's source pathname (Next-URL / interception\n * context) satisfies the intercept entry's intercepting-route pattern, with\n * descendants allowed. Mirrors the header regex shape Next.js emits for the\n * generated interception rewrite: `^<pattern>(?:/.*)?$`.\n *\n * When the entry has no declared `sourceMatchPatternParts`, fall back to the\n * legacy behavior of accepting any source (we still require the source to be\n * non-null at the caller — see `findIntercept`).\n */\nfunction matchInterceptSource(sourceParts: string[], entry: AppRscInterceptLookupEntry): boolean {\n  const patternParts = entry.sourceMatchPatternParts;\n  if (!patternParts) return true;\n  // Root pattern (`/`) matches any source.\n  if (patternParts.length === 0) return true;\n  return matchRoutePatternPrefix(sourceParts, patternParts);\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        const sourceMatchPattern = intercept.sourceMatchPattern ?? null;\n        const sourceMatchPatternParts = sourceMatchPattern\n          ? sourceMatchPattern.split(\"/\").filter(Boolean)\n          : null;\n        interceptLookup.push({\n          sourceRouteIndex: routeIndex,\n          slotKey,\n          slotId: typeof slotModule.id === \"string\" ? slotModule.id : null,\n          targetPattern: intercept.targetPattern,\n          targetPatternParts: intercept.targetPattern.split(\"/\").filter(Boolean),\n          sourceMatchPattern,\n          sourceMatchPatternParts,\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":";;;;AA+DA,SAAS,oBAAuC;CAC9C,OAAO,OAAO,OAAO,KAAK;;AAG5B,SAAS,oBAAoB,UAA4B;CACvD,MAAM,WAAW,SAAS,MAAM,IAAI,CAAC;CAErC,OAAO,2BADY,aAAa,MAAM,MAAM,SAAS,QAAQ,OAAO,GAAG,CAC1B;;AAG/C,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;GAM7C,IAAI,mBAAmB,MAAM,OAAO;GAEpC,MAAM,WAAW,oBAAoB,SAAS;GAC9C,MAAM,cAAc,oBAAoB,eAAe;GAEvD,KAAK,MAAM,SAAS,iBAAiB;IAMnC,IAAI,CAAC,qBAAqB,aAAa,MAAM,EAAE;IAE/C,MAAM,SAAS,wBAAwB,UAAU,MAAM,mBAAmB;IAC1E,IAAI,WAAW,MAAM;IAErB,MAAM,cAAc,OAAO,MAAM;IACjC,MAAM,sBAAsB,cACxB,wBAAwB,aAAa,YAAY,aAAa,GAC9D;IAWJ,IAAI,wBAAwB,QAAQ,MAAM,4BAA4B,MACpE;IAEF,MAAM,eAAe,uBAAuB,mBAAmB;IAC/D,OAAO;KAAE,GAAG;KAAO,eAAe,mBAAmB,cAAc,OAAO;KAAE;;GAE9E,OAAO;;EAEV;;;;;;;;;;;;AAaH,SAAS,qBAAqB,aAAuB,OAA4C;CAC/F,MAAM,eAAe,MAAM;CAC3B,IAAI,CAAC,cAAc,OAAO;CAE1B,IAAI,aAAa,WAAW,GAAG,OAAO;CACtC,OAAO,wBAAwB,aAAa,aAAa;;AAG3D,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,YAAY;IAC7C,MAAM,qBAAqB,UAAU,sBAAsB;IAC3D,MAAM,0BAA0B,qBAC5B,mBAAmB,MAAM,IAAI,CAAC,OAAO,QAAQ,GAC7C;IACJ,gBAAgB,KAAK;KACnB,kBAAkB;KAClB;KACA,QAAQ,OAAO,WAAW,OAAO,WAAW,WAAW,KAAK;KAC5D,eAAe,UAAU;KACzB,oBAAoB,UAAU,cAAc,MAAM,IAAI,CAAC,OAAO,QAAQ;KACtE;KACA;KACA,kBAAkB,UAAU;KAC5B,MAAM,UAAU;KAChB,QAAQ,UAAU;KACnB,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-server-action-execution.d.ts

@@ -31,6 +31,11 @@ type AppServerActionRoute = {
 type ProgressiveServerActionResult = {
   formState: ReactFormState | null;
   kind: "form-state";
+} | {
+  actionError: unknown;
+  actionFailed: true;
+  formState: null;
+  kind: "form-state";
 };
 type AppServerActionMatch<TRoute extends AppServerActionRoute> = {
   params: AppPageParams;
@@ -39,6 +44,7 @@ type AppServerActionMatch<TRoute extends AppServerActionRoute> = {
 type AppServerActionIntercept<TPage = unknown> = {
   matchedParams: AppPageParams;
   page: TPage;
+  slotId?: string | null;
   slotKey: string;
   sourceRouteIndex: number;
 };
@@ -71,7 +77,8 @@ type DecodeServerActionReplyOptions<TTemporaryReferences> = {
 };
 type HandleProgressiveServerActionRequestOptions = {
   actionId: string | null;
-  allowedOrigins: string[];
+  allowedOrigins: string[]; /** Configured next.config `basePath`. Prefixed onto progressive Location targets. */
+  basePath?: string;
   cleanPathname: string;
   clearRequestContext: () => void;
   contentType: string;
@@ -88,7 +95,8 @@ type HandleProgressiveServerActionRequestOptions = {
 };
 type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActionRoute, TInterceptOpts, TTemporaryReferences, TPage = unknown> = {
   actionId: string | null;
-  allowedOrigins: string[];
+  allowedOrigins: string[]; /** Configured next.config `basePath`. Prefixed onto ACTION_REDIRECT_HEADER targets. */
+  basePath?: string;
   buildPageElement: (options: BuildServerActionPageElementOptions<TRoute, TInterceptOpts>) => TElement;
   cleanPathname: string;
   clearRequestContext: () => void;
@@ -128,9 +136,33 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
 };
 declare function readActionBodyWithLimit(request: Request, maxBytes: number): Promise<string>;
 declare function readActionFormDataWithLimit(request: Request, maxBytes: number): Promise<FormData>;
+/**
+ * Prepend the configured next.config `basePath` to a server-action redirect
+ * target before it goes on the wire.
+ *
+ * `redirect("/foo")` called from a server action mounted at `/base/...` must
+ * land the browser at `/base/foo`, mirroring how Next.js threads basePath
+ * through `addPathPrefix(getURLFromRedirectError(err), basePath)` in
+ * `app-render.tsx` for SSR redirects and in `action-handler.ts` for action
+ * redirects.
+ *
+ * Idempotent and external-aware:
+ *  - Empty basePath → returned unchanged.
+ *  - External URLs (`http://`, `https://`, `data:`, protocol-relative `//`)
+ *    are returned unchanged because the framework does not own those routes.
+ *  - Targets that already start with the configured basePath are returned
+ *    unchanged so this helper can be applied at any layer without risk of
+ *    double-prefixing (`/base/base/foo`).
+ *
+ * Exported for tests. Used by both the progressive (no-JS form POST) and
+ * RSC (`ACTION_REDIRECT_HEADER`) action redirect paths below.
+ *
+ * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/action-handler.ts
+ */
+declare function applyActionRedirectBasePath(url: string, basePath: string): string;
 declare function isProgressiveServerActionRequest(request: Pick<Request, "method">, contentType: string, actionId: string | null): boolean;
 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 };
+export { HandleProgressiveServerActionRequestOptions, HandleServerActionRscRequestOptions, applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };
 //# sourceMappingURL=app-server-action-execution.d.ts.map

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

@@ -1,14 +1,16 @@
+import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
 import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER } from "./headers.js";
+import { isExternalUrl } from "../config/config-matchers.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 { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
+import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 //#region src/server/app-server-action-execution.ts
 /**
@@ -71,24 +73,6 @@ async function readActionFormDataWithLimit(request, maxBytes) {
 	}
 	return new Response(combined, { headers: { "Content-Type": request.headers.get("content-type") || "" } }).formData();
 }
-function getActionControlResponse(error) {
-	const digest = getNextErrorDigest(error);
-	if (!digest) return null;
-	const redirect = parseNextRedirectDigest(digest);
-	if (redirect) return {
-		kind: "redirect",
-		url: redirect.url
-	};
-	const httpError = parseNextHttpErrorDigest(digest);
-	if (httpError) {
-		if (!Number.isInteger(httpError.status)) return null;
-		return {
-			kind: "status",
-			statusCode: httpError.status
-		};
-	}
-	return null;
-}
 function getActionRedirect(error) {
 	const digest = getNextErrorDigest(error);
 	if (!digest) return null;
@@ -100,6 +84,41 @@ function getActionRedirect(error) {
 		url: redirect.url
 	};
 }
+/**
+* Prepend the configured next.config `basePath` to a server-action redirect
+* target before it goes on the wire.
+*
+* `redirect("/foo")` called from a server action mounted at `/base/...` must
+* land the browser at `/base/foo`, mirroring how Next.js threads basePath
+* through `addPathPrefix(getURLFromRedirectError(err), basePath)` in
+* `app-render.tsx` for SSR redirects and in `action-handler.ts` for action
+* redirects.
+*
+* Idempotent and external-aware:
+*  - Empty basePath → returned unchanged.
+*  - External URLs (`http://`, `https://`, `data:`, protocol-relative `//`)
+*    are returned unchanged because the framework does not own those routes.
+*  - Targets that already start with the configured basePath are returned
+*    unchanged so this helper can be applied at any layer without risk of
+*    double-prefixing (`/base/base/foo`).
+*
+* Exported for tests. Used by both the progressive (no-JS form POST) and
+* RSC (`ACTION_REDIRECT_HEADER`) action redirect paths below.
+*
+* @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/action-handler.ts
+*/
+function applyActionRedirectBasePath(url, basePath) {
+	if (!basePath) return url;
+	if (isExternalUrl(url)) return url;
+	if (hasBasePath(url, basePath)) return url;
+	if (!url.startsWith("/")) return url;
+	const queryIndex = url.indexOf("?");
+	const hashIndex = url.indexOf("#");
+	const splitAt = queryIndex === -1 ? hashIndex : hashIndex === -1 ? queryIndex : Math.min(queryIndex, hashIndex);
+	const pathname = splitAt === -1 ? url : url.slice(0, splitAt);
+	const suffix = splitAt === -1 ? "" : url.slice(splitAt);
+	return `${addBasePathToPathname(pathname, basePath)}${suffix}`;
+}
 function getActionHttpFallbackStatus(error) {
 	const digest = getNextErrorDigest(error);
 	if (!digest) return null;
@@ -133,6 +152,10 @@ function isProgressiveServerActionRequest(request, contentType, actionId) {
 }
 async function handleProgressiveServerActionRequest(options) {
 	if (!isProgressiveServerActionRequest(options.request, options.contentType, options.actionId)) return null;
+	if (options.request.headers.get("x-action-forwarded")) return createActionNotFoundResponse(null, {
+		clearRequestContext: options.clearRequestContext,
+		getAndClearPendingCookies: options.getAndClearPendingCookies
+	});
 	const csrfResponse = validateCsrfOrigin(options.request, options.allowedOrigins);
 	if (csrfResponse) return csrfResponse;
 	if (parseInt(options.request.headers.get("content-length") || "0", 10) > options.maxActionBodySize) {
@@ -157,19 +180,42 @@ async function handleProgressiveServerActionRequest(options) {
 		}
 		const action = await options.decodeAction(body);
 		if (!isAppServerActionFunction(action)) return null;
-		let actionControlResponse = null;
+		let actionRedirect = null;
+		let actionError = void 0;
+		let actionFailed = false;
 		let actionResult;
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
 			actionResult = await action();
 		} catch (error) {
-			actionControlResponse = getActionControlResponse(error);
-			if (!actionControlResponse) throw error;
+			actionRedirect = getActionRedirect(error);
+			if (!actionRedirect) {
+				actionError = error;
+				actionFailed = true;
+				if (!(getActionHttpFallbackStatus(error) !== null || isServerActionNotFoundError(error, null))) {
+					console.error("[vinext] Server action error:", error);
+					options.reportRequestError(normalizeError(error), {
+						path: options.cleanPathname,
+						method: options.request.method,
+						headers: Object.fromEntries(options.request.headers.entries())
+					}, {
+						routerKind: "App Router",
+						routePath: options.cleanPathname,
+						routeType: "action"
+					});
+				}
+			}
 		} finally {
 			options.setHeadersAccessPhase(previousHeadersPhase);
 		}
-		if (!actionControlResponse) {
+		if (!actionRedirect) {
 			getAndClearActionRevalidationKind();
+			if (actionFailed) return {
+				kind: "form-state",
+				formState: null,
+				actionError,
+				actionFailed
+			};
 			return {
 				kind: "form-state",
 				formState: await options.decodeFormState(actionResult, body) ?? null
@@ -180,13 +226,14 @@ async function handleProgressiveServerActionRequest(options) {
 		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());
+		const prefixedRedirectUrl = applyActionRedirectBasePath(actionRedirect.url, options.basePath ?? "");
+		headers.set("Location", new URL(prefixedRedirectUrl, 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,
+			status: 303,
 			headers
 		});
 	} catch (error) {
@@ -196,7 +243,7 @@ async function handleProgressiveServerActionRequest(options) {
 		});
 		getAndClearActionRevalidationKind();
 		options.getAndClearPendingCookies();
-		console.error("[vinext] Server action error:", error);
+		console.error("[vinext] Server action payload parsing error:", error);
 		options.reportRequestError(normalizeError(error), {
 			path: options.cleanPathname,
 			method: options.request.method,
@@ -207,11 +254,15 @@ async function handleProgressiveServerActionRequest(options) {
 			routeType: "action"
 		});
 		options.clearRequestContext();
-		return internalServerErrorResponse(process.env.NODE_ENV === "production" ? void 0 : "Server action failed: " + getServerActionFailureMessage(error));
+		return internalServerErrorResponse(process.env.NODE_ENV === "production" ? void 0 : "Server action parsing failed: " + getServerActionFailureMessage(error));
 	}
 }
 async function handleServerActionRscRequest(options) {
 	if (options.request.method.toUpperCase() !== "POST" || !options.actionId) return null;
+	if (options.request.headers.get("x-action-forwarded")) return createActionNotFoundResponse(options.actionId, {
+		clearRequestContext: options.clearRequestContext,
+		getAndClearPendingCookies: options.getAndClearPendingCookies
+	});
 	const csrfResponse = validateCsrfOrigin(options.request, options.allowedOrigins);
 	if (csrfResponse) return csrfResponse;
 	if (parseInt(options.request.headers.get("content-length") || "0", 10) > options.maxActionBodySize) {
@@ -293,11 +344,12 @@ async function handleServerActionRscRequest(options) {
 			const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
 			options.clearRequestContext();
 			const redirectHeaders = new Headers({
-				"Content-Type": "text/x-component; charset=utf-8",
+				"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 				Vary: VINEXT_RSC_VARY_HEADER
 			});
 			mergeMiddlewareResponseHeaders(redirectHeaders, options.middlewareHeaders);
-			redirectHeaders.set(ACTION_REDIRECT_HEADER, actionRedirect.url);
+			applyRscCompatibilityIdHeader(redirectHeaders);
+			redirectHeaders.set(ACTION_REDIRECT_HEADER, applyActionRedirectBasePath(actionRedirect.url, options.basePath ?? ""));
 			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);
@@ -319,10 +371,11 @@ async function handleServerActionRscRequest(options) {
 			});
 			options.clearRequestContext();
 			const actionHeaders = new Headers({
-				"Content-Type": "text/x-component; charset=utf-8",
+				"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 				Vary: VINEXT_RSC_VARY_HEADER
 			});
 			mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);
+			applyRscCompatibilityIdHeader(actionHeaders);
 			return new Response(rscStream, {
 				status: options.middlewareStatus ?? actionStatus,
 				headers: actionHeaders
@@ -374,10 +427,11 @@ async function handleServerActionRscRequest(options) {
 			onError: onRenderError
 		});
 		const actionHeaders = new Headers({
-			"Content-Type": "text/x-component; charset=utf-8",
+			"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 			Vary: VINEXT_RSC_VARY_HEADER
 		});
 		mergeMiddlewareResponseHeaders(actionHeaders, options.middlewareHeaders);
+		applyRscCompatibilityIdHeader(actionHeaders);
 		setActionRevalidatedHeader(actionHeaders, actionRevalidationKind);
 		const actionResponse = new Response(rscStream, {
 			status: options.middlewareStatus ?? actionStatus,
@@ -400,6 +454,6 @@ async function handleServerActionRscRequest(options) {
 	}
 }
 //#endregion
-export { handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };
+export { applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };
 
 //# sourceMappingURL=app-server-action-execution.js.map