@rangojs/router 0.0.0-experimental.259 → 0.0.0-experimental.26

package/dist/vite/index.js

@@ -1,3 +1,7 @@
+// src/vite/rango.ts
+import { readFileSync as readFileSync7 } from "node:fs";
+import { resolve as resolve9 } from "node:path";
+
 // src/vite/plugins/expose-action-id.ts
 import MagicString from "magic-string";
 import path2 from "node:path";
@@ -353,10 +357,10 @@ import path4 from "node:path";
 function isDirectivePrologueStatement(node) {
   return node?.type === "ExpressionStatement" && typeof node.directive === "string";
 }
-function findImportInsertionPos(code, parseAst3) {
+function findImportInsertionPos(code, parseAst4) {
   let program;
   try {
-    program = parseAst3(code, { jsx: true });
+    program = parseAst4(code, { jsx: true });
   } catch {
     return 0;
   }
@@ -393,10 +397,10 @@ function walkNode(node, parent, ancestors, enter) {
   }
   ancestors.pop();
 }
-function findHandlerCalls(code, fnName, parseAst3) {
+function findHandlerCalls(code, fnName, parseAst4) {
   let program;
   try {
-    program = parseAst3(code, { jsx: true });
+    program = parseAst4(code, { jsx: true });
   } catch {
     return [];
   }
@@ -468,18 +472,18 @@ function getImportedLocalNamesFromProgram(program, importedName) {
   }
   return localNames;
 }
-function getImportedLocalNames(code, importedName, parseAst3) {
+function getImportedLocalNames(code, importedName, parseAst4) {
   try {
-    const program = parseAst3(code, { jsx: true });
+    const program = parseAst4(code, { jsx: true });
     return getImportedLocalNamesFromProgram(program, importedName);
   } catch {
     return /* @__PURE__ */ new Set();
   }
 }
-function extractImportDeclarations(code, parseAst3) {
+function extractImportDeclarations(code, parseAst4) {
   let program;
   try {
-    program = parseAst3(code, { jsx: true });
+    program = parseAst4(code, { jsx: true });
   } catch {
     return [];
   }
@@ -531,10 +535,10 @@ function isSafeVariableDeclaration(node, handlerNames) {
     (d) => isSafeDeclaratorInit(d.init) && !(d.init?.type === "CallExpression" && d.init.callee?.type === "Identifier" && handlerNames.has(d.init.callee.name))
   );
 }
-function extractModuleLevelDeclarations(code, parseAst3, handlerNames) {
+function extractModuleLevelDeclarations(code, parseAst4, handlerNames) {
   let program;
   try {
-    program = parseAst3(code, { jsx: true });
+    program = parseAst4(code, { jsx: true });
   } catch {
     return [];
   }
@@ -565,17 +569,17 @@ function extractModuleLevelDeclarations(code, parseAst3, handlerNames) {
   }
   return declarations;
 }
-function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtualRegistry, moduleId, parseAst3) {
-  const sites = findHandlerCalls(code, fnName, parseAst3);
+function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtualRegistry, moduleId, parseAst4) {
+  const sites = findHandlerCalls(code, fnName, parseAst4);
   const inlineSites = sites.filter((site) => site.exportInfo === null);
   if (inlineSites.length === 0) return false;
-  const imports = extractImportDeclarations(code, parseAst3);
-  const staticNames = getImportedLocalNames(code, "Static", parseAst3);
-  const prerenderNames = getImportedLocalNames(code, "Prerender", parseAst3);
+  const imports = extractImportDeclarations(code, parseAst4);
+  const staticNames = getImportedLocalNames(code, "Static", parseAst4);
+  const prerenderNames = getImportedLocalNames(code, "Prerender", parseAst4);
   const handlerNames = /* @__PURE__ */ new Set([...staticNames, ...prerenderNames]);
   const declarations = extractModuleLevelDeclarations(
     code,
-    parseAst3,
+    parseAst4,
     handlerNames
   );
   const lineCounts = /* @__PURE__ */ new Map();
@@ -600,7 +604,7 @@ function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtu
   }
   if (importStatements.length > 0) {
     const importBlock = importStatements.join("\n") + "\n";
-    const insertionPos = findImportInsertionPos(code, parseAst3);
+    const insertionPos = findImportInsertionPos(code, parseAst4);
     if (insertionPos === 0) {
       s.prepend(importBlock);
     } else {
@@ -1101,6 +1105,7 @@ ${lazyImports.join(",\n")}
     async buildStart() {
       if (!isBuild) return;
       const fs2 = await import("node:fs/promises");
+      const SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", "dist", "build", "coverage"]);
       async function scanDir(dir) {
         const results = [];
         try {
@@ -1108,7 +1113,7 @@ ${lazyImports.join(",\n")}
           for (const entry of entries) {
             const fullPath = path4.join(dir, entry.name);
             if (entry.isDirectory()) {
-              if (entry.name !== "node_modules") {
+              if (!SKIP_DIRS.has(entry.name) && !entry.name.startsWith(".")) {
                 results.push(...await scanDir(fullPath));
               }
             } else if (/\.(ts|tsx|js|jsx)$/.test(entry.name)) {
@@ -1120,8 +1125,7 @@ ${lazyImports.join(",\n")}
         return results;
       }
       try {
-        const srcDir = path4.join(projectRoot, "src");
-        const files = await scanDir(srcDir);
+        const files = await scanDir(projectRoot);
         for (const filePath of files) {
           const content = await fs2.readFile(filePath, "utf-8");
           if (!content.includes("createLoader")) continue;
@@ -1397,6 +1401,237 @@ ${lazyImports.join(",\n")}
   };
 }
 
+// src/vite/plugins/use-cache-transform.ts
+import path5 from "node:path";
+import MagicString5 from "magic-string";
+var CACHE_RUNTIME_IMPORT = "@rangojs/router/cache-runtime";
+var LAYOUT_TEMPLATE_PATTERN = /\/(layout|template)\.(tsx?|jsx?)$/;
+function useCacheTransform() {
+  let projectRoot = "";
+  let isBuild = false;
+  let rscTransforms = null;
+  return {
+    name: "@rangojs/router:use-cache",
+    enforce: "post",
+    configResolved(config) {
+      projectRoot = config.root;
+      isBuild = config.command === "build";
+    },
+    async transform(code, id) {
+      if (this.environment?.name !== "rsc") return;
+      if (!code.includes("use cache")) return;
+      if (id.includes("/node_modules/") || id.startsWith("\0")) return;
+      if (!/\.(tsx?|jsx?|mjs)$/.test(id)) return;
+      if (!rscTransforms) {
+        try {
+          rscTransforms = await import("@vitejs/plugin-rsc/transforms");
+        } catch {
+          return;
+        }
+      }
+      const {
+        hasDirective,
+        transformWrapExport,
+        transformHoistInlineDirective
+      } = rscTransforms;
+      let ast;
+      try {
+        const { parseAst: parseAst4 } = await import("vite");
+        ast = parseAst4(code);
+      } catch {
+        return;
+      }
+      const filePath = normalizePath(path5.relative(projectRoot, id));
+      const isLayoutOrTemplate = LAYOUT_TEMPLATE_PATTERN.test(id);
+      if (hasDirective(ast.body, "use cache")) {
+        return transformFileLevelUseCache(
+          code,
+          ast,
+          filePath,
+          id,
+          isBuild,
+          isLayoutOrTemplate,
+          transformWrapExport
+        );
+      }
+      const functionResult = transformFunctionLevelUseCache(
+        code,
+        ast,
+        filePath,
+        id,
+        isBuild,
+        transformHoistInlineDirective
+      );
+      warnOnNearMissDirectives(ast, id, this.warn.bind(this));
+      if (functionResult) return functionResult;
+    }
+  };
+}
+function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLayoutOrTemplate, transformWrapExport) {
+  const nonFunctionExports = [];
+  const { exportNames, output } = transformWrapExport(code, ast, {
+    runtime: (value, name) => {
+      const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
+      return `__rango_registerCachedFunction(${value}, ${JSON.stringify(funcId)}, "default")`;
+    },
+    rejectNonAsyncFunction: false,
+    filter: (name, meta) => {
+      if (name === "default" && isLayoutOrTemplate) return false;
+      if (meta.isFunction === false) {
+        nonFunctionExports.push(name);
+        return false;
+      }
+      return true;
+    }
+  });
+  if (nonFunctionExports.length > 0) {
+    throw new Error(
+      `[rango:use-cache] File-level "use cache" in ${sourceId} cannot wrap non-function export${nonFunctionExports.length > 1 ? "s" : ""}: ${nonFunctionExports.map((n) => `"${n}"`).join(", ")}. Only function exports can be cached. Either remove "use cache" from the file level and add it inside individual functions, or move the non-function exports to a separate module.`
+    );
+  }
+  if (exportNames.length === 0) {
+    const s = new MagicString5(code);
+    const directive2 = findFileLevelDirective(ast);
+    if (directive2) {
+      s.overwrite(
+        directive2.start,
+        directive2.end,
+        `/* "use cache" -- wrapped by rango */`
+      );
+      return {
+        code: s.toString(),
+        map: s.generateMap({ source: sourceId, hires: "boundary" })
+      };
+    }
+    return;
+  }
+  output.prepend(
+    `import { registerCachedFunction as __rango_registerCachedFunction } from ${JSON.stringify(CACHE_RUNTIME_IMPORT)};
+`
+  );
+  const directive = findFileLevelDirective(ast);
+  if (directive) {
+    output.overwrite(
+      directive.start,
+      directive.end,
+      `/* "use cache" -- wrapped by rango */`
+    );
+  }
+  return {
+    code: output.toString(),
+    map: output.generateMap({ source: sourceId, hires: "boundary" })
+  };
+}
+function transformFunctionLevelUseCache(code, ast, filePath, sourceId, isBuild, transformHoistInlineDirective) {
+  try {
+    const { output, names } = transformHoistInlineDirective(code, ast, {
+      directive: /^use cache(:\s*[\w-]+)?$/,
+      runtime: (value, name, meta) => {
+        const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
+        const profileMatch = meta.directiveMatch[1];
+        const profileName = profileMatch ? profileMatch.replace(/^:\s*/, "").trim() : "default";
+        return `__rango_registerCachedFunction(${value}, ${JSON.stringify(funcId)}, ${JSON.stringify(profileName)})`;
+      },
+      rejectNonAsyncFunction: false
+    });
+    if (names.length === 0) return;
+    output.prepend(
+      `import { registerCachedFunction as __rango_registerCachedFunction } from ${JSON.stringify(CACHE_RUNTIME_IMPORT)};
+`
+    );
+    return {
+      code: output.toString(),
+      map: output.generateMap({ source: sourceId, hires: "boundary" })
+    };
+  } catch {
+    return;
+  }
+}
+function findFileLevelDirective(ast) {
+  for (const node of ast.body ?? []) {
+    if (node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string" && node.expression.value.startsWith("use cache")) {
+      return { start: node.start, end: node.end };
+    }
+  }
+  return null;
+}
+var VALID_DIRECTIVE_RE = /^use cache(:\s*[\w-]+)?$/;
+var NEAR_MISS_RE = /^use cache:\s*.+$/;
+function warnOnNearMissDirectives(ast, fileId, warn) {
+  const visit = (node) => {
+    if (!node || typeof node !== "object") return;
+    if (node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string") {
+      const value = node.expression.value;
+      if (value.startsWith("use cache") && NEAR_MISS_RE.test(value) && !VALID_DIRECTIVE_RE.test(value)) {
+        const profilePart = value.slice("use cache:".length).trim();
+        warn(
+          `[rango:use-cache] "${value}" in ${fileId} has an invalid profile name "${profilePart}". Profile names must match [a-zA-Z0-9_-]+. This directive will be ignored.`
+        );
+      }
+    }
+    for (const key of Object.keys(node)) {
+      const child = node[key];
+      if (Array.isArray(child)) {
+        for (const item of child) {
+          visit(item);
+        }
+      } else if (child && typeof child === "object" && child.type) {
+        visit(child);
+      }
+    }
+  };
+  for (const node of ast.body ?? []) {
+    visit(node);
+  }
+}
+
+// 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 {
@@ -1503,309 +1738,66 @@ function getVirtualVersionContent(version) {
   return `export const VERSION = ${JSON.stringify(version)};`;
 }
 
-// src/vite/plugins/version-plugin.ts
-function createVersionPlugin() {
-  const buildVersion = Date.now().toString(16);
-  let currentVersion = buildVersion;
-  let isDev = false;
-  let server = null;
-  return {
-    name: "@rangojs/router:version",
-    enforce: "pre",
-    configResolved(config) {
-      isDev = config.command === "serve";
+// src/vite/utils/package-resolution.ts
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+
+// package.json
+var package_default = {
+  name: "@rangojs/router",
+  version: "0.0.0-experimental.26",
+  description: "Django-inspired RSC router with composable URL patterns",
+  keywords: [
+    "react",
+    "react-server-components",
+    "router",
+    "rsc",
+    "vite"
+  ],
+  homepage: "https://github.com/ivogt/vite-rsc#readme",
+  bugs: {
+    url: "https://github.com/ivogt/vite-rsc/issues"
+  },
+  license: "MIT",
+  author: "Ivo Todorov",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/ivogt/vite-rsc.git",
+    directory: "packages/rangojs-router"
+  },
+  bin: {
+    rango: "./dist/bin/rango.js"
+  },
+  files: [
+    "src",
+    "!src/**/__tests__",
+    "!src/**/__mocks__",
+    "!src/**/*.test.ts",
+    "!src/**/*.test.tsx",
+    "dist",
+    "skills",
+    "AGENTS.md",
+    "README.md"
+  ],
+  type: "module",
+  exports: {
+    ".": {
+      types: "./src/index.rsc.ts",
+      "react-server": "./src/index.rsc.ts",
+      default: "./src/index.ts"
     },
-    configureServer(devServer) {
-      server = devServer;
+    "./server": {
+      types: "./src/server.ts",
+      import: "./src/server.ts"
     },
-    resolveId(id) {
-      if (id === VIRTUAL_IDS.version) {
-        return "\0" + id;
-      }
-      return null;
+    "./client": {
+      types: "./src/client.tsx",
+      "react-server": "./src/client.rsc.tsx",
+      default: "./src/client.tsx"
     },
-    load(id) {
-      if (id === "\0" + VIRTUAL_IDS.version) {
-        return getVirtualVersionContent(currentVersion);
-      }
-      return null;
-    },
-    // Track RSC module changes and update version
-    hotUpdate(ctx) {
-      if (!isDev) return;
-      const isRscModule = this.environment?.name === "rsc";
-      if (isRscModule && ctx.modules.length > 0) {
-        currentVersion = Date.now().toString(16);
-        console.log(
-          `[rsc-router] RSC module changed, version updated: ${currentVersion}`
-        );
-        if (server) {
-          const rscEnv = server.environments?.rsc;
-          if (rscEnv?.moduleGraph) {
-            const versionMod = rscEnv.moduleGraph.getModuleById(
-              "\0" + VIRTUAL_IDS.version
-            );
-            if (versionMod) {
-              rscEnv.moduleGraph.invalidateModule(versionMod);
-            }
-          }
-        }
-      }
-    }
-  };
-}
-
-// src/vite/plugins/virtual-stub-plugin.ts
-function createVirtualStubPlugin() {
-  const STUB_PREFIXES = [
-    "virtual:rsc-router/",
-    "virtual:entry-",
-    "virtual:vite-rsc/"
-  ];
-  return {
-    name: "@rangojs/router:virtual-stubs",
-    resolveId(id) {
-      if (STUB_PREFIXES.some((p) => id.startsWith(p))) {
-        return "\0stub:" + id;
-      }
-      return null;
-    },
-    load(id) {
-      if (id.startsWith("\0stub:")) {
-        return "export default {}";
-      }
-      return null;
-    }
-  };
-}
-
-// src/vite/plugins/client-ref-hashing.ts
-import { relative, posix } 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/";
-var FS_PREFIX = "/@fs/";
-function computeProductionHash(projectRoot, refKey) {
-  let toHash;
-  if (refKey.startsWith(CLIENT_PKG_PROXY_PREFIX)) {
-    toHash = refKey.slice(CLIENT_PKG_PROXY_PREFIX.length);
-  } else if (refKey.startsWith(CLIENT_IN_SERVER_PKG_PROXY_PREFIX)) {
-    const absPath = decodeURIComponent(
-      refKey.slice(CLIENT_IN_SERVER_PKG_PROXY_PREFIX.length)
-    );
-    toHash = posix.normalize(relative(projectRoot, absPath));
-  } else if (refKey.startsWith(FS_PREFIX)) {
-    const absPath = refKey.slice(FS_PREFIX.length - 1);
-    toHash = posix.normalize(relative(projectRoot, absPath));
-  } else if (refKey.startsWith("/")) {
-    toHash = refKey.slice(1);
-  } else {
-    return refKey;
-  }
-  return createHash2("sha256").update(toHash).digest("hex").slice(0, 12);
-}
-var REGISTER_CLIENT_REF_RE = /registerClientReference\(\s*(?:(?:\([^)]*\))|(?:\(\)[\s\S]*?\}))\s*,\s*"([^"]+)"\s*,\s*"[^"]+"\s*\)/g;
-function transformClientRefs(code, projectRoot) {
-  if (!code.includes("registerClientReference")) return null;
-  let hasReplacement = false;
-  const result = code.replace(
-    REGISTER_CLIENT_REF_RE,
-    (match, refKey) => {
-      const hash = computeProductionHash(projectRoot, refKey);
-      if (hash === refKey) return match;
-      hasReplacement = true;
-      return match.replace(`"${refKey}"`, `"${hash}"`);
-    }
-  );
-  return hasReplacement ? result : null;
-}
-function hashClientRefs(projectRoot) {
-  return {
-    name: "@rangojs/router:hash-client-refs",
-    // Run after the RSC plugin's transform (default enforce is normal)
-    enforce: "post",
-    applyToEnvironment(env) {
-      return env.name === "rsc";
-    },
-    transform(code, _id) {
-      const result = transformClientRefs(code, projectRoot);
-      if (result === null) return;
-      return { code: result, map: null };
-    }
-  };
-}
-
-// src/vite/plugins/version-injector.ts
-import { resolve } from "node:path";
-import * as Vite from "vite";
-function createVersionInjectorPlugin(rscEntryPath) {
-  let resolvedEntryPath = "";
-  return {
-    name: "@rangojs/router:version-injector",
-    enforce: "pre",
-    configResolved(config) {
-      let entryPath = rscEntryPath;
-      if (!entryPath) {
-        const rscEnvConfig = config.environments?.["rsc"];
-        const entries = rscEnvConfig?.optimizeDeps?.entries;
-        if (typeof entries === "string") {
-          entryPath = entries;
-        } else if (Array.isArray(entries) && entries.length > 0) {
-          entryPath = entries[0];
-        }
-      }
-      if (entryPath) {
-        resolvedEntryPath = resolve(config.root, entryPath);
-      }
-    },
-    transform(code, id) {
-      if (!resolvedEntryPath) return null;
-      const normalizedId = Vite.normalizePath(id);
-      const normalizedEntry = Vite.normalizePath(resolvedEntryPath);
-      if (normalizedId !== normalizedEntry) {
-        return null;
-      }
-      const prepend = [];
-      let newCode = code;
-      if (!code.includes("virtual:rsc-router/routes-manifest")) {
-        prepend.push(`import "virtual:rsc-router/routes-manifest";`);
-      }
-      const needsVersion = code.includes("createRSCHandler") && !code.includes("@rangojs/router:version") && /createRSCHandler\s*\(\s*\{/.test(code);
-      if (needsVersion) {
-        prepend.push(`import { VERSION } from "@rangojs/router:version";`);
-        newCode = newCode.replace(
-          /createRSCHandler\s*\(\s*\{/,
-          "createRSCHandler({\n  version: VERSION,"
-        );
-      }
-      if (prepend.length === 0 && newCode === code) return null;
-      newCode = prepend.join("\n") + (prepend.length > 0 ? "\n" : "") + newCode;
-      return {
-        code: newCode,
-        map: null
-      };
-    }
-  };
-}
-
-// src/vite/plugins/cjs-to-esm.ts
-function createCjsToEsmPlugin() {
-  return {
-    name: "@rangojs/router:cjs-to-esm",
-    enforce: "pre",
-    transform(code, id) {
-      const cleanId = id.split("?")[0];
-      if (cleanId.includes("vendor/react-server-dom/client.browser.js") || cleanId.includes("vendor\\react-server-dom\\client.browser.js")) {
-        const isProd = process.env.NODE_ENV === "production";
-        const cjsFile = isProd ? "./cjs/react-server-dom-webpack-client.browser.production.js" : "./cjs/react-server-dom-webpack-client.browser.development.js";
-        return {
-          code: `export * from "${cjsFile}";`,
-          map: null
-        };
-      }
-      if ((cleanId.includes("vendor/react-server-dom/cjs/") || cleanId.includes("vendor\\react-server-dom\\cjs\\")) && cleanId.includes("client.browser")) {
-        let transformed = code;
-        const licenseMatch = transformed.match(/^\/\*\*[\s\S]*?\*\//);
-        const license = licenseMatch ? licenseMatch[0] : "";
-        if (license) {
-          transformed = transformed.slice(license.length);
-        }
-        transformed = transformed.replace(/^\s*["']use strict["'];\s*/, "");
-        transformed = transformed.replace(
-          /^\s*["']production["']\s*!==\s*process\.env\.NODE_ENV\s*&&\s*\(function\s*\(\)\s*\{/,
-          ""
-        );
-        transformed = transformed.replace(/\}\)\(\);?\s*$/, "");
-        transformed = transformed.replace(
-          /var\s+React\s*=\s*require\s*\(\s*["']react["']\s*\)\s*,[\s\n]+ReactDOM\s*=\s*require\s*\(\s*["']react-dom["']\s*\)\s*,/g,
-          'import React from "react";\nimport ReactDOM from "react-dom";\nvar '
-        );
-        transformed = transformed.replace(
-          /var\s+ReactDOM\s*=\s*require\s*\(\s*["']react-dom["']\s*\)\s*,/g,
-          'import ReactDOM from "react-dom";\nvar '
-        );
-        transformed = transformed.replace(
-          /exports\.(\w+)\s*=\s*function\s*\(/g,
-          "export function $1("
-        );
-        transformed = transformed.replace(
-          /exports\.(\w+)\s*=/g,
-          "export const $1 ="
-        );
-        transformed = license + "\n" + transformed;
-        return {
-          code: transformed,
-          map: null
-        };
-      }
-      return null;
-    }
-  };
-}
-
-// src/vite/utils/shared-utils.ts
-import * as Vite2 from "vite";
-
-// src/vite/utils/package-resolution.ts
-import { existsSync } from "node:fs";
-import { resolve as resolve2 } from "node:path";
-
-// package.json
-var package_default = {
-  name: "@rangojs/router",
-  version: "0.0.0-experimental.259",
-  description: "Django-inspired RSC router with composable URL patterns",
-  keywords: [
-    "react",
-    "react-server-components",
-    "router",
-    "rsc",
-    "vite"
-  ],
-  homepage: "https://github.com/ivogt/vite-rsc#readme",
-  bugs: {
-    url: "https://github.com/ivogt/vite-rsc/issues"
-  },
-  license: "MIT",
-  author: "Ivo Todorov",
-  repository: {
-    type: "git",
-    url: "git+https://github.com/ivogt/vite-rsc.git",
-    directory: "packages/rangojs-router"
-  },
-  bin: {
-    rango: "./dist/bin/rango.js"
-  },
-  files: [
-    "src",
-    "!src/**/__tests__",
-    "!src/**/__mocks__",
-    "!src/**/*.test.ts",
-    "!src/**/*.test.tsx",
-    "dist",
-    "skills",
-    "CLAUDE.md",
-    "README.md"
-  ],
-  type: "module",
-  exports: {
-    ".": {
-      types: "./src/index.rsc.ts",
-      "react-server": "./src/index.rsc.ts",
-      default: "./src/index.ts"
-    },
-    "./server": {
-      types: "./src/server.ts",
-      import: "./src/server.ts"
-    },
-    "./client": {
-      types: "./src/client.tsx",
-      "react-server": "./src/client.rsc.tsx",
-      default: "./src/client.tsx"
-    },
-    "./browser": {
-      types: "./src/browser/index.ts",
-      default: "./src/browser/index.ts"
+    "./browser": {
+      types: "./src/browser/index.ts",
+      default: "./src/browser/index.ts"
     },
     "./ssr": {
       types: "./src/ssr/index.tsx",
@@ -1914,7 +1906,7 @@ var package_default = {
     vitest: "^4.0.0"
   },
   peerDependencies: {
-    "@cloudflare/vite-plugin": "^1.25.6",
+    "@cloudflare/vite-plugin": "^1.25.0",
     "@vitejs/plugin-rsc": "^0.5.14",
     react: "^18.0.0 || ^19.0.0",
     vite: "^7.3.0"
@@ -1936,7 +1928,7 @@ function getPublishedPackageName() {
 }
 function isInstalledFromNpm() {
   const packageName = getPublishedPackageName();
-  return existsSync(resolve2(process.cwd(), "node_modules", packageName));
+  return existsSync(resolve(process.cwd(), "node_modules", packageName));
 }
 function isWorkspaceDevelopment() {
   return !isInstalledFromNpm();
@@ -1971,413 +1963,122 @@ function getPackageAliases() {
   return aliases;
 }
 
-// src/vite/utils/shared-utils.ts
-var versionEsbuildPlugin = {
-  name: "@rangojs/router-version",
-  setup(build) {
-    build.onResolve({ filter: /^rsc-router:version$/ }, (args) => ({
-      path: args.path,
-      namespace: "@rangojs/router-virtual"
-    }));
-    build.onLoad(
-      { filter: /.*/, namespace: "@rangojs/router-virtual" },
-      () => ({
-        contents: `export const VERSION = "dev";`,
-        loader: "js"
-      })
-    );
-  }
-};
-var sharedEsbuildOptions = {
-  plugins: [versionEsbuildPlugin]
-};
-function createVirtualEntriesPlugin(entries, routerPath) {
-  const virtualModules = {};
-  if (entries.client === VIRTUAL_IDS.browser) {
-    virtualModules[VIRTUAL_IDS.browser] = VIRTUAL_ENTRY_BROWSER;
-  }
-  if (entries.ssr === VIRTUAL_IDS.ssr) {
-    virtualModules[VIRTUAL_IDS.ssr] = VIRTUAL_ENTRY_SSR;
-  }
-  if (entries.rsc === VIRTUAL_IDS.rsc && routerPath) {
-    const absoluteRouterPath = routerPath.startsWith(".") ? "/" + routerPath.slice(2) : routerPath;
-    virtualModules[VIRTUAL_IDS.rsc] = getVirtualEntryRSC(absoluteRouterPath);
-  }
-  return {
-    name: "@rangojs/router:virtual-entries",
-    enforce: "pre",
-    resolveId(id) {
-      if (id in virtualModules) {
-        return "\0" + id;
-      }
-      if (id.startsWith("\0") && id.slice(1) in virtualModules) {
-        return id;
-      }
-      return null;
-    },
-    load(id) {
-      if (id.startsWith("\0virtual:rsc-router/")) {
-        const virtualId = id.slice(1);
-        if (virtualId in virtualModules) {
-          return virtualModules[virtualId];
-        }
-      }
-      return null;
-    }
-  };
-}
-function onwarn(warning, defaultHandler) {
-  if (warning.code === "MODULE_LEVEL_DIRECTIVE" || warning.code === "SOURCEMAP_ERROR" || warning.code === "EMPTY_BUNDLE") {
-    return;
-  }
-  if (warning.message?.includes("Sourcemap is likely to be incorrect")) {
-    return;
-  }
-  if (warning.plugin === "vite:reporter" && warning.message?.includes(
-    "dynamic import will not move module into another chunk"
-  )) {
-    return;
+// src/build/route-types/param-extraction.ts
+function extractParamsFromPattern(pattern) {
+  const params = {};
+  const regex = /:([a-zA-Z_$][\w$]*)(?:\([^)]+\))?(\?)?/g;
+  let match;
+  while ((match = regex.exec(pattern)) !== null) {
+    params[match[1]] = match[2] ? "string?" : "string";
   }
-  defaultHandler(warning);
+  return Object.keys(params).length > 0 ? params : void 0;
 }
-function getManualChunks(id) {
-  const normalized = Vite2.normalizePath(id);
-  if (normalized.includes("node_modules/react/") || normalized.includes("node_modules/react-dom/") || normalized.includes("node_modules/react-server-dom-webpack/") || normalized.includes("node_modules/@vitejs/plugin-rsc/")) {
-    return "react";
-  }
-  const packageName = getPublishedPackageName();
-  if (normalized.includes(`node_modules/${packageName}/`) || normalized.includes("packages/rsc-router/") || normalized.includes("packages/rangojs-router/")) {
-    return "router";
+function formatRouteEntry(key, pattern, _params, search) {
+  const hasSearch = search && Object.keys(search).length > 0;
+  if (!hasSearch) {
+    return `  ${key}: "${pattern}",`;
   }
-  return void 0;
+  const searchBody = Object.entries(search).map(([k, v]) => `${k}: "${v}"`).join(", ");
+  return `  ${key}: { path: "${pattern}", search: { ${searchBody} } },`;
 }
 
-// src/vite/utils/manifest-utils.ts
-function flattenLeafEntries(prefixTree, routeManifest, result) {
-  function visit(node) {
-    const children = node.children || {};
-    if (Object.keys(children).length === 0 && node.routes && node.routes.length > 0) {
-      const routes = {};
-      for (const name of node.routes) {
-        if (name in routeManifest) {
-          routes[name] = routeManifest[name];
-        }
-      }
-      result.push({ staticPrefix: node.staticPrefix, routes });
-    } else {
-      for (const child of Object.values(children)) {
-        visit(child);
-      }
-    }
-  }
-  for (const node of Object.values(prefixTree)) {
-    visit(node);
-  }
+// src/build/route-types/ast-route-extraction.ts
+import ts2 from "typescript";
+
+// src/build/route-types/ast-helpers.ts
+import ts from "typescript";
+function getStringValue(node) {
+  if (ts.isStringLiteral(node)) return node.text;
+  if (ts.isNoSubstitutionTemplateLiteral(node)) return node.text;
+  return null;
 }
-function buildRouteToStaticPrefix(prefixTree, result) {
-  function visit(node) {
-    const sp = node.staticPrefix || "";
-    for (const name of node.routes || []) {
-      result[name] = sp;
-    }
-    for (const child of Object.values(node.children || {})) {
-      visit(child);
-    }
-  }
-  for (const node of Object.values(prefixTree)) {
-    visit(node);
+function extractObjectStringProperties(node) {
+  const result = {};
+  for (const prop of node.properties) {
+    if (!ts.isPropertyAssignment(prop)) continue;
+    const key = ts.isIdentifier(prop.name) ? prop.name.text : ts.isStringLiteral(prop.name) ? prop.name.text : null;
+    if (!key) continue;
+    const val = getStringValue(prop.initializer);
+    if (val !== null) result[key] = val;
   }
-}
-function jsonParseExpression(value) {
-  const json = JSON.stringify(value);
-  const escaped = json.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
-  return `JSON.parse('${escaped}')`;
+  return result;
 }
 
-// src/vite/utils/bundle-analysis.ts
-function findMatchingParenInBundle(code, openParenPos) {
-  let depth = 1;
-  let pos = openParenPos;
-  while (pos < code.length && depth > 0) {
-    const skipped = skipStringOrComment(code, pos);
-    if (skipped > pos) {
-      pos = skipped;
-      continue;
+// src/build/route-types/ast-route-extraction.ts
+function extractRoutesFromSource(code) {
+  const sourceFile = ts2.createSourceFile(
+    "input.tsx",
+    code,
+    ts2.ScriptTarget.Latest,
+    true,
+    ts2.ScriptKind.TSX
+  );
+  const routes = [];
+  function visit(node) {
+    if (ts2.isCallExpression(node)) {
+      const callee = node.expression;
+      const isPath = ts2.isIdentifier(callee) && callee.text === "path" || ts2.isPropertyAccessExpression(callee) && ts2.isIdentifier(callee.expression) && callee.expression.text === "path";
+      if (isPath && node.arguments.length >= 1) {
+        const route = extractRouteFromCallExpression(node);
+        if (route) routes.push(route);
+      }
     }
-    if (code[pos] === "(") depth++;
-    else if (code[pos] === ")") depth--;
-    pos++;
+    ts2.forEachChild(node, visit);
   }
-  return depth === 0 ? pos : -1;
+  visit(sourceFile);
+  return routes;
 }
-function extractHandlerExportsFromChunk(chunkCode, handlerModules, fnName, detectPassthrough) {
-  const handlers = [];
-  for (const [, handlerNames] of handlerModules) {
-    for (const name of handlerNames) {
-      const eName = escapeRegExp(name);
-      const idPattern = new RegExp(
-        `(?<![a-zA-Z0-9_])${eName}\\.\\$\\$id\\s*=\\s*"([^"]+)"`
-      );
-      const match = chunkCode.match(idPattern);
-      if (!match) continue;
-      let isPassthrough = false;
-      if (detectPassthrough) {
-        const eFnName = escapeRegExp(fnName);
-        const callStartRe = new RegExp(
-          `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
-        );
-        const callStart = callStartRe.exec(chunkCode);
-        if (callStart) {
-          const afterOpen = callStart.index + callStart[0].length;
-          const closePos = findMatchingParenInBundle(chunkCode, afterOpen);
-          if (closePos !== -1) {
-            const callBody = chunkCode.slice(callStart.index, closePos);
-            isPassthrough = /passthrough\s*:\s*(!0|true)/.test(callBody);
-          }
+function extractRouteFromCallExpression(node) {
+  const patternNode = node.arguments[0];
+  const pattern = getStringValue(patternNode);
+  if (pattern === null) return null;
+  let name = null;
+  let search;
+  for (let i = 1; i < node.arguments.length; i++) {
+    const arg = node.arguments[i];
+    if (ts2.isObjectLiteralExpression(arg)) {
+      for (const prop of arg.properties) {
+        if (!ts2.isPropertyAssignment(prop)) continue;
+        const propName = ts2.isIdentifier(prop.name) ? prop.name.text : null;
+        if (propName === "name") {
+          name = getStringValue(prop.initializer);
+        } else if (propName === "search" && ts2.isObjectLiteralExpression(prop.initializer)) {
+          search = extractObjectStringProperties(prop.initializer);
         }
       }
-      handlers.push({ name, handlerId: match[1], passthrough: isPassthrough });
     }
   }
-  return handlers;
-}
-function evictHandlerCode(code, exports, fnName, brand) {
-  const originalSize = Buffer.byteLength(code);
-  let modified = code;
-  const eFnName = escapeRegExp(fnName);
-  for (const { name, handlerId, passthrough } of exports) {
-    if (passthrough) continue;
-    const eName = escapeRegExp(name);
-    const callStartRe = new RegExp(
-      `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
-    );
-    const startMatch = callStartRe.exec(modified);
-    if (!startMatch) continue;
-    const afterOpen = startMatch.index + startMatch[0].length;
-    const closePos = findMatchingParenInBundle(modified, afterOpen);
-    if (closePos === -1) continue;
-    let rangeEnd = closePos;
-    while (rangeEnd < modified.length && /\s/.test(modified[rangeEnd]))
-      rangeEnd++;
-    if (modified[rangeEnd] === ";") rangeEnd++;
-    const matched = modified.slice(startMatch.index, rangeEnd);
-    if (!matched.includes(handlerId)) continue;
-    const stub = `const ${name} = { __brand: "${brand}", $$id: "${handlerId}" };`;
-    modified = modified.slice(0, startMatch.index) + stub + modified.slice(rangeEnd);
-    modified = modified.replace(
-      new RegExp(`\\n${eName}\\.\\$\\$id\\s*=\\s*"[^"]+";`),
-      ""
-    );
-  }
-  if (modified === code) return null;
+  if (!name) return null;
+  const params = extractParamsFromPattern(pattern);
   return {
-    code: modified,
-    savedBytes: originalSize - Buffer.byteLength(modified)
+    name,
+    pattern,
+    ...params ? { params } : {},
+    ...search && Object.keys(search).length > 0 ? { search } : {}
   };
 }
 
-// src/vite/utils/prerender-utils.ts
-function escapeRegExp2(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function encodePathParam(value) {
-  return String(value).split("/").map((segment) => encodeURIComponent(segment)).join("/");
-}
-async function runWithConcurrency(items, concurrency, fn) {
-  const limit = Math.max(1, Math.min(concurrency, items.length));
-  if (limit <= 1) {
-    for (const item of items) await fn(item);
-    return;
-  }
-  let nextIndex = 0;
-  async function worker() {
-    while (nextIndex < items.length) {
-      const idx = nextIndex++;
-      await fn(items[idx]);
-    }
-  }
-  await Promise.all(Array.from({ length: limit }, () => worker()));
-}
-function groupByConcurrency(entries) {
-  const map = /* @__PURE__ */ new Map();
-  for (const entry of entries) {
-    const key = entry.concurrency;
-    let group = map.get(key);
-    if (!group) {
-      group = [];
-      map.set(key, group);
-    }
-    group.push(entry);
-  }
-  return Array.from(map.entries(), ([concurrency, items]) => ({
-    concurrency,
-    entries: items
-  }));
-}
-function notifyOnError(registry, error, phase, routeKey, pathname, skipped) {
-  for (const [, routerInstance] of registry) {
-    const onError = routerInstance.onError;
-    if (!onError) continue;
-    const errorObj = error instanceof Error ? error : new Error(String(error));
-    const syntheticUrl = new URL("http://prerender" + (pathname || "/"));
-    const context = {
-      error: errorObj,
-      phase,
-      request: new Request(syntheticUrl),
-      url: syntheticUrl,
-      pathname: syntheticUrl.pathname,
-      method: "GET",
-      routeKey,
-      metadata: skipped ? { skipped: true } : void 0
-    };
-    try {
-      const result = onError(context);
-      if (result instanceof Promise) {
-        result.catch((cbErr) => {
-          console.error(`[Build.onError] Callback error:`, cbErr);
-        });
-      }
-    } catch (cbErr) {
-      console.error(`[Build.onError] Callback error:`, cbErr);
-    }
-    break;
-  }
-}
-
-// src/vite/utils/banner.ts
-var rangoVersion = package_default.version;
-var _bannerPrinted = false;
-function printBanner(mode, preset, version) {
-  if (_bannerPrinted) return;
-  _bannerPrinted = true;
-  const dim = "\x1B[2m";
-  const bold = "\x1B[1m";
-  const reset = "\x1B[0m";
-  const banner = `
-${dim}  \u2726        \u2726          \u2727.           .          .${reset}
-${dim} \u2571${reset}    ${bold}\u2554\u2550\u2557${reset}${dim}      *      \u2571                   \u2726             *${reset}
-${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\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}
-
-   v${version} \xB7 ${preset} \xB7 ${mode}
-`;
-  console.log(banner);
-}
-
-// src/vite/router-discovery.ts
-import { createServer as createViteServer } from "vite";
-import { readFileSync as readFileSync6 } from "node:fs";
-
-// src/build/route-types/param-extraction.ts
-function extractParamsFromPattern(pattern) {
-  const params = {};
-  const regex = /:([a-zA-Z_$][\w$]*)(?:\([^)]+\))?(\?)?/g;
-  let match;
-  while ((match = regex.exec(pattern)) !== null) {
-    params[match[1]] = match[2] ? "string?" : "string";
-  }
-  return Object.keys(params).length > 0 ? params : void 0;
-}
-function formatRouteEntry(key, pattern, _params, search) {
-  const hasSearch = search && Object.keys(search).length > 0;
-  if (!hasSearch) {
-    return `  ${key}: "${pattern}",`;
-  }
-  const searchBody = Object.entries(search).map(([k, v]) => `${k}: "${v}"`).join(", ");
-  return `  ${key}: { path: "${pattern}", search: { ${searchBody} } },`;
-}
-
-// src/build/route-types/ast-route-extraction.ts
-import ts2 from "typescript";
-
-// src/build/route-types/ast-helpers.ts
-import ts from "typescript";
-function getStringValue(node) {
-  if (ts.isStringLiteral(node)) return node.text;
-  if (ts.isNoSubstitutionTemplateLiteral(node)) return node.text;
-  return null;
-}
-function extractObjectStringProperties(node) {
-  const result = {};
-  for (const prop of node.properties) {
-    if (!ts.isPropertyAssignment(prop)) continue;
-    const key = ts.isIdentifier(prop.name) ? prop.name.text : ts.isStringLiteral(prop.name) ? prop.name.text : null;
-    if (!key) continue;
-    const val = getStringValue(prop.initializer);
-    if (val !== null) result[key] = val;
-  }
-  return result;
-}
-
-// src/build/route-types/ast-route-extraction.ts
-function extractRoutesFromSource(code) {
-  const sourceFile = ts2.createSourceFile(
-    "input.tsx",
-    code,
-    ts2.ScriptTarget.Latest,
-    true,
-    ts2.ScriptKind.TSX
-  );
-  const routes = [];
-  function visit(node) {
-    if (ts2.isCallExpression(node)) {
-      const callee = node.expression;
-      const isPath = ts2.isIdentifier(callee) && callee.text === "path" || ts2.isPropertyAccessExpression(callee) && ts2.isIdentifier(callee.expression) && callee.expression.text === "path";
-      if (isPath && node.arguments.length >= 1) {
-        const route = extractRouteFromCallExpression(node);
-        if (route) routes.push(route);
-      }
-    }
-    ts2.forEachChild(node, visit);
-  }
-  visit(sourceFile);
-  return routes;
-}
-function extractRouteFromCallExpression(node) {
-  const patternNode = node.arguments[0];
-  const pattern = getStringValue(patternNode);
-  if (pattern === null) return null;
-  let name = null;
-  let search;
-  for (let i = 1; i < node.arguments.length; i++) {
-    const arg = node.arguments[i];
-    if (ts2.isObjectLiteralExpression(arg)) {
-      for (const prop of arg.properties) {
-        if (!ts2.isPropertyAssignment(prop)) continue;
-        const propName = ts2.isIdentifier(prop.name) ? prop.name.text : null;
-        if (propName === "name") {
-          name = getStringValue(prop.initializer);
-        } else if (propName === "search" && ts2.isObjectLiteralExpression(prop.initializer)) {
-          search = extractObjectStringProperties(prop.initializer);
-        }
-      }
-    }
-  }
-  if (!name) return null;
-  const params = extractParamsFromPattern(pattern);
-  return {
-    name,
-    pattern,
-    ...params ? { params } : {},
-    ...search && Object.keys(search).length > 0 ? { search } : {}
-  };
+// src/route-name.ts
+var AUTO_GENERATED_ROUTE_PREFIX = "$path_";
+var INTERNAL_INCLUDE_SCOPE_PREFIX = "$prefix_";
+function isAutoGeneratedRouteName(name) {
+  return name.split(".").some((segment) => {
+    return segment.startsWith(AUTO_GENERATED_ROUTE_PREFIX) || segment.startsWith(INTERNAL_INCLUDE_SCOPE_PREFIX);
+  });
 }
 
 // src/build/route-types/codegen.ts
 function generateRouteTypesSource(routeManifest, searchSchemas) {
-  const entries = Object.entries(routeManifest).sort(
-    ([a], [b]) => a.localeCompare(b)
-  );
+  const entries = Object.entries(routeManifest).filter(([name]) => !isAutoGeneratedRouteName(name)).sort(([a], [b]) => a.localeCompare(b));
+  const filteredSearchSchemas = searchSchemas ? Object.fromEntries(
+    Object.entries(searchSchemas).filter(
+      ([name]) => !isAutoGeneratedRouteName(name)
+    )
+  ) : void 0;
   const objectBody = entries.map(([name, pattern]) => {
     const key = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : `"${name}"`;
     const params = extractParamsFromPattern(pattern);
-    const search = searchSchemas?.[name];
+    const search = filteredSearchSchemas?.[name];
     return formatRouteEntry(key, pattern, params, search);
   }).join("\n");
   return `// Auto-generated by @rangojs/router - do not edit
@@ -2394,8 +2095,7 @@ declare global {
 }
 
 // src/build/route-types/scan-filter.ts
-import { join, relative as relative2 } from "node:path";
-import { readdirSync } from "node:fs";
+import { join, relative } from "node:path";
 import picomatch from "picomatch";
 var DEFAULT_EXCLUDE_PATTERNS = [
   "**/__tests__/**",
@@ -2414,42 +2114,19 @@ function createScanFilter(root, opts) {
   const includeMatcher = hasInclude ? picomatch(include) : null;
   const excludeMatcher = effectiveExclude.length > 0 ? picomatch(effectiveExclude) : null;
   return (absolutePath) => {
-    const rel = relative2(root, 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";
 
 // src/build/route-types/include-resolution.ts
 import { readFileSync, existsSync as existsSync2 } from "node:fs";
-import { dirname, resolve as resolve3 } from "node:path";
+import { dirname, resolve as resolve2 } from "node:path";
 import ts3 from "typescript";
 function extractNamePrefixFromInclude(node) {
   if (node.arguments.length >= 3) {
@@ -2544,14 +2221,14 @@ function resolveImportPath(importSpec, fromFile) {
   else if (base.endsWith(".mjs")) base = base.slice(0, -4);
   else if (base.endsWith(".jsx")) base = base.slice(0, -4);
   const candidates = [
-    resolve3(dir, base + ".ts"),
-    resolve3(dir, base + ".tsx"),
-    resolve3(dir, base + ".js"),
-    resolve3(dir, base + ".jsx"),
-    resolve3(dir, base + "/index.ts"),
-    resolve3(dir, base + "/index.tsx"),
-    resolve3(dir, base + "/index.js"),
-    resolve3(dir, base + "/index.jsx")
+    resolve2(dir, base + ".ts"),
+    resolve2(dir, base + ".tsx"),
+    resolve2(dir, base + ".js"),
+    resolve2(dir, base + ".jsx"),
+    resolve2(dir, base + "/index.ts"),
+    resolve2(dir, base + "/index.tsx"),
+    resolve2(dir, base + "/index.js"),
+    resolve2(dir, base + "/index.jsx")
   ];
   for (const candidate of candidates) {
     if (existsSync2(candidate)) return candidate;
@@ -2643,6 +2320,9 @@ function buildRouteMapFromBlock(block, fullSource, filePath, visited, searchSche
         diagnosticsOut
       );
     }
+    if (namePrefix === null) {
+      continue;
+    }
     for (const [name, pattern] of Object.entries(childResult.routes)) {
       const prefixedName = namePrefix ? `${namePrefix}.${name}` : name;
       let prefixedPattern;
@@ -2663,7 +2343,7 @@ function buildRouteMapFromBlock(block, fullSource, filePath, visited, searchSche
 }
 function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagnosticsOut) {
   visited = visited ?? /* @__PURE__ */ new Set();
-  const realPath = resolve3(filePath);
+  const realPath = resolve2(filePath);
   const key = variableName ? `${realPath}:${variableName}` : realPath;
   if (visited.has(key)) {
     console.warn(`[rsc-router] Circular include detected, skipping: ${key}`);
@@ -2693,13 +2373,108 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
     searchSchemas,
     diagnosticsOut
   );
+  visited.delete(key);
   return { routes, searchSchemas };
 }
 
 // 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 resolve4, basename as pathBasename } from "node:path";
+import {
+  readFileSync as readFileSync2,
+  writeFileSync,
+  existsSync as existsSync3,
+  unlinkSync,
+  readdirSync
+} from "node:fs";
+import {
+  join as join2,
+  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) ?? [];
+  let count = 0;
+  for (const match of matches) {
+    const routeName = match[1] || match[2];
+    if (routeName && !isAutoGeneratedRouteName(routeName.trim())) {
+      count++;
+    }
+  }
+  return count;
+}
+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.");
+}
+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 = join2(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name === "node_modules" || 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 extractUrlsVariableFromRouter(code) {
   const sourceFile = ts5.createSourceFile(
     "router.tsx",
@@ -2761,95 +2536,657 @@ function buildCombinedRouteMapForRouterFile(routerFilePath) {
     if (!targetFile) {
       return { routes: {}, searchSchemas: {} };
     }
-    return buildCombinedRouteMapWithSearch(targetFile, imported.exportedName);
-  }
-  return buildCombinedRouteMapWithSearch(routerFilePath, urlsVarName);
+    return buildCombinedRouteMapWithSearch(targetFile, imported.exportedName);
+  }
+  return buildCombinedRouteMapWithSearch(routerFilePath, urlsVarName);
+}
+function findRouterFiles(root, filter) {
+  const result = [];
+  findRouterFilesRecursive(root, filter, result);
+  return result;
+}
+function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
+  try {
+    const oldCombinedPath = join2(root, "src", "named-routes.gen.ts");
+    if (existsSync3(oldCombinedPath)) {
+      unlinkSync(oldCombinedPath);
+      console.log(
+        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+      );
+    }
+  } catch {
+  }
+  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 routerBasename = pathBasename(routerFilePath).replace(
+      /\.(tsx?|jsx?)$/,
+      ""
+    );
+    const outPath = join2(
+      dirname2(routerFilePath),
+      `${routerBasename}.named-routes.gen.ts`
+    );
+    const existing = existsSync3(outPath) ? readFileSync2(outPath, "utf-8") : null;
+    if (Object.keys(result.routes).length === 0) {
+      if (!existing) {
+        const emptySource = generateRouteTypesSource({});
+        writeFileSync(outPath, emptySource);
+      }
+      continue;
+    }
+    const hasSearchSchemas = Object.keys(result.searchSchemas).length > 0;
+    const source = generateRouteTypesSource(
+      result.routes,
+      hasSearchSchemas ? result.searchSchemas : void 0
+    );
+    if (existing !== source) {
+      if (opts?.preserveIfLarger && existing) {
+        const existingCount = countPublicRouteEntries(existing);
+        const newCount = Object.keys(result.routes).filter(
+          (name) => !isAutoGeneratedRouteName(name)
+        ).length;
+        if (existingCount > newCount) {
+          continue;
+        }
+      }
+      writeFileSync(outPath, source);
+      console.log(
+        `[rsc-router] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
+      );
+    }
+  }
+}
+
+// src/vite/plugins/version-plugin.ts
+import { parseAst as parseAst3 } from "vite";
+function isCodeModule(id) {
+  return /\.(tsx?|jsx?)($|\?)/.test(id);
+}
+function normalizeModuleId(id) {
+  return id.split("?", 1)[0];
+}
+function getClientModuleSignature(source) {
+  let program;
+  try {
+    program = parseAst3(source, { jsx: true });
+  } catch {
+    return void 0;
+  }
+  let isUseClient = false;
+  for (const node of program.body ?? []) {
+    if (node?.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string") {
+      if (node.expression.value === "use client") {
+        isUseClient = true;
+      }
+      continue;
+    }
+    break;
+  }
+  if (!isUseClient) return void 0;
+  const exports = /* @__PURE__ */ new Set();
+  let hasDefault = false;
+  let hasExportAll = false;
+  const collectBindingNames = (pattern) => {
+    if (!pattern) return;
+    if (pattern.type === "Identifier") {
+      exports.add(pattern.name);
+    } else if (pattern.type === "ObjectPattern") {
+      for (const prop of pattern.properties ?? []) {
+        if (prop?.type === "RestElement") {
+          collectBindingNames(prop.argument);
+        } else {
+          collectBindingNames(prop?.value);
+        }
+      }
+    } else if (pattern.type === "ArrayPattern") {
+      for (const el of pattern.elements ?? []) {
+        if (el?.type === "RestElement") {
+          collectBindingNames(el.argument);
+        } else {
+          collectBindingNames(el);
+        }
+      }
+    }
+  };
+  const collectDeclarationNames = (declaration) => {
+    if (!declaration) return;
+    if (declaration.type === "VariableDeclaration") {
+      for (const decl of declaration.declarations ?? []) {
+        collectBindingNames(decl?.id);
+      }
+      return;
+    }
+    collectBindingNames(declaration.id);
+  };
+  for (const node of program.body ?? []) {
+    if (node?.type === "ExportDefaultDeclaration") {
+      hasDefault = true;
+      continue;
+    }
+    if (node?.type === "ExportAllDeclaration") {
+      hasExportAll = true;
+      continue;
+    }
+    if (node?.type !== "ExportNamedDeclaration") continue;
+    collectDeclarationNames(node.declaration);
+    for (const specifier of node.specifiers ?? []) {
+      const exportedName = specifier?.exported?.name ?? specifier?.exported?.value;
+      if (exportedName === "default") {
+        hasDefault = true;
+      } else if (typeof exportedName === "string") {
+        exports.add(exportedName);
+      }
+    }
+  }
+  return {
+    key: JSON.stringify({
+      default: hasDefault,
+      exportAll: hasExportAll,
+      exports: [...exports].sort()
+    })
+  };
+}
+function createVersionPlugin() {
+  const buildVersion = Date.now().toString(16);
+  let currentVersion = buildVersion;
+  let isDev = false;
+  let server = null;
+  const clientModuleSignatures = /* @__PURE__ */ new Map();
+  const bumpVersion = (reason) => {
+    currentVersion = Date.now().toString(16);
+    console.log(`[rsc-router] ${reason}, version updated: ${currentVersion}`);
+    const rscEnv = server?.environments?.rsc;
+    const versionMod = rscEnv?.moduleGraph?.getModuleById(
+      "\0" + VIRTUAL_IDS.version
+    );
+    if (versionMod) {
+      rscEnv.moduleGraph.invalidateModule(versionMod);
+    }
+  };
+  return {
+    name: "@rangojs/router:version",
+    enforce: "pre",
+    configResolved(config) {
+      isDev = config.command === "serve";
+    },
+    configureServer(devServer) {
+      server = devServer;
+      devServer.watcher.on("unlink", (filePath) => {
+        if (!isDev) return;
+        if (!clientModuleSignatures.has(filePath)) return;
+        clientModuleSignatures.delete(filePath);
+        bumpVersion("Client module removed");
+      });
+    },
+    resolveId(id) {
+      if (id === VIRTUAL_IDS.version) {
+        return "\0" + id;
+      }
+      return null;
+    },
+    load(id) {
+      if (id === "\0" + VIRTUAL_IDS.version) {
+        return getVirtualVersionContent(currentVersion);
+      }
+      return null;
+    },
+    transform(code, id) {
+      if (!isDev || !isCodeModule(id)) return null;
+      const normalizedId = normalizeModuleId(id);
+      if (!code.includes("use client") && !clientModuleSignatures.has(normalizedId)) {
+        return null;
+      }
+      const signature = getClientModuleSignature(code);
+      if (signature) {
+        clientModuleSignatures.set(normalizedId, signature);
+      } else {
+        clientModuleSignatures.delete(normalizedId);
+      }
+      return null;
+    },
+    // Track RSC module changes and update version
+    async hotUpdate(ctx) {
+      if (!isDev) return;
+      const isRscModule = this.environment?.name === "rsc";
+      if (!isRscModule) return;
+      if (isCodeModule(ctx.file)) {
+        const filePath = normalizeModuleId(ctx.file);
+        const previousSignature = clientModuleSignatures.get(filePath);
+        try {
+          const source = await ctx.read();
+          const nextSignature = getClientModuleSignature(source);
+          if (nextSignature) {
+            clientModuleSignatures.set(filePath, nextSignature);
+            if (previousSignature && previousSignature.key === nextSignature.key) {
+              return;
+            }
+          } else {
+            clientModuleSignatures.delete(filePath);
+            if (!previousSignature) {
+              if (ctx.modules.length === 0) return;
+            }
+          }
+        } catch {
+        }
+      } else {
+        if (ctx.modules.length === 0) return;
+      }
+      bumpVersion("RSC module changed");
+    }
+  };
+}
+
+// src/vite/utils/shared-utils.ts
+import * as Vite from "vite";
+var versionEsbuildPlugin = {
+  name: "@rangojs/router-version",
+  setup(build) {
+    build.onResolve({ filter: /^rsc-router:version$/ }, (args) => ({
+      path: args.path,
+      namespace: "@rangojs/router-virtual"
+    }));
+    build.onLoad(
+      { filter: /.*/, namespace: "@rangojs/router-virtual" },
+      () => ({
+        contents: `export const VERSION = "dev";`,
+        loader: "js"
+      })
+    );
+  }
+};
+var sharedEsbuildOptions = {
+  plugins: [versionEsbuildPlugin]
+};
+function createVirtualEntriesPlugin(entries, routerPathRef) {
+  const virtualModules = {};
+  if (entries.client === VIRTUAL_IDS.browser) {
+    virtualModules[VIRTUAL_IDS.browser] = VIRTUAL_ENTRY_BROWSER;
+  }
+  if (entries.ssr === VIRTUAL_IDS.ssr) {
+    virtualModules[VIRTUAL_IDS.ssr] = VIRTUAL_ENTRY_SSR;
+  }
+  const knownIds = new Set(Object.keys(virtualModules));
+  if (entries.rsc === VIRTUAL_IDS.rsc) {
+    knownIds.add(VIRTUAL_IDS.rsc);
+  }
+  return {
+    name: "@rangojs/router:virtual-entries",
+    enforce: "pre",
+    resolveId(id) {
+      if (knownIds.has(id)) {
+        return "\0" + id;
+      }
+      if (id.startsWith("\0") && knownIds.has(id.slice(1))) {
+        return id;
+      }
+      return null;
+    },
+    load(id) {
+      if (id.startsWith("\0virtual:rsc-router/")) {
+        const virtualId = id.slice(1);
+        if (virtualId in virtualModules) {
+          return virtualModules[virtualId];
+        }
+        if (virtualId === VIRTUAL_IDS.rsc && routerPathRef?.path) {
+          const raw = routerPathRef.path.startsWith(".") ? "/" + routerPathRef.path.slice(2) : routerPathRef.path;
+          const absoluteRouterPath = raw.replaceAll("\\", "/");
+          return getVirtualEntryRSC(absoluteRouterPath);
+        }
+      }
+      return null;
+    }
+  };
+}
+function onwarn(warning, defaultHandler) {
+  if (warning.code === "MODULE_LEVEL_DIRECTIVE" || warning.code === "SOURCEMAP_ERROR" || warning.code === "EMPTY_BUNDLE") {
+    return;
+  }
+  if (warning.message?.includes("Sourcemap is likely to be incorrect")) {
+    return;
+  }
+  if (warning.plugin === "vite:reporter" && warning.message?.includes(
+    "dynamic import will not move module into another chunk"
+  )) {
+    return;
+  }
+  defaultHandler(warning);
+}
+function getManualChunks(id) {
+  const normalized = Vite.normalizePath(id);
+  if (normalized.includes("node_modules/react/") || normalized.includes("node_modules/react-dom/") || normalized.includes("node_modules/react-server-dom-webpack/") || normalized.includes("node_modules/@vitejs/plugin-rsc/")) {
+    return "react";
+  }
+  const packageName = getPublishedPackageName();
+  if (normalized.includes(`node_modules/${packageName}/`) || normalized.includes("packages/rsc-router/") || normalized.includes("packages/rangojs-router/")) {
+    return "router";
+  }
+  return void 0;
+}
+
+// src/vite/utils/banner.ts
+var rangoVersion = package_default.version;
+var _bannerPrinted = false;
+function printBanner(mode, preset, version) {
+  if (_bannerPrinted) return;
+  _bannerPrinted = true;
+  const dim = "\x1B[2m";
+  const bold = "\x1B[1m";
+  const reset = "\x1B[0m";
+  const banner = `
+${dim}  \u2726        \u2726          \u2727.           .          .${reset}
+${dim} \u2571${reset}    ${bold}\u2554\u2550\u2557${reset}${dim}      *      \u2571                   \u2726             *${reset}
+${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\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}
+
+   v${version} \xB7 ${preset} \xB7 ${mode}
+`;
+  console.log(banner);
+}
+
+// src/vite/plugins/version-injector.ts
+import { resolve as resolve4 } from "node:path";
+import * as Vite2 from "vite";
+function createVersionInjectorPlugin(rscEntryPath) {
+  let resolvedEntryPath = "";
+  return {
+    name: "@rangojs/router:version-injector",
+    enforce: "pre",
+    configResolved(config) {
+      let entryPath = rscEntryPath;
+      if (!entryPath) {
+        const rscEnvConfig = config.environments?.["rsc"];
+        const entries = rscEnvConfig?.optimizeDeps?.entries;
+        if (typeof entries === "string") {
+          entryPath = entries;
+        } else if (Array.isArray(entries) && entries.length > 0) {
+          entryPath = entries[0];
+        }
+      }
+      if (entryPath) {
+        resolvedEntryPath = resolve4(config.root, entryPath);
+      }
+    },
+    transform(code, id) {
+      if (!resolvedEntryPath) return null;
+      const normalizedId = Vite2.normalizePath(id);
+      const normalizedEntry = Vite2.normalizePath(resolvedEntryPath);
+      if (normalizedId !== normalizedEntry) {
+        return null;
+      }
+      const prepend = [];
+      let newCode = code;
+      if (!code.includes("virtual:rsc-router/routes-manifest")) {
+        prepend.push(`import "virtual:rsc-router/routes-manifest";`);
+      }
+      const needsVersion = code.includes("createRSCHandler") && !code.includes("@rangojs/router:version") && /createRSCHandler\s*\(\s*\{/.test(code);
+      if (needsVersion) {
+        prepend.push(`import { VERSION } from "@rangojs/router:version";`);
+        newCode = newCode.replace(
+          /createRSCHandler\s*\(\s*\{/,
+          "createRSCHandler({\n  version: VERSION,"
+        );
+      }
+      if (prepend.length === 0 && newCode === code) return null;
+      newCode = prepend.join("\n") + (prepend.length > 0 ? "\n" : "") + newCode;
+      return {
+        code: newCode,
+        map: null
+      };
+    }
+  };
+}
+
+// src/vite/plugins/cjs-to-esm.ts
+function createCjsToEsmPlugin() {
+  return {
+    name: "@rangojs/router:cjs-to-esm",
+    enforce: "pre",
+    transform(code, id) {
+      const cleanId = id.split("?")[0];
+      if (cleanId.includes("vendor/react-server-dom/client.browser.js") || cleanId.includes("vendor\\react-server-dom\\client.browser.js")) {
+        const isProd = process.env.NODE_ENV === "production";
+        const cjsFile = isProd ? "./cjs/react-server-dom-webpack-client.browser.production.js" : "./cjs/react-server-dom-webpack-client.browser.development.js";
+        return {
+          code: `export * from "${cjsFile}";`,
+          map: null
+        };
+      }
+      if ((cleanId.includes("vendor/react-server-dom/cjs/") || cleanId.includes("vendor\\react-server-dom\\cjs\\")) && cleanId.includes("client.browser")) {
+        let transformed = code;
+        const licenseMatch = transformed.match(/^\/\*\*[\s\S]*?\*\//);
+        const license = licenseMatch ? licenseMatch[0] : "";
+        if (license) {
+          transformed = transformed.slice(license.length);
+        }
+        transformed = transformed.replace(/^\s*["']use strict["'];\s*/, "");
+        transformed = transformed.replace(
+          /^\s*["']production["']\s*!==\s*process\.env\.NODE_ENV\s*&&\s*\(function\s*\(\)\s*\{/,
+          ""
+        );
+        transformed = transformed.replace(/\}\)\(\);?\s*$/, "");
+        transformed = transformed.replace(
+          /var\s+React\s*=\s*require\s*\(\s*["']react["']\s*\)\s*,[\s\n]+ReactDOM\s*=\s*require\s*\(\s*["']react-dom["']\s*\)\s*,/g,
+          'import React from "react";\nimport ReactDOM from "react-dom";\nvar '
+        );
+        transformed = transformed.replace(
+          /var\s+ReactDOM\s*=\s*require\s*\(\s*["']react-dom["']\s*\)\s*,/g,
+          'import ReactDOM from "react-dom";\nvar '
+        );
+        transformed = transformed.replace(
+          /exports\.(\w+)\s*=\s*function\s*\(/g,
+          "export function $1("
+        );
+        transformed = transformed.replace(
+          /exports\.(\w+)\s*=/g,
+          "export const $1 ="
+        );
+        transformed = license + "\n" + transformed;
+        return {
+          code: transformed,
+          map: null
+        };
+      }
+      return null;
+    }
+  };
+}
+
+// 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";
+
+// src/vite/plugins/virtual-stub-plugin.ts
+function createVirtualStubPlugin() {
+  const STUB_PREFIXES = [
+    "virtual:rsc-router/",
+    "virtual:entry-",
+    "virtual:vite-rsc/"
+  ];
+  return {
+    name: "@rangojs/router:virtual-stubs",
+    resolveId(id) {
+      if (STUB_PREFIXES.some((p) => id.startsWith(p))) {
+        return "\0stub:" + id;
+      }
+      return null;
+    },
+    load(id) {
+      if (id.startsWith("\0stub:")) {
+        return "export default {}";
+      }
+      return null;
+    }
+  };
+}
+
+// src/vite/plugins/client-ref-hashing.ts
+import { relative as relative2 } 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/";
+var FS_PREFIX = "/@fs/";
+function computeProductionHash(projectRoot, refKey) {
+  let toHash;
+  if (refKey.startsWith(CLIENT_PKG_PROXY_PREFIX)) {
+    toHash = refKey.slice(CLIENT_PKG_PROXY_PREFIX.length);
+  } else if (refKey.startsWith(CLIENT_IN_SERVER_PKG_PROXY_PREFIX)) {
+    const absPath = decodeURIComponent(
+      refKey.slice(CLIENT_IN_SERVER_PKG_PROXY_PREFIX.length)
+    );
+    toHash = relative2(projectRoot, absPath).replaceAll("\\", "/");
+  } else if (refKey.startsWith(FS_PREFIX)) {
+    const absPath = refKey.slice(FS_PREFIX.length - 1);
+    toHash = relative2(projectRoot, absPath).replaceAll("\\", "/");
+  } else if (refKey.startsWith("/")) {
+    toHash = refKey.slice(1);
+  } else {
+    return refKey;
+  }
+  return createHash2("sha256").update(toHash).digest("hex").slice(0, 12);
+}
+var REGISTER_CLIENT_REF_RE = /registerClientReference\(\s*(?:(?:\([^)]*\))|(?:\(\)[\s\S]*?\}))\s*,\s*"([^"]+)"\s*,\s*"[^"]+"\s*\)/g;
+function transformClientRefs(code, projectRoot) {
+  if (!code.includes("registerClientReference")) return null;
+  let hasReplacement = false;
+  const result = code.replace(
+    REGISTER_CLIENT_REF_RE,
+    (match, refKey) => {
+      const hash = computeProductionHash(projectRoot, refKey);
+      if (hash === refKey) return match;
+      hasReplacement = true;
+      return match.replace(`"${refKey}"`, `"${hash}"`);
+    }
+  );
+  return hasReplacement ? result : null;
+}
+function hashClientRefs(projectRoot) {
+  return {
+    name: "@rangojs/router:hash-client-refs",
+    // Run after the RSC plugin's transform (default enforce is normal)
+    enforce: "post",
+    applyToEnvironment(env) {
+      return env.name === "rsc";
+    },
+    transform(code, _id) {
+      const result = transformClientRefs(code, projectRoot);
+      if (result === null) return;
+      return { code: result, map: null };
+    }
+  };
 }
-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 {
+
+// src/vite/utils/bundle-analysis.ts
+function findMatchingParenInBundle(code, openParenPos) {
+  let depth = 1;
+  let pos = openParenPos;
+  while (pos < code.length && depth > 0) {
+    const skipped = skipStringOrComment(code, pos);
+    if (skipped > pos) {
+      pos = skipped;
       continue;
     }
+    if (code[pos] === "(") depth++;
+    else if (code[pos] === ")") depth--;
+    pos++;
   }
-  return result;
+  return depth === 0 ? pos : -1;
 }
-function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
-  try {
-    const oldCombinedPath = join2(root, "src", "named-routes.gen.ts");
-    if (existsSync3(oldCombinedPath)) {
-      unlinkSync(oldCombinedPath);
-      console.log(
-        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+function extractHandlerExportsFromChunk(chunkCode, handlerModules, fnName, detectPassthrough) {
+  const handlers = [];
+  for (const [, handlerNames] of handlerModules) {
+    for (const name of handlerNames) {
+      const eName = escapeRegExp(name);
+      const idPattern = new RegExp(
+        `(?<![a-zA-Z0-9_])${eName}\\.\\$\\$id\\s*=\\s*"([^"]+)"`
       );
+      const match = chunkCode.match(idPattern);
+      if (!match) continue;
+      let isPassthrough = false;
+      if (detectPassthrough) {
+        const eFnName = escapeRegExp(fnName);
+        const callStartRe = new RegExp(
+          `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
+        );
+        const callStart = callStartRe.exec(chunkCode);
+        if (callStart) {
+          const afterOpen = callStart.index + callStart[0].length;
+          const closePos = findMatchingParenInBundle(chunkCode, afterOpen);
+          if (closePos !== -1) {
+            const callBody = chunkCode.slice(callStart.index, closePos);
+            isPassthrough = /passthrough\s*:\s*(!0|true)/.test(callBody);
+          }
+        }
+      }
+      handlers.push({ name, handlerId: match[1], passthrough: isPassthrough });
     }
-  } catch {
   }
-  const routerFilePaths = knownRouterFiles ?? findRouterFiles(root);
-  if (routerFilePaths.length === 0) return;
-  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 routerBasename = pathBasename(routerFilePath).replace(
-      /\.(tsx?|jsx?)$/,
-      ""
-    );
-    const outPath = join2(
-      dirname2(routerFilePath),
-      `${routerBasename}.named-routes.gen.ts`
+  return handlers;
+}
+function evictHandlerCode(code, exports, fnName, brand) {
+  const originalSize = Buffer.byteLength(code);
+  let modified = code;
+  const eFnName = escapeRegExp(fnName);
+  for (const { name, handlerId, passthrough } of exports) {
+    if (passthrough) continue;
+    const eName = escapeRegExp(name);
+    const callStartRe = new RegExp(
+      `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
     );
-    const existing = existsSync3(outPath) ? readFileSync2(outPath, "utf-8") : null;
-    if (Object.keys(result.routes).length === 0) {
-      if (!existing) {
-        const emptySource = generateRouteTypesSource({});
-        writeFileSync(outPath, emptySource);
-      }
-      continue;
-    }
-    const hasSearchSchemas = Object.keys(result.searchSchemas).length > 0;
-    const source = generateRouteTypesSource(
-      result.routes,
-      hasSearchSchemas ? result.searchSchemas : void 0
+    const startMatch = callStartRe.exec(modified);
+    if (!startMatch) continue;
+    const afterOpen = startMatch.index + startMatch[0].length;
+    const closePos = findMatchingParenInBundle(modified, afterOpen);
+    if (closePos === -1) continue;
+    let rangeEnd = closePos;
+    while (rangeEnd < modified.length && /\s/.test(modified[rangeEnd]))
+      rangeEnd++;
+    if (modified[rangeEnd] === ";") rangeEnd++;
+    const matched = modified.slice(startMatch.index, rangeEnd);
+    if (!matched.includes(handlerId)) continue;
+    const stub = `const ${name} = { __brand: "${brand}", $$id: "${handlerId}" };`;
+    modified = modified.slice(0, startMatch.index) + stub + modified.slice(rangeEnd);
+    modified = modified.replace(
+      new RegExp(`\\n${eName}\\.\\$\\$id\\s*=\\s*"[^"]+";`),
+      ""
     );
-    if (existing !== source) {
-      if (opts?.preserveIfLarger && existing) {
-        const existingCount = (existing.match(/^\s+["a-zA-Z_$][^:]*:\s*["{]/gm) || []).length;
-        const newCount = Object.keys(result.routes).length;
-        if (existingCount > newCount) {
-          continue;
-        }
-      }
-      writeFileSync(outPath, source);
-      console.log(
-        `[rsc-router] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
-      );
-    }
   }
+  if (modified === code) return null;
+  return {
+    code: modified,
+    savedBytes: originalSize - Buffer.byteLength(modified)
+  };
 }
 
 // src/vite/discovery/state.ts
@@ -2870,8 +3207,8 @@ function createDiscoveryState(entryPath, opts) {
     perRouterTrieMap: /* @__PURE__ */ new Map(),
     perRouterPrecomputedMap: /* @__PURE__ */ new Map(),
     perRouterManifestDataMap: /* @__PURE__ */ new Map(),
-    prerenderCollectedData: null,
-    staticCollectedData: null,
+    prerenderManifestEntries: null,
+    staticManifestEntries: null,
     handlerChunkInfo: null,
     staticHandlerChunkInfo: null,
     rscEntryFileName: null,
@@ -2913,6 +3250,48 @@ function consumeSelfGenWrite(state, filePath) {
   }
 }
 
+// src/vite/utils/manifest-utils.ts
+function flattenLeafEntries(prefixTree, routeManifest, result) {
+  function visit(node) {
+    const children = node.children || {};
+    if (Object.keys(children).length === 0 && node.routes && node.routes.length > 0) {
+      const routes = {};
+      for (const name of node.routes) {
+        if (name in routeManifest) {
+          routes[name] = routeManifest[name];
+        }
+      }
+      result.push({ staticPrefix: node.staticPrefix, routes });
+    } else {
+      for (const child of Object.values(children)) {
+        visit(child);
+      }
+    }
+  }
+  for (const node of Object.values(prefixTree)) {
+    visit(node);
+  }
+}
+function buildRouteToStaticPrefix(prefixTree, result) {
+  function visit(node) {
+    const sp = node.staticPrefix || "";
+    for (const name of node.routes || []) {
+      result[name] = sp;
+    }
+    for (const child of Object.values(node.children || {})) {
+      visit(child);
+    }
+  }
+  for (const node of Object.values(prefixTree)) {
+    visit(node);
+  }
+}
+function jsonParseExpression(value) {
+  const json = JSON.stringify(value);
+  const escaped = json.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+  return `JSON.parse('${escaped}')`;
+}
+
 // src/context-var.ts
 var FORBIDDEN_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
 function contextSet(variables, keyOrVar, value) {
@@ -2922,11 +3301,132 @@ function contextSet(variables, keyOrVar, value) {
         `ctx.set(): "${keyOrVar}" is a reserved key and cannot be used as a variable name.`
       );
     }
-    variables[keyOrVar] = value;
-  } else {
-    variables[keyOrVar.key] = value;
+    variables[keyOrVar] = value;
+  } else {
+    variables[keyOrVar.key] = value;
+  }
+}
+
+// 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, "\\$&");
+}
+function encodePathParam(value) {
+  return String(value).split("/").map((segment) => encodeURIComponent(segment)).join("/");
+}
+function substituteRouteParams(pattern, params, encode = encodeURIComponent) {
+  let result = pattern;
+  for (const [key, value] of Object.entries(params)) {
+    const escaped = escapeRegExp2(key);
+    result = result.replace(
+      new RegExp(`:${escaped}(\\([^)]*\\))?\\??`),
+      encode(value)
+    );
+    result = result.replace(`*${key}`, encode(value));
+  }
+  return result;
+}
+async function runWithConcurrency(items, concurrency, fn) {
+  const limit = Math.max(1, Math.min(concurrency, items.length));
+  if (limit <= 1) {
+    for (const item of items) await fn(item);
+    return;
+  }
+  let nextIndex = 0;
+  async function worker() {
+    while (nextIndex < items.length) {
+      const idx = nextIndex++;
+      await fn(items[idx]);
+    }
+  }
+  await Promise.all(Array.from({ length: limit }, () => worker()));
+}
+function groupByConcurrency(entries) {
+  const map = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const key = entry.concurrency;
+    let group = map.get(key);
+    if (!group) {
+      group = [];
+      map.set(key, group);
+    }
+    group.push(entry);
+  }
+  return Array.from(map.entries(), ([concurrency, items]) => ({
+    concurrency,
+    entries: items
+  }));
+}
+function notifyOnError(registry, error, phase, routeKey, pathname, skipped) {
+  for (const [, routerInstance] of registry) {
+    const onError = routerInstance.onError;
+    if (!onError) continue;
+    const errorObj = error instanceof Error ? error : new Error(String(error));
+    const syntheticUrl = new URL("http://prerender" + (pathname || "/"));
+    const context = {
+      error: errorObj,
+      phase,
+      request: new Request(syntheticUrl),
+      url: syntheticUrl,
+      pathname: syntheticUrl.pathname,
+      method: "GET",
+      routeKey,
+      metadata: skipped ? { skipped: true } : void 0
+    };
+    try {
+      const result = onError(context);
+      if (result instanceof Promise) {
+        result.catch((cbErr) => {
+          console.error(`[Build.onError] Callback error:`, cbErr);
+        });
+      }
+    } catch (cbErr) {
+      console.error(`[Build.onError] Callback error:`, cbErr);
+    }
+    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) {
@@ -2939,18 +3439,8 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const getParamsReverse = (name, params) => {
     const pattern = allRoutes[name];
     if (!pattern) throw new Error(`Unknown route: "${name}"`);
-    let result = pattern;
-    if (params) {
-      for (const [key, value] of Object.entries(params)) {
-        const escaped = escapeRegExp2(key);
-        result = result.replace(
-          new RegExp(`:${escaped}(\\([^)]*\\))?`),
-          encodeURIComponent(value)
-        );
-        result = result.replace(`*${key}`, encodeURIComponent(value));
-      }
-    }
-    return result;
+    if (!params) return pattern;
+    return substituteRouteParams(pattern, params);
   };
   for (const { manifest } of allManifests) {
     if (!manifest.prerenderRoutes) continue;
@@ -2958,15 +3448,17 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
     for (const routeName of manifest.prerenderRoutes) {
       const pattern = manifest.routeManifest[routeName];
       if (!pattern) continue;
+      const def = defs[routeName];
+      const isPassthroughRoute = !!def?.options?.passthrough;
       const hasDynamic = pattern.includes(":") || pattern.includes("*");
       if (!hasDynamic) {
         entries.push({
           urlPath: pattern.replace(/\/$/, "") || "/",
           routeName,
-          concurrency: 1
+          concurrency: 1,
+          isPassthroughRoute
         });
       } else {
-        const def = defs[routeName];
         if (def?.getParams) {
           try {
             const buildVars = {};
@@ -2981,18 +3473,11 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             const concurrency = def.options?.concurrency ?? 1;
             const hasBuildVars = Object.keys(buildVars).length > 0 || Object.getOwnPropertySymbols(buildVars).length > 0;
             for (const params of paramsList) {
-              let url = pattern;
-              for (const [key, value] of Object.entries(
-                params
-              )) {
-                const encoded = encodePathParam(value);
-                const escaped = escapeRegExp2(key);
-                url = url.replace(
-                  new RegExp(`:${escaped}(\\([^)]*\\))?`),
-                  encoded
-                );
-                url = url.replace(`*${key}`, encoded);
-              }
+              let url = substituteRouteParams(
+                pattern,
+                params,
+                encodePathParam
+              );
               if (url.includes("*")) {
                 const wildcardValue = params["*"] ?? params.splat;
                 if (wildcardValue !== void 0) {
@@ -3003,7 +3488,8 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 urlPath: url.replace(/\/$/, "") || "/",
                 routeName,
                 concurrency,
-                ...hasBuildVars ? { buildVars } : {}
+                ...hasBuildVars ? { buildVars } : {},
+                isPassthroughRoute
               });
             }
           } catch (err) {
@@ -3042,7 +3528,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();
@@ -3059,22 +3545,43 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             const result = await routerInstance.matchForPrerender(
               entry.urlPath,
               {},
-              entry.buildVars
+              entry.buildVars,
+              entry.isPassthroughRoute
             );
             if (!result) continue;
+            if (result.passthrough) {
+              const elapsed2 = (performance.now() - startUrl).toFixed(0);
+              console.log(
+                `[rsc-router]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
+              );
+              doneCount++;
+              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(
@@ -3118,7 +3625,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`);
@@ -3129,7 +3636,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;
@@ -3166,7 +3673,13 @@ async function renderStaticHandlers(state, rscEnv, registry) {
             def.$$routePrefix
           );
           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)`
@@ -3203,7 +3716,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`);
@@ -3220,8 +3733,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...`
@@ -3260,22 +3772,30 @@ async function discoverRouters(state, rscEnv) {
     }
   }
   const buildMod = await rscEnv.runner.import("@rangojs/router/build");
-  const generateManifest = buildMod.generateManifest;
-  state.mergedRouteManifest = {};
-  state.mergedPrecomputedEntries = [];
-  state.perRouterManifests = [];
-  state.perRouterManifestDataMap = /* @__PURE__ */ new Map();
-  state.perRouterPrecomputedMap = /* @__PURE__ */ new Map();
-  state.perRouterTrieMap = /* @__PURE__ */ new Map();
+  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 = [];
+  const newPerRouterManifestDataMap = /* @__PURE__ */ new Map();
+  const newPerRouterPrecomputedMap = /* @__PURE__ */ new Map();
+  const newPerRouterTrieMap = /* @__PURE__ */ new Map();
   let mergedRouteAncestry = {};
   let mergedRouteTrailingSlash = {};
   let routerMountIndex = 0;
   const allManifests = [];
   for (const [id, router] of registry) {
-    if (!router.urlpatterns || !generateManifest) {
+    if (!router.urlpatterns || !generateManifestFull) {
       continue;
     }
-    const manifest = generateManifest(router.urlpatterns, routerMountIndex);
+    const manifest = generateManifestFull(router.urlpatterns, routerMountIndex);
     routerMountIndex++;
     allManifests.push({ id, manifest });
     const routeCount = Object.keys(manifest.routeManifest).length;
@@ -3283,7 +3803,7 @@ async function discoverRouters(state, rscEnv) {
       (p) => !p.includes(":") && !p.includes("*")
     ).length;
     const dynamicRoutes = routeCount - staticRoutes;
-    Object.assign(state.mergedRouteManifest, manifest.routeManifest);
+    Object.assign(newMergedRouteManifest, manifest.routeManifest);
     let factoryOnlyPrefixes;
     if (router.__sourceFile) {
       const staticParsed = buildCombinedRouteMapForRouterFile(
@@ -3301,7 +3821,7 @@ async function discoverRouters(state, rscEnv) {
       }
       if (factoryOnlyPrefixes.size === 0) factoryOnlyPrefixes = void 0;
     }
-    state.perRouterManifests.push({
+    newPerRouterManifests.push({
       id,
       routeManifest: manifest.routeManifest,
       routeSearchSchemas: manifest.routeSearchSchemas,
@@ -3317,16 +3837,16 @@ async function discoverRouters(state, rscEnv) {
     flattenLeafEntries(
       manifest.prefixTree,
       manifest.routeManifest,
-      state.mergedPrecomputedEntries
+      newMergedPrecomputedEntries
     );
-    state.perRouterManifestDataMap.set(id, manifest.routeManifest);
+    newPerRouterManifestDataMap.set(id, manifest.routeManifest);
     const routerPrecomputed = [];
     flattenLeafEntries(
       manifest.prefixTree,
       manifest.routeManifest,
       routerPrecomputed
     );
-    state.perRouterPrecomputedMap.set(id, routerPrecomputed);
+    newPerRouterPrecomputedMap.set(id, routerPrecomputed);
     console.log(
       `[rsc-router] Router "${id}" -> ${routeCount} routes (${staticRoutes} static, ${dynamicRoutes} dynamic)`
     );
@@ -3341,7 +3861,8 @@ async function discoverRouters(state, rscEnv) {
       );
     }
   }
-  if (state.mergedRouteManifest && Object.keys(state.mergedRouteManifest).length > 0) {
+  let newMergedRouteTrie = null;
+  if (Object.keys(newMergedRouteManifest).length > 0) {
     const buildRouteTrie = buildMod.buildRouteTrie;
     if (buildRouteTrie && mergedRouteAncestry) {
       const routeToStaticPrefix = {};
@@ -3371,8 +3892,8 @@ async function discoverRouters(state, rscEnv) {
           Object.assign(mergedResponseTypeRoutes, manifest.responseTypeRoutes);
         }
       }
-      state.mergedRouteTrie = buildRouteTrie(
-        state.mergedRouteManifest,
+      newMergedRouteTrie = buildRouteTrie(
+        newMergedRouteManifest,
         mergedRouteAncestry,
         routeToStaticPrefix,
         Object.keys(mergedRouteTrailingSlash).length > 0 ? mergedRouteTrailingSlash : void 0,
@@ -3399,22 +3920,29 @@ async function discoverRouters(state, rscEnv) {
           perRouterPassthroughNames && perRouterPassthroughNames.size > 0 ? perRouterPassthroughNames : void 0,
           manifest.responseTypeRoutes && Object.keys(manifest.responseTypeRoutes).length > 0 ? manifest.responseTypeRoutes : void 0
         );
-        state.perRouterTrieMap.set(id, perRouterTrie);
+        newPerRouterTrieMap.set(id, perRouterTrie);
       }
     }
   }
+  state.mergedRouteManifest = newMergedRouteManifest;
+  state.mergedPrecomputedEntries = newMergedPrecomputedEntries;
+  state.perRouterManifests = newPerRouterManifests;
+  state.perRouterManifestDataMap = newPerRouterManifestDataMap;
+  state.perRouterPrecomputedMap = newPerRouterPrecomputedMap;
+  state.perRouterTrieMap = newPerRouterTrieMap;
+  state.mergedRouteTrie = newMergedRouteTrie;
   await expandPrerenderRoutes(state, rscEnv, registry, allManifests);
   await renderStaticHandlers(state, rscEnv, registry);
   return serverMod;
 }
 
 // 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 join3, 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)) {
-    if (!name.startsWith("$")) {
+    if (!isAutoGeneratedRouteName(name)) {
       filtered[name] = pattern;
     }
   }
@@ -3444,7 +3972,7 @@ function writeCombinedRouteTypesWithTracking(state, opts) {
       ""
     );
     const outPath = join3(routerDir, `${routerBasename}.named-routes.gen.ts`);
-    if (!existsSync4(outPath)) continue;
+    if (!existsSync5(outPath)) continue;
     try {
       const content = readFileSync4(outPath, "utf-8");
       if (content !== preContent.get(outPath)) {
@@ -3458,10 +3986,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)) {
+    if (existsSync5(oldCombinedPath)) {
       unlinkSync2(oldCombinedPath);
       console.log(
         `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
@@ -3505,10 +4033,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}`);
     }
   }
@@ -3537,7 +4065,7 @@ function supplementGenFilesWithRuntimeRoutes(state) {
       ...staticParsed.searchSchemas
     };
     for (const [name, pattern] of Object.entries(routeManifest)) {
-      if (name.startsWith("$")) continue;
+      if (isAutoGeneratedRouteName(name)) continue;
       const dotIdx = name.indexOf(".");
       if (dotIdx <= 0) continue;
       const prefix = name.substring(0, dotIdx + 1);
@@ -3555,10 +4083,10 @@ function supplementGenFilesWithRuntimeRoutes(state) {
       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);
     }
   }
 }
@@ -3582,7 +4110,7 @@ function generateRoutesManifestModule(state) {
         const genPath = join4(
           routerDir,
           `${routerBasename}.named-routes.gen.js`
-        );
+        ).replaceAll("\\", "/");
         const varName = `_r${varIdx++}`;
         genFileImports.push(
           `import { NamedRoutes as ${varName} } from ${JSON.stringify(genPath)};`
@@ -3676,7 +4204,10 @@ function generatePerRouterModule(state, routerId) {
       /\.(tsx?|jsx?)$/,
       ""
     );
-    const genPath = join4(routerDir, `${routerBasename}.named-routes.gen.js`);
+    const genPath = join4(
+      routerDir,
+      `${routerBasename}.named-routes.gen.js`
+    ).replaceAll("\\", "/");
     lines.push(`import { NamedRoutes as _r } from ${JSON.stringify(genPath)};`);
     lines.push(
       `function __flat(r) { const o = {}; for (const [k, v] of Object.entries(r)) o[k] = typeof v === "string" ? v : v.path; return o; }`
@@ -3700,14 +4231,13 @@ 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"
@@ -3728,7 +4258,7 @@ function postprocessBundle(state) {
   ];
   for (const target of evictionTargets) {
     if (!target.info) continue;
-    const chunkPath = resolve6(
+    const chunkPath = resolve7(
       state.projectRoot,
       "dist/rsc",
       target.info.fileName
@@ -3742,7 +4272,7 @@ function postprocessBundle(state) {
         target.brand
       );
       if (result) {
-        writeFileSync3(chunkPath, result.code);
+        writeFileSync4(chunkPath, result.code);
         const savedKB = (result.savedBytes / 1024).toFixed(1);
         console.log(
           `[rsc-router] Evicted ${target.label} (${savedKB} KB saved): ${target.info.fileName}`
@@ -3756,44 +4286,38 @@ function postprocessBundle(state) {
   }
   state.handlerChunkInfo = null;
   state.staticHandlerChunkInfo = null;
-  if (hasPrerenderData && existsSync5(rscEntryPath)) {
+  if (hasPrerenderData && existsSync6(rscEntryPath)) {
     const rscCode = readFileSync5(rscEntryPath, "utf-8");
-    if (!rscCode.includes("__PRERENDER_MANIFEST")) {
+    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(
@@ -3802,44 +4326,36 @@ globalThis.__PRERENDER_MANIFEST = __pm;
       }
     }
   }
-  if (hasStaticData && existsSync5(rscEntryPath)) {
+  if (hasStaticData && existsSync6(rscEntryPath)) {
     const rscCode = readFileSync5(rscEntryPath, "utf-8");
     if (!rscCode.includes("__STATIC_MANIFEST")) {
       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 contentHash = createHash4("sha256").update(encoded).digest("hex").slice(0, 8);
-          const assetFileName = `__st-${contentHash}.js`;
-          const assetPath = resolve6(assetsDir, assetFileName);
-          const hasHandles = Object.keys(handles).length > 0;
-          const exportValue = hasHandles ? JSON.stringify({ encoded, handles }) : JSON.stringify(encoded);
-          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(
@@ -3851,6 +4367,36 @@ globalThis.__PRERENDER_MANIFEST = __pm;
 }
 
 // src/vite/router-discovery.ts
+async function createTempRscServer(state, options = {}) {
+  const { default: rsc } = await import("@vitejs/plugin-rsc");
+  return createViteServer({
+    root: state.projectRoot,
+    configFile: false,
+    server: { middlewareMode: true },
+    appType: "custom",
+    logLevel: "silent",
+    resolve: { alias: state.userResolveAlias },
+    esbuild: { jsx: "automatic", jsxImportSource: "react" },
+    ...options.cacheDir && { cacheDir: options.cacheDir },
+    plugins: [
+      rsc({
+        entries: {
+          client: "virtual:entry-client",
+          ssr: "virtual:entry-ssr",
+          rsc: state.resolvedEntryPath
+        }
+      }),
+      // hashClientRefs only in build mode — production bundles need hashed refs
+      ...options.forceBuild ? [hashClientRefs(state.projectRoot)] : [],
+      createVersionPlugin(),
+      createVirtualStubPlugin(),
+      // Dev prerender must use dev-mode IDs (path-based) to match the workerd
+      // runtime. forceBuild produces hashed IDs for production bundle consistency.
+      exposeInternalIds(options.forceBuild ? { forceBuild: true } : void 0),
+      exposeRouterId()
+    ]
+  });
+}
 function createRouterDiscoveryPlugin(entryPath, opts) {
   const s = createDiscoveryState(entryPath, opts);
   return {
@@ -3887,6 +4433,9 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
       s.projectRoot = config.root;
       s.isBuildMode = config.command === "build";
       s.userResolveAlias = config.resolve.alias;
+      if (!s.resolvedEntryPath && opts?.routerPathRef?.path) {
+        s.resolvedEntryPath = opts.routerPathRef.path;
+      }
       if (!s.resolvedEntryPath) {
         const rscEnvConfig = config.environments?.["rsc"];
         const entries = rscEnvConfig?.optimizeDeps?.entries;
@@ -3921,8 +4470,8 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
       if (globalThis.__rscRouterDiscoveryActive) return;
       s.devServer = server;
       let resolveDiscovery;
-      const discoveryPromise = new Promise((resolve7) => {
-        resolveDiscovery = resolve7;
+      const discoveryPromise = new Promise((resolve10) => {
+        resolveDiscovery = resolve10;
       });
       const getDevServerOrigin = () => server.resolvedUrls?.local?.[0]?.replace(/\/$/, "") || `http://localhost:${server.config.server.port || 5173}`;
       let prerenderTempServer = null;
@@ -3939,32 +4488,8 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
           return prerenderTempServer.environments?.rsc ?? null;
         }
         try {
-          const { default: rsc } = await import("@vitejs/plugin-rsc");
-          prerenderTempServer = await createViteServer({
-            root: s.projectRoot,
-            configFile: false,
-            server: { middlewareMode: true },
-            appType: "custom",
-            logLevel: "silent",
-            cacheDir: "node_modules/.vite_prerender",
-            resolve: { alias: s.userResolveAlias },
-            esbuild: { jsx: "automatic", jsxImportSource: "react" },
-            plugins: [
-              rsc({
-                entries: {
-                  client: "virtual:entry-client",
-                  ssr: "virtual:entry-ssr",
-                  rsc: s.resolvedEntryPath
-                }
-              }),
-              createVersionPlugin(),
-              createVirtualStubPlugin(),
-              // Dev prerender must use dev-mode IDs (path-based) to match the
-              // workerd runtime. forceBuild would produce hashed IDs causing
-              // handle data key mismatches when replayed into the runtime store.
-              exposeInternalIds(),
-              exposeRouterId()
-            ]
+          prerenderTempServer = await createTempRscServer(s, {
+            cacheDir: "node_modules/.vite_prerender"
           });
           const tempRscEnv = prerenderTempServer.environments?.rsc;
           if (tempRscEnv?.runner) {
@@ -4008,34 +4533,10 @@ ${err.stack}`
           if (serverMod?.setManifestReadyPromise) {
             serverMod.setManifestReadyPromise(discoveryPromise);
           }
-          const serverModAfterDiscovery = await discoverRouters(s, rscEnv);
-          mainRegistry = serverModAfterDiscovery?.RouterRegistry ?? null;
+          await discoverRouters(s, rscEnv);
           s.devServerOrigin = getDevServerOrigin();
           writeRouteTypesFiles(s);
-          if (s.mergedRouteManifest && serverMod?.setCachedManifest) {
-            serverMod.setCachedManifest(s.mergedRouteManifest);
-          }
-          if (s.mergedPrecomputedEntries && s.mergedPrecomputedEntries.length > 0 && serverMod?.setPrecomputedEntries) {
-            serverMod.setPrecomputedEntries(s.mergedPrecomputedEntries);
-          }
-          if (s.mergedRouteTrie && serverMod?.setRouteTrie) {
-            serverMod.setRouteTrie(s.mergedRouteTrie);
-          }
-          if (serverMod?.setRouterManifest) {
-            for (const [routerId, manifest] of s.perRouterManifestDataMap) {
-              serverMod.setRouterManifest(routerId, manifest);
-            }
-          }
-          if (serverMod?.setRouterTrie) {
-            for (const [routerId, trie] of s.perRouterTrieMap) {
-              serverMod.setRouterTrie(routerId, trie);
-            }
-          }
-          if (serverMod?.setRouterPrecomputedEntries) {
-            for (const [routerId, entries] of s.perRouterPrecomputedMap) {
-              serverMod.setRouterPrecomputedEntries(routerId, entries);
-            }
-          }
+          await propagateDiscoveryState(rscEnv);
         } catch (err) {
           console.warn(
             `[rsc-router] Router discovery failed: ${err.message}
@@ -4045,10 +4546,42 @@ ${err.stack}`
           resolveDiscovery();
         }
       };
-      s.discoveryDone = new Promise((resolve7) => {
-        setTimeout(() => discover().then(resolve7, resolve7), 0);
+      s.discoveryDone = new Promise((resolve10) => {
+        setTimeout(() => discover().then(resolve10, resolve10), 0);
       });
       let mainRegistry = null;
+      const propagateDiscoveryState = async (rscEnv) => {
+        const serverMod = await rscEnv.runner.import("@rangojs/router/server");
+        if (!serverMod) return;
+        if (serverMod.clearAllRouterData) {
+          serverMod.clearAllRouterData();
+        }
+        mainRegistry = serverMod.RouterRegistry ?? null;
+        if (s.mergedRouteManifest && serverMod.setCachedManifest) {
+          serverMod.setCachedManifest(s.mergedRouteManifest);
+        }
+        if (s.mergedPrecomputedEntries && s.mergedPrecomputedEntries.length > 0 && serverMod.setPrecomputedEntries) {
+          serverMod.setPrecomputedEntries(s.mergedPrecomputedEntries);
+        }
+        if (s.mergedRouteTrie && serverMod.setRouteTrie) {
+          serverMod.setRouteTrie(s.mergedRouteTrie);
+        }
+        if (serverMod.setRouterManifest) {
+          for (const [routerId, manifest] of s.perRouterManifestDataMap) {
+            serverMod.setRouterManifest(routerId, manifest);
+          }
+        }
+        if (serverMod.setRouterTrie) {
+          for (const [routerId, trie] of s.perRouterTrieMap) {
+            serverMod.setRouterTrie(routerId, trie);
+          }
+        }
+        if (serverMod.setRouterPrecomputedEntries) {
+          for (const [routerId, entries] of s.perRouterPrecomputedMap) {
+            serverMod.setRouterPrecomputedEntries(routerId, entries);
+          }
+        }
+      };
       server.middlewares.use("/__rsc_prerender", async (req, res) => {
         if (s.discoveryDone) await s.discoveryDone;
         const url = new URL(req.url || "/", "http://localhost");
@@ -4071,11 +4604,20 @@ ${err.stack}`
           return;
         }
         const wantIntercept = url.searchParams.get("intercept") === "1";
+        const wantRouteName = url.searchParams.get("routeName");
+        const wantPassthrough = url.searchParams.get("passthrough") === "1";
         for (const [, routerInstance] of registry) {
           if (!routerInstance.matchForPrerender) continue;
           try {
-            const result = await routerInstance.matchForPrerender(pathname, {});
+            const result = await routerInstance.matchForPrerender(
+              pathname,
+              {},
+              void 0,
+              wantPassthrough
+            );
             if (!result) continue;
+            if (result.passthrough) continue;
+            if (wantRouteName && result.routeName !== wantRouteName) continue;
             res.setHeader("content-type", "application/json");
             let payload;
             if (wantIntercept && result.interceptSegments?.length) {
@@ -4112,10 +4654,29 @@ ${err.stack}`
         const maybeHandleGeneratedRouteFileMutation = (filePath) => {
           if (!isGeneratedRouteFile(filePath)) return false;
           if (consumeSelfGenWrite(s, filePath)) return true;
+          const hasRunner = !!server.environments?.rsc?.runner;
+          if (!hasRunner) return true;
           regenerateGeneratedRouteFiles();
           return true;
         };
         let routeChangeTimer;
+        let runtimeRediscoveryInProgress = false;
+        const refreshRuntimeDiscovery = async () => {
+          const rscEnv = server.environments?.rsc;
+          if (!rscEnv?.runner || runtimeRediscoveryInProgress) return;
+          runtimeRediscoveryInProgress = true;
+          try {
+            await discoverRouters(s, rscEnv);
+            writeRouteTypesFiles(s);
+            await propagateDiscoveryState(rscEnv);
+          } catch (err) {
+            console.warn(
+              `[rsc-router] Runtime re-discovery failed: ${err.message}`
+            );
+          } finally {
+            runtimeRediscoveryInProgress = false;
+          }
+        };
         const scheduleRouteRegeneration = () => {
           clearTimeout(routeChangeTimer);
           routeChangeTimer = setTimeout(() => {
@@ -4130,6 +4691,13 @@ ${err.stack}`
                 `[rsc-router] Route regeneration error: ${err.message}`
               );
             }
+            if (s.perRouterManifests.length > 0) {
+              refreshRuntimeDiscovery().catch((err) => {
+                console.warn(
+                  `[rsc-router] Runtime re-discovery error: ${err.message}`
+                );
+              });
+            }
           }, 100);
         };
         const handleRouteFileChange = (filePath) => {
@@ -4146,6 +4714,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();
@@ -4156,6 +4734,8 @@ ${err.stack}`
         server.watcher.on("change", handleRouteFileChange);
         server.watcher.on("unlink", (filePath) => {
           if (!isGeneratedRouteFile(filePath)) return;
+          const hasRunner = !!server.environments?.rsc?.runner;
+          if (!hasRunner) return;
           regenerateGeneratedRouteFiles();
         });
       }
@@ -4166,43 +4746,13 @@ ${err.stack}`
     async buildStart() {
       if (!s.isBuildMode) return;
       if (s.mergedRouteManifest !== null) return;
+      resetStagedBuildAssets(s.projectRoot);
+      s.prerenderManifestEntries = null;
+      s.staticManifestEntries = null;
       let tempServer = null;
       globalThis.__rscRouterDiscoveryActive = true;
       try {
-        const { default: rsc } = await import("@vitejs/plugin-rsc");
-        tempServer = await createViteServer({
-          root: s.projectRoot,
-          configFile: false,
-          server: { middlewareMode: true },
-          appType: "custom",
-          logLevel: "silent",
-          // Use the resolved aliases from the real config (includes user's path aliases
-          // like @/ -> src/ AND package aliases from rsc-router)
-          resolve: { alias: s.userResolveAlias },
-          // Enable automatic JSX runtime so .tsx files don't need `import React`.
-          // Without this, esbuild defaults to classic mode (React.createElement)
-          // which fails when lazy host-router handlers load sub-app modules with JSX.
-          esbuild: { jsx: "automatic", jsxImportSource: "react" },
-          plugins: [
-            rsc({
-              entries: {
-                client: "virtual:entry-client",
-                ssr: "virtual:entry-ssr",
-                rsc: s.resolvedEntryPath
-              }
-            }),
-            hashClientRefs(s.projectRoot),
-            createVersionPlugin(),
-            // Stub virtual modules that the RSC entry may import
-            // (e.g., virtual:rsc-router/routes-manifest, virtual:rsc-router/loader-manifest)
-            createVirtualStubPlugin(),
-            // Inject handle + router IDs so prerender-collected handle data uses
-            // the same hashed keys as the production client/SSR bundles, and
-            // build-time router IDs match runtime IDs across environments.
-            exposeInternalIds({ forceBuild: true }),
-            exposeRouterId()
-          ]
-        });
+        tempServer = await createTempRscServer(s, { forceBuild: true });
         const rscEnv = tempServer.environments?.rsc;
         if (!rscEnv?.runner) {
           console.warn(
@@ -4321,152 +4871,6 @@ ${details}`
   };
 }
 
-// src/vite/rango.ts
-import { readFileSync as readFileSync7 } from "node:fs";
-
-// src/vite/plugins/use-cache-transform.ts
-import path5 from "node:path";
-import MagicString5 from "magic-string";
-var CACHE_RUNTIME_IMPORT = "@rangojs/router/cache-runtime";
-var LAYOUT_TEMPLATE_PATTERN = /\/(layout|template)\.(tsx?|jsx?)$/;
-function useCacheTransform() {
-  let projectRoot = "";
-  let isBuild = false;
-  let rscTransforms = null;
-  return {
-    name: "@rangojs/router:use-cache",
-    enforce: "post",
-    configResolved(config) {
-      projectRoot = config.root;
-      isBuild = config.command === "build";
-    },
-    async transform(code, id) {
-      if (this.environment?.name !== "rsc") return;
-      if (!code.includes("use cache")) return;
-      if (id.includes("/node_modules/") || id.startsWith("\0")) return;
-      if (!/\.(tsx?|jsx?|mjs)$/.test(id)) return;
-      if (!rscTransforms) {
-        try {
-          rscTransforms = await import("@vitejs/plugin-rsc/transforms");
-        } catch {
-          return;
-        }
-      }
-      const {
-        hasDirective,
-        transformWrapExport,
-        transformHoistInlineDirective
-      } = rscTransforms;
-      let ast;
-      try {
-        const { parseAst: parseAst3 } = await import("vite");
-        ast = parseAst3(code);
-      } catch {
-        return;
-      }
-      const filePath = normalizePath(path5.relative(projectRoot, id));
-      const isLayoutOrTemplate = LAYOUT_TEMPLATE_PATTERN.test(id);
-      if (hasDirective(ast.body, "use cache")) {
-        return transformFileLevelUseCache(
-          code,
-          ast,
-          filePath,
-          id,
-          isBuild,
-          isLayoutOrTemplate,
-          transformWrapExport
-        );
-      }
-      return transformFunctionLevelUseCache(
-        code,
-        ast,
-        filePath,
-        id,
-        isBuild,
-        transformHoistInlineDirective
-      );
-    }
-  };
-}
-function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLayoutOrTemplate, transformWrapExport) {
-  const { exportNames, output } = transformWrapExport(code, ast, {
-    runtime: (value, name) => {
-      const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
-      return `__rango_registerCachedFunction(${value}, ${JSON.stringify(funcId)}, "default")`;
-    },
-    rejectNonAsyncFunction: false,
-    filter: (name) => {
-      if (name === "default" && isLayoutOrTemplate) return false;
-      return true;
-    }
-  });
-  if (exportNames.length === 0) {
-    const s = new MagicString5(code);
-    const directive2 = findFileLevelDirective(ast);
-    if (directive2) {
-      s.overwrite(
-        directive2.start,
-        directive2.end,
-        `/* "use cache" -- wrapped by rango */`
-      );
-      return {
-        code: s.toString(),
-        map: s.generateMap({ source: sourceId, hires: "boundary" })
-      };
-    }
-    return;
-  }
-  output.prepend(
-    `import { registerCachedFunction as __rango_registerCachedFunction } from ${JSON.stringify(CACHE_RUNTIME_IMPORT)};
-`
-  );
-  const directive = findFileLevelDirective(ast);
-  if (directive) {
-    output.overwrite(
-      directive.start,
-      directive.end,
-      `/* "use cache" -- wrapped by rango */`
-    );
-  }
-  return {
-    code: output.toString(),
-    map: output.generateMap({ source: sourceId, hires: "boundary" })
-  };
-}
-function transformFunctionLevelUseCache(code, ast, filePath, sourceId, isBuild, transformHoistInlineDirective) {
-  try {
-    const { output, names } = transformHoistInlineDirective(code, ast, {
-      directive: /^use cache(:\s*\w+)?$/,
-      runtime: (value, name, meta) => {
-        const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
-        const profileMatch = meta.directiveMatch[1];
-        const profileName = profileMatch ? profileMatch.replace(/^:\s*/, "").trim() : "default";
-        return `__rango_registerCachedFunction(${value}, ${JSON.stringify(funcId)}, ${JSON.stringify(profileName)})`;
-      },
-      rejectNonAsyncFunction: false
-    });
-    if (names.length === 0) return;
-    output.prepend(
-      `import { registerCachedFunction as __rango_registerCachedFunction } from ${JSON.stringify(CACHE_RUNTIME_IMPORT)};
-`
-    );
-    return {
-      code: output.toString(),
-      map: output.generateMap({ source: sourceId, hires: "boundary" })
-    };
-  } catch {
-    return;
-  }
-}
-function findFileLevelDirective(ast) {
-  for (const node of ast.body ?? []) {
-    if (node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string" && node.expression.value.startsWith("use cache")) {
-      return { start: node.start, end: node.end };
-    }
-  }
-  return null;
-}
-
 // src/vite/rango.ts
 async function rango(options) {
   const resolvedOptions = options ?? { preset: "node" };
@@ -4476,7 +4880,7 @@ async function rango(options) {
   const rangoAliases = getPackageAliases();
   const excludeDeps = getExcludeDeps();
   let rscEntryPath = null;
-  let routerPath;
+  const routerRef = { path: void 0 };
   const prerenderEnabled = true;
   if (preset === "cloudflare") {
     const { default: rsc } = await import("@vitejs/plugin-rsc");
@@ -4573,35 +4977,39 @@ async function rango(options) {
     plugins.push(createVirtualEntriesPlugin(finalEntries));
     plugins.push(
       rsc({
-        get entries() {
-          return finalEntries;
-        },
+        entries: finalEntries,
         serverHandler: false
       })
     );
+    plugins.push(clientRefDedup());
   } else {
     const nodeOptions = resolvedOptions;
-    routerPath = nodeOptions.router;
-    if (!routerPath) {
-      const earlyFilter = createScanFilter(process.cwd(), {
-        include: resolvedOptions.include,
-        exclude: resolvedOptions.exclude
-      });
-      const candidates = findRouterFiles(process.cwd(), earlyFilter);
-      if (candidates.length === 1) {
-        const abs = candidates[0];
-        const rel = abs.startsWith(process.cwd()) ? "./" + abs.slice(process.cwd().length + 1) : abs;
-        routerPath = rel;
-      } else if (candidates.length > 1) {
-        const cwd = process.cwd();
-        const list = candidates.map(
-          (f) => "  - " + (f.startsWith(cwd) ? f.slice(cwd.length + 1) : f)
-        ).join("\n");
-        throw new Error(
-          `[rsc-router] Multiple routers found. Specify \`router\` to choose one:
+    routerRef.path = nodeOptions.router;
+    if (!routerRef.path) {
+      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 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}`
-        );
-      }
+            );
+          }
+        }
+      });
     }
     const rscOption = nodeOptions.rsc ?? true;
     if (rscOption !== false) {
@@ -4715,13 +5123,14 @@ ${list}`
           }
         }
       });
-      plugins.push(createVirtualEntriesPlugin(finalEntries, routerPath));
+      plugins.push(createVirtualEntriesPlugin(finalEntries, routerRef));
       plugins.push(
         rsc({
           entries: finalEntries
         })
       );
     }
+    plugins.push(clientRefDedup());
   }
   plugins.push({
     name: "@rangojs/router:client-component-hmr",
@@ -4746,7 +5155,8 @@ ${list}`
   plugins.push(exposeInternalIds());
   plugins.push(exposeRouterId());
   plugins.push(createVersionPlugin());
-  const discoveryEntryPath = preset !== "cloudflare" ? routerPath : void 0;
+  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));
@@ -4754,6 +5164,7 @@ ${list}`
   plugins.push(createCjsToEsmPlugin());
   plugins.push(
     createRouterDiscoveryPlugin(discoveryEntryPath, {
+      routerPathRef: discoveryRouterRef,
       enableBuildPrerender: prerenderEnabled,
       staticRouteTypesGeneration: resolvedOptions.staticRouteTypesGeneration,
       include: resolvedOptions.include,
@@ -4762,34 +5173,42 @@ ${list}`
   );
   return plugins;
 }
+
+// src/vite/plugins/refresh-cmd.ts
+function poke() {
+  return {
+    name: "vite-plugin-poke",
+    apply: "serve",
+    configureServer(server) {
+      const stdin = process.stdin;
+      const previousRawMode = stdin.isTTY ? stdin.isRaw : null;
+      if (stdin.isTTY) {
+        stdin.setRawMode(true);
+      }
+      const onData = (data) => {
+        if (data.length !== 1) return;
+        if (data[0] === 3) {
+          process.emit("SIGINT", "SIGINT");
+          return;
+        }
+        if (data[0] === 18) {
+          server.hot.send({ type: "full-reload", path: "*" });
+          server.config.logger.info("  browser reload (ctrl+r)", {
+            timestamp: true
+          });
+        }
+      };
+      stdin.on("data", onData);
+      server.httpServer?.on("close", () => {
+        stdin.off("data", onData);
+        if (stdin.isTTY && previousRawMode !== null) {
+          stdin.setRawMode(previousRawMode);
+        }
+      });
+    }
+  };
+}
 export {
-  VIRTUAL_ROUTES_MANIFEST_ID,
-  buildRouteToStaticPrefix,
-  computeProductionHash,
-  createCjsToEsmPlugin,
-  createRouterDiscoveryPlugin,
-  createVersionInjectorPlugin,
-  createVersionPlugin,
-  createVirtualEntriesPlugin,
-  createVirtualStubPlugin,
-  encodePathParam,
-  evictHandlerCode,
-  exposeActionId,
-  exposeInternalIds,
-  exposeRouterId,
-  extractHandlerExportsFromChunk,
-  findMatchingParenInBundle,
-  flattenLeafEntries,
-  getManualChunks,
-  groupByConcurrency,
-  hashClientRefs,
-  jsonParseExpression,
-  notifyOnError,
-  onwarn,
-  printBanner,
-  rango,
-  rangoVersion,
-  runWithConcurrency,
-  sharedEsbuildOptions,
-  transformClientRefs
+  poke,
+  rango
 };