@rangojs/router 0.0.0-experimental.19 → 0.0.0-experimental.1db96a9e

package/dist/vite/index.js

@@ -1,6 +1,6 @@
 // src/vite/rango.ts
 import { readFileSync as readFileSync7 } from "node:fs";
-import { resolve as resolve7 } from "node:path";
+import { resolve as resolve9 } from "node:path";
 
 // src/vite/plugins/expose-action-id.ts
 import MagicString from "magic-string";
@@ -292,7 +292,7 @@ function exposeActionId() {
       }
       if (!rscPluginApi) {
         throw new Error(
-          "[rsc-router] Could not find @vitejs/plugin-rsc. @rangojs/router requires the Vite RSC plugin.\nThe RSC plugin should be included automatically. If you disabled it with\nrango({ rsc: false }), add rsc() before rango() in your config."
+          "[rsc-router] Could not find @vitejs/plugin-rsc. @rangojs/router requires the Vite RSC plugin, which is included automatically by rango()."
         );
       }
       if (!isBuild) return;
@@ -910,9 +910,7 @@ function generateWholeFileStubs(cfg, bindings, code, filePath, isBuild) {
   });
   return { code: stubs.join("\n") + "\n", map: null };
 }
-function generateExprStubs(cfg, bindings, code, filePath, sourceId, isBuild) {
-  if (bindings.length === 0) return null;
-  const s = new MagicString2(code);
+function stubHandlerExprs(cfg, bindings, s, filePath, isBuild) {
   let hasChanges = false;
   for (const binding of bindings) {
     const exportName = binding.exportNames[0];
@@ -924,15 +922,7 @@ function generateExprStubs(cfg, bindings, code, filePath, sourceId, isBuild) {
     );
     hasChanges = true;
   }
-  if (!hasChanges) return null;
-  return {
-    code: s.toString(),
-    map: s.generateMap({
-      source: sourceId,
-      includeContent: true,
-      hires: "boundary"
-    })
-  };
+  return hasChanges;
 }
 function transformHandlerIds(cfg, bindings, s, filePath, isBuild) {
   let hasChanges = false;
@@ -1269,15 +1259,6 @@ ${lazyImports.join(",\n")}
           isBuild
         );
         if (wholeFile) return wholeFile;
-        const exprStubs = generateExprStubs(
-          PRERENDER_CONFIG,
-          bindings,
-          code,
-          filePath,
-          id,
-          isBuild
-        );
-        if (exprStubs) return exprStubs;
       }
       if (hasPrerenderHandlerCode && isRscEnv && isBuild) {
         const fnNames = getFnNames(PRERENDER_CONFIG.fnName);
@@ -1329,15 +1310,57 @@ ${lazyImports.join(",\n")}
           isBuild
         );
         if (wholeFile) return wholeFile;
-        const exprStubs = generateExprStubs(
-          STATIC_CONFIG,
-          bindings,
-          code,
-          filePath,
-          id,
-          isBuild
-        );
-        if (exprStubs) return exprStubs;
+      }
+      if (!isRscEnv && (hasPrerenderHandlerCode || hasStaticHandlerCode)) {
+        const allBindings = [];
+        if (hasLoaderCode) {
+          allBindings.push(...getBindings(code, getFnNames("createLoader")));
+        }
+        if (hasHandleCode) {
+          allBindings.push(...getBindings(code, getFnNames("createHandle")));
+        }
+        if (hasLocationStateCode) {
+          allBindings.push(
+            ...getBindings(code, getFnNames("createLocationState"))
+          );
+        }
+        if (hasPrerenderHandlerCode) {
+          allBindings.push(
+            ...getBindings(code, getFnNames(PRERENDER_CONFIG.fnName))
+          );
+        }
+        if (hasStaticHandlerCode) {
+          allBindings.push(
+            ...getBindings(code, getFnNames(STATIC_CONFIG.fnName))
+          );
+        }
+        if (allBindings.length > 0 && isExportOnlyFile(code, allBindings)) {
+          const stubs = [];
+          for (const binding of allBindings) {
+            const name = binding.exportNames[0];
+            const stubId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
+            const fnCall = code.slice(
+              binding.callExprStart,
+              binding.callOpenParenPos + 1
+            );
+            let brand = "loader";
+            if (hasPrerenderHandlerCode && getFnNames(PRERENDER_CONFIG.fnName).some(
+              (n) => fnCall.includes(n)
+            )) {
+              brand = PRERENDER_CONFIG.brand;
+            } else if (hasStaticHandlerCode && getFnNames(STATIC_CONFIG.fnName).some((n) => fnCall.includes(n))) {
+              brand = STATIC_CONFIG.brand;
+            } else if (hasHandleCode && getFnNames("createHandle").some((n) => fnCall.includes(n))) {
+              brand = "handle";
+            } else if (hasLocationStateCode && getFnNames("createLocationState").some((n) => fnCall.includes(n))) {
+              brand = "locationState";
+            }
+            stubs.push(
+              `export const ${name} = { __brand: "${brand}", $$id: "${stubId}" };`
+            );
+          }
+          return { code: stubs.join("\n") + "\n", map: null };
+        }
       }
       if (hasStaticHandlerCode && isRscEnv && isBuild) {
         const fnNames = getFnNames(STATIC_CONFIG.fnName);
@@ -1372,25 +1395,41 @@ ${lazyImports.join(",\n")}
           isBuild
         ) || changed;
       }
-      if (hasPrerenderHandlerCode && isRscEnv) {
+      if (hasPrerenderHandlerCode) {
         const fnNames = getFnNames(PRERENDER_CONFIG.fnName);
-        changed = transformHandlerIds(
-          PRERENDER_CONFIG,
-          getBindings(code, fnNames),
-          s,
-          filePath,
-          isBuild
-        ) || changed;
+        const bindings = getBindings(code, fnNames);
+        if (isRscEnv) {
+          changed = transformHandlerIds(
+            PRERENDER_CONFIG,
+            bindings,
+            s,
+            filePath,
+            isBuild
+          ) || changed;
+        } else {
+          changed = stubHandlerExprs(
+            PRERENDER_CONFIG,
+            bindings,
+            s,
+            filePath,
+            isBuild
+          ) || changed;
+        }
       }
-      if (hasStaticHandlerCode && isRscEnv) {
+      if (hasStaticHandlerCode) {
         const fnNames = getFnNames(STATIC_CONFIG.fnName);
-        changed = transformHandlerIds(
-          STATIC_CONFIG,
-          getBindings(code, fnNames),
-          s,
-          filePath,
-          isBuild
-        ) || changed;
+        const bindings = getBindings(code, fnNames);
+        if (isRscEnv) {
+          changed = transformHandlerIds(
+            STATIC_CONFIG,
+            bindings,
+            s,
+            filePath,
+            isBuild
+          ) || changed;
+        } else {
+          changed = stubHandlerExprs(STATIC_CONFIG, bindings, s, filePath, isBuild) || changed;
+        }
       }
       if (!changed) return;
       return {
@@ -1585,6 +1624,53 @@ function warnOnNearMissDirectives(ast, fileId, warn) {
   }
 }
 
+// src/vite/plugins/client-ref-dedup.ts
+var CLIENT_IN_SERVER_PROXY_PREFIX = "virtual:vite-rsc/client-in-server-package-proxy/";
+function extractPackageName(absolutePath) {
+  const marker = "/node_modules/";
+  const idx = absolutePath.lastIndexOf(marker);
+  if (idx === -1) return null;
+  const afterModules = absolutePath.slice(idx + marker.length);
+  if (afterModules.startsWith("@")) {
+    const parts = afterModules.split("/");
+    if (parts.length < 2 || !parts[1]) return null;
+    return `${parts[0]}/${parts[1]}`;
+  }
+  const name = afterModules.split("/")[0];
+  return name || null;
+}
+function clientRefDedup() {
+  let clientExclude = [];
+  return {
+    name: "@rangojs/router:client-ref-dedup",
+    enforce: "pre",
+    apply: "serve",
+    configResolved(config) {
+      const clientEnv = config.environments?.["client"];
+      clientExclude = clientEnv?.optimizeDeps?.exclude ?? config.optimizeDeps?.exclude ?? [];
+    },
+    resolveId(source, importer, options) {
+      if (this.environment?.name !== "client") return;
+      if (!importer?.includes(CLIENT_IN_SERVER_PROXY_PREFIX)) return;
+      if (!source.includes("/node_modules/")) return;
+      if (!importer) return;
+      const packageName = extractPackageName(source);
+      if (!packageName) return;
+      if (clientExclude.includes(packageName)) return;
+      return `\0rango:dedup/${packageName}`;
+    },
+    load(id) {
+      if (!id.startsWith("\0rango:dedup/")) return;
+      const packageName = id.slice("\0rango:dedup/".length);
+      return [
+        `export * from ${JSON.stringify(packageName)};`,
+        `import * as __all__ from ${JSON.stringify(packageName)};`,
+        `export default __all__.default;`
+      ].join("\n");
+    }
+  };
+}
+
 // src/vite/plugins/virtual-entries.ts
 var VIRTUAL_ENTRY_BROWSER = `
 import {
@@ -1698,7 +1784,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.19",
+  version: "0.0.0-experimental.1db96a9e",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -1729,7 +1815,7 @@ var package_default = {
     "!src/**/*.test.tsx",
     "dist",
     "skills",
-    "CLAUDE.md",
+    "AGENTS.md",
     "README.md"
   ],
   type: "module",
@@ -1840,7 +1926,7 @@ var package_default = {
     "test:unit:watch": "vitest"
   },
   dependencies: {
-    "@vitejs/plugin-rsc": "^0.5.14",
+    "@vitejs/plugin-rsc": "^0.5.19",
     "magic-string": "^0.30.17",
     picomatch: "^4.0.3",
     "rsc-html-stream": "^0.0.7"
@@ -2048,55 +2134,7 @@ declare global {
 }
 
 // src/build/route-types/scan-filter.ts
-import { join, relative } from "node:path";
-import { readdirSync } from "node:fs";
 import picomatch from "picomatch";
-var DEFAULT_EXCLUDE_PATTERNS = [
-  "**/__tests__/**",
-  "**/__mocks__/**",
-  "**/dist/**",
-  "**/coverage/**",
-  "**/*.test.{ts,tsx,js,jsx}",
-  "**/*.spec.{ts,tsx,js,jsx}"
-];
-function createScanFilter(root, opts) {
-  const { include, exclude } = opts;
-  const hasInclude = include && include.length > 0;
-  const hasCustomExclude = exclude !== void 0;
-  if (!hasInclude && !hasCustomExclude) return void 0;
-  const effectiveExclude = exclude ?? DEFAULT_EXCLUDE_PATTERNS;
-  const includeMatcher = hasInclude ? picomatch(include) : null;
-  const excludeMatcher = effectiveExclude.length > 0 ? picomatch(effectiveExclude) : null;
-  return (absolutePath) => {
-    const rel = relative(root, absolutePath);
-    if (excludeMatcher && excludeMatcher(rel)) return false;
-    if (includeMatcher) return includeMatcher(rel);
-    return true;
-  };
-}
-function findTsFiles(dir, filter) {
-  const results = [];
-  let entries;
-  try {
-    entries = readdirSync(dir, { withFileTypes: true });
-  } catch (err) {
-    console.warn(
-      `[rsc-router] Failed to scan directory ${dir}: ${err.message}`
-    );
-    return results;
-  }
-  for (const entry of entries) {
-    const fullPath = join(dir, entry.name);
-    if (entry.isDirectory()) {
-      if (entry.name === "node_modules" || entry.name.startsWith(".")) continue;
-      results.push(...findTsFiles(fullPath, filter));
-    } else if ((entry.name.endsWith(".ts") || entry.name.endsWith(".tsx") || entry.name.endsWith(".js") || entry.name.endsWith(".jsx")) && !entry.name.includes(".gen.")) {
-      if (filter && !filter(fullPath)) continue;
-      results.push(fullPath);
-    }
-  }
-  return results;
-}
 
 // src/build/route-types/per-module-writer.ts
 import ts4 from "typescript";
@@ -2318,7 +2356,7 @@ function buildRouteMapFromBlock(block, fullSource, filePath, visited, searchSche
   }
   return routeMap;
 }
-function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagnosticsOut) {
+function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagnosticsOut, inlineBlock) {
   visited = visited ?? /* @__PURE__ */ new Set();
   const realPath = resolve2(filePath);
   const key = variableName ? `${realPath}:${variableName}` : realPath;
@@ -2334,7 +2372,9 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
     return { routes: {}, searchSchemas: {} };
   }
   let block;
-  if (variableName) {
+  if (inlineBlock) {
+    block = inlineBlock;
+  } else if (variableName) {
     const extracted = extractUrlsBlockForVariable(source, variableName);
     if (!extracted) return { routes: {}, searchSchemas: {} };
     block = extracted;
@@ -2355,8 +2395,20 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
 }
 
 // src/build/route-types/router-processing.ts
-import { readFileSync as readFileSync2, writeFileSync, existsSync as existsSync3, unlinkSync } from "node:fs";
-import { join as join2, dirname as dirname2, resolve as resolve3, basename as pathBasename } from "node:path";
+import {
+  readFileSync as readFileSync2,
+  writeFileSync,
+  existsSync as existsSync3,
+  unlinkSync,
+  readdirSync
+} from "node:fs";
+import {
+  join,
+  dirname as dirname2,
+  resolve as resolve3,
+  sep,
+  basename as pathBasename
+} from "node:path";
 import ts5 from "typescript";
 function countPublicRouteEntries(source) {
   const matches = source.matchAll(/^\s+(?:"([^"]+)"|([a-zA-Z_$][^:]*)):\s*["{]/gm) ?? [];
@@ -2369,7 +2421,79 @@ function countPublicRouteEntries(source) {
   }
   return count;
 }
-function extractUrlsVariableFromRouter(code) {
+var ROUTER_CALL_PATTERN = /\bcreateRouter\s*[<(]/;
+function isRoutableSourceFile(name) {
+  return (name.endsWith(".ts") || name.endsWith(".tsx") || name.endsWith(".js") || name.endsWith(".jsx")) && !name.includes(".gen.") && !name.includes(".test.") && !name.includes(".spec.");
+}
+function findRouterFilesRecursive(dir, filter, results) {
+  let entries;
+  try {
+    entries = readdirSync(dir, { withFileTypes: true });
+  } catch (err) {
+    console.warn(
+      `[rsc-router] Failed to scan directory ${dir}: ${err.message}`
+    );
+    return;
+  }
+  const childDirs = [];
+  const routerFilesInDir = [];
+  for (const entry of entries) {
+    const fullPath = join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name === "node_modules" || entry.name === "dist" || entry.name === "coverage" || entry.name === "__tests__" || entry.name === "__mocks__" || entry.name.startsWith("."))
+        continue;
+      childDirs.push(fullPath);
+      continue;
+    }
+    if (!isRoutableSourceFile(entry.name)) continue;
+    if (filter && !filter(fullPath)) continue;
+    try {
+      const source = readFileSync2(fullPath, "utf-8");
+      if (ROUTER_CALL_PATTERN.test(source)) {
+        routerFilesInDir.push(fullPath);
+      }
+    } catch {
+      continue;
+    }
+  }
+  if (routerFilesInDir.length > 0) {
+    results.push(...routerFilesInDir);
+    return;
+  }
+  for (const childDir of childDirs) {
+    findRouterFilesRecursive(childDir, filter, results);
+  }
+}
+function findNestedRouterConflict(routerFiles) {
+  const routerDirs = [
+    ...new Set(routerFiles.map((filePath) => dirname2(resolve3(filePath))))
+  ].sort((a, b) => a.length - b.length);
+  for (let i = 0; i < routerDirs.length; i++) {
+    const ancestorDir = routerDirs[i];
+    const prefix = ancestorDir.endsWith(sep) ? ancestorDir : `${ancestorDir}${sep}`;
+    for (let j = i + 1; j < routerDirs.length; j++) {
+      const nestedDir = routerDirs[j];
+      if (!nestedDir.startsWith(prefix)) continue;
+      const ancestorFile = routerFiles.find(
+        (filePath) => dirname2(resolve3(filePath)) === ancestorDir
+      );
+      const nestedFile = routerFiles.find(
+        (filePath) => dirname2(resolve3(filePath)) === nestedDir
+      );
+      if (ancestorFile && nestedFile) {
+        return { ancestor: ancestorFile, nested: nestedFile };
+      }
+    }
+  }
+  return null;
+}
+function formatNestedRouterConflictError(conflict, prefix = "[rsc-router]") {
+  return `${prefix} Nested router roots are not supported.
+Router root: ${conflict.ancestor}
+Nested router: ${conflict.nested}
+Move the nested router into a sibling directory or configure it as a separate app root.`;
+}
+function extractUrlsFromRouter(code) {
   const sourceFile = ts5.createSourceFile(
     "router.tsx",
     code,
@@ -2383,24 +2507,70 @@ function extractUrlsVariableFromRouter(code) {
     const callee = node.expression;
     return ts5.isIdentifier(callee) && callee.text === "createRouter";
   }
+  function isInlineBuilder(node) {
+    return ts5.isArrowFunction(node) || ts5.isFunctionExpression(node);
+  }
+  function isRoutesOnCreateRouter(node) {
+    if (!ts5.isPropertyAccessExpression(node.expression) || node.expression.name.text !== "routes")
+      return false;
+    let inner = node.expression.expression;
+    while (ts5.isCallExpression(inner) && ts5.isPropertyAccessExpression(inner.expression)) {
+      inner = inner.expression.expression;
+    }
+    return isCreateRouterCall(inner);
+  }
   function visit(node) {
     if (result) return;
-    if (ts5.isCallExpression(node) && ts5.isPropertyAccessExpression(node.expression) && node.expression.name.text === "routes" && node.arguments.length >= 1 && ts5.isIdentifier(node.arguments[0])) {
-      let inner = node.expression.expression;
-      while (ts5.isCallExpression(inner) && ts5.isPropertyAccessExpression(inner.expression)) {
-        inner = inner.expression.expression;
-      }
-      if (isCreateRouterCall(inner)) {
-        result = node.arguments[0].text;
-        return;
+    if (ts5.isCallExpression(node) && node.arguments.length >= 1 && isRoutesOnCreateRouter(node)) {
+      const arg = node.arguments[0];
+      if (ts5.isIdentifier(arg)) {
+        result = { kind: "variable", name: arg.text };
+      } else if (isInlineBuilder(arg)) {
+        result = { kind: "inline", block: arg.getText(sourceFile) };
       }
+      return;
     }
     if (isCreateRouterCall(node)) {
       const callExpr = node;
-      for (const arg of callExpr.arguments) {
+      for (const callArg of callExpr.arguments) {
+        if (ts5.isObjectLiteralExpression(callArg)) {
+          for (const prop of callArg.properties) {
+            if (ts5.isPropertyAssignment(prop) && ts5.isIdentifier(prop.name) && prop.name.text === "urls") {
+              if (ts5.isIdentifier(prop.initializer)) {
+                result = { kind: "variable", name: prop.initializer.text };
+              } else if (isInlineBuilder(prop.initializer)) {
+                result = {
+                  kind: "inline",
+                  block: prop.initializer.getText(sourceFile)
+                };
+              }
+              return;
+            }
+          }
+        }
+      }
+    }
+    ts5.forEachChild(node, visit);
+  }
+  visit(sourceFile);
+  return result;
+}
+function extractBasenameFromRouter(code) {
+  const sourceFile = ts5.createSourceFile(
+    "router.tsx",
+    code,
+    ts5.ScriptTarget.Latest,
+    true,
+    ts5.ScriptKind.TSX
+  );
+  let result;
+  function visit(node) {
+    if (result !== void 0) return;
+    if (ts5.isCallExpression(node) && ts5.isIdentifier(node.expression) && node.expression.text === "createRouter") {
+      for (const arg of node.arguments) {
         if (ts5.isObjectLiteralExpression(arg)) {
           for (const prop of arg.properties) {
-            if (ts5.isPropertyAssignment(prop) && ts5.isIdentifier(prop.name) && prop.name.text === "urls" && ts5.isIdentifier(prop.initializer)) {
+            if (ts5.isPropertyAssignment(prop) && ts5.isIdentifier(prop.name) && prop.name.text === "basename" && ts5.isStringLiteral(prop.initializer)) {
               result = prop.initializer.text;
               return;
             }
@@ -2413,6 +2583,19 @@ function extractUrlsVariableFromRouter(code) {
   visit(sourceFile);
   return result;
 }
+function applyBasenameToRoutes(result, basename3) {
+  const prefixed = {};
+  for (const [name, pattern] of Object.entries(result.routes)) {
+    if (pattern === "/") {
+      prefixed[name] = basename3;
+    } else if (basename3.endsWith("/") && pattern.startsWith("/")) {
+      prefixed[name] = basename3 + pattern.slice(1);
+    } else {
+      prefixed[name] = basename3 + pattern;
+    }
+  }
+  return { routes: prefixed, searchSchemas: result.searchSchemas };
+}
 function buildCombinedRouteMapForRouterFile(routerFilePath) {
   let routerSource;
   try {
@@ -2420,39 +2603,49 @@ function buildCombinedRouteMapForRouterFile(routerFilePath) {
   } catch {
     return { routes: {}, searchSchemas: {} };
   }
-  const urlsVarName = extractUrlsVariableFromRouter(routerSource);
-  if (!urlsVarName) {
+  const extraction = extractUrlsFromRouter(routerSource);
+  if (!extraction) {
     return { routes: {}, searchSchemas: {} };
   }
-  const imported = resolveImportedVariable(routerSource, urlsVarName);
-  if (imported) {
-    const targetFile = resolveImportPath(imported.specifier, routerFilePath);
-    if (!targetFile) {
-      return { routes: {}, searchSchemas: {} };
+  const rawBasename = extractBasenameFromRouter(routerSource);
+  const basename3 = rawBasename ? ("/" + rawBasename.replace(/^\/+|\/+$/g, "")).replace(/^\/$/, "") : void 0;
+  let result;
+  if (extraction.kind === "inline") {
+    result = buildCombinedRouteMapWithSearch(
+      routerFilePath,
+      void 0,
+      void 0,
+      void 0,
+      extraction.block
+    );
+  } else {
+    const imported = resolveImportedVariable(routerSource, extraction.name);
+    if (imported) {
+      const targetFile = resolveImportPath(imported.specifier, routerFilePath);
+      if (!targetFile) {
+        return { routes: {}, searchSchemas: {} };
+      }
+      result = buildCombinedRouteMapWithSearch(
+        targetFile,
+        imported.exportedName
+      );
+    } else {
+      result = buildCombinedRouteMapWithSearch(routerFilePath, extraction.name);
     }
-    return buildCombinedRouteMapWithSearch(targetFile, imported.exportedName);
   }
-  return buildCombinedRouteMapWithSearch(routerFilePath, urlsVarName);
+  if (basename3) {
+    result = applyBasenameToRoutes(result, basename3);
+  }
+  return result;
 }
 function findRouterFiles(root, filter) {
-  const files = findTsFiles(root, filter);
   const result = [];
-  for (const filePath of files) {
-    if (filePath.includes(".gen.")) continue;
-    try {
-      const source = readFileSync2(filePath, "utf-8");
-      if (/\bcreateRouter\s*[<(]/.test(source)) {
-        result.push(filePath);
-      }
-    } catch {
-      continue;
-    }
-  }
+  findRouterFilesRecursive(root, filter, result);
   return result;
 }
 function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
   try {
-    const oldCombinedPath = join2(root, "src", "named-routes.gen.ts");
+    const oldCombinedPath = join(root, "src", "named-routes.gen.ts");
     if (existsSync3(oldCombinedPath)) {
       unlinkSync(oldCombinedPath);
       console.log(
@@ -2463,32 +2656,26 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
   }
   const routerFilePaths = knownRouterFiles ?? findRouterFiles(root);
   if (routerFilePaths.length === 0) return;
+  const nestedRouterConflict = findNestedRouterConflict(routerFilePaths);
+  if (nestedRouterConflict) {
+    throw new Error(formatNestedRouterConflictError(nestedRouterConflict));
+  }
   for (const routerFilePath of routerFilePaths) {
-    let routerSource;
-    try {
-      routerSource = readFileSync2(routerFilePath, "utf-8");
-    } catch {
-      continue;
-    }
-    const urlsVarName = extractUrlsVariableFromRouter(routerSource);
-    if (!urlsVarName) continue;
-    let result;
-    const imported = resolveImportedVariable(routerSource, urlsVarName);
-    if (imported) {
-      const targetFile = resolveImportPath(imported.specifier, routerFilePath);
-      if (!targetFile) continue;
-      result = buildCombinedRouteMapWithSearch(
-        targetFile,
-        imported.exportedName
-      );
-    } else {
-      result = buildCombinedRouteMapWithSearch(routerFilePath, urlsVarName);
+    const result = buildCombinedRouteMapForRouterFile(routerFilePath);
+    if (Object.keys(result.routes).length === 0 && Object.keys(result.searchSchemas).length === 0) {
+      let routerSource;
+      try {
+        routerSource = readFileSync2(routerFilePath, "utf-8");
+      } catch {
+        continue;
+      }
+      if (!extractUrlsFromRouter(routerSource)) continue;
     }
     const routerBasename = pathBasename(routerFilePath).replace(
       /\.(tsx?|jsx?)$/,
       ""
     );
-    const outPath = join2(
+    const outPath = join(
       dirname2(routerFilePath),
       `${routerBasename}.named-routes.gen.ts`
     );
@@ -2618,8 +2805,9 @@ function createVersionPlugin() {
   let isDev = false;
   let server = null;
   const clientModuleSignatures = /* @__PURE__ */ new Map();
+  let versionCounter = 0;
   const bumpVersion = (reason) => {
-    currentVersion = Date.now().toString(16);
+    currentVersion = Date.now().toString(16) + String(++versionCounter);
     console.log(`[rsc-router] ${reason}, version updated: ${currentVersion}`);
     const rscEnv = server?.environments?.rsc;
     const versionMod = rscEnv?.moduleGraph?.getModuleById(
@@ -2675,6 +2863,9 @@ function createVersionPlugin() {
       if (!isDev) return;
       const isRscModule = this.environment?.name === "rsc";
       if (!isRscModule) return;
+      if (ctx.modules.length === 1 && ctx.modules[0].id === "\0" + VIRTUAL_IDS.version) {
+        return;
+      }
       if (isCodeModule(ctx.file)) {
         const filePath = normalizeModuleId(ctx.file);
         const previousSignature = clientModuleSignatures.get(filePath);
@@ -2704,6 +2895,68 @@ function createVersionPlugin() {
 
 // src/vite/utils/shared-utils.ts
 import * as Vite from "vite";
+
+// src/vite/plugins/performance-tracks.ts
+import { readFile } from "node:fs/promises";
+var RSDW_PATCH_RE = /((?:var|let|const)\s+\w+\s*=\s*root\._children\s*,\s*(\w+)\s*=\s*root\._debugInfo\s*[;,])/;
+function buildPatchReplacement(match, debugInfoVar) {
+  return `${match}
+if (${debugInfoVar} && 0 === ${debugInfoVar}.length && "fulfilled" === root.status) {
+  var _resolved = "function" === typeof resolveLazy ? resolveLazy(root.value) : root.value;
+  if ("object" === typeof _resolved && null !== _resolved && isArrayImpl(_resolved._debugInfo)) {
+    ${debugInfoVar} = _resolved._debugInfo;
+  }
+}`;
+}
+function patchRsdwClientDebugInfoRecovery(code) {
+  const match = code.match(RSDW_PATCH_RE);
+  if (!match) {
+    return { code, debugInfoVar: null };
+  }
+  return {
+    code: code.replace(match[1], buildPatchReplacement(match[1], match[2])),
+    debugInfoVar: match[2]
+  };
+}
+function performanceTracksOptimizeDepsPlugin() {
+  return {
+    name: "@rangojs/router:performance-tracks-optimize-deps",
+    setup(build) {
+      build.onLoad(
+        {
+          filter: /react-server-dom-webpack-client\.browser\.(development|production)\.js$/
+        },
+        async (args) => {
+          const code = await readFile(args.path, "utf8");
+          const patched = patchRsdwClientDebugInfoRecovery(code);
+          return {
+            contents: patched.code,
+            loader: "js"
+          };
+        }
+      );
+    }
+  };
+}
+function performanceTracksPlugin() {
+  return {
+    name: "@rangojs/router:performance-tracks",
+    transform(code, id) {
+      if (!id.includes("react-server-dom") || !id.includes("client")) return;
+      const patched = patchRsdwClientDebugInfoRecovery(code);
+      if (!patched.debugInfoVar) return;
+      if (process.env.INTERNAL_RANGO_DEBUG)
+        console.log(
+          "[perf-tracks] patched RSDW client (var:",
+          patched.debugInfoVar,
+          ")"
+        );
+      return patched.code;
+    }
+  };
+}
+
+// src/vite/utils/shared-utils.ts
 var versionEsbuildPlugin = {
   name: "@rangojs/router-version",
   setup(build) {
@@ -2721,7 +2974,7 @@ var versionEsbuildPlugin = {
   }
 };
 var sharedEsbuildOptions = {
-  plugins: [versionEsbuildPlugin]
+  plugins: [versionEsbuildPlugin, performanceTracksOptimizeDepsPlugin()]
 };
 function createVirtualEntriesPlugin(entries, routerPathRef) {
   const virtualModules = {};
@@ -2804,11 +3057,11 @@ ${dim} \u2571${reset}    ${bold}\u2554\u2550\u2557${reset}${dim}      *      \u2
 ${dim}      ${reset}${bold}\u2551 \u2551${reset} ${bold}\u2554\u2550\u2557${reset}${dim}                    *                \u2727.   \u2571${reset}
 ${dim}   ${reset}${bold}\u2554\u2557 \u2551 \u2551 \u2551 \u2551${reset}${dim}                          *               \u2571${reset}
 ${dim}   ${reset}${bold}\u2551\u2551 \u2551 \u2551 \u2551 \u2551  \u2566\u2550\u2557\u2554\u2550\u2557\u2554\u2557\u2554\u2554\u2550\u2557\u2554\u2550\u2557${reset}${dim}             \u2727              \u2726${reset}
-${dim}  ${reset}${bold}\u2550\u2563\u2551 \u2551 \u2560\u2550\u255D \u2551  \u2560\u2566\u255D\u2560\u2550\u2563\u2551\u2551\u2551\u2551 \u2566\u2551 \u2551${reset}${dim}        *           \u2727${reset}
+${dim}   ${reset}${bold}\u2551\u2551 \u2551 \u2560\u2550\u255D \u2551  \u2560\u2566\u255D\u2560\u2550\u2563\u2551\u2551\u2551\u2551 \u2566\u2551 \u2551${reset}${dim}        *           \u2727${reset}
 ${dim}   ${reset}${bold}\u2551\u255A\u2550\u255D \u2554\u2550\u2550\u2550\u255D  \u2569\u255A\u2550\u2569 \u2569\u255D\u255A\u255D\u255A\u2550\u255D\u255A\u2550\u255D${reset}${dim}            \u2726          .      *${reset}
 ${dim}   ${reset}${bold}\u255A\u2550\u2550\u2557 \u2551${reset}${dim} *      RSC Wrangler         \u2727                \u2726${reset}
-${dim}  *   ${reset}${bold}\u2551 \u2560\u2550${reset}${dim}                         *            \u2727.    \u2571${reset}
-${bold}\u2550\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2569\u2550\u2550\u2550${reset}${dim}                  \u2726            *${reset}
+${dim}  *   ${reset}${bold}\u2551 \u2551${reset}${dim}                          *            \u2727.    \u2571${reset}
+${dim}   ${reset}${bold}\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550${reset}${dim}                           \u2726            *${reset}
 
    v${version} \xB7 ${preset} \xB7 ${mode}
 `;
@@ -2925,7 +3178,10 @@ function createCjsToEsmPlugin() {
 
 // src/vite/router-discovery.ts
 import { createServer as createViteServer } from "vite";
+import { resolve as resolve8 } from "node:path";
 import { readFileSync as readFileSync6 } from "node:fs";
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
 
 // src/vite/plugins/virtual-stub-plugin.ts
 function createVirtualStubPlugin() {
@@ -2952,7 +3208,7 @@ function createVirtualStubPlugin() {
 }
 
 // src/vite/plugins/client-ref-hashing.ts
-import { relative as relative2 } from "node:path";
+import { relative } from "node:path";
 import { createHash as createHash2 } from "node:crypto";
 var CLIENT_PKG_PROXY_PREFIX = "/@id/__x00__virtual:vite-rsc/client-package-proxy/";
 var CLIENT_IN_SERVER_PKG_PROXY_PREFIX = "/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/";
@@ -2965,10 +3221,10 @@ function computeProductionHash(projectRoot, refKey) {
     const absPath = decodeURIComponent(
       refKey.slice(CLIENT_IN_SERVER_PKG_PROXY_PREFIX.length)
     );
-    toHash = relative2(projectRoot, absPath).replaceAll("\\", "/");
+    toHash = relative(projectRoot, absPath).replaceAll("\\", "/");
   } else if (refKey.startsWith(FS_PREFIX)) {
     const absPath = refKey.slice(FS_PREFIX.length - 1);
-    toHash = relative2(projectRoot, absPath).replaceAll("\\", "/");
+    toHash = relative(projectRoot, absPath).replaceAll("\\", "/");
   } else if (refKey.startsWith("/")) {
     toHash = refKey.slice(1);
   } else {
@@ -3107,10 +3363,10 @@ function createDiscoveryState(entryPath, opts) {
     perRouterTrieMap: /* @__PURE__ */ new Map(),
     perRouterPrecomputedMap: /* @__PURE__ */ new Map(),
     perRouterManifestDataMap: /* @__PURE__ */ new Map(),
-    prerenderCollectedData: null,
-    staticCollectedData: null,
-    handlerChunkInfo: null,
-    staticHandlerChunkInfo: null,
+    prerenderManifestEntries: null,
+    staticManifestEntries: null,
+    handlerChunkInfoMap: /* @__PURE__ */ new Map(),
+    staticHandlerChunkInfoMap: /* @__PURE__ */ new Map(),
     rscEntryFileName: null,
     resolvedPrerenderModules: void 0,
     resolvedStaticModules: void 0,
@@ -3193,8 +3449,17 @@ function jsonParseExpression(value) {
 }
 
 // src/context-var.ts
+var NON_CACHEABLE_KEYS = /* @__PURE__ */ Symbol.for(
+  "rango:non-cacheable-keys"
+);
+function getNonCacheableKeys(variables) {
+  if (!variables[NON_CACHEABLE_KEYS]) {
+    variables[NON_CACHEABLE_KEYS] = /* @__PURE__ */ new Set();
+  }
+  return variables[NON_CACHEABLE_KEYS];
+}
 var FORBIDDEN_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
-function contextSet(variables, keyOrVar, value) {
+function contextSet(variables, keyOrVar, value, options) {
   if (typeof keyOrVar === "string") {
     if (FORBIDDEN_KEYS.has(keyOrVar)) {
       throw new Error(
@@ -3202,12 +3467,28 @@ function contextSet(variables, keyOrVar, value) {
       );
     }
     variables[keyOrVar] = value;
+    if (options?.cache === false) {
+      getNonCacheableKeys(variables).add(keyOrVar);
+    }
   } else {
     variables[keyOrVar.key] = value;
+    if (options?.cache === false) {
+      getNonCacheableKeys(variables).add(keyOrVar.key);
+    }
   }
 }
 
 // src/vite/utils/prerender-utils.ts
+import { createHash as createHash4 } from "node:crypto";
+import {
+  copyFileSync,
+  existsSync as existsSync4,
+  mkdirSync,
+  rmSync,
+  statSync,
+  writeFileSync as writeFileSync2
+} from "node:fs";
+import { resolve as resolve5 } from "node:path";
 function escapeRegExp2(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -3216,6 +3497,7 @@ function encodePathParam(value) {
 }
 function substituteRouteParams(pattern, params, encode = encodeURIComponent) {
   let result = pattern;
+  let hadOmittedOptional = false;
   for (const [key, value] of Object.entries(params)) {
     const escaped = escapeRegExp2(key);
     result = result.replace(
@@ -3224,6 +3506,15 @@ function substituteRouteParams(pattern, params, encode = encodeURIComponent) {
     );
     result = result.replace(`*${key}`, encode(value));
   }
+  result = result.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)(\([^)]*\))?\?/g, () => {
+    hadOmittedOptional = true;
+    return "";
+  });
+  if (hadOmittedOptional) {
+    const hadTrailingSlash = pattern.length > 1 && pattern.endsWith("/");
+    result = result.replace(/\/\/+/g, "/").replace(/\/+$/, "") || "/";
+    if (hadTrailingSlash && !result.endsWith("/")) result += "/";
+  }
   return result;
 }
 async function runWithConcurrency(items, concurrency, fn) {
@@ -3286,6 +3577,37 @@ function notifyOnError(registry, error, phase, routeKey, pathname, skipped) {
     break;
   }
 }
+function getStagedAssetDir(projectRoot) {
+  return resolve5(projectRoot, "node_modules/.rangojs-router-build/rsc-assets");
+}
+function resetStagedBuildAssets(projectRoot) {
+  rmSync(getStagedAssetDir(projectRoot), { recursive: true, force: true });
+}
+function stageBuildAssetModule(projectRoot, prefix, exportValue) {
+  const stagedDir = getStagedAssetDir(projectRoot);
+  mkdirSync(stagedDir, { recursive: true });
+  const contentHash = createHash4("sha256").update(exportValue).digest("hex").slice(0, 8);
+  const fileName = `${prefix}-${contentHash}.js`;
+  const filePath = resolve5(stagedDir, fileName);
+  if (!existsSync4(filePath)) {
+    writeFileSync2(filePath, `export default ${exportValue};
+`);
+  }
+  return fileName;
+}
+function copyStagedBuildAssets(projectRoot, fileNames) {
+  const stagedDir = getStagedAssetDir(projectRoot);
+  const distAssetsDir = resolve5(projectRoot, "dist/rsc/assets");
+  mkdirSync(distAssetsDir, { recursive: true });
+  let totalBytes = 0;
+  for (const fileName of new Set(fileNames)) {
+    const stagedPath = resolve5(stagedDir, fileName);
+    const distPath = resolve5(distAssetsDir, fileName);
+    copyFileSync(stagedPath, distPath);
+    totalBytes += statSync(stagedPath).size;
+  }
+  return totalBytes;
+}
 
 // src/vite/discovery/prerender-collection.ts
 async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
@@ -3301,14 +3623,33 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
     if (!params) return pattern;
     return substituteRouteParams(pattern, params);
   };
+  let resolvedRoutes = 0;
+  let totalDynamic = 0;
+  for (const { manifest } of allManifests) {
+    if (!manifest.prerenderRoutes) continue;
+    for (const routeName of manifest.prerenderRoutes) {
+      const pattern = manifest.routeManifest[routeName];
+      if (pattern && (pattern.includes(":") || pattern.includes("*"))) {
+        totalDynamic++;
+      }
+    }
+  }
+  const paramsStart = performance.now();
+  const progressInterval = totalDynamic > 0 ? setInterval(() => {
+    const elapsed = ((performance.now() - paramsStart) / 1e3).toFixed(1);
+    console.log(
+      `[rsc-router] Resolving prerender params... ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
+    );
+  }, 5e3) : void 0;
   for (const { manifest } of allManifests) {
     if (!manifest.prerenderRoutes) continue;
     const defs = manifest._prerenderDefs || {};
+    const passthroughSet = new Set(manifest.passthroughRoutes || []);
     for (const routeName of manifest.prerenderRoutes) {
       const pattern = manifest.routeManifest[routeName];
       if (!pattern) continue;
       const def = defs[routeName];
-      const isPassthroughRoute = !!def?.options?.passthrough;
+      const isPassthroughRoute = passthroughSet.has(routeName);
       const hasDynamic = pattern.includes(":") || pattern.includes("*");
       if (!hasDynamic) {
         entries.push({
@@ -3321,12 +3662,20 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
         if (def?.getParams) {
           try {
             const buildVars = {};
+            const buildEnv = state.resolvedBuildEnv;
             const getParamsCtx = {
               build: true,
+              dev: !state.isBuildMode,
               set: ((keyOrVar, value) => {
                 contextSet(buildVars, keyOrVar, value);
               }),
-              reverse: getParamsReverse
+              reverse: getParamsReverse,
+              get env() {
+                if (buildEnv !== void 0) return buildEnv;
+                throw new Error(
+                  "[rsc-router] ctx.env is not available during build-time getParams(). Configure buildEnv in your rango() plugin options to enable build-time env access."
+                );
+              }
             };
             const paramsList = await def.getParams(getParamsCtx);
             const concurrency = def.options?.concurrency ?? 1;
@@ -3351,7 +3700,9 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 isPassthroughRoute
               });
             }
+            resolvedRoutes++;
           } catch (err) {
+            resolvedRoutes++;
             if (err.name === "Skip") {
               console.log(
                 `[rsc-router]   SKIP route "${routeName}" - ${err.message}`
@@ -3380,6 +3731,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
       }
     }
   }
+  if (progressInterval) clearInterval(progressInterval);
   if (entries.length === 0) return;
   const maxConcurrency = Math.max(...entries.map((e) => e.concurrency));
   const concurrencyNote = maxConcurrency > 1 ? ` (concurrency: ${maxConcurrency})` : "";
@@ -3387,7 +3739,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
     `[rsc-router] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`
   );
   const { hashParams } = await rscEnv.runner.import("@rangojs/router/build");
-  const collectedData = {};
+  const manifestEntries = {};
   let doneCount = 0;
   let skipCount = 0;
   const startTotal = performance.now();
@@ -3405,7 +3757,8 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
               entry.urlPath,
               {},
               entry.buildVars,
-              entry.isPassthroughRoute
+              entry.isPassthroughRoute,
+              state.resolvedBuildEnv
             );
             if (!result) continue;
             if (result.passthrough) {
@@ -3417,18 +3770,30 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
               break;
             }
             const paramHash = hashParams(result.params || {});
-            collectedData[`${result.routeName}/${paramHash}`] = {
+            const mainKey = `${result.routeName}/${paramHash}`;
+            const mainValue = JSON.stringify({
               segments: result.segments,
               handles: result.handles
-            };
+            });
+            manifestEntries[mainKey] = stageBuildAssetModule(
+              state.projectRoot,
+              "__pr",
+              mainValue
+            );
             if (result.interceptSegments?.length) {
-              collectedData[`${result.routeName}/${paramHash}/i`] = {
+              const interceptKey = `${result.routeName}/${paramHash}/i`;
+              const interceptValue = JSON.stringify({
                 segments: [...result.segments, ...result.interceptSegments],
                 handles: {
                   ...result.handles,
                   ...result.interceptHandles || {}
                 }
-              };
+              });
+              manifestEntries[interceptKey] = stageBuildAssetModule(
+                state.projectRoot,
+                "__pr",
+                interceptValue
+              );
             }
             const elapsed = (performance.now() - startUrl).toFixed(0);
             console.log(
@@ -3472,7 +3837,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   }
   const totalElapsed = (performance.now() - startTotal).toFixed(0);
   if (doneCount > 0) {
-    state.prerenderCollectedData = collectedData;
+    state.prerenderManifestEntries = manifestEntries;
   }
   const parts = [`${doneCount} done`];
   if (skipCount > 0) parts.push(`${skipCount} skipped`);
@@ -3483,7 +3848,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
 async function renderStaticHandlers(state, rscEnv, registry) {
   if (!state.opts?.enableBuildPrerender || !state.isBuildMode || !state.resolvedStaticModules?.size)
     return;
-  const collected = {};
+  const manifestEntries = {};
   let staticDone = 0;
   let staticSkip = 0;
   let totalStaticCount = 0;
@@ -3517,10 +3882,18 @@ async function renderStaticHandlers(state, rscEnv, registry) {
           const result = await routerInstance.renderStaticSegment(
             def.handler,
             def.$$id,
-            def.$$routePrefix
+            def.$$routePrefix,
+            state.resolvedBuildEnv,
+            !state.isBuildMode
           );
           if (result) {
-            collected[def.$$id] = result;
+            const hasHandles = Object.keys(result.handles).length > 0;
+            const exportValue = hasHandles ? JSON.stringify(result) : JSON.stringify(result.encoded);
+            manifestEntries[def.$$id] = stageBuildAssetModule(
+              state.projectRoot,
+              "__st",
+              exportValue
+            );
             const elapsed = (performance.now() - startHandler).toFixed(0);
             console.log(
               `[rsc-router]   OK   ${name.padEnd(40)} (${elapsed}ms)`
@@ -3557,7 +3930,7 @@ async function renderStaticHandlers(state, rscEnv, registry) {
   }
   const totalStaticElapsed = (performance.now() - startStatic).toFixed(0);
   if (staticDone > 0) {
-    state.staticCollectedData = collected;
+    state.staticManifestEntries = manifestEntries;
   }
   const staticParts = [`${staticDone} done`];
   if (staticSkip > 0) staticParts.push(`${staticSkip} skipped`);
@@ -3574,8 +3947,7 @@ async function discoverRouters(state, rscEnv) {
   let registry = serverMod.RouterRegistry;
   if (!registry || registry.size === 0) {
     try {
-      const hostMod = await rscEnv.runner.import("@rangojs/router/host");
-      const hostRegistry = hostMod.HostRouterRegistry;
+      const hostRegistry = serverMod.HostRouterRegistry;
       if (hostRegistry && hostRegistry.size > 0) {
         console.log(
           `[rsc-router] Found ${hostRegistry.size} host router(s), resolving lazy handlers...`
@@ -3615,6 +3987,14 @@ async function discoverRouters(state, rscEnv) {
   }
   const buildMod = await rscEnv.runner.import("@rangojs/router/build");
   const generateManifestFull = buildMod.generateManifestFull;
+  const nestedRouterConflict = findNestedRouterConflict(
+    [...registry.values()].map((router) => router.__sourceFile).filter(
+      (sourceFile) => typeof sourceFile === "string"
+    )
+  );
+  if (nestedRouterConflict) {
+    throw new Error(formatNestedRouterConflictError(nestedRouterConflict));
+  }
   const newMergedRouteManifest = {};
   const newMergedPrecomputedEntries = [];
   const newPerRouterManifests = [];
@@ -3629,7 +4009,11 @@ async function discoverRouters(state, rscEnv) {
     if (!router.urlpatterns || !generateManifestFull) {
       continue;
     }
-    const manifest = generateManifestFull(router.urlpatterns, routerMountIndex);
+    const manifest = generateManifestFull(
+      router.urlpatterns,
+      routerMountIndex,
+      router.__basename ? { urlPrefix: router.__basename } : void 0
+    );
     routerMountIndex++;
     allManifests.push({ id, manifest });
     const routeCount = Object.keys(manifest.routeManifest).length;
@@ -3771,8 +4155,8 @@ async function discoverRouters(state, rscEnv) {
 }
 
 // src/vite/discovery/route-types-writer.ts
-import { dirname as dirname3, basename, join as join3, resolve as resolve5 } from "node:path";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync4, unlinkSync as unlinkSync2 } from "node:fs";
+import { dirname as dirname3, basename, join as join2, resolve as resolve6 } from "node:path";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync5, unlinkSync as unlinkSync2 } from "node:fs";
 function filterUserNamedRoutes(manifest) {
   const filtered = {};
   for (const [name, pattern] of Object.entries(manifest)) {
@@ -3792,7 +4176,7 @@ function writeCombinedRouteTypesWithTracking(state, opts) {
       /\.(tsx?|jsx?)$/,
       ""
     );
-    const outPath = join3(routerDir, `${routerBasename}.named-routes.gen.ts`);
+    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
     try {
       preContent.set(outPath, readFileSync4(outPath, "utf-8"));
     } catch {
@@ -3805,8 +4189,8 @@ function writeCombinedRouteTypesWithTracking(state, opts) {
       /\.(tsx?|jsx?)$/,
       ""
     );
-    const outPath = join3(routerDir, `${routerBasename}.named-routes.gen.ts`);
-    if (!existsSync4(outPath)) continue;
+    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
+    if (!existsSync5(outPath)) continue;
     try {
       const content = readFileSync4(outPath, "utf-8");
       if (content !== preContent.get(outPath)) {
@@ -3820,10 +4204,10 @@ function writeRouteTypesFiles(state) {
   if (state.perRouterManifests.length === 0) return;
   try {
     const entryDir = dirname3(
-      resolve5(state.projectRoot, state.resolvedEntryPath)
+      resolve6(state.projectRoot, state.resolvedEntryPath)
     );
-    const oldCombinedPath = join3(entryDir, "named-routes.gen.ts");
-    if (existsSync4(oldCombinedPath)) {
+    const oldCombinedPath = join2(entryDir, "named-routes.gen.ts");
+    if (existsSync5(oldCombinedPath)) {
       unlinkSync2(oldCombinedPath);
       console.log(
         `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
@@ -3847,7 +4231,7 @@ Set an explicit \`id\` on createRouter() or check the call site.`
     }
     const routerDir = dirname3(sourceFile);
     const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
-    const outPath = join3(routerDir, `${routerBasename}.named-routes.gen.ts`);
+    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
     const userRoutes = filterUserNamedRoutes(routeManifest);
     let effectiveSearchSchemas = routeSearchSchemas;
     if ((!effectiveSearchSchemas || Object.keys(effectiveSearchSchemas).length === 0) && sourceFile) {
@@ -3867,10 +4251,10 @@ Set an explicit \`id\` on createRouter() or check the call site.`
       userRoutes,
       effectiveSearchSchemas && Object.keys(effectiveSearchSchemas).length > 0 ? effectiveSearchSchemas : void 0
     );
-    const existing = existsSync4(outPath) ? readFileSync4(outPath, "utf-8") : null;
+    const existing = existsSync5(outPath) ? readFileSync4(outPath, "utf-8") : null;
     if (existing !== source) {
       markSelfGenWrite(state, outPath, source);
-      writeFileSync2(outPath, source);
+      writeFileSync3(outPath, source);
       console.log(`[rsc-router] Generated route types -> ${outPath}`);
     }
   }
@@ -3912,21 +4296,21 @@ function supplementGenFilesWithRuntimeRoutes(state) {
     }
     const routerDir = dirname3(sourceFile);
     const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
-    const outPath = join3(routerDir, `${routerBasename}.named-routes.gen.ts`);
+    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
     const source = generateRouteTypesSource(
       mergedRoutes,
       Object.keys(mergedSearchSchemas).length > 0 ? mergedSearchSchemas : void 0
     );
-    const existing = existsSync4(outPath) ? readFileSync4(outPath, "utf-8") : null;
+    const existing = existsSync5(outPath) ? readFileSync4(outPath, "utf-8") : null;
     if (existing !== source) {
       markSelfGenWrite(state, outPath, source);
-      writeFileSync2(outPath, source);
+      writeFileSync3(outPath, source);
     }
   }
 }
 
 // src/vite/discovery/virtual-module-codegen.ts
-import { dirname as dirname4, basename as basename2, join as join4 } from "node:path";
+import { dirname as dirname4, basename as basename2, join as join3 } from "node:path";
 function generateRoutesManifestModule(state) {
   const hasManifest = state.mergedRouteManifest && Object.keys(state.mergedRouteManifest).length > 0;
   if (hasManifest) {
@@ -3941,7 +4325,7 @@ function generateRoutesManifestModule(state) {
           /\.(tsx?|jsx?)$/,
           ""
         );
-        const genPath = join4(
+        const genPath = join3(
           routerDir,
           `${routerBasename}.named-routes.gen.js`
         ).replaceAll("\\", "/");
@@ -4038,7 +4422,7 @@ function generatePerRouterModule(state, routerId) {
       /\.(tsx?|jsx?)$/,
       ""
     );
-    const genPath = join4(
+    const genPath = join3(
       routerDir,
       `${routerBasename}.named-routes.gen.js`
     ).replaceAll("\\", "/");
@@ -4065,100 +4449,90 @@ function generatePerRouterModule(state, routerId) {
 }
 
 // src/vite/discovery/bundle-postprocess.ts
-import { resolve as resolve6 } from "node:path";
-import { createHash as createHash4 } from "node:crypto";
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync3, existsSync as existsSync5, mkdirSync } from "node:fs";
+import { resolve as resolve7 } from "node:path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync4, existsSync as existsSync6 } from "node:fs";
 function postprocessBundle(state) {
-  const hasPrerenderData = state.prerenderCollectedData && Object.keys(state.prerenderCollectedData).length > 0;
-  const hasStaticData = state.staticCollectedData && Object.keys(state.staticCollectedData).length > 0;
+  const hasPrerenderData = state.prerenderManifestEntries && Object.keys(state.prerenderManifestEntries).length > 0;
+  const hasStaticData = state.staticManifestEntries && Object.keys(state.staticManifestEntries).length > 0;
   if (!hasPrerenderData && !hasStaticData) return;
-  const rscEntryPath = resolve6(
+  const rscEntryPath = resolve7(
     state.projectRoot,
     "dist/rsc",
     state.rscEntryFileName ?? "index.js"
   );
   const evictionTargets = [
     {
-      info: state.handlerChunkInfo,
+      infos: state.handlerChunkInfoMap.values(),
       fnName: "Prerender",
       brand: "prerenderHandler",
       label: "handler code from RSC bundle"
     },
     {
-      info: state.staticHandlerChunkInfo,
+      infos: state.staticHandlerChunkInfoMap.values(),
       fnName: "Static",
       brand: "staticHandler",
       label: "static handler code"
     }
   ];
   for (const target of evictionTargets) {
-    if (!target.info) continue;
-    const chunkPath = resolve6(
-      state.projectRoot,
-      "dist/rsc",
-      target.info.fileName
-    );
-    try {
-      const code = readFileSync5(chunkPath, "utf-8");
-      const result = evictHandlerCode(
-        code,
-        target.info.exports,
-        target.fnName,
-        target.brand
-      );
-      if (result) {
-        writeFileSync3(chunkPath, result.code);
-        const savedKB = (result.savedBytes / 1024).toFixed(1);
-        console.log(
-          `[rsc-router] Evicted ${target.label} (${savedKB} KB saved): ${target.info.fileName}`
+    for (const info of target.infos) {
+      const chunkPath = resolve7(state.projectRoot, "dist/rsc", info.fileName);
+      try {
+        const code = readFileSync5(chunkPath, "utf-8");
+        const result = evictHandlerCode(
+          code,
+          info.exports,
+          target.fnName,
+          target.brand
+        );
+        if (result) {
+          writeFileSync4(chunkPath, result.code);
+          const savedKB = (result.savedBytes / 1024).toFixed(1);
+          console.log(
+            `[rsc-router] Evicted ${target.label} (${savedKB} KB saved): ${info.fileName}`
+          );
+        }
+      } catch (replaceErr) {
+        console.warn(
+          `[rsc-router] Failed to evict ${target.label}: ${replaceErr.message}`
         );
       }
-    } catch (replaceErr) {
-      console.warn(
-        `[rsc-router] Failed to evict ${target.label}: ${replaceErr.message}`
-      );
     }
   }
-  state.handlerChunkInfo = null;
-  state.staticHandlerChunkInfo = null;
-  if (hasPrerenderData && existsSync5(rscEntryPath)) {
+  state.handlerChunkInfoMap.clear();
+  state.staticHandlerChunkInfoMap.clear();
+  if (hasPrerenderData && existsSync6(rscEntryPath)) {
     const rscCode = readFileSync5(rscEntryPath, "utf-8");
     if (!rscCode.includes("__prerender-manifest.js")) {
       try {
-        const assetsDir = resolve6(state.projectRoot, "dist/rsc/assets");
-        mkdirSync(assetsDir, { recursive: true });
-        const manifestEntries = [];
-        let totalBytes = 0;
-        for (const [key, entry] of Object.entries(
-          state.prerenderCollectedData
+        let totalBytes = copyStagedBuildAssets(
+          state.projectRoot,
+          Object.values(state.prerenderManifestEntries)
+        );
+        const manifestMap = {};
+        for (const [key, assetFileName] of Object.entries(
+          state.prerenderManifestEntries
         )) {
-          const entryJson = JSON.stringify(entry);
-          const contentHash = createHash4("sha256").update(entryJson).digest("hex").slice(0, 8);
-          const assetFileName = `__pr-${contentHash}.js`;
-          const assetPath = resolve6(assetsDir, assetFileName);
-          const assetCode = `export default ${entryJson};
-`;
-          writeFileSync3(assetPath, assetCode);
-          totalBytes += Buffer.byteLength(assetCode);
-          manifestEntries.push(
-            `${JSON.stringify(key)}:()=>import("./assets/${assetFileName}")`
-          );
+          manifestMap[key] = `./assets/${assetFileName}`;
         }
-        const manifestCode = `const m={${manifestEntries.join(",")}};export default m;
-`;
-        const manifestPath = resolve6(
+        const manifestCode = [
+          `const m=JSON.parse('${JSON.stringify(manifestMap).replace(/'/g, "\\'")}');`,
+          `export function loadPrerenderAsset(s){return import(s)}`,
+          `export default m;`,
+          ""
+        ].join("\n");
+        const manifestPath = resolve7(
           state.projectRoot,
           "dist/rsc/__prerender-manifest.js"
         );
-        writeFileSync3(manifestPath, manifestCode);
+        writeFileSync4(manifestPath, manifestCode);
         totalBytes += Buffer.byteLength(manifestCode);
-        const injection = `import __pm from "./__prerender-manifest.js";
-globalThis.__PRERENDER_MANIFEST = __pm;
+        const injection = `globalThis.__loadPrerenderManifestModule = () => import("./__prerender-manifest.js");
 `;
-        writeFileSync3(rscEntryPath, injection + rscCode);
+        writeFileSync4(rscEntryPath, injection + rscCode);
         const totalKB = (totalBytes / 1024).toFixed(1);
         console.log(
-          `[rsc-router] Wrote prerender assets (${totalKB} KB total, ${Object.keys(state.prerenderCollectedData).length} entries)`
+          `[rsc-router] Wrote prerender assets (${totalKB} KB total, ${Object.keys(state.prerenderManifestEntries).length} entries)`
         );
       } catch (err) {
         throw new Error(
@@ -4167,44 +4541,36 @@ globalThis.__PRERENDER_MANIFEST = __pm;
       }
     }
   }
-  if (hasStaticData && existsSync5(rscEntryPath)) {
+  if (hasStaticData && existsSync6(rscEntryPath)) {
     const rscCode = readFileSync5(rscEntryPath, "utf-8");
-    if (!rscCode.includes("__STATIC_MANIFEST")) {
+    if (!rscCode.includes("__static-manifest.js")) {
       try {
-        const assetsDir = resolve6(state.projectRoot, "dist/rsc/assets");
-        mkdirSync(assetsDir, { recursive: true });
         const manifestEntries = [];
-        let totalBytes = 0;
-        for (const [handlerId, { encoded, handles }] of Object.entries(
-          state.staticCollectedData
+        let totalBytes = copyStagedBuildAssets(
+          state.projectRoot,
+          Object.values(state.staticManifestEntries)
+        );
+        for (const [handlerId, assetFileName] of Object.entries(
+          state.staticManifestEntries
         )) {
-          const hasHandles = Object.keys(handles).length > 0;
-          const exportValue = hasHandles ? JSON.stringify({ encoded, handles }) : JSON.stringify(encoded);
-          const contentHash = createHash4("sha256").update(exportValue).digest("hex").slice(0, 8);
-          const assetFileName = `__st-${contentHash}.js`;
-          const assetPath = resolve6(assetsDir, assetFileName);
-          const assetCode = `export default ${exportValue};
-`;
-          writeFileSync3(assetPath, assetCode);
-          totalBytes += Buffer.byteLength(assetCode);
           manifestEntries.push(
             `${JSON.stringify(handlerId)}:()=>import("./assets/${assetFileName}")`
           );
         }
         const manifestCode = `const m={${manifestEntries.join(",")}};globalThis.__STATIC_MANIFEST=m;export default m;
 `;
-        const manifestPath = resolve6(
+        const manifestPath = resolve7(
           state.projectRoot,
           "dist/rsc/__static-manifest.js"
         );
-        writeFileSync3(manifestPath, manifestCode);
+        writeFileSync4(manifestPath, manifestCode);
         totalBytes += Buffer.byteLength(manifestCode);
         const injection = `import "./__static-manifest.js";
 `;
-        writeFileSync3(rscEntryPath, injection + rscCode);
+        writeFileSync4(rscEntryPath, injection + rscCode);
         const totalKB = (totalBytes / 1024).toFixed(1);
         console.log(
-          `[rsc-router] Wrote static assets (${totalKB} KB total, ${Object.keys(state.staticCollectedData).length} entries)`
+          `[rsc-router] Wrote static assets (${totalKB} KB total, ${Object.keys(state.staticManifestEntries).length} entries)`
         );
       } catch (err) {
         throw new Error(
@@ -4246,8 +4612,67 @@ async function createTempRscServer(state, options = {}) {
     ]
   });
 }
+async function resolveBuildEnv(option, factoryCtx) {
+  if (!option) return null;
+  if (option === "auto") {
+    if (factoryCtx.preset !== "cloudflare") {
+      throw new Error(
+        '[rsc-router] buildEnv: "auto" is only supported with preset: "cloudflare". Use a factory function or plain object for other presets.'
+      );
+    }
+    try {
+      const userRequire = createRequire(
+        resolve8(factoryCtx.root, "package.json")
+      );
+      const wranglerPath = userRequire.resolve("wrangler");
+      const { getPlatformProxy } = await import(pathToFileURL(wranglerPath).href);
+      const proxy = await getPlatformProxy();
+      return {
+        env: proxy.env,
+        dispose: proxy.dispose
+      };
+    } catch (err) {
+      throw new Error(
+        `[rsc-router] buildEnv: "auto" requires wrangler to be installed.
+Install it with: pnpm add -D wrangler
+${err.message}`
+      );
+    }
+  }
+  if (typeof option === "function") {
+    return await option(factoryCtx);
+  }
+  return { env: option };
+}
+async function acquireBuildEnv(s, command, mode) {
+  const option = s.opts?.buildEnv;
+  if (!option) return false;
+  const result = await resolveBuildEnv(option, {
+    root: s.projectRoot,
+    mode,
+    command,
+    preset: s.opts?.preset ?? "node"
+  });
+  if (!result) return false;
+  s.resolvedBuildEnv = result.env;
+  s.buildEnvDispose = result.dispose ?? null;
+  return true;
+}
+async function releaseBuildEnv(s) {
+  if (s.buildEnvDispose) {
+    try {
+      await s.buildEnvDispose();
+    } catch (err) {
+      console.warn(`[rsc-router] buildEnv dispose failed: ${err.message}`);
+    }
+    s.buildEnvDispose = null;
+  }
+  s.resolvedBuildEnv = void 0;
+}
 function createRouterDiscoveryPlugin(entryPath, opts) {
   const s = createDiscoveryState(entryPath, opts);
+  let viteCommand = "build";
+  let viteMode = "production";
   return {
     name: "@rangojs/router:discovery",
     config() {
@@ -4256,31 +4681,13 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
           __RANGO_DEBUG__: JSON.stringify(!!process.env.INTERNAL_RANGO_DEBUG)
         }
       };
-      if (opts?.enableBuildPrerender) {
-        config.environments = {
-          rsc: {
-            build: {
-              rollupOptions: {
-                output: {
-                  manualChunks(id) {
-                    if (s.resolvedPrerenderModules?.has(id)) {
-                      return "__prerender-handlers";
-                    }
-                    if (s.resolvedStaticModules?.has(id)) {
-                      return "__static-handlers";
-                    }
-                  }
-                }
-              }
-            }
-          }
-        };
-      }
       return config;
     },
     configResolved(config) {
       s.projectRoot = config.root;
       s.isBuildMode = config.command === "build";
+      viteCommand = config.command;
+      viteMode = config.mode;
       s.userResolveAlias = config.resolve.alias;
       if (!s.resolvedEntryPath && opts?.routerPathRef?.path) {
         s.resolvedEntryPath = opts.routerPathRef.path;
@@ -4294,12 +4701,6 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
           s.resolvedEntryPath = entries[0];
         }
       }
-      if (opts?.include || opts?.exclude) {
-        s.scanFilter = createScanFilter(s.projectRoot, {
-          include: opts.include,
-          exclude: opts.exclude
-        });
-      }
       if (opts?.staticRouteTypesGeneration !== false) {
         s.cachedRouterFiles = findRouterFiles(s.projectRoot, s.scanFilter);
         writeCombinedRouteTypesWithTracking(s, { preserveIfLarger: true });
@@ -4319,8 +4720,8 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
       if (globalThis.__rscRouterDiscoveryActive) return;
       s.devServer = server;
       let resolveDiscovery;
-      const discoveryPromise = new Promise((resolve8) => {
-        resolveDiscovery = resolve8;
+      const discoveryPromise = new Promise((resolve10) => {
+        resolveDiscovery = resolve10;
       });
       const getDevServerOrigin = () => server.resolvedUrls?.local?.[0]?.replace(/\/$/, "") || `http://localhost:${server.config.server.port || 5173}`;
       let prerenderTempServer = null;
@@ -4331,6 +4732,8 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
           });
           prerenderTempServer = null;
         }
+        releaseBuildEnv(s).catch(() => {
+        });
       });
       async function getOrCreateTempServer() {
         if (prerenderNodeRegistry) {
@@ -4361,6 +4764,7 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
         if (!rscEnv?.runner) {
           s.devServerOrigin = getDevServerOrigin();
           try {
+            await acquireBuildEnv(s, viteCommand, viteMode);
             const tempRscEnv = await getOrCreateTempServer();
             if (tempRscEnv) {
               await discoverRouters(s, tempRscEnv);
@@ -4376,6 +4780,7 @@ ${err.stack}`
           return;
         }
         try {
+          await acquireBuildEnv(s, viteCommand, viteMode);
           const serverMod = await rscEnv.runner.import(
             "@rangojs/router/server"
           );
@@ -4395,8 +4800,8 @@ ${err.stack}`
           resolveDiscovery();
         }
       };
-      s.discoveryDone = new Promise((resolve8) => {
-        setTimeout(() => discover().then(resolve8, resolve8), 0);
+      s.discoveryDone = new Promise((resolve10) => {
+        setTimeout(() => discover().then(resolve10, resolve10), 0);
       });
       let mainRegistry = null;
       const propagateDiscoveryState = async (rscEnv) => {
@@ -4440,7 +4845,26 @@ ${err.stack}`
           res.end("Missing pathname");
           return;
         }
-        let registry = mainRegistry;
+        const rscEnv = server.environments?.rsc;
+        let registry = null;
+        if (rscEnv?.runner && s.resolvedEntryPath) {
+          try {
+            await rscEnv.runner.import(s.resolvedEntryPath);
+            const serverMod = await rscEnv.runner.import(
+              "@rangojs/router/server"
+            );
+            registry = serverMod.RouterRegistry ?? null;
+          } catch (err) {
+            console.warn(
+              `[rsc-router] Dev prerender module refresh failed: ${err.message}`
+            );
+            res.statusCode = 500;
+            res.end(`Prerender handler error: ${err.message}`);
+            return;
+          }
+        } else {
+          registry = mainRegistry;
+        }
         if (!registry) {
           if (!prerenderNodeRegistry) {
             await getOrCreateTempServer();
@@ -4462,7 +4886,10 @@ ${err.stack}`
               pathname,
               {},
               void 0,
-              wantPassthrough
+              wantPassthrough,
+              s.resolvedBuildEnv,
+              true
+              // devMode: check getParams for passthrough routes
             );
             if (!result) continue;
             if (result.passthrough) continue;
@@ -4563,6 +4990,16 @@ ${err.stack}`
             const hasCreateRouter = /\bcreateRouter\s*[<(]/.test(source);
             if (!hasUrls && !hasCreateRouter) return;
             if (hasCreateRouter) {
+              const nestedRouterConflict = findNestedRouterConflict([
+                ...s.cachedRouterFiles ?? [],
+                resolve8(filePath)
+              ]);
+              if (nestedRouterConflict) {
+                server.config.logger.error(
+                  formatNestedRouterConflictError(nestedRouterConflict)
+                );
+                return;
+              }
               s.cachedRouterFiles = void 0;
             }
             scheduleRouteRegeneration();
@@ -4585,6 +5022,10 @@ ${err.stack}`
     async buildStart() {
       if (!s.isBuildMode) return;
       if (s.mergedRouteManifest !== null) return;
+      resetStagedBuildAssets(s.projectRoot);
+      s.prerenderManifestEntries = null;
+      s.staticManifestEntries = null;
+      await acquireBuildEnv(s, viteCommand, viteMode);
       let tempServer = null;
       globalThis.__rscRouterDiscoveryActive = true;
       try {
@@ -4624,6 +5065,7 @@ ${details}`
         if (tempServer) {
           await tempServer.close();
         }
+        await releaseBuildEnv(s);
       }
     },
     // Virtual module: provides the pre-generated route manifest as a JS module
@@ -4666,20 +5108,30 @@ ${details}`
       }
       if (!s.resolvedPrerenderModules?.size && !s.resolvedStaticModules?.size)
         return;
+      s.handlerChunkInfoMap.clear();
+      s.staticHandlerChunkInfoMap.clear();
       for (const [fileName, chunk] of Object.entries(bundle)) {
         if (chunk.type !== "chunk") continue;
-        if (fileName.includes("__prerender-handlers") && s.resolvedPrerenderModules?.size) {
+        if (s.resolvedPrerenderModules?.size) {
           const handlers = extractHandlerExportsFromChunk(
             chunk.code,
             s.resolvedPrerenderModules,
             "Prerender",
-            true
+            false
           );
           if (handlers.length > 0) {
-            s.handlerChunkInfo = { fileName, exports: handlers };
+            const existing = s.handlerChunkInfoMap.get(fileName);
+            if (existing) {
+              existing.exports.push(...handlers);
+            } else {
+              s.handlerChunkInfoMap.set(fileName, {
+                fileName,
+                exports: handlers
+              });
+            }
           }
         }
-        if (fileName.includes("__static-handlers") && s.resolvedStaticModules?.size) {
+        if (s.resolvedStaticModules?.size) {
           const handlers = extractHandlerExportsFromChunk(
             chunk.code,
             s.resolvedStaticModules,
@@ -4687,7 +5139,15 @@ ${details}`
             false
           );
           if (handlers.length > 0) {
-            s.staticHandlerChunkInfo = { fileName, exports: handlers };
+            const existing = s.staticHandlerChunkInfoMap.get(fileName);
+            if (existing) {
+              existing.exports.push(...handlers);
+            } else {
+              s.staticHandlerChunkInfoMap.set(fileName, {
+                fileName,
+                exports: handlers
+              });
+            }
           }
         }
       }
@@ -4714,8 +5174,16 @@ async function rango(options) {
   const showBanner = resolvedOptions.banner ?? true;
   const plugins = [];
   const rangoAliases = getPackageAliases();
-  const excludeDeps = getExcludeDeps();
-  let rscEntryPath = null;
+  const excludeDeps = [
+    ...getExcludeDeps(),
+    // The public browser entry re-exports the RSDW browser client.
+    // Excluding both keeps Vite from freezing the unpatched bundle into
+    // .vite/deps before our source transforms run.
+    "@vitejs/plugin-rsc/browser",
+    // Keep the browser RSDW client out of Vite's dep optimizer so our
+    // cjs-to-esm transform can patch the real file.
+    "@vitejs/plugin-rsc/vendor/react-server-dom/client.browser"
+  ];
   const routerRef = { path: void 0 };
   const prerenderEnabled = true;
   if (preset === "cloudflare") {
@@ -4811,160 +5279,132 @@ async function rango(options) {
       }
     });
     plugins.push(createVirtualEntriesPlugin(finalEntries));
+    plugins.push(performanceTracksPlugin());
     plugins.push(
       rsc({
         entries: finalEntries,
         serverHandler: false
       })
     );
+    plugins.push(clientRefDedup());
   } else {
-    const nodeOptions = resolvedOptions;
-    routerRef.path = nodeOptions.router;
-    if (!routerRef.path) {
-      plugins.push({
-        name: "@rangojs/router:auto-discover",
-        config(userConfig) {
-          if (routerRef.path) return;
-          const root = userConfig.root ? resolve7(process.cwd(), userConfig.root) : process.cwd();
-          const filter = createScanFilter(root, {
-            include: resolvedOptions.include,
-            exclude: resolvedOptions.exclude
-          });
-          const candidates = findRouterFiles(root, filter);
-          if (candidates.length === 1) {
-            const abs = candidates[0];
-            routerRef.path = (abs.startsWith(root) ? "./" + abs.slice(root.length + 1) : abs).replaceAll("\\", "/");
-          } else if (candidates.length > 1) {
-            const list = candidates.map(
-              (f) => "  - " + (f.startsWith(root) ? f.slice(root.length + 1) : f)
-            ).join("\n");
-            throw new Error(
-              `[rsc-router] Multiple routers found. Specify \`router\` to choose one:
-${list}`
-            );
-          }
+    plugins.push({
+      name: "@rangojs/router:auto-discover",
+      config(userConfig) {
+        if (routerRef.path) return;
+        const root = userConfig.root ? resolve9(process.cwd(), userConfig.root) : process.cwd();
+        const candidates = findRouterFiles(root);
+        if (candidates.length === 1) {
+          const abs = candidates[0];
+          routerRef.path = (abs.startsWith(root) ? "./" + abs.slice(root.length + 1) : abs).replaceAll("\\", "/");
+        } else if (candidates.length > 1) {
+          const list = candidates.map(
+            (f) => "  - " + (f.startsWith(root) ? f.slice(root.length + 1) : f)
+          ).join("\n");
+          throw new Error(`[rsc-router] Multiple routers found:
+${list}`);
         }
-      });
-    }
-    const rscOption = nodeOptions.rsc ?? true;
-    if (rscOption !== false) {
-      const { default: rsc } = await import("@vitejs/plugin-rsc");
-      const userEntries = typeof rscOption === "boolean" ? {} : rscOption.entries || {};
-      const finalEntries = {
-        client: userEntries.client ?? VIRTUAL_IDS.browser,
-        ssr: userEntries.ssr ?? VIRTUAL_IDS.ssr,
-        rsc: userEntries.rsc ?? VIRTUAL_IDS.rsc
-      };
-      rscEntryPath = userEntries.rsc ?? null;
-      let hasWarnedDuplicate = false;
-      plugins.push({
-        name: "@rangojs/router:rsc-integration",
-        enforce: "pre",
-        config() {
-          const useVirtualClient = finalEntries.client === VIRTUAL_IDS.browser;
-          const useVirtualSSR = finalEntries.ssr === VIRTUAL_IDS.ssr;
-          const useVirtualRSC = finalEntries.rsc === VIRTUAL_IDS.rsc;
-          return {
-            // Exclude rsc-router modules from optimization to prevent module duplication
-            // This ensures the same Context instance is used by both browser entry and RSC proxy modules
-            optimizeDeps: {
-              exclude: excludeDeps,
-              esbuildOptions: sharedEsbuildOptions
-            },
-            build: {
-              rollupOptions: { onwarn }
-            },
-            resolve: {
-              alias: rangoAliases
-            },
-            environments: {
-              client: {
-                build: {
-                  rollupOptions: {
-                    output: {
-                      manualChunks: getManualChunks
-                    }
-                  }
-                },
-                // Always exclude rsc-router modules, conditionally add virtual entry
-                optimizeDeps: {
-                  // Pre-bundle React and rsc-html-stream to prevent late discovery
-                  // triggering ERR_OUTDATED_OPTIMIZED_DEP on cold starts
-                  include: [
-                    "react",
-                    "react-dom",
-                    "react/jsx-runtime",
-                    "react/jsx-dev-runtime",
-                    "rsc-html-stream/client"
-                  ],
-                  exclude: excludeDeps,
-                  esbuildOptions: sharedEsbuildOptions,
-                  ...useVirtualClient && {
-                    // Tell Vite to scan the virtual entry for dependencies
-                    entries: [VIRTUAL_IDS.browser]
-                  }
-                }
-              },
-              ...useVirtualSSR && {
-                ssr: {
-                  optimizeDeps: {
-                    entries: [VIRTUAL_IDS.ssr],
-                    // Pre-bundle all SSR deps to prevent late discovery triggering ERR_OUTDATED_OPTIMIZED_DEP
-                    include: [
-                      "react",
-                      "react-dom",
-                      "react-dom/server.edge",
-                      "react-dom/static.edge",
-                      "react/jsx-runtime",
-                      "react/jsx-dev-runtime",
-                      "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge"
-                    ],
-                    exclude: excludeDeps,
-                    esbuildOptions: sharedEsbuildOptions
+      }
+    });
+    const finalEntries = {
+      client: VIRTUAL_IDS.browser,
+      ssr: VIRTUAL_IDS.ssr,
+      rsc: VIRTUAL_IDS.rsc
+    };
+    const { default: rsc } = await import("@vitejs/plugin-rsc");
+    let hasWarnedDuplicate = false;
+    plugins.push({
+      name: "@rangojs/router:rsc-integration",
+      enforce: "pre",
+      config() {
+        return {
+          optimizeDeps: {
+            exclude: excludeDeps,
+            esbuildOptions: sharedEsbuildOptions
+          },
+          build: {
+            rollupOptions: { onwarn }
+          },
+          resolve: {
+            alias: rangoAliases
+          },
+          environments: {
+            client: {
+              build: {
+                rollupOptions: {
+                  output: {
+                    manualChunks: getManualChunks
                   }
                 }
               },
-              ...useVirtualRSC && {
-                rsc: {
-                  optimizeDeps: {
-                    entries: [VIRTUAL_IDS.rsc],
-                    // Pre-bundle all RSC deps to prevent late discovery triggering ERR_OUTDATED_OPTIMIZED_DEP
-                    include: [
-                      "react",
-                      "react/jsx-runtime",
-                      "react/jsx-dev-runtime",
-                      "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
-                    ],
-                    esbuildOptions: sharedEsbuildOptions
-                  }
-                }
+              optimizeDeps: {
+                include: [
+                  "react",
+                  "react-dom",
+                  "react/jsx-runtime",
+                  "react/jsx-dev-runtime",
+                  "rsc-html-stream/client"
+                ],
+                exclude: excludeDeps,
+                esbuildOptions: sharedEsbuildOptions,
+                entries: [VIRTUAL_IDS.browser]
+              }
+            },
+            ssr: {
+              optimizeDeps: {
+                entries: [VIRTUAL_IDS.ssr],
+                include: [
+                  "react",
+                  "react-dom",
+                  "react-dom/server.edge",
+                  "react-dom/static.edge",
+                  "react/jsx-runtime",
+                  "react/jsx-dev-runtime",
+                  "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge"
+                ],
+                exclude: excludeDeps,
+                esbuildOptions: sharedEsbuildOptions
+              }
+            },
+            rsc: {
+              optimizeDeps: {
+                entries: [VIRTUAL_IDS.rsc],
+                include: [
+                  "react",
+                  "react/jsx-runtime",
+                  "react/jsx-dev-runtime",
+                  "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
+                ],
+                esbuildOptions: sharedEsbuildOptions
               }
             }
-          };
-        },
-        configResolved(config) {
-          if (showBanner) {
-            const mode = config.command === "serve" ? process.argv.includes("preview") ? "preview" : "dev" : "build";
-            printBanner(mode, "node", rangoVersion);
-          }
-          const rscMinimalCount = config.plugins.filter(
-            (p) => p.name === "rsc:minimal"
-          ).length;
-          if (rscMinimalCount > 1 && !hasWarnedDuplicate) {
-            hasWarnedDuplicate = true;
-            console.warn(
-              "[rsc-router] Duplicate @vitejs/plugin-rsc detected. Remove rsc() from your config or use rango({ rsc: false }) for manual configuration."
-            );
           }
+        };
+      },
+      configResolved(config) {
+        if (showBanner) {
+          const mode = config.command === "serve" ? process.argv.includes("preview") ? "preview" : "dev" : "build";
+          printBanner(mode, "node", rangoVersion);
         }
-      });
-      plugins.push(createVirtualEntriesPlugin(finalEntries, routerRef));
-      plugins.push(
-        rsc({
-          entries: finalEntries
-        })
-      );
-    }
+        const rscMinimalCount = config.plugins.filter(
+          (p) => p.name === "rsc:minimal"
+        ).length;
+        if (rscMinimalCount > 1 && !hasWarnedDuplicate) {
+          hasWarnedDuplicate = true;
+          console.warn(
+            "[rsc-router] Duplicate @vitejs/plugin-rsc detected. Remove rsc() from your vite config \u2014 rango() includes it automatically."
+          );
+        }
+      }
+    });
+    plugins.push(createVirtualEntriesPlugin(finalEntries, routerRef));
+    plugins.push(performanceTracksPlugin());
+    plugins.push(
+      rsc({
+        entries: finalEntries
+      })
+    );
+    plugins.push(clientRefDedup());
   }
   plugins.push({
     name: "@rangojs/router:client-component-hmr",
@@ -4991,22 +5431,102 @@ ${list}`
   plugins.push(createVersionPlugin());
   const discoveryEntryPath = preset !== "cloudflare" ? routerRef.path : void 0;
   const discoveryRouterRef = preset !== "cloudflare" ? routerRef : void 0;
-  const injectorEntryPath = rscEntryPath ?? (preset === "cloudflare" ? void 0 : null);
-  if (injectorEntryPath !== null) {
-    plugins.push(createVersionInjectorPlugin(injectorEntryPath));
+  if (preset === "cloudflare") {
+    plugins.push(createVersionInjectorPlugin(void 0));
   }
   plugins.push(createCjsToEsmPlugin());
   plugins.push(
     createRouterDiscoveryPlugin(discoveryEntryPath, {
       routerPathRef: discoveryRouterRef,
       enableBuildPrerender: prerenderEnabled,
-      staticRouteTypesGeneration: resolvedOptions.staticRouteTypesGeneration,
-      include: resolvedOptions.include,
-      exclude: resolvedOptions.exclude
+      buildEnv: options?.buildEnv,
+      preset
     })
   );
   return plugins;
 }
+
+// src/vite/plugins/refresh-cmd.ts
+function poke() {
+  return {
+    name: "vite-plugin-poke",
+    apply: "serve",
+    configureServer(server) {
+      const stdin = process.stdin;
+      const debug = process.env.RANGO_POKE_DEBUG === "1";
+      const triggerReload = (source) => {
+        server.hot.send({ type: "full-reload", path: "*" });
+        server.config.logger.info(`  browser reload (${source})`, {
+          timestamp: true
+        });
+      };
+      const toBuffer = (chunk) => {
+        return typeof chunk === "string" ? Buffer.from(chunk, "utf8") : chunk;
+      };
+      const formatChunk = (chunk) => {
+        const data = toBuffer(chunk);
+        const hex = Array.from(data).map((byte) => `0x${byte.toString(16).padStart(2, "0")}`).join(" ");
+        const ascii = Array.from(data).map((byte) => {
+          if (byte >= 32 && byte <= 126) return String.fromCharCode(byte);
+          if (byte === 10) return "\\n";
+          if (byte === 13) return "\\r";
+          if (byte === 9) return "\\t";
+          return ".";
+        }).join("");
+        return `len=${data.length} hex=[${hex}] ascii="${ascii}"`;
+      };
+      const readCtrlR = (chunk) => {
+        const data = typeof chunk === "string" ? Buffer.from(chunk, "utf8") : chunk;
+        return data.length === 1 && data[0] === 18;
+      };
+      const readSubmittedCommands = (chunk) => {
+        const text = toBuffer(chunk).toString("utf8").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+        if (!text.includes("\n")) return [];
+        const lines = text.split("\n");
+        lines.pop();
+        return lines;
+      };
+      if (debug) {
+        server.config.logger.info(
+          `  poke debug enabled (isTTY=${stdin.isTTY ? "yes" : "no"}, isRaw=${stdin.isTTY ? stdin.isRaw ? "yes" : "no" : "n/a"})`,
+          { timestamp: true }
+        );
+      }
+      if (stdin.isTTY) {
+        server.config.logger.info(
+          "  poke ready: press e + enter to reload browser (ctrl+r also works when available)",
+          { timestamp: true }
+        );
+      }
+      const onData = (data) => {
+        if (debug) {
+          server.config.logger.info(`  poke stdin ${formatChunk(data)}`, {
+            timestamp: true
+          });
+        }
+        if (readCtrlR(data)) {
+          triggerReload("ctrl+r");
+          return;
+        }
+        for (const command of readSubmittedCommands(data)) {
+          if (command === "e") {
+            triggerReload("e+enter");
+            return;
+          }
+          if (command === "\x1Br") {
+            triggerReload("option+r+enter");
+            return;
+          }
+        }
+      };
+      stdin.on("data", onData);
+      server.httpServer?.on("close", () => {
+        stdin.off("data", onData);
+      });
+    }
+  };
+}
 export {
+  poke,
   rango
 };