@rangojs/router 0.0.0-experimental.d7eeaa75 → 0.0.0-experimental.d98a8e9d

package/dist/vite/index.js

@@ -21,8 +21,8 @@ function hashId(filePath, exportName) {
 function makeStubId(filePath, exportName, isBuild) {
   return isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
 }
-function hashInlineId(filePath, lineNumber, index) {
-  const input = index !== void 0 && index > 0 ? `${filePath}:${lineNumber}:${index}` : `${filePath}:${lineNumber}`;
+function hashInlineId(filePath, fnName, index) {
+  const input = `${filePath}:${fnName}:${index}`;
   return crypto.createHash("sha256").update(input).digest("hex").slice(0, 8);
 }
 function buildExportMap(program) {
@@ -191,7 +191,100 @@ function escapeRegExp(input) {
   return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
+// src/vite/debug.ts
+import debugFactory from "debug";
+var NS = {
+  config: "rango:config",
+  discovery: "rango:discovery",
+  routes: "rango:routes",
+  prerender: "rango:prerender",
+  build: "rango:build",
+  dev: "rango:dev",
+  transform: "rango:transform",
+  chunks: "rango:chunks"
+};
+if (process.env.INTERNAL_RANGO_DEBUG) {
+  const existing = debugFactory.disable();
+  debugFactory.enable(existing ? `${existing},rango:*` : "rango:*");
+}
+function createRangoDebugger(namespace) {
+  const primary = debugFactory(namespace);
+  const shadow = debugFactory(`vite:${namespace}`);
+  if (primary.enabled) return primary;
+  if (shadow.enabled) return shadow;
+  return void 0;
+}
+async function timed(debug11, label, fn) {
+  if (!debug11) return await fn();
+  const start = performance.now();
+  try {
+    return await fn();
+  } finally {
+    debug11("%s (%sms)", label, (performance.now() - start).toFixed(1));
+  }
+}
+function timedSync(debug11, label, fn) {
+  if (!debug11) return fn();
+  const start = performance.now();
+  try {
+    return fn();
+  } finally {
+    debug11("%s (%sms)", label, (performance.now() - start).toFixed(1));
+  }
+}
+function createCounter(debug11, label) {
+  if (!debug11) return void 0;
+  let n = 0;
+  let totalMs = 0;
+  let slowestMs = 0;
+  let slowestFile = "";
+  const record = (file, ms) => {
+    n++;
+    totalMs += ms;
+    if (ms > slowestMs) {
+      slowestMs = ms;
+      slowestFile = file;
+    }
+  };
+  return {
+    record,
+    time(file, fn) {
+      const start = performance.now();
+      let out;
+      try {
+        out = fn();
+      } catch (err) {
+        record(file, performance.now() - start);
+        throw err;
+      }
+      if (out && typeof out.then === "function") {
+        return out.finally(
+          () => record(file, performance.now() - start)
+        );
+      }
+      record(file, performance.now() - start);
+      return out;
+    },
+    flush() {
+      if (n === 0) return;
+      debug11(
+        "%s: %d files, %sms total, slowest %sms %s",
+        label,
+        n,
+        totalMs.toFixed(1),
+        slowestMs.toFixed(1),
+        slowestFile
+      );
+      n = 0;
+      totalMs = 0;
+      slowestMs = 0;
+      slowestFile = "";
+    }
+  };
+}
+
 // src/vite/plugins/expose-action-id.ts
+var debug = createRangoDebugger(NS.transform);
 function getRscPluginApi(config) {
   let plugin = config.plugins.find((p) => p.name === "rsc:minimal");
   if (!plugin) {
@@ -200,7 +293,7 @@ function getRscPluginApi(config) {
     );
     if (plugin) {
       console.warn(
-        `[rsc-router:expose-action-id] RSC plugin found by API structure (name: "${plugin.name}"). Consider updating the name lookup if the plugin was renamed.`
+        `[rango:expose-action-id] RSC plugin found by API structure (name: "${plugin.name}"). Consider updating the name lookup if the plugin was renamed.`
       );
     }
   }
@@ -280,6 +373,8 @@ function exposeActionId() {
   let isBuild = false;
   let hashToFileMap;
   let rscPluginApi;
+  const counterTransform = createCounter(debug, "expose-action-id transform");
+  const counterRender = createCounter(debug, "expose-action-id renderChunk");
   return {
     name: "@rangojs/router:expose-action-id",
     // Run after all other plugins (including RSC plugin's transforms)
@@ -289,13 +384,17 @@ function exposeActionId() {
       isBuild = config.command === "build";
       rscPluginApi = getRscPluginApi(config);
     },
+    buildEnd() {
+      counterTransform?.flush();
+      counterRender?.flush();
+    },
     buildStart() {
       if (!rscPluginApi) {
         rscPluginApi = getRscPluginApi(config);
       }
       if (!rscPluginApi) {
         throw new Error(
-          "[rsc-router] Could not find @vitejs/plugin-rsc. @rangojs/router requires the Vite RSC plugin, which is included automatically by rango()."
+          "[rango] Could not find @vitejs/plugin-rsc. @rangojs/router requires the Vite RSC plugin, which is included automatically by rango()."
         );
       }
       if (!isBuild) return;
@@ -325,35 +424,49 @@ function exposeActionId() {
       if (id.includes("/node_modules/")) {
         return;
       }
-      return transformServerReferences(code, id);
+      const start = counterTransform ? performance.now() : 0;
+      try {
+        return transformServerReferences(code, id);
+      } finally {
+        counterTransform?.record(id, performance.now() - start);
+      }
     },
     // Build mode: renderChunk runs after all transforms and bundling complete
     renderChunk(code, chunk) {
-      const isRscEnv = this.environment?.name === "rsc";
-      const effectiveMap = isRscEnv ? hashToFileMap : void 0;
-      if (isRscEnv && hashToFileMap) {
-        const s = new MagicString(code);
-        const changed1 = applyServerReferenceWrapping(code, s, effectiveMap);
-        const changed2 = applyRegisterReferenceWrapping(code, s, hashToFileMap);
-        if (changed1 || changed2) {
-          return {
-            code: s.toString(),
-            map: s.generateMap({
-              source: chunk.fileName,
-              includeContent: true
-            })
-          };
+      const start = counterRender ? performance.now() : 0;
+      try {
+        const isRscEnv = this.environment?.name === "rsc";
+        const effectiveMap = isRscEnv ? hashToFileMap : void 0;
+        if (isRscEnv && hashToFileMap) {
+          const s = new MagicString(code);
+          const changed1 = applyServerReferenceWrapping(code, s, effectiveMap);
+          const changed2 = applyRegisterReferenceWrapping(
+            code,
+            s,
+            hashToFileMap
+          );
+          if (changed1 || changed2) {
+            return {
+              code: s.toString(),
+              map: s.generateMap({
+                source: chunk.fileName,
+                includeContent: true
+              })
+            };
+          }
+          return null;
         }
-        return null;
+        return transformServerReferences(code, chunk.fileName, effectiveMap);
+      } finally {
+        counterRender?.record(chunk.fileName, performance.now() - start);
       }
-      return transformServerReferences(code, chunk.fileName, effectiveMap);
     }
   };
 }
 
 // src/vite/plugins/expose-internal-ids.ts
 import { parseAst as parseAst2 } from "vite";
-import MagicString4 from "magic-string";
+import MagicString3 from "magic-string";
 import path4 from "node:path";
 
 // src/vite/utils/ast-handler-extract.ts
@@ -363,7 +476,7 @@ function isDirectivePrologueStatement(node) {
 function findImportInsertionPos(code, parseAst4) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return 0;
   }
@@ -403,7 +516,7 @@ function walkNode(node, parent, ancestors, enter) {
 function findHandlerCalls(code, fnName, parseAst4) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -477,7 +590,7 @@ function getImportedLocalNamesFromProgram(program, importedName) {
 }
 function getImportedLocalNames(code, importedName, parseAst4) {
   try {
-    const program = parseAst4(code, { jsx: true });
+    const program = parseAst4(code, { lang: "tsx" });
     return getImportedLocalNamesFromProgram(program, importedName);
   } catch {
     return /* @__PURE__ */ new Set();
@@ -486,7 +599,7 @@ function getImportedLocalNames(code, importedName, parseAst4) {
 function extractImportDeclarations(code, parseAst4) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -541,7 +654,7 @@ function isSafeVariableDeclaration(node, handlerNames) {
 function extractModuleLevelDeclarations(code, parseAst4, handlerNames) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -585,14 +698,12 @@ function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtu
     parseAst4,
     handlerNames
   );
-  const lineCounts = /* @__PURE__ */ new Map();
   const importStatements = [];
-  for (const site of inlineSites) {
-    const lineCount = lineCounts.get(site.lineNumber) ?? 0;
-    lineCounts.set(site.lineNumber, lineCount + 1);
-    const hash = hashInlineId(filePath, site.lineNumber, lineCount);
+  for (const [siteIndex, site] of inlineSites.entries()) {
+    const hash = hashInlineId(filePath, fnName, siteIndex);
     const exportName = `__sh_${hash}`;
-    const virtualId = `\0${virtualPrefix}${filePath}:${site.lineNumber}${lineCount > 0 ? `:${lineCount}` : ""}`;
+    const idSuffix = `${filePath}:${fnName}:${siteIndex}`;
+    const virtualId = `\0${virtualPrefix}${idSuffix}`;
     const handlerCode = code.slice(site.callStart, site.callEnd);
     virtualRegistry.set(virtualId, {
       originalModuleId: moduleId,
@@ -602,7 +713,7 @@ function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtu
       exportName
     });
     s.overwrite(site.callStart, site.callEnd, exportName);
-    const importId = `${virtualPrefix}${filePath}:${site.lineNumber}${lineCount > 0 ? `:${lineCount}` : ""}`;
+    const importId = `${virtualPrefix}${idSuffix}`;
     importStatements.push(`import { ${exportName} } from "${importId}";`);
   }
   if (importStatements.length > 0) {
@@ -634,6 +745,83 @@ var STRICT_CREATE_CONFIGS = [
 
 // src/vite/plugins/expose-ids/export-analysis.ts
 import { parseAst } from "vite";
+
+// src/build/route-types/source-scan.ts
+function isLineTerminator(ch) {
+  const c = ch.charCodeAt(0);
+  return c === 10 || c === 13 || c === 8232 || c === 8233;
+}
+function makeCodeClassifier(code) {
+  const n = code.length;
+  let i = 0;
+  let skipStart = -1;
+  let skipEnd = -1;
+  return (q) => {
+    if (q >= skipStart && q < skipEnd) return false;
+    while (i < n && i <= q) {
+      const c = code[i];
+      const d = i + 1 < n ? code[i + 1] : "";
+      let end = -1;
+      if (c === "/" && d === "/") {
+        let j = i + 2;
+        while (j < n && !isLineTerminator(code[j])) j++;
+        end = j;
+      } else if (c === "/" && d === "*") {
+        let j = i + 2;
+        while (j < n && !(code[j] === "*" && code[j + 1] === "/")) j++;
+        end = Math.min(n, j + 2);
+      } else if (c === '"' || c === "'" || c === "`") {
+        let j = i + 1;
+        while (j < n) {
+          if (code[j] === "\\") {
+            j += 2;
+            continue;
+          }
+          if (code[j] === c) {
+            j++;
+            break;
+          }
+          j++;
+        }
+        end = j;
+      }
+      if (end >= 0) {
+        if (q < end) {
+          skipStart = i;
+          skipEnd = end;
+          return false;
+        }
+        i = end;
+      } else {
+        i++;
+      }
+    }
+    return true;
+  };
+}
+function firstCodeMatchIndex(code, pattern) {
+  const inCode = makeCodeClassifier(code);
+  pattern.lastIndex = 0;
+  let m;
+  while ((m = pattern.exec(code)) !== null) {
+    if (inCode(m.index)) return m.index;
+    if (pattern.lastIndex <= m.index) pattern.lastIndex = m.index + 1;
+  }
+  return -1;
+}
+function codeMatchIndices(code, pattern) {
+  const inCode = makeCodeClassifier(code);
+  const indices = [];
+  pattern.lastIndex = 0;
+  let m;
+  while ((m = pattern.exec(code)) !== null) {
+    if (inCode(m.index)) indices.push(m.index);
+    if (pattern.lastIndex <= m.index) pattern.lastIndex = m.index + 1;
+  }
+  return indices;
+}
+
+// src/vite/plugins/expose-ids/export-analysis.ts
 function isExportOnlyFile(code, bindings) {
   if (bindings.length === 0) return false;
   const knownLocals = /* @__PURE__ */ new Set();
@@ -662,12 +850,30 @@ function isExportOnlyFile(code, bindings) {
   }
   return true;
 }
-function countCreateCallsForNames(code, fnNames) {
-  const pattern = new RegExp(
+function createCallPattern(fnNames) {
+  return new RegExp(
     `\\b(?:${fnNames.map(escapeRegExp).join("|")})\\s*(?:<[^>]*>\\s*)?\\(`,
     "g"
   );
-  return (code.match(pattern) || []).length;
+}
+function countCreateCallsForNames(code, fnNames) {
+  return codeMatchIndices(code, createCallPattern(fnNames)).length;
+}
+function offsetToLineColumn(code, index) {
+  let line = 1;
+  let lineStart = 0;
+  const end = Math.min(index, code.length);
+  for (let i = 0; i < end; i++) {
+    if (code[i] === "\n") {
+      line++;
+      lineStart = i + 1;
+    }
+  }
+  return { line, column: index - lineStart + 1 };
+}
+function findUnsupportedCreateCallSites(code, fnNames, supportedBindings) {
+  const supported = new Set(supportedBindings.map((b) => b.callExprStart));
+  return codeMatchIndices(code, createCallPattern(fnNames)).filter((index) => !supported.has(index)).map((index) => offsetToLineColumn(code, index));
 }
 function getImportedFnNames(code, importedName) {
   const importPattern = /import\s*\{([^}]*)\}\s*from\s*["']@rangojs\/router(?:\/[^"']*)?["']/g;
@@ -698,6 +904,17 @@ function getCalledIdentifierFromCall(callExpr) {
   }
   return null;
 }
+function unwrapSignatureWrappedCall(init, fnNameSet) {
+  if (init?.type !== "CallExpression") return init;
+  const directId = getCalledIdentifierFromCall(init);
+  if (directId && fnNameSet.has(directId)) return init;
+  const firstArg = init.arguments?.[0];
+  if (firstArg?.type === "CallExpression") {
+    const innerId = getCalledIdentifierFromCall(firstArg);
+    if (innerId && fnNameSet.has(innerId)) return firstArg;
+  }
+  return init;
+}
 function collectCreateExportBindingsFallback(code, fnNames) {
   const alternation = fnNames.map(escapeRegExp).join("|");
   const exportConstPattern = new RegExp(
@@ -757,7 +974,7 @@ function collectCreateExportBindingsFallback(code, fnNames) {
 function collectCreateExportBindings(code, fnNames, program) {
   if (!program) {
     try {
-      program = parseAst(code, { jsx: true });
+      program = parseAst(code, { lang: "tsx" });
     } catch {
       return collectCreateExportBindingsFallback(code, fnNames);
     }
@@ -770,16 +987,16 @@ function collectCreateExportBindings(code, fnNames, program) {
       return;
     }
     for (const decl of varDecl.declarations ?? []) {
-      const calledIdentifier = getCalledIdentifierFromCall(decl?.init);
-      if (decl?.id?.type !== "Identifier" || decl?.init?.type !== "CallExpression" || !calledIdentifier || !fnNameSet.has(calledIdentifier)) {
+      const callExpr = unwrapSignatureWrappedCall(decl?.init, fnNameSet);
+      const calledIdentifier = getCalledIdentifierFromCall(callExpr);
+      if (decl?.id?.type !== "Identifier" || callExpr?.type !== "CallExpression" || !calledIdentifier || !fnNameSet.has(calledIdentifier)) {
         continue;
       }
       const localName = decl.id.name;
       const exportNames = exportMap.get(localName) ?? [];
       if (exportNames.length === 0) continue;
-      const callStart = decl.init.start;
-      const callEnd = decl.init.end;
-      const calleeEnd = decl.init.callee.end;
+      const callEnd = callExpr.end;
+      const calleeEnd = callExpr.callee.end;
       let openParenPos = -1;
       for (let i = calleeEnd; i < callEnd; i++) {
         if (code[i] === "(") {
@@ -793,10 +1010,10 @@ function collectCreateExportBindings(code, fnNames, program) {
       bindings.push({
         localName,
         exportNames,
-        callExprStart: decl.init.start,
+        callExprStart: callExpr.start,
         callOpenParenPos: openParenPos,
         callCloseParenPos: closeParenPos,
-        argCount: decl.init.arguments?.length ?? 0,
+        argCount: callExpr.arguments?.length ?? 0,
         statementEnd
       });
     }
@@ -815,9 +1032,20 @@ function collectCreateExportBindings(code, fnNames, program) {
   }
   return bindings;
 }
-function buildUnsupportedShapeWarning(filePath, fnName) {
-  return [
-    `[rsc-router] Unsupported ${fnName} shape in "${filePath}".`,
+function buildUnsupportedShapeWarning(filePath, fnName, sites = []) {
+  const lines = [`[rango] Unsupported ${fnName} shape in "${filePath}".`];
+  if (sites.length === 1) {
+    const s = sites[0];
+    lines.push(
+      `The ${fnName}(...) call at ${filePath}:${s.line}:${s.column} has no stable $$id injected \u2014 it is not in a supported shape.`
+    );
+  } else if (sites.length > 1) {
+    lines.push(
+      `These ${fnName}(...) calls have no stable $$id injected \u2014 they are not in a supported shape:`
+    );
+    for (const s of sites) lines.push(`  - ${filePath}:${s.line}:${s.column}`);
+  }
+  lines.push(
     `Supported shapes are:`,
     `  - export const X = ${fnName}(...)`,
     `  - const X = ${fnName}(...); export { X }`,
@@ -825,7 +1053,8 @@ function buildUnsupportedShapeWarning(filePath, fnName) {
     `Potentially unsupported forms include:`,
     `  - export let/var X = ${fnName}(...)`,
     `  - inline ${fnName}(...) calls`
-  ].join("\n");
+  );
+  return lines.join("\n");
 }
 
 // src/vite/plugins/expose-ids/loader-transform.ts
@@ -839,7 +1068,7 @@ function generateClientLoaderStubs(bindings, code, filePath, isBuild) {
   const lines = [];
   for (const binding of bindings) {
     for (const name of binding.exportNames) {
-      const loaderId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
+      const loaderId = makeStubId(filePath, name, isBuild);
       lines.push(
         `export const ${name} = { __brand: "loader", $$id: "${loaderId}" };`
       );
@@ -851,7 +1080,7 @@ function transformLoaders(bindings, s, filePath, isBuild) {
   let hasChanges = false;
   for (const binding of bindings) {
     const exportName = binding.exportNames[0];
-    const loaderId = isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
+    const loaderId = makeStubId(filePath, exportName, isBuild);
     const paramInjection = binding.argCount === 1 ? `, undefined, "${loaderId}"` : `, "${loaderId}"`;
     s.appendLeft(binding.callCloseParenPos, paramInjection);
     const propInjection = `
@@ -863,7 +1092,6 @@ ${binding.localName}.$$id = "${loaderId}";`;
 }
 
 // src/vite/plugins/expose-ids/handler-transform.ts
-import MagicString2 from "magic-string";
 function analyzeCreateHandleArgs(code, startPos, endPos) {
   const content = code.slice(startPos, endPos).trim();
   return { hasArgs: content.length > 0 };
@@ -877,7 +1105,7 @@ function transformHandles(bindings, s, code, filePath, isBuild) {
       binding.callOpenParenPos + 1,
       binding.callCloseParenPos
     );
-    const handleId = isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
+    const handleId = makeStubId(filePath, exportName, isBuild);
     let paramInjection;
     if (!args.hasArgs) {
       paramInjection = `undefined, "${handleId}"`;
@@ -896,7 +1124,7 @@ function transformLocationState(bindings, s, filePath, isBuild) {
   let hasChanges = false;
   for (const binding of bindings) {
     const exportName = binding.exportNames[0];
-    const stateKey = isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
+    const stateKey = makeStubId(filePath, exportName, isBuild);
     const propInjection = `
 ${binding.localName}.__rsc_ls_key = "__rsc_ls_${stateKey}";`;
     s.appendRight(binding.statementEnd, propInjection);
@@ -908,7 +1136,7 @@ function generateWholeFileStubs(cfg, bindings, code, filePath, isBuild) {
   if (!isExportOnlyFile(code, bindings)) return null;
   const exportNames = bindings.flatMap((b) => b.exportNames);
   const stubs = exportNames.map((name) => {
-    const handlerId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
+    const handlerId = makeStubId(filePath, name, isBuild);
     return `export const ${name} = { __brand: "${cfg.brand}", $$id: "${handlerId}" };`;
   });
   return { code: stubs.join("\n") + "\n", map: null };
@@ -917,7 +1145,7 @@ function stubHandlerExprs(cfg, bindings, s, filePath, isBuild) {
   let hasChanges = false;
   for (const binding of bindings) {
     const exportName = binding.exportNames[0];
-    const handlerId = isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
+    const handlerId = makeStubId(filePath, exportName, isBuild);
     s.overwrite(
       binding.callExprStart,
       binding.callCloseParenPos + 1,
@@ -931,7 +1159,7 @@ function transformHandlerIds(cfg, bindings, s, filePath, isBuild) {
   let hasChanges = false;
   for (const binding of bindings) {
     const exportName = binding.exportNames[0];
-    const handlerId = isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
+    const handlerId = makeStubId(filePath, exportName, isBuild);
     let paramInjection;
     if (binding.argCount === 0) {
       paramInjection = `undefined, "${handlerId}"`;
@@ -950,19 +1178,20 @@ ${binding.localName}.$$id = "${handlerId}";`;
 }
 
 // src/vite/plugins/expose-ids/router-transform.ts
-import MagicString3 from "magic-string";
+import MagicString2 from "magic-string";
 import path3 from "node:path";
 import { createHash } from "node:crypto";
+var debug2 = createRangoDebugger(NS.transform);
 function transformRouter(code, filePath, routerFnNames, absolutePath) {
   const pat = new RegExp(
     `\\b(?:${routerFnNames.map((n) => n.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|")})\\s*(?:<[^>]*>)?\\s*\\(`,
     "g"
   );
   let match;
-  const s = new MagicString3(code);
+  const s = new MagicString2(code);
   let changed = false;
-  const basename3 = path3.basename(filePath).replace(/\.(tsx?|jsx?)$/, "");
-  const routeNamesImport = `./${basename3}.named-routes.gen.js`;
+  const basename2 = path3.basename(filePath).replace(/\.(tsx?|jsx?)$/, "");
+  const routeNamesImport = `./${basename2}.named-routes.gen.js`;
   const routeNamesVar = `__rsc_rn`;
   while ((match = pat.exec(code)) !== null) {
     const callStart = match.index;
@@ -995,11 +1224,15 @@ function transformRouter(code, filePath, routerFnNames, absolutePath) {
 }
 function exposeRouterId() {
   let projectRoot = "";
+  const counter = createCounter(debug2, "expose-router-id");
   return {
     name: "@rangojs/router:expose-router-id",
     configResolved(config) {
       projectRoot = config.root;
     },
+    buildEnd() {
+      counter?.flush();
+    },
     transform(code, id) {
       if (!code.includes("createRouter")) return null;
       if (!/import\s*\{[^}]*\bcreateRouter\b[^}]*\}\s*from\s*["']@rangojs\/router(?:\/server)?["']/.test(
@@ -1008,14 +1241,25 @@ function exposeRouterId() {
         return null;
       }
       if (id.includes("node_modules")) return null;
-      const filePath = normalizePath(path3.relative(projectRoot, id));
-      const routerFnNames = getImportedFnNames(code, "createRouter");
-      return transformRouter(code, filePath, routerFnNames, normalizePath(id));
+      const start = counter ? performance.now() : 0;
+      try {
+        const filePath = normalizePath(path3.relative(projectRoot, id));
+        const routerFnNames = getImportedFnNames(code, "createRouter");
+        return transformRouter(
+          code,
+          filePath,
+          routerFnNames,
+          normalizePath(id)
+        );
+      } finally {
+        counter?.record(id, performance.now() - start);
+      }
     }
   };
 }
 
 // src/vite/plugins/expose-internal-ids.ts
+var debug3 = createRangoDebugger(NS.transform);
 var VIRTUAL_LOADER_MANIFEST = "virtual:rsc-router/loader-manifest";
 var RESOLVED_VIRTUAL_LOADER_MANIFEST = "\0" + VIRTUAL_LOADER_MANIFEST;
 var VIRTUAL_HANDLER_PREFIX = "virtual:handler-extract:";
@@ -1028,9 +1272,13 @@ function exposeInternalIds(options) {
   const staticHandlerModules = /* @__PURE__ */ new Map();
   const virtualHandlers = /* @__PURE__ */ new Map();
   const unsupportedShapeWarnings = /* @__PURE__ */ new Set();
+  const counter = createCounter(debug3, "expose-internal-ids");
   return {
     name: "@rangojs/router:expose-internal-ids",
     enforce: "post",
+    buildEnd() {
+      counter?.flush();
+    },
     api: {
       prerenderHandlerModules,
       staticHandlerModules
@@ -1144,11 +1392,13 @@ ${lazyImports.join(",\n")}
     // --------------- Unified transform ---------------
     transform(code, id) {
       if (id.includes("/node_modules/")) return;
-      const filePath = normalizePath(path4.relative(projectRoot, id));
-      const isRscEnv = this.environment?.name === "rsc";
-      if (id.includes(".named-routes.gen.") && !isRscEnv && this.environment?.name === "client") {
-        this.warn(
-          `
+      const __t0 = counter ? performance.now() : 0;
+      try {
+        const filePath = normalizePath(path4.relative(projectRoot, id));
+        const isRscEnv = this.environment?.name === "rsc";
+        if (id.includes(".named-routes.gen.") && !isRscEnv && this.environment?.name === "client") {
+          this.warn(
+            `
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!                                                              !!
 !!  WARNING: NamedRoutes imported in a CLIENT component!        !!
@@ -1168,367 +1418,363 @@ ${lazyImports.join(",\n")}
 !!                                                              !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 `
-        );
-      }
-      if (!code.includes("@rangojs/router")) return;
-      const has = detectImports(code);
-      const hasLoaderCode = has.loader && code.includes("createLoader");
-      const hasHandleCode = has.handle && code.includes("createHandle");
-      const hasLocationStateCode = has.locationState && code.includes("createLocationState");
-      const hasPrerenderHandlerCode = has.prerenderHandler && code.includes("Prerender");
-      const hasStaticHandlerCode = has.staticHandler && code.includes("Static");
-      if (!hasLoaderCode && !hasHandleCode && !hasLocationStateCode && !hasPrerenderHandlerCode && !hasStaticHandlerCode) {
-        return;
-      }
-      const _fnNamesCache = /* @__PURE__ */ new Map();
-      const _bindingsCache = /* @__PURE__ */ new Map();
-      let _cachedAst;
-      let _astParseFailed = false;
-      let _astCodeRef = code;
-      const getFnNames = (canonicalName) => {
-        let result = _fnNamesCache.get(canonicalName);
-        if (!result) {
-          result = getImportedFnNames(code, canonicalName);
-          _fnNamesCache.set(canonicalName, result);
+          );
         }
-        return result;
-      };
-      const lazyAst = () => {
-        if (code !== _astCodeRef) {
-          _cachedAst = void 0;
-          _astParseFailed = false;
-          _astCodeRef = code;
+        if (!code.includes("@rangojs/router")) return;
+        const has = detectImports(code);
+        const hasLoaderCode = has.loader && code.includes("createLoader");
+        const hasHandleCode = has.handle && code.includes("createHandle");
+        const hasLocationStateCode = has.locationState && code.includes("createLocationState");
+        const hasPrerenderHandlerCode = has.prerenderHandler && code.includes("Prerender");
+        const hasStaticHandlerCode = has.staticHandler && code.includes("Static");
+        if (!hasLoaderCode && !hasHandleCode && !hasLocationStateCode && !hasPrerenderHandlerCode && !hasStaticHandlerCode) {
+          return;
         }
-        if (_cachedAst !== void 0 || _astParseFailed) return _cachedAst;
-        try {
-          _cachedAst = parseAst2(code, { jsx: true });
-        } catch {
-          _astParseFailed = true;
+        const _fnNamesCache = /* @__PURE__ */ new Map();
+        const _bindingsCache = /* @__PURE__ */ new Map();
+        let _cachedAst;
+        let _astParseFailed = false;
+        let _astCodeRef = code;
+        const getFnNames = (canonicalName) => {
+          let result = _fnNamesCache.get(canonicalName);
+          if (!result) {
+            result = getImportedFnNames(code, canonicalName);
+            _fnNamesCache.set(canonicalName, result);
+          }
+          return result;
+        };
+        const lazyAst = () => {
+          if (code !== _astCodeRef) {
+            _cachedAst = void 0;
+            _astParseFailed = false;
+            _astCodeRef = code;
+          }
+          if (_cachedAst !== void 0 || _astParseFailed) return _cachedAst;
+          try {
+            _cachedAst = parseAst2(code, { lang: "tsx" });
+          } catch {
+            _astParseFailed = true;
+          }
+          return _cachedAst;
+        };
+        const getBindings = (currentCode, fnNames) => {
+          const key = fnNames.join("\0");
+          let result = _bindingsCache.get(key);
+          if (!result) {
+            result = collectCreateExportBindings(
+              currentCode,
+              fnNames,
+              lazyAst()
+            );
+            _bindingsCache.set(key, result);
+          }
+          return result;
+        };
+        for (const cfg of STRICT_CREATE_CONFIGS) {
+          const hasCode = cfg.fnName === "createLoader" ? hasLoaderCode : cfg.fnName === "createHandle" ? hasHandleCode : hasLocationStateCode;
+          if (!hasCode) continue;
+          const fnNames = getFnNames(cfg.fnName);
+          const sites = findUnsupportedCreateCallSites(
+            code,
+            fnNames,
+            getBindings(code, fnNames)
+          );
+          if (sites.length === 0) continue;
+          const warnKey = `${id}::${cfg.fnName}`;
+          if (unsupportedShapeWarnings.has(warnKey)) continue;
+          unsupportedShapeWarnings.add(warnKey);
+          this.warn(buildUnsupportedShapeWarning(filePath, cfg.fnName, sites));
         }
-        return _cachedAst;
-      };
-      const getBindings = (currentCode, fnNames) => {
-        const key = fnNames.join("\0");
-        let result = _bindingsCache.get(key);
-        if (!result) {
-          result = collectCreateExportBindings(currentCode, fnNames, lazyAst());
-          _bindingsCache.set(key, result);
+        if (hasLoaderCode && isRscEnv) {
+          const fnNames = getFnNames("createLoader");
+          const bindings = getBindings(code, fnNames);
+          for (const binding of bindings) {
+            const exportName = binding.exportNames[0];
+            const hashedId = hashId(filePath, exportName);
+            loaderRegistry.set(hashedId, {
+              filePath,
+              exportName
+            });
+          }
         }
-        return result;
-      };
-      for (const cfg of STRICT_CREATE_CONFIGS) {
-        const hasCode = cfg.fnName === "createLoader" ? hasLoaderCode : cfg.fnName === "createHandle" ? hasHandleCode : hasLocationStateCode;
-        if (!hasCode) continue;
-        const fnNames = getFnNames(cfg.fnName);
-        const totalCalls = countCreateCallsForNames(code, fnNames);
-        const supportedBindings = getBindings(code, fnNames).length;
-        if (totalCalls <= supportedBindings) continue;
-        const warnKey = `${id}::${cfg.fnName}`;
-        if (unsupportedShapeWarnings.has(warnKey)) continue;
-        unsupportedShapeWarnings.add(warnKey);
-        this.warn(buildUnsupportedShapeWarning(filePath, cfg.fnName));
-      }
-      if (hasLoaderCode && isRscEnv) {
-        const fnNames = getFnNames("createLoader");
-        const bindings = getBindings(code, fnNames);
-        for (const binding of bindings) {
-          const exportName = binding.exportNames[0];
-          const hashedId = hashId(filePath, exportName);
-          loaderRegistry.set(hashedId, {
+        if (hasLoaderCode && !isRscEnv) {
+          const fnNames = getFnNames("createLoader");
+          const bindings = getBindings(code, fnNames);
+          const stubResult = generateClientLoaderStubs(
+            bindings,
+            code,
             filePath,
-            exportName
-          });
-        }
-      }
-      if (hasLoaderCode && !isRscEnv) {
-        const fnNames = getFnNames("createLoader");
-        const bindings = getBindings(code, fnNames);
-        const stubResult = generateClientLoaderStubs(
-          bindings,
-          code,
-          filePath,
-          isBuild
-        );
-        if (stubResult) return stubResult;
-      }
-      if (hasPrerenderHandlerCode && !isRscEnv) {
-        const fnNames = getFnNames(PRERENDER_CONFIG.fnName);
-        const bindings = getBindings(code, fnNames);
-        const wholeFile = generateWholeFileStubs(
-          PRERENDER_CONFIG,
-          bindings,
-          code,
-          filePath,
-          isBuild
-        );
-        if (wholeFile) return wholeFile;
-      }
-      if (hasPrerenderHandlerCode && isRscEnv && isBuild) {
-        const fnNames = getFnNames(PRERENDER_CONFIG.fnName);
-        const exportNames = getBindings(code, fnNames).map(
-          (b) => b.exportNames[0]
-        );
-        if (exportNames.length > 0) {
-          prerenderHandlerModules.set(id, exportNames);
+            isBuild
+          );
+          if (stubResult) return stubResult;
         }
-      }
-      let changed = false;
-      const handlerConfigs = [
-        hasStaticHandlerCode && STATIC_CONFIG,
-        hasPrerenderHandlerCode && PRERENDER_CONFIG
-      ].filter((c) => !!c).map((cfg) => {
-        const fnNames = getFnNames(cfg.fnName);
-        return { cfg, fnNames };
-      });
-      for (const { cfg, fnNames } of handlerConfigs) {
-        const totalCalls = countCreateCallsForNames(code, fnNames);
-        const supportedBindings = getBindings(code, fnNames).length;
-        if (totalCalls > supportedBindings) {
-          const iterS = new MagicString4(code);
-          const result = transformInlineHandlers(
-            cfg.fnName,
-            VIRTUAL_HANDLER_PREFIX,
-            iterS,
+        if (hasPrerenderHandlerCode && !isRscEnv) {
+          const fnNames = getFnNames(PRERENDER_CONFIG.fnName);
+          const bindings = getBindings(code, fnNames);
+          const wholeFile = generateWholeFileStubs(
+            PRERENDER_CONFIG,
+            bindings,
             code,
             filePath,
-            virtualHandlers,
-            id,
-            parseAst2
+            isBuild
           );
-          if (result) {
-            changed = true;
-            code = iterS.toString();
-            _bindingsCache.clear();
-          }
+          if (wholeFile) return wholeFile;
         }
-      }
-      if (hasStaticHandlerCode && !isRscEnv) {
-        const fnNames = getFnNames(STATIC_CONFIG.fnName);
-        const bindings = getBindings(code, fnNames);
-        const wholeFile = generateWholeFileStubs(
-          STATIC_CONFIG,
-          bindings,
-          code,
-          filePath,
-          isBuild
-        );
-        if (wholeFile) return wholeFile;
-      }
-      if (!isRscEnv && (hasPrerenderHandlerCode || hasStaticHandlerCode)) {
-        const prerenderFnNames = hasPrerenderHandlerCode ? getFnNames(PRERENDER_CONFIG.fnName) : [];
-        const staticFnNames = hasStaticHandlerCode ? getFnNames(STATIC_CONFIG.fnName) : [];
-        const loaderFnNames = hasLoaderCode ? getFnNames("createLoader") : [];
-        const handleFnNames = hasHandleCode ? getFnNames("createHandle") : [];
-        const lsFnNames = hasLocationStateCode ? getFnNames("createLocationState") : [];
-        const allBindings = [];
-        for (const fnNames of [
-          prerenderFnNames,
-          staticFnNames,
-          loaderFnNames,
-          handleFnNames,
-          lsFnNames
-        ]) {
-          if (fnNames.length > 0) {
-            allBindings.push(...getBindings(code, fnNames));
+        let changed = false;
+        const handlerConfigs = [
+          hasStaticHandlerCode && STATIC_CONFIG,
+          hasPrerenderHandlerCode && PRERENDER_CONFIG
+        ].filter((c) => !!c).map((cfg) => {
+          const fnNames = getFnNames(cfg.fnName);
+          return { cfg, fnNames };
+        });
+        for (const { cfg, fnNames } of handlerConfigs) {
+          const totalCalls = countCreateCallsForNames(code, fnNames);
+          const supportedBindings = getBindings(code, fnNames).length;
+          if (totalCalls > supportedBindings) {
+            const iterS = new MagicString3(code);
+            const result = transformInlineHandlers(
+              cfg.fnName,
+              VIRTUAL_HANDLER_PREFIX,
+              iterS,
+              code,
+              filePath,
+              virtualHandlers,
+              id,
+              parseAst2
+            );
+            if (result) {
+              changed = true;
+              code = iterS.toString();
+              _bindingsCache.clear();
+            }
           }
         }
-        let canStubWholeFile = allBindings.length > 0 && isExportOnlyFile(code, allBindings);
-        if (canStubWholeFile && (handleFnNames.length > 0 || lsFnNames.length > 0)) {
-          const exportedLocals = new Set(allBindings.map((b) => b.localName));
-          const strippedBindings = [];
-          const localDeclPattern = /(?:^|;|\n)\s*(?:const|let|var|function)\s+(\w+)/g;
-          let declMatch;
-          while ((declMatch = localDeclPattern.exec(code)) !== null) {
-            const name = declMatch[1];
-            if (!exportedLocals.has(name) && !/^_c\d*$/.test(name)) {
-              strippedBindings.push(name);
+        if (hasStaticHandlerCode && !isRscEnv) {
+          const fnNames = getFnNames(STATIC_CONFIG.fnName);
+          const bindings = getBindings(code, fnNames);
+          const wholeFile = generateWholeFileStubs(
+            STATIC_CONFIG,
+            bindings,
+            code,
+            filePath,
+            isBuild
+          );
+          if (wholeFile) return wholeFile;
+        }
+        if (!isRscEnv && (hasPrerenderHandlerCode || hasStaticHandlerCode)) {
+          const prerenderFnNames = hasPrerenderHandlerCode ? getFnNames(PRERENDER_CONFIG.fnName) : [];
+          const staticFnNames = hasStaticHandlerCode ? getFnNames(STATIC_CONFIG.fnName) : [];
+          const loaderFnNames = hasLoaderCode ? getFnNames("createLoader") : [];
+          const handleFnNames = hasHandleCode ? getFnNames("createHandle") : [];
+          const lsFnNames = hasLocationStateCode ? getFnNames("createLocationState") : [];
+          const allBindings = [];
+          for (const fnNames of [
+            prerenderFnNames,
+            staticFnNames,
+            loaderFnNames,
+            handleFnNames,
+            lsFnNames
+          ]) {
+            if (fnNames.length > 0) {
+              allBindings.push(...getBindings(code, fnNames));
             }
           }
-          const importPattern = /import\s*\{([^}]*)\}\s*from\s*["'](?!@rangojs\/router)[^"']*["']/g;
-          let importMatch;
-          while ((importMatch = importPattern.exec(code)) !== null) {
-            for (const spec of importMatch[1].split(",")) {
-              const m = spec.trim().match(/^[A-Za-z_$][\w$]*(?:\s+as\s+([A-Za-z_$][\w$]*))?$/);
-              if (m) strippedBindings.push(m[1] || m[0].trim().split(/\s/)[0]);
+          let canStubWholeFile = allBindings.length > 0 && isExportOnlyFile(code, allBindings);
+          if (canStubWholeFile && (handleFnNames.length > 0 || lsFnNames.length > 0)) {
+            const exportedLocals = new Set(allBindings.map((b) => b.localName));
+            const strippedBindings = [];
+            const localDeclPattern = /(?:^|;|\n)\s*(?:const|let|var|function)\s+(\w+)/g;
+            let declMatch;
+            while ((declMatch = localDeclPattern.exec(code)) !== null) {
+              const name = declMatch[1];
+              if (!exportedLocals.has(name) && !/^_c\d*$/.test(name)) {
+                strippedBindings.push(name);
+              }
+            }
+            const importPattern = /import\s*\{([^}]*)\}\s*from\s*["'](?!@rangojs\/router)[^"']*["']/g;
+            let importMatch;
+            while ((importMatch = importPattern.exec(code)) !== null) {
+              for (const spec of importMatch[1].split(",")) {
+                const m = spec.trim().match(/^[A-Za-z_$][\w$]*(?:\s+as\s+([A-Za-z_$][\w$]*))?$/);
+                if (m)
+                  strippedBindings.push(m[1] || m[0].trim().split(/\s/)[0]);
+              }
+            }
+            const defaultImportPattern = /import\s+([A-Za-z_$][\w$]*)\s+from\s*["'](?!@rangojs\/router)[^"']*["']/g;
+            while ((importMatch = defaultImportPattern.exec(code)) !== null) {
+              strippedBindings.push(importMatch[1]);
+            }
+            const nsImportPattern = /import\s+\*\s+as\s+([A-Za-z_$][\w$]*)\s+from\s*["'](?!@rangojs\/router)[^"']*["']/g;
+            while ((importMatch = nsImportPattern.exec(code)) !== null) {
+              strippedBindings.push(importMatch[1]);
+            }
+            if (strippedBindings.length > 0) {
+              const preservedBindings = allBindings.filter((b) => {
+                const fc = code.slice(b.callExprStart, b.callOpenParenPos + 1);
+                return handleFnNames.some((n) => fc.includes(n)) || lsFnNames.some((n) => fc.includes(n));
+              });
+              const strippedRe = new RegExp(
+                `\\b(?:${strippedBindings.join("|")})\\b`
+              );
+              canStubWholeFile = !preservedBindings.some((b) => {
+                const expr = code.slice(
+                  b.callExprStart,
+                  b.callCloseParenPos + 1
+                );
+                return strippedRe.test(expr);
+              });
             }
           }
-          const defaultImportPattern = /import\s+([A-Za-z_$][\w$]*)\s+from\s*["'](?!@rangojs\/router)[^"']*["']/g;
-          while ((importMatch = defaultImportPattern.exec(code)) !== null) {
-            strippedBindings.push(importMatch[1]);
-          }
-          const nsImportPattern = /import\s+\*\s+as\s+([A-Za-z_$][\w$]*)\s+from\s*["'](?!@rangojs\/router)[^"']*["']/g;
-          while ((importMatch = nsImportPattern.exec(code)) !== null) {
-            strippedBindings.push(importMatch[1]);
-          }
-          if (strippedBindings.length > 0) {
-            const preservedBindings = allBindings.filter((b) => {
-              const fc = code.slice(b.callExprStart, b.callOpenParenPos + 1);
-              return handleFnNames.some((n) => fc.includes(n)) || lsFnNames.some((n) => fc.includes(n));
-            });
-            const strippedRe = new RegExp(
-              `\\b(?:${strippedBindings.join("|")})\\b`
-            );
-            canStubWholeFile = !preservedBindings.some((b) => {
-              const expr = code.slice(b.callExprStart, b.callCloseParenPos + 1);
-              return strippedRe.test(expr);
-            });
-          }
-        }
-        if (canStubWholeFile) {
-          const lines = [];
-          const neededImports = [];
-          if (handleFnNames.length > 0) neededImports.push("createHandle");
-          if (lsFnNames.length > 0) neededImports.push("createLocationState");
-          if (neededImports.length > 0) {
-            lines.push(
-              `import { ${neededImports.join(", ")} } from "@rangojs/router";`
-            );
-          }
-          for (const binding of allBindings) {
-            const fnCall = code.slice(
-              binding.callExprStart,
-              binding.callOpenParenPos + 1
-            );
-            const isHandle = handleFnNames.some((n) => fnCall.includes(n));
-            const isLocationState = lsFnNames.some((n) => fnCall.includes(n));
-            const primaryName = binding.exportNames[0];
-            const stubId = makeStubId(filePath, primaryName, isBuild);
-            if (isHandle || isLocationState) {
-              const rawArgs = code.slice(binding.callOpenParenPos + 1, binding.callCloseParenPos).replace(/\b_c\d*\s*=\s*/g, "");
-              const canonicalName = isHandle ? "createHandle" : "createLocationState";
-              const activeFnNames = isHandle ? handleFnNames : lsFnNames;
-              let rawCallee = code.slice(
+          if (canStubWholeFile) {
+            const lines = [];
+            const neededImports = [];
+            if (handleFnNames.length > 0) neededImports.push("createHandle");
+            if (lsFnNames.length > 0) neededImports.push("createLocationState");
+            if (neededImports.length > 0) {
+              lines.push(
+                `import { ${neededImports.join(", ")} } from "@rangojs/router";`
+              );
+            }
+            for (const binding of allBindings) {
+              const fnCall = code.slice(
                 binding.callExprStart,
-                binding.callOpenParenPos
+                binding.callOpenParenPos + 1
               );
-              for (const alias of activeFnNames) {
-                if (alias !== canonicalName && rawCallee.startsWith(alias)) {
-                  rawCallee = canonicalName + rawCallee.slice(alias.length);
-                  break;
-                }
-              }
-              if (isHandle) {
-                const idParam = binding.argCount === 0 ? `undefined, "${stubId}"` : `, "${stubId}"`;
-                lines.push(
-                  `export const ${primaryName} = ${rawCallee}(${rawArgs}${idParam});`
+              const isHandle = handleFnNames.some((n) => fnCall.includes(n));
+              const isLocationState = lsFnNames.some((n) => fnCall.includes(n));
+              const primaryName = binding.exportNames[0];
+              const stubId = makeStubId(filePath, primaryName, isBuild);
+              if (isHandle || isLocationState) {
+                const rawArgs = code.slice(
+                  binding.callOpenParenPos + 1,
+                  binding.callCloseParenPos
+                ).replace(/\b_c\d*\s*=\s*/g, "");
+                const canonicalName = isHandle ? "createHandle" : "createLocationState";
+                const activeFnNames = isHandle ? handleFnNames : lsFnNames;
+                let rawCallee = code.slice(
+                  binding.callExprStart,
+                  binding.callOpenParenPos
                 );
-                lines.push(`${primaryName}.$$id = "${stubId}";`);
+                for (const alias of activeFnNames) {
+                  if (alias !== canonicalName && rawCallee.startsWith(alias)) {
+                    rawCallee = canonicalName + rawCallee.slice(alias.length);
+                    break;
+                  }
+                }
+                if (isHandle) {
+                  const idParam = binding.argCount === 0 ? `undefined, "${stubId}"` : `, "${stubId}"`;
+                  lines.push(
+                    `export const ${primaryName} = ${rawCallee}(${rawArgs}${idParam});`
+                  );
+                  lines.push(`${primaryName}.$$id = "${stubId}";`);
+                } else {
+                  lines.push(
+                    `export const ${primaryName} = ${rawCallee}(${rawArgs});`
+                  );
+                  lines.push(
+                    `${primaryName}.__rsc_ls_key = "__rsc_ls_${stubId}";`
+                  );
+                }
+                for (const name of binding.exportNames.slice(1)) {
+                  lines.push(`export const ${name} = ${primaryName};`);
+                }
               } else {
+                let brand = "loader";
+                if (prerenderFnNames.some((n) => fnCall.includes(n))) {
+                  brand = PRERENDER_CONFIG.brand;
+                } else if (staticFnNames.some((n) => fnCall.includes(n))) {
+                  brand = STATIC_CONFIG.brand;
+                }
                 lines.push(
-                  `export const ${primaryName} = ${rawCallee}(${rawArgs});`
-                );
-                lines.push(
-                  `${primaryName}.__rsc_ls_key = "__rsc_ls_${stubId}";`
+                  `export const ${primaryName} = { __brand: "${brand}", $$id: "${stubId}" };`
                 );
-              }
-              for (const name of binding.exportNames.slice(1)) {
-                lines.push(`export const ${name} = ${primaryName};`);
-              }
-            } else {
-              let brand = "loader";
-              if (prerenderFnNames.some((n) => fnCall.includes(n))) {
-                brand = PRERENDER_CONFIG.brand;
-              } else if (staticFnNames.some((n) => fnCall.includes(n))) {
-                brand = STATIC_CONFIG.brand;
-              }
-              lines.push(
-                `export const ${primaryName} = { __brand: "${brand}", $$id: "${stubId}" };`
-              );
-              for (const name of binding.exportNames.slice(1)) {
-                lines.push(`export const ${name} = ${primaryName};`);
+                for (const name of binding.exportNames.slice(1)) {
+                  lines.push(`export const ${name} = ${primaryName};`);
+                }
               }
             }
+            return { code: lines.join("\n") + "\n", map: null };
           }
-          return { code: lines.join("\n") + "\n", map: null };
         }
-      }
-      if (hasStaticHandlerCode && isRscEnv && isBuild) {
-        const fnNames = getFnNames(STATIC_CONFIG.fnName);
-        const exportNames = getBindings(code, fnNames).map(
-          (b) => b.exportNames[0]
-        );
-        if (exportNames.length > 0) {
-          staticHandlerModules.set(id, exportNames);
+        if (isRscEnv && isBuild) {
+          const trackTypes = [
+            [
+              hasPrerenderHandlerCode,
+              PRERENDER_CONFIG,
+              prerenderHandlerModules
+            ],
+            [hasStaticHandlerCode, STATIC_CONFIG, staticHandlerModules]
+          ];
+          for (const [has2, cfg, trackMap] of trackTypes) {
+            if (!has2) continue;
+            const exportNames = getBindings(code, getFnNames(cfg.fnName)).map(
+              (b) => b.exportNames[0]
+            );
+            if (exportNames.length > 0) trackMap.set(id, exportNames);
+          }
         }
-      }
-      const s = new MagicString4(code);
-      if (hasLoaderCode) {
-        const fnNames = getFnNames("createLoader");
-        changed = transformLoaders(getBindings(code, fnNames), s, filePath, isBuild) || changed;
-      }
-      if (hasHandleCode) {
-        const fnNames = getFnNames("createHandle");
-        changed = transformHandles(
-          getBindings(code, fnNames),
-          s,
-          code,
-          filePath,
-          isBuild
-        ) || changed;
-      }
-      if (hasLocationStateCode) {
-        const fnNames = getFnNames("createLocationState");
-        changed = transformLocationState(
-          getBindings(code, fnNames),
-          s,
-          filePath,
-          isBuild
-        ) || changed;
-      }
-      if (hasPrerenderHandlerCode) {
-        const fnNames = getFnNames(PRERENDER_CONFIG.fnName);
-        const bindings = getBindings(code, fnNames);
-        if (isRscEnv) {
-          changed = transformHandlerIds(
-            PRERENDER_CONFIG,
-            bindings,
+        const s = new MagicString3(code);
+        if (hasLoaderCode) {
+          const fnNames = getFnNames("createLoader");
+          changed = transformLoaders(
+            getBindings(code, fnNames),
             s,
             filePath,
             isBuild
           ) || changed;
-        } else {
-          changed = stubHandlerExprs(
-            PRERENDER_CONFIG,
-            bindings,
+        }
+        if (hasHandleCode) {
+          const fnNames = getFnNames("createHandle");
+          changed = transformHandles(
+            getBindings(code, fnNames),
             s,
+            code,
             filePath,
             isBuild
           ) || changed;
         }
-      }
-      if (hasStaticHandlerCode) {
-        const fnNames = getFnNames(STATIC_CONFIG.fnName);
-        const bindings = getBindings(code, fnNames);
-        if (isRscEnv) {
-          changed = transformHandlerIds(
-            STATIC_CONFIG,
-            bindings,
+        if (hasLocationStateCode) {
+          const fnNames = getFnNames("createLocationState");
+          changed = transformLocationState(
+            getBindings(code, fnNames),
             s,
             filePath,
             isBuild
           ) || changed;
-        } else {
-          changed = stubHandlerExprs(STATIC_CONFIG, bindings, s, filePath, isBuild) || changed;
         }
+        const finalHandlerConfigs = [
+          hasPrerenderHandlerCode && PRERENDER_CONFIG,
+          hasStaticHandlerCode && STATIC_CONFIG
+        ].filter((c) => !!c);
+        for (const cfg of finalHandlerConfigs) {
+          const bindings = getBindings(code, getFnNames(cfg.fnName));
+          changed = (isRscEnv ? transformHandlerIds(cfg, bindings, s, filePath, isBuild) : stubHandlerExprs(cfg, bindings, s, filePath, isBuild)) || changed;
+        }
+        if (!changed) return;
+        return {
+          code: s.toString(),
+          map: s.generateMap({ source: id, includeContent: true })
+        };
+      } finally {
+        counter?.record(id, performance.now() - __t0);
       }
-      if (!changed) return;
-      return {
-        code: s.toString(),
-        map: s.generateMap({ source: id, includeContent: true })
-      };
     }
   };
 }
 
 // src/vite/plugins/use-cache-transform.ts
 import path5 from "node:path";
-import MagicString5 from "magic-string";
+import MagicString4 from "magic-string";
+var debug4 = createRangoDebugger(NS.transform);
 var CACHE_RUNTIME_IMPORT = "@rangojs/router/cache-runtime";
 var LAYOUT_TEMPLATE_PATTERN = /\/(layout|template)\.(tsx?|jsx?)$/;
+var USE_CACHE_DIRECTIVE_RE = /^use cache(:\s*[\w-]+)?$/;
 function useCacheTransform() {
   let projectRoot = "";
   let isBuild = false;
   let rscTransforms = null;
+  const counter = createCounter(debug4, "use-cache");
   return {
     name: "@rangojs/router:use-cache",
     enforce: "post",
@@ -1536,53 +1782,61 @@ function useCacheTransform() {
       projectRoot = config.root;
       isBuild = config.command === "build";
     },
+    buildEnd() {
+      counter?.flush();
+    },
     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) {
+      const start = counter ? performance.now() : 0;
+      try {
+        if (!rscTransforms) {
+          try {
+            rscTransforms = await import("@vitejs/plugin-rsc/transforms");
+          } catch {
+            return;
+          }
+        }
+        const {
+          hasDirective,
+          transformWrapExport,
+          transformHoistInlineDirective
+        } = rscTransforms;
+        let ast;
         try {
-          rscTransforms = await import("@vitejs/plugin-rsc/transforms");
+          const { parseAst: parseAst4 } = await import("vite");
+          ast = parseAst4(code, { lang: "tsx" });
         } 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(
+        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,
-          isLayoutOrTemplate,
-          transformWrapExport
+          transformHoistInlineDirective
         );
+        warnOnNearMissDirectives(ast, id, this.warn.bind(this));
+        if (functionResult) return functionResult;
+      } finally {
+        counter?.record(id, performance.now() - start);
       }
-      const functionResult = transformFunctionLevelUseCache(
-        code,
-        ast,
-        filePath,
-        id,
-        isBuild,
-        transformHoistInlineDirective
-      );
-      warnOnNearMissDirectives(ast, id, this.warn.bind(this));
-      if (functionResult) return functionResult;
     }
   };
 }
@@ -1609,7 +1863,7 @@ function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLa
     );
   }
   if (exportNames.length === 0) {
-    const s = new MagicString5(code);
+    const s = new MagicString4(code);
     const directive2 = findFileLevelDirective(ast);
     if (directive2) {
       s.overwrite(
@@ -1644,7 +1898,7 @@ function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLa
 function transformFunctionLevelUseCache(code, ast, filePath, sourceId, isBuild, transformHoistInlineDirective) {
   try {
     const { output, names } = transformHoistInlineDirective(code, ast, {
-      directive: /^use cache(:\s*[\w-]+)?$/,
+      directive: USE_CACHE_DIRECTIVE_RE,
       runtime: (value, name, meta) => {
         const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
         const profileMatch = meta.directiveMatch[1];
@@ -1674,14 +1928,13 @@ function findFileLevelDirective(ast) {
   }
   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)) {
+      if (value.startsWith("use cache") && NEAR_MISS_RE.test(value) && !USE_CACHE_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.`
@@ -1705,6 +1958,7 @@ function warnOnNearMissDirectives(ast, fileId, warn) {
 }
 
 // src/vite/plugins/client-ref-dedup.ts
+var debug5 = createRangoDebugger(NS.transform);
 var CLIENT_IN_SERVER_PROXY_PREFIX = "virtual:vite-rsc/client-in-server-package-proxy/";
 function extractPackageName(absolutePath) {
   const marker = "/node_modules/";
@@ -1721,6 +1975,7 @@ function extractPackageName(absolutePath) {
 }
 function clientRefDedup() {
   let clientExclude = [];
+  const dedupedPackages = /* @__PURE__ */ new Set();
   return {
     name: "@rangojs/router:client-ref-dedup",
     enforce: "pre",
@@ -1729,6 +1984,15 @@ function clientRefDedup() {
       const clientEnv = config.environments?.["client"];
       clientExclude = clientEnv?.optimizeDeps?.exclude ?? config.optimizeDeps?.exclude ?? [];
     },
+    buildEnd() {
+      if (debug5 && dedupedPackages.size > 0) {
+        debug5(
+          "client-ref-dedup: redirected %d package(s) (%s)",
+          dedupedPackages.size,
+          [...dedupedPackages].join(",")
+        );
+      }
+    },
     resolveId(source, importer, options) {
       if (this.environment?.name !== "client") return;
       if (!importer?.includes(CLIENT_IN_SERVER_PROXY_PREFIX)) return;
@@ -1737,6 +2001,7 @@ function clientRefDedup() {
       const packageName = extractPackageName(source);
       if (!packageName) return;
       if (clientExclude.includes(packageName)) return;
+      if (debug5) dedupedPackages.add(packageName);
       return `\0rango:dedup/${packageName}`;
     },
     load(id) {
@@ -1763,7 +2028,7 @@ import {
 import { createElement, StrictMode } from "react";
 import { hydrateRoot } from "react-dom/client";
 import { rscStream } from "@rangojs/router/internal/deps/html-stream-client";
-import { initBrowserApp, RSCRouter } from "@rangojs/router/browser";
+import { initBrowserApp, Rango } from "@rangojs/router/browser";
 
 async function initializeApp() {
   const deps = {
@@ -1778,7 +2043,7 @@ async function initializeApp() {
 
   hydrateRoot(
     document,
-    createElement(StrictMode, null, createElement(RSCRouter))
+    createElement(StrictMode, null, createElement(Rango))
   );
 }
 
@@ -1859,12 +2124,13 @@ function getVirtualVersionContent(version) {
 
 // src/vite/utils/package-resolution.ts
 import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import { resolve } from "node:path";
 
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.d7eeaa75",
+  version: "0.0.0-experimental.d98a8e9d",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -1990,6 +2256,31 @@ var package_default = {
     "./host/testing": {
       types: "./src/host/testing.ts",
       default: "./src/host/testing.ts"
+    },
+    "./testing": {
+      types: "./src/testing/index.ts",
+      default: "./src/testing/index.ts"
+    },
+    "./testing/vitest": {
+      types: "./src/testing/vitest.ts",
+      default: "./dist/testing/vitest.js"
+    },
+    "./testing/dom": {
+      types: "./src/testing/dom.entry.ts",
+      default: "./src/testing/dom.entry.ts"
+    },
+    "./testing/e2e": {
+      types: "./src/testing/e2e/index.ts",
+      default: "./src/testing/e2e/index.ts"
+    },
+    "./testing/flight": {
+      types: "./src/testing/flight.entry.ts",
+      "react-server": "./src/testing/flight.entry.ts",
+      default: "./src/testing/flight.entry.ts"
+    },
+    "./testing/flight-matchers": {
+      types: "./src/testing/flight-matchers.ts",
+      default: "./src/testing/flight-matchers.ts"
     }
   },
   publishConfig: {
@@ -1997,50 +2288,72 @@ var package_default = {
     tag: "experimental"
   },
   scripts: {
-    build: "pnpm dlx esbuild src/vite/index.ts --bundle --format=esm --outfile=dist/vite/index.js --platform=node --packages=external && pnpm dlx esbuild src/bin/rango.ts --bundle --format=esm --outfile=dist/bin/rango.js --platform=node --packages=external --banner:js='#!/usr/bin/env node' && chmod +x dist/bin/rango.js",
+    build: "pnpm dlx esbuild src/vite/index.ts --bundle --format=esm --outfile=dist/vite/index.js --platform=node --packages=external && mkdir -p dist/vite/plugins && cp src/vite/plugins/cloudflare-protocol-loader-hook.mjs dist/vite/plugins/cloudflare-protocol-loader-hook.mjs && pnpm dlx esbuild src/testing/vitest.ts --bundle --format=esm --outfile=dist/testing/vitest.js --platform=node --packages=external && pnpm dlx esbuild src/bin/rango.ts --bundle --format=esm --outfile=dist/bin/rango.js --platform=node --packages=external --banner:js='#!/usr/bin/env node' && chmod +x dist/bin/rango.js",
     prepublishOnly: "pnpm build",
-    typecheck: "tsc --noEmit",
+    typecheck: "tsc --noEmit && tsc -p tsconfig.strict-check.json --noEmit && tsc -p tsconfig.augment-check.json --noEmit",
     test: "playwright test",
     "test:ui": "playwright test --ui",
+    "test:hmr-local": "playwright test --project=dev-warmup --project=hmr-routes --project=hmr-basename --project=hmr-prerender --no-deps --workers=1",
     "test:unit": "vitest run",
-    "test:unit:watch": "vitest"
+    "test:unit:watch": "vitest",
+    "test:unit:rsc": "vitest run --config vitest.rsc.config.ts"
   },
   dependencies: {
-    "@vitejs/plugin-rsc": "^0.5.19",
+    "@types/debug": "^4.1.12",
+    "@vitejs/plugin-rsc": "^0.5.26",
+    debug: "^4.4.1",
     "magic-string": "^0.30.17",
     picomatch: "^4.0.3",
-    "rsc-html-stream": "^0.0.7"
+    "rsc-html-stream": "^0.0.7",
+    tinyexec: "^0.3.2"
   },
   devDependencies: {
     "@playwright/test": "^1.49.1",
+    "@shared/e2e": "workspace:*",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/node": "^24.10.1",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     esbuild: "^0.27.0",
+    "happy-dom": "^20.10.1",
     jiti: "^2.6.1",
     react: "catalog:",
     "react-dom": "catalog:",
-    tinyexec: "^0.3.2",
     typescript: "^5.3.0",
     vitest: "^4.0.0"
   },
   peerDependencies: {
-    "@cloudflare/vite-plugin": "^1.25.0",
-    "@vitejs/plugin-rsc": "^0.5.14",
-    react: "^18.0.0 || ^19.0.0",
-    vite: "^7.3.0"
+    "@cloudflare/vite-plugin": "^1.38.0",
+    "@playwright/test": "^1.49.1",
+    "@testing-library/react": ">=16",
+    "@vitejs/plugin-rsc": "^0.5.26",
+    react: ">=19.2.6 <20",
+    "react-dom": ">=19.2.6 <20",
+    vite: "^8.0.0",
+    vitest: ">=3"
   },
   peerDependenciesMeta: {
     "@cloudflare/vite-plugin": {
       optional: true
     },
-    vite: {
+    "@playwright/test": {
+      optional: true
+    },
+    "@testing-library/react": {
+      optional: true
+    },
+    vite: {
+      optional: true
+    },
+    vitest: {
       optional: true
     }
   }
 };
 
 // src/vite/utils/package-resolution.ts
+var require2 = createRequire(import.meta.url);
 var VIRTUAL_PACKAGE_NAME = "@rangojs/router";
 function getPublishedPackageName() {
   return package_default.name;
@@ -2081,6 +2394,20 @@ function getPackageAliases() {
   }
   return aliases;
 }
+function getVendorAliases() {
+  const specs = [
+    "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge",
+    "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
+  ];
+  const aliases = {};
+  for (const spec of specs) {
+    try {
+      aliases[spec] = require2.resolve(spec);
+    } catch {
+    }
+  }
+  return aliases;
+}
 
 // src/build/route-types/param-extraction.ts
 function extractParamsFromPattern(pattern) {
@@ -2206,7 +2533,7 @@ ${objectBody}
 } as const;
 
 declare global {
-  namespace RSCRouter {
+  namespace Rango {
     interface GeneratedRouteMap extends Readonly<typeof NamedRoutes> {}
   }
 }
@@ -2441,7 +2768,7 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
   const realPath = resolve2(filePath);
   const key = variableName ? `${realPath}:${variableName}` : realPath;
   if (visited.has(key)) {
-    console.warn(`[rsc-router] Circular include detected, skipping: ${key}`);
+    console.warn(`[rango] Circular include detected, skipping: ${key}`);
     return { routes: {}, searchSchemas: {} };
   }
   visited.add(key);
@@ -2502,6 +2829,7 @@ function countPublicRouteEntries(source) {
   return count;
 }
 var ROUTER_CALL_PATTERN = /\bcreateRouter\s*[<(]/;
+var ROUTER_CALL_PATTERN_G = /\bcreateRouter\s*[<(]/g;
 function isRoutableSourceFile(name) {
   return (name.endsWith(".ts") || name.endsWith(".tsx") || name.endsWith(".js") || name.endsWith(".jsx")) && !name.includes(".gen.") && !name.includes(".test.") && !name.includes(".spec.");
 }
@@ -2511,7 +2839,7 @@ function findRouterFilesRecursive(dir, filter, results) {
     entries = readdirSync(dir, { withFileTypes: true });
   } catch (err) {
     console.warn(
-      `[rsc-router] Failed to scan directory ${dir}: ${err.message}`
+      `[rango] Failed to scan directory ${dir}: ${err.message}`
     );
     return;
   }
@@ -2529,7 +2857,7 @@ function findRouterFilesRecursive(dir, filter, results) {
     if (filter && !filter(fullPath)) continue;
     try {
       const source = readFileSync2(fullPath, "utf-8");
-      if (ROUTER_CALL_PATTERN.test(source)) {
+      if (ROUTER_CALL_PATTERN.test(source) && firstCodeMatchIndex(source, ROUTER_CALL_PATTERN_G) >= 0) {
         routerFilesInDir.push(fullPath);
       }
     } catch {
@@ -2567,7 +2895,7 @@ function findNestedRouterConflict(routerFiles) {
   }
   return null;
 }
-function formatNestedRouterConflictError(conflict, prefix = "[rsc-router]") {
+function formatNestedRouterConflictError(conflict, prefix = "[rango]") {
   return `${prefix} Nested router roots are not supported.
 Router root: ${conflict.ancestor}
 Nested router: ${conflict.nested}
@@ -2663,19 +2991,38 @@ function extractBasenameFromRouter(code) {
   visit(sourceFile);
   return result;
 }
-function applyBasenameToRoutes(result, basename3) {
+function applyBasenameToRoutes(result, basename2) {
   const prefixed = {};
   for (const [name, pattern] of Object.entries(result.routes)) {
     if (pattern === "/") {
-      prefixed[name] = basename3;
-    } else if (basename3.endsWith("/") && pattern.startsWith("/")) {
-      prefixed[name] = basename3 + pattern.slice(1);
+      prefixed[name] = basename2;
+    } else if (basename2.endsWith("/") && pattern.startsWith("/")) {
+      prefixed[name] = basename2 + pattern.slice(1);
     } else {
-      prefixed[name] = basename3 + pattern;
+      prefixed[name] = basename2 + pattern;
     }
   }
   return { routes: prefixed, searchSchemas: result.searchSchemas };
 }
+function genFileTsPath(sourceFile) {
+  const base = pathBasename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
+  return join(dirname2(sourceFile), `${base}.named-routes.gen.ts`);
+}
+function resolveSearchSchemas(publicRouteNames, runtimeSchemas, sourceFile) {
+  if (runtimeSchemas && Object.keys(runtimeSchemas).length > 0) {
+    return runtimeSchemas;
+  }
+  const staticParsed = buildCombinedRouteMapForRouterFile(sourceFile);
+  if (Object.keys(staticParsed.searchSchemas).length === 0) {
+    return runtimeSchemas;
+  }
+  const filtered = {};
+  for (const name of publicRouteNames) {
+    const schema = staticParsed.searchSchemas[name];
+    if (schema) filtered[name] = schema;
+  }
+  return Object.keys(filtered).length > 0 ? filtered : runtimeSchemas;
+}
 function buildCombinedRouteMapForRouterFile(routerFilePath) {
   let routerSource;
   try {
@@ -2688,7 +3035,7 @@ function buildCombinedRouteMapForRouterFile(routerFilePath) {
     return { routes: {}, searchSchemas: {} };
   }
   const rawBasename = extractBasenameFromRouter(routerSource);
-  const basename3 = rawBasename ? ("/" + rawBasename.replace(/^\/+|\/+$/g, "")).replace(/^\/$/, "") : void 0;
+  const basename2 = rawBasename ? ("/" + rawBasename.replace(/^\/+|\/+$/g, "")).replace(/^\/$/, "") : void 0;
   let result;
   if (extraction.kind === "inline") {
     result = buildCombinedRouteMapWithSearch(
@@ -2713,8 +3060,8 @@ function buildCombinedRouteMapForRouterFile(routerFilePath) {
       result = buildCombinedRouteMapWithSearch(routerFilePath, extraction.name);
     }
   }
-  if (basename3) {
-    result = applyBasenameToRoutes(result, basename3);
+  if (basename2) {
+    result = applyBasenameToRoutes(result, basename2);
   }
   return result;
 }
@@ -2729,7 +3076,7 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
     if (existsSync3(oldCombinedPath)) {
       unlinkSync(oldCombinedPath);
       console.log(
-        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+        `[rango] Removed stale combined route types: ${oldCombinedPath}`
       );
     }
   } catch {
@@ -2751,18 +3098,12 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
       }
       if (!extractUrlsFromRouter(routerSource)) continue;
     }
-    const routerBasename = pathBasename(routerFilePath).replace(
-      /\.(tsx?|jsx?)$/,
-      ""
-    );
-    const outPath = join(
-      dirname2(routerFilePath),
-      `${routerBasename}.named-routes.gen.ts`
-    );
+    const outPath = genFileTsPath(routerFilePath);
     const existing = existsSync3(outPath) ? readFileSync2(outPath, "utf-8") : null;
     if (Object.keys(result.routes).length === 0) {
       if (!existing) {
         const emptySource = generateRouteTypesSource({});
+        opts?.onWrite?.(outPath, emptySource);
         writeFileSync(outPath, emptySource);
       }
       continue;
@@ -2782,9 +3123,10 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
           continue;
         }
       }
+      opts?.onWrite?.(outPath, source);
       writeFileSync(outPath, source);
       console.log(
-        `[rsc-router] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
+        `[rango] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
       );
     }
   }
@@ -2801,7 +3143,7 @@ function normalizeModuleId(id) {
 function getClientModuleSignature(source) {
   let program;
   try {
-    program = parseAst3(source, { jsx: true });
+    program = parseAst3(source, { lang: "tsx" });
   } catch {
     return void 0;
   }
@@ -2884,11 +3226,12 @@ function createVersionPlugin() {
   let currentVersion = buildVersion;
   let isDev = false;
   let server = null;
+  let resolvedCacheDir;
   const clientModuleSignatures = /* @__PURE__ */ new Map();
   let versionCounter = 0;
   const bumpVersion = (reason) => {
     currentVersion = Date.now().toString(16) + String(++versionCounter);
-    console.log(`[rsc-router] ${reason}, version updated: ${currentVersion}`);
+    console.log(`[rango] ${reason}, version updated: ${currentVersion}`);
     const rscEnv = server?.environments?.rsc;
     const versionMod = rscEnv?.moduleGraph?.getModuleById(
       "\0" + VIRTUAL_IDS.version
@@ -2902,6 +3245,7 @@ function createVersionPlugin() {
     enforce: "pre",
     configResolved(config) {
       isDev = config.command === "serve";
+      resolvedCacheDir = config.cacheDir ? String(config.cacheDir).replace(/\\/g, "/") : void 0;
     },
     configureServer(devServer) {
       server = devServer;
@@ -2943,6 +3287,7 @@ function createVersionPlugin() {
       if (!isDev) return;
       const isRscModule = this.environment?.name === "rsc";
       if (!isRscModule) return;
+      if (isViteDepCachePath(ctx.file, resolvedCacheDir)) return;
       if (ctx.modules.length === 1 && ctx.modules[0].id === "\0" + VIRTUAL_IDS.version) {
         return;
       }
@@ -2972,12 +3317,24 @@ function createVersionPlugin() {
     }
   };
 }
+function isViteDepCachePath(filePath, cacheDir) {
+  if (!filePath) return false;
+  const normalized = filePath.replace(/\\/g, "/");
+  if (cacheDir) {
+    const normalizedCacheDir = cacheDir.replace(/\\/g, "/").replace(/\/+$/, "");
+    if (normalized === normalizedCacheDir || normalized.startsWith(normalizedCacheDir + "/")) {
+      return true;
+    }
+  }
+  return /\/node_modules\/\.vite[^/]*\//.test(normalized) || normalized.includes("/.vite-isolated/");
+}
 
 // src/vite/utils/shared-utils.ts
 import * as Vite from "vite";
 
 // src/vite/plugins/performance-tracks.ts
 import { readFile } from "node:fs/promises";
+var debug6 = createRangoDebugger(NS.transform);
 var RSDW_PATCH_RE = /((?:var|let|const)\s+\w+\s*=\s*root\._children\s*,\s*(\w+)\s*=\s*root\._debugInfo\s*[;,])/;
 function buildPatchReplacement(match, debugInfoVar) {
   return `${match}
@@ -2999,62 +3356,65 @@ function patchRsdwClientDebugInfoRecovery(code) {
   };
 }
 function performanceTracksOptimizeDepsPlugin() {
+  const RSDW_CLIENT_RE = /react-server-dom-webpack-client\.browser\.(development|production)\.js$/;
   return {
     name: "@rangojs/router:performance-tracks-optimize-deps",
-    setup(build) {
-      build.onLoad(
-        {
-          filter: /react-server-dom-webpack-client\.browser\.(development|production)\.js$/
-        },
-        async (args) => {
-          const code = await readFile(args.path, "utf8");
-          const patched = patchRsdwClientDebugInfoRecovery(code);
-          return {
-            contents: patched.code,
-            loader: "js"
-          };
-        }
-      );
+    // Vite 8 optimizes deps with Rolldown (Rollup-style plugin pipeline), so the
+    // pre-bundled RSDW client is patched via load() rather than esbuild's onLoad.
+    // Returning code overrides Rolldown's default filesystem read for the module.
+    async load(id) {
+      const cleanId = id.split("?")[0] ?? id;
+      if (!RSDW_CLIENT_RE.test(cleanId)) return null;
+      const code = await readFile(cleanId, "utf8");
+      const patched = patchRsdwClientDebugInfoRecovery(code);
+      return { code: patched.code };
     }
   };
 }
 function performanceTracksPlugin() {
+  const counter = createCounter(debug6, "performance-tracks");
   return {
     name: "@rangojs/router:performance-tracks",
+    buildEnd() {
+      counter?.flush();
+    },
     transform(code, id) {
       if (!id.includes("react-server-dom") || !id.includes("client")) return;
-      const patched = patchRsdwClientDebugInfoRecovery(code);
-      if (!patched.debugInfoVar) return;
-      if (process.env.INTERNAL_RANGO_DEBUG)
-        console.log(
-          "[perf-tracks] patched RSDW client (var:",
-          patched.debugInfoVar,
-          ")"
-        );
-      return patched.code;
+      const start = counter ? performance.now() : 0;
+      try {
+        const patched = patchRsdwClientDebugInfoRecovery(code);
+        if (!patched.debugInfoVar) return;
+        debug6?.("patched RSDW client (var: %s)", patched.debugInfoVar);
+        return patched.code;
+      } finally {
+        counter?.record(id, performance.now() - start);
+      }
     }
   };
 }
 
 // src/vite/utils/shared-utils.ts
-var versionEsbuildPlugin = {
+function resolveRscEntryFromConfig(config) {
+  const entries = config.environments?.["rsc"]?.optimizeDeps?.entries;
+  if (typeof entries === "string") return entries;
+  if (Array.isArray(entries) && entries.length > 0) return entries[0];
+  return void 0;
+}
+var versionRolldownPlugin = {
   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"
-      })
-    );
+  resolveId(id) {
+    if (id === VIRTUAL_IDS.version) return "\0" + VIRTUAL_IDS.version;
+    return void 0;
+  },
+  load(id) {
+    if (id === "\0" + VIRTUAL_IDS.version) {
+      return getVirtualVersionContent("dev");
+    }
+    return void 0;
   }
 };
-var sharedEsbuildOptions = {
-  plugins: [versionEsbuildPlugin, performanceTracksOptimizeDepsPlugin()]
+var sharedRolldownOptions = {
+  plugins: [versionRolldownPlugin, performanceTracksOptimizeDepsPlugin()]
 };
 function createVirtualEntriesPlugin(entries, routerPathRef) {
   const virtualModules = {};
@@ -3096,8 +3456,29 @@ function createVirtualEntriesPlugin(entries, routerPathRef) {
     }
   };
 }
+function isContentHashedAssetConflict(message) {
+  if (!message) return false;
+  const match = /The emitted file "?([^"\s]+)"? overwrites a previously emitted file/.exec(
+    message
+  );
+  if (!match) return false;
+  const fileName = match[1];
+  const base = fileName.slice(fileName.lastIndexOf("/") + 1);
+  const dot = base.lastIndexOf(".");
+  if (dot <= 0) return false;
+  const stem = base.slice(0, dot);
+  const HASH_LEN = 8;
+  if (stem.length < HASH_LEN + 1 || stem[stem.length - HASH_LEN - 1] !== "-") {
+    return false;
+  }
+  const hash = stem.slice(-HASH_LEN);
+  return /^[A-Za-z0-9_-]+$/.test(hash) && /[A-Z0-9]/.test(hash);
+}
 function onwarn(warning, defaultHandler) {
-  if (warning.code === "MODULE_LEVEL_DIRECTIVE" || warning.code === "SOURCEMAP_ERROR" || warning.code === "EMPTY_BUNDLE") {
+  if (warning.code === "MODULE_LEVEL_DIRECTIVE" || warning.code === "SOURCEMAP_ERROR" || warning.code === "EMPTY_BUNDLE" || warning.code === "INEFFECTIVE_DYNAMIC_IMPORT") {
+    return;
+  }
+  if (warning.code === "FILE_NAME_CONFLICT" && isContentHashedAssetConflict(warning.message)) {
     return;
   }
   if (warning.message?.includes("Sourcemap is likely to be incorrect")) {
@@ -3116,12 +3497,138 @@ function getManualChunks(id) {
     return "react";
   }
   const packageName = getPublishedPackageName();
-  if (normalized.includes(`node_modules/${packageName}/`) || normalized.includes("packages/rsc-router/") || normalized.includes("packages/rangojs-router/")) {
+  if (normalized.includes(`node_modules/${packageName}/`) || /\/packages\/(rsc-router|rangojs-router)\/(src|dist)\//.test(normalized)) {
     return "router";
   }
   return void 0;
 }
 
+// src/vite/plugins/client-ref-hashing.ts
+import { relative } from "node:path";
+import { createHash as createHash2 } from "node:crypto";
+var debug7 = createRangoDebugger(NS.transform);
+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 hashRefKey(relativeId) {
+  return createHash2("sha256").update(relativeId).digest("hex").slice(0, 12);
+}
+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 = relative(projectRoot, absPath).replaceAll("\\", "/");
+  } else if (refKey.startsWith(FS_PREFIX)) {
+    const absPath = refKey.slice(FS_PREFIX.length - 1);
+    toHash = relative(projectRoot, absPath).replaceAll("\\", "/");
+  } else if (refKey.startsWith("/")) {
+    toHash = refKey.slice(1);
+  } else {
+    return refKey;
+  }
+  return hashRefKey(toHash);
+}
+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) {
+  const counter = createCounter(debug7, "hash-client-refs");
+  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";
+    },
+    buildEnd() {
+      counter?.flush();
+    },
+    transform(code, id) {
+      const start = counter ? performance.now() : 0;
+      try {
+        const result = transformClientRefs(code, projectRoot);
+        if (result === null) return;
+        return { code: result, map: null };
+      } finally {
+        counter?.record(id, performance.now() - start);
+      }
+    }
+  };
+}
+
+// src/vite/utils/client-chunks.ts
+var debugChunks = createRangoDebugger(NS.chunks);
+function isSharedRuntime(meta) {
+  return [meta.id, meta.normalizedId].some(
+    (path6) => path6.includes("/node_modules/") || /\/@rangojs\/router\//.test(path6) || /\/packages\/(rangojs-router|rsc-router)\/(src|dist)\//.test(path6)
+  );
+}
+function sanitizeGroup(name) {
+  return name.replace(/[^a-zA-Z0-9_-]+/g, "_").replace(/^_+|_+$/g, "") || "app";
+}
+var ROUTE_ROOT_DIRS = /* @__PURE__ */ new Set([
+  "routes",
+  "route",
+  "pages",
+  "page",
+  "app",
+  "features",
+  "feature",
+  "views",
+  "view",
+  "handlers",
+  "urls",
+  "modules",
+  "screens",
+  "sections"
+]);
+function directoryClientChunks(meta, ctx) {
+  if (isSharedRuntime(meta)) {
+    return void 0;
+  }
+  if (ctx?.fallbackRefs.size && ctx.fallbackRefs.has(hashRefKey(meta.normalizedId))) {
+    debugChunks?.("fallback %s -> app-fallback", meta.normalizedId);
+    return "app-fallback";
+  }
+  const segments = meta.normalizedId.split("/").filter(Boolean);
+  const dirCount = segments.length - 1;
+  if (dirCount >= 1) {
+    for (let i = 0; i < dirCount - 1; i++) {
+      if (ROUTE_ROOT_DIRS.has(segments[i].toLowerCase())) {
+        const group = `app-${sanitizeGroup(segments[i + 1])}`;
+        debugChunks?.("split %s -> %s", meta.normalizedId, group);
+        return group;
+      }
+    }
+  }
+  debugChunks?.(
+    "shared %s (no route-root marker; inherits default grouping)",
+    meta.normalizedId
+  );
+  return void 0;
+}
+function resolveClientChunks(option, ctx) {
+  if (!option) return void 0;
+  if (option === true) return (meta) => directoryClientChunks(meta, ctx);
+  return option;
+}
+
 // src/vite/utils/banner.ts
 var rangoVersion = package_default.version;
 var _bannerPrinted = false;
@@ -3158,15 +3665,7 @@ function createVersionInjectorPlugin(rscEntryPath) {
     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) entryPath = resolveRscEntryFromConfig(config);
       if (entryPath) {
         resolvedEntryPath = resolve4(config.root, entryPath);
       }
@@ -3178,11 +3677,10 @@ function createVersionInjectorPlugin(rscEntryPath) {
       if (normalizedId !== normalizedEntry) {
         return null;
       }
-      const prepend = [];
+      const prepend = [
+        `import "virtual:rsc-router/routes-manifest";`
+      ];
       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";`);
@@ -3191,8 +3689,21 @@ function createVersionInjectorPlugin(rscEntryPath) {
           "createRSCHandler({\n  version: VERSION,"
         );
       }
-      if (prepend.length === 0 && newCode === code) return null;
-      newCode = prepend.join("\n") + (prepend.length > 0 ? "\n" : "") + newCode;
+      const lines = newCode.split("\n");
+      let insertAt = 0;
+      while (insertAt < lines.length) {
+        const trimmed = lines[insertAt].trim();
+        if (trimmed === "" || /^\/\/\/\s*<reference\b/.test(trimmed)) {
+          insertAt++;
+        } else {
+          break;
+        }
+      }
+      newCode = [
+        ...lines.slice(0, insertAt),
+        ...prepend,
+        ...lines.slice(insertAt)
+      ].join("\n");
       return {
         code: newCode,
         map: null
@@ -3202,21 +3713,23 @@ function createVersionInjectorPlugin(rscEntryPath) {
 }
 
 // src/vite/plugins/cjs-to-esm.ts
+var debug8 = createRangoDebugger(NS.transform);
 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 cleanId = id.split("?")[0].replaceAll("\\", "/");
+      if (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";
+        debug8?.("cjs-to-esm entry redirect %s", id);
         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")) {
+      if (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] : "";
@@ -3246,6 +3759,7 @@ function createCjsToEsmPlugin() {
           "export const $1 ="
         );
         transformed = license + "\n" + transformed;
+        debug8?.("cjs-to-esm body rewrite %s", id);
         return {
           code: transformed,
           map: null
@@ -3260,7 +3774,7 @@ function createCjsToEsmPlugin() {
 import { createServer as createViteServer } from "vite";
 import { resolve as resolve8 } from "node:path";
 import { readFileSync as readFileSync6 } from "node:fs";
-import { createRequire } from "node:module";
+import { createRequire as createRequire2, register } from "node:module";
 import { pathToFileURL } from "node:url";
 
 // src/vite/plugins/virtual-stub-plugin.ts
@@ -3287,61 +3801,112 @@ function createVirtualStubPlugin() {
   };
 }
 
-// src/vite/plugins/client-ref-hashing.ts
-import { relative } from "node:path";
-import { createHash as createHash2 } from "node:crypto";
-var CLIENT_PKG_PROXY_PREFIX = "/@id/__x00__virtual:vite-rsc/client-package-proxy/";
-var CLIENT_IN_SERVER_PKG_PROXY_PREFIX = "/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/";
-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 = relative(projectRoot, absPath).replaceAll("\\", "/");
-  } else if (refKey.startsWith(FS_PREFIX)) {
-    const absPath = refKey.slice(FS_PREFIX.length - 1);
-    toHash = relative(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) {
+// src/vite/plugins/cloudflare-protocol-stub.ts
+var VIRTUAL_PREFIX = "virtual:rango-cloudflare-stub-";
+var NULL_PREFIX = "\0" + VIRTUAL_PREFIX;
+var CF_PREFIX = "cloudflare:";
+var BUILD_ENV_GLOBAL_KEY = "__rango_build_env__";
+var SOURCE_EXT_RE = /\.[mc]?[jt]sx?$/;
+var IMPORT_NODE_TYPES = /* @__PURE__ */ new Set([
+  "ImportDeclaration",
+  "ImportExpression",
+  "ExportNamedDeclaration",
+  "ExportAllDeclaration"
+]);
+var STUBS = {
+  "cloudflare:workers": `
+export class DurableObject { constructor(_ctx, _env) {} }
+export class WorkerEntrypoint { constructor(_ctx, _env) {} }
+export class WorkflowEntrypoint { constructor(_ctx, _env) {} }
+export class RpcTarget {}
+export const env = globalThis[${JSON.stringify(BUILD_ENV_GLOBAL_KEY)}] ?? {};
+export default {};
+`,
+  "cloudflare:email": `
+export class EmailMessage { constructor(_from, _to, _raw) {} }
+export default {};
+`,
+  "cloudflare:sockets": `
+export function connect() { return {}; }
+export default {};
+`,
+  "cloudflare:workflows": `
+export class NonRetryableError extends Error {
+  constructor(message, name) { super(message); this.name = name ?? "NonRetryableError"; }
+}
+export default {};
+`
+};
+var FALLBACK_STUB = `export default {};
+`;
+function createCloudflareProtocolStubPlugin() {
   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";
+    name: "@rangojs/router:cloudflare-protocol-stub",
+    transform(code, id) {
+      const cleanId = id.split("?")[0] ?? id;
+      if (!SOURCE_EXT_RE.test(cleanId)) return null;
+      if (!code.includes(CF_PREFIX)) return null;
+      let ast;
+      try {
+        ast = this.parse(code, { lang: "tsx" });
+      } catch {
+        return null;
+      }
+      const hits = [];
+      walk(ast, (node) => {
+        if (!IMPORT_NODE_TYPES.has(node.type)) return;
+        const source = node.source;
+        if (!source || source.type !== "Literal") return;
+        if (typeof source.value !== "string") return;
+        if (!source.value.startsWith(CF_PREFIX)) return;
+        if (typeof source.start !== "number" || typeof source.end !== "number")
+          return;
+        hits.push({
+          start: source.start,
+          end: source.end,
+          value: source.value
+        });
+      });
+      if (hits.length === 0) return null;
+      hits.sort((a, b) => b.start - a.start);
+      let out = code;
+      for (const hit of hits) {
+        const submodule = hit.value.slice(CF_PREFIX.length);
+        const quote = code[hit.start] === "'" ? "'" : '"';
+        out = out.slice(0, hit.start) + quote + VIRTUAL_PREFIX + submodule + quote + out.slice(hit.end);
+      }
+      return { code: out, map: null };
     },
-    transform(code, _id) {
-      const result = transformClientRefs(code, projectRoot);
-      if (result === null) return;
-      return { code: result, map: null };
+    resolveId(id) {
+      if (id.startsWith(VIRTUAL_PREFIX)) {
+        return "\0" + id;
+      }
+      return null;
+    },
+    load(id) {
+      if (!id.startsWith(NULL_PREFIX)) return null;
+      const submodule = id.slice(NULL_PREFIX.length);
+      const specifier = CF_PREFIX + submodule;
+      return STUBS[specifier] ?? FALLBACK_STUB;
     }
   };
 }
+function walk(node, visit) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const child of node) walk(child, visit);
+    return;
+  }
+  const n = node;
+  if (typeof n.type !== "string") return;
+  visit(n);
+  for (const key in n) {
+    if (key === "loc" || key === "start" || key === "end" || key === "range") {
+      continue;
+    }
+    walk(n[key], visit);
+  }
+}
 
 // src/vite/utils/bundle-analysis.ts
 function findMatchingParenInBundle(code, openParenPos) {
@@ -3373,7 +3938,7 @@ function extractHandlerExportsFromChunk(chunkCode, handlerModules, fnName, detec
       if (detectPassthrough) {
         const eFnName = escapeRegExp(fnName);
         const callStartRe = new RegExp(
-          `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
+          `(?:const|let|var)\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
         );
         const callStart = callStartRe.exec(chunkCode);
         if (callStart) {
@@ -3398,7 +3963,7 @@ function evictHandlerCode(code, exports, fnName, brand) {
     if (passthrough) continue;
     const eName = escapeRegExp(name);
     const callStartRe = new RegExp(
-      `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
+      `(?:const|let|var)\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
     );
     const startMatch = callStartRe.exec(modified);
     if (!startMatch) continue;
@@ -3433,6 +3998,8 @@ function createDiscoveryState(entryPath, opts) {
     projectRoot: "",
     isBuildMode: false,
     userResolveAlias: void 0,
+    userRunnerConfig: void 0,
+    userResolvePlugins: [],
     scanFilter: void 0,
     cachedRouterFiles: void 0,
     opts,
@@ -3454,7 +4021,8 @@ function createDiscoveryState(entryPath, opts) {
     devServerOrigin: null,
     devServer: null,
     selfWrittenGenFiles: /* @__PURE__ */ new Map(),
-    SELF_WRITE_WINDOW_MS: 5e3
+    SELF_WRITE_WINDOW_MS: 5e3,
+    lastDiscoveryError: null
   };
 }
 
@@ -3466,6 +4034,12 @@ function markSelfGenWrite(state, filePath, content) {
   state.selfWrittenGenFiles.set(filePath, { at: Date.now(), hash });
 }
 function consumeSelfGenWrite(state, filePath) {
+  return checkSelfGenWrite(state, filePath, true);
+}
+function peekSelfGenWrite(state, filePath) {
+  return checkSelfGenWrite(state, filePath, false);
+}
+function checkSelfGenWrite(state, filePath, consume) {
   const info = state.selfWrittenGenFiles.get(filePath);
   if (!info) return false;
   if (Date.now() - info.at > state.SELF_WRITE_WINDOW_MS) {
@@ -3476,7 +4050,7 @@ function consumeSelfGenWrite(state, filePath) {
     const current = readFileSync3(filePath, "utf-8");
     const currentHash = createHash3("sha256").update(current).digest("hex");
     if (currentHash === info.hash) {
-      state.selfWrittenGenFiles.delete(filePath);
+      if (consume) state.selfWrittenGenFiles.delete(filePath);
       return true;
     }
     return false;
@@ -3486,11 +4060,14 @@ function consumeSelfGenWrite(state, filePath) {
   }
 }
 
-// src/vite/utils/manifest-utils.ts
+// src/build/prefix-tree-utils.ts
 function flattenLeafEntries(prefixTree, routeManifest, result) {
-  function visit(node) {
+  function visit(node, ancestorStaticPrefixes) {
     const children = node.children || {};
     if (Object.keys(children).length === 0 && node.routes && node.routes.length > 0) {
+      if (ancestorStaticPrefixes.has(node.staticPrefix)) {
+        return;
+      }
       const routes = {};
       for (const name of node.routes) {
         if (name in routeManifest) {
@@ -3499,13 +4076,15 @@ function flattenLeafEntries(prefixTree, routeManifest, result) {
       }
       result.push({ staticPrefix: node.staticPrefix, routes });
     } else {
+      const nextAncestors = new Set(ancestorStaticPrefixes);
+      nextAncestors.add(node.staticPrefix);
       for (const child of Object.values(children)) {
-        visit(child);
+        visit(child, nextAncestors);
       }
     }
   }
   for (const node of Object.values(prefixTree)) {
-    visit(node);
+    visit(node, /* @__PURE__ */ new Set());
   }
 }
 function buildRouteToStaticPrefix(prefixTree, result) {
@@ -3522,6 +4101,8 @@ function buildRouteToStaticPrefix(prefixTree, result) {
     visit(node);
   }
 }
+
+// src/vite/utils/manifest-utils.ts
 function jsonParseExpression(value) {
   const json = JSON.stringify(value);
   const escaped = json.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
@@ -3580,11 +4161,19 @@ function substituteRouteParams(pattern, params, encode = encodeURIComponent) {
   let hadOmittedOptional = false;
   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));
+    if (value === "") {
+      result = result.replace(
+        new RegExp(`:${escaped}(\\([^)]*\\))?(?!\\?)`),
+        ""
+      );
+      result = result.replace(`*${key}`, "");
+    } else {
+      result = result.replace(
+        new RegExp(`:${escaped}(\\([^)]*\\))?\\??`),
+        encode(value)
+      );
+      result = result.replace(`*${key}`, encode(value));
+    }
   }
   result = result.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)(\([^)]*\))?\?/g, () => {
     hadOmittedOptional = true;
@@ -3690,8 +4279,14 @@ function copyStagedBuildAssets(projectRoot, fileNames) {
 }
 
 // src/vite/discovery/prerender-collection.ts
+var debug9 = createRangoDebugger(NS.prerender);
 async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   if (!state.opts?.enableBuildPrerender || !state.isBuildMode) return;
+  const overallStart = debug9 ? performance.now() : 0;
+  debug9?.(
+    "expandPrerenderRoutes: start (%d router manifest(s))",
+    allManifests.length
+  );
   const entries = [];
   const allRoutes = {};
   for (const { manifest: m } of allManifests) {
@@ -3718,7 +4313,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const progressInterval = totalDynamic > 0 ? setInterval(() => {
     const elapsed = ((performance.now() - paramsStart) / 1e3).toFixed(1);
     console.log(
-      `[rsc-router] Resolving prerender params... ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
+      `[rango] Resolving prerender params... ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
     );
   }, 5e3) : void 0;
   try {
@@ -3741,6 +4336,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
           });
         } else {
           if (def?.getParams) {
+            const getParamsStart = debug9 ? performance.now() : 0;
             try {
               const buildVars = {};
               const buildEnv = state.resolvedBuildEnv;
@@ -3754,11 +4350,17 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 get env() {
                   if (buildEnv !== void 0) return buildEnv;
                   throw new Error(
-                    "[rsc-router] ctx.env is not available during build-time getParams(). Configure buildEnv in your rango() plugin options to enable build-time env access."
+                    "[rango] ctx.env is not available during build-time getParams(). Configure buildEnv in your rango() plugin options to enable build-time env access."
                   );
                 }
               };
               const paramsList = await def.getParams(getParamsCtx);
+              debug9?.(
+                "getParams %s -> %d params (%sms)",
+                routeName,
+                paramsList.length,
+                (performance.now() - getParamsStart).toFixed(1)
+              );
               const concurrency = def.options?.concurrency ?? 1;
               const hasBuildVars = Object.keys(buildVars).length > 0 || Object.getOwnPropertySymbols(buildVars).length > 0;
               for (const params of paramsList) {
@@ -3789,7 +4391,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
               resolvedRoutes++;
               if (err.name === "Skip") {
                 console.log(
-                  `[rsc-router]   SKIP route "${routeName}" - ${err.message}`
+                  `[rango]   SKIP route "${routeName}" - ${err.message}`
                 );
                 notifyOnError(
                   registry,
@@ -3802,14 +4404,14 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 continue;
               }
               console.error(
-                `[rsc-router] Failed to get params for prerender route "${routeName}": ${err.message}`
+                `[rango] Failed to get params for prerender route "${routeName}": ${err.message}`
               );
               notifyOnError(registry, err, "prerender", routeName);
               throw err;
             }
           } else {
             console.warn(
-              `[rsc-router] Dynamic prerender route "${routeName}" has no getParams(), skipping`
+              `[rango] Dynamic prerender route "${routeName}" has no getParams(), skipping`
             );
           }
         }
@@ -3820,15 +4422,26 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
       clearInterval(progressInterval);
       const elapsed = ((performance.now() - paramsStart) / 1e3).toFixed(1);
       console.log(
-        `[rsc-router] Resolved prerender params: ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
+        `[rango] Resolved prerender params: ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
       );
     }
   }
-  if (entries.length === 0) return;
+  if (entries.length === 0) {
+    debug9?.(
+      "no prerender entries (done in %sms)",
+      (performance.now() - overallStart).toFixed(1)
+    );
+    return;
+  }
   const maxConcurrency = Math.max(...entries.map((e) => e.concurrency));
   const concurrencyNote = maxConcurrency > 1 ? ` (concurrency: ${maxConcurrency})` : "";
   console.log(
-    `[rsc-router] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`
+    `[rango] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`
+  );
+  debug9?.(
+    "prerender loop: %d entries, max concurrency %d",
+    entries.length,
+    maxConcurrency
   );
   const { hashParams } = await rscEnv.runner.import("@rangojs/router/build");
   const manifestEntries = {};
@@ -3856,7 +4469,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             if (result.passthrough) {
               const elapsed2 = (performance.now() - startUrl).toFixed(0);
               console.log(
-                `[rsc-router]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
+                `[rango]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
               );
               doneCount++;
               break;
@@ -3889,7 +4502,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             }
             const elapsed = (performance.now() - startUrl).toFixed(0);
             console.log(
-              `[rsc-router]   OK   ${entry.urlPath.padEnd(40)} (${elapsed}ms)`
+              `[rango]   OK   ${entry.urlPath.padEnd(40)} (${elapsed}ms)`
             );
             doneCount++;
             break;
@@ -3897,7 +4510,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             if (err.name === "Skip") {
               const elapsed2 = (performance.now() - startUrl).toFixed(0);
               console.log(
-                `[rsc-router]   SKIP ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - ${err.message}`
+                `[rango]   SKIP ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - ${err.message}`
               );
               skipCount++;
               notifyOnError(
@@ -3912,7 +4525,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             }
             const elapsed = (performance.now() - startUrl).toFixed(0);
             console.error(
-              `[rsc-router]   FAIL ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`
+              `[rango]   FAIL ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`
             );
             notifyOnError(
               registry,
@@ -3934,12 +4547,24 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const parts = [`${doneCount} done`];
   if (skipCount > 0) parts.push(`${skipCount} skipped`);
   console.log(
-    `[rsc-router] Pre-render complete: ${parts.join(", ")} (${totalElapsed}ms total)`
+    `[rango] Pre-render complete: ${parts.join(", ")} (${totalElapsed}ms total)`
+  );
+  debug9?.(
+    "expandPrerenderRoutes done: %d done, %d skipped, %sms (overall %sms)",
+    doneCount,
+    skipCount,
+    totalElapsed,
+    (performance.now() - overallStart).toFixed(1)
   );
 }
 async function renderStaticHandlers(state, rscEnv, registry) {
   if (!state.opts?.enableBuildPrerender || !state.isBuildMode || !state.resolvedStaticModules?.size)
     return;
+  const overallStart = debug9 ? performance.now() : 0;
+  debug9?.(
+    "renderStaticHandlers: start (%d static module(s))",
+    state.resolvedStaticModules.size
+  );
   const manifestEntries = {};
   let staticDone = 0;
   let staticSkip = 0;
@@ -3948,16 +4573,14 @@ async function renderStaticHandlers(state, rscEnv, registry) {
     totalStaticCount += exportNames.length;
   }
   const startStatic = performance.now();
-  console.log(
-    `[rsc-router] Rendering ${totalStaticCount} static handler(s)...`
-  );
+  console.log(`[rango] Rendering ${totalStaticCount} static handler(s)...`);
   for (const [moduleId, exportNames] of state.resolvedStaticModules) {
     let mod;
     try {
       mod = await rscEnv.runner.import(moduleId);
     } catch (err) {
       console.error(
-        `[rsc-router] Failed to import static module ${moduleId}: ${err.message}`
+        `[rango] Failed to import static module ${moduleId}: ${err.message}`
       );
       notifyOnError(registry, err, "static");
       throw err;
@@ -3987,9 +4610,7 @@ async function renderStaticHandlers(state, rscEnv, registry) {
               exportValue
             );
             const elapsed = (performance.now() - startHandler).toFixed(0);
-            console.log(
-              `[rsc-router]   OK   ${name.padEnd(40)} (${elapsed}ms)`
-            );
+            console.log(`[rango]   OK   ${name.padEnd(40)} (${elapsed}ms)`);
             staticDone++;
             handled = true;
             break;
@@ -3998,7 +4619,7 @@ async function renderStaticHandlers(state, rscEnv, registry) {
           if (err.name === "Skip") {
             const elapsed2 = (performance.now() - startHandler).toFixed(0);
             console.log(
-              `[rsc-router]   SKIP ${name.padEnd(40)} (${elapsed2}ms) - ${err.message}`
+              `[rango]   SKIP ${name.padEnd(40)} (${elapsed2}ms) - ${err.message}`
             );
             staticSkip++;
             notifyOnError(registry, err, "static", void 0, void 0, true);
@@ -4007,16 +4628,14 @@ async function renderStaticHandlers(state, rscEnv, registry) {
           }
           const elapsed = (performance.now() - startHandler).toFixed(0);
           console.error(
-            `[rsc-router]   FAIL ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`
+            `[rango]   FAIL ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`
           );
           notifyOnError(registry, err, "static");
           throw err;
         }
       }
       if (!handled) {
-        console.warn(
-          `[rsc-router] No router could render static handler "${name}"`
-        );
+        console.warn(`[rango] No router could render static handler "${name}"`);
       }
     }
   }
@@ -4027,38 +4646,118 @@ async function renderStaticHandlers(state, rscEnv, registry) {
   const staticParts = [`${staticDone} done`];
   if (staticSkip > 0) staticParts.push(`${staticSkip} skipped`);
   console.log(
-    `[rsc-router] Static render complete: ${staticParts.join(", ")} (${totalStaticElapsed}ms total)`
+    `[rango] Static render complete: ${staticParts.join(", ")} (${totalStaticElapsed}ms total)`
+  );
+  debug9?.(
+    "renderStaticHandlers done: %d done, %d skipped, %sms (overall %sms)",
+    staticDone,
+    staticSkip,
+    totalStaticElapsed,
+    (performance.now() - overallStart).toFixed(1)
   );
 }
 
+// src/vite/discovery/discovery-errors.ts
+function indent(text, pad) {
+  return text.split("\n").map((line) => line.length > 0 ? pad + line : line).join("\n");
+}
+async function invokeLazyMount(loader, context, errors) {
+  try {
+    await loader();
+  } catch (error) {
+    errors.push({ context, error });
+  }
+}
+function isLazyMount(route) {
+  return !!route && route.kind === "lazy" && typeof route.handler === "function";
+}
+async function resolveHostRouterHandlers(hostRegistry) {
+  const errors = [];
+  for (const [hostId, entry] of hostRegistry) {
+    for (const route of entry.routes) {
+      if (isLazyMount(route)) {
+        await invokeLazyMount(
+          route.handler,
+          `host "${hostId}" route handler`,
+          errors
+        );
+      }
+    }
+    if (isLazyMount(entry.fallback)) {
+      await invokeLazyMount(
+        entry.fallback.handler,
+        `host "${hostId}" fallback handler`,
+        errors
+      );
+    }
+  }
+  return errors;
+}
+function formatNoRoutersError(entryPath, errors) {
+  const base = `[rango] No routers found in registry after importing ${entryPath}`;
+  if (errors.length === 0) {
+    return base;
+  }
+  const formatted = errors.map(({ context, error }) => {
+    const err = error instanceof Error ? error : new Error(String(error));
+    const detail = err.stack ?? err.message;
+    return `  - while resolving ${context}:
+${indent(detail, "      ")}`;
+  }).join("\n");
+  return `${base}
+
+${errors.length} error(s) were caught during host-router discovery and likely explain why no routers were registered:
+${formatted}`;
+}
+function toCause(errors) {
+  if (errors.length === 0) return void 0;
+  if (errors.length === 1) return errors[0].error;
+  return new AggregateError(
+    errors.map((e) => e.error),
+    "Multiple host-router handlers failed during discovery"
+  );
+}
+var DiscoveryError = class _DiscoveryError extends Error {
+  constructor(entryPath, caught) {
+    super(formatNoRoutersError(entryPath, caught));
+    const cause = toCause(caught);
+    if (cause !== void 0) {
+      this.cause = cause;
+    }
+    this.name = "DiscoveryError";
+    this.entryPath = entryPath;
+    this.caught = caught;
+    Object.setPrototypeOf(this, _DiscoveryError.prototype);
+  }
+};
+
 // src/vite/discovery/discover-routers.ts
+var debug10 = createRangoDebugger(NS.discovery);
 async function discoverRouters(state, rscEnv) {
   if (!state.resolvedEntryPath) return;
-  await rscEnv.runner.import(state.resolvedEntryPath);
-  const serverMod = await rscEnv.runner.import("@rangojs/router/server");
+  await timed(
+    debug10,
+    "inner: import entry",
+    () => rscEnv.runner.import(state.resolvedEntryPath)
+  );
+  const serverMod = await timed(
+    debug10,
+    "inner: import @rangojs/router/server",
+    () => rscEnv.runner.import("@rangojs/router/server")
+  );
   let registry = serverMod.RouterRegistry;
   if (!registry || registry.size === 0) {
+    const discoveryErrors = [];
     try {
       const hostRegistry = serverMod.HostRouterRegistry;
       if (hostRegistry && hostRegistry.size > 0) {
         console.log(
-          `[rsc-router] Found ${hostRegistry.size} host router(s), resolving lazy handlers...`
+          `[rango] Found ${hostRegistry.size} host router(s), resolving lazy handlers...`
         );
-        for (const [, entry] of hostRegistry) {
-          for (const route of entry.routes) {
-            if (typeof route.handler === "function") {
-              try {
-                await route.handler();
-              } catch {
-              }
-            }
-          }
-          if (entry.fallback && typeof entry.fallback.handler === "function") {
-            try {
-              await entry.fallback.handler();
-            } catch {
-            }
-          }
+        const handlerErrors = await resolveHostRouterHandlers(hostRegistry);
+        discoveryErrors.push(...handlerErrors);
+        for (const { context, error } of handlerErrors) {
+          debug10?.("caught error while resolving %s: %O", context, error);
         }
         const freshServerMod = await rscEnv.runner.import(
           "@rangojs/router/server"
@@ -4069,16 +4768,20 @@ async function discoverRouters(state, rscEnv) {
           registry = freshRegistry;
         }
       }
-    } catch {
+    } catch (error) {
+      discoveryErrors.push({ context: "host-router discovery", error });
     }
     if (!registry || registry.size === 0) {
-      throw new Error(
-        `[rsc-router] No routers found in registry after importing ${state.resolvedEntryPath}`
-      );
+      throw new DiscoveryError(state.resolvedEntryPath, discoveryErrors);
     }
   }
-  const buildMod = await rscEnv.runner.import("@rangojs/router/build");
+  const buildMod = await timed(
+    debug10,
+    "inner: import @rangojs/router/build",
+    () => rscEnv.runner.import("@rangojs/router/build")
+  );
   const generateManifestFull = buildMod.generateManifestFull;
+  debug10?.("inner: found %d router(s) in registry", registry.size);
   const nestedRouterConflict = findNestedRouterConflict(
     [...registry.values()].map((router) => router.__sourceFile).filter(
       (sourceFile) => typeof sourceFile === "string"
@@ -4097,6 +4800,16 @@ async function discoverRouters(state, rscEnv) {
   let mergedRouteTrailingSlash = {};
   let routerMountIndex = 0;
   const allManifests = [];
+  const clientChunkCtx = state.opts?.clientChunkCtx;
+  const collectClientFallbackRef = clientChunkCtx ? (refKey) => clientChunkCtx.fallbackRefs.add(
+    computeProductionHash(state.projectRoot, refKey)
+  ) : void 0;
+  const collectFromBoundaryNode = (node) => {
+    if (collectClientFallbackRef && buildMod.collectFallbackClientRefs) {
+      buildMod.collectFallbackClientRefs(node, collectClientFallbackRef);
+    }
+  };
+  const manifestGenStart = debug10 ? performance.now() : 0;
   for (const [id, router] of registry) {
     if (!router.urlpatterns || !generateManifestFull) {
       continue;
@@ -4104,10 +4817,18 @@ async function discoverRouters(state, rscEnv) {
     const manifest = generateManifestFull(
       router.urlpatterns,
       routerMountIndex,
-      router.__basename ? { urlPrefix: router.__basename } : void 0
+      {
+        ...router.__basename ? { urlPrefix: router.__basename } : {},
+        ...collectClientFallbackRef ? { collectClientFallbackRef } : {}
+      }
     );
     routerMountIndex++;
     allManifests.push({ id, manifest });
+    if (collectClientFallbackRef) {
+      collectFromBoundaryNode(router.__defaultErrorBoundary);
+      collectFromBoundaryNode(router.__defaultNotFoundBoundary);
+      collectFromBoundaryNode(router.__notFound);
+    }
     const routeCount = Object.keys(manifest.routeManifest).length;
     const staticRoutes = Object.values(manifest.routeManifest).filter(
       (p) => !p.includes(":") && !p.includes("*")
@@ -4158,7 +4879,7 @@ async function discoverRouters(state, rscEnv) {
     );
     newPerRouterPrecomputedMap.set(id, routerPrecomputed);
     console.log(
-      `[rsc-router] Router "${id}" -> ${routeCount} routes (${staticRoutes} static, ${dynamicRoutes} dynamic)`
+      `[rango] Router "${id}" -> ${routeCount} routes (${staticRoutes} static, ${dynamicRoutes} dynamic)`
     );
   }
   if (registry.size > 1) {
@@ -4167,11 +4888,17 @@ async function discoverRouters(state, rscEnv) {
     );
     if (autoIds.length > 1) {
       console.warn(
-        `[rsc-router] WARNING: ${autoIds.length} routers use auto-generated IDs (${autoIds.join(", ")}). In multi-router setups, each createRouter() must have an explicit \`id\` option to ensure per-router manifest data is matched correctly at runtime. Example: createRouter({ id: "site", ... })`
+        `[rango] WARNING: ${autoIds.length} routers use auto-generated IDs (${autoIds.join(", ")}). In multi-router setups, each createRouter() must have an explicit \`id\` option to ensure per-router manifest data is matched correctly at runtime. Example: createRouter({ id: "site", ... })`
       );
     }
   }
+  debug10?.(
+    "inner: generated manifests for %d router(s) (%sms)",
+    allManifests.length,
+    (performance.now() - manifestGenStart).toFixed(1)
+  );
   let newMergedRouteTrie = null;
+  const trieStart = debug10 ? performance.now() : 0;
   if (Object.keys(newMergedRouteManifest).length > 0) {
     const buildRouteTrie = buildMod.buildRouteTrie;
     if (buildRouteTrie && mergedRouteAncestry) {
@@ -4206,34 +4933,24 @@ async function discoverRouters(state, rscEnv) {
         newMergedRouteManifest,
         mergedRouteAncestry,
         routeToStaticPrefix,
-        Object.keys(mergedRouteTrailingSlash).length > 0 ? mergedRouteTrailingSlash : void 0,
-        prerenderRouteNames.size > 0 ? prerenderRouteNames : void 0,
-        passthroughRouteNames.size > 0 ? passthroughRouteNames : void 0,
-        Object.keys(mergedResponseTypeRoutes).length > 0 ? mergedResponseTypeRoutes : void 0
+        mergedRouteTrailingSlash,
+        prerenderRouteNames,
+        passthroughRouteNames,
+        mergedResponseTypeRoutes
       );
+      const buildPerRouterTrie = buildMod.buildPerRouterTrie;
       for (const { id, manifest } of allManifests) {
-        if (!manifest._routeAncestry || Object.keys(manifest._routeAncestry).length === 0)
-          continue;
-        const perRouterStaticPrefix = {};
-        for (const name of Object.keys(manifest.routeManifest)) {
-          perRouterStaticPrefix[name] = "";
+        const perRouterTrie = buildPerRouterTrie ? buildPerRouterTrie(manifest) : null;
+        if (perRouterTrie) {
+          newPerRouterTrieMap.set(id, perRouterTrie);
         }
-        buildRouteToStaticPrefix(manifest.prefixTree, perRouterStaticPrefix);
-        const perRouterPrerenderNames = manifest.prerenderRoutes ? new Set(manifest.prerenderRoutes) : void 0;
-        const perRouterPassthroughNames = manifest.passthroughRoutes ? new Set(manifest.passthroughRoutes) : void 0;
-        const perRouterTrie = buildRouteTrie(
-          manifest.routeManifest,
-          manifest._routeAncestry,
-          perRouterStaticPrefix,
-          manifest.routeTrailingSlash && Object.keys(manifest.routeTrailingSlash).length > 0 ? manifest.routeTrailingSlash : void 0,
-          perRouterPrerenderNames && perRouterPrerenderNames.size > 0 ? perRouterPrerenderNames : void 0,
-          perRouterPassthroughNames && perRouterPassthroughNames.size > 0 ? perRouterPassthroughNames : void 0,
-          manifest.responseTypeRoutes && Object.keys(manifest.responseTypeRoutes).length > 0 ? manifest.responseTypeRoutes : void 0
-        );
-        newPerRouterTrieMap.set(id, perRouterTrie);
       }
     }
   }
+  debug10?.(
+    "inner: trie build done (%sms)",
+    (performance.now() - trieStart).toFixed(1)
+  );
   state.mergedRouteManifest = newMergedRouteManifest;
   state.mergedPrecomputedEntries = newMergedPrecomputedEntries;
   state.perRouterManifests = newPerRouterManifests;
@@ -4247,7 +4964,7 @@ async function discoverRouters(state, rscEnv) {
 }
 
 // src/vite/discovery/route-types-writer.ts
-import { dirname as dirname3, basename, join as join2, resolve as resolve6 } from "node:path";
+import { dirname as dirname3, join as join2, resolve as resolve6 } from "node:path";
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync5, unlinkSync as unlinkSync2 } from "node:fs";
 function filterUserNamedRoutes(manifest) {
   const filtered = {};
@@ -4258,39 +4975,20 @@ function filterUserNamedRoutes(manifest) {
   }
   return filtered;
 }
+function writeGenFileIfChanged(state, outPath, source, opts) {
+  const existing = existsSync5(outPath) ? readFileSync4(outPath, "utf-8") : null;
+  if (existing === source) return;
+  markSelfGenWrite(state, outPath, source);
+  writeFileSync3(outPath, source);
+  if (opts?.log) console.log(`[rango] Generated route types -> ${outPath}`);
+}
 function writeCombinedRouteTypesWithTracking(state, opts) {
   const routerFiles = state.cachedRouterFiles ?? findRouterFiles(state.projectRoot, state.scanFilter);
   state.cachedRouterFiles = routerFiles;
-  const preContent = /* @__PURE__ */ new Map();
-  for (const routerFilePath of routerFiles) {
-    const routerDir = dirname3(routerFilePath);
-    const routerBasename = basename(routerFilePath).replace(
-      /\.(tsx?|jsx?)$/,
-      ""
-    );
-    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
-    try {
-      preContent.set(outPath, readFileSync4(outPath, "utf-8"));
-    } catch {
-    }
-  }
-  writeCombinedRouteTypes(state.projectRoot, routerFiles, opts);
-  for (const routerFilePath of routerFiles) {
-    const routerDir = dirname3(routerFilePath);
-    const routerBasename = basename(routerFilePath).replace(
-      /\.(tsx?|jsx?)$/,
-      ""
-    );
-    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
-    if (!existsSync5(outPath)) continue;
-    try {
-      const content = readFileSync4(outPath, "utf-8");
-      if (content !== preContent.get(outPath)) {
-        markSelfGenWrite(state, outPath, content);
-      }
-    } catch {
-    }
-  }
+  writeCombinedRouteTypes(state.projectRoot, routerFiles, {
+    ...opts,
+    onWrite: (outPath, content) => markSelfGenWrite(state, outPath, content)
+  });
 }
 function writeRouteTypesFiles(state) {
   if (state.perRouterManifests.length === 0) return;
@@ -4302,7 +5000,7 @@ function writeRouteTypesFiles(state) {
     if (existsSync5(oldCombinedPath)) {
       unlinkSync2(oldCombinedPath);
       console.log(
-        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+        `[rango] Removed stale combined route types: ${oldCombinedPath}`
       );
     }
   } catch {
@@ -4316,39 +5014,23 @@ function writeRouteTypesFiles(state) {
     if (!sourceFile) continue;
     if (sourceFile.includes("node_modules")) {
       throw new Error(
-        `[rsc-router] Router "${id}" has sourceFile inside node_modules: ${sourceFile}
+        `[rango] Router "${id}" has sourceFile inside node_modules: ${sourceFile}
 This means createRouter() stack trace parsing matched a Vite internal frame.
 Set an explicit \`id\` on createRouter() or check the call site.`
       );
     }
-    const routerDir = dirname3(sourceFile);
-    const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
-    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
+    const outPath = genFileTsPath(sourceFile);
     const userRoutes = filterUserNamedRoutes(routeManifest);
-    let effectiveSearchSchemas = routeSearchSchemas;
-    if ((!effectiveSearchSchemas || Object.keys(effectiveSearchSchemas).length === 0) && sourceFile) {
-      const staticParsed = buildCombinedRouteMapForRouterFile(sourceFile);
-      if (Object.keys(staticParsed.searchSchemas).length > 0) {
-        const filtered = {};
-        for (const name of Object.keys(userRoutes)) {
-          const schema = staticParsed.searchSchemas[name];
-          if (schema) filtered[name] = schema;
-        }
-        if (Object.keys(filtered).length > 0) {
-          effectiveSearchSchemas = filtered;
-        }
-      }
-    }
+    const effectiveSearchSchemas = resolveSearchSchemas(
+      Object.keys(userRoutes),
+      routeSearchSchemas,
+      sourceFile
+    );
     const source = generateRouteTypesSource(
       userRoutes,
       effectiveSearchSchemas && Object.keys(effectiveSearchSchemas).length > 0 ? effectiveSearchSchemas : void 0
     );
-    const existing = existsSync5(outPath) ? readFileSync4(outPath, "utf-8") : null;
-    if (existing !== source) {
-      markSelfGenWrite(state, outPath, source);
-      writeFileSync3(outPath, source);
-      console.log(`[rsc-router] Generated route types -> ${outPath}`);
-    }
+    writeGenFileIfChanged(state, outPath, source, { log: true });
   }
 }
 function supplementGenFilesWithRuntimeRoutes(state) {
@@ -4386,23 +5068,17 @@ function supplementGenFilesWithRuntimeRoutes(state) {
         }
       }
     }
-    const routerDir = dirname3(sourceFile);
-    const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
-    const outPath = join2(routerDir, `${routerBasename}.named-routes.gen.ts`);
+    const outPath = genFileTsPath(sourceFile);
     const source = generateRouteTypesSource(
       mergedRoutes,
       Object.keys(mergedSearchSchemas).length > 0 ? mergedSearchSchemas : void 0
     );
-    const existing = existsSync5(outPath) ? readFileSync4(outPath, "utf-8") : null;
-    if (existing !== source) {
-      markSelfGenWrite(state, outPath, source);
-      writeFileSync3(outPath, source);
-    }
+    writeGenFileIfChanged(state, outPath, source);
   }
 }
 
 // src/vite/discovery/virtual-module-codegen.ts
-import { dirname as dirname4, basename as basename2, join as join3 } from "node:path";
+import { dirname as dirname4, basename, join as join3 } from "node:path";
 function generateRoutesManifestModule(state) {
   const hasManifest = state.mergedRouteManifest && Object.keys(state.mergedRouteManifest).length > 0;
   if (hasManifest) {
@@ -4413,7 +5089,7 @@ function generateRoutesManifestModule(state) {
     for (const entry of state.perRouterManifests) {
       if (entry.sourceFile) {
         const routerDir = dirname4(entry.sourceFile);
-        const routerBasename = basename2(entry.sourceFile).replace(
+        const routerBasename = basename(entry.sourceFile).replace(
           /\.(tsx?|jsx?)$/,
           ""
         );
@@ -4434,7 +5110,7 @@ function generateRoutesManifestModule(state) {
       }
     }
     const lines = [
-      `import { setCachedManifest, setPrecomputedEntries, setRouteTrie, setRouterManifest, registerRouterManifestLoader, clearAllRouterData } from "@rangojs/router/server";`,
+      `import { setCachedManifest, setRouterManifest, registerRouterManifestLoader, clearAllRouterData } from "@rangojs/router/server";`,
       ...genFileImports,
       // Clear stale per-router cached data (manifest, trie, precomputed entries)
       // before re-populating. In Cloudflare dev mode, program reloads re-evaluate
@@ -4470,18 +5146,6 @@ function generateRoutesManifestModule(state) {
         );
       }
     }
-    if (state.isBuildMode) {
-      if (state.mergedPrecomputedEntries && state.mergedPrecomputedEntries.length > 0) {
-        lines.push(
-          `setPrecomputedEntries(${jsonParseExpression(state.mergedPrecomputedEntries)});`
-        );
-      }
-      if (state.mergedRouteTrie) {
-        lines.push(
-          `setRouteTrie(${jsonParseExpression(state.mergedRouteTrie)});`
-        );
-      }
-    }
     for (const routerId of state.perRouterManifestDataMap.keys()) {
       lines.push(
         `registerRouterManifestLoader(${JSON.stringify(routerId)}, () => import(${JSON.stringify(VIRTUAL_ROUTES_MANIFEST_ID + "/" + routerId)}));`
@@ -4510,7 +5174,7 @@ function generatePerRouterModule(state, routerId) {
   const lines = [];
   if (routerEntry?.sourceFile) {
     const routerDir = dirname4(routerEntry.sourceFile);
-    const routerBasename = basename2(routerEntry.sourceFile).replace(
+    const routerBasename = basename(routerEntry.sourceFile).replace(
       /\.(tsx?|jsx?)$/,
       ""
     );
@@ -4581,12 +5245,12 @@ function postprocessBundle(state) {
           writeFileSync4(chunkPath, result.code);
           const savedKB = (result.savedBytes / 1024).toFixed(1);
           console.log(
-            `[rsc-router] Evicted ${target.label} (${savedKB} KB saved): ${info.fileName}`
+            `[rango] Evicted ${target.label} (${savedKB} KB saved): ${info.fileName}`
           );
         }
       } catch (replaceErr) {
         console.warn(
-          `[rsc-router] Failed to evict ${target.label}: ${replaceErr.message}`
+          `[rango] Failed to evict ${target.label}: ${replaceErr.message}`
         );
       }
     }
@@ -4624,11 +5288,11 @@ function postprocessBundle(state) {
         writeFileSync4(rscEntryPath, injection + rscCode);
         const totalKB = (totalBytes / 1024).toFixed(1);
         console.log(
-          `[rsc-router] Wrote prerender assets (${totalKB} KB total, ${Object.keys(state.prerenderManifestEntries).length} entries)`
+          `[rango] Wrote prerender assets (${totalKB} KB total, ${Object.keys(state.prerenderManifestEntries).length} entries)`
         );
       } catch (err) {
         throw new Error(
-          `[rsc-router] Failed to write prerender assets: ${err.message}`
+          `[rango] Failed to write prerender assets: ${err.message}`
         );
       }
     }
@@ -4662,28 +5326,180 @@ function postprocessBundle(state) {
         writeFileSync4(rscEntryPath, injection + rscCode);
         const totalKB = (totalBytes / 1024).toFixed(1);
         console.log(
-          `[rsc-router] Wrote static assets (${totalKB} KB total, ${Object.keys(state.staticManifestEntries).length} entries)`
+          `[rango] Wrote static assets (${totalKB} KB total, ${Object.keys(state.staticManifestEntries).length} entries)`
         );
       } catch (err) {
         throw new Error(
-          `[rsc-router] Failed to write static assets: ${err.message}`
+          `[rango] Failed to write static assets: ${err.message}`
         );
       }
     }
   }
 }
 
+// src/vite/discovery/gate-state.ts
+function createDiscoveryGate(s, debug11) {
+  let gatePending = false;
+  let gateResolver = () => {
+  };
+  let inProgress = false;
+  let queued = false;
+  let pendingEvents = false;
+  const beginGate = () => {
+    if (gatePending) return;
+    s.discoveryDone = new Promise((resolve10) => {
+      gateResolver = resolve10;
+    });
+    gatePending = true;
+  };
+  const resolveGate = () => {
+    if (!gatePending) return;
+    if (inProgress || queued || pendingEvents) {
+      debug11?.(
+        "hmr: resolveGate deferred \u2014 work in flight (inProgress=%s queued=%s pendingEvents=%s)",
+        inProgress,
+        queued,
+        pendingEvents
+      );
+      return;
+    }
+    gatePending = false;
+    debug11?.("hmr: discoveryDone resolved");
+    gateResolver();
+  };
+  const noteRouteEvent = () => {
+    pendingEvents = true;
+    beginGate();
+  };
+  const runRefreshCycle = async (work) => {
+    if (inProgress) {
+      queued = true;
+      debug11?.("hmr: rediscovery in flight \u2014 queued for a follow-up cycle");
+      return;
+    }
+    pendingEvents = false;
+    inProgress = true;
+    try {
+      await work();
+    } finally {
+      inProgress = false;
+      if (queued) {
+        queued = false;
+        debug11?.("hmr: consuming queued rediscovery");
+        runRefreshCycle(work).catch((err) => {
+          debug11?.(
+            "hmr: queued cycle rejected \u2014 releasing gate (%s)",
+            err instanceof Error ? err.message : String(err)
+          );
+          resolveGate();
+        });
+      } else if (pendingEvents) {
+        debug11?.(
+          "hmr: holding gate for pending events (debounce not yet fired)"
+        );
+      } else {
+        resolveGate();
+      }
+    }
+  };
+  return {
+    beginGate,
+    resolveGate,
+    noteRouteEvent,
+    runRefreshCycle,
+    state: () => ({ gatePending, inProgress, queued, pendingEvents })
+  };
+}
+
+// src/vite/utils/forward-user-plugins.ts
+function isDenied(name) {
+  return name.startsWith("vite:") || name === "rsc" || name.startsWith("rsc:") || name.startsWith("@rangojs/router") || name.startsWith("@cloudflare/vite-plugin") || name.startsWith("vite-plugin-cloudflare");
+}
+function hasResolutionHooks(p) {
+  return Boolean(p.resolveId || p.load);
+}
+function stripToResolutionHooks(p) {
+  const stripped = { name: p.name };
+  if (p.enforce) stripped.enforce = p.enforce;
+  if (p.applyToEnvironment)
+    stripped.applyToEnvironment = p.applyToEnvironment;
+  if (p.resolveId) stripped.resolveId = p.resolveId;
+  if (p.load) stripped.load = p.load;
+  return stripped;
+}
+function selectForwardableResolvePlugins(plugins) {
+  if (!plugins) return [];
+  const forwarded = [];
+  for (const p of plugins) {
+    const name = p?.name;
+    if (!name || isDenied(name)) continue;
+    if (!hasResolutionHooks(p)) continue;
+    forwarded.push(stripToResolutionHooks(p));
+  }
+  return forwarded;
+}
+function pickForwardedRunnerConfig(config) {
+  const r = config.resolve ?? {};
+  const resolve10 = {};
+  if (r.alias !== void 0) resolve10.alias = r.alias;
+  if (r.dedupe !== void 0) resolve10.dedupe = r.dedupe;
+  if (r.conditions !== void 0) resolve10.conditions = r.conditions;
+  if (r.mainFields !== void 0) resolve10.mainFields = r.mainFields;
+  if (r.extensions !== void 0) resolve10.extensions = r.extensions;
+  if (r.preserveSymlinks !== void 0)
+    resolve10.preserveSymlinks = r.preserveSymlinks;
+  if (r.tsconfigPaths !== void 0) resolve10.tsconfigPaths = r.tsconfigPaths;
+  const userOxc = config.oxc;
+  const userJsx = userOxc && typeof userOxc === "object" && typeof userOxc.jsx === "object" && userOxc.jsx !== null ? userOxc.jsx : {};
+  const oxc = userOxc && typeof userOxc === "object" ? {
+    ...userOxc,
+    jsx: { ...userJsx, runtime: "automatic", importSource: "react" }
+  } : { jsx: { runtime: "automatic", importSource: "react" } };
+  return {
+    resolve: resolve10,
+    define: config.define,
+    oxc
+  };
+}
+
 // src/vite/router-discovery.ts
+var debugDiscovery = createRangoDebugger(NS.discovery);
+var debugRoutes = createRangoDebugger(NS.routes);
+var debugBuild = createRangoDebugger(NS.build);
+var debugDev = createRangoDebugger(NS.dev);
+var loaderHookRegistered = false;
+function ensureCloudflareProtocolLoaderRegistered() {
+  if (loaderHookRegistered) return;
+  loaderHookRegistered = true;
+  try {
+    register(
+      new URL("./plugins/cloudflare-protocol-loader-hook.mjs", import.meta.url)
+    );
+  } catch (err) {
+    console.warn(
+      `[rango] Could not register Node ESM loader hook for cloudflare:* imports (${err?.message ?? err}). Falling back to Vite transform only.`
+    );
+  }
+}
 async function createTempRscServer(state, options = {}) {
+  ensureCloudflareProtocolLoaderRegistered();
   const { default: rsc } = await import("@vitejs/plugin-rsc");
+  const runnerConfig = state.userRunnerConfig;
+  const resolveConfig = runnerConfig?.resolve ?? {
+    alias: state.userResolveAlias
+  };
+  const oxcConfig = runnerConfig?.oxc ?? {
+    jsx: { runtime: "automatic", importSource: "react" }
+  };
   return createViteServer({
     root: state.projectRoot,
     configFile: false,
     server: { middlewareMode: true },
     appType: "custom",
     logLevel: "silent",
-    resolve: { alias: state.userResolveAlias },
-    esbuild: { jsx: "automatic", jsxImportSource: "react" },
+    resolve: resolveConfig,
+    ...runnerConfig?.define ? { define: runnerConfig.define } : {},
+    oxc: oxcConfig,
     ...options.cacheDir && { cacheDir: options.cacheDir },
     plugins: [
       rsc({
@@ -4697,10 +5513,15 @@ async function createTempRscServer(state, options = {}) {
       ...options.forceBuild ? [hashClientRefs(state.projectRoot)] : [],
       createVersionPlugin(),
       createVirtualStubPlugin(),
+      createCloudflareProtocolStubPlugin(),
       // 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()
+      exposeRouterId(),
+      // Forwarded user resolution plugins (e.g. vite-tsconfig-paths). Stripped
+      // to resolveId/load and placed last so framework resolution runs first;
+      // Vite re-sorts by `enforce`, so `enforce: "pre"` resolvers still lead.
+      ...state.userResolvePlugins
     ]
   });
 }
@@ -4709,11 +5530,11 @@ async function resolveBuildEnv(option, factoryCtx) {
   if (option === "auto") {
     if (factoryCtx.preset !== "cloudflare") {
       throw new Error(
-        '[rsc-router] buildEnv: "auto" is only supported with preset: "cloudflare". Use a factory function or plain object for other presets.'
+        '[rango] buildEnv: "auto" is only supported with preset: "cloudflare". Use a factory function or plain object for other presets.'
       );
     }
     try {
-      const userRequire = createRequire(
+      const userRequire = createRequire2(
         resolve8(factoryCtx.root, "package.json")
       );
       const wranglerPath = userRequire.resolve("wrangler");
@@ -4725,7 +5546,7 @@ async function resolveBuildEnv(option, factoryCtx) {
       };
     } catch (err) {
       throw new Error(
-        `[rsc-router] buildEnv: "auto" requires wrangler to be installed.
+        `[rango] buildEnv: "auto" requires wrangler to be installed.
 Install it with: pnpm add -D wrangler
 ${err.message}`
       );
@@ -4748,6 +5569,7 @@ async function acquireBuildEnv(s, command, mode) {
   if (!result) return false;
   s.resolvedBuildEnv = result.env;
   s.buildEnvDispose = result.dispose ?? null;
+  globalThis[BUILD_ENV_GLOBAL_KEY] = result.env;
   return true;
 }
 async function releaseBuildEnv(s) {
@@ -4755,11 +5577,12 @@ async function releaseBuildEnv(s) {
     try {
       await s.buildEnvDispose();
     } catch (err) {
-      console.warn(`[rsc-router] buildEnv dispose failed: ${err.message}`);
+      console.warn(`[rango] buildEnv dispose failed: ${err.message}`);
     }
     s.buildEnvDispose = null;
   }
   s.resolvedBuildEnv = void 0;
+  delete globalThis[BUILD_ENV_GLOBAL_KEY];
 }
 function createRouterDiscoveryPlugin(entryPath, opts) {
   const s = createDiscoveryState(entryPath, opts);
@@ -4781,17 +5604,16 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
       viteCommand = config.command;
       viteMode = config.mode;
       s.userResolveAlias = config.resolve.alias;
+      s.userRunnerConfig = pickForwardedRunnerConfig(config);
+      s.userResolvePlugins = selectForwardableResolvePlugins(
+        config.plugins
+      );
       if (!s.resolvedEntryPath && opts?.routerPathRef?.path) {
         s.resolvedEntryPath = opts.routerPathRef.path;
       }
       if (!s.resolvedEntryPath) {
-        const rscEnvConfig = config.environments?.["rsc"];
-        const entries = rscEnvConfig?.optimizeDeps?.entries;
-        if (typeof entries === "string") {
-          s.resolvedEntryPath = entries;
-        } else if (Array.isArray(entries) && entries.length > 0) {
-          s.resolvedEntryPath = entries[0];
-        }
+        const entry = resolveRscEntryFromConfig(config);
+        if (entry) s.resolvedEntryPath = entry;
       }
       if (opts?.staticRouteTypesGeneration !== false) {
         s.cachedRouterFiles = findRouterFiles(s.projectRoot, s.scanFilter);
@@ -4815,6 +5637,9 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
       const discoveryPromise = new Promise((resolve10) => {
         resolveDiscovery = resolve10;
       });
+      const gate = createDiscoveryGate(s, debugDiscovery);
+      const beginDiscoveryGate = gate.beginGate;
+      const resolveDiscoveryGate = gate.resolveGate;
       const getDevServerOrigin = () => server.resolvedUrls?.local?.[0]?.replace(/\/$/, "") || `http://localhost:${server.config.server.port || 5173}`;
       let prerenderTempServer = null;
       let prerenderNodeRegistry = null;
@@ -4827,74 +5652,241 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
         releaseBuildEnv(s).catch(() => {
         });
       });
+      async function importEntryAndRegistry(tempRscEnv) {
+        const flagAlreadySet = !!globalThis.__rscRouterDiscoveryActive;
+        if (!flagAlreadySet) {
+          globalThis.__rscRouterDiscoveryActive = true;
+        }
+        try {
+          debugDiscovery?.(
+            "importEntryAndRegistry: importing entry (flag=%s)",
+            globalThis.__rscRouterDiscoveryActive ?? false
+          );
+          await tempRscEnv.runner.import(s.resolvedEntryPath);
+          debugDiscovery?.(
+            "importEntryAndRegistry: entry import OK, fetching RouterRegistry"
+          );
+          const serverMod = await tempRscEnv.runner.import(
+            "@rangojs/router/server"
+          );
+          prerenderNodeRegistry = serverMod.RouterRegistry;
+          debugDiscovery?.(
+            "importEntryAndRegistry: registry size=%d",
+            prerenderNodeRegistry?.size ?? 0
+          );
+        } finally {
+          if (!flagAlreadySet) {
+            delete globalThis.__rscRouterDiscoveryActive;
+            debugDiscovery?.(
+              "importEntryAndRegistry: cleared __rscRouterDiscoveryActive"
+            );
+          }
+        }
+      }
       async function getOrCreateTempServer() {
-        if (prerenderNodeRegistry) {
-          return prerenderTempServer.environments?.rsc ?? null;
+        if (prerenderTempServer) {
+          const existingEnv = prerenderTempServer.environments?.rsc;
+          if (existingEnv?.runner) {
+            if (prerenderNodeRegistry) {
+              debugDiscovery?.(
+                "getOrCreateTempServer: cached temp runner reused"
+              );
+              return existingEnv;
+            }
+            debugDiscovery?.(
+              "getOrCreateTempServer: server alive but registry missing \u2014 re-importing"
+            );
+            try {
+              await importEntryAndRegistry(existingEnv);
+              return existingEnv;
+            } catch (err) {
+              debugDiscovery?.(
+                "getOrCreateTempServer: reuse import failed (%s) \u2014 closing orphan and creating fresh",
+                err?.message ?? String(err)
+              );
+              await prerenderTempServer.close().catch(() => {
+              });
+              prerenderTempServer = null;
+              prerenderNodeRegistry = null;
+            }
+          } else {
+            debugDiscovery?.(
+              "getOrCreateTempServer: existing server has no rsc.runner \u2014 closing and recreating"
+            );
+            await prerenderTempServer.close().catch(() => {
+            });
+            prerenderTempServer = null;
+            prerenderNodeRegistry = null;
+          }
         }
+        debugDiscovery?.(
+          "getOrCreateTempServer: creating new temp server, entry=%s",
+          s.resolvedEntryPath ?? "(unset)"
+        );
         try {
           prerenderTempServer = await createTempRscServer(s, {
             cacheDir: "node_modules/.vite_prerender"
           });
           const tempRscEnv = prerenderTempServer.environments?.rsc;
           if (tempRscEnv?.runner) {
-            await tempRscEnv.runner.import(s.resolvedEntryPath);
-            const serverMod = await tempRscEnv.runner.import(
-              "@rangojs/router/server"
-            );
-            prerenderNodeRegistry = serverMod.RouterRegistry;
+            await importEntryAndRegistry(tempRscEnv);
             return tempRscEnv;
           }
+          debugDiscovery?.(
+            "getOrCreateTempServer: tempRscEnv.runner unavailable"
+          );
         } catch (err) {
-          console.warn(
-            `[rsc-router] Failed to create temp runner: ${err.message}`
+          debugDiscovery?.(
+            "getOrCreateTempServer: FAILED message=%s",
+            err.message
           );
+          console.warn(`[rango] Failed to create temp runner: ${err.message}`);
         }
         return null;
       }
+      async function clearTempRegistries(tempRscEnv) {
+        try {
+          const serverMod = await tempRscEnv.runner.import(
+            "@rangojs/router/server"
+          );
+          if (typeof serverMod?.RouterRegistry?.clear === "function") {
+            serverMod.RouterRegistry.clear();
+          }
+          if (typeof serverMod?.HostRouterRegistry?.clear === "function") {
+            serverMod.HostRouterRegistry.clear();
+          }
+          debugDiscovery?.(
+            "clearTempRegistries: cleared RouterRegistry + HostRouterRegistry"
+          );
+        } catch (err) {
+          debugDiscovery?.(
+            "clearTempRegistries: import @rangojs/router/server failed (%s)",
+            err?.message ?? String(err)
+          );
+        }
+      }
+      async function refreshTempRscEnv() {
+        let tempRscEnv = await getOrCreateTempServer();
+        if (!tempRscEnv) return null;
+        const envGraph = tempRscEnv.moduleGraph;
+        const serverGraph = prerenderTempServer?.moduleGraph;
+        const target = envGraph?.invalidateAll ? envGraph : serverGraph?.invalidateAll ? serverGraph : null;
+        if (!target) {
+          debugDiscovery?.(
+            "refreshTempRscEnv: invalidateAll unavailable on env+server graphs, falling back to close+recreate"
+          );
+          if (prerenderTempServer) {
+            await prerenderTempServer.close().catch(() => {
+            });
+            prerenderTempServer = null;
+            prerenderNodeRegistry = null;
+          }
+          return await getOrCreateTempServer();
+        }
+        debugDiscovery?.(
+          "refreshTempRscEnv: invalidating module graph (%s)",
+          envGraph?.invalidateAll ? "env" : "server"
+        );
+        target.invalidateAll();
+        prerenderNodeRegistry = null;
+        await clearTempRegistries(tempRscEnv);
+        await importEntryAndRegistry(tempRscEnv);
+        return tempRscEnv;
+      }
       const discover = async () => {
+        const discoverStart = performance.now();
         const rscEnv = server.environments?.rsc;
         if (!rscEnv?.runner) {
+          debugDiscovery?.(
+            "dev: cloudflare path start, __rscRouterDiscoveryActive=%s",
+            globalThis.__rscRouterDiscoveryActive ?? false
+          );
           s.devServerOrigin = getDevServerOrigin();
           try {
-            await acquireBuildEnv(s, viteCommand, viteMode);
-            const tempRscEnv = await getOrCreateTempServer();
+            await timed(
+              debugDiscovery,
+              "acquireBuildEnv",
+              () => acquireBuildEnv(s, viteCommand, viteMode)
+            );
+            const tempRscEnv = await timed(
+              debugDiscovery,
+              "getOrCreateTempServer",
+              () => getOrCreateTempServer()
+            );
             if (tempRscEnv) {
-              await discoverRouters(s, tempRscEnv);
-              writeRouteTypesFiles(s);
+              await timed(
+                debugDiscovery,
+                "discoverRouters (cloudflare)",
+                () => discoverRouters(s, tempRscEnv)
+              );
+              timedSync(
+                debugDiscovery,
+                "writeRouteTypesFiles",
+                () => writeRouteTypesFiles(s)
+              );
             }
           } catch (err) {
             console.warn(
-              `[rsc-router] Cloudflare dev discovery failed: ${err.message}
+              `[rango] Cloudflare dev discovery failed: ${err.message}
 ${err.stack}`
             );
           }
+          debugDiscovery?.(
+            "dev discovery done (%sms)",
+            (performance.now() - discoverStart).toFixed(1)
+          );
           resolveDiscovery();
           return;
         }
         try {
-          await acquireBuildEnv(s, viteCommand, viteMode);
-          const serverMod = await rscEnv.runner.import(
-            "@rangojs/router/server"
+          debugDiscovery?.("dev: node path start");
+          await timed(
+            debugDiscovery,
+            "acquireBuildEnv",
+            () => acquireBuildEnv(s, viteCommand, viteMode)
+          );
+          const serverMod = await timed(
+            debugDiscovery,
+            "import @rangojs/router/server",
+            () => rscEnv.runner.import("@rangojs/router/server")
           );
           if (serverMod?.setManifestReadyPromise) {
             serverMod.setManifestReadyPromise(discoveryPromise);
           }
-          await discoverRouters(s, rscEnv);
+          await timed(
+            debugDiscovery,
+            "discoverRouters",
+            () => discoverRouters(s, rscEnv)
+          );
           s.devServerOrigin = getDevServerOrigin();
-          writeRouteTypesFiles(s);
-          await propagateDiscoveryState(rscEnv);
+          timedSync(
+            debugDiscovery,
+            "writeRouteTypesFiles",
+            () => writeRouteTypesFiles(s)
+          );
+          await timed(
+            debugDiscovery,
+            "propagateDiscoveryState",
+            () => propagateDiscoveryState(rscEnv)
+          );
         } catch (err) {
           console.warn(
-            `[rsc-router] Router discovery failed: ${err.message}
+            `[rango] Router discovery failed: ${err.message}
 ${err.stack}`
           );
         } finally {
+          debugDiscovery?.(
+            "dev discovery done (%sms)",
+            (performance.now() - discoverStart).toFixed(1)
+          );
           resolveDiscovery();
         }
       };
-      s.discoveryDone = new Promise((resolve10) => {
-        setTimeout(() => discover().then(resolve10, resolve10), 0);
-      });
+      beginDiscoveryGate();
+      setTimeout(
+        () => discover().then(resolveDiscoveryGate, resolveDiscoveryGate),
+        0
+      );
       let mainRegistry = null;
       const propagateDiscoveryState = async (rscEnv) => {
         const serverMod = await rscEnv.runner.import("@rangojs/router/server");
@@ -4912,29 +5904,35 @@ ${err.stack}`
         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);
-          }
+        const perRouterSetters = [
+          [s.perRouterManifestDataMap, "setRouterManifest"],
+          [s.perRouterTrieMap, "setRouterTrie"],
+          [s.perRouterPrecomputedMap, "setRouterPrecomputedEntries"]
+        ];
+        for (const [map, fn] of perRouterSetters) {
+          const setter = serverMod[fn];
+          if (typeof setter !== "function") continue;
+          for (const [routerId, value] of map) setter(routerId, value);
         }
       };
       server.middlewares.use("/__rsc_prerender", async (req, res) => {
+        const reqStart = debugDev ? performance.now() : 0;
+        const logResult = (status, note) => {
+          debugDev?.(
+            "/__rsc_prerender %s -> %d %s (%sms)",
+            req.url,
+            status,
+            note,
+            (performance.now() - reqStart).toFixed(1)
+          );
+        };
         if (s.discoveryDone) await s.discoveryDone;
         const url = new URL(req.url || "/", "http://localhost");
         const pathname = url.searchParams.get("pathname");
         if (!pathname) {
           res.statusCode = 400;
           res.end("Missing pathname");
+          logResult(400, "missing pathname");
           return;
         }
         const rscEnv = server.environments?.rsc;
@@ -4948,10 +5946,11 @@ ${err.stack}`
             registry = serverMod.RouterRegistry ?? null;
           } catch (err) {
             console.warn(
-              `[rsc-router] Dev prerender module refresh failed: ${err.message}`
+              `[rango] Dev prerender module refresh failed: ${err.message}`
             );
             res.statusCode = 500;
             res.end(`Prerender handler error: ${err.message}`);
+            logResult(500, "module refresh failed");
             return;
           }
         } else {
@@ -4966,6 +5965,7 @@ ${err.stack}`
         if (!registry || registry.size === 0) {
           res.statusCode = 503;
           res.end("Prerender runner not available");
+          logResult(503, "no registry");
           return;
         }
         const wantIntercept = url.searchParams.get("intercept") === "1";
@@ -5000,15 +6000,17 @@ ${err.stack}`
               payload = { segments: result.segments, handles: result.handles };
             }
             res.end(JSON.stringify(payload));
+            logResult(200, `match ${result.routeName}`);
             return;
           } catch (err) {
             console.warn(
-              `[rsc-router] Dev prerender failed for ${pathname}: ${err.message}`
+              `[rango] Dev prerender failed for ${pathname}: ${err.message}`
             );
           }
         }
         res.statusCode = 404;
         res.end("No prerender match");
+        logResult(404, "no match");
       });
       if (opts?.staticRouteTypesGeneration !== false) {
         const isGeneratedRouteFile = (filePath) => filePath.endsWith(".gen.ts") && (filePath.includes("named-routes.gen.ts") || filePath.includes("urls.gen.ts"));
@@ -5028,59 +6030,185 @@ ${err.stack}`
           return true;
         };
         let routeChangeTimer;
-        let runtimeRediscoveryInProgress = false;
         const refreshRuntimeDiscovery = async () => {
           const rscEnv = server.environments?.rsc;
-          if (!rscEnv?.runner || runtimeRediscoveryInProgress) return;
-          runtimeRediscoveryInProgress = true;
+          const hasMainRunner = !!rscEnv?.runner;
+          if (!hasMainRunner && s.perRouterManifests.length === 0) return;
+          await gate.runRefreshCycle(async () => {
+            const hmrStart = performance.now();
+            try {
+              if (hasMainRunner) {
+                await timed(
+                  debugDiscovery,
+                  "hmr discoverRouters",
+                  () => discoverRouters(s, rscEnv)
+                );
+                timedSync(
+                  debugDiscovery,
+                  "hmr writeRouteTypesFiles",
+                  () => writeRouteTypesFiles(s)
+                );
+                await timed(
+                  debugDiscovery,
+                  "hmr propagateDiscoveryState",
+                  () => propagateDiscoveryState(rscEnv)
+                );
+              } else {
+                const tempRscEnv = await timed(
+                  debugDiscovery,
+                  "hmr refreshTempRscEnv (cloudflare)",
+                  () => refreshTempRscEnv()
+                );
+                if (!tempRscEnv) {
+                  throw new Error(
+                    "temp runner unavailable for cloudflare HMR rediscovery"
+                  );
+                }
+                await timed(
+                  debugDiscovery,
+                  "hmr discoverRouters (cloudflare)",
+                  () => discoverRouters(s, tempRscEnv)
+                );
+                timedSync(
+                  debugDiscovery,
+                  "hmr writeRouteTypesFiles",
+                  () => writeRouteTypesFiles(s)
+                );
+              }
+              if (s.lastDiscoveryError) {
+                debugDiscovery?.(
+                  "hmr: cleared lastDiscoveryError (%s) after successful rediscovery",
+                  s.lastDiscoveryError.message
+                );
+                s.lastDiscoveryError = null;
+              }
+              if (rscEnv && !rscEnv.runner) forceCloudflareWorkerReload(rscEnv);
+            } catch (err) {
+              s.lastDiscoveryError = {
+                message: err?.message ?? String(err),
+                at: Date.now()
+              };
+              console.warn(
+                `[rango] Runtime re-discovery failed: ${err.message}`
+              );
+              debugDiscovery?.(
+                "hmr: lastDiscoveryError set (%s) \u2014 manifest preserved at last-good; recovery mode active (any in-scan source change will trigger rediscovery)",
+                err?.message
+              );
+            } finally {
+              debugDiscovery?.(
+                "hmr re-discovery done (%sms)",
+                (performance.now() - hmrStart).toFixed(1)
+              );
+            }
+          });
+        };
+        const forceCloudflareWorkerReload = (rscEnv) => {
+          if (!rscEnv?.hot) return;
           try {
-            await discoverRouters(s, rscEnv);
-            writeRouteTypesFiles(s);
-            await propagateDiscoveryState(rscEnv);
+            const graph = rscEnv.moduleGraph;
+            if (graph?.invalidateAll) {
+              graph.invalidateAll();
+              debugDiscovery?.("hmr: invalidated workerd rsc module graph");
+            }
+            rscEnv.hot.send({ type: "full-reload" });
+            debugDiscovery?.(
+              "hmr: forced workerd rsc env reload (full-reload)"
+            );
           } catch (err) {
-            console.warn(
-              `[rsc-router] Runtime re-discovery failed: ${err.message}`
+            debugDiscovery?.(
+              "hmr: workerd reload failed: %s",
+              err?.message ?? err
             );
-          } finally {
-            runtimeRediscoveryInProgress = false;
           }
         };
         const scheduleRouteRegeneration = () => {
           clearTimeout(routeChangeTimer);
           routeChangeTimer = setTimeout(() => {
             routeChangeTimer = void 0;
+            const regenStart = debugDiscovery ? performance.now() : 0;
+            const rscEnv = server.environments?.rsc;
+            const skipStaticWrite = !rscEnv?.runner && s.perRouterManifests.length > 0;
             try {
-              writeCombinedRouteTypesWithTracking(s);
-              if (s.perRouterManifests.length > 0) {
-                supplementGenFilesWithRuntimeRoutes(s);
+              if (skipStaticWrite) {
+                debugDiscovery?.(
+                  "watcher: skipping static write (cloudflare HMR \u2014 runtime rediscovery owns gen file)"
+                );
+              } else {
+                writeCombinedRouteTypesWithTracking(s);
+                if (s.perRouterManifests.length > 0) {
+                  supplementGenFilesWithRuntimeRoutes(s);
+                }
               }
             } catch (err) {
-              console.error(
-                `[rsc-router] Route regeneration error: ${err.message}`
-              );
+              console.error(`[rango] Route regeneration error: ${err.message}`);
             }
+            debugDiscovery?.(
+              "watcher: regenerated gen files (%sms)",
+              (performance.now() - regenStart).toFixed(1)
+            );
             if (s.perRouterManifests.length > 0) {
               refreshRuntimeDiscovery().catch((err) => {
                 console.warn(
-                  `[rsc-router] Runtime re-discovery error: ${err.message}`
+                  `[rango] Runtime re-discovery error: ${err.message}`
                 );
+                resolveDiscoveryGate();
               });
             }
           }, 100);
         };
         const handleRouteFileChange = (filePath) => {
           if (maybeHandleGeneratedRouteFileMutation(filePath)) return;
-          if (!filePath.endsWith(".ts") && !filePath.endsWith(".tsx") && !filePath.endsWith(".js") && !filePath.endsWith(".jsx"))
+          if (!filePath.endsWith(".ts") && !filePath.endsWith(".tsx") && !filePath.endsWith(".js") && !filePath.endsWith(".jsx")) {
+            if (s.lastDiscoveryError) {
+              debugDiscovery?.(
+                "watcher: skip non-source %s [LASTERR %s]",
+                filePath,
+                s.lastDiscoveryError.message
+              );
+            }
             return;
-          if (s.scanFilter && !s.scanFilter(filePath)) return;
+          }
+          if (s.scanFilter && !s.scanFilter(filePath)) {
+            if (s.lastDiscoveryError) {
+              debugDiscovery?.(
+                "watcher: skip scan-filter %s [LASTERR %s]",
+                filePath,
+                s.lastDiscoveryError.message
+              );
+            }
+            return;
+          }
+          const inRecoveryMode = !!s.lastDiscoveryError;
           try {
             const source = readFileSync6(filePath, "utf-8");
             const trimmed = source.trimStart();
-            if (trimmed.startsWith('"use client"') || trimmed.startsWith("'use client'"))
-              return;
-            const hasUrls = source.includes("urls(");
-            const hasCreateRouter = /\bcreateRouter\s*[<(]/.test(source);
-            if (!hasUrls && !hasCreateRouter) return;
+            const isUseClient = trimmed.startsWith('"use client"') || trimmed.startsWith("'use client'");
+            if (!inRecoveryMode && isUseClient) return;
+            let hasUrls = source.includes("urls(");
+            let hasCreateRouter = /\bcreateRouter\s*[<(]/.test(source);
+            if (hasUrls) hasUrls = firstCodeMatchIndex(source, /urls\(/g) >= 0;
+            if (hasCreateRouter) {
+              hasCreateRouter = firstCodeMatchIndex(source, /\bcreateRouter\s*[<(]/g) >= 0;
+            }
+            if (!inRecoveryMode && !hasUrls && !hasCreateRouter) return;
+            if (inRecoveryMode) {
+              debugDiscovery?.(
+                "watcher: recovery rediscovery for %s (urls=%s, router=%s, useClient=%s) [LASTERR %s]",
+                filePath,
+                hasUrls,
+                hasCreateRouter,
+                isUseClient,
+                s.lastDiscoveryError.message
+              );
+            } else {
+              debugDiscovery?.(
+                "watcher: %s matches (urls=%s, router=%s)",
+                filePath,
+                hasUrls,
+                hasCreateRouter
+              );
+            }
             if (hasCreateRouter) {
               const nestedRouterConflict = findNestedRouterConflict([
                 ...s.cachedRouterFiles ?? [],
@@ -5094,8 +6222,19 @@ ${err.stack}`
               }
               s.cachedRouterFiles = void 0;
             }
+            if (s.perRouterManifests.length > 0) {
+              gate.noteRouteEvent();
+            }
             scheduleRouteRegeneration();
-          } catch {
+          } catch (readErr) {
+            if (s.lastDiscoveryError) {
+              debugDiscovery?.(
+                "watcher: read error %s: %s [LASTERR %s]",
+                filePath,
+                readErr?.message,
+                s.lastDiscoveryError.message
+              );
+            }
           }
         };
         server.watcher.on("add", handleRouteFileChange);
@@ -5113,19 +6252,35 @@ ${err.stack}`
     // The manifest data is stored for the virtual module's load hook.
     async buildStart() {
       if (!s.isBuildMode) return;
-      if (s.mergedRouteManifest !== null) return;
+      if (s.mergedRouteManifest !== null) {
+        debugDiscovery?.(
+          "build: skip (already discovered, env=%s)",
+          this.environment?.name ?? "?"
+        );
+        return;
+      }
+      const buildStartTime = performance.now();
+      debugDiscovery?.("build: start (env=%s)", this.environment?.name ?? "?");
       resetStagedBuildAssets(s.projectRoot);
       s.prerenderManifestEntries = null;
       s.staticManifestEntries = null;
-      await acquireBuildEnv(s, viteCommand, viteMode);
+      await timed(
+        debugDiscovery,
+        "build acquireBuildEnv",
+        () => acquireBuildEnv(s, viteCommand, viteMode)
+      );
       let tempServer = null;
       globalThis.__rscRouterDiscoveryActive = true;
       try {
-        tempServer = await createTempRscServer(s, { forceBuild: true });
+        tempServer = await timed(
+          debugDiscovery,
+          "build createTempRscServer",
+          () => createTempRscServer(s, { forceBuild: true })
+        );
         const rscEnv = tempServer.environments?.rsc;
         if (!rscEnv?.runner) {
           console.warn(
-            "[rsc-router] RSC environment runner not available during build, skipping manifest generation"
+            "[rango] RSC environment runner not available during build, skipping manifest generation"
           );
           return;
         }
@@ -5135,8 +6290,16 @@ ${err.stack}`
         if (tempIdsPlugin?.api?.staticHandlerModules) {
           s.resolvedStaticModules = tempIdsPlugin.api.staticHandlerModules;
         }
-        await discoverRouters(s, rscEnv);
-        writeRouteTypesFiles(s);
+        await timed(
+          debugDiscovery,
+          "build discoverRouters",
+          () => discoverRouters(s, rscEnv)
+        );
+        timedSync(
+          debugDiscovery,
+          "build writeRouteTypesFiles",
+          () => writeRouteTypesFiles(s)
+        );
       } catch (err) {
         const sourceFile = err.stack?.split("\n").find(
           (line) => line.includes(s.projectRoot) && !line.includes("node_modules")
@@ -5149,15 +6312,52 @@ ${err.stack}`
 ${err.stack}` : null
         ].filter(Boolean).join("\n");
         throw new Error(
-          `[rsc-router] Build-time router discovery failed:
-${details}`
+          `[rango] Build-time router discovery failed:
+${details}`,
+          { cause: err }
         );
       } finally {
         delete globalThis.__rscRouterDiscoveryActive;
         if (tempServer) {
-          await tempServer.close();
+          await timed(
+            debugDiscovery,
+            "build tempServer.close",
+            () => tempServer.close()
+          );
         }
         await releaseBuildEnv(s);
+        debugDiscovery?.(
+          "build discovery done (%sms)",
+          (performance.now() - buildStartTime).toFixed(1)
+        );
+      }
+    },
+    // Suppress vite's HMR cascade for our own gen-file writes.
+    //
+    // After every cf HMR cycle, refreshTempRscEnv → writeRouteTypesFiles
+    // writes the configured gen files (default `router.named-routes.gen.ts`,
+    // but the source filenames and gen suffix are user-configurable). The
+    // chokidar watcher then fires twice independently: our
+    // `handleRouteFileChange` (already short-circuited by
+    // `consumeSelfGenWrite` inside `maybeHandleGeneratedRouteFileMutation`),
+    // AND vite's own HMR pipeline (which invalidates the gen file's
+    // importers and triggers a second workerd full reload — visible to the
+    // user as a duplicate "[Rango] HMR: version changed" on the client).
+    //
+    // `peekSelfGenWrite` is the authoritative filter: its map only contains
+    // paths that `markSelfGenWrite` has registered, so it natively works
+    // for any configured gen-file name. It is non-consuming so the chokidar
+    // handler that fires later can still consume the same entry. Returning
+    // [] tells vite "no modules invalidated by this change" — safe because
+    // `s.perRouterManifests` is already up-to-date (the write that just
+    // happened is the consequence of our just-completed rediscovery).
+    handleHotUpdate(ctx) {
+      if (peekSelfGenWrite(s, ctx.file)) {
+        debugDiscovery?.(
+          "handleHotUpdate: suppressing self-write HMR cascade for %s",
+          ctx.file
+        );
+        return [];
       }
     },
     // Virtual module: provides the pre-generated route manifest as a JS module
@@ -5174,17 +6374,36 @@ ${details}`
     async load(id) {
       if (id === "\0" + VIRTUAL_ROUTES_MANIFEST_ID) {
         if (s.discoveryDone) {
-          await s.discoveryDone;
+          await timed(
+            debugRoutes,
+            "await discoveryDone (manifest)",
+            () => s.discoveryDone
+          );
         }
-        return generateRoutesManifestModule(s);
+        const code = await timed(
+          debugRoutes,
+          "generateRoutesManifestModule",
+          () => generateRoutesManifestModule(s)
+        );
+        debugRoutes?.("manifest module emitted (%d bytes)", code?.length ?? 0);
+        return code;
       }
       const perRouterPrefix = "\0" + VIRTUAL_ROUTES_MANIFEST_ID + "/";
       if (id.startsWith(perRouterPrefix)) {
         if (s.discoveryDone) {
-          await s.discoveryDone;
+          await timed(
+            debugRoutes,
+            "await discoveryDone (per-router)",
+            () => s.discoveryDone
+          );
         }
         const routerId = id.slice(perRouterPrefix.length);
-        return generatePerRouterModule(s, routerId);
+        const code = await timed(
+          debugRoutes,
+          `generatePerRouterModule ${routerId}`,
+          () => generatePerRouterModule(s, routerId)
+        );
+        return code;
       }
       return null;
     },
@@ -5192,14 +6411,20 @@ ${details}`
     // Used by closeBundle for handler code eviction and prerender data injection.
     generateBundle(_options, bundle) {
       if (this.environment?.name !== "rsc") return;
+      const genStart = debugBuild ? performance.now() : 0;
       for (const [fileName, chunk] of Object.entries(bundle)) {
         if (chunk.type === "chunk" && chunk.isEntry) {
           s.rscEntryFileName = fileName;
           break;
         }
       }
-      if (!s.resolvedPrerenderModules?.size && !s.resolvedStaticModules?.size)
+      if (!s.resolvedPrerenderModules?.size && !s.resolvedStaticModules?.size) {
+        debugBuild?.(
+          "generateBundle (rsc): no handlers to scan (%sms)",
+          (performance.now() - genStart).toFixed(1)
+        );
         return;
+      }
       s.handlerChunkInfoMap.clear();
       s.staticHandlerChunkInfoMap.clear();
       for (const [fileName, chunk] of Object.entries(bundle)) {
@@ -5243,6 +6468,13 @@ ${details}`
           }
         }
       }
+      debugBuild?.(
+        "generateBundle (rsc): scanned %d chunks, %d prerender chunk(s), %d static chunk(s) (%sms)",
+        Object.keys(bundle).length,
+        s.handlerChunkInfoMap.size,
+        s.staticHandlerChunkInfoMap.size,
+        (performance.now() - genStart).toFixed(1)
+      );
     },
     // Build-time pre-rendering: evict handler code and inject collected prerender data.
     // Collection now happens in-process during discoverRouters() via RSC runner.
@@ -5253,29 +6485,45 @@ ${details}`
       async handler() {
         if (!s.isBuildMode) return;
         if (this.environment && this.environment.name !== "rsc") return;
-        postprocessBundle(s);
+        timedSync(
+          debugBuild,
+          "closeBundle postprocessBundle",
+          () => postprocessBundle(s)
+        );
       }
     }
   };
 }
 
 // src/vite/rango.ts
+var debugConfig = createRangoDebugger(NS.config);
 async function rango(options) {
+  const rangoStart = performance.now();
   const resolvedOptions = options ?? { preset: "node" };
   const preset = resolvedOptions.preset ?? "node";
   const showBanner = resolvedOptions.banner ?? true;
+  const clientChunksOption = resolvedOptions.clientChunks ?? true;
+  const useBuiltInClientChunks = clientChunksOption === true;
+  const clientChunkCtx = useBuiltInClientChunks ? { fallbackRefs: /* @__PURE__ */ new Set() } : void 0;
+  const clientChunks = resolveClientChunks(clientChunksOption, clientChunkCtx);
+  debugConfig?.("rango(%s) setup start", preset);
   const plugins = [];
-  const rangoAliases = getPackageAliases();
+  const rangoAliases = { ...getPackageAliases(), ...getVendorAliases() };
   const excludeDeps = [
     ...getExcludeDeps(),
-    // The public browser entry re-exports the RSDW browser client.
-    // Excluding both keeps Vite from freezing the unpatched bundle into
-    // .vite/deps before our source transforms run.
+    // plugin-rsc itself injects these into the client env's
+    // optimizeDeps.include, which overrides exclude for the dep's own
+    // pre-bundle entry. What exclude still controls is how *other*
+    // pre-bundled deps treat imports of these specs (external vs inlined)
+    // via esbuildCjsExternalPlugin. The cjs-to-esm transform in
+    // plugins/cjs-to-esm.ts is the fallback for strict-pnpm consumers,
+    // where client.browser's bare include fails to resolve and Vite ends up
+    // serving the raw CJS file at dev-serve time.
     "@vitejs/plugin-rsc/browser",
-    // Keep the browser RSDW client out of Vite's dep optimizer so our
-    // cjs-to-esm transform can patch the real file.
     "@vitejs/plugin-rsc/vendor/react-server-dom/client.browser"
   ];
+  const pkg = getPublishedPackageName();
+  const nested = (spec) => `${pkg} > ${spec}`;
   const routerRef = { path: void 0 };
   const prerenderEnabled = true;
   if (preset === "cloudflare") {
@@ -5293,10 +6541,18 @@ async function rango(options) {
           // This ensures the same Context instance is used by both browser entry and RSC proxy modules
           optimizeDeps: {
             exclude: excludeDeps,
-            esbuildOptions: sharedEsbuildOptions
+            rolldownOptions: sharedRolldownOptions
           },
           resolve: {
-            alias: rangoAliases
+            alias: rangoAliases,
+            // Force a single React/React-DOM copy across all three RSC
+            // environments. RSC requires exactly one react/react-dom instance
+            // per environment runtime; consumer install topologies (pnpm
+            // strict layout, experimental React pins, third-party "use client"
+            // packages) can otherwise resolve duplicate copies, causing
+            // "Invalid hook call" / lost context. Child environments inherit
+            // this root dedupe, and Vite merges it with any consumer dedupe.
+            dedupe: ["react", "react-dom"]
           },
           build: {
             rollupOptions: { onwarn }
@@ -5305,6 +6561,14 @@ async function rango(options) {
             client: {
               build: {
                 rollupOptions: {
+                  // FILE_NAME_CONFLICT (and any other client-build warning) is
+                  // emitted by the CLIENT environment build, which consults THIS
+                  // env's onwarn -- Vite 8's environment builds do NOT propagate
+                  // the top-level build.rollupOptions.onwarn into the client env.
+                  // Wire it here so the suppression runs where the conflicts
+                  // originate (the top-level handler is invoked 0x for these; the
+                  // client-env handler is invoked for all of them).
+                  onwarn,
                   output: {
                     manualChunks: getManualChunks
                   }
@@ -5313,9 +6577,9 @@ async function rango(options) {
               // Pre-bundle rsc-html-stream to prevent discovery during first request
               // Exclude rsc-router modules to ensure same Context instance
               optimizeDeps: {
-                include: ["rsc-html-stream/client"],
+                include: [nested("rsc-html-stream/client")],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             },
             ssr: {
@@ -5323,10 +6587,6 @@ async function rango(options) {
               build: {
                 outDir: "./dist/rsc/ssr"
               },
-              resolve: {
-                // Ensure single React instance in SSR child environment
-                dedupe: ["react", "react-dom"]
-              },
               // Pre-bundle SSR entry and React for proper module linking with childEnvironments
               // All deps must be listed to avoid late discovery triggering ERR_OUTDATED_OPTIMIZED_DEP
               optimizeDeps: {
@@ -5338,11 +6598,13 @@ async function rango(options) {
                   "react-dom/static.edge",
                   "react/jsx-runtime",
                   "react/jsx-dev-runtime",
-                  "rsc-html-stream/server",
-                  "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge"
+                  nested("rsc-html-stream/server"),
+                  nested(
+                    "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge"
+                  )
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             },
             rsc: {
@@ -5354,10 +6616,12 @@ async function rango(options) {
                   "react",
                   "react/jsx-runtime",
                   "react/jsx-dev-runtime",
-                  "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
+                  nested(
+                    "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
+                  )
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             }
           }
@@ -5375,7 +6639,8 @@ async function rango(options) {
     plugins.push(
       rsc({
         entries: finalEntries,
-        serverHandler: false
+        serverHandler: false,
+        clientChunks
       })
     );
     plugins.push(clientRefDedup());
@@ -5393,7 +6658,7 @@ async function rango(options) {
           const list = candidates.map(
             (f) => "  - " + (f.startsWith(root) ? f.slice(root.length + 1) : f)
           ).join("\n");
-          throw new Error(`[rsc-router] Multiple routers found:
+          throw new Error(`[rango] Multiple routers found:
 ${list}`);
         }
       }
@@ -5412,18 +6677,34 @@ ${list}`);
         return {
           optimizeDeps: {
             exclude: excludeDeps,
-            esbuildOptions: sharedEsbuildOptions
+            rolldownOptions: sharedRolldownOptions
           },
           build: {
             rollupOptions: { onwarn }
           },
           resolve: {
-            alias: rangoAliases
+            alias: rangoAliases,
+            // Force a single React/React-DOM copy across all three RSC
+            // environments. RSC requires exactly one react/react-dom instance
+            // per environment runtime; consumer install topologies (pnpm
+            // strict layout, experimental React pins, third-party "use client"
+            // packages) can otherwise resolve duplicate copies, causing
+            // "Invalid hook call" / lost context. Child environments inherit
+            // this root dedupe, and Vite merges it with any consumer dedupe.
+            dedupe: ["react", "react-dom"]
           },
           environments: {
             client: {
               build: {
                 rollupOptions: {
+                  // FILE_NAME_CONFLICT (and any other client-build warning) is
+                  // emitted by the CLIENT environment build, which consults THIS
+                  // env's onwarn -- Vite 8's environment builds do NOT propagate
+                  // the top-level build.rollupOptions.onwarn into the client env.
+                  // Wire it here so the suppression runs where the conflicts
+                  // originate (the top-level handler is invoked 0x for these; the
+                  // client-env handler is invoked for all of them).
+                  onwarn,
                   output: {
                     manualChunks: getManualChunks
                   }
@@ -5435,10 +6716,10 @@ ${list}`);
                   "react-dom",
                   "react/jsx-runtime",
                   "react/jsx-dev-runtime",
-                  "rsc-html-stream/client"
+                  nested("rsc-html-stream/client")
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions,
+                rolldownOptions: sharedRolldownOptions,
                 entries: [VIRTUAL_IDS.browser]
               }
             },
@@ -5452,10 +6733,12 @@ ${list}`);
                   "react-dom/static.edge",
                   "react/jsx-runtime",
                   "react/jsx-dev-runtime",
-                  "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge"
+                  nested(
+                    "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge"
+                  )
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             },
             rsc: {
@@ -5465,9 +6748,11 @@ ${list}`);
                   "react",
                   "react/jsx-runtime",
                   "react/jsx-dev-runtime",
-                  "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
+                  nested(
+                    "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
+                  )
                 ],
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             }
           }
@@ -5484,7 +6769,7 @@ ${list}`);
         if (rscMinimalCount > 1 && !hasWarnedDuplicate) {
           hasWarnedDuplicate = true;
           console.warn(
-            "[rsc-router] Duplicate @vitejs/plugin-rsc detected. Remove rsc() from your vite config \u2014 rango() includes it automatically."
+            "[rango] Duplicate @vitejs/plugin-rsc detected. Remove rsc() from your vite config \u2014 rango() includes it automatically."
           );
         }
       }
@@ -5493,7 +6778,8 @@ ${list}`);
     plugins.push(performanceTracksPlugin());
     plugins.push(
       rsc({
-        entries: finalEntries
+        entries: finalEntries,
+        clientChunks
       })
     );
     plugins.push(clientRefDedup());
@@ -5532,9 +6818,16 @@ ${list}`);
       routerPathRef: discoveryRouterRef,
       enableBuildPrerender: prerenderEnabled,
       buildEnv: options?.buildEnv,
-      preset
+      preset,
+      clientChunkCtx
     })
   );
+  debugConfig?.(
+    "rango(%s) setup done: %d plugin(s) (%sms)",
+    preset,
+    plugins.length,
+    (performance.now() - rangoStart).toFixed(1)
+  );
   return plugins;
 }
 
@@ -5545,7 +6838,7 @@ function poke() {
     apply: "serve",
     configureServer(server) {
       const stdin = process.stdin;
-      const debug = process.env.RANGO_POKE_DEBUG === "1";
+      const debug11 = process.env.RANGO_POKE_DEBUG === "1";
       const triggerReload = (source) => {
         server.hot.send({ type: "full-reload", path: "*" });
         server.config.logger.info(`  browser reload (${source})`, {
@@ -5578,7 +6871,7 @@ function poke() {
         lines.pop();
         return lines;
       };
-      if (debug) {
+      if (debug11) {
         server.config.logger.info(
           `  poke debug enabled (isTTY=${stdin.isTTY ? "yes" : "no"}, isRaw=${stdin.isTTY ? stdin.isRaw ? "yes" : "no" : "n/a"})`,
           { timestamp: true }
@@ -5591,7 +6884,7 @@ function poke() {
         );
       }
       const onData = (data) => {
-        if (debug) {
+        if (debug11) {
           server.config.logger.info(`  poke stdin ${formatChunk(data)}`, {
             timestamp: true
           });